diff options
855 files changed, 8773 insertions, 5975 deletions
diff --git a/.gitmodules b/.gitmodules index bdec8fc..934def7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "admin"] path = admin url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/CMakeL10n.txt b/CMakeL10n.txt index f197cd6..3a56a6a 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8959bfa..947d57e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 2.8.12 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -17,7 +22,6 @@ cmake_minimum_required( VERSION 2.8.12 ) project( tdeutils ) set( PACKAGE tdeutils ) -set( VERSION R14.1.0 ) ##### include essential cmake modules ########### @@ -35,7 +39,6 @@ include( CheckTypeSize ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) @@ -130,13 +133,37 @@ option( BUILD_TDEFILEREPLACE "Build tdefilereplace" ${BUILD_ALL} ) ##### add apidox targets ############ -add_custom_target(apidox - COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/qt3/doc/html" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/") +add_custom_target( apidox + COMMAND ${CMAKE_COMMAND} -E env + "TQTDOCDIR=/usr/share/tqt3/doc/html" + "DOXDATA=${HTML_INSTALL_DIR}/en/common" + ${CMAKE_SOURCE_DIR}/admin/doxygen.sh + --no-modulename + ${CMAKE_SOURCE_DIR} + COMMAND + find ${CMAKE_BINARY_DIR}/apidocs -name '*.html' | + xargs -r sed -i 's|${CMAKE_BINARY_DIR}/apidocs|${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs|g' + COMMAND + find ${CMAKE_BINARY_DIR}/apidocs -name '*.tag' | + xargs -r sed -i 's|${CMAKE_SOURCE_DIR}/|${PROJECT_NAME}/|g' + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +) + +add_custom_target( install-apidox + COMMAND ${CMAKE_COMMAND} -E echo Apidox installed in ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs +) + +install( CODE " + if( EXISTS ${CMAKE_BINARY_DIR}/apidocs ) + file( + INSTALL ${CMAKE_BINARY_DIR}/apidocs/ + DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs + PATTERN doxygen_sqlite3.db EXCLUDE + PATTERN installdox-slow EXCLUDE + ) + endif()" +) -add_custom_target(install-apidox - COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/") ##### configure checks ########################## diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 148884c..d1db8e3 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -28,13 +28,9 @@ if( WITH_GCC_VISIBILITY ) tde_setup_gcc_visibility( ) endif( ) - -##### ark ####################################### - -if( BUILD_ARK ) - check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) - check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) -endif( BUILD_ARK ) +# strlcat and strlcpy check +check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) ##### kcalc ##################################### @@ -151,9 +147,9 @@ if ( BUILD_KSIM ) check_include_file( "sys/mount.h" HAVE_SYS_MOUNT_H ) check_include_file( "mntent.h" HAVE_MNTENT_H ) check_include_file( "sys/ucred.h" HAVE_SYS_UCRED_H ) - check_include_file( "sys/mnttab.h" HAVE_SYS_MNTTAB_H ) + check_include_files( "stdio.h;sys/mnttab.h" HAVE_SYS_MNTTAB_H ) - check_include_file( "sys/loadavg.h" HAVE_SYS_LOADAVG_H ) + check_include_files( "sys/time.h;sys/loadavg.h" HAVE_SYS_LOADAVG_H ) check_function_exists( getloadavg HAVE_GETLOADAVG ) check_function_exists( statfs HAVE_STATFS ) check_function_exists( statvfs HAVE_STATVFS ) @@ -205,10 +201,27 @@ endif ( BUILD_KSIM ) if ( BUILD_SUPERKARAMBA ) check_include_file( "sys/types.h" HAVE_SYS_TYPES_H ) - find_package( PythonLibs ) - if( NOT PYTHONLIBS_FOUND ) - tde_message_fatal( "python is required, but was not found on your system" ) - endif( NOT PYTHONLIBS_FOUND ) + if( ${CMAKE_VERSION} VERSION_LESS "3.12" ) + find_package( PythonLibs ) + if( NOT PYTHONLIBS_FOUND ) + tde_message_fatal( "Python is required, but was not found on your system" ) + endif( NOT PYTHONLIBS_FOUND ) + else( ) + find_package( Python COMPONENTS Development ) + if( NOT Python_Development_FOUND ) + tde_message_fatal( "Python is required, but was not found on your system" ) + endif( ) + set( PYTHONLIBS_VERSION_STRING "${Python_VERSION}" ) + set( PYTHON_VERSION_STRING "${Python_VERSION}" ) + set( PYTHON_VERSION_MAJOR "${Python_VERSION_MAJOR}" ) + set( PYTHON_VERSION_MINOR "${Python_VERSION_MINOR}" ) + set( PYTHON_INCLUDE_DIRS "${Python_INCLUDE_DIRS}" ) + set( PYTHON_LIBRARIES "${Python_LIBRARIES}" ) + endif( ) + + if( "${PYTHONLIBS_VERSION_STRING}" LESS "3" ) + tde_message_fatal( "Python3 is required, but was not found on your system" ) + endif( ) if( WITH_TDENEWSTUFF ) set( HAVE_TDENEWSTUFF 1 ) diff --git a/admin b/admin -Subproject 8c7e0d40de084fe5d54e173918756639e0d4d63 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/ark/ace.cpp b/ark/ace.cpp index 4f1d2e4..51a2826 100644 --- a/ark/ace.cpp +++ b/ark/ace.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <kurl.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include "ace.h" #include "arkwidget.h" @@ -89,15 +89,15 @@ void AceArch::open() kdDebug() << "AceArch::open(): kp->args(): " << kp->args() << endl; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - this, TQT_SLOT( catchMeIfYouCan(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + this, TQ_SLOT( catchMeIfYouCan(TDEProcess*, char*, int) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -158,12 +158,12 @@ void AceArch::unarchFileInternal( ) } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -31,7 +31,7 @@ class TDEProcess; // TODO: Remove me! class AceArch : public Arch { - Q_OBJECT + TQ_OBJECT public: AceArch( ArkWidget *, const TQString & ); @@ -38,7 +38,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> // ark includes #include "arkwidget.h" @@ -89,13 +89,13 @@ void ArArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "vt" << m_filename; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedTOC(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedTOC(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotOpenExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotOpenExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -111,10 +111,10 @@ void ArArch::create() kp->clearArguments(); *kp << m_archiver_program << "c" << m_filename; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::Block) == false) { @@ -152,13 +152,13 @@ void ArArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -209,13 +209,13 @@ void ArArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotExtractExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotExtractExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -242,13 +242,13 @@ void ArArch::remove(TQStringList *list) *kp << str; } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotDeleteExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotDeleteExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -38,7 +38,7 @@ class ArkWidget; class ArArch : public Arch { - Q_OBJECT + TQ_OBJECT public: ArArch( ArkWidget *_gui, diff --git a/ark/arch.cpp b/ark/arch.cpp index eb5606b..1b2d08e 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -41,8 +41,8 @@ #include <kmimetype.h> #include <tdelocale.h> #include <kpassdlg.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> // ark includes #include "arch.h" @@ -75,7 +75,7 @@ typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList; */ class Arch : public TQObject { - Q_OBJECT + TQ_OBJECT protected: @@ -211,18 +211,18 @@ class Arch : public TQObject // Columns // don't forget to change common_texts.cpp if you change something here -#define FILENAME_COLUMN tqMakePair( i18n(" Filename "), TQt::AlignLeft ) -#define PERMISSION_COLUMN tqMakePair( i18n(" Permissions "), TQt::AlignLeft ) -#define OWNER_GROUP_COLUMN tqMakePair( i18n(" Owner/Group "), TQt::AlignLeft ) -#define SIZE_COLUMN tqMakePair( i18n(" Size "), TQt::AlignRight ) -#define TIMESTAMP_COLUMN tqMakePair( i18n(" Timestamp "), TQt::AlignRight ) -#define LINK_COLUMN tqMakePair( i18n(" Link "), TQt::AlignLeft ) -#define PACKED_COLUMN tqMakePair( i18n(" Size Now "), TQt::AlignRight ) -#define RATIO_COLUMN tqMakePair( i18n(" Ratio "), TQt::AlignRight ) -#define CRC_COLUMN tqMakePair( i18n("Cyclic Redundancy Check"," CRC "), TQt::AlignLeft ) -#define METHOD_COLUMN tqMakePair( i18n(" Method "), TQt::AlignLeft ) -#define VERSION_COLUMN tqMakePair( i18n(" Version "), TQt::AlignLeft ) -#define OWNER_COLUMN tqMakePair( i18n(" Owner "), TQt::AlignLeft ) -#define GROUP_COLUMN tqMakePair( i18n(" Group "), TQt::AlignLeft ) +#define FILENAME_COLUMN qMakePair( i18n(" Filename "), TQt::AlignLeft ) +#define PERMISSION_COLUMN qMakePair( i18n(" Permissions "), TQt::AlignLeft ) +#define OWNER_GROUP_COLUMN qMakePair( i18n(" Owner/Group "), TQt::AlignLeft ) +#define SIZE_COLUMN qMakePair( i18n(" Size "), TQt::AlignRight ) +#define TIMESTAMP_COLUMN qMakePair( i18n(" Timestamp "), TQt::AlignRight ) +#define LINK_COLUMN qMakePair( i18n(" Link "), TQt::AlignLeft ) +#define PACKED_COLUMN qMakePair( i18n(" Size Now "), TQt::AlignRight ) +#define RATIO_COLUMN qMakePair( i18n(" Ratio "), TQt::AlignRight ) +#define CRC_COLUMN qMakePair( i18n("Cyclic Redundancy Check"," CRC "), TQt::AlignLeft ) +#define METHOD_COLUMN qMakePair( i18n(" Method "), TQt::AlignLeft ) +#define VERSION_COLUMN qMakePair( i18n(" Version "), TQt::AlignLeft ) +#define OWNER_COLUMN qMakePair( i18n(" Owner "), TQt::AlignLeft ) +#define GROUP_COLUMN qMakePair( i18n(" Group "), TQt::AlignLeft ) #endif /* ARCH_H */ diff --git a/ark/archiveformatdlg.h b/ark/archiveformatdlg.h index 136236f..733358a 100644 --- a/ark/archiveformatdlg.h +++ b/ark/archiveformatdlg.h @@ -27,7 +27,7 @@ class ArchiveFormatDlg: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType ); diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp index d3c73a6..6ef5b7c 100644 --- a/ark/archiveformatinfo.cpp +++ b/ark/archiveformatinfo.cpp @@ -26,7 +26,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kfilterdev.h> #include <tqfile.h> @@ -91,7 +91,7 @@ void ArchiveFormatInfo::addFormatInfo( ArchType type, TQString mime, TQString st { FormatInfo & info = find( type ); - KDesktopFile * desktopFile = new KDesktopFile( mime + ".desktop", true, "mime" ); + TDEDesktopFile * desktopFile = new TDEDesktopFile( mime + ".desktop", true, "mime" ); if( !desktopFile ) kdWarning( 1601 ) << "MimeType " << mime << " seems to be missing." << endl; KMimeType mimeType( desktopFile ); diff --git a/ark/arj.cpp b/ark/arj.cpp index 7022b24..3677b52 100644 --- a/ark/arj.cpp +++ b/ark/arj.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpassdlg.h> // ark includes @@ -122,12 +122,12 @@ void ArjArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -190,12 +190,12 @@ void ArjArch::open() *kp << m_unarchiver_program << "v" << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -246,12 +246,12 @@ void ArjArch::unarchFileInternal() } } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -282,12 +282,12 @@ void ArjArch::remove( TQStringList *list ) *kp << str; } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -310,12 +310,12 @@ void ArjArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -38,7 +38,7 @@ class ArkWidget; class ArjArch : public Arch { - Q_OBJECT + TQ_OBJECT public: ArjArch( ArkWidget *_gui, const TQString & _fileName ); virtual ~ArjArch() { } diff --git a/ark/ark_dummy.cpp b/ark/ark_dummy.cpp index efd89d8..65be7fc 100644 --- a/ark/ark_dummy.cpp +++ b/ark/ark_dummy.cpp @@ -1,3 +1,3 @@ -#include <kdemacros.h> +#include <tdemacros.h> extern "C" int kdemain(int argc, char* argv[]); -extern "C" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); } +extern "C" TDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); } diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 9a8cd50..e1b1bc7 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -72,12 +72,12 @@ ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject awidget = new ArkWidget( parentWidget, "ArkWidget" ); setWidget(awidget); - connect( awidget, TQT_SIGNAL( fixActions() ), this, TQT_SLOT( fixEnables() ) ); - connect( awidget, TQT_SIGNAL( disableAllActions() ), this, TQT_SLOT( disableActions() ) ); - connect( awidget, TQT_SIGNAL( signalFilePopup( const TQPoint& ) ), this, TQT_SLOT( slotFilePopup( const TQPoint& ) ) ); - connect( awidget, TQT_SIGNAL( setWindowCaption( const TQString & ) ), this, TQT_SIGNAL( setWindowCaption( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( removeRecentURL( const KURL & ) ), this, TQT_SIGNAL( removeRecentURL( const KURL & ) ) ); - connect( awidget, TQT_SIGNAL( addRecentURL( const KURL & ) ), this, TQT_SIGNAL( addRecentURL( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( fixActions() ), this, TQ_SLOT( fixEnables() ) ); + connect( awidget, TQ_SIGNAL( disableAllActions() ), this, TQ_SLOT( disableActions() ) ); + connect( awidget, TQ_SIGNAL( signalFilePopup( const TQPoint& ) ), this, TQ_SLOT( slotFilePopup( const TQPoint& ) ) ); + connect( awidget, TQ_SIGNAL( setWindowCaption( const TQString & ) ), this, TQ_SIGNAL( setWindowCaption( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( removeRecentURL( const KURL & ) ), this, TQ_SIGNAL( removeRecentURL( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( addRecentURL( const KURL & ) ), this, TQ_SIGNAL( addRecentURL( const KURL & ) ) ); if( readWrite ) setXMLFile( "ark_part.rc" ); @@ -90,22 +90,22 @@ ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject setupActions(); m_ext = new ArkBrowserExtension( this, "ArkBrowserExtension" ); - connect( awidget, TQT_SIGNAL( openURLRequest( const KURL & ) ), - m_ext, TQT_SLOT( slotOpenURLRequested( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( openURLRequest( const KURL & ) ), + m_ext, TQ_SLOT( slotOpenURLRequested( const KURL & ) ) ); m_bar = new ArkStatusBarExtension( this ); - connect( awidget, TQT_SIGNAL( setStatusBarText( const TQString & ) ), m_bar, - TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setStatusBarSelectedFiles( const TQString & ) ), m_bar, - TQT_SLOT( slotSetStatusBarSelectedFiles( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setBusy( const TQString & ) ), m_bar, - TQT_SLOT( slotSetBusy( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setReady() ), m_bar, - TQT_SLOT( slotSetReady() ) ); - connect( this, TQT_SIGNAL( started(TDEIO::Job*) ), TQT_SLOT( transferStarted(TDEIO::Job*) ) ); - connect( this, TQT_SIGNAL( completed() ), TQT_SLOT( transferCompleted() ) ); - connect( this, TQT_SIGNAL( canceled(const TQString&) ), - TQT_SLOT( transferCanceled(const TQString&) ) ); + connect( awidget, TQ_SIGNAL( setStatusBarText( const TQString & ) ), m_bar, + TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setStatusBarSelectedFiles( const TQString & ) ), m_bar, + TQ_SLOT( slotSetStatusBarSelectedFiles( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setBusy( const TQString & ) ), m_bar, + TQ_SLOT( slotSetBusy( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setReady() ), m_bar, + TQ_SLOT( slotSetReady() ) ); + connect( this, TQ_SIGNAL( started(TDEIO::Job*) ), TQ_SLOT( transferStarted(TDEIO::Job*) ) ); + connect( this, TQ_SIGNAL( completed() ), TQ_SLOT( transferCompleted() ) ); + connect( this, TQ_SIGNAL( canceled(const TQString&) ), + TQ_SLOT( transferCanceled(const TQString&) ) ); setProgressInfoEnabled( false ); } @@ -116,44 +116,44 @@ ArkPart::~ArkPart() void ArkPart::setupActions() { - addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_add()), actionCollection(), "addfile"); + addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, awidget, + TQ_SLOT(action_add()), actionCollection(), "addfile"); - addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_add_dir()), actionCollection(), "adddir"); + addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, awidget, + TQ_SLOT(action_add_dir()), actionCollection(), "adddir"); - extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_extract()), actionCollection(), "extract"); + extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, awidget, + TQ_SLOT(action_extract()), actionCollection(), "extract"); - deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget), - TQT_SLOT(action_delete()), actionCollection(), "delete"); + deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), awidget, + TQ_SLOT(action_delete()), actionCollection(), "delete"); - viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_view()), actionCollection(), "view"); + viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, awidget, + TQ_SLOT(action_view()), actionCollection(), "view"); - openWithAction = new TDEAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget), - TQT_SLOT(slotOpenWith()), actionCollection(), "open_with"); + openWithAction = new TDEAction(i18n("&Open With..."), 0, awidget, + TQ_SLOT(slotOpenWith()), actionCollection(), "open_with"); - editAction = new TDEAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_edit()), actionCollection(), "edit"); + editAction = new TDEAction(i18n("Edit &With..."), 0, awidget, + TQ_SLOT(action_edit()), actionCollection(), "edit"); testAction = new TDEAction(i18n("&Test integrity"), 0, awidget, - TQT_SLOT(action_test()), actionCollection(), "test"); + TQ_SLOT(action_test()), actionCollection(), "test"); - selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all"); + selectAllAction = KStdAction::selectAll(awidget->fileList(), TQ_SLOT(selectAll()), actionCollection(), "select_all"); - deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all"); + deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, awidget->fileList(),TQ_SLOT(unselectAll()), actionCollection(), "deselect_all"); - invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); + invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, awidget->fileList(),TQ_SLOT(invertSelection()), actionCollection(), "invert_selection"); - saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection()); + saveAsAction = KStdAction::saveAs(this, TQ_SLOT(file_save_as()), actionCollection()); - //KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection()); + //KStdAction::preferences(awidget, TQ_SLOT(showSettings()), actionCollection()); - ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget), - TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); + ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, awidget, + TQ_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); showSearchBar = new TDEToggleAction( i18n( "Show Search Bar" ), TDEShortcut(), actionCollection(), "options_show_search_bar" ); @@ -161,7 +161,7 @@ ArkPart::setupActions() showSearchBar->setChecked( ArkSettings::showSearchBar() ); - connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(awidget), TQT_SLOT( slotShowSearchBarToggled( bool ) ) ); + connect( showSearchBar, TQ_SIGNAL( toggled( bool ) ), awidget, TQ_SLOT( slotShowSearchBarToggled( bool ) ) ); initialEnables(); } @@ -332,10 +332,10 @@ void ArkPart::transferStarted( TDEIO::Job *job ) if ( job ) { disableActions(); - connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); - connect( m_bar->cancelButton(), TQT_SIGNAL( clicked() ), - TQT_SLOT( cancelTransfer() ) ); + connect( job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + TQ_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); + connect( m_bar->cancelButton(), TQ_SIGNAL( clicked() ), + TQ_SLOT( cancelTransfer() ) ); } } @@ -343,8 +343,8 @@ void ArkPart::transferCompleted() { if ( m_job ) { - disconnect( m_job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - this, TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); + disconnect( m_job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + this, TQ_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); m_job = 0; } @@ -369,8 +369,8 @@ void ArkPart::progressInformation( TDEIO::Job *, unsigned long progress ) void ArkPart::cancelTransfer() { - disconnect( m_bar->cancelButton(), TQT_SIGNAL( clicked() ), - this, TQT_SLOT( cancelTransfer() ) ); + disconnect( m_bar->cancelButton(), TQ_SIGNAL( clicked() ), + this, TQ_SLOT( cancelTransfer() ) ); if ( m_job ) { m_job->kill( false ); @@ -413,7 +413,7 @@ void ArkStatusBarExtension::setupStatusBar() } m_pTimer = new TQTimer( this ); - connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgress() ) ); + connect( m_pTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgress() ) ); m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" ); m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame ); diff --git a/ark/ark_part.h b/ark/ark_part.h index 49af555..78ca5a4 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -45,7 +45,7 @@ namespace TDEIO class ArkBrowserExtension: public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name = 0L ); @@ -55,7 +55,7 @@ public slots: class ArkStatusBarExtension: public KParts::StatusBarExtension { - Q_OBJECT + TQ_OBJECT public: ArkStatusBarExtension( KParts::ReadWritePart * parent ); @@ -87,7 +87,7 @@ private: class ArkPart: public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, diff --git a/ark/arkapp.cpp b/ark/arkapp.cpp index 4a98c94..7fc9efe 100644 --- a/ark/arkapp.cpp +++ b/ark/arkapp.cpp @@ -106,7 +106,7 @@ ArkApplication * ArkApplication::getInstance() } ArkApplication::ArkApplication() - : KUniqueApplication(), m_windowCount(0) + : TDEUniqueApplication(), m_windowCount(0) { m_mainwidget = new TQWidget; setMainWidget(m_mainwidget); diff --git a/ark/arkapp.h b/ark/arkapp.h index 787513d..89de47b 100644 --- a/ark/arkapp.h +++ b/ark/arkapp.h @@ -33,7 +33,7 @@ #include <tqdict.h> // KDE includes -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class TQString; class TQStringList; @@ -49,9 +49,9 @@ class EqualKey // This class follows the singleton pattern. -class ArkApplication : public KUniqueApplication +class ArkApplication : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: virtual int newInstance(); diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp index c0912ce..a865374 100644 --- a/ark/arkfactory.cpp +++ b/ark/arkfactory.cpp @@ -20,7 +20,7 @@ */ #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include "ark_part.h" #include "arkfactory.h" diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp index 34f9cfd..1c12630 100644 --- a/ark/arkviewer.cpp +++ b/ark/arkviewer.cpp @@ -42,7 +42,7 @@ ArkViewer::ArkViewer( TQWidget * parent, const char * name ) m_widget = new TQVBox( this ); m_widget->layout()->setSpacing( 10 ); - connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) ); + connect( this, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFinished() ) ); setMainWidget( m_widget ); } @@ -86,7 +86,7 @@ bool ArkViewer::view( const KURL& filename ) header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ); - m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) ); + m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, this ); if ( m_part ) { diff --git a/ark/arkviewer.h b/ark/arkviewer.h index af04c80..88cdbf1 100644 --- a/ark/arkviewer.h +++ b/ark/arkviewer.h @@ -27,7 +27,7 @@ class ArkViewer : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 6a6c091..1e1d488 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -49,9 +49,9 @@ #include <tdetempfile.h> #include <kmimemagic.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktempdir.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdefiledialog.h> #include <kdirselectdialog.h> #include <kurldrag.h> @@ -299,7 +299,7 @@ ArkWidget::convertTo( const KURL & u ) busy( i18n( "Saving..." ) ); m_convert_tmpDir = new KTempDir( tmpDir() + "convtmp" ); m_convert_tmpDir->setAutoDelete( true ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( convertSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( convertSlotExtractDone( bool ) ) ); m_convert_saveAsURL = u; arch->unarchFile( 0, m_convert_tmpDir->name() ); } @@ -308,15 +308,15 @@ void ArkWidget::convertSlotExtractDone( bool ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( convertSlotExtractDone( bool ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( convertSlotCreate() ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( convertSlotExtractDone( bool ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( convertSlotCreate() ) ); } void ArkWidget::convertSlotCreate() { file_close(); - connect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( convertSlotCreateDone( bool ) ) ); + connect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( convertSlotCreateDone( bool ) ) ); TQString archToCreate; if ( m_convert_saveAsURL.isLocalFile() ) archToCreate = m_convert_saveAsURL.path(); @@ -330,7 +330,7 @@ ArkWidget::convertSlotCreate() void ArkWidget::convertSlotCreateDone( bool success ) { - disconnect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( convertSlotCreateDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( convertSlotCreateDone( bool ) ) ); kdDebug( 1601 ) << k_funcinfo << endl; if ( !success ) { @@ -357,7 +357,7 @@ ArkWidget::convertSlotCreateDone( bool success ) *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it; } bool bOldRecVal = ArkSettings::rarRecurseSubdirs(); - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( convertSlotAddDone( bool ) ) ); arch->addFile( entries ); ArkSettings::setRarRecurseSubdirs( bOldRecVal ); } @@ -365,11 +365,11 @@ ArkWidget::convertSlotCreateDone( bool success ) void ArkWidget::convertSlotAddDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( convertSlotAddDone( bool ) ) ); kdDebug( 1601 ) << k_funcinfo << endl; m_convertSuccess = success; // needed ? (TarArch, lzo) - TQTimer::singleShot( 0, this, TQT_SLOT( convertFinish() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( convertFinish() ) ); } void @@ -438,7 +438,7 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b } } - connect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) ); + connect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( extractToSlotOpenDone( bool ) ) ); } const TQString @@ -464,7 +464,7 @@ ArkWidget::guessName( const KURL &archive ) void ArkWidget::extractToSlotOpenDone( bool success ) { - disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( extractToSlotOpenDone( bool ) ) ); if ( !success ) { KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).arg( m_url.prettyURL() ) ); @@ -508,7 +508,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) if ( ArkUtils::diskHasSpace( extractDir, m_nSizeOfFiles ) ) { disableAll(); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( extractToSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( extractToSlotExtractDone( bool ) ) ); arch->unarchFile( 0, extractDir ); } else @@ -525,7 +525,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) void ArkWidget::extractToSlotExtractDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( extractToSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( extractToSlotExtractDone( bool ) ) ); if ( !success ) { kdDebug( 1601 ) << "Last Shell Output" << arch->getLastShellOutput() << endl; @@ -536,7 +536,7 @@ ArkWidget::extractToSlotExtractDone( bool success ) if ( m_extractRemote ) { - connect( this, TQT_SIGNAL( extractRemoteMovingDone() ), this, TQT_SIGNAL( request_file_quit() ) ); + connect( this, TQ_SIGNAL( extractRemoteMovingDone() ), this, TQ_SIGNAL( request_file_quit() ) ); extractRemoteInitiateMoving( m_extractTo_targetDirectory ); } else @@ -565,7 +565,7 @@ ArkWidget::addToArchive( const KURL::List & filesToAdd, const KURL & archive) } } - connect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( addToArchiveSlotCreateDone( bool ) ) ); + connect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( addToArchiveSlotCreateDone( bool ) ) ); // TODO: remote Archives should be handled by createArchive if ( archive.isLocalFile() ) @@ -581,14 +581,14 @@ ArkWidget::addToArchive( const KURL::List & filesToAdd, const KURL & archive) return true; } - connect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( addToArchiveSlotOpenDone( bool ) ) ); + connect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( addToArchiveSlotOpenDone( bool ) ) ); return true; } void ArkWidget::addToArchiveSlotCreateDone( bool success ) { - disconnect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( addToArchiveSlotCreateDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( addToArchiveSlotCreateDone( bool ) ) ); if ( !success ) { kdDebug( 1601 ) << "Could not create the archive" << endl; @@ -602,7 +602,7 @@ void ArkWidget::addToArchiveSlotOpenDone( bool success ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( addToArchiveSlotOpenDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( addToArchiveSlotOpenDone( bool ) ) ); // TODO: handle dirs with addDir ( or better+easier: get rid of the need to do that entirely ) if ( !success ) { @@ -617,7 +617,7 @@ ArkWidget::addToArchiveSlotOpenDone( bool success ) strFilename = url.path(); if (!strFilename.isEmpty()) { - connect( this, TQT_SIGNAL( createRealArchiveDone( bool ) ), this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + connect( this, TQ_SIGNAL( createRealArchiveDone( bool ) ), this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); createRealArchive( strFilename, m_addToArchive_filesToAdd.toStringList() ); return; } @@ -662,7 +662,7 @@ ArkWidget::addToArchiveSlotOpenDone( bool success ) kdDebug( 1601 ) << "Adding: " << list << endl; - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); arch->addFile( list.toStringList() ); } @@ -670,7 +670,7 @@ void ArkWidget::addToArchiveSlotAddDone( bool success ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + disconnect( this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); if ( !success ) { KMessageBox::error( this, i18n( "An error occurred while adding the files to the archive." ) ); @@ -861,8 +861,8 @@ ArkWidget::extractOnlyOpenDone() void ArkWidget::slotExtractDone(bool success) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( slotExtractDone(bool) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( slotExtractDone(bool) ) ); ready(); if(m_extractList != 0) @@ -919,8 +919,8 @@ ArkWidget::extractRemoteInitiateMoving( const KURL & target ) m_extractURL.adjustPath( 1 ); TDEIO::CopyJob *job = TDEIO::copy( srcList, target, this ); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotExtractRemoteDone(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotExtractRemoteDone(TDEIO::Job*)) ); m_extractRemote = false; } @@ -1010,8 +1010,8 @@ ArkWidget::createRealArchive( const TQString & strFilename, const TQStringList & u2.setPath( m_createRealArchTmpDir->name() + u1.fileName() ); TDEIO::NetAccess::copy( u1, u2, this ); m_compressedFile = "file:" + u2.path(); // AGAIN THE 5 SPACES Hack :-( - connect( newArch, TQT_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), - this, TQT_SLOT( createRealArchiveSlotCreate( Arch *, bool, + connect( newArch, TQ_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), + this, TQ_SLOT( createRealArchiveSlotCreate( Arch *, bool, const TQString &, int ) ) ); file_close(); newArch->create(); @@ -1030,8 +1030,8 @@ ArkWidget::createRealArchiveSlotCreate( Arch * newArch, bool success, listForCompressedFile.append(m_compressedFile); disableAll(); - connect( newArch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddDone( bool ) ) ); + connect( newArch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddDone( bool ) ) ); newArch->addFile(listForCompressedFile); } @@ -1040,8 +1040,8 @@ void ArkWidget::createRealArchiveSlotAddDone( bool success ) { kdDebug( 1601 ) << "createRealArchiveSlotAddDone+, success:" << success << endl; - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddDone( bool ) ) ); m_createRealArchTmpDir->unlink(); delete m_createRealArchTmpDir; @@ -1061,8 +1061,8 @@ ArkWidget::createRealArchiveSlotAddDone( bool success ) } else { - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); // files were dropped in addFile( m_pTempAddList ); } @@ -1072,8 +1072,8 @@ void ArkWidget::createRealArchiveSlotAddFilesDone( bool success ) { //kdDebug( 1601 ) << "createRealArchiveSlotAddFilesDone+, success:" << success << endl; - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); delete m_pTempAddList; m_pTempAddList = NULL; emit createRealArchiveDone( success ); @@ -1150,7 +1150,7 @@ ArkWidget::addFile(TQStringList *list) } - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); arch->addFile( ( *list ) ); } @@ -1167,7 +1167,7 @@ ArkWidget::action_add_dir() busy( i18n( "Adding folder..." ) ); disableAll(); u = toLocalFile(u); - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); arch->addDir( u.prettyURL() ); } @@ -1176,7 +1176,7 @@ ArkWidget::action_add_dir() void ArkWidget::slotAddDone(bool _bSuccess) { - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); m_fileListView->setUpdatesEnabled(true); m_fileListView->triggerUpdate(); ready(); @@ -1280,7 +1280,7 @@ ArkWidget::action_delete() disableAll(); busy( i18n( "Removing..." ) ); - connect( arch, TQT_SIGNAL( sigDelete( bool ) ), this, TQT_SLOT( slotDeleteDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigDelete( bool ) ), this, TQ_SLOT( slotDeleteDone( bool ) ) ); arch->remove(&list); kdDebug(1601) << "-ArkWidget::action_delete" << endl; } @@ -1288,7 +1288,7 @@ ArkWidget::action_delete() void ArkWidget::slotDeleteDone(bool _bSuccess) { - disconnect( arch, TQT_SIGNAL( sigDelete( bool ) ), this, TQT_SLOT( slotDeleteDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigDelete( bool ) ), this, TQ_SLOT( slotDeleteDone( bool ) ) ); kdDebug(1601) << "+ArkWidget::slotDeleteDone" << endl; m_fileListView->setUpdatesEnabled(true); m_fileListView->triggerUpdate(); @@ -1310,8 +1310,8 @@ ArkWidget::slotDeleteDone(bool _bSuccess) void ArkWidget::slotOpenWith() { - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( openWithSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( openWithSlotExtractDone( bool ) ) ); showCurrentFile(); } @@ -1319,8 +1319,8 @@ ArkWidget::slotOpenWith() void ArkWidget::openWithSlotExtractDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( openWithSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( openWithSlotExtractDone( bool ) ) ); if ( success ) { @@ -1524,7 +1524,7 @@ ArkWidget::action_extract() { disableAll(); busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( slotExtractDone(bool) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( slotExtractDone(bool) ) ); arch->unarchFile(0, extractDir); } } @@ -1551,8 +1551,8 @@ ArkWidget::action_extract() { disableAll(); busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( slotExtractDone(bool) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( slotExtractDone(bool) ) ); arch->unarchFile(m_extractList, extractDir); // extract selected files } } @@ -1585,16 +1585,16 @@ ArkWidget::action_edit() // [hmm, does that really make sense? I'll leave it for now.] busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( editSlotExtractDone() ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( editSlotExtractDone() ) ); showCurrentFile(); } void ArkWidget::editSlotExtractDone() { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( editSlotExtractDone() ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( editSlotExtractDone() ) ); ready(); editStart(); @@ -1619,8 +1619,8 @@ ArkWidget::editStart() TDEProcess *kp = new TDEProcess; *kp << l.text() << m_strFileToView; - connect( kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotEditFinished(TDEProcess *)) ); + connect( kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotEditFinished(TDEProcess *)) ); if ( kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false ) { KMessageBox::error(0, i18n("Trouble editing the file...")); @@ -1632,7 +1632,7 @@ void ArkWidget::slotEditFinished(TDEProcess *kp) { kdDebug(1601) << "+ArkWidget::slotEditFinished" << endl; - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( editSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( editSlotAddDone( bool ) ) ); delete kp; TQStringList list; // now put the file back into the archive. @@ -1673,15 +1673,15 @@ void ArkWidget::editSlotAddDone( bool success ) { ready(); - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( editSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( editSlotAddDone( bool ) ) ); slotAddDone( success ); } void ArkWidget::action_view() { - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( viewSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( viewSlotExtractDone( bool ) ) ); busy( i18n( "Extracting file to view" ) ); showCurrentFile(); } @@ -1689,8 +1689,8 @@ ArkWidget::action_view() void ArkWidget::action_test() { - connect( arch, TQT_SIGNAL( sigTest( bool ) ), this, - TQT_SLOT( slotTestDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigTest( bool ) ), this, + TQ_SLOT( slotTestDone( bool ) ) ); busy( i18n( "Testing..." ) ); arch->test(); } @@ -1698,8 +1698,8 @@ ArkWidget::action_test() void ArkWidget::slotTestDone(bool ok) { - disconnect( arch, TQT_SIGNAL( sigTest( bool ) ), this, - TQT_SLOT( slotTestDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigTest( bool ) ), this, + TQ_SLOT( slotTestDone( bool ) ) ); ready(); if( ok ) KMessageBox::information(0, i18n("Test successful.")); @@ -1732,8 +1732,8 @@ ArkWidget::viewSlotExtractDone( bool success ) } } - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( viewSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( viewSlotExtractDone( bool ) ) ); delete m_viewList; @@ -1996,15 +1996,15 @@ void ArkWidget::startDrag( const TQStringList & fileList ) { mDragFiles = fileList; - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( startDragSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( startDragSlotExtractDone( bool ) ) ); prepareViewFiles( fileList ); } void ArkWidget::startDragSlotExtractDone( bool ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( startDragSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( startDragSlotExtractDone( bool ) ) ); KURL::List list; @@ -2036,16 +2036,16 @@ ArkWidget::createFileListView() { m_fileListView = new FileListView(this); - connect( m_fileListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( m_fileListView, TQT_SIGNAL( rightButtonPressed(TQListViewItem *, const TQPoint &, int) ), - this, TQT_SLOT(doPopup(TQListViewItem *, const TQPoint &, int))); - connect( m_fileListView, TQT_SIGNAL( startDragRequest( const TQStringList & ) ), - this, TQT_SLOT( startDrag( const TQStringList & ) ) ); - connect( m_fileListView, TQT_SIGNAL( executed(TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( viewFile(TQListViewItem*) ) ); - connect( m_fileListView, TQT_SIGNAL( returnPressed(TQListViewItem * ) ), - this, TQT_SLOT( viewFile(TQListViewItem*) ) ); + connect( m_fileListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_fileListView, TQ_SIGNAL( rightButtonPressed(TQListViewItem *, const TQPoint &, int) ), + this, TQ_SLOT(doPopup(TQListViewItem *, const TQPoint &, int))); + connect( m_fileListView, TQ_SIGNAL( startDragRequest( const TQStringList & ) ), + this, TQ_SLOT( startDrag( const TQStringList & ) ) ); + connect( m_fileListView, TQ_SIGNAL( executed(TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( viewFile(TQListViewItem*) ) ); + connect( m_fileListView, TQ_SIGNAL( returnPressed(TQListViewItem * ) ), + this, TQ_SLOT( viewFile(TQListViewItem*) ) ); } m_fileListView->clear(); } @@ -2072,8 +2072,8 @@ Arch * ArkWidget::getNewArchive( const TQString & _fileName, const TQString& _mi return NULL; } - connect( newArch, TQT_SIGNAL(headers(const ColumnList&)), - m_fileListView, TQT_SLOT(setHeaders(const ColumnList&))); + connect( newArch, TQ_SIGNAL(headers(const ColumnList&)), + m_fileListView, TQ_SLOT(setHeaders(const ColumnList&))); m_archType = archtype; m_fileListView->setUpdatesEnabled(true); @@ -2093,8 +2093,8 @@ ArkWidget::createArchive( const TQString & _filename ) return false; busy( i18n( "Creating archive..." ) ); - connect( newArch, TQT_SIGNAL(sigCreate(Arch *, bool, const TQString &, int) ), - this, TQT_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); + connect( newArch, TQ_SIGNAL(sigCreate(Arch *, bool, const TQString &, int) ), + this, TQ_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); newArch->create(); return true; @@ -2104,8 +2104,8 @@ void ArkWidget::slotCreate(Arch * _newarch, bool _success, const TQString & _filename, int) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( _newarch, TQT_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), - this, TQT_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); + disconnect( _newarch, TQ_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), + this, TQ_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); ready(); if ( _success ) { @@ -2187,10 +2187,10 @@ ArkWidget::openArchive( const TQString & _filename, const TQString & _password ) m_archType = archtype; - connect( newArch, TQT_SIGNAL(sigOpen(Arch *, bool, const TQString &, int)), - this, TQT_SLOT(slotOpen(Arch *, bool, const TQString &,int)) ); - connect( newArch, TQT_SIGNAL(headers(const ColumnList&)), - m_fileListView, TQT_SLOT(setHeaders(const ColumnList&))); + connect( newArch, TQ_SIGNAL(sigOpen(Arch *, bool, const TQString &, int)), + this, TQ_SLOT(slotOpen(Arch *, bool, const TQString &,int)) ); + connect( newArch, TQ_SIGNAL(headers(const ColumnList&)), + m_fileListView, TQ_SLOT(setHeaders(const ColumnList&))); disableAll(); diff --git a/ark/arkwidget.h b/ark/arkwidget.h index 6d7bd5e..4767ba8 100644 --- a/ark/arkwidget.h +++ b/ark/arkwidget.h @@ -58,7 +58,7 @@ class SearchBar; class ArkWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: ArkWidget( TQWidget *parent=0, const char *name=0 ); diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index a00bc16..dfd476e 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -36,9 +36,9 @@ #include <klargefile.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktempdir.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kmimetype.h> #include <tdeio/netaccess.h> #include <tdeio/global.h> @@ -209,12 +209,12 @@ void CompressedFile::open() kdDebug(1601) << "Command is " << m_unarchiver_program << " " << m_tmpfile<< endl; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotUncompressDone(TDEProcess*))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotUncompressDone(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -314,12 +314,12 @@ void CompressedFile::addFile( const TQStringList &urls ) *kp << compressor << "-c" << file; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotAddInProgress(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddDone(TDEProcess*))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotAddInProgress(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddDone(TDEProcess*))); int f_desc = KDE_open(TQFile::encodeName(m_filename), O_CREAT | O_TRUNC | O_WRONLY, 0666); if (f_desc != -1) diff --git a/ark/compressedfile.h b/ark/compressedfile.h index 16d84fb..d3eba30 100644 --- a/ark/compressedfile.h +++ b/ark/compressedfile.h @@ -43,7 +43,7 @@ class ArkWidget; // class CompressedFile : public Arch { - Q_OBJECT + TQ_OBJECT public: CompressedFile( ArkWidget *_gui, const TQString & _fileName, const TQString &_openAsMimeType ); diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index d456744..972c6b1 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -41,7 +41,7 @@ #include <kiconloader.h> #include <kurlrequester.h> #include <kurlcompletion.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kcombobox.h> #include <klineedit.h> @@ -122,9 +122,9 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, m_viewFolderAfterExtraction = new TQCheckBox( i18n( "Open destination folder after extraction" ), vbox ); m_viewFolderAfterExtraction->setChecked( ArkSettings::openDestinationFolder() ); - connect( combobox, TQT_SIGNAL( returnPressed( const TQString& ) ), combobox, TQT_SLOT( addToHistory( const TQString& ) ) ); - connect( combobox->lineEdit(), TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( extractDirChanged( const TQString & ) ) ); + connect( combobox, TQ_SIGNAL( returnPressed( const TQString& ) ), combobox, TQ_SLOT( addToHistory( const TQString& ) ) ); + connect( combobox->lineEdit(), TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( extractDirChanged( const TQString & ) ) ); } ExtractionDialog::~ExtractionDialog() diff --git a/ark/extractiondialog.h b/ark/extractiondialog.h index da2f6e9..0b5a229 100644 --- a/ark/extractiondialog.h +++ b/ark/extractiondialog.h @@ -40,7 +40,7 @@ class KURLRequester; class ExtractionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index 47a4d6f..4a0786b 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -162,7 +162,7 @@ void FileLVI::setText( int column, const TQString &text ) TQListViewItem::setText(column, text); else { - m_timeStamp = TQDateTime::fromString( text, Qt::ISODate ); + m_timeStamp = TQDateTime::fromString( text, TQt::ISODate ); TQListViewItem::setText( column, TDEGlobal::locale()->formatDateTime( m_timeStamp ) ); } } @@ -342,7 +342,7 @@ bool FileListView::isSelectionEmpty() void FileListView::contentsMousePressEvent(TQMouseEvent *e) { - if( e->button()==Qt::LeftButton ) + if( e->button()==TQt::LeftButton ) { m_pressed = true; m_presspos = e->pos(); diff --git a/ark/filelistview.h b/ark/filelistview.h index d4f7438..58ecfcb 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -75,7 +75,7 @@ typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList; class FileListView: public TDEListView { - Q_OBJECT + TQ_OBJECT public: FileListView( TQWidget *parent = 0, const char* name = 0 ); diff --git a/ark/lha.cpp b/ark/lha.cpp index 101277d..5b7a7cb 100644 --- a/ark/lha.cpp +++ b/ark/lha.cpp @@ -42,7 +42,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> // ark includes #include "arkwidget.h" @@ -146,12 +146,12 @@ void LhaArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "v" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -216,12 +216,12 @@ void LhaArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -257,12 +257,12 @@ void LhaArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -287,12 +287,12 @@ void LhaArch::remove( TQStringList *list ) *kp << ( *it ); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -37,7 +37,7 @@ class ArkWidget; class LhaArch : public Arch { - Q_OBJECT + TQ_OBJECT public: LhaArch( ArkWidget *, const TQString & ); diff --git a/ark/main.cpp b/ark/main.cpp index c5e4f13..3fd5e1e 100644 --- a/ark/main.cpp +++ b/ark/main.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ // -// Note: This is a KUniqueApplication. +// Note: This is a TDEUniqueApplication. // To debug add --nofork to the command line. // Be aware that newInstance() will not be called in this case, but you // can run ark from a console, and that will invoke it in the debugger. @@ -62,7 +62,7 @@ static TDECmdLineOptions option[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] ) +extern "C" TDE_EXPORT int kdemain( int argc, char *argv[] ) { TDEAboutData aboutData( "ark", I18N_NOOP( "Ark" ), "2.6.4", I18N_NOOP( "TDE Archiving tool" ), diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 4726989..33f54ff 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -49,7 +49,7 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) : KParts::MainWindow(), progressDialog( 0 ) { setXMLFile( "arkui.rc" ); - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, TQT_TQOBJECT(this), "ArkPart"); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, this, "ArkPart"); if (m_part ) { //Since most of the functionality is still in ArkWidget: @@ -58,29 +58,29 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) setStandardToolBarMenuEnabled( true ); setupActions(); - connect( m_part->widget(), TQT_SIGNAL( request_file_quit() ), this, TQT_SLOT( file_quit() ) ); - connect( KParts::BrowserExtension::childObject( m_part ), TQT_SIGNAL( openURLRequestDelayed + connect( m_part->widget(), TQ_SIGNAL( request_file_quit() ), this, TQ_SLOT( file_quit() ) ); + connect( KParts::BrowserExtension::childObject( m_part ), TQ_SIGNAL( openURLRequestDelayed ( const KURL &, const KParts::URLArgs & ) ), - m_part, TQT_SLOT( openURL( const KURL & ) ) ); + m_part, TQ_SLOT( openURL( const KURL & ) ) ); m_widget->setArchivePopupEnabled( true ); - connect( m_part->widget(), TQT_SIGNAL( signalArchivePopup( const TQPoint & ) ), this, - TQT_SLOT( slotArchivePopup( const TQPoint & ) ) ); - - connect( m_part, TQT_SIGNAL( removeRecentURL( const KURL & ) ), this, - TQT_SLOT( slotRemoveRecentURL( const KURL & ) ) ); - connect( m_part, TQT_SIGNAL( addRecentURL( const KURL & ) ), this, - TQT_SLOT( slotAddRecentURL( const KURL & ) ) ); - connect( m_part, TQT_SIGNAL( fixActionState( const bool & ) ), this, - TQT_SLOT( slotFixActionState( const bool & ) ) ); - connect( m_widget, TQT_SIGNAL( disableAllActions() ), this, - TQT_SLOT( slotDisableActions() ) ); + connect( m_part->widget(), TQ_SIGNAL( signalArchivePopup( const TQPoint & ) ), this, + TQ_SLOT( slotArchivePopup( const TQPoint & ) ) ); + + connect( m_part, TQ_SIGNAL( removeRecentURL( const KURL & ) ), this, + TQ_SLOT( slotRemoveRecentURL( const KURL & ) ) ); + connect( m_part, TQ_SIGNAL( addRecentURL( const KURL & ) ), this, + TQ_SLOT( slotAddRecentURL( const KURL & ) ) ); + connect( m_part, TQ_SIGNAL( fixActionState( const bool & ) ), this, + TQ_SLOT( slotFixActionState( const bool & ) ) ); + connect( m_widget, TQ_SIGNAL( disableAllActions() ), this, + TQ_SLOT( slotDisableActions() ) ); ArkApplication::getInstance()->addWindow(); - connect( m_widget, TQT_SIGNAL( removeOpenArk( const KURL &) ), this, - TQT_SLOT( slotRemoveOpenArk( const KURL & ) ) ); - connect( m_widget, TQT_SIGNAL( addOpenArk( const KURL & ) ), this, - TQT_SLOT( slotAddOpenArk( const KURL & ) ) ); + connect( m_widget, TQ_SIGNAL( removeOpenArk( const KURL &) ), this, + TQ_SLOT( slotRemoveOpenArk( const KURL & ) ) ); + connect( m_widget, TQ_SIGNAL( addOpenArk( const KURL & ) ), this, + TQ_SLOT( slotAddOpenArk( const KURL & ) ) ); setCentralWidget( m_part->widget() ); createGUI( m_part ); @@ -109,24 +109,24 @@ MainWindow::~MainWindow() void MainWindow::setupActions() { - newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT(file_newWindow()), actionCollection(), "new_window"); + newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), this, + TQ_SLOT(file_newWindow()), actionCollection(), "new_window"); - newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection()); - openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection()); + newArchAction = KStdAction::openNew(this, TQ_SLOT(file_new()), actionCollection()); + openAction = KStdAction::open(this, TQ_SLOT(file_open()), actionCollection()); - reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), - TQT_SLOT(file_reload()), actionCollection(), "reload_arch"); - closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close"); + reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), this, + TQ_SLOT(file_reload()), actionCollection(), "reload_arch"); + closeAction = KStdAction::close(this, TQ_SLOT(file_close()), actionCollection(), "file_close"); - recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection()); - recent->loadEntries(kapp->config()); + recent = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection()); + recent->loadEntries(tdeApp->config()); createStandardStatusBarAction(); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(window_close()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeyBindings()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(window_close()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(editToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT( slotConfigureKeyBindings()), actionCollection()); openAction->setEnabled( true ); recent->setEnabled( true ); @@ -179,7 +179,7 @@ MainWindow::editToolbars() { saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg( factory(), this ); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } @@ -340,7 +340,7 @@ MainWindow::file_quit() void MainWindow::slotSaveProperties() { - recent->saveEntries(kapp->config()); + recent->saveEntries(tdeApp->config()); } void @@ -365,14 +365,14 @@ void MainWindow::slotAddRecentURL( const KURL & url ) { recent->addURL( url ); - recent->saveEntries(kapp->config()); + recent->saveEntries(tdeApp->config()); } void MainWindow::slotRemoveRecentURL( const KURL & url ) { recent->removeURL( url ); - recent->saveEntries(kapp->config()); + recent->saveEntries(tdeApp->config()); } void @@ -462,10 +462,10 @@ MainWindow::startProgressDialog( const TQString & text ) progressDialog->setMinimumDuration( 500 ); progressDialog->show(); KDialog::centerOnScreen( progressDialog ); - connect( progressDialog, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( window_close() ) ); + connect( progressDialog, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( window_close() ) ); timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgress() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgress() ) ); timer->start( 200, false ); } diff --git a/ark/mainwindow.h b/ark/mainwindow.h index b77dec5..d0b7a89 100644 --- a/ark/mainwindow.h +++ b/ark/mainwindow.h @@ -40,7 +40,7 @@ class ArkWidget; class MainWindow: public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow( TQWidget *parent=0, const char *name=0 ); diff --git a/ark/rar.cpp b/ark/rar.cpp index 3c5d8fa..d253cf7 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -43,8 +43,8 @@ #include <tdemessagebox.h> #include <kmimetype.h> #include <kpassdlg.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> // ark includes #include <config.h> @@ -126,7 +126,7 @@ bool RarArch::processLine( const TQCString &line ) } TQStringList entry; - TQStringList parsedData = TQStringList::split(QChar(' '), uline); + TQStringList parsedData = TQStringList::split(TQChar(' '), uline); if (m_version < VERSION_5) { if (m_isFirstLine) @@ -211,12 +211,12 @@ void RarArch::open() *kp << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -297,12 +297,12 @@ void RarArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -354,12 +354,12 @@ void RarArch::unarchFileInternal() *kp << m_destDir ; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -390,12 +390,12 @@ void RarArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -418,12 +418,12 @@ void RarArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -36,7 +36,7 @@ class ArkWidget; class RarArch : public Arch { - Q_OBJECT + TQ_OBJECT public: RarArch( ArkWidget *_gui, const TQString & _fileName ); diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index 498e3e3..1ea1d0c 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -35,7 +35,7 @@ SearchBar::SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name ) : TDEListViewSearchLine( parent, 0, name ) { - TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" ); + TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this, TQ_SLOT( clear() ), aC, "reset_search" ); resetSearch->plug( parent ); resetSearch->setWhatsThis( i18n( "Reset Search\n" diff --git a/ark/searchbar.h b/ark/searchbar.h index c4a1396..7a9a6f9 100644 --- a/ark/searchbar.h +++ b/ark/searchbar.h @@ -31,7 +31,7 @@ class TDEActionCollection; class SearchBar: public TDEListViewSearchLine { - Q_OBJECT + TQ_OBJECT public: SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name = 0 ); diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index e6823c0..4a2dde6 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -33,8 +33,8 @@ #include <kurl.h> #include <tdemessagebox.h> #include <kpassdlg.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include "sevenzip.h" #include "arkwidget.h" @@ -102,12 +102,12 @@ void SevenZipArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "l" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -150,12 +150,12 @@ void SevenZipArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -195,12 +195,12 @@ void SevenZipArch::remove( TQStringList *list ) *kp << *it; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -249,12 +249,12 @@ void SevenZipArch::unarchFileInternal( ) *kp << "-o" + m_destDir ; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -405,12 +405,12 @@ void SevenZipArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/ark/sevenzip.h b/ark/sevenzip.h index 8eaadc5..2c16079 100644 --- a/ark/sevenzip.h +++ b/ark/sevenzip.h @@ -28,7 +28,7 @@ class SevenZipArch : public Arch { - Q_OBJECT + TQ_OBJECT public: SevenZipArch( ArkWidget *, const TQString & ); diff --git a/ark/tar.cpp b/ark/tar.cpp index 52e8adb..7ae4d39 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -61,9 +61,9 @@ #include <tdemessagebox.h> #include <tdetempfile.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktempdir.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <ktar.h> // ark includes @@ -156,13 +156,13 @@ void TarArch::updateArch() *kp << "cat" << tmpfile; - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(updateProgress( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - (Arch *)this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(updateProgress( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + (Arch *)this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(updateFinished(TDEProcess *)) ); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(updateFinished(TDEProcess *)) ); if ( !fd || kp->start(TDEProcess::NotifyOnExit, flag) == false) { @@ -269,12 +269,12 @@ void TarArch::open() m_header_removed = false; m_finished = false; - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotListingDone(TDEProcess *))); - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotListingDone(TDEProcess *))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -291,7 +291,7 @@ void TarArch::open() } else { - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( openFirstCreateTempDone() ) ); createTmp(); } } @@ -301,7 +301,7 @@ void TarArch::openFirstCreateTempDone() if ( compressed && ( m_fileMimeType != "application/x-tgz" ) && ( m_fileMimeType != "application/x-tbz" ) ) { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( openFirstCreateTempDone() ) ); Q_ASSERT( !m_listingThread ); m_listingThread = new TarListingThread( this, tmpfile ); } @@ -409,12 +409,12 @@ void TarArch::createTmp() } *kp << "-c" << m_filename; - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(createTmpFinished(TDEProcess *))); - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(createTmpProgress( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(createTmpFinished(TDEProcess *))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(createTmpProgress( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::NotifyOnExit, flag ) == false) { KMessageBox::error(0, i18n("Unable to fork a decompressor")); @@ -514,22 +514,22 @@ void TarArch::addFile( const TQStringList& urls ) // first. So we'll first delete all the old files matching the names of // those in urls. m_bNotifyWhenDeleteFails = false; - connect( this, TQT_SIGNAL( removeDone() ), this, TQT_SLOT( deleteOldFilesDone() ) ); + connect( this, TQ_SIGNAL( removeDone() ), this, TQ_SLOT( deleteOldFilesDone() ) ); deleteOldFiles(urls, ArkSettings::replaceOnlyWithNewer()); } void TarArch::deleteOldFilesDone() { - disconnect( this, TQT_SIGNAL( removeDone() ), this, TQT_SLOT( deleteOldFilesDone() ) ); + disconnect( this, TQ_SIGNAL( removeDone() ), this, TQ_SLOT( deleteOldFilesDone() ) ); m_bNotifyWhenDeleteFails = true; - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( addFileCreateTempDone() ) ); createTmp(); } void TarArch::addFileCreateTempDone() { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( addFileCreateTempDone() ) ); TQStringList * urls = &m_filesToAdd; TDEProcess *kp = m_currentProcess = new TDEProcess; @@ -562,13 +562,13 @@ void TarArch::addFileCreateTempDone() kdDebug(1601) << *strTemp << " " << endl; } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddFinished(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddFinished(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -579,13 +579,13 @@ void TarArch::addFileCreateTempDone() void TarArch::slotAddFinished(TDEProcess *_kp) { - disconnect( _kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddFinished(TDEProcess*))); + disconnect( _kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddFinished(TDEProcess*))); m_pTmpProc = _kp; m_filesToAdd = TQStringList(); if ( compressed ) { - connect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( addFinishedUpdateDone() ) ); + connect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) ); updateArch(); } else @@ -595,7 +595,7 @@ void TarArch::slotAddFinished(TDEProcess *_kp) void TarArch::addFinishedUpdateDone() { if ( compressed ) - disconnect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( addFinishedUpdateDone() ) ); + disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) ); Arch::slotAddExited( m_pTmpProc ); // this will delete _kp m_pTmpProc = NULL; } @@ -641,13 +641,13 @@ void TarArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotExtractExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotExtractExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -661,13 +661,13 @@ void TarArch::remove(TQStringList *list) { deleteInProgress = true; m_filesToRemove = *list; - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( removeCreateTempDone() ) ); createTmp(); } void TarArch::removeCreateTempDone() { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( removeCreateTempDone() ) ); TQString name, tmp; TDEProcess *kp = m_currentProcess = new TDEProcess; @@ -685,13 +685,13 @@ void TarArch::removeCreateTempDone() } m_filesToRemove = TQStringList(); - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotDeleteExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotDeleteExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -705,7 +705,7 @@ void TarArch::slotDeleteExited(TDEProcess *_kp) m_pTmpProc2 = _kp; if ( compressed ) { - connect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( removeUpdateDone() ) ); + connect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( removeUpdateDone() ) ); updateArch(); } else @@ -715,7 +715,7 @@ void TarArch::slotDeleteExited(TDEProcess *_kp) void TarArch::removeUpdateDone() { if ( compressed ) - disconnect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( removeUpdateDone() ) ); + disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( removeUpdateDone() ) ); deleteInProgress = false; emit removeDone(); @@ -806,12 +806,12 @@ void TarArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -55,7 +55,7 @@ class TarListingThread; class TarArch : public Arch { - Q_OBJECT + TQ_OBJECT public: TarArch( ArkWidget *_gui, const TQString & _filename, diff --git a/ark/tarlistingthread.cpp b/ark/tarlistingthread.cpp index 9d903c3..2cd7ef7 100644 --- a/ark/tarlistingthread.cpp +++ b/ark/tarlistingthread.cpp @@ -148,7 +148,7 @@ void TarListingThread::processDir( const KTarDirectory *tardir, const TQString & strSize.sprintf("%d", ((KTarFile *)tarEntry)->size()); } col_list.append(strSize); - TQString timestamp = tarEntry->datetime().toString(Qt::ISODate); + TQString timestamp = tarEntry->datetime().toString(TQt::ISODate); col_list.append(timestamp); col_list.append(tarEntry->symlink()); diff --git a/ark/zip.cpp b/ark/zip.cpp index 392cc5c..598f5fd 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -33,7 +33,8 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <kpassdlg.h> // ark includes @@ -51,7 +52,10 @@ ZipArch::ZipArch( ArkWidget *_gui, const TQString & _fileName ) verifyUncompressUtilityIsAvailable( m_unarchiver_program ); m_headerString = "----"; - m_repairYear = 9; m_fixMonth = 7; m_fixDay = 8; m_fixTime = 10; + m_fixYear = 7; + m_fixMonth = 8; + m_fixDay = 9; + m_fixTime = 10; m_dateCol = 5; m_numCols = 7; @@ -59,9 +63,9 @@ ZipArch::ZipArch( ArkWidget *_gui, const TQString & _fileName ) m_archCols.append( new ArchColumns( 2, TQRegExp( "[^\\s]+" ) ) ); m_archCols.append( new ArchColumns( 3, TQRegExp( "[0-9]+" ) ) ); m_archCols.append( new ArchColumns( 4, TQRegExp( "[0-9.]+%" ) ) ); - m_archCols.append( new ArchColumns( 7, TQRegExp( "[01][0-9]" ), 2 ) ); - m_archCols.append( new ArchColumns( 8, TQRegExp( "[0-3][0-9]" ), 2 ) ); - m_archCols.append( new ArchColumns( 9, TQRegExp( "[0-9][0-9]" ), 2 ) ); + m_archCols.append( new ArchColumns( 7, TQRegExp( "[0-9]{4}" ), 4 ) ); + m_archCols.append( new ArchColumns( 8, TQRegExp( "[01][0-9]" ), 2 ) ); + m_archCols.append( new ArchColumns( 9, TQRegExp( "[0-3][0-9]" ), 2 ) ); m_archCols.append( new ArchColumns( 10, TQRegExp( "[0-9:]+" ), 6 ) ); m_archCols.append( new ArchColumns( 6, TQRegExp( "[a-fA-F0-9]+ {2}" ) ) ); m_archCols.append( new ArchColumns( 0, TQRegExp( "[^\\n]+" ), 4096 ) ); @@ -94,12 +98,12 @@ void ZipArch::open() *kp << m_unarchiver_program << "-v" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -172,12 +176,12 @@ void ZipArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -231,12 +235,12 @@ void ZipArch::unarchFileInternal() *kp << "-d" << m_destDir; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -268,12 +272,12 @@ void ZipArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -296,12 +300,12 @@ void ZipArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -37,7 +37,7 @@ class ArkWidget; class ZipArch : public Arch { - Q_OBJECT + TQ_OBJECT public: ZipArch( ArkWidget *_gui, const TQString & _fileName ); diff --git a/ark/zoo.cpp b/ark/zoo.cpp index aa96d47..cc3f377 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -39,7 +39,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> // ark includes #include "settings.h" @@ -110,12 +110,12 @@ void ZooArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "l" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -177,12 +177,12 @@ void ZooArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -236,12 +236,12 @@ void ZooArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -267,12 +267,12 @@ void ZooArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -35,7 +35,7 @@ class ArkWidget; class ZooArch : public Arch { - Q_OBJECT + TQ_OBJECT public: ZooArch( ArkWidget *, const TQString & ); diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index 9730560..f250428 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("kcharselectapplet"); return new CharSelectApplet(configFile, KPanelApplet::Normal, @@ -157,7 +157,7 @@ CharTable::CharTable(TQWidget* parent, const char* name) _cWidth(cell_width), _cHeight(cell_height) { setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(TQWidget::NoBackground); } @@ -285,7 +285,7 @@ void CharTable::mousePressEvent(TQMouseEvent *e) void CharTable::mouseMoveEvent(TQMouseEvent *e) { - if(!(e->state() & (Qt::LeftButton | Qt::RightButton | Qt::MidButton))) return; + if(!(e->state() & (TQt::LeftButton | TQt::RightButton | TQt::MidButton))) return; int row = findRow(e->y()); if (row == -1) return; @@ -311,7 +311,7 @@ void CharTable::selectCell(int row, int col) repaintCell(_activeRow, _activeCol); TQClipboard *cb = TQApplication::clipboard(); - TQObject::disconnect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); + TQObject::disconnect( cb, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clearCell()) ); TQString text = TQString(_map[col + row * _cols]); bool oldMode = cb->selectionModeEnabled(); cb->setSelectionMode( true ); @@ -319,7 +319,7 @@ void CharTable::selectCell(int row, int col) cb->setSelectionMode( false ); cb->setText( text ); cb->setSelectionMode( oldMode ); - TQObject::connect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); + TQObject::connect( cb, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clearCell()) ); } void CharTable::clearCell() @@ -332,7 +332,7 @@ void CharTable::clearCell() repaintCell(oldRow, oldCol); - TQObject::disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); + TQObject::disconnect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clearCell()) ); } diff --git a/charselectapplet/charselectapplet.h b/charselectapplet/charselectapplet.h index aa23ed3..d2dcc57 100644 --- a/charselectapplet/charselectapplet.h +++ b/charselectapplet/charselectapplet.h @@ -35,7 +35,7 @@ class TDEAboutData; class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -57,7 +57,7 @@ private: class CharTable : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -96,7 +96,7 @@ private: class CharSelectApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: diff --git a/cmake b/cmake deleted file mode 160000 -Subproject f0a5bcc7600c36f8fe59754d1167d1bbc70a495 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index dc6bb77..0740990 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -9,4 +9,24 @@ # ################################################# -tde_auto_add_subdirectories( ) +add_subdirectory( kcontrol ) +add_subdirectory( man ) + +tde_conditional_add_subdirectory( BUILD_ARK ark ) +tde_conditional_add_subdirectory( BUILD_TDELIRC irkick ) +tde_conditional_add_subdirectory( BUILD_KCALC kcalc ) +tde_conditional_add_subdirectory( BUILD_KCHARSELECT kcharselect ) +tde_conditional_add_subdirectory( BUILD_KDF kdf ) +tde_conditional_add_subdirectory( BUILD_KEDIT kedit ) +tde_conditional_add_subdirectory( BUILD_KFLOPPY kfloppy ) +tde_conditional_add_subdirectory( BUILD_KGPG kgpg ) +tde_conditional_add_subdirectory( BUILD_KHEXEDIT khexedit ) +tde_conditional_add_subdirectory( BUILD_KJOTS kjots ) +tde_conditional_add_subdirectory( BUILD_KREGEXPEDITOR KRegExpEditor ) +tde_conditional_add_subdirectory( BUILD_KSIM ksim ) +tde_conditional_add_subdirectory( BUILD_KTIMER ktimer ) +tde_conditional_add_subdirectory( BUILD_KMILO kvaio ) +tde_conditional_add_subdirectory( BUILD_SUPERKARAMBA superkaramba ) +tde_conditional_add_subdirectory( BUILD_TDEFILEREPLACE tdefilereplace ) +tde_conditional_add_subdirectory( BUILD_TDEWALLET tdewallet ) +tde_conditional_add_subdirectory( BUILD_KMILO thinkpad ) diff --git a/doc/kcalc/kcalc_on_OSF.txt b/doc/kcalc/kcalc_on_OSF.txt deleted file mode 100644 index 59b6e6e..0000000 --- a/doc/kcalc/kcalc_on_OSF.txt +++ /dev/null @@ -1,62 +0,0 @@ -X-RDate: Mon, 01 Sep 1997 07:45:22 -0400 (EDT) -Return-Path: <knoll@daniel.mpi-hd.mpg.de> -Received: from cornell.edu (cornell.edu [132.236.56.6]) by - postoffice2.mail.cornell.edu (8.8.5/8.8.5) with ESMTP id KAA06175 for - <bw18@POSTOFFICE2.MAIL.CORNELL.EDU>; Tue, 26 Aug 1997 10:56:10 -0400 (EDT) -Received: (from daemon@localhost) by cornell.edu (8.8.5/8.8.5) id KAA25547 for - bw18@postoffice3.mail.cornell.edu; Tue, 26 Aug 1997 10:55:42 -0400 (EDT) -Received: from polygon.math.cornell.edu (POLYGON.MATH.CORNELL.EDU - [128.84.234.110]) by cornell.edu (8.8.5/8.8.5) with SMTP id KAA25126 for - <bw18@cornell.edu>; Tue, 26 Aug 1997 10:55:15 -0400 (EDT) -Received: from mpimail.mpi-hd.mpg.de by polygon.math.cornell.edu (5.x/SMI-SVR4) - id AA07964; Tue, 26 Aug 1997 10:54:56 -0400 -Received: from daniel.mpi-hd.mpg.de (daniel.mpi-hd.mpg.de [149.217.1.90]) by - mpimail.mpi-hd.mpg.de (8.8.2/8.8.2) with SMTP id QAA19532 for - <wuebben@math.cornell.edu>; Tue, 26 Aug 1997 16:54:56 +0200 (MET DST) -Received: from localhost by daniel.mpi-hd.mpg.de - (5.65v4.0/1.1.10.5/31Jul97-0446PM) id AA04869; Tue, 26 Aug 1997 16:54:56 +0200 -Date: Tue, 26 Aug 1997 16:54:56 +0200 (MET DST) -X-PH: V4.1@cornell.edu (Cornell Modified) -Message-Id: <Pine.OSF.3.96.970826163314.32213A-100000@daniel.mpi-hd.mpg.de> -Mime-Version: 1.0 -Content-Type: TEXT/PLAIN; charset=US-ASCII -XFMstatus: 0002 -From: Lars Knoll <Lars.Knoll@mpi-hd.mpg.de> -To: wuebben@math.cornell.edu -Subject: kcalc unter dec osf4.0 - -Hi, - -ich hatte ein paar Probleme, kcalc auf einer dec alpha unter osf4.0 -zu kompilieren. Das Problem ist, dass bei diesem System - sizeof(long double) = sizeof(double) -ist, und dass Routinen namens asinl, fabsl, ... existieren, aber nicht -in irgendwelchen headers definiert werden. -Zusaetzlich funktioniert fabsl() wie erwartet, asinl gibt aber leider -immer nur 0. zurueck. Der folgende patch loest das Problem bei mir. - -Lars - - -diff -c kcalc/kcalc.h kcalc.osf/kcalc.h -*** kcalc/kcalc.h Sun Aug 3 05:01:41 1997 ---- kcalc.osf/kcalc.h Tue Aug 26 16:53:12 1997 -*************** -*** 63,68 **** ---- 63,72 ---- - - /* TAKE CARE OF TH HAVE_LONG_DOUBLE defines in core.cpp*/ - -+ /* dec osf4.0 has fabsl, but not asinl... */ -+ #ifdef __osf__ -+ #undef HAVE_FABSL -+ #endif - - #ifdef HAVE_FABSL - #define CALCAMNT long double - - - ---- -Lars Knoll knoll@mpi-hd.mpg.de - PGP pub key [6DADF3D5]: finger knoll@pluto.mpi-hd.mpg.de diff --git a/doc/kcontrol/CMakeLists.txt b/doc/kcontrol/CMakeLists.txt index dc6bb77..5027422 100644 --- a/doc/kcontrol/CMakeLists.txt +++ b/doc/kcontrol/CMakeLists.txt @@ -9,4 +9,9 @@ # ################################################# -tde_auto_add_subdirectories( ) +tde_conditional_add_subdirectory( BUILD_TDELIRC kcmlirc ) +tde_conditional_add_subdirectory( BUILD_KLAPTOPDAEMON kcmlowbatcrit ) +tde_conditional_add_subdirectory( BUILD_KLAPTOPDAEMON kcmlowbatwarn ) +tde_conditional_add_subdirectory( BUILD_KLAPTOPDAEMON laptop ) +tde_conditional_add_subdirectory( BUILD_KLAPTOPDAEMON powerctrl ) +tde_conditional_add_subdirectory( BUILD_KDF storagedevices ) diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt new file mode 100644 index 0000000..ba93b8f --- /dev/null +++ b/doc/man/CMakeLists.txt @@ -0,0 +1,10 @@ +tde_conditional_add_subdirectory( BUILD_ARK ark ) +tde_conditional_add_subdirectory( BUILD_KCALC kcalc ) +tde_conditional_add_subdirectory( BUILD_KCHARSELECT kcharselect ) +tde_conditional_add_subdirectory( BUILD_KDF kdf ) +tde_conditional_add_subdirectory( BUILD_KEDIT kedit ) +tde_conditional_add_subdirectory( BUILD_KFLOPPY kfloppy ) +tde_conditional_add_subdirectory( BUILD_KGPG kgpg ) +tde_conditional_add_subdirectory( BUILD_KHEXEDIT khexedit ) +tde_conditional_add_subdirectory( BUILD_SUPERKARAMBA superkaramba ) +tde_conditional_add_subdirectory( BUILD_TDEFILEREPLACE tdefilereplace ) diff --git a/doc/man/ark/CMakeLists.txt b/doc/man/ark/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/ark/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/ark/ark.1 b/doc/man/ark/ark.1 new file mode 100644 index 0000000..d738284 --- /dev/null +++ b/doc/man/ark/ark.1 @@ -0,0 +1,82 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH Ark "1" "May 2006" "Ark" "User Commands" +.SH NAME +Ark \- manual page for Ark +.SH SYNOPSIS +.B ark +[\fIQt-options\fR] [\fITDE-options\fR] [\fITDE-tempfile-options\fR] [\fIoptions\fR] [\fIfolder\fR] [\fIfiles\fR] [\fIarchive\fR] +.SH DESCRIPTION +TDE Archiving tool +Ark is a graphical program for managing various archive formats within the +TDE environment. Archives can be viewed, extracted, created and modified +from within Ark. +The program can handle various formats such as tar, gzip, bzip2, zip, rar and +lha (if the appropriate command-line programs are installed). +Ark can work closely with Konqueror in the TDE environment to handle archives, +if you install the Konqueror Integration plugin available in the konq-plugins +package. +.SS "Generic options" +.TP +\fB\-\-help\fR +Show help about options +.TP +\fB\-\-help\-qt\fR +Show Qt specific options +.TP +\fB\-\-help\-tde\fR +Show TDE specific options +.TP +\fB\-\-help\-tde\-tempfile\fR +Show TDE\-tempfile specific options +.TP +\fB\-\-help\-all\fR +Show all options +.TP +\fB\-\-author\fR +Show author information +.TP +\fB\-v\fR, \fB\-\-version\fR +Show version information +.TP +\fB\-\-license\fR +Show license information +.TP +\fB\-\-\fR +End of options +.SH OPTIONS +.TP +\fB\-\-extract\fR +Open extract dialog, quit when finished +.TP +\fB\-\-extract\-to\fR +Extract 'archive' to 'folder'. Quit when finished. +\&'folder' will be created if it does not exist. +.TP +\fB\-\-add\fR +Ask for the name of the archive to add 'files' to. Quit when finished. +.TP +\fB\-\-add\-to\fR +Add 'files' to 'archive'. Quit when finished. +\&'archive' will be created if it does not exist. +.TP +\fB\-\-guess\-name\fR +Used with '\-\-extract\-to'. When specified, 'archive' +will be extracted to a subfolder of 'folder' +whose name will be the name of 'archive' without the filename extension. +.SS "Arguments" +.TP +folder +Folder to extract to +.TP +files +Files to be added +.TP +archive +Open 'archive' +.SH AUTHOR +Ark was written by Matthias Elter <elter@kde.org> and many others. +.br +Ark is released under the GNU General Public License. +.PP +This manual page was written by Sune Vuorela <debian@pusling.com> +for the Debian Project, and is released under the same terms as the program. diff --git a/doc/man/kcalc/CMakeLists.txt b/doc/man/kcalc/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/kcalc/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/kcalc/kcalc.1 b/doc/man/kcalc/kcalc.1 new file mode 100644 index 0000000..eff4706 --- /dev/null +++ b/doc/man/kcalc/kcalc.1 @@ -0,0 +1,185 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KCALC 1 "June 2006" "Trinity Desktop Environment" "TDE Calculator" +.SH NAME +kcalc +\- TDE Calculator +.SH SYNOPSIS +\fBkcalc\fP [Qt\-options] [TDE\-options] +.SH DESCRIPTION +\fBKCalc\fP is a scientific calculator for TDE. In addition to the usual functionality offered by most scientific calculators, \fBKCalc\fP offers a number of features: +.br +.IP " \-" +\fBKCalc\fP provides trigonometric functions, logic operations, and it is able to do statistical calculations. +.IP " \-" +\fBKCalc\fP allows you to cut and paste numbers from/into its display. +.IP " \-" +\fBKCalc\fP features a results\-stack which lets you conveniently recall previous results. +.IP " \-" +You can configure \fBKCalc\fP's display colors and font. +.IP " \-" +You can configure \fBKCalc\fP's precision and the number of digits after the period. +.IP " \-" +\fBKCalc\fP offers a great number of useful key\-bindings, which make using \fBKCalc\fP without using a pointing device easy. +.PP +Hint: Pressing (and holding) the Ctrl\-key, displays on every button, the corresponding key\-binding. + +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS TDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format + +.SH FILES +.TP +.I ~/.trinity/share/config/kcalcrc +\fBkcalc\fP configuration file + +.SH SEE ALSO +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/kcalc/ +directly into konqueror or you can run +.BR "khelpcenter help:/kcalc/" +from the command\-line. +.br +.SH AUTHORS +.nf +Klaus Niederkruger <kniederk@math.uni\-koeln.de> +.br +Bernd Johannes Wuebben <wuebben@kde.org> +.br +Evan Teran <eteran@alum.rit.edu> +.br +Espen Sand <espen@kde.org> +.br +Chris Howells <howells@kde.org> +.br +Aaron J. Seigo <aseigo@olympusproject.org> +.br +Charles Samuels <charles@altair.dhs.org> +.br +Ren Mrou <ochominutosdearco@yahoo.es> +.br + +.br +.fi +Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/doc/man/kcharselect/CMakeLists.txt b/doc/man/kcharselect/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/kcharselect/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/kcharselect/kcharselect.1 b/doc/man/kcharselect/kcharselect.1 new file mode 100644 index 0000000..8eac79d --- /dev/null +++ b/doc/man/kcharselect/kcharselect.1 @@ -0,0 +1,257 @@ +.lf 1 info/tdeutils.kcharselect.1 +.TH KCHARSELECT 1 "May 2003" TDE "TDE Application" +.SH NAME +kcharselect \- TDE Character Selector +.SH SYNOPSIS +.B kcharselect +[\fIQt-options\fR] [\fITDE-options\fR] +.SH DESCRIPTION +This manual page documents briefly the +.B KCharSelect +TDE Application. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +Using +.B KCharSelect +one can view all the glyphs, organized by character table, available from any +installed font. One can also assemble a string of characters by clicking on +characters in the table. The string can be exported to the clipboard for +later use. +.PP +.B KCharSelect +is helpful for determining which characters in a font have glyphs as well as +for selecting characters that may be difficult to produce. +.P +This program is part of the official TDE utils module. +.SH OPTIONS +.SS "General Options" +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v\fR, \fB\-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.lf 1 info/kdetqtoptions +.SS "TDE options" +.TP 12 +.BI \-\-caption \ caption +Use \fIcaption\fP as name in the titlebar. +.TP +.BI \-\-icon \ icon +Use \fIicon\fP as the application icon. \fIicon\fP is the name of the +icon, which can either be an absolute filename path, or otherwise the +icon is sought for in places according to the normal TDE rules. +.TP +.BI \-\-miniicon \ icon +Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename +of the icon, according to the same rules as for the \-\-icon parameter. +.TP +.BI \-\-config \ filename +Use an alternative configuration file, instead of the default, which +is normally located in +.I /usr/share/config +or in +.RB $ TDEHOME\fI/share/config +.TP +.BI \-\-dcopserver \ server +Set the address of the DCOP server to attach to. +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps. This option has the same +effect as definiting the environment variable TDE_DEBUG. +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager. +.TP +.BI \-\-style \ style +sets the application GUI style. +.TP +.BI \-\-geometry \ geometry +sets the client geometry of the main widget. +The geometry parameter follows the normal X convention for geometry, +which is on the form: +.RS +.IP +[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR] +.P +Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and +height, of the main application window. Both in pixels. A value of 0 +specifies the default size. The optional \fIxpos\fR and \fIypos\fR +specifies the x,y-position that which is desired for the application +window. Specifying negative values for x or y implies that the x or y +position is to be measured from the left or bottom screen edge, +instead of as in the normal case, with positive values, from the left +and top edges. +.RE +.SS "Qt options" +.TP 12 +.BI \-\-display \ displayname +Use the X-server display \fIdisplayname\fP. +.TP +.BI \-\-session \ sessionId +Restore the application for the given \fIsessionId\fP. +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8-bit display. +.TP +.BI \-\-ncols \ count +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification. +.TP +.B \-\-nograb +Tells Qt to never grab the mouse or the keyboard. +.TP +.B \-\-dograb +Running under a debugger can cause an implicit +.B \-nograb, use \fB\-dograb\fR to override. +.TP +.B \-\-sync +switches to synchronous mode for debugging. +.TP +.BI "\-\-fn\fR, \fP\-\-font" \ fontname +Defines the default application font. The \fIfontname\fP should be in +the X logical font name description format XLFD. For a full description of +the format see +.I /usr/X11R6/lib/X11/doc/xlfd.TXT +Note that the application might override the font specified with +its own font. +.TP +.BI "-\-bg\fR, \fB\-\-background" \ color +Sets the default background color and an +application palette (light and dark shades are +calculated). +.TP +.BI "\-\-fg\fR, \fB\-\-foreground" \ color +Sets the default foreground color. +.TP +.BI \-\-btn\fR, \fB\-\-button \ color +Sets the default button color. +.TP +.BI \-\-name \ name +Sets the application name. +.TP +.BI \-\-title \ title +Sets the application title. This option might, or might not appear +in the title bar caption, depending on the application. To change the caption, use the +.B \-\-caption +option instead. +.TP +.B \-\-visual TrueColor +Forces the application to use a TrueColor visual on +an 8-bit display. +.TP +.BI \-\-inputstyle \ inputstyle +Sets XIM (X Input Method) input style. Possible +values are +.BR onthespot ", " overthespot ", " offthespot and root . +.TP +.BI \-\-im " XIM-server" +Set XIM server. +.TP +.B \-\-noxim +Disable XIM. +.TP +.B \-\-reverse +Mirror reverses the whole layout of widgets. This means that menus +will go in the opposite direction, the scroll bar will be on the +opposite side, etc. For a normal western layout that means that menus +and tool bars will go from the right edge to the left, the vertical +scroll bar will be on the left side and so on. + +.lf 48 info/tdeutils.kcharselect.1 +.SH ENVIRONMENT +.lf 1 info/kdeenviron +.SS "standard TDE environment variables" +.IP TDE_LANG +Language locale setting to use. This option makes it possible to set +another language environment for a program than what is the default. The +correct language pack for this language has to be installed for this option +to work. The default language when there is none set is en_US. When +deciding upon a language, the following resources are looked up, in +order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL, +LANG. +.IP TDE_UTF8_FILENAMES +Assume that all filenames are in UTF-8 format regardless of the +current language setting. Otherwise the filename format is defined by +the language. +.IP TDE_MULTIHEAD +If this variable has the value +.B true +multihead multiple display mode is enabled. The TDE display will be +shared over more than one screen. +.IP DISPLAY +Specifies the X display to run TDE on. +.IP TDESYCOCA +Specifies and alternative path for the +.I tdesycoca +TDE system configuration cache file. +The default path is +/tmp/tde-$USER/tdesycoca +.IP DCOPSERVER +Specifies an alternative path for the DCOP server file. The default +file is +$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP +.IP SESSION_MANAGER +The session manager to use. This option is set automatically by TDE +and is a network path to the session manager socket. +.IP HOME +Path to the home directory for the current user. +.IP TDEHOME +The TDE per-user setting directory. Default if not specified is +.I $HOME/.trinity +.lf 50 info/tdeutils.kcharselect.1 +.SH FILES +.TP +.I $HOME/.trinity/share/config/kcharselectrc +configuration file. +.SH AUTHOR +KCharSelect was written by +.nh +.ad l +Reginald Stadlbauer <reggie@kde.org>. +.hy +.br +Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly. +.br +This manual page was prepared by +.nh +.ad l +Karolina Lindqvist <pgd\-karolinali@algonet.se> +.hy +for the Debian GNU/Linux system (but may be used by others). +.SH "SEE ALSO" +The full documentation for +.B KCharSelect +is maintained as a docbook manual. If the +.B khelpcenter +program is properly installed at your site, the command +.IP +.B khelpcenter help:/kcharselect +.PP +should give you access to the complete manual. +.P +Alternatively the manual can be browsed in +.B konqueror +giving it the URL help:/kcharselect + diff --git a/doc/man/kdf/CMakeLists.txt b/doc/man/kdf/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/kdf/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/kdf/kdf.1 b/doc/man/kdf/kdf.1 new file mode 100644 index 0000000..58bbbec --- /dev/null +++ b/doc/man/kdf/kdf.1 @@ -0,0 +1,154 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDF 1 "June 2006" "Trinity Desktop Environment" "TDE free disk space utility" +.SH NAME +kdf +\- TDE free disk space utility +.SH SYNOPSIS +\fBkdf\fP [Qt\-options] [TDE\-options] +.SH DESCRIPTION +\fBKDiskFree\fP displays available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager. +.sp 1 +\fBKDiskFree\fP is similar to \fBkwikdisk\fP and is useful if you want to keep a \fBKDiskFree\fP window available at all times. +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS TDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format + +.SH SEE ALSO +\fBkwikdisk\fP(1) +.sp 1 +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/kdf/ +directly into konqueror or you can run +.BR "khelpcenter help:/kdf/" +from the command\-line. +.br +.SH AUTHORS +.nf +Michael Kropfberger <michael.kropfberger@gmx.net> +.br + +.br +.fi +Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/doc/man/kdf/kwikdisk.1 b/doc/man/kdf/kwikdisk.1 new file mode 100644 index 0000000..74aaad6 --- /dev/null +++ b/doc/man/kdf/kwikdisk.1 @@ -0,0 +1,151 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KWIKDISK 1 "June 2006" "Trinity Desktop Environment" "TDE Free disk space utility" +.SH NAME +kwikdisk +\- TDE Free disk space utility +.SH SYNOPSIS +\fBkwikdisk\fB [Qt\-options] [TDE\-options] +.SH DESCRIPTION +\fBkwikdisk\fP is a kicker applet to display the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their free space, type and mount point. It also allows you to mount and unmount drives. +.sp 1 +\fBkwikdisk\fP is similar to \fBKDiskFree\fP, but takes up less screen space. +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS TDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format + +.SH SEE ALSO +\fBkdf\fP(1) +.SH AUTHORS +.nf +Michael Kropfberger <michael.kropfberger@gmx.net> +.br +Espen Sand <espen@kde.org> +.br +Stanislav Karchebny <Stanislav.Karchebny@kdemail.net> +.br + +.br +.fi +Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/doc/man/kedit/CMakeLists.txt b/doc/man/kedit/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/kedit/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/kedit/kedit.1 b/doc/man/kedit/kedit.1 new file mode 100644 index 0000000..ebf6a58 --- /dev/null +++ b/doc/man/kedit/kedit.1 @@ -0,0 +1,165 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE text editor" +.SH NAME +kedit +\- TDE text editor +.SH SYNOPSIS +\fBkedit\fP [Qt\-options] [TDE\-options] [options] \fIfile\fP +.SH DESCRIPTION +\fBKEdit\fP is a text editor for the Trinity Desktop. It is a small editor which can be used with \fBKonqueror\fP for text and configuration file browsing. \fBKEdit\fP also serves well for creating small plain text documents. It is not meant to be a programmers editor, in particular it is not meant to replace any of the more powerful editors such as \fBKate\fP, \fBXEmacs\fP or \fBEmacs\fP. +.sp 1 +\fBKEdit\fP's functionality will intentionally remain rather limited to ensure a reasonably fast start. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B file +File or URL to open +.SS Options: +.TP +.B \-\-encoding <encoding> +Encoding to use for the following documents +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS TDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH SEE ALSO +\fBkate\fP(1), \fBkwrite\fP(1) +.sp 1 +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/kedit/ +directly into konqueror or you can run +.BR "khelpcenter help:/kedit/" +from the command\-line. +.br +.SH AUTHORS +.nf +Bernd Johannes Wuebben <wuebben@kde.org> +.br + +.br +.fi +Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/doc/man/kfloppy/CMakeLists.txt b/doc/man/kfloppy/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/kfloppy/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/kfloppy/kfloppy.1 b/doc/man/kfloppy/kfloppy.1 new file mode 100644 index 0000000..412893a --- /dev/null +++ b/doc/man/kfloppy/kfloppy.1 @@ -0,0 +1,182 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KFLOPPY 1 "June 2006" "Trinity Desktop Environment" "TDE Floppy Disk Utility" +.SH NAME +kfloppy +\- TDE Floppy Disk Utility +.SH SYNOPSIS +\fBkfloppy\fP [Qt\-options] [TDE\-options] [device] +.SH DESCRIPTION +\fBKfloppy Formatter\fP is a utility that provides a straightforward graphical means to format 3.5" and 5.25" floppy disks. +.sp 1 +Starting \fBKfloppy\fP opens a single window by which the user may choose appropriate settings and control the formatting process. +.sp 1 +\fBCaution\fP +.br +Make sure that your floppy disk is not mounted. \fBKfloppy\fP cannot format a mounted floppy disk. +.sp 1 +\fBKfloppy\fP offers the following settings for floppy size: +.RS 3 +.TP +\- 3.5" 1.44MB +.TP +\- 3.5" 720KB +.TP +\- 5.25" 1.2MB +.TP +\- 5.25" 360KB +.TP +\- Auto-Detect +.RE +.sp 1 +\fBNote\fP +.br +The 800KB disk format used by Mac floppy drives cannot be supported on PC floppy drives since they are not capable of formatting disks in that fashion. +.sp 1 +\fBKfloppy\fP supports the file systems DOS, ext2 and Minix. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B device +Default device +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS TDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH SEE ALSO +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/kfloppy/ +directly into konqueror or you can run +.BR "khelpcenter help:/kfloppy/" +from the command\-line. +.br +.SH AUTHORS +.nf +Bernd Johannes Wuebben <wuebben@kde.org> +.br + +.br +.fi +Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/doc/man/kgpg/CMakeLists.txt b/doc/man/kgpg/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/kgpg/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/kgpg/kgpg.1 b/doc/man/kgpg/kgpg.1 new file mode 100644 index 0000000..9ea82bb --- /dev/null +++ b/doc/man/kgpg/kgpg.1 @@ -0,0 +1,187 @@ +.TH KGPG "1" "December 2002" "TDE" "TDE Application" +.SH NAME +kgpg \- a TDE frontend for GNU Privacy Guard (GnuPG) +.SH SYNOPSIS +.B kgpg +[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile\fR +.SH DESCRIPTION +This manual page documents briefly the +.B Kgpg +TDE Application. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B Kgpg +is a simple graphical interface for gpg (http://gnupg.org). +Basically, It allows you to encrypt and decrypt files or messages, and to manage your keys. +.PP +Kgpg can be used in different ways: +.IP "1 -" 4 +Open Kgpg. You will see an editor. Just type or paste your text in the editor. You can then easily encrypt/decrypt the text. +.IP "2 -" 4 +On your Desktop or from a Konqueror window, right click on a file and you will see an encrypt file entry in the menu. just select it to encrypt the file. In the same way, simply left click on an encrypted file to decrypt it. +.IP "3 -" 4 +If you enable Kgpg's Klipper action, as soon as you copy an encrypted text to the clipboard, a popup menu will ask you if you want to decrypt it. +.SH OPTIONS +.TP +.B \-e +encrypt file +.TP +.B \-s +show encrypted file +.TP +.B \-S +sign file +.TP +.B \-V +verify signature +.SS "Arguments:" +.TP 12 +file +file to open +.SS "Generic options:" +.TP 12 +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v\fR, \fB\-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS "Qt options" +.TP 12 +.BI \-\-display \ displayname +Use the X-server display \fIdisplayname\fP. +.TP +.BI \-\-session \ sessionId +Restore the application for the given \fIsessionId\fP. +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8-bit display. +.TP +.BI \-\-ncols \ count +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification. +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard. +.TP +.B \-\-dograb +running under a debugger can cause an implicit +.B \-nograb, use \fB\-dograb\fR to override. +.TP +.B \-\-sync +switches to synchronous mode for debugging. +.TP +.BI "\-\-fn\fR, \fP\-\-font" \ fontname +defines the application font. +.TP +.BI "-\-bg\fR, \fB\-\-background" \ color +sets the default background color and an +application palette (light and dark shades are +calculated). +.TP +.BI "\-\-fg\fR, \fB\-\-foreground" \ color +sets the default foreground color. +.TP +.BI \-\-btn\fR, \fB\-\-button \ color +sets the default button color. +.TP +.BI \-\-name \ name +sets the application name. +.TP +.BI \-\-title \ title +sets the application title (caption). +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display. +.TP +.BI \-\-inputstyle \ inputstyle +sets XIM (X Input Method) input style. Possible +values are +.BR onthespot ", " overthespot ", " offthespot and root . +.TP +.BI \-\-im " XIM-server" +set XIM server. +.TP +.B \-\-noxim +disable XIM. +.TP +.B \-\-reverse +mirrors the whole layout of widgets. +.SS "TDE options" +.TP 12 +.BI \-\-caption \ caption +Use \fIcaption\fP as name in the titlebar. +.TP +.BI \-\-icon \ icon +Use \fIicon\fP as the application icon. +.TP +.BI \-\-miniicon \ icon +Use \fIicon\fP as the icon in the titlebar. +.TP +.BI \-\-config \ filename +Use alternative configuration file. +.TP +.BI \-\-dcopserver \ server +Use the DCOP Server specified by \fIserver\fP. +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps. +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager. +.TP +.BI \-\-style \ style +sets the application GUI style. +.TP +.BI \-\-geometry \ geometry +sets the client geometry of the main widget. +.SH AUTHOR +kgpg was written by +.nh +.ad l +y0k0 <bj@altern.org>, +.br +.hy +This manual page was prepared by +.nh +.ad l +Karolina Lindqvist <pgd\-karolinali@algonet.se> +.hy +for the Debian GNU/Linux system (but may be used by others). +.SH "SEE ALSO" +The full documentation for +.B Kgpg +is maintained as a docbook manual. If the +.B khelpcenter +program is properly installed at your site, the command +.IP +.B khelpcenter help:/kgpg +.PP +should give you access to the complete manual. +.P +Alternatively the manual can be browsed in +.B konqueror +giving it the URL help:/kgpg + diff --git a/doc/man/khexedit/CMakeLists.txt b/doc/man/khexedit/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/khexedit/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/khexedit/khexedit.1 b/doc/man/khexedit/khexedit.1 new file mode 100644 index 0000000..968d438 --- /dev/null +++ b/doc/man/khexedit/khexedit.1 @@ -0,0 +1,169 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KHEXEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE hex editor" +.SH NAME +khexedit +\- TDE hex editor +.SH SYNOPSIS +\fBkhexedit\fP [Qt\-options] [TDE\-options] [options] [file(s)] +.SH DESCRIPTION +\fBKHexEdit\fP is an editor for the raw data of binary files. It includes find/replace functions, bookmarks, many configuration options, drag and drop support and other powerful features. +.sp 1 +When a document is opened, the bytes are displayed in hexadecimal format in the data editor window. The data can be edited, cut, copied, pasted, dragged and dropped much as text is in an text editor or word processor. A cursor marks the current position. Pressing the Insert key toggles between overwrite and insert text entry modes. The data can also be displayed as octal, binary or decimal values, by choosing the desired format in the View menu. +.sp 1 +The offset column on the left indicates the position of a particular byte in the file. The text field on the right displays the ASCII encoding of the file. The cursor position and edits in the data editor window are reflected in the text field. The text field can also be edited, and those changes are reflected in the data editor window. +.sp 1 +The search bar allows the user to search for a specific value \-\- hexadecimal, octal, binary, decimal or text. +.sp 1 +The conversion field displays the value of the byte at the cursor position in a variety of bases. It also displays the value of all standard data types starting at the cursor. +.sp 1 +Multiple documents can be open at the same time but only one can be active. Use the Documents menu to select which document will be active. +.SH OPTIONS +.SS +.SS Arguments: +file(s) File(s) to open +.SS Options: +.TP +.B \-\-offset <offset> +Jump to 'offset' +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS TDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH SEE ALSO +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/khexedit/ +directly into konqueror or you can run +.BR "khelpcenter help:/khexedit/" +from the command\-line. +.br +.SH AUTHORS +.nf +Espen Sand <espensa@online.no> +.br + +.br +.fi +Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/doc/man/superkaramba/CMakeLists.txt b/doc/man/superkaramba/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/superkaramba/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/superkaramba/superkaramba.1 b/doc/man/superkaramba/superkaramba.1 new file mode 100644 index 0000000..ab0ec0f --- /dev/null +++ b/doc/man/superkaramba/superkaramba.1 @@ -0,0 +1,51 @@ +.TH SUPERKARAMBA 1 "juli 27, 2003" +.SH NAME +superkaramba \- a program based on karamba improving the eyecandy of TDE. +.SH SYNOPSIS +.B superkaramba +[\fIQt-options\fR] [\fITDE-options\fR] \fIfile\fR +.SH DESCRIPTION +This manual page documents briefly the +.B superkaramba +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +Instead, it has documentation in the GNU Info format; see below. +.PP +.B Superkaramba +is a tool based on karamba that allows anyone to easily create and run little +interactive widgets on a Trinity desktop. Widgets are defined in a simple text file +and can be augmented with Python code to make them interactive. +.SH OPTIONS +A summary of options are included below. +.TP +.B \-\-help +Show summary of options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version of program. +.TP +.B \-\-license +Show license information +.TP +.B file +A required argument 'file' +.SH AUTHOR +.B Superkaramba +was written by Adam Geitgey <adam@rootnode.org> and Hans Karlsson +<d98hk@efd.lth.se>. +.PP +This manual page was written by Jean-Michel Kelbert <kelbert@debian.org>, +for the Debian project (but may be used by others). diff --git a/doc/man/tdefilereplace/CMakeLists.txt b/doc/man/tdefilereplace/CMakeLists.txt new file mode 100644 index 0000000..65c83b9 --- /dev/null +++ b/doc/man/tdefilereplace/CMakeLists.txt @@ -0,0 +1,7 @@ +file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) + +install( + FILES ${_man_files} + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/tdefilereplace/tdefilereplace.1 b/doc/man/tdefilereplace/tdefilereplace.1 new file mode 100644 index 0000000..63557c9 --- /dev/null +++ b/doc/man/tdefilereplace/tdefilereplace.1 @@ -0,0 +1,160 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH TDEFILEREPLACE 1 "June 2006" "Trinity Desktop Environment" "Batch search and replace tool" +.SH NAME +tdefilereplace +\- Batch search and replace tool +.SH SYNOPSIS +\fBtdefilereplace\fP [Qt\-options] [TDE\-options] [PATH] +.SH DESCRIPTION +\fBKFileReplace\fP is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt\-like regular expressions. There are also other options to tune your search. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B PATH +Starting folder +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS TDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS + +.SH SEE ALSO +Full user documentation is available through the TDE Help Center. You can also enter the URL +.BR help:/tdefilereplace/ +directly into konqueror or you can run +.BR "khelpcenter help:/tdefilereplace/" +from the command\-line. +.br +.SH AUTHORS +.nf +Andras Mantia <amantia@kde.org> +.br +Emiliano Gulmini <emi_barbarossa@yahoo.it> +.br +Francois Dupou <dupoux@dupoux.com> +.br + +.br +.fi +Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp index f478b99..e5a3bc1 100644 --- a/kcalc/dlabel.cpp +++ b/kcalc/dlabel.cpp @@ -40,8 +40,8 @@ DispLogic::DispLogic(TQWidget *parent, const char *name, { KNumber::setDefaultFloatOutput(true); KNumber::setDefaultFractionalInput(true); - _back = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(history_back()), coll); - _forward = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(history_forward()), coll); + _back = KStdAction::undo(this, TQ_SLOT(history_back()), coll); + _forward = KStdAction::redo(this, TQ_SLOT(history_forward()), coll); _forward->setEnabled(false); _back->setEnabled(false); diff --git a/kcalc/dlabel.h b/kcalc/dlabel.h index fe226b5..bf54b22 100644 --- a/kcalc/dlabel.h +++ b/kcalc/dlabel.h @@ -37,7 +37,7 @@ class TDEActionCollection; class DispLogic : public KCalcDisplay { -Q_OBJECT +TQ_OBJECT public: diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 3b186fd..9bf79da 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -89,7 +89,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) TDEAcceleratorManager::setNoAccel( central ); // Detect color change - connect(kapp,TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(set_colors())); + connect(tdeApp,TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(set_colors())); calc_display = new DispLogic(central, "display", actionCollection()); @@ -105,7 +105,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) // Create Button to select BaseMode BaseChooseGroup = new TQHButtonGroup(i18n("Base"), central); - connect(BaseChooseGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotBaseSelected(int))); + connect(BaseChooseGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotBaseSelected(int))); BaseChooseGroup->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); @@ -138,7 +138,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) angle_menu->insertItem(i18n("Gradians"), 2); angle_menu->setCheckable(true); - connect(angle_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAngleSelected(int))); + connect(angle_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAngleSelected(int))); pbAngleChoose->setPopup(angle_menu); @@ -146,9 +146,9 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbInv = new KCalcButton("Inv", central, "Inverse-Button", i18n("Inverse mode")); pbInv->setAccel(Key_I); - connect(pbInv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotInvtoggled(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbInv, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbInv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotInvtoggled(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbInv, TQ_SLOT(slotSetAccelDisplayMode(bool))); pbInv->setToggleButton(true); // @@ -170,25 +170,25 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbMod->addMode(ModeNormal, "Mod", i18n("Modulo")); pbMod->addMode(ModeInverse, "IntDiv", i18n("Integer division")); pbMod->setAccel(Key_Colon); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbMod, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMod, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMod, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotModclicked(void))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbMod, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMod, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMod, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotModclicked(void))); pbReci = new KCalcButton(mSmallPage, "Reciprocal-Button"); pbReci->addMode(ModeNormal, "1/x", i18n("Reciprocal")); pbReci->setAccel(Key_R); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbReci, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbReci, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotReciclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbReci, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbReci, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotReciclicked(void))); pbFactorial = new KCalcButton(mSmallPage, "Factorial-Button"); pbFactorial->addMode(ModeNormal, "x!", i18n("Factorial")); pbFactorial->setAccel(Key_Exclam); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbFactorial, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbFactorial, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotFactorialclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbFactorial, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbFactorial, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotFactorialclicked(void))); // Representation of x^2 is moved to the function // changeRepresentation() that paints the letters When @@ -197,20 +197,20 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbSquare = new KCalcButton(mSmallPage, "Square-Button"); pbSquare->addMode(ModeNormal, "x<sup>2</sup>", i18n("Square"), true); pbSquare->addMode(ModeInverse, "x<sup>3</sup>", i18n("Third power"), true); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbSquare, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbSquare, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(pbSquare, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSquareclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbSquare, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbSquare, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(pbSquare, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotSquareclicked(void))); pbRoot = new KSquareButton(mSmallPage, "Square-Button"); pbRoot->addMode(ModeNormal, "sqrt(x)", i18n("Square root")); pbRoot->addMode(ModeInverse, "sqrt[3](x)", i18n("Cube root")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbRoot, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbRoot, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(pbRoot, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotRootclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbRoot, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbRoot, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(pbRoot, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotRootclicked(void))); // Representation of x^y is moved to the function @@ -219,12 +219,12 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbPower = new KCalcButton(mSmallPage, "Power-Button"); pbPower->addMode(ModeNormal, "x<sup>y</sup>", i18n("x to the power of y"), true); pbPower->addMode(ModeInverse, "x<sup>1/y</sup>", i18n("x to the power of 1/y"), true); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbPower, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbPower, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPower, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbPower, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); pbPower->setAccel(Key_AsciiCircum); - connect(pbPower, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPowerclicked(void))); + connect(pbPower, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPowerclicked(void))); // @@ -369,8 +369,8 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) // Show the result in the app's caption in taskbar (wishlist - bug #52858) if (KCalcSettings::captionResult() == true) connect(calc_display, - TQT_SIGNAL(changedText(const TQString &)), - TQT_SLOT(setCaption(const TQString &))); + TQ_SIGNAL(changedText(const TQString &)), + TQ_SLOT(setCaption(const TQString &))); calc_display->changeSettings(); set_precision(); @@ -409,48 +409,48 @@ KCalculator::~KCalculator() void KCalculator::setupMainActions(void) { // file menu - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); // edit menu - KStdAction::cut(TQT_TQOBJECT(calc_display), TQT_SLOT(slotCut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(calc_display), TQT_SLOT(slotCopy()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(calc_display), TQT_SLOT(slotPaste()), actionCollection()); + KStdAction::cut(calc_display, TQ_SLOT(slotCut()), actionCollection()); + KStdAction::copy(calc_display, TQ_SLOT(slotCopy()), actionCollection()); + KStdAction::paste(calc_display, TQ_SLOT(slotPaste()), actionCollection()); // settings menu actionStatshow = new TDEToggleAction(i18n("&Statistic Buttons"), 0, actionCollection(), "show_stat"); actionStatshow->setChecked(true); - connect(actionStatshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotStatshow(bool))); + connect(actionStatshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotStatshow(bool))); actionScientificshow = new TDEToggleAction(i18n("Science/&Engineering Buttons"), 0, actionCollection(), "show_science"); actionScientificshow->setChecked(true); - connect(actionScientificshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotScientificshow(bool))); + connect(actionScientificshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotScientificshow(bool))); actionLogicshow = new TDEToggleAction(i18n("&Logic Buttons"), 0, actionCollection(), "show_logic"); actionLogicshow->setChecked(true); - connect(actionLogicshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotLogicshow(bool))); + connect(actionLogicshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotLogicshow(bool))); actionConstantsShow = new TDEToggleAction(i18n("&Constants Buttons"), 0, actionCollection(), "show_constants"); actionConstantsShow->setChecked(true); - connect(actionConstantsShow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotConstantsShow(bool))); + connect(actionConstantsShow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotConstantsShow(bool))); - (void) new TDEAction(i18n("&Show All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowAll()), + (void) new TDEAction(i18n("&Show All"), 0, this, TQ_SLOT(slotShowAll()), actionCollection(), "show_all"); - (void) new TDEAction(i18n("&Hide All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAll()), + (void) new TDEAction(i18n("&Hide All"), 0, this, TQ_SLOT(slotHideAll()), actionCollection(), "hide_all"); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); } @@ -481,128 +481,128 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) KCalcButton *tmp_pb; NumButtonGroup = new TQButtonGroup(0, "Num-Button-Group"); - connect(NumButtonGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotNumberclicked(int))); + connect(NumButtonGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotNumberclicked(int))); tmp_pb = new KCalcButton("0", thisPage, "0-Button"); tmp_pb->setAccel(Key_0); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0); tmp_pb = new KCalcButton("1", thisPage, "1-Button"); tmp_pb->setAccel(Key_1); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 1); tmp_pb = new KCalcButton("2", thisPage, "2-Button"); tmp_pb->setAccel(Key_2); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 2); tmp_pb = new KCalcButton("3", thisPage, "3-Button"); tmp_pb->setAccel(Key_3); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 3); tmp_pb = new KCalcButton("4", thisPage, "4-Button"); tmp_pb->setAccel(Key_4); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 4); tmp_pb = new KCalcButton("5", thisPage, "5-Button"); tmp_pb->setAccel(Key_5); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 5); tmp_pb = new KCalcButton("6", thisPage, "6-Button"); tmp_pb->setAccel(Key_6); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 6); tmp_pb = new KCalcButton("7", thisPage, "7-Button"); tmp_pb->setAccel(Key_7); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 7); tmp_pb = new KCalcButton("8", thisPage, "8-Button"); tmp_pb->setAccel(Key_8); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 8); tmp_pb = new KCalcButton("9", thisPage, "9-Button"); tmp_pb->setAccel(Key_9); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 9); pbEE = new KCalcButton(thisPage, "EE-Button"); pbEE->addMode(ModeNormal, "x<small>" "\xb7" "10</small><sup>y</sup>", i18n("Exponent"), true); pbEE->setAccel(Key_E); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbEE, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbEE, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEEclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbEE, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbEE, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotEEclicked(void))); pbParenClose = new KCalcButton(")", mLargePage, "ParenClose-Button"); pbParenClose->setAccel(Key_ParenRight); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbParenClose, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbParenClose,TQT_SIGNAL(clicked(void)),TQT_SLOT(slotParenCloseclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbParenClose, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbParenClose,TQ_SIGNAL(clicked(void)),TQ_SLOT(slotParenCloseclicked(void))); pbX = new KCalcButton("X", thisPage, "Multiply-Button", i18n("Multiplication")); pbX->setAccel(Key_multiply); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbX, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbX, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Pressed '*'", i18n("Pressed Multiplication-Button"), - 0, Key_Asterisk, TQT_TQOBJECT(pbX), TQT_SLOT(animateClick())); - connect(pbX, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXclicked(void))); + 0, Key_Asterisk, pbX, TQ_SLOT(animateClick())); + connect(pbX, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotXclicked(void))); pbDivision = new KCalcButton("/", thisPage, "Division-Button", i18n("Division")); pbDivision->setAccel(Key_Slash); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbDivision, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbDivision, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotDivisionclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbDivision, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbDivision, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotDivisionclicked(void))); pbPlus = new KCalcButton("+", thisPage, "Plus-Button", i18n("Addition")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbPlus, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPlus, TQ_SLOT(slotSetAccelDisplayMode(bool))); pbPlus->setAccel(Key_Plus); - connect(pbPlus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPlusclicked(void))); + connect(pbPlus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPlusclicked(void))); pbMinus = new KCalcButton("-", thisPage, "Minus-Button", i18n("Subtraction")); pbMinus->setAccel(Key_Minus); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMinusclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMinus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMinusclicked(void))); pbPeriod = new KCalcButton(TDEGlobal::locale()->decimalSymbol(), thisPage, "Period-Button", i18n("Decimal point")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - TQT_TQOBJECT(pbPeriod), TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPeriod, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Decimal Point (Period)", i18n("Pressed Decimal Point"), - 0, Key_Period, TQT_TQOBJECT(pbPeriod), TQT_SLOT(animateClick())); + 0, Key_Period, pbPeriod, TQ_SLOT(animateClick())); accel()->insert("Decimal Point (Comma)", i18n("Pressed Decimal Point"), - 0, Key_Comma, TQT_TQOBJECT(pbPeriod), TQT_SLOT(animateClick())); - connect(TQT_TQOBJECT(pbPeriod), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPeriodclicked(void))); + 0, Key_Comma, pbPeriod, TQ_SLOT(animateClick())); + connect(pbPeriod, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPeriodclicked(void))); pbEqual = new KCalcButton("=", thisPage, "Equal-Button", i18n("Result")); pbEqual->setAccel(Key_Enter); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - TQT_TQOBJECT(pbEqual), TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbEqual, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Entered Equal", i18n("Pressed Equal-Button"), - 0, Key_Equal, TQT_TQOBJECT(pbEqual), TQT_SLOT(animateClick())); + 0, Key_Equal, pbEqual, TQ_SLOT(animateClick())); accel()->insert("Entered Return", i18n("Pressed Equal-Button"), - 0, Key_Return, TQT_TQOBJECT(pbEqual), TQT_SLOT(animateClick())); - connect(TQT_TQOBJECT(pbEqual), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEqualclicked(void))); + 0, Key_Return, pbEqual, TQ_SLOT(animateClick())); + connect(pbEqual, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotEqualclicked(void))); TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0, @@ -641,101 +641,101 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) pbMemRecall = new KCalcButton("MR", mLargePage, "MemRecall-Button", i18n("Memory recall")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMemRecall, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemRecall, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotMemRecallclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemRecall, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemRecall, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotMemRecallclicked(void))); pbMemRecall->setDisabled(true); // At start, there is nothing in memory pbMemPlusMinus = new KCalcButton(mLargePage, "MPlusMinus-Button"); pbMemPlusMinus->addMode(ModeNormal, "M+", i18n("Add display to memory")); pbMemPlusMinus->addMode(ModeInverse, "M-", i18n("Subtract from memory")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbMemPlusMinus, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMemPlusMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemPlusMinus,TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotMemPlusMinusclicked(void))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbMemPlusMinus, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemPlusMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemPlusMinus,TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotMemPlusMinusclicked(void))); pbMemStore = new KCalcButton("MS", mLargePage, "MemStore-Button", i18n("Memory store")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMemStore, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemStore, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMemStoreclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemStore, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemStore, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMemStoreclicked(void))); pbMC = new KCalcButton("MC", mLargePage, "MemClear-Button", i18n("Clear memory")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbMC, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMC, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMCclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMC, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMC, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMCclicked(void))); pbClear = new KCalcButton("C", mLargePage, "Clear-Button", i18n("Clear")); pbClear->setAccel(Key_Prior); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - TQT_TQOBJECT(pbClear), TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbClear, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Entered 'ESC'", i18n("Pressed ESC-Button"), 0, - Key_Escape, TQT_TQOBJECT(pbClear), TQT_SLOT(animateClick())); - connect(TQT_TQOBJECT(pbClear), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotClearclicked(void))); + Key_Escape, pbClear, TQ_SLOT(animateClick())); + connect(pbClear, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotClearclicked(void))); pbAC = new KCalcButton("AC", mLargePage, "AC-Button", i18n("Clear all")); pbAC->setAccel(Key_Delete); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbAC, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbAC, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotACclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbAC, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbAC, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotACclicked(void))); pbParenOpen = new KCalcButton("(", mLargePage, "ParenOpen-Button"); pbParenOpen->setAccel(Key_ParenLeft); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbParenOpen, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbParenOpen, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotParenOpenclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbParenOpen, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbParenOpen, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotParenOpenclicked(void))); pbPercent = new KCalcButton("%", mLargePage, "Percent-Button", i18n("Percent")); pbPercent->setAccel(Key_Percent); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbPercent, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbPercent, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPercentclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPercent, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbPercent, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPercentclicked(void))); pbPlusMinus = new KCalcButton("\xb1", mLargePage, "Sign-Button", i18n("Change sign")); pbPlusMinus->setAccel(Key_Backslash); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - pbPlusMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbPlusMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPlusMinusclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPlusMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbPlusMinus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPlusMinusclicked(void))); tmp_pb = new KCalcButton("A", mSmallPage, "A-Button"); tmp_pb->setAccel(Key_A); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xA); tmp_pb = new KCalcButton("B", mSmallPage, "B-Button"); tmp_pb->setAccel(Key_B); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xB); tmp_pb = new KCalcButton("C", mSmallPage, "C-Button"); tmp_pb->setAccel(Key_C); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xC); tmp_pb = new KCalcButton("D", mSmallPage, "D-Button"); tmp_pb->setAccel(Key_D); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xD); tmp_pb = new KCalcButton("E", mSmallPage, "E-Button"); tmp_pb->setAccel(Key_E); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xE); tmp_pb = new KCalcButton("F", mSmallPage, "F-Button"); tmp_pb->setAccel(Key_F); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xF); return thisPage; @@ -750,48 +750,48 @@ void KCalculator::setupLogicKeys(TQWidget *parent) tmp_pb = new KCalcButton("AND", parent, "AND-Button", i18n("Bitwise AND")); pbLogic.insert("AND", tmp_pb); tmp_pb->setAccel(Key_Ampersand); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotANDclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotANDclicked(void))); tmp_pb = new KCalcButton("OR", parent, "OR-Button", i18n("Bitwise OR")); pbLogic.insert("OR", tmp_pb); tmp_pb->setAccel(Key_Bar); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotORclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotORclicked(void))); tmp_pb = new KCalcButton("XOR", parent, "XOR-Button", i18n("Bitwise XOR")); pbLogic.insert("XOR", tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXORclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotXORclicked(void))); tmp_pb = new KCalcButton("Cmp", parent, "One-Complement-Button", i18n("One's complement")); pbLogic.insert("One-Complement", tmp_pb); tmp_pb->setAccel(Key_AsciiTilde); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotNegateclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotNegateclicked(void))); tmp_pb = new KCalcButton("Lsh", parent, "LeftBitShift-Button", i18n("Left bit shift")); tmp_pb->setAccel(Key_Less); pbLogic.insert("LeftShift", tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotLeftShiftclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotLeftShiftclicked(void))); tmp_pb = new KCalcButton("Rsh", parent, "RightBitShift-Button", i18n("Right bit shift")); tmp_pb->setAccel(Key_Greater); pbLogic.insert("RightShift", tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotRightShiftclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotRightShiftclicked(void))); } void KCalculator::setupScientificKeys(TQWidget *parent) @@ -803,9 +803,9 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb = new KCalcButton("Hyp", parent, "Hyp-Button", i18n("Hyperbolic mode")); pbScientific.insert("HypMode", tmp_pb); tmp_pb->setAccel(Key_H); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHyptoggled(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHyptoggled(bool))); tmp_pb->setToggleButton(true); tmp_pb = new KCalcButton(parent, "Sin-Button"); @@ -816,11 +816,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Asinh", i18n("Inverse hyperbolic sine")); tmp_pb->setAccel(Key_S); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSinclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotSinclicked(void))); tmp_pb = new KCalcButton(parent, "Cos-Button"); pbScientific.insert("Cosine", tmp_pb); @@ -830,11 +830,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Acosh", i18n("Inverse hyperbolic cosine")); tmp_pb->setAccel(Key_C); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotCosclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotCosclicked(void))); tmp_pb = new KCalcButton(parent, "Tan-Button"); pbScientific.insert("Tangent", tmp_pb); @@ -844,11 +844,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Atanh", i18n("Inverse hyperbolic tangent")); tmp_pb->setAccel(Key_T); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotTanclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotTanclicked(void))); tmp_pb = new KCalcButton(parent, "Ln-Button"); tmp_pb->addMode(ModeNormal, "Ln", i18n("Natural log")); @@ -856,11 +856,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) true); pbScientific.insert("LogNatural", tmp_pb); tmp_pb->setAccel(Key_N); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLnclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotLnclicked(void))); tmp_pb = new KCalcButton(parent, "Log-Button"); tmp_pb->addMode(ModeNormal, "Log", i18n("Logarithm to base 10")); @@ -868,11 +868,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) true); pbScientific.insert("Log10", tmp_pb); tmp_pb->setAccel(Key_L); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLogclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotLogclicked(void))); } @@ -888,20 +888,20 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) + "x", i18n("Sum of all data items")); pbStat.insert("NumData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatNumclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatNumclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.Median-Button"); tmp_pb->addMode(ModeNormal, "Med", i18n("Median")); pbStat.insert("Median", tmp_pb); mStatButtonList.append(tmp_pb); TQToolTip::add(tmp_pb, i18n("Median")); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMedianclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatMedianclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.Mean-Button"); tmp_pb->addMode(ModeNormal, "Mea", i18n("Mean")); @@ -910,11 +910,11 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) i18n("Sum of all data items squared"), true); pbStat.insert("Mean", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMeanclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatMeanclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.StandardDeviation-Button"); tmp_pb->addMode(ModeNormal, TQString::fromUtf8("σ",-1) + "<sub>N-1</sub>", @@ -923,30 +923,30 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) i18n("Standard deviation"), true); pbStat.insert("StandardDeviation", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatStdDevclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatStdDevclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.DataInput-Button"); tmp_pb->addMode(ModeNormal, "Dat", i18n("Enter data")); tmp_pb->addMode(ModeInverse, "CDat", i18n("Delete last data item")); pbStat.insert("InputData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatDataInputclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatDataInputclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.ClearData-Button"); tmp_pb->addMode(ModeNormal, "CSt", i18n("Clear data store")); pbStat.insert("ClearData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatClearDataclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatClearDataclicked(void))); } void KCalculator::setupConstantsKeys(TQWidget *parent) @@ -954,62 +954,62 @@ void KCalculator::setupConstantsKeys(TQWidget *parent) TQ_CHECK_PTR(parent); ConstButtonGroup = new TQButtonGroup(0, "Const-Button-Group"); - connect(ConstButtonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotConstclicked(int))); + connect(ConstButtonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotConstclicked(int))); KCalcConstButton *tmp_pb; tmp_pb = new KCalcConstButton(parent, 0, "C1"); tmp_pb->setAccel(ALT + Key_1); pbConstant[0] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 0); tmp_pb = new KCalcConstButton(parent, 1, "C2"); tmp_pb->setAccel(ALT + Key_2); pbConstant[1] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 1); tmp_pb = new KCalcConstButton(parent, 2, "C3"); tmp_pb->setAccel(ALT + Key_3); pbConstant[2] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 2); tmp_pb = new KCalcConstButton(parent, 3, "C4"); tmp_pb->setAccel(ALT + Key_4); pbConstant[3] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 3); tmp_pb = new KCalcConstButton(parent, 4, "C5"); tmp_pb->setAccel(ALT + Key_5); pbConstant[4] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 4); tmp_pb = new KCalcConstButton(parent, 5, "C6"); tmp_pb->setAccel(ALT + Key_6); pbConstant[5] = tmp_pb; - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 5); changeButtonNames(); @@ -1017,8 +1017,8 @@ void KCalculator::setupConstantsKeys(TQWidget *parent) // add menu with scientific constants KCalcConstMenu *tmp_menu = new KCalcConstMenu(this); menuBar()->insertItem(i18n("&Constants"), tmp_menu, -1, 2); - connect(tmp_menu, TQT_SIGNAL(activated(int)), this, - TQT_SLOT(slotConstantToDisplay(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), this, + TQ_SLOT(slotConstantToDisplay(int))); } void KCalculator::slotConstantToDisplay(int constant) @@ -1843,40 +1843,40 @@ void KCalculator::showSettings() tmp_const = constant; KCalcConstMenu *tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst0(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst0(int))); (constant->kPushButton0)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst1(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst1(int))); (constant->kPushButton1)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst2(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst2(int))); (constant->kPushButton2)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst3(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst3(int))); (constant->kPushButton3)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst4(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst4(int))); (constant->kPushButton4)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst5(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst5(int))); (constant->kPushButton5)->setPopup(tmp_menu); dialog->addPage(constant, i18n("Constants"), "constants"); // When the user clicks OK or Apply we want to update our settings. - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateSettings())); // Display the dialog. dialog->show(); @@ -2093,13 +2093,13 @@ void KCalculator::updateSettings() set_colors(); set_precision(); // Show the result in the app's caption in taskbar (wishlist - bug #52858) - disconnect(calc_display, TQT_SIGNAL(changedText(const TQString &)), + disconnect(calc_display, TQ_SIGNAL(changedText(const TQString &)), this, 0); if (KCalcSettings::captionResult()) { connect(calc_display, - TQT_SIGNAL(changedText(const TQString &)), - TQT_SLOT(setCaption(const TQString &))); + TQ_SIGNAL(changedText(const TQString &)), + TQ_SLOT(setCaption(const TQString &))); } else { @@ -2113,7 +2113,7 @@ void KCalculator::updateSettings() // // 1999-10-31 Espen Sand: Don't ask me why ;) // - kapp->processOneEvent(); + tdeApp->processOneEvent(); setFixedHeight(minimumHeight()); } @@ -2267,7 +2267,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e) #include "kcalc.moc" -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDEAboutData aboutData( "kcalc", I18N_NOOP("KCalc"), version, description, TDEAboutData::License_GPL, diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h index e596d9e..ab857db 100644 --- a/kcalc/kcalc.h +++ b/kcalc/kcalc.h @@ -60,7 +60,7 @@ class Constants; class KCalculator : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg index 2192df3..e04ac56 100644 --- a/kcalc/kcalc.kcfg +++ b/kcalc/kcalc.kcfg @@ -18,7 +18,7 @@ </entry> <entry name="NumberButtonsColor" type="Color"> <label>The color of number buttons.</label> - <code>QColor defaultButtonColor = kapp->palette().active().background();</code> + <code>TQColor defaultButtonColor = tdeApp->palette().active().background();</code> <default code="true">defaultButtonColor</default> </entry> <entry name="FunctionButtonsColor" type="Color"> diff --git a/kcalc/kcalc_button.h b/kcalc/kcalc_button.h index a5b26be..ac7aa0f 100644 --- a/kcalc/kcalc_button.h +++ b/kcalc/kcalc_button.h @@ -60,7 +60,7 @@ public: class KCalcButton : public KPushButton { -Q_OBJECT +TQ_OBJECT public: @@ -89,7 +89,7 @@ protected: class KSquareButton : public KCalcButton { -Q_OBJECT +TQ_OBJECT public: diff --git a/kcalc/kcalc_const_button.cpp b/kcalc/kcalc_const_button.cpp index fa137f5..1db27b9 100644 --- a/kcalc/kcalc_const_button.cpp +++ b/kcalc/kcalc_const_button.cpp @@ -74,8 +74,8 @@ void KCalcConstButton::initPopupMenu(void) _popup->insertItem(i18n("Set Name"), 0); _popup->insertItem(i18n("Choose From List"), tmp_menu, 1); - connect(_popup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotConfigureButton(int))); - connect(tmp_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChooseScientificConst(int))); + connect(_popup, TQ_SIGNAL(activated(int)), TQ_SLOT(slotConfigureButton(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChooseScientificConst(int))); KContextMenuManager::insert(this, _popup); } diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h index 0658571..88e73e1 100644 --- a/kcalc/kcalc_const_button.h +++ b/kcalc/kcalc_const_button.h @@ -30,7 +30,7 @@ class KCalcConstButton : public KCalcButton { -Q_OBJECT +TQ_OBJECT public: diff --git a/kcalc/kcalc_const_menu.cpp b/kcalc/kcalc_const_menu.cpp index 23790cb..6d74928 100644 --- a/kcalc/kcalc_const_menu.cpp +++ b/kcalc/kcalc_const_menu.cpp @@ -64,11 +64,11 @@ KCalcConstMenu::KCalcConstMenu(TQWidget * parent, const char * name) insertItem(i18n("Thermodynamics"), thermo_menu); insertItem(i18n("Gravitation"), gravitation_menu); - connect(math_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(em_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(nuclear_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(thermo_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(gravitation_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); + connect(math_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(em_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(nuclear_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(thermo_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(gravitation_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); for (int i = 0; i<NUM_CONST; i++) { diff --git a/kcalc/kcalc_const_menu.h b/kcalc/kcalc_const_menu.h index 2718ed9..1cb6ba3 100644 --- a/kcalc/kcalc_const_menu.h +++ b/kcalc/kcalc_const_menu.h @@ -38,7 +38,7 @@ struct science_constant{ class KCalcConstMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp index 8ad1350..ecb0827 100644 --- a/kcalc/kcalcdisplay.cpp +++ b/kcalc/kcalcdisplay.cpp @@ -48,13 +48,13 @@ KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name) setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAlignment(AlignRight | AlignVCenter); setFocus(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDisplaySelected())); - connect(selection_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotSelectionTimedOut())); + connect(selection_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotSelectionTimedOut())); sendEvent(EventReset); } @@ -150,7 +150,7 @@ void KCalcDisplay::slotPaste(bool bClipboard) void KCalcDisplay::slotDisplaySelected(void) { - if(_button == Qt::LeftButton) { + if(_button == TQt::LeftButton) { if(_lit) { slotCopy(); selection_timer->start(100); @@ -182,11 +182,11 @@ void KCalcDisplay::invertColors() void KCalcDisplay::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) { + if(e->button() == TQt::LeftButton) { _lit = !_lit; - _button = Qt::LeftButton; + _button = TQt::LeftButton; } else { - _button = Qt::MidButton; + _button = TQt::MidButton; } emit clicked(); diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h index 92dc83a..99e3abd 100644 --- a/kcalc/kcalcdisplay.h +++ b/kcalc/kcalcdisplay.h @@ -78,7 +78,7 @@ enum NumBase { class KCalcDisplay : public TQLabel { -Q_OBJECT +TQ_OBJECT public: diff --git a/kcalc/knumber/knumber.h b/kcalc/knumber/knumber.h index 2bccc35..e5f60e3 100644 --- a/kcalc/knumber/knumber.h +++ b/kcalc/knumber/knumber.h @@ -59,7 +59,7 @@ class TQString; * * @author Klaus Niederkrueger <kniederk@math.uni-koeln.de> */ -class KDE_EXPORT KNumber +class TDE_EXPORT KNumber { public: static KNumber const Zero; diff --git a/kcharselect/kcharselectdia.cpp b/kcharselect/kcharselectdia.cpp index 8750b68..d5232a8 100644 --- a/kcharselect/kcharselectdia.cpp +++ b/kcharselect/kcharselectdia.cpp @@ -36,12 +36,12 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, // Add character selection widget from library tdeui charSelect = new KCharSelect(mainWidget,"",vFont,vChr,_tableNum); charSelect->resize(charSelect->sizeHint()); - connect(charSelect,TQT_SIGNAL(highlighted(const TQChar &)), - TQT_SLOT(charChanged(const TQChar &))); - connect(charSelect,TQT_SIGNAL(activated(const TQChar &)), - TQT_SLOT(add(const TQChar &))); - connect(charSelect,TQT_SIGNAL(fontChanged(const TQString &)), - TQT_SLOT(fontSelected(const TQString &))); + connect(charSelect,TQ_SIGNAL(highlighted(const TQChar &)), + TQ_SLOT(charChanged(const TQChar &))); + connect(charSelect,TQ_SIGNAL(activated(const TQChar &)), + TQ_SLOT(add(const TQChar &))); + connect(charSelect,TQ_SIGNAL(fontChanged(const TQString &)), + TQ_SLOT(fontSelected(const TQString &))); grid->addMultiCellWidget(charSelect, 0, 0, 0, 3); // Build line editor @@ -52,13 +52,13 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, font.setFamily( vFont ); lined->setFont( font ); - connect(lined,TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(lineEditChanged())); + connect(lined,TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(lineEditChanged())); grid->addMultiCellWidget(lined, 1, 1, 0, 3); // Build some buttons bHelp = new KPushButton( KStdGuiItem::help(), mainWidget ); - connect(bHelp,TQT_SIGNAL(clicked()),this,TQT_SLOT(help())); + connect(bHelp,TQ_SIGNAL(clicked()),this,TQ_SLOT(help())); bHelp->setFixedSize( bHelp->sizeHint() ); grid->addWidget( bHelp, 2, 0 ); @@ -66,39 +66,39 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, grid->addItem( space, 2, 1 ); bClear = new KPushButton( KStdGuiItem::clear(), mainWidget ); - connect(bClear,TQT_SIGNAL(clicked()),this,TQT_SLOT(clear())); + connect(bClear,TQ_SIGNAL(clicked()),this,TQ_SLOT(clear())); bClear->setFixedSize( bClear->sizeHint() ); grid->addWidget( bClear, 2, 2 ); bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ), "edit-copy" ), mainWidget ); bClip->setFixedSize( bClip->sizeHint() ); - connect(bClip,TQT_SIGNAL(clicked()),this,TQT_SLOT(toClip())); + connect(bClip,TQ_SIGNAL(clicked()),this,TQ_SLOT(toClip())); grid->addWidget( bClip, 2, 3 ); // Build menu - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(_exit()), actionCollection() ); + KStdAction::quit( this, TQ_SLOT(_exit()), actionCollection() ); new TDEAction(i18n("&To Clipboard"), "edit-copy", - TDEStdAccel::shortcut(TDEStdAccel::Copy), TQT_TQOBJECT(this), TQT_SLOT(toClip()), actionCollection(), "copy_clip" ); + TDEStdAccel::shortcut(TDEStdAccel::Copy), this, TQ_SLOT(toClip()), actionCollection(), "copy_clip" ); - (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, TQT_TQOBJECT(this), - TQT_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" ); - (void)new TDEAction(i18n("To Clipboard &HTML"), 0, TQT_TQOBJECT(this), - TQT_SLOT(toClipHTML()), actionCollection(), "copy_html" ); + (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, this, + TQ_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" ); + (void)new TDEAction(i18n("To Clipboard &HTML"), 0, this, + TQ_SLOT(toClipHTML()), actionCollection(), "copy_html" ); new TDEAction(i18n("&From Clipboard"), "edit-paste", - TDEStdAccel::shortcut(TDEStdAccel::Paste), TQT_TQOBJECT(this), TQT_SLOT(fromClip()), actionCollection(), "from_clip" ); - (void)new TDEAction(i18n("From Clipboard UTF-8"), 0, TQT_TQOBJECT(this), - TQT_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" ); + TDEStdAccel::shortcut(TDEStdAccel::Paste), this, TQ_SLOT(fromClip()), actionCollection(), "from_clip" ); + (void)new TDEAction(i18n("From Clipboard UTF-8"), 0, this, + TQ_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" ); i18n("From Clipboard HTML"); // Intended for future use - KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(clear()), actionCollection(), "clear"); - (void)new TDEAction(i18n("&Flip"), 0, TQT_TQOBJECT(this), - TQT_SLOT(flipText()), actionCollection(), "flip" ); - (void)new TDEAction(i18n("&Alignment"), 0, TQT_TQOBJECT(this), - TQT_SLOT(toggleEntryDirection()), actionCollection(), "alignment" ); + KStdAction::clear(this, TQ_SLOT(clear()), actionCollection(), "clear"); + (void)new TDEAction(i18n("&Flip"), 0, this, + TQ_SLOT(flipText()), actionCollection(), "flip" ); + (void)new TDEAction(i18n("&Alignment"), 0, this, + TQ_SLOT(toggleEntryDirection()), actionCollection(), "alignment" ); charSelect->setFocus(); @@ -262,7 +262,7 @@ void KCharSelectDia::lineEditChanged() //================================================================== void KCharSelectDia::_exit() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); config->writeEntry("selectedFont",vFont); @@ -284,6 +284,6 @@ void KCharSelectDia::clear() //================================================================== void KCharSelectDia::help() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } diff --git a/kcharselect/kcharselectdia.h b/kcharselect/kcharselectdia.h index 62f07c2..c2b3742 100644 --- a/kcharselect/kcharselectdia.h +++ b/kcharselect/kcharselectdia.h @@ -24,7 +24,7 @@ static const char *version = "v1.1"; class KCharSelectDia : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcharselect/main.cpp b/kcharselect/main.cpp index cb74af5..a863e5e 100644 --- a/kcharselect/main.cpp +++ b/kcharselect/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char **argv) TDEApplication app; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); TQString font(config->readEntry("selectedFont", TDEGlobalSettings::generalFont().family())); diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index 3526999..d487a37 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -53,13 +53,13 @@ DiskList::DiskList(TQObject *parent, const char *name) // BackgroundProcesses **************************************** dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); - connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), - this, TQT_SLOT(dfDone() ) ); + connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ), + this, TQ_SLOT(dfDone() ) ); readingDFStdErrOut=FALSE; - config = kapp->config(); + config = tdeApp->config(); loadSettings(); } diff --git a/kdf/disklist.h b/kdf/disklist.h index fe22dbf..019b848 100644 --- a/kdf/disklist.h +++ b/kdf/disklist.h @@ -94,7 +94,7 @@ private: /***************************************************************************/ class DiskList : public TQObject -{ Q_OBJECT +{ TQ_OBJECT public: DiskList( TQObject *parent=0, const char *name=0 ); diff --git a/kdf/disks.cpp b/kdf/disks.cpp index 1084380..391b5d9 100644 --- a/kdf/disks.cpp +++ b/kdf/disks.cpp @@ -56,10 +56,10 @@ void DiskEntry::init() // BackgroundProcesses **************************************** sysProc = new KShellProcess(); TQ_CHECK_PTR(sysProc); - connect( sysProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); - connect( sysProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); + connect( sysProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); + connect( sysProc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); readingSysStdErrOut=FALSE; diff --git a/kdf/disks.h b/kdf/disks.h index 0a0d529..faf8752 100644 --- a/kdf/disks.h +++ b/kdf/disks.h @@ -34,12 +34,12 @@ #include <tdeio/global.h> #include <kprogress.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> class DiskEntry : public TQObject { - Q_OBJECT + TQ_OBJECT public: DiskEntry(TQObject *parent=0, const char *name=0); diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp index 4daaaab..f58a193 100644 --- a/kdf/kcmdf.cpp +++ b/kdf/kcmdf.cpp @@ -57,7 +57,7 @@ TQString KDiskFreeWidget::quickHelp() const extern "C" { - KDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ ) + TDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ ) { return new KDiskFreeWidget( parent , "kdf" ); } diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h index c321deb..6cb56a8 100644 --- a/kdf/kcmdf.h +++ b/kdf/kcmdf.h @@ -32,7 +32,7 @@ class KDiskFreeWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp index e316b3e..ea3263a 100644 --- a/kdf/kdf.cpp +++ b/kdf/kdf.cpp @@ -41,11 +41,11 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name) { kdf = new KDFWidget(this,"kdf",FALSE); TQ_CHECK_PTR(kdf); - (void) new TDEAction( i18n( "&Update" ), 0, TQT_TQOBJECT(kdf), TQT_SLOT( updateDF() ), actionCollection(), "updatedf" ); + (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQ_SLOT( updateDF() ), actionCollection(), "updatedf" ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(kdf), TQT_SLOT(settingsBtnClicked()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::preferences(kdf, TQ_SLOT(settingsBtnClicked()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); setCentralWidget(kdf); // kdf->setMinimumSize(kdf->sizeHint()); @@ -30,7 +30,7 @@ /***************************************************************/ class KDFTopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index 1180d6d..1e5946c 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -79,10 +79,10 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) { mList->addColumn( mTabName[i]->mName ); } - connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int))); - connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotChanged())); + connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int))); + connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotChanged())); topLayout->addWidget( mList ); TQListViewItem *mListItem = new TQListViewItem( mList ); @@ -99,17 +99,17 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) mScroll = new TQScrollBar( this ); TQ_CHECK_PTR(mScroll); - mScroll->setOrientation( Qt::Horizontal ); + mScroll->setOrientation( TQt::Horizontal ); mScroll->setSteps(1,20); mScroll->setRange(0, 180 ); gl->addWidget( mScroll, 1, 1 ); - connect(mScroll,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged())); + connect(mScroll,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged())); mLCD = new TQLCDNumber( this ); TQ_CHECK_PTR(mLCD); mLCD->setNumDigits( 3 ); mLCD->setSegmentStyle(TQLCDNumber::Filled); - connect(mScroll,TQT_SIGNAL(valueChanged(int)),mLCD,TQT_SLOT(display(int))); + connect(mScroll,TQ_SIGNAL(valueChanged(int)),mLCD,TQ_SLOT(display(int))); gl->addMultiCellWidget( mLCD, 0, 1, 0, 0 ); text = i18n("Update frequency [seconds]. The value 0 disables update" ); @@ -125,19 +125,19 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) mFileManagerEdit = new TQLineEdit( this ); TQ_CHECK_PTR(mFileManagerEdit); topLayout->addWidget( mFileManagerEdit ); - connect(mFileManagerEdit,TQT_SIGNAL(textChanged (const TQString &)),this,TQT_SLOT(slotChanged())); + connect(mFileManagerEdit,TQ_SIGNAL(textChanged (const TQString &)),this,TQ_SLOT(slotChanged())); text = i18n("Open file manager automatically on mount"); mOpenMountCheck = new TQCheckBox(text, this ); TQ_CHECK_PTR(mOpenMountCheck); topLayout->addWidget( mOpenMountCheck ); - connect(mOpenMountCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged())); + connect(mOpenMountCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged())); text = i18n("Pop up a window when a disk gets critically full"); mPopupFullCheck = new TQCheckBox( text, this ); TQ_CHECK_PTR(mPopupFullCheck); topLayout->addWidget( mPopupFullCheck ); - connect(mPopupFullCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged())); + connect(mPopupFullCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged())); } loadSettings(); @@ -156,13 +156,13 @@ KDFConfigWidget::~KDFConfigWidget() void KDFConfigWidget::closeEvent(TQCloseEvent *) { applySettings(); - kapp->quit(); + tdeApp->quit(); } void KDFConfigWidget::applySettings( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("KDFConfig"); if( GUI ) @@ -196,7 +196,7 @@ void KDFConfigWidget::applySettings( void ) void KDFConfigWidget::loadSettings( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("KDFConfig"); if( GUI ) diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h index d5c2993..955a1a7 100644 --- a/kdf/kdfconfig.h +++ b/kdf/kdfconfig.h @@ -41,7 +41,7 @@ class CListView; class KDFConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT class CTabName diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index 7c5121d..13ad92c 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -39,7 +39,7 @@ #include <kcmenumngr.h> #include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "listview.h" #include "kdfwidget.h" @@ -95,10 +95,10 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full) KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init ) : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0) { - connect(&mDiskList , TQT_SIGNAL(readDFDone() ), - this, TQT_SLOT (updateDFDone()) ); - connect(&mDiskList , TQT_SIGNAL(criticallyFull(DiskEntry*)), - this, TQT_SLOT (criticallyFull(DiskEntry*)) ); + connect(&mDiskList , TQ_SIGNAL(readDFDone() ), + this, TQ_SLOT (updateDFDone()) ); + connect(&mDiskList , TQ_SIGNAL(criticallyFull(DiskEntry*)), + this, TQ_SLOT (criticallyFull(DiskEntry*)) ); mTabProp.resize(8); mTabProp[0] = new CTabEntry( "Icon", i18n("Icon"), true, 32); @@ -122,13 +122,13 @@ KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init ) mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); mList->setShowSortIndicator(true); connect( mList, - TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ))); + TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ))); connect( mList, - TQT_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int ))); - connect( mList->header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(columnSizeChanged(int, int, int)) ); + TQ_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int ))); + connect( mList->header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(columnSizeChanged(int, int, int)) ); makeColumns(); mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false; @@ -186,7 +186,7 @@ void KDFWidget::makeColumns( void ) void KDFWidget::closeEvent(TQCloseEvent *) { applySettings(); - kapp->quit(); + tdeApp->quit(); } @@ -202,7 +202,7 @@ void KDFWidget::settingsChanged( void ) **/ void KDFWidget::applySettings( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("KDiskFree"); if( GUI ) @@ -231,7 +231,7 @@ void KDFWidget::loadSettings( void ) if(GUI) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("KDiskFree"); for( uint i=0; i<mTabProp.size(); i++ ) { @@ -266,8 +266,8 @@ void KDFWidget::settingsBtnClicked( void ) { mOptionDialog = new COptionDialog( this, "options", false ); if( mOptionDialog == 0 ) { return; } - connect( mOptionDialog, TQT_SIGNAL(valueChanged()), - this, TQT_SLOT(settingsChanged()) ); + connect( mOptionDialog, TQ_SIGNAL(valueChanged()), + this, TQ_SLOT(settingsChanged()) ); } mOptionDialog->show(); } @@ -283,7 +283,7 @@ void KDFWidget::setUpdateFrequency( int frequency ) // Kill current timer and restart it if the frequency is // larger than zero. // - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); if( frequency > 0 ) { startTimer( frequency * 1000 ); @@ -632,7 +632,7 @@ void KDFWidget::columnSizeChanged( int, int, int ) if( mTimer == 0 ) { mTimer = new TQTimer( this ); - connect( mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateDiskBarPixmaps()) ); + connect( mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateDiskBarPixmaps()) ); } else if( mTimer->isActive() == true ) { @@ -645,7 +645,7 @@ void KDFWidget::columnSizeChanged( int, int, int ) void KDFWidget::invokeHelp() { - kapp->invokeHelp("", "kcontrol/kdf"); + tdeApp->invokeHelp("", "kcontrol/kdf"); } #include "kdfwidget.moc" diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h index 872379f..057761f 100644 --- a/kdf/kdfwidget.h +++ b/kdf/kdfwidget.h @@ -91,7 +91,7 @@ class CListViewItem : public TQListViewItem class KDFWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index c06e9c2..1420a11 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -69,11 +69,11 @@ KwikDisk::KwikDisk() setPixmap(KSystemTray::loadIcon("kdf")); show(); - connect( &m_diskList, TQT_SIGNAL(readDFDone()), this, TQT_SLOT(updateDFDone()) ); - connect( &m_diskList, TQT_SIGNAL(criticallyFull(DiskEntry*)), - this, TQT_SLOT(criticallyFull(DiskEntry*)) ); + connect( &m_diskList, TQ_SIGNAL(readDFDone()), this, TQ_SLOT(updateDFDone()) ); + connect( &m_diskList, TQ_SIGNAL(criticallyFull(DiskEntry*)), + this, TQ_SLOT(criticallyFull(DiskEntry*)) ); - connect( contextMenu(), TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(aboutToHide()) ); + connect( contextMenu(), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(aboutToHide()) ); loadSettings(); updateDF(); @@ -134,7 +134,7 @@ void KwikDisk::setUpdateFrequency(int frequency) // Kill current timer and restart it if the frequency is // larger than zero. // - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); if( frequency > 0 ) { startTimer(frequency * 1000); @@ -184,7 +184,7 @@ void KwikDisk::updateDFDone() { entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail()); } - int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) ); + int id = contextMenu()->insertItem("", this, TQ_SLOT(toggleMount(int)) ); contextMenu()->setItemParameter(id, itemNo); itemNo++; @@ -215,7 +215,7 @@ void KwikDisk::updateDFDone() qp.drawRect(0,0,pix->width(),pix->height()); qp.end(); } - contextMenu()->disconnectItem(id,disk,TQT_SLOT(toggleMount())); + contextMenu()->disconnectItem(id,disk,TQ_SLOT(toggleMount())); toolTipText = i18n("You must login as root to mount this disk"); } @@ -226,21 +226,21 @@ void KwikDisk::updateDFDone() contextMenu()->insertItem( KSystemTray::loadIcon("kdf"), - i18n("&Start KDiskFree"), this, TQT_SLOT(startKDF()),0); + i18n("&Start KDiskFree"), this, TQ_SLOT(startKDF()),0); contextMenu()->insertItem( KSystemTray::loadIcon("configure"), - i18n("&Configure KwikDisk..."), this, TQT_SLOT(changeSettings()),0); + i18n("&Configure KwikDisk..."), this, TQ_SLOT(changeSettings()),0); contextMenu()->insertItem( KSystemTray::loadIcon("help"), - KStdGuiItem::help().text(), this, TQT_SLOT(invokeHelp()),0); + KStdGuiItem::help().text(), this, TQ_SLOT(invokeHelp()),0); contextMenu()->insertSeparator(); contextMenu()->insertItem( KSystemTray::loadIcon("system-log-out"), - KStdGuiItem::quit().text(), this, TQT_SIGNAL(quitSelected()) ); + KStdGuiItem::quit().text(), this, TQ_SIGNAL(quitSelected()) ); } void KwikDisk::toggleMount(int item) @@ -297,8 +297,8 @@ void KwikDisk::changeSettings() { m_optionDialog = new COptionDialog(this, "options", FALSE); if( !m_optionDialog ) return; - connect(m_optionDialog, TQT_SIGNAL(valueChanged()), - this, TQT_SLOT(loadSettings())); + connect(m_optionDialog, TQ_SIGNAL(valueChanged()), + this, TQ_SLOT(loadSettings())); } m_optionDialog->show(); } @@ -312,7 +312,7 @@ void KwikDisk::startKDF() void KwikDisk::invokeHelp() { - kapp->invokeHelp("", "kdf"); + tdeApp->invokeHelp("", "kdf"); } /*****************************************************************************/ @@ -335,7 +335,7 @@ int main(int argc, char **argv) KwikDisk *mainWin = 0; mainWin = new KwikDisk; - TQObject::connect(mainWin, TQT_SIGNAL(quitSelected()), &app, TQT_SLOT(quit())); + TQObject::connect(mainWin, TQ_SIGNAL(quitSelected()), &app, TQ_SLOT(quit())); // mainWin has WDestructiveClose flag by default, so it will delete itself. return app.exec(); diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h index ce8db57..68bf44c 100644 --- a/kdf/kwikdisk.h +++ b/kdf/kwikdisk.h @@ -41,7 +41,7 @@ */ class KwikDisk : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: KwikDisk(); diff --git a/kdf/listview.h b/kdf/listview.h index f8a8424..d100131 100644 --- a/kdf/listview.h +++ b/kdf/listview.h @@ -27,7 +27,7 @@ class CListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index 37b9ff8..732cba8 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -59,7 +59,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mDiskList.readFSTAB(); mDiskList.readDF(); mInitializing = true; - connect( &mDiskList,TQT_SIGNAL(readDFDone()),this,TQT_SLOT(readDFDone())); + connect( &mDiskList,TQ_SIGNAL(readDFDone()),this,TQ_SLOT(readDFDone())); TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint()); @@ -72,8 +72,8 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mList->addColumn( i18n("Mount Command") ); mList->addColumn( i18n("Unmount Command") ); mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); - connect( mList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(clicked(TQListViewItem *))); + connect( mList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(clicked(TQListViewItem *))); topLayout->addWidget( mList ); @@ -93,47 +93,47 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mIconLineEdit = new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mIconLineEdit); mIconLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(iconChanged(const TQString&))); - connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(iconChanged(const TQString&))); + connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mIconLineEdit, 2, 0 ); mIconButton = new TDEIconButton(mGroupBox); mIconButton->setIconType(TDEIcon::Small, TDEIcon::Device); TQ_CHECK_PTR(mIconButton); mIconButton->setFixedWidth( mIconButton->sizeHint().height() ); - connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString))); + connect(mIconButton,TQ_SIGNAL(iconChanged(TQString)),this,TQ_SLOT(iconChangedButton(TQString))); gl->addWidget( mIconButton, 2, 1 ); //Mount mMountButton = new TQPushButton( i18n("Get Mount Command"), mGroupBox ); TQ_CHECK_PTR(mMountButton); - connect(mMountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectMntFile())); + connect(mMountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectMntFile())); gl->addWidget( mMountButton, 1, 2 ); mMountLineEdit = new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mMountLineEdit); mMountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect(mMountLineEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(mntCmdChanged(const TQString&))); - connect( mMountLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect(mMountLineEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(mntCmdChanged(const TQString&))); + connect( mMountLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mMountLineEdit, 1, 3 ); //Umount mUmountButton = new TQPushButton(i18n("Get Unmount Command"), mGroupBox ); TQ_CHECK_PTR( mUmountButton ); - connect(mUmountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectUmntFile())); + connect(mUmountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectUmntFile())); gl->addWidget( mUmountButton, 2, 2 ); mUmountLineEdit=new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mUmountLineEdit); mUmountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect(mUmountLineEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(umntCmdChanged(const TQString&))); - connect( mUmountLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect(mUmountLineEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(umntCmdChanged(const TQString&))); + connect( mUmountLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mUmountLineEdit, 2, 3 ); } @@ -179,7 +179,7 @@ void MntConfigWidget::applySettings( void ) { mDiskList.applySettings(); - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("MntConfig"); if(GUI ) { @@ -192,7 +192,7 @@ void MntConfigWidget::applySettings( void ) void MntConfigWidget::loadSettings( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); if( mInitializing == false && GUI ) { config.setGroup("MntConfig"); diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h index 8e510cd..d247012 100644 --- a/kdf/mntconfig.h +++ b/kdf/mntconfig.h @@ -45,7 +45,7 @@ class TQListViewItem; class MntConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp index 6734294..6d96fe3 100644 --- a/kdf/optiondialog.cpp +++ b/kdf/optiondialog.cpp @@ -33,13 +33,13 @@ COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal ) TQVBoxLayout *l1 = new TQVBoxLayout( f1 ); mConf = new KDFConfigWidget( f1, "kdfconf" ); l1->addWidget(mConf); - connect( mConf, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mConf, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQFrame *f2 = addPage( i18n("Mount Commands") ); TQVBoxLayout *l2 = new TQVBoxLayout( f2 ); mMnt = new MntConfigWidget( f2, "mntconf"); l2->addWidget(mMnt); - connect( mMnt, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mMnt, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); enableButton( Apply, false ); dataChanged = false; } diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h index c56f8a2..77efa05 100644 --- a/kdf/optiondialog.h +++ b/kdf/optiondialog.h @@ -27,7 +27,7 @@ class MntConfigWidget; class COptionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp index 297274b..96920a8 100644 --- a/kdf/stdoption.cpp +++ b/kdf/stdoption.cpp @@ -47,7 +47,7 @@ CStdOption::~CStdOption( void ) void CStdOption::updateConfiguration( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("KDFConfig"); mFileManager = config.readPathEntry( "FileManagerCommand", mDefaultFileManager ); @@ -62,7 +62,7 @@ void CStdOption::updateConfiguration( void ) void CStdOption::writeConfiguration( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("KDFConfig"); config.writeEntry( "UpdateFrequency", mUpdateFrequency ); config.writePathEntry( "FileManagerCommand", mFileManager ); @@ -74,7 +74,7 @@ void CStdOption::writeConfiguration( void ) void CStdOption::writeDefaultFileManager( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("KDFConfig"); config.writePathEntry( "FileManagerCommand", mDefaultFileManager ); config.sync(); diff --git a/kdf/tdeconftest.cpp b/kdf/tdeconftest.cpp index ff806f9..ad9bf6f 100644 --- a/kdf/tdeconftest.cpp +++ b/kdf/tdeconftest.cpp @@ -50,7 +50,7 @@ main(int argc, char ** argv) TDECmdLineArgs::init(argc, argv, "test", description, version); TDEApplication app; - TDEConfig * cfg = kapp->config(); + TDEConfig * cfg = tdeApp->config(); TQDict<char> dict; diff --git a/kdf/unix_outputs/unix-defines.txt b/kdf/unix_outputs/unix-defines.txt deleted file mode 100644 index 75a2846..0000000 --- a/kdf/unix_outputs/unix-defines.txt +++ /dev/null @@ -1,125 +0,0 @@ -What about using builtin symbols defined by the compiler (gcc) -itself. For example on Alpha I have : - -lappa{bussat}(74) echo 'main(){printf("hello world\n";}' |gcc -E -v - -Reading specs from /usr/local/lib/gcc-lib/alpha-dec-osf4.0/2.7.2.3/specs -gcc version 2.7.2.3 - /usr/local/lib/gcc-lib/alpha-dec-osf4.0/2.7.2.3/cpp -lang-c -v -undef --D__GNUC__=2 -D__GNUC_MINOR__=7 -Dunix -D__osf__ -D__alpha -D__alpha__ --D_LONGLONG -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__unix__ -D__osf__ -D__alpha --D__alpha__ -D_LONGLONG -D__SYSTYPE_BSD__ -D_SYSTYPE_BSD -D__unix --D__SYSTYPE_BSD -Asystem(unix) -Asystem(xpg4) -Acpu(alpha) --Amachine(alpha) -D__LANGUAGE_C__ -D__LANGUAGE_C -DLANGUAGE_C - -GNU CPP version 2.7.2.3 -#include "..." search starts here: -#include <...> search starts here: - /usr/local/include - /usr/local/alpha-dec-osf4.0/include - /usr/local/lib/gcc-lib/alpha-dec-osf4.0/2.7.2.3/include - /usr/include -End of search list. -# 1 "" -main(){printf("hello world\n";} - -On HP, this becomes : -bussat [21] echo 'main(){printf("hello world\n";}' |gcc -E -v - -Reading specs from -/opt/gcc/lib/gcc-lib/hppa1.1-hp-hpux10.10/2.7.2.2/specs -gcc version 2.7.2.2 - /opt/gcc/lib/gcc-lib/hppa1.1-hp-hpux10.10/2.7.2.2/cpp -lang-c -v -undef --D__GNUC__=2 -D__GNUC_MINOR__=7 -Dhppa -Dhp9000s800 -D__hp9000s800 --Dhp9k8 -DPWB -Dhpux -Dunix -D_HPUX_SOURCE -D__hppa__ -D__hp9000s800__ --D__hp9000s800 -D__hp9k8__ -D__PWB__ -D__hpux__ -D__unix__ --D_HPUX_SOURCE -D__hppa -D__hp9000s800 -D__hp9k8 -D__PWB -D__hpux --D__unix -Asystem(unix) -Asystem(hpux) -Acpu(hppa) -Amachine(hppa) --D__hp9000s700 -D_PA_RISC1_1 - -GNU CPP version 2.7.2.2 (hppa) -#include "..." search starts here: -#include <...> search starts here: - /opt/gcc/include - /opt/gcc/hppa1.1-hp-hpux10.10/include - /opt/gcc/lib/gcc-lib/hppa1.1-hp-hpux10.10/2.7.2.2/include - /usr/include -End of search list. -# 1 "" -main(){printf("hello world -";} - -On Sun Solaris2.5 I found -lappsun8{bussat}[1]: echo 'main(){printf("hello world\n";}' |gcc -E -v - -Reading specs from -/opt/FSFgcc/lib/gcc-lib/sparc-sun-solaris2.5/2.7.2/specs -gcc version 2.7.2 - /opt/FSFgcc/lib/gcc-lib/sparc-sun-solaris2.5/2.7.2/cpp -lang-c -v --undef -D__GNUC__=2 -D__GNUC_MINOR__=7 -Dsun -Dsparc -Dunix -D__svr4__ --D__SVR4 -D__GCC_NEW_VARARGS__ -D__sun__ -D__sparc__ -D__unix__ --D__svr4__ -D__SVR4 -D__GCC_NEW_VARARGS__ -D__sun -D__sparc -D__unix --Asystem(unix) -Asystem(svr4) -Acpu(sparc) -Amachine(sparc) - -GNU CPP version 2.7.2 (sparc) -#include "..." search starts here: -#include <...> search starts here: - /usr/local/include - /opt/FSFgcc/sparc-sun-solaris2.5/include - /opt/FSFgcc/lib/gcc-lib/sparc-sun-solaris2.5/2.7.2/include - /usr/include -End of search list. -# 1 "" -main(){printf("hello world -";} - -Finally, on Sun with SunOS4.1 the results are : -lappsun1{bussat}[1]: echo 'main(){printf("hello world\n";}' |gcc -E -v -- -Reading specs from -/usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.0/specs -gcc version 2.6.0 - /usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.0/cpp -lang-c -v --undef -D__GNUC__=2 -D__GNUC_MINOR__=6 -Dsparc -Dsun -Dunix --D__GCC_NEW_VARARGS__ -D__sparc__ -D__sun__ -D__unix__ --D__GCC_NEW_VARARGS__ -D__sparc -D__sun -D__unix -Asystem(unix) --Asystem(bsd) -Acpu(sparc) -Amachine(sparc) - -GNU CPP version 2.6.0 (sparc) -#include "..." search starts here: -#include <...> search starts here: - /usr/local/include - /usr/local/sparc-sun-sunos4.1.3_U1/include - /usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.0/include - /usr/include -End of search list. -# 1 "" -main(){printf("hello world -";} - -on a Linux box there is: -mike@kermit:/home/mike > echo 'main(){printf("hello world\n";}' |gcc -E -v - -Reading specs from /usr/lib/gcc-lib/i486-linux/2.7.2.1/specs -gcc version 2.7.2.1 - /usr/lib/gcc-lib/i486-linux/2.7.2.1/cpp -lang-c -v -undef -D__GNUC__=2 --D__GNUC_MINOR__=7 -D__ELF__ -Dunix -Di386 -Dlinux -D__ELF__ -D__unix__ --D__i386__ -D__linux__ -D__unix -D__i386 -D__linux -Asystem(unix) --Asystem(posix) -Acpu(i386) -Amachine(i386) -D__i486__ - GNU CPP version -2.7.2.1 (i386 Linux/ELF) #include "..." search starts here: #include <...> -search starts here: /usr/local/include - /usr/i486-linux/include - /usr/lib/gcc-lib/i486-linux/2.7.2.1/include - /usr/include -End of search list. -# 1 "" -main(){printf("hello world\n";} - -on digital UNIX V3.2D-1 there is -mkropfbe@edusrv(1)$ echo 'main(){printf("hello world\n";}' |gcc -E -v - -Reading specs from /usr/local/lib/gcc-lib/alpha-dec-osf3.2/2.7.2/specs -gcc version 2.7.2 - /usr/local/lib/gcc-lib/alpha-dec-osf3.2/2.7.2/cpp -lang-c -v -undef --D__GNUC__=2 -D__GNUC_MINOR__=7 -Dunix -D__osf__ -D__alpha -D__alpha__ --D_LONGLONG -DSYSTYPE_BSD -D_SYSTYPE_BSD -D__unix__ -D__osf__ -D__alpha --D__alpha__ -D_LONGLONG -D__SYSTYPE_BSD__ -D_SYSTYPE_BSD -D__unix --D__SYSTYPE_BSD -Asystem(unix) -Asystem(xpg4) -Acpu(alpha) -Amachine(alpha) --D__LANGUAGE_C__ -D__LANGUAGE_C -DLANGUAGE_C - GNU CPP version 2.7.2 #include -"..." search starts here: #include <...> search starts here: -/usr/local/include /usr/local/alpha-dec-osf3.2/include -/usr/local/lib/gcc-lib/alpha-dec-osf3.2/2.7.2/include /usr/include -End of search list. -# 1 "" -main(){printf("hello world\n";} diff --git a/kedit/KEdit.desktop b/kedit/KEdit.desktop index 8974fac..ff3ef5d 100644 --- a/kedit/KEdit.desktop +++ b/kedit/KEdit.desktop @@ -12,4 +12,4 @@ Terminal=false MimeType=text/plain; X-TDE-StartupNotify=true X-DCOP-ServiceType=Multi -Categories=Qt;TDE;TextEditor; +Categories=Qt;TDE;Utility;TextEditor; diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index 51d04b6..c027328 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -72,9 +72,9 @@ TopLevel::TopLevel (TQWidget *, const char *name) windowList->append( this ); statusbar_timer = new TQTimer(this); - connect(statusbar_timer, TQT_SIGNAL(timeout()),this,TQT_SLOT(timer_slot())); + connect(statusbar_timer, TQ_SIGNAL(timeout()),this,TQ_SLOT(timer_slot())); - connect(kapp,TQT_SIGNAL(tdedisplayPaletteChanged()),this,TQT_SLOT(set_colors())); + connect(tdeApp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors())); setupStatusBar(); setupActions(); @@ -107,24 +107,24 @@ void TopLevel::setupEditWidget() eframe = new KEdit (this, "eframe"); eframe->setOverwriteEnabled(true); - connect(eframe, TQT_SIGNAL(CursorPositionChanged()),this, - TQT_SLOT(statusbar_slot())); - connect(eframe, TQT_SIGNAL(toggle_overwrite_signal()),this, - TQT_SLOT(toggle_overwrite())); - connect(eframe, TQT_SIGNAL(gotUrlDrop(TQDropEvent*)), this, - TQT_SLOT(urlDrop_slot(TQDropEvent*))); - connect(eframe, TQT_SIGNAL(undoAvailable(bool)),undoAction, - TQT_SLOT(setEnabled(bool))); - connect(eframe, TQT_SIGNAL(redoAvailable(bool)),redoAction, - TQT_SLOT(setEnabled(bool))); - connect(eframe, TQT_SIGNAL(copyAvailable(bool)),cutAction, - TQT_SLOT(setEnabled(bool))); - connect(eframe, TQT_SIGNAL(copyAvailable(bool)),copyAction, - TQT_SLOT(setEnabled(bool))); - connect( eframe, TQT_SIGNAL(selectionChanged()),this, - TQT_SLOT(slotSelectionChanged())); - connect( eframe, TQT_SIGNAL(modificationChanged( bool)), - TQT_SLOT(setFileCaption())); + connect(eframe, TQ_SIGNAL(CursorPositionChanged()),this, + TQ_SLOT(statusbar_slot())); + connect(eframe, TQ_SIGNAL(toggle_overwrite_signal()),this, + TQ_SLOT(toggle_overwrite())); + connect(eframe, TQ_SIGNAL(gotUrlDrop(TQDropEvent*)), this, + TQ_SLOT(urlDrop_slot(TQDropEvent*))); + connect(eframe, TQ_SIGNAL(undoAvailable(bool)),undoAction, + TQ_SLOT(setEnabled(bool))); + connect(eframe, TQ_SIGNAL(redoAvailable(bool)),redoAction, + TQ_SLOT(setEnabled(bool))); + connect(eframe, TQ_SIGNAL(copyAvailable(bool)),cutAction, + TQ_SLOT(setEnabled(bool))); + connect(eframe, TQ_SIGNAL(copyAvailable(bool)),copyAction, + TQ_SLOT(setEnabled(bool))); + connect( eframe, TQ_SIGNAL(selectionChanged()),this, + TQ_SLOT(slotSelectionChanged())); + connect( eframe, TQ_SIGNAL(modificationChanged( bool)), + TQ_SLOT(setFileCaption())); undoAction->setEnabled(false); redoAction->setEnabled(false); @@ -163,20 +163,20 @@ void TopLevel::setupEditWidget() right_mouse_button = new TQPopupMenu; right_mouse_button->insertItem (i18n("Open..."), - this, TQT_SLOT(file_open())); + this, TQ_SLOT(file_open())); right_mouse_button->insertItem (SmallIcon("document-save"),i18n("Save"), - this, TQT_SLOT(file_save())); + this, TQ_SLOT(file_save())); right_mouse_button->insertItem (SmallIcon("document-save-as"),i18n("Save As..."), - this, TQT_SLOT(file_save_as())); + this, TQ_SLOT(file_save_as())); right_mouse_button->insertSeparator(-1); right_mouse_button->insertItem(i18n("Copy"), - this, TQT_SLOT(copy())); + this, TQ_SLOT(copy())); right_mouse_button->insertItem(i18n("Paste"), - this, TQT_SLOT(paste())); + this, TQ_SLOT(paste())); right_mouse_button->insertItem(i18n("Cut"), - this, TQT_SLOT(cut())); + this, TQ_SLOT(cut())); right_mouse_button->insertItem(i18n("Select All"), - this, TQT_SLOT(select_all())); + this, TQ_SLOT(select_all())); eframe->installRBPopup(right_mouse_button); */ } @@ -193,42 +193,42 @@ void TopLevel::slotSelectionChanged() void TopLevel::setupActions() { // setup File menu - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection()); - recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), + KStdAction::openNew(this, TQ_SLOT(file_new()), actionCollection()); + KStdAction::open(this, TQ_SLOT(file_open()), actionCollection()); + recent = KStdAction::openRecent(this, TQ_SLOT(openRecent(const KURL&)), actionCollection()); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(file_save()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(file_save_as()), actionCollection()); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection()); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); - KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::save(this, TQ_SLOT(file_save()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(file_save_as()), actionCollection()); + KStdAction::close(this, TQ_SLOT(file_close()), actionCollection()); + KStdAction::print(this, TQ_SLOT(print()), actionCollection()); + KStdAction::mail(this, TQ_SLOT(mail()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); // setup edit menu - undoAction = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection()); - redoAction = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection()); - cutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), actionCollection()); - copyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); - KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); - KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(select_all()), actionCollection()); - KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection()); - KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(search_again()), actionCollection()); - KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(replace()), actionCollection()); - - (void)new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()), + undoAction = KStdAction::undo(this, TQ_SLOT(undo()), actionCollection()); + redoAction = KStdAction::redo(this, TQ_SLOT(redo()), actionCollection()); + cutAction = KStdAction::cut(this, TQ_SLOT(cut()), actionCollection()); + copyAction = KStdAction::copy(this, TQ_SLOT(copy()), actionCollection()); + KStdAction::pasteText(this, TQ_SLOT(paste()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(select_all()), actionCollection()); + KStdAction::find(this, TQ_SLOT(search()), actionCollection()); + KStdAction::findNext(this, TQ_SLOT(search_again()), actionCollection()); + KStdAction::replace(this, TQ_SLOT(replace()), actionCollection()); + + (void)new TDEAction(i18n("&Insert File..."), 0, this, TQ_SLOT(file_insert()), actionCollection(), "insert_file"); - (void)new TDEAction(i18n("In&sert Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertDate()), + (void)new TDEAction(i18n("In&sert Date"), 0, this, TQ_SLOT(insertDate()), actionCollection(), "insert_date"); - (void)new TDEAction(i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(clean_space()), + (void)new TDEAction(i18n("Cl&ean Spaces"), 0, this, TQ_SLOT(clean_space()), actionCollection(), "clean_spaces"); // setup Tools menu - KStdAction::spelling(TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection()); + KStdAction::spelling(this, TQ_SLOT(spellcheck()), actionCollection()); // setup Go menu - KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), actionCollection()); + KStdAction::gotoLine(this, TQ_SLOT(gotoLine()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); } void TopLevel::setupStatusBar() @@ -264,7 +264,7 @@ void TopLevel::saveProperties(TDEConfig* config) TQString name = m_url.url(); if (name.isEmpty()) name = TQString("kedit%1-%2").arg(getpid()).arg((long)this); - TQString tmplocation = kapp->tempSaveName(m_url.url()); + TQString tmplocation = tdeApp->tempSaveName(m_url.url()); config->writeEntry("saved_to",tmplocation); saveFile(tmplocation, false, m_url.fileEncoding()); } @@ -388,20 +388,20 @@ void TopLevel::spellcheck() statusBar()->changeItem(i18n("Spellcheck: Started."), ID_GENERAL); initSpellConfig(); - tdespell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this), - TQT_SLOT( spell_started(KSpell *)), tdespellconfigOptions); + tdespell = new KSpell(this, i18n("Spellcheck"), this, + TQ_SLOT( spell_started(KSpell *)), tdespellconfigOptions); - connect (tdespell, TQT_SIGNAL ( death()), - this, TQT_SLOT ( spell_finished( ))); + connect (tdespell, TQ_SIGNAL ( death()), + this, TQ_SLOT ( spell_finished( ))); - connect (tdespell, TQT_SIGNAL (progress (unsigned int)), - this, TQT_SLOT (spell_progress (unsigned int))); - connect (tdespell, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), - eframe, TQT_SLOT (misspelling (const TQString &, const TQStringList &, unsigned int))); - connect (tdespell, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), - eframe, TQT_SLOT (corrected (const TQString &, const TQString &, unsigned int))); - connect (tdespell, TQT_SIGNAL (done(const TQString&)), - this, TQT_SLOT (spell_done(const TQString&))); + connect (tdespell, TQ_SIGNAL (progress (unsigned int)), + this, TQ_SLOT (spell_progress (unsigned int))); + connect (tdespell, TQ_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), + eframe, TQ_SLOT (misspelling (const TQString &, const TQStringList &, unsigned int))); + connect (tdespell, TQ_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), + eframe, TQ_SLOT (corrected (const TQString &, const TQString &, unsigned int))); + connect (tdespell, TQ_SIGNAL (done(const TQString&)), + this, TQ_SLOT (spell_done(const TQString&))); } @@ -577,7 +577,7 @@ void TopLevel::file_insert() bool TopLevel::queryExit() { // save recent files menu - config = kapp->config(); + config = tdeApp->config(); recent->saveEntries( config ); config->sync(); @@ -764,7 +764,7 @@ void TopLevel::mail() if( index != -1) defaultsubject = defaultsubject.right(defaultsubject.length() - index - 1 ); - kapp->invokeMailer( TQString(), TQString(), TQString(), + tdeApp->invokeMailer( TQString(), TQString(), TQString(), defaultsubject, eframe->text() ); } @@ -805,7 +805,7 @@ void TopLevel::fancyprint(){ void TopLevel::helpselected(){ - kapp->invokeHelp( ); + tdeApp->invokeHelp( ); } @@ -831,7 +831,7 @@ void TopLevel::showSettings() initSpellConfig(); TDEConfigDialog* dialog = new SettingsDialog(this, "settings", Prefs::self(), tdespellconfigOptions); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateSettings())); dialog->show(); } @@ -1233,7 +1233,7 @@ void TopLevel::updateSettings( void ) void TopLevel::readSettings( void ) { - recent->loadEntries( kapp->config() ); + recent->loadEntries( tdeApp->config() ); } @@ -1257,7 +1257,7 @@ static const TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain (int argc, char **argv) +extern "C" TDE_EXPORT int kdemain (int argc, char **argv) { bool have_top_window = false; @@ -1333,7 +1333,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele // Spelling addPage(spellConfig, i18n("Spelling"), "tools-check-spelling", i18n("Spelling Checker")); - connect(spellConfig, TQT_SIGNAL(configChanged()), this, TQT_SLOT(slotSpellConfigChanged())); + connect(spellConfig, TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotSpellConfigChanged())); // Miscellaneous Misc *miscOptions = new Misc(0, "MiscSettings"); diff --git a/kedit/kedit.h b/kedit/kedit.h index 9751b57..93a0d02 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -47,7 +47,7 @@ namespace TDEIO { class Job; } class TopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: @@ -205,7 +205,7 @@ private slots: }; class SettingsDialog: public TDEConfigDialog { -Q_OBJECT +TQ_OBJECT public: diff --git a/kedit/kedit.kcfg b/kedit/kedit.kcfg index ef1e433..c253c92 100644 --- a/kedit/kedit.kcfg +++ b/kedit/kedit.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <include>kstandarddirs.h</include> + <include>tdestandarddirs.h</include> <kcfgfile name="keditrc"/> <group name="Text Font"> <entry name="Font" type="Font" key="KEditFont"> diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index 6df31be..859172e 100644 --- a/kedit/ktextfiledlg.cpp +++ b/kedit/ktextfiledlg.cpp @@ -39,7 +39,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, // insert encoding action into toolbar TDESelectAction *mEncoding = new TDESelectAction( i18n( "Set &Encoding" ), 0, this, - TQT_SLOT( slotSetEncoding() ), this, + TQ_SLOT( slotSetEncoding() ), this, "encoding" ); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); @@ -62,7 +62,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, TDEAction* mEncoding = new TDEAction( i18n("Select Encoding..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding"); + this, TQ_SLOT( slotShowEncCombo() ), this, "encoding"); mEncoding->setIcon( TQString::fromLatin1("charset") ); @@ -118,10 +118,10 @@ void KTextFileDialog::slotShowEncCombo() i++; } - connect( encDlg->actionButton( KDialogBase::Ok ), TQT_SIGNAL(clicked()), - encDlg, TQT_SLOT(accept()) ); - connect( encDlg->actionButton( KDialogBase::Cancel ), TQT_SIGNAL(clicked()), - encDlg, TQT_SLOT(reject()) ); + connect( encDlg->actionButton( KDialogBase::Ok ), TQ_SIGNAL(clicked()), + encDlg, TQ_SLOT(accept()) ); + connect( encDlg->actionButton( KDialogBase::Cancel ), TQ_SIGNAL(clicked()), + encDlg, TQ_SLOT(reject()) ); encDlg->setMinimumSize( 300, 120); diff --git a/kedit/ktextfiledlg.h b/kedit/ktextfiledlg.h index d6d7ad6..8c1968e 100644 --- a/kedit/ktextfiledlg.h +++ b/kedit/ktextfiledlg.h @@ -36,7 +36,7 @@ class KURL; */ class KTextFileDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kedit/misc.ui b/kedit/misc.ui index 956790d..3ff751e 100644 --- a/kedit/misc.ui +++ b/kedit/misc.ui @@ -116,8 +116,8 @@ <includes> <include location="local" impldecl="in implementation">misc.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>settingsWrapMode( int mode )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index 91593a6..b5356cc 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -184,7 +184,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) v1->addSpacing( 10 ); - buttongroup = new TQButtonGroup( 3, Qt::Vertical, i18n("&Formatting"), this, "ButtonGroup_1" ); + buttongroup = new TQButtonGroup( 3, TQt::Vertical, i18n("&Formatting"), this, "ButtonGroup_1" ); quick = new TQRadioButton( i18n( "Q&uick format" ), buttongroup, "RadioButton_2" ); @@ -255,7 +255,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) " Due to a limitation of MS-DOS the label can only be 11 characters long." " Please note that Minix does not support labels, whatever you enter here.</qt>") ); - connect(labellabel,TQT_SIGNAL(toggled(bool)),lineedit,TQT_SLOT(setEnabled(bool))); + connect(labellabel,TQ_SIGNAL(toggled(bool)),lineedit,TQ_SLOT(setEnabled(bool))); TQVBoxLayout* v3 = new TQVBoxLayout( h1 ); @@ -264,7 +264,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) formatbutton->setAutoRepeat( false ); if (!numFileSystems) formatbutton->setDisabled(false); // We have not any helper program for creating any file system - connect(formatbutton,TQT_SIGNAL(clicked()),this,TQT_SLOT(format())); + connect(formatbutton,TQ_SIGNAL(clicked()),this,TQ_SLOT(format())); v3->addWidget( formatbutton ); TQWhatsThis::add( formatbutton, i18n("<qt>Click here to start formatting.</qt>") ); @@ -281,7 +281,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) quitbutton = new KPushButton( KStdGuiItem::quit(), this ); quitbutton->setAutoRepeat( false ); - connect(quitbutton,TQT_SIGNAL(clicked()),this,TQT_SLOT(quit())); + connect(quitbutton,TQ_SIGNAL(clicked()),this,TQ_SLOT(quit())); v3->addWidget( quitbutton ); ml->addSpacing( 10 ); @@ -335,7 +335,7 @@ void FloppyData::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { case TQt::Key_F1: - kapp->invokeHelp(); + tdeApp->invokeHelp(); break; default: KDialog::keyPressEvent(e); @@ -424,7 +424,7 @@ bool FloppyData::setInitialDevice(const TQString& dev) void FloppyData::quit(){ if (formatActions) formatActions->quit(); writeSettings(); - kapp->quit(); + tdeApp->quit(); delete this; } @@ -536,12 +536,12 @@ void FloppyData::format(){ } if (formatActions) delete formatActions; - formatActions = new KFActionQueue(TQT_TQOBJECT(this)); + formatActions = new KFActionQueue(this); - connect(formatActions,TQT_SIGNAL(status(const TQString &,int)), - this,TQT_SLOT(formatStatus(const TQString &,int))); - connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)), - this,TQT_SLOT(reset())); + connect(formatActions,TQ_SIGNAL(status(const TQString &,int)), + this,TQ_SLOT(formatStatus(const TQString &,int))); + connect(formatActions,TQ_SIGNAL(done(KFAction *,bool)), + this,TQ_SLOT(reset())); if ( quick->isChecked()) { @@ -550,7 +550,7 @@ void FloppyData::format(){ } else if ( zerooutformat->isChecked() ) { - DDZeroOut* f = new DDZeroOut( TQT_TQOBJECT(this) ); + DDZeroOut* f = new DDZeroOut( this ); if ( userDevice ) { f->configureDevice( currentComboBoxDevice ); @@ -569,7 +569,7 @@ void FloppyData::format(){ } else { - FDFormat *f = new FDFormat(TQT_TQOBJECT(this)); + FDFormat *f = new FDFormat(this); f->configureDevice(drive,blocks); f->configure(verifylabel->isChecked()); formatActions->queue(f); @@ -577,7 +577,7 @@ void FloppyData::format(){ if ( filesystemComboBox->currentText() == i18n("DOS") ) { - FATFilesystem *f = new FATFilesystem(TQT_TQOBJECT(this)); + FATFilesystem *f = new FATFilesystem(this); f->configure(verifylabel->isChecked(), labellabel->isChecked(), lineedit->text()); @@ -594,7 +594,7 @@ void FloppyData::format(){ else if ( filesystemComboBox->currentText() == i18n("ext2") ) { - Ext2Filesystem *f = new Ext2Filesystem(TQT_TQOBJECT(this)); + Ext2Filesystem *f = new Ext2Filesystem(this); f->configure(verifylabel->isChecked(), labellabel->isChecked(), lineedit->text()); @@ -612,7 +612,7 @@ void FloppyData::format(){ #ifdef ANY_BSD else if ( filesystemComboBox->currentText() == i18n("UFS") ) { - FloppyAction *f = new UFSFilesystem(TQT_TQOBJECT(this)); + FloppyAction *f = new UFSFilesystem(this); f->configureDevice(drive,blocks); formatActions->queue(f); } @@ -621,7 +621,7 @@ void FloppyData::format(){ #ifdef ANY_LINUX else if ( filesystemComboBox->currentText() == i18n("Minix") ) { - MinixFilesystem *f = new MinixFilesystem(TQT_TQOBJECT(this)); + MinixFilesystem *f = new MinixFilesystem(this); f->configure(verifylabel->isChecked(), labellabel->isChecked(), lineedit->text()); @@ -664,7 +664,7 @@ void FloppyData::formatStatus(const TQString &s,int p) void FloppyData::writeSettings(){ - config = kapp->config(); + config = tdeApp->config(); config->setGroup("GeneralData"); densityconfig = densityComboBox->currentText().stripWhiteSpace(); @@ -694,7 +694,7 @@ void FloppyData::writeSettings(){ void FloppyData::readSettings(){ - config = kapp->config(); + config = tdeApp->config(); config->setGroup("GeneralData"); verifyconfig = config->readNumEntry("Verify", 1); diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h index 240181c..901494f 100644 --- a/kfloppy/floppy.h +++ b/kfloppy/floppy.h @@ -43,7 +43,7 @@ class KFActionQueue; class FloppyData : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp index 5c3729c..31be451 100644 --- a/kfloppy/format.cpp +++ b/kfloppy/format.cpp @@ -28,9 +28,9 @@ #include <tqregexp.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "format.h" @@ -146,12 +146,12 @@ void KFActionQueue::queue(KFAction *p) else { kdDebug(KFAREA) << "Running action " << next->name() << endl; - TQObject::connect(next,TQT_SIGNAL(done(KFAction *,bool)), - this,TQT_SLOT(actionDone(KFAction *,bool))); + TQObject::connect(next,TQ_SIGNAL(done(KFAction *,bool)), + this,TQ_SLOT(actionDone(KFAction *,bool))); // Propagate signals - TQObject::connect(next,TQT_SIGNAL(status(const TQString &,int)), - this,TQT_SIGNAL(status(const TQString &,int))); - TQTimer::singleShot(0,next,TQT_SLOT(exec())); + TQObject::connect(next,TQ_SIGNAL(status(const TQString &,int)), + this,TQ_SIGNAL(status(const TQString &,int))); + TQTimer::singleShot(0,next,TQ_SLOT(exec())); } } @@ -370,12 +370,12 @@ bool FloppyAction::startProcess() { DEBUGSETUP; - connect(theProcess,TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processDone(TDEProcess *))); - connect(theProcess,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), - this,TQT_SLOT(processStdOut(TDEProcess *,char *,int))); - connect(theProcess,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)), - this,TQT_SLOT(processStdErr(TDEProcess *,char *,int))); + connect(theProcess,TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processDone(TDEProcess *))); + connect(theProcess,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this,TQ_SLOT(processStdOut(TDEProcess *,char *,int))); + connect(theProcess,TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)), + this,TQ_SLOT(processStdErr(TDEProcess *,char *,int))); theProcess->setEnvironment( "LC_ALL", "C" ); // We need the untranslated output of the tool return theProcess->start(TDEProcess::NotifyOnExit, diff --git a/kfloppy/format.h b/kfloppy/format.h index 2da577c..c0caa15 100644 --- a/kfloppy/format.h +++ b/kfloppy/format.h @@ -65,7 +65,7 @@ */ class KFAction : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -115,7 +115,7 @@ signals: */ class KFActionQueue : public KFAction { -Q_OBJECT +TQ_OBJECT public: @@ -175,7 +175,7 @@ class TDEProcess; class FloppyAction : public KFAction { -Q_OBJECT +TQ_OBJECT public: diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp index a35a715..82cbb4a 100644 --- a/kfloppy/zip.cpp +++ b/kfloppy/zip.cpp @@ -39,7 +39,7 @@ #include <tqwhatsthis.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> ZipFormat::ZipFormat(TQWidget *w,const char *n) : @@ -143,14 +143,14 @@ void ZipFormat::quit() if (statusTimer) delete statusTimer; statusTimer = new TQTimer(this); - connect(p,TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(transition())); - connect(p,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), - this,TQT_SLOT(processResult(TDEProcess *,char *,int))); - connect(p,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)), - this,TQT_SLOT(processResult(TDEProcess *,char *,int))); - connect(statusTimer,TQT_SIGNAL(timeout()), - this,TQT_SLOT(statusRequest())); + connect(p,TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(transition())); + connect(p,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this,TQ_SLOT(processResult(TDEProcess *,char *,int))); + connect(p,TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)), + this,TQ_SLOT(processResult(TDEProcess *,char *,int))); + connect(statusTimer,TQ_SIGNAL(timeout()), + this,TQ_SLOT(statusRequest())); transition(); } @@ -174,7 +174,7 @@ void ZipFormat::transition() // No point in making a dizzy display of it. statusTimer->start(10000); TQTimer::singleShot(1000,this, - TQT_SLOT(statusRequest())); + TQ_SLOT(statusRequest())); totalBlocks=12288; // 196608 * 512b = 12288 * 8192b ; } else diff --git a/kfloppy/zip.h b/kfloppy/zip.h index cb02d18..2bf2830 100644 --- a/kfloppy/zip.h +++ b/kfloppy/zip.h @@ -46,7 +46,7 @@ class TDEConfig; class ZipFormat : public DiskFormat { -Q_OBJECT +TQ_OBJECT public: diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui index 9cdee30..911b158 100644 --- a/kgpg/conf_decryption.ui +++ b/kgpg/conf_decryption.ui @@ -62,9 +62,9 @@ </widget> </grid> </widget> -<Q_SLOTS> +<slots> <slot>use_agent_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui index f64556a..1ac4d56 100644 --- a/kgpg/conf_encryption.ui +++ b/kgpg/conf_encryption.ui @@ -28,10 +28,7 @@ <cstring>kcfg_PgpCompatibility</cstring> </property> <property name="text"> - <string>PGP 6 compatibility</string> - </property> - <property name="accel"> - <string>Alt+6</string> + <string>PGP &6 compatibility</string> </property> <property name="whatsThis" stdset="0"> <string><qt><b>PGP 6 compatibility:</b><br /> @@ -312,8 +309,8 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<Q_SLOTS> +<slots> <slot>allow_custom_option_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui index ed91a8a..dea46e2 100644 --- a/kgpg/conf_gpg.ui +++ b/kgpg/conf_gpg.ui @@ -208,9 +208,7 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui index 94f4573..bc310d1 100644 --- a/kgpg/keyexport.ui +++ b/kgpg/keyexport.ui @@ -130,14 +130,12 @@ </connection> </connections> <includes> - <include location="local" impldecl="in implementation">keyexport.ui.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">keyexport.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>checkFile_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp index 30fd99c..bf354ed 100644 --- a/kgpg/keygener.cpp +++ b/kgpg/keygener.cpp @@ -65,7 +65,7 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent keyexp->insertItem(i18n("Months"),3); keyexp->insertItem(i18n("Years"),4); keyexp->setMinimumSize(keyexp->sizeHint()); - connect(keyexp,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activateexp(int))); + connect(keyexp,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activateexp(int))); (void) new TQLabel(i18n("Key size:"),bgroup1); keysize = new KComboBox(bgroup1); diff --git a/kgpg/keygener.h b/kgpg/keygener.h index 59c73b8..0645a6a 100644 --- a/kgpg/keygener.h +++ b/kgpg/keygener.h @@ -24,7 +24,7 @@ class KLineEdit; class keyGenerate : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: keyGenerate(TQWidget *parent=0, const char *name=0); diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index 1b833ac..291bb8c 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -20,10 +20,10 @@ ***************************************************************************/ #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqdatetime.h> #include <tqfile.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <kpassivepopup.h> #include <tdeaction.h> #include <tqregexp.h> @@ -76,18 +76,18 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi if (hasPhoto) { KgpgInterface *photoProcess=new KgpgInterface(); photoProcess->KgpgGetPhotoList(displayedKeyID); - connect(photoProcess,TQT_SIGNAL(signalPhotoList(TQStringList)),this,TQT_SLOT(slotSetMainPhoto(TQStringList))); + connect(photoProcess,TQ_SIGNAL(signalPhotoList(TQStringList)),this,TQ_SLOT(slotSetMainPhoto(TQStringList))); } else prop->comboId->setEnabled(false); - connect(prop->changeExp,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeExp())); - connect(this,TQT_SIGNAL(closeClicked()),this,TQT_SLOT(slotPreOk())); - connect(prop->changePass,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangePass())); - connect(prop->comboId,TQT_SIGNAL(activated (const TQString &)),this,TQT_SLOT(reloadMainPhoto(const TQString &))); - connect(prop->cbDisabled,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisableKey(bool))); - connect(prop->kCOwnerTrust,TQT_SIGNAL(activated (int)),this,TQT_SLOT(slotChangeTrust(int))); - connect(this,TQT_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQT_SLOT(slotSetPhoto(const TQPixmap&))); + connect(prop->changeExp,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangeExp())); + connect(this,TQ_SIGNAL(closeClicked()),this,TQ_SLOT(slotPreOk())); + connect(prop->changePass,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangePass())); + connect(prop->comboId,TQ_SIGNAL(activated (const TQString &)),this,TQ_SLOT(reloadMainPhoto(const TQString &))); + connect(prop->cbDisabled,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotDisableKey(bool))); + connect(prop->kCOwnerTrust,TQ_SIGNAL(activated (int)),this,TQ_SLOT(slotChangeTrust(int))); + connect(this,TQ_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQ_SLOT(slotSetPhoto(const TQPixmap&))); //prop->setMinimumSize(prop->sizeHint()); } @@ -235,7 +235,7 @@ void KgpgKeyInfo::loadKey(TQString Keyid) date = timestamp.date(); } else { - date = TQDate::fromString(gpgOutput.section(':',5,5), Qt::ISODate); + date = TQDate::fromString(gpgOutput.section(':',5,5), TQt::ISODate); } Q_ASSERT ( date.isValid())/* tqWarning("create date is not valid")*/; @@ -250,7 +250,7 @@ void KgpgKeyInfo::loadKey(TQString Keyid) date = timestamp.date(); } else { - date = TQDate::fromString(gpgOutput.section(':',6,6), Qt::ISODate); + date = TQDate::fromString(gpgOutput.section(':',6,6), TQt::ISODate); } Q_ASSERT (date.isValid()) /* tqWarning("Expirationdate date is not valid")*/; expirationDate=TDEGlobal::locale()->formatDate(date); @@ -344,11 +344,11 @@ void KgpgKeyInfo::reloadMainPhoto(const TQString &uid) kgpginfotmp=new KTempFile(); kgpginfotmp->setAutoDelete(true); TQString pgpgOutput="cp %i "+kgpginfotmp->name(); - KProcIO *p=new KProcIO(); + TDEProcIO *p=new TDEProcIO(); *p<<"gpg"<<"--no-tty"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput)); *p<<"--edit-key"<<displayedKeyID<<"uid"<<uid<<"showphoto"; - TQObject::connect(p, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(finishphotoreadprocess(KProcIO *))); - TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotMainImageRead(TDEProcess *))); + TQObject::connect(p, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(finishphotoreadprocess(TDEProcIO *))); + TQObject::connect(p, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotMainImageRead(TDEProcess *))); p->start(TDEProcess::NotifyOnExit,true); } @@ -374,14 +374,14 @@ void KgpgKeyInfo::slotSetPhoto(const TQPixmap &pix) // kdDebug(2100) << k_funcinfo << endl; TQImage dup=pix.convertToImage(); TQPixmap dup2; - dup2.convertFromImage(dup.scale(prop->pLPhoto->width(),prop->pLPhoto->height(),TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(prop->pLPhoto->width(),prop->pLPhoto->height(),TQImage::ScaleMin)); prop->pLPhoto->setPixmap(dup2); } -void KgpgKeyInfo::finishphotoreadprocess(KProcIO *p) +void KgpgKeyInfo::finishphotoreadprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -400,7 +400,7 @@ void KgpgKeyInfo::openPhoto() TDETrader::OfferList offers = TDETrader::self()->query("image/jpeg", "Type == 'Application'"); KService::Ptr ptr = offers.first(); //KMessageBox::sorry(0,ptr->desktopEntryName()); - KProcIO *p=new KProcIO(); + TDEProcIO *p=new TDEProcIO(); *p<<"gpg"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(ptr->desktopEntryName()+" %i"))<<"--list-keys"<<displayedKeyID; p->start(TDEProcess::DontCare,true); } @@ -423,10 +423,10 @@ void KgpgKeyInfo::slotChangeExp() TQVBoxLayout *vbox=new TQVBoxLayout(page,3); vbox->addWidget(kdt); vbox->addWidget(kb); - connect(kb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableDate(bool))); - connect(chdate,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotChangeDate())); - connect(kdt,TQT_SIGNAL(dateChanged(TQDate)),this,TQT_SLOT(slotCheckDate(TQDate))); - connect(kdt,TQT_SIGNAL(dateEntered(TQDate)),this,TQT_SLOT(slotCheckDate(TQDate))); + connect(kb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableDate(bool))); + connect(chdate,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotChangeDate())); + connect(kdt,TQ_SIGNAL(dateChanged(TQDate)),this,TQ_SLOT(slotCheckDate(TQDate))); + connect(kdt,TQ_SIGNAL(dateEntered(TQDate)),this,TQ_SLOT(slotCheckDate(TQDate))); chdate->setMainWidget(page); chdate->show(); @@ -450,7 +450,7 @@ void KgpgKeyInfo::slotChangeDate() else { KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,kdt->date(),false); } - connect(KeyExpirationProcess,TQT_SIGNAL(expirationFinished(int)),this,TQT_SLOT(slotInfoExpirationChanged(int))); + connect(KeyExpirationProcess,TQ_SIGNAL(expirationFinished(int)),this,TQ_SLOT(slotInfoExpirationChanged(int))); } void KgpgKeyInfo::slotEnableDate(bool isOn) @@ -481,7 +481,7 @@ void KgpgKeyInfo::slotChangePass() // kdDebug(2100) << k_funcinfo << endl; KgpgInterface *ChangeKeyPassProcess=new KgpgInterface(); ChangeKeyPassProcess->KgpgChangePass(displayedKeyID); - connect(ChangeKeyPassProcess,TQT_SIGNAL(passwordChanged()),this,TQT_SLOT(slotInfoPasswordChanged())); + connect(ChangeKeyPassProcess,TQ_SIGNAL(passwordChanged()),this,TQ_SLOT(slotInfoPasswordChanged())); } void KgpgKeyInfo::slotChangeTrust(int newTrust) @@ -489,7 +489,7 @@ void KgpgKeyInfo::slotChangeTrust(int newTrust) // kdDebug(2100) << k_funcinfo << endl; KgpgInterface *KeyTrustProcess=new KgpgInterface(); KeyTrustProcess->KgpgTrustExpire(displayedKeyID,newTrust); - connect(KeyTrustProcess,TQT_SIGNAL(trustfinished()),this,TQT_SLOT(slotInfoTrustChanged())); + connect(KeyTrustProcess,TQ_SIGNAL(trustfinished()),this,TQ_SLOT(slotInfoTrustChanged())); } diff --git a/kgpg/keyinfowidget.h b/kgpg/keyinfowidget.h index 6d00d3b..6ebc352 100644 --- a/kgpg/keyinfowidget.h +++ b/kgpg/keyinfowidget.h @@ -28,11 +28,11 @@ class TQCheckBox; class KDatePicker; class KeyProperties; class TDEProcess; -class KProcIO; +class TDEProcIO; class KgpgKeyInfo : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ private slots: void slotCheckDate(TQDate date); void openPhoto(); void slotSetPhoto(const TQPixmap &pix); - void finishphotoreadprocess(KProcIO *p); + void finishphotoreadprocess(TDEProcIO *p); void slotMainImageRead(TDEProcess *); void slotSetMainPhoto(TQStringList list); void reloadMainPhoto(const TQString &uid); diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 23eb79a..fee508b 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -40,13 +40,13 @@ #include <tqcursor.h> #include <tdelocale.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <tdelistview.h> #include <kstatusbar.h> #include <tdeconfig.h> #include <klineedit.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeaction.h> #include <kdebug.h> @@ -59,7 +59,7 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClose):KDialogBase( Swallow, i18n("Key Server"), Close, Close, parent, name,modal) { autoCloseWindow=autoClose; - config=new KSimpleConfig ("kgpgrc"); + config=new TDESimpleConfig ("kgpgrc"); page=new keyServerWidget(); setMainWidget(page); @@ -68,17 +68,17 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos currentKey = TQString(); hashMap.clear(); - connect(page->Buttonimport,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotImport())); - connect(page->Buttonsearch,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSearch())); - connect(page->Buttonexport,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPreExport())); - connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk())); + connect(page->Buttonimport,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotImport())); + connect(page->Buttonsearch,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSearch())); + connect(page->Buttonexport,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPreExport())); + connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotOk())); if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 - connect(page->cBproxyI,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableProxyI(bool))); - connect(page->cBproxyE,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableProxyE(bool))); + connect(page->cBproxyI,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableProxyI(bool))); + connect(page->cBproxyE,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableProxyE(bool))); } - connect(page->kLEimportid, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString &))); + connect(page->kLEimportid, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotTextChanged( const TQString &))); if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 page->cBproxyI->setChecked(KGpgSettings::useProxy()); page->cBproxyE->setChecked(KGpgSettings::useProxy()); @@ -91,10 +91,10 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos } } - KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *encid=new TDEProcIO(TQTextCodec::codecForLocale()); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; - TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotprocresult(TDEProcess *))); - TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotprocresult(TDEProcess *))); + TQObject::connect(encid, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotprocread(TDEProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty()); page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty()); @@ -123,7 +123,7 @@ void keyServer::slotEnableProxyE(bool on) page->kLEproxyE->setEnabled(on); } -void keyServer::slotprocread(KProcIO *p) +void keyServer::slotprocread(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; ///////////////////////////////////////////////////////////////// extract encryption keys @@ -237,14 +237,14 @@ void keyServer::slotSearch() listpop->kLVsearch->setColumnWidth(0,150); listpop->kLVsearch->setColumnWidth(1,130); listpop->statusText->setText(i18n("Connecting to the server...")); - connect(listpop->kLVsearch,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(transferKeyID())); - connect(dialogServer,TQT_SIGNAL(okClicked()),this,TQT_SLOT(preimport())); - connect(listpop->kLVsearch,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),dialogServer,TQT_SIGNAL(okClicked())); + connect(listpop->kLVsearch,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(transferKeyID())); + connect(dialogServer,TQ_SIGNAL(okClicked()),this,TQ_SLOT(preimport())); + connect(listpop->kLVsearch,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),dialogServer,TQ_SIGNAL(okClicked())); - connect(dialogServer,TQT_SIGNAL(closeClicked()),this,TQT_SLOT(handleQuit())); - connect( listpop , TQT_SIGNAL( destroyed() ) , this, TQT_SLOT( abortSearch())); + connect(dialogServer,TQ_SIGNAL(closeClicked()),this,TQ_SLOT(handleQuit())); + connect( listpop , TQ_SIGNAL( destroyed() ) , this, TQ_SLOT( abortSearch())); - searchproc=new KProcIO(TQTextCodec::codecForLocale()); + searchproc=new TDEProcIO(TQTextCodec::codecForLocale()); TQString keyserv=page->kCBimportks->currentText(); *searchproc<<"gpg"<<"--utf8-strings"/*<<"--no-tty"*/; @@ -262,8 +262,8 @@ void keyServer::slotSearch() keyNumbers=0; TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); - TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotsearchresult(TDEProcess *))); - TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *))); + TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotsearchresult(TDEProcess *))); + TQObject::connect(searchproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotsearchread(TDEProcIO *))); searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it searchproc->start(TDEProcess::NotifyOnExit,true); @@ -327,7 +327,7 @@ void keyServer::transferKeyID() listpop->kLEID->setText(keysToSearch.stripWhiteSpace()); } -void keyServer::slotsearchread(KProcIO *p) +void keyServer::slotsearchread(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required = TQString(); @@ -414,7 +414,7 @@ void keyServer::slotsearchresult(TDEProcess *) date = timestamp.date(); } else { - date = TQDate::fromString(keyString[5], Qt::ISODate); + date = TQDate::fromString(keyString[5], TQt::ISODate); } Q_ASSERT (date.isValid()) /*tqWarning("create date is not valid")*/; if (date < TQDate::currentDate() ) { @@ -446,7 +446,7 @@ void keyServer::slotsearchresult(TDEProcess *) date = timestamp.date(); } else { - date = TQDate::fromString(keyString[4], Qt::ISODate); + date = TQDate::fromString(keyString[4], TQt::ISODate); } created=TDEGlobal::locale()->formatDate(date, true); } @@ -463,7 +463,7 @@ void keyServer::slotsearchresult(TDEProcess *) date = timestamp.date(); } else { - date = TQDate::fromString(keyString[2], Qt::ISODate); + date = TQDate::fromString(keyString[2], TQt::ISODate); } created=TDEGlobal::locale()->formatDate(date, true); } @@ -514,7 +514,7 @@ void keyServer::slotExport(TQStringList keyIds) return; readmessage=TQString(); hashMap.clear(); - exportproc=new KProcIO(TQTextCodec::codecForLocale()); + exportproc=new TDEProcIO(TQTextCodec::codecForLocale()); TQString keyserv=page->kCBexportks->currentText(); *exportproc<<"gpg"<<"--utf8-strings"; @@ -532,8 +532,8 @@ void keyServer::slotExport(TQStringList keyIds) } *exportproc << "--status-fd=2" << "--keyserver" << keyserv << "--send-keys" << keyIds; - TQObject::connect(exportproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotexportresult(TDEProcess *))); - TQObject::connect(exportproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *))); + TQObject::connect(exportproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotexportresult(TDEProcess *))); + TQObject::connect(exportproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotimportread(TDEProcIO *))); exportproc->start(TDEProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); importpop = new TQDialog( this,0,true,TQt::WDestructiveClose); @@ -546,8 +546,8 @@ void keyServer::slotExport(TQStringList keyIds) importpop->setMinimumWidth(250); importpop->adjustSize(); importpop->show(); - connect(importpop,TQT_SIGNAL(destroyed ()),this,TQT_SLOT(abortExport())); - connect(Buttonabort,TQT_SIGNAL(clicked ()),importpop,TQT_SLOT(close())); + connect(importpop,TQ_SIGNAL(destroyed ()),this,TQ_SLOT(abortExport())); + connect(Buttonabort,TQ_SIGNAL(clicked ()),importpop,TQ_SLOT(close())); } void keyServer::abortExport() @@ -611,7 +611,7 @@ void keyServer::slotImport() keyNames=keyNames.simplifyWhiteSpace(); if ( keyNames.startsWith("0x") ) { - searchproc=new KProcIO(TQTextCodec::codecForLocale()); + searchproc=new TDEProcIO(TQTextCodec::codecForLocale()); *searchproc << "gpg"<<"--utf8-strings"<<"--no-secmem-warning"; if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 if (page->cBproxyI->isChecked()) { @@ -631,8 +631,8 @@ void keyServer::slotImport() keyNames=keyNames.stripWhiteSpace(); *searchproc<< TQString(TQFile::encodeName(fkeyNames)); } - TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotksearchprocresult(TDEProcess *))); - TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this), TQT_SLOT(slotsearchread(KProcIO *))); + TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotksearchprocresult(TDEProcess *))); + TQObject::connect(searchproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotsearchread(TDEProcIO *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it searchproc->start(TDEProcess::Block,true); @@ -646,7 +646,7 @@ void keyServer::slotImport() keysToImport = TQStringList::split(" ",keyNames,true); } - importproc=new KProcIO(TQTextCodec::codecForLocale()); + importproc=new TDEProcIO(TQTextCodec::codecForLocale()); *importproc<<"gpg"<<"--utf8-strings"; if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 if (page->cBproxyI->isChecked()) { @@ -663,8 +663,8 @@ void keyServer::slotImport() *importproc<< (*it) ; } - TQObject::connect(importproc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotimportresult(TDEProcess *))); - TQObject::connect(importproc, TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this), TQT_SLOT(slotimportread(KProcIO *))); + TQObject::connect(importproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotimportresult(TDEProcess *))); + TQObject::connect(importproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotimportread(TDEProcIO *))); importproc->start(TDEProcess::NotifyOnExit,true); importproc->closeWhenDone(); @@ -679,8 +679,8 @@ void keyServer::slotImport() importpop->setMinimumWidth(250); importpop->adjustSize(); importpop->show(); - connect(Buttonabort,TQT_SIGNAL(clicked()),importpop,TQT_SLOT(close())); - connect(importpop,TQT_SIGNAL(destroyed ()),this,TQT_SLOT(abortImport())); + connect(Buttonabort,TQ_SIGNAL(clicked()),importpop,TQ_SLOT(close())); + connect(importpop,TQ_SIGNAL(destroyed ()),this,TQ_SLOT(abortImport())); } void keyServer::abortImport() @@ -719,7 +719,7 @@ void keyServer::slotksearchprocresult(TDEProcess *) { date = timestamp.date(); } else { - date = TQDate::fromString(keyString[5], Qt::ISODate); + date = TQDate::fromString(keyString[5], TQt::ISODate); } Q_ASSERT (date.isValid()) /*tqWarning("create date is not valid")*/; if (date < TQDate::currentDate() ) { @@ -831,7 +831,7 @@ void keyServer::slotimportresult(TDEProcess*) if (autoCloseWindow) close(); } -void keyServer::slotimportread(KProcIO *p) +void keyServer::slotimportread(TDEProcIO *p) { TQString required; while (p->readln(required,true)!=-1) diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h index 51e98a8..b45fc25 100644 --- a/kgpg/keyservers.h +++ b/kgpg/keyservers.h @@ -22,15 +22,15 @@ #include "keyserver.h" class TDEListViewItem; -class KSimpleConfig; -class KProcIO; +class TDESimpleConfig; +class TDEProcIO; class TDEProcess; class searchRes; class keyServer : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: keyServer(TQWidget *parent=0, const char *name=0,bool modal=false,bool autoClose=false); @@ -42,15 +42,15 @@ public slots: void abortExport(); void abortSearch(); void transferKeyID(); - void slotsearchread(KProcIO *p); + void slotsearchread(TDEProcIO *p); void slotOk(); void syncCombobox(); void slotImport(); void slotSearch(); void slotimportresult(TDEProcess*); void slotexportresult(TDEProcess*); - void slotimportread(KProcIO *p); - void slotprocread(KProcIO *p); + void slotimportread(TDEProcIO *p); + void slotprocread(TDEProcIO *p); void slotprocresult(TDEProcess *); void slotPreExport(); void slotExport(TQStringList keyIds); @@ -60,19 +60,19 @@ public slots: void slotEnableProxyE(bool on); void handleQuit(); void slotTextChanged( const TQString &text); -// void slotksearchprocread(KProcIO *p); +// void slotksearchprocread(TDEProcIO *p); void slotksearchprocresult(TDEProcess *); private: TQDialog *importpop; - KSimpleConfig *config; + TDESimpleConfig *config; uint keyNumbers; TQString readmessage, currentKey;; TQStringList keysToImport, invalidKeys; TQMap<TQString,TQStringList> hashMap; - KProcIO *importproc,*exportproc; - KProcIO *searchproc; + TDEProcIO *importproc,*exportproc; + TDEProcIO *searchproc; searchRes *listpop; int count; bool cycle,autoCloseWindow; diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 0d7acd2..5073b96 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -51,8 +51,8 @@ #include <kiconloader.h> #include <tdetempfile.h> #include <twin.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <tdeaboutapplication.h> #include <kurlrequester.h> #include <ktip.h> @@ -60,11 +60,11 @@ #include <ktar.h> #include <kzip.h> #include <dcopclient.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <tdepopupmenu.h> #include <tqcursor.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include "kgpgeditor.h" @@ -84,10 +84,10 @@ MyView::MyView( TQWidget *parent, const char *name ) setBackgroundMode( X11ParentRelative ); openTasks=0; - TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,TQT_TQOBJECT(this), TQT_SLOT(decryptDroppedFile()),TQT_TQOBJECT(this),"decrypt_file"); - TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,TQT_TQOBJECT(this), TQT_SLOT(showDroppedFile()),TQT_TQOBJECT(this),"show_file"); - TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,TQT_TQOBJECT(this), TQT_SLOT(encryptDroppedFile()),TQT_TQOBJECT(this),"encrypt_file"); - TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,TQT_TQOBJECT(this), TQT_SLOT(signDroppedFile()),TQT_TQOBJECT(this),"sign_file"); + TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,this, TQ_SLOT(decryptDroppedFile()),this,"decrypt_file"); + TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,this, TQ_SLOT(showDroppedFile()),this,"show_file"); + TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,this, TQ_SLOT(encryptDroppedFile()),this,"encrypt_file"); + TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,this, TQ_SLOT(signDroppedFile()),this,"sign_file"); //TQToolTip::add(this,i18n("KGpg drag & drop encryption applet")); readOptions(); @@ -118,26 +118,26 @@ MyView::~MyView() void MyView::clipEncrypt() { popupPublic *dialoguec=new popupPublic(0, "public_keys", 0,false,goDefaultKey); - connect(dialoguec,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool))); + connect(dialoguec,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool))); dialoguec->exec(); delete dialoguec; } void MyView::clipDecrypt() { - TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace(); + TQString clippie=tdeApp->clipboard()->text(clipboardMode).stripWhiteSpace(); droppedtext(clippie,false); } void MyView::clipSign(bool openEditor) { - TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace(); + TQString clippie=tdeApp->clipboard()->text(clipboardMode).stripWhiteSpace(); if (!clippie.isEmpty()) { KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); if (!openEditor) - connect(kgpgtxtedit->view,TQT_SIGNAL(verifyFinished()),kgpgtxtedit,TQT_SLOT(closeWindow())); + connect(kgpgtxtedit->view,TQ_SIGNAL(verifyFinished()),kgpgtxtedit,TQ_SLOT(closeWindow())); kgpgtxtedit->view->editor->setText(clippie); kgpgtxtedit->view->clearSign(); kgpgtxtedit->show(); @@ -163,9 +163,9 @@ void MyView::encryptDroppedFolder() optionbx->insertItem(i18n("Gzip")); optionbx->insertItem(i18n("Bzip2")); bGroup->show(); - connect(dialogue,TQT_SIGNAL(keyListFilled ()),dialogue,TQT_SLOT(slotSetVisible())); - connect(optionbx,TQT_SIGNAL(activated (int)),TQT_TQOBJECT(this),TQT_SLOT(slotSetCompression(int))); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(keyListFilled ()),dialogue,TQ_SLOT(slotSetVisible())); + connect(optionbx,TQ_SIGNAL(activated (int)),this,TQ_SLOT(slotSetCompression(int))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool))); dialogue->CBshred->setEnabled(false); dialogue->exec(); dialogue=0L; @@ -213,7 +213,7 @@ pop = new KPassivePopup(); pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop)); pop->setAutoDelete(false); pop->show(); - kapp->processEvents(); + tdeApp->processEvents(); dialogue->slotAccept(); dialogue=0L; @@ -236,8 +236,8 @@ pop = new KPassivePopup(); KgpgInterface *folderprocess=new KgpgInterface(); folderprocess->KgpgEncryptFile(selec,KURL(kgpgfoldertmp->name()),encryptedFile,encryptOptions,symetric); - connect(folderprocess,TQT_SIGNAL(encryptionfinished(KURL)),TQT_TQOBJECT(this),TQT_SLOT(slotFolderFinished(KURL))); - connect(folderprocess,TQT_SIGNAL(errormessage(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotFolderFinishedError(TQString))); + connect(folderprocess,TQ_SIGNAL(encryptionfinished(KURL)),this,TQ_SLOT(slotFolderFinished(KURL))); + connect(folderprocess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(slotFolderFinishedError(TQString))); } void MyView::slotFolderFinished(KURL) @@ -280,7 +280,7 @@ void MyView::encryptDroppedFile() { TQStringList opts; KgpgLibrary *lib=new KgpgLibrary(this,KGpgSettings::pgpExtension()); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); if (KGpgSettings::fileKey()!=TQString()) { if (KGpgSettings::allowUntrustedKeys()) opts<<"--always-trust"; @@ -315,7 +315,7 @@ lb->insertStringList(droppedUrls.toStringList()); if (shredConfirm->exec()==TQDialog::Accepted) { KgpgLibrary *lib=new KgpgLibrary(this); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); lib->shredprocessenc(droppedUrls); } delete shredConfirm; @@ -348,7 +348,7 @@ void MyView::slotVerifyFile() ///////////////////////// pipe gpg command KgpgInterface *verifyFileProcess=new KgpgInterface(); verifyFileProcess->KgpgVerifyFile(droppedUrl,KURL(sigfile)); - connect (verifyFileProcess,TQT_SIGNAL(verifyquerykey(TQString)),TQT_TQOBJECT(this),TQT_SLOT(importSignature(TQString))); + connect (verifyFileProcess,TQ_SIGNAL(verifyquerykey(TQString)),this,TQ_SLOT(importSignature(TQString))); } void MyView::importSignature(TQString ID) @@ -423,10 +423,10 @@ void MyView::decryptDroppedFile() } KgpgLibrary *lib=new KgpgLibrary(this); lib->slotFileDec(droppedUrls.first(),swapname,KGpgSettings::customDecrypt()); - connect(lib,TQT_SIGNAL(importOver(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList))); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(importOver(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); // if (isFolder) - connect(lib,TQT_SIGNAL(decryptionOver()),TQT_TQOBJECT(this),TQT_SLOT(decryptNextFile())); + connect(lib,TQ_SIGNAL(decryptionOver()),this,TQ_SLOT(decryptNextFile())); } @@ -466,10 +466,10 @@ void MyView::showDroppedFile() kdDebug(2100)<<"------Show dropped file"<<endl; KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); kgpgtxtedit->view->editor->slotDroppedFile(droppedUrls.first()); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList))); - connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(refreshImported(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); + connect(kgpgtxtedit->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); kgpgtxtedit->show(); } @@ -523,8 +523,8 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt) if (inputText.startsWith("-----BEGIN PGP MESSAGE")) { KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); kgpgtxtedit->view->editor->setText(inputText); kgpgtxtedit->view->slotdecode(); kgpgtxtedit->show(); @@ -537,7 +537,7 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt) else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(inputText); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); return; } } @@ -573,7 +573,7 @@ void MyView::dropEvent (TQDropEvent *o) void MyView::readOptions() { clipboardMode=TQClipboard::Clipboard; - if ( KGpgSettings::useMouseSelection() && kapp->clipboard()->supportsSelection()) + if ( KGpgSettings::useMouseSelection() && tdeApp->clipboard()->supportsSelection()) clipboardMode=TQClipboard::Selection; if (KGpgSettings::firstRun()) { @@ -594,7 +594,7 @@ void MyView::readOptions() void MyView::firstRun() { - KProcIO *p=new KProcIO(); + TDEProcIO *p=new TDEProcIO(); *p<<"gpg"<<"--no-tty"<<"--list-secret-keys"; p->start(TDEProcess::Block); //// start gnupg so that it will create a config file startWizard(); @@ -710,17 +710,17 @@ void MyView::startWizard() } wiz->CBdefault->setCurrentItem(firstKey); - //connect(wiz->pushButton4,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotGenKey())); + //connect(wiz->pushButton4,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotGenKey())); if (!counter) - connect(wiz->finishButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotGenKey())); + connect(wiz->finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotGenKey())); else { wiz->textGenerate->hide(); wiz->setTitle(wiz->page_4,i18n("Step Three: Select your Default Private Key")); - connect(wiz->finishButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotSaveOptionsPath())); + connect(wiz->finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSaveOptionsPath())); } - connect(wiz->nextButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotWizardChange())); - connect( wiz , TQT_SIGNAL( destroyed() ) , this, TQT_SLOT( slotWizardClose())); - connect(wiz,TQT_SIGNAL(helpClicked()),TQT_TQOBJECT(this),TQT_SLOT(help())); + connect(wiz->nextButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotWizardChange())); + connect( wiz , TQ_SIGNAL( destroyed() ) , this, TQ_SLOT( slotWizardClose())); + connect(wiz,TQ_SIGNAL(helpClicked()),this,TQ_SLOT(help())); wiz->setFinishEnabled(wiz->page_4,true); wiz->show(); @@ -778,7 +778,7 @@ void MyView::installShred() KURL path; path.setPath(TDEGlobalSettings::desktopPath()); path.addPath("shredder.desktop"); - KDesktopFile configl2(path.path(), false); + TDEDesktopFile configl2(path.path(), false); if (configl2.isImmutable() ==false) { configl2.setGroup("Desktop Entry"); configl2.writeEntry("Type", "Application"); @@ -823,13 +823,13 @@ void MyView::slotGenKey() void MyView::about() { - TDEAboutApplication dialog(kapp->aboutData());//_aboutData); + TDEAboutApplication dialog(tdeApp->aboutData());//_aboutData); dialog.exec(); } void MyView::help() { - kapp->invokeHelp(0,"kgpg"); + tdeApp->invokeHelp(0,"kgpg"); } kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) @@ -838,19 +838,19 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) w=new MyView(this); w->show(); TDEPopupMenu *conf_menu=contextMenu(); - KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,TQT_TQOBJECT(w), TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt"); - KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,TQT_TQOBJECT(w), TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); - KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,TQT_TQOBJECT(w), TQT_SLOT(clipSign()),actionCollection(),"clip_sign"); + KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,w, TQ_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt"); + KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,w, TQ_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); + KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,w, TQ_SLOT(clipSign()),actionCollection(),"clip_sign"); TDEAction *KgpgOpenEditor; if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager) - KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(parent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); + KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,parent, TQ_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); else - KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor"); + KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQ_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor"); - TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server"); - TDEAction *KgpgPreferences=KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection()); + TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQ_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server"); + TDEAction *KgpgPreferences=KStdAction::preferences(this, TQ_SLOT(showOptions()), actionCollection()); - connect (conf_menu,TQT_SIGNAL(aboutToShow()),TQT_TQOBJECT(this),TQT_SLOT(checkMenu())); + connect (conf_menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(checkMenu())); KgpgEncryptClipboard->plug(conf_menu); KgpgDecryptClipboard->plug(conf_menu); @@ -865,7 +865,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) void kgpgapplet::checkMenu() { KgpgDecryptClipboard->setEnabled(false); - if ((kapp->clipboard()->text(w->clipboardMode).isEmpty())) + if ((tdeApp->clipboard()->text(w->clipboardMode).isEmpty())) { KgpgEncryptClipboard->setEnabled(false); KgpgSignClipboard->setEnabled(false); @@ -873,7 +873,7 @@ void kgpgapplet::checkMenu() else { KgpgEncryptClipboard->setEnabled(true); - if (kapp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN")) + if (tdeApp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN")) KgpgDecryptClipboard->setEnabled(true); KgpgSignClipboard->setEnabled(true); } @@ -882,21 +882,21 @@ void kgpgapplet::checkMenu() void kgpgapplet::showOptions() { TQByteArray data; -if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data)) +if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data)) kdDebug(2100) <<"there was some error using DCOP."<<endl; } void kgpgapplet::slotOpenKeyManager() { TQByteArray data; -if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data)) +if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data)) kdDebug(2100) <<"there was some error using DCOP."<<endl; } void kgpgapplet::slotOpenServerDialog() { TQByteArray data; -if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showKeyServer()",data)) +if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showKeyServer()",data)) kdDebug(2100) <<"there was some error using DCOP."<<endl; } @@ -909,7 +909,7 @@ kgpgapplet::~kgpgapplet() } KgpgAppletApp::KgpgAppletApp() - : KUniqueApplication()//, kgpg_applet( 0 ) + : TDEUniqueApplication()//, kgpg_applet( 0 ) { running=false; @@ -933,7 +933,7 @@ s_keyManager->keysList2->saveLayout(TDEGlobal::config(),"KeyView"); KGpgSettings::setShowCreat(s_keyManager->sCreat->isChecked()); KGpgSettings::setShowSize(s_keyManager->sSize->isChecked()); KGpgSettings::writeConfig(); - KSimpleConfig ("kgpgrc").sync(); + TDESimpleConfig ("kgpgrc").sync(); quit(); } @@ -970,16 +970,16 @@ int KgpgAppletApp::newInstance() { kgpg_applet=new kgpgapplet(s_keyManager->s_kgpgEditor,"kgpg_systrayapplet"); } - connect(s_keyManager,TQT_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQT_SLOT(encryptFiles(KURL::List))); - connect(s_keyManager,TQT_SIGNAL(installShredder()),kgpg_applet->w,TQT_SLOT(installShred())); - connect(s_keyManager->s_kgpgEditor,TQT_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQT_SLOT(encryptFiles(KURL::List))); - - connect( kgpg_applet, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotHandleQuit())); - connect(s_keyManager,TQT_SIGNAL(readAgainOptions()),kgpg_applet->w,TQT_SLOT(readOptions())); - connect(kgpg_applet->w,TQT_SIGNAL(updateDefault(TQString)),TQT_TQOBJECT(this),TQT_SLOT(wizardOver(TQString))); - connect(kgpg_applet->w,TQT_SIGNAL(createNewKey()),s_keyManager,TQT_SLOT(slotgenkey())); - connect(s_keyManager,TQT_SIGNAL(fontChanged(TQFont)),kgpg_applet->w,TQT_SIGNAL(setFont(TQFont))); - connect(kgpg_applet->w,TQT_SIGNAL(importedKeys(TQStringList)),s_keyManager->keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(s_keyManager,TQ_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQ_SLOT(encryptFiles(KURL::List))); + connect(s_keyManager,TQ_SIGNAL(installShredder()),kgpg_applet->w,TQ_SLOT(installShred())); + connect(s_keyManager->s_kgpgEditor,TQ_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQ_SLOT(encryptFiles(KURL::List))); + + connect( kgpg_applet, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotHandleQuit())); + connect(s_keyManager,TQ_SIGNAL(readAgainOptions()),kgpg_applet->w,TQ_SLOT(readOptions())); + connect(kgpg_applet->w,TQ_SIGNAL(updateDefault(TQString)),this,TQ_SLOT(wizardOver(TQString))); + connect(kgpg_applet->w,TQ_SIGNAL(createNewKey()),s_keyManager,TQ_SLOT(slotgenkey())); + connect(s_keyManager,TQ_SIGNAL(fontChanged(TQFont)),kgpg_applet->w,TQ_SIGNAL(setFont(TQFont))); + connect(kgpg_applet->w,TQ_SIGNAL(importedKeys(TQStringList)),s_keyManager->keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); kgpg_applet->show(); @@ -1069,7 +1069,7 @@ int KgpgAppletApp::newInstance() void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric) { - if (kapp->clipboard()->text(clipboardMode).isEmpty()) { + if (tdeApp->clipboard()->text(clipboardMode).isEmpty()) { KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this); return; } @@ -1079,14 +1079,14 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo if (symmetric) selec.clear(); KgpgInterface *txtEncrypt=new KgpgInterface(); - connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSetClip(TQString))); - connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),TQT_TQOBJECT(this),TQT_SLOT(slotPassiveClip())); - txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions); + connect (txtEncrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(slotSetClip(TQString))); + connect (txtEncrypt,TQ_SIGNAL(txtencryptionstarted()),this,TQ_SLOT(slotPassiveClip())); + txtEncrypt->KgpgEncryptText(tdeApp->clipboard()->text(clipboardMode),selec,encryptOptions); } void MyView::slotPassiveClip() { -TQString newtxt=kapp->clipboard()->text(clipboardMode); +TQString newtxt=tdeApp->clipboard()->text(clipboardMode); if (newtxt.length()>300) newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace()); diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index e797d28..2ce6008 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -24,7 +24,7 @@ #include <tdeaction.h> #include <ksystemtray.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <kurl.h> #include <tdeshortcut.h> @@ -43,7 +43,7 @@ class popupPublic; class MyView : public TQLabel { - Q_OBJECT + TQ_OBJECT public: @@ -119,9 +119,9 @@ signals: void importedKeys(TQStringList); }; -class kgpgapplet : public KSystemTray//KUniqueApplication +class kgpgapplet : public KSystemTray//TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: @@ -143,9 +143,9 @@ private slots: class TDECmdLineArgs; -class KgpgAppletApp : public KUniqueApplication +class KgpgAppletApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT friend class kgpgapplet; public: diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index b60ee8d..1c7aa8d 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -78,14 +78,14 @@ delete view; void KgpgApp::slotOptions() { TQByteArray data; -if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data)) +if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showOptions()",data)) kdDebug(2100) <<"there was some error using DCOP."<<endl; } void KgpgApp::slotKeyManager() { TQByteArray data; -if (!kapp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data)) +if (!tdeApp->dcopClient()->send("kgpg", "KeyInterface", "showKeyManager()",data)) kdDebug(2100) <<"there was some error using DCOP."<<endl; } @@ -93,7 +93,7 @@ void KgpgApp::closeEvent ( TQCloseEvent * e ) { if (!isMainWindow) { - kapp->ref(); + tdeApp->ref(); TDEMainWindow::closeEvent( e ); } else e->accept(); @@ -126,33 +126,33 @@ void KgpgApp::readOptions(bool doresize) void KgpgApp::initActions() { - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); - KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); - KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection(),"kgpg_config"); - - //KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - //KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); - - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt"); - (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt"); - (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage"); - editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotundo()), actionCollection()); - editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotredo()), actionCollection()); - //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,TQT_TQOBJECT(this), TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage"); - (void) new TDEAction(i18n("&Generate Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate"); - (void) new TDEAction(i18n("&Verify Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify"); - (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,TQT_TQOBJECT(this), TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check"); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotOptions()), actionCollection(),"kgpg_config"); + + //KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); + //KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); + + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,this, TQ_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt"); + (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,this, TQ_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt"); + (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQ_SLOT(slotKeyManager()), actionCollection(),"key_manage"); + editUndo = KStdAction::undo(this, TQ_SLOT(slotundo()), actionCollection()); + editRedo = KStdAction::redo(this, TQ_SLOT(slotredo()), actionCollection()); + //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,this, TQ_SLOT(slotManageKey()), actionCollection(),"keys_manage"); + (void) new TDEAction(i18n("&Generate Signature..."),0, this, TQ_SLOT(slotPreSignFile()), actionCollection(), "sign_generate"); + (void) new TDEAction(i18n("&Verify Signature..."),0, this, TQ_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify"); + (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,this, TQ_SLOT(slotCheckMd5()), actionCollection(), "sign_check"); + KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); // comment out for now, only confusing - //encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQT_SLOT(slotSetCharset()),actionCollection(),"charsets"); + //encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQ_SLOT(slotSetCharset()),actionCollection(),"charsets"); } void KgpgApp::slotSetFont(TQFont myFont) @@ -181,7 +181,7 @@ void KgpgApp::initView() view = new KgpgView(this,0); // doc->addView(view); - connect(view,TQT_SIGNAL(resetEncoding(bool)),this,TQT_SLOT(slotResetEncoding(bool))); + connect(view,TQ_SIGNAL(resetEncoding(bool)),this,TQ_SLOT(slotResetEncoding(bool))); setCentralWidget(view); setCaption(i18n("Untitled"),false); /// doc->URL().fileName(),false); @@ -276,7 +276,7 @@ void KgpgApp::slotFilePreDec() } KgpgLibrary *lib=new KgpgLibrary(this); lib->slotFileDec(url,KURL(newname), customDecrypt); - connect(lib,TQT_SIGNAL(importOver(TQStringList)),this,TQT_SIGNAL(refreshImported(TQStringList))); + connect(lib,TQ_SIGNAL(importOver(TQStringList)),this,TQ_SIGNAL(refreshImported(TQStringList))); } else openEncryptedDocumentFile(url); } @@ -534,7 +534,7 @@ void KgpgApp::slotVerifyFile(KURL url) ///////////////////////// pipe gpg command KgpgInterface *verifyFileProcess=new KgpgInterface(); verifyFileProcess->KgpgVerifyFile(url,KURL(sigfile)); - connect (verifyFileProcess,TQT_SIGNAL(verifyquerykey(TQString)),this,TQT_SLOT(importSignatureKey(TQString))); + connect (verifyFileProcess,TQ_SIGNAL(verifyquerykey(TQString)),this,TQ_SLOT(importSignatureKey(TQString))); } } diff --git a/kgpg/kgpgeditor.h b/kgpg/kgpgeditor.h index 4f8a9fb..4b6d2c3 100644 --- a/kgpg/kgpgeditor.h +++ b/kgpg/kgpgeditor.h @@ -35,7 +35,7 @@ class KgpgView; class KgpgApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KgpgView; diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 9fb5cca..e397966 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -41,8 +41,8 @@ #include <kiconloader.h> #include <tdeaction.h> #include <tqtextcodec.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <tdeconfig.h> #include <tqfile.h> #include <kled.h> @@ -101,7 +101,7 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de sourceFile=srcUrl; message=TQString(); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) if (!TQFile::encodeName(*it).isEmpty()) *proc<< TQString(TQFile::encodeName(*it)); @@ -118,8 +118,8 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de *proc<<TQString(TQFile::encodeName(srcUrl.path())); ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(encryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readencprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(encryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readencprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -138,7 +138,7 @@ void KgpgInterface::encryptfin(TDEProcess *) } } -void KgpgInterface::readencprocess(KProcIO *p) +void KgpgInterface::readencprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -178,7 +178,7 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option userIDs=TQString(); anonymous=false; - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; @@ -190,8 +190,8 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option *proc<<"-d"<<TQString(TQFile::encodeName(srcUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(decryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readdecprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(decryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readdecprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -205,7 +205,7 @@ void KgpgInterface::decryptfin(TDEProcess *) } -void KgpgInterface::readdecprocess(KProcIO *p) +void KgpgInterface::readdecprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -266,7 +266,7 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString if (codec->canEncode(text)) txtToEncrypt=text; else txtToEncrypt=text.utf8(); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--command-fd=0"<<"--status-fd=1"<<"--utf8-strings"; for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) @@ -283,8 +283,8 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtencryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtreadencprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtencryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(txtreadencprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,false); emit txtencryptionstarted(); } @@ -299,7 +299,7 @@ void KgpgInterface::txtencryptfin(TDEProcess *) emit txtencryptionfinished(TQString()); } -void KgpgInterface::txtreadencprocess(KProcIO *p) +void KgpgInterface::txtreadencprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -352,9 +352,9 @@ void KgpgInterface::KgpgDecryptText(TQString text,TQStringList Options) ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *))); - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtdecryptfin(TDEProcess *))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getOutput(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getCmdOutput(TDEProcess *, char *, int))); proc->start(TDEProcess::NotifyOnExit,TDEProcess::All); proc->writeStdin(text.utf8(), text.length()); } @@ -462,7 +462,7 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op if (codec->canEncode(text)) txtprocess=text; else txtprocess=text.utf8(); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--command-fd=0"<<"--status-fd=1"<<"--utf8-strings"; for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) @@ -471,8 +471,8 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtsignfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtsignprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtsignfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(txtsignprocess(TDEProcIO *))); //emit txtsigningstarted(); @@ -498,7 +498,7 @@ void KgpgInterface::txtsignfin(TDEProcess *) emit txtSignOver(TQString()); } -void KgpgInterface::txtsignprocess(KProcIO *p) +void KgpgInterface::txtsignprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -571,9 +571,9 @@ void KgpgInterface::KgpgDecryptFileToText(KURL srcUrl,TQStringList Options) ///////// when process ends, update dialog infos - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *))); - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtdecryptfin(TDEProcess *))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getOutput(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getCmdOutput(TDEProcess *, char *, int))); proc->start(TDEProcess::NotifyOnExit,TDEProcess::All); } @@ -590,10 +590,10 @@ void KgpgInterface::KgpgVerifyText(TQString text) signmiss=false; signID=TQString(); message=TQString(); - KProcIO *verifyproc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *verifyproc=new TDEProcIO(TQTextCodec::codecForLocale()); *verifyproc<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"<<"--verify"; - connect(verifyproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotverifyresult(TDEProcess *))); - connect(verifyproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotverifyread(KProcIO *))); + connect(verifyproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotverifyresult(TDEProcess *))); + connect(verifyproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotverifyread(TDEProcIO *))); verifyproc->start(TDEProcess::NotifyOnExit,true); verifyproc->writeStdin (text); verifyproc->closeWhenDone(); @@ -611,7 +611,7 @@ if (signmiss) emit missingSignature(signID); //kdDebug(2100) << "GPG VERIFY OVER________"<<endl; } -void KgpgInterface::slotverifyread(KProcIO *p) +void KgpgInterface::slotverifyread(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -655,7 +655,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p f.open( IO_ReadOnly); KMD5 checkfile; checkfile.reset(); - checkfile.update(*TQT_TQIODEVICE(&f)); + checkfile.update(f); mdSum=checkfile.hexDigest().data(); f.close(); TQWidget *page = new TQWidget(this); @@ -734,7 +734,7 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options message=TQString(); step=3; ///////////// create gpg command - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); keyID=keyID.stripWhiteSpace(); *proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--utf8-strings"<<"--status-fd=2"<<"--command-fd=0"<<"-u"<<keyID.local8Bit(); for ( TQStringList::Iterator it = Options.begin(); it != Options.end(); ++it ) @@ -743,8 +743,8 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options *proc<<"--output"<<TQString(TQFile::encodeName(srcUrl.path()+".sig")); *proc<<"--detach-sig"<<TQString(TQFile::encodeName(srcUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(signfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readsignprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(signfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readsignprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -763,7 +763,7 @@ void KgpgInterface::signfin(TDEProcess *) } -void KgpgInterface::readsignprocess(KProcIO *p) +void KgpgInterface::readsignprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -812,20 +812,20 @@ void KgpgInterface::KgpgVerifyFile(KURL sigUrl,KURL srcUrl) signID=TQString(); signmiss=false; ///////////// create gpg command - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); file=sigUrl; *proc<<"gpg"<<"--no-tty"<<"--utf8-strings"<<"--no-secmem-warning"<<"--status-fd=2"<<"--verify"; if (!srcUrl.isEmpty()) *proc<<TQString(TQFile::encodeName(srcUrl.path())); *proc<<TQString(TQFile::encodeName(sigUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(verifyfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(verifyfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readprocess(TDEProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::readprocess(KProcIO *p) +void KgpgInterface::readprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -898,18 +898,18 @@ void KgpgInterface::KgpgSignKey(TQString keyID,TQString signKeyID,TQString signK signSuccess=0; step=1; output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--utf8-strings"<<"--command-fd=0"<<"--status-fd=2"<<"-u"<<signKeyID; *conprocess<<"--edit-key"<<keyID; if (local) *conprocess<<"lsign"; else *conprocess<<"sign"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(sigprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(signover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(sigprocess(TDEProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(signover(TDEProcess *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::sigprocess(KProcIO *p) +void KgpgInterface::sigprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1148,17 +1148,17 @@ void KgpgInterface::KgpgDelSignature(TQString keyID,TQString signKeyID) signb++; } pclose(fp); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--utf8-strings"<<"--command-fd=0"<<"--status-fd=2"; *conprocess<<"--edit-key"<<keyID<<"uid 1"<<"delsig"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(delsigprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delsignover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(delsigprocess(TDEProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delsignover(TDEProcess *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::delsigprocess(KProcIO *p) +void KgpgInterface::delsigprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; @@ -1239,16 +1239,16 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited) expirationDelay=TQDate::currentDate().daysTo(date); // kdDebug(2100) << "KgpgKeyExpire date: " << TQDate::currentDate().daysTo(date) <<endl; output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"expire"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(expprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(expover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(expprocess(TDEProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(expover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } -void KgpgInterface::expprocess(KProcIO *p) +void KgpgInterface::expprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1336,16 +1336,16 @@ void KgpgInterface::KgpgTrustExpire(TQString keyID,int keyTrust) /* Don't know=1; Do NOT trust=2; Marginally=3; Fully=4; Ultimately=5; */ output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"trust"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(trustprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(trustover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(trustprocess(TDEProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(trustover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::trustprocess(KProcIO *p) +void KgpgInterface::trustprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1395,16 +1395,16 @@ void KgpgInterface::KgpgChangePass(TQString keyID) step=1; output=TQString(); message=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--no-use-agent"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"passwd"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(passprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(passover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(passprocess(TDEProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(passover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } -void KgpgInterface::passprocess(KProcIO *p) +void KgpgInterface::passprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1497,7 +1497,7 @@ TQString KgpgInterface::getKey(TQStringList IDs, bool attributes) { // kdDebug(2100) << k_funcinfo << endl; keyString=TQString(); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); *proc<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--utf8-strings"; *proc<<"--export"<<"--armor"; if (!attributes) @@ -1505,13 +1505,13 @@ TQString KgpgInterface::getKey(TQStringList IDs, bool attributes) for ( TQStringList::Iterator it = IDs.begin(); it != IDs.end(); ++it ) *proc << *it; - TQObject::connect(proc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotReadKey(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotReadKey(TDEProcIO *))); proc->start(TDEProcess::Block,false); return keyString; } -void KgpgInterface::slotReadKey(KProcIO *p) +void KgpgInterface::slotReadKey(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString outp; @@ -1529,12 +1529,12 @@ void KgpgInterface::importKeyURL(KURL url) // kdDebug(2100) << k_funcinfo << endl; if( TDEIO::NetAccess::download( url, tempKeyFile,0) ) { message=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import"; *conprocess<<"--allow-secret-key-import"; *conprocess<<tempKeyFile; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importURLover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importURLover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(importprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } } @@ -1543,11 +1543,11 @@ void KgpgInterface::importKey(TQString keystr) { ///////////// import a key message=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--import"; *conprocess<<"--allow-secret-key-import"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(importprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); conprocess->writeStdin(keystr, true); conprocess->closeWhenDone(); @@ -1627,7 +1627,7 @@ void KgpgInterface::importURLover(TDEProcess *p) //emit importfinished(); } -void KgpgInterface::importprocess(KProcIO *p) +void KgpgInterface::importprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString outp; @@ -1650,11 +1650,11 @@ uidEmail=email; output=TQString(); addSuccess=true; - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"adduid"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(adduidover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(adduidprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(adduidover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(adduidprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1665,7 +1665,7 @@ if (addSuccess) emit addUidFinished(); else emit addUidError(output); } -void KgpgInterface::adduidprocess(KProcIO *p) +void KgpgInterface::adduidprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1737,15 +1737,15 @@ output=TQString(); photoCount=1; userIDs=keyID; - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"; *conprocess<<"--with-colon"<<"--list-keys"<<keyID; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(photoreadover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(photoreadprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(photoreadover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(photoreadprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } -void KgpgInterface::photoreadprocess(KProcIO *p) +void KgpgInterface::photoreadprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1772,7 +1772,7 @@ KTempFile *kgpginfotmp=new KTempFile(); kgpginfotmp->setAutoDelete(true); TQString pgpgOutput="cp %i "+kgpginfotmp->name(); -KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); +TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput))<<"--edit-key"<<userIDs<<"uid"<<TQString::number(uid)<<"showphoto"; conprocess->start(TDEProcess::Block); @@ -1790,11 +1790,11 @@ void KgpgInterface::KgpgDeletePhoto(TQString keyID,TQString uid) // kdDebug(2100) << k_funcinfo << endl; delSuccess=true; output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"uid"<<uid<<"deluid"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delphotoover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(delphotoprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delphotoover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(delphotoprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1805,7 +1805,7 @@ if (delSuccess) emit delPhotoFinished(); else emit delPhotoError(output); } -void KgpgInterface::delphotoprocess(KProcIO *p) +void KgpgInterface::delphotoprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1856,11 +1856,11 @@ void KgpgInterface::KgpgAddPhoto(TQString keyID,TQString imagePath) photoUrl=imagePath; output=TQString(); addSuccess=true; - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"addphoto"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(addphotoover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(addphotoprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(addphotoover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(addphotoprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1871,7 +1871,7 @@ if (addSuccess) emit addPhotoFinished(); else emit addPhotoError(output); } -void KgpgInterface::addphotoprocess(KProcIO *p) +void KgpgInterface::addphotoprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); @@ -1938,13 +1938,13 @@ void KgpgInterface::KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,T revokeDescription=description; certificateUrl=revokeUrl; output=TQString(); - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--logger-fd=2"<<"--command-fd=0"<<"--utf8-strings"; if (!revokeUrl.isEmpty()) *conprocess<<"-o"<<revokeUrl; *conprocess<<"--gen-revoke"<<keyID; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(revokeover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(revokeprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(revokeover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(revokeprocess(TDEProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1963,7 +1963,7 @@ void KgpgInterface::revokeover(TDEProcess *) } } -void KgpgInterface::revokeprocess(KProcIO *p) +void KgpgInterface::revokeprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required=TQString(); diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h index 2433c72..df00e45 100644 --- a/kgpg/kgpginterface.h +++ b/kgpg/kgpginterface.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> class TQLabel; -class KProcIO; +class TDEProcIO; class TDEProcess; class KLed; @@ -36,7 +36,7 @@ class KLed; class KgpgInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -83,7 +83,7 @@ public slots: void KgpgVerifyFile(KURL sigUrl,KURL srcUrl=KURL()) ; void KgpgVerifyText(TQString text); - void slotverifyread(KProcIO *p); + void slotverifyread(TDEProcIO *p); void slotverifyresult(TDEProcess*); @@ -142,7 +142,7 @@ public slots: void KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,TQString description); void revokeover(TDEProcess *); - void revokeprocess(KProcIO *p); + void revokeprocess(TDEProcIO *p); void KgpgDeletePhoto(TQString keyID,TQString uid); void KgpgAddPhoto(TQString keyID,TQString imagePath); @@ -177,7 +177,7 @@ private slots: /** * Read output of the signature process */ - void sigprocess(KProcIO *p); + void sigprocess(TDEProcIO *p); /** * Checks if the encrypted file was saved. @@ -202,7 +202,7 @@ private slots: /** * Reads output of the delete signature process */ - void delsigprocess(KProcIO *p); + void delsigprocess(TDEProcIO *p); /** * Checks output of the delete signature process */ @@ -215,54 +215,54 @@ private slots: /** * Read output of the import process */ - void importprocess(KProcIO *p); + void importprocess(TDEProcIO *p); /** * Reads output of the current process + allow overwriting of a file */ - void readprocess(KProcIO *p); + void readprocess(TDEProcIO *p); /** * Reads output of the current encryption process + allow overwriting of a file */ - void readencprocess(KProcIO *p); + void readencprocess(TDEProcIO *p); /** * Reads output of the current signing process + allow overwriting of a file */ - void readsignprocess(KProcIO *p); + void readsignprocess(TDEProcIO *p); /** * Reads output of the current decryption process + allow overwriting of a file */ - void readdecprocess(KProcIO *p); + void readdecprocess(TDEProcIO *p); /** * Checks output of the verify process */ void verifyfin(TDEProcess *p); - void expprocess(KProcIO *p); + void expprocess(TDEProcIO *p); void expover(TDEProcess*); - void trustprocess(KProcIO *p); - void passprocess(KProcIO *p); + void trustprocess(TDEProcIO *p); + void passprocess(TDEProcIO *p); void trustover(TDEProcess *); void passover(TDEProcess *); - void txtreadencprocess(KProcIO *p); + void txtreadencprocess(TDEProcIO *p); void txtencryptfin(TDEProcess *); void delphotoover(TDEProcess *); - void delphotoprocess(KProcIO *p); + void delphotoprocess(TDEProcIO *p); void addphotoover(TDEProcess *); - void addphotoprocess(KProcIO *p); + void addphotoprocess(TDEProcIO *p); void adduidover(TDEProcess *); - void adduidprocess(KProcIO *p); + void adduidprocess(TDEProcIO *p); - void slotReadKey(KProcIO *p); + void slotReadKey(TDEProcIO *p); void photoreadover(TDEProcess *); - void photoreadprocess(KProcIO *p); + void photoreadprocess(TDEProcIO *p); bool isPhotoId(int uid); void updateIDs(TQString txtString); - void txtsignprocess(KProcIO *p); + void txtsignprocess(TDEProcIO *p); void txtsignfin(TDEProcess *); //void txtdecryptfin(TDEProcess *); @@ -389,7 +389,7 @@ private: class Md5Widget :public KDialogBase { - Q_OBJECT + TQ_OBJECT public: Md5Widget(TQWidget *parent=0, const char *name=0,KURL url=KURL()); diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index 66fbc45..05af489 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -54,7 +54,7 @@ void KgpgLibrary::slotFileEnc(KURL::List urls,TQStringList opts,TQStringList def TQString fileNames=urls.first().fileName(); if (urls.count()>1) fileNames+=",..."; popupPublic *dialogue=new popupPublic(0,"Public keys",fileNames,true,goDefaultKey); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(startencode(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(startencode(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; } else @@ -111,11 +111,11 @@ void KgpgLibrary::fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList e cryptFileProcess->KgpgEncryptFile(selec,urlselected,dest,encryptOptions,symetric); if (!popIsActive) { - //connect(cryptFileProcess,TQT_SIGNAL(processstarted(TQString)),this,TQT_SLOT(processpopup2(TQString))); + //connect(cryptFileProcess,TQ_SIGNAL(processstarted(TQString)),this,TQ_SLOT(processpopup2(TQString))); popIsActive=true; } - connect(cryptFileProcess,TQT_SIGNAL(encryptionfinished(KURL)),this,TQT_SLOT(processenc(KURL))); - connect(cryptFileProcess,TQT_SIGNAL(errormessage(TQString)),this,TQT_SLOT(processencerror(TQString))); + connect(cryptFileProcess,TQ_SIGNAL(encryptionfinished(KURL)),this,TQ_SLOT(processenc(KURL))); + connect(cryptFileProcess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(processencerror(TQString))); } void KgpgLibrary::processpopup2(TQString fileName) @@ -144,7 +144,7 @@ emit systemMessage(i18n("Shredding %n file","Shredding %n files",filesToShred.co TDEIO::Job *job; job = TDEIO::del( filesToShred, true ); -connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotShredResult( TDEIO::Job * ) ) ); +connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),TQ_SLOT( slotShredResult( TDEIO::Job * ) ) ); } void KgpgLibrary::slotShredResult( TDEIO::Job * job ) @@ -184,10 +184,10 @@ void KgpgLibrary::slotFileDec(KURL srcUrl,KURL destUrl,TQStringList customDecryp pop = new KPassivePopup(); urlselected=srcUrl; decryptFileProcess->KgpgDecryptFile(srcUrl,destUrl,customDecryptOption); - connect(decryptFileProcess,TQT_SIGNAL(processaborted(bool)),this,TQT_SLOT(processdecover())); - connect(decryptFileProcess,TQT_SIGNAL(processstarted(TQString)),this,TQT_SLOT(processpopup(TQString))); - connect(decryptFileProcess,TQT_SIGNAL(decryptionfinished()),this,TQT_SLOT(processdecover())); - connect(decryptFileProcess,TQT_SIGNAL(errormessage(TQString)),this,TQT_SLOT(processdecerror(TQString))); + connect(decryptFileProcess,TQ_SIGNAL(processaborted(bool)),this,TQ_SLOT(processdecover())); + connect(decryptFileProcess,TQ_SIGNAL(processstarted(TQString)),this,TQ_SLOT(processpopup(TQString))); + connect(decryptFileProcess,TQ_SIGNAL(decryptionfinished()),this,TQ_SLOT(processdecover())); + connect(decryptFileProcess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(processdecerror(TQString))); } void KgpgLibrary::processpopup(TQString fileName) @@ -228,7 +228,7 @@ void KgpgLibrary::processdecerror(TQString mssge) else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(urlselected); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SIGNAL(importOver(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SIGNAL(importOver(TQStringList))); return; } } else if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) {////// dropped file is a public key, ask for import diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h index 267b7f6..965201c 100644 --- a/kgpg/kgpglibrary.h +++ b/kgpg/kgpglibrary.h @@ -30,7 +30,7 @@ class KProgress; class KgpgLibrary : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index f412172..c6dee50 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -26,7 +26,7 @@ #include <tdeconfig.h> #include <tdeversion.h> #include <tdelocale.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tqcheckbox.h> #include <tqradiobutton.h> #include <tqpushbutton.h> @@ -40,8 +40,8 @@ #include <tdefiledialog.h> #include <kinputdialog.h> #include <tdefontdialog.h> -#include <kdesktopfile.h> -#include <kstandarddirs.h> +#include <tdedesktopfile.h> +#include <tdestandarddirs.h> #include <kcolorbutton.h> #include <stdlib.h> #include <kdebug.h> @@ -117,26 +117,26 @@ kgpgOptions::kgpgOptions(TQWidget *parent, const char *name) page1->clear_fkey->setIconSet(TQIconSet(TQPixmap(SmallIcon("clear_left")))); // The following widgets are managed manually. - connect(page1->change_fkey, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertFileKey())); - connect(page1->clear_fkey, TQT_SIGNAL(clicked()), page1->kcfg_FileKey, TQT_SLOT(clear())); - connect(page1->change_akey, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertAlwaysKey())); - connect(page1->clear_akey, TQT_SIGNAL(clicked()), page1->alwaysKey, TQT_SLOT(clear())); - connect(page1->alwaysKey, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->gpg_conf_path, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->gpg_home_path, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->use_agent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateButtons())); - connect(page4->changeHome, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChangeHome())); - connect(page4->kcfg_PubKeyring, TQT_SIGNAL(toggled (bool)), page4->kcfg_PubKeyringUrl, TQT_SLOT(setEnabled(bool))); - connect(page4->kcfg_PubKeyring, TQT_SIGNAL(toggled (bool)), this, TQT_SLOT(checkAdditionalState(bool))); - connect(page4->kcfg_PrivKeyring, TQT_SIGNAL(toggled (bool)), page4->kcfg_PrivKeyringUrl, TQT_SLOT(setEnabled(bool))); - connect(page4->kcfg_PrivKeyring, TQT_SIGNAL(toggled (bool)), this, TQT_SLOT(checkAdditionalState(bool))); - connect(page6->server_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddKeyServer())); - connect(page6->server_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelKeyServer())); - connect(page6->server_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultKeyServer())); - connect(page6->ServerBox, TQT_SIGNAL(currentChanged ( TQListBoxItem *)), this, TQT_SLOT(updateButtons())); - connect(page7->pushShredder, TQT_SIGNAL(clicked ()), this, TQT_SIGNAL(installShredder())); - - //connect(this, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateSettings())); + connect(page1->change_fkey, TQ_SIGNAL(clicked()), this, TQ_SLOT(insertFileKey())); + connect(page1->clear_fkey, TQ_SIGNAL(clicked()), page1->kcfg_FileKey, TQ_SLOT(clear())); + connect(page1->change_akey, TQ_SIGNAL(clicked()), this, TQ_SLOT(insertAlwaysKey())); + connect(page1->clear_akey, TQ_SIGNAL(clicked()), page1->alwaysKey, TQ_SLOT(clear())); + connect(page1->alwaysKey, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->gpg_conf_path, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->gpg_home_path, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->use_agent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateButtons())); + connect(page4->changeHome, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeHome())); + connect(page4->kcfg_PubKeyring, TQ_SIGNAL(toggled (bool)), page4->kcfg_PubKeyringUrl, TQ_SLOT(setEnabled(bool))); + connect(page4->kcfg_PubKeyring, TQ_SIGNAL(toggled (bool)), this, TQ_SLOT(checkAdditionalState(bool))); + connect(page4->kcfg_PrivKeyring, TQ_SIGNAL(toggled (bool)), page4->kcfg_PrivKeyringUrl, TQ_SLOT(setEnabled(bool))); + connect(page4->kcfg_PrivKeyring, TQ_SIGNAL(toggled (bool)), this, TQ_SLOT(checkAdditionalState(bool))); + connect(page6->server_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddKeyServer())); + connect(page6->server_del, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelKeyServer())); + connect(page6->server_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultKeyServer())); + connect(page6->ServerBox, TQ_SIGNAL(currentChanged ( TQListBoxItem *)), this, TQ_SLOT(updateButtons())); + connect(page7->pushShredder, TQ_SIGNAL(clicked ()), this, TQ_SIGNAL(installShredder())); + + //connect(this, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateSettings())); keyGood=KGpgSettings::colorGood(); keyUnknown=KGpgSettings::colorUnknown(); @@ -206,7 +206,7 @@ void kgpgOptions::slotChangeHome() if (!TQFile(gpgHome+confPath).exists()) { if (KMessageBox::questionYesNo(this,i18n("No configuration file was found in the selected location.\nDo you want to create it now ?\n\nWithout configuration file, neither KGpg nor Gnupg will work properly."),i18n("No Configuration File Found"),i18n("Create"),i18n("Ignore")) ==KMessageBox::Yes) {////////// Try to create config File by running gpg once - KProcIO *p=new KProcIO(); + TDEProcIO *p=new TDEProcIO(); *p<<"gpg"<<"--homedir"<<gpgHome<<"--no-tty"<<"--list-secret-keys"; p->start(TDEProcess::Block); //// start gnupg so that it will create a config file confPath="gpg.conf"; @@ -465,7 +465,7 @@ void kgpgOptions::slotInstallSign(TQString mimetype) { TQString path=locateLocal("data","konqueror/servicemenus/signfile.desktop"); - KDesktopFile configl2(path, false); + TDEDesktopFile configl2(path, false); if (configl2.isImmutable() ==false) { configl2.setGroup("Desktop Entry"); configl2.writeEntry("X-TDE-ServiceTypes", mimetype); @@ -482,7 +482,7 @@ void kgpgOptions::slotInstallDecrypt(TQString mimetype) { TQString path=locateLocal("data","konqueror/servicemenus/decryptfile.desktop"); - KDesktopFile configl2(path, false); + TDEDesktopFile configl2(path, false); if (configl2.isImmutable() ==false) { configl2.setGroup("Desktop Entry"); configl2.writeEntry("X-TDE-ServiceTypes", mimetype); diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h index 272384e..2f3259b 100644 --- a/kgpg/kgpgoptions.h +++ b/kgpg/kgpgoptions.h @@ -34,11 +34,11 @@ class ColorsConf; class MiscConf; class TDEFontChooser; class TDEConfig; -class KSimpleConfig; +class TDESimpleConfig; class kgpgOptions : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: kgpgOptions(TQWidget *parent=0, const char *name=0); diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui index c5cd4af..b73711f 100644 --- a/kgpg/kgpgrevokewidget.ui +++ b/kgpg/kgpgrevokewidget.ui @@ -140,14 +140,12 @@ <tabstop>kURLRequester1</tabstop> </tabstops> <includes> - <include location="local" impldecl="in implementation">kgpgrevokewidget.ui.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">kgpgrevokewidget.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>cbSave_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index 0c044f7..525dacd 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -134,7 +134,7 @@ TQFile qfile(fileToCheck); } else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL(fileToCheck)); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessResult(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SLOT(slotProcessResult(TQStringList))); return true; } } else { @@ -172,8 +172,8 @@ void MyEditor::slotDecodeFile(TQString fname) TQFile qfile(TQFile::encodeName(fname)); if (qfile.open(IO_ReadOnly)) { KgpgInterface *txtDecrypt=new KgpgInterface(); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(editorUpdateDecryptedtxt(TQString))); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),TQT_TQOBJECT(this),TQT_SLOT(editorFailedDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfinished(TQString)),this,TQ_SLOT(editorUpdateDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfailed(TQString)),this,TQ_SLOT(editorFailedDecryptedtxt(TQString))); txtDecrypt->KgpgDecryptFileToText(KURL(fname),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace())); } else KMessageBox::sorry(this,i18n("Unable to read file.")); @@ -205,14 +205,14 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name) setAcceptDrops(true); - KButtonBox *boutonbox=new KButtonBox(this,Qt::Horizontal,15,12); + KButtonBox *boutonbox=new KButtonBox(this,TQt::Horizontal,15,12); boutonbox->addStretch(1); - bouton0=boutonbox->addButton(i18n("S&ign/Verify"),TQT_TQOBJECT(this),TQT_SLOT(clearSign()),TRUE); - bouton1=boutonbox->addButton(i18n("En&crypt"),TQT_TQOBJECT(this),TQT_SLOT(popuppublic()),TRUE); - bouton2=boutonbox->addButton(i18n("&Decrypt"),TQT_TQOBJECT(this),TQT_SLOT(slotdecode()),TRUE); + bouton0=boutonbox->addButton(i18n("S&ign/Verify"),this,TQ_SLOT(clearSign()),TRUE); + bouton1=boutonbox->addButton(i18n("En&crypt"),this,TQ_SLOT(popuppublic()),TRUE); + bouton2=boutonbox->addButton(i18n("&Decrypt"),this,TQ_SLOT(slotdecode()),TRUE); - TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified())); + TQObject::connect(editor,TQ_SIGNAL(textChanged()),this,TQ_SLOT(modified())); boutonbox->layout(); editor->resize(editor->maximumSize()); @@ -261,8 +261,8 @@ void KgpgView::clearSign() if (mess.startsWith("-----BEGIN PGP SIGNED")) { ////////////////////// this is a signed message, verify it KgpgInterface *verifyProcess=new KgpgInterface(); - connect(verifyProcess,TQT_SIGNAL(missingSignature(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotAskForImport(TQString))); - connect(verifyProcess,TQT_SIGNAL(verifyOver(TQString,TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotVerifyResult(TQString,TQString))); + connect(verifyProcess,TQ_SIGNAL(missingSignature(TQString)),this,TQ_SLOT(slotAskForImport(TQString))); + connect(verifyProcess,TQ_SIGNAL(verifyOver(TQString,TQString)),this,TQ_SLOT(slotVerifyResult(TQString,TQString))); verifyProcess->KgpgVerifyText(mess); } else { @@ -280,7 +280,7 @@ void KgpgView::clearSign() delete opts; KgpgInterface *signProcess=new KgpgInterface(); - connect(signProcess,TQT_SIGNAL(txtSignOver(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSignResult(TQString))); + connect(signProcess,TQ_SIGNAL(txtSignOver(TQString)),this,TQ_SLOT(slotSignResult(TQString))); TQStringList options=NULL; if (KGpgSettings::pgpCompatibility()) options<<"--pgp6"; @@ -312,7 +312,7 @@ void KgpgView::popuppublic() //////// open dialog --> popuppublic.cpp popupPublic *dialogue=new popupPublic(this, "public_keys", 0,false,((KgpgApp *) parent())->goDefaultKey); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(encodetxt(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(encodetxt(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; } @@ -329,8 +329,8 @@ void KgpgView::slotdecode() //TQString resultat=KgpgInterface::KgpgDecryptText(editor->text(),encUsers); KgpgInterface *txtDecrypt=new KgpgInterface(); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(updateDecryptedtxt(TQString))); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),TQT_TQOBJECT(this),TQT_SLOT(failedDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfinished(TQString)),this,TQ_SLOT(updateDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfailed(TQString)),this,TQ_SLOT(failedDecryptedtxt(TQString))); txtDecrypt->KgpgDecryptText(editor->text(),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace())); /* @@ -371,7 +371,7 @@ void KgpgView::encodetxt(TQStringList selec,TQStringList encryptOptions,bool, bo if (symmetric) selec.clear(); KgpgInterface *txtCrypt=new KgpgInterface(); - connect (txtCrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(updatetxt(TQString))); + connect (txtCrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(updatetxt(TQString))); txtCrypt->KgpgEncryptText(editor->text(),selec,encryptOptions); //KMessageBox::sorry(0,"OVER"); diff --git a/kgpg/kgpgview.h b/kgpg/kgpgview.h index bca013e..54fbcb5 100644 --- a/kgpg/kgpgview.h +++ b/kgpg/kgpgview.h @@ -40,7 +40,7 @@ class TQDragEnterEvent; class MyEditor : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: @@ -68,7 +68,7 @@ signals: class KgpgView : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class MyEditor; public: diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui index fe4167c..37f3169 100644 --- a/kgpg/kgpgwizard.ui +++ b/kgpg/kgpgwizard.ui @@ -394,16 +394,14 @@ Remember that if you download a file or open one in an editor, parts of the file <data format="XPM.GZ" length="79396">789cedbd59732339b2eff97e3e45dbc1dbb1315c52a4b8d8d83c68a5b84994445112c7e6014bec3b1791e2b5f9ee0384bb23b3faa8bbab32d95975e7b264acc89f18810838dcffee4090a1fff15f7f7b9b4dfff65fffe33fd61bb189d4df5428567ffb2fbdcdb2cffffbfff9bffee77ffc67b375f6b7b3b3c6df9a67ddf6dfcefef3fff88ffff4c5dfd4df58a3d750cd5ecd9fc4670dcbe11970b3d1acd96f10c3fbfa1db9dda88f570762d83f6c39aedf0fe6c467fd9a2f907bb07f32b2dc6cd0f5841b60f31bb8be9018f6d7a56338bf2286eb2b17c8787dde8e188e57b963385e13c3f1ded6717dbd7e4adc6ad69c11b76bd64b64ec8f2a1c43fb7b62689f6d1dd7ed2717c4d0be2256d8dea763684f10437b41d771dd1e6b11437be9d871fd7e86ed9da13dbd0fc775fbfc8e18f62f7b353b7ff09e1dd7fbeb4f64b4af7e720cd73b25c6ebfd2006fb791e32dacfeb3b86e325318e0f730cd7372486ebd58fc4d0be3f712c6a7b64c8685f39725c9f4f8e89e17cbcedb86e5fe4c4605ff6e1b87e3fe4c4d8bfd4717dfec09defbc8ec704dba7f150dc31f49f1163fc1d1cd7e7e37362b81e7ee518de3f2786eba9bac478fed8717d7dea1219c74f3788e1fce9ce31b44fed617cb06bc7f0fe9018cebfda3a86f1a0feb6e1fc2bb77fa7bebe402353bcb488b1bf3d62689f5f3aaedb93b55e9db97809678eebf6bc0631b4e7ed81c9feb24f8cfe70e618faf74c8cfdbf2286eb0953c7f5f5887362b0bf7c4346fbaa9d6368bf458cedb71d839e3a86f329b73f9c6f45d7db86f3a57dc760ff1e31d87b758b8cf1a69963b89e0e315c4f103806fda1ebc7f1f0368eebf38509315c4ff9e218aed7b587d7d3740cf15322e3f85553623c3fd917e34ff88eebe3a301319c3f2b88e17ce53d700bc78f49c7f5f1fc8218ed79edb87ebf84ebef937fe80299f42f760cfec789c19e72888cf6571f8ea1bd9c18ed7fe618f4f08218f3d31e19eda5bbc4986f268e617c07c4707cf0460cfd5d5d1383bd62b07fbf85fdf53431faebc631b47f438cf17aeb18ec3b2286f385d231f8cf1d32da4b798e61fca93dd2972131b4173d39aedf6797c438fe5bc7e06f3de26eab3e7f1319ed1d1c88a17d3e765c1f9f53ffd19ff33bc7e02f136268bfa2f7d1be6904dc26ffaae3a7d5a4f12f1f1c433c3062b0afbc40c6f1970762b45fd3311cdf20c6e3ef80693c55e618fadf27c6f1bc26067b54cfc8e8ef9a8e277fbf740cfed12046fdb8770ce3bf2686f6f357c7f5fb71428cfa312306fbfa747d546f6d1d837d26c4d89f27c7a0df0762387fcc1c83bf2d89d19fa68e21bf5e21a37de3dc311c9f12a3be7c3a067fdc1043fbc5d271fd7ef1410cfd5d1d1ccbfa7d4ddcabdf4f6f80db385e7ed771dd5ef24c0ce7634bc7905f77c470be724cdc57f5f8dd22e3786413c760cf36311c9f0f88e1faaa3a7e5b4eaf74df31f813d8cbe94b191363bdb144467ff372c770fc8c18eb23e118f2d18818f3d51531da234226ff61c4988fdb8e217ea97df48f78ee18f488ae1ffb2707c4188f5dc790cfdcfe387e9c18fd6fe718e2078f6fa3bdc49818f3ddc431e8f13b31b6bf705cbf9f85c4680fe118f44f12c3f86637c430be31bd4ff17d490cedf18363389f470cfe2c02e27ebbf6ef6764b4afd7740cfda1fea1de662f8eebf6c257e25ecd0afdab8df1949c398678da12437f0af48f73ea3ff6f7fc1cdacb2262b8dea8d6b77693eab7f49918ec1d3c20933f9d39aedbf77ac4a8171531f63f43467fe14d62d4cfc031c4a3db1ff5e51a98f2afdf2386f7f58763f0ef4b64aa2f3bc4a84f1e31eac5c6716d1f4ded637f5789e3faf82a24c6f3a3fd283e04730cf1312586fdc508d8f97be218f4d9bd0ff629c68ea1ff3931fae7d271fdbe56c8a42f53623cdfda31e8e78218ce273a8ea1bd67621c8fc831d89b11833d195d3fda8b53fb549fbc3986787b2046fb148e61bcbac4d07efa480cfe1edd2153fe3a2386e3934f62ac9fae1cd7e31dd0f9307e3c3a9f82f8c8c8de4ad41c0f8129bea23931b42f6e1cd7ed273b62683f79715cbf1f65c470bee4e0b8ce5f11473e87f678490ced89d431e807faf7791ff7cf89e1fd74450ce78b717ccf3570f804dc3987fe16cc717d3d29d84b50fcfb7d645a5f181363be3a3886f7b7c0546f4b418cfb4bc7504f5d23a3bf7a3e31ecef158e217fdd10833fc917c7e01f6b64f42771818cfea1211e05c563de45c6f8919f8e213e3831ae674c1dc3fbb7c8a8272c740cfd97c438df183a06ff5f10437fd41c19ed2d687fb4b7b8750cef7bc4988f3f1c43fc3688d11ed89f731c0f513a06fba6c4584f0d1d43bcdd1263bc7e10833f277d628ca70df239ea419b18c72f710cf9f79918da0f946388e70631e643c7989f2f1dd7d7e3d3f5a2bf276fc4b2e612fdcbc453dd1e9f3986f85a11637c6f1d437e3e23c6f8168eebf387f7c470fe32725cbf9fed91359ccf0f88e17cc1d031e8cd2b319ecf735cb7b7720ce75b69e04e138e0f2262d4831d32da333d10c3fbeccc71dd7ebe2506fb55753e383f233da8ae1d433cde0253fc27b963a87f1f91295ff588617fd5700cf9b9498cf9f90119e32b1f3986f8bc20c6f9f1d031f8fb1899ea959e63d07f9f188eafbe31e43fbc7ecacfd92d31fa53df318cdf3531dadb43c6fe472fc438ffbb2486e3334d8cf900fb4bfa92bf3b06fb2e88f1fadf8831bfb61d433dfa844cf3c38963184f6a0ff367dc755cfb0753c04e5f068ec13e5d62d4bbd2318c47807c8ec7f71c837fec89b1fe74fb63bef68851ef56c87dd4b70e31ce277a8e41df3262acbf77c4584fe37852bc06cfc4604fc61dc3fce192188fa7ebc1f84c136288a70c8f37f10af5cad431d4af0b62684faf1dd7f62f57c4d07e903986f845ffed603dc1a97d8cf7403a06fd1c12c3f1c58618aeb76821a37dd8de71bd7f2c8861ff244246bdcaeb7c732e285e831631faeb1c19fd2fbc26c6f807ff14543f071d62ac9f5f1c433c5c10837f44b43fea4934710cf5c98c18f62f7a8e61fc3932ea49b623067ba45dc7757f031f19afdfff20c6fa6d4e0cfbeb1898e2271a12c3f161450ce7cb578eebe3c51d32c68fda10a3fd34721fe3ad720cf1e21163bcf41d831e6f89d13e43c7103f2fc4d03f86fd3fd7d8deca319c2f23c6f59a37c7609f2931e643f05793cff07eceb563e8af63684f668ee1fa56c4e8bfd8ff0eea4945fba39eb0c2717d7c9c1243bc867b62ccef0932d60ffecc31e86d9718ceef49c7b0bef5480ced05afc4a817b1635d5f1fdaab837a54a58eebf3ad36c478be8e63f0979018f4c313c470be30765c9f2fb92756e775fbe86f5dd4a3ec9518eb919d63a8179f88a13df9410cedc54de4beaadfcfea7cd171f938cf8029de8ba963c85797c818dfe98563a8bf27c430beea1999e6ab1bc790ef5f89513f768e613c97c8a44f3bc750afaf89d19fde1d833f05c0940f459718e32b24c6f5ad27c7f5f1559b18ebbbc231e48735318c878e90319e53bc1e179f5dc7109f9a18eb7f9f18f3530bb8d3c4fa6b448cf614c4b85efe440cd7cb2bc7503f7f1283bf78387e149fac24c6f83e770cf3ef6b62cccf3931b4cf0b62b087df41267de3c478bd8563689ffa8bf1bd9a12437fe49563888705319c2f5a3b86fadded0ff196a3ff74d0fefa8c18e7b397c418ef1b6238ff8aeca7717eaf88a17d6fe0b88eaf780cdcc5f1481831ea4f488cc74f1cd7c7733c7f97ec9b12637f2f1dd7ef577d62682f5e3baedb0b6e88410fd20632da77e53b86fedd13c3f9f88763b81ef73eb4973491c91e77c03decaf067bb8f979ca1c437e71efc378c457c818ef9213e37c76e618e205fae7f279ec3b867a66458cfefdea18f2df8018e7c3ee7888c772490cf61260ef6ff9b0e318f42320c67cf68c8cf1935f3b86fa76428cfe72e318f42627c6f82a9131be3cda1fe34b6c1d43be7a25c6f9f61d31b45fb489b17d0f19e3c50b89b19e881dd7edc92931e6e737c7506f3c10e37add9818ce172e1d83bf48e02eda37578e213f3c12c3f9e4d2318c678f18f3f32731fa73e618eaeb1531f8efeac9711d3f4223e3f8792f8ea1ff0531c6937b1fd707df1d43ffde8871fda4725c9fcf5f23e3f8f82362ac27568e21feaf8851ef3e1cd7ed853e31c4ab42ffede278f85b626c7fec18fcaf4b8cf6891dd7ed6bba1eac5ffcbde3fafd08f289203d080531ead5c431f4df2746bd8a8935e80dfa638ff4aee3b83e3ec5f1eaf561ffbcf6cf6ecbad472f8931ff6c80297ed91019f39f8c89511f0262ac77ef9031de644a8cfaf14e8ceb6b23c7107fb43fc6935a13e3fa55e518d6b724b08b8737623c5f460ce7f31362ac1fd78e61bde18218d7a3ee91b1ffde8118ae27fb700cf1bd2746ff2f89e17cd9ca31f8db0b319ccfbf4246fbe96b628cb7d231cc17a7c478ff413986f6e97a313efc1631facbbb63c8d7b7c498cf0a64b47770498cf67c750cf506b58ff1b272c7e3fcfe11b887f6f7cf88e17cded031e4eb1c99ecb524c6fc3a720cfede2486f622e618e2ef8a18e2217d42a67cfe408ceb0b1f8e61bed02646fdb8730cfa48fdc178f3a87dec3fdf3b067b3b86fd57b5de7425c5539e20e3f8eb0019e3211b3886fcd620c678c4f7293f24a963f0e73931e6874b64f477b520c678ba2686f1963931faf73931f457558e411f3d64ec4f7cef18fceb9618d703df1c43bddb22c6f15a13a37db78e61feda2086f12ae87ad07edeab63d0932631fa77db31d4abefc4a8df53628c5fe618f41bfbd7437dd21d62cccf1b62acef43c790cf2431aebf5d11a3ff9f3986fe3262f47fb45f0fc72b5c10e3fd940b62684fb488c19fd317648a878a18ded774fde8ef058e478fea972d311c1f158e215e2262383e13c07dec1ff71c43fcbaf7512f5ac4703cd78ebd7a7ff4cf3efa9fdc12c3f1e18018f657f5f8f6bee58f5b625c8f9e22533c7062183f75efb8de5fbd20a37f7b0b62cc7fdc31cc3706c4303e95760cedf9c8e49f743d58af68f73eae8760fbe45f2b498cf92f750cf54d498cf58d720cfa3747a6feae1cc3f137c4a80757c4986fdcfba8072fc4301efa1c19eda3e78e416f5ac4180f2f8e411f36c4e86f9a18eba72bc7f5f9bd1819e33f0c88315e3262eccfd431c4e79a18fd3521c6f5257c9ffcb9108e21bf3591d11e5c11c3f5f28018fc33c5fef551df78480cfbe7b7c4180fb1e3fa787640c6fa54c3f192eab1fc0c98eaa3e2d531ac972c91e9f34163625cef6b10e3f82c1c43febe40a6f9574c8cf5cb9b63f0df7362bc5f3027067bea0132c643f94c8cfefb4e0cfd951130c5837a20c6fb272dc7e0cf0362f4df866318df4b62acf7f17c3db44fdc2346ff6d13637c2e88b1de7c700cf9232646bdbd43467b551e31de0ffec6a0276e7fcc17ca31e48b4f62f0978a98d6731f1c433c6862bcffb324c6f9db9c18f5953986f55dd71e9c2f467feba3be161931f487dd3b86f87e22c678ba700cf3bb15318ef7dc31c4fb3931ce9f668eebf8f0713cfb54cfbf12c3f923458cf54d8f18dae73b62685fa23f52bcf18818cec7410fa420ffb921c6f719b1d7a9fdb9b647bf4df3f172848cf11224c418bf05328e5fd521c6fcb2700cf9ba498cfede06a678083c62d4d7d231d817cf4ffe5e3489b1de081d437cdd11437b5221e3f5e79e63d08f73623cff16993e9fb022467db8720c7afb498cf5fa3531fa7f0c4cfe575d10a3bfcd1cd7c7ab8418e71323c7f5f8491caf3ef63f3c3886f8e1c478ffc52786eb53743de84fdcbd8ffe8afdedd37c4f13a3fd26c4d8fecc71dd7ea188d11e57c470be60edb83e5f3246a6f5aa7762ac1f9b8e411f1931cee7c81ee8ffd52db0a0faee9d18ebb13afefacaf96b4e0cfbe72fc0e49ff99e18f59f3b86fd67c8f4f99d1531fabbe718ae3f43a6f9df8118ebcf6b648c2f754e8ceb692362f41f883f457a97df1363fd36740cf9e18e188fcf1dd7d7b37a2686ebc9b6c438ff7c47c6fe562dc7a0670131f6bf700ce3352186f6abc431d873410ce70b1b8eebf12b9e90a93ea3fed2fadcda31e4a35762385fe91343fbace9b86e3fd6c8686f3125c6f69963c89fd43ec67b211dd7ede50fc002edaf0262b4ff1b31de4fbc2386f6d4d071dd9eae9069fe714d8cf5684e0cc78bc431f40ffd4f08d0ffb08e57e1f459b78169beb812c878befc0299eaa10fc7600fda1ff35375e918f2e91698fc2bef3886faa44246bdaff6c4580f6862385e7c22e378471131b63f760ced3f20e3f8463d62d42ff73efa7fc3311c4fede1f8461298c633e938867c7a4e8cfdbf2586e3454c8ce33147a6f8183b86fe3d12c3f8fa1bc7757b2bb49f10a8cf1dc7b03ed422c678481d433d551263bcb71dd7ed7b6b62b8de00c7477868efc231ccf7c93e1eea3f730cf986fae3417be51bb0ec0057d09e227f2aa13f4eaffc0131c6cfc131e8cd3932da33178e417f1f88d19e0a19fd29d1c4b8feb1700cf1774b8ceb6d1132f9ff3786f6bac4b8ff9b63b02fee4ffe14e6c4a88f7362ccdf9218ec95627b4e0f4ac770bd8e717de4ce717dfeec8c18da9337c8e82f719f188e8f9e913dcc67f43efa4371700c7abc20c67af49318fd09fc41c933acf7278eebe31f37c4b07f922077f0fa968e21fe1431deafa8fd413abd29f6c8146f03c7f5fbd59218e3e10a19fda39a11a3fe53fbf4f9938018fd27710c7ae0f6c7f178745cdba77c02a6f14fde8971ff0bc750dfe0f5d0f856ca31f8d71b328ea70c1c43fb43626cbf720cc73b46fbfbc838bef10b31c6fb9363c8dff7c4e8af787e1adff08218f52c24467fd4c838bef92531dabf4f8cfb6f1c83de44c8d85f3520c67abb4d0cfb871d64ec5fb024c6f9589318f6afeafa4f6af29fe41119c75728c7d0fe1898c6b73a27c6f9ec2b32d5ef37c468cf01325e5f72458cfe5e3986f86e12837df21cd8d81bfab3760cf54b490cfb470fc868ffea8318fbf78d213fee8971be3927f66bceae91713ca25b629c4f3788e1f878818cfd952b62f4f72762685fc1f86985fd8b2ac7500f9d13c3fea940c6fe54af8ec11febfca5ce9d7e0f808dfe427f1bc0643fe918de8f77c8d83f79e618e6437b62cc7f8f8e410ffac8145fd41e8e679402537f93b563b89e2762b4e78363580f9c11e3f8f490d11e31770cd71312a33f3d13c3f1215ebfa2f15c3a067b1d88f17a226238be6c39f6ebf6a93d0f38abf543397f8b3f91b1fd5c13a33d27c8180fd12b31fa67e6188e87fe39ff294ac710bf37c478fd5bc7106f9218ae37ec23a3bdfc67c760cf3631f43fa2f3a33d045eafc2ebcf9bc438fe2362b417f89fd678bdde8c18ebcd376268bf7a715c1f5fd6fea89d3fe757c8140f37c470fd0531da3b7b770ce35322e3f5aa8818ce1f57c064cf6ce418ecd324467bec1dd7d79b6e91d1bed9d2319c5f21e3f5a5e78ec11fbac4d8fe0b32d9bb4f8cf58a700cfa4fd78ffd49f07c64ffaa24c678f9740cf6dc13e3f81d90c93f68ff0ebc1fa4c8e8ef72468cfe50ebb1f65c3e2b91f17afd3930d9773521c6f87d41c6f3cb07646affcc31d877400cc7179fc834be783dd4ff22710cf7131e88d17e73c730be2132c64770e7b87e5f3c23e3f509e918fadf43c6f1136f8ec11ed89e87d793d7fee975c81ec52d329e3f7e44c6fe2697c8d8dfeac6717d7db202a6feca4762783fba40267bfbc4a81f1fc8d89f64428cfe7aefb8debf7a47c6fe9567c4d81ef68ffa5b3e12e3f5d7f9c5f3487fa319308d8f583806fb2f91f17acb5764b44774e3b87e7f95033b7bb789617ff6e218f67f4046fb9733c770fe4764b2c73b328d473dfefe377b7f22e3f16c868cfd8d6364bc5e1502d3f5a85b64bc1e31770cf1db42a6eb79720cfdb944c6eb0b43c790df52609fecfde018e27f808ce7af0e8ee1fc703e9ffa173591f1fcfe0e19cf579d0153ff04be4ffd6173643c5e7ac8783cc3f3d1f58919321dff888cc7b367641ff871c3997989ffddb7d6165c70695eec7ff72dfac59f3e267f852dfac59f3e267f85ed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e2a4175f6d4f7a71d28bafb627bd38e9c557db935e9cf4e2abed492f4e7af1d5f6a41727bdf86a7bd28b935e7cb53de9c5492fbeda9ef4e217ea85e29a7bdc37afa0e690477f051ff8c57a11f384a73ce3392f78c92bbee26bbee15bfec1777ccf3fff1abef00bf422363d3ff00b7ec9aff835bfe1b77c60fe75c787e667c4c77cc2a7fc9e3ffcf9bef06fd68b197fe44ffc99cff90b5ff057fe66b6ef7cc91bbcc9cf788bb7f939eff02eeff13ee38c71efafe01347d78b9409268d0dbafc8629a699c77c16b090452c66094b59c67256b092556cc5d66cc3b6ec83edf884edd9273bfcf9be7124bd50ec825db22b76cd6ed82d1b98bede99d7908dd8984dd894ddb30736638fec893dd7af397b610bf6caded8bb3966c796acc1f59fed1b3faf17acc9ce4c5f5aaccdce5987758d0d7aac6fde4a0413c258e1c5d8e0f91ffd082994d0c213be084428227610f1ffaa7a2112918a4ce4a21025bb139579adc4da586123b6e243ecfeaeefffc02a622f3ec5415c884b7165a2e54fca313fa517a1b81637ec8337c4ad18304f0cc49d188a91188b89988a7bf1607a3933af47f1249ec55cbc88857835db37f624deffde3262c9ee454334c59969f74ff18d9fd08b40b4ecdff2161dd1153dd1173dc92593424aa9a4668fd233ca3093fee34606329491103296894c65267359884f59caca68c86fbc46aee45a6ec495a9c8fe04dff851bd905bf9217726773ec9bdb1c48029f9290ff2425eca2b795d8ffd83bc91b7c60a57a294037927877254ff8ce5d864d6969c885b3995f7f2417e6711f1261fe59388e4f3aff78d1fd50b39973bf92217f2550c8d3f48e3116ff25dde89b55cca866cca33d9926d792e3bb22b7bc60e7d6b0565128e124a2aa5b4f991863c3652be0a8cc2923d9e54a82215cbe7ff35f442252ae557b26b74c2fcb04465a69fb92ae44195aa32fe7fab566acd7ca31e635b5ba88df18185daaa4c7da81d3f533bb5373f85fa540775a12ed595ba5637ea167d63c65ed440ddc9e7bfbe5ea8a1b811e76a647c40aab1e9e3c48cf15469e3fd4cddab0735538f6caa9ed4b39aab17b550afea4dbd8b955aca816aa8a63cb08d3a33d613f54f617e846aa9b6fdcbbda41ce25e7555efafaf17aacfdafc499b09a8cd1a669473630ba5f69a99d12fb4d052542604b4f6b4af031dea4847c63306e256c762a8139dea4ce7ba404be4baac8f371123f7ba12a01e8f7aa5d77af3d7d60bbdd51f664ef12a467a2799deab83fe54b91ceb83bed097fa4a5feb1b7dab07fa4e0ff5488fa5146b35d73b36d11373cc54dfeb07638b99ceac6f70f3d28fb53573fd64fefdace7e209bc43bfe8857efdebea857cd66f6c2b1746074236513bfd6efa71a197bac11b2cd34d7dc602ddd26dfb9774c58a458a43e6906f9a99bdbbc67699ca748fc5ba672cd2d7b9c73d66226c6fdab13f058bb4a742a83d3ce1491eff55f5c2536c6b7abd161b3df5b4f571fdae97f64fa27a816c1b9d1878a11779b197e8c444cfa7f0f993a9cd7722b3ffe7732f557b9351cfbc4c4df4cccbbdc2a84d66f694c6b746a6b527638fcc2bc51c728a57792b6ffdd7d40b6fe36de58085a662b8f43ecc54c2da61e7eda5f43ebd8377e15d7a57deb577232ff919bbf66ef9ca1b7877ded01bb14f6fec4dbca9a9d67def9ecf95f0989dc3eb2eef98bcc24cbe3dd4da61bc434ebc877a0ef7eccdbc47efe92fa917669ecddb62c312de30b1fda4f6deb3faf49e75d79b7b2fdec27bf5debc776f29efbc86d7f4cebc96d73699f1b735a4f2cebd8ed765d2ebd9fc63f289a9bc74ae98d7c73891ead3e7620aaa21573ee3c15f502f6e7d21195b1baf80eb2ecc3816c6c34772e94bf3a37ced7b5e9f3f7b53af656659ffa01d53537abeef074cf2b6ad348cee1a35e11d7df0c3da370abd14433faa6de1f1a9ff4b6ad03fa2177ee2a7bec9007eae3339f276b5358ceaf1865fe8815ffa95bf929162fcd95ffbbfa33d91f85bff830f6c0ef136c6339a6a27c7b577987c6bce30f777f50ceec1eba8e15f492ffc3ddbf99fbccd125b6f1b4b1430869ea92a7ca314fe857fe95ff9d7bca5fabf772cfc1bfee0df1a6be4bcad73a31b4645a5d1623fb46dab9d3fb0f359ffce1ffa237ffcd7d10b3ff027661a71601329bc9dd5fb5af305eff853f5e85dfaf7fe83995b307ff647e698fea3899627ab42bcc39ba6963f9879cdb8f63853a38bd2af67f6fedc7ff9f7af8bfe5ebd90cffec2879a39b3f9cf8e9b79997fb1d47ff5dff4c87f3713adbeb8f9e3f580bf64c26f88dc7846a3ae408abadad0bae42dbf69eb50e97953ffecdf3d3ff9bd7ae1b7f895b73579636366db63f4895c1dd895dff6cffd8ea9273c16fb5d5327fec098782bbf67f27357657edfe4205ed719ca7a5dc003663ce3311081349af197d08b40795b9bfb036da21ae610d62f3ee524f04c84dc7837811f0441c8c31f1a9338884cb5d15259109b6ab4ab0fe017e63c2c4882d4ae6b0459901b7df90be84550980899aa2228add6431da097721c5432d403d60d5626bf7c78ad1f1d93601d6c4c8eca4d15fa116cd5ced4e53af83067e16c14eca4c79e83bdf1cde8cfd78be03338185bd8191803bfb01935b8d0fbe032b80aaecddc7d62aaedcdcfac4505377c6e66afdd2096774641c7a6eab035e8c1fce656cc834170170cc5f59faf17fe2c1819ad3fe367c1d878726d15bb12c326c12498b2a1bc34b5e321b8ffa9b1894d2dbaf57ac61ea98995077b96ba1e1f05b3c0e412b10b9ebccebf731df4f7e945f01cccf9b3d5365301b4eaf539bbf2c0d92a78091662a819fb085e7ffaded747f06694f920ef8c66ec4d255a584d32f93b0fdee54ccc8265d0089a7fae5e98f13e78dbe02c68e91e6f9879d4b456f88ba02d97c1b97975826ed0f3973f3b36fec6f4d5cce2a5b0fac93b21b77ee1ede4bb17f8f5bdb6a011b23f572f42119a79839e09a646d62f4c1cdb1aa0d02c54a1964b3343d986decf7fae423e873e1fc94b9355cdbc5d77ebdc5d5a6bb0280cc2308cc2d80ffe5cbd08599884298bf4334b94f58bbc9e4b16621c66616e66659c7d98b9e411c626688685649ea9b994a9bacc9c6faf9fbc9df18c376f1e9662e68dc38a3ffc797a617243aa5a26930ee4a75c58bf3075858964f5c917e14a05a2c136ec3c3cd2d8f8db706d3ca32b2f4d0d9aab8f70637ce3dd33755cb80d3fd853b80bf77fa25e78e1a738a8891c88b55c48bb52f704b305c9c34378a13bfa22bcfcc91ce2b66a185e85d78249667dc3f8433d6bd5cba0d497d267f3f02650e1ed9fa517e18097ec36bc63eb70188e586c6c51d6f3854f9686e370124e593bbc97db238d51e889f04176c558303d0b67b6ce000565a9aea4173e060dfef1efb9a7f63bf442874ffcd6f3d95aacc530e87cd38bf0399c872fe1820f3c79acb1e19ffe327c955dfe22989f07b1329a61ab71e38b997f1ebeb197f03d5cf2f0cfd18bb02152fe14363517b7e61713de0acfc296f58bb01d9e871d2dcc3ce4f57863c49ade547464972561d7e4931ddc71d4a51ccb7d7813f6c27ec423f6ef98b3fe6bbd88042ff893bc64eb60256ef9b2f68b835d8b129b480622527e4f5c1e6f8ce473a423cfe4a6848df5bdbce36d53cf186b78bbc88f02318fc228525dffcfd28b3c8a8d5e84c62f4a7b4fc466399bf7e5204aa254dd0487288bf2e38d515444a5ec6aae7b62547b86bd0957dacc1a2ca24adceb2a5afd3b3e03f8aff5221c44eb28f67c29a38db8d53bbdafef08dbda338bb6d28f3ebcb9d7f4ce8f3546fe8d484418ed8c7e8ec4584fccf964bd5e7250e682a37df469a3c43b3bfe9cf5f7d5176ce769311403b551733327296abfd05e3fb88a0ed145300d2fa3cbe38d918992abe85ab5d9448ce44035eb95f2bafe34f5792bba896e23ed4dc3c6afd70b13252c1a282fba0b56d150acede70b3cebb76606e9bd0477d128ccc5215c46471b2333170da2b11a4513964453e37df77595a1d4d46c5fa28768163db2dc5b79ed5fad17763e123df18e4ec46dfd398acbda67cbfade270f27e2297af682686e6fbb1f6b8cfc71741979b21bbde87b16eb3d5a5fa99c4da285f1c5d7e8cd7b3cf69cf5f7cc47a277ef36e4e6ca96d150be9a5afcadbe2f92ab0ba39e8da8199d45ada81d9d1f6f8c4cc6f4c32b9b4ba20eb36b3bfdda338c2f060fde6bd495aba8c757e2ea57eb85dd467db63573d427518aa1992bf4e1de883a9899ea4185310fae621684478d5f150b3689a5a93fcdcc3588eb7b103067ed8b66ac621d7b3c3dee770e7edf7aa73fe343fe1efb621807b2eb6deab9597ddf330ee3288ed97d9cc4e931c728cea24bff2dcef5b3189b5ab719ce60edddf8473b2ee232ae642b5e89c868cb2fd50b2ee23537734793439ea46413cdd4bef68b42b178136fe38f78676a8c79541c6f8cd821def332e8b3095b9baa2b0a62b7e2dcf58bf833dec587f8c2df9b68faa57a61d715e24b3e17eb70145fb189bcb3eb0ab52d3ee36b91a8d0545c0f7c1cdf1c337ec3417c1bc53697e867160763c5ea3bd95339169bf0100fe23b7d25c260fdabf5c2f8ec50e472118ed4dcd4835d25e1fe88fd94623c3293c6a5df66b7f1f898f95ec4f144ee545b744cc575afd3baf637b9442fe3697c1f4ee2877021e7def87873d6df7b7fc4fb14793c337ae1b3500aa39efb3a7e3ff5d2bb881fc55206c6164f3f7e7fe4ab6df41e3fc773b9883a26b39a28d18f36ab0617ec9cade2977811bfc66ff1fbafd60bb34dbd0def5abf507316d11cc1ae39a92c9c9b5cb264a5b1c6916bc1b8692a9b775b7ffad7f5faa799a105178aeb697ce63fc7adb81d0cfdfdafd58b3a972c8240f3d8577331d2793d46e81b46d7cfd98357ea9db9b223e692c74ddc89bbaaede7626ce6ac703742d84f320565dc8bfbe14dc2c32ab1f7ea7fa95e703361e273a3e8a130a3a29a768ce0beaa5e2632ec272ad166463f39662e312f9d78a2239918998a8be9bcae7897aa30fac9139df84920a7c16b12fe5abd78dc245112abb6c9f743b19197668c0aa805bd5d78ed6fe2384992948f227dd45a30622cc9820e5bdb35f824e7678a9b11a8d7e093427c24651cf232a97eb15e8878cf243719351c31334a416caee850cf9872d94f56c99a3d249b70986c8ff9794c11271fc92e8ad5c85435a6e83019ac50a25e3b79637e7848f67a9e7c7af23873d63ff279ade4905cf0d770a47746cbfaf51dd5bc5e7392ac6fa2e432b992fbe4da5f1eb316f4da6c9fdc24b7c9803fb18d6ed8cf0e9ae8dc2b1337c95ddc4a86c1345c86bf582fccf6815db3b6e66a2ea54e4d556c6c918cead9fb241927133f52eb649adc1fb31694cfc9835e27b368cc6e95f0eca710f0ceb6defb45f2687389b8499ef8fe57ea85dd26cf463fd7f19518ea7bf81c86b1855d996d283fec2473d962efc98bd1f523e6127608d6d1557c1b0ff9796d0b6d7c439a735f9ab9914af661962c92d7e4e157ea459d4bde025b774e4d36199bd8ddd367fcbd3e5b27efc93269b08c8f9223af2bd8ef188522394bead5f7fa9c665698b4599c9c279da49bf4923efff8b57a61d71552ce5b29333586cd2567b6be80352ecf97217b488599975cc5aba3e6927a1bac138f5d9af8e0f80d8da9d79743d655b354ea2b95a62afde9efb7fed1cf83ab946da54c3d969879ebce5c99a8e768b91ca57e1aa4619889db344a8ffed9fee4234d4c8785fd5e42ed8b5a8ed38c85d15bbcf35ff98197ecf3d7ea0567699e5c041df969fc62909a397b3d939e9a5ac36393b48cce829dba4eab203ca64fd82ddfa5ab746defe27a1fa6e6ddf3677d907dff3aee85f36062742cfbd57ac165ba8906c199a93142b69697c6333ef173a9f613dd8fe9364a8377769e7e70753c9fa8b71f6cc976bc93eeec67113c6e6601b9fa60917723e7e93efd4c8ff07df83ffafd11ff9171cf1483e9855ca497e6bacef193a9f6537d9da413cdf4ab8c63965e1d572f184baf8d8d6f22df545ca96aa6b7661ec0c4d05b184b0c828d99affedafaa2de069ffc8a37e4423d59cfa8bf41879ff79497e95d741b0ffc221dea453a3aa65e784f5e3335358664aaad326b0d9d0a964e582f9d069b64c71ffe892fdfffbecf85fec0f753c3f441e4c62f3e5353fba90f132512d6a8e5bb3c0f6fd2595c88327d3c4e2df86d9b3ea56b6fcb9fd52e7d363380a6caf88b5cb0cb7498ced3977f7c5c3c4e177ceabfe8b57e39ae5ed8adbf16b960d18bd50cf581b5b899c17b3b1337afb14adfd2773ee6f747d50bb335d658b296c883aec879cbcc8daef96dda489b7afbcf8e0b9468fbb7412477c66a67110f86ff68ff1ff97e6ab8f2365ea1797ca5a7b25747491e7cd839bceea6adb49d9eebebb4a3d263dfbf3075af97764399f6f85ddacf78c632f1af3eef297326789549f6942976ce6f329d79997f2cbda8bf3330635b9db0502e78c34489acfd42fba11c89db2c0896aa277a59e81d75fdb3de463c5449166571ba096ffff9fefe583e6789388883f2c52c4bb3cc68dcb53fcd72b6f45a47d20bb3f5d759c1bba98993acd4997ca75a501dc2667c1675b34addc72c5bfd7b3fbffdd5d6b76bf677d93adbb073bf17ae334f70bdcbb66c2e97d126fb48baf14db6fb7a5df6479f7f91eded2a97fd9eaab1c51b7d76462fb34fef226ef9cfd19b28f9e4e76bc1dfb7f5c77aebb532a112711333fbd42676ced67a9a4e4469bf55cfba2c531b21b283686617c936bbfc6a2efda3cfbfc8aef84d10d8fb9d7685458e8d5ed867177c2a26c6e95b761dbfb055762342ef88f72f701b7df73d124fc5fe325cf10daf8261348ee6d9addc27292b752006b16f227560fc61190ee52bebc976a4b24a24d91d5b7eb52efbe3cfcbc9867c6efd428ce45dfddc02bb2e5ea84fbd0fa6d92878ccc62c4d5e928fe3fa80fd6c701289883ff8beb140994dd832d8f049364db4f7ca4ab1625da1ed3765598fade2fbec3ef6e45e4a93e51f64983d64b3ec317be29374732cbdb0dbec599c1b5b6cf47de4eb9ceef0999cb20b9fbd755c657319f3c9b19f55e027d94bb6c85efd5636d11f26331c84970d82a97af04bc94d5cec8c3fbeb13249e5793ccadeb3252ba389b80d2a33420d35cc9ac61a67c1306b1d4f2f8c5fb4d96d1028bb363e5159fdfdebf7ba023db04d709ef8c9a39cc64c2f8eb7fe99ed93add18243a4d88beab04c5e1ac51a64e75927cbd8cad4a0895d71b34f53c8baeada6864cfe48f3e2bb36eb8f4dbde59ceb38b9ce5227b0a32b63c9e5ed86d2eed3d56cd4d0d3a09da5edf7ea6cd7e2e4333e320fa71937ba6429e8b23e592dc673bb6cb83ac2b3ec52ebaf10bfd2c56799847e2238ff384ad5924c6792aeff22c9d7873fd6abfc128eec3439ee7455e8aabbc92d76aa6e2304fb6f9ea987ac1a5deb25b761e8ee4a71c18fd045bd4f33416e6eb6cc4eea356bec9b7fca7ef5fe41fde2ddb05815cc889a9bb57de6b706db645ba0d96f1367a6366de6cecb2538f828b91b6f96d98eff3cffa7b6a7779fd19915c8b66d265f7f2d6f8c590af12713cbdb05b1b25d18b5d17d7b3fa53a9397e1be823bfc82ff32bb1cdaff31b91fc58fbfc33bfcd07e9a7b84887f95d10e44396d8e7fae5f693d8cfea3a1fe793a4112e445f8cf2a91ee5f7f9433e63f6735e139f7b41b4901bf6903f8a5dfe24bdfc39dae73cd1d92c9f674fd9821f8ea717f5f660e6ac037b5791c59eb69f0ab09fcb08edb31e7af22c5ee42fea9a2df5f60fdd0b8f8266be089ae19599d38ca241f4143de5aff99bf0a4fdfcc1bd9eb291f18faef18bbec9193c1c194bbcb34ebecc1bec396fe6b1181b1db93433fa323f0b17c12efe604f792b6f87f3fc3c9b5abfc83be226f9fcfb5cf2b3cfe34bfb7c105fe55d3da9bf7d05cfafc8f532efa5af795f050597fb82fdab672215a2905e4bbfea6da13c59e8e8a9f0d26161924611445e1186f6392c9d2232bebf968b22e2f6f94d8368a3e3686946622d7a451c054522766259987258de055b3589a659371d644fc9dc7e8f317cc9abec29cc8d4f348aacc8c58db9b8a3e985dd860f41507bc65832fb9c026b09eb1bf2ad28b2eba22caa62c596eaee9fb553ac935d94159b625b7c444fe9301bcac458601779a2fee1b6865d8443b6b64f6312b7e1d05493a9dc8ba1c91a23fb19505355ac82243e2bf67ed3541377f2c03b6a629f076732ab9717ec25fe283e8b43786eeace876c5a5cc8b0b82cae8ea917761b748b6b35d7cfc66b85b185c46f0f8ecd58dd14b7c520bc2ceef8c73f3abe50f1387ee287e08ecd83cf62588c222fbf0edbc94078ecddfa81e9cfabe95f47dca617f6dfc5b898186b18ffe02f700fbe98d6ebaf32beaa9f4671e7f7ed0a6070c66ed4c8d43a2ff95c45d14df419dd14f77915a9e2c1f8c54cdcf81fc5e311f5c26ced131a4dc5bfb6ab5cba5e1337758636f6b82a9e541855e226fb87c79bde3ff31b7e53ccc3883d679be225f28c472c8a057f0b87cae802337512cb8a57534d3d8a81b181f18a622c3af63dd5566dc94c0e9b79b9fd8ea4c96507336bfed04c656a12f44dd5c38c729ccb56d415923d0a19758bb75cc89616c62fde8b65f19bfbb03ffffcce3815b9b85563cd7daebbeccadbe965bd36be2b9a712ce6c5d957df43e79f45ab6887977920657ac1fac579d1c98c2f181db82dba461b7a5617582236ac1fb76510c745bfe4d62fc46dc944279ac86e29d8c6f862aa53638333eb096a2245fdbdd1862942077c10f4830eebe9ab52b1273353f5e2f3681fa952979ea9cccf9383a9ddaf8ea7175c94beb795e6bfe8c5aa7719e8a7da2f94927c51246558467ff71d827b533daea2391f4703b6339125d9da68a17d8cdd44744ced38f217c61663eb13561d582f984637a66e7ac93e4c9dd5b1bf37fe302963d5b4cfcc28131b11bc632d617c61a226c64726968320e8cbae28e5d2d49b4de98937e99769f6106a392fb332d73e3f94c531f5c258a314a6048d5ed20b7daf9aa61acfe1797bc1367f48e63c2fab72e50d8a46b90eafbc6eb12c37e9b0dc961fc9a05894467da39df1fab51d6bfe5eeef87bb4331678afc7dee8859e668372cf9ecb4ff560de1772a2ecb7f2263aafbfe36c7eca83f5049595b2bc088c7f9497f07baf179c9557e1b0bcb6b984cdc54c980c6be6aa8df2a6bc2d07e51d9ff8c931f5c2ae439643cdd593e6a602bdb34f92c26f457d94a364e99d672fe5b89c94533ee2b7e53d1f951faa145ef9213ae190bff177d98d62f37fab0d1deb13f483be7129c6e98368aa1e4bd5846da09f2667d9e7a834cb076b05deb0df5bb4f681df7f7bb18d992f75a2b254e5ac34be9517e513bb2f9fe579392f782292677f763cbdb0b92068972fe130657211f9eac35843a9bc5ce8cc2fcad7f2ad7c4fb2725936cc78770ad35f9b1be299898777ab0b6a549ae32c1791d18a9ee89446f12c9bed24e8f086974b667c84d9be5a5da86dd13431d0b7df55e40d6b0dfafddf6f4ba97bf6d991c153d92ccfca56d91649792e9765a77ccf1ad926d3feec787a61b76597b58cc68fe5a7f18fcc7e12d30fcb9efa10dbb2cf9e2b5e8c8de7c7266398d137c2b0801f517a41f8203ac637de6c6e005f3036b2738e89bd638be39dd9f88771ae9f0a31a1dfdb57c5fede17be7fa949258c1a9d57b2527215cd92b5baf15f2b9d4d63aff2e49c4ff43a681e4f2f4c8d9197db20101b31323561a3feeea0ad31de8d7a3ed8ef947a015fb249e59b7982c93955e0053216039b13f8ab1a810f583f31f972a246fc4576ab50655e513fafce8d7130d65d3dfbe60be5a1d6cbb37fe413766befa384d7729fb6721e6fcb66320f27c179795345559c96a55f257c94b58ea717765bd9e7792ecc1ceddeaef9e983d50bafaf3eaa2c6fb3c7f03c7f6393283639736172dc6595a7af7ecb5691d607d4087482bffb769ed195cce48889fd763ff881cd0bf5bf9a759e305ea29affcc177efbb2478443e31945a9c47d55569568c687e4ae5a85efd943b50e36d5e6787a61b7c13bfb30713908b65eeee5bc659fbd68ea0cae9e632d66712ba84c8dc8cd3cf3b5da268bcacc96bcb58c4dedf82a17a017b2ebf3a09fd423a9263647940f6a92d8e709cd54667cc2f03ff781ffbe35d16a9fe9969aca2c2d6fb265f9c9e6d5cece57cba76a6fc2eb5e96e2267ed2dbe3e90567f198b5d496c5726866462cb0cf1ab46b9f4c8cbdcfea335cb19e1c588f576d534f5e47afd5c17f3699dffa45574eac32d8ba31a82b26f487a6197dd28be6b7dcf1475ef62988f648537fa681174e6c2e896ec249945417d52a9b49337baf2e855f5d1d4b2f44c2ed9a772e85bcd37b316077a617cf8a79a6068ea6c175e227976929a58df352a86dd091d33c8fde6cede873d35f51574818dfb0353ed1acaead2e180b8dff882f7cb535b3b475f621d7d58d5dcb48e601cbaa9cc52fd5453e4eef926b98971c412f22af69ff9e447026c7416c3fabcd4676445556d78d4c8878c99ec5b377632acbc4d41063336f49ec7382adf7436feb279ad663693d03fcc2daa3f6961ff087ffe61f0db9f08beca96c470731f7665555dd26efb1ae06d9347be0651616eb63e84575c787de7d3e2c2f94f4bc602cc67acaed1c32b3916f7c60efbdd9b980df166b9644bead9df47d3eb2969097b257e7c64e30ae86ba2f0fd5e8fb312d1fcac3cffa441d239791cf7a455e8dab1b363391d2ae262a48fc6c1a4cc4553e4f3fed036f7e522fa274c85ad5d4334e974ecd9c91d57f4b600c39cfcc1bbbdcce283ad5bd96a257d70c0c34c0f886b184eec1d6b0ed33fbfbf1b46af9dbdffd3dffee5743eefd37be8b6ec53cecb197709277f4b07aa8bc6a16a9a0489f44fc737a1133d6e2b7324df7d563f514b7f52c3216b163eee772908f4ccf97c60b1e74563debccea85b5453517a3acd4f7660e99d8ef2647be7d3e8e1c060ff699523feb03b4358af53dcfe4221bd815bfeac5ccd296f1367b8a92709135f24915853a6807cd9fd18bf4890f446e469e578bbcc1e6c1ad7dbe8becda3984c929f6798ecc44c1a5e929fed86adafeceded7d03dfb833e92420df1a3f9e2f7bc24cbbac122335a117fa8b07acd2e42ed0fc243b4a82eb20393d1e58feb4590b34b91b31ba3919160d55e96d94076f5056fd8da534f4c6f9f4dbf7ba67eb4cffbec99d7a59c5473538bcdccdca201ca49be026cf2c9517ce2abad9a888d3c8fa2c78d0ac54e858f9bac515d44a68049cb7051bdb1ed8fea45f118b360ae26b61f7565bc3035b51d7356095b330866bf3d68fcc08efb0434c15ac3a808e8c3a5fda9b74c6dedefed8f5da7fc37f9855de719b07e7099ecf3839923bd4761ceab65a88b7d91055745973fff985e0479f1c15a660e68674ff518d7cf422e7823e8578daa2999cfad6ed8e780f386d18319f880d9c758c7ae3dd9e7a52bb488d115a3a06ca31af5fca37b5c9f3055b8d5db96ee86d7ace79fdb95e0ea4c7ad547b48fefccbca4253e8369d54e3f7f4c2f12ab990d5b2f525eb06b8df2a09a6562d71931571c6c74e854de599f405fb8b32b72765d52eff5dece35c83f20b7d42b7447f307de5266168b6cae95f5d37dd20d96d559d84b2ea5aeced97d5514cdaa13a8a0f1637a118fabaecd15667ef102f305755626b6d710f73a4d6f75df3e574f35ac35cc3b3da827d25b6b09589fb43fe9ed77ba71798c1ad3e9c3ce5670411b2bfa336d6a5c719b0e643bde563d318b3ecb76362b1e64abc8bd45b80c863fa617559f9f077d13ffcc3ebb04ea066b89fad99b5d0dabd233b7de543f1fdefeded452b6a2baabff9e80fdf9e643f57e562fea4ae3a7fcc13e6334ddf1b67daebf7dda36fdde5cd588ad565cde88b9fd9b39315f3175be122bb9522bbdf27e4c2f56fe2a303a606c5044662e6eb659a8eaf8373ed0b73e60ea8b49deabd7a42e8d6ff44d3c7cc07cc3fa4e6d1b1ac3eef739c55ae4877da3057f9f805dd92dffcd9cd6dac2ce4bc2e7609a5762c91ec5ac3a5b85ab287af3cffd76b8e4d31fd38b551c0decdf1f31b922865c6035b4bec759af49adb0beacf521b316b25586f9b7a9b2eb979b73d4d738f9e61bb5ba1e7e349f386df8f265eb60711bb556e92a136f62b6cad37319ae0aef25f6f4225aff687db12af939bf317effe05fcb81a91dd147f88bfd66edb7bac1d61b9843ee54560d8d8e7c1bcb9474c3e6906fbef1fd5ad6cfe710b090e5ca5c91a931f6ea21526c667e5e56d56a152ea2a8ba58ad579b1fad2ffcd96acb6f8c325bad18d4ab515d39a8eb4c66f24bfd32d6b0339206db983869da9c0139c48d93f114faf7f7ba6195e51839c468c66ffc2438b3e3130e5916df18cd581665f21eead547a492f7dc5fed7e743e12ae92e7aa5bd71103653387a925ed67f87d6ef4a32307661bd5fa31b3f7b6ecd68e39d50f726875d4f8889d7d808e64e41b5feb859d937db71ed132d972f77bea8aef7feff56c6d68c62e0da659b5dab37972992d7326cb34f70fce2f7e603e120cd371d0afebe7cc3e4bd0ae4dd4f776bbb68e841a13ebce7abe6135c3664da31af5b843beb07353cdec3dd03ad3d4fbd8f5cc7f994b6a7bfc717f01cd28eeb227719fb7c4cc9b8537c55bb4f73aabcf9f58bf78581d44beba905d3f17233bcfb0b5a67e30b190c29cf45bdd60ac62957366734aad8e771e66d5606cef06836f404e01dfe1cd63d69ebf594b9ff157218a3c6ddb5c2266f12069946938ad7e582fec36f94cc7defd2aa933e71d640c9859502d69fd01fefdbd1ed4bfcf6d94581f019f70b5a189a6e3e8c53ff00b9bd5bbacefbfc6dbd5257bced2ea2c0d92fd6ab3bafa99f50bff897dacaef980378d4ff7bef705332b8fec3ca5ae382fbff711d842dd257bd647709df3430eedb6b65ba39eaffc1be6aab035bab6d757f14eccea4ffaeda4bfbaf1d9cfe885d9863ee777debdd5051619addc7e3ff676b6f6cd0fbefd1b5f77506fd178ad6ee5d0decbf8ee98eeb7f10cceeccf11724b9d57a4fd7b5bcbd5203f987aebc01ef34391acee929f5def3cac86ab5179558f75fadbb1ff6e6bc7f837b5a5f1071f7ca1d60d1b13cd5ad72e7feb3bc79dabd6ff6a1acd9ef1c56a9c2f5793eaacfecb72f3ac67fc62fa73eb9d8cf37391f38189f1de2ab17df8b636f1fdfcf3fbfb9f0a7b6fd7b1e059e0f665e72cf51cf6bbfd7fd60fccecacae31ecfce4bb39c9c46479934b56f7612e9e6c94ac1e4c94dc05e1cfde1f59cd582b1f7eef0b902b8c5e5c12dbfba2565bab919dc5c3fbf667f5687e7b69e7ae3066660e6b676d99f9bd55d09fb91f622bcd1dbbe26754737eff7e29edfd92d554dd5437f03791aa9e77c67f4e2fcc3694fc2ae8c37dce6f3e613f41856b5513f81c55bd9e09cf9d87ca0c34c3cef233d48d7e6d993b581f7573963f92537e67bd61eb4f5edf2f918f3697d828e1e9eae967ef8f642d6f2372537309fb84f3efd621b6750eb9abd7b0fe4e3f6ca56eb736137f773fa45eef303e92dabf8967d749ed6713bde277fb02fc35acdfe13bc199caccfca9b77a5ecd2197b0b99caf5e7efe7e6af0965c78f7942fa08eb0fda07fd31cc3de39727587f321a8ace4a14ceabcd2af86f55f4bccec3a58ed1d47f70b9b8f4cbe9aac16abd7d55bdec4bf37b85dbdfffcfdd43009467c5035ec7cc268c0525e06ad6f7546dd5f3347b32b7f303f81dfff565f6c56ae86d5a81ad6eba17807c97e2eebd8f505ddb73573d6c5aa51de445d36afff2ee795b7faf9fba96973b5b535463dde3d53554c6cff3d5d7f9bb6616bae7aee8aeb1934e6b42efe7735c7acdef75b8de1c6f2fb5ae438f5a7a93e7b51591c581d27feb6ac8ef0f98b78d534f5e796cf4dc4ce5767fac0cd4bb58069bb3ab3dbfffefb2ff66b192f7eaef959ed43ee31de665bd8121f63cb5be5d46baed6ab56781b158c799fc7fafcc5ff1fb6fff9fffe9ffff1ff01d65fbc39</data> </image> </images> -<Q_SLOTS> +<slots> <slot>finishButton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index ed1d7dc..94553f0 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -42,8 +42,8 @@ #include <tqheader.h> #include <tdetempfile.h> #include <kdebug.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <tqwidget.h> #include <tdeaction.h> #include <tqcheckbox.h> @@ -72,9 +72,9 @@ #include <tdeapplication.h> #include <tdeabc/stdaddressbook.h> #include <tdeabc/addresseedialog.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqcombobox.h> #include <tqtabwidget.h> #include <kinputdialog.h> @@ -350,8 +350,8 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) { KMessageBox::information(this,i18n("<qt><b>Some of your secret keys are untrusted.</b><br>Change their trust if you want to use them for signing.</qt>"),TQString(),"warnUntrusted"); } - TQObject::connect(keysListpr,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),TQT_TQOBJECT(this),TQT_SLOT(slotpreOk())); - TQObject::connect(keysListpr,TQT_SIGNAL(clicked(TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(slotSelect(TQListViewItem *))); + TQObject::connect(keysListpr,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotpreOk())); + TQObject::connect(keysListpr,TQ_SIGNAL(clicked(TQListViewItem *)),this,TQ_SLOT(slotSelect(TQListViewItem *))); if (!selectedok) @@ -460,7 +460,7 @@ KeyView::KeyView( TQWidget *parent, const char *name ) trustgood.fill(KGpgSettings::colorGood());//TQColor(144,255,0)); bitBlt(&trustgood,0,0,&blankFrame,0,0,50,15); - connect(this,TQT_SIGNAL(expanded (TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(expandKey(TQListViewItem *))); + connect(this,TQ_SIGNAL(expanded (TQListViewItem *)),this,TQ_SLOT(expandKey(TQListViewItem *))); header()->setMovingEnabled(false); setAcceptDrops(true); setDragEnabled(true); @@ -476,7 +476,7 @@ void KeyView::droppedfile (KURL url) KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(url); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SLOT(slotReloadKeys(TQStringList))); } void KeyView::contentsDragMoveEvent(TQDragMoveEvent *e) @@ -573,64 +573,64 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa installEventFilter(this); setCaption(i18n("Key Management")); - (void) new TDEAction(i18n("&Open Editor"), "edit",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); - TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),TQT_TQOBJECT(this), TQT_SLOT(slotexport()),actionCollection(),"key_export"); - TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete"); - signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,TQT_TQOBJECT(this), TQT_SLOT(signkey()),actionCollection(),"key_sign"); - TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign"); - TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,TQT_TQOBJECT(this), TQT_SLOT(listsigns()),actionCollection(),"key_info"); - TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),TQT_TQOBJECT(this), TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import"); - TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default"); - importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign"); - importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign"); - refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,TQT_TQOBJECT(this), TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh"); - - TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(createNewGroup()),actionCollection(),"create_group"); - TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteGroup()),actionCollection(),"delete_group"); - TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(editGroup()),actionCollection(),"edit_group"); - - TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,TQT_TQOBJECT(this), TQT_SLOT(addToKAB()),actionCollection(),"add_kab"); - (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key"); - - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitApp()), actionCollection()); - KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(findKey()), actionCollection()); - KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(findNextKey()), actionCollection()); - (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),TQT_TQOBJECT(this), TQT_SLOT(refreshkey()),actionCollection(),"key_refresh"); - TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo"); - TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,TQT_TQOBJECT(this), TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo"); - TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); - - TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddUid()),actionCollection(),"add_uid"); - TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotDelUid()),actionCollection(),"del_uid"); - - TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),TQT_TQOBJECT(this), TQT_SLOT(slotedit()),actionCollection(),"key_edit"); - TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport"); - TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke"); - - TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); - TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),TQT_TQOBJECT(this), TQT_SLOT(slotgenkey()),actionCollection(),"key_gener"); - - TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotregenerate()),actionCollection(),"key_regener"); - - (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(showKeyServer()),actionCollection(),"key_server"); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection(),"options_configure"); - (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,TQT_TQOBJECT(this), TQT_SLOT(slotTip()), actionCollection(),"help_tipofday"); - (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,TQT_TQOBJECT(this), TQT_SLOT(slotManpage()),actionCollection(),"gpg_man"); - - (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret"); + (void) new TDEAction(i18n("&Open Editor"), "edit",0,this, TQ_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); + TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),this, TQ_SLOT(slotexport()),actionCollection(),"key_export"); + TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,this, TQ_SLOT(confirmdeletekey()),actionCollection(),"key_delete"); + signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,this, TQ_SLOT(signkey()),actionCollection(),"key_sign"); + TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,this, TQ_SLOT(delsignkey()),actionCollection(),"key_delsign"); + TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,this, TQ_SLOT(listsigns()),actionCollection(),"key_info"); + TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),this, TQ_SLOT(slotPreImportKey()),actionCollection(),"key_import"); + TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,this, TQ_SLOT(slotSetDefKey()),actionCollection(),"key_default"); + importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,this, TQ_SLOT(preimportsignkey()),actionCollection(),"key_importsign"); + importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,this, TQ_SLOT(importallsignkey()),actionCollection(),"key_importallsign"); + refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,this, TQ_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh"); + + TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,this, TQ_SLOT(createNewGroup()),actionCollection(),"create_group"); + TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,this, TQ_SLOT(deleteGroup()),actionCollection(),"delete_group"); + TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,this, TQ_SLOT(editGroup()),actionCollection(),"edit_group"); + + TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,this, TQ_SLOT(addToKAB()),actionCollection(),"add_kab"); + (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,this, TQ_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key"); + + KStdAction::quit(this, TQ_SLOT(quitApp()), actionCollection()); + KStdAction::find(this, TQ_SLOT(findKey()), actionCollection()); + KStdAction::findNext(this, TQ_SLOT(findNextKey()), actionCollection()); + (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),this, TQ_SLOT(refreshkey()),actionCollection(),"key_refresh"); + TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,this, TQ_SLOT(slotShowPhoto()),actionCollection(),"key_photo"); + TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,this, TQ_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo"); + TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,this, TQ_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); + + TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,this, TQ_SLOT(slotAddUid()),actionCollection(),"add_uid"); + TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,this, TQ_SLOT(slotDelUid()),actionCollection(),"del_uid"); + + TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),this, TQ_SLOT(slotedit()),actionCollection(),"key_edit"); + TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,this, TQ_SLOT(slotexportsec()),actionCollection(),"key_sexport"); + TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,this, TQ_SLOT(revokeWidget()),actionCollection(),"key_revoke"); + + TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,this, TQ_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); + TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),this, TQ_SLOT(slotgenkey()),actionCollection(),"key_gener"); + + TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,this, TQ_SLOT(slotregenerate()),actionCollection(),"key_regener"); + + (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQ_SLOT(showKeyServer()),actionCollection(),"key_server"); + KStdAction::preferences(this, TQ_SLOT(showOptions()), actionCollection(),"options_configure"); + (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,this, TQ_SLOT(slotTip()), actionCollection(),"help_tipofday"); + (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,this, TQ_SLOT(slotManpage()),actionCollection(),"gpg_man"); + + (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,this, TQ_SLOT(slotToggleSecret()),actionCollection(),"show_secret"); keysList2->displayOnlySecret=false; - (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); + (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,this, TQ_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); keysList2->displayDisabled=true; - sTrust=new TDEToggleAction(i18n("Trust"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust"); - sSize=new TDEToggleAction(i18n("Size"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowSize()),actionCollection(),"show_size"); - sCreat=new TDEToggleAction(i18n("Creation"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat"); - sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi"); + sTrust=new TDEToggleAction(i18n("Trust"),0, 0,this, TQ_SLOT(slotShowTrust()),actionCollection(),"show_trust"); + sSize=new TDEToggleAction(i18n("Size"),0, 0,this, TQ_SLOT(slotShowSize()),actionCollection(),"show_size"); + sCreat=new TDEToggleAction(i18n("Creation"),0, 0,this, TQ_SLOT(slotShowCreat()),actionCollection(),"show_creat"); + sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,this, TQ_SLOT(slotShowExpi()),actionCollection(),"show_expi"); photoProps = new TDESelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings"); - connect(photoProps, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetPhotoSize(int))); + connect(photoProps, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetPhotoSize(int))); // Keep the list in kgpg.kcfg in sync with this one! TQStringList list; @@ -722,12 +722,12 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa setCentralWidget(keysList2); keysList2->restoreLayout(TDEGlobal::config(), "KeyView"); - TQObject::connect(keysList2,TQT_SIGNAL(returnPressed(TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(listsigns())); - TQObject::connect(keysList2,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),TQT_TQOBJECT(this),TQT_SLOT(listsigns())); - TQObject::connect(keysList2,TQT_SIGNAL(selectionChanged ()),TQT_TQOBJECT(this),TQT_SLOT(checkList())); - TQObject::connect(keysList2,TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), - this,TQT_SLOT(slotmenu(TQListViewItem *,const TQPoint &,int))); - TQObject::connect(keysList2,TQT_SIGNAL(destroyed()),TQT_TQOBJECT(this),TQT_SLOT(annule())); + TQObject::connect(keysList2,TQ_SIGNAL(returnPressed(TQListViewItem *)),this,TQ_SLOT(listsigns())); + TQObject::connect(keysList2,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(listsigns())); + TQObject::connect(keysList2,TQ_SIGNAL(selectionChanged ()),this,TQ_SLOT(checkList())); + TQObject::connect(keysList2,TQ_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), + this,TQ_SLOT(slotmenu(TQListViewItem *,const TQPoint &,int))); + TQObject::connect(keysList2,TQ_SIGNAL(destroyed()),this,TQ_SLOT(annule())); /////////////// get all keys data @@ -742,10 +742,10 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa : "locationbar_erase")); (void) new TQLabel(i18n("Search: "),toolBar()); listViewSearch = new mySearchLine(toolBar(),keysList2); - connect(clearSearch, TQT_SIGNAL(pressed()), TQT_TQOBJECT(listViewSearch), TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); - (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, TQT_TQOBJECT(listViewSearch), TQT_SLOT(setFocus()),actionCollection(), "search_focus"); + (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, listViewSearch, TQ_SLOT(setFocus()),actionCollection(), "search_focus"); sTrust->setChecked(KGpgSettings::showTrust()); sSize->setChecked(KGpgSettings::showSize()); @@ -758,13 +758,13 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa keyStatusBar->insertFixedItem(i18n("00000 Keys, 000 Groups"),1,true); keyStatusBar->setItemAlignment(0, AlignLeft); keyStatusBar->changeItem("",1); - TQObject::connect(keysList2,TQT_SIGNAL(statusMessage(TQString,int,bool)),TQT_TQOBJECT(this),TQT_SLOT(changeMessage(TQString,int,bool))); - TQObject::connect(statusbarTimer,TQT_SIGNAL(timeout()),TQT_TQOBJECT(this),TQT_SLOT(statusBarTimeout())); + TQObject::connect(keysList2,TQ_SIGNAL(statusMessage(TQString,int,bool)),this,TQ_SLOT(changeMessage(TQString,int,bool))); + TQObject::connect(statusbarTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(statusBarTimeout())); s_kgpgEditor= new KgpgApp(parent, "editor",WType_Dialog,actionCollection()->action("go_default_key")->shortcut(),true); - connect(s_kgpgEditor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(this,TQT_SIGNAL(fontChanged(TQFont)),s_kgpgEditor,TQT_SLOT(slotSetFont(TQFont))); - connect(s_kgpgEditor->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(s_kgpgEditor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(this,TQ_SIGNAL(fontChanged(TQFont)),s_kgpgEditor,TQ_SLOT(slotSetFont(TQFont))); + connect(s_kgpgEditor->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); // kdDebug(2100) << k_funcinfo << "getGpgversion" << KgpgInterface::getGpgVersion() <<endl; } @@ -781,10 +781,10 @@ show(); void listKeys::slotOpenEditor() { KgpgApp *kgpgtxtedit = new KgpgApp(this, "editor",WType_TopLevel | WDestructiveClose,actionCollection()->action("go_default_key")->shortcut()); - connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SIGNAL(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(fontChanged(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SIGNAL(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(fontChanged(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); kgpgtxtedit->show(); } @@ -911,7 +911,7 @@ void listKeys::refreshKeyFromServer() kServer=new keyServer(0,"server_dialog",false); kServer->page->kLEimportid->setText(keyIDS); kServer->slotImport(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT(refreshFinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT(refreshFinished())); } @@ -970,13 +970,13 @@ void listKeys::slotAddUid() addUidWidget->setMainWidget(keyUid); //keyUid->setMinimumSize(keyUid->sizeHint()); keyUid->setMinimumWidth(300); - connect(keyUid->kLineEdit1,TQT_SIGNAL(textChanged ( const TQString & )),TQT_TQOBJECT(this),TQT_SLOT(slotAddUidEnable(const TQString & ))); + connect(keyUid->kLineEdit1,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotAddUidEnable(const TQString & ))); if (addUidWidget->exec()!=TQDialog::Accepted) return; KgpgInterface *addUidProcess=new KgpgInterface(); addUidProcess->KgpgAddUid(keysList2->currentItem()->text(6),keyUid->kLineEdit1->text(),keyUid->kLineEdit2->text(),keyUid->kLineEdit3->text()); - connect(addUidProcess,TQT_SIGNAL(addUidFinished()),keysList2,TQT_SLOT(refreshselfkey())); - connect(addUidProcess,TQT_SIGNAL(addUidError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString))); + connect(addUidProcess,TQ_SIGNAL(addUidFinished()),keysList2,TQ_SLOT(refreshselfkey())); + connect(addUidProcess,TQ_SIGNAL(addUidError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotAddUidEnable(const TQString & name) @@ -999,8 +999,8 @@ void listKeys::slotAddPhoto() return; KgpgInterface *addPhotoProcess=new KgpgInterface(); addPhotoProcess->KgpgAddPhoto(keysList2->currentItem()->text(6),imagePath); - connect(addPhotoProcess,TQT_SIGNAL(addPhotoFinished()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdatePhoto())); - connect(addPhotoProcess,TQT_SIGNAL(addPhotoError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString))); + connect(addPhotoProcess,TQ_SIGNAL(addPhotoFinished()),this,TQ_SLOT(slotUpdatePhoto())); + connect(addPhotoProcess,TQ_SIGNAL(addPhotoError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotGpgError(TQString errortxt) @@ -1016,8 +1016,8 @@ void listKeys::slotDeletePhoto() KgpgInterface *delPhotoProcess=new KgpgInterface(); delPhotoProcess->KgpgDeletePhoto(keysList2->currentItem()->parent()->text(6),keysList2->currentItem()->text(6)); - connect(delPhotoProcess,TQT_SIGNAL(delPhotoFinished()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdatePhoto())); - connect(delPhotoProcess,TQT_SIGNAL(delPhotoError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString))); + connect(delPhotoProcess,TQ_SIGNAL(delPhotoFinished()),this,TQ_SLOT(slotUpdatePhoto())); + connect(delPhotoProcess,TQ_SIGNAL(delPhotoError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotUpdatePhoto() @@ -1180,7 +1180,7 @@ void listKeys::addToKAB() } TDEABC::Addressee::List addresseeList = ab->findByEmail(email); - kapp->startServiceByDesktopName( "kaddressbook" ); + tdeApp->startServiceByDesktopName( "kaddressbook" ); DCOPRef call( "kaddressbook", "KAddressBookIface" ); if( !addresseeList.isEmpty() ) { call.send( "showContactEditor(TQString)", addresseeList.first().uid() ); @@ -1230,7 +1230,7 @@ void listKeys::allToKAB() void listKeys::slotManpage() { - kapp->startServiceByDesktopName("khelpcenter", TQString("man:/gpg"), 0, 0, 0, "", true); + tdeApp->startServiceByDesktopName("khelpcenter", TQString("man:/gpg"), 0, 0, 0, "", true); } void listKeys::slotTip() @@ -1240,7 +1240,7 @@ void listKeys::slotTip() void listKeys::closeEvent ( TQCloseEvent * e ) { - //kapp->ref(); // prevent TDEMainWindow from closing the app + //tdeApp->ref(); // prevent TDEMainWindow from closing the app //TDEMainWindow::closeEvent( e ); e->accept(); // hide(); @@ -1251,7 +1251,7 @@ void listKeys::showKeyServer() { // kdDebug(2100) << k_funcinfo << endl; keyServer *ks=new keyServer(this); - connect(ks,TQT_SIGNAL( importFinished(TQString) ) , keysList2, TQT_SLOT(refreshcurrentkey(TQString))); + connect(ks,TQ_SIGNAL( importFinished(TQString) ) , keysList2, TQ_SLOT(refreshcurrentkey(TQString))); ks->exec(); if (ks) delete ks; @@ -1319,7 +1319,7 @@ void listKeys::readOptions() // kdDebug(2100) << k_funcinfo << endl; clipboardMode=TQClipboard::Clipboard; - if (KGpgSettings::useMouseSelection() && (kapp->clipboard()->supportsSelection())) + if (KGpgSettings::useMouseSelection() && (tdeApp->clipboard()->supportsSelection())) clipboardMode=TQClipboard::Selection; /////// re-read groups in case the config file location was changed @@ -1338,12 +1338,12 @@ void listKeys::showOptions() if (TDEConfigDialog::showDialog("settings")) return; kgpgOptions *optionsDialog=new kgpgOptions(this,"settings"); - connect(optionsDialog,TQT_SIGNAL(settingsUpdated()),TQT_TQOBJECT(this),TQT_SLOT(readAllOptions())); - connect(optionsDialog,TQT_SIGNAL(homeChanged()),TQT_TQOBJECT(this),TQT_SLOT(refreshkey())); - connect(optionsDialog,TQT_SIGNAL(reloadKeyList()),TQT_TQOBJECT(this),TQT_SLOT(refreshkey())); - connect(optionsDialog,TQT_SIGNAL(refreshTrust(int,TQColor)),keysList2,TQT_SLOT(refreshTrust(int,TQColor))); - connect(optionsDialog,TQT_SIGNAL(changeFont(TQFont)),TQT_TQOBJECT(this),TQT_SIGNAL(fontChanged(TQFont))); - connect(optionsDialog,TQT_SIGNAL(installShredder()),TQT_TQOBJECT(this),TQT_SIGNAL(installShredder())); + connect(optionsDialog,TQ_SIGNAL(settingsUpdated()),this,TQ_SLOT(readAllOptions())); + connect(optionsDialog,TQ_SIGNAL(homeChanged()),this,TQ_SLOT(refreshkey())); + connect(optionsDialog,TQ_SIGNAL(reloadKeyList()),this,TQ_SLOT(refreshkey())); + connect(optionsDialog,TQ_SIGNAL(refreshTrust(int,TQColor)),keysList2,TQ_SLOT(refreshTrust(int,TQColor))); + connect(optionsDialog,TQ_SIGNAL(changeFont(TQFont)),this,TQ_SIGNAL(fontChanged(TQFont))); + connect(optionsDialog,TQ_SIGNAL(installShredder()),this,TQ_SIGNAL(installShredder())); optionsDialog->exec(); delete optionsDialog; } @@ -1476,15 +1476,15 @@ void listKeys::revokeWidget() if (keyRevoke->cbSave->isChecked()) { slotrevoke(keysList2->currentItem()->text(6),keyRevoke->kURLRequester1->url(),keyRevoke->comboBox1->currentItem(),keyRevoke->textDescription->text()); if (keyRevoke->cbPrint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doFilePrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(doFilePrint(TQString))); if (keyRevoke->cbImport->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotImportRevoke(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(slotImportRevoke(TQString))); } else { slotrevoke(keysList2->currentItem()->text(6),TQString(),keyRevoke->comboBox1->currentItem(),keyRevoke->textDescription->text()); if (keyRevoke->cbPrint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doPrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(doPrint(TQString))); if (keyRevoke->cbImport->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotImportRevokeTxt(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(slotImportRevokeTxt(TQString))); } } @@ -1493,14 +1493,14 @@ void listKeys::slotImportRevoke(TQString url) { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL::fromPathOrURL( url )); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(refreshselfkey())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(refreshselfkey())); } void listKeys::slotImportRevokeTxt(TQString revokeText) { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(revokeText); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(refreshselfkey())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(refreshselfkey())); } void listKeys::slotexportsec() @@ -1525,7 +1525,7 @@ void listKeys::slotexportsec() if (fgpg.exists()) fgpg.remove(); - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty"<<"--output"<<TQString(TQFile::encodeName(url.path()))<<"--armor"<<"--export-secret-keys"<<keysList2->currentItem()->text(6); p->start(TDEProcess::Block); @@ -1587,7 +1587,7 @@ void listKeys::slotexport() expServer->slotExport(exportKeysList); return; } - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty"; if (page->checkFile->isChecked()) { expname=page->newFilename->url().stripWhiteSpace(); @@ -1623,10 +1623,10 @@ void listKeys::slotexport() TQString result=kexp->getKey(tdelist,exportAttr); if (page->checkClipboard->isChecked()) slotProcessExportClip(result); - //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessExportClip(TQString))); + //connect(kexp,TQ_SIGNAL(publicKeyString(TQString)),this,TQ_SLOT(slotProcessExportClip(TQString))); else slotProcessExportMail(result); - //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessExportMail(TQString))); + //connect(kexp,TQ_SIGNAL(publicKeyString(TQString)),this,TQ_SLOT(slotProcessExportMail(TQString))); } } @@ -1638,7 +1638,7 @@ void listKeys::slotexport() void listKeys::slotProcessExportMail(TQString keys) { /// start default Mail application - kapp->invokeMailer(TQString(), TQString(), TQString(), TQString(), + tdeApp->invokeMailer(TQString(), TQString(), TQString(), TQString(), keys, //body TQString(), TQString()); // attachments @@ -1646,7 +1646,7 @@ void listKeys::slotProcessExportMail(TQString keys) void listKeys::slotProcessExportClip(TQString keys) { - kapp->clipboard()->setText(keys,clipboardMode); + tdeApp->clipboard()->setText(keys,clipboardMode); } @@ -1664,7 +1664,7 @@ void listKeys::slotShowPhoto() TDETrader::OfferList offers = TDETrader::self()->query("image/jpeg", "Type == 'Application'"); KService::Ptr ptr = offers.first(); //KMessageBox::sorry(0,ptr->desktopEntryName()); - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty" <<"--photo-viewer"<<TQString(TQFile::encodeName(ptr->desktopEntryName()+" %i")) <<"--edit-key"<<keysList2->currentItem()->parent()->text(6) @@ -1698,7 +1698,7 @@ void listKeys::listsigns() TQString key=keysList2->currentItem()->text(6); if (!key.isEmpty()) { KgpgKeyInfo *opts=new KgpgKeyInfo(this,"key_props",key); - connect(opts,TQT_SIGNAL(keyNeedsRefresh()),keysList2,TQT_SLOT(refreshselfkey())); + connect(opts,TQ_SIGNAL(keyNeedsRefresh()),keysList2,TQ_SLOT(refreshselfkey())); opts->exec(); } else editGroup(); @@ -1848,11 +1848,11 @@ void listKeys::editGroup() gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-down",TDEIcon::Small,20)); gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-up",TDEIcon::Small,20)); - connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupAdd())); - connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupRemove())); - // connect(dialogGroupEdit->okClicked(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupChange())); - connect(gEdit->availableKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),TQT_TQOBJECT(this),TQT_SLOT(groupAdd())); - connect(gEdit->groupKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),TQT_TQOBJECT(this),TQT_SLOT(groupRemove())); + connect(gEdit->buttonAdd,TQ_SIGNAL(clicked()),this,TQ_SLOT(groupAdd())); + connect(gEdit->buttonRemove,TQ_SIGNAL(clicked()),this,TQ_SLOT(groupRemove())); + // connect(dialogGroupEdit->okClicked(),TQ_SIGNAL(clicked()),this,TQ_SLOT(groupChange())); + connect(gEdit->availableKeys,TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQ_SLOT(groupAdd())); + connect(gEdit->groupKeys,TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQ_SLOT(groupRemove())); TQListViewItem *item=keysList2->firstChild(); if (item==NULL) return; @@ -2024,7 +2024,7 @@ void listKeys::signLoop() // kdDebug(2100)<<"Sign process for key: "<<keyCount<<" on a total of "<<signList.count()<<endl; if ( signList.at(keyCount) ) { KgpgInterface *signKeyProcess=new KgpgInterface(); - TQObject::connect(signKeyProcess,TQT_SIGNAL(signatureFinished(int)),TQT_TQOBJECT(this),TQT_SLOT(signatureResult(int))); + TQObject::connect(signKeyProcess,TQ_SIGNAL(signatureFinished(int)),this,TQ_SLOT(signatureResult(int))); signKeyProcess->KgpgSignKey(signList.at(keyCount)->text(6),globalkeyID,globalkeyMail,globalisLocal,globalChecked); } } @@ -2088,7 +2088,7 @@ bool listKeys::importRemoteKey(TQString keyID) kServer->page->tabWidget2->setTabEnabled(kServer->page->tabWidget2->page(1),false); kServer->show(); kServer->raise(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT( dcopImportFinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT( dcopImportFinished())); return true; } @@ -2103,7 +2103,7 @@ void listKeys::dcopImportFinished() TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << true; - kapp->dcopClient()->emitDCOPSignal("keyImported(bool)", params); + tdeApp->dcopClient()->emitDCOPSignal("keyImported(bool)", params); refreshkey(); } @@ -2117,7 +2117,7 @@ void listKeys::importsignkey(TQString importKeyId) kServer->slotImport(); // kServer->slotSearch(); //kServer->show(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT( importfinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT( importfinished())); } @@ -2164,7 +2164,7 @@ void listKeys::delsignkey() return; KgpgInterface *delSignKeyProcess=new KgpgInterface(); delSignKeyProcess->KgpgDelSignature(parentKey,signID); - connect(delSignKeyProcess,TQT_SIGNAL(delsigfinished(bool)),TQT_TQOBJECT(this),TQT_SLOT(delsignatureResult(bool))); + connect(delSignKeyProcess,TQ_SIGNAL(delsigfinished(bool)),this,TQ_SLOT(delsignatureResult(bool))); } void listKeys::delsignatureResult(bool success) @@ -2267,12 +2267,12 @@ void listKeys::slotgenkey() int iYpos=qRect.height()/2-pop->height()/2; pop->move(iXpos,iYpos); pop->setAutoDelete(false); - KProcIO *proc=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *proc=new TDEProcIO(TQTextCodec::codecForLocale()); message=TQString(); //*proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--batch"<<"--passphrase-fd"<<res<<"--gen-key"<<"-a"<<"kgpg.tmp"; *proc<<"gpg"<<"--no-tty"<<"--status-fd=2"<<"--no-secmem-warning"<<"--batch"<<"--gen-key"<<"--utf8-strings"; ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(genover(TDEProcess *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(genover(TDEProcess *))); proc->start(TDEProcess::NotifyOnExit,true); if (ktype=="RSA") @@ -2303,7 +2303,7 @@ void listKeys::slotgenkey() if (kexp==4) proc->writeStdin(TQString("Expire-Date:%1y").arg(knumb)); proc->writeStdin(TQString("%commit")); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this),TQT_SLOT(readgenprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(readgenprocess(TDEProcIO *))); proc->closeWhenDone(); } else ////// start expert (=konsole) mode { @@ -2321,7 +2321,7 @@ void listKeys::slotgenkey() } } -void listKeys::readgenprocess(KProcIO *p) +void listKeys::readgenprocess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString required; @@ -2339,20 +2339,20 @@ void listKeys::genover(TDEProcess *) // kdDebug(2100) << k_funcinfo << endl; newkeyID=TQString(); continueSearch=true; - KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); TQString fpropt = (KgpgInterface::getGpgVersion() < 210 ) ? "--fingerprint" : "--with-fingerprint"; *conprocess<< "gpg"; *conprocess<<"--no-secmem-warning" <<"--with-colons" << fpropt <<"--list-keys"<<newKeyName; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this),TQT_SLOT(slotReadFingerProcess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(newKeyDone(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(TDEProcIO *)),this,TQ_SLOT(slotReadFingerProcess(TDEProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(newKeyDone(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,true); } -void listKeys::slotReadFingerProcess(KProcIO *p) +void listKeys::slotReadFingerProcess(TDEProcIO *p) { // kdDebug(2100) << k_funcinfo << endl; TQString outp; @@ -2413,10 +2413,10 @@ void listKeys::newKeyDone(TDEProcess *) if (page->CBsave->isChecked()) { slotrevoke(newkeyID,page->kURLRequester1->url(),0,i18n("backup copy")); if (page->CBprint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doFilePrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(doFilePrint(TQString))); } else if (page->CBprint->isChecked()) { slotrevoke(newkeyID,TQString(),0,i18n("backup copy")); - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doPrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(doPrint(TQString))); } } @@ -2460,7 +2460,7 @@ void listKeys::deleteseckey() *conprocess<< config->readPathEntry("TerminalApplication","konsole"); *conprocess<<"-e"<<"gpg" <<"--no-secmem-warning" <<"--delete-secret-key"<<keysList2->currentItem()->text(6); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(reloadSecretKeys())); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(reloadSecretKeys())); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -2594,17 +2594,17 @@ void listKeys::slotPreImportKey() ////////////////////////// import from file KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL::fromPathOrURL( impname )); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(refreshOrphaned()),keysList2,TQ_SLOT(slotReloadOrphaned())); } } else { - TQString keystr = kapp->clipboard()->text(clipboardMode); + TQString keystr = tdeApp->clipboard()->text(clipboardMode); if (!keystr.isEmpty()) { changeMessage(i18n("Importing..."),0,true); KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(keystr); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(refreshOrphaned()),keysList2,TQ_SLOT(slotReloadOrphaned())); } } } @@ -2629,7 +2629,7 @@ TQPixmap KeyView::slotGetPhoto(TQString photoId,bool mini) // kdDebug(2100) << k_funcinfo << endl; KTempFile *phototmp=new KTempFile(); TQString popt="cp %i "+phototmp->name(); - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--show-photos" <<"--photo-viewer"<<TQString(TQFile::encodeName(popt)) <<"--list-keys"<<photoId; @@ -2641,9 +2641,9 @@ TQPixmap KeyView::slotGetPhoto(TQString photoId,bool mini) TQImage dup=pixmap.convertToImage(); TQPixmap dup2; if (!mini) - dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQImage::ScaleMin)); else - dup2.convertFromImage(dup.scale(22,22,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(22,22,TQImage::ScaleMin)); phototmp->unlink(); delete phototmp; return dup2; @@ -2710,7 +2710,7 @@ void KeyView::expandKey(TQListViewItem *item) kgpgphototmp=new KTempFile(); kgpgphototmp->setAutoDelete(true); TQString pgpgOutput="cp %i "+kgpgphototmp->name(); - KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *p=new TDEProcIO(TQTextCodec::codecForLocale()); *p<<"gpg"<<"--no-tty" <<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput)) <<"--edit-key"<<item->text(6) @@ -2721,7 +2721,7 @@ void KeyView::expandKey(TQListViewItem *item) pixmap.load(kgpgphototmp->name()); TQImage dup=pixmap.convertToImage(); TQPixmap dup2; - dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQ_ScaleMin)); + dup2.convertFromImage(dup.scale(previewSize+5,previewSize,TQImage::ScaleMin)); itemuid->setPixmap(0,dup2); delete kgpgphototmp; //itemuid->setPixmap(0,keyPhotoId); @@ -2833,7 +2833,7 @@ void KeyView::refreshkeylist() { // kdDebug(2100) << k_funcinfo << endl; emit statusMessage(i18n("Loading Keys..."),0,true); - kapp->processEvents(); + tdeApp->processEvents(); //////// update display of keys in main management window // kdDebug(2100)<<"Refreshing key list"<<endl; @@ -3420,7 +3420,7 @@ gpgKey KeyView::extractKey(TQString keyColon) date = timestamp.date(); } else { - date = TQDate::fromString(ret.gpgkeycreation, Qt::ISODate); + date = TQDate::fromString(ret.gpgkeycreation, TQt::ISODate); } Q_ASSERT (date.isValid()) /*tqWarning("create date is not valid")*/; ret.gpgkeycreation=TDEGlobal::locale()->formatDate(date, true); @@ -3439,7 +3439,7 @@ gpgKey KeyView::extractKey(TQString keyColon) date = timestamp.date(); } else { - date = TQDate::fromString(ret.gpgkeyexpiration, Qt::ISODate); + date = TQDate::fromString(ret.gpgkeyexpiration, TQt::ISODate); } Q_ASSERT (date.isValid()) /*tqWarning("expire date is not valid")*/; ret.gpgkeyexpiration=TDEGlobal::locale()->formatDate(date, true); diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index 55af3b5..a65abe6 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -42,7 +42,7 @@ class TQCheckbox; class KStatusBar; class KPassivePopup; class TDEProcess; -class KProcIO; +class TDEProcIO; class TQEvent; class KTempFile; class KgpgApp; @@ -67,7 +67,7 @@ struct gpgKey class KgpgSelKey : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -91,7 +91,7 @@ public slots: class KeyView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class listKeys; public: @@ -143,7 +143,7 @@ protected: class mySearchLine: public TDEListViewSearchLine { - Q_OBJECT + TQ_OBJECT public: mySearchLine(TQWidget *parent = 0, KeyView *listView = 0, const char *name = 0); @@ -161,7 +161,7 @@ virtual bool itemMatches(const TQListViewItem *item, const TQString & s) const; class listKeys : public TDEMainWindow, virtual public KeyInterface { friend class KeyView; - Q_OBJECT + TQ_OBJECT public: @@ -235,7 +235,7 @@ private slots: void slotAddPhoto(); void slotSetPhotoSize(int size); void slotShowPhoto(); - void readgenprocess(KProcIO *p); + void readgenprocess(TDEProcIO *p); void newKeyDone(TDEProcess *); void slotrevoke(TQString keyID,TQString revokeUrl,int reason,TQString description); void revokeWidget(); @@ -247,7 +247,7 @@ private slots: void slotTip(); void showKeyServer(); void showKeyManager(); - void slotReadFingerProcess(KProcIO *p); + void slotReadFingerProcess(TDEProcIO *p); void slotProcessExportMail(TQString keys); void slotProcessExportClip(TQString keys); void readOptions(); diff --git a/kgpg/main.cpp b/kgpg/main.cpp index 73b99bf..7ef747b 100644 --- a/kgpg/main.cpp +++ b/kgpg/main.cpp @@ -21,7 +21,7 @@ #include <tdemessagebox.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> @@ -54,12 +54,12 @@ int main(int argc, char *argv[]) about.addAuthor( "Jean-Baptiste Mardelle", 0, "bj@altern.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); //KMessageBox::sorry(0,"nombre: "+TQString::number(i)); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) return 0; //KgpgAppletApp *app; @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) /* - KUniqueApplication app; + TDEUniqueApplication app; // register ourselves as a dcop client //app.dcopClient()->registerAs(app.name(), false); diff --git a/kgpg/newkey.ui b/kgpg/newkey.ui index 7793d74..a181bd5 100644 --- a/kgpg/newkey.ui +++ b/kgpg/newkey.ui @@ -191,8 +191,8 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<Q_SLOTS> +<slots> <slot>CBsave_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 8ee67fb..b1162c2 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -34,8 +34,8 @@ #include <tdeversion.h> #include <tdelistview.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <tdelocale.h> #include <tdeaccel.h> #if KDE_IS_VERSION( 3, 2, 90 ) @@ -124,7 +124,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent : "locationbar_erase")); (void) new TQLabel(i18n("Search: "),hBar); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); #endif keysList = new TDEListView( page ); @@ -147,10 +147,10 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent keysList->setColumnWidth(0,210); keysList->setColumnWidth(1,210); - boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0); + boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0); TDEActionCollection *actcol=new TDEActionCollection(this); - (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); + (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQ_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions); @@ -189,7 +189,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent TQWhatsThis::add (CBsymmetric,i18n("<b>Symmetrical encryption</b>: encryption does not use keys. You just need to give a password " "to encrypt/decrypt the file")); - TQObject::connect(CBsymmetric,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(isSymetric(bool))); + TQObject::connect(CBsymmetric,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(isSymetric(bool))); CBarmor->setChecked( KGpgSettings::asciiArmor() ); CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() ); @@ -204,11 +204,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent optiontxt->setText(customOptions); TQWhatsThis::add (optiontxt,i18n("<b>Custom option</b>: for experienced users only, allows you to enter a gpg command line option, like: '--armor'")); - TQObject::connect(optiontxt,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(customOpts(const TQString & ))); + TQObject::connect(optiontxt,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(customOpts(const TQString & ))); } - TQObject::connect(keysList,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotOk())); -// TQObject::connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(crypte())); - TQObject::connect(CBuntrusted,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(refresh(bool))); + TQObject::connect(keysList,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotOk())); +// TQObject::connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(crypte())); + TQObject::connect(CBuntrusted,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(refresh(bool))); char line[200]="\0"; FILE *fp2; @@ -340,11 +340,11 @@ void popupPublic::refreshkeys() } } } - KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale()); + TDEProcIO *encid=new TDEProcIO(TQTextCodec::codecForLocale()); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; ///////// when process ends, update dialog infos - TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect())); - TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotpreselect())); + TQObject::connect(encid, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotprocread(TDEProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); } @@ -455,7 +455,7 @@ void popupPublic::slotSetVisible() keysList->ensureItemVisible(keysList->currentItem()); } -void popupPublic::slotprocread(KProcIO *p) +void popupPublic::slotprocread(TDEProcIO *p) { // collect all data (output starts with pub line followed by related) // kdDebug(2100) << k_funcinfo << endl; diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h index 7f860f6..120dc17 100644 --- a/kgpg/popuppublic.h +++ b/kgpg/popuppublic.h @@ -27,11 +27,11 @@ class TQPushButton; class TQCheckBox; class TDEListView; class TQButtonGroup; -class KProcIO; +class TDEProcIO; class popupPublic : public KDialogBase //TQDialog { - Q_OBJECT + TQ_OBJECT public: @@ -52,7 +52,7 @@ private: private slots: void customOpts(const TQString &); - void slotprocread(KProcIO *); + void slotprocread(TDEProcIO *); void slotpreselect(); void refreshkeys(); void refresh(bool state); diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui index 2dc9c38..ad88492 100644 --- a/kgpg/sourceselect.ui +++ b/kgpg/sourceselect.ui @@ -100,15 +100,13 @@ <slot>checkFile_toggled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>checkFile_toggled( bool isOn )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/khexedit/bitswapwidget.cpp b/khexedit/bitswapwidget.cpp index e281d2b..098fc9d 100644 --- a/khexedit/bitswapwidget.cpp +++ b/khexedit/bitswapwidget.cpp @@ -27,7 +27,7 @@ CDigitLabel::CDigitLabel( TQWidget *parent, uint digit, const char *name ) :TQLabel(parent, name), mDigit( digit ), mDotPosition( 0 ) { - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); initialize(); } @@ -56,7 +56,7 @@ void CDigitLabel::setValue( uint digit, bool notify ) { if( notify == true ) { - emit valueChanged( TQT_TQOBJECT(this), digit, false ); + emit valueChanged( this, digit, false ); } mDigit = digit; @@ -64,7 +64,7 @@ void CDigitLabel::setValue( uint digit, bool notify ) if( notify == true ) { - emit valueChanged( TQT_TQOBJECT(this), mDigit, true ); + emit valueChanged( this, mDigit, true ); } } } @@ -145,12 +145,12 @@ void CDigitLabel::keyPressEvent( TQKeyEvent *e ) { case Key_Left: case Key_Up: - emit stepCell( TQT_TQOBJECT(this), false ); + emit stepCell( this, false ); break; case Key_Right: case Key_Down: - emit stepCell( TQT_TQOBJECT(this), true ); + emit stepCell( this, true ); break; case Key_Escape: @@ -186,10 +186,10 @@ CByteWidget::CByteWidget( TQWidget *parent, const char *name ) mDigit[i]->setFixedSize( mDigit[i]->sizeHint()*2 ); mDigit[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mDigit[i]->setAlignment( AlignCenter ); - connect( mDigit[i], TQT_SIGNAL(stepCell(const TQObject *, bool )), - this, TQT_SLOT(stepCell(const TQObject *, bool ))); - connect( mDigit[i], TQT_SIGNAL(valueChanged(const TQObject *, uint, bool )), - this, TQT_SLOT(valueChanged(const TQObject *, uint, bool ))); + connect( mDigit[i], TQ_SIGNAL(stepCell(const TQObject *, bool )), + this, TQ_SLOT(stepCell(const TQObject *, bool ))); + connect( mDigit[i], TQ_SIGNAL(valueChanged(const TQObject *, uint, bool )), + this, TQ_SLOT(valueChanged(const TQObject *, uint, bool ))); mHBox->addWidget( mDigit[i] ); } @@ -206,7 +206,7 @@ void CByteWidget::stepCell( const TQObject *obj, bool next ) { for( uint i=0; i<8; i++ ) { - if( TQT_BASE_OBJECT_CONST(obj) == TQT_BASE_OBJECT_CONST(mDigit[i]) ) + if( obj == mDigit[i] ) { if( next == true ) { @@ -228,7 +228,7 @@ void CByteWidget::valueChanged( const TQObject *obj, uint val, bool after ) { for( uint i=0; i<8; i++ ) { - if( TQT_BASE_OBJECT_CONST(obj) == TQT_BASE_OBJECT_CONST(mDigit[i]) ) + if( obj == mDigit[i] ) { uint tmp = 7-mDigit[i]->value(); mDigit[tmp]->setValue( mDigit[i]->value(), false ); @@ -282,7 +282,7 @@ void CByteWidget::setBuddy( const TQObject *obj ) { for( uint i=0; i<8; i++ ) { - if( TQT_BASE_OBJECT_CONST(obj) == TQT_BASE_OBJECT_CONST(mDigit[i]) ) + if( obj == mDigit[i] ) { uint val = mDigit[i]->value(); if( val < 8 ) diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h index d07c009..7d5c409 100644 --- a/khexedit/bitswapwidget.h +++ b/khexedit/bitswapwidget.h @@ -28,7 +28,7 @@ class CDigitLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: @@ -70,7 +70,7 @@ inline uint CDigitLabel::value( void ) class CByteWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/chartabledialog.cpp b/khexedit/chartabledialog.cpp index a46bee0..be77c2b 100644 --- a/khexedit/chartabledialog.cpp +++ b/khexedit/chartabledialog.cpp @@ -58,8 +58,8 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name, // // I am setting the min. size below // - //connect( mCharacterList, TQT_SIGNAL(doubleClicked(TQListViewItem *) ), - //TQT_SLOT(startAssign(TQListViewItem *))); + //connect( mCharacterList, TQ_SIGNAL(doubleClicked(TQListViewItem *) ), + //TQ_SLOT(startAssign(TQListViewItem *))); topLayout->addWidget( mCharacterList, 10 ); diff --git a/khexedit/chartabledialog.h b/khexedit/chartabledialog.h index c5a204c..11206a9 100644 --- a/khexedit/chartabledialog.h +++ b/khexedit/chartabledialog.h @@ -34,7 +34,7 @@ class TQSpinBox; class CCharTableDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/converterdialog.cpp b/khexedit/converterdialog.cpp index e742e73..1f54df7 100644 --- a/khexedit/converterdialog.cpp +++ b/khexedit/converterdialog.cpp @@ -34,8 +34,8 @@ CValidateLineEdit::CValidateLineEdit( TQWidget *parent, int validateType, { mValidator = new CHexValidator( this, (CHexValidator::EState)validateType ); setValidator( mValidator ); - connect( this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(convertText(const TQString &)) ); + connect( this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(convertText(const TQString &)) ); } @@ -101,16 +101,16 @@ CConverterDialog::CConverterDialog( TQWidget *parent, const char *name, mTxtInput = new CValidateLineEdit( page, CHexValidator::regularText ); topLayout->addWidget( mTxtInput, 4, 1 ); - connect( mHexInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mDecInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mOctInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mBinInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mTxtInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); + connect( mHexInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mDecInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mOctInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mBinInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mTxtInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); } diff --git a/khexedit/converterdialog.h b/khexedit/converterdialog.h index 8cfd51d..1ee1287 100644 --- a/khexedit/converterdialog.h +++ b/khexedit/converterdialog.h @@ -29,7 +29,7 @@ class CHexValidator; class CValidateLineEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT public: @@ -53,7 +53,7 @@ class CValidateLineEdit : public TQLineEdit class CConverterDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/dialog.cpp b/khexedit/dialog.cpp index c2f2d80..a26ed0e 100644 --- a/khexedit/dialog.cpp +++ b/khexedit/dialog.cpp @@ -78,7 +78,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckVisible, 2, 0 ); gbox->setRowStretch( 3, 10 ); - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("Goto Dialog"); mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", false ) ); mCheckVisible->setChecked( config.readBoolEntry( "StayVisible", true ) ); @@ -89,7 +89,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal ) CGotoDialog::~CGotoDialog( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("Goto Dialog"); config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() ); config.writeEntry( "StayVisible", mCheckVisible->isChecked() ); @@ -189,7 +189,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) if( mSelector == 0 ) { return; } mSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mSelector->insertStringList( formatStrings() ); - connect( mSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(selectorChanged(int)) ); + connect( mSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(selectorChanged(int)) ); TQLabel *label = new TQLabel( mSelector, i18n("Fo&rmat:"), plainPage() ); if( label == 0 ) { return; } @@ -200,8 +200,8 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) mInput = new TQLineEdit( plainPage() ); if( mInput == 0 ) { return; } mInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); - connect( mInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(inputChanged(const TQString&)) ); + connect( mInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(inputChanged(const TQString&)) ); mFindValidator = new CHexValidator( this, CHexValidator::regularText ); if( mFindValidator == 0 ) { return; } mInput->setValidator( mFindValidator ); @@ -232,7 +232,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckIgnoreCase, 3, 0 ); gbox->setRowStretch( 4, 10 ); - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("Find Dialog"); mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) ); mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) ); @@ -248,7 +248,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) CFindDialog::~CFindDialog( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("Find Dialog"); config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() ); config.writeEntry( "InSelection", mCheckInSelection->isChecked() ); @@ -365,7 +365,7 @@ CFindNavigatorDialog::CFindNavigatorDialog( TQWidget *parent, const char *name, mKey = new TQLineEdit( plainPage() ); mKey->setMinimumWidth( fontMetrics().width("M") * 20 ); - mKey->setFocusPolicy( TQ_NoFocus ); + mKey->setFocusPolicy( TQWidget::NoFocus ); hbox->addWidget( mKey ); topLayout->addSpacing( spacingHint() ); // A little bit extra space @@ -498,8 +498,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) if( mFindSelector == 0 ) { return; } mFindSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mFindSelector->insertStringList( formatStrings() ); - connect( mFindSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(findSelectorChanged(int)) ); + connect( mFindSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(findSelectorChanged(int)) ); text = i18n("Fo&rmat (find):"); TQLabel *label = new TQLabel( mFindSelector, text, plainPage() ); @@ -514,8 +514,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) mFindValidator = new CHexValidator( this, CHexValidator::regularText ); if( mFindValidator == 0 ) { return; } mFindInput->setValidator( mFindValidator ); - connect( mFindInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(findInputChanged(const TQString&)) ); + connect( mFindInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(findInputChanged(const TQString&)) ); label = new TQLabel( mFindInput, i18n("F&ind:"), plainPage() ); if( label == 0 ) { return; } @@ -527,8 +527,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) if( mReplaceSelector == 0 ) { return; } mReplaceSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mReplaceSelector->insertStringList( formatStrings() ); - connect( mReplaceSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(replaceSelectorChanged(int)) ); + connect( mReplaceSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(replaceSelectorChanged(int)) ); text = i18n("For&mat (replace):"); label = new TQLabel( mReplaceSelector, text, plainPage() ); @@ -544,8 +544,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) mReplaceValidator = new CHexValidator( this, CHexValidator::regularText ); if( mReplaceValidator == 0 ) { return; } mReplaceInput->setValidator( mReplaceValidator ); - connect( mReplaceInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(replaceInputChanged(const TQString&)) ); + connect( mReplaceInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(replaceInputChanged(const TQString&)) ); label = new TQLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() ); if( label == 0 ) { return; } @@ -573,7 +573,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckIgnoreCase, 3, 0 ); gbox->setRowStretch( 4, 10 ); - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("Replace Dialog"); mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) ); mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) ); @@ -592,7 +592,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) CReplaceDialog::~CReplaceDialog( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("Replace Dialog"); config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() ); config.writeEntry( "InSelection", mCheckInSelection->isChecked() ); @@ -774,8 +774,8 @@ CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) if( mOperationSelector == 0 ) { return; } mOperationSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mOperationSelector->insertStringList( operationStrings() ); - connect( mOperationSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(operationSelectorChanged(int)) ); + connect( mOperationSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(operationSelectorChanged(int)) ); text = i18n("O&peration:"); TQLabel *label = new TQLabel( mOperationSelector, text, plainPage() ); @@ -849,8 +849,8 @@ void CFilterDialog::makeOperandLayout( void ) mOperandSelector->setFixedHeight( mOperandSelector->sizeHint().height()); mOperandSelector->setMinimumWidth( fontMetrics().width("M")*20 ); mOperandSelector->insertStringList( formatStrings() ); - connect( mOperandSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(operandSelectorChanged(int)) ); + connect( mOperandSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(operandSelectorChanged(int)) ); text = i18n("Fo&rmat (operand):"); mOperandFormatLabel = new TQLabel( mOperandSelector, text, page ); @@ -865,8 +865,8 @@ void CFilterDialog::makeOperandLayout( void ) mOperandValidator = new CHexValidator( this, CHexValidator::regularText ); if( mOperandValidator == 0 ) { return; } mOperandInput->setValidator( mOperandValidator ); - connect( mOperandInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(operandInputChanged(const TQString&)) ); + connect( mOperandInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(operandInputChanged(const TQString&)) ); mOperandInputLabel = new TQLabel( mOperandInput, i18n("O&perand:"), page ); if( mOperandInputLabel == 0 ) { return; } @@ -903,7 +903,7 @@ void CFilterDialog::makeBitSwapLayout( void ) text = i18n("&Reset"); TQPushButton *resetButton = new TQPushButton( text, page ); resetButton->setFixedHeight( resetButton->sizeHint().height() ); - connect( resetButton, TQT_SIGNAL(clicked()), mByteWidget, TQT_SLOT(reset()) ); + connect( resetButton, TQ_SIGNAL(clicked()), mByteWidget, TQ_SLOT(reset()) ); hbox->addWidget( resetButton ); hbox->addStretch( 10 ); @@ -1096,8 +1096,8 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) if( mPatternSelector == 0 ) { return; } mPatternSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mPatternSelector->insertStringList( formatStrings() ); - connect( mPatternSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(patternSelectorChanged(int)) ); + connect( mPatternSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(patternSelectorChanged(int)) ); text = i18n("Fo&rmat (pattern):"); label = new TQLabel( mPatternSelector, text, plainPage() ); @@ -1112,8 +1112,8 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) mPatternValidator = new CHexValidator( this, CHexValidator::regularText ); if( mPatternValidator == 0 ) { return; } mPatternInput->setValidator( mPatternValidator ); - connect( mPatternInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(patternInputChanged(const TQString&)) ); + connect( mPatternInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(patternInputChanged(const TQString&)) ); label = new TQLabel( mPatternInput, i18n("&Pattern:"), plainPage() ); if( label == 0 ) { return; } @@ -1143,10 +1143,10 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckPattern, 1, 0 ); mCheckOnCursor = new TQCheckBox( i18n("&Insert on cursor position"), group ); gbox->addWidget( mCheckOnCursor, 2, 0 ); - connect( mCheckOnCursor, TQT_SIGNAL(clicked()), TQT_SLOT(cursorCheck()) ); + connect( mCheckOnCursor, TQ_SIGNAL(clicked()), TQ_SLOT(cursorCheck()) ); gbox->setRowStretch( 3, 10 ); - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("Insert Pattern Dialog"); mCheckPattern->setChecked( config.readBoolEntry( "RepeatPattern", false ) ); mCheckOnCursor->setChecked( config.readBoolEntry( "InsertOnCursor", false) ); @@ -1159,7 +1159,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) CInsertDialog::~CInsertDialog( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup("Insert Pattern Dialog"); config.writeEntry( "RepeatPattern", mCheckPattern->isChecked() ); config.writeEntry( "InsertOnCursor", mCheckOnCursor->isChecked() ); diff --git a/khexedit/dialog.h b/khexedit/dialog.h index ad6c09c..6322c2d 100644 --- a/khexedit/dialog.h +++ b/khexedit/dialog.h @@ -63,7 +63,7 @@ const uint Find_Next = 7; class CGotoDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -90,7 +90,7 @@ class CGotoDialog : public KDialogBase class CFindDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -138,7 +138,7 @@ class CFindDialog : public KDialogBase class CFindNavigatorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -168,7 +168,7 @@ class CFindNavigatorDialog : public KDialogBase class CReplaceDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -212,7 +212,7 @@ class CReplaceDialog : public KDialogBase class CReplacePromptDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -242,7 +242,7 @@ class CReplacePromptDialog : public KDialogBase class CFilterDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -302,7 +302,7 @@ class CFilterDialog : public KDialogBase class CInsertDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/draglabel.cpp b/khexedit/draglabel.cpp index dfca9a6..fd38d7b 100644 --- a/khexedit/draglabel.cpp +++ b/khexedit/draglabel.cpp @@ -44,7 +44,7 @@ CDragLabel::~CDragLabel( void ) void CDragLabel::mousePressEvent( TQMouseEvent *e ) { - if( mValid == false || e->button() != Qt::LeftButton || mUrl.isEmpty() == true ) + if( mValid == false || e->button() != TQt::LeftButton || mUrl.isEmpty() == true ) { return; } diff --git a/khexedit/draglabel.h b/khexedit/draglabel.h index 999d502..c4e48e5 100644 --- a/khexedit/draglabel.h +++ b/khexedit/draglabel.h @@ -31,7 +31,7 @@ class KURLDrag; class CDragLabel: public TQLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/exportdialog.cpp b/khexedit/exportdialog.cpp index 2cdfae7..df95f5f 100644 --- a/khexedit/exportdialog.cpp +++ b/khexedit/exportdialog.cpp @@ -71,7 +71,7 @@ void CExportDialog::readConfiguration( void ) { if( mConfig != 0 ) { return; } - mConfig = new KSimpleConfig( TQString("hexexport") ); + mConfig = new TDESimpleConfig( TQString("hexexport") ); if( mConfig == 0 ) { return; } mConfig->setGroup( "Destination" ); @@ -163,8 +163,8 @@ void CExportDialog::setupDestinationPage( void ) mDestination.formatCombo = new TQComboBox( false, page ); mDestination.formatCombo->insertStringList( formatList ); mDestination.formatCombo->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect( mDestination.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(formatChanged(int)) ); + connect( mDestination.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(formatChanged(int)) ); text = i18n("&Format:"); TQLabel *label = new TQLabel( mDestination.formatCombo, text, page ); @@ -187,11 +187,11 @@ void CExportDialog::setupDestinationPage( void ) mDestination.fileInput = new TQLineEdit( page ); hbox->addWidget( mDestination.fileInput ); - connect(mDestination.fileInput, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(destinationChanged(const TQString &))); + connect(mDestination.fileInput, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(destinationChanged(const TQString &))); text = i18n("Choose..."); TQPushButton *browseButton = new TQPushButton( text, page, "browse" ); hbox->addWidget( browseButton ); - connect( browseButton, TQT_SIGNAL(clicked()), TQT_SLOT(browserClicked()) ); + connect( browseButton, TQ_SIGNAL(clicked()), TQ_SLOT(browserClicked()) ); mDestination.fileInput->setMinimumWidth( fontMetrics().maxWidth()*15 ); label->setBuddy(mDestination.fileInput); @@ -237,7 +237,7 @@ void CExportDialog::setupDestinationPage( void ) gbox->addWidget( mDestination.toLabel, 1, 0 ); gbox->addWidget( mDestination.toInput, 1, 1 ); - connect( group, TQT_SIGNAL(clicked(int)), TQT_SLOT(rangeChanged(int)) ); + connect( group, TQ_SIGNAL(clicked(int)), TQ_SLOT(rangeChanged(int)) ); group->setButton(0); rangeChanged(0); enableButtonOK( !mDestination.fileInput->text().isEmpty() ); diff --git a/khexedit/exportdialog.h b/khexedit/exportdialog.h index 392e74c..7adcea3 100644 --- a/khexedit/exportdialog.h +++ b/khexedit/exportdialog.h @@ -30,7 +30,7 @@ class TQLabel; class TQLineEdit; class TQSpinBox; class TQWidgetStack; -class KSimpleConfig; +class TDESimpleConfig; #include <kdialogbase.h> #include "hexbuffer.h" @@ -38,7 +38,7 @@ class KSimpleConfig; class CExportDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -127,7 +127,7 @@ class CExportDialog : public KDialogBase SDestinationWidgets mDestination; SHtmlWidgets mHtml; SArrayWidgets mArray; - KSimpleConfig *mConfig; + TDESimpleConfig *mConfig; TQString mWorkDir; }; diff --git a/khexedit/fileinfodialog.cpp b/khexedit/fileinfodialog.cpp index 96fb060..9d240e0 100644 --- a/khexedit/fileinfodialog.cpp +++ b/khexedit/fileinfodialog.cpp @@ -321,7 +321,7 @@ void CFileInfoDialog::showEvent( TQShowEvent *e ) void CFileInfoDialog::timerEvent( TQTimerEvent * ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); slotUser1(); } diff --git a/khexedit/fileinfodialog.h b/khexedit/fileinfodialog.h index cd1bd4a..b94a83e 100644 --- a/khexedit/fileinfodialog.h +++ b/khexedit/fileinfodialog.h @@ -35,7 +35,7 @@ class CListView; class CFileInfoDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/hexdrag.h b/khexedit/hexdrag.h index 0f267f4..0f26583 100644 --- a/khexedit/hexdrag.h +++ b/khexedit/hexdrag.h @@ -27,7 +27,7 @@ class CHexDrag : public TQDragObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/hexeditorwidget.cpp b/khexedit/hexeditorwidget.cpp index 09a9407..d066738 100644 --- a/khexedit/hexeditorwidget.cpp +++ b/khexedit/hexeditorwidget.cpp @@ -60,16 +60,16 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name ) mHexView = new CHexViewWidget( this, "hexview", hexBuffer ); if( mHexView == 0 || mHexView->widgetValid() == false ) { return; } - connect( mHexView, TQT_SIGNAL(pleaseOpenNewFile()), TQT_SLOT( newFile()) ); - connect( mHexView, TQT_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )), - TQT_SLOT( open(const TQString&, bool, uint)) ); - connect( mHexView, TQT_SIGNAL(pleaseStepFile(bool)), TQT_SLOT( stepFile(bool)) ); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ), TQT_SLOT( fontChanged() ) ); - connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ),TQT_SLOT( paletteChanged()) ); - connect( mHexView, TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), - TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); - connect( mHexView, TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); + connect( mHexView, TQ_SIGNAL(pleaseOpenNewFile()), TQ_SLOT( newFile()) ); + connect( mHexView, TQ_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )), + TQ_SLOT( open(const TQString&, bool, uint)) ); + connect( mHexView, TQ_SIGNAL(pleaseStepFile(bool)), TQ_SLOT( stepFile(bool)) ); + connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ), TQ_SLOT( fontChanged() ) ); + connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ),TQ_SLOT( paletteChanged()) ); + connect( mHexView, TQ_SIGNAL( layoutChanged( const SDisplayLayout & ) ), + TQ_SLOT( layoutChanged( const SDisplayLayout & ) ) ); + connect( mHexView, TQ_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), + this, TQ_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); mHexView->setFocus(); setBackgroundColor( palette().active().base() ); @@ -453,26 +453,26 @@ void CHexEditorWidget::setColor( const SDisplayColor &color ) // // The selection colors can not be chosen. // - mDisplayState.color.selectBg = kapp->palette().active().highlight(); - mDisplayState.color.selectFg = kapp->palette().active().highlightedText(); + mDisplayState.color.selectBg = tdeApp->palette().active().highlight(); + mDisplayState.color.selectFg = tdeApp->palette().active().highlightedText(); if( mDisplayState.color.useSystemColor == true ) { SDisplayColor c = mDisplayState.color; - c.textBg = kapp->palette().active().base(); - c.secondTextBg = kapp->palette().active().base(); - c.offsetBg = kapp->palette().active().base(); - c.inactiveBg = kapp->palette().active().base(); - c.primaryFg[0] = kapp->palette().active().text(); - c.primaryFg[1] = kapp->palette().active().text(); - c.nonPrintFg = kapp->palette().active().text(); - c.offsetFg = kapp->palette().active().text(); - c.secondaryFg = kapp->palette().active().text(); - c.leftSeparatorFg = kapp->palette().active().text(); - c.rightSeparatorFg = kapp->palette().active().text(); - c.cursorBg = kapp->palette().active().text(); - c.cursorFg = kapp->palette().active().base(); - c.gridFg = kapp->palette().active().text(); + c.textBg = tdeApp->palette().active().base(); + c.secondTextBg = tdeApp->palette().active().base(); + c.offsetBg = tdeApp->palette().active().base(); + c.inactiveBg = tdeApp->palette().active().base(); + c.primaryFg[0] = tdeApp->palette().active().text(); + c.primaryFg[1] = tdeApp->palette().active().text(); + c.nonPrintFg = tdeApp->palette().active().text(); + c.offsetFg = tdeApp->palette().active().text(); + c.secondaryFg = tdeApp->palette().active().text(); + c.leftSeparatorFg = tdeApp->palette().active().text(); + c.rightSeparatorFg = tdeApp->palette().active().text(); + c.cursorBg = tdeApp->palette().active().text(); + c.cursorFg = tdeApp->palette().active().base(); + c.gridFg = tdeApp->palette().active().text(); SDisplayColor defaultColor; c.bookmarkBg = defaultColor.bookmarkBg; c.bookmarkFg = defaultColor.bookmarkFg; @@ -1167,12 +1167,12 @@ void CHexEditorWidget::exportDialog( void ) { mExportDialog = new CExportDialog( topLevelWidget(), 0, false ); if( mExportDialog == 0 ) { return; } - connect( mExportDialog, TQT_SIGNAL( exportText(const SExportText &)), - this, TQT_SLOT( exportText( const SExportText &)) ); - connect( mExportDialog, TQT_SIGNAL( exportHtml(const SExportHtml &)), - this, TQT_SLOT( exportHtml( const SExportHtml &)) ); - connect( mExportDialog, TQT_SIGNAL( exportCArray(const SExportCArray &)), - this, TQT_SLOT( exportCArray( const SExportCArray &)) ); + connect( mExportDialog, TQ_SIGNAL( exportText(const SExportText &)), + this, TQ_SLOT( exportText( const SExportText &)) ); + connect( mExportDialog, TQ_SIGNAL( exportHtml(const SExportHtml &)), + this, TQ_SLOT( exportHtml( const SExportHtml &)) ); + connect( mExportDialog, TQ_SIGNAL( exportCArray(const SExportCArray &)), + this, TQ_SLOT( exportCArray( const SExportCArray &)) ); } mExportDialog->show(); } @@ -1449,8 +1449,8 @@ void CHexEditorWidget::gotoOffset( void ) { mGotoDialog = new CGotoDialog( topLevelWidget(), 0, false ); if( mGotoDialog == 0 ) { return; } - connect( mGotoDialog, TQT_SIGNAL(gotoOffset( uint, uint, bool, bool )), - mHexView, TQT_SLOT(gotoOffset( uint, uint, bool, bool )) ); + connect( mGotoDialog, TQ_SIGNAL(gotoOffset( uint, uint, bool, bool )), + mHexView, TQ_SLOT(gotoOffset( uint, uint, bool, bool )) ); } mGotoDialog->show(); } @@ -1468,8 +1468,8 @@ void CHexEditorWidget::find( void ) mFindDialog = new CFindDialog( topLevelWidget(), 0, false ); if( mFindDialog == 0 ) { return; } connect( mFindDialog, - TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - TQT_SLOT(findData(SSearchControl &, uint, bool)) ); + TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + TQ_SLOT(findData(SSearchControl &, uint, bool)) ); } mFindDialog->show(); } @@ -1616,10 +1616,10 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc ) mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false); if( mFindNavigatorDialog == 0 ) { return; } connect( mFindNavigatorDialog, - TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - TQT_SLOT(findData(SSearchControl &, uint, bool)) ); - connect( mFindNavigatorDialog, TQT_SIGNAL(makeKey(void)), - TQT_SLOT(find()) ); + TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + TQ_SLOT(findData(SSearchControl &, uint, bool)) ); + connect( mFindNavigatorDialog, TQ_SIGNAL(makeKey(void)), + TQ_SLOT(find()) ); } if( mFindNavigatorDialog->isVisible() == false ) { @@ -1639,8 +1639,8 @@ void CHexEditorWidget::replace( void ) mReplaceDialog = new CReplaceDialog( topLevelWidget(), 0, false ); if( mReplaceDialog == 0 ) { return; } connect( mReplaceDialog, - TQT_SIGNAL( replaceData( SSearchControl &, uint)), - TQT_SLOT( replaceData( SSearchControl &, uint))); + TQ_SIGNAL( replaceData( SSearchControl &, uint)), + TQ_SLOT( replaceData( SSearchControl &, uint))); } mReplaceDialog->show(); } @@ -1729,8 +1729,8 @@ void CHexEditorWidget::replacePrompt( SSearchControl &sc ) mReplacePromptDialog = new CReplacePromptDialog(topLevelWidget(), 0,false); if( mReplacePromptDialog == 0 ) { return; } connect( mReplacePromptDialog, - TQT_SIGNAL( replaceData( SSearchControl &, uint)), - TQT_SLOT( replaceData( SSearchControl &, uint))); + TQ_SIGNAL( replaceData( SSearchControl &, uint)), + TQ_SLOT( replaceData( SSearchControl &, uint))); } if( mReplacePromptDialog->isVisible() == false ) { @@ -1783,8 +1783,8 @@ void CHexEditorWidget::insertPattern( void ) { mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false ); if( mInsertDialog == 0 ) { return; } - connect( mInsertDialog, TQT_SIGNAL(execute( SInsertData & )), - mHexView, TQT_SLOT(insert( SInsertData & )) ); + connect( mInsertDialog, TQ_SIGNAL(execute( SInsertData & )), + mHexView, TQ_SLOT(insert( SInsertData & )) ); } mInsertDialog->show(); } @@ -1805,13 +1805,13 @@ void CHexEditorWidget::strings( void ) { mStringDialog = new CStringDialog( topLevelWidget(), 0, false ); if( mStringDialog == 0 ) { return; } - connect( mStringDialog, TQT_SIGNAL(markText( uint, uint, bool )), - mHexView, TQT_SLOT(setMark( uint, uint, bool )) ); - connect( mStringDialog, TQT_SIGNAL(collect()), TQT_SLOT(collectStrings()) ); - connect( mHexView, TQT_SIGNAL(fileName( const TQString &, bool ) ), - mStringDialog, TQT_SLOT( removeList() ) ); - connect( mHexView, TQT_SIGNAL(dataChanged()), - mStringDialog, TQT_SLOT(setDirty()) ); + connect( mStringDialog, TQ_SIGNAL(markText( uint, uint, bool )), + mHexView, TQ_SLOT(setMark( uint, uint, bool )) ); + connect( mStringDialog, TQ_SIGNAL(collect()), TQ_SLOT(collectStrings()) ); + connect( mHexView, TQ_SIGNAL(fileName( const TQString &, bool ) ), + mStringDialog, TQ_SLOT( removeList() ) ); + connect( mHexView, TQ_SIGNAL(dataChanged()), + mStringDialog, TQ_SLOT(setDirty()) ); } mStringDialog->show(); } @@ -1851,8 +1851,8 @@ void CHexEditorWidget::filter( void ) { mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false ); if( mFilterDialog == 0 ) { return; } - connect( mFilterDialog, TQT_SIGNAL(filterData( SFilterControl & )), - mHexView, TQT_SLOT(filter( SFilterControl & )) ); + connect( mFilterDialog, TQ_SIGNAL(filterData( SFilterControl & )), + mHexView, TQ_SLOT(filter( SFilterControl & )) ); } mFilterDialog->show(); } @@ -1864,8 +1864,8 @@ void CHexEditorWidget::chart( void ) { mCharTableDialog = new CCharTableDialog( topLevelWidget(), 0, false ); if( mCharTableDialog == 0 ) { return; } - connect( mCharTableDialog, TQT_SIGNAL(assign( const TQByteArray & )), - mHexView, TQT_SLOT(insert( const TQByteArray & )) ); + connect( mCharTableDialog, TQ_SIGNAL(assign( const TQByteArray & )), + mHexView, TQ_SLOT(insert( const TQByteArray & )) ); } mCharTableDialog->show(); } @@ -1876,8 +1876,8 @@ void CHexEditorWidget::converter( void ) if( mConverterDialog == 0 ) { mConverterDialog = new CConverterDialog( this, "converter", false ); - connect( mConverterDialog, TQT_SIGNAL(probeCursorValue(TQByteArray &, uint)), - mHexView, TQT_SLOT(valueOnCursor(TQByteArray &, uint)) ); + connect( mConverterDialog, TQ_SIGNAL(probeCursorValue(TQByteArray &, uint)), + mHexView, TQ_SLOT(valueOnCursor(TQByteArray &, uint)) ); } mConverterDialog->show(); } @@ -1889,10 +1889,10 @@ void CHexEditorWidget::statistics( void ) { mFileInfoDialog = new CFileInfoDialog( topLevelWidget(), 0, false ); if( mFileInfoDialog == 0 ) { return; } - connect( mFileInfoDialog, TQT_SIGNAL(collectStatistic(SStatisticControl &)), - TQT_SLOT(collectStatistics(SStatisticControl &))); - connect( mHexView, TQT_SIGNAL(dataChanged()), - mFileInfoDialog, TQT_SLOT(setDirty()) ); + connect( mFileInfoDialog, TQ_SIGNAL(collectStatistic(SStatisticControl &)), + TQ_SLOT(collectStatistics(SStatisticControl &))); + connect( mHexView, TQ_SIGNAL(dataChanged()), + mFileInfoDialog, TQ_SLOT(setDirty()) ); } mFileInfoDialog->show(); } @@ -1930,20 +1930,20 @@ void CHexEditorWidget::options( void ) mOptionDialog = new COptionDialog( topLevelWidget(), 0, false ); if( mOptionDialog == 0 ) { return; } - connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)), - TQT_SLOT(setLineSize(const SDisplayLine &)) ); - connect( mOptionDialog, TQT_SIGNAL(layoutChoice(const SDisplayLayout &)), - TQT_SLOT(setLayout(const SDisplayLayout &)) ); - connect( mOptionDialog, TQT_SIGNAL(fontChoice(const SDisplayFont &)), - TQT_SLOT(setFont(const SDisplayFont &)) ); - connect( mOptionDialog, TQT_SIGNAL(colorChoice(const SDisplayColor &)), - TQT_SLOT(setColor(const SDisplayColor &)) ); - connect( mOptionDialog, TQT_SIGNAL(cursorChoice(const SDisplayCursor &)), - TQT_SLOT(setCursor(const SDisplayCursor &)) ); - connect( mOptionDialog, TQT_SIGNAL(miscChoice(const SDisplayMisc &)), - TQT_SLOT(setMisc(const SDisplayMisc &)) ); - connect( mOptionDialog, TQT_SIGNAL(removeRecentFiles()), - TQT_SIGNAL(removeRecentFiles()) ); + connect( mOptionDialog, TQ_SIGNAL(lineSizeChoice(const SDisplayLine &)), + TQ_SLOT(setLineSize(const SDisplayLine &)) ); + connect( mOptionDialog, TQ_SIGNAL(layoutChoice(const SDisplayLayout &)), + TQ_SLOT(setLayout(const SDisplayLayout &)) ); + connect( mOptionDialog, TQ_SIGNAL(fontChoice(const SDisplayFont &)), + TQ_SLOT(setFont(const SDisplayFont &)) ); + connect( mOptionDialog, TQ_SIGNAL(colorChoice(const SDisplayColor &)), + TQ_SLOT(setColor(const SDisplayColor &)) ); + connect( mOptionDialog, TQ_SIGNAL(cursorChoice(const SDisplayCursor &)), + TQ_SLOT(setCursor(const SDisplayCursor &)) ); + connect( mOptionDialog, TQ_SIGNAL(miscChoice(const SDisplayMisc &)), + TQ_SLOT(setMisc(const SDisplayMisc &)) ); + connect( mOptionDialog, TQ_SIGNAL(removeRecentFiles()), + TQ_SIGNAL(removeRecentFiles()) ); } if( mOptionDialog->isVisible() == false ) { @@ -2347,20 +2347,20 @@ int CHexEditorWidget::progressParse( const SProgressData &pd ) emit operationChanged( false ); mProgressBusy = false; enableInputLock( false ); - kapp->processEvents(); + tdeApp->processEvents(); return( Err_Success ); } else if( pd.useFraction == 1 ) { emit enableProgressText( true ); emit setProgress( (int)(100.0 * pd.fraction ) ); - kapp->processEvents(); + tdeApp->processEvents(); } else { emit enableProgressText( true ); emit setProgress( pd.curPage, pd.maxPage ); - kapp->processEvents(); + tdeApp->processEvents(); } if( mProgressStop == false ) diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h index 030b135..b95b4aa 100644 --- a/khexedit/hexeditorwidget.h +++ b/khexedit/hexeditorwidget.h @@ -53,7 +53,7 @@ namespace TDEIO { class Job; } class CHexEditorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h index 47ace2c..51d72bc 100644 --- a/khexedit/hexeditstate.h +++ b/khexedit/hexeditstate.h @@ -382,8 +382,8 @@ class SDisplayColor textBg = TQt::white; secondTextBg = TQt::white; inactiveBg = TQt::gray; - selectBg = kapp->palette().active().highlight(); - selectFg = kapp->palette().active().highlightedText(); + selectBg = tdeApp->palette().active().highlight(); + selectFg = tdeApp->palette().active().highlightedText(); markBg = TQt::blue; markFg = TQt::white; primaryFg[0] = TQt::black; diff --git a/khexedit/hexmanagerwidget.cpp b/khexedit/hexmanagerwidget.cpp index a8d4bed..361c8c8 100644 --- a/khexedit/hexmanagerwidget.cpp +++ b/khexedit/hexmanagerwidget.cpp @@ -38,18 +38,18 @@ CHexManagerWidget::CHexManagerWidget( TQWidget *parent, const char *name, mConverter = new CHexToolWidget( this ); - connect( mEditor->view(), TQT_SIGNAL(fileName(const TQString &, bool)), - this, TQT_SLOT( addName(const TQString &))); - connect( mEditor->view(), TQT_SIGNAL( fileClosed(const TQString &)), - this, TQT_SLOT( removeName(const TQString &))); - connect( mEditor->view(),TQT_SIGNAL(fileRename(const TQString &,const TQString &)), - this, TQT_SLOT(changeName(const TQString &,const TQString &))); - connect( mEditor->view(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - mConverter, TQT_SLOT( cursorChanged( SCursorState & ) ) ); - connect( mConverter, TQT_SIGNAL( closed(void) ), - this, TQT_SIGNAL( conversionClosed(void) ) ); - connect( mTabBar, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(open(const TQString &))); + connect( mEditor->view(), TQ_SIGNAL(fileName(const TQString &, bool)), + this, TQ_SLOT( addName(const TQString &))); + connect( mEditor->view(), TQ_SIGNAL( fileClosed(const TQString &)), + this, TQ_SLOT( removeName(const TQString &))); + connect( mEditor->view(),TQ_SIGNAL(fileRename(const TQString &,const TQString &)), + this, TQ_SLOT(changeName(const TQString &,const TQString &))); + connect( mEditor->view(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + mConverter, TQ_SLOT( cursorChanged( SCursorState & ) ) ); + connect( mConverter, TQ_SIGNAL( closed(void) ), + this, TQ_SIGNAL( conversionClosed(void) ) ); + connect( mTabBar, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(open(const TQString &))); mValid = true; setConversionVisibility( conversionPosition ); @@ -133,7 +133,7 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position ) p.setY(point.y() + rect.height()/2 - mConverter->minimumSize().height()/2); mConverter->resize( mConverter->minimumSize() ); mConverter->reparent( 0, WStyle_Customize | WStyle_DialogBorder, p, true ); - mConverter->setCaption(kapp->makeStdCaption(i18n("Conversion"))); + mConverter->setCaption(tdeApp->makeStdCaption(i18n("Conversion"))); } else { @@ -179,11 +179,11 @@ void CHexManagerWidget::setSearchBarPosition( EPosition position ) if( mSearchBar == 0 ) { mSearchBar = new CSearchBar( this ); - connect( mSearchBar, TQT_SIGNAL(hidden()), this, TQT_SLOT(searchBarHidden()) ); - connect( mSearchBar, TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - mEditor, TQT_SLOT(findData(SSearchControl &, uint, bool)) ); - connect( editor()->view(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - mSearchBar, TQT_SLOT( cursorMoved() ) ); + connect( mSearchBar, TQ_SIGNAL(hidden()), this, TQ_SLOT(searchBarHidden()) ); + connect( mSearchBar, TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + mEditor, TQ_SLOT(findData(SSearchControl &, uint, bool)) ); + connect( editor()->view(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + mSearchBar, TQ_SLOT( cursorMoved() ) ); } mSearchBar->show(); } @@ -261,7 +261,7 @@ int CHexManagerWidget::preferredWidth( void ) CTabBar::CTabBar( TQWidget *parent, char *name ) :TQTabBar( parent, name ) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotSelected(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotSelected(int)) ); } diff --git a/khexedit/hexmanagerwidget.h b/khexedit/hexmanagerwidget.h index a3956f1..8c23bd8 100644 --- a/khexedit/hexmanagerwidget.h +++ b/khexedit/hexmanagerwidget.h @@ -74,7 +74,7 @@ class CFileKey class CTabBar : public TQTabBar { - Q_OBJECT + TQ_OBJECT public: @@ -100,7 +100,7 @@ class CTabBar : public TQTabBar class CHexManagerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/hextoolwidget.cpp b/khexedit/hextoolwidget.cpp index ef66db2..84d3033 100644 --- a/khexedit/hextoolwidget.cpp +++ b/khexedit/hextoolwidget.cpp @@ -96,7 +96,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text = i18n("Show little endian decoding"); mCheckIntelFormat = new TQCheckBox( text, this ); mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->sizeHint() ); - connect( mCheckIntelFormat, TQT_SIGNAL(clicked()), this, TQT_SLOT(intelFormat()) ); + connect( mCheckIntelFormat, TQ_SIGNAL(clicked()), this, TQ_SLOT(intelFormat()) ); SettingsBox->addWidget( mCheckIntelFormat, 0, AlignVCenter ); mCheckIntelFormat->setChecked( // default value to please endian system users #ifdef WORDS_BIGENDIAN @@ -110,7 +110,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text = i18n("Show unsigned as hexadecimal"); mCheckHexadecimal = new TQCheckBox( text, this ); mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->sizeHint() ); - connect( mCheckHexadecimal, TQT_SIGNAL(clicked()), this, TQT_SLOT(unsignedFormat()) ); + connect( mCheckHexadecimal, TQ_SIGNAL(clicked()), this, TQ_SLOT(unsignedFormat()) ); SettingsBox->addWidget( mCheckHexadecimal, 0, AlignVCenter ); mUtilBox->addMultiCellLayout( ValuesBox, 0, 3, 0, 0, AlignLeft|AlignVCenter ); @@ -133,7 +133,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) mBitCombo->insertItem( text ); } mBitCombo->setMinimumSize( mBitCombo->sizeHint() ); - connect( mBitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bitWidthChanged(int))); + connect( mBitCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(bitWidthChanged(int))); mUtilBox->addWidget( mBitCombo, 4, 2 ); /* load font metrics */ @@ -141,8 +141,8 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) mUtilBox->activate(); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ), - TQT_SLOT( fontChanged() ) ); + connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged() ), + TQ_SLOT( fontChanged() ) ); mCursorState.valid = false; mViewHexCaps = true; diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h index 1a6ddf4..f04699b 100644 --- a/khexedit/hextoolwidget.h +++ b/khexedit/hextoolwidget.h @@ -33,7 +33,7 @@ class TQCheckBox; class CHexToolWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/hexvalidator.cpp b/khexedit/hexvalidator.cpp index 74126e7..96cd982 100644 --- a/khexedit/hexvalidator.cpp +++ b/khexedit/hexvalidator.cpp @@ -25,7 +25,7 @@ CHexValidator::CHexValidator( TQWidget *parent, EState state, const char *name ) - :TQValidator( TQT_TQOBJECT(parent), name ) + :TQValidator( parent, name ) { setState( state ); } diff --git a/khexedit/hexvalidator.h b/khexedit/hexvalidator.h index c15cb5c..396c2e7 100644 --- a/khexedit/hexvalidator.h +++ b/khexedit/hexvalidator.h @@ -25,7 +25,7 @@ class CHexValidator: public TQValidator { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/hexviewwidget.cpp b/khexedit/hexviewwidget.cpp index 6c15ae3..bcdca2f 100644 --- a/khexedit/hexviewwidget.cpp +++ b/khexedit/hexviewwidget.cpp @@ -139,7 +139,7 @@ void CDragManager::timerEvent( TQTimerEvent *e ) if( mPending == true ) { mPending = false; - emit startDrag( ( kapp->keyboardModifiers() & TDEApplication::ShiftModifier ) ); + emit startDrag( ( tdeApp->keyboardModifiers() & TDEApplication::ShiftModifier ) ); } } } @@ -193,16 +193,16 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, // signal whenever is receives a TQHideEvent. // - mVertScroll = new CScrollBar( Qt::Vertical, this ); + mVertScroll = new CScrollBar( TQt::Vertical, this ); if( mVertScroll == 0 ) { return; } - mHorzScroll = new CScrollBar( Qt::Horizontal, this ); + mHorzScroll = new CScrollBar( TQt::Horizontal, this ); if( mHorzScroll == 0 ) { return; } mCorner = new TQWidget( this ); if( mCorner == 0 ) { return; } - connect( mHorzScroll, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeXPos(int)) ); - connect( mVertScroll, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeYPos(int)) ); - connect( mHorzScroll, TQT_SIGNAL(hidden()), TQT_SLOT(update()) ); - connect( mVertScroll, TQT_SIGNAL(hidden()), TQT_SLOT(update()) ); + connect( mHorzScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeXPos(int)) ); + connect( mVertScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeYPos(int)) ); + connect( mHorzScroll, TQ_SIGNAL(hidden()), TQ_SLOT(update()) ); + connect( mVertScroll, TQ_SIGNAL(hidden()), TQ_SLOT(update()) ); mHorzScroll->hide(); mVertScroll->hide(); @@ -213,11 +213,11 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, #else mDragManager->setActivateMode( CDragManager::Timer ); #endif - connect( mDragManager, TQT_SIGNAL(startDrag(bool)), TQT_SLOT(startDrag(bool)) ); + connect( mDragManager, TQ_SIGNAL(startDrag(bool)), TQ_SLOT(startDrag(bool)) ); setFrameStyle( TQFrame::WinPanel|TQFrame::Sunken ); setWFlags( WResizeNoErase ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); mHexBuffer = hexBuffer; mHexBuffer->cursorReset(); @@ -438,8 +438,8 @@ void CHexViewWidget::changeYPos( int p ) void CHexViewWidget::clipboardChanged( void ) { - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); unselect(); } @@ -451,7 +451,7 @@ void CHexViewWidget::paletteChanged( void ) void CHexViewWidget::fontChanged( void ) { - //setFont( kapp->fixedFont, true ); + //setFont( tdeApp->fixedFont, true ); } void CHexViewWidget::filter( SFilterControl &fc ) @@ -964,8 +964,8 @@ void CHexViewWidget::copy( void ) { return; } - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); // // Note: Do no give the CHexDrag a parent != 0. The clipboard // owns the current dragdata and will destroy it on exit or @@ -975,8 +975,8 @@ void CHexViewWidget::copy( void ) // when the app. is closed (=> segfault). // TQApplication::clipboard()->setData(new CHexDrag( buf )); - connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); } @@ -988,11 +988,11 @@ void CHexViewWidget::copyText( int columnSegment ) return; } - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); TQApplication::clipboard()->setText( buf.data() ); - connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); } @@ -1534,7 +1534,7 @@ void CHexViewWidget::mousePressEvent( TQMouseEvent *e ) // The RMB popup menu is managed by the KContextMenuManager // - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) { if( e->state() & ControlButton ) { @@ -1550,7 +1550,7 @@ void CHexViewWidget::mousePressEvent( TQMouseEvent *e ) setCursorPosition( e->x(), e->y(), true, cellLevel ); } } - else if( e->button() == Qt::MidButton ) + else if( e->button() == TQt::MidButton ) { paste(); } @@ -1559,7 +1559,7 @@ void CHexViewWidget::mousePressEvent( TQMouseEvent *e ) void CHexViewWidget::mouseMoveEvent( TQMouseEvent *e ) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) { if( mDragManager->start( e ) == false ) { @@ -1575,7 +1575,7 @@ void CHexViewWidget::mouseReleaseEvent( TQMouseEvent *e ) // The RMB popup menu is managed by the KContextMenuManager // - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) { if( e->state() & ControlButton ) { diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h index 358cab4..99db8cf 100644 --- a/khexedit/hexviewwidget.h +++ b/khexedit/hexviewwidget.h @@ -39,11 +39,11 @@ class CScrollBar : public TQScrollBar { - Q_OBJECT + TQ_OBJECT public: - CScrollBar( Qt::Orientation o, TQWidget *parent, const char *name = 0 ) + CScrollBar( TQt::Orientation o, TQWidget *parent, const char *name = 0 ) : TQScrollBar( o, parent, name ) { } @@ -61,7 +61,7 @@ class CScrollBar : public TQScrollBar class CDragManager : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -99,7 +99,7 @@ class CDragManager : public TQWidget class CHexViewWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -312,7 +312,7 @@ class CHexViewWidget : public TQFrame inline bool CHexViewWidget::shiftButtonState( void ) { - return kapp->keyboardModifiers() & TDEApplication::ShiftModifier; + return tdeApp->keyboardModifiers() & TDEApplication::ShiftModifier; } diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h index e20fb43..8aea022 100644 --- a/khexedit/lib/kbufferdrag.h +++ b/khexedit/lib/kbufferdrag.h @@ -39,7 +39,7 @@ typedef KColTextExport* KColTextExportPtr; */ class TDEBufferDrag : public TQDragObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h index a94fff6..de9cd7d 100644 --- a/khexedit/lib/kbytesedit.h +++ b/khexedit/lib/kbytesedit.h @@ -56,7 +56,7 @@ class KBytesEditPrivate; //TODO: give the bytes edit widget an empty buffer as default class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit { - Q_OBJECT + TQ_OBJECT //_PROPERTY( char * Data READ data ) TQ_PROPERTY( int DataSize READ dataSize ) diff --git a/khexedit/lib/kcolumnsview.cpp b/khexedit/lib/kcolumnsview.cpp index 4bb939a..c50385b 100644 --- a/khexedit/lib/kcolumnsview.cpp +++ b/khexedit/lib/kcolumnsview.cpp @@ -198,7 +198,7 @@ void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch ) break; // to avoid flickers we first paint to the linebuffer - Paint.begin( TQT_TQPAINTDEVICE(&LineBuffer), this ); + Paint.begin( &LineBuffer, this ); KColumn *C = RedrawColumns.first(); Paint.translate( C->x(), 0 ); diff --git a/khexedit/lib/kcolumnsview.h b/khexedit/lib/kcolumnsview.h index d51e54c..f728d44 100644 --- a/khexedit/lib/kcolumnsview.h +++ b/khexedit/lib/kcolumnsview.h @@ -41,7 +41,7 @@ class KColumnsViewPrivate; class KColumnsView : public TQScrollView { - Q_OBJECT + TQ_OBJECT friend class KColumn; diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index 4873fa3..7564890 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -133,14 +133,14 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl // get the full control viewport()->setFocusProxy( this ); - viewport()->setFocusPolicy( TQ_WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); viewport()->installEventFilter( this ); installEventFilter( this ); - connect( CursorBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursor()) ); - connect( ScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoScrollTimerDone()) ); - connect( DragStartTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDrag()) ); + connect( CursorBlinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursor()) ); + connect( ScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoScrollTimerDone()) ); + connect( DragStartTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDrag()) ); viewport()->setAcceptDrops( true ); } @@ -1042,7 +1042,7 @@ void KHexEdit::updateLength() void KHexEdit::clipboardChanged() { // don't listen to selection changes - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0 ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0 ); selectAll( false ); } @@ -1178,7 +1178,7 @@ void KHexEdit::showEvent( TQShowEvent *e ) bool KHexEdit::eventFilter( TQObject *O, TQEvent *E ) { - if( TQT_BASE_OBJECT(O) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(O) == TQT_BASE_OBJECT(viewport()) ) + if( O == this || O == viewport() ) { if( E->type() == TQEvent::FocusIn ) { @@ -1548,7 +1548,7 @@ void KHexEdit::contentsMousePressEvent( TQMouseEvent *e ) pauseCursor( true ); // care about a left button press? - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) { MousePressed = true; @@ -1601,7 +1601,7 @@ void KHexEdit::contentsMousePressEvent( TQMouseEvent *e ) BufferRanges->removeFurtherSelections(); } - else if( e->button() == Qt::MidButton ) + else if( e->button() == TQt::MidButton ) BufferRanges->removeSelection(); if( BufferRanges->isModified() ) @@ -1674,17 +1674,17 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e ) if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(clipboardChanged()) ); ClipboardMode = TQClipboard::Clipboard; } } } // middle mouse button paste? - else if( e->button() == Qt::MidButton && !isReadOnly() ) + else if( e->button() == TQt::MidButton && !isReadOnly() ) { pauseCursor(); @@ -1723,7 +1723,7 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e ) void KHexEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { // we are only interested in LMB doubleclicks - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) { e->ignore(); return; @@ -2008,11 +2008,11 @@ void KHexEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(clipboardChanged()) ); ClipboardMode = TQClipboard::Clipboard; } } diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h index c44fb89..7b25536 100644 --- a/khexedit/lib/khexedit.h +++ b/khexedit/lib/khexedit.h @@ -80,7 +80,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView friend class KValueEditor; friend class KCharEditor; - Q_OBJECT + TQ_OBJECT TQ_ENUMS( KResizeStyle KCoding ) TQ_PROPERTY( bool OverwriteMode READ isOverwriteMode WRITE setOverwriteMode ) diff --git a/khexedit/lib/khexedit_export.h b/khexedit/lib/khexedit_export.h index f922516..80c758b 100644 --- a/khexedit/lib/khexedit_export.h +++ b/khexedit/lib/khexedit_export.h @@ -18,8 +18,8 @@ #ifndef KHEXEDIT_EXPORT_H #define KHEXEDIT_EXPORT_H -#include <kdemacros.h> +#include <tdemacros.h> -#define KHEXEDIT_EXPORT KDE_EXPORT +#define KHEXEDIT_EXPORT TDE_EXPORT #endif diff --git a/khexedit/listview.h b/khexedit/listview.h index 6fe963c..7a40e3c 100644 --- a/khexedit/listview.h +++ b/khexedit/listview.h @@ -25,7 +25,7 @@ class CListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/optiondialog.cpp b/khexedit/optiondialog.cpp index 49a33b7..6db0334 100644 --- a/khexedit/optiondialog.cpp +++ b/khexedit/optiondialog.cpp @@ -116,10 +116,10 @@ void COptionDialog::setupLayoutPage( void ) modeList.append( i18n("Binary Mode") ); modeList.append( i18n("Text Only Mode") ); mLayout.formatCombo->insertStringList( modeList ); - connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotModeSelectorChanged(int)) ); - connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotModeSelectorChanged(int)) ); + connect( mLayout.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChanged()) ); gbox->addWidget( mLayout.formatCombo, 0, 1 ); // @@ -129,18 +129,18 @@ void COptionDialog::setupLayoutPage( void ) mLayout.lineSizeSpin = new TQSpinBox( page ); mLayout.lineSizeSpin->setMinimumWidth( fontMetrics().width("M") * 10 ); mLayout.lineSizeSpin->setRange( 1, 10000 ); - connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLineSizeChanged(int) ) ); - connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lineSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLineSizeChanged(int) ) ); + connect( mLayout.lineSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); gbox->addWidget( mLayout.lineSizeSpin, 1, 1 ); mLayout.columnSizeSpin = new TQSpinBox( page ); mLayout.columnSizeSpin->setRange( 1, 10000 ); - connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotColumnSizeChanged(int) ) ); - connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged() ) ); + connect( mLayout.columnSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotColumnSizeChanged(int) ) ); + connect( mLayout.columnSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged() ) ); gbox->addWidget( mLayout.columnSizeSpin, 2, 1 ); text = i18n("Default l&ine size [bytes]:"); @@ -158,14 +158,14 @@ void COptionDialog::setupLayoutPage( void ) text = i18n("Line size is &fixed (use scrollbar when required)"); mLayout.lockLineCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.lockLineCheck, 4, 4, 0, 1, AlignLeft ); - connect( mLayout.lockLineCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lockLineCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotChanged()) ); text = i18n("Loc&k column at end of line (when column size>1)"); mLayout.lockColumnCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.lockColumnCheck, 5, 5, 0, 1 ); - connect( mLayout.lockColumnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lockColumnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotChanged()) ); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -179,8 +179,8 @@ void COptionDialog::setupLayoutPage( void ) mLayout.gridCombo = new TQComboBox( false, page ); mLayout.gridCombo->insertStringList( gridList ); - connect( mLayout.gridCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.gridCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Gridlines between text:"); label = new TQLabel( mLayout.gridCombo, text, page ); @@ -191,14 +191,14 @@ void COptionDialog::setupLayoutPage( void ) mLayout.leftSepWidthSpin = new TQSpinBox( page ); mLayout.leftSepWidthSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.leftSepWidthSpin, 8, 1 ); - connect( mLayout.leftSepWidthSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.leftSepWidthSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); mLayout.rightSepWidthSpin = new TQSpinBox( page ); mLayout.rightSepWidthSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.rightSepWidthSpin, 9, 1 ); - connect( mLayout.rightSepWidthSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.rightSepWidthSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Left separator width [pixels]:"); mLayout.leftSepLabel = new TQLabel( mLayout.leftSepWidthSpin, text, page ); @@ -211,14 +211,14 @@ void COptionDialog::setupLayoutPage( void ) mLayout.separatorSpin = new TQSpinBox( page ); mLayout.separatorSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.separatorSpin, 10, 1 ); - connect( mLayout.separatorSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.separatorSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); mLayout.edgeSpin = new TQSpinBox( page ); mLayout.edgeSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.edgeSpin, 11, 1 ); - connect( mLayout.edgeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.edgeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Separator margin width [pixels]:"); label = new TQLabel( mLayout.separatorSpin, text, page ); @@ -231,15 +231,15 @@ void COptionDialog::setupLayoutPage( void ) text = i18n("Column separation is e&qual to one character"); mLayout.columnCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.columnCheck, 12, 12, 0, 1, AlignLeft ); - connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotColumnSepCheck(bool))); - connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mLayout.columnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotColumnSepCheck(bool))); + connect( mLayout.columnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); mLayout.columnSepSpin = new TQSpinBox( page ); mLayout.columnSepSpin->setRange( 1, 100 ); - connect( mLayout.columnSepSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.columnSepSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("Column separa&tion [pixels]:"); mLayout.columnSepLabel = new TQLabel( mLayout.columnSepSpin, text, page ); @@ -265,10 +265,10 @@ void COptionDialog::setupCursorPage( void ) text = i18n("Do not b&link"); mCursor.blinkCheck = new TQCheckBox( i18n("Do not b&link"), group ); - connect( mCursor.blinkCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotBlinkIntervalCheck(bool))); - connect( mCursor.blinkCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.blinkCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotBlinkIntervalCheck(bool))); + connect( mCursor.blinkCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); TQHBox *hbox = new TQHBox( group ); mCursor.blinkLabel = new TQLabel( i18n("&Blink interval [ms]:" ), hbox ); @@ -278,8 +278,8 @@ void COptionDialog::setupCursorPage( void ) mCursor.blinkSpin->setSteps( 100, 100 ); mCursor.blinkSpin->setValue( 500 ); mCursor.blinkLabel->setBuddy(mCursor.blinkSpin); - connect( mCursor.blinkSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT( slotChanged())); + connect( mCursor.blinkSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT( slotChanged())); group = new TQVButtonGroup( i18n("Shape"), page ); group->layout()->setMargin( spacingHint() ); @@ -287,14 +287,14 @@ void COptionDialog::setupCursorPage( void ) text = i18n("Always &use block (rectangular) cursor"); mCursor.blockCheck = new TQCheckBox( text, group ); - connect( mCursor.blockCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotBlockCursorCheck(bool))); - connect( mCursor.blockCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.blockCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotBlockCursorCheck(bool))); + connect( mCursor.blockCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); text = i18n("Use &thick cursor in insert mode"); mCursor.thickCheck = new TQCheckBox( text, group ); - connect( mCursor.thickCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.thickCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); text = i18n("Cursor Behavior When Editor Loses Focus"); group = new TQVButtonGroup( text, page ); @@ -306,12 +306,12 @@ void COptionDialog::setupCursorPage( void ) mCursor.hideRadio = new TQRadioButton( i18n("H&ide"), group, "radio2" ); text = i18n("Do ¬hing"); mCursor.nothingRadio = new TQRadioButton( text, group, "radio3" ); - connect( mCursor.stopRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); - connect( mCursor.hideRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); - connect( mCursor.nothingRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.stopRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); + connect( mCursor.hideRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); + connect( mCursor.nothingRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); topLayout->addStretch(10); } @@ -328,10 +328,10 @@ void COptionDialog::setupColorPage( void ) text = i18n("&Use system colors (as chosen in Control Center)"); mColor.checkSystem = new TQCheckBox( text, page ); - connect( mColor.checkSystem, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotColorSystem(bool))); - connect( mColor.checkSystem, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mColor.checkSystem, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotColorSystem(bool))); + connect( mColor.checkSystem, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); topLayout->addWidget( mColor.checkSystem ); TQFrame *hline = new TQFrame( page ); @@ -365,7 +365,7 @@ void COptionDialog::setupColorPage( void ) mColor.colorList->insertItem( listItem ); } mColor.colorList->setCurrentItem(0); - connect( mColor.colorList, TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mColor.colorList, TQ_SIGNAL( dataChanged() ), this, TQ_SLOT( slotChanged() ) ); } @@ -380,10 +380,10 @@ void COptionDialog::setupFontPage( void ) text = i18n("&Use system font (as chosen in Control Center)"); mFont.checkSystem = new TQCheckBox( text, page ); - connect( mFont.checkSystem, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotFontSystem(bool))); - connect( mFont.checkSystem, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFont.checkSystem, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotFontSystem(bool))); + connect( mFont.checkSystem, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); topLayout->addWidget( mFont.checkSystem ); TQFrame *hline = new TQFrame( page ); @@ -396,8 +396,8 @@ void COptionDialog::setupFontPage( void ) fixFont.setBold(true); mFont.chooser->setFont( fixFont, true ); mFont.chooser->setSampleText( i18n("KHexEdit editor font") ); - connect( mFont.chooser, TQT_SIGNAL(fontSelected(const TQFont &)), - this, TQT_SLOT( slotChanged())); + connect( mFont.chooser, TQ_SIGNAL(fontSelected(const TQFont &)), + this, TQ_SLOT( slotChanged())); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -408,8 +408,8 @@ void COptionDialog::setupFontPage( void ) mFont.nonPrintInput = new TQLineEdit( page ); mFont.nonPrintInput->setMaxLength( 1 ); - connect( mFont.nonPrintInput, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT( slotChanged())); + connect( mFont.nonPrintInput, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT( slotChanged())); text = i18n("&Map non printable characters to:"); TQLabel *nonPrintLabel = new TQLabel( mFont.nonPrintInput, text, page ); @@ -440,8 +440,8 @@ void COptionDialog::setupFilePage( void ) modeList.append( i18n("All Recent Documents") ); mFile.openCombo->insertStringList( modeList ); mFile.openCombo->setMinimumWidth( mFile.openCombo->sizeHint().width() ); - connect( mFile.openCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT( slotChanged())); + connect( mFile.openCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT( slotChanged())); text = i18n("Open doc&uments on startup:"); TQLabel *label = new TQLabel( mFile.openCombo, text, page ); @@ -456,8 +456,8 @@ void COptionDialog::setupFilePage( void ) mFile.gotoOffsetCheck->setEnabled( false ); // ### END topLayout->addWidget( mFile.gotoOffsetCheck, 0, AlignLeft ); - connect( mFile.gotoOffsetCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.gotoOffsetCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); TQFrame *hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -466,20 +466,20 @@ void COptionDialog::setupFilePage( void ) text = i18n("Open document with &write protection enabled"); mFile.writeProtectCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.writeProtectCheck, 0, AlignLeft ); - connect( mFile.writeProtectCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.writeProtectCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Keep cursor position after reloading document"); mFile.reloadOffsetCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.reloadOffsetCheck, 0, AlignLeft ); - connect( mFile.reloadOffsetCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.reloadOffsetCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Make a backup when saving document"); mFile.backupCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.backupCheck, 0, AlignLeft ); - connect( mFile.backupCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.backupCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -493,8 +493,8 @@ void COptionDialog::setupFilePage( void ) "when the program is closed.\n" "Note: it will not erase any document of the recent document list " "created by TDE." ) ); - connect( mFile.discardRecentCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.discardRecentCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Cl&ear \"Recent\" Document List"); TQPushButton *discardRecentButton = new TQPushButton( page ); @@ -504,8 +504,8 @@ void COptionDialog::setupFilePage( void ) "Note: it will not erase any document of the recent document list " "created by TDE." ) ); topLayout->addWidget( discardRecentButton, 0, AlignCenter ); - connect( discardRecentButton, TQT_SIGNAL(clicked()), - TQT_SIGNAL(removeRecentFiles()) ); + connect( discardRecentButton, TQ_SIGNAL(clicked()), + TQ_SIGNAL(removeRecentFiles()) ); topLayout->addStretch(10); } @@ -526,57 +526,57 @@ void COptionDialog::setupMiscPage( void ) text = i18n("Auto&matic copy to clipboard when selection is ready"); mMisc.autoCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.autoCheck, 0, AlignLeft ); - connect( mMisc.autoCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.autoCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Editor starts in \"insert\" mode" ); mMisc.insertCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.insertCheck, 0, AlignLeft ); - connect( mMisc.insertCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.insertCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Confirm &wrapping (to beginning or end) during search"); mMisc.confirmWrapCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.confirmWrapCheck, 0, AlignLeft ); - connect( mMisc.confirmWrapCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.confirmWrapCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Cursor jumps to &nearest byte when moved"); mMisc.cursorJumpCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.cursorJumpCheck, 0, AlignLeft ); - connect( mMisc.cursorJumpCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.cursorJumpCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); TQVButtonGroup *group = new TQVButtonGroup( i18n("Sounds"), page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Make sound on data &input (eg. typing) failure"); mMisc.inputCheck = new TQCheckBox( text, group ); - connect( mMisc.inputCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.inputCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Make sound on &fatal failure"); mMisc.fatalCheck = new TQCheckBox( text, group ); - connect( mMisc.fatalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.fatalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); group = new TQVButtonGroup( i18n("Bookmark Visibility"), page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Use visible bookmarks in the offset column"); mMisc.bookmarkColumnCheck = new TQCheckBox( text, group ); - connect( mMisc.bookmarkColumnCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.bookmarkColumnCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Use visible bookmarks in the editor fields"); mMisc.bookmarkEditorCheck = new TQCheckBox( text, group ); - connect( mMisc.bookmarkEditorCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.bookmarkEditorCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Confirm when number of printed pages will e&xceed limit"); mMisc.thresholdCheck = new TQCheckBox( text, page ); - connect( mMisc.thresholdCheck, TQT_SIGNAL(clicked()), - TQT_SLOT( slotThresholdConfirm())); - connect( mMisc.thresholdCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.thresholdCheck, TQ_SIGNAL(clicked()), + TQ_SLOT( slotThresholdConfirm())); + connect( mMisc.thresholdCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); topLayout->addWidget( mMisc.thresholdCheck, 0, AlignLeft ); TQGridLayout *glay = new TQGridLayout( 3, 3 ); @@ -588,8 +588,8 @@ void COptionDialog::setupMiscPage( void ) mMisc.thresholdSpin->setRange( 5, INT_MAX ); mMisc.thresholdSpin->setSteps( 5, 5 ); mMisc.thresholdSpin->setValue( 5 ); - connect( mMisc.thresholdSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.thresholdSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT( slotChanged())); text = i18n("&Threshold [pages]:" ); mMisc.thresholdLabel = new TQLabel( mMisc.thresholdSpin, text, page ); @@ -605,8 +605,8 @@ void COptionDialog::setupMiscPage( void ) mMisc.undoSpin->setRange( 10, 10000 ); mMisc.undoSpin->setSteps( 5, 5 ); mMisc.undoSpin->setValue( 50 ); - connect( mMisc.undoSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.undoSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT( slotChanged())); label = new TQLabel( mMisc.undoSpin, i18n("&Undo limit:"), page ); glay->addWidget( label, 2, 0 ); @@ -1053,7 +1053,7 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void ) CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h index 9cf9e1e..8f0b831 100644 --- a/khexedit/optiondialog.h +++ b/khexedit/optiondialog.h @@ -42,7 +42,7 @@ class TDEFontChooser; class CColorListBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: @@ -92,7 +92,7 @@ class CColorListItem : public TQListBoxItem class COptionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp index 7c1d6c4..25e7c48 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp @@ -32,8 +32,8 @@ KBytesEditWidget::KBytesEditWidget( TQWidget *parent, const char *name, const TQ TQHBoxLayout* Layout = new TQHBoxLayout( this ); BytesEdit = new KHE::KBytesEdit( this, "BytesEdit" ); Layout->addWidget( BytesEdit ); -// connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( BytesEdit, TQT_SIGNAL(copyAvailable( bool )), this, TQT_SIGNAL(copyAvailable( bool )) ); +// connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( BytesEdit, TQ_SIGNAL(copyAvailable( bool )), this, TQ_SIGNAL(copyAvailable( bool )) ); } diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h index 99bc684..145383b 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.h +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h @@ -42,7 +42,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface, public KHE::ValueColumnInterface, public KHE::CharColumnInterface, public KHE::ZoomInterface, public KHE::ClipboardInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/parts/kpart/khebrowserextension.cpp b/khexedit/parts/kpart/khebrowserextension.cpp index 6adebaa..ec509c7 100644 --- a/khexedit/parts/kpart/khebrowserextension.cpp +++ b/khexedit/parts/kpart/khebrowserextension.cpp @@ -29,7 +29,7 @@ KHexEditBrowserExtension::KHexEditBrowserExtension( KHexEditPart *P ) : KParts::BrowserExtension( P, "khexeditpartbrowserextension" ), HexEditPart( P ) { - connect( HexEditPart->HexEdit, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) ); + connect( HexEditPart->HexEdit, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); } void KHexEditBrowserExtension::copy() diff --git a/khexedit/parts/kpart/khebrowserextension.h b/khexedit/parts/kpart/khebrowserextension.h index 8096bef..c555de0 100644 --- a/khexedit/parts/kpart/khebrowserextension.h +++ b/khexedit/parts/kpart/khebrowserextension.h @@ -33,7 +33,7 @@ class KHexEditPart; */ class KHexEditBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp index e23e26a..9a4adfb 100644 --- a/khexedit/parts/kpart/khepart.cpp +++ b/khexedit/parts/kpart/khepart.cpp @@ -17,7 +17,7 @@ // kde specific #include <tdelocale.h> -//#include <kinstance.h> +//#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> //#include <tdeglobalsettings.h> @@ -51,8 +51,8 @@ KHexEditPart::KHexEditPart( TQWidget *ParentWidget, const char *WidgetName, if( CopyAction ) { - connect( HexEdit, TQT_SIGNAL(copyAvailable(bool)), CopyAction,TQT_SLOT(setEnabled(bool)) ); - connect( HexEdit, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( HexEdit, TQ_SIGNAL(copyAvailable(bool)), CopyAction,TQ_SLOT(setEnabled(bool)) ); + connect( HexEdit, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); CopyAction->setEnabled( false ); } @@ -83,10 +83,10 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) { TDEActionCollection *AC = actionCollection(); // create our actions - CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( TQT_TQOBJECT(HexEdit), TQT_SLOT(copy()), AC ); + CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQ_SLOT(copy()), AC ); - KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), AC ); - KStdAction::deselect( this, TQT_SLOT(slotUnselect()), AC ); + KStdAction::selectAll( this, TQ_SLOT(slotSelectAll()), AC ); + KStdAction::deselect( this, TQ_SLOT(slotUnselect()), AC ); // value encoding CodingAction = new TDESelectAction( i18n("&Value Coding"), 0, AC, "view_valuecoding" ); @@ -96,17 +96,17 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Octal") ); List.append( i18n("&Binary") ); CodingAction->setItems( List ); - connect( CodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCoding(int)) ); + connect( CodingAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetCoding(int)) ); // document encoding EncodingAction = new TDESelectAction( i18n("&Char Encoding"), 0, AC, "view_charencoding" ); EncodingAction->setItems( KCharCodec::codecNames() ); - connect( EncodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetEncoding(int)) ); + connect( EncodingAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetEncoding(int)) ); - ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); + ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQ_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); - KStdAction::zoomIn( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomIn()), actionCollection() ); - KStdAction::zoomOut( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomOut()), actionCollection() ); + KStdAction::zoomIn( HexEdit, TQ_SLOT(zoomIn()), actionCollection() ); + KStdAction::zoomOut( HexEdit, TQ_SLOT(zoomOut()), actionCollection() ); // resize style ResizeStyleAction = new TDESelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" ); @@ -115,9 +115,9 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Lock Groups") ); List.append( i18n("&Full Size Usage") ); ResizeStyleAction->setItems( List ); - connect( ResizeStyleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetResizeStyle(int)) ); + connect( ResizeStyleAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetResizeStyle(int)) ); - ShowOffsetColumnAction = new TDEToggleAction( i18n("&Line Offset"), Key_F11, this, TQT_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); + ShowOffsetColumnAction = new TDEToggleAction( i18n("&Line Offset"), Key_F11, this, TQ_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); // show buffer columns ToggleColumnsAction = new TDESelectAction( i18n("&Columns"), 0, AC, "togglecolumns" ); @@ -126,7 +126,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Chars Column") ); List.append( i18n("&Both Columns") ); ToggleColumnsAction->setItems( List ); - connect( ToggleColumnsAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleValueCharColumns(int)) ); + connect( ToggleColumnsAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleValueCharColumns(int)) ); fitActionSettings(); diff --git a/khexedit/parts/kpart/khepart.h b/khexedit/parts/kpart/khepart.h index dcdba24..edc6ec7 100644 --- a/khexedit/parts/kpart/khepart.h +++ b/khexedit/parts/kpart/khepart.h @@ -44,7 +44,7 @@ class KHexEdit; */ class KHexEditPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT friend class KHexEditBrowserExtension; diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp index 7a9cce4..748fbd1 100644 --- a/khexedit/parts/kpart/khepartfactory.cpp +++ b/khexedit/parts/kpart/khepartfactory.cpp @@ -16,7 +16,7 @@ // kde specific -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <tdelocale.h> // app specific diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h index 9d12317..e573e01 100644 --- a/khexedit/parts/kpart/khepartfactory.h +++ b/khexedit/parts/kpart/khepartfactory.h @@ -26,7 +26,7 @@ class TDEAboutData; class KHexEditPartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/printdialogpage.cpp b/khexedit/printdialogpage.cpp index d421880..ad58759 100644 --- a/khexedit/printdialogpage.cpp +++ b/khexedit/printdialogpage.cpp @@ -102,8 +102,8 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw h&eader above text"); mLayout.headerCheck = new TQCheckBox( text, this ); mLayout.headerCheck->setFixedSize( mLayout.headerCheck->sizeHint() ); - connect( mLayout.headerCheck, TQT_SIGNAL( toggled(bool)), - TQT_SLOT( slotDrawHeader(bool))); + connect( mLayout.headerCheck, TQ_SIGNAL( toggled(bool)), + TQ_SLOT( slotDrawHeader(bool))); topLayout->addWidget( mLayout.headerCheck, 0, AlignLeft ); gbox = new TQGridLayout( 5, 6, 0 ); @@ -164,8 +164,8 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw &footer below text"); mLayout.footerCheck = new TQCheckBox( text, this ); mLayout.footerCheck->setFixedSize( mLayout.footerCheck->sizeHint() ); - connect( mLayout.footerCheck, TQT_SIGNAL( toggled(bool)), - TQT_SLOT( slotDrawFooter(bool))); + connect( mLayout.footerCheck, TQ_SIGNAL( toggled(bool)), + TQ_SLOT( slotDrawFooter(bool))); topLayout->addWidget( mLayout.footerCheck, 0, AlignLeft ); gbox = new TQGridLayout( 5, 6, 0 ); @@ -223,7 +223,7 @@ void LayoutDialogPage::readConfiguration( void ) { if( mConfig != 0 ) { return; } - mConfig = new KSimpleConfig( TQString("hexprinter") ); + mConfig = new TDESimpleConfig( TQString("hexprinter") ); if( mConfig == 0 ) { return; } mConfig->setGroup( "PageLayout" ); diff --git a/khexedit/printdialogpage.h b/khexedit/printdialogpage.h index 2b88b2e..6eb4741 100644 --- a/khexedit/printdialogpage.h +++ b/khexedit/printdialogpage.h @@ -28,11 +28,11 @@ class TQLabel; class TQSpinBox; #include <tdeprint/kprintdialogpage.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> class LayoutDialogPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: @@ -67,7 +67,7 @@ class LayoutDialogPage : public KPrintDialogPage TQComboBox *footerCombo[4]; }; - KSimpleConfig *mConfig; + TDESimpleConfig *mConfig; SLayoutWidgets mLayout; }; diff --git a/khexedit/searchbar.cpp b/khexedit/searchbar.cpp index 02fbb4e..395c950 100644 --- a/khexedit/searchbar.cpp +++ b/khexedit/searchbar.cpp @@ -58,22 +58,22 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) setLineWidth( 1 ); mTypeCombo = new TQComboBox( this ); - connect( mTypeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectorChanged(int)) ); + connect( mTypeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(selectorChanged(int)) ); TQStringList list; list << i18n("Hex") << i18n("Dec") << i18n("Oct") << i18n("Bin") << i18n("Txt"); mTypeCombo->insertStringList( list ); mInputEdit = new TQLineEdit( this ); - connect( mInputEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(textChanged(const TQString&)) ); + connect( mInputEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(textChanged(const TQString&)) ); mValidator = new CHexValidator( this, CHexValidator::regularText ); mInputEdit->setValidator( mValidator ); mFindButton = new TQPushButton( i18n("Find"), this ); mFindButton->setAutoDefault(false); - connect( mFindButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(start()) ); - connect(mInputEdit,TQT_SIGNAL(returnPressed()),mFindButton,TQT_SLOT(animateClick())); + connect( mFindButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(start()) ); + connect(mInputEdit,TQ_SIGNAL(returnPressed()),mFindButton,TQ_SLOT(animateClick())); mFindButton->setFixedHeight( mTypeCombo->sizeHint().height() ); mBackwards = new TQCheckBox( i18n("Backwards"), this ); @@ -82,7 +82,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) mCloseButton = new TQPushButton( this ); mCloseButton->setAutoDefault(false); mCloseButton->setPixmap( TQPixmap( close_xpm ) ); - connect( mCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideWidget()) ); + connect( mCloseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideWidget()) ); // // Make layout @@ -110,7 +110,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) // bool CSearchBar::eventFilter( TQObject *o, TQEvent *e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mInputEdit) && e->type() == TQEvent::KeyPress ) + if( o == mInputEdit && e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if( ke->key() == Key_Return ) diff --git a/khexedit/searchbar.h b/khexedit/searchbar.h index b0aed20..087f0f6 100644 --- a/khexedit/searchbar.h +++ b/khexedit/searchbar.h @@ -32,7 +32,7 @@ class CHexValidator; class CSearchBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/statusbarprogress.cpp b/khexedit/statusbarprogress.cpp index 6ed24e3..2ec4c4a 100644 --- a/khexedit/statusbarprogress.cpp +++ b/khexedit/statusbarprogress.cpp @@ -297,7 +297,7 @@ void CStatusBarProgress::drawContents(TQPainter *p) switch( mBarStyle ) { case Solid: - if( mOrientation ==Qt::Horizontal ) + if( mOrientation == Horizontal ) { fr.setWidth(recalcValue(cr.width())); er.setLeft(fr.right() + 1); @@ -319,7 +319,7 @@ void CStatusBarProgress::drawContents(TQPainter *p) case Blocked: const int margin = 2; int max, num, dx, dy; - if( mOrientation ==Qt::Horizontal ) + if( mOrientation == Horizontal ) { fr.setHeight(cr.height() - 2 * margin); fr.setWidth((int)(0.67 * fr.height())); @@ -350,7 +350,7 @@ void CStatusBarProgress::drawContents(TQPainter *p) if (num != max) { - if( mOrientation ==Qt::Horizontal ) + if( mOrientation == Horizontal ) er.setLeft(fr.right() + 1); else er.setBottom(fr.bottom() + 1); diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h index fb7e362..9446f7b 100644 --- a/khexedit/statusbarprogress.h +++ b/khexedit/statusbarprogress.h @@ -27,7 +27,7 @@ class CStatusBarProgress : public TQFrame, public TQRangeControl { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/stringdialog.cpp b/khexedit/stringdialog.cpp index f1c79f4..aa7ef6b 100644 --- a/khexedit/stringdialog.cpp +++ b/khexedit/stringdialog.cpp @@ -70,7 +70,7 @@ CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal ) TQPushButton *useButton = new TQPushButton( plainPage(), "use" ); useButton->setText( i18n("&Use") ); useButton->setAutoDefault( false ); - connect( useButton, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotUser1()) ); + connect( useButton, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotUser1()) ); glay->addWidget( useButton, 1, 2 ); TQWidget *helper = new TQWidget( plainPage() ); @@ -97,8 +97,8 @@ CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal ) mStringList->setAllColumnsShowFocus( true ); mStringList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); - connect( mStringList, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged())); + connect( mStringList, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged())); topLayout->addWidget( mStringList, 10 ); hlay = new TQHBoxLayout( topLayout ); @@ -150,7 +150,7 @@ void CStringDialog::showEvent( TQShowEvent *e ) void CStringDialog::readConfiguration( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup( "String Dialog" ); mLengthSpin->setValue( config.readNumEntry("MinimumLength", 4) ); @@ -163,7 +163,7 @@ void CStringDialog::readConfiguration( void ) void CStringDialog::writeConfiguration( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup( "String Dialog" ); config.writeEntry( "MinimumLength", mLengthSpin->value() ); @@ -270,14 +270,14 @@ void CStringDialog::setClean( void ) void CStringDialog::selectionChanged() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); startTimer( 200 ); } void CStringDialog::timerEvent( TQTimerEvent * ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); TQListViewItem *item = mStringList->currentItem(); if( item == 0 ) diff --git a/khexedit/stringdialog.h b/khexedit/stringdialog.h index 2726665..51d1fb2 100644 --- a/khexedit/stringdialog.h +++ b/khexedit/stringdialog.h @@ -40,7 +40,7 @@ class CListView; class CStringDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/toplevel.cpp b/khexedit/toplevel.cpp index c09bef8..8f3650a 100644 --- a/khexedit/toplevel.cpp +++ b/khexedit/toplevel.cpp @@ -65,43 +65,43 @@ KHexEdit::KHexEdit( void ) // // Prepare menus and status bar // - mAction.bookmarkMapper = new TQSignalMapper(TQT_TQOBJECT(this)); - connect(mAction.bookmarkMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(editor()), TQT_SLOT(gotoBookmark(int))); + mAction.bookmarkMapper = new TQSignalMapper(this); + connect(mAction.bookmarkMapper, TQ_SIGNAL(mapped(int)), editor(), TQ_SLOT(gotoBookmark(int))); setupActions(); setupStatusBar(); - connect( hexView(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - TQT_TQOBJECT(this), TQT_SLOT( cursorChanged( SCursorState & ) ) ); - connect( hexView(), TQT_SIGNAL( editMode( CHexBuffer::EEditMode ) ), - TQT_TQOBJECT(this), TQT_SLOT( editMode( CHexBuffer::EEditMode ) ) ); - connect( hexView(), TQT_SIGNAL( encodingChanged( const SEncodeState &)), - TQT_TQOBJECT(this), TQT_SLOT( encodingChanged( const SEncodeState & )) ); - connect( hexView(), TQT_SIGNAL( textWidth( uint ) ), - TQT_TQOBJECT(this), TQT_SLOT( textWidth( uint ) ) ); - connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fileState( SFileState & ) ) ); - connect( hexView(), TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), - TQT_TQOBJECT(this), TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); - connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - TQT_TQOBJECT(this), TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); - connect( hexView(), TQT_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)), - TQT_TQOBJECT(this), TQT_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) ); - connect( hexView(), TQT_SIGNAL( fileName( const TQString &, bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( fileActive( const TQString &, bool ) ) ); - connect( hexView(), TQT_SIGNAL( fileRename( const TQString &, const TQString & )), - TQT_TQOBJECT(this), TQT_SLOT( fileRename( const TQString &, const TQString & ) ) ); - connect( hexView(), TQT_SIGNAL( fileClosed( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fileClosed( const TQString & ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( errorLoadFile( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( removeRecentFile( const TQString & ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( operationChanged( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( operationChanged( bool ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( removeRecentFiles() ), - TQT_TQOBJECT(this), TQT_SLOT( removeRecentFiles() ) ); - connect( mManager, TQT_SIGNAL( conversionClosed() ), - TQT_TQOBJECT(this), TQT_SLOT(conversionClosed()) ); - connect( mManager, TQT_SIGNAL( searchBarClosed() ), - TQT_TQOBJECT(this), TQT_SLOT(searchBarClosed()) ); + connect( hexView(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + this, TQ_SLOT( cursorChanged( SCursorState & ) ) ); + connect( hexView(), TQ_SIGNAL( editMode( CHexBuffer::EEditMode ) ), + this, TQ_SLOT( editMode( CHexBuffer::EEditMode ) ) ); + connect( hexView(), TQ_SIGNAL( encodingChanged( const SEncodeState &)), + this, TQ_SLOT( encodingChanged( const SEncodeState & )) ); + connect( hexView(), TQ_SIGNAL( textWidth( uint ) ), + this, TQ_SLOT( textWidth( uint ) ) ); + connect( hexView(), TQ_SIGNAL( fileState( SFileState & ) ), + this, TQ_SLOT( fileState( SFileState & ) ) ); + connect( hexView(), TQ_SIGNAL( layoutChanged( const SDisplayLayout & ) ), + this, TQ_SLOT( layoutChanged( const SDisplayLayout & ) ) ); + connect( hexView(), TQ_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), + this, TQ_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); + connect( hexView(), TQ_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)), + this, TQ_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) ); + connect( hexView(), TQ_SIGNAL( fileName( const TQString &, bool ) ), + this, TQ_SLOT( fileActive( const TQString &, bool ) ) ); + connect( hexView(), TQ_SIGNAL( fileRename( const TQString &, const TQString & )), + this, TQ_SLOT( fileRename( const TQString &, const TQString & ) ) ); + connect( hexView(), TQ_SIGNAL( fileClosed( const TQString & ) ), + this, TQ_SLOT( fileClosed( const TQString & ) ) ); + connect( editor(), TQ_SIGNAL( errorLoadFile( const TQString & ) ), + this, TQ_SLOT( removeRecentFile( const TQString & ) ) ); + connect( editor(), TQ_SIGNAL( operationChanged( bool ) ), + this, TQ_SLOT( operationChanged( bool ) ) ); + connect( editor(), TQ_SIGNAL( removeRecentFiles() ), + this, TQ_SLOT( removeRecentFiles() ) ); + connect( mManager, TQ_SIGNAL( conversionClosed() ), + this, TQ_SLOT(conversionClosed()) ); + connect( mManager, TQ_SIGNAL( searchBarClosed() ), + this, TQ_SLOT(searchBarClosed()) ); // // Read configuration from file and set the default editor size. @@ -122,68 +122,68 @@ KHexEdit::~KHexEdit( void ) void KHexEdit::setupActions( void ) { - KStdAction::openNew( TQT_TQOBJECT(editor()), TQT_SLOT(newFile()), actionCollection() ); - KStdAction::open( TQT_TQOBJECT(editor()), TQT_SLOT(open()), actionCollection() ); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::openNew( editor(), TQ_SLOT(newFile()), actionCollection() ); + KStdAction::open( editor(), TQ_SLOT(open()), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); mAction.insert = new TDEAction( i18n("&Insert..."), CTRL+Key_I, - TQT_TQOBJECT(editor()), TQT_SLOT(insertFile()), actionCollection(), "insert_file" ); - mAction.openRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); - mAction.save = KStdAction::save( TQT_TQOBJECT(editor()), TQT_SLOT(save()), actionCollection() ); - mAction.saveAs = KStdAction::saveAs( TQT_TQOBJECT(editor()), TQT_SLOT(saveAs()), actionCollection() ); - mAction.revert = KStdAction::revert( TQT_TQOBJECT(editor()), TQT_SLOT(reload()), actionCollection() ); - //mAction.revert = KStdAction::revert( TQT_TQOBJECT(this), TQT_SLOT(resizeTest()), actionCollection() ); - - mAction.close = KStdAction::close( TQT_TQOBJECT(editor()), TQT_SLOT(close()), actionCollection() ); - mAction.print = KStdAction::print( TQT_TQOBJECT(editor()), TQT_SLOT(print()), actionCollection() ); + editor(), TQ_SLOT(insertFile()), actionCollection(), "insert_file" ); + mAction.openRecent = KStdAction::openRecent( this, TQ_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); + mAction.save = KStdAction::save( editor(), TQ_SLOT(save()), actionCollection() ); + mAction.saveAs = KStdAction::saveAs( editor(), TQ_SLOT(saveAs()), actionCollection() ); + mAction.revert = KStdAction::revert( editor(), TQ_SLOT(reload()), actionCollection() ); + //mAction.revert = KStdAction::revert( this, TQ_SLOT(resizeTest()), actionCollection() ); + + mAction.close = KStdAction::close( editor(), TQ_SLOT(close()), actionCollection() ); + mAction.print = KStdAction::print( editor(), TQ_SLOT(print()), actionCollection() ); mAction.exportData = new TDEAction( i18n("E&xport..."), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(exportDialog()), actionCollection(), "export" ); + editor(), TQ_SLOT(exportDialog()), actionCollection(), "export" ); mAction.cancel = new TDEAction( i18n("&Cancel Operation"), - "process-stop", 0, TQT_TQOBJECT(editor()), TQT_SLOT(stop()), actionCollection(), "cancel" ); + "process-stop", 0, editor(), TQ_SLOT(stop()), actionCollection(), "cancel" ); mAction.readOnly = new TDEToggleAction( i18n("&Read Only"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); + 0, editor(), TQ_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); mAction.resizeLock = new TDEToggleAction( i18n("&Allow Resize"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); + 0, editor(), TQ_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); mAction.newWindow = new TDEAction( i18n("N&ew Window"), - 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()),actionCollection(), "new_window" ); + 0, this, TQ_SLOT(newWindow()),actionCollection(), "new_window" ); mAction.closeWindow= new TDEAction( i18n("Close &Window"), - 0, TQT_TQOBJECT(this), TQT_SLOT(closeWindow()),actionCollection(), "close_window" ); - mAction.quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(closeProgram()), actionCollection() ); - - mAction.undo = KStdAction::undo( TQT_TQOBJECT(editor()), TQT_SLOT(undo()), actionCollection() ); - mAction.redo = KStdAction::redo( TQT_TQOBJECT(editor()), TQT_SLOT(redo()), actionCollection() ); - mAction.cut = KStdAction::cut( TQT_TQOBJECT(editor()), TQT_SLOT(cut()), actionCollection() ); - mAction.copy = KStdAction::copy( TQT_TQOBJECT(editor()), TQT_SLOT(copy()), actionCollection() ); - mAction.paste = KStdAction::paste( TQT_TQOBJECT(editor()), TQT_SLOT(paste()), actionCollection() ); - mAction.selectAll = KStdAction::selectAll( TQT_TQOBJECT(editor()), TQT_SLOT(selectAll()),actionCollection() ); - mAction.unselect = KStdAction::deselect( TQT_TQOBJECT(editor()), TQT_SLOT(unselect()), actionCollection()); - mAction.find = KStdAction::find( TQT_TQOBJECT(editor()), TQT_SLOT(find()), actionCollection() ); - mAction.findNext = KStdAction::findNext( TQT_TQOBJECT(editor()), TQT_SLOT(findNext()), actionCollection() ); - mAction.findPrev = KStdAction::findPrev( TQT_TQOBJECT(editor()),TQT_SLOT(findPrevious()),actionCollection() ); - mAction.replace = KStdAction::replace( TQT_TQOBJECT(editor()), TQT_SLOT(replace()), actionCollection() ); + 0, this, TQ_SLOT(closeWindow()),actionCollection(), "close_window" ); + mAction.quit = KStdAction::quit( this, TQ_SLOT(closeProgram()), actionCollection() ); + + mAction.undo = KStdAction::undo( editor(), TQ_SLOT(undo()), actionCollection() ); + mAction.redo = KStdAction::redo( editor(), TQ_SLOT(redo()), actionCollection() ); + mAction.cut = KStdAction::cut( editor(), TQ_SLOT(cut()), actionCollection() ); + mAction.copy = KStdAction::copy( editor(), TQ_SLOT(copy()), actionCollection() ); + mAction.paste = KStdAction::paste( editor(), TQ_SLOT(paste()), actionCollection() ); + mAction.selectAll = KStdAction::selectAll( editor(), TQ_SLOT(selectAll()),actionCollection() ); + mAction.unselect = KStdAction::deselect( editor(), TQ_SLOT(unselect()), actionCollection()); + mAction.find = KStdAction::find( editor(), TQ_SLOT(find()), actionCollection() ); + mAction.findNext = KStdAction::findNext( editor(), TQ_SLOT(findNext()), actionCollection() ); + mAction.findPrev = KStdAction::findPrev( editor(),TQ_SLOT(findPrevious()),actionCollection() ); + mAction.replace = KStdAction::replace( editor(), TQ_SLOT(replace()), actionCollection() ); mAction.gotoOffset = new TDEAction( i18n("&Goto Offset..."), CTRL+Key_G, - TQT_TQOBJECT(editor()), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); + editor(), TQ_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); mAction.insertPattern = new TDEAction( i18n("&Insert Pattern..."), CTRL+Key_Insert, - TQT_TQOBJECT(editor()), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); + editor(), TQ_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); mAction.copyAsText = new TDEAction( i18n("Copy as &Text"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" ); + editor(), TQ_SLOT(copyText()), actionCollection(), "copy_as_text" ); mAction.pasteToNewFile = new TDEAction( i18n("Paste into New &File"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); + editor(), TQ_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); mAction.pasteToNewWindow = new TDEAction( i18n("Paste into New &Window"), 0, - TQT_TQOBJECT(this), TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); + this, TQ_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); mAction.hexadecimal = new TDERadioAction( i18n("&Hexadecimal"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); mAction.decimal = new TDERadioAction( i18n("&Decimal"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); mAction.octal = new TDERadioAction( i18n("&Octal"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); mAction.binary = new TDERadioAction( i18n("&Binary"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); mAction.textOnly = new TDERadioAction( i18n("&Text"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); mAction.hexadecimal->setExclusiveGroup( "displayMode" ); mAction.decimal->setExclusiveGroup( "displayMode" ); mAction.octal->setExclusiveGroup( "displayMode" ); @@ -191,104 +191,104 @@ actionCollection()); mAction.textOnly->setExclusiveGroup( "displayMode" ); mAction.showOffsetColumn = new TDEToggleAction( i18n("Show O&ffset Column"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); + 0, editor(), TQ_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); mAction.showTextColumn = new TDEToggleAction( i18n("Show Te&xt Field"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); + 0, editor(), TQ_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); mAction.offsetAsDecimal = new TDEToggleAction( i18n("Off&set as Decimal"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); + 0, editor(), TQ_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); mAction.dataUppercase = new TDEToggleAction( i18n("&Upper Case (Data)"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); + 0, editor(), TQ_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); mAction.offsetUppercase = new TDEToggleAction( i18n("Upper &Case (Offset)"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); + 0, editor(), TQ_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); mAction.defaultEncoding = new TDERadioAction( i18n("&Default encoding", "&Default"), - 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_default" ); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_default" ); mAction.usAsciiEncoding = new TDERadioAction( i18n("US-&ASCII (7 bit)"), - 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii"); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_ascii"); mAction.ebcdicEncoding = new TDERadioAction( i18n("&EBCDIC"), - 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); // mAction.customEncoding = new TDEAction( i18n("&Custom..."), -// 0, TQT_TQOBJECT(editor()), TQT_SLOT( encoding()), actionCollection(), "enc_custom" ); +// 0, editor(), TQ_SLOT( encoding()), actionCollection(), "enc_custom" ); mAction.defaultEncoding->setExclusiveGroup( "encodingMode" ); mAction.usAsciiEncoding->setExclusiveGroup( "encodingMode" ); mAction.ebcdicEncoding->setExclusiveGroup( "encodingMode" ); mAction.strings = new TDEAction( i18n("&Extract Strings..."), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(strings()), actionCollection(), "extract_strings" ); + editor(), TQ_SLOT(strings()), actionCollection(), "extract_strings" ); // mAction.recordViewer = new TDEAction( i18n("&Record Viewer"), 0, -// TQT_TQOBJECT(editor()), TQT_SLOT(recordView()), actionCollection(), "record_viewer" ); +// editor(), TQ_SLOT(recordView()), actionCollection(), "record_viewer" ); mAction.filter = new TDEAction( i18n("&Binary Filter..."), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(filter()), actionCollection(), "binary_filter" ); + editor(), TQ_SLOT(filter()), actionCollection(), "binary_filter" ); mAction.characterTable = new TDEAction( i18n("&Character Table"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(chart()), actionCollection(), "char_table" ); + editor(), TQ_SLOT(chart()), actionCollection(), "char_table" ); mAction.converter = new TDEAction( i18n("C&onverter"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(converter()), actionCollection(), "converter" ); + editor(), TQ_SLOT(converter()), actionCollection(), "converter" ); mAction.statistics = new TDEAction( i18n("&Statistics"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(statistics()), actionCollection(), "statistics" ); + editor(), TQ_SLOT(statistics()), actionCollection(), "statistics" ); - mAction.addBookmark = KStdAction::addBookmark( TQT_TQOBJECT(editor()), - TQT_SLOT(addBookmark()), actionCollection() ); + mAction.addBookmark = KStdAction::addBookmark( editor(), + TQ_SLOT(addBookmark()), actionCollection() ); mAction.replaceBookmark = new TDEAction( i18n("&Replace Bookmark"), CTRL+Key_E, - TQT_TQOBJECT(editor()), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); + editor(), TQ_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); mAction.removeBookmark = new TDEAction( i18n("R&emove Bookmark"), CTRL+Key_U, - TQT_TQOBJECT(editor()), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); + editor(), TQ_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); mAction.removeAllBookmark = new TDEAction( i18n("Re&move All"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); + editor(), TQ_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); mAction.nextBookmark = new TDEAction( i18n("Goto &Next Bookmark"), - ALT+Key_Down, TQT_TQOBJECT(editor()), - TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); + ALT+Key_Down, editor(), + TQ_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); mAction.prevBookmark = new TDEAction( i18n("Goto &Previous Bookmark"), - ALT+Key_Up, TQT_TQOBJECT(editor()), - TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); + ALT+Key_Up, editor(), + TQ_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); mAction.showFullPath = new TDEToggleAction( i18n("Show F&ull Path"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" ); + 0, this, TQ_SLOT(showFullPath()), actionCollection(), "show_full_path" ); mAction.tabHide = new TDERadioAction( i18n("&Hide"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); mAction.tabShowAboveEditor = new TDERadioAction( i18n("&Above Editor"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); mAction.tabShowBelowEditor = new TDERadioAction( i18n("&Below Editor"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); mAction.tabHide->setExclusiveGroup( "editorTab" ); mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" ); mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" ); mAction.conversionHide = new TDERadioAction( i18n("&Hide"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); + 0, this, TQ_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); mAction.conversionFloat = new TDERadioAction( i18n("&Floating"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); + 0, this, TQ_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); mAction.conversionEmbed = new TDERadioAction( i18n("&Embed in Main Window"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); + 0, this, TQ_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); mAction.conversionHide->setExclusiveGroup( "conversionField" ); mAction.conversionFloat->setExclusiveGroup( "conversionField" ); mAction.conversionEmbed->setExclusiveGroup( "conversionField" ); mAction.searchHide = new TDERadioAction( i18n("&Hide"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); + 0, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); mAction.searchShowAboveEditor = new TDERadioAction( i18n("&Above Editor"), - Key_F5, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); + Key_F5, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); mAction.searchShowBelowEditor = new TDERadioAction( i18n("&Below Editor"), - Key_F6, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); + Key_F6, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); mAction.searchHide->setExclusiveGroup( "searchBar" ); mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" ); mAction.searchShowBelowEditor->setExclusiveGroup( "searchBar" ); - KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(writeConfiguration()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(editor()) ,TQT_SLOT(options()),actionCollection() ); + KStdAction::saveOptions(this, TQ_SLOT(writeConfiguration()), actionCollection()); + KStdAction::preferences(editor() ,TQ_SLOT(options()),actionCollection() ); // mAction.favorites = new TDEAction( i18n("P&rofiles..."), 0, -// TQT_TQOBJECT(editor()), TQT_SLOT(favorites()), actionCollection(), "favorites" ); +// editor(), TQ_SLOT(favorites()), actionCollection(), "favorites" ); - KStdAction::help( TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection() ); + KStdAction::help( this, TQ_SLOT(appHelpActivated()), actionCollection() ); mDragLabel = new CDragLabel(this); mDragLabel->setPixmap( UserIcon( "hexdrag" ) ); mDragLabel->setDragMask( UserIcon( "hexmask" ) ); mDragLabel->setEnabled( false ); // Enabled once we open a document TQToolTip::add( mDragLabel, i18n("Drag document") ); - (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, TQT_TQOBJECT(editor()), TQT_SLOT(options()), actionCollection(), "drag_document"); + (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, editor(), TQ_SLOT(options()), actionCollection(), "drag_document"); createGUI("khexeditui.rc", false); @@ -296,15 +296,15 @@ actionCollection()); hexView()->setPopupMenu( popup ); int id = 100; - toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQT_SIGNAL(clicked()), - TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()), true, + toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQ_SIGNAL(clicked()), + editor(), TQ_SLOT(toggleWriteProtection()), true, i18n("Toggle write protection") ); toolBar(0)->alignItemRight( id ); mWriteProtectButton = toolBar(0)->getButton(id); TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); hexView()->setDocumentMenu(documentMenu); - connect(documentMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(documentMenuCB(int))); + connect(documentMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(documentMenuCB(int))); } @@ -313,15 +313,15 @@ void KHexEdit::setupStatusBar( void ) { CStatusBarProgress *progess = new CStatusBarProgress( statusBar() ); statusBar()->addWidget( progess, 10 ); - connect( progess, TQT_SIGNAL(pressed()), TQT_TQOBJECT(editor()), TQT_SLOT(stop()) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgress( int ) ), - progess, TQT_SLOT( setValue( int ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgress( int, int ) ), - progess, TQT_SLOT( setValue( int, int ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( enableProgressText( bool ) ), - progess, TQT_SLOT( setTextEnabled( bool ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgressText( const TQString & ) ), - progess, TQT_SLOT( setText( const TQString & ) ) ); + connect( progess, TQ_SIGNAL(pressed()), editor(), TQ_SLOT(stop()) ); + connect( editor(), TQ_SIGNAL( setProgress( int ) ), + progess, TQ_SLOT( setValue( int ) ) ); + connect( editor(), TQ_SIGNAL( setProgress( int, int ) ), + progess, TQ_SLOT( setValue( int, int ) ) ); + connect( editor(), TQ_SIGNAL( enableProgressText( bool ) ), + progess, TQ_SLOT( setTextEnabled( bool ) ) ); + connect( editor(), TQ_SIGNAL( setProgressText( const TQString & ) ), + progess, TQ_SLOT( setText( const TQString & ) ) ); statusBar()->insertFixedItem( i18n("Selection: 0000:0000 0000:0000"), status_Selection ); @@ -344,7 +344,7 @@ void KHexEdit::setupStatusBar( void ) statusBar()->changeItem( i18n("Size:"), status_Size ); statusBar()->changeItem( "", status_Modified ); statusBar()->changeItem( "", status_Selection ); - connect( statusBar(),TQT_SIGNAL(pressed(int)),this,TQT_SLOT(statusBarPressed(int)) ); + connect( statusBar(),TQ_SIGNAL(pressed(int)),this,TQ_SLOT(statusBarPressed(int)) ); } @@ -375,7 +375,7 @@ void KHexEdit::initialize( bool openFiles ) { // Code modified from tdelibs/tdeui/tdeactionclasses.cpp TDERecentFilesAction::loadEntries - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); const TQString oldGroup = config->group(); @@ -408,7 +408,7 @@ void KHexEdit::initialize( bool openFiles ) // is displayed, then the editor will not be visible until the error // is confirmed and the (modal) dialog is closed. // - TQTimer::singleShot( 100, TQT_TQOBJECT(this), TQT_SLOT(delayedStartupOpen()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(delayedStartupOpen()) ); } @@ -608,7 +608,7 @@ void KHexEdit::closeProgram( void ) mWindowList.removeRef( mWindowList.first() ); } - kapp->quit(); + tdeApp->quit(); } else { @@ -641,14 +641,14 @@ bool KHexEdit::queryExit( void ) void KHexEdit::readConfiguration( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); readConfiguration( config ); } void KHexEdit::writeConfiguration( void ) { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); writeConfiguration( config ); } @@ -920,7 +920,7 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list ) { offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); text = i18n("Offset: %1").arg(offset); - TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1()); + TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQ_SLOT(map()), this, text.latin1()); int key = acceleratorNumKey( i ); if( key > 0 ) { @@ -1351,7 +1351,7 @@ void KHexEdit::resizeTest() for( int i=0; i<loop; i+=4 ) { resize( i+400, i+400 ); - //kapp->processOneEvent(); + //tdeApp->processOneEvent(); } gettimeofday( &t2, 0 ); diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h index 6991a58..f343b03 100644 --- a/khexedit/toplevel.h +++ b/khexedit/toplevel.h @@ -47,7 +47,7 @@ class CDragLabel; class KHexEdit : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT enum StatusBarId diff --git a/kjots/CMakeLists.txt b/kjots/CMakeLists.txt index addcfed..c2ae2eb 100644 --- a/kjots/CMakeLists.txt +++ b/kjots/CMakeLists.txt @@ -31,7 +31,7 @@ tde_add_executable( kjots AUTOMOC kjotsedit.cpp kjotsbookmarks.cpp confpagefont.ui confpagemisc.ui KJotsSettings.kcfgc - LINK tdeprint-shared + LINK tdeprint-shared tdeutils-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 5146536..9d3ca5c 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -36,7 +36,7 @@ #include <tdemessagebox.h> #include <tdepopupmenu.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdestdaccel.h> #include <ktextbrowser.h> @@ -90,10 +90,9 @@ KJotsMain::KJotsMain(const char* name) textStack = new TQWidgetStack(splitter); me_text = new KJotsEdit(textStack, "me_text"); - me_text->setFocusPolicy(TQ_StrongFocus); + me_text->setFocusPolicy(TQWidget::StrongFocus); me_text->setEnabled(false); textStack->addWidget(me_text); - connect(me_text, TQT_SIGNAL(findSuccessful()), this, TQT_SLOT(slotFindSuccessful())); roTextView = new KTextBrowser(textStack, "roTextView", true); textStack->addWidget(roTextView); @@ -104,73 +103,73 @@ KJotsMain::KJotsMain(const char* name) splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1)); // create actions - actions[ACTION_NEXT_BOOK] = new TDEAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this), - TQT_SLOT(nextBook()), actionCollection(), "go_next_book"); - actions[ACTION_PREV_BOOK] = new TDEAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, TQT_TQOBJECT(this), - TQT_SLOT(prevBook()), actionCollection(), "go_prev_book"); - actions[ACTION_NEXT_PAGE] = new TDEAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, TQT_TQOBJECT(this), - TQT_SLOT(nextPage()), actionCollection(), "go_next_page"); - actions[ACTION_PREV_PAGE] = new TDEAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, TQT_TQOBJECT(this), - TQT_SLOT(prevPage()), actionCollection(), "go_prev_page"); - - actions[ACTION_NEW_PAGE] = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newEntry()), actionCollection()); + actions[ACTION_NEXT_BOOK] = new TDEAction(i18n("Next Book"), TQString(), CTRL + Key_D, this, + TQ_SLOT(nextBook()), actionCollection(), "go_next_book"); + actions[ACTION_PREV_BOOK] = new TDEAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, this, + TQ_SLOT(prevBook()), actionCollection(), "go_prev_book"); + actions[ACTION_NEXT_PAGE] = new TDEAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, this, + TQ_SLOT(nextPage()), actionCollection(), "go_next_page"); + actions[ACTION_PREV_PAGE] = new TDEAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, this, + TQ_SLOT(prevPage()), actionCollection(), "go_prev_page"); + + actions[ACTION_NEW_PAGE] = KStdAction::openNew(this, TQ_SLOT(newEntry()), actionCollection()); actions[ACTION_NEW_PAGE]->setText(i18n("&New Page")); - actions[ACTION_NEW_BOOK] = new TDEAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, TQT_TQOBJECT(this), - TQT_SLOT(createNewBook()), actionCollection(), "new_book"); + actions[ACTION_NEW_BOOK] = new TDEAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, this, + TQ_SLOT(createNewBook()), actionCollection(), "new_book"); exportPageMenu = new TDEActionMenu(i18n("Export Page"), actionCollection(), "save_page_to"); - actions[ACTION_PAGE2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this), - TQT_SLOT(writePage()), actionCollection(), "save_page_to_ascii"); + actions[ACTION_PAGE2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, this, + TQ_SLOT(writePage()), actionCollection(), "save_page_to_ascii"); actions[ACTION_PAGE2TEXT]->plug(exportPageMenu->popupMenu()); - actions[ACTION_PAGE2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this), - TQT_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html"); + actions[ACTION_PAGE2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, this, + TQ_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html"); actions[ACTION_PAGE2HTML]->plug(exportPageMenu->popupMenu()); exportBookMenu = new TDEActionMenu(i18n("Export Book"), actionCollection(), "save_book_to"); - actions[ACTION_BOOK2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this), - TQT_SLOT(writeBook()), actionCollection(), "save_book_to_ascii"); + actions[ACTION_BOOK2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, this, + TQ_SLOT(writeBook()), actionCollection(), "save_book_to_ascii"); actions[ACTION_BOOK2TEXT]->plug(exportBookMenu->popupMenu()); - actions[ACTION_BOOK2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this), - TQT_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html"); + actions[ACTION_BOOK2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, this, + TQ_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html"); actions[ACTION_BOOK2HTML]->plug(exportBookMenu->popupMenu()); - actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "edit-delete", CTRL + Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(deleteEntry()), actionCollection(), "del_page"); - actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(deleteBook()), actionCollection(), "del_folder"); + actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "edit-delete", CTRL + Key_Delete, this, + TQ_SLOT(deleteEntry()), actionCollection(), "del_page"); + actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, this, + TQ_SLOT(deleteBook()), actionCollection(), "del_folder"); actions[ACTION_MANUAL_SAVE] = new TDEAction(i18n("Manual Save"), 0, TDEStdAccel::save(), - TQT_TQOBJECT(this), TQT_SLOT(autoSave()), actionCollection(), "manual_save"); - actions[ACTION_PRINT] = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection()); - actions[ACTION_QUIT] = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + this, TQ_SLOT(autoSave()), actionCollection(), "manual_save"); + actions[ACTION_PRINT] = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection()); + actions[ACTION_QUIT] = KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); - actions[ACTION_CUT] = KStdAction::cut(TQT_TQOBJECT(me_text), TQT_SLOT(cut()), actionCollection()); - connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_CUT], TQT_SLOT(setEnabled(bool))); + actions[ACTION_CUT] = KStdAction::cut(me_text, TQ_SLOT(cut()), actionCollection()); + connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_CUT], TQ_SLOT(setEnabled(bool))); actions[ACTION_CUT]->setEnabled(false); - actions[ACTION_COPY] = KStdAction::copy(TQT_TQOBJECT(me_text), TQT_SLOT(copy()), actionCollection()); - connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQT_SLOT(setEnabled(bool))); + actions[ACTION_COPY] = KStdAction::copy(me_text, TQ_SLOT(copy()), actionCollection()); + connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQ_SLOT(setEnabled(bool))); actions[ACTION_COPY]->setEnabled(false); - actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "edit-copy", CTRL+Key_T, TQT_TQOBJECT(this), - TQT_SLOT(copySelection()), actionCollection(), "copyIntoTitle"); - connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQT_SLOT(setEnabled(bool))); + actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "edit-copy", CTRL+Key_T, this, + TQ_SLOT(copySelection()), actionCollection(), "copyIntoTitle"); + connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQ_SLOT(setEnabled(bool))); actions[ACTION_PASTE2TITLE]->setEnabled(false); - actions[ACTION_PASTE] = KStdAction::pasteText(TQT_TQOBJECT(me_text), TQT_SLOT(paste()), actionCollection()); + actions[ACTION_PASTE] = KStdAction::pasteText(me_text, TQ_SLOT(paste()), actionCollection()); - actions[ACTION_FIND] = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotSearch() ), actionCollection() ); - actions[ACTION_FIND_NEXT] = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotRepeatSearch() ), actionCollection() ); - actions[ACTION_FIND_NEXT]->setEnabled(false); - actions[ACTION_REPLACE] = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), actionCollection() ); + actions[ACTION_FIND] = KStdAction::find(me_text, TQ_SLOT(find()), actionCollection()); + actions[ACTION_FIND_NEXT] = KStdAction::findNext(me_text, TQ_SLOT(findNext()), actionCollection()); + actions[ACTION_FIND_PREV] = KStdAction::findPrev(me_text, TQ_SLOT(findPrev()), actionCollection()); + actions[ACTION_REPLACE] = KStdAction::replace(me_text, TQ_SLOT(replace()), actionCollection()); - actions[ACTION_RENAME] = new TDEAction(i18n("Rename..."), TQString(), CTRL + Key_M, TQT_TQOBJECT(this), - TQT_SLOT(slotRenameEntry()), actionCollection(), "rename_entry"); - actions[ACTION_INSERT_DATE] = new TDEAction(i18n("Insert Date"), "date", CTRL + Key_I, TQT_TQOBJECT(this), - TQT_SLOT(insertDate()), actionCollection(), "insert_date"); + actions[ACTION_RENAME] = new TDEAction(i18n("Rename..."), TQString(), CTRL + Key_M, this, + TQ_SLOT(slotRenameEntry()), actionCollection(), "rename_entry"); + actions[ACTION_INSERT_DATE] = new TDEAction(i18n("Insert Date"), "date", CTRL + Key_I, this, + TQ_SLOT(insertDate()), actionCollection(), "insert_date"); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection()); bookmarkMenu = new TDEActionMenu(i18n("&Bookmarks"), "bookmarks", actionCollection(), "bookmarks"); KJotsBookmarks* bookmarks = new KJotsBookmarks(this); - connect(bookmarks, TQT_SIGNAL(openPage(const TQString&)), TQT_SLOT(jumpToBookmark(const TQString&))); + connect(bookmarks, TQ_SIGNAL(openPage(const TQString&)), TQ_SLOT(jumpToBookmark(const TQString&))); new KBookmarkMenu(KBookmarkManager::managerForFile(locateLocal("appdata","bookmarks.xml")), bookmarks, bookmarkMenu->popupMenu(), actionCollection(), true); @@ -204,25 +203,25 @@ KJotsMain::KJotsMain(const char* name) updateConfiguration(); updateMenu(); - TQTimer::singleShot(0, this, TQT_SLOT(slotSetupInterface())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetupInterface())); //connect new slots - connect(subjectList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(jumpToEntry(TQListViewItem*))); - connect(subjectList, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), - this, TQT_SLOT(slotItemMoved(TQListViewItem*, TQListViewItem*, TQListViewItem*))); - connect(subjectList, TQT_SIGNAL(expanded(TQListViewItem*)), - this, TQT_SLOT(slotExpandBook(TQListViewItem*))); - connect(subjectList, TQT_SIGNAL(collapsed(TQListViewItem*)), - this, TQT_SLOT(slotCollapseBook(TQListViewItem*))); - connect(subjectList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), - this, TQT_SLOT(showListviewContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); - connect(subjectList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); - connect(roTextView, TQT_SIGNAL(urlClick(const TQString&)), - this, TQT_SLOT(linkClicked(const TQString&))); - connect(m_autosaveTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(autoSave())); + connect(subjectList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(jumpToEntry(TQListViewItem*))); + connect(subjectList, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), + this, TQ_SLOT(slotItemMoved(TQListViewItem*, TQListViewItem*, TQListViewItem*))); + connect(subjectList, TQ_SIGNAL(expanded(TQListViewItem*)), + this, TQ_SLOT(slotExpandBook(TQListViewItem*))); + connect(subjectList, TQ_SIGNAL(collapsed(TQListViewItem*)), + this, TQ_SLOT(slotCollapseBook(TQListViewItem*))); + connect(subjectList, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + this, TQ_SLOT(showListviewContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); + connect(subjectList, TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); + connect(roTextView, TQ_SIGNAL(urlClick(const TQString&)), + this, TQ_SLOT(linkClicked(const TQString&))); + connect(m_autosaveTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(autoSave())); } void KJotsMain::slotSetupInterface() @@ -399,26 +398,11 @@ void KJotsMain::configure() confPageMisc* cpMisc = new confPageMisc(0, "Autosave"); dialog->addPage(cpMisc, i18n("Autosave"), "misc"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateConfiguration())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateConfiguration())); dialog->show(); } -void KJotsMain::slotSearch() -{ - me_text->search(); -} - -void KJotsMain::slotRepeatSearch() -{ - me_text->repeatSearch(); -} - -void KJotsMain::slotReplace() -{ - me_text->replace(); -} - void KJotsMain::updateConfiguration() { static int encoding = -1; @@ -649,15 +633,10 @@ void KJotsMain::updateMenu() } } -void KJotsMain::slotFindSuccessful() -{ - actions[ACTION_FIND_NEXT]->setEnabled(true); -} - void KJotsMain::showListviewContextMenu(TDEListView*, TQListViewItem* i, const TQPoint& p) { if ( invalidMoveFlag ) return; //Prevent race condition - TDEActionMenu* am = new TDEActionMenu(TQT_TQOBJECT(this)); + TDEActionMenu* am = new TDEActionMenu(this); if (!i) { @@ -1053,7 +1032,7 @@ void KJotsMain::updateCaption() } } - setCaption(kapp->makeStdCaption(caption)); + setCaption(tdeApp->makeStdCaption(caption)); return; } diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h index 0f24e5a..ea38f08 100644 --- a/kjots/KJotsMain.h +++ b/kjots/KJotsMain.h @@ -77,11 +77,12 @@ class KJotsEdit; #define ACTION_REPLACE 21 #define ACTION_RENAME 22 #define ACTION_INSERT_DATE 23 -#define ACTION_MAX 24 +#define ACTION_FIND_PREV 24 +#define ACTION_MAX 25 class KJotsMain : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: @@ -106,11 +107,7 @@ class KJotsMain : public TDEMainWindow void copySelection(); void insertDate(); void slotPrint(); - void slotSearch(); - void slotRepeatSearch(); - void slotReplace(); void slotQuit(); - void slotFindSuccessful(); void jumpToEntry(TQListViewItem* entry, bool=false); diff --git a/kjots/kjotsbookmarks.h b/kjots/kjotsbookmarks.h index ebf08d4..c71c15f 100644 --- a/kjots/kjotsbookmarks.h +++ b/kjots/kjotsbookmarks.h @@ -29,7 +29,7 @@ class KJotsMain; class KJotsBookmarks : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index 420f715..b2ffe89 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -25,8 +25,13 @@ #include <tqcursor.h> #include <tdepopupmenu.h> -#include <keditcl.h> +#include <kfind.h> +#include <kfinddialog.h> +#include <kreplace.h> +#include <kreplacedialog.h> +#include <kstringhandler.h> #include <tdelocale.h> +#include <tdemessagebox.h> #include <kopenwith.h> #include <kprinter.h> @@ -37,25 +42,30 @@ // MYMULTIEDIT //---------------------------------------------------------------------- KJotsEdit::KJotsEdit (TQWidget* parent, const char* name) - : KEdit(parent, name), - m_entry(0) + : KTextEdit(parent, name) + , m_entry(nullptr) + , m_find(nullptr) + , m_findDialog(nullptr) + , m_replace(nullptr) + , m_replaceDialog(nullptr) { // no rich text until printing and other such issues are worked out setTextFormat(TQt::PlainText); setWordWrap(TQTextEdit::WidgetWidth); setLinkUnderline(true); web_menu = new TDEPopupMenu(this);; - web_menu->insertItem(i18n("Open URL"), this, TQT_SLOT(openUrl()) ); + web_menu->insertItem(i18n("Open URL"), this, TQ_SLOT(openUrl()) ); } KJotsEdit::~KJotsEdit() { - + delete m_find; + delete m_replace; } void KJotsEdit::mousePressEvent( TQMouseEvent *e ) { - if(e->button() == Qt::RightButton && + if(e->button() == TQt::RightButton && hasSelectedText()) { KURL url(selectedText()); @@ -67,7 +77,7 @@ void KJotsEdit::mousePressEvent( TQMouseEvent *e ) } } - KEdit::mousePressEvent(e); + KTextEdit::mousePressEvent(e); } void KJotsEdit::openUrl() @@ -121,6 +131,441 @@ void KJotsEdit::print(TQString title) } } +void KJotsEdit::slotFindHighlight(const TQString& text, int matchIndex, int matchLength) +{ + // tqDebug("KJotsEdit::slotFindHighlight"); + + Q_UNUSED(text); + + const bool inSelection = m_find->options() & KFindDialog::SelectedText; + + // Ensure we are offsetting the selection for the first line of the selection + // so we don't highlight the wrong text. + if (inSelection && (m_findCursor.paragraph == m_selectionStart.paragraph)) + { + setSelection(m_findCursor.paragraph, m_selectionStart.paragraphIndex + matchIndex, m_findCursor.paragraph, + m_selectionStart.paragraphIndex + matchIndex + matchLength); + } + else + { + setSelection(m_findCursor.paragraph, matchIndex, m_findCursor.paragraph, matchIndex + matchLength); + } +} + +void KJotsEdit::slotReplaceHighlight(const TQString& text, int matchIndex, int matchLength) +{ + // tqDebug("KJotsEdit::slotReplaceHighlight"); + + Q_UNUSED(text); + + setSelection(m_replaceCursor.paragraph, matchIndex, m_replaceCursor.paragraph, matchIndex + matchLength); +} + +void KJotsEdit::replace() +{ + // tqDebug("KJotsEdit::replace"); + + if (length() == 0) + { + return; + } + + if (m_replaceDialog) + { + m_replaceDialog->setActiveWindow(); + } + else + { + m_replaceDialog = new KReplaceDialog(this, "m_replaceDialog", KReplaceDialog::PromptOnReplace); + connect(m_replaceDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoReplace())); + } + + if (hasSelectedText()) + { + m_replaceDialog->setHasSelection(true); + m_replaceDialog->setOptions(m_replaceDialog->options() | KReplaceDialog::SelectedText); + } + else + { + m_replaceDialog->setHasSelection(false); + m_replaceDialog->setOptions(m_replaceDialog->options() & ~KReplaceDialog::SelectedText); + } + + m_replaceDialog->show(); +} + +void KJotsEdit::slotDoReplace() +{ + // tqDebug("KJotsEdit::slotDoReplace"); + + /* Performing a new replacement, so we need to remove the previous + * KReplace, set up a new one and the 'replaceNext' functionality. */ + + delete m_replace; + m_replace = nullptr; + + if (!m_replaceDialog) + { + // tqDebug("KJotsEdit::slotDoReplace: no replaceDialog"); + return; + } + + m_replace = new KReplace(m_replaceDialog->pattern(), m_replaceDialog->replacement(), m_replaceDialog->options()); + + if ((m_replace->options() & KReplaceDialog::SelectedText)) + { + const bool backwards = m_replace->options() & KFindDialog::FindBackwards; + + getSelection(&m_selectionStart.paragraph, &m_selectionStart.paragraphIndex, &m_selectionEnd.paragraph, + &m_selectionEnd.paragraphIndex); + m_replaceCursor.paragraph = backwards ? m_selectionEnd.paragraph : m_selectionStart.paragraph; + m_replaceCursor.paragraphIndex = backwards ? m_selectionEnd.paragraphIndex : m_selectionStart.paragraphIndex; + } + else + { + setupCursor(&m_replaceCursor, m_replace); + } + + connect(m_replace, TQ_SIGNAL(highlight(const TQString&, int, int)), this, + TQ_SLOT(slotReplaceHighlight(const TQString&, int, int))); + connect(m_replace, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotReplaceNext())); + connect(m_replace, TQ_SIGNAL(replace(const TQString&, int, int, int)), this, + TQ_SLOT(slotReplace(const TQString&, int, int, int))); + + m_replaceDialog->close(); + slotReplaceNext(); +} + +void KJotsEdit::slotReplace(const TQString& replaceText, int replacementIndex, int replacementLength, int matchedLength) +{ + // tqDebug("KJotsEdit::slotReplace"); + + // Ensure the selection only matches the replacement. + // Prevents an issue where all the text is selected before replacing (since we remove the selection below). + setSelection(m_replaceCursor.paragraph, replacementIndex, m_replaceCursor.paragraph, + replacementIndex + matchedLength); + + const auto replacement = replaceText.mid(replacementIndex, replacementLength); + removeSelectedText(); + insertAt(replacement, m_replaceCursor.paragraph, replacementIndex); + setModified(true); +} + +void KJotsEdit::slotReplaceNext() +{ + // tqDebug("KJotsEdit::slotReplaceNext"); + + if (!m_replace) + { + return; + } + + const bool backwards = (m_replace->options() & KReplaceDialog::FindBackwards); + const bool useSelection = (m_replace->options() & KReplaceDialog::SelectedText); + + if (m_replace->needData()) + { + if (useSelection && backwards) + { + m_replace->setData(text(m_selectionEnd.paragraph), m_selectionEnd.paragraphIndex); + } + else if (useSelection) + { + m_replace->setData(text(m_selectionStart.paragraph), m_selectionStart.paragraphIndex); + } + else + { + m_replace->setData(text(m_replaceCursor.paragraph), m_replaceCursor.paragraphIndex); + } + } + + KReplace::Result res = KReplace::NoMatch; + + do + { + res = m_replace->replace(); + if (res == KReplace::Match) + { + return; + } + + m_replaceCursor.paragraph += (backwards ? -1 : 1); + m_replaceCursor.paragraphIndex = (backwards ? paragraphLength(m_replaceCursor.paragraph) : 0); + m_replace->setData(text(m_replaceCursor.paragraph), m_replaceCursor.paragraphIndex); + + if (useSelection && m_replaceCursor.paragraph > m_selectionEnd.paragraph) + { + break; + } + + if (useSelection && backwards && m_replaceCursor.paragraph < m_selectionStart.paragraph) + { + break; + } + } while (backwards ? (m_replaceCursor.paragraph >= 0) : (m_replaceCursor.paragraph < paragraphs())); + + Q_ASSERT(res != KReplace::Match); + + if ((m_replace->options() & KReplaceDialog::FromCursor) && m_replace->shouldRestart(true)) + { + // tqDebug("KJotsEdit::slotReplaceNext restarting"); + m_replaceCursor.paragraph = backwards ? (paragraphs() - 1) : 0; + m_replaceCursor.paragraphIndex = backwards ? (paragraphLength(m_replaceCursor.paragraph)) : 0; + m_replace->setData(text(m_replaceCursor.paragraph), m_replaceCursor.paragraphIndex); + m_replace->resetCounts(); + slotReplaceNext(); + return; + } + + m_replace->displayFinalDialog(); + m_replace->disconnect(this, TQ_SLOT(slotReplaceHighlight(const TQString&, int, int))); + m_replace->deleteLater(); + m_replace = nullptr; +} + +void KJotsEdit::find() +{ + // tqDebug("KJotsEdit::find"); + + if (length() == 0) + { + return; + } + + if (m_findDialog) + { + m_findDialog->setActiveWindow(); + } + else + { + m_findDialog = new KFindDialog(this, "m_findDialog"); + connect(m_findDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoFind())); + } + + if (hasSelectedText()) + { + m_findDialog->setHasSelection(true); + m_findDialog->setOptions(m_findDialog->options() | KFindDialog::SelectedText); + } + else + { + m_findDialog->setHasSelection(false); + m_findDialog->setOptions(m_findDialog->options() & ~KFindDialog::SelectedText); + } + + + m_findDialog->show(); +} + +void KJotsEdit::findNext() +{ + // tqDebug("KJotsEdit::findNext"); + + if (!m_find) + { + find(); + return; + } + + const bool backwards = (m_find->options() & KFindDialog::FindBackwards); + const bool fromCursor = (m_find->options() & KFindDialog::FromCursor); + const bool inSelection = (m_find->options() & KFindDialog::SelectedText); + + if (m_find->needData()) + { + if (inSelection) + { + if (m_selectionStart.paragraph == m_selectionEnd.paragraph) + { + // Same line, ensure we only inlcude the selection. + auto selectionLength = m_selectionEnd.paragraphIndex - m_selectionStart.paragraphIndex; + auto data = text(m_findCursor.paragraph).mid(m_selectionStart.paragraphIndex, selectionLength); + m_find->setData(data); + } + else if (backwards) + { + m_findCursor.paragraph = m_selectionEnd.paragraph; + m_findCursor.paragraphIndex = -1; + m_find->setData(text(m_findCursor.paragraph).left(m_selectionEnd.paragraphIndex)); + } + else + { + m_findCursor.paragraph = m_selectionStart.paragraph; + m_findCursor.paragraphIndex = 0; + auto offset = (paragraphLength(m_findCursor.paragraph)) - m_selectionStart.paragraphIndex+1; + m_find->setData(text(m_findCursor.paragraph).right(offset), m_findCursor.paragraphIndex); + } + } + else + { + m_find->setData(text(m_findCursor.paragraph), m_findCursor.paragraphIndex); + } + } + + KFind::Result res = KFind::NoMatch; + + do + { + res = m_find->find(); + if (res == KFind::Match) + { + return; + } + + m_findCursor.paragraph += (backwards ? -1 : 1); + m_findCursor.paragraphIndex = -1; // SOL or EOL depending on `backwards`. + + if (m_findCursor.paragraph == m_selectionStart.paragraph) + { + auto offset = (paragraphLength(m_findCursor.paragraph)) - m_selectionStart.paragraphIndex+1; + m_find->setData(text(m_findCursor.paragraph).right(offset), m_findCursor.paragraphIndex); + } + else if (m_findCursor.paragraph == m_selectionEnd.paragraph) + { + m_find->setData(text(m_findCursor.paragraph).left(m_selectionEnd.paragraphIndex), m_findCursor.paragraphIndex); + } + else + { + m_findCursor.paragraphIndex = -1; + m_find->setData(text(m_findCursor.paragraph), m_findCursor.paragraphIndex); + } + + if (inSelection && backwards && m_findCursor.paragraph < m_selectionStart.paragraph) + { + break; + } + + if (inSelection && m_findCursor.paragraph > m_selectionEnd.paragraph) + { + break; + } + } while (backwards ? (m_findCursor.paragraph >= 0) : (m_findCursor.paragraph < paragraphs())); + + Q_ASSERT(res != KFind::Match); + + // If there were no matches, and we were checking from the start of the text, + // then we do not want to prompt to search again, since we already know there + // is nothing. + + if (m_find->numMatches() == 0 && !fromCursor) + { + KMessageBox::sorry(this, + i18n("Search string '%1' was not found!").arg(KStringHandler::csqueeze(m_find->pattern()))); + // Reset the cursor in case more text is added between calls to findNext() + m_findCursor = m_selectionStart; + m_find->setData(text(m_selectionStart.paragraph) + .mid(m_selectionStart.paragraphIndex, + m_selectionEnd.paragraphIndex - m_selectionStart.paragraphIndex)); + return; + } + + if (m_find->shouldRestart(/* forceAsking */ true, /* showNumMatches */ false)) + { + if (inSelection) + { + if (m_selectionStart.paragraph == m_selectionEnd.paragraph) + { + m_findCursor.paragraph = m_selectionStart.paragraph; + m_findCursor.paragraphIndex = m_selectionStart.paragraphIndex; + auto selectionLength = m_selectionEnd.paragraphIndex - m_selectionStart.paragraphIndex; + auto data = text(m_findCursor.paragraph).mid(m_findCursor.paragraphIndex, selectionLength); + m_find->setData(data); + } + else if (backwards) + { + m_findCursor = m_selectionEnd; + m_find->setData(text(m_findCursor.paragraph).left(m_findCursor.paragraphIndex)); + } + else + { + m_findCursor.paragraph = m_selectionStart.paragraph; + m_findCursor.paragraphIndex = -1; + auto offset = (paragraphLength(m_findCursor.paragraph)) - m_selectionStart.paragraphIndex+1; + m_find->setData(text(m_findCursor.paragraph).right(offset), m_findCursor.paragraphIndex); + } + } + else + { + m_findCursor.paragraph = backwards ? (paragraphs() - 1) : 0; + m_findCursor.paragraphIndex = backwards ? (paragraphLength(m_findCursor.paragraph)) : 0; + m_find->setData(text(m_findCursor.paragraph), m_findCursor.paragraphIndex); + } + + m_find->resetCounts(); + findNext(); + } +} + +void KJotsEdit::findPrev() +{ + if (!m_find) + { + find(); + return; + } + + m_find->setOptions(m_find->options() ^ KFindDialog::FindBackwards); + findNext(); + + // Check as pressing 'stop' will delete m_find. + if (m_find) + { + m_find->setOptions(m_find->options() ^ KFindDialog::FindBackwards); + } +} + +void KJotsEdit::slotDoFind() +{ + // tqDebug("KJotsEdit::slotDoFind"); + + /* Performing a new search, ensure the previous search is invalidated. */ + + delete m_find; + m_find = nullptr; + + if (!m_findDialog) + { + // tqDebug("KJotsEdit::slotDoFind: find dialog not set up"); + return; + } + + if (m_findDialog->pattern().isEmpty()) + { + // tqDebug("KJotsEdit::slotDoFind: empty pattern."); + return; + } + + // tqDebug("findDialog->pattern = %s", m_findDialog->pattern().local8Bit().data()); + + m_find = new KFind(m_findDialog->pattern(), m_findDialog->options(), this); + + if (m_find->options() & KFindDialog::SelectedText) + { + const bool backwards = m_find->options() & KFindDialog::FindBackwards; + + getSelection(&m_selectionStart.paragraph, &m_selectionStart.paragraphIndex, &m_selectionEnd.paragraph, + &m_selectionEnd.paragraphIndex); + m_findCursor.paragraph = backwards ? m_selectionEnd.paragraph : m_selectionStart.paragraph; + m_findCursor.paragraphIndex = backwards ? m_selectionEnd.paragraphIndex : m_selectionStart.paragraphIndex; + } + else + { + setupCursor(&m_findCursor, m_find); + // Reset selection so slotFindHighlight works correctly. + m_selectionStart = {0, 0}; + m_selectionEnd = {0, 0}; + } + + connect(m_find, TQ_SIGNAL(highlight(const TQString&, int, int)), this, + TQ_SLOT(slotFindHighlight(const TQString&, int, int))); + connect(m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(findNext())); + + m_findDialog->close(); + m_find->closeFindNextDialog(); + + findNext(); +} + void KJotsEdit::setEntry (KJotsPage *entry) { //tell the old entry to take a hike @@ -144,6 +589,34 @@ void KJotsEdit::setEntry (KJotsPage *entry) } m_entry = entry; + + // Reset the find & replace dialog for the new entry. + delete m_find; + delete m_replace; + m_find = nullptr; + m_replace = nullptr; +} + +void KJotsEdit::setupCursor(KJotsEdit::CursorPosition* cursor, const KFind* find) +{ + if (!cursor) + { + tqWarning("WARNING: Attempting to setup a NULL cursor: %s (%d)", __FILE__, __LINE__); + return; + } + + cursor->paragraph = 0; + cursor->paragraphIndex = 0; + + if (find->options() & KFindDialog::FromCursor) + { + getCursorPosition(&cursor->paragraph, &cursor->paragraphIndex); + } + else if (find->options() & KFindDialog::FindBackwards) + { + cursor->paragraph = paragraphs(); + cursor->paragraphIndex = paragraphLength(cursor->paragraph); + } } #include "kjotsedit.moc" diff --git a/kjots/kjotsedit.h b/kjots/kjotsedit.h index a85d3d0..75012f8 100644 --- a/kjots/kjotsedit.h +++ b/kjots/kjotsedit.h @@ -23,13 +23,18 @@ #ifndef __KJOTSEDIT_H #define __KJOTSEDIT_H -#include <keditcl.h> +#include <ktextedit.h> + +class KFind; +class KFindDialog; +class KReplace; +class KReplaceDialog; class TDEPopupMenu; class KJotsPage; -class KJotsEdit : public KEdit +class KJotsEdit : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: KJotsEdit (TQWidget* parent=0, const char* name=0); @@ -41,14 +46,62 @@ class KJotsEdit : public KEdit signals: void findSuccessful(); + public slots: + // Create the initial KFindDialog. + void find(); + // Repeat the previous search. + // Creates KFindDialog if needed. + void findNext(); + // Repeat the previous search, but in the opposite direction. + // Creates KFindDialog if needed. + void findPrev(); + // Creates a KReplaceDialog + void replace(); + protected slots: - void openUrl(); + void openUrl(); + void slotFindHighlight(const TQString&, int, int); + void slotReplaceHighlight(const TQString&, int, int); + void slotDoFind(); + void slotDoReplace(); + void slotReplace(const TQString&, int, int, int); + void slotReplaceNext(); protected: virtual void mousePressEvent (TQMouseEvent *e); TDEPopupMenu *web_menu; KJotsPage *m_entry; //!< The entry we are editing. It needs to be kept informed. + + private: + + /* + * Keep track of the current cursor position for find/replace + * functionality, allowing us to increment easily. + */ + struct CursorPosition + { + // Current paragraph. + int paragraph; + // Index from start of current paragraph. + int paragraphIndex; + }; + + KFind *m_find; + KFindDialog *m_findDialog; + KReplace *m_replace; + KReplaceDialog *m_replaceDialog; + + // Maintaining two positions to allow replace while find still active. + CursorPosition m_findCursor{0, 0}; + CursorPosition m_replaceCursor{0, 0}; + + // Start and end position of selection, used to restart search with initial selection. + CursorPosition m_selectionStart{0, 0}; + CursorPosition m_selectionEnd{0, 0}; + + // Setup for m_findCursor/m_replaceCursor with m_find/m_replace + void setupCursor(CursorPosition*, const KFind*); }; #endif // __KJOTSEDIT_H diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index 03581cf..c947f94 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <tdeio/job.h> @@ -245,7 +245,7 @@ void KJotsBook::init() m_open = false; m_saveProgressDialog = 0; setExpandable(true); - setPixmap(0, kapp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small)); + setPixmap(0, tdeApp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small)); } /*! @@ -264,7 +264,7 @@ bool KJotsBook::isBookFile(const TQString& filename) { if ( folder.open(IO_ReadWrite) ) { - TQTextStream st(TQT_TQIODEVICE(&folder)); + TQTextStream st(&folder); st.setEncoding( KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale ); TQString buf = st.readLine().stripWhiteSpace(); @@ -306,7 +306,7 @@ bool KJotsBook::openBook(const TQString& filename) if ( file.exists() && file.open(IO_ReadWrite) ) //TODO: Implement read-only mode? { - TQTextStream st(TQT_TQIODEVICE(&file)); + TQTextStream st(&file); st.setEncoding( KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale ); TQString data = st.read(); @@ -388,7 +388,7 @@ bool KJotsBook::openBook(const TQString& filename) */ bool KJotsBook::loadOldBook(TQFile &file) { - TQTextStream st(TQT_TQIODEVICE(&file)); + TQTextStream st(&file); st.setEncoding( KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale ); TQString buf = st.readLine(); @@ -501,7 +501,7 @@ void KJotsBook::rename() { setSubject(name); - KJotsMain* m = dynamic_cast<KJotsMain*>(kapp->mainWidget()); + KJotsMain* m = dynamic_cast<KJotsMain*>(tdeApp->mainWidget()); if (m) m->updateCaption(); @@ -541,8 +541,8 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding) m_saveProgressDialog->showCancelButton(false); m_saveProgressDialog->setAutoClose(true); - connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); - connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *))); + connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQ_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); + connect(job, TQ_SIGNAL(result( TDEIO::Job *)), TQ_SLOT(slotSaveResult( TDEIO::Job *))); m_saveInProgress = true; } @@ -849,7 +849,7 @@ KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after) { m_isBook = false; m_paraPos = m_indexPos = 0; - setPixmap(0, kapp->iconLoader()->loadIcon(TQString("edit"), TDEIcon::Small)); + setPixmap(0, tdeApp->iconLoader()->loadIcon(TQString("edit"), TDEIcon::Small)); } KJotsPage::~KJotsPage() @@ -882,10 +882,10 @@ void KJotsPage::initNewPage(void) TQString KJotsPage::body() { //if we're being edited we want the current text, not whatever we saved before. - if ( m_editor && m_editor->edited() ) + if (m_editor && m_editor->isModified()) { m_text = m_editor->text(); - m_editor->setEdited(false); + m_editor->setModified(false); setDirty(true); } @@ -913,7 +913,7 @@ void KJotsPage::rename() { setSubject(name); - KJotsMain* m = dynamic_cast<KJotsMain*>(kapp->mainWidget()); + KJotsMain* m = dynamic_cast<KJotsMain*>(tdeApp->mainWidget()); if (m) m->updateCaption(); @@ -939,8 +939,8 @@ void KJotsPage::saveToFile(KURL url, bool plainText, const TQString& encoding) return; } - connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); - connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *))); + connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQ_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); + connect(job, TQ_SIGNAL(result( TDEIO::Job *)), TQ_SLOT(slotSaveResult( TDEIO::Job *))); m_saveInProgress = true; } @@ -1079,7 +1079,7 @@ void KJotsPage::setEditor( KJotsEdit *editor ) { m_editor->getCursorPosition(&m_paraPos, &m_indexPos); - if ( m_editor->edited() ) + if (m_editor->isModified()) { m_text = m_editor->text(); setDirty(true); @@ -1091,7 +1091,7 @@ void KJotsPage::setEditor( KJotsEdit *editor ) //and in with the new if ( m_editor ) { - m_editor->setEdited(false); + m_editor->setModified(false); m_editor->setCursorPosition(m_paraPos, m_indexPos); } @@ -1105,7 +1105,7 @@ void KJotsPage::setEditor( KJotsEdit *editor ) */ bool KJotsPage::isDirty() { - if ( m_editor && m_editor->edited() ) + if (m_editor && m_editor->isModified()) { setDirty(true); } diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h index 45c165d..1f1adc5 100644 --- a/kjots/kjotsentry.h +++ b/kjots/kjotsentry.h @@ -48,7 +48,7 @@ namespace TDEIO class KJotsEntryBase : public TQObject, public TDEListViewItem { - Q_OBJECT + TQ_OBJECT public: KJotsEntryBase(TDEListView*, TQListViewItem*); @@ -98,7 +98,7 @@ class KJotsEntryBase : public TQObject, public TDEListViewItem class KJotsBook : public KJotsEntryBase { - Q_OBJECT + TQ_OBJECT public: KJotsBook(TDEListView*, TQListViewItem* after = 0); @@ -142,7 +142,7 @@ class KJotsBook : public KJotsEntryBase // class KJotsPage : public KJotsEntryBase { - Q_OBJECT + TQ_OBJECT public: KJotsPage(KJotsBook* parent, TQListViewItem* after = 0); diff --git a/kjots/main.cpp b/kjots/main.cpp index 48c55fa..343675a 100644 --- a/kjots/main.cpp +++ b/kjots/main.cpp @@ -24,7 +24,7 @@ #endif #include <stdlib.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <tdeaboutdata.h> @@ -48,15 +48,15 @@ int main( int argc, char **argv ) aboutData.addAuthor("Stanislav Kljuhhin", 0, "crz@starman.ee"); aboutData.addAuthor("Christoph Neerfeld", I18N_NOOP("Original author"), "chris@kde.org"); TDECmdLineArgs::init(argc, argv, &aboutData); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) { fprintf(stderr, "kjots is already running!\n"); exit(0); } - KUniqueApplication a; + TDEUniqueApplication a; // backwards compatibility code to convert "old" user font settings // to the new config settings diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index 8bce86b..4191937 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -36,8 +36,8 @@ #include <kicondialog.h> #include <tdeapplication.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> // other TQt headers: #include <tqlayout.h> @@ -86,27 +86,27 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableStandby ); TQToolTip::add( enableStandby, i18n( "If checked this box enables transitions to the 'standby' state - a temporary powered down state" ) ); enableStandby->setEnabled(can_enable); - connect( enableStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableSuspend = new TQCheckBox( i18n("Enable &suspend"), this ); top_layout->addWidget( enableSuspend ); TQToolTip::add( enableSuspend, i18n( "If checked this box enables transitions to the 'suspend' state - a semi-powered down state, sometimes called 'suspend-to-ram'" ) ); enableSuspend->setEnabled(can_enable); - connect( enableSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); TQHBoxLayout *ll = new TQHBoxLayout(); enableHibernate = new TQCheckBox( i18n("Enable &hibernate"), this ); ll->addWidget( enableHibernate ); TQToolTip::add( enableHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state - a powered down state, sometimes called 'suspend-to-disk'" ) ); enableHibernate->setEnabled(can_enable); - connect( enableHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (laptop_portable::has_software_suspend()) { ll->addStretch(1); enableSoftwareSuspendHibernate = new TQCheckBox( i18n("Use software suspend for hibernate"), this ); ll->addWidget( enableSoftwareSuspendHibernate ); TQToolTip::add( enableSoftwareSuspendHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state - a powered down state, sometimes called 'suspend-to-disk' - the kernel 'Software Suspend' mechanism will be used instead of using ACPI directly" ) ); enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2)); - connect( enableSoftwareSuspendHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); } else { enableSoftwareSuspendHibernate = 0; } @@ -118,13 +118,13 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( enablePerformance ); TQToolTip::add( enablePerformance, i18n( "If checked this box enables access to ACPI performance profiles - usually OK in 2.4 and later" ) ); enablePerformance->setEnabled(can_enable); - connect( enablePerformance, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enablePerformance, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableThrottle = new TQCheckBox( i18n("Enable &CPU throttling"), this ); top_layout->addWidget( enableThrottle ); TQToolTip::add( enableThrottle, i18n( "If checked this box enables access to ACPI throttle speed changes - usually OK in 2.4 and later" ) ); enableThrottle->setEnabled(can_enable); - connect( enableThrottle, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableThrottle, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); tmp_label = new TQLabel(i18n("If the above boxes are disabled then there is no 'helper' " "application set up to help change ACPI states, there are two " @@ -136,7 +136,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); ll = new TQHBoxLayout(); TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the ACPI helper application" ) ); ll->addStretch(2); ll->addWidget(setupButton); diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h index 68adb46..0fa3c9c 100644 --- a/klaptopdaemon/acpi.h +++ b/klaptopdaemon/acpi.h @@ -39,7 +39,7 @@ class TQPushButton; class AcpiConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: AcpiConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index e2940d2..60159de 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -37,8 +37,8 @@ #include <kicondialog.h> #include <tdeapplication.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> // other TQt headers: #include <tqlayout.h> @@ -84,13 +84,13 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableStandby ); TQToolTip::add( enableStandby, i18n( "If checked this box enables transitions to the 'standby' state - a temporary powered down state" ) ); enableStandby->setEnabled(can_enable); - connect( enableStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableSuspend = new TQCheckBox( i18n("Enable &suspend"), this ); top_layout->addWidget( enableSuspend ); TQToolTip::add( enableSuspend, i18n( "If checked this box enables transitions to the 'suspend' state - a semi-powered down state, sometimes called 'suspend-to-ram'" ) ); enableSuspend->setEnabled(can_enable); - connect( enableSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); apm_name = "/usr/bin/apm"; if (::access(apm_name, F_OK) != 0 && ::access("/usr/sbin/apm", F_OK) == 0) apm_name = "/usr/sbin/apm"; @@ -105,7 +105,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); TQHBoxLayout *ll = new TQHBoxLayout(top_layout); TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the APM helper application" ) ); ll->addStretch(2); ll->addWidget(setupButton); @@ -120,7 +120,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableSoftwareSuspendHibernate ); TQToolTip::add( enableSoftwareSuspendHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state using the 'Software Suspend' mechanism" ) ); enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2)); - connect( enableSoftwareSuspendHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); tmp_label = new TQLabel( i18n("If the above box is disabled then you need to be logged in " "as root or need a helper application to invoke the Software " "Suspend utility - TDE provides a utility to do this, if you " @@ -130,7 +130,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); ll = new TQHBoxLayout(this); TQPushButton *setupSSButton = new TQPushButton(i18n("Setup SS Helper Application"), this); - connect( setupSSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper2()) ); + connect( setupSSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper2()) ); TQToolTip::add( setupSSButton, i18n( "This button can be used to enable the Software Suspend helper application" ) ); ll->addStretch(2); ll->addWidget(setupSSButton); diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h index 74510ee..829f4e5 100644 --- a/klaptopdaemon/apm.h +++ b/klaptopdaemon/apm.h @@ -39,7 +39,7 @@ class TQPushButton; class ApmConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: ApmConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index 9bf6be9..dcd03da 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -72,23 +72,23 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) runMonitor = new TQCheckBox( i18n("&Show battery monitor"), this ); top_layout->addWidget( runMonitor ); TQToolTip::add( runMonitor, i18n( "This box enables the battery state icon in the panel" ) ); - connect( runMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); - connect( runMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(runMonitorChanged()) ); + connect( runMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); + connect( runMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(runMonitorChanged()) ); // show also the battery level percentage showLevel = new TQCheckBox( i18n("Show battery level percentage"), this ); top_layout->addWidget( showLevel ); TQToolTip::add( showLevel, i18n( "This box enables a text message near the battery state icon containing battery level percentage" ) ); - connect( showLevel, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( showLevel, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); notifyMe = new TQCheckBox( i18n("&Notify me whenever my battery becomes fully charged"), this ); top_layout->addWidget( notifyMe ); TQToolTip::add( notifyMe, i18n( "This box enables a dialog box that pops up when your battery becomes fully charged" ) ); - connect( notifyMe, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( notifyMe, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); blankSaver = new TQCheckBox( i18n("&Use a blank screen saver when running on battery"), this ); top_layout->addWidget( blankSaver ); - connect( blankSaver, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( blankSaver, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (!apm) { top_layout->addWidget( laptop_portable::no_power_management_explanation(this) ); @@ -105,8 +105,8 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) TQToolTip::add( editPoll, i18n( "Choose how responsive the laptop software will be when it checks the battery status" ) ); editPoll->setSuffix( i18n("keep short, unit in spinbox", "sec") ); poll_label->setBuddy( editPoll ); - connect( editPoll, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(configChanged()) ); + connect( editPoll, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(configChanged()) ); TQWidget* spacer = new TQWidget( hb ); hb->setStretchFactor( spacer, 1 ); @@ -128,9 +128,9 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) buttonNoBattery->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); buttonNoCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); buttonCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); - connect(buttonNoBattery, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged())); - connect(buttonNoCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged())); - connect(buttonCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(configChanged())); + connect(buttonNoBattery, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(iconChanged())); + connect(buttonNoCharge, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(iconChanged())); + connect(buttonCharge, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(configChanged())); int num_batteries; @@ -178,7 +178,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) top_layout->addStretch(1); startMonitor = new TQPushButton( i18n("&Start Battery Monitor"), this); - connect(startMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartMonitor())); + connect(startMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartMonitor())); top_layout->addWidget( startMonitor, 0, TQt::AlignRight ); load(); diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h index b93be4b..84f8d10 100644 --- a/klaptopdaemon/battery.h +++ b/klaptopdaemon/battery.h @@ -44,7 +44,7 @@ class TQLabel; class BatteryConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: BatteryConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index eed4b8d..cc27f5f 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -152,10 +152,10 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQWidget *wp = new TQWidget(lidBox); TQHBoxLayout *xl = new TQHBoxLayout( wp); xl->addWidget(new TQLabel("-", wp)); - lidValBrightness = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + lidValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); lidValBrightness->setEnabled(0); TQToolTip::add( lidValBrightness, i18n( "How bright the back panel will be set to" ) ); - connect (lidValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (lidValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -170,7 +170,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( lidValPerformance, i18n( "The performance profile to switch to" ) ); lidValPerformance->insertStringList(performance_list); lidValPerformance->setEnabled(0); - connect (lidValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (lidValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValPerformance); xl->addStretch(1); } @@ -184,13 +184,13 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( lidValThrottle, i18n( "How much to throttle back the CPU" ) ); lidValThrottle->insertStringList(throttle_list); lidValThrottle->setEnabled(0); - connect (lidValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (lidValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValThrottle); xl->addStretch(1); } - connect(lidBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); + connect(lidBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged())); } if (laptop_portable::has_button(laptop_portable::PowerButton)) { @@ -228,10 +228,10 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQWidget *wp = new TQWidget(powerBox); TQHBoxLayout *xl = new TQHBoxLayout( wp); xl->addWidget(new TQLabel("-", wp)); - powerValBrightness = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + powerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( powerValBrightness, i18n( "How bright the back panel will be set to" ) ); powerValBrightness->setEnabled(0); - connect (powerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (powerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -246,7 +246,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValPerformance, i18n( "The performance profile to switch to" ) ); powerValPerformance->insertStringList(performance_list); powerValPerformance->setEnabled(0); - connect (powerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (powerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValPerformance); xl->addStretch(1); } @@ -260,11 +260,11 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValThrottle, i18n( "How much to throttle back the CPU" ) ); powerValThrottle->insertStringList(throttle_list); powerValThrottle->setEnabled(0); - connect (powerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (powerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValThrottle); xl->addStretch(1); } - connect(powerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); + connect(powerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged())); } hlay->addStretch(1); diff --git a/klaptopdaemon/buttons.h b/klaptopdaemon/buttons.h index d66d20e..96ca27b 100644 --- a/klaptopdaemon/buttons.h +++ b/klaptopdaemon/buttons.h @@ -39,7 +39,7 @@ class KComboBox; class ButtonsConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: ButtonsConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/daemon_state.h b/klaptopdaemon/daemon_state.h index 0764e08..2ec5548 100644 --- a/klaptopdaemon/daemon_state.h +++ b/klaptopdaemon/daemon_state.h @@ -31,7 +31,7 @@ #include <tqimage.h> #include <tdelibs_export.h> -class KDE_EXPORT daemon_state +class TDE_EXPORT daemon_state { public: daemon_state(); diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 87c4f45..3420713 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -36,8 +36,8 @@ #include "portable.h" #include <kiconloader.h> #include <tdeapplication.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeglobalsettings.h> #include <tdemessagebox.h> @@ -80,16 +80,16 @@ laptop_dock::SetupPopup() TQStringList throttle_list; int current_throttle; bool has_throttle = laptop_portable::get_system_throttling(0, current_throttle, throttle_list, active_list); - rightPopup->insertItem(SmallIcon("configure"), i18n("&Configure KLaptop..."), this, TQT_SLOT(invokeSetup())); + rightPopup->insertItem(SmallIcon("configure"), i18n("&Configure KLaptop..."), this, TQ_SLOT(invokeSetup())); if (has_brightness) - rightPopup->insertItem(i18n("Screen Brightness..."), this, TQT_SLOT(invokeBrightness())); + rightPopup->insertItem(i18n("Screen Brightness..."), this, TQ_SLOT(invokeBrightness())); if (has_performance) { performance_popup = new TQPopupMenu(0, "performance"); performance_popup->setCheckable(1); rightPopup->insertItem(i18n("Performance Profile..."), performance_popup); - connect( performance_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( activate_performance( int ) ) ); - connect( performance_popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fill_performance() ) ); + connect( performance_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_performance( int ) ) ); + connect( performance_popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fill_performance() ) ); } else { performance_popup = 0; } @@ -97,24 +97,24 @@ laptop_dock::SetupPopup() throttle_popup = new TQPopupMenu(0, "throttle"); throttle_popup->setCheckable(1); rightPopup->insertItem(i18n("CPU Throttling..."), throttle_popup); - connect( throttle_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( activate_throttle( int ) ) ); - connect( throttle_popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fill_throttle() ) ); + connect( throttle_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_throttle( int ) ) ); + connect( throttle_popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fill_throttle() ) ); } else { throttle_popup = 0; } if (can_standby || can_suspend || can_hibernate) { rightPopup->insertSeparator(); - if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, TQT_SLOT(invokeStandby())); - // if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, TQT_SLOT(invokeLockSuspend())); - if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, TQT_SLOT(invokeLockSuspend())); - // if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, TQT_SLOT(invokeLockHibernation())); - if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, TQT_SLOT(invokeLockHibernation())); + if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, TQ_SLOT(invokeStandby())); + // if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, TQ_SLOT(invokeLockSuspend())); + if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, TQ_SLOT(invokeLockSuspend())); + // if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, TQ_SLOT(invokeLockHibernation())); + if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, TQ_SLOT(invokeLockHibernation())); } rightPopup->insertSeparator(); - rightPopup->insertItem(i18n("&Hide Monitor"), this, TQT_SLOT(slotHide())); - rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQT_SLOT(slotQuit())); + rightPopup->insertItem(i18n("&Hide Monitor"), this, TQ_SLOT(slotHide())); + rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQ_SLOT(slotQuit())); } laptop_dock::~laptop_dock() @@ -198,10 +198,10 @@ laptop_dock::invokeBrightness() brightness_widget = new TQVBox(0L, "Brightness", WStyle_Customize | WType_Popup); brightness_widget->setFrameStyle(TQFrame::PopupPanel); brightness_widget->setMargin(KDialog::marginHint()); - brightness_slider = new TQSlider(0, 255, 16, 255-brightness, Qt::Vertical, brightness_widget, 0); + brightness_slider = new TQSlider(0, 255, 16, 255-brightness, TQt::Vertical, brightness_widget, 0); brightness_slider->setMinimumHeight(40); brightness_slider->setMinimumWidth(15); - connect(brightness_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(invokeBrightnessSlider(int))); + connect(brightness_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(invokeBrightnessSlider(int))); brightness_widget->resize(brightness_widget->sizeHint()); } else { brightness_slider->setValue(255-brightness); @@ -251,8 +251,8 @@ void laptop_dock::slotGoRoot(int /*id*/) { *_rootProcess << "root"; //*_rootProcess << "--nonewdcop"; *_rootProcess << TDEStandardDirs::findExe("klaptopdaemon"); - connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(rootExited(TDEProcess*))); + connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(rootExited(TDEProcess*))); _rootProcess->start(TDEProcess::NotifyOnExit); // We should disable this menu item here now. } @@ -362,7 +362,7 @@ KPCMCIAInfo *f = new KPCMCIAInfo(_pcmcia); void laptop_dock::mousePressEvent( TQMouseEvent *event ) { - if(event->button() == Qt::LeftButton) { + if(event->button() == TQt::LeftButton) { TQPopupMenu *popup = new TQPopupMenu(0, "popup"); if (!pdaemon->exists()) { @@ -419,30 +419,30 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event ) _suspendActions.clear(); _resumeActions.clear(); _displayActions.clear(); - id = popup->insertItem(i18n("Card Slots..."), this, TQT_SLOT(slotDisplayAction(int))); + id = popup->insertItem(i18n("Card Slots..."), this, TQ_SLOT(slotDisplayAction(int))); _displayActions.insert(id, _pcmcia->getCard(0)); for (int i = 0; i < _pcmcia->getCardCount(); i++) { KPCMCIACard *thiscard; thiscard = _pcmcia->getCard(i); if (thiscard && (thiscard->present())) { TQPopupMenu *thisSub = new TQPopupMenu(popup, thiscard->name().latin1()); - id = thisSub->insertItem(i18n("Details..."), this, TQT_SLOT(slotDisplayAction(int))); + id = thisSub->insertItem(i18n("Details..."), this, TQ_SLOT(slotDisplayAction(int))); _displayActions.insert(id, thiscard); // add the actions TQPopupMenu *actionsSub = new TQPopupMenu(thisSub, "actions"); - id = actionsSub->insertItem(i18n("Eject"), this, TQT_SLOT(slotEjectAction(int))); + id = actionsSub->insertItem(i18n("Eject"), this, TQ_SLOT(slotEjectAction(int))); actionsSub->setItemEnabled(id, !(thiscard->status() & CARD_STATUS_BUSY)); _ejectActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Suspend"), this, TQT_SLOT(slotSuspendAction(int))); + id = actionsSub->insertItem(i18n("Suspend"), this, TQ_SLOT(slotSuspendAction(int))); actionsSub->setItemEnabled(id, !(thiscard->status() & (CARD_STATUS_SUSPEND|CARD_STATUS_BUSY))); _suspendActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Resume"), this, TQT_SLOT(slotResumeAction(int))); + id = actionsSub->insertItem(i18n("Resume"), this, TQ_SLOT(slotResumeAction(int))); actionsSub->setItemEnabled(id, (thiscard->status() & CARD_STATUS_SUSPEND)); _resumeActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Reset"), this, TQT_SLOT(slotResetAction(int))); + id = actionsSub->insertItem(i18n("Reset"), this, TQ_SLOT(slotResetAction(int))); _resetActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Insert"), this, TQT_SLOT(slotInsertAction(int))); + id = actionsSub->insertItem(i18n("Insert"), this, TQ_SLOT(slotInsertAction(int))); _insertActions.insert(id, thiscard); actionsSub->setItemEnabled(id, !(thiscard->status() & (CARD_STATUS_READY|CARD_STATUS_SUSPEND))); thisSub->insertItem(i18n("Actions"), actionsSub); @@ -469,15 +469,15 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event ) } void laptop_dock::mouseReleaseEvent( TQMouseEvent *e ) { - if ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) ) + if ( !rect().contains( e->pos() ) ) return; switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: break; - case Qt::MidButton: + case TQt::MidButton: // fall through - case Qt::RightButton: + case TQt::RightButton: { TDEPopupMenu *menu = contextMenu(); contextMenuAboutToShow( menu ); @@ -517,7 +517,7 @@ void laptop_dock::invokeSuspend() void laptop_dock::invokeLockSuspend() { - DCOPClient* client = kapp->dcopClient(); + DCOPClient* client = tdeApp->dcopClient(); if (client) client->send("kdesktop", "KScreensaverIface", "lock()", TQString("")); laptop_portable::invoke_suspend(); diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h index 920ae26..821714c 100644 --- a/klaptopdaemon/daemondock.h +++ b/klaptopdaemon/daemondock.h @@ -40,7 +40,7 @@ class TDEPopupMenu; class laptop_dock : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp index 941f739..fc315ab 100644 --- a/klaptopdaemon/kpcmcia.cpp +++ b/klaptopdaemon/kpcmcia.cpp @@ -28,8 +28,8 @@ #include <tqregexp.h> #include <tdelocale.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include "kpcmcia.h" @@ -367,7 +367,7 @@ _refreshSpeed = 750; _haveCardServices = false; _timer = new TQTimer(this); -connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCardInfo())); +connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCardInfo())); _cards = new TQMemArray<KPCMCIACard *>(_maxSlots+1); _cardCnt = 0; diff --git a/klaptopdaemon/kpcmcia.h b/klaptopdaemon/kpcmcia.h index 1040268..baca74c 100644 --- a/klaptopdaemon/kpcmcia.h +++ b/klaptopdaemon/kpcmcia.h @@ -177,7 +177,7 @@ private: class KPCMCIA : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp index e2e70d5..738b1e3 100644 --- a/klaptopdaemon/kpcmciainfo.cpp +++ b/klaptopdaemon/kpcmciainfo.cpp @@ -60,7 +60,7 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name) _mainTab->resize(KDialog::sizeHint()); resize(KDialog::sizeHint()); - connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updateCard(int))); + connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updateCard(int))); _sb = new KStatusBar(this); _sb->insertItem(i18n("Ready."), 0, 1, true); @@ -70,10 +70,10 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name) _updateButton = new TQPushButton(i18n("&Update"), this); _mainGrid->addWidget(_updateButton, 7, 3); - connect(_updateButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(update())); + connect(_updateButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(update())); _closeButton = new KPushButton(KStdGuiItem::close(), this); _mainGrid->addWidget(_closeButton, 7, 4); - connect(_closeButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClose())); + connect(_closeButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClose())); _mainGrid->setRowStretch(7, 0); show(); @@ -99,7 +99,7 @@ void KPCMCIAInfo::slotResetStatus() { void KPCMCIAInfo::statusNotice(const TQString& text, int life) { _sb->changeItem(text, 0); if (life > 0) - TQTimer::singleShot(life, this, TQT_SLOT(slotResetStatus())); + TQTimer::singleShot(life, this, TQ_SLOT(slotResetStatus())); } @@ -133,8 +133,8 @@ void KPCMCIAInfo::prepareCards() { for (int i = 0; i < _pcmcia->getCardCount(); i++) { TQString tabname = i18n("Card Slot %1"); KPCMCIAInfoPage *tp = new KPCMCIAInfoPage(_pcmcia->getCard(i), _mainTab); - connect(this, TQT_SIGNAL(updateNow()), tp, TQT_SLOT(update())); - connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSetStatus(const TQString&))); + connect(this, TQ_SIGNAL(updateNow()), tp, TQ_SLOT(update())); + connect(tp, TQ_SIGNAL(setStatusBar(const TQString&)), this, TQ_SLOT(slotTabSetStatus(const TQString&))); tp->resize(_mainTab->sizeHint()); _mainTab->addTab(tp, tabname.arg(i+1)); _pages.insert(i, tp); @@ -182,9 +182,9 @@ KPCMCIAInfoPage::KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent, const char _mainGrid->addWidget(_card_ej_ins, 9, 5); _mainGrid->addWidget(_card_sus_res, 9, 6); _mainGrid->addWidget(_card_reset, 9, 7); - connect(_card_reset, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotResetCard())); - connect(_card_sus_res, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSuspendResume())); - connect(_card_ej_ins, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotInsertEject())); + connect(_card_reset, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotResetCard())); + connect(_card_sus_res, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSuspendResume())); + connect(_card_ej_ins, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotInsertEject())); update(); } diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h index f6c1a67..43cefd4 100644 --- a/klaptopdaemon/kpcmciainfo.h +++ b/klaptopdaemon/kpcmciainfo.h @@ -38,7 +38,7 @@ class KPushButton; #include <tqmap.h> class KPCMCIAInfo : public KDialog { -Q_OBJECT +TQ_OBJECT public: @@ -77,7 +77,7 @@ class TQLabel; class KPCMCIAInfoPage : public TQFrame { -Q_OBJECT +TQ_OBJECT public: KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = NULL, const char *name = 0); diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h index abd83c8..a01e609 100644 --- a/klaptopdaemon/krichtextlabel.h +++ b/klaptopdaemon/krichtextlabel.h @@ -33,7 +33,7 @@ * TQLabel */ class TDEUI_EXPORT KRichTextLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 97e70ba..c585868 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -51,7 +51,7 @@ extern "C" { - KDE_EXPORT KDEDModule *create_klaptopdaemon(const TQCString& name) { + TDE_EXPORT KDEDModule *create_klaptopdaemon(const TQCString& name) { return new laptop_daemon(name); } } @@ -70,7 +70,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) { xwidget = new XWidget(this); xwidget->hide(); - kapp->installX11EventFilter(xwidget); + tdeApp->installX11EventFilter(xwidget); mLavEnabled = false; backoffTimer = 0; @@ -100,7 +100,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) sony_notifier = 0; knownFullyCharged = 0; sony_disp = 0; - connect(this, TQT_SIGNAL(signal_checkBattery()), TQT_SLOT(checkBatteryNow())); + connect(this, TQ_SIGNAL(signal_checkBattery()), TQ_SLOT(checkBatteryNow())); //hasAudio = (audioServer.serverStatus() == 0) ? true : false; @@ -113,8 +113,8 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) else _pcmcia = NULL; if (_pcmcia) - connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updatePCMCIA(int))); - connect( &autoLock, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updatePCMCIA(int))); + connect( &autoLock, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); } @@ -297,8 +297,8 @@ void laptop_daemon::restart() if (sony_notifier == 0) { sony_notifier = new TQSocketNotifier( sony_fd, TQSocketNotifier::Read, this ); if (sony_notifier) - TQObject::connect( sony_notifier, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(sonyDataReceived()) ); + TQObject::connect( sony_notifier, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(sonyDataReceived()) ); } } else { if (sony_notifier) { @@ -314,7 +314,7 @@ void laptop_daemon::setBlankSaver(bool blanked) TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); ds << bool(blanked); - // can't use kapp->dcopClient() because it breaks KUniqueApplication + // can't use tdeApp->dcopClient() because it breaks TDEUniqueApplication DCOPClient c; c.attach(); c.send("kdesktop", "KScreensaverIface", "setBlankOnly(bool)", ba); @@ -388,13 +388,13 @@ void laptop_daemon::timerDone() wakepos.setY(TQCursor::pos().y()); if (!wake_timer) { wake_timer = new TQTimer(this); - connect(wake_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(WakeCheck())); + connect(wake_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(WakeCheck())); wake_timer->start(1*1000, 1); } } else { if (!backoffTimer) { backoffTimer = new TQTimer(this); - connect(backoffTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(BackoffRestart())); + connect(backoffTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(BackoffRestart())); backoffTimer->start(60*1000, 1); } } @@ -496,7 +496,7 @@ void laptop_daemon::haveBatteryLow(int t, const int num, const int type) // beep if we are allowed to if (s.systemBeep[t]) { //KNotifyClient::beep(); - (void)kapp->beep(); + (void)tdeApp->beep(); } // run a command if we have to @@ -820,14 +820,14 @@ void laptop_daemon::invokeHibernate() void laptop_daemon::invokeLogout() { - bool rc = kapp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeNone, TDEApplication::ShutdownModeForceNow); + bool rc = tdeApp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeNone, TDEApplication::ShutdownModeForceNow); if (!rc) KMessageBox::sorry(0, i18n("Logout failed.")); } void laptop_daemon::invokeShutdown() { - bool rc = kapp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeHalt, TDEApplication::ShutdownModeForceNow); + bool rc = tdeApp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeHalt, TDEApplication::ShutdownModeForceNow); if (!rc) KMessageBox::sorry(0, i18n("Shutdown failed.")); } diff --git a/klaptopdaemon/laptop_daemon.h b/klaptopdaemon/laptop_daemon.h index 19fb45e..9cb5d1e 100644 --- a/klaptopdaemon/laptop_daemon.h +++ b/klaptopdaemon/laptop_daemon.h @@ -34,7 +34,7 @@ #include <tqimage.h> #include <kiconloader.h> -#include <kprocess.h> +#include <tdeprocess.h> //#include <kaudio.h> #include <tqtooltip.h> @@ -73,7 +73,7 @@ private: class laptop_dock; class laptop_daemon: public KDEDModule { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 5068a4e..323ab46 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <tdeglobal.h> #include <tqlayout.h> @@ -48,49 +48,49 @@ extern void wake_laptop_daemon(); extern "C" { - KDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *) { return new PcmciaConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *) { return new WarningConfig(0, parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *) { return new WarningConfig(1, parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *) { return new BatteryConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *) { return new PowerConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *) { return new AcpiConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *) { return new ApmConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *) { return new ProfileConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *) { return new SonyConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *) { return new ButtonsConfig(parent, "kcmlaptop"); } - KDE_EXPORT void init_battery() + TDE_EXPORT void init_battery() { TDEConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); config.setGroup("BatteryDefault"); @@ -111,12 +111,12 @@ extern "C" wake_laptop_daemon(); } - KDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *) { return new LaptopModule(parent, "kcmlaptop"); } - KDE_EXPORT void init_laptop() + TDE_EXPORT void init_laptop() { init_battery(); } @@ -153,19 +153,19 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) battery = new BatteryConfig(parent, "kcmlaptop"); tab->addTab(battery, i18n("&Battery")); - connect(battery, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(battery, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); power = new PowerConfig(parent, "kcmlaptop"); tab->addTab(power, i18n("&Power Control")); - connect(power, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(power, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); warning = new WarningConfig(0, parent, "kcmlaptop"); tab->addTab(warning, i18n("Low Battery &Warning")); - connect(warning, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(warning, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); critical = new WarningConfig(1, parent, "kcmlaptop"); tab->addTab(critical, i18n("Low Battery &Critical")); - connect(critical, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(critical, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); TQStringList profile_list; int current_profile; @@ -177,28 +177,28 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) if (laptop_portable::has_brightness() || has_profile || has_throttling) { profile = new ProfileConfig(parent, "kcmlaptop"); tab->addTab(profile, i18n("Default Power Profiles")); - connect(profile, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(profile, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { profile = 0; } if (laptop_portable::has_button(laptop_portable::LidButton) || laptop_portable::has_button(laptop_portable::PowerButton)) { buttons = new ButtonsConfig(parent, "kcmlaptop"); tab->addTab(buttons, i18n("Button Actions")); - connect(buttons, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(buttons, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { buttons = 0; } if (laptop_portable::has_acpi()) { acpi = new AcpiConfig(parent, "kcmlaptop"); tab->addTab(acpi, i18n("&ACPI Config")); - connect(acpi, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(acpi, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { acpi = 0; } if (laptop_portable::has_apm()) { apm = new ApmConfig(parent, "kcmlaptop"); tab->addTab(apm, i18n("&APM Config")); - connect(apm, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(apm, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { apm = 0; } @@ -215,7 +215,7 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) if (do_sony) { sony = new SonyConfig(parent, "kcmlaptop"); tab->addTab(sony, i18n("&Sony Laptop Config")); - connect(sony, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(sony, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { sony = 0; } diff --git a/klaptopdaemon/main.h b/klaptopdaemon/main.h index 8e3f660..1e8ef96 100644 --- a/klaptopdaemon/main.h +++ b/klaptopdaemon/main.h @@ -43,7 +43,7 @@ class ButtonsConfig; class LaptopModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h index ea915d6..5a081cf 100644 --- a/klaptopdaemon/pcmcia.h +++ b/klaptopdaemon/pcmcia.h @@ -40,7 +40,7 @@ class PcmciaConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: PcmciaConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index 1be8706..58aec12 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -93,8 +93,8 @@ #include <kactivelabel.h> #include <tdeconfig.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <krichtextlabel.h> // ibm specific stuff @@ -2018,7 +2018,7 @@ laptop_portable::get_button(LaptopButton l) // true if a button is pressed #include <tqpushbutton.h> #include <tqobject.h> #include <kactivelabel.h> -#include <kprocess.h> +#include <tdeprocess.h> #define APMDEV "/dev/apm" @@ -2443,7 +2443,7 @@ laptop_portable::software_suspend_set_mask(bool /*hibernate*/) #include <tqpushbutton.h> #include <tqobject.h> #include <kactivelabel.h> -#include <kprocess.h> +#include <tdeprocess.h> // // Klaptopdeamon interface to NetBSD 1.5 apm. diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h index 42d8c16..c7ca415 100644 --- a/klaptopdaemon/portable.h +++ b/klaptopdaemon/portable.h @@ -34,7 +34,7 @@ struct power_result { // ATTENTION: if you change something in here, please update ALL of the // ported sections in the implementation file! -class KDE_EXPORT laptop_portable { +class TDE_EXPORT laptop_portable { public: static void power_management_restart(); // reset internal state static int has_power_management(); // returns 1 if this computer has power management diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index c29c425..cf132c9 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -145,11 +145,11 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQWidget *wp = new TQWidget(nopowerBox); TQHBoxLayout *xl = new TQHBoxLayout( wp); xl->addWidget(new TQLabel("-", wp)); - nopowerValBrightness = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + nopowerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( nopowerValBrightness, i18n( "How bright to change the back panel" ) ); nopowerValBrightness->setEnabled(0); - connect(nopowerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(nopowerBrightness, TQT_SIGNAL(toggled(bool)), nopowerValBrightness, TQT_SLOT(setEnabled(bool))); + connect(nopowerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(nopowerBrightness, TQ_SIGNAL(toggled(bool)), nopowerValBrightness, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -164,8 +164,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( nopowerValPerformance, i18n( "Which profile to change it to" ) ); nopowerValPerformance->insertStringList(performance_list); nopowerValPerformance->setEnabled(0); - connect(nopowerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(nopowerPerformance, TQT_SIGNAL(toggled(bool)), nopowerValPerformance, TQT_SLOT(setEnabled(bool))); + connect(nopowerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(nopowerPerformance, TQ_SIGNAL(toggled(bool)), nopowerValPerformance, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValPerformance); xl->addStretch(1); } @@ -179,25 +179,25 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( nopowerValThrottle, i18n( "How much to throttle the laptop's CPU" ) ); nopowerValThrottle->insertStringList(throttle_list); nopowerValThrottle->setEnabled(0); - connect(nopowerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(nopowerThrottle, TQT_SIGNAL(toggled(bool)), nopowerValThrottle, TQT_SLOT(setEnabled(bool))); + connect(nopowerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(nopowerThrottle, TQ_SIGNAL(toggled(bool)), nopowerValThrottle, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValThrottle); xl->addStretch(1); } - connect(nopowerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); + connect(nopowerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); bool can_lav = laptop_portable::has_lav(); TQHBox *hbox; if (can_lav) { hbox = new TQHBox( nopowerBox ); noenablelav = new TQCheckBox(i18n("Don't act if LAV is >"), hbox); - connect(noenablelav, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(noenablelav, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); noeditlav = new KDoubleSpinBox(0.0, 10.0, 0.0, 0.1, 1, hbox); TQToolTip::add( noeditlav, i18n( "If enabled and the system load average is greater than this value none of the above options will be applied" ) ); - connect(noeditlav, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); - connect(noenablelav, TQT_SIGNAL(toggled(bool)), noeditlav, TQT_SLOT(setEnabled(bool))); + connect(noeditlav, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed())); + connect(noenablelav, TQ_SIGNAL(toggled(bool)), noeditlav, TQ_SLOT(setEnabled(bool))); } hbox = new TQHBox( nopowerBox ); @@ -207,7 +207,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) noeditwait->setSuffix( i18n("keep short, unit in spinbox", "min") ); noedlabel->setBuddy( noeditwait ); hbox->setStretchFactor( noeditwait, 1 ); - connect( noeditwait, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( noeditwait, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); /////////////////////////////////////////////////////////////// @@ -238,11 +238,11 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQWidget *wp = new TQWidget(powerBox); TQHBoxLayout *xl = new TQHBoxLayout( wp); xl->addWidget(new TQLabel("-", wp)); - powerValBrightness = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + powerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( powerValBrightness, i18n( "How bright to change the back panel" ) ); powerValBrightness->setEnabled(0); - connect(powerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(powerBrightness, TQT_SIGNAL(toggled(bool)), powerValBrightness, TQT_SLOT(setEnabled(bool))); + connect(powerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(powerBrightness, TQ_SIGNAL(toggled(bool)), powerValBrightness, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -257,8 +257,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValPerformance, i18n( "Which profile to change it to" ) ); powerValPerformance->insertStringList(performance_list); powerValPerformance->setEnabled(0); - connect(powerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(powerPerformance, TQT_SIGNAL(toggled(bool)), powerValPerformance, TQT_SLOT(setEnabled(bool))); + connect(powerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(powerPerformance, TQ_SIGNAL(toggled(bool)), powerValPerformance, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValPerformance); xl->addStretch(1); } @@ -272,22 +272,22 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValThrottle, i18n( "How much to throttle the laptop's CPU" ) ); powerValThrottle->insertStringList(throttle_list); powerValThrottle->setEnabled(0); - connect(powerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(powerThrottle, TQT_SIGNAL(toggled(bool)), powerValThrottle, TQT_SLOT(setEnabled(bool))); + connect(powerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(powerThrottle, TQ_SIGNAL(toggled(bool)), powerValThrottle, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValThrottle); xl->addStretch(1); } - connect(powerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); + connect(powerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); if (can_lav) { hbox = new TQHBox( powerBox ); enablelav = new TQCheckBox(i18n("Don't act if LAV is >"), hbox); - connect( enablelav, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect( enablelav, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); editlav = new KDoubleSpinBox(0.0, 10.0, 0.0, 0.1, 1, hbox); TQToolTip::add( editlav, i18n( "If enabled and the system load average is greater than this value none of the above options will be applied" ) ); - connect( editlav, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); - connect( enablelav, TQT_SIGNAL(toggled(bool)), editlav, TQT_SLOT(setEnabled(bool)) ); + connect( editlav, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed())); + connect( enablelav, TQ_SIGNAL(toggled(bool)), editlav, TQ_SLOT(setEnabled(bool)) ); } hbox = new TQHBox( powerBox ); @@ -297,7 +297,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) editwait->setSuffix( i18n("keep short, unit in spinbox", "min") ); edlabel->setBuddy( editwait ); hbox->setStretchFactor( editwait, 1 ); - connect( editwait, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( editwait, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); hlay->addStretch(1); diff --git a/klaptopdaemon/power.h b/klaptopdaemon/power.h index ec9c1b4..645e1bd 100644 --- a/klaptopdaemon/power.h +++ b/klaptopdaemon/power.h @@ -40,7 +40,7 @@ class KDoubleSpinBox; class PowerConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: PowerConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index e60109e..24f6228 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -81,13 +81,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) poff = new TQCheckBox(i18n("Back panel brightness"), wp); TQToolTip::add( poff, i18n( "Enables the changing of the back panel brightness" ) ); xl->addWidget(poff); - connect (poff, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(poff_changed(bool))); + connect (poff, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(poff_changed(bool))); xl->addWidget(new TQLabel("-", wp)); - soff = new TQSlider(0, 255, 16, 160, Qt::Horizontal, wp); + soff = new TQSlider(0, 255, 16, 160, TQt::Horizontal, wp); soff->setEnabled(0); TQToolTip::add( soff, i18n( "How bright it should be when it is changed" ) ); - connect (soff, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (soff, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(soff); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -102,13 +102,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) performance_off = new TQCheckBox(i18n("System performance"), wp); TQToolTip::add( performance_off, i18n( "Enables the changing of the system performance profile" ) ); xl->addWidget(performance_off); - connect (performance_off, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_off_changed(bool))); + connect (performance_off, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_off_changed(bool))); performance_val_off = new KComboBox(0, wp); TQToolTip::add( performance_val_off, i18n( "The new system performance profile to change to" ) ); performance_val_off->insertStringList(performance_list); performance_val_off->setEnabled(0); - connect (performance_val_off, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val_off, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(performance_val_off); xl->addStretch(1); } else { @@ -121,13 +121,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) throttle_off = new TQCheckBox(i18n("CPU throttling"), wp); TQToolTip::add( throttle_off, i18n( "Enables the throttling of the CPU performance" ) ); xl->addWidget(throttle_off); - connect (throttle_off, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_off_changed(bool))); + connect (throttle_off, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_off_changed(bool))); throttle_val_off = new KComboBox(0, wp); throttle_val_off->insertStringList(throttle_list); throttle_val_off->setEnabled(0); TQToolTip::add( throttle_val_off, i18n( "How much to throttle the CPU by" ) ); - connect (throttle_val_off, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val_off, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(throttle_val_off); xl->addStretch(1); } else { @@ -145,13 +145,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) pon = new TQCheckBox(i18n("Back panel brightness"), wp); TQToolTip::add( pon, i18n( "Enables the changing of the back panel brightness" ) ); xl->addWidget(pon); - connect (pon, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(pon_changed(bool))); + connect (pon, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(pon_changed(bool))); xl->addWidget(new TQLabel("-", wp)); - son = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + son = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); son->setEnabled(0); TQToolTip::add( son, i18n( "How bright it should be when it is changed" ) ); - connect (son, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (son, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(son); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -165,13 +165,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) performance_on = new TQCheckBox(i18n("System performance"), wp); TQToolTip::add( performance_on, i18n( "Enables the changing of the system performance profile" ) ); xl->addWidget(performance_on); - connect (performance_on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_on_changed(bool))); + connect (performance_on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_on_changed(bool))); performance_val_on = new KComboBox(0, wp); performance_val_on->insertStringList(performance_list); performance_val_on->setEnabled(0); TQToolTip::add( performance_val_on, i18n( "The new system performance profile to change to" ) ); - connect (performance_val_on, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val_on, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(performance_val_on); xl->addStretch(1); } else { @@ -184,13 +184,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) throttle_on = new TQCheckBox(i18n("CPU throttle"), wp); TQToolTip::add( throttle_on, i18n( "Enables the throttling of the CPU performance" ) ); xl->addWidget(throttle_on); - connect (throttle_on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_on_changed(bool))); + connect (throttle_on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_on_changed(bool))); throttle_val_on = new KComboBox(0, wp); throttle_val_on->insertStringList(throttle_list); throttle_val_on->setEnabled(0); TQToolTip::add( throttle_val_on, i18n( "How much to throttle the CPU by" ) ); - connect (throttle_val_on, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val_on, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(throttle_val_on); xl->addStretch(1); } else { diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h index c518c92..df48e2c 100644 --- a/klaptopdaemon/profile.h +++ b/klaptopdaemon/profile.h @@ -41,7 +41,7 @@ class KComboBox; class ProfileConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: ProfileConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index 02b941a..5fa1301 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -37,8 +37,8 @@ #include <kiconloader.h> #include <kicondialog.h> #include <tdeapplication.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <krichtextlabel.h> @@ -73,12 +73,12 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name) enableScrollBar = new TQCheckBox( i18n("Enable &scroll bar"), this ); TQToolTip::add( enableScrollBar, i18n( "When checked this box enables the scrollbar so that it works under TDE" ) ); top_layout->addWidget( enableScrollBar ); - connect( enableScrollBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableScrollBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableMiddleEmulation = new TQCheckBox( i18n("&Emulate middle mouse button with scroll bar press"), this ); TQToolTip::add( enableMiddleEmulation, i18n( "When checked this box enables pressing the scroll bar to act in the same way as pressing the middle button on a 3 button mouse" ) ); top_layout->addWidget( enableMiddleEmulation ); - connect( enableMiddleEmulation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableMiddleEmulation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (::access("/dev/sonypi", R_OK) != 0) { enableMiddleEmulation->setEnabled(0); @@ -89,7 +89,7 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name) "protections need to be changed. Clicking on the button below will change them\n").replace("\n", " "), this)); TQHBoxLayout *ll = new TQHBoxLayout(); TQPushButton *setupButton = new TQPushButton(i18n("Setup /dev/sonypi"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the sony specific features" ) ); ll->addStretch(2); ll->addWidget(setupButton); diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h index 5339aaf..88baaf9 100644 --- a/klaptopdaemon/sony.h +++ b/klaptopdaemon/sony.h @@ -40,7 +40,7 @@ class TQPushButton; class SonyConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: SonyConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/wake_laptop.cpp b/klaptopdaemon/wake_laptop.cpp index c994057..4473f1b 100644 --- a/klaptopdaemon/wake_laptop.cpp +++ b/klaptopdaemon/wake_laptop.cpp @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <kdatastream.h> #include <dcopclient.h> #include <tdeapplication.h> -KDE_EXPORT void +TDE_EXPORT void wake_laptop_daemon() { - DCOPClient *dclient = kapp->dcopClient(); + DCOPClient *dclient = tdeApp->dcopClient(); if (!dclient || (!dclient->isAttached() && !dclient->attach())) return; diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index 5152d05..ab3edc1 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -88,12 +88,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) grid->addWidget(checkCriticalPercent, curRow, 0); grid->addWidget(editCriticalPercent, curRow++, TQt::AlignLeft); - connect(editCriticalTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(editCriticalPercent, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(checkCriticalTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkCriticalPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkCriticalTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkCriticalTimeChanged(bool))); - connect(checkCriticalPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkCriticalPercentChanged(bool))); + connect(editCriticalTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(editCriticalPercent, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(checkCriticalTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkCriticalPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkCriticalTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkCriticalTimeChanged(bool))); + connect(checkCriticalPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkCriticalPercentChanged(bool))); } else { checkLowTime = new TQCheckBox( i18n("Low &trigger:"), this ); checkLowPercent = new TQCheckBox( i18n("Low &trigger:"), this ); @@ -108,12 +108,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) grid->addWidget(checkLowPercent, curRow, 0); grid->addWidget(editLowPercent, curRow++, TQt::AlignLeft); - connect(editLowTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(editLowPercent, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(checkLowTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkLowPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkLowTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkLowTimeChanged(bool))); - connect(checkLowPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkLowPercentChanged(bool))); + connect(editLowTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(editLowPercent, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(checkLowTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkLowPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkLowTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkLowTimeChanged(bool))); + connect(checkLowPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkLowPercentChanged(bool))); } @@ -123,12 +123,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) editRunCommand = new KURLRequester( this ); editRunCommand->setEnabled(false); - connect( checkRunCommand, TQT_SIGNAL(toggled(bool)), - editRunCommand, TQT_SLOT(setEnabled(bool)) ); - connect( checkRunCommand, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged()) ); - connect( editRunCommand, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); + connect( checkRunCommand, TQ_SIGNAL(toggled(bool)), + editRunCommand, TQ_SLOT(setEnabled(bool)) ); + connect( checkRunCommand, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged()) ); + connect( editRunCommand, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); grid->addWidget(editRunCommand, curRow++, 1); TQToolTip::add( editRunCommand, i18n( "This command will be run when the battery gets low" ) ); @@ -138,24 +138,24 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) editPlaySound = new KURLRequester( this ); editPlaySound->setEnabled(false); - connect( checkPlaySound, TQT_SIGNAL(toggled(bool)), - editPlaySound, TQT_SLOT(setEnabled(bool)) ); - connect( checkPlaySound, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged()) ); - connect( editPlaySound, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); + connect( checkPlaySound, TQ_SIGNAL(toggled(bool)), + editPlaySound, TQ_SLOT(setEnabled(bool)) ); + connect( checkPlaySound, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged()) ); + connect( editPlaySound, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); grid->addWidget(editPlaySound, curRow++, 1); TQToolTip::add( editPlaySound, i18n( "This sound will play when the battery gets low" ) ); // setup the System Sound stuff checkBeep = new TQCheckBox(i18n("System &beep"), this); grid->addWidget(checkBeep, curRow++, 0); - connect(checkBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); TQToolTip::add( checkBeep, i18n( "The system will beep if this is enabled" ) ); checkNotify = new TQCheckBox(i18n("&Notify"), this); grid->addWidget(checkNotify, curRow++, 0); - connect(checkNotify, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkNotify, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); int can_suspend = laptop_portable::has_suspend(); int can_standby = laptop_portable::has_standby(); @@ -167,10 +167,10 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) checkBrightness->setMinimumSize(checkBrightness->sizeHint()); TQToolTip::add( checkBrightness, i18n( "If enabled the back panel brightness will change" ) ); grid->addWidget(checkBrightness, curRow, 0); - connect(checkBrightness, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(brightness_changed(bool))); + connect(checkBrightness, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(brightness_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); v->addWidget(new TQLabel("-", this)); - valueBrightness = new TQSlider(0, 255, 16, 160, Qt::Horizontal, this); + valueBrightness = new TQSlider(0, 255, 16, 160, TQt::Horizontal, this); TQToolTip::add( valueBrightness, i18n( "How bright or dim to make the back panel" ) ); valueBrightness->setMaximumWidth(70); v->addWidget(valueBrightness); @@ -178,7 +178,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) v->addStretch(1); grid->addLayout(v, curRow, 1); valueBrightness->setEnabled(0); - connect(valueBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(valueBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); ++curRow; } else { checkBrightness = 0; @@ -192,13 +192,13 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) performance = new TQCheckBox(i18n("System performance"), this); TQToolTip::add( performance, i18n( "If enabled the laptop's power performance profile will change" ) ); grid->addWidget(performance, curRow, 0); - connect (performance, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_changed(bool))); + connect (performance, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); performance_val = new KComboBox(0, this); performance_val->insertStringList(performance_list); performance_val->setEnabled(0); - connect (performance_val, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); TQToolTip::add( performance_val, i18n( "The performance profile to change to" ) ); v->addWidget(performance_val); v->addStretch(1); @@ -215,13 +215,13 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) throttle = new TQCheckBox(i18n("CPU throttling"), this); TQToolTip::add( throttle, i18n( "If enabled the CPU performance will be throttled" ) ); grid->addWidget(throttle, curRow, 0); - connect (throttle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_changed(bool))); + connect (throttle, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); throttle_val = new KComboBox(0, this); throttle_val->insertStringList(throttle_list); throttle_val->setEnabled(0); - connect (throttle_val, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); TQToolTip::add( throttle_val, i18n( "How much to throttle the CPU performance by" ) ); v->addWidget(throttle_val); v->addStretch(1); @@ -241,30 +241,30 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) checkStandby = new TQRadioButton(i18n("Standb&y"), b); TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) ); checkStandby->setMinimumSize(checkStandby->sizeHint()); - connect(checkStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } if (can_suspend) { checkSuspend = new TQRadioButton(i18n("&Suspend"), b); TQToolTip::add( checkSuspend, i18n( "Move the system into the suspend state - also known as 'save-to-ram'" ) ); checkSuspend->setMinimumSize(checkSuspend->sizeHint()); - connect(checkSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } if (can_hibernate) { checkHibernate = new TQRadioButton(i18n("H&ibernate"), b); TQToolTip::add( checkHibernate, i18n( "Move the system into the hibernate state - also known as 'save-to-disk'" ) ); checkHibernate->setMinimumSize(checkHibernate->sizeHint()); - connect(checkHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } // setup the logout option checkLogout = new TQRadioButton(i18n("&Logout"), b); - connect(checkLogout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkLogout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); // setup the shutdown option checkShutdown = new TQRadioButton(i18n("System power off"), b); TQToolTip::add( checkShutdown, i18n( "Power the laptop off" ) ); - connect(checkShutdown, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkShutdown, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); checkNone = new TQRadioButton(i18n("&None"), b); - connect(checkNone, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkNone, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); grid->addMultiCellWidget(b, curRow, curRow, 0, 1, TQt::AlignLeft|TQt::AlignTop); curRow++; diff --git a/klaptopdaemon/warning.h b/klaptopdaemon/warning.h index 5c07ed0..cadcef9 100644 --- a/klaptopdaemon/warning.h +++ b/klaptopdaemon/warning.h @@ -40,7 +40,7 @@ class KComboBox; class WarningConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: WarningConfig(int x, TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/xautolock.cpp b/klaptopdaemon/xautolock.cpp index 93834af..0c7d724 100644 --- a/klaptopdaemon/xautolock.cpp +++ b/klaptopdaemon/xautolock.cpp @@ -69,7 +69,7 @@ XAutoLock::XAutoLock() #endif if( !xautolock_useXidle && !xautolock_useMit ) { - kapp->installX11EventFilter( this ); + tdeApp->installX11EventFilter( this ); int (*oldHandler)(Display *, XErrorEvent *); oldHandler = XSetErrorHandler(catchFalseAlarms); XSync(tqt_xdisplay(), False ); diff --git a/klaptopdaemon/xautolock.h b/klaptopdaemon/xautolock.h index de43be0..12a7eea 100644 --- a/klaptopdaemon/xautolock.h +++ b/klaptopdaemon/xautolock.h @@ -19,7 +19,7 @@ // class XAutoLock : public TQWidget { - Q_OBJECT + TQ_OBJECT public: XAutoLock(); diff --git a/kmilo/delli8k/delli8k.cpp b/kmilo/delli8k/delli8k.cpp index d63c8c7..2bcb9ed 100644 --- a/kmilo/delli8k/delli8k.cpp +++ b/kmilo/delli8k/delli8k.cpp @@ -31,6 +31,7 @@ #include "kmilointerface.h" #include <fcntl.h> +#include <unistd.h> #include <sys/ioctl.h> #include "i8k.h" @@ -144,7 +145,7 @@ bool DellI8kMonitor::retrieveVolume() if (kmix_error) { // maybe the error occurred because kmix wasn't running - if( kapp->startServiceByDesktopName( "kmix" ) == 0 ) // trying to start kmix + if( tdeApp->startServiceByDesktopName( "kmix" ) == 0 ) // trying to start kmix { // trying again reply = kmixClient->call( "masterVolume"); @@ -209,7 +210,7 @@ bool DellI8kMonitor::retrieveMute() if (kmix_error) { // maybe the error occurred because kmix wasn't running - if( kapp->startServiceByDesktopName( "kmix" ) == 0 ) // trying to start kmix + if( tdeApp->startServiceByDesktopName( "kmix" ) == 0 ) // trying to start kmix { // trying again reply = kmixClient->call( "masterVolume" ); diff --git a/kmilo/delli8k/i8k.h b/kmilo/delli8k/i8k.h index 1c45ba5..a8b16fd 100644 --- a/kmilo/delli8k/i8k.h +++ b/kmilo/delli8k/i8k.h @@ -20,6 +20,10 @@ #define I8K_PROC "/proc/i8k" #define I8K_PROC_FMT "1.0" +#ifdef Q_OS_SOLARIS +#include <sys/ioccom.h> +#endif + #define I8K_BIOS_VERSION _IOR ('i', 0x80, int) /* broken: meant 4 bytes */ #define I8K_MACHINE_ID _IOR ('i', 0x81, int) /* broken: meant 16 bytes */ #define I8K_POWER_STATUS _IOR ('i', 0x82, size_t) diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index 739b266..2c15ad5 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -24,7 +24,7 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <sys/types.h> @@ -35,6 +35,7 @@ #include <tqmessagebox.h> #include <tqfile.h> #include <tqdir.h> +#include <tqtimer.h> #define CONFIG_FILE "kmilodrc" @@ -51,27 +52,27 @@ struct ShortcutInfo static const ShortcutInfo shortcuts[] = { - { "Search", TDEShortcut("XF86Search"), TQT_SLOT(launchSearch()) }, - { "Home Folder", TDEShortcut("XF86MyComputer"), TQT_SLOT(launchHomeFolder()) }, - { "Mail", TDEShortcut("XF86Mail"), TQT_SLOT(launchMail()) }, - { "Audio Media", TDEShortcut("XF86AudioMedia"), TQT_SLOT(launchMusic()) }, - { "Music", TDEShortcut("XF86Music"), TQT_SLOT(launchMusic()) }, - { "Browser", TDEShortcut("XF86WWW"), TQT_SLOT(launchBrowser()) }, - { "Calculator", TDEShortcut("XF86Calculator"), TQT_SLOT(launchCalculator()) }, - { "Terminal", TDEShortcut("XF86Terminal"), TQT_SLOT(launchTerminal()) }, - { "Eject", TDEShortcut("XF86Eject"), TQT_SLOT(eject()) }, - { "Help", TDEShortcut("XF86Launch0"), TQT_SLOT(launchHelp()) }, - { "Light Bulb", TDEShortcut("XF86LightBulb"), TQT_SLOT(lightBulb()) }, - { "Battery", TDEShortcut("XF86LaunchB"), TQT_SLOT(pmBattery()) }, - { "FastVolumeUp", TQt::Key_VolumeUp, TQT_SLOT(fastVolumeUp()) }, - { "FastVolumeDown", TQt::Key_VolumeDown, TQT_SLOT(fastVolumeDown()) }, - { "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQT_SLOT(slowVolumeUp()) }, - { "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQT_SLOT(slowVolumeDown()) }, - { "Mute", TDEShortcut("XF86AudioMute"), TQT_SLOT(toggleMute()) }, - { "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQT_SLOT(brightnessUp()) }, - { "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQT_SLOT(brightnessDown()) }, - { "BrightnessSlowUp", TDEShortcut("Ctrl+XF86MonBrightnessUp"), TQT_SLOT(brightnessSlowUp()) }, - { "BrightnessSlowDown", TDEShortcut("Ctrl+XF86MonBrightnessDown"), TQT_SLOT(brightnessSlowDown()) } + { "Search", TDEShortcut("XF86Search"), TQ_SLOT(launchSearch()) }, + { "Home Folder", TDEShortcut("XF86MyComputer"), TQ_SLOT(launchHomeFolder()) }, + { "Mail", TDEShortcut("XF86Mail"), TQ_SLOT(launchMail()) }, + { "Audio Media", TDEShortcut("XF86AudioMedia"), TQ_SLOT(launchMusic()) }, + { "Music", TDEShortcut("XF86Music"), TQ_SLOT(launchMusic()) }, + { "Browser", TDEShortcut("XF86WWW"), TQ_SLOT(launchBrowser()) }, + { "Calculator", TDEShortcut("XF86Calculator"), TQ_SLOT(launchCalculator()) }, + { "Terminal", TDEShortcut("XF86Terminal"), TQ_SLOT(launchTerminal()) }, + { "Eject", TDEShortcut("XF86Eject"), TQ_SLOT(eject()) }, + { "Help", TDEShortcut("XF86Launch0"), TQ_SLOT(launchHelp()) }, + { "Light Bulb", TDEShortcut("XF86LightBulb"), TQ_SLOT(lightBulb()) }, + { "Battery", TDEShortcut("XF86LaunchB"), TQ_SLOT(pmBattery()) }, + { "FastVolumeUp", TQt::Key_VolumeUp, TQ_SLOT(fastVolumeUp()) }, + { "FastVolumeDown", TQt::Key_VolumeDown, TQ_SLOT(fastVolumeDown()) }, + { "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQ_SLOT(slowVolumeUp()) }, + { "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQ_SLOT(slowVolumeDown()) }, + { "Mute", TDEShortcut("XF86AudioMute"), TQ_SLOT(toggleMute()) }, + { "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQ_SLOT(brightnessUp()) }, + { "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQ_SLOT(brightnessDown()) }, + { "BrightnessSlowUp", TDEShortcut("Ctrl+XF86MonBrightnessUp"), TQ_SLOT(brightnessSlowUp()) }, + { "BrightnessSlowDown", TDEShortcut("Ctrl+XF86MonBrightnessDown"), TQ_SLOT(brightnessSlowDown()) } }; GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args) @@ -146,7 +147,7 @@ bool GenericMonitor::retrieveVolume(int &volume) // maybe the error occurred because kmix wasn't running. Try to start it _interface->displayText(i18n("Starting KMix...")); - if (kapp->startServiceByDesktopName("kmix") == 0) + if (tdeApp->startServiceByDesktopName("kmix") == 0) { // trying again reply = kmixClient->call("volume"); @@ -214,7 +215,7 @@ bool GenericMonitor::retrieveMute(bool &muted) // maybe the error occurred because kmix wasn't running. Try to start it _interface->displayText(i18n("Starting KMix...")); - if (kapp->startServiceByDesktopName("kmix") == 0) + if (tdeApp->startServiceByDesktopName("kmix") == 0) { // trying again reply = kmixClient->call("mute"); @@ -275,33 +276,30 @@ void GenericMonitor::brightnessSlowDown() void GenericMonitor::brightnessChange(int direction, int step) { - if (!tdepowersave) + if (!tdepowersave || direction == 0) { return; } + if (direction > 0) + { + tdepowersave->call("do_brightnessUp", step); + } + else + { + tdepowersave->call("do_brightnessDown", step); + } + TQTimer::singleShot(250, this, TQ_SLOT(brightnessValueUpdate())); +} + +void GenericMonitor::brightnessValueUpdate() +{ DCOPReply reply = tdepowersave->call("brightnessGet"); if (reply.isValid()) { - int brightnessLevel = 100 + (int)reply; // reply value is a negative number between 0 and -100. - brightnessLevel += direction * step; // add requested brightness step - if (brightnessLevel > 100) - { - brightnessLevel = 100; - } - if (brightnessLevel < 0) - { - brightnessLevel = 0; - } - if (direction > 0) - { - tdepowersave->send("do_brightnessUp", step); - } - else if (direction < 0) - { - tdepowersave->send("do_brightnessDown", step); - } - _interface->displayProgress(i18n("Brightness"), brightnessLevel); + // Display real brightness value. This may differ from the set value + // on machines with few brightness steps. + _interface->displayProgress(i18n("Brightness"), (int)reply); } } @@ -326,12 +324,12 @@ void GenericMonitor::launch(TQString configKey, TQString defaultApplication) void GenericMonitor::launchMail() { kdDebug() << "launchMail" << endl; - kapp->invokeMailer("", "", "", "", "", "", "", ""); + tdeApp->invokeMailer("", "", "", "", "", "", "", ""); } void GenericMonitor::launchBrowser() { - kapp->invokeBrowser(""); + tdeApp->invokeBrowser(""); } void GenericMonitor::launchSearch() diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 6968d2c..b986677 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -25,7 +25,7 @@ #define _GENERICMONITOR_H_ #include <tdemainwindow.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <dcopref.h> #include <tdeapplication.h> #include <tdeconfig.h> @@ -37,7 +37,7 @@ namespace KMilo { class GenericMonitor : public Monitor { - Q_OBJECT + TQ_OBJECT public: @@ -71,6 +71,9 @@ public slots: void lightBulb(); void pmBattery(); +private slots: + void brightnessValueUpdate(); + private: void volumeChange(int direction, int percentage); bool retrieveMute(bool &muted); diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui index 6cff8c9..79ca1a3 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui +++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui @@ -258,12 +258,12 @@ <include location="global" impldecl="in implementation">kled.h</include> <include location="global" impldecl="in implementation">kprogress.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>changed();</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index e1522d4..ea24905 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -66,7 +66,7 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList layout->addWidget( mKVaioGeneral ); layout->addStretch(); - mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this)); + mDriver = new KVaioDriverInterface(this); mDriverAvailable = mDriver->connectToDriver(false); mTimer = new TQTimer(this); mTimer->start(231); @@ -82,10 +82,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList // mKVaioGeneral->frameMain->setEnabled (true); } - connect(mKVaioGeneral, TQT_SIGNAL(changed()), - TQT_SLOT(changed())); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); - connect(mDriver, TQT_SIGNAL (vaioEvent(int)), TQT_SLOT (vaioEvent(int) ) ); + connect(mKVaioGeneral, TQ_SIGNAL(changed()), + TQ_SLOT(changed())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); + connect(mDriver, TQ_SIGNAL (vaioEvent(int)), TQ_SLOT (vaioEvent(int) ) ); } void KVaioModule::save() diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h index e976d40..52e04ca 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.h +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h @@ -30,7 +30,7 @@ class KCMKVaioGeneral; class KVaioModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index dcef77f..071b461 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.h +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h @@ -22,7 +22,7 @@ #define _KMILO_KVAIO_H_ #include <tdemainwindow.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <dcopref.h> #include <tdeapplication.h> @@ -33,7 +33,7 @@ class KVaio; class KMiloKVaio : public KMilo::Monitor { -// Q_OBJECT +// TQ_OBJECT public: diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 63f50da..c9b114d 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -69,8 +69,8 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name) kdDebug() << "KVaio: Cannot connect to driver." << endl; } else { kdDebug() << "KVaio: Connected to SonyPI driver." << endl; - connect(mDriver, TQT_SIGNAL(vaioEvent(int)), TQT_SLOT(slotVaioEvent(int))); - connect (mTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (slotTimeout() ) ); + connect(mDriver, TQ_SIGNAL(vaioEvent(int)), TQ_SLOT(slotVaioEvent(int))); + connect (mTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (slotTimeout() ) ); mTimer->start (10000, true); } @@ -478,7 +478,7 @@ bool KVaio::retrieveVolume() { { // _interface->displayText showTextMsg(i18n("Starting KMix...")); - if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix + if (tdeApp->startServiceByDesktopName("kmix")==0) // trying to start kmix { // trying again reply = kmixClient->call("masterVolume"); @@ -545,7 +545,7 @@ bool KVaio::retrieveMute() // maybe the error occurred because kmix wasn't running //_interface->displayText showTextMsg(i18n("Starting KMix...")); - if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix + if (tdeApp->startServiceByDesktopName("kmix")==0) // trying to start kmix { // trying again reply = kmixClient->call("masterMute"); diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index 867ef4c..0ee3a5c 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -54,7 +54,7 @@ class KMiloKVaio; */ class KVaio : public TQObject { - Q_OBJECT + TQ_OBJECT public: // KVaio(TQObject *parent = 0, const char *name =0); diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index c10c11c..e8e8541 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -29,7 +29,14 @@ extern "C" { #include <unistd.h> #include <errno.h> #include <sys/ioctl.h> +#ifdef Q_OS_LINUX #include <linux/types.h> +#elif defined(Q_OS_SOLARIS) +#include <sys/ioccom.h> +#define O_ASYNC O_DIRECT +typedef uint8_t __u8; +typedef uint16_t __u16; +#endif #include <X11/Xlib.h> //#include <X11/extensions/XTest.h> @@ -90,7 +97,7 @@ bool KVaioDriverInterface::connectToDriver(bool listen) if(listen) { mNotifier = new TQSocketNotifier(mFd, TQSocketNotifier::Read, this); - connect(mNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(socketActivated(int))); + connect(mNotifier, TQ_SIGNAL(activated(int)), TQ_SLOT(socketActivated(int))); } return true; } diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h index 2ca7a46..3e41ac6 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h @@ -33,7 +33,7 @@ class TQSocketNotifier; class KVaioDriverInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: KVaioDriverInterface(TQObject *parent=0); diff --git a/kmilo/kmilo_kvaio/sonypi.h b/kmilo/kmilo_kvaio/sonypi.h index 43cfc80..658c5ed 100644 --- a/kmilo/kmilo_kvaio/sonypi.h +++ b/kmilo/kmilo_kvaio/sonypi.h @@ -36,7 +36,9 @@ #ifndef _SONYPI_H_ #define _SONYPI_H_ +#ifdef Q_OS_LINUX #include <linux/types.h> +#endif /* Linux */ /* events the user application reading /dev/sonypi can use */ diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index ac983fd..156f2ac 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -38,10 +38,10 @@ DefaultSkin::DefaultSkin() { - connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); _widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM); - _widget->setFocusPolicy(TQ_NoFocus); + _widget->setFocusPolicy(TQWidget::NoFocus); KWin::setOnAllDesktops(_widget->winId(), true); KWin::setState( _widget->winId(), NET::StaysOnTop | NET::Sticky diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h index 48badba..1e6cc55 100644 --- a/kmilo/kmilod/defaultskin.h +++ b/kmilo/kmilod/defaultskin.h @@ -30,7 +30,7 @@ class DefaultWidget; class DefaultSkin : public TQObject, public KMilo::DisplaySkin { - Q_OBJECT + TQ_OBJECT public: DefaultSkin(); diff --git a/kmilo/kmilod/displayskin.h b/kmilo/kmilod/displayskin.h index dbeebe6..6f21917 100644 --- a/kmilo/kmilod/displayskin.h +++ b/kmilo/kmilod/displayskin.h @@ -22,14 +22,14 @@ #ifndef _DISPLAYSKIN_H_ #define _DISPLAYSKIN_H_ -#include <kdemacros.h> +#include <tdemacros.h> #include <tqstring.h> #include <tqpixmap.h> namespace KMilo { -class KDE_EXPORT DisplaySkin { +class TDE_EXPORT DisplaySkin { public: DisplaySkin(); virtual ~DisplaySkin(); diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp index 07d72aa..1598bb5 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -42,7 +42,7 @@ using namespace KMilo; extern "C" { - KDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) { + TDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) { return new KMiloD(name); } } @@ -79,7 +79,7 @@ KMiloD::KMiloD(const TQCString &name) : KDEDModule(name), _interval(100) } // Start the timer - TQObject::connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimer())); + TQObject::connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimer())); if (shouldPoll) { _timer.start(_interval); } diff --git a/kmilo/kmilod/kmilod.h b/kmilo/kmilod/kmilod.h index 232a4b5..58d9fd5 100644 --- a/kmilo/kmilod/kmilod.h +++ b/kmilo/kmilod/kmilod.h @@ -34,7 +34,7 @@ namespace KMilo { class KMiloInterface; class KMiloD : public KDEDModule { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h index d420543..540b565 100644 --- a/kmilo/kmilod/kmilointerface.h +++ b/kmilo/kmilod/kmilointerface.h @@ -30,7 +30,7 @@ namespace KMilo { // FIXME: make put the methods into .cpp file when the header is installed. class KMiloInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: KMiloInterface(KMiloD *p) : TQObject() { _p = p; } diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h index 9dc9127..771615c 100644 --- a/kmilo/kmilod/monitor.h +++ b/kmilo/kmilod/monitor.h @@ -27,14 +27,14 @@ #include <tqpixmap.h> #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; namespace KMilo { class KMiloInterface; -class KDE_EXPORT Monitor : public TQObject { +class TDE_EXPORT Monitor : public TQObject { public: Monitor(TQObject *parent, const char *name, const TQStringList&); virtual ~Monitor(); diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui index 0951321..f87cf7a 100644 --- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui +++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui @@ -282,18 +282,16 @@ <tabstop>commandExecMail</tabstop> </tabstops> <includes> - <include location="local" impldecl="in implementation">kcmthinkpad_general.ui.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">kcmthinkpad_general.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>changed();</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index 9113f36..fd893d6 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -122,7 +122,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration")); } - connect( m_KCMThinkpadGeneral, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect( m_KCMThinkpadGeneral, TQ_SIGNAL(changed()), TQ_SLOT(changed())); } diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h index d7c8682..174ea38 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.h +++ b/kmilo/thinkpad/kcmthinkpad/main.h @@ -30,7 +30,7 @@ class KCMThinkPadGeneral; class KCMThinkpadModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 16e22a9..50bc532 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -461,7 +461,7 @@ bool ThinkPadMonitor::retrieveVolume() { } if (kmix_error) { // maybe the error occurred because kmix wasn't running - if (kapp->startServiceByDesktopName("kmix")==0) { // trying to start kmix + if (tdeApp->startServiceByDesktopName("kmix")==0) { // trying to start kmix // trying again reply = kmixClient->call("masterVolume"); if (reply.isValid()) { diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp index 078ee7f..4f0d4b3 100644 --- a/kregexpeditor/KMultiFormListBox/ccp.cpp +++ b/kregexpeditor/KMultiFormListBox/ccp.cpp @@ -32,7 +32,7 @@ CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQObject() { ee = ee_; eee = eee_; - install(TQT_TQOBJECT(eee)); + install(eee); } void CCP::install(TQObject *elm) @@ -58,7 +58,7 @@ void CCP::install(TQObject *elm) bool CCP::eventFilter(TQObject *, TQEvent *event) { if (event->type() != TQEvent::MouseButtonPress || - ((TQMouseEvent *) event)->button() != Qt::RightButton || + ((TQMouseEvent *) event)->button() != TQt::RightButton || ((TQMouseEvent *) event)->state() != TQEvent::ControlButton) { return false; } diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp index 22bc14f..020ecf5 100644 --- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp +++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp @@ -29,7 +29,7 @@ indexWindow::indexWindow() : TQWidget(0,"", WStyle_Customize | WType_Popup) { lb = new TQListBox(this); - connect(lb,TQT_SIGNAL(selected(int)), this, TQT_SLOT(lbSelected(int))); + connect(lb,TQ_SIGNAL(selected(int)), this, TQ_SLOT(lbSelected(int))); TQHBoxLayout *lay = new TQHBoxLayout(this); lay->addWidget(lb); lbFinish = false; diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.h b/kregexpeditor/KMultiFormListBox/indexWindow.h index cf15393..a841bc0 100644 --- a/kregexpeditor/KMultiFormListBox/indexWindow.h +++ b/kregexpeditor/KMultiFormListBox/indexWindow.h @@ -40,7 +40,7 @@ **/ class indexWindow : public TQWidget{ -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp index 09c5052..a394c58 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp @@ -178,9 +178,9 @@ void KMultiFormListBoxMultiVisible::insertElmIntoWidget(KMultiFormListBoxEntry * if (elm->indexButton()) { elm->indexButton()->setPixmap(TQBitmap(indexButtonWidth, indexButtonHeight, indexButtonBits, true)); - connect(elm->indexButton(), TQT_SIGNAL(clicked()), elm, TQT_SLOT(acceptIndexButton())); - connect(elm, TQT_SIGNAL(gotoIndex(KMultiFormListBoxEntry *)), - this, TQT_SLOT(showIndexList(KMultiFormListBoxEntry *))); + connect(elm->indexButton(), TQ_SIGNAL(clicked()), elm, TQ_SLOT(acceptIndexButton())); + connect(elm, TQ_SIGNAL(gotoIndex(KMultiFormListBoxEntry *)), + this, TQ_SLOT(showIndexList(KMultiFormListBoxEntry *))); } // Find the location to insert the new element. @@ -266,14 +266,14 @@ void KMultiFormListBoxMultiVisible::cut(KMultiFormListBoxEntry *elm) } TQDataStream stream(clipboard, IO_WriteOnly); - factory->toStream( TQT_TQOBJECT(elm), stream ); + factory->toStream( elm, stream ); delElement(elm); } void KMultiFormListBoxMultiVisible::copy(KMultiFormListBoxEntry *elm) { TQDataStream stream(clipboard, IO_WriteOnly); - factory->toStream(TQT_TQOBJECT(elm), stream); + factory->toStream(elm, stream); } void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm) @@ -285,7 +285,7 @@ void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm) KMultiFormListBoxEntry *newElm = factory->create(viewport()); TQDataStream stream( clipboard, IO_ReadOnly ); - factory->fromStream(stream, TQT_TQOBJECT(newElm)); + factory->fromStream(stream, newElm); insertElmIntoWidget(newElm,oldElm); } diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h index 5077496..f9cab74 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h @@ -34,7 +34,7 @@ */ class KMultiFormListBoxMultiVisible :public TQScrollView, KMultiFormListBoxShower { -Q_OBJECT +TQ_OBJECT friend class KMultiFormListBox; diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp index f39c9e9..a366ad1 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp @@ -46,40 +46,40 @@ KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *f TQPushButton *but = new TQPushButton(addButtonText, this,"Add Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewElement())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewElement())); but = new TQPushButton(i18n("Edit"), this,"Edit Button"); buttons->addWidget(but,0); - connect(but,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSelected())); - connect(_listbox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQT_SLOT(slotEditSelected(TQListBoxItem *))); + connect(but,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditSelected())); + connect(_listbox, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQ_SLOT(slotEditSelected(TQListBoxItem *))); _buttonList.append(but); but = new TQPushButton(i18n("Delete"), this, "Delete Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteEntry())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteEntry())); _buttonList.append(but); but = new TQPushButton(i18n("Copy"), this, "Copy Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopySelected())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopySelected())); _buttonList.append(but); if (showUpDownButtons) { but = new TQPushButton(i18n("Up"), this, "Up Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveItemUp())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveItemUp())); _buttonList.append(but); but = new TQPushButton(i18n("Down"), this, "Down Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveItemDown())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveItemDown())); _buttonList.append(but); } if (showHelpButton) { but = new KPushButton(KStdGuiItem::help(), this, "Help Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(showHelp())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(showHelp())); } buttons->addStretch(1); @@ -123,7 +123,7 @@ void KMultiFormListBoxWindowed::addNewElement() TQWidget *widget = new WidgetWindow(_factory, _listbox); widget->show(); - connect(widget, TQT_SIGNAL(finished()), this, TQT_SLOT(slotUpdateButtonState())); + connect(widget, TQ_SIGNAL(finished()), this, TQ_SLOT(slotUpdateButtonState())); } void KMultiFormListBoxWindowed::addElement() diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h index 2b3a555..8f4e27a 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h @@ -37,7 +37,7 @@ class WindowListboxItem; */ class KMultiFormListBoxWindowed :public TQWidget, KMultiFormListBoxShower { -Q_OBJECT +TQ_OBJECT friend class KMultiFormListBox; diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp index 33eda27..2b22ee5 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp @@ -77,7 +77,7 @@ void KMultiFormListBox::toStream( TQDataStream& stream ) const const KMultiFormListBoxEntryList elms = elements(); stream << elms.count(); for ( TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it) - _factory->toStream( TQT_TQOBJECT(*it), stream ); + _factory->toStream( *it, stream ); } void KMultiFormListBox::fromStream( TQDataStream& stream ) @@ -97,7 +97,7 @@ void KMultiFormListBox::fromStream( TQDataStream& stream ) KMultiFormListBoxEntryList elms = elements(); for (TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it) - _factory->fromStream( stream, TQT_TQOBJECT(*it) ); + _factory->fromStream( stream, *it ); } diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h index 1918625..f9917d0 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h @@ -62,7 +62,7 @@ class KMultiFormListBoxMultiVisible; **/ class KMultiFormListBox : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h index 957f3ab..a5b2974 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h @@ -47,7 +47,7 @@ **/ class KMultiFormListBoxEntry : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp index 9b055a3..6d101a0 100644 --- a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp +++ b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp @@ -47,7 +47,7 @@ void WidgetWindow::init(KMultiFormListBoxFactory *factory, TDEListBox *lb, KMult myWidget = factory->create(frame); } TQDataStream stream( _backup, IO_WriteOnly ); - myFact->toStream( TQT_TQOBJECT(myWidget), stream ); + myFact->toStream( myWidget, stream ); lay->addWidget(myWidget); @@ -86,7 +86,7 @@ void WidgetWindow::slotCancel() } else { TQDataStream stream( _backup, IO_ReadOnly ); - myFact->fromStream( stream, TQT_TQOBJECT(myWidget) ); + myFact->fromStream( stream, myWidget ); } KDialogBase::slotCancel(); } @@ -96,9 +96,9 @@ WidgetWindow *WidgetWindow::clone() WidgetWindow *item = new WidgetWindow(myFact, listbox); TQByteArray data; TQDataStream ws( data, IO_WriteOnly ); - myFact->toStream( TQT_TQOBJECT(myWidget), ws ); + myFact->toStream( myWidget, ws ); TQDataStream rs( data, IO_ReadOnly ); - myFact->fromStream( rs, TQT_TQOBJECT(item->myWidget) ); + myFact->fromStream( rs, item->myWidget ); item->slotOk(); return item; @@ -107,7 +107,7 @@ WidgetWindow *WidgetWindow::clone() void WidgetWindow::display() { TQDataStream stream( _backup, IO_WriteOnly); - myFact->toStream( TQT_TQOBJECT(myWidget), stream ); + myFact->toStream( myWidget, stream ); show(); } diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp index 721257c..70af32f 100644 --- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp +++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp @@ -45,7 +45,7 @@ void KWidgetStreamer::fromStream( TQDataStream& stream, TQObject* to ) void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stream ) { // Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc. - if ( ! from->inherits(TQWIDGET_OBJECT_NAME_STRING) ) + if ( ! from->inherits("TQWidget") ) return; // Serializing all the children (if any). @@ -80,7 +80,7 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre void KWidgetStreamer::propertyFromStream( TQDataStream& stream, TQObject* to ) { // Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc. - if ( ! to->inherits(TQWIDGET_OBJECT_NAME_STRING) ) + if ( ! to->inherits("TQWidget") ) return; // Stream in all the children (if any) @@ -119,7 +119,7 @@ KWidgetStreamer::KWidgetStreamer () l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("checked") << TQString::fromLatin1("tristate"); - _map.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQCheckBox"), l); // TQComboBox l.clear(); @@ -127,51 +127,51 @@ KWidgetStreamer::KWidgetStreamer () << TQString::fromLatin1("editable") << TQString::fromLatin1("currentItem") << TQString::fromLatin1("maxCount") << TQString::fromLatin1("insertionPolicy") << TQString::fromLatin1("autoCompletion"); - _map.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQComboBox"), l); // TQDial l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("tracking") << TQString::fromLatin1("wrapping") << TQString::fromLatin1("value"); - _map.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQDial"), l); // TQLCDNumber l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("numDigits") << TQString::fromLatin1("mode") << TQString::fromLatin1("segmentStyle") << TQString::fromLatin1("value"); - _map.insert(TQString::fromLatin1(TQLCDNUMBER_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQLCDNumber"), l); // TQLineEdit l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("text") << TQString::fromLatin1("maxLength") << TQString::fromLatin1("echoMode") << TQString::fromLatin1("alignment"); - _map.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQLineEdit"), l); // TQMultiLineEdit l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("text") << TQString::fromLatin1("alignment"); - _map.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQTextEdit"), l); // TQRadioButton l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("checked"); - _map.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQRadioButton"), l); // TQSlider l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("value"); - _map.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQSlider"), l); // TQSpinBox l.clear(); l << TQString::fromLatin1("enabled") << TQString::fromLatin1("value"); - _map.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), l); + _map.insert(TQString::fromLatin1("TQSpinBox"), l); } diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h index 6d9bfd7..6ac3349 100644 --- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h +++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h @@ -37,7 +37,7 @@ <pre> KWidgetStreamer streamer; KWidgetStreamer::PropertyMap& map = streamer.propertyMap(); - KWidgetStreamer::PropertyList& list = *map.find(TQLCDNUMBER_OBJECT_NAME_STRING); + KWidgetStreamer::PropertyList& list = *map.find("TQLCDNumber"); list.remove("numDigits"); </pre> **/ diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp index ffa47c1..0bcd10d 100644 --- a/kregexpeditor/auxbuttons.cpp +++ b/kregexpeditor/auxbuttons.cpp @@ -40,44 +40,44 @@ AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0) _undo = new TQToolButton( this ); _undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-undo") ) ); layout->addWidget( _undo ); - connect( _undo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(undo()) ); + connect( _undo, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(undo()) ); TQToolTip::add( _undo, i18n( "Undo" ) ); _redo = new TQToolButton( this ); _redo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-redo") ) ); layout->addWidget( _redo ); - connect( _redo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(redo()) ); + connect( _redo, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(redo()) ); TQToolTip::add( _redo, i18n( "Redo" ) ); _cut = new TQToolButton( this ); _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-cut") ) ); layout->addWidget( _cut ); - connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) ); + connect( _cut, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(cut()) ); TQToolTip::add( _cut, i18n( "Cut" ) ); _copy = new TQToolButton( this ); _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-copy") ) ); layout->addWidget( _copy ); - connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) ); + connect( _copy, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(copy()) ); TQToolTip::add( _copy, i18n( "Copy" ) ); _paste = new TQToolButton( this ); _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-paste")) ); layout->addWidget( _paste ); - connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) ); + connect( _paste, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(paste()) ); TQToolTip::add( _paste, i18n( "Paste" ) ); _save = new TQToolButton( this ); _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("document-save")) ); layout->addWidget( _save ); - connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) ); + connect( _save, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(save()) ); TQToolTip::add( _save, i18n( "Save" ) ); TQToolButton* button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("contexthelp") ) ); layout->addWidget( button ); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEnterWhatsThis())); _undo->setEnabled( false ); _redo->setEnabled( false ); diff --git a/kregexpeditor/auxbuttons.h b/kregexpeditor/auxbuttons.h index d8775a5..c7e5851 100644 --- a/kregexpeditor/auxbuttons.h +++ b/kregexpeditor/auxbuttons.h @@ -25,7 +25,7 @@ class TQToolButton; class AuxButtons :public TQDockWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp index 3926260..cae60e8 100644 --- a/kregexpeditor/characterswidget.cpp +++ b/kregexpeditor/characterswidget.cpp @@ -322,7 +322,7 @@ CharacterEdits::CharacterEdits( TQWidget *parent, const char *name) moreLay->addWidget( more ); moreLay->addStretch( 1 ); - connect(more,TQT_SIGNAL(clicked()), _single, TQT_SLOT(addElement())); + connect(more,TQ_SIGNAL(clicked()), _single, TQ_SLOT(addElement())); // Ranges TQVGroupBox* rangeBox = new TQVGroupBox(i18n("Character Ranges"), top ); @@ -337,9 +337,9 @@ CharacterEdits::CharacterEdits( TQWidget *parent, const char *name) more = new TQPushButton( i18n("More Entries"), moreW ); moreLay->addWidget( more ); moreLay->addStretch( 1 ); - connect(more,TQT_SIGNAL(clicked()), _range, TQT_SLOT(addElement())); + connect(more,TQ_SIGNAL(clicked()), _range, TQ_SLOT(addElement())); // Buttons - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotOK())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotOK())); } void CharacterEdits::slotOK() diff --git a/kregexpeditor/characterswidget.h b/kregexpeditor/characterswidget.h index 1450d97..af0faf9 100644 --- a/kregexpeditor/characterswidget.h +++ b/kregexpeditor/characterswidget.h @@ -122,7 +122,7 @@ public: */ class CharacterEdits : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CharacterEdits(TQWidget *parent = 0, const char *name = 0); diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp index afba02b..5a3406f 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -84,7 +84,7 @@ CharSelector::CharSelector( TQWidget* parent, const char* name ) _stack->raiseWidget( 0 ); - connect( _type, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(slotNewItem( int ) ) ); + connect( _type, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT(slotNewItem( int ) ) ); } void CharSelector::slotNewItem( int which ) diff --git a/kregexpeditor/charselector.h b/kregexpeditor/charselector.h index 611ab19..70a2bbc 100644 --- a/kregexpeditor/charselector.h +++ b/kregexpeditor/charselector.h @@ -26,7 +26,7 @@ class LimitedCharLineEdit; class CharSelector :public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index 98f3975..0c13bd6 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -125,8 +125,8 @@ void CompoundWidget::init( ) _content = new CompoundDetailWindow( _configWindow ); _configWindow->setMainWidget( _content ); - connect( _configWindow, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotConfigCanceled())) ; - connect(_configWindow, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigWindowClosed())); + connect( _configWindow, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotConfigCanceled())) ; + connect(_configWindow, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigWindowClosed())); _down = getIcon( TQString::fromLocal8Bit( "1downarrow" )); _up = getIcon( TQString::fromLocal8Bit( "1uparrow" ) ); @@ -246,7 +246,7 @@ void CompoundWidget::slotConfigCanceled() { TQDataStream stream( _backup, IO_ReadOnly ); KWidgetStreamer streamer; - streamer.fromStream( stream, TQT_TQOBJECT(_content) ); + streamer.fromStream( stream, _content ); repaint(); } @@ -258,7 +258,7 @@ RegExp* CompoundWidget::regExp() const void CompoundWidget::mousePressEvent( TQMouseEvent* event ) { - if ( event->button() == Qt::LeftButton && + if ( event->button() == TQt::LeftButton && TQRect( _pixmapPos, _pixmapSize ).contains( event->pos() ) ) { // Skip otherwise we will never see the mouse release // since it is eaten by Editor window. @@ -269,7 +269,7 @@ void CompoundWidget::mousePressEvent( TQMouseEvent* event ) void CompoundWidget::mouseReleaseEvent( TQMouseEvent* event) { - if ( event->button() == Qt::LeftButton && + if ( event->button() == TQt::LeftButton && TQRect( _pixmapPos, _pixmapSize ).contains( event->pos() ) ) { _hidden = !_hidden; _editorWindow->updateContent( 0 ); @@ -300,7 +300,7 @@ int CompoundWidget::edit() _configWindow->sizeHint().height()/2) ); TQDataStream stream( _backup, IO_WriteOnly ); KWidgetStreamer streamer; - streamer.toStream( TQT_TQOBJECT(_content), stream ); + streamer.toStream( _content, stream ); return _configWindow->exec(); } diff --git a/kregexpeditor/compoundwidget.h b/kregexpeditor/compoundwidget.h index 746f33a..3be5e73 100644 --- a/kregexpeditor/compoundwidget.h +++ b/kregexpeditor/compoundwidget.h @@ -59,7 +59,7 @@ private: */ class CompoundWidget :public SingleContainerWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp index 900b09f..47753d4 100644 --- a/kregexpeditor/concwidget.cpp +++ b/kregexpeditor/concwidget.cpp @@ -189,7 +189,7 @@ void ConcWidget::paintEvent( TQPaintEvent *e) void ConcWidget::mousePressEvent ( TQMouseEvent* event ) { - if ( event->button() == Qt::RightButton ) { + if ( event->button() == TQt::RightButton ) { _editorWindow->showRMBMenu( _editorWindow->hasSelection() ); } else { diff --git a/kregexpeditor/dcbutton.h b/kregexpeditor/dcbutton.h index 451d1b3..daec605 100644 --- a/kregexpeditor/dcbutton.h +++ b/kregexpeditor/dcbutton.h @@ -27,7 +27,7 @@ class TQMouseEvent; */ class DoubleClickButton :public TQToolButton { -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/dragaccepter.cpp b/kregexpeditor/dragaccepter.cpp index f336dbd..d361830 100644 --- a/kregexpeditor/dragaccepter.cpp +++ b/kregexpeditor/dragaccepter.cpp @@ -46,7 +46,7 @@ void DragAccepter::paintEvent(TQPaintEvent *e) void DragAccepter::mousePressEvent ( TQMouseEvent* event ) { - if ( event->button() == Qt::RightButton ) { + if ( event->button() == TQt::RightButton ) { _editorWindow->showRMBMenu( _editorWindow->hasSelection() ); } else { @@ -56,7 +56,7 @@ void DragAccepter::mousePressEvent ( TQMouseEvent* event ) void DragAccepter::mouseReleaseEvent( TQMouseEvent* event ) { - if ( _editorWindow->isPasteing() && event->button() == Qt::LeftButton ) { + if ( _editorWindow->isPasteing() && event->button() == TQt::LeftButton ) { RegExp* regexp = _editorWindow->pasteData(); RegExpWidget *newElm = WidgetFactory::createWidget( regexp, _editorWindow, 0 ); @@ -75,7 +75,7 @@ void DragAccepter::mouseReleaseEvent( TQMouseEvent* event ) _editorWindow->clearSelection( true ); } } - else if ( _editorWindow->isInserting() && event->button() == Qt::LeftButton ) { + else if ( _editorWindow->isInserting() && event->button() == TQt::LeftButton ) { if ( WidgetFactory::isContainer( _editorWindow->insertType() ) && _editorWindow->pointSelected( mapToGlobal( event->pos() ) ) ) { RegExpWidget::mouseReleaseEvent( event ); diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index 58afa1d..0ab7a26 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> // #include <tdefiledialog.h> - #include <kstandarddirs.h> + #include <tdestandarddirs.h> #include <kiconloader.h> #include "editorwindow.moc" #include <klineeditdlg.h> @@ -55,15 +55,15 @@ RegExpEditorWindow::RegExpEditorWindow( TQWidget *parent, const char *name) _pasteData = 0; TQAccel* accel = new TQAccel( this ); - accel->connectItem( accel->insertItem( CTRL+Key_C ), this, TQT_SLOT( slotCopy() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_X ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( Key_Delete ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( Key_BackSpace ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_V ), this, TQT_SLOT( slotStartPasteAction() ) ); - accel->connectItem( accel->insertItem( Key_Escape ), this, TQT_SLOT( slotEndActions() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_S ), this, TQT_SLOT( slotSave() ) ); - - connect( this, TQT_SIGNAL( change() ), this, TQT_SLOT( emitVerifyRegExp() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_C ), this, TQ_SLOT( slotCopy() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_X ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( Key_Delete ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( Key_BackSpace ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_V ), this, TQ_SLOT( slotStartPasteAction() ) ); + accel->connectItem( accel->insertItem( Key_Escape ), this, TQ_SLOT( slotEndActions() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_S ), this, TQ_SLOT( slotSave() ) ); + + connect( this, TQ_SIGNAL( change() ), this, TQ_SLOT( emitVerifyRegExp() ) ); } RegExp* RegExpEditorWindow::regExp() const diff --git a/kregexpeditor/editorwindow.h b/kregexpeditor/editorwindow.h index f1ff424..e249b6a 100644 --- a/kregexpeditor/editorwindow.h +++ b/kregexpeditor/editorwindow.h @@ -45,7 +45,7 @@ class TQHBoxLayout; */ class RegExpEditorWindow :public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kregexpeditor/gen_qregexplexer.cpp b/kregexpeditor/gen_qregexplexer.cpp index 172dd8e..e0f2d7d 100644 --- a/kregexpeditor/gen_qregexplexer.cpp +++ b/kregexpeditor/gen_qregexplexer.cpp @@ -57,15 +57,6 @@ #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include <io.h> -#include <stdlib.h> -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp index 0afa3ea..cb21ca9 100644 --- a/kregexpeditor/infopage.cpp +++ b/kregexpeditor/infopage.cpp @@ -88,7 +88,7 @@ void InfoPage::setSource ( const TQString& name ) TQTextBrowser::setSource( nm ); #else if ( name.startsWith( TQString::fromLocal8Bit("doc://") ) ) { - kapp->invokeHelp( name.mid(6, name.length()-7), TQString::fromLocal8Bit("KRegExpEditor") ); + tdeApp->invokeHelp( name.mid(6, name.length()-7), TQString::fromLocal8Bit("KRegExpEditor") ); } else { KTextBrowser::setSource( name ); // handle mailto and other links diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index 46fc452..5f89df3 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -41,9 +41,9 @@ KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *parent, const char *name, TQHBoxLayout* layout = new TQHBoxLayout( this, 6 ); _editor = new KRegExpEditorPrivate( this, "_editor" ); layout->addWidget( _editor ); - connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) ); - connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) ); + connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( _editor, TQ_SIGNAL( canRedo(bool) ), this, TQ_SIGNAL( canRedo(bool) ) ); + connect( _editor, TQ_SIGNAL( changes(bool) ), this, TQ_SIGNAL( changes(bool) ) ); } TQString KRegExpEditorGUI::regExp() const @@ -78,14 +78,14 @@ KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *parent, layout->setAutoAdd( true ); _editor = new KRegExpEditorGUI( frame ); - connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) ); - connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) ); + connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( _editor, TQ_SIGNAL( canRedo(bool) ), this, TQ_SIGNAL( canRedo(bool) ) ); + connect( _editor, TQ_SIGNAL( changes(bool) ), this, TQ_SIGNAL( changes(bool) ) ); resize( 640, 400 ); setHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) ); #ifdef TQT_ONLY - connect( this, TQT_SIGNAL( helpClicked() ), _editor, TQT_SLOT( showHelp() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), _editor, TQ_SLOT( showHelp() ) ); #endif } @@ -130,7 +130,7 @@ void KRegExpEditorGUI::doSomething( TQString method, void* arguments ) _editor->setAllowNonTQtSyntax( (bool) arguments ); } else { - tqFatal( "%s", tqtr("Method '%1' is not valid!").arg(method).latin1() ); + tqFatal( i18n("Method '%1' is not valid!").arg(method) ); } } @@ -150,7 +150,7 @@ void KRegExpEditorGUI::showHelp() #ifdef TQT_ONLY _editor->showHelp(); #else - kapp->invokeHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) ); + tdeApp->invokeHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) ); #endif } diff --git a/kregexpeditor/kregexpeditorgui.h b/kregexpeditor/kregexpeditorgui.h index 17ff05c..8de9fdb 100644 --- a/kregexpeditor/kregexpeditorgui.h +++ b/kregexpeditor/kregexpeditorgui.h @@ -34,9 +34,9 @@ class KRegExpEditorPrivate; @author Jesper Kjr Pedersen <blackie@kde.org> @version 0.1 **/ -class KDE_EXPORT KRegExpEditorGUI :public TQWidget, public KRegExpEditorInterface +class TDE_EXPORT KRegExpEditorGUI :public TQWidget, public KRegExpEditorInterface { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString regexp READ regExp WRITE setRegExp ) public: @@ -64,9 +64,9 @@ private: KRegExpEditorPrivate* _editor; }; -class KDE_EXPORT KRegExpEditorGUIDialog : public KDialogBase, public KRegExpEditorInterface +class TDE_EXPORT KRegExpEditorGUIDialog : public KDialogBase, public KRegExpEditorInterface { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString regexp READ regExp WRITE setRegExp ) public: diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index 04ae00a..bcaf266 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -21,7 +21,7 @@ #else #include <tdelocale.h> #include <kiconloader.h> - #include <kstandarddirs.h> + #include <tdestandarddirs.h> #include <tdemessagebox.h> #include "kregexpeditorprivate.moc" #endif @@ -50,11 +50,11 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) : TQWidget(parent, name), _updating( false ), _autoVerify( true ) { setMinimumSize(730,300); - TQDockArea* area = new TQDockArea(Qt::Horizontal, TQDockArea::Normal, this ); + TQDockArea* area = new TQDockArea(TQt::Horizontal, TQDockArea::Normal, this ); area->setMinimumSize(2,2); - TQDockArea* verArea1 = new TQDockArea(Qt::Vertical, TQDockArea::Normal, this ); + TQDockArea* verArea1 = new TQDockArea(TQt::Vertical, TQDockArea::Normal, this ); verArea1->setMinimumSize(2,2); - TQDockArea* verArea2 = new TQDockArea(Qt::Vertical, TQDockArea::Reverse, this ); + TQDockArea* verArea2 = new TQDockArea(TQt::Vertical, TQDockArea::Reverse, this ); verArea2->setMinimumSize(2,2); // The DockWindows. @@ -67,7 +67,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) "you have developed and saved, and regular expressions shipped with the system." )); // Editor window - _editor = new TQSplitter(Qt::Vertical, this, "KRegExpEditorPrivate::_editor" ); + _editor = new TQSplitter(TQt::Vertical, this, "KRegExpEditorPrivate::_editor" ); _scrolledEditorWindow = new RegExpScrolledEditorWindow( _editor, "KRegExpEditorPrivate::_scrolledEditorWindow" ); @@ -77,7 +77,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) _info = new InfoPage( this, "_info" ); _verifier = new Verifier( _editor, "KRegExpEditorPrivate::_verifier" ); - connect( _verifier, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( maybeVerify() ) ); + connect( _verifier, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( maybeVerify() ) ); TQWhatsThis::add( _verifier, i18n("Type in some text in this window, and see what the regular expression you have developed matches.<p>" "Each second match will be colored in red and each other match will be colored blue, simply so you " "can distinguish them from each other.<p>" @@ -98,54 +98,54 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) rows->addWidget( verArea2 ); // Connect the buttons - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), _scrolledEditorWindow, TQT_SLOT( slotInsertRegExp( int ) ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), _scrolledEditorWindow, TQT_SLOT( slotDoSelect() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), _scrolledEditorWindow, TQT_SLOT( slotInsertRegExp( RegExp* ) ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), _scrolledEditorWindow, TQ_SLOT( slotInsertRegExp( int ) ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), _scrolledEditorWindow, TQ_SLOT( slotDoSelect() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), _scrolledEditorWindow, TQ_SLOT( slotInsertRegExp( RegExp* ) ) ); - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), _userRegExps, TQT_SLOT( slotUnSelect() ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), _userRegExps, TQT_SLOT( slotUnSelect() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), _regExpButtons, TQT_SLOT( slotUnSelect() ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), _userRegExps, TQ_SLOT( slotUnSelect() ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), _userRegExps, TQ_SLOT( slotUnSelect() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), _regExpButtons, TQ_SLOT( slotUnSelect() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( doneEditing() ), _regExpButtons, TQT_SLOT( slotSelectNewAction() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( doneEditing() ), _userRegExps, TQT_SLOT( slotSelectNewAction() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( doneEditing() ), _regExpButtons, TQ_SLOT( slotSelectNewAction() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( doneEditing() ), _userRegExps, TQ_SLOT( slotSelectNewAction() ) ); - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotShowEditor() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), this, TQT_SLOT( slotShowEditor() ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), this, TQT_SLOT( slotShowEditor() ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotShowEditor() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), this, TQ_SLOT( slotShowEditor() ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), this, TQ_SLOT( slotShowEditor() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( savedRegexp() ), _userRegExps, TQT_SLOT( slotPopulateUserRegexps() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( savedRegexp() ), _userRegExps, TQ_SLOT( slotPopulateUserRegexps() ) ); - connect( _auxButtons, TQT_SIGNAL( undo() ), this, TQT_SLOT( slotUndo() ) ); - connect( _auxButtons, TQT_SIGNAL( redo() ), this, TQT_SLOT( slotRedo() ) ); - connect( _auxButtons, TQT_SIGNAL( cut() ), _scrolledEditorWindow, TQT_SLOT( slotCut() ) ); - connect( _auxButtons, TQT_SIGNAL( copy() ), _scrolledEditorWindow, TQT_SLOT( slotCopy() ) ); - connect( _auxButtons, TQT_SIGNAL( paste() ), _scrolledEditorWindow, TQT_SLOT( slotPaste() ) ); - connect( _auxButtons, TQT_SIGNAL( save() ), _scrolledEditorWindow, TQT_SLOT( slotSave() ) ); - connect( _verifyButtons, TQT_SIGNAL( autoVerify( bool ) ), this, TQT_SLOT( setAutoVerify( bool ) ) ); - connect( _verifyButtons, TQT_SIGNAL( verify() ), this, TQT_SLOT( doVerify() ) ); - connect( _verifyButtons, TQT_SIGNAL( changeSyntax( const TQString& ) ), this, TQT_SLOT( setSyntax( const TQString& ) ) ); + connect( _auxButtons, TQ_SIGNAL( undo() ), this, TQ_SLOT( slotUndo() ) ); + connect( _auxButtons, TQ_SIGNAL( redo() ), this, TQ_SLOT( slotRedo() ) ); + connect( _auxButtons, TQ_SIGNAL( cut() ), _scrolledEditorWindow, TQ_SLOT( slotCut() ) ); + connect( _auxButtons, TQ_SIGNAL( copy() ), _scrolledEditorWindow, TQ_SLOT( slotCopy() ) ); + connect( _auxButtons, TQ_SIGNAL( paste() ), _scrolledEditorWindow, TQ_SLOT( slotPaste() ) ); + connect( _auxButtons, TQ_SIGNAL( save() ), _scrolledEditorWindow, TQ_SLOT( slotSave() ) ); + connect( _verifyButtons, TQ_SIGNAL( autoVerify( bool ) ), this, TQ_SLOT( setAutoVerify( bool ) ) ); + connect( _verifyButtons, TQ_SIGNAL( verify() ), this, TQ_SLOT( doVerify() ) ); + connect( _verifyButtons, TQ_SIGNAL( changeSyntax( const TQString& ) ), this, TQ_SLOT( setSyntax( const TQString& ) ) ); - connect( this, TQT_SIGNAL( canUndo( bool ) ), _auxButtons, TQT_SLOT( slotCanUndo( bool ) ) ); - connect( this, TQT_SIGNAL( canRedo( bool ) ), _auxButtons, TQT_SLOT( slotCanRedo( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQT_SLOT( slotCanCut( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQT_SLOT( slotCanCopy( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingOnClipboard( bool ) ), _auxButtons, TQT_SLOT( slotCanPaste( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( canSave( bool ) ), _auxButtons, TQT_SLOT( slotCanSave( bool ) ) ); + connect( this, TQ_SIGNAL( canUndo( bool ) ), _auxButtons, TQ_SLOT( slotCanUndo( bool ) ) ); + connect( this, TQ_SIGNAL( canRedo( bool ) ), _auxButtons, TQ_SLOT( slotCanRedo( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQ_SLOT( slotCanCut( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQ_SLOT( slotCanCopy( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingOnClipboard( bool ) ), _auxButtons, TQ_SLOT( slotCanPaste( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( canSave( bool ) ), _auxButtons, TQ_SLOT( slotCanSave( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( verifyRegExp() ), this, TQT_SLOT( maybeVerify() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( verifyRegExp() ), this, TQ_SLOT( maybeVerify() ) ); - connect( _verifyButtons, TQT_SIGNAL( loadVerifyText( const TQString& ) ), this, TQT_SLOT( setVerifyText( const TQString& ) ) ); + connect( _verifyButtons, TQ_SIGNAL( loadVerifyText( const TQString& ) ), this, TQ_SLOT( setVerifyText( const TQString& ) ) ); - // connect( _verifier, TQT_SIGNAL( countChanged( int ) ), _verifyButtons, TQT_SLOT( setMatchCount( int ) ) ); + // connect( _verifier, TQ_SIGNAL( countChanged( int ) ), _verifyButtons, TQ_SLOT( setMatchCount( int ) ) ); // TQt anchors do not work for <pre>...</pre>, thefore scrolling to next/prev match // do not work. Enable this when they work. - // connect( _verifyButtons, TQT_SIGNAL( gotoFirst() ), _verifier, TQT_SLOT( gotoFirst() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoPrev() ), _verifier, TQT_SLOT( gotoPrev() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoNext() ), _verifier, TQT_SLOT( gotoNext() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoLast() ), _verifier, TQT_SLOT( gotoLast() ) ); - // connect( _verifier, TQT_SIGNAL( goForwardPossible( bool ) ), _verifyButtons, TQT_SLOT( enableForwardButtons( bool ) ) ); - // connect( _verifier, TQT_SIGNAL( goBackwardPossible( bool ) ), _verifyButtons, TQT_SLOT( enableBackwardButtons( bool ) ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoFirst() ), _verifier, TQ_SLOT( gotoFirst() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoPrev() ), _verifier, TQ_SLOT( gotoPrev() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoNext() ), _verifier, TQ_SLOT( gotoNext() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoLast() ), _verifier, TQ_SLOT( gotoLast() ) ); + // connect( _verifier, TQ_SIGNAL( goForwardPossible( bool ) ), _verifyButtons, TQ_SLOT( enableForwardButtons( bool ) ) ); + // connect( _verifier, TQ_SIGNAL( goBackwardPossible( bool ) ), _verifyButtons, TQ_SLOT( enableBackwardButtons( bool ) ) ); _auxButtons->slotCanPaste( false ); _auxButtons->slotCanCut( false ); @@ -183,18 +183,18 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) _timer = new TQTimer(this); - connect( _scrolledEditorWindow, TQT_SIGNAL( change() ), this, TQT_SLOT( slotUpdateLineEdit() ) ); - connect( _regexpEdit, TQT_SIGNAL(textChanged( const TQString& ) ), this, TQT_SLOT( slotTriggerUpdate() ) ); - connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); - connect( clearButton, TQT_SIGNAL( clicked() ), _regexpEdit, TQT_SLOT( clear() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( change() ), this, TQ_SLOT( slotUpdateLineEdit() ) ); + connect( _regexpEdit, TQ_SIGNAL(textChanged( const TQString& ) ), this, TQ_SLOT( slotTriggerUpdate() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), _regexpEdit, TQ_SLOT( clear() ) ); // Push an initial empty element on the stack. _undoStack.push( _scrolledEditorWindow->regExp() ); _redoStack.setAutoDelete( true ); TQAccel* accel = new TQAccel( this ); - accel->connectItem( accel->insertItem( CTRL+Key_Z ), this, TQT_SLOT( slotUndo() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_R ), this, TQT_SLOT( slotRedo() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_Z ), this, TQ_SLOT( slotUndo() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_R ), this, TQ_SLOT( slotRedo() ) ); setSyntax( TQString::fromLatin1( "TQt" ) ); } diff --git a/kregexpeditor/kregexpeditorprivate.h b/kregexpeditor/kregexpeditorprivate.h index 9cff2cf..9e1eabb 100644 --- a/kregexpeditor/kregexpeditorprivate.h +++ b/kregexpeditor/kregexpeditorprivate.h @@ -45,7 +45,7 @@ class TQToolButton; **/ class KRegExpEditorPrivate :public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kregexpeditor/limitedcharlineedit.cpp b/kregexpeditor/limitedcharlineedit.cpp index 5e494d8..f311ebe 100644 --- a/kregexpeditor/limitedcharlineedit.cpp +++ b/kregexpeditor/limitedcharlineedit.cpp @@ -26,7 +26,7 @@ class Validator :public TQValidator { public: Validator( LimitedCharLineEdit::Mode mode, TQWidget* parent ) - :TQValidator( TQT_TQOBJECT(parent), "Validator" ), _mode(mode) + :TQValidator( parent, "Validator" ), _mode(mode) { } diff --git a/kregexpeditor/lookaheadwidget.h b/kregexpeditor/lookaheadwidget.h index 14efee0..5c51d81 100644 --- a/kregexpeditor/lookaheadwidget.h +++ b/kregexpeditor/lookaheadwidget.h @@ -23,7 +23,7 @@ class LookAheadRegExp; class LookAheadWidget :public SingleContainerWidget { - Q_OBJECT + TQ_OBJECT public: LookAheadWidget( RegExpEditorWindow* editorWindow, RegExpType tp, TQWidget* parent, const char* name = 0 ); diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp index 728bb19..0bc7990 100644 --- a/kregexpeditor/main.cpp +++ b/kregexpeditor/main.cpp @@ -58,11 +58,11 @@ int main( int argc, char* argv[] ) lay2->addStretch(1); lay2->addWidget( quit ); - TQObject::connect( help, TQT_SIGNAL( clicked() ), iface, TQT_SLOT( showHelp() ) ); - TQObject::connect( quit, TQT_SIGNAL( clicked() ), tqApp, TQT_SLOT( quit() ) ); + TQObject::connect( help, TQ_SIGNAL( clicked() ), iface, TQ_SLOT( showHelp() ) ); + TQObject::connect( quit, TQ_SIGNAL( clicked() ), tqApp, TQ_SLOT( quit() ) ); top->show(); - TQObject::connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), tqApp, TQT_SLOT( quit() ) ); + TQObject::connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), tqApp, TQ_SLOT( quit() ) ); myapp.exec(); } diff --git a/kregexpeditor/qregexpparser.l b/kregexpeditor/qregexpparser.l index 8831bb6..ad0e416 100644 --- a/kregexpeditor/qregexpparser.l +++ b/kregexpeditor/qregexpparser.l @@ -76,20 +76,20 @@ SpecialEsc \\[afnrtv] } {SpecialEsc} { TextRangeRegExp* regexp = new TextRangeRegExp( false ); - regexp->addCharacter( QString::fromLocal8Bit( yytext ) ); + regexp->addCharacter( TQString::fromLocal8Bit( yytext ) ); qregexplval.regexp = regexp; return TOK_CharClass; } {HexChar} { TextRangeRegExp* regexp = new TextRangeRegExp( false ); - regexp->addCharacter( QString::fromLocal8Bit(yytext) ); + regexp->addCharacter( TQString::fromLocal8Bit(yytext) ); qregexplval.regexp = regexp; return TOK_CharClass; } {OctChar} { TextRangeRegExp* regexp = new TextRangeRegExp( false ); - regexp->addCharacter( QString::fromLocal8Bit(yytext) ); + regexp->addCharacter( TQString::fromLocal8Bit(yytext) ); qregexplval.regexp = regexp; return TOK_CharClass; } @@ -113,7 +113,7 @@ SpecialEsc \\[afnrtv] %% -void setParseData( QString qstr ) { +void setParseData( TQString qstr ) { const char* cstr; if ( qstr.isNull() ) cstr = ""; @@ -176,18 +176,18 @@ void parseRange( char* txt, int* min, int* max ) RegExp* parseCharClass( char* match ) { TextRangeRegExp* res = new TextRangeRegExp( false ); - QString txt = QString::fromLocal8Bit( match ); + TQString txt = TQString::fromLocal8Bit( match ); txt = txt.mid(1,txt.length()-2); unsigned int i = 0; - QChar ch = txt.at(i++); - QString pendingChar; - QString thisChar; + TQChar ch = txt.at(i++); + TQString pendingChar; + TQString thisChar; bool charPending = false; bool rangePending = false; bool flushPending = false; - if ( ch == QChar('^') ) { + if ( ch == TQChar('^') ) { res->setNegate( true ); ch = txt.at(i++); } @@ -195,7 +195,7 @@ RegExp* parseCharClass( char* match ) do { // If a character is pending, and the next char is '-' then we are // possible looking at a range. - if ( ch == QChar('-') && charPending ) { + if ( ch == TQChar('-') && charPending ) { rangePending = true; ch = txt.at(i++); continue; @@ -209,44 +209,44 @@ RegExp* parseCharClass( char* match ) charPending = false; } - if ( ch == QChar('\\') ) { + if ( ch == TQChar('\\') ) { // Handle the cases where an escape character is specified. ch = txt.at(i++); - if ( ch == QChar('a') || ch == QChar('f') || ch == QChar('n') || ch == QChar('r') || ch == QChar('t') || ch == QChar('v') ) { + if ( ch == TQChar('a') || ch == TQChar('f') || ch == TQChar('n') || ch == TQChar('r') || ch == TQChar('t') || ch == TQChar('v') ) { // These are just seen as normal characters. - thisChar = QString::fromLocal8Bit("\\") + ch; + thisChar = TQString::fromLocal8Bit("\\") + ch; } - else if ( ch == QChar('d') ) { + else if ( ch == TQChar('d') ) { // The following characters represent character groups. If any of // these are seen in a range, then the range is ignored, thus [a-\s] // matches an 'a', a '-', and a space (\s means space). res->setDigit( true ); flushPending = true; } - else if ( ch == QChar('D') ) { + else if ( ch == TQChar('D') ) { res->setNonDigit( true ); flushPending = true; } - else if ( ch == QChar('s') ) { + else if ( ch == TQChar('s') ) { res->setSpace( true ); flushPending = true; } - else if ( ch == QChar('S') ) { + else if ( ch == TQChar('S') ) { res->setNonSpace( true ); flushPending = true; } - else if ( ch == QChar('w') ) { + else if ( ch == TQChar('w') ) { res->setWordChar( true ); flushPending = true; } - else if ( ch == QChar('W') ) { + else if ( ch == TQChar('W') ) { res->setNonWordChar( true ); flushPending = true; } - else if ( ch == QChar('x') || ch == QChar('X') ) { + else if ( ch == TQChar('x') || ch == TQChar('X') ) { // This is a hexidecimal character: \xHHHH - QString str; + TQString str; for ( int j=0; j<4; j++) { ch = txt.at(i++); if ( ch == 'a' || ch == 'A' || ch == 'b' || ch == 'B' || ch == 'c' || ch == 'C' || ch == 'd' || ch == 'D' || @@ -257,11 +257,11 @@ RegExp* parseCharClass( char* match ) else i--; } - thisChar = QString::fromLocal8Bit("\\x") + str; + thisChar = TQString::fromLocal8Bit("\\x") + str; } - else if ( ch == QChar('0') ) { + else if ( ch == TQChar('0') ) { // This is an octal character - QString str; + TQString str; for ( int j=0; j<4; j++) { ch = txt.at(i++); if ( ch == '0' || ch == '1' || ch == '2' || ch == '3' || ch == '4' || ch == '5' || ch == '6' || ch == '7' ) @@ -269,7 +269,7 @@ RegExp* parseCharClass( char* match ) else i--; } - thisChar = QString::fromLocal8Bit("\\x") + str ; + thisChar = TQString::fromLocal8Bit("\\x") + str ; } else { // Anything else escaped just means the character itself. @@ -290,7 +290,7 @@ RegExp* parseCharClass( char* match ) if ( charPending ) res->addCharacter( pendingChar ); if ( rangePending ) - res->addCharacter( QString::fromLocal8Bit("-") ); + res->addCharacter( TQString::fromLocal8Bit("-") ); flushPending = false; charPending = false; rangePending = false; @@ -308,12 +308,12 @@ RegExp* parseCharClass( char* match ) } ch = txt.at(i++); } - while ( ch != QChar(']') && i <= txt.length() ); + while ( ch != TQChar(']') && i <= txt.length() ); if ( charPending ) res->addCharacter( pendingChar ); if ( rangePending ) - res->addCharacter( QString::fromLocal8Bit("-") ); + res->addCharacter( TQString::fromLocal8Bit("-") ); return res; } diff --git a/kregexpeditor/qregexpparser.y b/kregexpeditor/qregexpparser.y index 868c1dd..59e42b0 100644 --- a/kregexpeditor/qregexpparser.y +++ b/kregexpeditor/qregexpparser.y @@ -38,10 +38,10 @@ #include "compoundregexp.h" extern int yylex(); - extern void setParseData( QString str ); + extern void setParseData( TQString str ); int yyerror (const char *); void setParseResult( RegExp* ); - RegExp* parseQtRegExp( QString qstr, bool* ok ); + RegExp* parseQtRegExp( TQString qstr, bool* ok ); static RegExp* parseResult; static int _index; %} @@ -102,11 +102,11 @@ expression : expression TOK_Bar term { $<regexp>$ = new AltnRegExp( false ); dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( $<regexp>1 ); } - dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) ); + dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) ); } | TOK_Bar term { $<regexp>$ = new AltnRegExp( false ); - dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) ); + dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) ); dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( $<regexp>2 ); } | TOK_Bar { $<regexp>$ = new AltnRegExp( false ); } @@ -155,7 +155,7 @@ atom : TOK_LeftParen expression TOK_RightParent { | TOK_Carat { $<regexp>$ = new PositionRegExp( false, PositionRegExp::BEGLINE ); } | TOK_Dot { $<regexp>$ = new DotRegExp( false ); } | TOK_BackRef { - QString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $<backRef>1 ); + TQString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $<backRef>1 ); $<regexp>$ = new TextRegExp( false, match ); KMessageBox::information(0,i18n("<qt>Back reference regular expressions are not supported.<p>" "<tt>\\1</tt>, <tt>\\2</tt>, ... are <i>back references</i>, meaning they refer to " @@ -167,7 +167,7 @@ atom : TOK_LeftParen expression TOK_RightParent { "the back reference will be replaced by matching the text <b>%2</b> literally.") .arg( match ).arg( match ), i18n("Back reference regular expressions not supported"), - QString::fromLocal8Bit("backReferenceNotSupported") ); + TQString::fromLocal8Bit("backReferenceNotSupported") ); } | TOK_PosWordChar { $<regexp>$ = new PositionRegExp( false, PositionRegExp::WORDBOUNDARY ); } | TOK_PosNonWordChar { $<regexp>$ = new PositionRegExp( false, PositionRegExp::NONWORDBOUNDARY ); } @@ -184,7 +184,7 @@ char : TOK_Char { %% -RegExp* parseQtRegExp( QString qstr, bool* ok ) { +RegExp* parseQtRegExp( TQString qstr, bool* ok ) { _index = 0; parseResult = 0; setParseData( qstr ); diff --git a/kregexpeditor/qt-only/compat.cpp b/kregexpeditor/qt-only/compat.cpp index a7a5d12..2d3315a 100644 --- a/kregexpeditor/qt-only/compat.cpp +++ b/kregexpeditor/qt-only/compat.cpp @@ -50,18 +50,18 @@ void KDialogBase::init( int buttonMask, ButtonCode /*defaultButton*/, const TQSt if ( buttonMask & Help ) { but = new TQPushButton( tr("Help"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpClicked() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpClicked() ) ); } buts->addStretch(1); if ( buttonMask & Ok ) { but = new TQPushButton( tr("OK"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOk() ) ); } if ( buttonMask & Cancel ) { but = new TQPushButton( tr("Cancel"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCancel() ) ); } } diff --git a/kregexpeditor/qt-only/compat.h b/kregexpeditor/qt-only/compat.h index bf8e9ee..16d7263 100644 --- a/kregexpeditor/qt-only/compat.h +++ b/kregexpeditor/qt-only/compat.h @@ -36,7 +36,7 @@ TQString i18n( const TQString& a, const TQString& b); class KDialogBase :public TQDialog { - Q_OBJECT + TQ_OBJECT public: @@ -72,7 +72,7 @@ private: class KMessageBox :public TQMessageBox { - Q_OBJECT + TQ_OBJECT public: enum ButtonCode { Ok = 1, Cancel = 2, Yes = 3, No = 4, Continue = 5 }; diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp index a6bb121..3d8fa8f 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -21,7 +21,7 @@ #else #include <kiconloader.h> #include <tdelocale.h> - #include <kstandarddirs.h> + #include <tdestandarddirs.h> #include "regexpbuttons.moc" #endif @@ -43,8 +43,8 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) _grp->hide(); _grp->setExclusive( true ); - _mapper = new TQSignalMapper( TQT_TQOBJECT(this), "RegExpButtons::_mapper" ); - connect( _mapper, TQT_SIGNAL( mapped(int) ), this, TQT_SIGNAL( clicked(int) ) ); + _mapper = new TQSignalMapper( this, "RegExpButtons::_mapper" ); + connect( _mapper, TQ_SIGNAL( mapped(int) ), this, TQ_SIGNAL( clicked(int) ) ); // The "select" button. _selectBut = new TQToolButton( this); @@ -60,8 +60,8 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) layout->addWidget( _selectBut ); _grp->insert(_selectBut); _selectBut->setToggleButton( true ); - connect( _selectBut, TQT_SIGNAL(clicked()), TQT_SIGNAL(doSelect())); - connect( _selectBut, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetNonKeepMode()) ); + connect( _selectBut, TQ_SIGNAL(clicked()), TQ_SIGNAL(doSelect())); + connect( _selectBut, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetNonKeepMode()) ); TQToolTip::add( _selectBut, i18n("Selection tool")); TQWhatsThis::add( _selectBut, i18n("<qt>This will change the state of the editor to <i>selection state</i>.<p>" @@ -164,11 +164,11 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but"); - _mapper->setMapping( TQT_TQOBJECT(but), tp ); + _mapper->setMapping( but, tp ); - connect( but, TQT_SIGNAL( clicked() ), _mapper, TQT_SLOT( map() ) ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSetNonKeepMode() ) ); - connect( but, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( slotSetKeepMode() ) ); + connect( but, TQ_SIGNAL( clicked() ), _mapper, TQ_SLOT( map() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSetNonKeepMode() ) ); + connect( but, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( slotSetKeepMode() ) ); _grp->insert( but ); but->setToggleButton( true ); diff --git a/kregexpeditor/regexpbuttons.h b/kregexpeditor/regexpbuttons.h index a0306e2..7778bcb 100644 --- a/kregexpeditor/regexpbuttons.h +++ b/kregexpeditor/regexpbuttons.h @@ -28,7 +28,7 @@ class TQSignalMapper; class RegExpButtons :public TQDockWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp index c139180..d52fc17 100644 --- a/kregexpeditor/regexpwidget.cpp +++ b/kregexpeditor/regexpwidget.cpp @@ -119,7 +119,7 @@ void RegExpWidget::mousePressEvent ( TQMouseEvent* event ) if ( _editorWindow->isPasteing() || _editorWindow->isInserting() ) return; - if ( event->button() == Qt::LeftButton ) { + if ( event->button() == TQt::LeftButton ) { if ( ! _editorWindow->pointSelected( TQCursor::pos() ) ) { _editorWindow->clearSelection( true ); if ( dynamic_cast<DragAccepter*>(this) == 0 && dynamic_cast<ConcWidget*>(this) == 0 ) { @@ -131,7 +131,7 @@ void RegExpWidget::mousePressEvent ( TQMouseEvent* event ) event->button(), event->state()); TQApplication::sendEvent( _editorWindow, &ev ); } - else if ( event->button() == Qt::RightButton ) { + else if ( event->button() == TQt::RightButton ) { _editorWindow->showRMBMenu( true ); } diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h index 8a4ba41..30f63bd 100644 --- a/kregexpeditor/regexpwidget.h +++ b/kregexpeditor/regexpwidget.h @@ -31,7 +31,7 @@ class RegExpEditorWindow; */ class RegExpWidget :public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp index 085c36b..9a87eb6 100644 --- a/kregexpeditor/repeatwidget.cpp +++ b/kregexpeditor/repeatwidget.cpp @@ -80,8 +80,8 @@ void RepeatWidget::init() KDialogBase::Ok | KDialogBase::Cancel); _content = new RepeatRangeWindow( _configWindow ); _configWindow->setMainWidget( _content ); - connect( _configWindow, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotConfigCanceled() ) ); - connect(_configWindow, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigWindowClosed())); + connect( _configWindow, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotConfigCanceled() ) ); + connect(_configWindow, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigWindowClosed())); } @@ -151,7 +151,7 @@ void RepeatWidget::slotConfigCanceled() { TQDataStream stream( _backup, IO_ReadOnly ); KWidgetStreamer streamer; - streamer.fromStream( stream, TQT_TQOBJECT(_content) ); + streamer.fromStream( stream, _content ); repaint(); } @@ -161,7 +161,7 @@ int RepeatWidget::edit() _configWindow->sizeHint().height()/2) ); TQDataStream stream( _backup, IO_WriteOnly ); KWidgetStreamer streamer; - streamer.toStream( TQT_TQOBJECT(_content), stream ); + streamer.toStream( _content, stream ); return _configWindow->exec(); } @@ -206,15 +206,15 @@ RepeatRangeWindow::RepeatRangeWindow( TQWidget* parent, const char* name ) _rangeTo = new TQSpinBox( 1, 999, 1, box ); (void) new TQLabel( i18n( "time(s)" ), box ); - connect( _rangeFrom, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotUpdateMaxVal( int ) ) ); - connect( _rangeTo, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotUpdateMinVal( int ) ) ); + connect( _rangeFrom, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotUpdateMaxVal( int ) ) ); + connect( _rangeTo, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotUpdateMinVal( int ) ) ); // set a default button. _group->setButton(ANY); slotItemChange( ANY ); - connect( _group, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotItemChange( int ) ) ); + connect( _group, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotItemChange( int ) ) ); } diff --git a/kregexpeditor/repeatwidget.h b/kregexpeditor/repeatwidget.h index c740717..ba6e38c 100644 --- a/kregexpeditor/repeatwidget.h +++ b/kregexpeditor/repeatwidget.h @@ -32,7 +32,7 @@ class RepeatRegExp; */ class RepeatRangeWindow :public TQVBox { -Q_OBJECT +TQ_OBJECT public: @@ -71,7 +71,7 @@ private: */ class RepeatWidget :public SingleContainerWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/scrollededitorwindow.cpp b/kregexpeditor/scrollededitorwindow.cpp index 07e8bf0..442ac22 100644 --- a/kregexpeditor/scrollededitorwindow.cpp +++ b/kregexpeditor/scrollededitorwindow.cpp @@ -30,21 +30,21 @@ RegExpScrolledEditorWindow::RegExpScrolledEditorWindow( TQWidget* parent, const _scrollView->addChild( _editorWindow ); _scrollView->setResizePolicy( TQScrollView::Manual ); - connect( _editorWindow, TQT_SIGNAL( contentChanged( TQPoint ) ), - this, TQT_SLOT( slotUpdateContentSize( TQPoint ) ) ); + connect( _editorWindow, TQ_SIGNAL( contentChanged( TQPoint ) ), + this, TQ_SLOT( slotUpdateContentSize( TQPoint ) ) ); - connect( _editorWindow, TQT_SIGNAL( scrolling( TQPoint ) ), - this, TQT_SLOT( slotScroll( TQPoint ) ) ); + connect( _editorWindow, TQ_SIGNAL( scrolling( TQPoint ) ), + this, TQ_SLOT( slotScroll( TQPoint ) ) ); - connect( _editorWindow, TQT_SIGNAL( doneEditing() ), this, TQT_SIGNAL( doneEditing() ) ); + connect( _editorWindow, TQ_SIGNAL( doneEditing() ), this, TQ_SIGNAL( doneEditing() ) ); - connect( _editorWindow, TQT_SIGNAL( change() ), this, TQT_SIGNAL( change() ) ); - connect( _editorWindow, TQT_SIGNAL( savedRegexp() ), this, TQT_SIGNAL( savedRegexp() ) ); + connect( _editorWindow, TQ_SIGNAL( change() ), this, TQ_SIGNAL( change() ) ); + connect( _editorWindow, TQ_SIGNAL( savedRegexp() ), this, TQ_SIGNAL( savedRegexp() ) ); - connect( _editorWindow, TQT_SIGNAL( anythingSelected(bool) ), this, TQT_SIGNAL( anythingSelected(bool) ) ); - connect( _editorWindow, TQT_SIGNAL( anythingOnClipboard(bool) ), this, TQT_SIGNAL( anythingOnClipboard(bool) ) ); - connect( _editorWindow, TQT_SIGNAL( canSave(bool) ), this, TQT_SIGNAL( canSave(bool) ) ); - connect( _editorWindow, TQT_SIGNAL( verifyRegExp() ), this, TQT_SIGNAL( verifyRegExp() ) ); + connect( _editorWindow, TQ_SIGNAL( anythingSelected(bool) ), this, TQ_SIGNAL( anythingSelected(bool) ) ); + connect( _editorWindow, TQ_SIGNAL( anythingOnClipboard(bool) ), this, TQ_SIGNAL( anythingOnClipboard(bool) ) ); + connect( _editorWindow, TQ_SIGNAL( canSave(bool) ), this, TQ_SIGNAL( canSave(bool) ) ); + connect( _editorWindow, TQ_SIGNAL( verifyRegExp() ), this, TQ_SIGNAL( verifyRegExp() ) ); } void RegExpScrolledEditorWindow::slotSetRegExp( RegExp* regexp ) diff --git a/kregexpeditor/scrollededitorwindow.h b/kregexpeditor/scrollededitorwindow.h index 8a40a3c..9ea0445 100644 --- a/kregexpeditor/scrollededitorwindow.h +++ b/kregexpeditor/scrollededitorwindow.h @@ -29,7 +29,7 @@ class RegExp; */ class RegExpScrolledEditorWindow :public TQWidget { - Q_OBJECT + TQ_OBJECT public: RegExpScrolledEditorWindow( TQWidget *parent = 0, const char* name = 0); diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp index 0e085d5..fc44b91 100644 --- a/kregexpeditor/selectablelineedit.cpp +++ b/kregexpeditor/selectablelineedit.cpp @@ -25,8 +25,8 @@ SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* parent, const char* name) : TQLineEdit( parent, name ), _owner(owner) { - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, - TQT_SLOT( slotKeyPressed() ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), this, + TQ_SLOT( slotKeyPressed() ) ); setAcceptDrops( false ); } diff --git a/kregexpeditor/selectablelineedit.h b/kregexpeditor/selectablelineedit.h index 5cdb1a0..9f26869 100644 --- a/kregexpeditor/selectablelineedit.h +++ b/kregexpeditor/selectablelineedit.h @@ -33,7 +33,7 @@ class RegExpWidget; */ class SelectableLineEdit :public TQLineEdit { -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/singlecontainerwidget.h b/kregexpeditor/singlecontainerwidget.h index 268e599..7218db4 100644 --- a/kregexpeditor/singlecontainerwidget.h +++ b/kregexpeditor/singlecontainerwidget.h @@ -24,7 +24,7 @@ */ class SingleContainerWidget :public RegExpWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp index 5de0dee..07e2da1 100644 --- a/kregexpeditor/textwidget.cpp +++ b/kregexpeditor/textwidget.cpp @@ -47,10 +47,10 @@ void TextWidget::init( const TQString& txt ) _edit->setText( txt ); - connect( _edit, TQT_SIGNAL( parentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) ); + connect( _edit, TQ_SIGNAL( parentPleaseUpdate() ), this, TQ_SLOT(slotUpdate()) ); setFocusProxy( _edit ); _edit->installEventFilter( this ); - connect( _edit, TQT_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQT_SLOT( emitChange() ) ); + connect( _edit, TQ_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQ_SLOT( emitChange() ) ); } @@ -60,7 +60,7 @@ void TextWidget::slotUpdate() // widget may not be enough for the parent to change size, and in that // case the parent would not repaint, and the text widget would not be // resized. - TQWidget *p = TQT_TQWIDGET(parent()); + TQWidget *p = static_cast<TQWidget*>(parent()); if (p) p->repaint(); _editorWindow->updateContent( this ); @@ -114,7 +114,7 @@ bool TextWidget::eventFilter( TQObject*, TQEvent* event) if ( event->type() == TQEvent::MouseButtonRelease ) { if ( _editorWindow->isInserting() ) { if ( acceptWidgetInsert( _editorWindow->insertType() ) ) { - mouseReleaseEvent( TQT_TQMOUSEEVENT(event) ); + mouseReleaseEvent( static_cast<TQMouseEvent*>(event) ); } return true; } @@ -124,7 +124,7 @@ bool TextWidget::eventFilter( TQObject*, TQEvent* event) return true; } else if ( isSelected() ) { - TQMouseEvent* e = TQT_TQMOUSEEVENT( event ); + TQMouseEvent* e = static_cast<TQMouseEvent*>( event ); TQMouseEvent ev( event->type(), mapTo(_editorWindow, e->pos()), e->button(), e->state()); TQApplication::sendEvent( _editorWindow, &ev ); diff --git a/kregexpeditor/textwidget.h b/kregexpeditor/textwidget.h index cd8d8f8..2b0639f 100644 --- a/kregexpeditor/textwidget.h +++ b/kregexpeditor/textwidget.h @@ -29,7 +29,7 @@ class TextRegExp; */ class TextWidget : public RegExpWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp index e6d83aa..3051e7d 100644 --- a/kregexpeditor/userdefinedregexps.cpp +++ b/kregexpeditor/userdefinedregexps.cpp @@ -21,7 +21,7 @@ #include <klineeditdlg.h> #include <tdelocale.h> #include <tdemessagebox.h> - #include <kstandarddirs.h> + #include <tdestandarddirs.h> #include <kdebug.h> #include "userdefinedregexps.moc" #endif @@ -54,9 +54,9 @@ UserDefinedRegExps::UserDefinedRegExps( TQWidget *parent, const char *name ) setWidget( top ); slotPopulateUserRegexps(); - connect( _userDefined, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotLoad(TQListViewItem*)) ); - connect( _userDefined, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&, int )), - this, TQT_SLOT( slotEdit( TQListViewItem*, const TQPoint& ) ) ); + connect( _userDefined, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotLoad(TQListViewItem*)) ); + connect( _userDefined, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&, int )), + this, TQ_SLOT( slotEdit( TQListViewItem*, const TQPoint& ) ) ); } void UserDefinedRegExps::slotPopulateUserRegexps() diff --git a/kregexpeditor/userdefinedregexps.h b/kregexpeditor/userdefinedregexps.h index 1cbb989..0ec1be9 100644 --- a/kregexpeditor/userdefinedregexps.h +++ b/kregexpeditor/userdefinedregexps.h @@ -27,7 +27,7 @@ class RegExp; class UserDefinedRegExps :public TQDockWindow { -Q_OBJECT +TQ_OBJECT public: diff --git a/kregexpeditor/util.cpp b/kregexpeditor/util.cpp index dedccfc..8482f41 100644 --- a/kregexpeditor/util.cpp +++ b/kregexpeditor/util.cpp @@ -18,7 +18,7 @@ #include "util.h" #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> TQPixmap Util::getKRegExpEditorIcon( const TQString& name ) { #ifdef TQT_ONLY diff --git a/kregexpeditor/verifier.h b/kregexpeditor/verifier.h index abc6adf..952e216 100644 --- a/kregexpeditor/verifier.h +++ b/kregexpeditor/verifier.h @@ -25,7 +25,7 @@ class TQLabel; class SyntaxHighlighter; class Verifier :public TQTextEdit { -Q_OBJECT +TQ_OBJECT public: Verifier( TQWidget* parent, const char* name = 0 ); diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index eb756b2..d7950db 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -22,7 +22,7 @@ #else #include <tdelocale.h> #include "verifybuttons.moc" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kiconloader.h> #include <tdemessagebox.h> @@ -51,40 +51,40 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) TQWhatsThis::add( _verify, i18n("Shows what part of the regular expression is being matched in the <i>verifier window</i>." "(The window below the graphical editor window).")); layout->addWidget( _verify ); - connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) ); + connect( _verify, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( verify() ) ); TQToolButton* button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("document-open")) ); layout->addWidget( button ); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadText())); TQToolTip::add( button, i18n("Load text in the verifier window") ); button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("package_settings")) ); layout->addWidget( button ); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(configure())); TQToolTip::add( button, i18n("Settings") ); // It is currently not possible to ask for the paragraph being highlighted, thefore scrolling to next/prev match // do not work. Enable this when they work. // _first = new TQToolButton( TQString::fromLatin1("<<"), this); // layout->addWidget( _first ); - // connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst())); + // connect(_first, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoFirst())); // _first->setFixedWidth( 25 ); // // _prev = new TQToolButton(TQString::fromLatin1("<"), this); // layout->addWidget( _prev ); - // connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev())); + // connect(_prev, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoPrev())); // _prev->setFixedWidth( 20 ); // // _next = new TQToolButton(TQString::fromLatin1(">"), this); // layout->addWidget( _next ); - // connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext())); + // connect(_next, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoNext())); // _next->setFixedWidth( 20 ); // // _last = new TQToolButton(TQString::fromLatin1(">>"), this); // layout->addWidget( _last ); - // connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast())); + // connect(_last, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoLast())); // _last->setFixedWidth( 25 ); // Same as above @@ -102,12 +102,12 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) // TQt RegExpConverter* converter = new TQtRegExpConverter(); - _converters.append( tqMakePair( converter, static_cast<TQAction*>( 0 ) ) ); + _converters.append( qMakePair( converter, static_cast<TQAction*>( 0 ) ) ); TQString qtConverterName = converter->name(); // Emacs converter = new EmacsRegExpConverter(); - _converters.append( tqMakePair( converter, static_cast<TQAction*>( 0 ) ) ); + _converters.append( qMakePair( converter, static_cast<TQAction*>( 0 ) ) ); // -------------------------------------------------- Initialize the config menu @@ -117,8 +117,8 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) TQAction* autoVerify = new TQAction( i18n("Verify on the Fly"), 0, this ); autoVerify->setToggleAction( true ); autoVerify->setOn( true ); - connect( autoVerify, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( updateVerifyButton( bool ) ) ); - connect( autoVerify, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( autoVerify( bool ) ) ); + connect( autoVerify, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( updateVerifyButton( bool ) ) ); + connect( autoVerify, TQ_SIGNAL( toggled( bool ) ), this, TQ_SIGNAL( autoVerify( bool ) ) ); autoVerify->addTo( _configMenu ); autoVerify->setToolTip( i18n( "Toggle on-the-fly verification of regular expression" ) ); autoVerify->setWhatsThis( i18n( "Enabling this option will make the verifier update for each edit. " @@ -138,7 +138,7 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) (*it).second = action; } grp->addTo( languages ); - connect( grp, TQT_SIGNAL( selected( TQAction* ) ), this, TQT_SLOT( slotChangeSyntax( TQAction* ) ) ); + connect( grp, TQ_SIGNAL( selected( TQAction* ) ), this, TQ_SLOT( slotChangeSyntax( TQAction* ) ) ); _configMenu->setItemEnabled( _languageId, false ); // Select the TQt converter by default diff --git a/kregexpeditor/verifybuttons.h b/kregexpeditor/verifybuttons.h index f700643..2f43857 100644 --- a/kregexpeditor/verifybuttons.h +++ b/kregexpeditor/verifybuttons.h @@ -27,7 +27,7 @@ class TQPopupMenu; class VerifyButtons :public TQDockWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp index 42148d6..ee601c2 100644 --- a/ksim/generalprefs.cpp +++ b/ksim/generalprefs.cpp @@ -48,7 +48,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name) m_sizeBox = new TQGroupBox(this); m_sizeBox->setTitle(i18n("Graph Size")); - m_sizeBox->setColumnLayout(0, Qt::Horizontal); + m_sizeBox->setColumnLayout(0, TQt::Horizontal); TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->layout()); sizeBoxLayout->setSpacing(6); @@ -174,21 +174,21 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeCombo->insertItem(i18n("%dd %h:%m")); m_uptimeCombo->insertItem(i18n("Uptime: %h:%m:%s")); connect(m_uptimeCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(uptimeContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(uptimeContextMenu(TQPopupMenu *))); m_uptimeAdd = new TQPushButton(this); m_uptimeAdd->setPixmap(SmallIcon("go-down")); - connect(m_uptimeAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertUptimeItem())); + connect(m_uptimeAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertUptimeItem())); TQToolTip::add(m_uptimeAdd, i18n("Insert item")); m_uptimeCheck = new TQCheckBox(this); m_uptimeCheck->setText(i18n("Show uptime")); m_uptimeCheck->setChecked(true); - connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)), - m_uptimeCombo, TQT_SLOT(setEnabled(bool))); - connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)), - m_uptimeAdd, TQT_SLOT(setEnabled(bool))); + connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)), + m_uptimeCombo, TQ_SLOT(setEnabled(bool))); + connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)), + m_uptimeAdd, TQ_SLOT(setEnabled(bool))); m_mainLayout->addWidget(m_uptimeCheck); m_subLayout = new TQHBoxLayout; @@ -210,7 +210,7 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeBox = new TQGroupBox(this); m_uptimeBox->setTitle(i18n("Uptime Legend")); - m_uptimeBox->setColumnLayout(0, Qt::Vertical); + m_uptimeBox->setColumnLayout(0, TQt::Vertical); m_uptimeBox->layout()->setSpacing(0); m_uptimeBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_uptimeBox->layout()); @@ -273,9 +273,9 @@ void KSim::UptimePrefs::uptimeContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); menu->insertItem(m_addIcon, i18n("Insert Item"), - this, TQT_SLOT(insertUptimeItem())); + this, TQ_SLOT(insertUptimeItem())); menu->insertItem(m_removeIcon, i18n("Remove Item"), - this, TQT_SLOT(removeUptimeItem())); + this, TQ_SLOT(removeUptimeItem())); } void KSim::UptimePrefs::insertUptimeItem() @@ -310,21 +310,21 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) //m_memCombo->insertItem(i18n("%tM - %fM free")); //m_memCombo->insertItem(i18n("%tM - %uM used")); connect(m_memCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(memoryContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(memoryContextMenu(TQPopupMenu *))); m_memoryAdd = new TQPushButton(this); m_memoryAdd->setPixmap(SmallIcon("go-down")); - connect(m_memoryAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertMemoryItem())); + connect(m_memoryAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertMemoryItem())); TQToolTip::add(m_memoryAdd, i18n("Insert item")); m_memCheck = new TQCheckBox(this); m_memCheck->setText(i18n("Show memory and free memory")); m_memCheck->setChecked(false); - connect(m_memCheck, TQT_SIGNAL(toggled(bool)), - m_memCombo, TQT_SLOT(setEnabled(bool))); - connect(m_memCheck, TQT_SIGNAL(toggled(bool)), - m_memoryAdd, TQT_SLOT(setEnabled(bool))); + connect(m_memCheck, TQ_SIGNAL(toggled(bool)), + m_memCombo, TQ_SLOT(setEnabled(bool))); + connect(m_memCheck, TQ_SIGNAL(toggled(bool)), + m_memoryAdd, TQ_SLOT(setEnabled(bool))); m_mainLayout->addWidget(m_memCheck); m_subLayout = new TQHBoxLayout; @@ -346,7 +346,7 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) m_memBox = new TQGroupBox(this); m_memBox->setTitle(i18n("Memory Legend")); - m_memBox->setColumnLayout(0, Qt::Vertical); + m_memBox->setColumnLayout(0, TQt::Vertical); m_memBox->layout()->setSpacing(0); m_memBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_memBox->layout()); @@ -421,9 +421,9 @@ void KSim::MemoryPrefs::memoryContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); menu->insertItem(m_addIcon, i18n("Insert Item"), - this, TQT_SLOT(insertMemoryItem())); + this, TQ_SLOT(insertMemoryItem())); menu->insertItem(m_removeIcon, i18n("Remove Item"), - this, TQT_SLOT(removeMemoryItem())); + this, TQ_SLOT(removeMemoryItem())); } void KSim::MemoryPrefs::insertMemoryItem() @@ -464,20 +464,20 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) //m_swapCombo->insertItem(i18n("%tM - %uM used")); connect(m_swapCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(swapContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(swapContextMenu(TQPopupMenu *))); m_swapAdd = new TQPushButton(this); m_swapAdd->setPixmap(SmallIcon("go-down")); - connect(m_swapAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertSwapItem())); + connect(m_swapAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertSwapItem())); TQToolTip::add(m_swapAdd, i18n("Insert item")); m_subLayout = new TQHBoxLayout; m_subLayout->setSpacing(6); - connect(m_swapCheck, TQT_SIGNAL(toggled(bool)), - m_swapCombo, TQT_SLOT(setEnabled(bool))); - connect(m_swapCheck, TQT_SIGNAL(toggled(bool)), - m_swapAdd, TQT_SLOT(setEnabled(bool))); + connect(m_swapCheck, TQ_SIGNAL(toggled(bool)), + m_swapCombo, TQ_SLOT(setEnabled(bool))); + connect(m_swapCheck, TQ_SIGNAL(toggled(bool)), + m_swapAdd, TQ_SLOT(setEnabled(bool))); m_swapFormat = new TQLabel(this); m_swapFormat->setText(i18n("Swap format:")); @@ -495,7 +495,7 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) m_swapBox = new TQGroupBox(this); m_swapBox->setTitle(i18n("Swap Legend")); - m_swapBox->setColumnLayout(0, Qt::Vertical); + m_swapBox->setColumnLayout(0, TQt::Vertical); m_swapBox->layout()->setSpacing(0); m_swapBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_swapBox->layout()); @@ -553,8 +553,8 @@ void KSim::SwapPrefs::readConfig(KSim::Config *config) void KSim::SwapPrefs::swapContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); - menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQT_SLOT(insertSwapItem())); - menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQT_SLOT(removeSwapItem())); + menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQ_SLOT(insertSwapItem())); + menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQ_SLOT(removeSwapItem())); } void KSim::SwapPrefs::insertSwapItem() diff --git a/ksim/generalprefs.h b/ksim/generalprefs.h index 997cbac..e945c26 100644 --- a/ksim/generalprefs.h +++ b/ksim/generalprefs.h @@ -42,7 +42,7 @@ namespace KSim class GeneralPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: GeneralPrefs(TQWidget *parent, const char *name=0); @@ -65,7 +65,7 @@ namespace KSim class ClockPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ClockPrefs(TQWidget *parent, const char *name=0); @@ -83,7 +83,7 @@ namespace KSim class UptimePrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: UptimePrefs(TQWidget *parent, const char *name=0); @@ -118,7 +118,7 @@ namespace KSim class MemoryPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MemoryPrefs(TQWidget *parent, const char *name=0); @@ -155,7 +155,7 @@ namespace KSim class SwapPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SwapPrefs(TQWidget *parent, const char *name=0); diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index 4d70777..544c12e 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -36,7 +36,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) + TDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) { TDEGlobal::locale()->insertCatalogue("ksim"); return new KSim::PanelExtension(configFile, KPanelExtension::Normal, @@ -110,7 +110,7 @@ void KSim::PanelExtension::about() void KSim::PanelExtension::help() { - kapp->invokeHelp(TQString::null, "ksim"); + tdeApp->invokeHelp(TQString::null, "ksim"); } void KSim::PanelExtension::preferences() diff --git a/ksim/ksim.h b/ksim/ksim.h index 36903fb..50e0232 100644 --- a/ksim/ksim.h +++ b/ksim/ksim.h @@ -34,7 +34,7 @@ namespace KSim class PanelExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: PanelExtension( const TQString & configFile, Type type, diff --git a/ksim/ksimframe.h b/ksim/ksimframe.h index 87f5389..58a2b6b 100644 --- a/ksim/ksimframe.h +++ b/ksim/ksimframe.h @@ -33,7 +33,7 @@ namespace KSim */ class Frame : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: Frame(int type, TQWidget *parent, const char *name = 0); diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index 746c810..9a27429 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tqhbox.h> @@ -91,10 +91,10 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config, i18n("Theme Selector"), BarIcon("folder_image", TDEIcon::SizeSmall)); m_themePage = new KSim::ThemePrefs(theme); - connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs())); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(closePrefs())); - connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(loadPluginConfig())); - connect(parent, TQT_SIGNAL(reload()), TQT_SLOT(reload())); + connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(savePrefs())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(closePrefs())); + connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(loadPluginConfig())); + connect(parent, TQ_SIGNAL(reload()), TQ_SLOT(reload())); KSim::PluginList::ConstIterator it; const KSim::PluginList &pluginList = KSim::PluginLoader::self().pluginList(); @@ -164,8 +164,8 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin) plugin.configPage()->readConfig(); // TODO: implement this correctly one day -// connect (info.configPage(), TQT_SIGNAL(pageChanged()), -// this, TQT_SLOT(enableButtons())); +// connect (info.configPage(), TQ_SIGNAL(pageChanged()), +// this, TQ_SLOT(enableButtons())); } void KSim::ConfigDialog::savePrefs() diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h index 6eda8d9..502e71a 100644 --- a/ksim/ksimpref.h +++ b/ksim/ksimpref.h @@ -24,7 +24,7 @@ #include <tdelibs_export.h> class TQFrame; -class KDesktopFile; +class TDEDesktopFile; namespace KSim { class Config; @@ -70,9 +70,9 @@ namespace KSim ~ChangedPluginList() {} }; - class KDE_EXPORT ConfigDialog : public KDialogBase + class TDE_EXPORT ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(KSim::Config *config, TQWidget *parent, const char *name = 0); diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 1f204b7..e6b58e8 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -55,10 +55,10 @@ KSim::Sysinfo::Sysinfo(KSim::Config *config, //m_procsLabel = 0L; m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(clockUptimeUpdate())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(clockUptimeUpdate())); m_sysTimer = new TQTimer(this); - connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(sysUpdate())); + connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(sysUpdate())); createView(); } diff --git a/ksim/ksimsysinfo.h b/ksim/ksimsysinfo.h index 89b8598..1f9cc38 100644 --- a/ksim/ksimsysinfo.h +++ b/ksim/ksimsysinfo.h @@ -33,7 +33,7 @@ namespace KSim class Sysinfo : public TQWidget, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 5e83641..67379c5 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -40,9 +40,9 @@ #include <tdeapplication.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <twin.h> #include <krun.h> @@ -140,8 +140,8 @@ KSim::MainView::MainView(TDEConfig *config, m_sizeLayout->addWidget(m_rightFrame); connect(&KSim::PluginLoader::self(), - TQT_SIGNAL(pluginLoaded(const KSim::Plugin &)), - this, TQT_SLOT(addMonitor(const KSim::Plugin &))); + TQ_SIGNAL(pluginLoaded(const KSim::Plugin &)), + this, TQ_SLOT(addMonitor(const KSim::Plugin &))); KSim::ThemeLoader::self().themeColours(this); @@ -150,7 +150,7 @@ KSim::MainView::MainView(TDEConfig *config, addPlugins(); } - connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView())); + connect(&m_maskTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMaskMainView())); } KSim::MainView::~MainView() @@ -278,7 +278,7 @@ void KSim::MainView::reparseConfig(bool emitReload, if (!(*plugin).isDifferent() && (*plugin).isEnabled()) { kdDebug(2003) << "Recreating " << (*plugin).name() << "'s view" << endl; - kapp->processEvents(); + tdeApp->processEvents(); // Make sure the plugins background color is // set to the correct theme color if (themeChanged && (*plugin).view()) @@ -299,13 +299,13 @@ void KSim::MainView::reparseConfig(bool emitReload, for (it = list.begin(); it != list.end(); ++it) { if ((*it).isDifferent()) { if ((*it).isEnabled()) { // Go through the added/removed plugins and load/unload them - const KDesktopFile kdf((*it).filename()); + const TDEDesktopFile kdf((*it).filename()); addPlugin(kdf); m_prefDialog->createPage((*it).libName()); } else { m_prefDialog->removePage((*it).libName()); - const KDesktopFile kdf((*it).filename()); + const TDEDesktopFile kdf((*it).filename()); removePlugin(kdf); } } @@ -334,19 +334,19 @@ void KSim::MainView::addPlugins() TQStringList::ConstIterator it; for (it = locatedFiles.begin(); it != locatedFiles.end(); ++it) { - const KDesktopFile kdf(*it, true); + const TDEDesktopFile kdf(*it, true); addPlugin(kdf); } } -void KSim::MainView::addPlugin(const KDesktopFile &file, bool force) +void KSim::MainView::addPlugin(const TDEDesktopFile &file, bool force) { if (force || m_config->enabledMonitor(file.readEntry("X-KSIM-LIBRARY"))) KSim::PluginLoader::self().loadPlugin(file); } // provided for convenience -void KSim::MainView::removePlugin(const KDesktopFile &file) +void KSim::MainView::removePlugin(const TDEDesktopFile &file) { KSim::PluginLoader::self().unloadPlugin(file.readEntry("X-KSIM-LIBRARY").local8Bit()); } @@ -371,8 +371,8 @@ void KSim::MainView::addMonitor(const KSim::Plugin &plugin) // kdDebug(2003) << "m_oldLocation: " << m_oldLocation << endl; // kdDebug(2003) << "location: " << location << endl; m_pluginLayout->addWidget(plugin.view()); - connect(plugin.view(), TQT_SIGNAL(runCommand(const TQCString &)), - TQT_SLOT(runCommand(const TQCString &))); + connect(plugin.view(), TQ_SIGNAL(runCommand(const TQCString &)), + TQ_SLOT(runCommand(const TQCString &))); // if (location > m_oldLocation) // m_oldLocation = location; @@ -393,8 +393,8 @@ void KSim::MainView::preferences() { if (m_prefDialog == 0L) { m_prefDialog = new KSim::ConfigDialog(m_config, this, "m_prefDialog"); - connect(m_prefDialog, TQT_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), - this, TQT_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); + connect(m_prefDialog, TQ_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), + this, TQ_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); } m_prefDialog->exec(); @@ -458,9 +458,9 @@ TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const return TQSize(width, height); } -void KSim::MainView::positionChange(Qt::Orientation o) +void KSim::MainView::positionChange(TQt::Orientation o) { - if (o == Qt::Vertical) + if (o == TQt::Vertical) m_pluginLayout->setDirection(TQBoxLayout::TopToBottom); else m_pluginLayout->setDirection(TQBoxLayout::LeftToRight); diff --git a/ksim/ksimview.h b/ksim/ksimview.h index 7495076..0ac2885 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -32,7 +32,7 @@ class TQBoxLayout; class TQHBoxLayout; class TQVBoxLayout; class TQPopupMenu; -class KDesktopFile; +class TDEDesktopFile; class TDEConfig; namespace KSim @@ -46,9 +46,9 @@ namespace KSim class ConfigDialog; class ChangedPluginList; - class KDE_EXPORT MainView : public TQWidget, virtual public DCOPObject + class TDE_EXPORT MainView : public TQWidget, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: @@ -64,7 +64,7 @@ namespace KSim void makeDirs(); TQSize sizeHint(KPanelExtension::Position, TQSize maxSize) const; - void positionChange(Qt::Orientation); + void positionChange(TQt::Orientation); k_dcop: const TQString &hostname() const; @@ -76,8 +76,8 @@ namespace KSim public slots: void reparseConfig(bool, const KSim::ChangedPluginList &); void addPlugins(); - void addPlugin(const KDesktopFile &, bool force = false); - void removePlugin(const KDesktopFile &); + void addPlugin(const TDEDesktopFile &, bool force = false); + void removePlugin(const TDEDesktopFile &); void addMonitor(const KSim::Plugin &); void runCommand(const TQCString &); void preferences(); diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index 9995769..8f07f30 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -49,8 +49,8 @@ class KSim::Chart::Timer tqAddPostRoutine(cleanup); } - TQObject::connect(m_timer, TQT_SIGNAL(timeout()), - chart, TQT_SLOT(updateDisplay())); + TQObject::connect(m_timer, TQ_SIGNAL(timeout()), + chart, TQ_SLOT(updateDisplay())); } static void disconnect(KSim::Chart *chart) @@ -58,8 +58,8 @@ class KSim::Chart::Timer if (!m_timer) return; - TQObject::disconnect(m_timer, TQT_SIGNAL(timeout()), - chart, TQT_SLOT(updateDisplay())); + TQObject::disconnect(m_timer, TQ_SIGNAL(timeout()), + chart, TQ_SLOT(updateDisplay())); } private: @@ -373,7 +373,7 @@ void KSim::Chart::setMaxValue(int maxValue) void KSim::Chart::setValue(int valueIn, int valueOut) { - d->values.prepend(tqMakePair(range(valueIn), range(valueOut))); + d->values.prepend(qMakePair(range(valueIn), range(valueOut))); if (d->variableGraphs) { d->maxValues.prepend(valueIn > valueOut ? valueIn : valueOut); diff --git a/ksim/library/chart.h b/ksim/library/chart.h index e2e7494..620e6ad 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include "common.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQColor; @@ -33,9 +33,9 @@ namespace KSim * provides a graph displaying data onscreen using gkrellm themes * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Chart : public TQWidget, public KSim::Base + class TDE_EXPORT Chart : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: enum DataType { DataIn = 0, DataOut }; diff --git a/ksim/library/common.h b/ksim/library/common.h index 9fc01c0..42d6faf 100644 --- a/ksim/library/common.h +++ b/ksim/library/common.h @@ -24,7 +24,7 @@ #define KSIM_VERSION_STRING "1.1.0" #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> /** * namespace for common ksim entries @@ -72,7 +72,7 @@ namespace KSim * @short base class for widgets * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Base + class TDE_EXPORT Base { public: Base(); diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp index b781630..d0ff3cc 100644 --- a/ksim/library/ksimconfig.cpp +++ b/ksim/library/ksimconfig.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeglobal.h> diff --git a/ksim/library/ksimconfig.h b/ksim/library/ksimconfig.h index 8f7376d..b7e777b 100644 --- a/ksim/library/ksimconfig.h +++ b/ksim/library/ksimconfig.h @@ -24,7 +24,7 @@ #include <tqpoint.h> #include <tqfont.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; @@ -33,7 +33,7 @@ namespace KSim /** * @internal */ - class KDE_EXPORT Config + class TDE_EXPORT Config { public: Config(TDEConfig *config); diff --git a/ksim/library/label.h b/ksim/library/label.h index dce2adc..0ae9f65 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include "common.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KSim { @@ -34,9 +34,9 @@ namespace KSim * @short Label widget * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Label : public TQWidget, public KSim::Base + class TDE_EXPORT Label : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/led.h b/ksim/library/led.h index 510f959..8d5e0f8 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -21,7 +21,7 @@ #define KSIM__LED_H #include "progress.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <tqpixmap.h> namespace KSim @@ -34,7 +34,7 @@ namespace KSim * @short led using gkrellm themes * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Led : public TQPixmap + class TDE_EXPORT Led : public TQPixmap { public: enum Type { First = 0, Second }; @@ -104,9 +104,9 @@ namespace KSim * @short Label widget with 2 leds * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT LedLabel : public KSim::Progress + class TDE_EXPORT LedLabel : public KSim::Progress { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/pluginglobal.cpp b/ksim/library/pluginglobal.cpp index 4d176bf..eb6d58f 100644 --- a/ksim/library/pluginglobal.cpp +++ b/ksim/library/pluginglobal.cpp @@ -21,7 +21,7 @@ #include "pluginmodule.h" #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include <kiconloader.h> @@ -75,7 +75,7 @@ KSim::Plugin::Plugin() : d(0) { } -KSim::Plugin::Plugin(KSim::PluginObject *plugin, const KDesktopFile &file) +KSim::Plugin::Plugin(KSim::PluginObject *plugin, const TDEDesktopFile &file) { init(plugin, file); @@ -190,7 +190,7 @@ KSim::PluginPage *KSim::Plugin::configPage() const return d ? d->page : 0; } -void KSim::Plugin::init(KSim::PluginObject *plugin, const KDesktopFile &file) +void KSim::Plugin::init(KSim::PluginObject *plugin, const TDEDesktopFile &file) { if (!plugin || file.fileName().isEmpty()) { d = 0; diff --git a/ksim/library/pluginglobal.h b/ksim/library/pluginglobal.h index e094198..cc1f7be 100644 --- a/ksim/library/pluginglobal.h +++ b/ksim/library/pluginglobal.h @@ -24,9 +24,9 @@ #include <tqpixmap.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDesktopFile; +class TDEDesktopFile; namespace KSim { @@ -38,7 +38,7 @@ namespace KSim * A class that holds various information about a plugin * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Plugin + class TDE_EXPORT Plugin { public: /** @@ -48,7 +48,7 @@ namespace KSim /** * Constructs a Plugin */ - Plugin(KSim::PluginObject *plugin, const KDesktopFile &file); + Plugin(KSim::PluginObject *plugin, const TDEDesktopFile &file); /** * Copy constructor */ @@ -124,7 +124,7 @@ namespace KSim */ static KSim::Plugin null; private: - void init(KSim::PluginObject *plugin, const KDesktopFile &file); + void init(KSim::PluginObject *plugin, const TDEDesktopFile &file); class Private; Private *d; @@ -135,7 +135,7 @@ namespace KSim * use pluginList() from KSim::PluginLoader instead * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginList : public TQValueList<Plugin> + class TDE_EXPORT PluginList : public TQValueList<Plugin> { public: /** diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp index 9518bbb..35ea3fb 100644 --- a/ksim/library/pluginloader.cpp +++ b/ksim/library/pluginloader.cpp @@ -22,10 +22,10 @@ #include <kdebug.h> #include <klibloader.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tqstringlist.h> @@ -86,7 +86,7 @@ KSim::PluginLoader::~PluginLoader() delete d; } -bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file) +bool KSim::PluginLoader::loadPlugin(const TDEDesktopFile &file) { switch (createPlugin(file)) { case KSim::PluginLoader::EmptyLibName: @@ -174,7 +174,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { - KDesktopFile file((*it)); + TDEDesktopFile file((*it)); if (file.readName() == name) { location = (*it); break; @@ -186,7 +186,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { - KDesktopFile file((*it)); + TDEDesktopFile file((*it)); if (file.readEntry("X-KSIM-LIBRARY") == name) { location = (*it); break; @@ -195,7 +195,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, break; } case DesktopFile: { - if (!KDesktopFile::isDesktopFile(name)) + if (!TDEDesktopFile::isDesktopFile(name)) return KSim::PluginInfo(); location = name; @@ -203,7 +203,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, } } - KDesktopFile file(location); + TDEDesktopFile file(location); KSim::PluginInfo info; info.m_name = file.readName(); info.m_libName = file.readEntry("X-KSIM-LIBRARY").local8Bit(); @@ -292,7 +292,7 @@ void KSim::PluginLoader::cleanup() m_instance = 0; } -KSim::PluginLoader::ErrorCode KSim::PluginLoader::createPlugin(const KDesktopFile &file) +KSim::PluginLoader::ErrorCode KSim::PluginLoader::createPlugin(const TDEDesktopFile &file) { d->error = TQString(); TQCString pluginName(file.readEntry("X-KSIM-LIBRARY").local8Bit()); diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h index 912297c..1dcd822 100644 --- a/ksim/library/pluginloader.h +++ b/ksim/library/pluginloader.h @@ -23,11 +23,11 @@ #include "pluginglobal.h" #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KSim { - class KDE_EXPORT PluginInfo + class TDE_EXPORT PluginInfo { friend class PluginLoader; public: @@ -61,9 +61,9 @@ namespace KSim * Provides a loader for the plugins * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginLoader : public TQObject + class TDE_EXPORT PluginLoader : public TQObject { - Q_OBJECT + TQ_OBJECT friend class MainView; public: @@ -78,7 +78,7 @@ namespace KSim /** * loads a plugin, example: * <pre> - * KDesktopFile deskfile("/home/user/foo.desktop"); + * TDEDesktopFile deskfile("/home/user/foo.desktop"); * KSim::PluginLoader::self().loadPlugin(deskFile); * </pre> * you can then use @ref pluginList() to access the plugin, view, @@ -86,7 +86,7 @@ namespace KSim * @param file is the desktop file of the lib * @return true if the plugin is successfully loaded */ - bool loadPlugin(const KDesktopFile &file); + bool loadPlugin(const TDEDesktopFile &file); /** * unloads a loaded plugin and removes plugin entries from pluginList() */ @@ -174,7 +174,7 @@ namespace KSim * Deletes the instance and cleans up after itself */ static void cleanup(); - ErrorCode createPlugin(const KDesktopFile &file); + ErrorCode createPlugin(const TDEDesktopFile &file); class Private; Private *d; diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index 7f450de..18aff4a 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -50,7 +50,7 @@ KSim::PluginObject::~PluginObject() const char *KSim::PluginObject::instanceName() const { - return kapp->aboutData()->appName(); + return tdeApp->aboutData()->appName(); } const TQCString &KSim::PluginObject::name() const @@ -123,7 +123,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) d->parent = parent; d->popupMenu = new TQPopupMenu(this); d->popupMenu->insertItem(i18n("About"), this, - TQT_SLOT(showAbout()), 0, -1, 0); + TQ_SLOT(showAbout()), 0, -1, 0); if (parent && !parent->configFileName().isEmpty()) d->config = new TDEConfig(parent->configFileName() + "rc"); @@ -159,7 +159,7 @@ void KSim::PluginView::doCommand() void KSim::PluginView::mousePressEvent(TQMouseEvent *ev) { - if (ev->button() == Qt::LeftButton) + if (ev->button() == TQt::LeftButton) doCommand(); } diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h index b93a98e..8ab04e7 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -22,14 +22,14 @@ #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQPopupMenu; class TDEConfig; #define KSIM_INIT_PLUGIN(className) \ extern "C" { \ - KDE_EXPORT KSim::PluginObject *init_plugin(const char *name) { \ + TDE_EXPORT KSim::PluginObject *init_plugin(const char *name) { \ return new className(name); \ } \ } @@ -50,7 +50,7 @@ namespace KSim * @see KSim::PluginView KSim::PluginPage * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginObject + class TDE_EXPORT PluginObject { public: /** @@ -111,9 +111,9 @@ namespace KSim * the config() to gain access to your config file * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginPage : public TQWidget + class TDE_EXPORT PluginPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -160,9 +160,9 @@ namespace KSim * when apply or ok gets clicked in the config dialog * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginView : public TQWidget + class TDE_EXPORT PluginView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/progress.h b/ksim/library/progress.h index c857000..88939d1 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -22,7 +22,7 @@ #include "label.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KSim { @@ -30,9 +30,9 @@ namespace KSim * provides a label with a progress bar meter * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Progress : public KSim::Label + class TDE_EXPORT Progress : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: enum ProgressType { Panel, Meter }; diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index 5bc4038..c1eb655 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -33,9 +33,9 @@ #include <tqbitmap.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> class KSim::Theme::Private diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h index c70dc92..a7a2804 100644 --- a/ksim/library/themeloader.h +++ b/ksim/library/themeloader.h @@ -26,7 +26,7 @@ #include <tqfont.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQStringList; template<class> class TQValueVector; @@ -44,7 +44,7 @@ namespace KSim * @author Robbie Ward <linuxphreak@gmx.co.uk> * @short Provides a loader for the themes */ - class KDE_EXPORT Theme + class TDE_EXPORT Theme { friend class ThemeLoader; public: @@ -397,7 +397,7 @@ namespace KSim * @author Robbie Ward <linuxphreak@gmx.co.uk> * @short Provides a loader for the themes */ - class KDE_EXPORT ThemeLoader + class TDE_EXPORT ThemeLoader { public: /** diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp index 5f982a6..88a2105 100644 --- a/ksim/monitorprefs.cpp +++ b/ksim/monitorprefs.cpp @@ -22,8 +22,8 @@ #include <tdelocale.h> #include <tdeglobal.h> -#include <kdesktopfile.h> -#include <kstandarddirs.h> +#include <tdedesktopfile.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <ksimconfig.h> @@ -49,7 +49,7 @@ KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name) m_locatedFiles.sort(); TQStringList::ConstIterator it; for (it = m_locatedFiles.begin(); it != m_locatedFiles.end(); ++it) { - KDesktopFile file((*it), true); + TDEDesktopFile file((*it), true); (void)(new TQCheckListItem(this, file.readName(), TQCheckListItem::CheckBox))->setText(1, file.readComment()); } diff --git a/ksim/monitorprefs.h b/ksim/monitorprefs.h index 477210d..26f6d7b 100644 --- a/ksim/monitorprefs.h +++ b/ksim/monitorprefs.h @@ -29,7 +29,7 @@ namespace KSim class MonitorPrefs : public TDEListView { - Q_OBJECT + TQ_OBJECT public: MonitorPrefs(TQWidget *parent, const char *name=0); diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index af6074c..c3eca2a 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -94,7 +94,7 @@ KSim::PluginPage *CpuPlugin::createConfigPage(const char *className) void CpuPlugin::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim CPU Plugin"), version.latin1(), @@ -126,7 +126,7 @@ CpuView::CpuView(KSim::PluginObject *parent, const char *name) addDisplay(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateView())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateView())); m_timer->start(CPU_SPEED); updateView(); } @@ -372,8 +372,8 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_listView->addColumn(i18n("Chart Format")); m_listView->setAllColumnsShowFocus(true); m_listView->setSelectionMode(TQListView::Single); - connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); mainLayout->addWidget( m_listView ); @@ -386,12 +386,12 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); layout->addWidget( m_modify ); mainLayout->addLayout( layout ); m_legendBox = new TQGroupBox(this); - m_legendBox->setColumnLayout(0, Qt::Vertical); + m_legendBox->setColumnLayout(0, TQt::Vertical); m_legendBox->setTitle(i18n("Chart Legend")); m_legendBox->layout()->setSpacing(0); m_legendBox->layout()->setMargin(0); diff --git a/ksim/monitors/cpu/ksimcpu.h b/ksim/monitors/cpu/ksimcpu.h index 1ca3fca..9f9dd99 100644 --- a/ksim/monitors/cpu/ksimcpu.h +++ b/ksim/monitors/cpu/ksimcpu.h @@ -51,7 +51,7 @@ class CpuPlugin : public KSim::PluginObject class CpuView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: CpuView(KSim::PluginObject *parent, const char *name); @@ -200,7 +200,7 @@ class CpuView : public KSim::PluginView class CpuConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: CpuConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index d3a3827..47b478a 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -90,7 +90,7 @@ KSim::PluginPage *DiskPlugin::createConfigPage(const char *className) void DiskPlugin::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Disk Plugin"), version.latin1(), @@ -126,7 +126,7 @@ DiskView::DiskView(KSim::PluginObject *parent, const char *name) init(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateDisplay())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateDisplay())); m_timer->start(DISK_SPEED); updateDisplay(); } @@ -491,12 +491,12 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) m_add = new TQPushButton(this); m_add->setText(i18n("Add...")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); layout->addWidget(m_add); m_remove = new TQPushButton(this); m_remove->setText(i18n("Remove")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); layout->addWidget(m_remove); m_layout->addLayout(layout); diff --git a/ksim/monitors/disk/ksimdisk.h b/ksim/monitors/disk/ksimdisk.h index 3cf62d1..079efbe 100644 --- a/ksim/monitors/disk/ksimdisk.h +++ b/ksim/monitors/disk/ksimdisk.h @@ -54,7 +54,7 @@ class DiskPlugin : public KSim::PluginObject class DiskView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: DiskView(KSim::PluginObject *parent, const char *name); @@ -131,7 +131,7 @@ class DiskView : public KSim::PluginView class DiskConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: DiskConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index 5c1cf3a..045e2ad 100644 --- a/ksim/monitors/filesystem/filesystemstats.cpp +++ b/ksim/monitors/filesystem/filesystemstats.cpp @@ -175,12 +175,7 @@ FilesystemStats::List FilesystemStats::readEntries() Entry entry; entry.dir = sfs[i].f_mntonname; entry.fsname = sfs[i].f_mntfromname; - -#ifdef __osf__ - entry.type = getvfsbynumber(sfs[i].f_type); -#else entry.type = sfs[i].f_fstypename; -#endif list.append( entry ); } diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 2fb77e1..82f3f7b 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <tqcursor.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <kiconloader.h> @@ -141,7 +141,7 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) while ((filesystem = it.current()) != 0) { ++it; - if (TQT_BASE_OBJECT(filesystem->display()) == TQT_BASE_OBJECT(o)) { + if (filesystem->display() == o) { progressBar = filesystem->display(); break; } @@ -149,15 +149,15 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) ++i; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(progressBar) && e->type() == TQEvent::MouseButtonPress) + if (o == progressBar && e->type() == TQEvent::MouseButtonPress) { - switch(TQT_TQMOUSEEVENT(e)->button()) { - case Qt::RightButton: + switch(static_cast<TQMouseEvent*>(e)->button()) { + case TQt::RightButton: showMenu(i); break; default: break; - case Qt::LeftButton: + case TQt::LeftButton: if (parentWidget()->inherits("KSim::PluginView")) static_cast<KSim::PluginView *>(parentWidget())->doCommand(); break; @@ -200,11 +200,11 @@ void FilesystemWidget::createProcess(const TQString &command, const TQString &po { m_process = new TDEProcess(); connect(m_process, - TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); connect(m_process, - TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(processExited(TDEProcess *))); + TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(processExited(TDEProcess *))); (*m_process) << command << point; void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)); diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h index 2a8f116..6e7f330 100644 --- a/ksim/monitors/filesystem/filesystemwidget.h +++ b/ksim/monitors/filesystem/filesystemwidget.h @@ -29,7 +29,7 @@ class TQVBoxLayout; class FilesystemWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FilesystemWidget(TQWidget *parent, const char *name); diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h index fe37957..8322bcd 100644 --- a/ksim/monitors/filesystem/fsystemconfig.h +++ b/ksim/monitors/filesystem/fsystemconfig.h @@ -32,7 +32,7 @@ class TQListBoxItem; class FsystemConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: FsystemConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 278a891..1f95a08 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -64,7 +64,7 @@ KSim::PluginPage *PluginModule::createConfigPage(const char *className) void PluginModule::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim FileSystem Plugin"), version.latin1(), @@ -100,7 +100,7 @@ Fsystem::Fsystem(KSim::PluginObject *parent, const char *name) createFreeInfo(); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateFS())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateFS())); m_updateTimer->start(config()->readNumEntry("updateValue", 60) * 1000); } @@ -193,7 +193,7 @@ Fsystem::MountEntryList Fsystem::makeList(const TQStringList &list) const TQStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { splitList = TQStringList::split(":", (*it)); - newList.append(tqMakePair(splitList[0], splitList[1])); + newList.append(qMakePair(splitList[0], splitList[1])); } return newList; diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h index 1583ba1..63e192c 100644 --- a/ksim/monitors/filesystem/ksimfsystem.h +++ b/ksim/monitors/filesystem/ksimfsystem.h @@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject class Fsystem : public KSim::PluginView, public FsystemIface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 21d0c9e..1b6c0b3 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -59,7 +59,7 @@ KSim::PluginPage *I8KPlugin::createConfigPage(const char *className) void I8KPlugin::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim I8K Plugin"), version.latin1(), @@ -121,7 +121,7 @@ void I8KView::openStream() { m_procStream = new TQTextIStream( m_procFile ); disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateView() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateView() ) ); m_timer->start( m_interval*1000 ); kdDebug( 2003 ) << "i8k: Success" << endl; @@ -130,7 +130,7 @@ void I8KView::openStream() { // i8k module is not loaded. Try again after 30 secs. disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( openStream() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( openStream() ) ); m_timer->start( 30*1000 ); kdDebug( 2003 ) << "i8k: Failed...retry after 30 secs" << endl; } diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h index e7eb3df..492af64 100644 --- a/ksim/monitors/i8k/ksimi8k.h +++ b/ksim/monitors/i8k/ksimi8k.h @@ -49,7 +49,7 @@ class I8KPlugin : public KSim::PluginObject class I8KView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: I8KView(KSim::PluginObject *parent, const char *name); @@ -81,7 +81,7 @@ class I8KView : public KSim::PluginView class I8TDEConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: I8TDEConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/lm_sensors/NVCtrl.c b/ksim/monitors/lm_sensors/NVCtrl.c index 6c61b8a..fe5b5c4 100644 --- a/ksim/monitors/lm_sensors/NVCtrl.c +++ b/ksim/monitors/lm_sensors/NVCtrl.c @@ -38,8 +38,8 @@ static const char *nvctrl_extension_name = NV_CONTROL_NAME; #define XNVCTRLSimpleCheckExtension(dpy,i) \ XextSimpleCheckExtension (dpy, i, nvctrl_extension_name) -static int close_display(); -static Bool wire_to_event(); +static int close_display(Display*, XExtCodes*); +static Bool wire_to_event(Display*, XEvent*, xEvent*); static const XExtensionHooks nvctrl_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index 9514bc5..d696c92 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -58,7 +58,7 @@ KSim::PluginPage *PluginModule::createConfigPage(const char *className) void PluginModule::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Sensors Plugin"), version.latin1(), @@ -77,8 +77,8 @@ SensorsView::SensorsView(KSim::PluginObject *parent, const char *name) config()->setGroup("Sensors"); (new TQVBoxLayout(this))->setAutoAdd(true); - connect(SensorBase::self(), TQT_SIGNAL(updateSensors(const SensorList &)), - this, TQT_SLOT(updateSensors(const SensorList &))); + connect(SensorBase::self(), TQ_SIGNAL(updateSensors(const SensorList &)), + this, TQ_SLOT(updateSensors(const SensorList &))); insertSensors(); } diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h index 9c1e801..f53082d 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.h +++ b/ksim/monitors/lm_sensors/ksimsensors.h @@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject class SensorsView : public KSim::PluginView, public KSimSensorsIface { - Q_OBJECT + TQ_OBJECT public: SensorsView(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index c81ad56..2852134 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -25,7 +25,7 @@ #include <tdelocale.h> #include <tqglobal.h> #include <klibloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tqtimer.h> @@ -76,7 +76,7 @@ SensorBase::SensorBase() : TQObject() } m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(update())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(update())); } SensorBase::~SensorBase() diff --git a/ksim/monitors/lm_sensors/sensorbase.h b/ksim/monitors/lm_sensors/sensorbase.h index 948a09b..8882920 100644 --- a/ksim/monitors/lm_sensors/sensorbase.h +++ b/ksim/monitors/lm_sensors/sensorbase.h @@ -90,7 +90,7 @@ class SensorList : public TQValueList<SensorInfo> class SensorBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: static SensorBase *self(); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 1a1f4a1..e8afb88 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -67,18 +67,18 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) m_sensorView->setColumnWidth(1, 60); m_sensorView->setColumnWidth(2, 80); m_sensorView->setAllColumnsShowFocus(true); - connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *, - TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *, + connect(m_sensorView, TQ_SIGNAL(contextMenu(TDEListView *, + TQListViewItem *, const TQPoint &)), this, TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_sensorView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); m_layout->addMultiCellWidget(m_sensorView, 1, 1, 0, 3); m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); m_layout->addMultiCellWidget( m_modify, 2, 2, 3, 3 ); m_fahrenBox = new TQCheckBox(i18n("Display Fahrenheit"), this); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.h b/ksim/monitors/lm_sensors/sensorsconfig.h index dff799e..7922433 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.h +++ b/ksim/monitors/lm_sensors/sensorsconfig.h @@ -35,7 +35,7 @@ class TQTimer; class SensorsConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: SensorsConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index bf67d46..fdfc977 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -93,7 +93,7 @@ MailLabel::MailLabel( TQWidget* parent ) // label->setPixmap( KSim::ThemeLoader::self().current().krellMail() ); configureObject( false ); TQTimer* timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( animation() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( animation() ) ); timer->start( 100 ); } diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h index d40ee33..1d1ff80 100644 --- a/ksim/monitors/mail/ksimmail.h +++ b/ksim/monitors/mail/ksimmail.h @@ -38,7 +38,7 @@ public: class MailView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: MailView( KSim::PluginObject* parent, const char* name ); @@ -52,7 +52,7 @@ private slots: class MailLabel : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: MailLabel( TQWidget* parent ); @@ -78,7 +78,7 @@ private: class MailConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: MailConfig( KSim::PluginObject* parent, const char* name ); diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index 065797d..a066c6e 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -47,7 +47,7 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 }; #include <tdelocale.h> #include <tdeaboutapplication.h> #include <tdeaboutdata.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobal.h> #include <krun.h> #include <tdeapplication.h> @@ -84,7 +84,7 @@ KSim::PluginPage *NetPlugin::createConfigPage(const char *className) void NetPlugin::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Net Plugin"), version.latin1(), @@ -119,11 +119,11 @@ NetView::NetView(KSim::PluginObject *parent, const char *name) addDisplay(); m_netTimer = new TQTimer(this); - connect(m_netTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph())); + connect(m_netTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph())); m_netTimer->start(NET_UPDATE); m_lightTimer = new TQTimer(this); - connect(m_lightTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateLights())); + connect(m_lightTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateLights())); m_lightTimer->start(LED_UPDATE); updateGraph(); @@ -444,10 +444,10 @@ TQPopupMenu *NetView::addPopupMenu(const TQString &device, int value) { TQPopupMenu *popup = new TQPopupMenu(this); popup->insertItem(SmallIcon("network"), i18n("Connect"), this, - TQT_SLOT(runConnectCommand(int)), 0, 1); + TQ_SLOT(runConnectCommand(int)), 0, 1); popup->setItemParameter(1, value); popup->insertItem(SmallIcon("network"), i18n("Disconnect"), this, - TQT_SLOT(runDisconnectCommand(int)), 0, 2); + TQ_SLOT(runDisconnectCommand(int)), 0, 2); popup->setItemParameter(2, value); menu()->insertItem(device, popup, 100 + value); return popup; @@ -632,7 +632,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e ) Network::List::Iterator it; for ( it = m_networkList.begin(); it != m_networkList.end(); ++it ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).chart()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).label()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).led()) ) + if ( o == ( *it ).chart() || o == ( *it ).label() || o == ( *it ).led() ) { break; } @@ -642,7 +642,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e ) if ( e->type() == TQEvent::MouseButtonPress ) { - if ( TQT_TQMOUSEEVENT( e )->button() == Qt::RightButton ) + if ( static_cast<TQMouseEvent*>( e )->button() == TQt::RightButton ) { showMenu(i); } diff --git a/ksim/monitors/net/ksimnet.h b/ksim/monitors/net/ksimnet.h index 5da4165..c699112 100644 --- a/ksim/monitors/net/ksimnet.h +++ b/ksim/monitors/net/ksimnet.h @@ -42,7 +42,7 @@ class NetPlugin : public KSim::PluginObject class NetView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: NetView(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index eb2c1a3..d05cc38 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -22,7 +22,7 @@ #include <tqcursor.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> @@ -49,11 +49,11 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) usingBox ->addColumn(i18n("Commands")); usingBox->setAllColumnsShowFocus(true); - connect(usingBox, TQT_SIGNAL(contextMenu(TDEListView *, + connect(usingBox, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - TQT_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_SLOT(modifyItem(TQListViewItem *))); + TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(usingBox, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + TQ_SLOT(modifyItem(TQListViewItem *))); mainLayout->addWidget(usingBox); layout = new TQHBoxLayout; @@ -65,17 +65,17 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) insertButton = new TQPushButton(this); insertButton->setText(i18n("Add...")); - connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog())); + connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(showNetDialog())); layout->addWidget(insertButton); modifyButton = new TQPushButton(this); modifyButton->setText(i18n("Modify...")); - connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent())); + connect(modifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(modifyCurrent())); layout->addWidget(modifyButton); removeButton = new TQPushButton(this); removeButton->setText(i18n("Remove")); - connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeCurrent())); layout->addWidget(removeButton); mainLayout->addLayout(layout); diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h index 2a62158..6e43933 100644 --- a/ksim/monitors/net/netconfig.h +++ b/ksim/monitors/net/netconfig.h @@ -32,7 +32,7 @@ class TQListViewItem; class NetConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: NetConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index 21d6236..5066541 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -53,7 +53,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) : TQTabDialog(parent, name, true) { m_clicked = false; - setCaption(kapp->makeStdCaption(i18n("Network Interface"))); + setCaption(tdeApp->makeStdCaption(i18n("Network Interface"))); m_generalTab = new TQWidget(this); m_generalLayout = new TQGridLayout(m_generalTab); @@ -85,7 +85,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_timerBox = new TQGroupBox(m_generalTab); m_timerBox->setTitle(i18n("Timer")); - m_timerBox->setColumnLayout(0, Qt::Vertical); + m_timerBox->setColumnLayout(0, TQt::Vertical); m_timerBox->layout()->setSpacing(0); m_timerBox->layout()->setMargin(0); m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout()); @@ -99,8 +99,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_showTimer = new TQCheckBox(m_timerBox); m_showTimer->setText(i18n("Show timer")); - connect(m_showTimer, TQT_SIGNAL(toggled(bool)), - m_timerEdit, TQT_SLOT(setEnabled(bool))); + connect(m_showTimer, TQ_SIGNAL(toggled(bool)), + m_timerEdit, TQ_SLOT(setEnabled(bool))); m_timerBoxLayout->addWidget(m_showTimer); m_timerBoxLayout->addWidget(m_timerEdit); @@ -138,8 +138,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_connectRequester = new KURLRequester(m_commandTab); m_connectRequester->setMinimumSize(145, 0); m_connectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_connectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_connectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_connectRequester, 1, 1, 1, 2); m_dCommand = new TQLabel(m_commandTab); @@ -149,8 +149,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_disconnectRequester = new KURLRequester(m_commandTab); m_disconnectRequester->setMinimumSize(145, 0); m_disconnectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_disconnectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_disconnectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_disconnectRequester, 2, 2, 1, 2); TQSpacerItem *commandSpacer = new TQSpacerItem(20, 20, @@ -160,7 +160,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect(this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(sendClicked())); + connect(this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(sendClicked())); } NetDialog::~NetDialog() diff --git a/ksim/monitors/net/netdialog.h b/ksim/monitors/net/netdialog.h index 1c6cd85..f75692a 100644 --- a/ksim/monitors/net/netdialog.h +++ b/ksim/monitors/net/netdialog.h @@ -34,7 +34,7 @@ class KURLRequester; class NetDialog : public TQTabDialog { - Q_OBJECT + TQ_OBJECT public: NetDialog(TQWidget *parent, const char *name = 0); diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 6a4381d..3aeb2b1 100644 --- a/ksim/monitors/snmp/browsedialog.cpp +++ b/ksim/monitors/snmp/browsedialog.cpp @@ -95,11 +95,11 @@ void BrowseDialog::startWalk( const Identifier &startOid ) { stopWalker(); - m_walker = new Walker( m_host, startOid, TQT_TQOBJECT(this) ); - connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - connect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + m_walker = new Walker( m_host, startOid, this ); + connect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + connect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); stop->setEnabled( true ); } @@ -109,10 +109,10 @@ void BrowseDialog::stopWalker() if ( !m_walker ) return; - disconnect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - disconnect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + disconnect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + disconnect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); m_walker->deleteLater(); m_walker = 0; diff --git a/ksim/monitors/snmp/browsedialog.h b/ksim/monitors/snmp/browsedialog.h index a6a7904..910a3e0 100644 --- a/ksim/monitors/snmp/browsedialog.h +++ b/ksim/monitors/snmp/browsedialog.h @@ -38,7 +38,7 @@ namespace Snmp class BrowseDialog : public BrowseDialogBase { - Q_OBJECT + TQ_OBJECT public: BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index 103537a..94255e7 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -251,11 +251,11 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">stopAllWalks()</slot> <slot access="protected">applyFilter()</slot> <slot access="protected">objectSelected(TQListViewItem *)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/chartmonitor.h b/ksim/monitors/snmp/chartmonitor.h index bcf5f19..c128de3 100644 --- a/ksim/monitors/snmp/chartmonitor.h +++ b/ksim/monitors/snmp/chartmonitor.h @@ -30,7 +30,7 @@ namespace Snmp class ChartMonitor : public KSim::Chart { - Q_OBJECT + TQ_OBJECT public: ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index e1dfcca..4ecd44e 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -50,24 +50,24 @@ ConfigPage::ConfigPage( Plugin *parent, const char *name ) m_page = new ConfigWidget( this ); - connect( m_page->addHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewHost() ) ); - connect( m_page->modifyHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyHost() ) ); - connect( m_page->removeHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeHost() ) ); - - connect( m_page->addMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewMonitor() ) ); - connect( m_page->modifyMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyMonitor() ) ); - connect( m_page->removeMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeMonitor() ) ); - - connect( m_page->hosts, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); - connect( m_page->monitors, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->addHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewHost() ) ); + connect( m_page->modifyHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyHost() ) ); + connect( m_page->removeHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeHost() ) ); + + connect( m_page->addMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewMonitor() ) ); + connect( m_page->modifyMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyMonitor() ) ); + connect( m_page->removeMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeMonitor() ) ); + + connect( m_page->hosts, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->monitors, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); } ConfigPage::~ConfigPage() diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h index 3311284..03246f9 100644 --- a/ksim/monitors/snmp/configpage.h +++ b/ksim/monitors/snmp/configpage.h @@ -78,7 +78,7 @@ class Plugin; class ConfigPage : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: ConfigPage( Plugin *parent, const char *name ); diff --git a/ksim/monitors/snmp/hostdialog.h b/ksim/monitors/snmp/hostdialog.h index 9508d77..3b5cb6c 100644 --- a/ksim/monitors/snmp/hostdialog.h +++ b/ksim/monitors/snmp/hostdialog.h @@ -32,7 +32,7 @@ namespace Snmp class HostDialog : public HostDialogBase { - Q_OBJECT + TQ_OBJECT public: HostDialog( TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index d02104d..650e262 100644 --- a/ksim/monitors/snmp/hostdialogbase.ui +++ b/ksim/monitors/snmp/hostdialogbase.ui @@ -508,12 +508,12 @@ <tabstop>buttonCancel</tabstop> <tabstop>communityString</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private">showSnmpAuthenticationDetailsForVersion(const TQString &)</slot> <slot>enableDisabledAuthenticationAndPrivacyElementsForSecurityLevel(const TQString &)</slot> <slot>checkValidity()</slot> <slot access="protected">testHost()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/labelmonitor.h b/ksim/monitors/snmp/labelmonitor.h index a6f277c..73a54d5 100644 --- a/ksim/monitors/snmp/labelmonitor.h +++ b/ksim/monitors/snmp/labelmonitor.h @@ -32,7 +32,7 @@ namespace Snmp class LabelMonitor : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp index aa645cf..1294c10 100644 --- a/ksim/monitors/snmp/monitor.cpp +++ b/ksim/monitors/snmp/monitor.cpp @@ -32,7 +32,7 @@ Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQ else m_timerId = -1; - TQTimer::singleShot( 0, this, TQT_SLOT( performSnmpRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( performSnmpRequest() ) ); } Monitor::~Monitor() diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h index 56bd03b..e56f81c 100644 --- a/ksim/monitors/snmp/monitor.h +++ b/ksim/monitors/snmp/monitor.h @@ -33,7 +33,7 @@ namespace Snmp class Monitor : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = 0, const char *name = 0 ); diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 6f6575d..4e42bda 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -107,9 +107,9 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name else w = new ChartMonitor( *this, parent, name ); - Monitor *monitor = new Monitor( host, id, refresh, TQT_TQOBJECT(w) ); - TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ), - w, TQT_SLOT( setData( const Value & ) ) ); + Monitor *monitor = new Monitor( host, id, refresh, w ); + TQObject::connect( monitor, TQ_SIGNAL( newData( const Value & ) ), + w, TQ_SLOT( setData( const Value & ) ) ); return w; } diff --git a/ksim/monitors/snmp/monitordialog.h b/ksim/monitors/snmp/monitordialog.h index e778cd7..bbb1ecb 100644 --- a/ksim/monitors/snmp/monitordialog.h +++ b/ksim/monitors/snmp/monitordialog.h @@ -31,7 +31,7 @@ namespace Snmp class MonitorDialog : public MonitorDialogBase { - Q_OBJECT + TQ_OBJECT public: MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index a6d2e2d..285514f 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -428,10 +428,10 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">checkValues()</slot> <slot access="protected">browse()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/pdu.cpp b/ksim/monitors/snmp/pdu.cpp index e06539a..9ad1110 100644 --- a/ksim/monitors/snmp/pdu.cpp +++ b/ksim/monitors/snmp/pdu.cpp @@ -48,7 +48,7 @@ PDU::~PDU() void PDU::addNullVariables( const IdentifierList &oids ) { std::for_each( oids.begin(), oids.end(), - std::bind1st( std::mem_fun( &PDU::addNullVariable ), this ) ); + std::bind( std::mem_fn( &PDU::addNullVariable ), this, std::placeholders::_1 ) ); } void PDU::addNullVariable( Identifier oid ) diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp index 489080e..2c9e930 100644 --- a/ksim/monitors/snmp/probedialog.cpp +++ b/ksim/monitors/snmp/probedialog.cpp @@ -77,12 +77,12 @@ void ProbeDialog::probeOne() Identifier oid = m_probeOIDs.pop(); delete m_currentMonitor; - m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, TQT_TQOBJECT(this) ); + m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this ); - connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ), - this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) ); - connect( m_currentMonitor, TQT_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), - this, TQT_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( newData( const Identifier &, const Value & ) ), + this, TQ_SLOT( probeResult( const Identifier &, const Value & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), + this, TQ_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); } void ProbeDialog::probeResult( const Identifier &oid, const Value &value ) @@ -108,7 +108,7 @@ void ProbeDialog::nextProbe() if ( m_canceled ) KProgressDialog::done( TQDialog::Rejected ); else - TQTimer::singleShot( 0, this, TQT_SLOT( probeOne() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( probeOne() ) ); } #include "probedialog.moc" diff --git a/ksim/monitors/snmp/probedialog.h b/ksim/monitors/snmp/probedialog.h index cf5833a..b307435 100644 --- a/ksim/monitors/snmp/probedialog.h +++ b/ksim/monitors/snmp/probedialog.h @@ -37,7 +37,7 @@ class Monitor; class ProbeDialog : public KProgressDialog { - Q_OBJECT + TQ_OBJECT public: ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/proberesultdialog.h b/ksim/monitors/snmp/proberesultdialog.h index 30529d7..47a758c 100644 --- a/ksim/monitors/snmp/proberesultdialog.h +++ b/ksim/monitors/snmp/proberesultdialog.h @@ -32,7 +32,7 @@ namespace Snmp class ProbeResultDialog : public ProbeResultDialogBase { - Q_OBJECT + TQ_OBJECT public: ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults, diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp index 6839283..b52fe5c 100644 --- a/ksim/monitors/snmp/session.cpp +++ b/ksim/monitors/snmp/session.cpp @@ -186,9 +186,16 @@ bool Session::initialize( ErrorInfo *error ) } switch ( source.privacy.protocol ) { + case AESPrivacy: { + d->defaultSession.securityPrivProto = usmAESPrivProtocol; + d->defaultSession.securityPrivProtoLen = USM_PRIV_PROTO_AES_LEN; + break; + } case DESPrivacy: { +#ifndef NETSNMP_DISABLE_DES d->defaultSession.securityPrivProto = usmDESPrivProtocol; d->defaultSession.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; +#endif break; } default: assert( false ); diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp index 333f0d2..1256228 100644 --- a/ksim/monitors/snmp/snmp.cpp +++ b/ksim/monitors/snmp/snmp.cpp @@ -48,7 +48,8 @@ static const struct EnumStringMapInfo { MD5Auth, "MD5", 0 }, { SHA1Auth, "SHA1", 0 }, { 0, 0, 0 } -}, privacyProtocolStrings[ 2 ] = { +}, privacyProtocolStrings[ 3 ] = { + { AESPrivacy, "AES", 0 }, { DESPrivacy, "DES", 0 }, { 0, 0, 0 } }; diff --git a/ksim/monitors/snmp/snmp.h b/ksim/monitors/snmp/snmp.h index c00e110..4b1e4fb 100644 --- a/ksim/monitors/snmp/snmp.h +++ b/ksim/monitors/snmp/snmp.h @@ -46,7 +46,10 @@ TQStringList allAuthenticationProtocols(); TQString authenticationProtocolToString( AuthenticationProtocol proto ); AuthenticationProtocol stringToAuthenticationProtocol( TQString string, bool *ok = 0 ); -enum PrivacyProtocol { DESPrivacy }; +enum PrivacyProtocol { + AESPrivacy, + DESPrivacy +}; TQStringList allPrivacyProtocols(); TQString privacyProtocolToString( PrivacyProtocol proto ); PrivacyProtocol stringToPrivacyProtocol( TQString string, bool *ok = 0 ); diff --git a/ksim/monitors/snmp/view.h b/ksim/monitors/snmp/view.h index 497001a..6ddae38 100644 --- a/ksim/monitors/snmp/view.h +++ b/ksim/monitors/snmp/view.h @@ -34,7 +34,7 @@ class Plugin; class View : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: View( Plugin *parent, const char *name ); diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp index 81a36f4..c74097b 100644 --- a/ksim/monitors/snmp/walker.cpp +++ b/ksim/monitors/snmp/walker.cpp @@ -29,7 +29,7 @@ using namespace KSim::Snmp; namespace { template <class T> - struct Deleter : public std::unary_function<T, void> + struct Deleter : public std::function<void(T)> { void operator()( T arg ) { delete arg; } diff --git a/ksim/monitors/snmp/walker.h b/ksim/monitors/snmp/walker.h index cf9e145..64052cf 100644 --- a/ksim/monitors/snmp/walker.h +++ b/ksim/monitors/snmp/walker.h @@ -35,7 +35,7 @@ namespace Snmp class Walker : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name = 0 ); diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index 9ab7f60..5ebc7ea 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -29,7 +29,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <tdeapplication.h> #include <tdefontdialog.h> @@ -77,11 +77,11 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_urlLabel = new KURLLabel(this); m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder")); m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir); - connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)), - this, TQT_SLOT(openURL(const TQString &))); + connect(m_urlLabel, TQ_SIGNAL(leftClickedURL(const TQString &)), + this, TQ_SLOT(openURL(const TQString &))); m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4); - m_line = new KSeparator(Qt::Horizontal, this); + m_line = new KSeparator(TQt::Horizontal, this); m_themeLayout->addMultiCellWidget(m_line, 2, 2, 0, 4); m_authorLabel = new TQLabel(this); @@ -99,8 +99,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_listView = new TDEListView(this); m_listView->addColumn(i18n("Theme")); m_listView->setFullWidth(true); - connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(selectItem(TQListViewItem *))); + connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(selectItem(TQListViewItem *))); m_themeLayout->addMultiCellWidget(m_listView, 4, 4, 0, 4); m_alternateLabel = new TQLabel(this); @@ -126,8 +126,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_fontsCombo->insertItem(i18n("Default")); m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(m_fontsCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(showFontDialog(int))); + connect(m_fontsCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(showFontDialog(int))); m_themeLayout->addMultiCellWidget(m_fontsCombo, 5, 5, 4, 4); TQStringList locatedFiles = TDEGlobal::dirs()->findDirs("data", "ksim/themes"); @@ -178,7 +178,7 @@ void KSim::ThemePrefs::setThemeAlts(int alternatives) void KSim::ThemePrefs::openURL(const TQString &url) { - kapp->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void KSim::ThemePrefs::insertItems(const ThemeInfoList &itemList) diff --git a/ksim/themeprefs.h b/ksim/themeprefs.h index 8fca089..828d649 100644 --- a/ksim/themeprefs.h +++ b/ksim/themeprefs.h @@ -75,7 +75,7 @@ namespace KSim class ThemePrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ThemePrefs(TQWidget *parent, const char *name=0); diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp index 3a3cef8..9d11c4c 100644 --- a/ktimer/ktimer.cpp +++ b/ktimer/ktimer.cpp @@ -115,12 +115,12 @@ KTimerPref::KTimerPref( TQWidget *parent, const char *name ) tray->setPixmap( SmallIcon( "ktimer" ) ); // connect - connect( m_add, TQT_SIGNAL(clicked()), TQT_SLOT(add()) ); - connect( m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove()) ); - connect( m_help, TQT_SIGNAL(clicked()), TQT_SLOT(help()) ); - connect( m_list, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(currentChanged(TQListViewItem*)) ); - loadJobs( kapp->config() ); + connect( m_add, TQ_SIGNAL(clicked()), TQ_SLOT(add()) ); + connect( m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove()) ); + connect( m_help, TQ_SIGNAL(clicked()), TQ_SLOT(help()) ); + connect( m_list, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(currentChanged(TQListViewItem*)) ); + loadJobs( tdeApp->config() ); show(); } @@ -128,7 +128,7 @@ KTimerPref::KTimerPref( TQWidget *parent, const char *name ) KTimerPref::~KTimerPref() { - saveJobs( kapp->config() ); + saveJobs( tdeApp->config() ); delete d; } @@ -138,16 +138,16 @@ void KTimerPref::add() KTimerJob *job = new KTimerJob; KTimerJobItem *item = new KTimerJobItem( job, m_list ); - connect( job, TQT_SIGNAL(delayChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(valueChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(stateChanged(KTimerJob*,States)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(commandChanged(KTimerJob*,const TQString&)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)), - TQT_SLOT(jobFinished(KTimerJob*,bool)) ); + connect( job, TQ_SIGNAL(delayChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(valueChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(stateChanged(KTimerJob*,States)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(commandChanged(KTimerJob*,const TQString&)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(finished(KTimerJob*,bool)), + TQ_SLOT(jobFinished(KTimerJob*,bool)) ); job->setUser( item ); @@ -169,7 +169,7 @@ void KTimerPref::remove() void KTimerPref::help() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } @@ -192,22 +192,22 @@ void KTimerPref::currentChanged( TQListViewItem *i ) m_counter->disconnect(); m_slider->disconnect(); - connect( m_commandLine->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), - job, TQT_SLOT(setCommand(const TQString &)) ); - connect( m_delay, TQT_SIGNAL(valueChanged(int)), - job, TQT_SLOT(setDelay(int)) ); - connect( m_loop, TQT_SIGNAL(toggled(bool)), - job, TQT_SLOT(setLoop(bool)) ); - connect( m_one, TQT_SIGNAL(toggled(bool)), - job, TQT_SLOT(setOneInstance(bool)) ); - connect( m_stop, TQT_SIGNAL(clicked()), - job, TQT_SLOT(stop()) ); - connect( m_pause, TQT_SIGNAL(clicked()), - job, TQT_SLOT(pause()) ); - connect( m_start, TQT_SIGNAL(clicked()), - job, TQT_SLOT(start()) ); - connect( m_slider, TQT_SIGNAL(valueChanged(int)), - job, TQT_SLOT(setValue(int)) ); + connect( m_commandLine->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), + job, TQ_SLOT(setCommand(const TQString &)) ); + connect( m_delay, TQ_SIGNAL(valueChanged(int)), + job, TQ_SLOT(setDelay(int)) ); + connect( m_loop, TQ_SIGNAL(toggled(bool)), + job, TQ_SLOT(setLoop(bool)) ); + connect( m_one, TQ_SIGNAL(toggled(bool)), + job, TQ_SLOT(setOneInstance(bool)) ); + connect( m_stop, TQ_SIGNAL(clicked()), + job, TQ_SLOT(stop()) ); + connect( m_pause, TQ_SIGNAL(clicked()), + job, TQ_SLOT(pause()) ); + connect( m_start, TQ_SIGNAL(clicked()), + job, TQ_SLOT(start()) ); + connect( m_slider, TQ_SIGNAL(valueChanged(int)), + job, TQ_SLOT(setValue(int)) ); m_commandLine->lineEdit()->setText( job->command() ); m_delay->setValue( job->delay() ); @@ -276,16 +276,16 @@ void KTimerPref::loadJobs( TDEConfig *cfg ) KTimerJob *job = new KTimerJob; KTimerJobItem *item = new KTimerJobItem( job, m_list ); - connect( job, TQT_SIGNAL(delayChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(valueChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(stateChanged(KTimerJob*,States)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(commandChanged(KTimerJob*,const TQString&)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)), - TQT_SLOT(jobFinished(KTimerJob*,bool)) ); + connect( job, TQ_SIGNAL(delayChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(valueChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(stateChanged(KTimerJob*,States)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(commandChanged(KTimerJob*,const TQString&)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(finished(KTimerJob*,bool)), + TQ_SLOT(jobFinished(KTimerJob*,bool)) ); job->load( cfg, TQString( "Job%1" ).arg(n) ); @@ -327,7 +327,7 @@ KTimerJob::KTimerJob( TQObject *parent, const char *name ) d->user = 0; d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); + connect( d->timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); } @@ -509,8 +509,8 @@ void KTimerJob::fire() KShellProcess *proc = new KShellProcess; (*proc) << d->command; d->processes.append( proc ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(processExited(TDEProcess*)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(processExited(TDEProcess*)) ); bool ok = proc->start( TDEProcess::NotifyOnExit ); emit fired( this ); if( !ok ) { diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h index b331007..00acd6d 100644 --- a/ktimer/ktimer.h +++ b/ktimer/ktimer.h @@ -21,14 +21,14 @@ #include <tqdialog.h> #include <tqwidget.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include "prefwidget.h" class KTimerJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -90,7 +90,7 @@ class KTimerJob : public TQObject { class KTimerPref : public PrefWidget { - Q_OBJECT + TQ_OBJECT public: KTimerPref( TQWidget *parent=0, const char *name = 0 ); diff --git a/ktimer/prefwidget.ui b/ktimer/prefwidget.ui index cd5715e..eefc336 100644 --- a/ktimer/prefwidget.ui +++ b/ktimer/prefwidget.ui @@ -277,10 +277,8 @@ <includes> <include location="global" impldecl="in declaration">kseparator.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/superkaramba/CMakeLists.txt b/superkaramba/CMakeLists.txt index 21dbc7e..7aaf596 100644 --- a/superkaramba/CMakeLists.txt +++ b/superkaramba/CMakeLists.txt @@ -10,6 +10,7 @@ ################################################# add_subdirectory( src ) +add_subdirectory( examples ) add_subdirectory( icons ) add_subdirectory( mimetypes ) diff --git a/superkaramba/examples/CMakeLists.txt b/superkaramba/examples/CMakeLists.txt new file mode 100644 index 0000000..0eefb51 --- /dev/null +++ b/superkaramba/examples/CMakeLists.txt @@ -0,0 +1,7 @@ +add_subdirectory( globalMouse ) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION ${DATA_INSTALL_DIR}/superkaramba/examples + PATTERN CMakeLists.txt EXCLUDE +) diff --git a/superkaramba/examples/autoHide/main.py b/superkaramba/examples/autoHide/main.py index 85e2b37..0dce2e0 100644 --- a/superkaramba/examples/autoHide/main.py +++ b/superkaramba/examples/autoHide/main.py @@ -18,7 +18,6 @@ def widgetUpdated(widget): hidden = 1 karamba.moveWidget(widget, 0, -210) - #This gets called everytime our widget is clicked. #Notes: # widget = reference to our widget @@ -33,21 +32,10 @@ def widgetUpdated(widget): def widgetClicked(widget, x, y, button): pass -#This gets called everytime our widget is clicked. -#Notes -# widget = reference to our widget -# x = x position (relative to our widget) -# y = y position (relative to our widget) -# botton = button being held: -# 0 = No Mouse Button -# 1 = Left Mouse Button -# 2 = Middle Mouse Button -# 3 = Right Mouse Button, but this will never happen -# because the right mouse button brings up the -# Karamba menu. +#This gets called everytime the mouse moves on the widget area +#Warning: Don't do anything too intensive here +#You don't want to run some complex piece of code everytime the mouse moves def widgetMouseMoved(widget, x, y, button): - #Warning: Don't do anything too intensive here - #You don't want to run some complex piece of code everytime the mouse moves global hidden global counter if (hidden==1): @@ -55,8 +43,6 @@ def widgetMouseMoved(widget, x, y, button): hidden = 0 counter = 0 - - # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/bar/bar.py b/superkaramba/examples/bar/bar.py index b018fe8..2ec029d 100644 --- a/superkaramba/examples/bar/bar.py +++ b/superkaramba/examples/bar/bar.py @@ -24,9 +24,9 @@ def widgetUpdated(widget): # vertical & bitmap b = karamba.getBarVertical(widget, bars[7]) - print "getVertical: " + str(b) + print("getVertical: " + str(b)) bmp = karamba.getBarImage(widget, bars[7]) - print "getBitmap: " + str(bmp) + print("getBitmap: " + str(bmp)) b = (b+1)%2 karamba.setBarVertical(widget, bars[7], b) if(b): @@ -38,13 +38,13 @@ def widgetUpdated(widget): # size & resize size = karamba.getBarSize(widget, bars[1]) - print "getBarSize: " + str(size) + print("getBarSize: " + str(size)) size = ((b * 100) + 100, size[1]) karamba.resizeBar(widget, bars[1], size[0], size[1]) # pos & move pos = karamba.getBarPos(widget, bars[2]) - print "getBarPos: " + str(pos) + print("getBarPos: " + str(pos)) pos = (b * 200, pos[1]) karamba.moveBar(widget, bars[2], pos[0], pos[1]) @@ -56,19 +56,19 @@ def widgetUpdated(widget): # Value v = karamba.getBarValue(widget, bars[5]) - print "getBarValue: ", v + print("getBarValue: ", v) v = (v + 10) % 110 karamba.setBarValue(widget, bars[5], v) # Min Max minmax = karamba.getBarMinMax(widget, bars[6]) - print "getBarMinMax: " + str(minmax) + print("getBarMinMax: " + str(minmax)) minmax = (0, (b * 100) + 100) karamba.setBarMinMax(widget, bars[6], minmax[0], minmax[1]) # Sensor sensor = karamba.getBarSensor(widget, bars[4]) - print "getSensor: " + str(sensor) + print("getSensor: " + str(sensor)) if(b): karamba.setBarSensor(widget, bars[4], 'SENSOR=SENSOR TYPE="cpu_temp"') else: @@ -90,4 +90,4 @@ def widgetMouseMoved(widget, x, y, button): pass # This will be printed when the widget loads. -print "Loaded Bar test python extension!" +print("Loaded Bar test python extension!") diff --git a/superkaramba/examples/change_interval/interval.py b/superkaramba/examples/change_interval/interval.py index 6c3422a..6a72434 100644 --- a/superkaramba/examples/change_interval/interval.py +++ b/superkaramba/examples/change_interval/interval.py @@ -11,50 +11,53 @@ text = None #this is called when you widget is initialized def initWidget(widget): - - karamba.redrawWidget(widget) + global seq + global text + seq = 0 + text = None + karamba.redrawWidget(widget) # sequence drops down to zero and changes the time interval to 1 second. # keeps counting down thereafter... def widgetUpdated(widget): - global seq - global text + global seq + global text - seq -= 1 + seq -= 1 - if seq <= 0: - karamba.changeInterval(widget, 1000) + if seq <= 0: + karamba.changeInterval(widget, 1000) - if seq <= 0: - message = "biding-time seq:%d" % -seq - else: - message = "wiggle seq:%d" % seq + if seq <= 0: + message = "biding-time seq:%d" % -seq + else: + message = "wiggle seq:%d" % seq - # delete previous text if exists. - if text is not None: - karamba.deleteText(widget, text) + # delete previous text if exists. + if text is not None: + karamba.deleteText(widget, text) - # display new message - text = karamba.createText(widget, 0, 20, 300, 20, message) - karamba.changeTextColor(widget, text, 252,252,252) + # display new message + text = karamba.createText(widget, 0, 20, 300, 20, message) + karamba.changeTextColor(widget, text, 252,252,252) - karamba.redrawWidget(widget) + karamba.redrawWidget(widget) # wiggle the mouse over the widget to get the sequence number increased more. # also set the refresh rate to 50ms so that the theme has to fight against # the wiggling. def widgetMouseMoved(widget, x, y, button): - global seq + global seq - if seq <= 0: - seq = 0 - karamba.changeInterval(widget, 50) + if seq <= 0: + seq = 0 + karamba.changeInterval(widget, 50) - seq += 1 - + seq += 1 + # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/taskBar/cleanbar/README b/superkaramba/examples/cleanbar/README index 2c6b146..2c6b146 100644 --- a/superkaramba/examples/taskBar/cleanbar/README +++ b/superkaramba/examples/cleanbar/README diff --git a/superkaramba/examples/taskBar/cleanbar/cleanbar.py b/superkaramba/examples/cleanbar/cleanbar.py index c0da2a2..16bd18f 100644 --- a/superkaramba/examples/taskBar/cleanbar/cleanbar.py +++ b/superkaramba/examples/cleanbar/cleanbar.py @@ -34,7 +34,7 @@ havexwi = os.system("which xwininfo") if (havexwi == 0): pass else: - print "\nCan't find xwininfo in your path." + print("\nCan't find xwininfo in your path.") fp = os.popen("xwininfo -root -stats") output = fp.read() @@ -49,8 +49,6 @@ for x in output: resY = int(param[1]) - - def drawTaskbar(widget): global taskPanels global taskText @@ -81,40 +79,41 @@ def drawTaskbar(widget): #build groups list that contains sub-lists of taskInfo sorted by group for j in range(len(taskList)): taskinfo = karamba.getTaskInfo(widget, taskList[j]) - - if knownGroups.has_key(taskinfo[2]) == 0: - groupCount = groupCount + 1 - if (taskinfo[7] == 1): - activeGroup = groupCount - knownGroups[taskinfo[2]] = 1 - thisGroup = [] - thisGroup.append(taskinfo) - groupRefs[taskinfo[2]] = len(groups) - groups.append(thisGroup) - else: - if (taskinfo[7] == 1): - activeGroup = groupRefs[taskinfo[2]] + 1 - knownGroups[taskinfo[2]] = knownGroups[taskinfo[2]] + 1 - thisGroup = groups[groupRefs[taskinfo[2]]] - thisGroup.append(taskinfo) - + + if (taskinfo[2] in knownGroups) == 0: + groupCount = groupCount + 1 + if (taskinfo[7] == 1): + activeGroup = groupCount + knownGroups[taskinfo[2]] = 1 + thisGroup = [] + thisGroup.append(taskinfo) + groupRefs[taskinfo[2]] = len(groups) + groups.append(thisGroup) + else: + if (taskinfo[7] == 1): + activeGroup = groupRefs[taskinfo[2]] + 1 + knownGroups[taskinfo[2]] = knownGroups[taskinfo[2]] + 1 + thisGroup = groups[groupRefs[taskinfo[2]]] + thisGroup.append(taskinfo) + #fill out the task bar j = 0 - for group in groups: + for group in groups: #safety check (could be more task groups than bar is long) if (j < length): - karamba.showImage(widget, taskPanels[j]) - if len(group) != 1: - karamba.changeText(widget, taskText[j], group[0][2] + " [" + str(len(group)) + "]") - else: - karamba.changeText(widget, taskText[j], (group[0][0])) - j = j + 1 + karamba.showImage(widget, taskPanels[j]) + if len(group) != 1: + karamba.changeText(widget, taskText[j], group[0][2].decode('utf-8') + ' [' + str(len(group)) + ']') + else: + karamba.changeText(widget, taskText[j], group[0][0].decode('utf-8')) + j = j + 1 if (activeGroup != 0): - karamba.changeTextShadow(widget, taskText[activeGroup - 1], 1) - karamba.changeTextColor(widget, taskText[activeGroup - 1], 239, 220, 11) + karamba.changeTextShadow(widget, taskText[activeGroup - 1], 1) + karamba.changeTextColor(widget, taskText[activeGroup - 1], 239, 220, 11) - + karamba.moveWidget(widget, 0, resY - 32) + karamba.resizeWidget(widget, resX, resY) karamba.redrawWidget(widget) #this is called when your widget is initialized @@ -126,7 +125,7 @@ def initWidget(widget): global timeText karamba.createImage(widget, resX - 149, 0, "pics/rightend_new.png") - numOfTasks = (resX - 198 - 149)/121 + numOfTasks = (resX - 198 - 149) // 121 timeText = karamba.createText(widget, resX - 149 + 54, 10, 140, 20, "time") karamba.changeTextColor(widget, timeText, 0,0,0) @@ -143,13 +142,13 @@ def initWidget(widget): # called to indicate that a new task is currently started def startupAdded(widget, startup): - pass + pass # called whenever a startup is removed. Which either means the task is # successfully started (and taskAdded will be called), or the task could # not be started for some reason. def startupRemoved(widget, startup): - pass + pass # called whenever a new task has been started def taskAdded(widget, task): @@ -190,78 +189,75 @@ def widgetClicked(widget, x, y, button): global taskMenu global taskMenuLookup - taskSelected = (x-198)/121 + taskSelected = (x-198) // 121 ## Make sure its a valid task if (0 <= taskSelected < numOfTasks): taskList = karamba.getTaskList(widget) #free last menu - karamba.deleteMenu(widget, taskMenu) - - #create new menu - taskMenu = karamba.createMenu(widget) - taskMenuLoopup = {} - - length = len(taskList) - if (numOfTasks < length): - length = numOfTasks - - - knownGroups = {} - groups = [] - groupRefs = {} - for j in range(len(taskList)): - taskinfo = karamba.getTaskInfo(widget, taskList[j]) - - if knownGroups.has_key(taskinfo[2]) == 0: - knownGroups[taskinfo[2]] = 1 - thisGroup = [] - thisGroup.append(taskinfo) - groupRefs[taskinfo[2]] = len(groups) - groups.append(thisGroup) - else: - knownGroups[taskinfo[2]] = knownGroups[taskinfo[2]] + 1 - thisGroup = groups[groupRefs[taskinfo[2]]] - thisGroup.append(taskinfo) - - if taskSelected < len(groups): - taskGroup = groups[taskSelected] - - - if len(taskGroup) == 1: - #only one task in group - just switch to that app - ## perform the task action (see Task API for list of numbers) - karamba.performTaskAction(widget, taskGroup[0][8], 8) - - else: - #more than one task in this group, make a popup - for task in taskGroup: - #if it's minimized, put []'s around name - if task[5] == 1: - item = karamba.addMenuItem(widget, taskMenu, "[ " + task[0] + " ]", task[2]) - else: - item = karamba.addMenuItem(widget, taskMenu, task[0], task[2]) - #save the taskInfo item for later use - #so we will know info for the task that - #will be clicked in the callback - taskMenuLookup[item] = task - - numOfItems = len(taskGroup) - karamba.popupMenu(widget, taskMenu, 198 + (121*taskSelected), -1 * (numOfItems * 26)) - - + karamba.deleteMenu(widget, taskMenu) + + #create new menu + taskMenu = karamba.createMenu(widget) + taskMenuLoopup = {} + + length = len(taskList) + if (numOfTasks < length): + length = numOfTasks + + + knownGroups = {} + groups = [] + groupRefs = {} + for j in range(len(taskList)): + taskinfo = karamba.getTaskInfo(widget, taskList[j]) + + if (taskinfo[2] in knownGroups) == 0: + knownGroups[taskinfo[2]] = 1 + thisGroup = [] + thisGroup.append(taskinfo) + groupRefs[taskinfo[2]] = len(groups) + groups.append(thisGroup) + else: + knownGroups[taskinfo[2]] = knownGroups[taskinfo[2]] + 1 + thisGroup = groups[groupRefs[taskinfo[2]]] + thisGroup.append(taskinfo) + + if taskSelected < len(groups): + taskGroup = groups[taskSelected] + + if len(taskGroup) == 1: + #only one task in group - just switch to that app + ## perform the task action (see Task API for list of numbers) + karamba.performTaskAction(widget, taskGroup[0][8], 8) + else: + #more than one task in this group, make a popup + for task in taskGroup: + #if it's minimized, put []'s around name + if task[5] == 1: + item = karamba.addMenuItem(widget, taskMenu, "[ " + task[0].decode('utf-8') + " ]", task[2].decode('utf-8')) + else: + item = karamba.addMenuItem(widget, taskMenu, task[0].decode('utf-8'), task[2].decode('utf-8')) + #save the taskInfo item for later use + #so we will know info for the task that + #will be clicked in the callback + taskMenuLookup[item] = task + + numOfItems = len(taskGroup) + karamba.popupMenu(widget, taskMenu, 198 + (121*taskSelected), -1 * (numOfItems * 26)) if (taskSelected == numOfTasks): karamba.toggleShowDesktop(widget) + #This gets called when an item is clicked in a popup menu you have created. # menu = a reference to the menu # id = the number of the item that was clicked. def menuItemClicked(widget, menu, id): - global taskMenuLookup + global taskMenuLookup - taskinfo = taskMenuLookup[id] - karamba.performTaskAction(widget, taskinfo[8], 8) - + taskinfo = taskMenuLookup[id] + karamba.performTaskAction(widget, taskinfo[8], 8) + diff --git a/superkaramba/examples/taskBar/cleanbar/cleanbar.theme b/superkaramba/examples/cleanbar/cleanbar.theme index 0dc6faa..0dc6faa 100644 --- a/superkaramba/examples/taskBar/cleanbar/cleanbar.theme +++ b/superkaramba/examples/cleanbar/cleanbar.theme diff --git a/superkaramba/examples/taskBar/cleanbar/pics/bar2.png b/superkaramba/examples/cleanbar/pics/bar2.png Binary files differindex aa1c4f5..aa1c4f5 100644 --- a/superkaramba/examples/taskBar/cleanbar/pics/bar2.png +++ b/superkaramba/examples/cleanbar/pics/bar2.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/rightend.png b/superkaramba/examples/cleanbar/pics/rightend.png Binary files differindex 7f852bf..7f852bf 100644 --- a/superkaramba/examples/taskBar/cleanbar/pics/rightend.png +++ b/superkaramba/examples/cleanbar/pics/rightend.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/rightend_new.png b/superkaramba/examples/cleanbar/pics/rightend_new.png Binary files differindex 45adc7b..45adc7b 100644 --- a/superkaramba/examples/taskBar/cleanbar/pics/rightend_new.png +++ b/superkaramba/examples/cleanbar/pics/rightend_new.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/slickbar.png b/superkaramba/examples/cleanbar/pics/slickbar.png Binary files differindex 57f0830..57f0830 100644 --- a/superkaramba/examples/taskBar/cleanbar/pics/slickbar.png +++ b/superkaramba/examples/cleanbar/pics/slickbar.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/startup.png b/superkaramba/examples/cleanbar/pics/startup.png Binary files differindex a5a99f1..a5a99f1 100644 --- a/superkaramba/examples/taskBar/cleanbar/pics/startup.png +++ b/superkaramba/examples/cleanbar/pics/startup.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/task.png b/superkaramba/examples/cleanbar/pics/task.png Binary files differindex f9bc4eb..f9bc4eb 100644 --- a/superkaramba/examples/taskBar/cleanbar/pics/task.png +++ b/superkaramba/examples/cleanbar/pics/task.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/task_new.png b/superkaramba/examples/cleanbar/pics/task_new.png Binary files differindex 1ac95c8..1ac95c8 100644 --- a/superkaramba/examples/taskBar/cleanbar/pics/task_new.png +++ b/superkaramba/examples/cleanbar/pics/task_new.png diff --git a/superkaramba/examples/control_management/mgmt.py b/superkaramba/examples/control_management/mgmt.py index eae98c2..2e43634 100644 --- a/superkaramba/examples/control_management/mgmt.py +++ b/superkaramba/examples/control_management/mgmt.py @@ -10,40 +10,40 @@ mgmt_txt = None #this is called when you widget is initialized def initWidget(widget): - global do_nothing_txt - global do_something_txt + global do_nothing_txt + global do_something_txt - # display new message - do_nothing_txt = karamba.createText(widget, 0, 00, 300, 20, - "Right mouse click me!") - karamba.changeTextColor(widget, do_nothing_txt, 252,252,252) - mgmt_txt = karamba.createText(widget, 0, 20, 300, 20, - "Righ mouse click me too!") - karamba.changeTextColor(widget, mgmt_txt, 252,252,252) + # display new message + do_nothing_txt = karamba.createText(widget, 0, 00, 300, 20, + "Right mouse click me!") + karamba.changeTextColor(widget, do_nothing_txt, 252,252,252) + mgmt_txt = karamba.createText(widget, 0, 20, 300, 20, + "Righ mouse click me too!") + karamba.changeTextColor(widget, mgmt_txt, 252,252,252) - karamba.redrawWidget(widget) + karamba.redrawWidget(widget) - karamba.setWantRightButton(widget, 1) + karamba.setWantRightButton(widget, 1) def widgetUpdated(widget): - karamba.redrawWidget(widget) + karamba.redrawWidget(widget) def widgetClicked(widget, x, y, button): - global do_nothing_txt + global do_nothing_txt - if y < 20: - if do_nothing_txt is not None: - karamba.deleteText(widget, do_nothing_txt) - do_nothing_txt = karamba.createText(widget, - 0, 0, 300, 20, "I don't do anything when clicking here.") - karamba.changeTextColor(widget, do_nothing_txt, - 255,200,200) - karamba.redrawWidget(widget) - return + if y < 20: + if do_nothing_txt is not None: + karamba.deleteText(widget, do_nothing_txt) + do_nothing_txt = karamba.createText(widget, + 0, 0, 300, 20, "I don't do anything when clicking here.") + karamba.changeTextColor(widget, do_nothing_txt, + 255,200,200) + karamba.redrawWidget(widget) + return - karamba.managementPopup(widget) - + karamba.managementPopup(widget) + # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/disableRightClickMenu/disable_menu.py b/superkaramba/examples/disableRightClickMenu/disable_menu.py index 6c524dd..e903d26 100644 --- a/superkaramba/examples/disableRightClickMenu/disable_menu.py +++ b/superkaramba/examples/disableRightClickMenu/disable_menu.py @@ -45,7 +45,7 @@ def widgetClicked(widget, x, y, button): if text2: karamba.deleteText(widget,text2) text2 = karamba.createText(widget,5,70,400,20,newText) - print newText + print(newText) elif not clicked and button == 1: clicked = True karamba.setWantRightButton(widget, True) @@ -53,9 +53,9 @@ def widgetClicked(widget, x, y, button): if text2: karamba.deleteText(widget,text2) text2 = karamba.createText(widget,5,70,400,20,newText) - print newText + print(newText) if button == 3: - print "Clicking the right mouse button is recognized now." + print("Clicking the right mouse button is recognized now.") karamba.redrawWidget(widget) #This gets called everytime our widget is clicked. @@ -173,4 +173,4 @@ def keyPressed(widget, meter, char): pass # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/globalMouse/CMakeLists.txt b/superkaramba/examples/globalMouse/CMakeLists.txt new file mode 100644 index 0000000..499a26b --- /dev/null +++ b/superkaramba/examples/globalMouse/CMakeLists.txt @@ -0,0 +1,11 @@ +##### xcursor.so ####################### + +include_directories( + ${PYTHON_INCLUDE_DIRS} +) + +tde_add_library( xcursor MODULE NO_LIBTOOL_FILE + SOURCES extension/xcursor.c + LINK ${PYTHON_LIBRARIES} X11 + DESTINATION ${DATA_INSTALL_DIR}/superkaramba/examples/globalMouse +) diff --git a/superkaramba/examples/globalMouse/README b/superkaramba/examples/globalMouse/README index 758ce4b..7d2abc3 100644 --- a/superkaramba/examples/globalMouse/README +++ b/superkaramba/examples/globalMouse/README @@ -19,7 +19,7 @@ INSTALLATION: named build. This file needs to be copied in the same directory as the eyes.theme and eyes.py file. - A precompiled xcursor.so file is included (Compiled on Mandrake 9.1). + A precompiled xcursor.so file is included. CHANGES: * Moving the theme now works as it should. diff --git a/superkaramba/examples/globalMouse/extension/setup.py b/superkaramba/examples/globalMouse/extension/setup.py index f33f8a6..2003334 100644 --- a/superkaramba/examples/globalMouse/extension/setup.py +++ b/superkaramba/examples/globalMouse/extension/setup.py @@ -1,12 +1,14 @@ from distutils.core import setup, Extension -module1 = Extension('xcursor', - include_dirs = ['/usr/X11R6/include'], - libraries = ['X11'], - library_dirs = ['/usr/X11R6/lib'], - sources = ['xcursor.c']) +def main(): + setup(name = 'XMouseCursor', + version = '1.0', + description = 'Determines the position of the X mouse cursor', + ext_modules = [Extension('xcursor', + include_dirs = ['/usr/X11R6/include'], + libraries = ['X11'], + library_dirs = ['/usr/X11R6/lib'], + sources = ['xcursor.c'])]) -setup (name = 'XMouseCursor', - version = '1.0', - description = 'Determines the position of the X mouse cursor', - ext_modules = [module1]) +if __name__ == "__main__": + main() diff --git a/superkaramba/examples/globalMouse/extension/xcursor.c b/superkaramba/examples/globalMouse/extension/xcursor.c index 8dad240..fbe80fa 100644 --- a/superkaramba/examples/globalMouse/extension/xcursor.c +++ b/superkaramba/examples/globalMouse/extension/xcursor.c @@ -26,6 +26,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ****************************************************************************/ +#define PY_SSIZE_T_CLEAN #include <Python.h> #include <X11/Xlib.h> @@ -96,9 +97,16 @@ static PyMethodDef xcursorMethods[] = {NULL, NULL, 0, NULL} /* Sentinel */ }; -void initxcursor(void) +static struct PyModuleDef xcursordef = { - (void) Py_InitModule("xcursor", xcursorMethods); -} - + PyModuleDef_HEAD_INIT, + "xcursor", + NULL, + -1, + xcursorMethods +}; +PyMODINIT_FUNC PyInit_xcursor(void) +{ + return PyModule_Create(&xcursordef); +} diff --git a/superkaramba/examples/globalMouse/eyes.py b/superkaramba/examples/globalMouse/eyes.py index b95f86d..f6f3804 100644 --- a/superkaramba/examples/globalMouse/eyes.py +++ b/superkaramba/examples/globalMouse/eyes.py @@ -38,117 +38,122 @@ lp_width, lp_height = 11, 17 rp_width, rp_height = 11, 17 def pupille(mouse_x, mouse_y, eye_center_x, eye_center_y, eye_a, eye_b, widget_x, widget_y): - x = mouse_x - eye_center_x - widget_x - y = mouse_y - eye_center_y - widget_y - #print x, y + x = mouse_x - eye_center_x - widget_x + y = mouse_y - eye_center_y - widget_y + #print(x, y) - r = math.sqrt(x * x + y * y) - phi = math.atan2(y, x) - #print phi * math.pi + r = math.sqrt(x * x + y * y) + phi = math.atan2(y, x) + #print(phi * math.pi) - eye_x = eye_a * math.cos(phi) - eye_y = eye_b * math.sin(phi) - - eye_r = math.sqrt(eye_x * eye_x + eye_y * eye_y) + eye_x = eye_a * math.cos(phi) + eye_y = eye_b * math.sin(phi) + + eye_r = math.sqrt(eye_x * eye_x + eye_y * eye_y) - if eye_r < r: - return int(eye_x + eye_center_x), int(eye_y + eye_center_y) - - return int(x + eye_center_x), int(y + eye_center_y) + if eye_r < r: + return int(eye_x + eye_center_x), int(eye_y + eye_center_y) + + return int(x + eye_center_x), int(y + eye_center_y) - + #this is called when you widget is initialized def initWidget(widget): - pass + global init + global linkePupille + global rechtePupille + init = 0 + linkePupille = "" + rechtePupille = "" #this is called everytime your widget is updated #the update inverval is specified in the .theme file def widgetUpdated(widget): - global init - global linkePupille - global rechtePupille - - global w_width - global w_height + global init + global linkePupille + global rechtePupille + + global w_width + global w_height - global w_x - global w_y + global w_x + global w_y - global lx - global ly - global la - global lb + global lx + global ly + global la + global lb - global lp_width - global lp_height + global lp_width + global lp_height - global rx - global ry - global ra - global rb + global rx + global ry + global ra + global rb - global rp_width - global rp_height + global rp_width + global rp_height - global x_old - global y_old + global x_old + global y_old - if init == 0: - theme_path = karamba.getThemePath(widget) + "/" - - # read widget coordinates from eyes.theme - # f = open(theme_path + "eyes.theme") + if init == 0: + theme_path = karamba.getThemePath(widget) + "/" + + # read widget coordinates from eyes.theme + # f = open(theme_path + "eyes.theme") - # karamba_line = "" - #while re.compile('KARAMBA').search(karamba_line) == None: - # karamba_line = f.readline() + # karamba_line = "" + #while re.compile('KARAMBA').search(karamba_line) == None: + # karamba_line = f.readline() - #w_x = int(re.compile('X=([0-9]+)').search(karamba_line).group(1)) - #w_y = int(re.compile('Y=([0-9]+)').search(karamba_line).group(1)) + #w_x = int(re.compile('X=([0-9]+)').search(karamba_line).group(1)) + #w_y = int(re.compile('Y=([0-9]+)').search(karamba_line).group(1)) - #f.close() + #f.close() - #karamba.createWidgetMask(widget, theme_path + "pics/mask.png") + #karamba.createWidgetMask(widget, theme_path + "pics/mask.png") - linkePupille = karamba.createImage(widget, 15, 30, theme_path + "pics/pupille.png") - rechtePupille = karamba.createImage(widget, 100, 30, theme_path + "pics/pupille.png") - init = 1 + linkePupille = karamba.createImage(widget, 15, 30, theme_path + "pics/pupille.png") + rechtePupille = karamba.createImage(widget, 100, 30, theme_path + "pics/pupille.png") + init = 1 - karamba.redrawWidget(widget) + karamba.redrawWidget(widget) - # query mouse-cursor position - x, y = xcursor.position() - - #fp = os.popen("./xpos") - #output = fp.read() - #x, y = output.split() - - #print x, y + # query mouse-cursor position + x, y = xcursor.position() + + #fp = os.popen("./xpos") + #output = fp.read() + #x, y = output.split() + + #print(x, y) - if x != x_old or y != y_old: - x_old, y_old = x, y - # Get Widget Position - w_x, w_y = karamba.getWidgetPosition(widget) + if x != x_old or y != y_old: + x_old, y_old = x, y + # Get Widget Position + w_x, w_y = karamba.getWidgetPosition(widget) - # Calc left pupille - xp, yp = pupille (int(x), int(y), lx, ly, la, lb, w_x, w_y) + # Calc left pupille + xp, yp = pupille (int(x), int(y), lx, ly, la, lb, w_x, w_y) - xp = xp - lp_width / 2 - yp = yp - lp_height / 2 - #print xp, yp + xp = xp - lp_width // 2 + yp = yp - lp_height // 2 + #print(xp, yp) - karamba.moveImage(widget, linkePupille, xp, yp) + karamba.moveImage(widget, linkePupille, xp, yp) - # Calc right pupille - xp, yp = pupille (int(x), int(y), rx, ry, ra, rb, w_x, w_y) + # Calc right pupille + xp, yp = pupille (int(x), int(y), rx, ry, ra, rb, w_x, w_y) - xp = xp - rp_width / 2 - yp = yp - rp_height / 2 - #print xp, yp + xp = xp - rp_width // 2 + yp = yp - rp_height // 2 + #print(xp, yp) - karamba.moveImage(widget, rechtePupille, xp, yp) + karamba.moveImage(widget, rechtePupille, xp, yp) - karamba.redrawWidget(widget) + karamba.redrawWidget(widget) #This gets called everytime our widget is clicked. #Notes: @@ -180,13 +185,13 @@ def widgetClicked(widget, x, y, button): def widgetMouseMoved(widget, x, y, button): #Warning: Don't do anything too intensive here #You don't want to run some complex piece of code everytime the mouse moves - pass - #global linkePupille + pass + #global linkePupille - #karamba.moveImage(widget, linkePupille, x, y) - #karamba.redrawWidget(widget) + #karamba.moveImage(widget, linkePupille, x, y) + #karamba.redrawWidget(widget) # This will be printed when the widget loads. -print "Loaded Karamba Eyes" +print("Loaded Karamba Eyes") diff --git a/superkaramba/examples/globalMouse/xcursor.so b/superkaramba/examples/globalMouse/xcursor.so Binary files differdeleted file mode 100644 index 1ff08d5..0000000 --- a/superkaramba/examples/globalMouse/xcursor.so +++ /dev/null diff --git a/superkaramba/examples/graph/graph.py b/superkaramba/examples/graph/graph.py index 5798612..56beab1 100644 --- a/superkaramba/examples/graph/graph.py +++ b/superkaramba/examples/graph/graph.py @@ -28,20 +28,20 @@ def widgetUpdated(widget): if(graphs[0]): karamba.deleteGraph(widget, graphs[0]) graphs[0] = 0 - print "Deleted graph." + print("Deleted graph.") else: graphs[0] = karamba.createGraph(widget, 0, 20, 400, 30, 400) - print "Created graph: " + str(graphs[0]) + print("Created graph: " + str(graphs[0])) # size & resize size = karamba.getGraphSize(widget, graphs[1]) - print "getGraphSize: " + str(size) + print("getGraphSize: " + str(size)) size = ((b * 200) + 200, size[1]) karamba.resizeGraph(widget, graphs[1], size[0], size[1]) # pos & move pos = karamba.getGraphPos(widget, graphs[2]) - print "getGraphPos: " + str(pos) + print("getGraphPos: " + str(pos)) pos = (b * 200, pos[1]) karamba.moveGraph(widget, graphs[2], pos[0], pos[1]) @@ -53,7 +53,7 @@ def widgetUpdated(widget): # Sensor sensor = karamba.getGraphSensor(widget, graphs[4]) - print "getSensor: " + str(sensor) + print("getSensor: " + str(sensor)) if(b): karamba.setGraphSensor(widget, graphs[4], 'SENSOR=NETWORK FORMAT="%in"') else: @@ -61,19 +61,19 @@ def widgetUpdated(widget): # Min Max minmax = karamba.getGraphMinMax(widget, graphs[5]) - print "getGraphMinMax: " + str(minmax) + print("getGraphMinMax: " + str(minmax)) minmax = (0, (b * 25) + 25) karamba.setGraphMinMax(widget, graphs[5], minmax[0], minmax[1]) # Value v = karamba.getGraphValue(widget, graphs[6]) - print "getGraphValue: ", v + print("getGraphValue: ", v) v = (v + 1) % 30 karamba.setGraphValue(widget, graphs[6], v) # Color c = karamba.getGraphColor(widget, graphs[7]) - print "getGraphColor: ", c + print("getGraphColor: ", c) r = (c[0] + 10) % 255 g = (c[1] + 10) % 255 bl = (c[2] + 10) % 255 @@ -86,4 +86,4 @@ def widgetMouseMoved(widget, x, y, button): pass # This will be printed when the widget loads. -print "Loaded Graph test python extension!" +print("Loaded Graph test python extension!") diff --git a/superkaramba/examples/image/image.py b/superkaramba/examples/image/image.py index 97656eb..54f2106 100644 --- a/superkaramba/examples/image/image.py +++ b/superkaramba/examples/image/image.py @@ -44,22 +44,22 @@ def widgetUpdated(widget): # size & resize size = karamba.getImageSize(widget, images[1]) - print "getImageSize: " + str(size) - print "getImageWidth: " + str(karamba.getImageWidth(widget, images[1])) - print "getImageHeight: " + str(karamba.getImageHeight(widget, images[1])) + print("getImageSize: " + str(size)) + print("getImageWidth: " + str(karamba.getImageWidth(widget, images[1]))) + print("getImageHeight: " + str(karamba.getImageHeight(widget, images[1]))) # Auto size #size = ((b * 200) + 200, size[1]) #karamba.resizeImage(widget, images[1], size[0], size[1]) # pos & move pos = karamba.getImagePos(widget, images[2]) - print "getImagePos: " + str(pos) + print("getImagePos: " + str(pos)) pos = (b * 200, pos[1]) karamba.moveImage(widget, images[2], pos[0], pos[1]) # Sensor sensor = karamba.getImageSensor(widget, images[3]) - print "getSensor: " + str(sensor) + print("getSensor: " + str(sensor)) if(b): karamba.setImageSensor(widget, images[3], 'SENSOR=PROGRAM PROGRAM="/tmp/test1.sh"') else: @@ -67,7 +67,7 @@ def widgetUpdated(widget): # Value v = karamba.getImagePath(widget, images[4]) - print "getImagePath: ", v + print("getImagePath: ", v) if(b): v = 'flag.png' else: @@ -118,4 +118,4 @@ def widgetMouseMoved(widget, x, y, button): pass # This will be printed when the widget loads. -print "Loaded Image test python extension!" +print("Loaded Image test python extension!") diff --git a/superkaramba/examples/input_api/input_api.py b/superkaramba/examples/input_api/input_api.py index 59dc9ba..0a9725f 100644 --- a/superkaramba/examples/input_api/input_api.py +++ b/superkaramba/examples/input_api/input_api.py @@ -182,4 +182,4 @@ def keyPressed(widget, meter, char): pass # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/input_example/input_example.py b/superkaramba/examples/input_example/input_example.py index c0145c9..62a369f 100644 --- a/superkaramba/examples/input_example/input_example.py +++ b/superkaramba/examples/input_example/input_example.py @@ -153,7 +153,7 @@ def wallpaperChanged(widget, desktop): def keyPressed(widget, meter, char): global input, output if meter == input: - print "keyPressed: key= '", char, "'" + print("keyPressed: key= '", char, "'") text = karamba.getInputBoxValue(widget, input) karamba.changeText(widget, output, "Searched: " + text) try: @@ -161,9 +161,9 @@ def keyPressed(widget, meter, char): url = "konqueror leo:" + text os.system(url + "&") except TypeError: - print "There was a type error" + print("There was a type error") karamba.redrawWidget(widget) # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/mouseDrag/karmix/images/bar.png b/superkaramba/examples/mouseDrag/images/bar.png Binary files differindex 07ae19d..07ae19d 100644 --- a/superkaramba/examples/mouseDrag/karmix/images/bar.png +++ b/superkaramba/examples/mouseDrag/images/bar.png diff --git a/superkaramba/examples/mouseDrag/karmix/images/bg.png b/superkaramba/examples/mouseDrag/images/bg.png Binary files differindex 6ac12bc..6ac12bc 100644 --- a/superkaramba/examples/mouseDrag/karmix/images/bg.png +++ b/superkaramba/examples/mouseDrag/images/bg.png diff --git a/superkaramba/examples/mouseDrag/karmix/karmix.py b/superkaramba/examples/mouseDrag/karmix.py index 225eefb..bd167db 100644 --- a/superkaramba/examples/mouseDrag/karmix/karmix.py +++ b/superkaramba/examples/mouseDrag/karmix.py @@ -186,5 +186,5 @@ def activeTaskChanged(widget, task): pass # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/mouseDrag/karmix/karmix.theme b/superkaramba/examples/mouseDrag/karmix.theme index 3844663..3844663 100644 --- a/superkaramba/examples/mouseDrag/karmix/karmix.theme +++ b/superkaramba/examples/mouseDrag/karmix.theme diff --git a/superkaramba/examples/mouseDrop/mousedrop.py b/superkaramba/examples/mouseDrop/mousedrop.py index 521f0ee..b83c1df 100644 --- a/superkaramba/examples/mouseDrop/mousedrop.py +++ b/superkaramba/examples/mouseDrop/mousedrop.py @@ -134,5 +134,5 @@ def activeTaskChanged(widget, task): pass # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/openCloseTheme/1.py b/superkaramba/examples/openCloseTheme/1.py index 26281aa..fa659e0 100644 --- a/superkaramba/examples/openCloseTheme/1.py +++ b/superkaramba/examples/openCloseTheme/1.py @@ -1,7 +1,7 @@ import dcop import dcopext import karamba -from qt import QString, QCString +from qt import TQString, QCString def closeTheme(theme): dc = dcop.DCOPClient() diff --git a/superkaramba/examples/popupMenu/popupMenu.py b/superkaramba/examples/popupMenu/popupMenu.py index 8df5aef..39010f7 100644 --- a/superkaramba/examples/popupMenu/popupMenu.py +++ b/superkaramba/examples/popupMenu/popupMenu.py @@ -20,21 +20,21 @@ def initWidget(widget): global id5 menu1 = karamba.createMenu(widget) - print "menu 1 created!" + print("menu 1 created!") menu2 = karamba.createMenu(widget) - print "menu 2 created!" + print("menu 2 created!") id1 = karamba.addMenuItem(widget, menu1, "menu 1 first item", "kword") - print "item 1 entered in menu 1" + print("item 1 entered in menu 1") id2 = karamba.addMenuItem(widget, menu1, "menu 1 second item", "kate") - print "item 2 entered in menu 1" + print("item 2 entered in menu 1") id3 = karamba.addMenuItem(widget, menu2, "menu 2 first item", "kword") - print "item 1 entered in menu 2" + print("item 1 entered in menu 2") id4 = karamba.addMenuItem(widget, menu2, "menu 2 second item", "kate") - print "item 2 entered in menu 2" + print("item 2 entered in menu 2") id5 = karamba.addMenuItem(widget, menu2, "menu 2 third item", "/opt/kde/share/icons/kdeclassic/16x16/apps/kicker.png") - print "item 3 entered in menu 2" + print("item 3 entered in menu 2") @@ -95,23 +95,23 @@ def menuItemClicked(widget, menu, id): if (menu == menu1): if(id == id1): - print "item 1 in menu 1 clicked." + print("item 1 in menu 1 clicked.") elif(id == id2): - print "item 2 in menu 1 clicked, removing item 2 in menu 2" + print("item 2 in menu 1 clicked, removing item 2 in menu 2") karamba.removeMenuItem(widget, menu2, id4) elif (menu == menu2): if(id == id3): - print "item 1 in menu 2 clicked." + print("item 1 in menu 2 clicked.") elif(id == id4): - print "item 2 in menu 2 clicked, deleting menu 1 (if menu1 still exists...)" + print("item 2 in menu 2 clicked, deleting menu 1 (if menu1 still exists...)") karamba.deleteMenu(widget, menu1) elif(id == id5): - print "item 3 in menu 2 clicked, removing item 2 in menu 1 (if menu1 still exists...)" + print("item 3 in menu 2 clicked, removing item 2 in menu 1 (if menu1 still exists...)") karamba.removeMenuItem(widget, menu1, id2) # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/richtext/richtext.py b/superkaramba/examples/richtext/richtext.py index 518aa65..6da4080 100644 --- a/superkaramba/examples/richtext/richtext.py +++ b/superkaramba/examples/richtext/richtext.py @@ -30,7 +30,7 @@ is used to encode the formatting commands.</p> <p><font size=+2>Some features:</font> <ul> <li>Numbered and unnumbered lists</li> -<li>Inline Images <img src=\"""" + karamba.getThemePath(widget) + u"""info.png\"</li> +<li>Inline Images <img src=\"""" + karamba.getThemePath(widget) + """info.png\"</li> <li>Various <font color="red">different</font><font color="blue"> text</font><font color="green"> colours</font></li> <li>Hyperlinks: <a href="kfmclient openURL http://netdragon.sourceforge.net"> Superkaramba Homepage</a></li> <li>Links can also <a href="#trigger">trigger</a> actions in the script</li> @@ -53,7 +53,7 @@ http://doc.trolltech.com/3.0/qstylesheet.html</a>. karamba.moveRichText(widget, richtext, 10, 10) - print "richText Size = ", karamba.getRichTextSize(widget, richtext) + print("richText Size = ", karamba.getRichTextSize(widget, richtext)) karamba.setRichTextWidth(widget, richtext, 345) @@ -104,7 +104,7 @@ def meterClicked(widget, meter, button): global penguin_hidden global richtext - print "Meter clicked", meter + print("Meter clicked", meter) if meter == "trigger": if penguin_hidden: karamba.showImage(widget, penguin) @@ -133,4 +133,4 @@ def widgetMouseMoved(widget, x, y, button): pass # This will be printed when the widget loads. -print "Loaded Karamba Unicode Test" +print("Loaded Karamba Unicode Test") diff --git a/superkaramba/examples/richtext/rtext.py b/superkaramba/examples/richtext/rtext.py index 68c800a..7d30776 100644 --- a/superkaramba/examples/richtext/rtext.py +++ b/superkaramba/examples/richtext/rtext.py @@ -38,19 +38,19 @@ def widgetUpdated(widget): karamba.moveRichText(widget, texts[0], 0, 20) karamba.resizeRichText(widget, texts[0], 200, 20) pos = karamba.getRichTextPos(widget, texts[0]) - print "--getRichTextPos: " + str(pos) + print("--getRichTextPos: " + str(pos)) size = karamba.getRichTextSize(widget, texts[0]) - print "--getRichTextSize: " + str(size) + print("--getRichTextSize: " + str(size)) # size & resize size = karamba.getRichTextSize(widget, texts[1]) - print "getRichTextSize: " + str(size) + print("getRichTextSize: " + str(size)) size = ((b * 200) + 200, size[1]) karamba.resizeRichText(widget, texts[1], size[0], size[1]) # pos & move pos = karamba.getRichTextPos(widget, texts[2]) - print "getRichTextPos: " + str(pos) + print("getRichTextPos: " + str(pos)) pos = (b * 200, pos[1]) karamba.moveRichText(widget, texts[2], pos[0], pos[1]) @@ -62,7 +62,7 @@ def widgetUpdated(widget): # Sensor sensor = karamba.getRichTextSensor(widget, texts[4]) - print "getSensor: " + str(sensor) + print("getSensor: " + str(sensor)) if(b): karamba.setRichTextSensor(widget, texts[4], 'SENSOR=SENSOR TYPE="cpu_temp"') else: @@ -70,19 +70,19 @@ def widgetUpdated(widget): # Value v = karamba.getRichTextValue(widget, texts[5]) - print "getRichTextValue: ", v - v += '.' + print("getRichTextValue: ", v) + v += '.'.encode('utf-8') karamba.changeRichText(widget, texts[5], v) # Font size v = karamba.getRichTextFontSize(widget, texts[7]) - print "getRichTextFontSize: ", v + print("getRichTextFontSize: ", v) v = 10 + ((v-10)+1)%10; karamba.changeRichTextSize(widget, texts[7], v) # RichText Font v = karamba.getRichTextFont(widget, texts[9]) - print "getRichTextFont: ", v + print("getRichTextFont: ", v) if(b): v = 'Bitstream Vera Sans' else: @@ -96,4 +96,4 @@ def widgetMouseMoved(widget, x, y, button): pass # This will be printed when the widget loads. -print "Loaded RichText test python extension!" +print("Loaded RichText test python extension!") diff --git a/superkaramba/examples/service_group/service_group.py b/superkaramba/examples/service_group/service_group.py index 276b9c8..a56835e 100644 --- a/superkaramba/examples/service_group/service_group.py +++ b/superkaramba/examples/service_group/service_group.py @@ -16,23 +16,25 @@ import karamba # simple function to display def create_text(widget, line, depth, disp, name=None, command=None, icon=None): + print(name) + print(disp) x = depth*30 - y = line*7 + y = line*12 width = 400 - height = 8 + height = 12 drop_txt = karamba.createText(widget, x, y, width, height, disp) - karamba.changeTextSize(widget, drop_txt, 7) + karamba.changeTextSize(widget, drop_txt, 11) karamba.changeTextColor(widget, drop_txt, 252,252,252) - # create a (very narrow! only an 8-pixel-high area!) + # create a (very narrow! only an 12-pixel-high area!) # service click area to demonstrate that commands get # executed correctly. if name: karamba.createServiceClickArea( widget, x,y,width,height, - name, command, icon) + str(name), str(command), str(icon)) # okay. you really should be looking up the KDE Developer documentation @@ -92,14 +94,14 @@ def display_svc_group(widget, rel_path, line, depth): for (type, d) in grps: - if type is 0: + if type == 0: # it's a - sub_relpath = d['relpath'] - icon = d.get('icon', 'unknown') - caption = d.get('caption', None) - comment = d.get('comment', None) + sub_relpath = d[b'relpath'].decode('utf-8') + icon = d.get(b'icon', 'unknown').decode('utf-8') + caption = d.get(b'caption', b'').decode('utf-8') + comment = d.get(b'comment', b'').decode('utf-8') cmt = '' # get at least something to display @@ -109,23 +111,24 @@ def display_svc_group(widget, rel_path, line, depth): cmt = caption msg = "SVCGRP: %s %s" % (icon, cmt) + print("MSG="+msg) create_text(widget, line, depth, msg) line += 1 - line = display_svc_group(widget, sub_relpath, + line = display_svc_group(widget, str(sub_relpath), line, depth+1) - elif type is 1 and d.has_key('menuid'): + elif type == 1 and b'menuid' in d: - relpath = d.get('relpath', '') - cmd = d['exec'] - icon = d.get('icon', 'unknown') - name = d.get('name', None) - genericname = d.get('genericname', None) + relpath = d.get(b'relpath', b'').decode('utf-8') + cmd = d[b'exec'].decode('utf-8') + icon = d.get(b'icon', 'unknown').decode('utf-8') + name = d.get(b'name', b'').decode('utf-8') + genericname = d.get(b'genericname', b'') cmt = '' # get at least something to display if genericname: - cmt = genericname + cmt = genericname.decode('utf-8') elif name: cmt = name diff --git a/superkaramba/examples/setIncomingData/2.py b/superkaramba/examples/setIncomingData/2.py index a411b60..1656316 100644 --- a/superkaramba/examples/setIncomingData/2.py +++ b/superkaramba/examples/setIncomingData/2.py @@ -14,7 +14,7 @@ def initWidget(widget): # this resets the text to "" so we know we've never # received anything yet from the other theme name = karamba.getPrettyThemeName(widget) - print "2.py name: ", name + print("2.py name: ", name) karamba.setIncomingData(widget, name, "") karamba.redrawWidget(widget) @@ -47,7 +47,7 @@ def widgetUpdated(widget): # get the "message"... disp = karamba.getIncomingData(widget) - if disp == "": + if disp == "" or disp == b'': return # decode it... @@ -74,5 +74,5 @@ def widgetUpdated(widget): pass # This will be printed when the widget loads. -print "Loaded my python 2.py extension!" +print("Loaded my python 2.py extension!") diff --git a/superkaramba/examples/template.py b/superkaramba/examples/template.py index d79d1a0..dac8db7 100644 --- a/superkaramba/examples/template.py +++ b/superkaramba/examples/template.py @@ -157,4 +157,4 @@ def keyPressed(widget, meter, char): pass # This will be printed when the widget loads. -print "Loaded my python extension!" +print("Loaded my python extension!") diff --git a/superkaramba/examples/test_all.sh b/superkaramba/examples/test_all.sh index 5e95063..4b920b6 100755 --- a/superkaramba/examples/test_all.sh +++ b/superkaramba/examples/test_all.sh @@ -1,27 +1,36 @@ #!/bin/sh -themes=( - "text/text.theme" - "autoHide/main.theme" - "bar/bar.theme" - "graph/graph.theme" - "image/image.theme" - "popupMenu/popupMenu.theme" - "taskBar/cleanbar/cleanbar.theme" - "richtext/richtext.theme" - "richtext/rtext.theme" - "globalMouse/eyes.theme" - "unicode/unicode.theme" - "mouseDrag/karmix/karmix.theme" - "input_api/input_api.theme" - "input_example/input_example.theme" -) +themes=" + autoHide/main.theme + bar/bar.theme + change_interval/interval.theme + cleanbar/cleanbar.theme + control_management/mgmt.theme + disableRightClickMenu/disable_menu.theme + globalMouse/eyes.theme + graph/graph.theme + image/image.theme + input_api/input_api.theme + input_example/input_example.theme + mouseDrag/karmix.theme + mouseDrop/mousedrop.theme + openCloseTheme/1.theme + openCloseTheme/2.theme + popupMenu/popupMenu.theme + richtext/richtext.theme + richtext/rtext.theme + service_group/service_group.theme + setIncomingData/1.theme + setIncomingData/2.theme + text/text.theme + unicode/unicode.theme +" -for theme in "${themes[@]}" +for theme in $themes do - echo $theme - dcop `dcop superkaramba* | head -n 1` default openTheme $PWD/$theme - read a - dcop `dcop superkaramba* | head -n 1` default closeTheme `expr $theme : '.*/\(.*\)\.'` + echo $theme + dcop `dcop superkaramba* | head -n 1` default openTheme $PWD/$theme + read a + dcop `dcop superkaramba* | head -n 1` default closeTheme `expr $theme : '.*/\(.*\)\.'` done #dcop `dcop superkaramba* | head -n 1` default quit diff --git a/superkaramba/examples/text/text.py b/superkaramba/examples/text/text.py index 4612dd5..b5ca3d7 100644 --- a/superkaramba/examples/text/text.py +++ b/superkaramba/examples/text/text.py @@ -38,13 +38,13 @@ def widgetUpdated(widget): # size & resize size = karamba.getTextSize(widget, texts[1]) - print "getTextSize: " + str(size) + print("getTextSize: " + str(size)) size = ((b * 200) + 200, size[1]) karamba.resizeText(widget, texts[1], size[0], size[1]) # pos & move pos = karamba.getTextPos(widget, texts[2]) - print "getTextPos: " + str(pos) + print("getTextPos: " + str(pos)) pos = (b * 200, pos[1]) karamba.moveText(widget, texts[2], pos[0], pos[1]) @@ -56,7 +56,7 @@ def widgetUpdated(widget): # Sensor sensor = karamba.getTextSensor(widget, texts[4]) - print "getSensor: " + str(sensor) + print("getSensor: " + str(sensor)) if(b): karamba.setTextSensor(widget, texts[4], 'SENSOR=SENSOR TYPE="cpu_temp"') else: @@ -64,30 +64,30 @@ def widgetUpdated(widget): # Value v = karamba.getTextValue(widget, texts[5]) - print "getTextValue: ", v + print("getTextValue: ", v) v += '.' karamba.changeText(widget, texts[5], v) # Shadow v = karamba.getTextShadow(widget, texts[6]) - print "getTextShadow: ", v + print("getTextShadow: ", v) v = (v+1)%10; karamba.changeTextShadow(widget, texts[6], v) # Font size v = karamba.getTextFontSize(widget, texts[7]) - print "getTextFontSize: ", v + print("getTextFontSize: ", v) v = 10 + ((v-10)+1)%10; karamba.changeTextSize(widget, texts[7], v) # Text color v = karamba.getTextColor(widget, texts[8]) - print "getTextColor: ", v + print("getTextColor: ", v) karamba.changeTextColor(widget, texts[8], b*255, b*255, b*255) # Text Font v = karamba.getTextFont(widget, texts[9]) - print "getTextFont: ", v + print("getTextFont: ", v) if(b): v = 'Bitstream Vera Sans' else: @@ -97,7 +97,7 @@ def widgetUpdated(widget): # Text Alignment a = (a+1)%3 v = karamba.getTextAlign(widget, texts[10]) - print "getTextAlign: ", v + print("getTextAlign: ", v) karamba.setTextAlign(widget, texts[10], align[a]) def widgetClicked(widget, x, y, button): @@ -107,4 +107,4 @@ def widgetMouseMoved(widget, x, y, button): pass # This will be printed when the widget loads. -print "Loaded Text test python extension!" +print("Loaded Text test python extension!") diff --git a/superkaramba/examples/unicode/unicode.py b/superkaramba/examples/unicode/unicode.py index 13d1136..6e0447a 100644 --- a/superkaramba/examples/unicode/unicode.py +++ b/superkaramba/examples/unicode/unicode.py @@ -9,7 +9,7 @@ import karamba #this is called when you widget is initialized def initWidget(widget): - text=u""" + text=""" <h1>UNICODE Example</h1> <h3>Greek:</h3> \u03B1\u03B2\u03B3\u03B4\u03B5\u03B6\u03B7\u03B8\u03B9\u03BA\u03BB\u03BC\u03BD\u03BE\u03BF\u03C0 @@ -113,4 +113,4 @@ def widgetMouseMoved(widget, x, y, button): pass # This will be printed when the widget loads. -print "Loaded Karamba Unicode Test" +print("Loaded Karamba Unicode Test") diff --git a/superkaramba/karamba.kdevses b/superkaramba/karamba.kdevses deleted file mode 100644 index 66ecb62..0000000 --- a/superkaramba/karamba.kdevses +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version = '1.0' encoding = 'UTF-8'?> -<!DOCTYPE KDevPrjSession> -<KDevPrjSession> - <DocsAndViews NumberOfDocuments="1" > - <Doc0 NumberOfViews="1" URL="file:///home/damu/files/code/linux/kdereview/superkaramba/src/dcopinterface.h" > - <View0 line="0" Type="Source" /> - </Doc0> - </DocsAndViews> - <pluginList> - <kdevdebugger> - <breakpointList> - <breakpoint0 location="/usr/src/superkaramba.cvs/src/meter_python.cpp:27" type="1" condition="" enabled="1" /> - <breakpoint1 location="/usr/src/superkaramba.cvs/src/meter_python.cpp:182" type="1" condition="" enabled="1" /> - <breakpoint2 location="/usr/src/superkaramba.cvs/src/themelistwindow.cpp:141" type="1" condition="" enabled="1" /> - <breakpoint3 location="/usr/src/superkaramba.cvs/src/karambainterface.cpp:95" type="1" condition="" enabled="1" /> - <breakpoint4 location="/usr/src/superkaramba.cvs/src/karamba.cpp:1" type="1" condition="" enabled="1" /> - </breakpointList> - </kdevdebugger> - <kdevbookmarks> - <bookmarks/> - </kdevbookmarks> - <kdevvalgrind> - <executable path="" params="/usr/src/superkaramba.cvs/examples/richtext/rtext.theme" /> - <valgrind path="/usr/bin/valgrind" params="--tool=memcheck --gen-suppressions=yes" /> - <calltree path="" params="" /> - <tdecachegrind path="" /> - </kdevvalgrind> - </pluginList> -</KDevPrjSession> diff --git a/superkaramba/karamba.tdevelop b/superkaramba/karamba.tdevelop deleted file mode 100644 index 430b61f..0000000 --- a/superkaramba/karamba.tdevelop +++ /dev/null @@ -1,257 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>See README for the list of authors</author> - <email></email> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <version>0.36</version> - <description></description> - <ignoreparts/> - <projectdirectory>..</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <secondaryLanguages/> - <versioncontrol></versioncontrol> - </general> - <kdevautoproject> - <general> - <activetarget>src/superkaramba</activetarget> - <useconfiguration>debug</useconfiguration> - </general> - <run> - <mainprogram>superkaramba/src/superkaramba</mainprogram> - <programargs></programargs> - <terminal>false</terminal> - <envvars/> - <directoryradio>build</directoryradio> - <customdirectory>/home/damu/.trinity/share/apps/superkaramba/themes/hdd/</customdirectory> - <autocompile>true</autocompile> - </run> - <makeenvvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </makeenvvars> - <envvars/> - <make> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <prio>0</prio> - </make> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - <envvars/> - <configargs/> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - </optimized> - <debug> - <configargs>--enable-debug=full</configargs> - <builddir>debug</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O0 -g3</cxxflags> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags>-O0 -g3</cflags> - <f77flags/> - <envvars/> - </debug> - <default> - <configargs>--prefix=/usr</configargs> - <builddir/> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevpgf77options</f77compiler> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <cxxflags>-march=athlon-xp -mcpu=athlon-xp -mmmx -m3dnow -msse</cxxflags> - <f77flags/> - <topsourcedir>..</topsourcedir> - <cppflags/> - <ldflags/> - <envvars/> - </default> - </configurations> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <showvcsfields>false</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>gtk</toc> - <toc>gnustep</toc> - <toc>python</toc> - <toc>php</toc> - <toc>perl</toc> - </ignoretocs> - <projectdoc> - <userdocDir>/home/hk/src/karamba/html/</userdocDir> - <apidocDir>/home/hk/src/karamba/html/</apidocDir> - </projectdoc> - <ignoreqt_xml/> - <ignoredoxygen/> - <ignorekdocs/> - <ignoredevhelp/> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs>/home/damu/.trinity/share/apps/superkaramba/themes/hdd/hdd.theme</programargs> - <gdbpath></gdbpath> - <breakonloadinglibs>false</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - <configGdbScript></configGdbScript> - <runShellScript></runShellScript> - <runGdbScript></runGdbScript> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <cppsupportpart> - <codecompletion> - <codehinting outputview="1" enablech="1" selectview="0" /> - </codecompletion> - <classstore> - <enablepcs>false</enablepcs> - <enablepp>false</enablepp> - <preparsing/> - </classstore> - <filetemplates> - <choosefiles>false</choosefiles> - <interfaceURL/> - <implementationURL/> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - <lowercasefilenames>true</lowercasefilenames> - </filetemplates> - </cppsupportpart> - <kdevclassview> - <folderhierarchy>true</folderhierarchy> - <depthoffolders>2</depthoffolders> - </kdevclassview> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions/> - <updateoptions>-dP</updateoptions> - <addoptions/> - <removeoptions>-f</removeoptions> - <diffoptions>-u3 -p</diffoptions> - <logoptions/> - <rshoptions/> - </kdevcvs> - <kdevfilecreate> - <filetypes/> - <useglobaltypes/> - </kdevfilecreate> - <dist> - <custom>false</custom> - <bzip>false</bzip> - <archname/> - <appname/> - <version/> - <release/> - <vendor/> - <licence/> - <summary/> - <group/> - <packager/> - <description/> - <changelog/> - <devpackage>false</devpackage> - <docspackage>false</docspackage> - <appicon>false</appicon> - <arch>0</arch> - <genHTML>false</genHTML> - <useRPM>false</useRPM> - <ftpkde>false</ftpkde> - <appskde>false</appskde> - <url/> - </dist> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <references/> - <creategettersetter> - <prefixGet></prefixGet> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <designerintegration> - <tqtdesigner/> - </designerintegration> - </kdevcppsupport> - <kdevcvsservice> - <recursivewhenupdate>true</recursivewhenupdate> - <prunedirswhenupdate>true</prunedirswhenupdate> - <createdirswhenupdate>true</createdirswhenupdate> - <recursivewhencommitremove>true</recursivewhencommitremove> - <revertoptions>-C</revertoptions> - </kdevcvsservice> - <kdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </kdevdocumentation> -</tdevelop> diff --git a/superkaramba/src/CMakeLists.txt b/superkaramba/src/CMakeLists.txt index 211ee0c..c38d41b 100644 --- a/superkaramba/src/CMakeLists.txt +++ b/superkaramba/src/CMakeLists.txt @@ -53,8 +53,8 @@ tde_add_executable( superkaramba AUTOMOC sknewstuff.h sknewstuff.cpp superkarambasettings.kcfgc themelocale.cpp input.cpp sklineedit.cpp input_python.cpp - svcgrp_python.cpp - LINK tdeio-shared ${PYTHON_LIBRARIES} + svcgrp_python.cpp gpusensor.cpp + LINK tdeio-shared ${PYTHON_LIBRARIES} ${TDENEWSTUFF_LIBRARIES} ${LIBKVM_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} diff --git a/superkaramba/src/bar.h b/superkaramba/src/bar.h index 3c0562a..09dbd96 100644 --- a/superkaramba/src/bar.h +++ b/superkaramba/src/bar.h @@ -17,7 +17,7 @@ class Bar : public Meter { -Q_OBJECT +TQ_OBJECT public: Bar(karamba* k,int ix,int iy,int iw,int ih ); diff --git a/superkaramba/src/clickarea.cpp b/superkaramba/src/clickarea.cpp index a49e4c7..2377aaf 100644 --- a/superkaramba/src/clickarea.cpp +++ b/superkaramba/src/clickarea.cpp @@ -31,7 +31,7 @@ bool ClickArea::click( TQMouseEvent *e ) { //tqDebug(TQString::number(e->type())); //KShellProcess ksp; - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return false; if (!svc_name.isEmpty()) { diff --git a/superkaramba/src/clickarea.h b/superkaramba/src/clickarea.h index d062da1..9aeb221 100644 --- a/superkaramba/src/clickarea.h +++ b/superkaramba/src/clickarea.h @@ -27,8 +27,8 @@ #include <tqevent.h> #include <tqregexp.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <krun.h> #include <meter.h> @@ -39,7 +39,7 @@ **/ class ClickArea : public Meter { - Q_OBJECT + TQ_OBJECT public: ClickArea(karamba* k, int x, int y, int w, int h ); diff --git a/superkaramba/src/clickmap.h b/superkaramba/src/clickmap.h index 33fbf0e..98d68dd 100644 --- a/superkaramba/src/clickmap.h +++ b/superkaramba/src/clickmap.h @@ -22,7 +22,7 @@ **/ class ClickMap : public Meter { -Q_OBJECT +TQ_OBJECT public: ClickMap(karamba* k, int x, int y, int w, int h); diff --git a/superkaramba/src/config_python.cpp b/superkaramba/src/config_python.cpp index 0b9b34b..1a094eb 100644 --- a/superkaramba/src/config_python.cpp +++ b/superkaramba/src/config_python.cpp @@ -172,7 +172,7 @@ PyObject* py_read_config_entry(PyObject *, PyObject *args) return Py_BuildValue((char*)"l", i); } - if (type == TQSTRING_OBJECT_NAME_STRING) + if (type == "TQString") { return Py_BuildValue((char*)"s", entry.toString().ascii()); } diff --git a/superkaramba/src/cpusensor.h b/superkaramba/src/cpusensor.h index e239edb..0d02334 100644 --- a/superkaramba/src/cpusensor.h +++ b/superkaramba/src/cpusensor.h @@ -16,7 +16,7 @@ class CPUSensor : public Sensor { - Q_OBJECT + TQ_OBJECT public: CPUSensor( TQString cpuNbr, int interval ); diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp index ca5e6e6..24e4675 100644 --- a/superkaramba/src/datesensor.cpp +++ b/superkaramba/src/datesensor.cpp @@ -87,7 +87,7 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev) hidden = false; cal = new DatePicker(0); - connect(cal, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted())); + connect(cal, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted())); TQPoint c = (TQPoint(ev->x(), ev->y())); int w = cal->sizeHint().width(); @@ -117,7 +117,7 @@ void DateSensor::mousePressEvent(TQMouseEvent *ev) { switch (ev->button()) { - case Qt::LeftButton: + case TQt::LeftButton: toggleCalendar(ev); break; default: diff --git a/superkaramba/src/datesensor.h b/superkaramba/src/datesensor.h index 67c66db..b0cbdfc 100644 --- a/superkaramba/src/datesensor.h +++ b/superkaramba/src/datesensor.h @@ -26,7 +26,7 @@ private: class DateSensor : public Sensor { -Q_OBJECT +TQ_OBJECT public: DateSensor( int interval ); diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp index e16d415..55f692a 100644 --- a/superkaramba/src/disksensor.cpp +++ b/superkaramba/src/disksensor.cpp @@ -13,20 +13,20 @@ #include <tqtextstream.h> #include <tqstring.h> #include <tqregexp.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> DiskSensor::DiskSensor( int msec ) : Sensor( msec ) { - connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int ))); - connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processExited( TDEProcess * ))); + connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int ))); + connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processExited( TDEProcess * ))); // update values on startup ksp.clearArguments(); ksp << "df"; - ksp.start( KProcIO::Block,KProcIO::Stdout); + ksp.start( TDEProcIO::Block,TDEProcIO::Stdout); init = 1; } DiskSensor::~DiskSensor() @@ -153,7 +153,7 @@ void DiskSensor::update() { ksp.clearArguments(); ksp << "df"; - ksp.start( KProcIO::NotifyOnExit,KProcIO::Stdout); + ksp.start( TDEProcIO::NotifyOnExit,TDEProcIO::Stdout); } void DiskSensor::setMaxValue( SensorParams *sp ) diff --git a/superkaramba/src/disksensor.h b/superkaramba/src/disksensor.h index 7207dd2..eddbb27 100644 --- a/superkaramba/src/disksensor.h +++ b/superkaramba/src/disksensor.h @@ -15,10 +15,10 @@ #include <tqtextcodec.h> #include <tqregexp.h> #include <tqstringlist.h> -#include <kprocess.h> +#include <tdeprocess.h> class DiskSensor : public Sensor { -Q_OBJECT +TQ_OBJECT public: DiskSensor(int msec ); diff --git a/superkaramba/src/gpusensor.cpp b/superkaramba/src/gpusensor.cpp new file mode 100644 index 0000000..120e5f4 --- /dev/null +++ b/superkaramba/src/gpusensor.cpp @@ -0,0 +1,129 @@ +/******************************************************************************* + GPU sensor + Copyright (C) 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License along with + this program. If not, see <http://www.gnu.org/licenses/>. + + Improvements and feedback are welcome! +*******************************************************************************/ + +// TQt +#include <tqregexp.h> + +// TDE +#include <tdestandarddirs.h> +#include <kdebug.h> + +// Superkaramba +#include "gpusensor.h" + +GPUSensor::GPUSensor(TQString gpuDriver, TQString gpuId, int interval) + : Sensor(interval), m_gpuDriver(gpuDriver), m_gpuId(gpuId) +{ + if (m_gpuDriver.lower() == "nvidia") + { + TQString nvsmi = TDEStandardDirs::findExe("nvidia-smi"); + if (nvsmi.isNull()) + { + kdError() << "The NVidia System Management Interface software is not avaiable." << endl; + return; + } + + m_command << nvsmi << "--query-gpu" << "utilization.gpu" + << "--format=csv,noheader"; + + if (!m_gpuId.isNull()) + { + m_command << TQString("--id=%1").arg(m_gpuId); + } + } + + else + { + kdError() << "Unsupported driver specified for GPU sensor (" << m_gpuDriver << ");" << endl + << "\tSupported drivers are: nvidia" << endl; + } + + connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(receivedStdout(TDEProcess*, char*, int))); + connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExited(TDEProcess*))); +} + +GPUSensor::~GPUSensor() +{ +} + +void GPUSensor::update() +{ + if (m_command.isEmpty()) return; + + m_proc.clearArguments(); + m_proc << m_command; + + m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); +} + +void GPUSensor::receivedStdout(TDEProcess *proc, char *buffer, int buflen) +{ + buffer[buflen] = 0; + m_buffer += TQCString(buffer); +} + +TQString GPUSensor::getLoad() +{ + if (m_gpuDriver.lower() == "nvidia") + { + return m_buffer.left(m_buffer.length() - 3); + } + + return TQString::null; +} + +#define SUB_FORMAT_STR(fstring, value) \ + format.replace(TQRegExp(#fstring, false), value) +void GPUSensor::processExited(TDEProcess *proc) +{ + SensorParams *sp; + Meter *meter; + TQString format; + TQString load = getLoad(); + m_buffer = TQString::null; + + TQObjectListIt it(*objList); + while (it != 0) + { + sp = (SensorParams*)(*it); + meter = sp->getMeter(); + format = sp->getParam("FORMAT"); + + if( format.length() == 0) + { + format = "%v"; + } + + SUB_FORMAT_STR(%load, load); + SUB_FORMAT_STR(%v, load); + + meter->setValue(format); + ++it; + } +} + +#undef SUB_FORMAT_STR + +void GPUSensor::setMaxValue(SensorParams *sp) +{ + sp->getMeter()->setMax(100); +} + +#include "gpusensor.moc"
\ No newline at end of file diff --git a/superkaramba/src/gpusensor.h b/superkaramba/src/gpusensor.h new file mode 100644 index 0000000..c03eb59 --- /dev/null +++ b/superkaramba/src/gpusensor.h @@ -0,0 +1,52 @@ +/******************************************************************************* + GPU sensor + Copyright (C) 2024 Mavridis Philippe <mavridisf@gmail.com> + + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License along with + this program. If not, see <http://www.gnu.org/licenses/>. + + Improvements and feedback are welcome! +*******************************************************************************/ + +#ifndef GPUSENSOR_H +#define GPUSENSOR_H + +// TDE +#include <tdeprocess.h> + +// Superkaramba +#include "sensor.h" + +class GPUSensor : public Sensor +{ + TQ_OBJECT + + public: + GPUSensor(TQString driver, TQString gpuId, int interval = 1000); + ~GPUSensor(); + + void update(); + void setMaxValue(SensorParams *sp); + + protected: + TQString getLoad(); + + private: + TQString m_gpuDriver, m_gpuId, m_buffer; + TQStringList m_command; + TDEProcess m_proc; + + public slots: + void receivedStdout(TDEProcess *proc, char *buffer, int buflen); + void processExited(TDEProcess *proc); +}; + +#endif // GPUSENSOR_H
\ No newline at end of file diff --git a/superkaramba/src/graph.h b/superkaramba/src/graph.h index 8c1b3a8..ca11715 100644 --- a/superkaramba/src/graph.h +++ b/superkaramba/src/graph.h @@ -17,7 +17,7 @@ class Graph : public Meter { -Q_OBJECT +TQ_OBJECT public: diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp index 514e7f8..4b934a9 100644 --- a/superkaramba/src/imagelabel.cpp +++ b/superkaramba/src/imagelabel.cpp @@ -39,7 +39,7 @@ Effect::Effect(ImageLabel* img, int msec) : if (msec > 0) { // remove the effect after the given time - //TQTimer::singleShot (millisec, myImage, TQT_SLOT(slotEffectExpired())); + //TQTimer::singleShot (millisec, myImage, TQ_SLOT(slotEffectExpired())); //timer -> changeInterval(millisec); millisec = msec; } @@ -57,7 +57,7 @@ void Effect::startTimer() { if (millisec > 0) { - TQTimer::singleShot (millisec, myImage, TQT_SLOT(slotEffectExpired())); + TQTimer::singleShot (millisec, myImage, TQ_SLOT(slotEffectExpired())); millisec = 0; } } @@ -287,8 +287,8 @@ void ImageLabel::setValue(TQString fn) KTempFile tmpFile; TDEIO::FileCopyJob* copy = TDEIO::file_copy(fileName, tmpFile.name(), 0600, true, false, false); - connect(copy, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotCopyResult(TDEIO::Job*))); + connect(copy, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotCopyResult(TDEIO::Job*))); return; } else @@ -387,15 +387,15 @@ bool ImageLabel::click(TQMouseEvent* e) if (getBoundingBox().contains(e -> x(), e -> y()) && isEnabled()) { TQString program; - if (e -> button() == Qt::LeftButton) + if (e -> button() == TQt::LeftButton) { program = leftButtonAction; } - else if (e -> button() == Qt::MidButton) + else if (e -> button() == TQt::MidButton) { program = middleButtonAction; } - else if (e -> button() == Qt::RightButton) + else if (e -> button() == TQt::RightButton) { program = rightButtonAction; } diff --git a/superkaramba/src/imagelabel.h b/superkaramba/src/imagelabel.h index 1346c2e..57d90e9 100644 --- a/superkaramba/src/imagelabel.h +++ b/superkaramba/src/imagelabel.h @@ -46,7 +46,7 @@ namespace TDEIO { class Effect : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -102,7 +102,7 @@ public: class ImageLabel : public Meter { -Q_OBJECT +TQ_OBJECT public: diff --git a/superkaramba/src/input.h b/superkaramba/src/input.h index 6e1601a..9bf7fdb 100644 --- a/superkaramba/src/input.h +++ b/superkaramba/src/input.h @@ -35,7 +35,7 @@ class Input : public Meter { -Q_OBJECT +TQ_OBJECT public: Input(karamba* k, int ix, int iy, int iw, int ih); diff --git a/superkaramba/src/input_python.cpp b/superkaramba/src/input_python.cpp index fb451bd..727daaa 100644 --- a/superkaramba/src/input_python.cpp +++ b/superkaramba/src/input_python.cpp @@ -348,7 +348,7 @@ PyObject* py_getInputFocus(PyObject *, PyObject *args) // TQWidget *obj = ((karamba*)widget)->focusWidget(); - if(obj->isA(TQLINEEDIT_OBJECT_NAME_STRING)) // SKLineEdit is no TQ_Object, but TQLineEdit can only be here as a SKLineEdit + if(obj->isA("TQLineEdit")) // SKLineEdit is no TQ_Object, but TQLineEdit can only be here as a SKLineEdit return Py_BuildValue((char*)"l", ((SKLineEdit*)obj)->getInput()); return Py_BuildValue((char*)"l", 0); diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index 19b30b5..eab94db 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -77,7 +77,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, if(!m_theme.set(url)) { setFixedSize(0, 0); - TQTimer::singleShot(100, this, TQT_SLOT(killWidget())); + TQTimer::singleShot(100, this, TQ_SLOT(killWidget())); return; } // Add self to list of open themes @@ -93,8 +93,8 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, setName(qName.ascii()); KDirWatch *dirWatch = KDirWatch::self(); - connect(dirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( slotFileChanged( const TQString & ) ) ); + connect(dirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( slotFileChanged( const TQString & ) ) ); if(!dirWatch->contains(m_theme.file())) dirWatch->addFile(m_theme.file()); @@ -132,7 +132,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, if(m_theme.pythonModuleExists()) { kdDebug() << "Loading python module: " << m_theme.pythonModule() << endl; - TQTimer::singleShot(0, this, TQT_SLOT(initPythonInterface())); + TQTimer::singleShot(0, this, TQ_SLOT(initPythonInterface())); } widgetMask = 0; @@ -142,22 +142,22 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, kWinModule = new KWinModule(); desktop = 0; - connect( kWinModule,TQT_SIGNAL(currentDesktopChanged(int)), this, - TQT_SLOT(currentDesktopChanged(int)) ); - connect( kapp, TQT_SIGNAL(backgroundChanged(int)), this, - TQT_SLOT(currentWallpaperChanged(int))); + connect( kWinModule,TQ_SIGNAL(currentDesktopChanged(int)), this, + TQ_SLOT(currentDesktopChanged(int)) ); + connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), this, + TQ_SLOT(currentWallpaperChanged(int))); // Setup of the Task Manager Callbacks - connect(&taskManager, TQT_SIGNAL(activeTaskChanged(Task*)), this, - TQT_SLOT(activeTaskChanged(Task*)) ); - connect(&taskManager, TQT_SIGNAL(taskAdded(Task*)), this, - TQT_SLOT(taskAdded(Task*)) ); - connect(&taskManager, TQT_SIGNAL(taskRemoved(Task*)), this, - TQT_SLOT(taskRemoved(Task*)) ); - connect(&taskManager, TQT_SIGNAL(startupAdded(Startup*)), this, - TQT_SLOT(startupAdded(Startup*)) ); - connect(&taskManager, TQT_SIGNAL(startupRemoved(Startup*)), this, - TQT_SLOT(startupRemoved(Startup*)) ); + connect(&taskManager, TQ_SIGNAL(activeTaskChanged(Task*)), this, + TQ_SLOT(activeTaskChanged(Task*)) ); + connect(&taskManager, TQ_SIGNAL(taskAdded(Task*)), this, + TQ_SLOT(taskAdded(Task*)) ); + connect(&taskManager, TQ_SIGNAL(taskRemoved(Task*)), this, + TQ_SLOT(taskRemoved(Task*)) ); + connect(&taskManager, TQ_SIGNAL(startupAdded(Startup*)), this, + TQ_SLOT(startupAdded(Startup*)) ); + connect(&taskManager, TQ_SIGNAL(startupRemoved(Startup*)), this, + TQ_SLOT(startupRemoved(Startup*)) ); themeConfMenu = new TDEPopupMenu( this); themeConfMenu -> setCheckable(true); @@ -170,8 +170,8 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, toDesktopMenu = new TDEPopupMenu (this); toDesktopMenu -> setCheckable(true); mid = toDesktopMenu -> insertItem (i18n("&All Desktops"), - dslot = new DesktopChangeSlot(TQT_TQOBJECT(this),0), - TQT_SLOT(receive())); + dslot = new DesktopChangeSlot(this,0), + TQ_SLOT(receive())); dslot->setMenuId(mid); toDesktopMenu -> insertSeparator(); @@ -181,7 +181,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, name += ('0' + ndesktop); mid = toDesktopMenu -> insertItem (name, - dslot = new DesktopChangeSlot(TQT_TQOBJECT(this), ndesktop), TQT_SLOT(receive())); + dslot = new DesktopChangeSlot(this, ndesktop), TQ_SLOT(receive())); dslot->setMenuId(mid); } @@ -193,11 +193,11 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, menuAccColl = new TDEActionCollection( this ); kpop->insertItem( SmallIconSet("reload"),i18n("Update"), this, - TQT_SLOT(updateSensors()), Key_F5 ); + TQ_SLOT(updateSensors()), Key_F5 ); toggleLocked = new TDEToggleAction ( i18n("Toggle &Locked Position"), SmallIconSet("locked"), - CTRL+Key_L, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleLocked() ), + CTRL+Key_L, this, + TQ_SLOT( slotToggleLocked() ), accColl, "Locked position" ); accColl->insert(toggleLocked); toggleLocked -> setChecked(true); @@ -205,8 +205,8 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, toggleLocked->plug(kpop); toggleFastTransforms = new TDEToggleAction(i18n("Use &Fast Image Scaling"), - CTRL+Key_F, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleFastTransforms() ), + CTRL+Key_F, this, + TQ_SLOT( slotToggleFastTransforms() ), accColl, "Fast transformations"); accColl->insert(toggleFastTransforms); @@ -221,9 +221,9 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, kpop->insertItem(i18n("To Des&ktop"), toDesktopMenu); kpop->insertItem( SmallIconSet("reload3"),i18n("&Reload Theme"),this, - TQT_SLOT(reloadConfig()), CTRL+Key_R ); + TQ_SLOT(reloadConfig()), CTRL+Key_R ); kpop->insertItem( SmallIconSet("window-close"),i18n("&Close This Theme"), this, - TQT_SLOT(killWidget()), CTRL+Key_C ); + TQ_SLOT(killWidget()), CTRL+Key_C ); if(!SuperKarambaSettings::showSysTray()) showMenuExtension(); @@ -249,7 +249,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, menuList = new TQObjectList(); menuList->setAutoDelete( true ); - client = kapp->dcopClient(); + client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); appId = client->registerAs(tqApp->name()); @@ -262,7 +262,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, if( !parseConfig() ) { setFixedSize(0,0); - TQTimer::singleShot( 100, this, TQT_SLOT(killWidget()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(killWidget()) ); tqWarning("Could not read config file."); } else @@ -310,11 +310,11 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, move(xpos, ypos); } - haveUpdated = 0; + haveUpdated = false; this->setMouseTracking(true); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } karamba::~karamba() @@ -605,7 +605,7 @@ bool karamba::parseConfig() if (!tiptext.isEmpty()) tmp->setTooltip(tiptext); - connect(tmp, TQT_SIGNAL(pixmapLoaded()), this, TQT_SLOT(externalStep())); + connect(tmp, TQ_SIGNAL(pixmapLoaded()), this, TQ_SLOT(externalStep())); setSensor(lineParser, (Meter*) tmp ); meterList->append (tmp ); imageList->append (tmp ); @@ -790,12 +790,12 @@ void karamba::start() { m_sysTimer = new TQTimer(this); - connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(step())); + connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(step())); m_sysTimer->start(m_interval); //Start the widget running - TQTimer::singleShot( 0, this, TQT_SLOT(step()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(step()) ); if( !(onTop || managed) ) lowerTimer.start(); @@ -988,6 +988,26 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) } + if (sens == "GPU") + { + TQString gpuId = lineParser.getString("GPU"); + TQString gpuDriver = lineParser.getString("DRIVER"); + TQString sensorId = TQString("GPU_%1_%2").arg(gpuDriver, gpuId); + sensor = sensorMap[sensorId]; + if (sensor == 0) + { + int interval = lineParser.getInt("INTERVAL"); + interval = (interval == 0) ? 1000 : interval; + sensor = (sensorMap[sensorId] = new GPUSensor(gpuDriver, gpuId, interval)); + sensorList->append(sensor); + } + + SensorParams *sp = new SensorParams(meter); + sp->addParam("FORMAT", m_theme.locale()->translate(lineParser.getString("FORMAT").ascii())); + sensor->addMeter(sp); + sensor->setMaxValue(sp); + } + if( sens == "MEMORY" ) { sensor = sensorMap["MEMORY"]; @@ -1015,7 +1035,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?5000:interval; sensor = ( sensorMap["DISK"] = new DiskSensor( interval ) ); - connect( sensor, TQT_SIGNAL(initComplete()), this, TQT_SLOT(externalStep()) ); + connect( sensor, TQ_SIGNAL(initComplete()), this, TQ_SLOT(externalStep()) ); sensorList->append( sensor ); } // meter->setMax( ((DiskSensor*)sensor)->getTotalSpace(mntPt)/1024 ); @@ -1216,7 +1236,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if (sensor != 0) { - TQTimer::singleShot( 0, sensor, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, sensor, TQ_SLOT(update()) ); sensor->start(); } } @@ -1248,9 +1268,9 @@ void karamba::setIncomingData(TQString theme, TQString obj) //dataStream << theme; //dataStream << txt; - //kapp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data ); + //tdeApp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data ); - DCOPClient *c = kapp->dcopClient(); + DCOPClient *c = tdeApp->dcopClient(); if (!c->isAttached()) c->attach(); @@ -1268,9 +1288,9 @@ void karamba::callTheme(TQString theme, TQString txt) //dataStream << theme; //dataStream << txt; - //kapp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data ); + //tdeApp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data ); - DCOPClient *c = kapp->dcopClient(); + DCOPClient *c = tdeApp->dcopClient(); if (!c->isAttached()) c->attach(); @@ -1294,11 +1314,11 @@ void karamba::meterClicked(TQMouseEvent* e, Meter* meter) { int button = 0; - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) button = 1; - else if( e->button() == Qt::MidButton ) + else if( e->button() == TQt::MidButton ) button = 2; - else if( e->button() == Qt::RightButton ) + else if( e->button() == TQt::RightButton ) button = 3; if (RichTextLabel* richText = dynamic_cast<RichTextLabel*>(meter)) @@ -1351,11 +1371,11 @@ void karamba::passClick(TQMouseEvent *e) { int button = 0; - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) button = 1; - else if( e->button() == Qt::MidButton ) + else if( e->button() == TQt::MidButton ) button = 2; - else if( e->button() == Qt::RightButton ) + else if( e->button() == TQt::RightButton ) button = 3; pythonIface->widgetClicked(this, e->x(), e->y(), button); @@ -1416,7 +1436,7 @@ void karamba::management_popup( void ) void karamba::mousePressEvent( TQMouseEvent *e ) { //tqDebug("karamba::mousePressEvent"); - if( e->button() == Qt::RightButton && !want_right_button ) + if( e->button() == TQt::RightButton && !want_right_button ) { management_popup(); } @@ -1512,14 +1532,14 @@ void karamba::mouseMoveEvent( TQMouseEvent *e ) //Modified by Ryan Nickell (p0z3r@mail.com) 03/16/2004 // This will work now, but only when you move at least // one pixel in any direction with your mouse. - //if( e->button() == Qt::LeftButton ) - if( e->state() == Qt::LeftButton) + //if( e->button() == TQt::LeftButton ) + if( e->state() == TQt::LeftButton) button = 1; - //else if( e->button() == Qt::MidButton ) - else if( e->state() == Qt::MidButton ) + //else if( e->button() == TQt::MidButton ) + else if( e->state() == TQt::MidButton ) button = 2; - //else if( e->button() == Qt::RightButton ) - else if( e->state() == Qt::RightButton ) + //else if( e->button() == TQt::RightButton ) + else if( e->state() == TQt::RightButton ) button = 3; pythonIface->widgetMouseMoved(this, e->x(), e->y(), button); @@ -1560,7 +1580,7 @@ void karamba::updateSensors() ((Sensor*) *it)->update(); ++it; } - TQTimer::singleShot( 500, this, TQT_SLOT(step()) ); + TQTimer::singleShot( 500, this, TQ_SLOT(step()) ); } void karamba::updateBackground(TDESharedPixmap* kpm) @@ -1691,14 +1711,13 @@ void karamba::step() if (pythonIface && pythonIface->isExtensionLoaded()) { - if (haveUpdated == 0) + if (!haveUpdated) pythonIface->initWidget(this); else pythonIface->widgetUpdated(this); } - if (haveUpdated == 0) - haveUpdated = 1; + haveUpdated = true; } void karamba::widgetClosed() @@ -1779,16 +1798,16 @@ void karamba::addMenuConfigOption(TQString key, TQString name) //tqDebug("karamba::addMenuConfigOption"); kpop -> setItemEnabled(THEMECONF, true); - SignalBridge* action = new SignalBridge(TQT_TQOBJECT(this), key, menuAccColl); + SignalBridge* action = new SignalBridge(this, key, menuAccColl); TDEToggleAction* confItem = new TDEToggleAction (name, TDEShortcut::null(), - action, TQT_SLOT(receive()), + action, TQ_SLOT(receive()), menuAccColl, key.ascii()); confItem -> setName(key.ascii()); menuAccColl -> insert(confItem); - connect(action, TQT_SIGNAL( enabled(TQString, bool) ), - this, TQT_SLOT( slotToggleConfigOption(TQString, bool) )); + connect(action, TQ_SIGNAL( enabled(TQString, bool) ), + this, TQ_SLOT( slotToggleConfigOption(TQString, bool) )); config -> setGroup("config menu"); confItem -> setChecked(config -> readBoolEntry(key)); @@ -2035,16 +2054,16 @@ void karamba::showMenuExtension() trayMenuToggleId = kglobal->insertItem(SmallIconSet("superkaramba"), i18n("Show System Tray Icon"), this, - TQT_SLOT(slotToggleSystemTray()), + TQ_SLOT(slotToggleSystemTray()), CTRL+Key_S); trayMenuThemeId = kglobal->insertItem(SmallIconSet("knewstuff"), i18n("&Manage Themes..."), this, - TQT_SLOT(slotShowTheme()), CTRL+Key_M); + TQ_SLOT(slotShowTheme()), CTRL+Key_M); trayMenuQuitId = kglobal->insertItem(SmallIconSet("system-log-out"), i18n("&Quit SuperKaramba"), this, - TQT_SLOT(slotQuit()), CTRL+Key_Q); + TQ_SLOT(slotQuit()), CTRL+Key_Q); kglobal->polish(); diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h index 6930c5c..6fc2140 100644 --- a/superkaramba/src/karamba.h +++ b/superkaramba/src/karamba.h @@ -63,7 +63,7 @@ #include <tqdatetime.h> #include <tqbitmap.h> #include <tdeconfig.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqdragobject.h> #include "karambarootpixmap.h" @@ -82,6 +82,7 @@ #include "uptimesensor.h" #include "memsensor.h" #include "cpusensor.h" +#include "gpusensor.h" #include "networksensor.h" #include "xmmssensor.h" #include "noatunsensor.h" @@ -111,8 +112,8 @@ class LineParser; class karamba : public TQWidget { - Q_OBJECT - + TQ_OBJECT + public: karamba(TQString fn, TQString name, bool reloading = false, @@ -326,8 +327,8 @@ private slots: */ class DesktopChangeSlot : public TQObject { - Q_OBJECT - + TQ_OBJECT + public: DesktopChangeSlot(TQObject *parent, int desktop_id); @@ -347,8 +348,8 @@ class DesktopChangeSlot : public TQObject /** SignalBridge is an ungulate that lives in the forests of wild Wisconsin. */ class SignalBridge : public TQObject { - Q_OBJECT - + TQ_OBJECT + public: SignalBridge(TQObject* parent, TQString, TDEActionCollection*); diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp index 73212a0..f732570 100644 --- a/superkaramba/src/karamba_python.cpp +++ b/superkaramba/src/karamba_python.cpp @@ -51,12 +51,7 @@ struct module_state { PyObject *error; }; -#if PY_MAJOR_VERSION >= 3 #define GETSTATE(m) ((struct module_state*)PyModule_GetState(m)) -#else -#define GETSTATE(m) (&_state) -static struct module_state _state; -#endif static PyObject * error_out(PyObject *m) { @@ -356,8 +351,6 @@ static PyMethodDef karamba_methods[] = { {NULL, NULL, 0 ,NULL} }; -#if PY_MAJOR_VERSION >= 3 - static int karamba_traverse(PyObject *m, visitproc visit, void *arg) { Py_VISIT(GETSTATE(m)->error); return 0; @@ -382,22 +375,18 @@ static struct PyModuleDef karambadef = { #define INITERROR return NULL -#else - -#define INITERROR return - -#endif +PyMODINIT_FUNC PyInit_karamba(void) +{ + return PyModule_Create(&karambadef); +} PyThreadState* KarambaPython::mainThreadState = 0; KarambaPython::KarambaPython(const ThemeFile& theme, bool reloading): pythonThemeExtensionLoaded(false), pName(0), pModule(0), pDict(0) { - PyThreadState* myThreadState; char pypath[1024]; - getLock(&myThreadState); - // load the .py file for this .theme PyRun_SimpleString((char*)"import sys"); //Add theme path to python path so that we can find the python file @@ -405,13 +394,7 @@ KarambaPython::KarambaPython(const ThemeFile& theme, bool reloading): PyRun_SimpleString(pypath); PyRun_SimpleString((char*)"sys.path.insert(0, '')"); - PyImport_AddModule((char*)"karamba"); -#if PY_MAJOR_VERSION >= 3 - PyModule_Create(&karambadef); -#else - Py_InitModule((char*)"karamba", karamba_methods); -#endif - pName = PyBytes_FromString(theme.pythonModule().ascii()); + pName = PyUnicode_FromString(theme.pythonModule().utf8()); pModule = PyImport_Import(pName); fprintf(stderr, "%s\n", pypath); @@ -443,72 +426,40 @@ KarambaPython::KarambaPython(const ThemeFile& theme, bool reloading): fprintf(stderr, "------------------------------------------------------\n"); } - releaseLock(myThreadState); } KarambaPython::~KarambaPython() { //Clean up Python references if (pythonThemeExtensionLoaded) { - PyThreadState* myThreadState; - getLock(&myThreadState); - //Displose of current python module so we can reload in constructor. Py_DECREF(pModule); Py_DECREF(pName); - - releaseLock(myThreadState); } } void KarambaPython::initPython() { // initialize Python + PyImport_AppendInittab((char*)"karamba", PyInit_karamba); Py_Initialize(); +#if PY_VERSION_HEX < 0x03070000 // initialize thread support PyEval_InitThreads(); +#endif // save a pointer to the main PyThreadState object mainThreadState = PyThreadState_Get(); - - // release the lock - PyEval_ReleaseLock(); } void KarambaPython::shutdownPython() { // shut down the interpreter - PyInterpreterState * mainInterpreterState = mainThreadState->interp; - // create a thread state object for this thread - PyThreadState * myThreadState = PyThreadState_New(mainInterpreterState); - PyThreadState_Swap(myThreadState); - PyEval_AcquireLock(); + PyThreadState_Swap(mainThreadState); Py_Finalize(); } -void KarambaPython::getLock(PyThreadState** myThreadState) -{ - // get the global lock - PyEval_AcquireLock(); - - // create a thread state object for this thread - *myThreadState = PyThreadState_New(mainThreadState->interp); - PyThreadState_Swap(*myThreadState); -} - -void KarambaPython::releaseLock(PyThreadState* myThreadState) -{ - // swap my thread state out of the interpreter - PyThreadState_Swap(NULL); - // clear out any cruft from thread state object - PyThreadState_Clear(myThreadState); - // delete my thread state object - PyThreadState_Delete(myThreadState); - // release the lock - PyEval_ReleaseLock(); -} - PyObject* KarambaPython::getFunc(const char* function) { PyObject* pFunc = PyDict_GetItemString(pDict, (char*)function); @@ -517,17 +468,11 @@ PyObject* KarambaPython::getFunc(const char* function) return NULL; } -bool KarambaPython::callObject(const char* func, PyObject* pArgs, bool lock) +bool KarambaPython::callObject(const char* func, PyObject* pArgs) { bool result = false; - PyThreadState* myThreadState; - //tqDebug("Calling %s", func); - - if (lock) - getLock(&myThreadState); PyObject* pFunc = getFunc(func); - if (pFunc != NULL) { PyObject* pValue = PyObject_CallObject(pFunc, pArgs); @@ -544,8 +489,6 @@ bool KarambaPython::callObject(const char* func, PyObject* pArgs, bool lock) } } Py_DECREF(pArgs); - if (lock) - releaseLock(myThreadState); return result; } @@ -597,8 +540,7 @@ bool KarambaPython::widgetClicked(karamba* k, int x, int y, int button) return callObject("widgetClicked", pArgs); } -bool KarambaPython::keyPressed(karamba* k, const Meter* meter, - const TQString& text) +bool KarambaPython::keyPressed(karamba* k, const Meter* meter, const TQString& text) { PyObject* pArgs = Py_BuildValue((char*)"(lls)", k, meter, text.ucs2()); return callObject("keyPressed", pArgs); @@ -660,13 +602,8 @@ bool KarambaPython::itemDropped(karamba* k, TQString text, int x, int y) bool KarambaPython::themeNotify(karamba* k, const char *from, const char *str) { - // WARNING WARNING WARNING i had to switch off thread locking to get - // this to work. callNotify is called from INSIDE another locked thread, - // so can never complete because themeNotify will expect locking to be - // released... - // PyObject* pArgs = Py_BuildValue((char*)"(lss)", k, from, str); - return callObject("themeNotify", pArgs, false); + return callObject("themeNotify", pArgs); } bool KarambaPython::systrayUpdated(karamba* k) diff --git a/superkaramba/src/karamba_python.h b/superkaramba/src/karamba_python.h index b3f7a0a..5227d6d 100644 --- a/superkaramba/src/karamba_python.h +++ b/superkaramba/src/karamba_python.h @@ -45,10 +45,8 @@ protected: PyObject *pDict; static PyThreadState* mainThreadState; - void getLock(PyThreadState** myThreadState); PyObject* getFunc(const char* function); - void releaseLock(PyThreadState* myThreadState); - bool callObject(const char* func, PyObject* pArgs, bool lock=true); + bool callObject(const char* func, PyObject* pArgs); public: KarambaPython(const ThemeFile& theme, bool reloading); diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index d567eb7..b4bf15c 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -141,17 +141,17 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about) TDEPopupMenu *menu = sysTrayIcon->contextMenu(); menu->insertItem(SmallIconSet("superkaramba"), i18n("Hide System Tray Icon"), this, - TQT_SLOT(globalHideSysTray())); + TQ_SLOT(globalHideSysTray())); menu->insertSeparator(); m_helpMenu = new KHelpMenu(themeListWindow, about); - action = KStdAction::help(m_helpMenu, TQT_SLOT(appHelpActivated()), + action = KStdAction::help(m_helpMenu, TQ_SLOT(appHelpActivated()), sysTrayIcon->actionCollection()); action->plug(menu); - action = KStdAction::aboutApp(m_helpMenu, TQT_SLOT(aboutApplication()), + action = KStdAction::aboutApp(m_helpMenu, TQ_SLOT(aboutApplication()), sysTrayIcon->actionCollection()); action->plug(menu); - action = KStdAction::aboutKDE(m_helpMenu, TQT_SLOT(aboutKDE()), + action = KStdAction::aboutKDE(m_helpMenu, TQ_SLOT(aboutKDE()), sysTrayIcon->actionCollection()); action->plug(menu); @@ -164,8 +164,8 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about) sysTrayIcon->hide(); //Connect Systray icon's quit event - TQObject::connect(sysTrayIcon, TQT_SIGNAL(quitSelected()), - this, TQT_SLOT(globalQuitSuperKaramba())); + TQObject::connect(sysTrayIcon, TQ_SIGNAL(quitSelected()), + this, TQ_SLOT(globalQuitSuperKaramba())); } void KarambaApplication::showKarambaMenuExtension(bool show) @@ -296,7 +296,7 @@ void KarambaApplication::addKaramba(karamba* k, bool reloading) karambaApp->dcopClient()->appId(), k->theme().file()); k->setInstance(instance); } - karambaList->append(TQT_TQOBJECT(k)); + karambaList->append(k); } void KarambaApplication::deleteKaramba(karamba* k, bool reloading) @@ -304,12 +304,12 @@ void KarambaApplication::deleteKaramba(karamba* k, bool reloading) if(!reloading && karambaApp->dcopStub()) karambaApp->dcopStub()->themeClosed( karambaApp->dcopClient()->appId(), k->theme().file(), k->instance()); - karambaList->removeRef(TQT_TQOBJECT(k)); + karambaList->removeRef(k); } bool KarambaApplication::hasKaramba(karamba* k) { - return karambaList->containsRef(TQT_TQOBJECT(k)) > 0; + return karambaList->containsRef(k) > 0; } // XXX: I guess this should be made with mutex/semaphores diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h index 330a6ed..8e53914 100644 --- a/superkaramba/src/karambaapp.h +++ b/superkaramba/src/karambaapp.h @@ -38,7 +38,7 @@ class TDEAboutData; class KarambaApplication : public TDEApplication { - Q_OBJECT + TQ_OBJECT friend class KarambaIface; diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp index 6d3c46c..fed4bb9 100644 --- a/superkaramba/src/karambasessionmanaged.cpp +++ b/superkaramba/src/karambasessionmanaged.cpp @@ -28,7 +28,7 @@ bool KarambaSessionManaged::saveState(TQSessionManager&) { - TDEConfig* config = kapp->sessionConfig(); + TDEConfig* config = tdeApp->sessionConfig(); config->setGroup("General Options"); diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp index 1811f38..56e0769 100644 --- a/superkaramba/src/kwidgetlistbox.cpp +++ b/superkaramba/src/kwidgetlistbox.cpp @@ -33,8 +33,8 @@ KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name) verticalHeader()->hide(); setSelectionMode(TQTable::NoSelection); setFocusStyle(TQTable::FollowStyle); - connect(this, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(selectionChanged(int, int))); + connect(this, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(selectionChanged(int, int))); setHScrollBarMode(TQScrollView::AlwaysOff); setVScrollBarMode(TQScrollView::Auto); } diff --git a/superkaramba/src/kwidgetlistbox.h b/superkaramba/src/kwidgetlistbox.h index 680df49..d791337 100644 --- a/superkaramba/src/kwidgetlistbox.h +++ b/superkaramba/src/kwidgetlistbox.h @@ -30,7 +30,7 @@ typedef bool (*show_callback) (int index, TQWidget* widget, void* data); class KWidgetListbox : public TQTable { - Q_OBJECT + TQ_OBJECT public: diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index 9ea8503..feee817 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -31,7 +31,7 @@ #include <tqfileinfo.h> #include <tqstringlist.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeversion.h> #include "karamba.h" @@ -87,7 +87,7 @@ void karambaMessageOutput(TQtMsgType type, const char *msg) int main(int argc, char **argv) { #ifdef KARAMBA_LOG - tqInstallMsgHandler(karambaMessageOutput); + qInstallMsgHandler(karambaMessageOutput); #endif TDEAboutData about("superkaramba", I18N_NOOP("SuperKaramba"), version, description, @@ -128,7 +128,7 @@ int main(int argc, char **argv) KarambaApplication::unlockKaramba(); - app.connect(tqApp,TQT_SIGNAL(lastWindowClosed()),tqApp,TQT_SLOT(quit())); + app.connect(tqApp,TQ_SIGNAL(lastWindowClosed()),tqApp,TQ_SLOT(quit())); // Try to restore a previous session if applicable. app.checkPreviousSession(app, lst); diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp index 98eceea..1aac365 100644 --- a/superkaramba/src/memsensor.cpp +++ b/superkaramba/src/memsensor.cpp @@ -33,7 +33,7 @@ #include <uvm/uvm_extern.h> #endif -#include <kprocio.h> +#include <tdeprocio.h> #if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD) /* define pagetok in terms of pageshift */ @@ -57,10 +57,10 @@ MemSensor::MemSensor(int msec) : Sensor(msec) # if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018 kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open"); # elif defined Q_OS_FREEBSD - connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int ))); - connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processExited( TDEProcess * ))); + connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int ))); + connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processExited( TDEProcess * ))); swapTotal = swapUsed = 0; @@ -210,9 +210,9 @@ int MemSensor::getSwapTotal() mib[1] = VM_UVMEXP; ssize = sizeof(uvmexp); - if (sysctl(mib,2,&uvmexp,&ssize,NULL,0) != -1) { - pagesize = uvmexp.pagesize; - STotal = (pagesize*uvmexp.swpages) >> 10; + if (sysctl(mib, 2, &uvmexp, &ssize, NULL, 0) != -1) { + pagesize = uvmexp.pagesize; + STotal = (pagesize*uvmexp.swpages) >> 10; } return STotal; #else @@ -254,10 +254,10 @@ int MemSensor::getSwapFree() ssize = sizeof(uvmexp); if (sysctl(mib,2,&uvmexp,&ssize,NULL,0) != -1) { - pagesize = uvmexp.pagesize; - STotal = (pagesize*uvmexp.swpages) >> 10; - SUsed = (pagesize*uvmexp.swpginuse) >> 10; - SFree = STotal - SUsed; + pagesize = uvmexp.pagesize; + STotal = (pagesize*uvmexp.swpages) >> 10; + SUsed = (pagesize*uvmexp.swpginuse) >> 10; + SFree = STotal - SUsed; } return SFree; #else @@ -273,7 +273,7 @@ void MemSensor::readValues() # if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018) ksp.clearArguments(); ksp << "swapinfo"; - ksp.start( TDEProcess::NotifyOnExit,KProcIO::Stdout); + ksp.start( TDEProcess::NotifyOnExit,TDEProcIO::Stdout); # endif #else TQFile file("/proc/meminfo"); @@ -287,6 +287,9 @@ void MemSensor::readValues() #endif } +#define SUB_FORMAT_STR(fstring, value) \ + format.replace(TQRegExp(#fstring, false), TQString::number((int)(value))) + void MemSensor::update() { readValues(); @@ -319,27 +322,46 @@ void MemSensor::update() format = "%um"; } - format.replace( TQRegExp("%fmb", false), TQString::number( (int)(( totalMem - usedMemNoBuffers)/1024.0+0.5))); - format.replace( TQRegExp("%fm", false), TQString::number( (int)( ( totalMem - usedMem )/1024.0+0.5) )); - - format.replace( TQRegExp("%umb", false), TQString::number( (int)((usedMemNoBuffers)/1024.0+0.5))); - format.replace( TQRegExp("%um", false), TQString::number( (int)((usedMem)/1024.0+0.5 ))); - - format.replace( TQRegExp("%tm", false), TQString::number( (int)( (totalMem)/1024.0+0.5))); - - format.replace( TQRegExp("%fs", false), TQString::number( (int)((totalSwap - usedSwap)/1024.0+0.5))); - format.replace( TQRegExp("%us", false), TQString::number( (int)(usedSwap/1024.0+0.5))); - format.replace( TQRegExp("%ts", false), TQString::number( (int)(totalSwap/1024.0+0.5))); + SUB_FORMAT_STR(%fmbp, (totalMem - usedMemNoBuffers) * 100.0 / totalMem); + SUB_FORMAT_STR(%fmbg, (totalMem - usedMemNoBuffers) / 1024.0 / 1024.0 + 1); + SUB_FORMAT_STR(%fmb, (totalMem - usedMemNoBuffers) / 1024.0 + 0.5); + SUB_FORMAT_STR(%fmp, (totalMem - usedMem) * 100.0 / totalMem); + SUB_FORMAT_STR(%fmg, (totalMem - usedMem) / 1024.0 / 1024.0 + 1); + SUB_FORMAT_STR(%fm, (totalMem - usedMem) / 1024.0 + 0.5); + + SUB_FORMAT_STR(%umbp, usedMemNoBuffers * 100.0 / totalMem); + SUB_FORMAT_STR(%umbg, usedMemNoBuffers / 1024.0 / 1024.0 + 1); + SUB_FORMAT_STR(%umb, usedMemNoBuffers / 1024.0 + 0.5); + SUB_FORMAT_STR(%ump, usedMem * 100.0 / totalMem); + SUB_FORMAT_STR(%umg, usedMem / 1024.0 / 1024.0 + 1); + SUB_FORMAT_STR(%um, usedMem / 1024.0 + 0.5); + + SUB_FORMAT_STR(%tmg, totalMem / 1024.0 / 1024.0 + 1); + SUB_FORMAT_STR(%tm, totalMem / 1024.0 + 0.5); + + SUB_FORMAT_STR(%fsp, (totalSwap - usedSwap) * 100.0 / totalSwap); + SUB_FORMAT_STR(%fsg, (totalSwap - usedSwap) / 1024.0 / 1024.0 + 1); + SUB_FORMAT_STR(%fs, (totalSwap - usedSwap) / 1024.0 + 0.5); + SUB_FORMAT_STR(%usp, usedSwap * 100.0 / totalSwap); + SUB_FORMAT_STR(%usg, usedSwap / 1024.0 / 1024.0 + 1); + SUB_FORMAT_STR(%us, usedSwap / 1024.0 + 0.5); + + SUB_FORMAT_STR(%tsg, totalSwap / 1024.0 / 1024.0 + 1); + SUB_FORMAT_STR(%ts, totalSwap / 1024.0 + 0.5); meter->setValue(format); ++it; } #if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018) if (set) + { MaxSet = true; + } #endif } +#undef SUB_FORMAT_STR + void MemSensor::setMaxValue( SensorParams *sp ) { Meter *meter; @@ -351,10 +373,22 @@ void MemSensor::setMaxValue( SensorParams *sp ) { f = "%um"; } - if( f=="%fm" || f== "%um" || f=="%fmb" || f=="%umb" ) - meter->setMax( getMemTotal() / 1024 ); - if( f=="%fs" || f== "%us" ) - meter->setMax( getSwapTotal() / 1024 ); + else if (f.endsWith("p")) + { + meter->setMax(100); + } + else if (f == "%fm" || f == "%um" || f == "%fmb" || f == "%umb") + { + meter->setMax(getMemTotal() / 1024); + } + else if (f == "%fmg" || f == "%umg" || f == "%fmbg" || f == "%umbg") + { + meter->setMax(getMemTotal() / 1024 / 1024); + } + else if (f == "%fs" || f == "%us" || f == "%fsg" || f == "%usg") + { + meter->setMax(getSwapTotal() / 1024); + } } #include "memsensor.moc" diff --git a/superkaramba/src/memsensor.h b/superkaramba/src/memsensor.h index 56a91a5..23ee96b 100644 --- a/superkaramba/src/memsensor.h +++ b/superkaramba/src/memsensor.h @@ -13,17 +13,17 @@ #include <tqglobal.h> #include <tqstring.h> #include <tqregexp.h> -#include <kprocess.h> +#include <tdeprocess.h> #ifdef __FreeBSD__ -#include <kprocio.h> +#include <tdeprocio.h> #include <kvm.h> #include <osreldate.h> #endif class MemSensor : public Sensor { -Q_OBJECT +TQ_OBJECT public: diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp index 5d80a75..bc5d9e3 100644 --- a/superkaramba/src/menu_python.cpp +++ b/superkaramba/src/menu_python.cpp @@ -38,10 +38,10 @@ long createMenu(long widget) karamba* currTheme = (karamba*)widget; TDEPopupMenu* tmp = new TDEPopupMenu(currTheme); - currTheme->menuList->append( TQT_TQOBJECT(tmp) ); + currTheme->menuList->append( tmp ); - currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme, - TQT_SLOT(passMenuItemClicked(int))); + currTheme->connect(tmp, TQ_SIGNAL(activated(int)), currTheme, + TQ_SLOT(passMenuItemClicked(int))); return (long)tmp; } @@ -86,7 +86,7 @@ long deleteMenu(long widget, long menu) karamba* currTheme = (karamba*)widget; TDEPopupMenu* tmp = (TDEPopupMenu*)menu; - currTheme->menuList->removeRef(TQT_TQOBJECT(tmp)); + currTheme->menuList->removeRef(tmp); return 1; } diff --git a/superkaramba/src/meter.h b/superkaramba/src/meter.h index 810a8aa..64609e8 100644 --- a/superkaramba/src/meter.h +++ b/superkaramba/src/meter.h @@ -22,7 +22,7 @@ class karamba; class Meter : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/superkaramba/src/meter_python.cpp b/superkaramba/src/meter_python.cpp index c5d745b..d3f2293 100644 --- a/superkaramba/src/meter_python.cpp +++ b/superkaramba/src/meter_python.cpp @@ -100,11 +100,13 @@ TQString PyString2TQString(PyObject* text) } else if (PyUnicode_CheckExact(text)) { - Py_UNICODE* t = PyUnicode_AsUnicode(text); - if(sizeof(Py_UNICODE) == 4) - qtext = fromUcs4((TQ_UINT32*)t); - else - qtext = TQString::fromUcs2((TQ_UINT16*)t); + int uniSize = PyUnicode_KIND(text); + if (uniSize == PyUnicode_4BYTE_KIND) + qtext = fromUcs4((TQ_UINT32*)PyUnicode_4BYTE_DATA(text)); + else if (uniSize == PyUnicode_2BYTE_KIND) + qtext = TQString::fromUcs2((TQ_UINT16*)PyUnicode_2BYTE_DATA(text)); + else if (uniSize == PyUnicode_1BYTE_KIND) + qtext.setAscii((char*)PyUnicode_1BYTE_DATA(text)); } else { @@ -119,34 +121,11 @@ PyObject* TQString2PyString(TQString string) PyObject *pyString; const unsigned short* tmp = string.ucs2(); - bool dofree = false; if(tmp) { - #if Py_UNICODE_SIZE == 4 - - Py_UNICODE* buf = new Py_UNICODE[string.length()]; - - for(unsigned int i = 0; i < string.length(); i++) - { - buf[i] = tmp[i]; - } - dofree = true; - - #else - - Py_UNICODE* buf = (Py_UNICODE*) tmp; - - #endif - - pyString = PyUnicode_FromUnicode(buf, string.length()); - - if(dofree) - { - delete [] buf; - } + pyString = PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, tmp, string.length()); } - else pyString = PyBytes_FromString(""); diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp index 271ec51..5f60ff0 100644 --- a/superkaramba/src/misc_python.cpp +++ b/superkaramba/src/misc_python.cpp @@ -149,13 +149,13 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args) } TQApplication::connect(currTheme->currProcess, - TQT_SIGNAL(processExited(TDEProcess *)), + TQ_SIGNAL(processExited(TDEProcess *)), currTheme, - TQT_SLOT(processExited(TDEProcess *))); + TQ_SLOT(processExited(TDEProcess *))); TQApplication::connect(currTheme->currProcess, - TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), currTheme, - TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); + TQ_SLOT(receivedStdout(TDEProcess *, char *, int))); currTheme->currProcess->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); return Py_BuildValue((char*)"l", (int)(currTheme->currProcess->pid())); diff --git a/superkaramba/src/networksensor.cpp b/superkaramba/src/networksensor.cpp index 2320a6a..34cff5c 100644 --- a/superkaramba/src/networksensor.cpp +++ b/superkaramba/src/networksensor.cpp @@ -108,7 +108,7 @@ void NetworkSensor::getInOutBytes ( unsigned long &in,unsigned long &out) const } if ( line.contains( device ) ) { - TQRegExp rx( "\\W+"+device+":\\D*(\\d+)(?:\\D+\\d+){7}\\D+(\\d+)", false); + TQRegExp rx( "^\\W*"+device+":\\D*(\\d+)(?:\\D+\\d+){7}\\D+(\\d+)", false); rx.search(line); in = rx.cap(1).toULong(); out = rx.cap(2).toULong(); diff --git a/superkaramba/src/networksensor.h b/superkaramba/src/networksensor.h index 5e93517..9ad8eab 100644 --- a/superkaramba/src/networksensor.h +++ b/superkaramba/src/networksensor.h @@ -24,7 +24,7 @@ class NetworkSensor : public Sensor { - Q_OBJECT + TQ_OBJECT public: NetworkSensor( TQString device, int interval ); diff --git a/superkaramba/src/noatunsensor.cpp b/superkaramba/src/noatunsensor.cpp index 129e8e0..0a06473 100644 --- a/superkaramba/src/noatunsensor.cpp +++ b/superkaramba/src/noatunsensor.cpp @@ -144,7 +144,7 @@ TQString NoatunSensor::getTitle() else { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { reply >> result; result.replace( TQRegExp("_")," " ); diff --git a/superkaramba/src/programsensor.cpp b/superkaramba/src/programsensor.cpp index 0c2f3e2..aa4edcb 100644 --- a/superkaramba/src/programsensor.cpp +++ b/superkaramba/src/programsensor.cpp @@ -25,10 +25,10 @@ ProgramSensor::ProgramSensor(const TQString &progName, int interval, TQString en programName = progName; //update(); - connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int ))); - connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processExited( TDEProcess * ))); + connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int ))); + connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processExited( TDEProcess * ))); } ProgramSensor::~ProgramSensor() @@ -87,7 +87,7 @@ void ProgramSensor::update() ksp << programName; - ksp.start( KProcIO::NotifyOnExit,KProcIO::Stdout); + ksp.start( TDEProcIO::NotifyOnExit,TDEProcIO::Stdout); } #include "programsensor.moc" diff --git a/superkaramba/src/programsensor.h b/superkaramba/src/programsensor.h index 672d0e7..a94019e 100644 --- a/superkaramba/src/programsensor.h +++ b/superkaramba/src/programsensor.h @@ -10,15 +10,15 @@ #ifndef PROGRAMSENSOR_H #define PROGRAMSENSOR_H #include "sensor.h" -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <tqstring.h> #include <tqstringlist.h> #include <tqvaluevector.h> #include <tqtextcodec.h> class ProgramSensor : public Sensor { - Q_OBJECT + TQ_OBJECT public: ProgramSensor(const TQString &programName, int msec=1000, TQString encoding="" ); diff --git a/superkaramba/src/richtextlabel.cpp b/superkaramba/src/richtextlabel.cpp index 999fe0f..d0664da 100644 --- a/superkaramba/src/richtextlabel.cpp +++ b/superkaramba/src/richtextlabel.cpp @@ -165,7 +165,7 @@ bool RichTextLabel::click(TQMouseEvent* e) TQString anchor = text->anchorAt(point); if (anchor[0] != '#') { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { KRun :: runCommand(anchor); } diff --git a/superkaramba/src/richtextlabel.h b/superkaramba/src/richtextlabel.h index cae19c6..3d2cb2a 100644 --- a/superkaramba/src/richtextlabel.h +++ b/superkaramba/src/richtextlabel.h @@ -23,7 +23,7 @@ class RichTextLabel : public Meter { - Q_OBJECT + TQ_OBJECT public: RichTextLabel(karamba*); diff --git a/superkaramba/src/rsssensor.h b/superkaramba/src/rsssensor.h index 4361dca..4872504 100644 --- a/superkaramba/src/rsssensor.h +++ b/superkaramba/src/rsssensor.h @@ -21,7 +21,7 @@ **/ class RssSensor : public Sensor { - Q_OBJECT + TQ_OBJECT public: RssSensor( const TQString &source, int interval, const TQString &format, const TQString &encoding=TQString() ); diff --git a/superkaramba/src/sensor.cpp b/superkaramba/src/sensor.cpp index 378cb1d..8655754 100644 --- a/superkaramba/src/sensor.cpp +++ b/superkaramba/src/sensor.cpp @@ -19,7 +19,7 @@ void Sensor::start() { if (!timer.isActive()) { - connect (&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect (&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); timer.start( (msec == 0)?1000:msec); } } diff --git a/superkaramba/src/sensor.h b/superkaramba/src/sensor.h index 1fa34b1..50faea0 100644 --- a/superkaramba/src/sensor.h +++ b/superkaramba/src/sensor.h @@ -20,7 +20,7 @@ class Sensor : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp index baea31d..2765368 100644 --- a/superkaramba/src/sensorsensor.cpp +++ b/superkaramba/src/sensorsensor.cpp @@ -29,10 +29,10 @@ SensorSensor::SensorSensor(int interval, char tempUnit) : Sensor( interval ) #endif if(tempUnit == 'F') extraParams = " -f"; - connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int ))); - connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processExited( TDEProcess * ))); + connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int ))); + connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processExited( TDEProcess * ))); // readValues(); } @@ -108,7 +108,7 @@ void SensorSensor::update() #else ksp << "sensors" << extraParams; #endif - ksp.start( TDEProcess::NotifyOnExit,KProcIO::Stdout); + ksp.start( TDEProcess::NotifyOnExit,TDEProcIO::Stdout); } diff --git a/superkaramba/src/sensorsensor.h b/superkaramba/src/sensorsensor.h index c2692ef..4ece984 100644 --- a/superkaramba/src/sensorsensor.h +++ b/superkaramba/src/sensorsensor.h @@ -7,8 +7,8 @@ #include <tqmap.h> #include <tqstringlist.h> #include <tqregexp.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include "sensor.h" @@ -19,7 +19,7 @@ **/ class SensorSensor : public Sensor { - Q_OBJECT + TQ_OBJECT public: SensorSensor(int interval, char tempUnit); diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp index 57d1f46..1259288 100644 --- a/superkaramba/src/showdesktop.cpp +++ b/superkaramba/src/showdesktop.cpp @@ -40,10 +40,10 @@ ShowDesktop::ShowDesktop() kWinModule = new KWinModule( this ); // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect( kWinModule, TQT_SIGNAL(currentDesktopChanged(int)), - TQT_SLOT(slotCurrentDesktopChanged(int))); - connect( kWinModule, TQT_SIGNAL(windowChanged(WId,unsigned int)), - TQT_SLOT(slotWindowChanged(WId,unsigned int))); + connect( kWinModule, TQ_SIGNAL(currentDesktopChanged(int)), + TQ_SLOT(slotCurrentDesktopChanged(int))); + connect( kWinModule, TQ_SIGNAL(windowChanged(WId,unsigned int)), + TQ_SLOT(slotWindowChanged(WId,unsigned int))); } void ShowDesktop::slotCurrentDesktopChanged(int) diff --git a/superkaramba/src/showdesktop.h b/superkaramba/src/showdesktop.h index 22d847f..c26a650 100644 --- a/superkaramba/src/showdesktop.h +++ b/superkaramba/src/showdesktop.h @@ -29,7 +29,7 @@ class KWinModule; */ class ShowDesktop : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp index 57b9db0..86f281a 100644 --- a/superkaramba/src/sklineedit.cpp +++ b/superkaramba/src/sklineedit.cpp @@ -66,7 +66,7 @@ void SKLineEdit::keyPressEvent(TQKeyEvent* e) if(!e->text().isEmpty()) { - karamba* k = static_cast<karamba*>(TQT_TQWIDGET(parent())); + karamba* k = static_cast<karamba*>(parent()); k->keyPressed(e->text(), m_input); } } diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp index c6869b3..19f6aa8 100644 --- a/superkaramba/src/sknewstuff.cpp +++ b/superkaramba/src/sknewstuff.cpp @@ -24,7 +24,7 @@ #include <tdeio/netaccess.h> #include <kmimetype.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktar.h> #include <kurl.h> #include <tqdir.h> @@ -40,7 +40,7 @@ #include "sknewstuff.h" SKNewStuff::SKNewStuff( ThemesDlg *dlg ) : - TDENewStuff( "superkaramba/themes", dlg ), + TDENewStuff( "Karamba & Superkaramba", dlg ), mDlg( dlg ) { } @@ -53,7 +53,7 @@ bool SKNewStuff::install( const TQString &fileName ) TDEStandardDirs myStdDir; TQFileInfo fi(fileName); TQString base = fi.baseName(); - TQString baseDestDir =myStdDir.saveLocation("data", kapp->instanceName() + "/themes/", true); + TQString baseDestDir =myStdDir.saveLocation("data", tdeApp->instanceName() + "/themes/", true); const TQString destDir = baseDestDir + base + "/"; TDEStandardDirs::makeDir( destDir ); diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index ab539cd..ea93889 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -62,7 +62,7 @@ void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) { //Stupid stupid stupid work around for annoying bug //QXEmbed ignores setBackgroundOrigin(AncestorOrigin).... TQPixmap bug = TQPixmap(emb->size()); - bitBlt(TQT_TQPAINTDEVICE(&bug), 0, 0, TQT_TQPAINTDEVICE(const_cast<TQPixmap*>(&pixmap)), emb->parentWidget()->x()+emb->x(), emb->parentWidget()->y()+emb->y(), emb->width(), emb->height(),TQt::CopyROP, false); + bitBlt(&bug, 0, 0, const_cast<TQPixmap*>(&pixmap), emb->parentWidget()->x()+emb->x(), emb->parentWidget()->y()+emb->y(), emb->width(), emb->height(),TQt::CopyROP, false); emb->setPaletteBackgroundPixmap (bug); } @@ -95,7 +95,7 @@ void Systemtray::initSystray( void ) emb->setAutoDelete(false); - connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); + connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows())); m_Wins.append(emb); @@ -107,8 +107,8 @@ void Systemtray::initSystray( void ) updateTrayWindows(); - connect(twin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId))); - connect(twin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId))); + connect(twin_module, TQ_SIGNAL(systemTrayWindowAdded(WId)), TQ_SLOT(systemTrayWindowAdded(WId))); + connect(twin_module, TQ_SIGNAL(systemTrayWindowRemoved(WId)), TQ_SLOT(systemTrayWindowRemoved(WId))); TQCString screenstr; screenstr.setNum(tqt_xscreen()); @@ -206,7 +206,7 @@ void Systemtray::systemTrayWindowAdded( WId w ) emb->setAutoDelete(false); //emb->setBackgroundMode(X11ParentRelative); emb->setBackgroundMode(FixedPixmap); - connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); + connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows())); m_Wins.append(emb); emb->embed(w); diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h index dbbbed6..ba2d87c 100644 --- a/superkaramba/src/systemtray.h +++ b/superkaramba/src/systemtray.h @@ -33,7 +33,7 @@ typedef long unsigned int Atom; class Systemtray : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Systemtray(TQWidget* parent); diff --git a/superkaramba/src/systray_python.cpp b/superkaramba/src/systray_python.cpp index c953fdb..e0d96a1 100644 --- a/superkaramba/src/systray_python.cpp +++ b/superkaramba/src/systray_python.cpp @@ -111,8 +111,8 @@ long createSystray(long widget, long x, long y, long w, long h) currTheme->systray->move((int)x,(int)y); currTheme->systray->setMinimumSize((int)w,(int)h); currTheme->systray->initSystray(); - TQObject::connect(currTheme->systray,TQT_SIGNAL(updated()), - currTheme,TQT_SLOT(systrayUpdated())); + TQObject::connect(currTheme->systray,TQ_SIGNAL(updated()), + currTheme,TQ_SLOT(systrayUpdated())); currTheme->systray->show(); } diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 48cef86..b666d28 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -55,11 +55,11 @@ TaskManager::TaskManager(TQObject *parent, const char *name) twin_module = new KWinModule(); // TDEGlobal::locale()->insertCatalogue("libtaskmanager"); - connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId))); - connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId))); - connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId))); - connect(twin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int))); - connect(twin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int))); + connect(twin_module, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId))); + connect(twin_module, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(windowRemoved(WId))); + connect(twin_module, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(activeWindowChanged(WId))); + connect(twin_module, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(currentDesktopChanged(int))); + connect(twin_module, TQ_SIGNAL(windowChanged(WId,unsigned int)), TQ_SLOT(windowChanged(WId,unsigned int))); // register existing windows const TQValueList<WId> windows = twin_module->windows(); @@ -86,14 +86,14 @@ void TaskManager::configure_startup() return; _startup_info = new TDEStartupInfo( true, this ); connect( _startup_info, - TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( _startup_info, - TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( _startup_info, - TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotRemoveStartup( const TDEStartupInfoId& ))); + TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotRemoveStartup( const TDEStartupInfoId& ))); c.setGroup( "TaskbarButtonSettings" ); _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 )); } @@ -773,14 +773,14 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop()); + TQWidget *rootWin = tqApp->desktop(); TQRect geom = _info.geometry(); _grab = TQPixmap::grabWindow( rootWin->winId(), geom.x(), geom.y(), geom.width(), geom.height() ); if ( !_grab.isNull() ) - TQTimer::singleShot( 200, this, TQT_SLOT( generateThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( generateThumbnail() ) ); } void Task::generateThumbnail() diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h index ceb62ff..0626b50 100644 --- a/superkaramba/src/taskmanager.h +++ b/superkaramba/src/taskmanager.h @@ -48,7 +48,7 @@ class TaskManager; */ class Task: public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString name READ name ) TQ_PROPERTY( TQString visibleName READ visibleName ) @@ -375,7 +375,7 @@ private: */ class Startup: public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString text READ text ) TQ_PROPERTY( TQString bin READ bin ) @@ -431,7 +431,7 @@ typedef TQPtrList<Startup> StartupList; */ class TaskManager : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentDesktop READ currentDesktop ) TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops ) diff --git a/superkaramba/src/textfilesensor.h b/superkaramba/src/textfilesensor.h index 930407a..656f3c6 100644 --- a/superkaramba/src/textfilesensor.h +++ b/superkaramba/src/textfilesensor.h @@ -36,7 +36,7 @@ class TextFileSensor : public Sensor { -Q_OBJECT +TQ_OBJECT public: TextFileSensor( const TQString &fileName, bool rdf, int interval, const TQString &encoding=TQString() ); diff --git a/superkaramba/src/textlabel.cpp b/superkaramba/src/textlabel.cpp index 09b8f98..968973d 100644 --- a/superkaramba/src/textlabel.cpp +++ b/superkaramba/src/textlabel.cpp @@ -342,15 +342,15 @@ bool TextLabel::click(TQMouseEvent* e) if (getBoundingBox().contains(e -> x(), e -> y()) && isEnabled()) { TQString program; - if (e -> button() == Qt::LeftButton) + if (e -> button() == TQt::LeftButton) { program = leftButtonAction; } - else if (e -> button() == Qt::MidButton) + else if (e -> button() == TQt::MidButton) { program = middleButtonAction; } - else if (e -> button() == Qt::RightButton) + else if (e -> button() == TQt::RightButton) { program = rightButtonAction; } diff --git a/superkaramba/src/textlabel.h b/superkaramba/src/textlabel.h index df730d1..8fc167e 100644 --- a/superkaramba/src/textlabel.h +++ b/superkaramba/src/textlabel.h @@ -22,7 +22,7 @@ class TextLabel : public Meter { -Q_OBJECT +TQ_OBJECT public: enum ScrollType { ScrollNone, ScrollNormal, diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index 8cf3b92..912b9a6 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -29,7 +29,7 @@ #include <kzip.h> #include <tdeapplication.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdeio/netaccess.h> #include <tqtextstream.h> @@ -209,7 +209,7 @@ bool ThemeFile::set(const KURL &url) { if(!url.isLocalFile() && !url.protocol().isEmpty()) { - if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()), + if(KMessageBox::warningContinueCancel(tdeApp->activeWindow(), i18n("You are about to install and run %1 SuperKaramba theme. Since " "themes can contain executable code you should only install themes " "from sources that you trust. Continue?"), i18n("Executable Code Warning"), i18n("Install") @@ -224,7 +224,7 @@ bool ThemeFile::set(const KURL &url) if(localFile.exists()) { - if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()), + if(KMessageBox::warningContinueCancel(tdeApp->activeWindow(), i18n("%1 already exists. Do you want to overwrite it?") .arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite")) == KMessageBox::Cancel) @@ -233,7 +233,7 @@ bool ThemeFile::set(const KURL &url) } } if(!TDEIO::NetAccess::file_copy(url, localFile.filePath(), -1, true, - false, kapp->mainWidget())) + false, tdeApp->mainWidget())) { return false; } diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp index f451eaf..9f77c19 100644 --- a/superkaramba/src/themelocale.cpp +++ b/superkaramba/src/themelocale.cpp @@ -162,7 +162,7 @@ void ThemeLocale::setLanguage(const TQStringList &languages) if(m_theme->fileExists(file)) { TQBuffer buffer(m_theme->readThemeFile(file)); - tl_nl_load_domain(TQT_TQIODEVICE(&buffer), buffer.size(), &m_domain); + tl_nl_load_domain(&buffer, buffer.size(), &m_domain); m_language = *it; return; } diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui index d264187..b6def24 100644 --- a/superkaramba/src/themes_layout.ui +++ b/superkaramba/src/themes_layout.ui @@ -226,17 +226,15 @@ <tabstop>buttonAddToDesktop</tabstop> <tabstop>buttonClose</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">addToDesktop()</slot> <slot access="protected">selectionChanged(int)</slot> <slot access="protected">search(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kwidgetlistbox.h</include> </includes> -<includehints> - <includehint>kwidgetlistbox.h</includehint> -</includehints> </UI> diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index 7534054..25903a7 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kiconloader.h> #include <tdelocale.h> @@ -76,7 +76,7 @@ void ThemesDlg::saveUserAddedThemes() { TDEStandardDirs ksd; TQStringList t = themes(); - TQStringList dirs = ksd.findDirs("data", TQString(kapp->name()) + "/themes"); + TQStringList dirs = ksd.findDirs("data", TQString(tdeApp->name()) + "/themes"); TQStringList::Iterator it = t.begin(); bool remove; @@ -134,8 +134,8 @@ void ThemesDlg::populateListbox() item->buttonGo->setText(i18n("New Stuff...")); #ifdef HAVE_TDENEWSTUFF item->buttonGo->setEnabled(true); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(getNewStuff())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(getNewStuff())); #else item->buttonGo->setEnabled(false); #endif @@ -148,11 +148,11 @@ void ThemesDlg::populateListbox() item->setDescriptionText(i18n("Add local theme to the list.")); item->buttonGo->setProperty("stdItem", 18); item->buttonGo->setText(i18n("Open...")); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(openLocalTheme())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(openLocalTheme())); tableThemes->insertItem(item); - dirs = ksd.findDirs("data", TQString(kapp->name()) + "/themes"); + dirs = ksd.findDirs("data", TQString(tdeApp->name()) + "/themes"); // Get custom dirs from config here? TQStringList::Iterator itend( dirs.end() ); for(TQStringList::Iterator it = dirs.begin(); it != itend; ++it ) @@ -164,8 +164,8 @@ void ThemesDlg::populateListbox() item = new ThemeWidget(new ThemeFile(dir.filePath(*it))); tableThemes->insertItem(item); item->buttonGo->setText(i18n("Uninstall")); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(uninstall())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(uninstall())); } } t = SuperKarambaSettings::userAddedThemes(); @@ -178,8 +178,8 @@ void ThemesDlg::populateListbox() item = new ThemeWidget(file); tableThemes->insertItem(item); item->buttonGo->setText(i18n("Uninstall")); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(uninstall())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(uninstall())); } else delete file; @@ -363,8 +363,8 @@ int ThemesDlg::addThemeToList(const TQString &file) i = tableThemes->insertItem(item); item->buttonGo->setText(i18n("Uninstall")); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(uninstall())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(uninstall())); } tableThemes->setSelected(i); return i; @@ -485,12 +485,12 @@ void ThemesDlg::uninstall() { kdDebug() << "removing " << tempPath << " under TDENewStuffNames from superkarambarc" << endl; - kapp->config()->deleteEntry(tempPath); + tdeApp->config()->deleteEntry(tempPath); config->setGroup("TDENewStuffStatus"); kdDebug() << "removing " << name << " under TDENewStuffStatus from superkarambarc" << endl; - kapp->config()->deleteEntry(name); - kapp->config()->sync(); + tdeApp->config()->deleteEntry(name); + tdeApp->config()->sync(); } #endif @@ -514,11 +514,11 @@ void ThemesDlg::uninstall() if(!name.isEmpty()) { kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl; - kapp->config()->deleteEntry(theme.path()); + tdeApp->config()->deleteEntry(theme.path()); config->setGroup("TDENewStuffStatus"); kdDebug() << "removing " << name << " from superkarambarc" << endl; - kapp->config()->deleteEntry(name); - kapp->config()->sync(); + tdeApp->config()->deleteEntry(name); + tdeApp->config()->sync(); } #endif } diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h index 1e73288..095f2c9 100644 --- a/superkaramba/src/themesdlg.h +++ b/superkaramba/src/themesdlg.h @@ -39,7 +39,7 @@ class KArchiveDirectory; class ThemesDlg : public ThemesLayout { - Q_OBJECT + TQ_OBJECT public: diff --git a/superkaramba/src/themewidget.h b/superkaramba/src/themewidget.h index 2481cb8..f57918c 100644 --- a/superkaramba/src/themewidget.h +++ b/superkaramba/src/themewidget.h @@ -29,7 +29,7 @@ class ThemeWidget : public ThemeWidgetLayout { - Q_OBJECT + TQ_OBJECT public: ThemeWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui index 8a55785..813df4f 100644 --- a/superkaramba/src/themewidget_layout.ui +++ b/superkaramba/src/themewidget_layout.ui @@ -157,9 +157,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> </hbox> </widget> diff --git a/superkaramba/src/xmmssensor.h b/superkaramba/src/xmmssensor.h index 20727b1..2e83967 100644 --- a/superkaramba/src/xmmssensor.h +++ b/superkaramba/src/xmmssensor.h @@ -22,7 +22,7 @@ class XMMSSensor : public Sensor { - Q_OBJECT + TQ_OBJECT public: XMMSSensor( int interval, const TQString &encoding=TQString() ); diff --git a/tdefilereplace/commandengine.cpp b/tdefilereplace/commandengine.cpp index 5184773..99e1720 100644 --- a/tdefilereplace/commandengine.cpp +++ b/tdefilereplace/commandengine.cpp @@ -25,7 +25,7 @@ // KDE #include <kuser.h> #include <krandomsequence.h> -#include <kprocess.h> +#include <tdeprocess.h> // local #include "commandengine.h" @@ -34,9 +34,9 @@ TQString CommandEngine::datetime(const TQString& opt, const TQString& arg) { Q_UNUSED(arg); if(opt == "iso") - return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::ISODate); + return TQDateTime::currentDateTime(TQt::LocalTime).toString(TQt::ISODate); if(opt == "local") - return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::LocalDate); + return TQDateTime::currentDateTime(TQt::LocalTime).toString(TQt::LocalDate); return TQString(); } @@ -104,9 +104,9 @@ TQString CommandEngine::mathexp(const TQString& opt, const TQString& arg) *(proc) << script; - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*))); //Through slotGetScriptOutput, m_processOutput contains the result of the TDEProcess call if(!proc->start(TDEProcess::Block, TDEProcess::All)) diff --git a/tdefilereplace/commandengine.h b/tdefilereplace/commandengine.h index 36bcfcb..ad14578 100644 --- a/tdefilereplace/commandengine.h +++ b/tdefilereplace/commandengine.h @@ -28,7 +28,7 @@ class TDEProcess; class CommandEngine : public TQObject { - Q_OBJECT + TQ_OBJECT private: TQString m_processOutput; diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp index ba76c8c..996abdf 100644 --- a/tdefilereplace/kaddstringdlg.cpp +++ b/tdefilereplace/kaddstringdlg.cpp @@ -44,12 +44,12 @@ KAddStringDlg::KAddStringDlg(RCOptions* info, TQWidget *parent, const char *name initGUI(); - connect(m_pbOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOK())); - connect(m_rbSearchOnly, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSearchOnly())); - connect(m_rbSearchReplace, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSearchReplace())); - connect(m_pbAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddStringToView())); - connect(m_pbDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteStringFromView())); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this ,TQT_SLOT(slotHelp())); + connect(m_pbOK, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOK())); + connect(m_rbSearchOnly, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSearchOnly())); + connect(m_rbSearchReplace, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSearchReplace())); + connect(m_pbAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddStringToView())); + connect(m_pbDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteStringFromView())); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this ,TQ_SLOT(slotHelp())); whatsThis(); } @@ -244,7 +244,7 @@ void KAddStringDlg::slotDeleteStringFromView() void KAddStringDlg::slotHelp() { - kapp->invokeHelp(TQString(), "tdefilereplace"); + tdeApp->invokeHelp(TQString(), "tdefilereplace"); } #include "kaddstringdlg.moc" diff --git a/tdefilereplace/kaddstringdlg.h b/tdefilereplace/kaddstringdlg.h index 276573e..6ca518c 100644 --- a/tdefilereplace/kaddstringdlg.h +++ b/tdefilereplace/kaddstringdlg.h @@ -27,7 +27,7 @@ */ class KAddStringDlg : public KAddStringDlgS { - Q_OBJECT + TQ_OBJECT private: RCOptions* m_option; diff --git a/tdefilereplace/kaddstringdlgs.ui b/tdefilereplace/kaddstringdlgs.ui index 563aa33..87098c8 100644 --- a/tdefilereplace/kaddstringdlgs.ui +++ b/tdefilereplace/kaddstringdlgs.ui @@ -51,9 +51,6 @@ <property name="text"> <string>Search and replace mode</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton" row="0" column="0"> <property name="name"> diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp index 5119d2c..0a6873f 100644 --- a/tdefilereplace/knewprojectdlg.cpp +++ b/tdefilereplace/knewprojectdlg.cpp @@ -38,7 +38,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeversion.h> #include <kiconloader.h> #include <kdebug.h> @@ -58,23 +58,23 @@ KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *parent, const char *na initGUI(); - connect(m_chbIncludeSubfolders, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableMaxDepthControls(bool))); - connect(m_chbLimitDepth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxMaxDepth(bool))); - connect(m_pbLocation, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDir())); - connect(m_pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReject())); - connect(m_pbSearchNow, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchNow())); - connect(m_pbSearchLater, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchLater())); - connect(m_cbSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSearchLineEdit(const TQString&))); - connect(m_chbSizeMin, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxSizeMin(bool))); - connect(m_chbSizeMax, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxSizeMax(bool))); - connect(m_chbDateMin, TQT_SIGNAL(toggled(bool)), m_dedDateMin, TQT_SLOT(setEnabled(bool))); - connect(m_chbDateMax, TQT_SIGNAL(toggled(bool)), m_dedDateMax, TQT_SLOT(setEnabled(bool))); - connect(m_chbDateMin,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(slotEnableCbValidDate(bool))); - connect(m_chbDateMax,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(slotEnableCbValidDate(bool))); - connect(m_chbOwnerUser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbUser(bool))); - connect(m_chbOwnerGroup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbGroup(bool))); - connect(m_chbBackup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbBackup(bool))); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); + connect(m_chbIncludeSubfolders, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableMaxDepthControls(bool))); + connect(m_chbLimitDepth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxMaxDepth(bool))); + connect(m_pbLocation, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDir())); + connect(m_pbCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReject())); + connect(m_pbSearchNow, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchNow())); + connect(m_pbSearchLater, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchLater())); + connect(m_cbSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotSearchLineEdit(const TQString&))); + connect(m_chbSizeMin, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxSizeMin(bool))); + connect(m_chbSizeMax, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxSizeMax(bool))); + connect(m_chbDateMin, TQ_SIGNAL(toggled(bool)), m_dedDateMin, TQ_SLOT(setEnabled(bool))); + connect(m_chbDateMax, TQ_SIGNAL(toggled(bool)), m_dedDateMax, TQ_SLOT(setEnabled(bool))); + connect(m_chbDateMin,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(slotEnableCbValidDate(bool))); + connect(m_chbDateMax,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(slotEnableCbValidDate(bool))); + connect(m_chbOwnerUser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbUser(bool))); + connect(m_chbOwnerGroup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbGroup(bool))); + connect(m_chbBackup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbBackup(bool))); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHelp())); whatsThis(); } @@ -315,7 +315,7 @@ void KNewProjectDlg::loadDateAccessOptions() else { m_chbDateMin->setChecked(true); - m_dedDateMin->setDate(TQDate::fromString(date,Qt::ISODate)); + m_dedDateMin->setDate(TQDate::fromString(date,TQt::ISODate)); m_dedDateMin->setEnabled(true); } @@ -329,7 +329,7 @@ void KNewProjectDlg::loadDateAccessOptions() else { m_chbDateMax->setChecked(true); - m_dedDateMax->setDate(TQDate::fromString(date,Qt::ISODate)); + m_dedDateMax->setDate(TQDate::fromString(date,TQt::ISODate)); m_dedDateMax->setEnabled(true); } @@ -420,7 +420,7 @@ void KNewProjectDlg::saveDateAccessOptions() if(m_chbDateMin->isChecked()) { - TQString date = m_dedDateMin->date().toString(Qt::ISODate); + TQString date = m_dedDateMin->date().toString(TQt::ISODate); m_option->m_minDate = date; } else @@ -428,7 +428,7 @@ void KNewProjectDlg::saveDateAccessOptions() if(m_chbDateMax->isChecked()) { - TQString date = m_dedDateMax->date().toString(Qt::ISODate); + TQString date = m_dedDateMax->date().toString(TQt::ISODate); m_option->m_maxDate = date; } else diff --git a/tdefilereplace/knewprojectdlg.h b/tdefilereplace/knewprojectdlg.h index 82e65e6..08a307e 100644 --- a/tdefilereplace/knewprojectdlg.h +++ b/tdefilereplace/knewprojectdlg.h @@ -28,7 +28,7 @@ class TDEConfig; class KNewProjectDlg : public KNewProjectDlgS { - Q_OBJECT + TQ_OBJECT private: @@ -58,7 +58,7 @@ class KNewProjectDlg : public KNewProjectDlgS void slotEnableChbUser(bool b); void slotEnableChbGroup(bool b); void slotEnableChbBackup(bool b); - void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); } + void slotHelp(){ tdeApp->invokeHelp(TQString(), "tdefilereplace"); } private: void initGUI(); diff --git a/tdefilereplace/knewprojectdlgs.ui b/tdefilereplace/knewprojectdlgs.ui index 84f6150..dbf78ff 100644 --- a/tdefilereplace/knewprojectdlgs.ui +++ b/tdefilereplace/knewprojectdlgs.ui @@ -88,9 +88,6 @@ <property name="text"> <string>Search Now</string> </property> - <property name="accel"> - <string></string> - </property> <property name="default"> <bool>true</bool> </property> @@ -102,9 +99,6 @@ <property name="text"> <string>Search Later</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -219,9 +213,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KComboBox" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> diff --git a/tdefilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp index 748c925..1e345bc 100644 --- a/tdefilereplace/koptionsdlg.cpp +++ b/tdefilereplace/koptionsdlg.cpp @@ -29,7 +29,7 @@ #include <kcombobox.h> #include <tdeconfig.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> //#include <kdebug.h> @@ -48,12 +48,12 @@ KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : initGUI(); - connect(m_pbOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOK())); - connect(m_pbDefault, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotDefaults())); - connect(m_chbBackup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbBackup(bool))); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); - connect(m_chbConfirmStrings, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbConfirmStrings(bool))); - connect(m_chbShowConfirmDialog, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbShowConfirmDialog(bool))); + connect(m_pbOK, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOK())); + connect(m_pbDefault, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotDefaults())); + connect(m_chbBackup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbBackup(bool))); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHelp())); + connect(m_chbConfirmStrings, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbConfirmStrings(bool))); + connect(m_chbShowConfirmDialog, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbShowConfirmDialog(bool))); whatsThis(); } diff --git a/tdefilereplace/koptionsdlg.h b/tdefilereplace/koptionsdlg.h index 78375e5..f2289ba 100644 --- a/tdefilereplace/koptionsdlg.h +++ b/tdefilereplace/koptionsdlg.h @@ -32,7 +32,7 @@ class TDEConfig; class KOptionsDlg : public KOptionsDlgS { - Q_OBJECT + TQ_OBJECT public: KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name); @@ -48,7 +48,7 @@ class KOptionsDlg : public KOptionsDlgS void slotChbBackup(bool b); void slotChbConfirmStrings(bool b); void slotChbShowConfirmDialog(bool b); - void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); } + void slotHelp(){ tdeApp->invokeHelp(TQString(), "tdefilereplace"); } private: void initGUI(); diff --git a/tdefilereplace/koptionsdlgs.ui b/tdefilereplace/koptionsdlgs.ui index 196ad2c..dde7725 100644 --- a/tdefilereplace/koptionsdlgs.ui +++ b/tdefilereplace/koptionsdlgs.ui @@ -55,9 +55,6 @@ <property name="text"> <string>Enable commands in replace strings</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="7" column="0"> <property name="name"> @@ -90,9 +87,6 @@ <property name="text"> <string>Case sensitive</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> @@ -101,9 +95,6 @@ <property name="text"> <string>Recursive (search/replace in all sub folders)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> diff --git a/tdefilereplace/report.cpp b/tdefilereplace/report.cpp index 3be703e..6a8f6b5 100644 --- a/tdefilereplace/report.cpp +++ b/tdefilereplace/report.cpp @@ -44,8 +44,8 @@ void Report::createReportFile() // b) Write the header of the XML file - TQDateTime datetime = TQDateTime::currentDateTime(Qt::LocalTime); - TQString dateString = datetime.toString(Qt::LocalDate); + TQDateTime datetime = TQDateTime::currentDateTime(TQt::LocalTime); + TQString dateString = datetime.toString(TQt::LocalDate); KUser user; TQString columnTextFour, columnReplaceWith; diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp index 8cb7d33..e88d4c5 100644 --- a/tdefilereplace/tdefilereplace.cpp +++ b/tdefilereplace/tdefilereplace.cpp @@ -30,15 +30,15 @@ TDEFileReplace::TDEFileReplace() KLibFactory *factory = KLibLoader::self()->factory("libtdefilereplacepart"); if (factory) { - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "tdefilereplace_part", "KParts::ReadOnlyPart" )); if (m_part) { setCentralWidget(m_part->widget()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); setStandardToolBarMenuEnabled(true); createGUI(m_part); removeDuplicatedActions(); @@ -78,8 +78,8 @@ void TDEFileReplace::slotConfigureToolbars() { saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/tdefilereplace/tdefilereplace.h b/tdefilereplace/tdefilereplace.h index 2742a5c..73256ee 100644 --- a/tdefilereplace/tdefilereplace.h +++ b/tdefilereplace/tdefilereplace.h @@ -25,7 +25,7 @@ Shell application for the TDEFileReplace part. */ class TDEFileReplace : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: TDEFileReplace(); diff --git a/tdefilereplace/tdefilereplace.tdevelop b/tdefilereplace/tdefilereplace.tdevelop deleted file mode 100644 index 9bf175a..0000000 --- a/tdefilereplace/tdefilereplace.tdevelop +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author/> - <email/> - <version>$VERSION$</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - <secondaryLanguages/> - <versioncontrol>tdevcvsservice</versioncontrol> - </general> - <tdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <showvcsfields>false</showvcsfields> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </tdevfileview> - <tdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </tdevdebugger> - <tdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </tdevfilecreate> - <tdevautoproject> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - </make> - <run> - <directoryradio>build</directoryradio> - <customdirectory>/</customdirectory> - <mainprogram>tdefilereplace/tdefilereplace</mainprogram> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - <general> - <useconfiguration>default</useconfiguration> - <activetarget>tdefilereplace</activetarget> - </general> - <configurations> - <default> - <envvars> - <envvar value="kommander klinkstatus kxsldbg kimagemapeditor quanta" name="DO_NOT_COMPILE" /> - </envvars> - <configargs>--enable-debug=full --prefix=/opt/trinity --enable-editors</configargs> - <builddir>/home/andris/development/build/kde-head/tdewebdev</builddir> - <topsourcedir>/home/andris/development/sources/kde-head/tdewebdev</topsourcedir> - <cppflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT -DDEBUG_PARSER</cppflags> - <ldflags/> - <ccompiler>tdevgccoptions</ccompiler> - <cxxcompiler>tdevgppoptions</cxxcompiler> - <f77compiler>tdevpgf77options</f77compiler> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <cxxflags/> - <f77flags/> - </default> - </configurations> - </tdevautoproject> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <tdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <references/> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - </tdevcppsupport> - <tdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </tdevdocumentation> - <tdevcvsservice> - <recursivewhenupdate>true</recursivewhenupdate> - <prunedirswhenupdate>true</prunedirswhenupdate> - <createdirswhenupdate>true</createdirswhenupdate> - <recursivewhencommitremove>true</recursivewhencommitremove> - <revertoptions>-C</revertoptions> - </tdevcvsservice> -</tdevelop> diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp index 90c8ef4..33e0bb3 100644 --- a/tdefilereplace/tdefilereplacelib.cpp +++ b/tdefilereplace/tdefilereplacelib.cpp @@ -118,9 +118,9 @@ bool TDEFileReplaceLib::isAnAccessibleFile(const TQString& filePath, const TQStr // Avoid files that not match access date requirements TQString last = "unknown"; if(dateAccess == "Last Writing Access") - last = fi.lastModified().toString(Qt::ISODate); + last = fi.lastModified().toString(TQt::ISODate); if(dateAccess == "Last Reading Access") - last = fi.lastRead().toString(Qt::ISODate); + last = fi.lastRead().toString(TQt::ISODate); if(last != "unknown") { diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp index 14d9ff3..c3c4b82 100644 --- a/tdefilereplace/tdefilereplacepart.cpp +++ b/tdefilereplace/tdefilereplacepart.cpp @@ -28,12 +28,12 @@ #include <kbugreport.h> #include <tdeconfig.h> #include <tdefiledialog.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/netaccess.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeparts/genericfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeglobal.h> #include <kiconeffect.h> @@ -143,7 +143,7 @@ void TDEFileReplacePart::slotSearchingOperation() m_view->showSemaphore("yellow"); - kapp->processEvents(); + tdeApp->processEvents(); //disabling and enabling sorting... don't ask me why, but it works! rv->setSorting(0); @@ -377,7 +377,7 @@ void TDEFileReplacePart::showAboutApplication() void TDEFileReplacePart::appHelpActivated() { - kapp->invokeHelp(TQString(), "tdefilereplace"); + tdeApp->invokeHelp(TQString(), "tdefilereplace"); } void TDEFileReplacePart::reportBug() @@ -493,7 +493,7 @@ void TDEFileReplacePart::initGUI() actionCollection()->setHighlightingEnabled(true); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); QCStringList appList = client->registeredApplications(); bool quantaFound = false; for(QCStringList::Iterator it = appList.begin(); it != appList.end(); ++it) @@ -506,53 +506,53 @@ void TDEFileReplacePart::initGUI() } // GUI - connect(m_view, TQT_SIGNAL(updateGUI()), this, TQT_SLOT(updateGUI())); + connect(m_view, TQ_SIGNAL(updateGUI()), this, TQ_SLOT(updateGUI())); // File - (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project"); - (void)new TDEAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search"); - (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); - (void)new TDEAction(i18n("&Replace"), "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace"); - (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop"); - (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "results_create_report"); - (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultSave()), actionCollection(), "results_save"); - (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultLoad()), actionCollection(), "results_load"); + (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), this, TQ_SLOT(slotSetNewParameters()), actionCollection(), "new_project"); + (void)new TDEAction(i18n("&Search"), "filesearch", 0, this, TQ_SLOT(slotSearchingOperation()), actionCollection(), "search"); + (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, this, TQ_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); + (void)new TDEAction(i18n("&Replace"), "filereplace", 0, this, TQ_SLOT(slotReplacingOperation()), actionCollection(), "replace"); + (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, this, TQ_SLOT(slotStop()), actionCollection(), "stop"); + (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, this, TQ_SLOT(slotCreateReport()), actionCollection(), "results_create_report"); + (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, m_view, TQ_SLOT(slotResultSave()), actionCollection(), "results_save"); + (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, m_view, TQ_SLOT(slotResultLoad()), actionCollection(), "results_load"); // Strings - (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); - (void)new TDEAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); - (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); - (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save"); - (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); - (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); - (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); + (void)new TDEAction(i18n("&Add String..."), "editadd", 0, m_view, TQ_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); + (void)new TDEAction(i18n("&Delete String"), "editremove", 0, m_view, TQ_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); + (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, m_view, TQ_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); + (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, m_view, TQ_SLOT(slotStringsSave()), actionCollection(), "strings_save"); + (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, m_view, TQ_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); + (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, m_view, TQ_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); + (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, m_view, TQ_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); // Options - (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive"); - (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup"); - (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); - (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var"); - (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); - (void)new TDEAction(i18n("Configure &TDEFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); + (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, this, TQ_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive"); + (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, this, TQ_SLOT(slotOptionBackup()), actionCollection(), "options_backup"); + (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, this, TQ_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); + (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, this, TQ_SLOT(slotOptionVariables()), actionCollection(), "options_var"); + (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, this, TQ_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); + (void)new TDEAction(i18n("Configure &TDEFileReplace..."), "configure", 0, this, TQ_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); // Results - (void)new TDEAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos"); - (void)new TDEAction(i18n("&Open"), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); - (void)new TDEAction(i18n("Open &With..."), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith"); + (void)new TDEAction(i18n("&Properties"), "informations", 0, m_view, TQ_SLOT(slotResultProperties()), actionCollection(), "results_infos"); + (void)new TDEAction(i18n("&Open"), "document-open", 0, m_view, TQ_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); + (void)new TDEAction(i18n("Open &With..."), "document-open", 0, m_view, TQ_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith"); if(quantaFound) { - (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); + (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, m_view, TQ_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); } - (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); - (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry"); - (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete"); - (void)new TDEAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); - (void)new TDEAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); + (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, m_view, TQ_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); + (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, m_view, TQ_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry"); + (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, m_view, TQ_SLOT(slotResultDelete()), actionCollection(), "results_delete"); + (void)new TDEAction(i18n("E&xpand Tree"), 0, m_view, TQ_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); + (void)new TDEAction(i18n("&Reduce Tree"), 0, m_view, TQ_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); // Help - (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); - (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); - (void)new TDEAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug"); + (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, this, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); + (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, this, TQ_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); + (void)new TDEAction(i18n("&Report Bug"), 0, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug"); } void TDEFileReplacePart::initView() @@ -904,7 +904,7 @@ void TDEFileReplacePart::fileReplace() // Avoids files that not match requirements if(!TDEFileReplaceLib::isAnAccessibleFile(d.canonicalPath(), fileName, m_option)) continue; - kapp->processEvents(); + tdeApp->processEvents(); if(m_option->m_backup) replaceAndBackup(d.canonicalPath(), fileName); else @@ -960,7 +960,7 @@ void TDEFileReplacePart::recursiveFileReplace(const TQString &directoryName, int TQFileInfo qi(filePath); m_view->displayScannedFiles(foldersNumber, filesNumber); - kapp->processEvents(); + tdeApp->processEvents(); // Replace recursively if "filePath" is a directory and we have not reached the max depth level if (qi.isDir()) @@ -1245,7 +1245,7 @@ void TDEFileReplacePart::fileSearch(const TQString& directoryName, const TQStrin TQFileInfo fileInfo(filePath+"/"+fileName); if(fileInfo.isDir()) continue; - kapp->processEvents(); + tdeApp->processEvents(); search(filePath, fileName); filesNumber++; m_view->displayScannedFiles(0, filesNumber); @@ -1297,7 +1297,7 @@ void TDEFileReplacePart::recursiveFileSearch(const TQString &directoryName, cons m_view->displayScannedFiles(foldersNumber, filesNumber); - kapp->processEvents(); + tdeApp->processEvents(); // Searchs recursively if "filePath" is a directory and we have not reached the max depth level if (fileInfo.isDir()) { diff --git a/tdefilereplace/tdefilereplacepart.h b/tdefilereplace/tdefilereplacepart.h index 4495ae9..7e841cd 100644 --- a/tdefilereplace/tdefilereplacepart.h +++ b/tdefilereplace/tdefilereplacepart.h @@ -31,7 +31,7 @@ class TDEFileReplaceView; class TDEFileReplacePart: public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT private: //MEMBERS diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp index 87d6482..616b3e3 100644 --- a/tdefilereplace/tdefilereplaceview.cpp +++ b/tdefilereplace/tdefilereplaceview.cpp @@ -52,25 +52,25 @@ TDEFileReplaceView::TDEFileReplaceView(RCOptions* info, TQWidget *parent,const c initGUI(); // result listview: connect events - connect(m_lvResults, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); - connect(m_lvResults, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults_2, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); - connect(m_lvResults_2, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults_2, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); + connect(m_lvResults, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults_2, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); + connect(m_lvResults_2, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults_2, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); // connect header events - connect(m_lvResults->header(), TQT_SIGNAL(clicked(int)), this,TQT_SLOT(slotResultHeaderClicked(int))); - connect(m_lvResults_2->header(), TQT_SIGNAL(clicked(int)), this,TQT_SLOT(slotResultHeaderClicked(int))); + connect(m_lvResults->header(), TQ_SIGNAL(clicked(int)), this,TQ_SLOT(slotResultHeaderClicked(int))); + connect(m_lvResults_2->header(), TQ_SIGNAL(clicked(int)), this,TQ_SLOT(slotResultHeaderClicked(int))); // string listview: connect events - connect(m_lvStrings, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsAdd())); - connect(m_lvStrings_2, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsAdd())); + connect(m_lvStrings, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotStringsAdd())); + connect(m_lvStrings_2, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotStringsAdd())); whatsThis(); } @@ -220,7 +220,7 @@ void TDEFileReplaceView::slotResultMouseButtonClicked(int button, TQListViewItem if (lvi == 0) // No item selected return; - if (button == Qt::RightButton) + if (button == TQt::RightButton) { // Right mouse button: open popup menub m_menuResult->popup(pos); @@ -283,7 +283,7 @@ void TDEFileReplaceView::slotResultEdit() while (lvi) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); DCOPRef quanta(client->appId(),"WindowManagerIf"); TQString path = TQString(lvi->text(1)+"/"+lvi->text(0)); TQListViewItem *lviChild = lvi; @@ -747,7 +747,7 @@ void TDEFileReplaceView::initGUI() m_stackStrings->addWidget(m_lvStrings); m_stackStrings->addWidget(m_lvStrings_2); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); QCStringList appList = client->registeredApplications(); bool quantaFound = false; @@ -768,37 +768,37 @@ void TDEFileReplaceView::initGUI() m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("document-open")), i18n("&Open"), this, - TQT_SLOT(slotResultOpen())); + TQ_SLOT(slotResultOpen())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("document-open")), i18n("Open &With..."), this, - TQT_SLOT(slotResultOpenWith())); + TQ_SLOT(slotResultOpenWith())); if(quantaFound) { m_menuResult->insertItem(SmallIconSet("quanta"), i18n("&Edit in Quanta"), this, - TQT_SLOT(slotResultEdit())); + TQ_SLOT(slotResultEdit())); } m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("go-up")), i18n("Open Parent &Folder"), this, - TQT_SLOT(slotResultDirOpen())); + TQ_SLOT(slotResultDirOpen())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-clear")), i18n("Remove &Entry"), this, - TQT_SLOT(slotResultRemoveEntry())); + TQ_SLOT(slotResultRemoveEntry())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-delete")), i18n("&Delete"), this, - TQT_SLOT(slotResultDelete())); + TQ_SLOT(slotResultDelete())); m_menuResult->insertSeparator(); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("application-vnd.tde.info")), i18n("&Properties"), this, - TQT_SLOT(slotResultProperties())); + TQ_SLOT(slotResultProperties())); changeViews(); } diff --git a/tdefilereplace/tdefilereplaceview.h b/tdefilereplace/tdefilereplaceview.h index 4e554e8..f4e5cab 100644 --- a/tdefilereplace/tdefilereplaceview.h +++ b/tdefilereplace/tdefilereplaceview.h @@ -56,7 +56,7 @@ class coord */ class TDEFileReplaceView : public TDEFileReplaceViewWdg { - Q_OBJECT + TQ_OBJECT public://Constructors TDEFileReplaceView(RCOptions* info, TQWidget *parent,const char *name); diff --git a/tdelirc/README.profile-creation b/tdelirc/README.profile-creation index 80ec429..b977bd2 100644 --- a/tdelirc/README.profile-creation +++ b/tdelirc/README.profile-creation @@ -50,8 +50,8 @@ service name (found in the .desktop file) as attributes of them: </profile> b) Inside populate with name and author information. If your application is not a -KUniqueApplication, you **must** declare this with an "instances" tag, giving the -attribute "unique" a value of "0" (it defaults to "1", a KUniqueApplication). You +TDEUniqueApplication, you **must** declare this with an "instances" tag, giving the +attribute "unique" a value of "0" (it defaults to "1", a TDEUniqueApplication). You may optionally describe the default behavior TDELirc should take should there be more than one instance of the application, with the attribute "ifmulti" which may take one of "dontsend" (do nothing if >1 instance), "sendtoone" (send call to one diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp index 2d042f0..6255430 100644 --- a/tdelirc/irkick/irkick.cpp +++ b/tdelirc/irkick/irkick.cpp @@ -20,7 +20,7 @@ #if !(TDE_VERSION_MINOR<=1 && TDE_VERSION_RELEASE<=5) #include <tdeactioncollection.h> #endif -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <ksystemtray.h> #include <kiconloader.h> #include <kpassivepopup.h> @@ -44,12 +44,12 @@ void IRKTrayIcon::mousePressEvent(TQMouseEvent *e) { - KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == Qt::LeftButton ? Qt::RightButton : e->button(), e->state())); + KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == TQt::LeftButton ? TQt::RightButton : e->button(), e->state())); } IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString()) { - kapp->dcopClient()->setDefaultObject(obj); + tdeApp->dcopClient()->setDefaultObject(obj); theClient = new KLircClient(); theTrayIcon = new IRKTrayIcon(); @@ -60,23 +60,23 @@ IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQStri else { theTrayIcon->setPixmap(SmallIcon("irkickoff")); TQToolTip::add(theTrayIcon, i18n("TDE Lirc Server: No infra-red remote controls found.")); - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } theFlashOff = new TQTimer(theTrayIcon); - connect(theFlashOff, TQT_SIGNAL(timeout()), TQT_SLOT(flashOff())); + connect(theFlashOff, TQ_SIGNAL(timeout()), TQ_SLOT(flashOff())); theResetCount = 0; slotReloadConfiguration(); - connect(theClient, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotClosed())); - connect(theClient, TQT_SIGNAL(remotesRead()), this, TQT_SLOT(resetModes())); - connect(theClient, TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQT_SLOT(gotMessage(const TQString &, const TQString &, int))); + connect(theClient, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotClosed())); + connect(theClient, TQ_SIGNAL(remotesRead()), this, TQ_SLOT(resetModes())); + connect(theClient, TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQ_SLOT(gotMessage(const TQString &, const TQString &, int))); theTrayIcon->contextMenu()->changeTitle(0, "IRKick"); - theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); + theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQ_SLOT(slotConfigure())); theTrayIcon->contextMenu()->insertSeparator(); theTrayIcon->contextMenu()->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), (new KHelpMenu(theTrayIcon, TDEGlobal::instance()->aboutData()))->menu()); - theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQT_SIGNAL(activated())); - connect(theTrayIcon->actionCollection()->action("file_quit"), TQT_SIGNAL(activated()), TQT_SLOT(doQuit())); + theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQ_SIGNAL(activated())); + connect(theTrayIcon->actionCollection()->action("file_quit"), TQ_SIGNAL(activated()), TQ_SLOT(doQuit())); theTrayIcon->show(); } @@ -92,7 +92,7 @@ void IRKick::slotClosed() { theTrayIcon->setPixmap(SmallIcon("irkickoff")); KPassivePopup::message("IRKick", i18n("The infrared system has severed its connection. Remote controls are no longer available."), SmallIcon("irkick"), theTrayIcon); - TQTimer::singleShot(1000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(1000, this, TQ_SLOT(checkLirc())); } void IRKick::checkLirc() @@ -103,7 +103,7 @@ void IRKick::checkLirc() theTrayIcon->setPixmap(SmallIcon("irkick")); } else - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } void IRKick::flashOff() @@ -113,14 +113,14 @@ void IRKick::flashOff() void IRKick::doQuit() { - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); theConfig.setGroup("General"); switch(KMessageBox::questionYesNoCancel(0, i18n("Should the Infrared Remote Control server start automatically when you begin TDE?"), i18n("Automatically Start?"), i18n("Start Automatically"), i18n("Do Not Start"))) { case KMessageBox::No: theConfig.writeEntry("AutoStart", false); break; case KMessageBox::Yes: theConfig.writeEntry("AutoStart", true); break; case KMessageBox::Cancel: return; } - TDEApplication::kApplication()->quit(); + tdeApp->quit(); } void IRKick::resetModes() @@ -143,7 +143,7 @@ void IRKick::resetModes() void IRKick::slotReloadConfiguration() { // load configuration from config file - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); allActions.loadFromConfig(theConfig); allModes.loadFromConfig(theConfig); if(currentModes.count() && theResetCount) diff --git a/tdelirc/irkick/irkick.h b/tdelirc/irkick/irkick.h index cecc26b..a3b7cc3 100644 --- a/tdelirc/irkick/irkick.h +++ b/tdelirc/irkick/irkick.h @@ -41,7 +41,7 @@ public: class IRKick: public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tdelirc/irkick/main.cpp b/tdelirc/irkick/main.cpp index 5d5a791..be98cae 100644 --- a/tdelirc/irkick/main.cpp +++ b/tdelirc/irkick/main.cpp @@ -13,11 +13,11 @@ #include <tdeaboutdata.h> #include <tdeglobal.h> #include <kdebug.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include "irkick.h" -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org"); aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/"); @@ -27,8 +27,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData->addCredit("Antonio Larrosa Jiménez", I18N_NOOP("Ideas"), "larrosa@kde.org"); TDECmdLineArgs::init( argc, argv, aboutData ); - KUniqueApplication::addCmdLineOptions(); - KUniqueApplication app; + TDEUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication app; TDEGlobal::locale()->insertCatalogue( "tdelirc" ); app.disableSessionManagement(); IRKick *theIRKick = new IRKick("IRKick"); diff --git a/tdelirc/irkick/tdelircclient.cpp b/tdelirc/irkick/tdelircclient.cpp index ee00c88..c70d39a 100644 --- a/tdelirc/irkick/tdelircclient.cpp +++ b/tdelirc/irkick/tdelircclient.cpp @@ -72,8 +72,8 @@ bool KLircClient::connectToLirc() theSocket = new TQSocket; theSocket->setSocket(sock); - connect(theSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead())); - connect(theSocket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotClosed())); + connect(theSocket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead())); + connect(theSocket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotClosed())); updateRemotes(); return true; } diff --git a/tdelirc/irkick/tdelircclient.h b/tdelirc/irkick/tdelircclient.h index 68c1906..a3da5df 100644 --- a/tdelirc/irkick/tdelircclient.h +++ b/tdelirc/irkick/tdelircclient.h @@ -28,7 +28,7 @@ class TQSocketNotifier; class KLircClient: public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp index 8a87775..0ebf472 100644 --- a/tdelirc/kcmlirc/addaction.cpp +++ b/tdelirc/kcmlirc/addaction.cpp @@ -34,8 +34,8 @@ AddAction::AddAction(TQWidget *parent, const char *name, const Mode &mode): AddActionBase(parent, name), theMode(mode) { - connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( updateForPageChange() )); - connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( slotCorrectPage() )); + connect(this, TQ_SIGNAL( selected(const TQString &) ), TQ_SLOT( updateForPageChange() )); + connect(this, TQ_SIGNAL( selected(const TQString &) ), TQ_SLOT( slotCorrectPage() )); curPage = 0; updateProfiles(); updateButtons(); @@ -143,7 +143,7 @@ void AddAction::updateButtonStates() const TQStringList AddAction::getFunctions(const TQString app, const TQString obj) { TQStringList ret; - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); QCStringList theApps = theClient->remoteFunctions(app.utf8(), obj.utf8()); for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i) if( *i != "QCStringList interfaces()" && @@ -274,7 +274,7 @@ void AddAction::updateParameter() { theValue->raiseWidget(1); theValueCheckBox->setChecked(theArguments[index].toBool()); } - else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1) + else if(type.find("TQStringList") != -1) { theValue->raiseWidget(4); TQStringList backup = theArguments[index].toStringList(); // backup needed because calling clear will kill what ever has been saved. @@ -313,7 +313,7 @@ void AddAction::slotParameterChanged() theArguments[index].asDouble() = theValueDoubleNumInput->value(); else if(type.find("bool") != -1) theArguments[index].asBool() = theValueCheckBox->isChecked(); - else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1) + else if(type.find("TQStringList") != -1) theArguments[index].asStringList() = theValueEditListBox->items(); else theArguments[index].asString() = theValueLineEdit->text(); @@ -335,7 +335,7 @@ void AddAction::updateObjects() uniqueProgramMap.clear(); nameProgramMap.clear(); - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); QCStringList theApps = theClient->registeredApplications(); for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i) { diff --git a/tdelirc/kcmlirc/addaction.h b/tdelirc/kcmlirc/addaction.h index 3a3f22f..135f89d 100644 --- a/tdelirc/kcmlirc/addaction.h +++ b/tdelirc/kcmlirc/addaction.h @@ -26,7 +26,7 @@ class TQListViewItem; class AddAction : public AddActionBase { - Q_OBJECT + TQ_OBJECT int curPage; diff --git a/tdelirc/kcmlirc/addactionbase.ui b/tdelirc/kcmlirc/addactionbase.ui index 9887a97..dc28b78 100644 --- a/tdelirc/kcmlirc/addactionbase.ui +++ b/tdelirc/kcmlirc/addactionbase.ui @@ -1574,7 +1574,7 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>updateFunctions()</slot> <slot>updateParameter()</slot> <slot>updateParameters()</slot> @@ -1587,7 +1587,7 @@ <slot>updateForPageChange()</slot> <slot>slotParameterChanged()</slot> <slot>updateOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/tdelirc/kcmlirc/editaction.cpp b/tdelirc/kcmlirc/editaction.cpp index 8d8a0cb..1b44eb7 100644 --- a/tdelirc/kcmlirc/editaction.cpp +++ b/tdelirc/kcmlirc/editaction.cpp @@ -315,7 +315,7 @@ void EditAction::updateDCOPApplications() TQStringList names; theDCOPApplications->clear(); - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); QCStringList theApps = theClient->registeredApplications(); for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i) { @@ -337,7 +337,7 @@ void EditAction::updateDCOPApplications() void EditAction::updateDCOPObjects() { theDCOPObjects->clear(); - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); if(theDCOPApplications->currentText().isNull() || theDCOPApplications->currentText().isEmpty()) return; QCStringList theObjects = theClient->remoteObjects(nameProgramMap[theDCOPApplications->currentText()].utf8()); if(!theObjects.size() && theDCOPApplications->currentText() == (*theAction).program()) theDCOPObjects->insertItem((*theAction).object()); diff --git a/tdelirc/kcmlirc/editaction.h b/tdelirc/kcmlirc/editaction.h index 8b19b6a..20b7da1 100644 --- a/tdelirc/kcmlirc/editaction.h +++ b/tdelirc/kcmlirc/editaction.h @@ -25,7 +25,7 @@ class EditAction : public EditActionBase { - Q_OBJECT + TQ_OBJECT IRAIt theAction; TQMap<TQString, TQString> applicationMap, functionMap; diff --git a/tdelirc/kcmlirc/editactionbase.ui b/tdelirc/kcmlirc/editactionbase.ui index e7dd0f7..d82d68b 100644 --- a/tdelirc/kcmlirc/editactionbase.ui +++ b/tdelirc/kcmlirc/editactionbase.ui @@ -1263,7 +1263,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>updateFunctions()</slot> <slot>updateApplications()</slot> <slot>updateDCOPApplications()</slot> @@ -1273,7 +1273,7 @@ <slot>updateArgument(int)</slot> <slot>slotParameterChanged()</slot> <slot>updateOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/tdelirc/kcmlirc/editmode.h b/tdelirc/kcmlirc/editmode.h index 5de0836..669e991 100644 --- a/tdelirc/kcmlirc/editmode.h +++ b/tdelirc/kcmlirc/editmode.h @@ -20,7 +20,7 @@ */ class EditMode : public EditModeBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdelirc/kcmlirc/editmodebase.ui b/tdelirc/kcmlirc/editmodebase.ui index e6c36f3..649d886 100644 --- a/tdelirc/kcmlirc/editmodebase.ui +++ b/tdelirc/kcmlirc/editmodebase.ui @@ -289,10 +289,10 @@ <slot>slotClearIcon()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotCheckText(const TQString &)</slot> <slot>slotClearIcon()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kicondialog.h</include> diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp index 512d10d..c0f4212 100644 --- a/tdelirc/kcmlirc/kcmlirc.cpp +++ b/tdelirc/kcmlirc/kcmlirc.cpp @@ -26,7 +26,7 @@ #include <kicondialog.h> #include <kiconloader.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kgenericfactory.h> #include <tdelistview.h> #include <tdemessagebox.h> @@ -57,37 +57,37 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC setButtons(TDECModule::Help); setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>")); bool ok; - TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); + tdeApp->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); if(!ok) if(KMessageBox::questionYesNo(this, i18n("The Infrared Remote Control software is not currently running. This configuration module will not work properly without it. Would you like to start it now?"), i18n("Software Not Running"), i18n("Start"), i18n("Do Not Start")) == KMessageBox::Yes) { kdDebug() << "S" << TDEApplication::startServiceByDesktopName("irkick") << endl; - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); theConfig.setGroup("General"); if(theConfig.readBoolEntry("AutoStart", true) == false) if(KMessageBox::questionYesNo(this, i18n("Would you like the infrared remote control software to start automatically when you begin TDE?"), i18n("Automatically Start?"), i18n("Start Automatically"), i18n("Do Not Start")) == KMessageBox::Yes) theConfig.writeEntry("AutoStart", true); } - TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); + tdeApp->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); kdDebug() << "OK" << ok << endl; (new TQHBoxLayout(this))->setAutoAdd(true); theKCMLircBase = new KCMLircBase(this); - connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateActions() )); - connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModesStatus(TQListViewItem *) )); - connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) )); - connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() )); - connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) )); - connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect((TQObject *)(theKCMLircBase->theAddActions), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddActions() )); - connect((TQObject *)(theKCMLircBase->theAddAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAction() )); - connect((TQObject *)(theKCMLircBase->theEditAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditAction() )); - connect((TQObject *)(theKCMLircBase->theActions), TQT_SIGNAL( doubleClicked(TQListViewItem *) ), this, TQT_SLOT( slotEditAction() )); - connect((TQObject *)(theKCMLircBase->theRemoveAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveAction() )); - connect((TQObject *)(theKCMLircBase->theAddMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddMode() )); - connect((TQObject *)(theKCMLircBase->theEditMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditMode() )); - connect((TQObject *)(theKCMLircBase->theRemoveMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveMode() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateActions() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateModesStatus(TQListViewItem *) )); + connect(theKCMLircBase->theActions, TQ_SIGNAL( currentChanged(TQListViewItem *) ), this, TQ_SLOT( updateActionsStatus(TQListViewItem *) )); + connect(theKCMLircBase->theExtensions, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateInformation() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQ_SLOT( slotRenamed(TQListViewItem *) )); + connect(theKCMLircBase->theModes, TQ_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(slotDrop(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect((TQObject *)(theKCMLircBase->theAddActions), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddActions() )); + connect((TQObject *)(theKCMLircBase->theAddAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAction() )); + connect((TQObject *)(theKCMLircBase->theEditAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditAction() )); + connect((TQObject *)(theKCMLircBase->theActions), TQ_SIGNAL( doubleClicked(TQListViewItem *) ), this, TQ_SLOT( slotEditAction() )); + connect((TQObject *)(theKCMLircBase->theRemoveAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveAction() )); + connect((TQObject *)(theKCMLircBase->theAddMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddMode() )); + connect((TQObject *)(theKCMLircBase->theEditMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditMode() )); + connect((TQObject *)(theKCMLircBase->theRemoveMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveMode() )); load(); } @@ -163,7 +163,7 @@ void KCMLirc::slotAddAction() Mode m = modeMap[theKCMLircBase->theModes->selectedItem()]; AddAction theDialog(this, 0, m); - connect(this, TQT_SIGNAL(haveButton(const TQString &, const TQString &)), &theDialog, TQT_SLOT(updateButton(const TQString &, const TQString &))); + connect(this, TQ_SIGNAL(haveButton(const TQString &, const TQString &)), &theDialog, TQ_SLOT(updateButton(const TQString &, const TQString &))); // populate the modes list box TQListViewItem *item = theKCMLircBase->theModes->selectedItem(); @@ -498,7 +498,7 @@ void KCMLirc::updateInformation() void KCMLirc::load() { - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); allActions.loadFromConfig(theConfig); allModes.loadFromConfig(theConfig); allModes.generateNulls(IRKick_stub("irkick", "IRKick").remotes()); @@ -516,7 +516,7 @@ void KCMLirc::defaults() void KCMLirc::save() { - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); allActions.saveToConfig(theConfig); allModes.saveToConfig(theConfig); @@ -546,7 +546,7 @@ void KCMLirc::configChanged() // TODO: Take this out when I know how extern "C" { - KDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) { TDEGlobal::locale()->insertCatalogue("kcmlirc"); return new KCMLirc(parent, "KCMLirc"); } diff --git a/tdelirc/kcmlirc/kcmlirc.h b/tdelirc/kcmlirc/kcmlirc.h index c187642..e062534 100644 --- a/tdelirc/kcmlirc/kcmlirc.h +++ b/tdelirc/kcmlirc/kcmlirc.h @@ -30,7 +30,7 @@ class Remote; class KCMLirc: public TDECModule, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tdelirc/kcmlirc/kcmlircbase.ui b/tdelirc/kcmlirc/kcmlircbase.ui index 3bf02c8..a6e4b4c 100644 --- a/tdelirc/kcmlirc/kcmlircbase.ui +++ b/tdelirc/kcmlirc/kcmlircbase.ui @@ -341,9 +341,6 @@ <property name="text"> <string>Auto-Populate...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton" row="1" column="0"> <property name="name"> @@ -485,14 +482,12 @@ </grid> </widget> <includes> - <include location="local" impldecl="in implementation">kcmlircbase.ui.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="local" impldecl="in implementation">kcmlircbase.ui.h</include> </includes> <functions> <function access="private" specifier="non virtual">init()</function> </functions> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> </UI> diff --git a/tdelirc/kcmlirc/kcmlircbase.ui.h b/tdelirc/kcmlirc/kcmlircbase.ui.h index dcf2ec3..f7dc483 100644 --- a/tdelirc/kcmlirc/kcmlircbase.ui.h +++ b/tdelirc/kcmlirc/kcmlircbase.ui.h @@ -23,7 +23,7 @@ void KCMLircBase::init() { delete theModes; modeLayout->removeItem(modeButtonLayout); - theModes = new ModesList(TQT_TQWIDGET(modeLayout->parent()), "theModes"); + theModes = new ModesList(static_cast<TQWidget*>(modeLayout->parent()), "theModes"); theModes->addColumn(i18n("Remote Control")); theModes->addColumn(i18n("Default")); theModes->addColumn(i18n("Icon")); diff --git a/tdelirc/kcmlirc/modeslist.h b/tdelirc/kcmlirc/modeslist.h index d6a4b25..e60ba00 100644 --- a/tdelirc/kcmlirc/modeslist.h +++ b/tdelirc/kcmlirc/modeslist.h @@ -24,7 +24,7 @@ class ModesList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: virtual bool acceptDrag(TQDropEvent *) const; diff --git a/tdelirc/kcmlirc/newmode.ui b/tdelirc/kcmlirc/newmode.ui index 2365dce..483a69b 100644 --- a/tdelirc/kcmlirc/newmode.ui +++ b/tdelirc/kcmlirc/newmode.ui @@ -148,8 +148,8 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotTextChanged( const TQString & newText )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/tdelirc/profiles/konqueror.profile.xml b/tdelirc/profiles/konqueror.profile.xml index 0fdfdba..464ed52 100644 --- a/tdelirc/profiles/konqueror.profile.xml +++ b/tdelirc/profiles/konqueror.profile.xml @@ -5,10 +5,10 @@ <name>Konqueror</name> <author>Gav Wood</author> <instances uniqueapp="0" ifmulti="sendtotop"/> - <action objid="KonquerorIface" prototype="void createNewWindow(QString)" repeat="0" autostart="0"> + <action objid="KonquerorIface" prototype="void createNewWindow(TQString)" repeat="0" autostart="0"> <name>Create New Window</name> <comment>Creates a new window and loads an arbitrary URL.</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The URL to load in the window initially.</comment></argument> + <argument type="TQString"><comment>The URL to load in the window initially.</comment></argument> </action> <action objid="MainApplication-Interface" prototype="void quit()" repeat="0" autostart="0"> <name>Quit</name> diff --git a/tdelirc/profiles/profile.dtd b/tdelirc/profiles/profile.dtd index 070fd14..96c60da 100644 --- a/tdelirc/profiles/profile.dtd +++ b/tdelirc/profiles/profile.dtd @@ -14,7 +14,7 @@ <!ATTLIST profile servicename CDATA #REQUIRED> <!ATTLIST action objid CDATA #REQUIRED> <!ATTLIST action prototype CDATA #REQUIRED> -<!ATTLIST argument type (int|QString|QCString|QStringList|bool|double) #REQUIRED> +<!ATTLIST argument type (int|TQString|QCString|QStringList|bool|double) #REQUIRED> <!ATTLIST range min CDATA #REQUIRED> <!ATTLIST range max CDATA #REQUIRED> <!ATTLIST action class (captions|teletext|fullscreen|scan|finetuneup|finetunedown|recall|enter|number|play|stop|pause|record|previous|next|rewind|forward|eject|mute|volumedown|volumeup|channeldown|channelup|red|yellow|green|blue|on|off) #IMPLIED> diff --git a/tdelirc/profiles/tdelauncher.profile.xml b/tdelirc/profiles/tdelauncher.profile.xml index 57eca31..be55dbd 100644 --- a/tdelirc/profiles/tdelauncher.profile.xml +++ b/tdelirc/profiles/tdelauncher.profile.xml @@ -3,16 +3,16 @@ <profile id="tdelauncher"> <name>TDE Program Launcher</name> <author>Gav Wood</author> - <action objid="default" prototype="void tdeinit_exec(QString, QStringList)" repeat="0" autostart="0"> + <action objid="default" prototype="void tdeinit_exec(TQString, QStringList)" repeat="0" autostart="0"> <name>Execute</name> <comment>Runs a program or script</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument> - <argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument> + <argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument> + <argument type="TQStringList"><comment>Parameters for the program or script</comment></argument> </action> - <action objid="default" prototype="void tdeinit_exec_wait(QString, QStringList)" repeat="0" autostart="0"> + <action objid="default" prototype="void tdeinit_exec_wait(TQString, QStringList)" repeat="0" autostart="0"> <name>Execute and Wait</name> <comment>Runs a program or script and waits for it to finish</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument> - <argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument> + <argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument> + <argument type="TQStringList"><comment>Parameters for the program or script</comment></argument> </action> </profile> diff --git a/tdelirc/tdelirc/profileserver.cpp b/tdelirc/tdelirc/profileserver.cpp index ba39442..8840693 100644 --- a/tdelirc/tdelirc/profileserver.cpp +++ b/tdelirc/tdelirc/profileserver.cpp @@ -15,7 +15,7 @@ #include <tqxml.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "profileserver.h" @@ -66,7 +66,7 @@ void Profile::loadFromFile(const TQString &fileName) curPAA = 0; TQFile xmlFile(fileName); - TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile)); + TQXmlInputSource source(&xmlFile); TQXmlSimpleReader reader; reader.setContentHandler(this); reader.parse(source); @@ -124,7 +124,7 @@ bool Profile::startElement(const TQString &, const TQString &, const TQString &n curPAA->setType(attributes.value("type")); } else if(name == "range" && curPAA) - curPAA->setRange(tqMakePair(attributes.value("min").toInt(), attributes.value("max").toInt())); + curPAA->setRange(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt())); charBuffer = ""; return true; diff --git a/tdelirc/tdelirc/prototype.h b/tdelirc/tdelirc/prototype.h index fa101b7..3c86025 100644 --- a/tdelirc/tdelirc/prototype.h +++ b/tdelirc/tdelirc/prototype.h @@ -30,7 +30,7 @@ class Prototype public: unsigned count() const{ return theTypes.count(); } - const TQPair<TQString, TQString> operator[](int i) const { return tqMakePair(theTypes[i], theNames[i]); } + const TQPair<TQString, TQString> operator[](int i) const { return qMakePair(theTypes[i], theNames[i]); } const TQString &name(int i) const { return theNames[i]; } const TQString &type(int i) const { return theTypes[i]; } const TQString &returnType() const { return theReturn; } diff --git a/tdelirc/tdelirc/remoteserver.cpp b/tdelirc/tdelirc/remoteserver.cpp index dafa67d..13f095c 100644 --- a/tdelirc/tdelirc/remoteserver.cpp +++ b/tdelirc/tdelirc/remoteserver.cpp @@ -15,7 +15,7 @@ #include <tqxml.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "remoteserver.h" @@ -58,7 +58,7 @@ void Remote::loadFromFile(const TQString &fileName) curRB = 0; TQFile xmlFile(fileName); - TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile)); + TQXmlInputSource source(&xmlFile); TQXmlSimpleReader reader; reader.setContentHandler(this); reader.parse(source); diff --git a/tdessh/sshdlg.h b/tdessh/sshdlg.h index 2856f7a..752a764 100644 --- a/tdessh/sshdlg.h +++ b/tdessh/sshdlg.h @@ -14,7 +14,7 @@ class TDEsshDialog : public KPasswordDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdessh/tdessh.cpp b/tdessh/tdessh.cpp index 4b46ac1..8e2d64a 100644 --- a/tdessh/tdessh.cpp +++ b/tdessh/tdessh.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> #include <tdeaboutdata.h> diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp index bc132b0..c52a7a2 100644 --- a/tdewallet/allyourbase.cpp +++ b/tdewallet/allyourbase.cpp @@ -26,7 +26,7 @@ #include <tdeio/netaccess.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kurldrag.h> #include <tdewallet.h> @@ -299,7 +299,7 @@ void TDEWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& l delete _wallet; //delete the folder from the source if we were moving - TQt::ButtonState state = kapp->keyboardMouseState(); + TQt::ButtonState state = tdeApp->keyboardMouseState(); if (e->source() && e->source()->parent() && !strcmp(e->source()->parent()->className(), "TDEWalletEntryList") && !(state & TQt::ControlButton)) { @@ -468,7 +468,7 @@ void TDEWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { e->ignore(); return; } - TQt::ButtonState state = kapp->keyboardMouseState(); + TQt::ButtonState state = tdeApp->keyboardMouseState(); if (isEntry) { if (!item) { e->ignore(); @@ -621,7 +621,7 @@ class TDEWalletIconDrag : public TQIconDrag { TDEWalletIconView::TDEWalletIconView(TQWidget *parent, const char *name) : TDEIconView(parent, name) { TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQ_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&))); } TDEWalletIconView::~TDEWalletIconView() { diff --git a/tdewallet/allyourbase.h b/tdewallet/allyourbase.h index e5e78ee..defc408 100644 --- a/tdewallet/allyourbase.h +++ b/tdewallet/allyourbase.h @@ -96,7 +96,7 @@ class TDEWalletFolderItem : public TDEListViewItem { }; class TDEWalletEntryList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: TDEWalletEntryList(TQWidget *parent, const char *name = 0L); @@ -133,7 +133,7 @@ class TDEWalletItem : public TQIconViewItem { class TDEWalletIconView : public TDEIconView { - Q_OBJECT + TQ_OBJECT public: TDEWalletIconView(TQWidget *parent, const char *name = 0L); diff --git a/tdewallet/kbetterthankdialogbase.ui b/tdewallet/kbetterthankdialogbase.ui index 65d8b5a..22bbf98 100644 --- a/tdewallet/kbetterthankdialogbase.ui +++ b/tdewallet/kbetterthankdialogbase.ui @@ -140,15 +140,12 @@ <include location="global" impldecl="in declaration">kactivelabel.h</include> <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">clicked()</slot> <slot>setLabel( const TQString & label )</slot> <slot access="private">init()</slot> <slot access="protected">accept()</slot> <slot access="protected">reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kactivelabel.h</includehint> -</includehints> </UI> diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp index 9dcb4c7..592101f 100644 --- a/tdewallet/konfigurator/konfigurator.cpp +++ b/tdewallet/konfigurator/konfigurator.cpp @@ -57,21 +57,21 @@ TDEWalletConfig::TDEWalletConfig(TQWidget *parent, const char *name, const TQStr TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint()); vbox->add(_wcw = new WalletConfigWidget(this)); - connect(_wcw->_enabled, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_launchManager, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_autocloseManager, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_autoclose, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_closeIdle, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_openPrompt, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_screensaverLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_localWalletSelected, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_idleTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(_wcw->_launch, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchManager())); - connect(_wcw->_newWallet, TQT_SIGNAL(clicked()), this, TQT_SLOT(newNetworkWallet())); - connect(_wcw->_newLocalWallet, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLocalWallet())); - connect(_wcw->_localWallet, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); - connect(_wcw->_defaultWallet, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); - connect(_wcw->_accessList, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(_wcw->_enabled, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_launchManager, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_autocloseManager, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_autoclose, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_closeIdle, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_openPrompt, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_screensaverLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_localWalletSelected, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_idleTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(_wcw->_launch, TQ_SIGNAL(clicked()), this, TQ_SLOT(launchManager())); + connect(_wcw->_newWallet, TQ_SIGNAL(clicked()), this, TQ_SLOT(newNetworkWallet())); + connect(_wcw->_newLocalWallet, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLocalWallet())); + connect(_wcw->_localWallet, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); + connect(_wcw->_defaultWallet, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); + connect(_wcw->_accessList, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); _wcw->_accessList->setAllColumnsShowFocus(true); updateWalletLists(); @@ -316,7 +316,7 @@ void TDEWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint& if (item && item->parent()) { TDEPopupMenu *m = new TDEPopupMenu(this); m->insertTitle(item->parent()->text(0)); - m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete); + m->insertItem(i18n("&Delete"), this, TQ_SLOT(deleteEntry()), Key_Delete); m->popup(pos); } } diff --git a/tdewallet/konfigurator/konfigurator.h b/tdewallet/konfigurator/konfigurator.h index f133912..85599a4 100644 --- a/tdewallet/konfigurator/konfigurator.h +++ b/tdewallet/konfigurator/konfigurator.h @@ -27,7 +27,7 @@ class WalletConfigWidget; class TQListViewItem; class TDEWalletConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: TDEWalletConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList& = TQStringList()); diff --git a/tdewallet/konfigurator/walletconfigwidget.ui b/tdewallet/konfigurator/walletconfigwidget.ui index 5f51713..eaf42e7 100644 --- a/tdewallet/konfigurator/walletconfigwidget.ui +++ b/tdewallet/konfigurator/walletconfigwidget.ui @@ -492,8 +492,8 @@ <tabstop>_accessList</tabstop> <tabstop>_launch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>_storeTogether_toggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp index a6c09b4..3e5c5b5 100644 --- a/tdewallet/kwmapeditor.cpp +++ b/tdewallet/kwmapeditor.cpp @@ -34,10 +34,10 @@ KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name) : TQTable(0, 3, parent, name), _map(map) { _ac = new TDEActionCollection(this); - _copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac); - connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty())); - connect(this, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - this, TQT_SLOT(contextMenu(int,int,const TQPoint&))); + _copyAct = KStdAction::copy(this, TQ_SLOT(copy()), _ac); + connect(this, TQ_SIGNAL(valueChanged(int,int)), this, TQ_SIGNAL(dirty())); + connect(this, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + this, TQ_SLOT(contextMenu(int,int,const TQPoint&))); setSelectionMode(TQTable::NoSelection); horizontalHeader()->setLabel(0, TQString()); horizontalHeader()->setLabel(1, i18n("Key")); @@ -57,7 +57,7 @@ void KWMapEditor::reload() { insertRows(row, _map.count() - row); for (int x = row; x < numRows(); ++x) { TQPushButton *b = new TQPushButton("X", this); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(erase())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(erase())); setCellWidget(x, 0, b); } } @@ -76,9 +76,9 @@ KWMapEditor::~KWMapEditor() { void KWMapEditor::erase() { - const TQObject *o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + const TQObject *o = sender(); for (int i = 0; i < numRows(); i++) { - if (TQT_BASE_OBJECT_CONST(cellWidget(i, 0)) == TQT_BASE_OBJECT_CONST(o)) { + if (cellWidget(i, 0) == o) { removeRow(i); break; } @@ -101,7 +101,7 @@ void KWMapEditor::addEntry() { int x = numRows(); insertRows(x, 1); TQPushButton *b = new TQPushButton("X", this); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(erase())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(erase())); setCellWidget(x, 0, b); ensureCellVisible(x, 1); setCurrentCell(x, 1); @@ -118,7 +118,7 @@ void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) { _contextRow = row; _contextCol = col; TDEPopupMenu *m = new TDEPopupMenu(this); - m->insertItem(i18n("&New Entry"), this, TQT_SLOT(addEntry())); + m->insertItem(i18n("&New Entry"), this, TQ_SLOT(addEntry())); _copyAct->plug(m); m->popup(pos); } @@ -135,7 +135,7 @@ class InlineEditor : public TQTextEdit { : TQTextEdit(), _p(p), row(row), col(col) { setWFlags(WStyle_NoBorder | WDestructiveClose); KWin::setType(winId(), NET::Override); - connect(p, TQT_SIGNAL(destroyed()), TQT_SLOT(close())); + connect(p, TQ_SIGNAL(destroyed()), TQ_SLOT(close())); } virtual ~InlineEditor() { if (!_p) return; _p->setText(row, col, text()); _p->emitDirty(); } diff --git a/tdewallet/kwmapeditor.h b/tdewallet/kwmapeditor.h index cad9c6a..484155f 100644 --- a/tdewallet/kwmapeditor.h +++ b/tdewallet/kwmapeditor.h @@ -28,7 +28,7 @@ class TDEAction; class TDEActionCollection; class KWMapEditor : public TQTable { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdewallet/main.cpp b/tdewallet/main.cpp index bd66c37..3f37c83 100644 --- a/tdewallet/main.cpp +++ b/tdewallet/main.cpp @@ -23,8 +23,8 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <kmimetype.h> -#include <kstandarddirs.h> -#include <kuniqueapplication.h> +#include <tdestandarddirs.h> +#include <tdeuniqueapplication.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -32,9 +32,9 @@ #include "tdewalletmanager.h" -class MyApp : public KUniqueApplication { +class MyApp : public TDEUniqueApplication { public: - MyApp() : KUniqueApplication() { ref(); } + MyApp() : TDEUniqueApplication() { ref(); } virtual ~MyApp() {} virtual int newInstance() { return 0; } @@ -60,7 +60,7 @@ int main(int argc, char **argv) { TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - if (!KUniqueApplication::start()) { + if (!TDEUniqueApplication::start()) { return 0; } diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp index 4fd16f5..968eee3 100644 --- a/tdewallet/tdewalleteditor.cpp +++ b/tdewallet/tdewalleteditor.cpp @@ -40,7 +40,7 @@ #include <tdemessagebox.h> #include <tdepopupmenu.h> #include <ksqueezedtextlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <kstringhandler.h> #include <tdetempfile.h> @@ -66,7 +66,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * : TDEMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) { _newWallet = false; _ww = new WalletWidget(this, "Wallet Widget"); - _copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection()); + _copyPassAction = KStdAction::copy(this, TQ_SLOT(copyPassword()), actionCollection()); TQVBoxLayout *box = new TQVBoxLayout(_ww->_entryListFrame); box->setSpacing( KDialog::spacingHint() ); @@ -79,7 +79,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * box = new TQVBoxLayout(_ww->_entryStack->widget(2)); _mapEditorShowHide = new TQCheckBox(i18n("&Show values"), _ww->_entryStack->widget(2)); - connect(_mapEditorShowHide, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showHideMapEditorValue(bool))); + connect(_mapEditorShowHide, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showHideMapEditorValue(bool))); _mapEditor = new KWMapEditor(_currentMap, _ww->_entryStack->widget(2)); box->addWidget(_mapEditorShowHide); box->addWidget(_mapEditor); @@ -88,40 +88,40 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * resize(600, 400); - connect(_entryList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(entrySelectionChanged(TQListViewItem*))); + connect(_entryList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(entrySelectionChanged(TQListViewItem*))); connect(_entryList, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), + TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, - TQT_SLOT(listContextMenuRequested(TQListViewItem*,const TQPoint&,int))); + TQ_SLOT(listContextMenuRequested(TQListViewItem*,const TQPoint&,int))); connect(_entryList, - TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), + TQ_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, - TQT_SLOT(listItemRenamed(TQListViewItem*, int, const TQString&))); + TQ_SLOT(listItemRenamed(TQListViewItem*, int, const TQString&))); - connect(_ww->_passwordValue, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(entryEditted())); - connect(_mapEditor, TQT_SIGNAL(dirty()), - this, TQT_SLOT(entryEditted())); + connect(_ww->_passwordValue, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(entryEditted())); + connect(_mapEditor, TQ_SIGNAL(dirty()), + this, TQ_SLOT(entryEditted())); - connect(_ww->_undoChanges, TQT_SIGNAL(clicked()), - this, TQT_SLOT(restoreEntry())); - connect(_ww->_saveChanges, TQT_SIGNAL(clicked()), - this, TQT_SLOT(saveEntry())); + connect(_ww->_undoChanges, TQ_SIGNAL(clicked()), + this, TQ_SLOT(restoreEntry())); + connect(_ww->_saveChanges, TQ_SIGNAL(clicked()), + this, TQ_SLOT(saveEntry())); - connect(_ww->_showContents, TQT_SIGNAL(clicked()), - this, TQT_SLOT(showPasswordContents())); - connect(_ww->_hideContents, TQT_SIGNAL(clicked()), - this, TQT_SLOT(hidePasswordContents())); + connect(_ww->_showContents, TQ_SIGNAL(clicked()), + this, TQ_SLOT(showPasswordContents())); + connect(_ww->_hideContents, TQ_SIGNAL(clicked()), + this, TQ_SLOT(hidePasswordContents())); _walletIsOpen = false; _w = TDEWallet::Wallet::openWallet(wallet, winId(), isPath ? TDEWallet::Wallet::Path : TDEWallet::Wallet::Asynchronous); if (_w) { - connect(_w, TQT_SIGNAL(walletOpened(bool)), this, TQT_SLOT(walletOpened(bool))); - connect(_w, TQT_SIGNAL(walletClosed()), this, TQT_SLOT(walletClosed())); - connect(_w, TQT_SIGNAL(folderUpdated(const TQString&)), this, TQT_SLOT(updateEntries(const TQString&))); - connect(_w, TQT_SIGNAL(folderListUpdated()), this, TQT_SLOT(updateFolderList())); + connect(_w, TQ_SIGNAL(walletOpened(bool)), this, TQ_SLOT(walletOpened(bool))); + connect(_w, TQ_SIGNAL(walletClosed()), this, TQ_SLOT(walletClosed())); + connect(_w, TQ_SIGNAL(folderUpdated(const TQString&)), this, TQ_SLOT(updateEntries(const TQString&))); + connect(_w, TQ_SIGNAL(folderListUpdated()), this, TQ_SLOT(updateFolderList())); updateFolderList(); } else { kdDebug(2300) << "Wallet open failed!" << endl; @@ -133,7 +133,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * setCaption(wallet); - TQTimer::singleShot(0, this, TQT_SLOT(layout())); + TQTimer::singleShot(0, this, TQ_SLOT(layout())); } TDEWalletEditor::~TDEWalletEditor() { @@ -159,49 +159,49 @@ void TDEWalletEditor::layout() { void TDEWalletEditor::createActions() { _newFolderAction = new TDEAction(i18n("&New Folder..."), "folder-new", - 0, TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(), + 0, this, TQ_SLOT(createFolder()), actionCollection(), "create_folder"); - connect(this, TQT_SIGNAL(enableFolderActions(bool)), - _newFolderAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableFolderActions(bool)), + _newFolderAction, TQ_SLOT(setEnabled(bool))); _deleteFolderAction = new TDEAction(i18n("&Delete Folder"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(deleteFolder()), actionCollection(), + this, TQ_SLOT(deleteFolder()), actionCollection(), "delete_folder"); - connect(this, TQT_SIGNAL(enableContextFolderActions(bool)), - _deleteFolderAction, TQT_SLOT(setEnabled(bool))); - connect(this, TQT_SIGNAL(enableFolderActions(bool)), - _deleteFolderAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableContextFolderActions(bool)), + _deleteFolderAction, TQ_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableFolderActions(bool)), + _deleteFolderAction, TQ_SLOT(setEnabled(bool))); - _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(changePassword()), actionCollection(), + _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, this, + TQ_SLOT(changePassword()), actionCollection(), "change_password"); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _passwordAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _passwordAction, TQ_SLOT(setEnabled(bool))); - _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(importWallet()), actionCollection(), + _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, this, + TQ_SLOT(importWallet()), actionCollection(), "merge"); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _mergeAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _mergeAction, TQ_SLOT(setEnabled(bool))); - _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(importXML()), actionCollection(), + _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, this, + TQ_SLOT(importXML()), actionCollection(), "import"); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _importAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _importAction, TQ_SLOT(setEnabled(bool))); - _exportAction = new TDEAction(i18n("&Export..."), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(exportXML()), actionCollection(), + _exportAction = new TDEAction(i18n("&Export..."), 0, 0, this, + TQ_SLOT(exportXML()), actionCollection(), "export"); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _exportAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _exportAction, TQ_SLOT(setEnabled(bool))); - _saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _saveAsAction, TQT_SLOT(setEnabled(bool))); + _saveAsAction = KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _saveAsAction, TQ_SLOT(setEnabled(bool))); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); emit enableWalletActions(false); emit enableFolderActions(false); @@ -585,9 +585,9 @@ void TDEWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoi m->insertTitle(title); switch (menuClass) { case TDEWalletEntryItemClass: - m->insertItem(i18n("&New..." ), this, TQT_SLOT(newEntry()), Key_Insert); - m->insertItem(i18n( "&Rename" ), this, TQT_SLOT(renameEntry()), Key_F2); - m->insertItem(i18n( "&Delete" ), this, TQT_SLOT(deleteEntry()), Key_Delete); + m->insertItem(i18n("&New..." ), this, TQ_SLOT(newEntry()), Key_Insert); + m->insertItem(i18n( "&Rename" ), this, TQ_SLOT(renameEntry()), Key_F2); + m->insertItem(i18n( "&Delete" ), this, TQ_SLOT(deleteEntry()), Key_Delete); if (ci && ci->type() == TDEWallet::Wallet::Password) { m->insertSeparator(); _copyPassAction->plug(m); @@ -595,7 +595,7 @@ void TDEWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoi break; case TDEWalletContainerItemClass: - m->insertItem(i18n( "&New..." ), this, TQT_SLOT(newEntry()), Key_Insert); + m->insertItem(i18n( "&New..." ), this, TQ_SLOT(newEntry()), Key_Insert); break; case TDEWalletFolderItemClass: diff --git a/tdewallet/tdewalleteditor.h b/tdewallet/tdewalleteditor.h index 4000bb2..64f408b 100644 --- a/tdewallet/tdewalleteditor.h +++ b/tdewallet/tdewalleteditor.h @@ -35,7 +35,7 @@ class TDEWalletEntryList; class KWMapEditor; class TDEWalletEditor : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp index 4f7d824..621bd60 100644 --- a/tdewallet/tdewalletmanager.cpp +++ b/tdewallet/tdewalletmanager.cpp @@ -34,7 +34,7 @@ #include <kinputdialog.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <ksystemtray.h> #include <tdewallet.h> @@ -61,7 +61,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) _tray = new KSystemTray(this, "tdewalletmanager tray"); _tray->setPixmap(loadSystemTrayIcon("wallet_closed")); TQToolTip::add(_tray, i18n("TDE Wallet: No wallets open.")); - connect(_tray, TQT_SIGNAL(quitSelected()), TQT_SLOT(shuttingDown())); + connect(_tray, TQ_SIGNAL(quitSelected()), TQ_SLOT(shuttingDown())); TQStringList wl = TDEWallet::Wallet::walletList(); bool isOpen = false; for (TQStringList::Iterator it = wl.begin(); it != wl.end(); ++it) { @@ -73,10 +73,10 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) break; } } - if (!isOpen && kapp->isRestored()) { + if (!isOpen && tdeApp->isRestored()) { delete _tray; _tray = 0L; - TQTimer::singleShot( 0, kapp, TQT_SLOT( quit())); + TQTimer::singleShot( 0, tdeApp, TQ_SLOT( quit())); return; } } else { @@ -84,8 +84,8 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) } _iconView = new TDEWalletIconView(this, "tdewalletmanager icon view"); - connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(TQIconViewItem*))); - connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&))); + connect(_iconView, TQ_SIGNAL(executed(TQIconViewItem*)), this, TQ_SLOT(openWallet(TQIconViewItem*))); + connect(_iconView, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQ_SLOT(contextMenu(TQIconViewItem*, const TQPoint&))); updateWalletDisplay(); setCentralWidget(_iconView); @@ -94,13 +94,13 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) _dcopRef = new DCOPRef("kded", "tdewalletd"); _dcopRef->dcopClient()->setNotifications(true); connect(_dcopRef->dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(possiblyRescan(const TQCString&))); + TQ_SLOT(possiblyRescan(const TQCString&))); connect(_dcopRef->dcopClient(), - TQT_SIGNAL(applicationRegistered(const TQCString&)), + TQ_SIGNAL(applicationRegistered(const TQCString&)), this, - TQT_SLOT(possiblyRescan(const TQCString&))); + TQ_SLOT(possiblyRescan(const TQCString&))); connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "allWalletsClosed()", "allWalletsClosed()", false); connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "walletClosed(TQString)", "updateWalletDisplay()", false); @@ -112,28 +112,28 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) // wallet closes before we are done opening. We will then stay // open. Must check that a wallet is still open here. - new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this), - TQT_SLOT(createWallet()), actionCollection(), + new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, this, + TQ_SLOT(createWallet()), actionCollection(), "wallet_create"); TDEAction *act = new TDEAction(i18n("Configure &Wallet..."), "configure", - 0, TQT_TQOBJECT(this), TQT_SLOT(setupWallet()), actionCollection(), + 0, this, TQ_SLOT(setupWallet()), actionCollection(), "wallet_settings"); if (_tray) { act->plug(_tray->contextMenu()); } - act = new TDEAction(i18n("Close &All Wallets"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(closeAllWallets()), actionCollection(), + act = new TDEAction(i18n("Close &All Wallets"), 0, 0, this, + TQ_SLOT(closeAllWallets()), actionCollection(), "close_all_wallets"); if (_tray) { act->plug(_tray->contextMenu()); } - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(shuttingDown()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(shuttingDown()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); createGUI("tdewalletmanager.rc"); - accel->connectItem(accel->insertItem(Key_Return), TQT_TQOBJECT(this), TQT_SLOT(openWallet())); - accel->connectItem(accel->insertItem(Key_Delete), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet())); + accel->connectItem(accel->insertItem(Key_Return), this, TQ_SLOT(openWallet())); + accel->connectItem(accel->insertItem(Key_Delete), this, TQ_SLOT(deleteWallet())); if (_tray) { _tray->show(); @@ -141,7 +141,7 @@ actionCollection()); show(); } - kapp->setName("tdewallet"); // hack to fix docs + tdeApp->setName("tdewallet"); // hack to fix docs } @@ -158,9 +158,9 @@ void TDEWalletManager::tdewalletdLaunch() { bool TDEWalletManager::queryClose() { - if (!_shuttingDown && !kapp->sessionSaving()) { + if (!_shuttingDown && !tdeApp->sessionSaving()) { if (!_tray) { - kapp->quit(); + tdeApp->quit(); } else { hide(); } @@ -208,11 +208,11 @@ TQPtrStack<TQIconViewItem> trash; void TDEWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) { if (item) { TQGuardedPtr<TDEWalletPopup> popupMenu = new TDEWalletPopup(item->text(), this); - connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(closeWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(changeWalletPassword(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletCreated()), TQT_TQOBJECT(this), TQT_SLOT(createWallet())); + connect(popupMenu, TQ_SIGNAL(walletOpened(const TQString&)), this, TQ_SLOT(openWallet(const TQString&))); + connect(popupMenu, TQ_SIGNAL(walletClosed(const TQString&)), this, TQ_SLOT(closeWallet(const TQString&))); + connect(popupMenu, TQ_SIGNAL(walletDeleted(const TQString&)), this, TQ_SLOT(deleteWallet(const TQString&))); + connect(popupMenu, TQ_SIGNAL(walletChangePassword(const TQString&)), this, TQ_SLOT(changeWalletPassword(const TQString&))); + connect(popupMenu, TQ_SIGNAL(walletCreated()), this, TQ_SLOT(createWallet())); popupMenu->exec(pos); delete popupMenu; } @@ -256,8 +256,8 @@ void TDEWalletManager::changeWalletPassword(const TQString& walletName) { void TDEWalletManager::openWalletFile(const TQString& path) { TDEWalletEditor *we = new TDEWalletEditor(path, true, this, "Wallet Editor"); if (we->isOpen()) { - connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)), - this, TQT_SLOT(editorClosed(TDEMainWindow*))); + connect(we, TQ_SIGNAL(editorClosed(TDEMainWindow*)), + this, TQ_SLOT(editorClosed(TDEMainWindow*))); we->show(); } else { KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path)); @@ -297,8 +297,8 @@ void TDEWalletManager::openWallet(const TQString& walletName, bool newWallet) { TDEWalletEditor *we = new TDEWalletEditor(walletName, false, this, "Wallet Editor"); we->setNewWallet(newWallet); if (we->isOpen()) { - connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)), - this, TQT_SLOT(editorClosed(TDEMainWindow*))); + connect(we, TQ_SIGNAL(editorClosed(TDEMainWindow*)), + this, TQ_SLOT(editorClosed(TDEMainWindow*))); we->show(); _windows.append(we); } else if (!newWallet) { @@ -332,7 +332,7 @@ void TDEWalletManager::possiblyQuit() { !isVisible() && !cfg.readBoolEntry("Leave Manager Open", false) && _tdewalletdLaunch) { - kapp->quit(); + tdeApp->quit(); } } @@ -394,7 +394,7 @@ void TDEWalletManager::createWallet() { void TDEWalletManager::shuttingDown() { _shuttingDown = true; - kapp->quit(); + tdeApp->quit(); } @@ -412,10 +412,10 @@ TQPixmap TDEWalletManager::loadSystemTrayIcon(const TQString &icon) { #if KDE_IS_VERSION(3, 1, 90) return KSystemTray::loadIcon(icon); #else - TDEConfig *appCfg = kapp->config(); + TDEConfig *appCfg = tdeApp->config(); TDEConfigGroupSaver configSaver(appCfg, "System Tray"); int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22); - return kapp->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth ); + return tdeApp->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth ); #endif } diff --git a/tdewallet/tdewalletmanager.h b/tdewallet/tdewalletmanager.h index 081c6bb..01b3f54 100644 --- a/tdewallet/tdewalletmanager.h +++ b/tdewallet/tdewalletmanager.h @@ -31,7 +31,7 @@ class DCOPRef; class TDEWalletManager : public TDEMainWindow, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp index 92cbe40..5639f55 100644 --- a/tdewallet/tdewalletpopup.cpp +++ b/tdewallet/tdewalletpopup.cpp @@ -34,16 +34,16 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c TDEActionCollection *ac = new TDEActionCollection(this, "tdewallet context actions"); TDEAction *act; - act = new TDEAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(createWallet()), ac, "wallet_create"); + act = new TDEAction(i18n("&New Wallet..."), 0, 0, this, + TQ_SLOT(createWallet()), ac, "wallet_create"); act->plug(this); - act = new TDEAction(i18n("&Open..."), 0, Key_Return, TQT_TQOBJECT(this), - TQT_SLOT(openWallet()), ac, "wallet_open"); + act = new TDEAction(i18n("&Open..."), 0, Key_Return, this, + TQ_SLOT(openWallet()), ac, "wallet_open"); act->plug(this); - act = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(changeWalletPassword()), ac, "wallet_password"); + act = new TDEAction(i18n("Change &Password..."), 0, 0, this, + TQ_SLOT(changeWalletPassword()), ac, "wallet_password"); act->plug(this); TQStringList ul = TDEWallet::Wallet::users(wallet); @@ -52,7 +52,7 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c int id = 7000; for (TQStringList::Iterator it = ul.begin(); it != ul.end(); ++it) { _appMap[id] = *it; - pm->insertItem(*it, this, TQT_SLOT(disconnectApp(int)), 0, id); + pm->insertItem(*it, this, TQ_SLOT(disconnectApp(int)), 0, id); pm->setItemParameter(id, id); id++; } @@ -60,15 +60,15 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c insertItem(i18n("Disconnec&t"), pm); } - act = KStdAction::close( TQT_TQOBJECT(this), - TQT_SLOT(closeWallet()), ac, "wallet_close"); + act = KStdAction::close( this, + TQ_SLOT(closeWallet()), ac, "wallet_close"); // FIXME: let's track this inside the manager so we don't need a dcop // roundtrip here. act->setEnabled(TDEWallet::Wallet::isOpen(wallet)); act->plug(this); - act = new TDEAction(i18n("&Delete"), 0, Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(deleteWallet()), ac, "wallet_delete"); + act = new TDEAction(i18n("&Delete"), 0, Key_Delete, this, + TQ_SLOT(deleteWallet()), ac, "wallet_delete"); act->plug(this); } diff --git a/tdewallet/tdewalletpopup.h b/tdewallet/tdewalletpopup.h index 2b4ba86..7f82ba1 100644 --- a/tdewallet/tdewalletpopup.h +++ b/tdewallet/tdewalletpopup.h @@ -25,7 +25,7 @@ #include <tqstring.h> class TDEWalletPopup : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/translations/desktop_files/KCharSelect.desktop/es.po b/translations/desktop_files/KCharSelect.desktop/es.po index e5ca9e7..739aeae 100644 --- a/translations/desktop_files/KCharSelect.desktop/es.po +++ b/translations/desktop_files/KCharSelect.desktop/es.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# titae <benjamin.m21@outlook.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-06-15 03:21+0000\n" +"Last-Translator: titae <benjamin.m21@outlook.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kcharselect-kcharselectdesktop/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: KCharSelect.desktop:2 -#, fuzzy msgid "KCharSelect" -msgstr "Selector de caracteres" +msgstr "KCharSelect" #. GenericName #: KCharSelect.desktop:4 diff --git a/translations/desktop_files/KCharSelect.desktop/es_AR.po b/translations/desktop_files/KCharSelect.desktop/es_AR.po new file mode 100644 index 0000000..0b049f5 --- /dev/null +++ b/translations/desktop_files/KCharSelect.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 15:44+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: KCharSelect.desktop:2 +msgid "KCharSelect" +msgstr "" + +#. GenericName +#: KCharSelect.desktop:4 +msgid "Character Selector" +msgstr "" diff --git a/translations/desktop_files/KCharSelect.desktop/ka.po b/translations/desktop_files/KCharSelect.desktop/ka.po index a1669e9..8018cb6 100644 --- a/translations/desktop_files/KCharSelect.desktop/ka.po +++ b/translations/desktop_files/KCharSelect.desktop/ka.po @@ -1,28 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kcharselect-kcharselectdesktop/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KCharSelect.desktop:2 -#, fuzzy msgid "KCharSelect" -msgstr "სიმბოლოთა შემრჩეველი" +msgstr "KCharSelect" #. GenericName #: KCharSelect.desktop:4 msgid "Character Selector" -msgstr "სიმბოლოთა შემრჩეველი" +msgstr "სიმბოლოების არჩევა" diff --git a/translations/desktop_files/KCharSelect.desktop/nl.po b/translations/desktop_files/KCharSelect.desktop/nl.po index 9d5af08..8e2ef15 100644 --- a/translations/desktop_files/KCharSelect.desktop/nl.po +++ b/translations/desktop_files/KCharSelect.desktop/nl.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:02+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kcharselect-kcharselectdesktop/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KCharSelect.desktop:2 -#, fuzzy msgid "KCharSelect" -msgstr "Speciale tekens" +msgstr "KCharSelect" #. GenericName #: KCharSelect.desktop:4 diff --git a/translations/desktop_files/KCharSelect.desktop/ru.po b/translations/desktop_files/KCharSelect.desktop/ru.po index 9019c43..67ba04f 100644 --- a/translations/desktop_files/KCharSelect.desktop/ru.po +++ b/translations/desktop_files/KCharSelect.desktop/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kcharselect-kcharselectdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: KCharSelect.desktop:2 -#, fuzzy msgid "KCharSelect" -msgstr "Выбор символов" +msgstr "KCharSelect" #. GenericName #: KCharSelect.desktop:4 diff --git a/translations/desktop_files/KEdit.desktop/es_AR.po b/translations/desktop_files/KEdit.desktop/es_AR.po new file mode 100644 index 0000000..5182473 --- /dev/null +++ b/translations/desktop_files/KEdit.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 16:03+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: KEdit.desktop:2 +msgid "KEdit" +msgstr "" + +#. GenericName +#: KEdit.desktop:4 +msgid "Simple Text Editor" +msgstr "" diff --git a/translations/desktop_files/KEdit.desktop/it.po b/translations/desktop_files/KEdit.desktop/it.po index 1cbf63d..2236fca 100644 --- a/translations/desktop_files/KEdit.desktop/it.po +++ b/translations/desktop_files/KEdit.desktop/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 16:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-22 17:56+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kedit-keditdesktop/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: KEdit.desktop:2 msgid "KEdit" -msgstr "" +msgstr "KEdit" #. GenericName #: KEdit.desktop:4 diff --git a/translations/desktop_files/KEdit.desktop/ka.po b/translations/desktop_files/KEdit.desktop/ka.po index b903a0b..dca8af4 100644 --- a/translations/desktop_files/KEdit.desktop/ka.po +++ b/translations/desktop_files/KEdit.desktop/ka.po @@ -1,27 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 16:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kedit-keditdesktop/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KEdit.desktop:2 msgid "KEdit" -msgstr "" +msgstr "KEdit" #. GenericName #: KEdit.desktop:4 msgid "Simple Text Editor" -msgstr "მარტივი ტექსტის რედაქტორი" +msgstr "მარტივი ტექსტური რედაქტორი" diff --git a/translations/desktop_files/KEdit.desktop/nl.po b/translations/desktop_files/KEdit.desktop/nl.po index af738cd..97e77a7 100644 --- a/translations/desktop_files/KEdit.desktop/nl.po +++ b/translations/desktop_files/KEdit.desktop/nl.po @@ -1,27 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 16:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kedit-keditdesktop/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KEdit.desktop:2 msgid "KEdit" -msgstr "" +msgstr "KEdit" #. GenericName #: KEdit.desktop:4 msgid "Simple Text Editor" -msgstr "Eenvoudige teksteditor" +msgstr "Eenvoudige tekstbewerker" diff --git a/translations/desktop_files/KEdit.desktop/ru.po b/translations/desktop_files/KEdit.desktop/ru.po index 3e34923..8b98ec7 100644 --- a/translations/desktop_files/KEdit.desktop/ru.po +++ b/translations/desktop_files/KEdit.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 16:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kedit-keditdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: KEdit.desktop:2 msgid "KEdit" -msgstr "" +msgstr "KEdit" #. GenericName #: KEdit.desktop:4 diff --git a/translations/desktop_files/Kjots.desktop/es.po b/translations/desktop_files/Kjots.desktop/es.po index 4f0c7c3..918d0dc 100644 --- a/translations/desktop_files/Kjots.desktop/es.po +++ b/translations/desktop_files/Kjots.desktop/es.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# titae <benjamin.m21@outlook.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:11+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-06-15 03:21+0000\n" +"Last-Translator: titae <benjamin.m21@outlook.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kjots-kjotsdesktop/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: Kjots.desktop:2 msgid "KJots" -msgstr "" +msgstr "KJots" #. GenericName #: Kjots.desktop:4 diff --git a/translations/desktop_files/Kjots.desktop/es_AR.po b/translations/desktop_files/Kjots.desktop/es_AR.po new file mode 100644 index 0000000..1e16f95 --- /dev/null +++ b/translations/desktop_files/Kjots.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 21:11+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: Kjots.desktop:2 +msgid "KJots" +msgstr "" + +#. GenericName +#: Kjots.desktop:4 +msgid "Note Taker" +msgstr "" diff --git a/translations/desktop_files/Kjots.desktop/it.po b/translations/desktop_files/Kjots.desktop/it.po index 6752ff8..e8ec37f 100644 --- a/translations/desktop_files/Kjots.desktop/it.po +++ b/translations/desktop_files/Kjots.desktop/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:11+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-24 21:23+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kjots-kjotsdesktop/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: Kjots.desktop:2 msgid "KJots" -msgstr "" +msgstr "KJots" #. GenericName #: Kjots.desktop:4 diff --git a/translations/desktop_files/Kjots.desktop/ka.po b/translations/desktop_files/Kjots.desktop/ka.po new file mode 100644 index 0000000..1a82d7a --- /dev/null +++ b/translations/desktop_files/Kjots.desktop/ka.po @@ -0,0 +1,28 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 21:11+0200\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kjots-kjotsdesktop/ka/>\n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: Kjots.desktop:2 +msgid "KJots" +msgstr "KJots" + +#. GenericName +#: Kjots.desktop:4 +msgid "Note Taker" +msgstr "შენიშვნების ჩამწერი" diff --git a/translations/desktop_files/Kjots.desktop/nl.po b/translations/desktop_files/Kjots.desktop/nl.po index 289d359..8a900d2 100644 --- a/translations/desktop_files/Kjots.desktop/nl.po +++ b/translations/desktop_files/Kjots.desktop/nl.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:11+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kjots-kjotsdesktop/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: Kjots.desktop:2 msgid "KJots" -msgstr "" +msgstr "KJots" #. GenericName #: Kjots.desktop:4 diff --git a/translations/desktop_files/Kjots.desktop/ru.po b/translations/desktop_files/Kjots.desktop/ru.po index 8af1d2f..77cac4e 100644 --- a/translations/desktop_files/Kjots.desktop/ru.po +++ b/translations/desktop_files/Kjots.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:11+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kjots-kjotsdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: Kjots.desktop:2 msgid "KJots" -msgstr "" +msgstr "KJots" #. GenericName #: Kjots.desktop:4 diff --git a/translations/desktop_files/ark-desktops/es_AR.po b/translations/desktop_files/ark-desktops/es_AR.po new file mode 100644 index 0000000..046b043 --- /dev/null +++ b/translations/desktop_files/ark-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 13:58+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. GenericName +#: ark.desktop:3 +msgid "Archiving Tool" +msgstr "" + +#. Name +#: ark.desktop:4 +msgid "Ark" +msgstr "" + +#. Comment +#: ark_part.desktop:3 +msgid "Archive Handling Tool" +msgstr "" + +#. Name +#: ark_part.desktop:4 +msgid "Archiver" +msgstr "" diff --git a/translations/desktop_files/ark-desktops/it.po b/translations/desktop_files/ark-desktops/it.po index 26e08a6..8f74bc7 100644 --- a/translations/desktop_files/ark-desktops/it.po +++ b/translations/desktop_files/ark-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 13:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-18 18:00+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ark-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. GenericName #: ark.desktop:3 @@ -24,7 +25,7 @@ msgstr "Strumento di archiviazione" #. Name #: ark.desktop:4 msgid "Ark" -msgstr "" +msgstr "Ark" #. Comment #: ark_part.desktop:3 diff --git a/translations/desktop_files/ark-desktops/ka.po b/translations/desktop_files/ark-desktops/ka.po index 43fd118..77edadc 100644 --- a/translations/desktop_files/ark-desktops/ka.po +++ b/translations/desktop_files/ark-desktops/ka.po @@ -1,37 +1,38 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 13:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ark-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: ark.desktop:3 msgid "Archiving Tool" -msgstr "არქივებთან სამუშაო უტილიტა" +msgstr "არქივებთან სამუშაო პროგრამა" #. Name #: ark.desktop:4 msgid "Ark" -msgstr "" +msgstr "Ark" #. Comment #: ark_part.desktop:3 msgid "Archive Handling Tool" -msgstr "არქივებთან სამუშაო ხელსაწყო" +msgstr "არქივებთან სამუშაო პროგრამა" #. Name #: ark_part.desktop:4 msgid "Archiver" -msgstr "არქივარიუსი" +msgstr "დამაარქივებელი" diff --git a/translations/desktop_files/ark-desktops/nl.po b/translations/desktop_files/ark-desktops/nl.po index 4ac6e77..627ec88 100644 --- a/translations/desktop_files/ark-desktops/nl.po +++ b/translations/desktop_files/ark-desktops/nl.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 13:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/ark-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. GenericName #: ark.desktop:3 @@ -24,12 +25,12 @@ msgstr "Archiefgereedschap" #. Name #: ark.desktop:4 msgid "Ark" -msgstr "" +msgstr "Ark" #. Comment #: ark_part.desktop:3 msgid "Archive Handling Tool" -msgstr "Hulpprogramma voor het beheer van archieven" +msgstr "Programma voor het beheer van archieven" #. Name #: ark_part.desktop:4 diff --git a/translations/desktop_files/ark-desktops/ru.po b/translations/desktop_files/ark-desktops/ru.po index 42b9385..efbfa89 100644 --- a/translations/desktop_files/ark-desktops/ru.po +++ b/translations/desktop_files/ark-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 13:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ark-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. GenericName #: ark.desktop:3 @@ -24,7 +26,7 @@ msgstr "Архиватор" #. Name #: ark.desktop:4 msgid "Ark" -msgstr "" +msgstr "Ark" #. Comment #: ark_part.desktop:3 diff --git a/translations/desktop_files/kcalc.desktop/es.po b/translations/desktop_files/kcalc.desktop/es.po index 1ac568b..c48ecc0 100644 --- a/translations/desktop_files/kcalc.desktop/es.po +++ b/translations/desktop_files/kcalc.desktop/es.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# titae <benjamin.m21@outlook.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:41+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-06-16 03:59+0000\n" +"Last-Translator: titae <benjamin.m21@outlook.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kcalc-kcalcdesktop/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: kcalc.desktop:2 msgid "KCalc" -msgstr "" +msgstr "KCalc" #. GenericName #: kcalc.desktop:4 diff --git a/translations/desktop_files/kcalc.desktop/es_AR.po b/translations/desktop_files/kcalc.desktop/es_AR.po new file mode 100644 index 0000000..4ef1bd1 --- /dev/null +++ b/translations/desktop_files/kcalc.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 15:41+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kcalc.desktop:2 +msgid "KCalc" +msgstr "" + +#. GenericName +#: kcalc.desktop:4 +msgid "Scientific Calculator" +msgstr "" diff --git a/translations/desktop_files/kcalc.desktop/ka.po b/translations/desktop_files/kcalc.desktop/ka.po index b838049..21b314f 100644 --- a/translations/desktop_files/kcalc.desktop/ka.po +++ b/translations/desktop_files/kcalc.desktop/ka.po @@ -1,27 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:41+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kcalc-kcalcdesktop/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcalc.desktop:2 msgid "KCalc" -msgstr "" +msgstr "KCalc" #. GenericName #: kcalc.desktop:4 msgid "Scientific Calculator" -msgstr "მეცნიერული კალკულატორი" +msgstr "სამეცნიერო კალკულატორი" diff --git a/translations/desktop_files/kcalc.desktop/nl.po b/translations/desktop_files/kcalc.desktop/nl.po index 6a3a2ef..c84ecd2 100644 --- a/translations/desktop_files/kcalc.desktop/nl.po +++ b/translations/desktop_files/kcalc.desktop/nl.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:41+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:02+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kcalc-kcalcdesktop/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcalc.desktop:2 msgid "KCalc" -msgstr "" +msgstr "KCalc" #. GenericName #: kcalc.desktop:4 diff --git a/translations/desktop_files/kcalc.desktop/ru.po b/translations/desktop_files/kcalc.desktop/ru.po index 0e4da10..e5e18db 100644 --- a/translations/desktop_files/kcalc.desktop/ru.po +++ b/translations/desktop_files/kcalc.desktop/ru.po @@ -1,27 +1,29 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:41+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kcalc-kcalcdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: kcalc.desktop:2 msgid "KCalc" -msgstr "" +msgstr "KCalc" #. GenericName #: kcalc.desktop:4 msgid "Scientific Calculator" -msgstr "Калькулятор" +msgstr "Научный Калькулятор" diff --git a/translations/desktop_files/kcharselectapplet.desktop/es_AR.po b/translations/desktop_files/kcharselectapplet.desktop/es_AR.po new file mode 100644 index 0000000..0bd359a --- /dev/null +++ b/translations/desktop_files/kcharselectapplet.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 15:32+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kcharselectapplet.desktop:2 +msgid "Character Selector" +msgstr "" + +#. Comment +#: kcharselectapplet.desktop:6 +msgid "Pick foreign and special characters for clipboard" +msgstr "" diff --git a/translations/desktop_files/kcharselectapplet.desktop/nl.po b/translations/desktop_files/kcharselectapplet.desktop/nl.po index 2d70981..4c2c547 100644 --- a/translations/desktop_files/kcharselectapplet.desktop/nl.po +++ b/translations/desktop_files/kcharselectapplet.desktop/nl.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:32+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kcharselectapplet-kcharselectappletdesktop/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcharselectapplet.desktop:2 @@ -24,4 +25,4 @@ msgstr "Speciale tekens" #. Comment #: kcharselectapplet.desktop:6 msgid "Pick foreign and special characters for clipboard" -msgstr "Buitenlandse en speciale tekens van klembord halen" +msgstr "Kies buitenlandse en speciale tekens voor op het klembord" diff --git a/translations/desktop_files/kdf-desktops/es_AR.po b/translations/desktop_files/kdf-desktops/es_AR.po new file mode 100644 index 0000000..4cd9289 --- /dev/null +++ b/translations/desktop_files/kdf-desktops/es_AR.po @@ -0,0 +1,45 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 15:48+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kcmdf.desktop:10 +msgid "Storage Devices" +msgstr "" + +#. Comment +#: kcmdf.desktop:12 +msgid "Shows the disk usage of the mounted devices" +msgstr "" + +#. Name +#: kdf.desktop:2 +msgid "KDiskFree" +msgstr "" + +#. GenericName +#: kdf.desktop:4 +msgid "View Disk Usage" +msgstr "" + +#. Name +#: kwikdisk.desktop:2 +msgid "KwikDisk" +msgstr "" + +#. GenericName +#: kwikdisk.desktop:7 +msgid "Removable Media Utility" +msgstr "" diff --git a/translations/desktop_files/kdf-desktops/it.po b/translations/desktop_files/kdf-desktops/it.po index 596e9db..65d043f 100644 --- a/translations/desktop_files/kdf-desktops/it.po +++ b/translations/desktop_files/kdf-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:48+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-22 17:56+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kdf-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: kcmdf.desktop:10 @@ -29,7 +30,7 @@ msgstr "Mostra l'uso del disco dei dispositivi montati" #. Name #: kdf.desktop:2 msgid "KDiskFree" -msgstr "" +msgstr "KDiskFree" #. GenericName #: kdf.desktop:4 @@ -39,7 +40,7 @@ msgstr "Mostra lo spazio disco libero" #. Name #: kwikdisk.desktop:2 msgid "KwikDisk" -msgstr "" +msgstr "KwikDisk" #. GenericName #: kwikdisk.desktop:7 diff --git a/translations/desktop_files/kdf-desktops/ka.po b/translations/desktop_files/kdf-desktops/ka.po index 589264c..67cfe87 100644 --- a/translations/desktop_files/kdf-desktops/ka.po +++ b/translations/desktop_files/kdf-desktops/ka.po @@ -1,35 +1,36 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:48+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kdf-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcmdf.desktop:10 msgid "Storage Devices" -msgstr "ინფორმაციის შემნახველი მოწყობილობები" +msgstr "საცავის მოწყობილობები" #. Comment #: kcmdf.desktop:12 msgid "Shows the disk usage of the mounted devices" -msgstr "მონტირებული დისკების გამოყენებას" +msgstr "აჩვენებს მიმაგრებული მოწყობილობების დისკის გამოყენება" #. Name #: kdf.desktop:2 msgid "KDiskFree" -msgstr "" +msgstr "KDiskFree" #. GenericName #: kdf.desktop:4 @@ -39,9 +40,9 @@ msgstr "იხილეთ დისკის გამოყენება" #. Name #: kwikdisk.desktop:2 msgid "KwikDisk" -msgstr "" +msgstr "KwikDisk" #. GenericName #: kwikdisk.desktop:7 msgid "Removable Media Utility" -msgstr "მოხსნადი მედიის უტილიტა" +msgstr "მოხსნადი მედიის პროგრამა" diff --git a/translations/desktop_files/kdf-desktops/nl.po b/translations/desktop_files/kdf-desktops/nl.po index 5949ebe..b6224ef 100644 --- a/translations/desktop_files/kdf-desktops/nl.po +++ b/translations/desktop_files/kdf-desktops/nl.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:48+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kdf-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcmdf.desktop:10 @@ -24,12 +25,12 @@ msgstr "Opslagapparaten" #. Comment #: kcmdf.desktop:12 msgid "Shows the disk usage of the mounted devices" -msgstr "Toont het schijfgebruik van de aangekoppelde bestandssystemen" +msgstr "Toont het schijfgebruik van de aangekoppelde apparaten" #. Name #: kdf.desktop:2 msgid "KDiskFree" -msgstr "" +msgstr "KDiskFree" #. GenericName #: kdf.desktop:4 @@ -39,7 +40,7 @@ msgstr "Schijfgebruik bekijken" #. Name #: kwikdisk.desktop:2 msgid "KwikDisk" -msgstr "" +msgstr "KwikDisk" #. GenericName #: kwikdisk.desktop:7 diff --git a/translations/desktop_files/kdf-desktops/ru.po b/translations/desktop_files/kdf-desktops/ru.po index 69f2cd8..ce7da94 100644 --- a/translations/desktop_files/kdf-desktops/ru.po +++ b/translations/desktop_files/kdf-desktops/ru.po @@ -1,25 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:48+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-05-11 22:02+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kdf-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcmdf.desktop:10 msgid "Storage Devices" -msgstr "Устройства хранения данных" +msgstr "Запоминающие устройства" #. Comment #: kcmdf.desktop:12 @@ -29,7 +32,7 @@ msgstr "Показывает свободное место на смонтиро #. Name #: kdf.desktop:2 msgid "KDiskFree" -msgstr "" +msgstr "KDiskFree" #. GenericName #: kdf.desktop:4 @@ -39,7 +42,7 @@ msgstr "Использование дисков" #. Name #: kwikdisk.desktop:2 msgid "KwikDisk" -msgstr "" +msgstr "KwikDisk" #. GenericName #: kwikdisk.desktop:7 diff --git a/translations/desktop_files/kfloppy-desktops/es.po b/translations/desktop_files/kfloppy-desktops/es.po index 97eb9ce..ed0a624 100644 --- a/translations/desktop_files/kfloppy-desktops/es.po +++ b/translations/desktop_files/kfloppy-desktops/es.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# titae <benjamin.m21@outlook.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 18:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-06-15 03:21+0000\n" +"Last-Translator: titae <benjamin.m21@outlook.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kfloppy-desktop-files/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: KFloppy.desktop:2 msgid "KFloppy" -msgstr "" +msgstr "KFloppy" #. GenericName #: KFloppy.desktop:4 diff --git a/translations/desktop_files/kfloppy-desktops/es_AR.po b/translations/desktop_files/kfloppy-desktops/es_AR.po new file mode 100644 index 0000000..ff97dab --- /dev/null +++ b/translations/desktop_files/kfloppy-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 18:40+0200\n" +"PO-Revision-Date: 2025-06-16 03:59+0000\n" +"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n" +"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdeutils/kfloppy-desktop-files/es_AR/>\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" + +#. Name +#: KFloppy.desktop:2 +msgid "KFloppy" +msgstr "KFloppyDisco" + +#. GenericName +#: KFloppy.desktop:4 +msgid "Floppy Formatter" +msgstr "Formateador de disquettes" + +#. Name +#: floppy_format.desktop:4 +#, fuzzy +msgid "Format" +msgstr "Formatear" diff --git a/translations/desktop_files/kfloppy-desktops/it.po b/translations/desktop_files/kfloppy-desktops/it.po index b93ff71..533c7b1 100644 --- a/translations/desktop_files/kfloppy-desktops/it.po +++ b/translations/desktop_files/kfloppy-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 18:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-22 17:56+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kfloppy-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: KFloppy.desktop:2 msgid "KFloppy" -msgstr "" +msgstr "KFloppy" #. GenericName #: KFloppy.desktop:4 diff --git a/translations/desktop_files/kfloppy-desktops/ka.po b/translations/desktop_files/kfloppy-desktops/ka.po index cb69837..d40d509 100644 --- a/translations/desktop_files/kfloppy-desktops/ka.po +++ b/translations/desktop_files/kfloppy-desktops/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 18:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kfloppy-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KFloppy.desktop:2 msgid "KFloppy" -msgstr "" +msgstr "KFloppy" #. GenericName #: KFloppy.desktop:4 @@ -29,4 +30,4 @@ msgstr "დისკეტის დამფორმატებელი" #. Name #: floppy_format.desktop:4 msgid "Format" -msgstr "ფორმატი" +msgstr "დაფორმატება" diff --git a/translations/desktop_files/kfloppy-desktops/nl.po b/translations/desktop_files/kfloppy-desktops/nl.po index 56fb377..580f36f 100644 --- a/translations/desktop_files/kfloppy-desktops/nl.po +++ b/translations/desktop_files/kfloppy-desktops/nl.po @@ -1,30 +1,31 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 18:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kfloppy-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: KFloppy.desktop:2 msgid "KFloppy" -msgstr "" +msgstr "KFloppy" #. GenericName #: KFloppy.desktop:4 msgid "Floppy Formatter" -msgstr "Diskettes formatteren" +msgstr "Formatteer diskettes" #. Name #: floppy_format.desktop:4 diff --git a/translations/desktop_files/kfloppy-desktops/ru.po b/translations/desktop_files/kfloppy-desktops/ru.po index 7e69bb8..6bb1bfc 100644 --- a/translations/desktop_files/kfloppy-desktops/ru.po +++ b/translations/desktop_files/kfloppy-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 18:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kfloppy-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: KFloppy.desktop:2 msgid "KFloppy" -msgstr "" +msgstr "KFloppy" #. GenericName #: KFloppy.desktop:4 diff --git a/translations/desktop_files/kfloppy-desktops/sv.po b/translations/desktop_files/kfloppy-desktops/sv.po index 2b696fa..db54154 100644 --- a/translations/desktop_files/kfloppy-desktops/sv.po +++ b/translations/desktop_files/kfloppy-desktops/sv.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 18:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-06-18 10:59+0000\n" +"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n" +"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kfloppy-desktop-files/sv/>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: KFloppy.desktop:2 msgid "KFloppy" -msgstr "" +msgstr "KFloppy" #. GenericName #: KFloppy.desktop:4 @@ -29,4 +30,4 @@ msgstr "Formatera disketter" #. Name #: floppy_format.desktop:4 msgid "Format" -msgstr "" +msgstr "Formattera" diff --git a/translations/desktop_files/kgpg-desktops/es_AR.po b/translations/desktop_files/kgpg-desktops/es_AR.po new file mode 100644 index 0000000..b92d324 --- /dev/null +++ b/translations/desktop_files/kgpg-desktops/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 20:55+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: encryptfile.desktop:7 +msgid "Encrypt File" +msgstr "" + +#. Name +#: encryptfolder.desktop:6 +msgid "Archive & Encrypt Folder" +msgstr "" + +#. Name +#: kgpg.desktop:2 +msgid "KGpg" +msgstr "" + +#. GenericName +#: kgpg.desktop:4 +msgid "Encryption Tool" +msgstr "" + +#. Comment +#: kgpg.desktop:6 +msgid "A GnuPG frontend" +msgstr "" diff --git a/translations/desktop_files/kgpg-desktops/it.po b/translations/desktop_files/kgpg-desktops/it.po index 0642447..1d5e9c9 100644 --- a/translations/desktop_files/kgpg-desktops/it.po +++ b/translations/desktop_files/kgpg-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 20:55+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-23 19:02+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kgpg-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: encryptfile.desktop:7 @@ -29,7 +30,7 @@ msgstr "Archivia e cifra cartella" #. Name #: kgpg.desktop:2 msgid "KGpg" -msgstr "" +msgstr "KGpg" #. GenericName #: kgpg.desktop:4 diff --git a/translations/desktop_files/kgpg-desktops/ka.po b/translations/desktop_files/kgpg-desktops/ka.po index cc3aac9..aa7d89f 100644 --- a/translations/desktop_files/kgpg-desktops/ka.po +++ b/translations/desktop_files/kgpg-desktops/ka.po @@ -1,42 +1,43 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 20:55+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kgpg-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: encryptfile.desktop:7 msgid "Encrypt File" -msgstr "დაილის დაშიფრვა" +msgstr "ფაილის დაშიფვრა" #. Name #: encryptfolder.desktop:6 msgid "Archive & Encrypt Folder" -msgstr "არქივი და დაშიფრვის საქაღალდე" +msgstr "საქაღალდის დაარქივება და დაშიფვრა" #. Name #: kgpg.desktop:2 msgid "KGpg" -msgstr "" +msgstr "KGpg" #. GenericName #: kgpg.desktop:4 msgid "Encryption Tool" -msgstr "დაშიფვრის ხელსაწყო" +msgstr "დაშიფვრის პროგრამა" #. Comment #: kgpg.desktop:6 msgid "A GnuPG frontend" -msgstr "GnuPG გრაფიკული გარსი" +msgstr "GnuPG-ის წინაბოლო" diff --git a/translations/desktop_files/kgpg-desktops/nl.po b/translations/desktop_files/kgpg-desktops/nl.po index f75be2c..9148360 100644 --- a/translations/desktop_files/kgpg-desktops/nl.po +++ b/translations/desktop_files/kgpg-desktops/nl.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 20:55+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kgpg-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: encryptfile.desktop:7 @@ -29,14 +30,14 @@ msgstr "Map archiveren en versleutelen" #. Name #: kgpg.desktop:2 msgid "KGpg" -msgstr "" +msgstr "KGpg" #. GenericName #: kgpg.desktop:4 msgid "Encryption Tool" -msgstr "Cryptografisch programma" +msgstr "Versleutelingsprogramma" #. Comment #: kgpg.desktop:6 msgid "A GnuPG frontend" -msgstr "Een programma om GnuPG-cryptografie en -ondertekening te gebruiken" +msgstr "Een frontend voor GnuPG" diff --git a/translations/desktop_files/kgpg-desktops/ru.po b/translations/desktop_files/kgpg-desktops/ru.po index 92152df..988b333 100644 --- a/translations/desktop_files/kgpg-desktops/ru.po +++ b/translations/desktop_files/kgpg-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 20:55+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kgpg-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: encryptfile.desktop:7 @@ -29,7 +31,7 @@ msgstr "Архивировать и зашифровать папку" #. Name #: kgpg.desktop:2 msgid "KGpg" -msgstr "" +msgstr "KGpg" #. GenericName #: kgpg.desktop:4 @@ -39,4 +41,4 @@ msgstr "Шифрование" #. Comment #: kgpg.desktop:6 msgid "A GnuPG frontend" -msgstr "Управление ключами GPG" +msgstr "Управление ключами GnuPG" diff --git a/translations/desktop_files/khexedit-desktops/af.po b/translations/desktop_files/khexedit-desktops/af.po index b730b7d..16dc2df 100644 --- a/translations/desktop_files/khexedit-desktops/af.po +++ b/translations/desktop_files/khexedit-desktops/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ar.po b/translations/desktop_files/khexedit-desktops/ar.po index 9e7f2be..466b1ea 100644 --- a/translations/desktop_files/khexedit-desktops/ar.po +++ b/translations/desktop_files/khexedit-desktops/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/bg.po b/translations/desktop_files/khexedit-desktops/bg.po index 406cf03..42cfa55 100644 --- a/translations/desktop_files/khexedit-desktops/bg.po +++ b/translations/desktop_files/khexedit-desktops/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/br.po b/translations/desktop_files/khexedit-desktops/br.po index de30072..ede2795 100644 --- a/translations/desktop_files/khexedit-desktops/br.po +++ b/translations/desktop_files/khexedit-desktops/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/bs.po b/translations/desktop_files/khexedit-desktops/bs.po index 46cfcde..f3456a9 100644 --- a/translations/desktop_files/khexedit-desktops/bs.po +++ b/translations/desktop_files/khexedit-desktops/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ca.po b/translations/desktop_files/khexedit-desktops/ca.po index bfc6c48..05521da 100644 --- a/translations/desktop_files/khexedit-desktops/ca.po +++ b/translations/desktop_files/khexedit-desktops/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/cs.po b/translations/desktop_files/khexedit-desktops/cs.po index d95a2de..d5cf694 100644 --- a/translations/desktop_files/khexedit-desktops/cs.po +++ b/translations/desktop_files/khexedit-desktops/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/cy.po b/translations/desktop_files/khexedit-desktops/cy.po index e2b7929..aad8fa0 100644 --- a/translations/desktop_files/khexedit-desktops/cy.po +++ b/translations/desktop_files/khexedit-desktops/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/da.po b/translations/desktop_files/khexedit-desktops/da.po index 5a5bb86..2c14f7a 100644 --- a/translations/desktop_files/khexedit-desktops/da.po +++ b/translations/desktop_files/khexedit-desktops/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/de.po b/translations/desktop_files/khexedit-desktops/de.po index ab0ea66..edac105 100644 --- a/translations/desktop_files/khexedit-desktops/de.po +++ b/translations/desktop_files/khexedit-desktops/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/el.po b/translations/desktop_files/khexedit-desktops/el.po index 6e834e8..537ab7a 100644 --- a/translations/desktop_files/khexedit-desktops/el.po +++ b/translations/desktop_files/khexedit-desktops/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/eo.po b/translations/desktop_files/khexedit-desktops/eo.po index 942f30a..35ce1e7 100644 --- a/translations/desktop_files/khexedit-desktops/eo.po +++ b/translations/desktop_files/khexedit-desktops/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/es.po b/translations/desktop_files/khexedit-desktops/es.po index a7908ad..6a35961 100644 --- a/translations/desktop_files/khexedit-desktops/es.po +++ b/translations/desktop_files/khexedit-desktops/es.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# titae <benjamin.m21@outlook.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2025-06-15 03:21+0000\n" +"Last-Translator: titae <benjamin.m21@outlook.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/khexedit-desktop-files/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: khexedit.desktop:2 msgid "KHexEdit" -msgstr "" +msgstr "KHexEdit" #. GenericName #: khexedit.desktop:4 diff --git a/translations/desktop_files/khexedit-desktops/es_AR.po b/translations/desktop_files/khexedit-desktops/es_AR.po new file mode 100644 index 0000000..e713338 --- /dev/null +++ b/translations/desktop_files/khexedit-desktops/es_AR.po @@ -0,0 +1,36 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: khexedit.desktop:2 +msgid "KHexEdit" +msgstr "" + +#. GenericName +#: khexedit.desktop:4 +msgid "Binary Editor" +msgstr "" + +#. Name +#: parts/kbytesedit/kbyteseditwidget.desktop:3 +msgid "BytesEdit Widget" +msgstr "" + +#. Name +#. Comment +#: parts/kpart/khexedit2part.desktop:4 parts/kpart/khexedit2part.desktop:5 +msgid "Embedded Binary Viewer" +msgstr "" diff --git a/translations/desktop_files/khexedit-desktops/et.po b/translations/desktop_files/khexedit-desktops/et.po index eb3d019..c9c83e9 100644 --- a/translations/desktop_files/khexedit-desktops/et.po +++ b/translations/desktop_files/khexedit-desktops/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/eu.po b/translations/desktop_files/khexedit-desktops/eu.po index 5fd7fa5..b855178 100644 --- a/translations/desktop_files/khexedit-desktops/eu.po +++ b/translations/desktop_files/khexedit-desktops/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/fa.po b/translations/desktop_files/khexedit-desktops/fa.po index dd20d92..3b8da26 100644 --- a/translations/desktop_files/khexedit-desktops/fa.po +++ b/translations/desktop_files/khexedit-desktops/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/fi.po b/translations/desktop_files/khexedit-desktops/fi.po index 28a4df9..a0314db 100644 --- a/translations/desktop_files/khexedit-desktops/fi.po +++ b/translations/desktop_files/khexedit-desktops/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/fr.po b/translations/desktop_files/khexedit-desktops/fr.po index 6903282..4aa3ec0 100644 --- a/translations/desktop_files/khexedit-desktops/fr.po +++ b/translations/desktop_files/khexedit-desktops/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ga.po b/translations/desktop_files/khexedit-desktops/ga.po index 66955e7..9bc0e09 100644 --- a/translations/desktop_files/khexedit-desktops/ga.po +++ b/translations/desktop_files/khexedit-desktops/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/he.po b/translations/desktop_files/khexedit-desktops/he.po index dffe612..3f01b55 100644 --- a/translations/desktop_files/khexedit-desktops/he.po +++ b/translations/desktop_files/khexedit-desktops/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/hi.po b/translations/desktop_files/khexedit-desktops/hi.po index 656a17f..94070b2 100644 --- a/translations/desktop_files/khexedit-desktops/hi.po +++ b/translations/desktop_files/khexedit-desktops/hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/hr.po b/translations/desktop_files/khexedit-desktops/hr.po index 851d282..aacde46 100644 --- a/translations/desktop_files/khexedit-desktops/hr.po +++ b/translations/desktop_files/khexedit-desktops/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/hu.po b/translations/desktop_files/khexedit-desktops/hu.po index 62eac97..c3e72f6 100644 --- a/translations/desktop_files/khexedit-desktops/hu.po +++ b/translations/desktop_files/khexedit-desktops/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/is.po b/translations/desktop_files/khexedit-desktops/is.po index 9fde79a..e360136 100644 --- a/translations/desktop_files/khexedit-desktops/is.po +++ b/translations/desktop_files/khexedit-desktops/is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/it.po b/translations/desktop_files/khexedit-desktops/it.po index 871d358..374994e 100644 --- a/translations/desktop_files/khexedit-desktops/it.po +++ b/translations/desktop_files/khexedit-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2021-04-23 19:02+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/khexedit-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: khexedit.desktop:2 msgid "KHexEdit" -msgstr "" +msgstr "KHexEdit" #. GenericName #: khexedit.desktop:4 diff --git a/translations/desktop_files/khexedit-desktops/ja.po b/translations/desktop_files/khexedit-desktops/ja.po index 4c6762e..7801269 100644 --- a/translations/desktop_files/khexedit-desktops/ja.po +++ b/translations/desktop_files/khexedit-desktops/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ka.po b/translations/desktop_files/khexedit-desktops/ka.po index b8fe23a..5fb8f82 100644 --- a/translations/desktop_files/khexedit-desktops/ka.po +++ b/translations/desktop_files/khexedit-desktops/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/khexedit-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: khexedit.desktop:2 msgid "KHexEdit" -msgstr "" +msgstr "KHexEdit" #. GenericName #: khexedit.desktop:4 @@ -29,7 +30,7 @@ msgstr "ბინარული რედაქტორი" #. Name #: parts/kbytesedit/kbyteseditwidget.desktop:3 msgid "BytesEdit Widget" -msgstr "" +msgstr "ბაიტების რედაქტორის ვიჯეტი" #. Name #. Comment diff --git a/translations/desktop_files/khexedit-desktops/khexedit-desktops.pot b/translations/desktop_files/khexedit-desktops/khexedit-desktops.pot index ceb6059..21e095f 100644 --- a/translations/desktop_files/khexedit-desktops/khexedit-desktops.pot +++ b/translations/desktop_files/khexedit-desktops/khexedit-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -33,7 +33,6 @@ msgstr "" #. Name #. Comment -#: parts/kpart/khexedit2part.desktop:4 -#: parts/kpart/khexedit2part.desktop:5 +#: parts/kpart/khexedit2part.desktop:4 parts/kpart/khexedit2part.desktop:5 msgid "Embedded Binary Viewer" msgstr "" diff --git a/translations/desktop_files/khexedit-desktops/kk.po b/translations/desktop_files/khexedit-desktops/kk.po index a19e79c..fc421b9 100644 --- a/translations/desktop_files/khexedit-desktops/kk.po +++ b/translations/desktop_files/khexedit-desktops/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/km.po b/translations/desktop_files/khexedit-desktops/km.po index 44a4f97..0358fd9 100644 --- a/translations/desktop_files/khexedit-desktops/km.po +++ b/translations/desktop_files/khexedit-desktops/km.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/lt.po b/translations/desktop_files/khexedit-desktops/lt.po index 293f098..6a83fd7 100644 --- a/translations/desktop_files/khexedit-desktops/lt.po +++ b/translations/desktop_files/khexedit-desktops/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/lv.po b/translations/desktop_files/khexedit-desktops/lv.po index c1f3fb7..456ecb7 100644 --- a/translations/desktop_files/khexedit-desktops/lv.po +++ b/translations/desktop_files/khexedit-desktops/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/mk.po b/translations/desktop_files/khexedit-desktops/mk.po index 17f45d3..974c8ec 100644 --- a/translations/desktop_files/khexedit-desktops/mk.po +++ b/translations/desktop_files/khexedit-desktops/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ms.po b/translations/desktop_files/khexedit-desktops/ms.po index 982869e..d499df9 100644 --- a/translations/desktop_files/khexedit-desktops/ms.po +++ b/translations/desktop_files/khexedit-desktops/ms.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/mt.po b/translations/desktop_files/khexedit-desktops/mt.po index a0b1163..c01082e 100644 --- a/translations/desktop_files/khexedit-desktops/mt.po +++ b/translations/desktop_files/khexedit-desktops/mt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/nb.po b/translations/desktop_files/khexedit-desktops/nb.po index 67afb84..646a8fa 100644 --- a/translations/desktop_files/khexedit-desktops/nb.po +++ b/translations/desktop_files/khexedit-desktops/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/nds.po b/translations/desktop_files/khexedit-desktops/nds.po index f5d6dab..3a12f67 100644 --- a/translations/desktop_files/khexedit-desktops/nds.po +++ b/translations/desktop_files/khexedit-desktops/nds.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ne.po b/translations/desktop_files/khexedit-desktops/ne.po index 9819a89..9f14b92 100644 --- a/translations/desktop_files/khexedit-desktops/ne.po +++ b/translations/desktop_files/khexedit-desktops/ne.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/nl.po b/translations/desktop_files/khexedit-desktops/nl.po index 74304db..c70a6db 100644 --- a/translations/desktop_files/khexedit-desktops/nl.po +++ b/translations/desktop_files/khexedit-desktops/nl.po @@ -1,38 +1,39 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/khexedit-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: khexedit.desktop:2 msgid "KHexEdit" -msgstr "" +msgstr "KHexEdit" #. GenericName #: khexedit.desktop:4 msgid "Binary Editor" -msgstr "Binaire bestanden bewerken" +msgstr "Bewerk binaire bestanden" #. Name #: parts/kbytesedit/kbyteseditwidget.desktop:3 msgid "BytesEdit Widget" -msgstr "" +msgstr "BytesEdit-widget" #. Name #. Comment #: parts/kpart/khexedit2part.desktop:4 parts/kpart/khexedit2part.desktop:5 msgid "Embedded Binary Viewer" -msgstr "Ingebedde binaire viewer" +msgstr "Ingesloten binaire weergave" diff --git a/translations/desktop_files/khexedit-desktops/nn.po b/translations/desktop_files/khexedit-desktops/nn.po index 75ff609..5bb9dd8 100644 --- a/translations/desktop_files/khexedit-desktops/nn.po +++ b/translations/desktop_files/khexedit-desktops/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/pa.po b/translations/desktop_files/khexedit-desktops/pa.po index c768a37..5d9a715 100644 --- a/translations/desktop_files/khexedit-desktops/pa.po +++ b/translations/desktop_files/khexedit-desktops/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/pl.po b/translations/desktop_files/khexedit-desktops/pl.po index 2ee447f..9284f5c 100644 --- a/translations/desktop_files/khexedit-desktops/pl.po +++ b/translations/desktop_files/khexedit-desktops/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/pt.po b/translations/desktop_files/khexedit-desktops/pt.po index 937879e..60aaef0 100644 --- a/translations/desktop_files/khexedit-desktops/pt.po +++ b/translations/desktop_files/khexedit-desktops/pt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: 2020-12-09 15:59+0000\n" "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n" "Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/" diff --git a/translations/desktop_files/khexedit-desktops/pt_BR.po b/translations/desktop_files/khexedit-desktops/pt_BR.po index ff824a5..8e13e66 100644 --- a/translations/desktop_files/khexedit-desktops/pt_BR.po +++ b/translations/desktop_files/khexedit-desktops/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ro.po b/translations/desktop_files/khexedit-desktops/ro.po index ee5884f..f535a19 100644 --- a/translations/desktop_files/khexedit-desktops/ro.po +++ b/translations/desktop_files/khexedit-desktops/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ru.po b/translations/desktop_files/khexedit-desktops/ru.po index 5ec3b1a..61aee72 100644 --- a/translations/desktop_files/khexedit-desktops/ru.po +++ b/translations/desktop_files/khexedit-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/khexedit-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: khexedit.desktop:2 msgid "KHexEdit" -msgstr "" +msgstr "KHexEdit" #. GenericName #: khexedit.desktop:4 diff --git a/translations/desktop_files/khexedit-desktops/sk.po b/translations/desktop_files/khexedit-desktops/sk.po index b9917d0..6a5749c 100644 --- a/translations/desktop_files/khexedit-desktops/sk.po +++ b/translations/desktop_files/khexedit-desktops/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/sl.po b/translations/desktop_files/khexedit-desktops/sl.po index da81637..01d8e79 100644 --- a/translations/desktop_files/khexedit-desktops/sl.po +++ b/translations/desktop_files/khexedit-desktops/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/sr.po b/translations/desktop_files/khexedit-desktops/sr.po index a5ed018..8dfb14a 100644 --- a/translations/desktop_files/khexedit-desktops/sr.po +++ b/translations/desktop_files/khexedit-desktops/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/sr@Latn.po b/translations/desktop_files/khexedit-desktops/sr@Latn.po index e6121b9..2a77783 100644 --- a/translations/desktop_files/khexedit-desktops/sr@Latn.po +++ b/translations/desktop_files/khexedit-desktops/sr@Latn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/sv.po b/translations/desktop_files/khexedit-desktops/sv.po index 470b63b..dc80474 100644 --- a/translations/desktop_files/khexedit-desktops/sv.po +++ b/translations/desktop_files/khexedit-desktops/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/ta.po b/translations/desktop_files/khexedit-desktops/ta.po index 0eb3b74..7437ce9 100644 --- a/translations/desktop_files/khexedit-desktops/ta.po +++ b/translations/desktop_files/khexedit-desktops/ta.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/tg.po b/translations/desktop_files/khexedit-desktops/tg.po index 3cd5a2c..c8e8bb0 100644 --- a/translations/desktop_files/khexedit-desktops/tg.po +++ b/translations/desktop_files/khexedit-desktops/tg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/th.po b/translations/desktop_files/khexedit-desktops/th.po index d236290..c168e08 100644 --- a/translations/desktop_files/khexedit-desktops/th.po +++ b/translations/desktop_files/khexedit-desktops/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/tr.po b/translations/desktop_files/khexedit-desktops/tr.po index 84920e1..0f197a7 100644 --- a/translations/desktop_files/khexedit-desktops/tr.po +++ b/translations/desktop_files/khexedit-desktops/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/uk.po b/translations/desktop_files/khexedit-desktops/uk.po index 06ea581..4078e93 100644 --- a/translations/desktop_files/khexedit-desktops/uk.po +++ b/translations/desktop_files/khexedit-desktops/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: 2020-09-02 05:32+0000\n" "Last-Translator: Roman Savochenko <roman@oscada.org>\n" "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" diff --git a/translations/desktop_files/khexedit-desktops/ven.po b/translations/desktop_files/khexedit-desktops/ven.po index 26eaaaa..f196126 100644 --- a/translations/desktop_files/khexedit-desktops/ven.po +++ b/translations/desktop_files/khexedit-desktops/ven.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/vi.po b/translations/desktop_files/khexedit-desktops/vi.po index cd32b16..aac3b6f 100644 --- a/translations/desktop_files/khexedit-desktops/vi.po +++ b/translations/desktop_files/khexedit-desktops/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/wa.po b/translations/desktop_files/khexedit-desktops/wa.po index ff2d8c6..2785f7e 100644 --- a/translations/desktop_files/khexedit-desktops/wa.po +++ b/translations/desktop_files/khexedit-desktops/wa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/xh.po b/translations/desktop_files/khexedit-desktops/xh.po index 6e201a7..ebd04de 100644 --- a/translations/desktop_files/khexedit-desktops/xh.po +++ b/translations/desktop_files/khexedit-desktops/xh.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/zh_CN.po b/translations/desktop_files/khexedit-desktops/zh_CN.po index fb3145d..61c0c81 100644 --- a/translations/desktop_files/khexedit-desktops/zh_CN.po +++ b/translations/desktop_files/khexedit-desktops/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/zh_TW.po b/translations/desktop_files/khexedit-desktops/zh_TW.po index 2f04d6f..132031f 100644 --- a/translations/desktop_files/khexedit-desktops/zh_TW.po +++ b/translations/desktop_files/khexedit-desktops/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/khexedit-desktops/zu.po b/translations/desktop_files/khexedit-desktops/zu.po index a56ed62..e97868e 100644 --- a/translations/desktop_files/khexedit-desktops/zu.po +++ b/translations/desktop_files/khexedit-desktops/zu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 21:03+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/klaptopdaemon-desktops/es.po b/translations/desktop_files/klaptopdaemon-desktops/es.po index 13dd871..04bdcbb 100644 --- a/translations/desktop_files/klaptopdaemon-desktops/es.po +++ b/translations/desktop_files/klaptopdaemon-desktops/es.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# titae <benjamin.m21@outlook.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-06-16 03:59+0000\n" +"Last-Translator: titae <benjamin.m21@outlook.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/klaptopdaemon-desktop-files/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: applnk/klaptopdaemon.desktop:2 @@ -34,9 +35,8 @@ msgstr "Batería del portátil" #. Name #: applnk/pcmcia.desktop:2 -#, fuzzy msgid "PCMCIA cards" -msgstr "Estado PCMCIA" +msgstr "Tarjetas PCMCIA" #. Comment #: applnk/pcmcia.desktop:4 diff --git a/translations/desktop_files/klaptopdaemon-desktops/es_AR.po b/translations/desktop_files/klaptopdaemon-desktops/es_AR.po new file mode 100644 index 0000000..2b61262 --- /dev/null +++ b/translations/desktop_files/klaptopdaemon-desktops/es_AR.po @@ -0,0 +1,41 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-21 21:20+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: applnk/klaptopdaemon.desktop:2 +msgid "Laptop Battery Monitor" +msgstr "" + +#. Comment +#: applnk/klaptopdaemon.desktop:4 +msgid "Laptop battery monitor" +msgstr "" + +#. Name +#. Comment +#: applnk/laptop.desktop:2 applnk/laptop.desktop:4 +msgid "Laptop Battery" +msgstr "" + +#. Name +#: applnk/pcmcia.desktop:2 +msgid "PCMCIA cards" +msgstr "" + +#. Comment +#: applnk/pcmcia.desktop:4 +msgid "PCMCIA status" +msgstr "" diff --git a/translations/desktop_files/klaptopdaemon-desktops/it.po b/translations/desktop_files/klaptopdaemon-desktops/it.po index 5cd2508..7a5fdb7 100644 --- a/translations/desktop_files/klaptopdaemon-desktops/it.po +++ b/translations/desktop_files/klaptopdaemon-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-24 21:23+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/klaptopdaemon-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: applnk/klaptopdaemon.desktop:2 @@ -34,9 +35,8 @@ msgstr "Batteria computer portatile" #. Name #: applnk/pcmcia.desktop:2 -#, fuzzy msgid "PCMCIA cards" -msgstr "Stato PCMCIA" +msgstr "Card PCMCIA" #. Comment #: applnk/pcmcia.desktop:4 diff --git a/translations/desktop_files/klaptopdaemon-desktops/ka.po b/translations/desktop_files/klaptopdaemon-desktops/ka.po index 4ecd1b3..f88035b 100644 --- a/translations/desktop_files/klaptopdaemon-desktops/ka.po +++ b/translations/desktop_files/klaptopdaemon-desktops/ka.po @@ -1,42 +1,42 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/klaptopdaemon-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: applnk/klaptopdaemon.desktop:2 msgid "Laptop Battery Monitor" -msgstr "ლეპტოპის კვების ელემენტის მონიტორი" +msgstr "ნოუთბუქის ელემენტის მონიტორი" #. Comment #: applnk/klaptopdaemon.desktop:4 msgid "Laptop battery monitor" -msgstr "ლეპტოპის კვების ელემენტის მონიტორი" +msgstr "ნოუთბუქის ელემენტის მონიტორი" #. Name #. Comment #: applnk/laptop.desktop:2 applnk/laptop.desktop:4 msgid "Laptop Battery" -msgstr "ლეპტოპის კვების ელემენტი" +msgstr "ნოუთბუქის ელემენტი" #. Name #: applnk/pcmcia.desktop:2 -#, fuzzy msgid "PCMCIA cards" -msgstr "PCMCIA სტატუსი" +msgstr "PCMCIA ბარათები" #. Comment #: applnk/pcmcia.desktop:4 diff --git a/translations/desktop_files/klaptopdaemon-desktops/nl.po b/translations/desktop_files/klaptopdaemon-desktops/nl.po index 8eab5d0..c75d9f4 100644 --- a/translations/desktop_files/klaptopdaemon-desktops/nl.po +++ b/translations/desktop_files/klaptopdaemon-desktops/nl.po @@ -1,44 +1,44 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/klaptopdaemon-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: applnk/klaptopdaemon.desktop:2 msgid "Laptop Battery Monitor" -msgstr "Laptop-batterijbewaking" +msgstr "Laptopaccumonitor" #. Comment #: applnk/klaptopdaemon.desktop:4 msgid "Laptop battery monitor" -msgstr "Programma voor laptop-batterijbewaking" +msgstr "Programma voor laptopaccubeheer" #. Name #. Comment #: applnk/laptop.desktop:2 applnk/laptop.desktop:4 msgid "Laptop Battery" -msgstr "Laptopbatterij" +msgstr "Laptopaccu" #. Name #: applnk/pcmcia.desktop:2 -#, fuzzy msgid "PCMCIA cards" -msgstr "Status van PCMCIA" +msgstr "PCMCIA-kaarten" #. Comment #: applnk/pcmcia.desktop:4 msgid "PCMCIA status" -msgstr "Status van PCMCIA" +msgstr "PCMCIA-status" diff --git a/translations/desktop_files/klaptopdaemon-desktops/pl.po b/translations/desktop_files/klaptopdaemon-desktops/pl.po index 38741d2..66a9f33 100644 --- a/translations/desktop_files/klaptopdaemon-desktops/pl.po +++ b/translations/desktop_files/klaptopdaemon-desktops/pl.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Marek W <coronzon88@gmail.com>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-10-25 18:06+0000\n" +"Last-Translator: Marek W <coronzon88@gmail.com>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/klaptopdaemon-desktop-files/pl/>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: applnk/klaptopdaemon.desktop:2 @@ -34,9 +36,8 @@ msgstr "Bateria laptopa" #. Name #: applnk/pcmcia.desktop:2 -#, fuzzy msgid "PCMCIA cards" -msgstr "Status kart PCMCIA" +msgstr "Karty PCMCIA" #. Comment #: applnk/pcmcia.desktop:4 diff --git a/translations/desktop_files/klaptopdaemon-desktops/ru.po b/translations/desktop_files/klaptopdaemon-desktops/ru.po index 1a91034..595f386 100644 --- a/translations/desktop_files/klaptopdaemon-desktops/ru.po +++ b/translations/desktop_files/klaptopdaemon-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 21:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/klaptopdaemon-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: applnk/klaptopdaemon.desktop:2 @@ -34,9 +36,8 @@ msgstr "Батарея ноутбука" #. Name #: applnk/pcmcia.desktop:2 -#, fuzzy msgid "PCMCIA cards" -msgstr "Состояние PCMCIA" +msgstr "PCMCIA карты" #. Comment #: applnk/pcmcia.desktop:4 diff --git a/translations/desktop_files/kmilo-desktops/ar.po b/translations/desktop_files/kmilo-desktops/ar.po index 593be65..46f80e9 100644 --- a/translations/desktop_files/kmilo-desktops/ar.po +++ b/translations/desktop_files/kmilo-desktops/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/bg.po b/translations/desktop_files/kmilo-desktops/bg.po index 3b51115..d0b151e 100644 --- a/translations/desktop_files/kmilo-desktops/bg.po +++ b/translations/desktop_files/kmilo-desktops/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/br.po b/translations/desktop_files/kmilo-desktops/br.po index bab0e2a..1db7913 100644 --- a/translations/desktop_files/kmilo-desktops/br.po +++ b/translations/desktop_files/kmilo-desktops/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/bs.po b/translations/desktop_files/kmilo-desktops/bs.po index 420302d..5ae3204 100644 --- a/translations/desktop_files/kmilo-desktops/bs.po +++ b/translations/desktop_files/kmilo-desktops/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/ca.po b/translations/desktop_files/kmilo-desktops/ca.po index a21ff0e..a70059e 100644 --- a/translations/desktop_files/kmilo-desktops/ca.po +++ b/translations/desktop_files/kmilo-desktops/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/cs.po b/translations/desktop_files/kmilo-desktops/cs.po index 4f46a74..17b8c0b 100644 --- a/translations/desktop_files/kmilo-desktops/cs.po +++ b/translations/desktop_files/kmilo-desktops/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/cy.po b/translations/desktop_files/kmilo-desktops/cy.po index 9b35e89..9855bc3 100644 --- a/translations/desktop_files/kmilo-desktops/cy.po +++ b/translations/desktop_files/kmilo-desktops/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/da.po b/translations/desktop_files/kmilo-desktops/da.po index af0eb42..4d6acde 100644 --- a/translations/desktop_files/kmilo-desktops/da.po +++ b/translations/desktop_files/kmilo-desktops/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/de.po b/translations/desktop_files/kmilo-desktops/de.po index 2be2242..ba35b11 100644 --- a/translations/desktop_files/kmilo-desktops/de.po +++ b/translations/desktop_files/kmilo-desktops/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/el.po b/translations/desktop_files/kmilo-desktops/el.po index d4f7bd6..67e5d4e 100644 --- a/translations/desktop_files/kmilo-desktops/el.po +++ b/translations/desktop_files/kmilo-desktops/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/eo.po b/translations/desktop_files/kmilo-desktops/eo.po index d4c3ef9..6364c43 100644 --- a/translations/desktop_files/kmilo-desktops/eo.po +++ b/translations/desktop_files/kmilo-desktops/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/es.po b/translations/desktop_files/kmilo-desktops/es.po index 6f8e3ff..d3cfeb3 100644 --- a/translations/desktop_files/kmilo-desktops/es.po +++ b/translations/desktop_files/kmilo-desktops/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/es_AR.po b/translations/desktop_files/kmilo-desktops/es_AR.po new file mode 100644 index 0000000..eebe102 --- /dev/null +++ b/translations/desktop_files/kmilo-desktops/es_AR.po @@ -0,0 +1,133 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: asus/kmilo_asus.desktop:2 +msgid "Asus Laptop Plugin" +msgstr "" + +#. Comment +#: asus/kmilo_asus.desktop:4 +msgid "Enables support for special Asus laptop keys" +msgstr "" + +#. Name +#: delli8k/kmilo_delli8k.desktop:2 +msgid "Dell I8k Laptop Plugin" +msgstr "" + +#. Comment +#: delli8k/kmilo_delli8k.desktop:4 +msgid "Enables support for special Dell laptop keys" +msgstr "" + +#. Name +#: demo/kmilo_demo.desktop:2 +msgid "Demo Plugin" +msgstr "" + +#. Comment +#: demo/kmilo_demo.desktop:4 +msgid "Does nothing" +msgstr "" + +#. Name +#: generic/kmilo_generic.desktop:2 +msgid "Generic Keyboard Plugin" +msgstr "" + +#. Comment +#: generic/kmilo_generic.desktop:4 +msgid "Enables support for special keys on all sorts of keyboards and laptops" +msgstr "" + +#. Name +#: kmilo_kvaio/kcmkvaio/kvaio.desktop:2 +msgid "Sony Vaio Laptop" +msgstr "" + +#. Comment +#: kmilo_kvaio/kcmkvaio/kvaio.desktop:4 +msgid "" +"Configure the TDE Interface to the Sony Programmable Interrupt Controller " +"Driver" +msgstr "" + +#. Keywords +#: kmilo_kvaio/kcmkvaio/kvaio.desktop:6 +msgid "Sony; Vaio; kvaio; brightness; mute; Jog Dial;" +msgstr "" + +#. Name +#: kmilo_kvaio/kmilo_kvaio.desktop:2 +msgid "Sony Vaio Laptop Plugin" +msgstr "" + +#. Comment +#: kmilo_kvaio/kmilo_kvaio.desktop:4 +msgid "Enables support for Sony Vaio laptops" +msgstr "" + +#. Name +#: kmilod/kmilod.desktop:2 +msgid "KMilo" +msgstr "" + +#. Comment +#: kmilod/kmilod.desktop:4 +msgid "TDE special key notifier" +msgstr "" + +#. Name +#: powerbook/kmilo_powerbook.desktop:2 powerbook2/kmilo_powerbook.desktop:2 +msgid "Apple PowerBook Plugin" +msgstr "" + +#. Comment +#: powerbook/kmilo_powerbook.desktop:4 +msgid "" +"Enables support for special keys on Apple PowerBook laptops via pbbuttonsd" +msgstr "" + +#. Comment +#: powerbook2/kmilo_powerbook.desktop:4 +msgid "Enabled support for special keys on Apple PowerBooks via pbbuttonsd" +msgstr "" + +#. Name +#: thinkpad/kcmthinkpad/thinkpad.desktop:10 +msgid "IBM Thinkpad Laptop" +msgstr "" + +#. Comment +#: thinkpad/kcmthinkpad/thinkpad.desktop:11 +msgid "Configure the TDE Interface to the IBM Thinkpad Special Controls" +msgstr "" + +#. Keywords +#: thinkpad/kcmthinkpad/thinkpad.desktop:12 +msgid "IBM; Thinkpad; brightness; mute; Jog Dial;" +msgstr "" + +#. Name +#: thinkpad/kmilo_thinkpad.desktop:2 +msgid "Thinkpad Plugin" +msgstr "" + +#. Comment +#: thinkpad/kmilo_thinkpad.desktop:4 +msgid "Enables support for special Thinkpad keys" +msgstr "" diff --git a/translations/desktop_files/kmilo-desktops/et.po b/translations/desktop_files/kmilo-desktops/et.po index cc3e0d8..093ff8b 100644 --- a/translations/desktop_files/kmilo-desktops/et.po +++ b/translations/desktop_files/kmilo-desktops/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/eu.po b/translations/desktop_files/kmilo-desktops/eu.po index 1ccc534..2e0f9cc 100644 --- a/translations/desktop_files/kmilo-desktops/eu.po +++ b/translations/desktop_files/kmilo-desktops/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/fa.po b/translations/desktop_files/kmilo-desktops/fa.po index 9edd4dd..ff71874 100644 --- a/translations/desktop_files/kmilo-desktops/fa.po +++ b/translations/desktop_files/kmilo-desktops/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/fi.po b/translations/desktop_files/kmilo-desktops/fi.po index 618b0f2..8870ceb 100644 --- a/translations/desktop_files/kmilo-desktops/fi.po +++ b/translations/desktop_files/kmilo-desktops/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/fr.po b/translations/desktop_files/kmilo-desktops/fr.po index 7309754..3f71215 100644 --- a/translations/desktop_files/kmilo-desktops/fr.po +++ b/translations/desktop_files/kmilo-desktops/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/ga.po b/translations/desktop_files/kmilo-desktops/ga.po index 2987383..4d868dd 100644 --- a/translations/desktop_files/kmilo-desktops/ga.po +++ b/translations/desktop_files/kmilo-desktops/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/he.po b/translations/desktop_files/kmilo-desktops/he.po index 43a9baf..126d7ac 100644 --- a/translations/desktop_files/kmilo-desktops/he.po +++ b/translations/desktop_files/kmilo-desktops/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/hi.po b/translations/desktop_files/kmilo-desktops/hi.po index 665ae84..856f17d 100644 --- a/translations/desktop_files/kmilo-desktops/hi.po +++ b/translations/desktop_files/kmilo-desktops/hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/hu.po b/translations/desktop_files/kmilo-desktops/hu.po index d0d41bf..5ed0f50 100644 --- a/translations/desktop_files/kmilo-desktops/hu.po +++ b/translations/desktop_files/kmilo-desktops/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/is.po b/translations/desktop_files/kmilo-desktops/is.po index 60dc23a..b0225fa 100644 --- a/translations/desktop_files/kmilo-desktops/is.po +++ b/translations/desktop_files/kmilo-desktops/is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/it.po b/translations/desktop_files/kmilo-desktops/it.po index b7b6d5e..22c8421 100644 --- a/translations/desktop_files/kmilo-desktops/it.po +++ b/translations/desktop_files/kmilo-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2021-04-26 18:14+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kmilo-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: asus/kmilo_asus.desktop:2 @@ -56,7 +57,7 @@ msgstr "Plugin tastiera generica" msgid "Enables support for special keys on all sorts of keyboards and laptops" msgstr "" "Questo plugin abilita il supporto per i tasti speciali su qualsiasi tipo di " -"tastiera e portatile." +"tastiera e portatile" #. Name #: kmilo_kvaio/kcmkvaio/kvaio.desktop:2 @@ -90,7 +91,7 @@ msgstr "Modulo di KMilo per il supporto dei portatili Sony Vaio" #. Name #: kmilod/kmilod.desktop:2 msgid "KMilo" -msgstr "" +msgstr "KMilo" #. Comment #: kmilod/kmilod.desktop:4 @@ -108,14 +109,14 @@ msgid "" "Enables support for special keys on Apple PowerBook laptops via pbbuttonsd" msgstr "" "Questo plugin abilita il supporto per i tasti speciali sui portatili Apple " -"PowerBook tramite pbbuttonsd." +"PowerBook tramite pbbuttonsd" #. Comment #: powerbook2/kmilo_powerbook.desktop:4 msgid "Enabled support for special keys on Apple PowerBooks via pbbuttonsd" msgstr "" "Questo plugin abilita il supporto per i tasti speciali sui portatili Apple " -"PowerBook tramite pbbuttonsd." +"PowerBook tramite pbbuttonsd" #. Name #: thinkpad/kcmthinkpad/thinkpad.desktop:10 diff --git a/translations/desktop_files/kmilo-desktops/ja.po b/translations/desktop_files/kmilo-desktops/ja.po index a7450bf..94c4624 100644 --- a/translations/desktop_files/kmilo-desktops/ja.po +++ b/translations/desktop_files/kmilo-desktops/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/ka.po b/translations/desktop_files/kmilo-desktops/ka.po index 8fb1081..aa8295c 100644 --- a/translations/desktop_files/kmilo-desktops/ka.po +++ b/translations/desktop_files/kmilo-desktops/ka.po @@ -1,40 +1,41 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kmilo-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: asus/kmilo_asus.desktop:2 msgid "Asus Laptop Plugin" -msgstr "Asus-ის ლეპტოპის მოდული" +msgstr "Asus-ის ნოუთბუქის მოდული" #. Comment #: asus/kmilo_asus.desktop:4 msgid "Enables support for special Asus laptop keys" -msgstr "რთავს Asus-ის ლეპტოპის სპეციალური კლავიშების მხარდაჭერას" +msgstr "რთავს Asus-ის ნოუთბუქის სპეციალური ღილაკების მხარდაჭერას" #. Name #: delli8k/kmilo_delli8k.desktop:2 msgid "Dell I8k Laptop Plugin" -msgstr "Dell I8k ლეპტოპის მოდული" +msgstr "Dell I8k ნოუთბუქის მოდული" #. Comment #: delli8k/kmilo_delli8k.desktop:4 msgid "Enables support for special Dell laptop keys" -msgstr "რთავს Dell-ის ლეპტოპის სპეციალური კლავიშების მხარდაჭერას" +msgstr "რთავს Dell-ის ნოუთბუქის სპეციალური ღილაკების მხარდაჭერას" #. Name #: demo/kmilo_demo.desktop:2 @@ -44,95 +45,91 @@ msgstr "Demo მოდული" #. Comment #: demo/kmilo_demo.desktop:4 msgid "Does nothing" -msgstr "ეს მოდული არაფერს არ აკეთებს" +msgstr "არაფერს არ აკეთებს" #. Name #: generic/kmilo_generic.desktop:2 msgid "Generic Keyboard Plugin" -msgstr "სტანდარტული კლავიატურა მოდული" +msgstr "სტანდარტული კლავიატურის დამატება" #. Comment #: generic/kmilo_generic.desktop:4 msgid "Enables support for special keys on all sorts of keyboards and laptops" msgstr "" -"ეს მოდული რთავს ყველანაერი ტიპის კლავიატურების (მათ შორის ლეპტოპების) " -"სპეციალური კლავიშების მხარდაჭერას." +"ეს მოდული რთავს ყველანაირი ტიპის კლავიატურების (მათ შორის ნოუთბუქის) " +"სპეციალური კლავიშების მხარდაჭერას" #. Name #: kmilo_kvaio/kcmkvaio/kvaio.desktop:2 -#, fuzzy msgid "Sony Vaio Laptop" -msgstr "Sony Vaio მოდული" +msgstr "ნოუთბუქი Sony Vaio" #. Comment #: kmilo_kvaio/kcmkvaio/kvaio.desktop:4 -#, fuzzy msgid "" "Configure the TDE Interface to the Sony Programmable Interrupt Controller " "Driver" -msgstr "" -"TDE ინტერფეისის IBM Thinkpad-ის სპეციალური კონტროლებისთვის კონფიგურაცია" +msgstr "მოირგეთ TDE-ის ინტერფეისი Sony-ის PIC დრაივერისთვის" #. Keywords #: kmilo_kvaio/kcmkvaio/kvaio.desktop:6 msgid "Sony; Vaio; kvaio; brightness; mute; Jog Dial;" -msgstr "" +msgstr "Sony; Vaio; kvaio; brightness; mute; Jog Dial;სიკაშკაშე;" #. Name #: kmilo_kvaio/kmilo_kvaio.desktop:2 msgid "Sony Vaio Laptop Plugin" -msgstr "Sony Vaio მოდული" +msgstr "Sony Vaio-ის მოდული" #. Comment #: kmilo_kvaio/kmilo_kvaio.desktop:4 msgid "Enables support for Sony Vaio laptops" -msgstr "Sony Vaio ლეპტოპის მხარდამჭერი KMilo მოდული" +msgstr "ჩართავს მხარდაჭერას Sony Vaio ნოუთბუქებისთვის" #. Name #: kmilod/kmilod.desktop:2 msgid "KMilo" -msgstr "" +msgstr "KMilo" #. Comment #: kmilod/kmilod.desktop:4 msgid "TDE special key notifier" -msgstr "" +msgstr "TDE-ის სპეციალური ღილაკის გამფრთხილებელი" #. Name #: powerbook/kmilo_powerbook.desktop:2 powerbook2/kmilo_powerbook.desktop:2 msgid "Apple PowerBook Plugin" -msgstr "Apple PowerBook მოდული" +msgstr "Apple PowerBook-ის მოდული" #. Comment #: powerbook/kmilo_powerbook.desktop:4 msgid "" "Enables support for special keys on Apple PowerBook laptops via pbbuttonsd" msgstr "" -".ეს მოდული რთავს Apple PowerBook ლეპტოპის სპეციალური კლავიშების მხარდაჭერას " -"pbbuttonsd-ის მეშვეობით." +".ეს მოდული რთავს Apple PowerBook ნოუთბუქის სპეციალური ღილაკების მხარდაჭერას " +"pbbuttonsd-ის მეშვეობით" #. Comment #: powerbook2/kmilo_powerbook.desktop:4 msgid "Enabled support for special keys on Apple PowerBooks via pbbuttonsd" msgstr "" "ეს მოდული რთავს Apple PowerBooks-ის სპეციალური კლავიშების მხარდაჭერას " -"pbbuttonsd-ის მეშვეობით." +"pbbuttonsd-ის მეშვეობით" #. Name #: thinkpad/kcmthinkpad/thinkpad.desktop:10 msgid "IBM Thinkpad Laptop" -msgstr "" +msgstr "ნოუთბუქი IBM THinkpad" #. Comment #: thinkpad/kcmthinkpad/thinkpad.desktop:11 msgid "Configure the TDE Interface to the IBM Thinkpad Special Controls" -msgstr "" -"TDE ინტერფეისის IBM Thinkpad-ის სპეციალური კონტროლებისთვის კონფიგურაცია" +msgstr "TDE ინტერფეისის მორგება IBM Thinkpad-ის სპეციალური კონტროლებისთვის" #. Keywords #: thinkpad/kcmthinkpad/thinkpad.desktop:12 msgid "IBM; Thinkpad; brightness; mute; Jog Dial;" -msgstr "" +msgstr "IBM; Thinkpad; brightness; mute; Jog Dial;სიკაშკაშე;" #. Name #: thinkpad/kmilo_thinkpad.desktop:2 @@ -142,4 +139,4 @@ msgstr "Thinkpad-ის მოდული" #. Comment #: thinkpad/kmilo_thinkpad.desktop:4 msgid "Enables support for special Thinkpad keys" -msgstr "რთავს Thinkpad-ის სპეციალური კლავიშების მხარდაჭერას" +msgstr "ჩართავს Thinkpad-ის სპეციალური ღილაკების მხარდაჭერას" diff --git a/translations/desktop_files/kmilo-desktops/kk.po b/translations/desktop_files/kmilo-desktops/kk.po index b9abc44..dd7a5e0 100644 --- a/translations/desktop_files/kmilo-desktops/kk.po +++ b/translations/desktop_files/kmilo-desktops/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/km.po b/translations/desktop_files/kmilo-desktops/km.po index 47effa8..69f1253 100644 --- a/translations/desktop_files/kmilo-desktops/km.po +++ b/translations/desktop_files/kmilo-desktops/km.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/kmilo-desktops.pot b/translations/desktop_files/kmilo-desktops/kmilo-desktops.pot index 010775d..52a85cc 100644 --- a/translations/desktop_files/kmilo-desktops/kmilo-desktops.pot +++ b/translations/desktop_files/kmilo-desktops/kmilo-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -94,8 +94,7 @@ msgid "TDE special key notifier" msgstr "" #. Name -#: powerbook/kmilo_powerbook.desktop:2 -#: powerbook2/kmilo_powerbook.desktop:2 +#: powerbook/kmilo_powerbook.desktop:2 powerbook2/kmilo_powerbook.desktop:2 msgid "Apple PowerBook Plugin" msgstr "" diff --git a/translations/desktop_files/kmilo-desktops/lt.po b/translations/desktop_files/kmilo-desktops/lt.po index 55b8b30..440bcba 100644 --- a/translations/desktop_files/kmilo-desktops/lt.po +++ b/translations/desktop_files/kmilo-desktops/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/mk.po b/translations/desktop_files/kmilo-desktops/mk.po index 1cdef88..b41ba27 100644 --- a/translations/desktop_files/kmilo-desktops/mk.po +++ b/translations/desktop_files/kmilo-desktops/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/ms.po b/translations/desktop_files/kmilo-desktops/ms.po index 16932a0..cb85cc8 100644 --- a/translations/desktop_files/kmilo-desktops/ms.po +++ b/translations/desktop_files/kmilo-desktops/ms.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/nb.po b/translations/desktop_files/kmilo-desktops/nb.po index 454cabb..3c08d02 100644 --- a/translations/desktop_files/kmilo-desktops/nb.po +++ b/translations/desktop_files/kmilo-desktops/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/nds.po b/translations/desktop_files/kmilo-desktops/nds.po index fe112c0..58dbbed 100644 --- a/translations/desktop_files/kmilo-desktops/nds.po +++ b/translations/desktop_files/kmilo-desktops/nds.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/ne.po b/translations/desktop_files/kmilo-desktops/ne.po index cae6cf0..a76e544 100644 --- a/translations/desktop_files/kmilo-desktops/ne.po +++ b/translations/desktop_files/kmilo-desktops/ne.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/nl.po b/translations/desktop_files/kmilo-desktops/nl.po index 9e3522e..0737963 100644 --- a/translations/desktop_files/kmilo-desktops/nl.po +++ b/translations/desktop_files/kmilo-desktops/nl.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2025-03-22 17:44+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kmilo-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: asus/kmilo_asus.desktop:2 @@ -60,9 +61,8 @@ msgstr "" #. Name #: kmilo_kvaio/kcmkvaio/kvaio.desktop:2 -#, fuzzy msgid "Sony Vaio Laptop" -msgstr "Sony Vaio-plugin" +msgstr "Sony Vaio-laptop" #. Comment #: kmilo_kvaio/kcmkvaio/kvaio.desktop:4 @@ -91,7 +91,7 @@ msgstr "KMilo-module met ondersteuning voor de Sony Vaio laptop" #. Name #: kmilod/kmilod.desktop:2 msgid "KMilo" -msgstr "" +msgstr "KMilo" #. Comment #: kmilod/kmilod.desktop:4 @@ -121,7 +121,7 @@ msgstr "" #. Name #: thinkpad/kcmthinkpad/thinkpad.desktop:10 msgid "IBM Thinkpad Laptop" -msgstr "" +msgstr "IBM Thinkpad-laptop" #. Comment #: thinkpad/kcmthinkpad/thinkpad.desktop:11 @@ -138,7 +138,7 @@ msgstr "IBM; Thinkpad; brightness; mute; Jog Dial; Helderheid; dempen;" #. Name #: thinkpad/kmilo_thinkpad.desktop:2 msgid "Thinkpad Plugin" -msgstr "" +msgstr "Thinkpad-plug-in" #. Comment #: thinkpad/kmilo_thinkpad.desktop:4 diff --git a/translations/desktop_files/kmilo-desktops/nn.po b/translations/desktop_files/kmilo-desktops/nn.po index 86e7bd4..a8c742b 100644 --- a/translations/desktop_files/kmilo-desktops/nn.po +++ b/translations/desktop_files/kmilo-desktops/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/pa.po b/translations/desktop_files/kmilo-desktops/pa.po index 537ba25..fd344e6 100644 --- a/translations/desktop_files/kmilo-desktops/pa.po +++ b/translations/desktop_files/kmilo-desktops/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/pl.po b/translations/desktop_files/kmilo-desktops/pl.po index 7b899fd..a390567 100644 --- a/translations/desktop_files/kmilo-desktops/pl.po +++ b/translations/desktop_files/kmilo-desktops/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/pt.po b/translations/desktop_files/kmilo-desktops/pt.po index 795ed16..5dfef2c 100644 --- a/translations/desktop_files/kmilo-desktops/pt.po +++ b/translations/desktop_files/kmilo-desktops/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/pt_BR.po b/translations/desktop_files/kmilo-desktops/pt_BR.po index c014658..ce2c137 100644 --- a/translations/desktop_files/kmilo-desktops/pt_BR.po +++ b/translations/desktop_files/kmilo-desktops/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/ro.po b/translations/desktop_files/kmilo-desktops/ro.po index 1decea5..b73db18 100644 --- a/translations/desktop_files/kmilo-desktops/ro.po +++ b/translations/desktop_files/kmilo-desktops/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/ru.po b/translations/desktop_files/kmilo-desktops/ru.po index 7f2f50a..3fd6a61 100644 --- a/translations/desktop_files/kmilo-desktops/ru.po +++ b/translations/desktop_files/kmilo-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kmilo-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: asus/kmilo_asus.desktop:2 @@ -24,7 +26,7 @@ msgstr "Ноутбук Asus" #. Comment #: asus/kmilo_asus.desktop:4 msgid "Enables support for special Asus laptop keys" -msgstr "Этот модуль поддерживает специальные клавиши ноутбука Asus" +msgstr "Включает поддержку специальных клавиш ноутбука Asus" #. Name #: delli8k/kmilo_delli8k.desktop:2 @@ -34,7 +36,7 @@ msgstr "Ноутбук Dell I8k" #. Comment #: delli8k/kmilo_delli8k.desktop:4 msgid "Enables support for special Dell laptop keys" -msgstr "Этот модуль поддерживает специальные клавиши ноутбука Dell" +msgstr "Включает поддержку специальных клавиш ноутбука Dell" #. Name #: demo/kmilo_demo.desktop:2 @@ -44,7 +46,7 @@ msgstr "Демонстрационный модуль" #. Comment #: demo/kmilo_demo.desktop:4 msgid "Does nothing" -msgstr "Этот модуль ничего не делает." +msgstr "Этот модуль ничего не делает" #. Name #: generic/kmilo_generic.desktop:2 @@ -55,8 +57,7 @@ msgstr "Модуль клавиатуры" #: generic/kmilo_generic.desktop:4 msgid "Enables support for special keys on all sorts of keyboards and laptops" msgstr "" -"Этот модуль поддерживает специальные клавиши на всех типах клавиатур и " -"ноутбуках." +"Включает поддержку специальных клавиш на различных клавиатурах и ноутбуках" #. Name #: kmilo_kvaio/kcmkvaio/kvaio.desktop:2 @@ -90,7 +91,7 @@ msgstr "Модуль KMilo для ноутбуков Sony Vaio" #. Name #: kmilod/kmilod.desktop:2 msgid "KMilo" -msgstr "" +msgstr "KMilo" #. Comment #: kmilod/kmilod.desktop:4 diff --git a/translations/desktop_files/kmilo-desktops/sk.po b/translations/desktop_files/kmilo-desktops/sk.po index ab02928..60735f1 100644 --- a/translations/desktop_files/kmilo-desktops/sk.po +++ b/translations/desktop_files/kmilo-desktops/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/sl.po b/translations/desktop_files/kmilo-desktops/sl.po index f4d5a4c..57228d1 100644 --- a/translations/desktop_files/kmilo-desktops/sl.po +++ b/translations/desktop_files/kmilo-desktops/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/sr.po b/translations/desktop_files/kmilo-desktops/sr.po index 59c83ea..32af18c 100644 --- a/translations/desktop_files/kmilo-desktops/sr.po +++ b/translations/desktop_files/kmilo-desktops/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/sr@Latn.po b/translations/desktop_files/kmilo-desktops/sr@Latn.po index c477da7..499d070 100644 --- a/translations/desktop_files/kmilo-desktops/sr@Latn.po +++ b/translations/desktop_files/kmilo-desktops/sr@Latn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/sv.po b/translations/desktop_files/kmilo-desktops/sv.po index c452296..d10231e 100644 --- a/translations/desktop_files/kmilo-desktops/sv.po +++ b/translations/desktop_files/kmilo-desktops/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/ta.po b/translations/desktop_files/kmilo-desktops/ta.po index 3c99558..850042f 100644 --- a/translations/desktop_files/kmilo-desktops/ta.po +++ b/translations/desktop_files/kmilo-desktops/ta.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/tg.po b/translations/desktop_files/kmilo-desktops/tg.po index afacf68..e55f10a 100644 --- a/translations/desktop_files/kmilo-desktops/tg.po +++ b/translations/desktop_files/kmilo-desktops/tg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/tr.po b/translations/desktop_files/kmilo-desktops/tr.po index 8c1d34d..8afe417 100644 --- a/translations/desktop_files/kmilo-desktops/tr.po +++ b/translations/desktop_files/kmilo-desktops/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/uk.po b/translations/desktop_files/kmilo-desktops/uk.po index 899d6ba..a8bed53 100644 --- a/translations/desktop_files/kmilo-desktops/uk.po +++ b/translations/desktop_files/kmilo-desktops/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: 2020-09-02 05:32+0000\n" "Last-Translator: Roman Savochenko <roman@oscada.org>\n" "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" diff --git a/translations/desktop_files/kmilo-desktops/uz.po b/translations/desktop_files/kmilo-desktops/uz.po index dbdea41..3568a24 100644 --- a/translations/desktop_files/kmilo-desktops/uz.po +++ b/translations/desktop_files/kmilo-desktops/uz.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/uz@cyrillic.po b/translations/desktop_files/kmilo-desktops/uz@cyrillic.po index 70f94fc..91bf015 100644 --- a/translations/desktop_files/kmilo-desktops/uz@cyrillic.po +++ b/translations/desktop_files/kmilo-desktops/uz@cyrillic.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/wa.po b/translations/desktop_files/kmilo-desktops/wa.po index ee3403c..0bdfba3 100644 --- a/translations/desktop_files/kmilo-desktops/wa.po +++ b/translations/desktop_files/kmilo-desktops/wa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/zh_CN.po b/translations/desktop_files/kmilo-desktops/zh_CN.po index 3ae850b..bdcf914 100644 --- a/translations/desktop_files/kmilo-desktops/zh_CN.po +++ b/translations/desktop_files/kmilo-desktops/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kmilo-desktops/zh_TW.po b/translations/desktop_files/kmilo-desktops/zh_TW.po index 5a4fc8f..748a0a1 100644 --- a/translations/desktop_files/kmilo-desktops/zh_TW.po +++ b/translations/desktop_files/kmilo-desktops/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 22:35+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/kregexpeditor-desktops/es_AR.po b/translations/desktop_files/kregexpeditor-desktops/es_AR.po new file mode 100644 index 0000000..2070a45 --- /dev/null +++ b/translations/desktop_files/kregexpeditor-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-22 01:16+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kregexpeditor.desktop:2 +msgid "KRegExpEditor" +msgstr "" + +#. GenericName +#: kregexpeditor.desktop:4 +msgid "Regular Expression Editor" +msgstr "" + +#. Name +#: kregexpeditorgui.desktop:3 +msgid "RegExp Editor Widget" +msgstr "" diff --git a/translations/desktop_files/kregexpeditor-desktops/it.po b/translations/desktop_files/kregexpeditor-desktops/it.po index ec74006..7b481e3 100644 --- a/translations/desktop_files/kregexpeditor-desktops/it.po +++ b/translations/desktop_files/kregexpeditor-desktops/it.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-29 09:55+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kregexpeditor-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: kregexpeditor.desktop:2 -#, fuzzy msgid "KRegExpEditor" -msgstr "Elemento grafico dell'editor di espressioni regolari" +msgstr "KRegExpEditor" #. GenericName #: kregexpeditor.desktop:4 diff --git a/translations/desktop_files/kregexpeditor-desktops/ka.po b/translations/desktop_files/kregexpeditor-desktops/ka.po index 3c18f5e..a4ab684 100644 --- a/translations/desktop_files/kregexpeditor-desktops/ka.po +++ b/translations/desktop_files/kregexpeditor-desktops/ka.po @@ -1,33 +1,33 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kregexpeditor-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kregexpeditor.desktop:2 -#, fuzzy msgid "KRegExpEditor" -msgstr "მარტივი გამოსახულების რედაქტორი" +msgstr "KRegExpEditor" #. GenericName #: kregexpeditor.desktop:4 msgid "Regular Expression Editor" -msgstr "მარტივი გამოსახულების რედაქტორი" +msgstr "რეგულარული გამოსახულებების რედაქტორი" #. Name #: kregexpeditorgui.desktop:3 msgid "RegExp Editor Widget" -msgstr "" +msgstr "რეგგამოსის რედაქტორის ვიჯეტი" diff --git a/translations/desktop_files/kregexpeditor-desktops/nl.po b/translations/desktop_files/kregexpeditor-desktops/nl.po index 63f4530..21d9e3a 100644 --- a/translations/desktop_files/kregexpeditor-desktops/nl.po +++ b/translations/desktop_files/kregexpeditor-desktops/nl.po @@ -1,33 +1,33 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/kregexpeditor-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kregexpeditor.desktop:2 -#, fuzzy msgid "KRegExpEditor" -msgstr "Editor voor regular expressions" +msgstr "KRegExpEditor" #. GenericName #: kregexpeditor.desktop:4 msgid "Regular Expression Editor" -msgstr "Editor voor regular expressions" +msgstr "Bewerker voor reguliere uitdrukkingen" #. Name #: kregexpeditorgui.desktop:3 msgid "RegExp Editor Widget" -msgstr "" +msgstr "RegExpEditor-widget" diff --git a/translations/desktop_files/kregexpeditor-desktops/ru.po b/translations/desktop_files/kregexpeditor-desktops/ru.po index 152e223..96a7410 100644 --- a/translations/desktop_files/kregexpeditor-desktops/ru.po +++ b/translations/desktop_files/kregexpeditor-desktops/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/kregexpeditor-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: kregexpeditor.desktop:2 -#, fuzzy msgid "KRegExpEditor" -msgstr "Виджет редактора регулярных выражений" +msgstr "KRegExpEditor" #. GenericName #: kregexpeditor.desktop:4 diff --git a/translations/desktop_files/ksim-desktops/es_AR.po b/translations/desktop_files/ksim-desktops/es_AR.po new file mode 100644 index 0000000..f6e4090 --- /dev/null +++ b/translations/desktop_files/ksim-desktops/es_AR.po @@ -0,0 +1,110 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-22 01:22+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: ksim.desktop:2 +msgid "KSim" +msgstr "" + +#. GenericName +#: ksim.desktop:4 +msgid "System Monitor" +msgstr "" + +#. Comment +#: ksim.desktop:6 +msgid "System Information Monitor (GKrellM style)" +msgstr "" + +#. Name +#: monitors/cpu/cpu.desktop:3 +msgid "CPU" +msgstr "" + +#. Comment +#: monitors/cpu/cpu.desktop:4 +msgid "CPU Monitor Plugin" +msgstr "" + +#. Comment +#: monitors/disk/disk.desktop:2 +msgid "Disk Monitor Plugin" +msgstr "" + +#. Name +#: monitors/disk/disk.desktop:4 +msgid "Disk" +msgstr "" + +#. Name +#: monitors/filesystem/DFree.desktop:3 +msgid "DFree" +msgstr "" + +#. Comment +#: monitors/filesystem/DFree.desktop:4 +msgid "Mounted Partitions Monitor" +msgstr "" + +#. Comment +#: monitors/i8k/i8k.desktop:2 +msgid "Dell I8K Hardware Monitor Plugin" +msgstr "" + +#. Name +#: monitors/i8k/i8k.desktop:4 +msgid "Dell I8K" +msgstr "" + +#. Comment +#: monitors/lm_sensors/Lm_sensors.desktop:2 +msgid "Lm_sensors Status Monitor" +msgstr "" + +#. Name +#: monitors/lm_sensors/Lm_sensors.desktop:4 +msgid "Lm_sensors" +msgstr "" + +#. Comment +#: monitors/mail/mail.desktop:2 +msgid "Mail Monitor Plugin" +msgstr "" + +#. Name +#: monitors/mail/mail.desktop:4 +msgid "Mail" +msgstr "" + +#. Comment +#: monitors/net/Net.desktop:2 +msgid "Net Status Monitor" +msgstr "" + +#. Name +#: monitors/net/Net.desktop:4 +msgid "Net" +msgstr "" + +#. Comment +#: monitors/snmp/Snmp.desktop:2 +msgid "Snmp Status Monitor" +msgstr "" + +#. Name +#: monitors/snmp/Snmp.desktop:4 +msgid "Snmp" +msgstr "" diff --git a/translations/desktop_files/ksim-desktops/it.po b/translations/desktop_files/ksim-desktops/it.po index feba25f..9c68417 100644 --- a/translations/desktop_files/ksim-desktops/it.po +++ b/translations/desktop_files/ksim-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-29 09:55+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ksim-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: ksim.desktop:2 msgid "KSim" -msgstr "" +msgstr "KSim" #. GenericName #: ksim.desktop:4 @@ -34,7 +35,7 @@ msgstr "Controllo delle informazioni di sistema (simile a GKrellM)" #. Name #: monitors/cpu/cpu.desktop:3 msgid "CPU" -msgstr "" +msgstr "CPU" #. Comment #: monitors/cpu/cpu.desktop:4 @@ -69,7 +70,7 @@ msgstr "Plugin di controllo hardware Dell I8K" #. Name #: monitors/i8k/i8k.desktop:4 msgid "Dell I8K" -msgstr "" +msgstr "Dell I8K" #. Comment #: monitors/lm_sensors/Lm_sensors.desktop:2 @@ -79,7 +80,7 @@ msgstr "Controllo di stato Lm_sensors" #. Name #: monitors/lm_sensors/Lm_sensors.desktop:4 msgid "Lm_sensors" -msgstr "" +msgstr "Lm_sensors" #. Comment #: monitors/mail/mail.desktop:2 diff --git a/translations/desktop_files/ksim-desktops/ka.po b/translations/desktop_files/ksim-desktops/ka.po index 9f0cbd7..3a026e8 100644 --- a/translations/desktop_files/ksim-desktops/ka.po +++ b/translations/desktop_files/ksim-desktops/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ksim-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: ksim.desktop:2 msgid "KSim" -msgstr "" +msgstr "KSim" #. GenericName #: ksim.desktop:4 @@ -29,12 +30,12 @@ msgstr "სისტემური მონიტორი" #. Comment #: ksim.desktop:6 msgid "System Information Monitor (GKrellM style)" -msgstr "სისტემური ინფორმაციის მონიტორი (GKrellM style)" +msgstr "სისტემური ინფორმაციის მონიტორი (GKrellM-ის სტილში)" #. Name #: monitors/cpu/cpu.desktop:3 msgid "CPU" -msgstr "" +msgstr "CPU" #. Comment #: monitors/cpu/cpu.desktop:4 @@ -49,27 +50,27 @@ msgstr "დისკის მონიტორის მოდული" #. Name #: monitors/disk/disk.desktop:4 msgid "Disk" -msgstr "" +msgstr "დისკი" #. Name #: monitors/filesystem/DFree.desktop:3 msgid "DFree" -msgstr "" +msgstr "თავისუფ" #. Comment #: monitors/filesystem/DFree.desktop:4 msgid "Mounted Partitions Monitor" -msgstr "მონტირებული პარტიციების მონიტორი" +msgstr "მიმაგრებული დანაყოფების მონიტორინგი" #. Comment #: monitors/i8k/i8k.desktop:2 msgid "Dell I8K Hardware Monitor Plugin" -msgstr "Dell I8K მოწყობილობათა მონიტორის მოდული" +msgstr "Dell I8K მოწყობილობათა მონიტორინგის დამატება" #. Name #: monitors/i8k/i8k.desktop:4 msgid "Dell I8K" -msgstr "" +msgstr "Dell I8K" #. Comment #: monitors/lm_sensors/Lm_sensors.desktop:2 @@ -79,17 +80,17 @@ msgstr "Lm_sensors სტატუსის მონიტორი" #. Name #: monitors/lm_sensors/Lm_sensors.desktop:4 msgid "Lm_sensors" -msgstr "" +msgstr "Lm_sensors" #. Comment #: monitors/mail/mail.desktop:2 msgid "Mail Monitor Plugin" -msgstr "ფოსტის მონიტორის მოდული" +msgstr "ელფოსტის მონიტორის მოდული" #. Name #: monitors/mail/mail.desktop:4 msgid "Mail" -msgstr "ფოსტა" +msgstr "ელფოსტა" #. Comment #: monitors/net/Net.desktop:2 @@ -99,7 +100,7 @@ msgstr "ქსელის სტატუსის სტატუსი" #. Name #: monitors/net/Net.desktop:4 msgid "Net" -msgstr "" +msgstr "ქსელი" #. Comment #: monitors/snmp/Snmp.desktop:2 @@ -109,4 +110,4 @@ msgstr "Snmp სტატუსის მონიტორი" #. Name #: monitors/snmp/Snmp.desktop:4 msgid "Snmp" -msgstr "" +msgstr "SNMP" diff --git a/translations/desktop_files/ksim-desktops/nl.po b/translations/desktop_files/ksim-desktops/nl.po index 0f3d81b..139d5d9 100644 --- a/translations/desktop_files/ksim-desktops/nl.po +++ b/translations/desktop_files/ksim-desktops/nl.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/ksim-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: ksim.desktop:2 msgid "KSim" -msgstr "" +msgstr "KSim" #. GenericName #: ksim.desktop:4 @@ -29,67 +30,67 @@ msgstr "Systeemmonitor" #. Comment #: ksim.desktop:6 msgid "System Information Monitor (GKrellM style)" -msgstr "Systeeminformatiemonitor (gKrellM-stijl)" +msgstr "Systeeminformatiemonitor (GKrellM-stijl)" #. Name #: monitors/cpu/cpu.desktop:3 msgid "CPU" -msgstr "" +msgstr "Cpu" #. Comment #: monitors/cpu/cpu.desktop:4 msgid "CPU Monitor Plugin" -msgstr "CPU monitor-plugin" +msgstr "Cpu-monitorplug-in" #. Comment #: monitors/disk/disk.desktop:2 msgid "Disk Monitor Plugin" -msgstr "Disk monitor-plugin" +msgstr "Schijfmonitorplug-in" #. Name #: monitors/disk/disk.desktop:4 msgid "Disk" -msgstr "" +msgstr "Schijf" #. Name #: monitors/filesystem/DFree.desktop:3 msgid "DFree" -msgstr "" +msgstr "DFree" #. Comment #: monitors/filesystem/DFree.desktop:4 msgid "Mounted Partitions Monitor" -msgstr "Monitor van aangekoppelde partities" +msgstr "Partitiemonitor" #. Comment #: monitors/i8k/i8k.desktop:2 msgid "Dell I8K Hardware Monitor Plugin" -msgstr "Dell I8000 Hardware Monitor-plugin" +msgstr "Dell I8K-hardwaremonitorplug-in" #. Name #: monitors/i8k/i8k.desktop:4 msgid "Dell I8K" -msgstr "" +msgstr "Dell I8K" #. Comment #: monitors/lm_sensors/Lm_sensors.desktop:2 msgid "Lm_sensors Status Monitor" -msgstr "Lm_sensors statusmonitor" +msgstr "Lm_sensors-statusmonitor" #. Name #: monitors/lm_sensors/Lm_sensors.desktop:4 msgid "Lm_sensors" -msgstr "" +msgstr "Lm_sensors" #. Comment #: monitors/mail/mail.desktop:2 msgid "Mail Monitor Plugin" -msgstr "Mail monitor-plugin" +msgstr "E-mailmonitorplug-in" #. Name #: monitors/mail/mail.desktop:4 msgid "Mail" -msgstr "" +msgstr "E-mail" #. Comment #: monitors/net/Net.desktop:2 @@ -99,14 +100,14 @@ msgstr "Netstatus-monitor" #. Name #: monitors/net/Net.desktop:4 msgid "Net" -msgstr "" +msgstr "Net" #. Comment #: monitors/snmp/Snmp.desktop:2 msgid "Snmp Status Monitor" -msgstr "Snmp Statusbewaking" +msgstr "Snmp-statusmonitor" #. Name #: monitors/snmp/Snmp.desktop:4 msgid "Snmp" -msgstr "" +msgstr "Snmp" diff --git a/translations/desktop_files/ksim-desktops/pt.po b/translations/desktop_files/ksim-desktops/pt.po index 97d8054..8305218 100644 --- a/translations/desktop_files/ksim-desktops/pt.po +++ b/translations/desktop_files/ksim-desktops/pt.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-12-03 23:01+0000\n" +"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n" +"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ksim-desktop-files/pt/>\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.9.1\n" #. Name #: ksim.desktop:2 msgid "KSim" -msgstr "" +msgstr "KSim" #. GenericName #: ksim.desktop:4 diff --git a/translations/desktop_files/ksim-desktops/ru.po b/translations/desktop_files/ksim-desktops/ru.po index bd03d61..b07c182 100644 --- a/translations/desktop_files/ksim-desktops/ru.po +++ b/translations/desktop_files/ksim-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:22+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ksim-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: ksim.desktop:2 msgid "KSim" -msgstr "" +msgstr "KSim" #. GenericName #: ksim.desktop:4 @@ -69,7 +71,7 @@ msgstr "Модуль монитора оборудования Dell I8K" #. Name #: monitors/i8k/i8k.desktop:4 msgid "Dell I8K" -msgstr "" +msgstr "Dell I8K" #. Comment #: monitors/lm_sensors/Lm_sensors.desktop:2 @@ -79,7 +81,7 @@ msgstr "Монитор состояния датчиков lm_sensors" #. Name #: monitors/lm_sensors/Lm_sensors.desktop:4 msgid "Lm_sensors" -msgstr "Датчики lm_sensors" +msgstr "lm_sensors" #. Comment #: monitors/mail/mail.desktop:2 @@ -109,4 +111,4 @@ msgstr "Монитор состояния SNMP" #. Name #: monitors/snmp/Snmp.desktop:4 msgid "Snmp" -msgstr "" +msgstr "SNMP" diff --git a/translations/desktop_files/ktimer.desktop/es.po b/translations/desktop_files/ktimer.desktop/es.po index b2a476c..5f3971f 100644 --- a/translations/desktop_files/ktimer.desktop/es.po +++ b/translations/desktop_files/ktimer.desktop/es.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# titae <benjamin.m21@outlook.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-06-15 03:21+0000\n" +"Last-Translator: titae <benjamin.m21@outlook.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ktimer-ktimerdesktop/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: ktimer.desktop:2 msgid "KTimer" -msgstr "" +msgstr "KTimer" #. GenericName #: ktimer.desktop:4 diff --git a/translations/desktop_files/ktimer.desktop/es_AR.po b/translations/desktop_files/ktimer.desktop/es_AR.po new file mode 100644 index 0000000..1d97f9a --- /dev/null +++ b/translations/desktop_files/ktimer.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-22 01:35+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: ktimer.desktop:2 +msgid "KTimer" +msgstr "" + +#. GenericName +#: ktimer.desktop:4 +msgid "Countdown Launcher" +msgstr "" diff --git a/translations/desktop_files/ktimer.desktop/it.po b/translations/desktop_files/ktimer.desktop/it.po index 550c233..c83e03c 100644 --- a/translations/desktop_files/ktimer.desktop/it.po +++ b/translations/desktop_files/ktimer.desktop/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-29 09:55+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ktimer-ktimerdesktop/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: ktimer.desktop:2 msgid "KTimer" -msgstr "" +msgstr "KTimer" #. GenericName #: ktimer.desktop:4 diff --git a/translations/desktop_files/ktimer.desktop/nl.po b/translations/desktop_files/ktimer.desktop/nl.po new file mode 100644 index 0000000..57f3b2b --- /dev/null +++ b/translations/desktop_files/ktimer.desktop/nl.po @@ -0,0 +1,28 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Heimen Stoffels <vistausss@fastmail.com>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-22 01:35+0200\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/ktimer-ktimerdesktop/nl/>\n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: ktimer.desktop:2 +msgid "KTimer" +msgstr "KTimer" + +#. GenericName +#: ktimer.desktop:4 +msgid "Countdown Launcher" +msgstr "Aftellen" diff --git a/translations/desktop_files/ktimer.desktop/ru.po b/translations/desktop_files/ktimer.desktop/ru.po index 9465ff8..aba8132 100644 --- a/translations/desktop_files/ktimer.desktop/ru.po +++ b/translations/desktop_files/ktimer.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/ktimer-ktimerdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: ktimer.desktop:2 msgid "KTimer" -msgstr "" +msgstr "KTimer" #. GenericName #: ktimer.desktop:4 diff --git a/translations/desktop_files/superkaramba-desktops/es_AR.po b/translations/desktop_files/superkaramba-desktops/es_AR.po new file mode 100644 index 0000000..3189a9e --- /dev/null +++ b/translations/desktop_files/superkaramba-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-22 01:39+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: mimetypes/x-superkaramba.desktop:2 +msgid "Superkaramba Theme File" +msgstr "" + +#. Name +#: src/superkaramba.desktop:2 +msgid "SuperKaramba" +msgstr "" + +#. GenericName +#: src/superkaramba.desktop:4 +msgid "Desktop Widgets" +msgstr "" + +#. Comment +#: src/superkaramba.desktop:6 +msgid "An engine for cool desktop eyecandy" +msgstr "" diff --git a/translations/desktop_files/superkaramba-desktops/it.po b/translations/desktop_files/superkaramba-desktops/it.po index 6a0b9bf..c92be25 100644 --- a/translations/desktop_files/superkaramba-desktops/it.po +++ b/translations/desktop_files/superkaramba-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-05-02 08:06+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/superkaramba-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Comment #: mimetypes/x-superkaramba.desktop:2 @@ -23,9 +24,8 @@ msgstr "File di tema Superkaramba" #. Name #: src/superkaramba.desktop:2 -#, fuzzy msgid "SuperKaramba" -msgstr "File di tema Superkaramba" +msgstr "Superkaramba" #. GenericName #: src/superkaramba.desktop:4 @@ -35,4 +35,4 @@ msgstr "Elementi desktop" #. Comment #: src/superkaramba.desktop:6 msgid "An engine for cool desktop eyecandy" -msgstr "Un motore per rendere il desktop più gradevole." +msgstr "Un motore per rendere il desktop più gradevole" diff --git a/translations/desktop_files/superkaramba-desktops/ka.po b/translations/desktop_files/superkaramba-desktops/ka.po index 50fd61d..7950606 100644 --- a/translations/desktop_files/superkaramba-desktops/ka.po +++ b/translations/desktop_files/superkaramba-desktops/ka.po @@ -1,38 +1,38 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/superkaramba-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: mimetypes/x-superkaramba.desktop:2 msgid "Superkaramba Theme File" -msgstr "Superkaramba-ს თემის ფაილი" +msgstr "Superkaramba-ის თემის ფაილი" #. Name #: src/superkaramba.desktop:2 -#, fuzzy msgid "SuperKaramba" -msgstr "Superkaramba-ს თემის ფაილი" +msgstr "Superkaramba" #. GenericName #: src/superkaramba.desktop:4 msgid "Desktop Widgets" -msgstr "სამუშაო მაგიდის ელემენტები" +msgstr "სამუშაო მაგიდის ვიჯეტები" #. Comment #: src/superkaramba.desktop:6 msgid "An engine for cool desktop eyecandy" -msgstr "" +msgstr "ძრავა ლამაზი სამუშაო მაგიდისთვის" diff --git a/translations/desktop_files/superkaramba-desktops/nl.po b/translations/desktop_files/superkaramba-desktops/nl.po index aabe43d..7206172 100644 --- a/translations/desktop_files/superkaramba-desktops/nl.po +++ b/translations/desktop_files/superkaramba-desktops/nl.po @@ -1,38 +1,38 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/superkaramba-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: mimetypes/x-superkaramba.desktop:2 msgid "Superkaramba Theme File" -msgstr "Thema-bestand van Superkaramba" +msgstr "Superkaramba-themabestand" #. Name #: src/superkaramba.desktop:2 -#, fuzzy msgid "SuperKaramba" -msgstr "Thema-bestand van Superkaramba" +msgstr "SuperKaramba" #. GenericName #: src/superkaramba.desktop:4 msgid "Desktop Widgets" -msgstr "Bureaubladprogramma's" +msgstr "Bureaubladwidgets" #. Comment #: src/superkaramba.desktop:6 msgid "An engine for cool desktop eyecandy" -msgstr "Een programma voor bureaubladverfraaiing." +msgstr "Een programma voor bureaubladverfraaiing" diff --git a/translations/desktop_files/superkaramba-desktops/ru.po b/translations/desktop_files/superkaramba-desktops/ru.po index e6db0c0..f890328 100644 --- a/translations/desktop_files/superkaramba-desktops/ru.po +++ b/translations/desktop_files/superkaramba-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/superkaramba-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Comment #: mimetypes/x-superkaramba.desktop:2 @@ -23,9 +25,8 @@ msgstr "Тема Superkaramba" #. Name #: src/superkaramba.desktop:2 -#, fuzzy msgid "SuperKaramba" -msgstr "Тема Superkaramba" +msgstr "SuperKaramba" #. GenericName #: src/superkaramba.desktop:4 @@ -35,4 +36,4 @@ msgstr "Виджеты рабочего стола" #. Comment #: src/superkaramba.desktop:6 msgid "An engine for cool desktop eyecandy" -msgstr "Набор виджетов рабочего стола." +msgstr "Движок для классных украшений рабочего стола" diff --git a/translations/desktop_files/tdefilereplace-desktops/es_AR.po b/translations/desktop_files/tdefilereplace-desktops/es_AR.po new file mode 100644 index 0000000..e196769 --- /dev/null +++ b/translations/desktop_files/tdefilereplace-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-22 01:44+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: tdefilereplace.desktop:2 tdefilereplacepart.desktop:2 +msgid "TDEFileReplace" +msgstr "" + +#. GenericName +#: tdefilereplace.desktop:4 +msgid "Search & Replace Tool" +msgstr "" + +#. Comment +#: tdefilereplace.desktop:6 tdefilereplacepart.desktop:6 +msgid "A batch search and replace tool" +msgstr "" + +#. GenericName +#: tdefilereplacepart.desktop:4 +msgid "File Replace View" +msgstr "" diff --git a/translations/desktop_files/tdefilereplace-desktops/it.po b/translations/desktop_files/tdefilereplace-desktops/it.po index cdb1ad1..de03449 100644 --- a/translations/desktop_files/tdefilereplace-desktops/it.po +++ b/translations/desktop_files/tdefilereplace-desktops/it.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-05-04 02:06+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdefilereplace-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.6.1\n" #. Name #: tdefilereplace.desktop:2 tdefilereplacepart.desktop:2 -#, fuzzy msgid "TDEFileReplace" -msgstr "Vista di sostituzione file" +msgstr "TDEFileReplace" #. GenericName #: tdefilereplace.desktop:4 diff --git a/translations/desktop_files/tdefilereplace-desktops/ka.po b/translations/desktop_files/tdefilereplace-desktops/ka.po index 95a2e6c..e0c8535 100644 --- a/translations/desktop_files/tdefilereplace-desktops/ka.po +++ b/translations/desktop_files/tdefilereplace-desktops/ka.po @@ -1,36 +1,36 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdefilereplace-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: tdefilereplace.desktop:2 tdefilereplacepart.desktop:2 -#, fuzzy msgid "TDEFileReplace" -msgstr "ფაილის ჩანაცვლების ხედი" +msgstr "TDEFileReplace" #. GenericName #: tdefilereplace.desktop:4 msgid "Search & Replace Tool" -msgstr "ძიების და ჩანაცვლების ხელსაწყო" +msgstr "ძებნისა და ჩანაცვლების პროგრამა" #. Comment #: tdefilereplace.desktop:6 tdefilereplacepart.desktop:6 msgid "A batch search and replace tool" -msgstr "ჯგუფური ძიების და ჩანაცვლების ხელსაწყო" +msgstr "ჯგუფური ძებნისა და ჩანაცვლების პროგრამა" #. GenericName #: tdefilereplacepart.desktop:4 diff --git a/translations/desktop_files/tdefilereplace-desktops/nl.po b/translations/desktop_files/tdefilereplace-desktops/nl.po index ed7086b..697dafa 100644 --- a/translations/desktop_files/tdefilereplace-desktops/nl.po +++ b/translations/desktop_files/tdefilereplace-desktops/nl.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/tdefilereplace-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: tdefilereplace.desktop:2 tdefilereplacepart.desktop:2 -#, fuzzy msgid "TDEFileReplace" -msgstr "Weergave van bestanden vervangen" +msgstr "TDEFileReplace" #. GenericName #: tdefilereplace.desktop:4 @@ -30,9 +30,9 @@ msgstr "Gereedschap voor zoeken en vervangen" #. Comment #: tdefilereplace.desktop:6 tdefilereplacepart.desktop:6 msgid "A batch search and replace tool" -msgstr "Een gereedschap voor zoeken en vervangen" +msgstr "Een hulpmiddel voor zoeken en vervangen" #. GenericName #: tdefilereplacepart.desktop:4 msgid "File Replace View" -msgstr "Weergave van bestanden vervangen" +msgstr "Bestandsvervangingsweergave" diff --git a/translations/desktop_files/tdefilereplace-desktops/ru.po b/translations/desktop_files/tdefilereplace-desktops/ru.po index b5374e2..2c1e36f 100644 --- a/translations/desktop_files/tdefilereplace-desktops/ru.po +++ b/translations/desktop_files/tdefilereplace-desktops/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdefilereplace-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: tdefilereplace.desktop:2 tdefilereplacepart.desktop:2 -#, fuzzy msgid "TDEFileReplace" -msgstr "Средство поиска и замены в файлах" +msgstr "TDEFileReplace" #. GenericName #: tdefilereplace.desktop:4 diff --git a/translations/desktop_files/tdelirc-desktops/es.po b/translations/desktop_files/tdelirc-desktops/es.po index 69f5357..57ba762 100644 --- a/translations/desktop_files/tdelirc-desktops/es.po +++ b/translations/desktop_files/tdelirc-desktops/es.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# titae <benjamin.m21@outlook.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-06-15 03:21+0000\n" +"Last-Translator: titae <benjamin.m21@outlook.com>\n" +"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdelirc-desktop-files/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: irkick/irkick.desktop:3 msgid "IRKick" -msgstr "" +msgstr "IRKick" #. GenericName #: irkick/irkick.desktop:4 @@ -44,4 +45,4 @@ msgstr "Configurar sus controles remotos para usarlos en las aplicaciones" #. Keywords #: kcmlirc/kcmlirc.desktop:6 msgid "KCMLirc;kcmlirc;lirc" -msgstr "" +msgstr "KCMLirc;kcmlirc;lirc" diff --git a/translations/desktop_files/tdelirc-desktops/es_AR.po b/translations/desktop_files/tdelirc-desktops/es_AR.po new file mode 100644 index 0000000..27f554b --- /dev/null +++ b/translations/desktop_files/tdelirc-desktops/es_AR.po @@ -0,0 +1,45 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-22 01:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: irkick/irkick.desktop:3 +msgid "IRKick" +msgstr "" + +#. GenericName +#: irkick/irkick.desktop:4 +msgid "TDE LIRC Server" +msgstr "" + +#. Comment +#: irkick/irkick.desktop:16 +msgid "TDE Linux infrared remote control server." +msgstr "" + +#. Name +#: kcmlirc/kcmlirc.desktop:2 +msgid "Remote Controls" +msgstr "" + +#. Comment +#: kcmlirc/kcmlirc.desktop:4 +msgid "Configure remote controls for use with applications" +msgstr "" + +#. Keywords +#: kcmlirc/kcmlirc.desktop:6 +msgid "KCMLirc;kcmlirc;lirc" +msgstr "" diff --git a/translations/desktop_files/tdelirc-desktops/it.po b/translations/desktop_files/tdelirc-desktops/it.po index 12560c4..5b9f5c6 100644 --- a/translations/desktop_files/tdelirc-desktops/it.po +++ b/translations/desktop_files/tdelirc-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-05-02 08:06+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdelirc-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: irkick/irkick.desktop:3 msgid "IRKick" -msgstr "" +msgstr "IRKick" #. GenericName #: irkick/irkick.desktop:4 @@ -29,7 +30,7 @@ msgstr "Server LIRC di TDE" #. Comment #: irkick/irkick.desktop:16 msgid "TDE Linux infrared remote control server." -msgstr "Server TDE per i telecomandi ad infrarossi" +msgstr "Server TDE per il contorllo remoto via infrarossi." #. Name #: kcmlirc/kcmlirc.desktop:2 @@ -39,9 +40,9 @@ msgstr "Telecomandi" #. Comment #: kcmlirc/kcmlirc.desktop:4 msgid "Configure remote controls for use with applications" -msgstr "Configura i telecomandi per l'uso con le applicazioni" +msgstr "Configura il controllo remoto per l'uso con le applicazioni" #. Keywords #: kcmlirc/kcmlirc.desktop:6 msgid "KCMLirc;kcmlirc;lirc" -msgstr "" +msgstr "KCMLirc;kcmlirc;lirc" diff --git a/translations/desktop_files/tdelirc-desktops/ka.po b/translations/desktop_files/tdelirc-desktops/ka.po index 6e0cd76..b031fb6 100644 --- a/translations/desktop_files/tdelirc-desktops/ka.po +++ b/translations/desktop_files/tdelirc-desktops/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdelirc-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: irkick/irkick.desktop:3 msgid "IRKick" -msgstr "" +msgstr "IRKick" #. GenericName #: irkick/irkick.desktop:4 @@ -29,7 +30,7 @@ msgstr "TDE LIRC სერვერი" #. Comment #: irkick/irkick.desktop:16 msgid "TDE Linux infrared remote control server." -msgstr "TDE ლინუქსის ინფრაწითელი დაშორებული მართვის სერვერი" +msgstr "TDE ლინუქსის ინფრაწითელი დაშორებული მართვის სერვერი." #. Name #: kcmlirc/kcmlirc.desktop:2 @@ -39,9 +40,9 @@ msgstr "დაშორებული მართვა" #. Comment #: kcmlirc/kcmlirc.desktop:4 msgid "Configure remote controls for use with applications" -msgstr "დააკონფიგურირეთ თქვენი დაშორებული მართვა ამ პროგრამით" +msgstr "მოირგეთ დაშორებული მართვა პროგრამებში გამოსაყენებლად" #. Keywords #: kcmlirc/kcmlirc.desktop:6 msgid "KCMLirc;kcmlirc;lirc" -msgstr "" +msgstr "KCMLirc;kcmlirc;lirc" diff --git a/translations/desktop_files/tdelirc-desktops/nl.po b/translations/desktop_files/tdelirc-desktops/nl.po index 6558b5b..8cb11f0 100644 --- a/translations/desktop_files/tdelirc-desktops/nl.po +++ b/translations/desktop_files/tdelirc-desktops/nl.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/tdelirc-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: irkick/irkick.desktop:3 msgid "IRKick" -msgstr "" +msgstr "IRKick" #. GenericName #: irkick/irkick.desktop:4 @@ -29,19 +30,19 @@ msgstr "TDE LIRC-server" #. Comment #: irkick/irkick.desktop:16 msgid "TDE Linux infrared remote control server." -msgstr "TDE-server voor infrarood-afstandsbediening." +msgstr "Een TDE-server voor infrarood afstandsbedieningen." #. Name #: kcmlirc/kcmlirc.desktop:2 msgid "Remote Controls" -msgstr "Afstandsbediening" +msgstr "Afstandsbedieningen" #. Comment #: kcmlirc/kcmlirc.desktop:4 msgid "Configure remote controls for use with applications" -msgstr "Uw afstandsbedieningen instellen voor gebruik in TDE" +msgstr "Stel uw afstandsbedieningen in voor gebruik in TDE-programma's" #. Keywords #: kcmlirc/kcmlirc.desktop:6 msgid "KCMLirc;kcmlirc;lirc" -msgstr "kcmlirc;linux infrarood;infrarood;afstandsbediening;" +msgstr "kcmlirc;linux infrarood;afstandsbediening;" diff --git a/translations/desktop_files/tdelirc-desktops/ru.po b/translations/desktop_files/tdelirc-desktops/ru.po index e0e7f04..ada06ad 100644 --- a/translations/desktop_files/tdelirc-desktops/ru.po +++ b/translations/desktop_files/tdelirc-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdelirc-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.13.1\n" #. Name #: irkick/irkick.desktop:3 msgid "IRKick" -msgstr "" +msgstr "IRKick" #. GenericName #: irkick/irkick.desktop:4 @@ -29,19 +31,19 @@ msgstr "Сервер LIRC для TDE" #. Comment #: irkick/irkick.desktop:16 msgid "TDE Linux infrared remote control server." -msgstr "Сервер управления TDE через инфракрасный порт." +msgstr "Сервер инфракрасных пультов управления для TDE." #. Name #: kcmlirc/kcmlirc.desktop:2 msgid "Remote Controls" -msgstr "Удалённое управление" +msgstr "Пульты" #. Comment #: kcmlirc/kcmlirc.desktop:4 msgid "Configure remote controls for use with applications" -msgstr "Настройка удалённого управления приложениями" +msgstr "Настройка пультов для приложений" #. Keywords #: kcmlirc/kcmlirc.desktop:6 msgid "KCMLirc;kcmlirc;lirc" -msgstr "" +msgstr "KCMLirc;kcmlirc;lirc" diff --git a/translations/desktop_files/tdewallet-desktops/ar.po b/translations/desktop_files/tdewallet-desktops/ar.po index 75f55d2..8c0e4be 100644 --- a/translations/desktop_files/tdewallet-desktops/ar.po +++ b/translations/desktop_files/tdewallet-desktops/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/bg.po b/translations/desktop_files/tdewallet-desktops/bg.po index cb76335..9e1cfe6 100644 --- a/translations/desktop_files/tdewallet-desktops/bg.po +++ b/translations/desktop_files/tdewallet-desktops/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/br.po b/translations/desktop_files/tdewallet-desktops/br.po index 104e065..9fda93d 100644 --- a/translations/desktop_files/tdewallet-desktops/br.po +++ b/translations/desktop_files/tdewallet-desktops/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/bs.po b/translations/desktop_files/tdewallet-desktops/bs.po index de0bfcf..d0e1c96 100644 --- a/translations/desktop_files/tdewallet-desktops/bs.po +++ b/translations/desktop_files/tdewallet-desktops/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/ca.po b/translations/desktop_files/tdewallet-desktops/ca.po index 5929fea..5dc4f21 100644 --- a/translations/desktop_files/tdewallet-desktops/ca.po +++ b/translations/desktop_files/tdewallet-desktops/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/cs.po b/translations/desktop_files/tdewallet-desktops/cs.po index ee65e60..4a0f037 100644 --- a/translations/desktop_files/tdewallet-desktops/cs.po +++ b/translations/desktop_files/tdewallet-desktops/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/cy.po b/translations/desktop_files/tdewallet-desktops/cy.po index 484f6eb..c12d8ea 100644 --- a/translations/desktop_files/tdewallet-desktops/cy.po +++ b/translations/desktop_files/tdewallet-desktops/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/da.po b/translations/desktop_files/tdewallet-desktops/da.po index e83eb05..b0a110d 100644 --- a/translations/desktop_files/tdewallet-desktops/da.po +++ b/translations/desktop_files/tdewallet-desktops/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/de.po b/translations/desktop_files/tdewallet-desktops/de.po index d472aa1..427b44d 100644 --- a/translations/desktop_files/tdewallet-desktops/de.po +++ b/translations/desktop_files/tdewallet-desktops/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/el.po b/translations/desktop_files/tdewallet-desktops/el.po index 2f0a52d..111b1ad 100644 --- a/translations/desktop_files/tdewallet-desktops/el.po +++ b/translations/desktop_files/tdewallet-desktops/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/es.po b/translations/desktop_files/tdewallet-desktops/es.po index 2b228b8..8357c0a 100644 --- a/translations/desktop_files/tdewallet-desktops/es.po +++ b/translations/desktop_files/tdewallet-desktops/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/es_AR.po b/translations/desktop_files/tdewallet-desktops/es_AR.po new file mode 100644 index 0000000..f132b17 --- /dev/null +++ b/translations/desktop_files/tdewallet-desktops/es_AR.po @@ -0,0 +1,37 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: konfigurator/tdewallet_config.desktop:6 +#: konfigurator/tdewalletconfig.desktop:10 +msgid "TDE Wallet" +msgstr "" + +#. Comment +#: konfigurator/tdewalletconfig.desktop:11 +msgid "TDE Wallet Configuration" +msgstr "" + +#. Keywords +#: konfigurator/tdewalletconfig.desktop:12 +msgid "Wallet;Form Fill;Passwords;Form Data;" +msgstr "" + +#. Name +#: konfigurator/tdewalletmanager_show.desktop:2 +#: tdewalletmanager-tdewalletd.desktop:2 tdewalletmanager.desktop:2 +msgid "Wallet Management Tool" +msgstr "" diff --git a/translations/desktop_files/tdewallet-desktops/et.po b/translations/desktop_files/tdewallet-desktops/et.po index 64500b0..c04acb4 100644 --- a/translations/desktop_files/tdewallet-desktops/et.po +++ b/translations/desktop_files/tdewallet-desktops/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/eu.po b/translations/desktop_files/tdewallet-desktops/eu.po index d564112..c3cb19a 100644 --- a/translations/desktop_files/tdewallet-desktops/eu.po +++ b/translations/desktop_files/tdewallet-desktops/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/fa.po b/translations/desktop_files/tdewallet-desktops/fa.po index ce75de5..3c945b3 100644 --- a/translations/desktop_files/tdewallet-desktops/fa.po +++ b/translations/desktop_files/tdewallet-desktops/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/fi.po b/translations/desktop_files/tdewallet-desktops/fi.po index 686c858..c6fb5d8 100644 --- a/translations/desktop_files/tdewallet-desktops/fi.po +++ b/translations/desktop_files/tdewallet-desktops/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/fr.po b/translations/desktop_files/tdewallet-desktops/fr.po index 7fc3080..444144b 100644 --- a/translations/desktop_files/tdewallet-desktops/fr.po +++ b/translations/desktop_files/tdewallet-desktops/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/ga.po b/translations/desktop_files/tdewallet-desktops/ga.po index d4988a2..fa8eb28 100644 --- a/translations/desktop_files/tdewallet-desktops/ga.po +++ b/translations/desktop_files/tdewallet-desktops/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/he.po b/translations/desktop_files/tdewallet-desktops/he.po index 1dec549..3461144 100644 --- a/translations/desktop_files/tdewallet-desktops/he.po +++ b/translations/desktop_files/tdewallet-desktops/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/hi.po b/translations/desktop_files/tdewallet-desktops/hi.po index c8ce29e..bfd3562 100644 --- a/translations/desktop_files/tdewallet-desktops/hi.po +++ b/translations/desktop_files/tdewallet-desktops/hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/hu.po b/translations/desktop_files/tdewallet-desktops/hu.po index ea0b9cc..9b84877 100644 --- a/translations/desktop_files/tdewallet-desktops/hu.po +++ b/translations/desktop_files/tdewallet-desktops/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/is.po b/translations/desktop_files/tdewallet-desktops/is.po index 8104f8f..fbff0e3 100644 --- a/translations/desktop_files/tdewallet-desktops/is.po +++ b/translations/desktop_files/tdewallet-desktops/is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/it.po b/translations/desktop_files/tdewallet-desktops/it.po index 7aa16a0..0e32786 100644 --- a/translations/desktop_files/tdewallet-desktops/it.po +++ b/translations/desktop_files/tdewallet-desktops/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/ja.po b/translations/desktop_files/tdewallet-desktops/ja.po index 8cfd23d..e811c32 100644 --- a/translations/desktop_files/tdewallet-desktops/ja.po +++ b/translations/desktop_files/tdewallet-desktops/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/ka.po b/translations/desktop_files/tdewallet-desktops/ka.po index 8f1a37a..fd0aef4 100644 --- a/translations/desktop_files/tdewallet-desktops/ka.po +++ b/translations/desktop_files/tdewallet-desktops/ka.po @@ -1,39 +1,40 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2024-11-27 06:10+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdewallet-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: konfigurator/tdewallet_config.desktop:6 #: konfigurator/tdewalletconfig.desktop:10 msgid "TDE Wallet" -msgstr "" +msgstr "TDE-ის საფულე" #. Comment #: konfigurator/tdewalletconfig.desktop:11 msgid "TDE Wallet Configuration" -msgstr "TDE Wallet-ის კონფიგურაცია" +msgstr "TDE-ის საფულის მორგება" #. Keywords #: konfigurator/tdewalletconfig.desktop:12 msgid "Wallet;Form Fill;Passwords;Form Data;" -msgstr "Wallet;ფორმის შევსება;პაროლები;ფორმათა მონაცემები;" +msgstr "Wallet;ფორმის შევსება;პაროლები;ფორმათა მონაცემები;პაროლები;" #. Name #: konfigurator/tdewalletmanager_show.desktop:2 #: tdewalletmanager-tdewalletd.desktop:2 tdewalletmanager.desktop:2 msgid "Wallet Management Tool" -msgstr "Wallet-ის მმართველი მოწყობილობა" +msgstr "საფულის მართვის პროგრამა" diff --git a/translations/desktop_files/tdewallet-desktops/kk.po b/translations/desktop_files/tdewallet-desktops/kk.po index d3cc6b9..f4c3185 100644 --- a/translations/desktop_files/tdewallet-desktops/kk.po +++ b/translations/desktop_files/tdewallet-desktops/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/km.po b/translations/desktop_files/tdewallet-desktops/km.po index 57a523d..9f413ca 100644 --- a/translations/desktop_files/tdewallet-desktops/km.po +++ b/translations/desktop_files/tdewallet-desktops/km.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/lt.po b/translations/desktop_files/tdewallet-desktops/lt.po index 84d79b1..e83c2e6 100644 --- a/translations/desktop_files/tdewallet-desktops/lt.po +++ b/translations/desktop_files/tdewallet-desktops/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/mk.po b/translations/desktop_files/tdewallet-desktops/mk.po index f42db42..748448d 100644 --- a/translations/desktop_files/tdewallet-desktops/mk.po +++ b/translations/desktop_files/tdewallet-desktops/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/nb.po b/translations/desktop_files/tdewallet-desktops/nb.po index 42534fe..c38d25b 100644 --- a/translations/desktop_files/tdewallet-desktops/nb.po +++ b/translations/desktop_files/tdewallet-desktops/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/nds.po b/translations/desktop_files/tdewallet-desktops/nds.po index 0dfc34d..5aae800 100644 --- a/translations/desktop_files/tdewallet-desktops/nds.po +++ b/translations/desktop_files/tdewallet-desktops/nds.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/ne.po b/translations/desktop_files/tdewallet-desktops/ne.po index 8b1053d..ce81109 100644 --- a/translations/desktop_files/tdewallet-desktops/ne.po +++ b/translations/desktop_files/tdewallet-desktops/ne.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/nl.po b/translations/desktop_files/tdewallet-desktops/nl.po index 85719f2..fb80ea6 100644 --- a/translations/desktop_files/tdewallet-desktops/nl.po +++ b/translations/desktop_files/tdewallet-desktops/nl.po @@ -1,38 +1,37 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@fastmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" +"PO-Revision-Date: 2025-02-25 21:03+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdeutils/tdewallet-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: konfigurator/tdewallet_config.desktop:6 #: konfigurator/tdewalletconfig.desktop:10 msgid "TDE Wallet" -msgstr "" +msgstr "TDE-portefeuille" #. Comment #: konfigurator/tdewalletconfig.desktop:11 msgid "TDE Wallet Configuration" -msgstr "TDE portefeuille-instellingen" +msgstr "TDE-portefeuille-instellingen" #. Keywords #: konfigurator/tdewalletconfig.desktop:12 msgid "Wallet;Form Fill;Passwords;Form Data;" -msgstr "" -"Wallet;gegevens;portefeuille;wachtwoorden;veilig bewaren van wachtwoorden;" -"invulgegevens;formulieren;" +msgstr "Wallet;gegevens;portefeuille;wachtwoorden;invulgegevens;formulieren;" #. Name #: konfigurator/tdewalletmanager_show.desktop:2 diff --git a/translations/desktop_files/tdewallet-desktops/nn.po b/translations/desktop_files/tdewallet-desktops/nn.po index d671aa5..9871b70 100644 --- a/translations/desktop_files/tdewallet-desktops/nn.po +++ b/translations/desktop_files/tdewallet-desktops/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/pa.po b/translations/desktop_files/tdewallet-desktops/pa.po index d2e23e6..7bd7658 100644 --- a/translations/desktop_files/tdewallet-desktops/pa.po +++ b/translations/desktop_files/tdewallet-desktops/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/pl.po b/translations/desktop_files/tdewallet-desktops/pl.po index f028afc..801e639 100644 --- a/translations/desktop_files/tdewallet-desktops/pl.po +++ b/translations/desktop_files/tdewallet-desktops/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/pt.po b/translations/desktop_files/tdewallet-desktops/pt.po index dc34250..e4d2bbd 100644 --- a/translations/desktop_files/tdewallet-desktops/pt.po +++ b/translations/desktop_files/tdewallet-desktops/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/pt_BR.po b/translations/desktop_files/tdewallet-desktops/pt_BR.po index 8dec76c..5fe4e49 100644 --- a/translations/desktop_files/tdewallet-desktops/pt_BR.po +++ b/translations/desktop_files/tdewallet-desktops/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/ro.po b/translations/desktop_files/tdewallet-desktops/ro.po index 1acf8ef..fe658ee 100644 --- a/translations/desktop_files/tdewallet-desktops/ro.po +++ b/translations/desktop_files/tdewallet-desktops/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/ru.po b/translations/desktop_files/tdewallet-desktops/ru.po index d2705d1..7394e0b 100644 --- a/translations/desktop_files/tdewallet-desktops/ru.po +++ b/translations/desktop_files/tdewallet-desktops/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/sk.po b/translations/desktop_files/tdewallet-desktops/sk.po index c43bb95..5826ba6 100644 --- a/translations/desktop_files/tdewallet-desktops/sk.po +++ b/translations/desktop_files/tdewallet-desktops/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/sl.po b/translations/desktop_files/tdewallet-desktops/sl.po index 8dd36b3..12e2fd6 100644 --- a/translations/desktop_files/tdewallet-desktops/sl.po +++ b/translations/desktop_files/tdewallet-desktops/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/sr.po b/translations/desktop_files/tdewallet-desktops/sr.po index d6a284a..cbc8663 100644 --- a/translations/desktop_files/tdewallet-desktops/sr.po +++ b/translations/desktop_files/tdewallet-desktops/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/sr@Latn.po b/translations/desktop_files/tdewallet-desktops/sr@Latn.po index 4108df2..4c1d792 100644 --- a/translations/desktop_files/tdewallet-desktops/sr@Latn.po +++ b/translations/desktop_files/tdewallet-desktops/sr@Latn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/sv.po b/translations/desktop_files/tdewallet-desktops/sv.po index ba7a1a0..ed33425 100644 --- a/translations/desktop_files/tdewallet-desktops/sv.po +++ b/translations/desktop_files/tdewallet-desktops/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/ta.po b/translations/desktop_files/tdewallet-desktops/ta.po index 779e734..eb431e1 100644 --- a/translations/desktop_files/tdewallet-desktops/ta.po +++ b/translations/desktop_files/tdewallet-desktops/ta.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/tdewallet-desktops.pot b/translations/desktop_files/tdewallet-desktops/tdewallet-desktops.pot index 9f7a40c..b2f9301 100644 --- a/translations/desktop_files/tdewallet-desktops/tdewallet-desktops.pot +++ b/translations/desktop_files/tdewallet-desktops/tdewallet-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -34,7 +34,6 @@ msgstr "" #. Name #: konfigurator/tdewalletmanager_show.desktop:2 -#: tdewalletmanager-tdewalletd.desktop:2 -#: tdewalletmanager.desktop:2 +#: tdewalletmanager-tdewalletd.desktop:2 tdewalletmanager.desktop:2 msgid "Wallet Management Tool" msgstr "" diff --git a/translations/desktop_files/tdewallet-desktops/tg.po b/translations/desktop_files/tdewallet-desktops/tg.po index 3cc4ef7..d846a48 100644 --- a/translations/desktop_files/tdewallet-desktops/tg.po +++ b/translations/desktop_files/tdewallet-desktops/tg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/tr.po b/translations/desktop_files/tdewallet-desktops/tr.po index d4ec3a5..ba16a88 100644 --- a/translations/desktop_files/tdewallet-desktops/tr.po +++ b/translations/desktop_files/tdewallet-desktops/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/uk.po b/translations/desktop_files/tdewallet-desktops/uk.po index 5f5561b..47f17ed 100644 --- a/translations/desktop_files/tdewallet-desktops/uk.po +++ b/translations/desktop_files/tdewallet-desktops/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/uz.po b/translations/desktop_files/tdewallet-desktops/uz.po index 6e2149e..fe92c13 100644 --- a/translations/desktop_files/tdewallet-desktops/uz.po +++ b/translations/desktop_files/tdewallet-desktops/uz.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/uz@cyrillic.po b/translations/desktop_files/tdewallet-desktops/uz@cyrillic.po index 9b834d7..5726ca8 100644 --- a/translations/desktop_files/tdewallet-desktops/uz@cyrillic.po +++ b/translations/desktop_files/tdewallet-desktops/uz@cyrillic.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/zh_CN.po b/translations/desktop_files/tdewallet-desktops/zh_CN.po index 8e97974..8010016 100644 --- a/translations/desktop_files/tdewallet-desktops/zh_CN.po +++ b/translations/desktop_files/tdewallet-desktops/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/translations/desktop_files/tdewallet-desktops/zh_TW.po b/translations/desktop_files/tdewallet-desktops/zh_TW.po index bf3ce5b..440a2f2 100644 --- a/translations/desktop_files/tdewallet-desktops/zh_TW.po +++ b/translations/desktop_files/tdewallet-desktops/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-22 01:55+0200\n" +"POT-Creation-Date: 2021-07-07 18:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |
