diff options
1667 files changed, 11606 insertions, 11327 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index fe173f393..d4599c271 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# @@ -34,7 +38,7 @@ endif( ) if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp ) # hide "#define" to allow strings to be extracted using xgettext file( READ ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp _tqt_qxml ) - string( REGEX REPLACE "\n(#define[^\n]*)(QT_TRANSLATE_NOOP)" "\n/*\\1*/\\2" _tqt_qxml ${_tqt_qxml} ) + string( REGEX REPLACE "\n(#define[^\n]*)(TQT_TRANSLATE_NOOP)" "\n/*\\1*/\\2" _tqt_qxml ${_tqt_qxml} ) file( WRITE ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp.tde_l10n "${_tqt_qxml}" ) endif( ) @@ -127,7 +131,7 @@ tde_l10n_create_template( KEYWORDS tr tr:1,2 translate translate:1,2 - QT_TRANSLATE_NOOP QT_TRANSLATE_NOOP:1,2 + TQT_TRANSLATE_NOOP TQT_TRANSLATE_NOOP:1,2 X-POT "-" ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6733ad83a..631e7a5a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -23,6 +28,7 @@ set( PACKAGE tdelibs ) include( FindPkgConfig ) include( CheckIncludeFile ) +include( CheckIncludeFiles ) include( CheckSymbolExists ) include( CheckFunctionExists ) include( CheckCSourceCompiles ) @@ -39,11 +45,6 @@ include( TDEMacros ) include( TDESetupPaths ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup and find essential stuff ############ tde_setup_paths( ) @@ -56,14 +57,8 @@ list( APPEND TDECORE_LIBRARY_DIRS ${TQT_LIBRARY_DIRS} ) ##### add apidox targets ############ -if( "${CMAKE_VERSION}" VERSION_LESS "3.1" ) - set( CMAKE_ENV "env" ) -else() - set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" ) -endif() - add_custom_target( apidox - COMMAND ${CMAKE_ENV} + COMMAND ${CMAKE_COMMAND} -E env "TQTDOCDIR=/usr/share/tqt3/doc/html" ${CMAKE_SOURCE_DIR}/admin/doxygen.sh --no-modulename @@ -95,57 +90,57 @@ install( CODE " ##### user requested OPTIONs #################### -OPTION( WITH_ALL_OPTIONS "Enable all OPTIONal support" OFF ) - -OPTION( TDE_MALLOC "Use own malloc implementation" OFF ) -OPTION( TDE_MALLOC_DEBUG "Enable debugging in fast malloc" OFF ) -OPTION( TDE_MALLOC_FULL "Make alloc as fast as possible" OFF ) - -OPTION( WITH_ARTS "Build with aRts" ON ) -OPTION( WITH_ALSA "Enable ALSA support" ON ) -OPTION( WITH_LIBART "Enable libart support (for SVG icons)" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_LIBIDN "Enable support for libidn" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_SSL "Enable support for SSL" ON ) -OPTION( WITH_CUPS "Enable CUPS support" ON ) -OPTION( WITH_IMAGETOPS_BINARY "Enable installation of imagetops binary" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_LUA "Enable LUA support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_TIFF "Enable tiff support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_JASPER "Enable jasper (jpeg2k) support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_UTEMPTER "Use utempter for utmp management" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON ) -OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON ) -OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_TDEHWLIB "Enable TDE hwlib globally" ON ) -OPTION( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_TDEHWLIB} ) -OPTION( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF ) -OPTION( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF ) -OPTION( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_UDEVIL "Enable udevil support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_CONSOLEKIT "Enable ConsoleKit support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF ) -OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF ) -OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF ) -OPTION( WITH_PCSC "Enable PC/SC SmartCard support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_PKCS "Enable PKCS support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_CRYPTSETUP "Enable cryptsetup support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF ) -OPTION( WITH_XRANDR "Build the tderandr library" ON ) -OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ON ) -OPTION( WITH_MITSHM "Use MIT-SHM for pixmap loading/saving" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF ) - -OPTION( WITH_ISPELL "Enable ispell support" ON ) -OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} ) - -OPTION( WITH_TDEICONLOADER_DEBUG "Enable debugging in TDEIconLoader class" OFF ) +option( WITH_ALL_OPTIONS "Enable all OPTIONal support" OFF ) + +option( TDE_MALLOC "Use own malloc implementation" OFF ) +option( TDE_MALLOC_DEBUG "Enable debugging in fast malloc" OFF ) +option( TDE_MALLOC_FULL "Make alloc as fast as possible" OFF ) + +option( WITH_ARTS "Build with aRts" ON ) +option( WITH_ALSA "Enable ALSA support" ON ) +option( WITH_LIBART "Enable libart support (for SVG icons)" ${WITH_ALL_OPTIONS} ) +option( WITH_LIBIDN "Enable support for libidn" ${WITH_ALL_OPTIONS} ) +option( WITH_SSL "Enable support for SSL" ON ) +option( WITH_CUPS "Enable CUPS support" ON ) +option( WITH_IMAGETOPS_BINARY "Enable installation of imagetops binary" ${WITH_ALL_OPTIONS} ) +option( WITH_LUA "Enable LUA support" ${WITH_ALL_OPTIONS} ) +option( WITH_TIFF "Enable tiff support" ${WITH_ALL_OPTIONS} ) +option( WITH_JASPER "Enable jasper (jpeg2k) support" ${WITH_ALL_OPTIONS} ) +option( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} ) +option( WITH_UTEMPTER "Use utempter for utmp management" ${WITH_ALL_OPTIONS} ) +option( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} ) +option( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} ) +option( WITH_PCRE "Enable pcre regex support for kjs" ON ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) +option( WITH_INOTIFY "Enable inotify support for tdeio" ON ) +option( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} ) +option( WITH_TDEHWLIB "Enable TDE hwlib globally" ON ) +option( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_TDEHWLIB} ) +option( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF ) +option( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF ) +option( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} ) +option( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} ) +option( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} ) +option( WITH_UDEVIL "Enable udevil support" ${WITH_ALL_OPTIONS} ) +option( WITH_CONSOLEKIT "Enable ConsoleKit support" ${WITH_ALL_OPTIONS} ) +option( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF ) +option( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF ) +option( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF ) +option( WITH_PCSC "Enable PC/SC SmartCard support" ${WITH_ALL_OPTIONS} ) +option( WITH_PKCS "Enable PKCS support" ${WITH_ALL_OPTIONS} ) +option( WITH_CRYPTSETUP "Enable cryptsetup support" ${WITH_ALL_OPTIONS} ) +option( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} ) +option( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF ) +option( WITH_XRANDR "Build the tderandr library" ON ) +option( WITH_XCOMPOSITE "Enable xcomposite support" ON ) +option( WITH_MITSHM "Use MIT-SHM for pixmap loading/saving" ${WITH_ALL_OPTIONS} ) +option( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF ) + +option( WITH_ISPELL "Enable ispell support" ON ) +option( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} ) +option( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} ) + +option( WITH_TDEICONLOADER_DEBUG "Enable debugging in TDEIconLoader class" OFF ) ##### set PKG_CONFIG_PATH ####################### @@ -225,6 +220,7 @@ check_include_file( "dirent.h" HAVE_DIRENT_H ) check_include_file( "dld.h" HAVE_DLD_H ) check_include_file( "dlfcn.h" HAVE_DLFCN_H ) check_include_file( "dl.h" HAVE_DL_H ) +check_include_files( "sys/types.h;sys/dl.h" HAVE_SYS_DL_H ) check_include_file( "float.h" HAVE_FLOAT_H ) check_include_file( "fstab.h" HAVE_FSTAB_H ) check_include_file( "ieeefp.h" HAVE_IEEEFP_H ) @@ -237,6 +233,7 @@ check_include_file( "machine/soundcard.h" HAVE_MACHINE_SOUNDCARD_H ) check_include_file( "malloc.h" HAVE_MALLOC_H ) check_include_file( "memory.h" HAVE_MEMORY_H ) check_include_file( "mntent.h" HAVE_MNTENT_H ) +check_include_file( "sys/mntent.h" HAVE_SYS_MNTENT_H ) check_include_file( "ndir.h" HAVE_NDIR_H ) check_include_file( "netinet/in.h" HAVE_NETINET_IN_H ) check_include_file( "net/if.h" HAVE_NET_IF_H ) @@ -260,7 +257,7 @@ check_include_file( "sys/dir.h" HAVE_SYS_DIR_H ) check_include_file( "sys/filio.h" HAVE_SYS_FILIO_H ) check_include_file( "sys/mman.h" HAVE_SYS_MMAN_H ) check_include_file( "sys/mntent.h" HAVE_SYS_MNTENT_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/mount.h" HAVE_SYS_MOUNT_H ) if( NOT HAVE_SYS_MOUNT_H ) find_path( SYS_MOUNT_PATH "sys/mount.h" ) @@ -280,9 +277,16 @@ check_include_file( "sys/ucred.h" HAVE_SYS_UCRED_H ) if( NOT HAVE_SYS_UCRED_H ) find_path( SYS_UCRED_PATH "sys/ucred.h" ) if( SYS_UCRED_PATH ) - set( HAVE_SYS_UCRED_H "1" ) + set( HAVE_SYS_UCRED_H 1 ) endif( ) endif( ) +check_include_file( "ucred.h" HAVE_UCRED_H ) +if( NOT HAVE_UCRED_H ) + find_path( UCRED_PATH "ucred.h" ) + if( UCRED_PATH ) + set( HAVE_UCRED_H 1 ) + endif() +endif() check_include_file( "sys/xattr.h" HAVE_SYS_XATTR_H ) check_include_file( "termios.h" HAVE_TERMIOS_H ) check_include_file( "termio.h" HAVE_TERMIO_H ) @@ -377,6 +381,9 @@ else () find_package( Backtrace ) if ( Backtrace_FOUND ) set ( HAVE_BACKTRACE 1 ) + else () + set ( Backtrace_LIBRARY "" ) + set ( Backtrace_HEADER "" ) endif () endif () check_cxx_source_compiles( "#include <cxxabi.h> @@ -424,6 +431,7 @@ endif( HAVE_GETMNTINFO ) check_function_exists( getnameinfo HAVE_GETNAMEINFO ) check_function_exists( getpagesize HAVE_GETPAGESIZE ) check_function_exists( getpeereid HAVE_GETPEEREID ) +check_function_exists( getpeerucred HAVE_GETPEERUCRED ) check_function_exists( getpeername HAVE_GETPEERNAME ) check_function_exists( getprotobyname_r HAVE_GETPROTOBYNAME_R ) check_function_exists( getpt HAVE_GETPT ) @@ -463,6 +471,14 @@ check_function_exists( __argz_count HAVE___ARGZ_COUNT ) check_function_exists( __argz_next HAVE___ARGZ_NEXT ) check_function_exists( __argz_stringify HAVE___ARGZ_STRINGIFY ) check_function_exists( sendfile HAVE_SENDFILE ) +set( SENDFILE_LIBRARIES "" ) +if( NOT HAVE_SENDFILE) + check_library_exists( sendfile sendfile "" HAVE_SENDFILE_LIB ) + if( HAVE_SENDFILE_LIB ) + set( HAVE_SENDFILE 1 ) + set( SENDFILE_LIBRARIES sendfile ) + endif( HAVE_SENDFILE_LIB ) +endif() check_function_exists( rindex HAVE_RINDEX ) check_function_exists( putenv HAVE_PUTENV ) check_function_exists( poll HAVE_POLL ) @@ -753,26 +769,29 @@ endif( WITH_LZMA ) ##### check for pcsc ############################ -if( WITH_PCSC ) - find_path( PCSCLITE_INCLUDE_DIR pcsclite.h - HINTS /usr/include/PCSC ) - find_library( PCSCLITE_LIBRARY NAMES pcsclite libpcsclite PCSC ) - if( PCSCLITE_LIBRARY AND PCSCLITE_INCLUDE_DIR ) - message( STATUS "Found PCSCLITE: ${PCSCLITE_LIBRARY}" ) - set( PCSCLITE_FOUND 1 ) - set( PCSCLITE_INCLUDE_DIRS ${PCSCLITE_INCLUDE_DIR} ) - set( PCSCLITE_LIBRARIES ${PCSCLITE_LIBRARY} ) - endif( PCSCLITE_LIBRARY AND PCSCLITE_INCLUDE_DIR ) +if( WITH_TDEHWLIB AND WITH_PCSC ) + pkg_search_module( PCSCLITE libpcsclite ) + if( NOT PCSCLITE_FOUND ) + find_path( PCSCLITE_INCLUDE_DIR pcsclite.h + HINTS /usr/include/PCSC ) + find_library( PCSCLITE_LIBRARY NAMES pcsclite libpcsclite PCSC ) + if( PCSCLITE_LIBRARY AND PCSCLITE_INCLUDE_DIR ) + message( STATUS "Found PCSCLITE: ${PCSCLITE_LIBRARY}" ) + set( PCSCLITE_FOUND 1 ) + set( PCSCLITE_INCLUDE_DIRS ${PCSCLITE_INCLUDE_DIR} ) + set( PCSCLITE_LIBRARIES ${PCSCLITE_LIBRARY} ) + endif( PCSCLITE_LIBRARY AND PCSCLITE_INCLUDE_DIR ) + endif( NOT PCSCLITE_FOUND ) if( NOT PCSCLITE_FOUND ) tde_message_fatal( "PCSCLITE is requested, but not found on your system" ) endif( NOT PCSCLITE_FOUND ) set( HAVE_PCSC_SUPPORT 1 ) -endif( WITH_PCSC ) +endif( WITH_TDEHWLIB AND WITH_PCSC ) ##### check for pkcs ############################ -if( WITH_PKCS ) +if( WITH_TDEHWLIB AND WITH_PKCS ) pkg_search_module( LIBPKCS11-HELPER libpkcs11-helper-1 ) if( NOT LIBPKCS11-HELPER_FOUND ) message(FATAL_ERROR "\nPKCS support was requested, but libpkcs11-helper-1 was not found on your system" ) @@ -794,7 +813,7 @@ endif( ) ##### check for pkcs ############################ -if( WITH_CRYPTSETUP ) +if( WITH_TDEHWLIB AND WITH_CRYPTSETUP ) pkg_search_module( LIBCRYPTSETUP libcryptsetup ) if( NOT LIBCRYPTSETUP_FOUND ) find_library( LIBCRYPTSETUP_LIBRARY cryptsetup ) @@ -1170,9 +1189,9 @@ if( WITH_ELFICON ) if( NOT LIBR_FOUND ) message(FATAL_ERROR "\nelficon support was requested, but libr was not found on your system" ) endif( NOT LIBR_FOUND ) - if( NOT "${LIBR_VERSION}" STREQUAL "0.6.0" ) + if( "${LIBR_VERSION}" VERSION_LESS "0.6" ) message(FATAL_ERROR "\nelficon support was requested, but the libr version on your system may not be compatible with TDE" ) - endif( NOT "${LIBR_VERSION}" STREQUAL "0.6.0" ) + endif( "${LIBR_VERSION}" VERSION_LESS "0.6" ) set( HAVE_ELFICON 1 ) endif( ) diff --git a/KDE3PORTING.html b/KDE3PORTING.html index d57e90b39..ba92f9313 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -155,9 +155,9 @@ not be available. <li> TDEAccel::insertItem() and TDEAccel::connectItem(). <pre> - tdeaccel->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" ); - - tdeaccel->connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) ); + - tdeaccel->connectItem( "Scroll Up", this, TQ_SLOT(scrollUp()) ); + tdeaccel->insert( "Scroll Up", i18n("Scroll Up"), TQString::null, - Key_Up, this, TQT_SLOT(scrollUp()) ); + Key_Up, this, TQ_SLOT(scrollUp()) ); </pre> Note that a What's This parameter is now a part of the insert function. You might replace the TQString::null parameter with @@ -176,7 +176,7 @@ not be available. The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>. <pre> new TDEAction( i18n("Scroll Up"), Key_Up, - this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" ); + this, TQ_SLOT(scrollUp()), actionCollection(), "Scroll Up" ); </pre> <h5>TDEGlobalAccel</h5> @@ -196,7 +196,7 @@ The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>. have been removed. (Nobody on the list knew what its function was supposed to be.) Calls to <i>insert()</i> and the equivalent <i>key(TDEStdAccel::Insert)</i> can be replaced with the former default - of <i>Qt::CTRL+Qt::Key_Insert</i>.</li> + of <i>TQt::CTRL+TQt::Key_Insert</i>.</li> <li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined: <table border=1> <tr><th>Old</th><th>New</th></tr> @@ -474,7 +474,7 @@ setURLArgs does the job. The API has been cleaned up to be in line with the rest of tdelibs, in particular: <ul> <li>suggestions() now returns a TQStringList instead of a pointer to a QStringList -<li>intermediateBuffer() now returns a TQString instead of a pointer to a QString +<li>intermediateBuffer() now returns a TQString instead of a pointer to a TQString <li>The signal <b>misspelling(TQString, TQStringList *, unsigned)</b> has changed to misspelling(const TQString &, const TQStringList &, unsigned int) <li>The signal <b>corrected(TQString, TQString, unsigned)</b> has changed to @@ -10,7 +10,7 @@ In this file: About tdelibs ------------- -This is version R14.1.0 of the Trinity Desktop Environment [TDE] libraries. +This is version R14.2.0~[DEVELOPMENT] of the Trinity Desktop Environment [TDE] libraries. This package includes libraries that are central to the development and execution of a KDE program, as well as internationalization files for these @@ -3,13 +3,12 @@ that we would like to make for the next binary incompatible release. - Check for forked classes in kde pim and other modules -- There is no reason why TDEConfigBase should inherit from QObject, get rid of that. +- There is no reason why TDEConfigBase should inherit from TQObject, get rid of that. - Change all FooPrivate *d; -> Private * const d; and place initialization in the constructor (for classes that would benefit from this). To help catch silly mistakes since d should never change. Also consider changing to use KStaticDeleter to - help prevent mistakes where developers forget to delete the pointer. Maybe make use of - Qt4 helper macros? + help prevent mistakes where developers forget to delete the pointer. - Move all utility functions away from TDEApplication. TBD: Make TDEApplication a very thin wrapper around QApplication. Ideally, TDEApplication should go @@ -203,14 +202,14 @@ an alternative help->contents action) requests for things like re-reading the config of a KPanelExtension can be done by its parent. -- Fix KURLRequester API to use KURL for urls instead of QString to make clear that +- Fix KURLRequester API to use KURL for urls instead of TQString to make clear that we work with URLs and not with paths. - Dump KPixmapIO class. QPixmap with qt-copy patches #0005 and #0007 can perform just as well, KPixmapIO can't dither, and it generally doesn't make much sense to have this class. - TDEListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between - "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :) + "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). - Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint, to merge that code. diff --git a/admin b/admin -Subproject a7f75ac0ff587d5b8694a1b78557597161f8104 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/arts/kde/README b/arts/kde/README index 2d34f08fd..8c3405e33 100644 --- a/arts/kde/README +++ b/arts/kde/README @@ -6,7 +6,7 @@ libartskde is a simple KDE->aRts wrapper that allows the developer to use KDE technology to access aRts. ie. no need to deal with std::string's anymore -etc.. you can just use QString's or KURL's +etc.. you can just use TQString's or KURL's to play sound 2. How to use it to play sounds? diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h index b25085a78..ea2e1e66a 100644 --- a/arts/kde/kartsdispatcher.h +++ b/arts/kde/kartsdispatcher.h @@ -63,7 +63,7 @@ namespace Arts */ class KDE_EXPORT KArtsDispatcher : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Constructor. diff --git a/arts/kde/kartsfloatwatch.h b/arts/kde/kartsfloatwatch.h index cc6671556..b8cb229f0 100644 --- a/arts/kde/kartsfloatwatch.h +++ b/arts/kde/kartsfloatwatch.h @@ -44,11 +44,11 @@ namespace Arts { class KFloatWatchProxy_impl; } * \code * StereoVolumeControl stereoVolumeControl = ...; * KArtsFloatWatch *w = new KArtsFloatWatch(stereoVolumeControl, "scaleFactor_changed", this); - * connect(w, TQT_SIGNAL(valueChanged(float)), this, TQT_SLOT(setValue(float))); + * connect(w, TQ_SIGNAL(valueChanged(float)), this, TQ_SLOT(setValue(float))); * \endcode */ class KArtsFloatWatch : public TQObject { - Q_OBJECT + TQ_OBJECT private: KArtsFloatWatchPrivate *d; friend class Arts::KFloatWatchProxy_impl; diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h index c0c04e66d..a5346aa06 100644 --- a/arts/kde/kartsserver.h +++ b/arts/kde/kartsserver.h @@ -36,7 +36,7 @@ */ class KDE_ARTS_EXPORT KArtsServer : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** diff --git a/arts/kde/kaudioconverter.cpp b/arts/kde/kaudioconverter.cpp index 1eb8c20e5..d387535d2 100644 --- a/arts/kde/kaudioconverter.cpp +++ b/arts/kde/kaudioconverter.cpp @@ -88,7 +88,7 @@ void KAudioConverter::requestPlayObject(const KURL &url) Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl(); inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl); - TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &))); + TQObject::connect(inputStreamImpl, TQ_SIGNAL(mimeTypeFound(const TQString &)), TQ_SLOT(slotMimeType(const TQString &))); inputStream.openURL(url.url().latin1()); inputStream.streamStart(); @@ -161,9 +161,9 @@ void KAudioConverter::start() Arts::connect(m_incoming->object(), "left", m_request, "left"); Arts::connect(m_incoming->object(), "right", m_request, "right"); - TQObject::connect(requestImpl, TQT_SIGNAL(newBlockSize(long)), TQT_SIGNAL(newBlockSize(long))); - TQObject::connect(requestImpl, TQT_SIGNAL(newBlockPointer(long)), TQT_SIGNAL(newBlockPointer(long))); - TQObject::connect(requestImpl, TQT_SIGNAL(newData()), TQT_SIGNAL(newData())); + TQObject::connect(requestImpl, TQ_SIGNAL(newBlockSize(long)), TQ_SIGNAL(newBlockSize(long))); + TQObject::connect(requestImpl, TQ_SIGNAL(newBlockPointer(long)), TQ_SIGNAL(newBlockPointer(long))); + TQObject::connect(requestImpl, TQ_SIGNAL(newData()), TQ_SIGNAL(newData())); // Special mpeglib case // TODO: needed at all?? diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h index 0022d9bba..773018021 100644 --- a/arts/kde/kaudioconverter.h +++ b/arts/kde/kaudioconverter.h @@ -31,7 +31,7 @@ class TQString; class KAudioConverter : public TQObject { -Q_OBJECT +TQ_OBJECT public: KAudioConverter(); ~KAudioConverter(); diff --git a/arts/kde/kaudioplaystream.h b/arts/kde/kaudioplaystream.h index 6bcbd20ce..106112b6a 100644 --- a/arts/kde/kaudioplaystream.h +++ b/arts/kde/kaudioplaystream.h @@ -40,7 +40,7 @@ class KAudioPlayStreamPrivate; */ class KDE_ARTS_EXPORT KAudioPlayStream : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a KAudioPlayStream on server with a title. You should pass the KArtsServer also diff --git a/arts/kde/kaudioplaystream_p.h b/arts/kde/kaudioplaystream_p.h index a790a8c33..93cb92429 100644 --- a/arts/kde/kaudioplaystream_p.h +++ b/arts/kde/kaudioplaystream_p.h @@ -37,7 +37,7 @@ class KAudioPlayStream; class KByteSoundProducer; class KAudioPlayStreamPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: KAudioPlayStreamPrivate( KArtsServer*, const TQString title, TQObject*, const char* =0 ); ~KAudioPlayStreamPrivate(); diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp index eb08abdb7..02c88411a 100644 --- a/arts/kde/kaudiorecordstream.cpp +++ b/arts/kde/kaudiorecordstream.cpp @@ -66,7 +66,7 @@ KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const TQString & d->inqueue.setAutoDelete( true ); d->title = title; - connect( d->kserver, TQT_SIGNAL( restartedServer() ), TQT_SLOT( slotRestartedServer() ) ); + connect( d->kserver, TQ_SIGNAL( restartedServer() ), TQ_SLOT( slotRestartedServer() ) ); d->in = Arts::DynamicCast( d->kserver->server().createObject( "Arts::Synth_AMAN_RECORD" ) ); d->effectStack = Arts::DynamicCast( d->kserver->server().createObject( "Arts::StereoEffectStack" ) ); @@ -196,8 +196,8 @@ void KAudioRecordStream::start( int samplingRate, int bits, int channels ) d->receiver_base = new KByteSoundReceiver( samplingRate, bits, channels, d->title.local8Bit() ); d->receiver = Arts::ByteSoundReceiver::_from_base( d->receiver_base ); - connect( d->receiver_base, TQT_SIGNAL( data( const char *, unsigned int ) ), - TQT_SLOT( slotData( const char *, unsigned int ) ) ); + connect( d->receiver_base, TQ_SIGNAL( data( const char *, unsigned int ) ), + TQ_SLOT( slotData( const char *, unsigned int ) ) ); Arts::connect( d->convert, "outdata", d->receiver, "indata" ); d->convert.start(); diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h index bbdb6d736..a1e4f1931 100644 --- a/arts/kde/kaudiorecordstream.h +++ b/arts/kde/kaudiorecordstream.h @@ -40,7 +40,7 @@ namespace Arts { class StereoEffectStack; } */ class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/arts/kde/kaudiorecordstream_p.h b/arts/kde/kaudiorecordstream_p.h index 1d38b2278..727f384ec 100644 --- a/arts/kde/kaudiorecordstream_p.h +++ b/arts/kde/kaudiorecordstream_p.h @@ -32,7 +32,7 @@ class KByteSoundReceiver : public TQObject, public Arts::ByteSoundReceiver_skel, public Arts::StdSynthModule { - Q_OBJECT + TQ_OBJECT public: KByteSoundReceiver( int rate, int bits, int channels, const char * title ); diff --git a/arts/kde/kconverttest.cpp b/arts/kde/kconverttest.cpp index 647c2f320..6c5706122 100644 --- a/arts/kde/kconverttest.cpp +++ b/arts/kde/kconverttest.cpp @@ -81,13 +81,13 @@ int main(int argc, char **argv) // converter.setup(44100); converter.requestPlayObject(url); - TQObject::connect(&converter, TQT_SIGNAL(rawStreamStart()), get, TQT_SLOT(slotRawStreamStart())); + TQObject::connect(&converter, TQ_SIGNAL(rawStreamStart()), get, TQ_SLOT(slotRawStreamStart())); - TQObject::connect(&converter, TQT_SIGNAL(newBlockSize(long)), get, TQT_SLOT(slotNewBlockSize(long))); - TQObject::connect(&converter, TQT_SIGNAL(newBlockPointer(long)), get, TQT_SLOT(slotNewBlockPointer(long))); - TQObject::connect(&converter, TQT_SIGNAL(newData()), get, TQT_SLOT(slotNewData())); + TQObject::connect(&converter, TQ_SIGNAL(newBlockSize(long)), get, TQ_SLOT(slotNewBlockSize(long))); + TQObject::connect(&converter, TQ_SIGNAL(newBlockPointer(long)), get, TQ_SLOT(slotNewBlockPointer(long))); + TQObject::connect(&converter, TQ_SIGNAL(newData()), get, TQ_SLOT(slotNewData())); - TQObject::connect(&converter, TQT_SIGNAL(rawStreamFinished()), get, TQT_SLOT(slotRawStreamFinished())); + TQObject::connect(&converter, TQ_SIGNAL(rawStreamFinished()), get, TQ_SLOT(slotRawStreamFinished())); converter.start(); diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h index 7e7cc6c50..f74b62859 100644 --- a/arts/kde/kconverttest.h +++ b/arts/kde/kconverttest.h @@ -26,7 +26,7 @@ class KConvertTest : public TQObject { -Q_OBJECT +TQ_OBJECT public: KConvertTest(); diff --git a/arts/kde/kdatarequest_impl.h b/arts/kde/kdatarequest_impl.h index 7d90c8b73..4abe72c03 100644 --- a/arts/kde/kdatarequest_impl.h +++ b/arts/kde/kdatarequest_impl.h @@ -32,7 +32,7 @@ namespace Arts class KDataRequest_impl : public TQObject, virtual public KDataRequest_skel, virtual public StdSynthModule { -Q_OBJECT +TQ_OBJECT public: KDataRequest_impl(); ~KDataRequest_impl(); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index d893675cd..38acef54d 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -80,14 +80,14 @@ void TDEIOInputStream_impl::streamStart() m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg"); m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION)); - TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); - TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + TQObject::connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::connect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); m_streamStarted = true; } @@ -98,14 +98,14 @@ void TDEIOInputStream_impl::streamEnd() if(m_job != 0) { - TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); - TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + TQObject::disconnect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::disconnect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::disconnect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::disconnect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); if ( m_streamPulled ) outdata.endPull(); diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index 1d18f6421..45bb34cd1 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -35,7 +35,7 @@ class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_s virtual public InputStream_skel, virtual public StdSynthModule { -Q_OBJECT +TQ_OBJECT public: TDEIOInputStream_impl(); ~TDEIOInputStream_impl(); diff --git a/arts/kde/kplayobject.cpp b/arts/kde/kplayobject.cpp index f11c0eb8f..a9b3a8a36 100644 --- a/arts/kde/kplayobject.cpp +++ b/arts/kde/kplayobject.cpp @@ -179,7 +179,7 @@ void KDE::PlayObject::play() if ( d->creator ) delete d->creator; d->creator = new KDE::PlayObjectCreator( d->server ); - d->creator->create( d->url, d->createBUS, this, TQT_SLOT( attachPlayObject( Arts::PlayObject ) ) ); + d->creator->create( d->url, d->createBUS, this, TQ_SLOT( attachPlayObject( Arts::PlayObject ) ) ); kdDebug( 400 ) << "KDE::PlayObject::play(): creator called" << endl; d->internalState = Arts::posPlaying; } diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h index f5bd849be..8626405f0 100644 --- a/arts/kde/kplayobject.h +++ b/arts/kde/kplayobject.h @@ -29,7 +29,7 @@ class KDE_EXPORT KPlayObject : public TQObject { -Q_OBJECT +TQ_OBJECT public: KPlayObject(); KPlayObject(Arts::PlayObject playobject, bool isStream); @@ -187,7 +187,7 @@ class PlayObjectFactory; */ class KDE_EXPORT PlayObject : public TQObject { -Q_OBJECT +TQ_OBJECT public: ~PlayObject(); diff --git a/arts/kde/kplayobjectcreator.cpp b/arts/kde/kplayobjectcreator.cpp index 039c8a3bc..4b8f0ba01 100644 --- a/arts/kde/kplayobjectcreator.cpp +++ b/arts/kde/kplayobjectcreator.cpp @@ -44,7 +44,7 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj if (m_server.isNull() || url.isEmpty() ) return false; - connect( this, TQT_SIGNAL( playObjectCreated( Arts::PlayObject ) ), + connect( this, TQ_SIGNAL( playObjectCreated( Arts::PlayObject ) ), receiver, slot ); // check if the URL is a local file @@ -57,8 +57,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj m_instream = Arts::TDEIOInputStream::_from_base(instream_impl); // signal will be called once the ioslave knows the mime-type of the stream - connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)), - this, TQT_SLOT(slotMimeType(const TQString &))); + connect(instream_impl, TQ_SIGNAL(mimeTypeFound(const TQString &)), + this, TQ_SLOT(slotMimeType(const TQString &))); // GO! m_instream.openURL(url.url().latin1()); diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h index 74e571c8e..e0935ed22 100644 --- a/arts/kde/kplayobjectcreator.h +++ b/arts/kde/kplayobjectcreator.h @@ -31,7 +31,7 @@ namespace KDE { class PlayObjectCreator : public TQObject { -Q_OBJECT +TQ_OBJECT public: PlayObjectCreator(Arts::SoundServerV2 server); ~PlayObjectCreator(); diff --git a/arts/kde/kplayobjectfactory.cpp b/arts/kde/kplayobjectfactory.cpp index 708fe516e..ef10a925b 100644 --- a/arts/kde/kplayobjectfactory.cpp +++ b/arts/kde/kplayobjectfactory.cpp @@ -179,7 +179,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons d->helper->po = d->playObj; d->helper->ap = d->amanPlay; if( d->playObj->object().isNull() && d->amanPlay ) - TQObject::connect( d->playObj, TQT_SIGNAL( playObjectCreated() ), d->helper, TQT_SLOT( connectAmanPlay() ) ); + TQObject::connect( d->playObj, TQ_SIGNAL( playObjectCreated() ), d->helper, TQ_SLOT( connectAmanPlay() ) ); else d->helper->connectAmanPlay(); } diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h index d1eb32a3c..9f4586e18 100644 --- a/arts/kde/kplayobjectfactory_p.h +++ b/arts/kde/kplayobjectfactory_p.h @@ -32,7 +32,7 @@ namespace KDE class POFHelper : public TQObject { friend class PlayObjectFactory; - Q_OBJECT + TQ_OBJECT private slots: void connectAmanPlay(); private: diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index f78c5c5db..618a2ccd5 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -19,7 +19,7 @@ #include <tqaccel.h> #include <tqcursor.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xlib.h> #include <X11/Xutil.h> #else @@ -49,7 +49,7 @@ KFullscreenVideoWidget::KFullscreenVideoWidget( KVideoWidget *parent, const char { this->videoWidget = parent; setEraseColor( black ); - setCursor(TQCursor(Qt::BlankCursor)); + setCursor(TQCursor(TQt::BlankCursor)); } void KFullscreenVideoWidget::windowActivationChange( bool ) @@ -62,7 +62,7 @@ void KFullscreenVideoWidget::windowActivationChange( bool ) bool KFullscreenVideoWidget::x11Event( XEvent *event ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY if (event->type == ClientMessage && event->xclient.message_type == XInternAtom( tqt_xdisplay(), "VPO_RESIZE_NOTIFY", False )) @@ -93,7 +93,7 @@ void KVideoWidget::init(void) { setMinimumSize(0, 0); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); fullscreenWidget = 0; poVideo = Arts::VideoPlayObject::null(); @@ -102,16 +102,16 @@ void KVideoWidget::init(void) // Setup actions new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen", - CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()), + CTRL+SHIFT+Key_F, this, TQ_SLOT(fullscreenActivated()), actionCollection(), "fullscreen_mode" ); new TDERadioAction( i18n("&Half Size"), ALT+Key_0, - TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()), + this, TQ_SLOT(halfSizeActivated()), actionCollection(), "half_size" ); new TDERadioAction( i18n("&Normal Size"), ALT+Key_1, - TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()), + this, TQ_SLOT(normalSizeActivated()), actionCollection(), "normal_size" ); new TDERadioAction( i18n("&Double Size"), ALT+Key_2, - TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()), + this, TQ_SLOT(doubleSizeActivated()), actionCollection(), "double_size" ); ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" ); @@ -191,7 +191,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo ) TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY Window root; Pixmap pixmap; XImage *xImage; @@ -213,7 +213,7 @@ TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo ) } // Convert 32bit RGBA image data into Qt image - TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (QRgb *)0, 0, TQImage::IgnoreEndian ).copy(); + TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (TQRgb *)0, 0, TQImage::IgnoreEndian ).copy(); // Free X11 resources and return Qt image XDestroyImage( xImage ); @@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event ) emit mouseButtonPressed( event->button(), pos, event->state() ); // ### Remove in KDE4 - if ( event->button() == Qt::RightButton ) + if ( event->button() == TQt::RightButton ) emit rightButtonPressed( pos ); } @@ -358,7 +358,7 @@ void KVideoWidget::resizeNotify( int width, int height ) bool KVideoWidget::x11Event( XEvent *event ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY if (event->type == ClientMessage && event->xclient.message_type == XInternAtom( tqt_xdisplay(), "VPO_RESIZE_NOTIFY", False )) @@ -379,20 +379,20 @@ void KVideoWidget::fullscreenActivated() fullscreenWidget = new KFullscreenVideoWidget( this ); // Interconnect mouse button signals - connect( fullscreenWidget, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )), - this, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) ); + connect( fullscreenWidget, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )), + this, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) ); - connect( fullscreenWidget, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )), - this, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) ); + connect( fullscreenWidget, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )), + this, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) ); // ### Remove in KDE4 - connect( fullscreenWidget, TQT_SIGNAL(rightButtonPressed(const TQPoint &)), - this, TQT_SIGNAL(rightButtonPressed(const TQPoint &)) ); + connect( fullscreenWidget, TQ_SIGNAL(rightButtonPressed(const TQPoint &)), + this, TQ_SIGNAL(rightButtonPressed(const TQPoint &)) ); // Leave fullscreen mode with <Escape> key TQAccel *a = new TQAccel( fullscreenWidget ); a->connectItem( a->insertItem( Key_Escape ), - this, TQT_SLOT(setWindowed()) ); + this, TQ_SLOT(setWindowed()) ); fullscreenWidget->setFocus(); fullscreenWidget->showFullScreen(); diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h index 0e3881a93..9cd8239a9 100644 --- a/arts/kde/kvideowidget.h +++ b/arts/kde/kvideowidget.h @@ -20,7 +20,7 @@ class KDE_ARTS_EXPORT KVideoWidget : public TQWidget, virtual public KXMLGUIClient { -Q_OBJECT +TQ_OBJECT public: KVideoWidget( KXMLGUIClient *clientParent, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/arts/kde/mcop-dcop/kmcop.h b/arts/kde/mcop-dcop/kmcop.h index 5ffa57bcd..aae0792b3 100644 --- a/arts/kde/mcop-dcop/kmcop.h +++ b/arts/kde/mcop-dcop/kmcop.h @@ -29,7 +29,7 @@ class KMCOPPrivate; class KMCOP : public TQObject, public DCOPObject { -Q_OBJECT +TQ_OBJECT K_DCOP public: diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 101c7967b..176559bea 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -247,7 +247,7 @@ KNotify::KNotify( bool useArts ) d->playObjects.setAutoDelete(true); d->audioManager = 0; if( useArts ) { - connect( soundServer, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( restartedArtsd() ) ); + connect( soundServer, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( restartedArtsd() ) ); restartedArtsd(); //started allready need to initialize d->audioManager } #endif @@ -530,7 +530,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int if ( !d->playTimer ) { d->playTimer = new TQTimer( this ); - connect( d->playTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( playTimeout() ) ); + connect( d->playTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( playTimeout() ) ); } if ( !d->playTimer->isActive() ) { d->playTimer->start( 1000 ); @@ -543,7 +543,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int TDEProcess *proc = d->externalPlayerProc; if (!proc) { proc = d->externalPlayerProc = new TDEProcess; - connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), TQT_SLOT( slotPlayerProcessExited( TDEProcess * ))); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * )), TQ_SLOT( slotPlayerProcessExited( TDEProcess * ))); } if (proc->isRunning()) { soundFinished( eventId, PlayerBusy ); diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index 8348f3d40..b74fca3b2 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -30,7 +30,7 @@ class TDEConfig; class KNotify : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/config.h.cmake b/config.h.cmake index 2f382cc73..17a871252 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -174,6 +174,9 @@ /* Define to 1 if you have the <dl.h> header file. */ #cmakedefine HAVE_DL_H 1 +/* Define to 1 if you have the <sys/dl.h> header file. */ +#cmakedefine HAVE_SYS_DL_H 1 + /* Define if your system has Linux Directory Notification */ #undef HAVE_DNOTIFY @@ -240,6 +243,9 @@ /* Define to 1 if you have the `getpeereid' function. */ #cmakedefine HAVE_GETPEEREID 1 +/* Define to 1 if you have the `getpeerucred' function. */ +#cmakedefine HAVE_GETPEERUCRED 1 + /* Define to 1 if you have the `getpeername' function. */ #cmakedefine HAVE_GETPEERNAME 1 @@ -651,6 +657,9 @@ /* Define to 1 if you have the <sys/ucred.h> header file. */ #cmakedefine HAVE_SYS_UCRED_H 1 +/* Define to 1 if you have the <ucred.h> header file. */ +#cmakedefine HAVE_UCRED_H 1 + /* Define if system has the sys/xattr.h header. */ #cmakedefine HAVE_SYS_XATTR_H 1 @@ -1153,6 +1162,7 @@ __END_DECLS #endif #ifdef __cplusplus extern "C" +{ #endif #if !defined(HAVE_VSNPRINTF_PROTO) int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); @@ -1161,7 +1171,7 @@ int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); int snprintf(char *str, size_t n, char const *fmt, ...); #endif #ifdef __cplusplus -extern "C" +} #endif #endif @@ -1222,7 +1232,10 @@ extern "C" #define HAVE_SETEUID_FAKE #ifdef __cplusplus extern "C" +{ #endif int seteuid(INT32_BASETYPE euid); /* defined in fakes.c */ +#ifdef __cplusplus +} +#endif #endif - diff --git a/dcop/HOWTO b/dcop/HOWTO index dedcf97dd..344ed82d1 100644 --- a/dcop/HOWTO +++ b/dcop/HOWTO @@ -169,8 +169,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)", tqDebug("there was some error using DCOP."); else { QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") { - QString result; + if (replyType == "TQString") { + TQString result; reply >> result; print("the result is: %s",result.latin1()); } else @@ -190,7 +190,7 @@ Receiving Data via DCOP: Currently the only real way to receive data from DCOP is to multiply inherit from the normal class that you are inheriting (usually some -sort of QWidget subclass or QObject) as well as the DCOPObject class. +sort of TQWidget subclass or TQObject) as well as the DCOPObject class. DCOPObject provides one very important method: DCOPObject::process(). This is a pure virtual method that you must implement in order to process DCOP messages that you receive. It takes a function @@ -210,10 +210,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, QDataStream arg(data, IO_ReadOnly); int i; // parameter arg >> i; - QString result = self->doIt (i); + TQString result = self->doIt (i); QDataStream reply(replyData, IO_WriteOnly); reply << result; - replyType = "QString"; + replyType = "TQString"; return true; } else { tqDebug("unknown function call to BarObject::process()"); @@ -244,7 +244,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, QDataStream arg(data, IO_ReadOnly); int i; // parameter arg >> i; - QString result = self->doIt(i); + TQString result = self->doIt(i); DCOPClientTransaction *myTransaction; myTransaction = kapp->dcopClient()->beginTransaction(); @@ -260,9 +260,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, } } -slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result) +slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result) { - QCString replyType = "QString"; + QCString replyType = "TQString"; QByteArray replyData; QDataStream reply(replyData, IO_WriteOnly); reply << result; @@ -358,7 +358,7 @@ class MyInterface : virtual public DCOPObject k_dcop: - virtual ASYNC myAsynchronousMethod(QString someParameter) = 0; + virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0; virtual QRect mySynchronousMethod() = 0; }; @@ -385,19 +385,19 @@ but virtual, not pure virtual. Example: -class MyClass: public QObject, virtual public MyInterface +class MyClass: public TQObject, virtual public MyInterface { - Q_OBJECT + TQ_OBJECT public: MyClass(); ~MyClass(); - ASYNC myAsynchronousMethod(QString someParameter); + ASYNC myAsynchronousMethod(TQString someParameter); QRect mySynchronousMethod(); }; -Note: (Qt issue) Remember that if you are inheriting from QObject, you must +Note: (Qt issue) Remember that if you are inheriting from TQObject, you must place it first in the list of inherited classes. In the implementation of your class' ctor, you must explicitly initialize @@ -408,7 +408,7 @@ the interface which your are implementing. Example: MyClass::MyClass() - : QObject(), + : TQObject(), DCOPObject("MyInterface") { // whatever... @@ -419,7 +419,7 @@ exactly the same as you would normally. Example: -void MyClass::myAsynchronousMethod(QString someParameter) +void MyClass::myAsynchronousMethod(TQString someParameter) { tqDebug("myAsyncMethod called with param `" + someParameter + "'"); } @@ -429,9 +429,9 @@ It is not necessary (though very clean) to define an interface as an abstract class of its own, like we did in the example above. We could just as well have defined a k_dcop section directly within MyClass: -class MyClass: public QObject, virtual public DCOPObject +class MyClass: public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -439,7 +439,7 @@ class MyClass: public QObject, virtual public DCOPObject ~MyClass(); k_dcop: - ASYNC myAsynchronousMethod(QString someParameter); + ASYNC myAsynchronousMethod(TQString someParameter); QRect mySynchronousMethod(); }; diff --git a/dcop/KDE-ICE/ICElibint.h b/dcop/KDE-ICE/ICElibint.h index f36ab7acc..268b664db 100644 --- a/dcop/KDE-ICE/ICElibint.h +++ b/dcop/KDE-ICE/ICElibint.h @@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium #define _ICELIBINT_H_ #include "config.h" -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xos.h> #include <X11/Xfuncs.h> #include <X11/Xmd.h> //schroder diff --git a/dcop/KDE-ICE/ICEproto.h b/dcop/KDE-ICE/ICEproto.h index f66b86ac0..471b80314 100644 --- a/dcop/KDE-ICE/ICEproto.h +++ b/dcop/KDE-ICE/ICEproto.h @@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium #define _ICEPROTO_H_ #include "config.h" -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xmd.h> #else #if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) diff --git a/dcop/KDE-ICE/Xtrans.h b/dcop/KDE-ICE/Xtrans.h index 95c817fa1..08d28966f 100644 --- a/dcop/KDE-ICE/Xtrans.h +++ b/dcop/KDE-ICE/Xtrans.h @@ -51,7 +51,7 @@ from The Open Group. #define _XTRANS_H_ #include "config.h" -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xfuncproto.h> #include <X11/Xos.h> #else diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox index 62fd3cf44..ca596022c 100644 --- a/dcop/Mainpage.dox +++ b/dcop/Mainpage.dox @@ -134,8 +134,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)", tqDebug("there was some error using DCOP."); else { QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "QString") { - QString result; + if (replyType == "TQString") { + TQString result; reply >> result; print("the result is: %s",result.latin1()); } else @@ -148,7 +148,7 @@ else { Currently the only real way to receive data from DCOP is to multiply inherit from the normal class that you are inheriting (usually some -sort of QWidget subclass or QObject) as well as the DCOPObject class. +sort of TQWidget subclass or TQObject) as well as the DCOPObject class. DCOPObject provides one very important method: DCOPObject::process(). This is a pure virtual method that you must implement in order to process DCOP messages that you receive. It takes a function @@ -169,10 +169,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, QDataStream arg(data, IO_ReadOnly); int i; // parameter arg >> i; - QString result = self->doIt (i); + TQString result = self->doIt (i); QDataStream reply(replyData, IO_WriteOnly); reply << result; - replyType = "QString"; + replyType = "TQString"; return true; } else { tqDebug("unknown function call to BarObject::process()"); @@ -205,7 +205,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, QDataStream arg(data, IO_ReadOnly); int i; // parameter arg >> i; - QString result = self->doIt(i); + TQString result = self->doIt(i); DCOPClientTransaction *myTransaction; myTransaction = kapp->dcopClient()->beginTransaction(); @@ -221,9 +221,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data, } } -slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result) +slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result) { - QCString replyType = "QString"; + QCString replyType = "TQString"; QByteArray replyData; QDataStream reply(replyData, IO_WriteOnly); reply << result; @@ -260,7 +260,7 @@ class MyInterface : virtual public DCOPObject k_dcop: - virtual ASYNC myAsynchronousMethod(QString someParameter) = 0; + virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0; virtual QRect mySynchronousMethod() = 0; }; @@ -289,19 +289,19 @@ but virtual, not pure virtual. Example: \code -class MyClass: public QObject, virtual public MyInterface +class MyClass: public TQObject, virtual public MyInterface { - Q_OBJECT + TQ_OBJECT public: MyClass(); ~MyClass(); - ASYNC myAsynchronousMethod(QString someParameter); + ASYNC myAsynchronousMethod(TQString someParameter); QRect mySynchronousMethod(); }; \endcode -\note (Qt issue) Remember that if you are inheriting from QObject, you must +\note (Qt issue) Remember that if you are inheriting from TQObject, you must place it first in the list of inherited classes. In the implementation of your class' ctor, you must explicitly initialize @@ -313,7 +313,7 @@ Example: \code MyClass::MyClass() - : QObject(), + : TQObject(), DCOPObject("MyInterface") { // whatever... @@ -327,7 +327,7 @@ exactly the same as you would normally. Example: \code -void MyClass::myAsynchronousMethod(QString someParameter) +void MyClass::myAsynchronousMethod(TQString someParameter) { tqDebug("myAsyncMethod called with param `" + someParameter + "'"); } @@ -338,9 +338,9 @@ abstract class of its own, like we did in the example above. We could just as well have defined a k_dcop section directly within MyClass: \code -class MyClass: public QObject, virtual public DCOPObject +class MyClass: public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -348,7 +348,7 @@ class MyClass: public QObject, virtual public DCOPObject ~MyClass(); k_dcop: - ASYNC myAsynchronousMethod(QString someParameter); + ASYNC myAsynchronousMethod(TQString someParameter); QRect mySynchronousMethod(); }; \endcode diff --git a/dcop/client/README.dcop b/dcop/client/README.dcop index e352cb439..b20a9d2c0 100644 --- a/dcop/client/README.dcop +++ b/dcop/client/README.dcop @@ -43,10 +43,10 @@ error message is printed to stderr and the command exits with exit-code '2'. The default selection criteria is "any". Applications can declare their own select_func as they see fit, e.g. konqueror could declare -"isDoingProtocol(QString protocol)" and then the following command would +"isDoingProtocol(TQString protocol)" and then the following command would select a konqueror mainwindow that is currently handling the help-protocol: - "dcopfind 'konqueror*' 'konqueror-mainwindow*' 'isDoingProtocol(QString + "dcopfind 'konqueror*' 'konqueror-mainwindow*' 'isDoingProtocol(TQString protocol)' help" diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index a07f6a41a..6a395c222 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -47,7 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "marshall.cpp" -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xatom.h> #endif @@ -429,7 +429,7 @@ TQStringList dcopSessionList( const TQString &user, const TQString &home ) void sendUserTime( const char* app ) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 static unsigned long time = 0; if( time == 0 ) { diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp index 68e3e3f57..64c10857d 100644 --- a/dcop/client/marshall.cpp +++ b/dcop/client/marshall.cpp @@ -145,34 +145,34 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) bool b; stream >> b; result = b ? "true" : "false"; - } else if ( type == TQSTRING_OBJECT_NAME_STRING ) + } else if ( type == "TQString" ) { TQString s; stream >> s; result = s.local8Bit(); - } else if ( type == TQCSTRING_OBJECT_NAME_STRING ) + } else if ( type == "TQCString" ) { stream >> result; } else if ( type == "QCStringList" ) { - return demarshal( stream, TQVALUELIST_OBJECT_NAME_STRING "<" TQCSTRING_OBJECT_NAME_STRING ">" ); - } else if ( type == TQSTRINGLIST_OBJECT_NAME_STRING ) + return demarshal( stream, "TQValueList" "<" "TQCString" ">" ); + } else if ( type == "TQStringList" ) { - return demarshal( stream, TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">" ); + return demarshal( stream, "TQValueList" "<" "TQString" ">" ); } else if ( type == "TQStringVariantMap" ) { - return demarshal(stream, TQMAP_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING "," TQVARIANT_OBJECT_NAME_STRING ">"); - } else if ( type == TQCOLOR_OBJECT_NAME_STRING ) + return demarshal(stream, "TQMap" "<" "TQString" "," "TQVariant" ">"); + } else if ( type == "TQColor" ) { TQColor c; stream >> c; result = TQString(c.name()).local8Bit(); - } else if ( type == TQSIZE_OBJECT_NAME_STRING ) + } else if ( type == "TQSize" ) { TQSize s; stream >> s; result.sprintf( "%dx%d", s.width(), s.height() ); - } else if ( type == TQPIXMAP_OBJECT_NAME_STRING || type == TQIMAGE_OBJECT_NAME_STRING ) + } else if ( type == "TQPixmap" || type == "TQImage" ) { TQImage i; stream >> i; @@ -181,17 +181,17 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) buf.open( IO_WriteOnly ); i.save( &buf, "XPM" ); result = buf.buffer(); - } else if ( type == TQPOINT_OBJECT_NAME_STRING ) + } else if ( type == "TQPoint" ) { TQPoint p; stream >> p; result.sprintf( "+%d+%d", p.x(), p.y() ); - } else if ( type == TQRECT_OBJECT_NAME_STRING ) + } else if ( type == "TQRect" ) { TQRect r; stream >> r; result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() ); - } else if ( type == TQVARIANT_OBJECT_NAME_STRING ) + } else if ( type == "TQVariant" ) { TQ_INT32 type; stream >> type; @@ -206,7 +206,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) KURL r; stream >> r; result = r.url().local8Bit(); - } else if ( type.left( 12 ) == TQVALUELIST_OBJECT_NAME_STRING "<" ) + } else if ( type.left( 12 ) == "TQValueList" "<" ) { if ( (uint)type.find( '>', 12 ) != type.length() - 1 ) return result; @@ -228,7 +228,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) if ( i < count - 1 ) result += '\n'; } - } else if ( type.left( 6 ) == TQMAP_OBJECT_NAME_STRING "<" ) + } else if ( type.left( 6 ) == "TQMap" "<" ) { int commaPos = type.find( ',', 6 ); @@ -281,11 +281,11 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) } TQString s = TQString::fromLocal8Bit( args[ i ] ); - if (type == TQSTRINGLIST_OBJECT_NAME_STRING) { - type = TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">"; + if (type == "TQStringList") { + type = "TQValueList" "<" "TQString" ">"; } if (type == "QCStringList") { - type = TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">"; + type = "TQValueList" "<" "TQString" ">"; } if ( type == "int" ) @@ -322,52 +322,52 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) arg << s.toDouble(); else if ( type == "bool" ) arg << mkBool( s ); - else if ( type == TQSTRING_OBJECT_NAME_STRING ) + else if ( type == "TQString" ) arg << s; - else if ( type == TQCSTRING_OBJECT_NAME_STRING ) + else if ( type == "TQCString" ) arg << TQCString( args[ i ] ); - else if ( type == TQCOLOR_OBJECT_NAME_STRING ) + else if ( type == "TQColor" ) arg << mkColor( s ); - else if ( type == TQPOINT_OBJECT_NAME_STRING ) + else if ( type == "TQPoint" ) arg << mkPoint( s ); - else if ( type == TQSIZE_OBJECT_NAME_STRING ) + else if ( type == "TQSize" ) arg << mkSize( s ); - else if ( type == TQRECT_OBJECT_NAME_STRING ) + else if ( type == "TQRect" ) arg << mkRect( s ); else if ( type == "KURL" ) arg << KURL( s ); - else if ( type == TQVARIANT_OBJECT_NAME_STRING ) { - int tqPointKeywordLength = strlen(TQPOINT_OBJECT_NAME_STRING); - int tqSizeKeywordLength = strlen(TQSIZE_OBJECT_NAME_STRING); - int tqRectKeywordLength = strlen(TQRECT_OBJECT_NAME_STRING); - int tqColorKeywordLength = strlen(TQCOLOR_OBJECT_NAME_STRING); + else if ( type == "TQVariant" ) { + int tqPointKeywordLength = strlen("TQPoint"); + int tqSizeKeywordLength = strlen("TQSize"); + int tqRectKeywordLength = strlen("TQRect"); + int tqColorKeywordLength = strlen("TQColor"); if ( s == "true" || s == "false" ) { arg << TQVariant( mkBool( s ) ); } else if ( s.left( 4 ) == "int(" ) { arg << TQVariant( s.mid(4, s.length()-5).toInt() ); } - else if ( s.left( (tqPointKeywordLength+1) ) == TQPOINT_OBJECT_NAME_STRING "(" ) { + else if ( s.left( (tqPointKeywordLength+1) ) == "TQPoint" "(" ) { arg << TQVariant( mkPoint( s.mid((tqPointKeywordLength+1), s.length()-(tqPointKeywordLength+2)) ) ); } - else if ( s.left( (tqSizeKeywordLength+1) ) == TQSIZE_OBJECT_NAME_STRING "(" ) { + else if ( s.left( (tqSizeKeywordLength+1) ) == "TQSize" "(" ) { arg << TQVariant( mkSize( s.mid((tqSizeKeywordLength+1), s.length()-(tqSizeKeywordLength+2)) ) ); } - else if ( s.left( (tqRectKeywordLength+1) ) == TQRECT_OBJECT_NAME_STRING "(" ) { + else if ( s.left( (tqRectKeywordLength+1) ) == "TQRect" "(" ) { arg << TQVariant( mkRect( s.mid((tqRectKeywordLength+1), s.length()-(tqRectKeywordLength+2)) ) ); } - else if ( s.left( (tqColorKeywordLength+1) ) == TQCOLOR_OBJECT_NAME_STRING "(" ) { + else if ( s.left( (tqColorKeywordLength+1) ) == "TQColor" "(" ) { arg << TQVariant( mkColor( s.mid((tqColorKeywordLength+1), s.length()-(tqColorKeywordLength+2)) ) ); } else { arg << TQVariant( s ); } - } else if ( type.startsWith(TQVALUELIST_OBJECT_NAME_STRING "<") || type == "KURL::List" ) { + } else if ( type.startsWith("TQValueList" "<") || type == "KURL::List" ) { if ( type == "KURL::List" ) { type = "KURL"; } else { - int tqValueListKeywordLength = strlen(TQVALUELIST_OBJECT_NAME_STRING); + int tqValueListKeywordLength = strlen("TQValueList"); type = type.mid((tqValueListKeywordLength+1), type.length() - (tqValueListKeywordLength+2)); } TQStringList list; diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp index 1ab43f730..515aca6a1 100644 --- a/dcop/dcop_deadlock_test.cpp +++ b/dcop/dcop_deadlock_test.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. MyDCOPObject::MyDCOPObject(const TQCString &name, const TQCString &remoteName) : TQObject(0, name), DCOPObject(name), m_remoteName(remoteName) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, @@ -47,7 +47,7 @@ TQCString& replyType, TQByteArray &replyData) gettimeofday(&tv, 0); tqWarning("%s: function('%s') %d:%06d", name(), m_remoteName.data(), tv.tv_sec % 100, tv.tv_usec); - replyType = TQSTRING_OBJECT_NAME_STRING; + replyType = "TQString"; TQDataStream reply( replyData, IO_WriteOnly ); reply << TQString("Hey"); m_timer.start(1000, true); diff --git a/dcop/dcop_deadlock_test.h b/dcop/dcop_deadlock_test.h index 461c53cba..a0ee25f19 100644 --- a/dcop/dcop_deadlock_test.h +++ b/dcop/dcop_deadlock_test.h @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class MyDCOPObject : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: MyDCOPObject(const TQCString &name, const TQCString &remoteName); bool process(const TQCString &fun, const TQByteArray &data, diff --git a/dcop/dcopc.c b/dcop/dcopc.c index 5f1818cae..0d34c7f4b 100644 --- a/dcop/dcopc.c +++ b/dcop/dcopc.c @@ -24,7 +24,7 @@ #include "config.h" #include <tqglobal.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xlib.h> #include <X11/X.h> #include <X11/Xproto.h> diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 5523365c8..8965b6062 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -50,6 +50,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include <assert.h> #include <string.h> +#ifdef HAVE_UCRED_H +#include <ucred.h> +#endif /* HAVE_UCRED_H */ #include <tqguardedptr.h> #include <tqtextstream.h> @@ -65,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <dcopobject.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xmd.h> #endif extern "C" { @@ -212,7 +215,7 @@ TQCString DCOPClient::iceauthPath() { #if defined(ICEAUTH_PATH) if ( -# if defined(Q_WS_WIN) +# if defined(TQ_WS_WIN) access(ICEAUTH_PATH, 0) == 0 # else access(ICEAUTH_PATH, X_OK) == 0 @@ -263,9 +266,9 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old) fprintf(stderr, "Aborting. $HOME is not set.\n"); exit(1); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQCString disp = getenv("DISPLAY"); -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) TQCString disp = getenv("QWS_DISPLAY"); #else TQCString disp; @@ -331,10 +334,10 @@ void DCOPClient::handleAsyncReply(ReplyStruct *replyStruct) { if (replyStruct->replyObject) { - TQObject::connect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), + TQObject::connect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), replyStruct->replyObject, replyStruct->replySlot); emit callBack(replyStruct->replyId, *(replyStruct->replyType), *(replyStruct->replyData)); - TQObject::disconnect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), + TQObject::disconnect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), replyStruct->replyObject, replyStruct->replySlot); } delete replyStruct; @@ -622,8 +625,8 @@ DCOPClient::DCOPClient() d->qt_bridge_enabled = true; d->transactionList = 0L; d->transactionId = 0; - TQObject::connect( &d->postMessageTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( processPostedMessagesInternal() ) ); - TQObject::connect( &d->eventLoopTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( eventLoopTimeout() ) ); + TQObject::connect( &d->postMessageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( processPostedMessagesInternal() ) ); + TQObject::connect( &d->eventLoopTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( eventLoopTimeout() ) ); if ( !mainClient() ) setMainClient( this ); @@ -690,14 +693,14 @@ void DCOPClient::bindToApp() delete d->notifier; d->notifier = new TQSocketNotifier(socket(), TQSocketNotifier::Read, 0, 0); - TQObject::connect(d->notifier, TQT_SIGNAL(activated(int)), - TQT_SLOT(processSocketData(int))); + TQObject::connect(d->notifier, TQ_SIGNAL(activated(int)), + TQ_SLOT(processSocketData(int))); } } void DCOPClient::suspend() { -#ifdef Q_WS_WIN //TODO: remove (win32 ports sometimes do not create notifiers) +#ifdef TQ_WS_WIN //TODO: remove (win32 ports sometimes do not create notifiers) if (!d->notifier) return; #endif @@ -707,7 +710,7 @@ void DCOPClient::suspend() void DCOPClient::resume() { -#ifdef Q_WS_WIN //TODO: remove +#ifdef TQ_WS_WIN //TODO: remove if (!d->notifier) return; #endif @@ -717,14 +720,14 @@ void DCOPClient::resume() bool DCOPClient::isSuspended() const { -#if defined(Q_WS_WIN) || defined(Q_WS_MAC) //TODO: REMOVE +#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC) //TODO: REMOVE if (!d->notifier) return false; #endif return !d->notifier->isEnabled(); } -#if defined(SO_PEERCRED) || defined(LOCAL_PEEREID) +#if defined(SO_PEERCRED) || defined(LOCAL_PEEREID) || defined(HAVE_GETPEERUCRED) #define USE_PEER_IS_US // Check whether the remote end is owned by the same user. static bool peerIsUs(int sockfd) @@ -745,6 +748,18 @@ static bool peerIsUs(int sockfd) if (getsockopt(sockfd, 0, LOCAL_PEEREID, &cred, &siz) != 0 || siz != sizeof(cred)) return false; return (cred.unp_euid == geteuid()); +#elif defined(HAVE_GETPEERUCRED) + ucred_t *cred = nullptr; + uint_t peer_uid; + + if (getpeerucred(sockfd, &cred) != 0) { + if (cred != nullptr) + ucred_free(cred); + return false; + } + peer_uid = ucred_geteuid(cred); + ucred_free(cred); + return (peer_uid == getuid()); #endif } #else @@ -806,7 +821,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); return false; } - int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file + int size = TQMIN( (long)1024, f.size() ); // protection against a huge file TQCString contents( size+1 ); if ( f.readBlock( contents.data(), size ) != size ) { @@ -1497,7 +1512,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const TQStrList lst = o->metaObject()->slotNames( true ); int i = 0; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( o->metaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public ) + if ( o->metaObject()->slot( i++, true )->access != TQMetaData::Public ) continue; TQCString slot = it.current(); if ( slot.contains( "()" ) ) { @@ -1841,7 +1856,7 @@ int DCOPClient::callAsync(const TQCString &remApp, const TQCString &remObjId, if (replyStruct->transactionId == 0) { // Call is finished already - TQTimer::singleShot(0, this, TQT_SLOT(asyncReplyReady())); + TQTimer::singleShot(0, this, TQ_SLOT(asyncReplyReady())); d->asyncReplyQueue.append(replyStruct); } diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h index 4cb4b2f6e..7035e3c72 100644 --- a/dcop/dcopclient.h +++ b/dcop/dcopclient.h @@ -67,7 +67,7 @@ typedef TQValueList<TQCString> QCStringList; */ class DCOP_EXPORT DCOPClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/dcop/dcopglobal.h b/dcop/dcopglobal.h index 559037d2f..f8bf78789 100644 --- a/dcop/dcopglobal.h +++ b/dcop/dcopglobal.h @@ -37,8 +37,7 @@ #define DCOPReplyDelayed 6 #define DCOPFind 7 -#define INT32 QINT32 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xmd.h> #endif diff --git a/dcop/dcopidl/dcopidl_output.kidl b/dcop/dcopidl/dcopidl_output.kidl index 678ff6732..a0ffc5353 100644 --- a/dcop/dcopidl/dcopidl_output.kidl +++ b/dcop/dcopidl/dcopidl_output.kidl @@ -8,13 +8,13 @@ <LINK_SCOPE>TDEUI_EXPORT</LINK_SCOPE> <SUPER>MyNamespace::MyParentClass</SUPER> <SUPER>DCOPObject</SUPER> - <SUPER>QValueList<<TYPE>QString</TYPE>></SUPER> + <SUPER>QValueList<<TYPE>TQString</TYPE>></SUPER> <FUNC> - <TYPE>QString</TYPE> + <TYPE>TQString</TYPE> <NAME>url</NAME> </FUNC> <FUNC qual="const"> - <TYPE>QString</TYPE> + <TYPE>TQString</TYPE> <NAME>constTest</NAME> </FUNC> <FUNC> diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll index 302da3e14..710cbc3f4 100644 --- a/dcop/dcopidl/scanner.ll +++ b/dcop/dcopidl/scanner.ll @@ -235,7 +235,6 @@ FALSE return T_FALSE; "k_dcop_signals" return T_DCOP_SIGNAL_AREA; typedef return T_TYPEDEF; K_DCOP return T_DCOP; -Q_OBJECT ; TQ_OBJECT ; ("0"|"0L") return T_NULL; "extern "[A-Za-z0-9_ \t*]+ return T_EXTERN; diff --git a/dcop/dcopidl/yacc.cpp b/dcop/dcopidl/yacc.cpp index 9a58cefc9..ada46126c 100644 --- a/dcop/dcopidl/yacc.cpp +++ b/dcop/dcopidl/yacc.cpp @@ -113,14 +113,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern int yylex(); -// extern QString idl_lexFile; +// extern TQString idl_lexFile; extern int idl_line_no; extern int function_mode; static int dcop_area = 0; static int dcop_signal_area = 0; -static QString in_namespace( "" ); +static TQString in_namespace( "" ); void dcopidlInitFlex( const char *_code ); @@ -238,7 +238,7 @@ typedef union YYSTYPE #line 67 "yacc.yy" long _int; - QString *_str; + TQString *_str; unsigned short _char; double _float; @@ -2096,7 +2096,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 308 "yacc.yy" { - QString* tmp = new QString( "%1::%2" ); + TQString* tmp = new TQString( "%1::%2" ); *tmp = tmp->arg(*((yyvsp[(1) - (3)]._str))).arg(*((yyvsp[(3) - (3)]._str))); (yyval._str) = tmp; ;} @@ -2107,7 +2107,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 317 "yacc.yy" { - QString* tmp = new QString( " <SUPER>%1</SUPER>\n" ); + TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" ); *tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) ); (yyval._str) = tmp; ;} @@ -2118,7 +2118,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 323 "yacc.yy" { - QString* tmp = new QString( " <SUPER>%1</SUPER>\n" ); + TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" ); *tmp = tmp->arg( *((yyvsp[(1) - (4)]._str)) + "<" + *((yyvsp[(3) - (4)]._str)) + ">" ); (yyval._str) = tmp; ;} @@ -2157,7 +2157,7 @@ yyreduce: #line 347 "yacc.yy" { /* $$ = $1; */ - (yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); ;} break; @@ -2175,7 +2175,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 359 "yacc.yy" { - (yyval._str) = new QString( "" ); + (yyval._str) = new TQString( "" ); ;} break; @@ -2192,7 +2192,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 373 "yacc.yy" { - (yyval._str) = new QString( "" ); + (yyval._str) = new TQString( "" ); ;} break; @@ -2201,7 +2201,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 377 "yacc.yy" { - (yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) ); ;} break; @@ -2210,7 +2210,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 381 "yacc.yy" { - (yyval._str) = new QString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); ;} break; @@ -2219,7 +2219,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 385 "yacc.yy" { - (yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) ); ;} break; @@ -2416,11 +2416,11 @@ yyreduce: #line 475 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n"); + TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n"); *tmp = tmp->arg( *((yyvsp[(6) - (7)]._str)) ).arg( *((yyvsp[(2) - (7)]._str)) ).arg( *((yyvsp[(4) - (7)]._str)) ); (yyval._str) = tmp; } else { - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); } ;} break; @@ -2457,140 +2457,140 @@ yyreduce: /* Line 1455 of yacc.c */ #line 503 "yacc.yy" - { (yyval._str) = new QString("signed int"); ;} + { (yyval._str) = new TQString("signed int"); ;} break; case 90: /* Line 1455 of yacc.c */ #line 504 "yacc.yy" - { (yyval._str) = new QString("signed int"); ;} + { (yyval._str) = new TQString("signed int"); ;} break; case 91: /* Line 1455 of yacc.c */ #line 505 "yacc.yy" - { (yyval._str) = new QString("unsigned int"); ;} + { (yyval._str) = new TQString("unsigned int"); ;} break; case 92: /* Line 1455 of yacc.c */ #line 506 "yacc.yy" - { (yyval._str) = new QString("unsigned int"); ;} + { (yyval._str) = new TQString("unsigned int"); ;} break; case 93: /* Line 1455 of yacc.c */ #line 507 "yacc.yy" - { (yyval._str) = new QString("signed short int"); ;} + { (yyval._str) = new TQString("signed short int"); ;} break; case 94: /* Line 1455 of yacc.c */ #line 508 "yacc.yy" - { (yyval._str) = new QString("signed short int"); ;} + { (yyval._str) = new TQString("signed short int"); ;} break; case 95: /* Line 1455 of yacc.c */ #line 509 "yacc.yy" - { (yyval._str) = new QString("signed long int"); ;} + { (yyval._str) = new TQString("signed long int"); ;} break; case 96: /* Line 1455 of yacc.c */ #line 510 "yacc.yy" - { (yyval._str) = new QString("signed long int"); ;} + { (yyval._str) = new TQString("signed long int"); ;} break; case 97: /* Line 1455 of yacc.c */ #line 511 "yacc.yy" - { (yyval._str) = new QString("unsigned short int"); ;} + { (yyval._str) = new TQString("unsigned short int"); ;} break; case 98: /* Line 1455 of yacc.c */ #line 512 "yacc.yy" - { (yyval._str) = new QString("unsigned short int"); ;} + { (yyval._str) = new TQString("unsigned short int"); ;} break; case 99: /* Line 1455 of yacc.c */ #line 513 "yacc.yy" - { (yyval._str) = new QString("unsigned long int"); ;} + { (yyval._str) = new TQString("unsigned long int"); ;} break; case 100: /* Line 1455 of yacc.c */ #line 514 "yacc.yy" - { (yyval._str) = new QString("unsigned long int"); ;} + { (yyval._str) = new TQString("unsigned long int"); ;} break; case 101: /* Line 1455 of yacc.c */ #line 515 "yacc.yy" - { (yyval._str) = new QString("int"); ;} + { (yyval._str) = new TQString("int"); ;} break; case 102: /* Line 1455 of yacc.c */ #line 516 "yacc.yy" - { (yyval._str) = new QString("long int"); ;} + { (yyval._str) = new TQString("long int"); ;} break; case 103: /* Line 1455 of yacc.c */ #line 517 "yacc.yy" - { (yyval._str) = new QString("long int"); ;} + { (yyval._str) = new TQString("long int"); ;} break; case 104: /* Line 1455 of yacc.c */ #line 518 "yacc.yy" - { (yyval._str) = new QString("short int"); ;} + { (yyval._str) = new TQString("short int"); ;} break; case 105: /* Line 1455 of yacc.c */ #line 519 "yacc.yy" - { (yyval._str) = new QString("short int"); ;} + { (yyval._str) = new TQString("short int"); ;} break; case 106: /* Line 1455 of yacc.c */ #line 520 "yacc.yy" - { (yyval._str) = new QString("char"); ;} + { (yyval._str) = new TQString("char"); ;} break; case 107: /* Line 1455 of yacc.c */ #line 521 "yacc.yy" - { (yyval._str) = new QString("signed char"); ;} + { (yyval._str) = new TQString("signed char"); ;} break; case 108: /* Line 1455 of yacc.c */ #line 522 "yacc.yy" - { (yyval._str) = new QString("unsigned char"); ;} + { (yyval._str) = new TQString("unsigned char"); ;} break; case 111: @@ -2598,7 +2598,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 532 "yacc.yy" { - (yyval._str) = new QString( "" ); + (yyval._str) = new TQString( "" ); ;} break; @@ -2607,7 +2607,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 537 "yacc.yy" { - (yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); + (yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) ); ;} break; @@ -2637,7 +2637,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 548 "yacc.yy" { - QString *tmp = new QString("%1<%2>"); + TQString *tmp = new TQString("%1<%2>"); *tmp = tmp->arg(*((yyvsp[(1) - (4)]._str))); *tmp = tmp->arg(*((yyvsp[(3) - (4)]._str))); (yyval._str) = tmp; @@ -2649,7 +2649,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 554 "yacc.yy" { - QString *tmp = new QString("%1<%2>::%3"); + TQString *tmp = new TQString("%1<%2>::%3"); *tmp = tmp->arg(*((yyvsp[(1) - (6)]._str))); *tmp = tmp->arg(*((yyvsp[(3) - (6)]._str))); *tmp = tmp->arg(*((yyvsp[(6) - (6)]._str))); @@ -2662,7 +2662,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 566 "yacc.yy" { - (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str))); + (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str))); ;} break; @@ -2710,7 +2710,7 @@ yyreduce: #line 596 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); + TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) ); (yyval._str) = tmp; } @@ -2722,7 +2722,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 603 "yacc.yy" { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(2) - (2)]._str)) ); (yyval._str) = tmp; ;} @@ -2733,7 +2733,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 608 "yacc.yy" { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) ); (yyval._str) = tmp; ;} @@ -2745,7 +2745,7 @@ yyreduce: #line 613 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); + TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) ); (yyval._str) = tmp; } @@ -2767,7 +2767,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 625 "yacc.yy" { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) ); (yyval._str) = tmp; ;} @@ -2788,7 +2788,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 639 "yacc.yy" { - (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str))); + (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str))); ;} break; @@ -2807,11 +2807,11 @@ yyreduce: #line 650 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("\n <ARG>%1<NAME>%2</NAME></ARG>"); + TQString* tmp = new TQString("\n <ARG>%1<NAME>%2</NAME></ARG>"); *tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) ); *tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) ); (yyval._str) = tmp; - } else (yyval._str) = new QString(); + } else (yyval._str) = new TQString(); ;} break; @@ -2821,10 +2821,10 @@ yyreduce: #line 659 "yacc.yy" { if (dcop_area) { - QString* tmp = new QString("\n <ARG>%1</ARG>"); + TQString* tmp = new TQString("\n <ARG>%1</ARG>"); *tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) ); (yyval._str) = tmp; - } else (yyval._str) = new QString(); + } else (yyval._str) = new TQString(); ;} break; @@ -2835,7 +2835,7 @@ yyreduce: { if (dcop_area) yyerror("variable arguments not supported in dcop area."); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -2923,8 +2923,8 @@ yyreduce: #line 716 "yacc.yy" { if (dcop_area || dcop_signal_area) { - QString* tmp = 0; - tmp = new QString( + TQString* tmp = 0; + tmp = new TQString( " <%4>\n" " %2\n" " <NAME>%1</NAME>" @@ -2934,13 +2934,13 @@ yyreduce: *tmp = tmp->arg( *((yyvsp[(1) - (6)]._str)) ); *tmp = tmp->arg( *((yyvsp[(4) - (6)]._str)) ); - QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC"; - QString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : ""; - *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) ); - *tmp = tmp->arg( QString("%1").arg(tagname) ); + TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC"; + TQString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : ""; + *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) ); + *tmp = tmp->arg( TQString("%1").arg(tagname) ); (yyval._str) = tmp; } else - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -2951,7 +2951,7 @@ yyreduce: { if (dcop_area) yyerror("operators aren't allowed in dcop areas!"); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -3031,7 +3031,7 @@ yyreduce: { /* The constructor */ assert(!dcop_area); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -3042,7 +3042,7 @@ yyreduce: { /* The constructor */ assert(!dcop_area); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -3053,7 +3053,7 @@ yyreduce: { /* The destructor */ assert(!dcop_area); - (yyval._str) = new QString(""); + (yyval._str) = new TQString(""); ;} break; @@ -3068,7 +3068,7 @@ yyreduce: else yyerror("DCOP functions cannot be static"); } else { - (yyval._str) = new QString(); + (yyval._str) = new TQString(); } ;} break; diff --git a/dcop/dcopidl/yacc.cpp.h b/dcop/dcopidl/yacc.cpp.h index 2a6c1b403..5bbacfa1f 100644 --- a/dcop/dcopidl/yacc.cpp.h +++ b/dcop/dcopidl/yacc.cpp.h @@ -116,7 +116,7 @@ typedef union YYSTYPE #line 67 "yacc.yy" long _int; - QString *_str; + TQString *_str; unsigned short _char; double _float; diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy index ac744e902..82d5fc333 100644 --- a/dcop/dcopidl/yacc.yy +++ b/dcop/dcopidl/yacc.yy @@ -42,14 +42,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern int yylex(); -// extern QString idl_lexFile; +// extern TQString idl_lexFile; extern int idl_line_no; extern int function_mode; static int dcop_area = 0; static int dcop_signal_area = 0; -static QString in_namespace( "" ); +static TQString in_namespace( "" ); void dcopidlInitFlex( const char *_code ); @@ -66,7 +66,7 @@ void yyerror( const char *s ) %union { long _int; - QString *_str; + TQString *_str; unsigned short _char; double _float; } @@ -306,7 +306,7 @@ Identifier $$ = $1; } | T_IDENTIFIER T_SCOPE Identifier { - QString* tmp = new QString( "%1::%2" ); + TQString* tmp = new TQString( "%1::%2" ); *tmp = tmp->arg(*($1)).arg(*($3)); $$ = tmp; } @@ -315,13 +315,13 @@ Identifier super_class_name : Identifier { - QString* tmp = new QString( " <SUPER>%1</SUPER>\n" ); + TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" ); *tmp = tmp->arg( *($1) ); $$ = tmp; } | Identifier T_LESS type_list T_GREATER { - QString* tmp = new QString( " <SUPER>%1</SUPER>\n" ); + TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" ); *tmp = tmp->arg( *($1) + "<" + *($3) + ">" ); $$ = tmp; } @@ -346,7 +346,7 @@ super_classes | super_class T_COMMA super_classes { /* $$ = $1; */ - $$ = new QString( *($1) + *($3) ); + $$ = new TQString( *($1) + *($3) ); } ; @@ -357,7 +357,7 @@ class_header } | T_LEFT_CURLY_BRACKET { - $$ = new QString( "" ); + $$ = new TQString( "" ); } ; @@ -371,19 +371,19 @@ opt_semicolon body : T_RIGHT_CURLY_BRACKET { - $$ = new QString( "" ); + $$ = new TQString( "" ); } | typedef body { - $$ = new QString( *($1) + *($2) ); + $$ = new TQString( *($1) + *($2) ); } | T_INLINE function body { - $$ = new QString( *($2) + *($3) ); + $$ = new TQString( *($2) + *($3) ); } | function body { - $$ = new QString( *($1) + *($2) ); + $$ = new TQString( *($1) + *($2) ); } | dcop_signal_area_begin body { @@ -474,11 +474,11 @@ typedef : T_TYPEDEF Identifier T_LESS type_list T_GREATER Identifier T_SEMICOLON { if (dcop_area) { - QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n"); + TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n"); *tmp = tmp->arg( *($6) ).arg( *($2) ).arg( *($4) ); $$ = tmp; } else { - $$ = new QString(""); + $$ = new TQString(""); } } | T_TYPEDEF Identifier T_LESS type_list T_GREATER T_SCOPE T_IDENTIFIER Identifier T_SEMICOLON @@ -500,26 +500,26 @@ const_qualifier ; int_type - : T_SIGNED { $$ = new QString("signed int"); } - | T_SIGNED T_INT { $$ = new QString("signed int"); } - | T_UNSIGNED { $$ = new QString("unsigned int"); } - | T_UNSIGNED T_INT { $$ = new QString("unsigned int"); } - | T_SIGNED T_SHORT { $$ = new QString("signed short int"); } - | T_SIGNED T_SHORT T_INT { $$ = new QString("signed short int"); } - | T_SIGNED T_LONG { $$ = new QString("signed long int"); } - | T_SIGNED T_LONG T_INT { $$ = new QString("signed long int"); } - | T_UNSIGNED T_SHORT { $$ = new QString("unsigned short int"); } - | T_UNSIGNED T_SHORT T_INT { $$ = new QString("unsigned short int"); } - | T_UNSIGNED T_LONG { $$ = new QString("unsigned long int"); } - | T_UNSIGNED T_LONG T_INT { $$ = new QString("unsigned long int"); } - | T_INT { $$ = new QString("int"); } - | T_LONG { $$ = new QString("long int"); } - | T_LONG T_INT { $$ = new QString("long int"); } - | T_SHORT { $$ = new QString("short int"); } - | T_SHORT T_INT { $$ = new QString("short int"); } - | T_CHAR { $$ = new QString("char"); } - | T_SIGNED T_CHAR { $$ = new QString("signed char"); } - | T_UNSIGNED T_CHAR { $$ = new QString("unsigned char"); } + : T_SIGNED { $$ = new TQString("signed int"); } + | T_SIGNED T_INT { $$ = new TQString("signed int"); } + | T_UNSIGNED { $$ = new TQString("unsigned int"); } + | T_UNSIGNED T_INT { $$ = new TQString("unsigned int"); } + | T_SIGNED T_SHORT { $$ = new TQString("signed short int"); } + | T_SIGNED T_SHORT T_INT { $$ = new TQString("signed short int"); } + | T_SIGNED T_LONG { $$ = new TQString("signed long int"); } + | T_SIGNED T_LONG T_INT { $$ = new TQString("signed long int"); } + | T_UNSIGNED T_SHORT { $$ = new TQString("unsigned short int"); } + | T_UNSIGNED T_SHORT T_INT { $$ = new TQString("unsigned short int"); } + | T_UNSIGNED T_LONG { $$ = new TQString("unsigned long int"); } + | T_UNSIGNED T_LONG T_INT { $$ = new TQString("unsigned long int"); } + | T_INT { $$ = new TQString("int"); } + | T_LONG { $$ = new TQString("long int"); } + | T_LONG T_INT { $$ = new TQString("long int"); } + | T_SHORT { $$ = new TQString("short int"); } + | T_SHORT T_INT { $$ = new TQString("short int"); } + | T_CHAR { $$ = new TQString("char"); } + | T_SIGNED T_CHAR { $$ = new TQString("signed char"); } + | T_UNSIGNED T_CHAR { $$ = new TQString("unsigned char"); } ; asterisks @@ -530,12 +530,12 @@ asterisks params : /* empty */ { - $$ = new QString( "" ); + $$ = new TQString( "" ); } | param | params T_COMMA param { - $$ = new QString( *($1) + *($3) ); + $$ = new TQString( *($1) + *($3) ); } ; @@ -546,13 +546,13 @@ type_name | T_STRUCT Identifier { $$ = $2; } | T_CLASS Identifier { $$ = $2; } | Identifier T_LESS templ_type_list T_GREATER { - QString *tmp = new QString("%1<%2>"); + TQString *tmp = new TQString("%1<%2>"); *tmp = tmp->arg(*($1)); *tmp = tmp->arg(*($3)); $$ = tmp; } | Identifier T_LESS templ_type_list T_GREATER T_SCOPE Identifier{ - QString *tmp = new QString("%1<%2>::%3"); + TQString *tmp = new TQString("%1<%2>::%3"); *tmp = tmp->arg(*($1)); *tmp = tmp->arg(*($3)); *tmp = tmp->arg(*($6)); @@ -564,7 +564,7 @@ type_name templ_type_list : templ_type T_COMMA templ_type_list { - $$ = new QString(*($1) + "," + *($3)); + $$ = new TQString(*($1) + "," + *($3)); } | templ_type { @@ -595,24 +595,24 @@ type } | T_CONST type_name T_AMPERSAND { if (dcop_area) { - QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); + TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); *tmp = tmp->arg( *($2) ); $$ = tmp; } } | T_CONST type_name %prec T_UNIMPORTANT { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *($2) ); $$ = tmp; } | type_name T_CONST %prec T_UNIMPORTANT { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *($1) ); $$ = tmp; } | type_name T_CONST T_AMPERSAND { if (dcop_area) { - QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); + TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); *tmp = tmp->arg( *($1) ); $$ = tmp; } @@ -623,7 +623,7 @@ type } | type_name %prec T_UNIMPORTANT { - QString* tmp = new QString("<TYPE>%1</TYPE>"); + TQString* tmp = new TQString("<TYPE>%1</TYPE>"); *tmp = tmp->arg( *($1) ); $$ = tmp; } @@ -637,7 +637,7 @@ type type_list : type T_COMMA type_list { - $$ = new QString(*($1) + "," + *($3)); + $$ = new TQString(*($1) + "," + *($3)); } | type { @@ -649,25 +649,25 @@ param : type Identifier default { if (dcop_area) { - QString* tmp = new QString("\n <ARG>%1<NAME>%2</NAME></ARG>"); + TQString* tmp = new TQString("\n <ARG>%1<NAME>%2</NAME></ARG>"); *tmp = tmp->arg( *($1) ); *tmp = tmp->arg( *($2) ); $$ = tmp; - } else $$ = new QString(); + } else $$ = new TQString(); } | type default { if (dcop_area) { - QString* tmp = new QString("\n <ARG>%1</ARG>"); + TQString* tmp = new TQString("\n <ARG>%1</ARG>"); *tmp = tmp->arg( *($1) ); $$ = tmp; - } else $$ = new QString(); + } else $$ = new TQString(); } | T_TRIPLE_DOT { if (dcop_area) yyerror("variable arguments not supported in dcop area."); - $$ = new QString(""); + $$ = new TQString(""); } ; @@ -715,8 +715,8 @@ function_header : type Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier { if (dcop_area || dcop_signal_area) { - QString* tmp = 0; - tmp = new QString( + TQString* tmp = 0; + tmp = new TQString( " <%4>\n" " %2\n" " <NAME>%1</NAME>" @@ -726,19 +726,19 @@ function_header *tmp = tmp->arg( *($1) ); *tmp = tmp->arg( *($4) ); - QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC"; - QString attr = ($6) ? " qual=\"const\"" : ""; - *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) ); - *tmp = tmp->arg( QString("%1").arg(tagname) ); + TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC"; + TQString attr = ($6) ? " qual=\"const\"" : ""; + *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) ); + *tmp = tmp->arg( TQString("%1").arg(tagname) ); $$ = tmp; } else - $$ = new QString(""); + $$ = new TQString(""); } | type T_FUNOPERATOR operator T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier { if (dcop_area) yyerror("operators aren't allowed in dcop areas!"); - $$ = new QString(""); + $$ = new TQString(""); } ; @@ -778,19 +778,19 @@ function { /* The constructor */ assert(!dcop_area); - $$ = new QString(""); + $$ = new TQString(""); } | Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS T_COLON init_list function_body { /* The constructor */ assert(!dcop_area); - $$ = new QString(""); + $$ = new TQString(""); } | virtual_qualifier T_TILDE Identifier T_LEFT_PARANTHESIS T_RIGHT_PARANTHESIS function_body { /* The destructor */ assert(!dcop_area); - $$ = new QString(""); + $$ = new TQString(""); } | T_STATIC function_header function_body { @@ -800,7 +800,7 @@ function else yyerror("DCOP functions cannot be static"); } else { - $$ = new QString(); + $$ = new TQString(); } } ; diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h index 66f18f92f..1d6d95a36 100644 --- a/dcop/dcopidl2cpp/dcopidl_test.h +++ b/dcop/dcopidl2cpp/dcopidl_test.h @@ -10,7 +10,7 @@ class TDEUI_EXPORT DefaultTest : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: DefaultTest(); @@ -70,7 +70,7 @@ public: class NonHashingTest : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: NonHashingTest(); @@ -80,7 +80,7 @@ k_dcop: class HashingTest : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: HashingTest(); diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus index 38b38a013..e3119b3dc 100644 --- a/dcop/dcopidlng/kalyptus +++ b/dcop/dcopidlng/kalyptus @@ -73,9 +73,9 @@ public: virtual bool tqt_emit( int, QUObject* ); virtual bool tqt_property( int, int, QVariant* ); static QMetaObject* staticMetaObject(); - QObject* qObject(); - static QString tr( const char *, const char * = 0 ); - static QString trUtf8( const char *, const char * = 0 ); + TQObject* qObject(); + static TQString tr( const char *, const char * = 0 ); + static TQString trUtf8( const char *, const char * = 0 ); private: CODE @@ -98,9 +98,8 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); _STYLE_PLATINUM => '', _STYLE_SGI => '', _STYLE_WINDOWS => '', - QT_STATIC_CONST => 'static const', - Q_EXPORT => '', - Q_REFCOUNT => '', + TQ_EXPORT => '', + TQ_REFCOUNT => '', QM_EXPORT_CANVAS => '', QM_EXPORT_DNS => '', QM_EXPORT_ICONVIEW => '', @@ -109,19 +108,18 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); QM_EXPORT_WORKSPACE => '', TQT_NO_REMOTE => 'TQT_NO_REMOTE', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', - Q_WS_X11 => 'Q_WS_X11', + TQ_WS_X11 => 'TQ_WS_X11', TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', - Q_WS_QWS => 'undef', - Q_WS_MAC => 'undef', - Q_OBJECT => <<'CODE', + TQ_WS_QWS => 'undef', + TQ_WS_MAC => 'undef', TQ_OBJECT => <<'CODE', public: virtual QMetaObject *metaObject() const; virtual const char *className() const; virtual bool tqt_invoke( int, QUObject* ); virtual bool tqt_emit( int, QUObject* ); - static QString tr( const char *, const char * = 0 ); - static QString trUtf8( const char *, const char * = 0 ); + static TQString tr( const char *, const char * = 0 ); + static TQString trUtf8( const char *, const char * = 0 ); private: CODE }; @@ -373,7 +371,7 @@ sub readSourceLine =head2 readCxxLine Reads a C++ source line, skipping comments, blank lines, - preprocessor tokens and the Q_OBJECT/TQ_OBJECT macros + preprocessor tokens and the TQ_OBJECT macros =cut @@ -401,16 +399,11 @@ LOOP: } } - if ( $p =~ /^\s*Q_OBJECT/ ) { - push @inputqueue, @codeqobject; - next; - } if ( $p =~ /^\s*TQ_OBJECT/ ) { push @inputqueue, @codeqobject; next; } # Hack, waiting for real handling of preprocessor defines - $p =~ s/QT_STATIC_CONST/static const/; $p =~ s/KSVG_GET/KJS::Value get();/; $p =~ s/KSVG_BASECLASS_GET/KJS::Value get();/; $p =~ s/KSVG_BRIDGE/KJS::ObjectImp *bridge();/; @@ -423,7 +416,7 @@ LOOP: } next if ( $p =~ /^\s*$/s ); # blank lines -# || $p =~ /^\s*Q_OBJECT/ # QObject macro +# || $p =~ /^\s*TQ_OBJECT/ # TQObject macro # ); # @@ -431,7 +424,7 @@ LOOP: || $p =~ /^\s*TQ_PROPERTY/ # and TQ_PROPERTY || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE || $p =~ /^\s*TQ_SETS/ - || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ + || $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCAFACTORY/ # || $p =~ /^\s*KSVG_/ # and KSVG stuff ;) @@ -456,8 +449,8 @@ LOOP: else { # Skip platform-specific stuff, or #if 0 stuff # or #else of something we parsed (e.g. for QKeySequence) - if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or - $p =~ m/^#\s*if\s+defined\(Q_WS_/ or + if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or + $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or $p =~ m/^#\s*if\s+defined\(Q_OS_/ or $p =~ m/^#\s*if\s+defined\(Q_CC_/ or $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or @@ -713,7 +706,7 @@ sub identifyDecl \s*(class|struct|union|namespace) # 2 struct type \s*([A-Z_]*EXPORT[A-Z_]*)? # 3 export (?:\s*TQ_PACKED)? - (?:\s*Q_REFCOUNT)? + (?:\s*TQ_REFCOUNT)? \s+([\w_]+ # 4 name (?:<[\w_ :,]+?>)? # maybe explicit template # (eat chars between <> non-hungry) @@ -776,7 +769,10 @@ sub identifyDecl \( (.*?) \) # parameters \s*((?:const)?)\s* (?:throw\s*\(.*?\))? - \s*((?:=\s*0(?:L?))?)\s* # Pureness. is "0L" allowed? + \s*((?:=\s*(?: + 0(?:L?)| # Pureness. is "0L" allowed? + default # Default method + ))?) \s*[;{]+/xs ) { # rest my $tpn = $1; # type + name @@ -788,7 +784,7 @@ sub identifyDecl } my $const = $3 eq "" ? 0 : 1; - my $pure = $4 eq "" ? 0 : 1; + my $pure = $4 eq "" ? 0 : ($4 =~ "default" ? 0 : 1); $tpn =~ s/\s+/ /g; $params =~ s/\s+/ /g; @@ -1475,7 +1471,7 @@ sub newMethod This property contains a list of nodes, one for each parameter. Each parameter node has the following properties: - * ArgType the type of the argument, e.g. const QString& + * ArgType the type of the argument, e.g. const TQString& * ArgName the name of the argument - optionnal * DefaultValue the default value of the argument - optionnal diff --git a/dcop/dcopidlng/kdocUtil.pm b/dcop/dcopidlng/kdocUtil.pm index 629147ac3..e045a6790 100644 --- a/dcop/dcopidlng/kdocUtil.pm +++ b/dcop/dcopidlng/kdocUtil.pm @@ -139,7 +139,7 @@ sub userName =head2 splitUnnested Helper to split a list using a delimiter, but looking for nesting with (), {}, [] and <>. - Example: splitting int a, QPair<c,b> d, e="," + Example: splitting int a, TQPair<c,b> d, e="," on ',' will give 3 items in the list. Parameter: delimiter, string diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp index f02d07325..fd39fb347 100644 --- a/dcop/dcopobject.cpp +++ b/dcop/dcopobject.cpp @@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj) while (currentObj != 0L) { ident.prepend( currentObj->name() ); ident.prepend("/"); - currentObj = TQT_TQOBJECT(currentObj->parent()); + currentObj = currentObj->parent(); } if ( ident[0] == '/' ) ident = ident.mid(1); @@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj ) { identity.prepend( currentObj->name() ); identity.prepend("/"); - currentObj = TQT_TQOBJECT(currentObj->parent()); + currentObj = currentObj->parent(); } if ( identity[0] == '/' ) identity = identity.mid(1); diff --git a/dcop/dcopref.h b/dcop/dcopref.h index 6864bc4ad..c85654e0e 100644 --- a/dcop/dcopref.h +++ b/dcop/dcopref.h @@ -238,7 +238,7 @@ inline TQDataStream & operator << (TQDataStream & str, const DCOPArg& arg ) * dcopTypeName function, for example * * \code - * inline const char* dcopTypeName( const TQString& ) { return TQSTRING_OBJECT_NAME_STRING; } + * inline const char* dcopTypeName( const TQString& ) { return "TQString"; } * \endcode * * If you use custom data types that do support TQDataStream but have diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index ec6086f09..99c3cba67 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -306,8 +306,8 @@ tqWarning("[dcopserver] waitForOutputReady fd = %d datasize = %d start = %d", so if (!outputBufferNotifier) { outputBufferNotifier = new TQSocketNotifier(socket(), Write); - connect(outputBufferNotifier, TQT_SIGNAL(activated(int)), - the_server, TQT_SLOT(slotOutputReady(int))); + connect(outputBufferNotifier, TQ_SIGNAL(activated(int)), + the_server, TQ_SLOT(slotOutputReady(int))); } outputBufferNotifier->setEnabled(true); return; @@ -1055,16 +1055,16 @@ DCOPServer::DCOPServer(bool _suicide) for ( int i = 0; i < numTransports; i++) { con = new DCOPListener( listenObjs[i] ); listener.append( con ); - connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newClient(int) ) ); + connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( newClient(int) ) ); } char c = 0; write(ready[1], &c, 1); // dcopserver is started close(ready[1]); m_timer = new TQTimer(this); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); m_deadConnectionTimer = new TQTimer(this); - connect( m_deadConnectionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCleanDeadConnections()) ); + connect( m_deadConnectionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCleanDeadConnections()) ); #ifdef Q_OS_WIN char szEventName[256]; @@ -1183,7 +1183,7 @@ void DCOPServer::newClient( int /*socket*/ ) void* DCOPServer::watchConnection( IceConn iceConn ) { DCOPConnection* con = new DCOPConnection( iceConn ); - connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) ); + connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( processData(int) ) ); clients.insert(iceConn, con ); fd_clients.insert( IceConnectionNumber(iceConn), con); @@ -1293,8 +1293,8 @@ void DCOPServer::slotTerminate() #endif TQByteArray data; dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false); - disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) ); + disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSuicide()) ); system(findDcopserverShutdown()+" --nokill"); } @@ -1321,8 +1321,8 @@ void DCOPServer::slotShutdown() TQByteArray data; dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false); m_timer->start( 10000 ); // if within 10 seconds nothing happens, we'll terminate - disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotExit()) ); + disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotExit()) ); if (appIds.isEmpty()) slotExit(); // Exit now } @@ -1618,7 +1618,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false) if (::access(fName.data(), R_OK) == 0) { TQFile f(fName); f.open(IO_ReadOnly); - int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file + int size = TQMIN( (long)1024, f.size() ); // protection against a huge file TQCString contents( size+1 ); bool ok = f.readBlock( contents.data(), size ) == size; contents[size] = '\0'; @@ -1779,7 +1779,7 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] ) SetConsoleCtrlHandler(DCOPServer::dcopServerConsoleProc,TRUE); #else TQSocketNotifier DEATH(pipeOfDeath[0], TQSocketNotifier::Read, 0, 0); - server->connect(&DEATH, TQT_SIGNAL(activated(int)), TQT_SLOT(slotShutdown())); + server->connect(&DEATH, TQ_SIGNAL(activated(int)), TQ_SLOT(slotShutdown())); #endif int ret = a.exec(); diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h index f0f5d1137..e17ee4ef1 100644 --- a/dcop/dcopserver.h +++ b/dcop/dcopserver.h @@ -34,8 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqintdict.h> #include <tqapplication.h> -#define INT32 QINT32 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xmd.h> #endif @@ -116,7 +115,7 @@ public: */ class DCOPServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: DCOPServer(bool _suicide); ~DCOPServer(); diff --git a/dcop/dcopserver_shutdown.c b/dcop/dcopserver_shutdown.c index af75c6d5a..8b1ee2884 100644 --- a/dcop/dcopserver_shutdown.c +++ b/dcop/dcopserver_shutdown.c @@ -54,9 +54,9 @@ static char *getDisplay() /* don't test for a value from tqglobal.h but instead distinguish Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS - on the commandline (which in tqglobal.h however triggers Q_WS_QWS, + on the commandline (which in tqglobal.h however triggers TQ_WS_QWS, but we don't want to include that here) (Simon) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 */ #if !defined(QWS) display = getenv("DISPLAY"); diff --git a/dcop/dcopserver_shutdown_win.cpp b/dcop/dcopserver_shutdown_win.cpp index 384bd6f36..af38c66f8 100644 --- a/dcop/dcopserver_shutdown_win.cpp +++ b/dcop/dcopserver_shutdown_win.cpp @@ -64,9 +64,9 @@ static char *getDisplay() /* don't test for a value from tqglobal.h but instead distinguish Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS - on the commandline (which in tqglobal.h however triggers Q_WS_QWS, + on the commandline (which in tqglobal.h however triggers TQ_WS_QWS, but we don't want to include that here) (Simon) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 */ #if !defined(QWS) display = getenv("DISPLAY"); diff --git a/dcop/dcoptypes.h b/dcop/dcoptypes.h index 548483e97..d70f787f7 100644 --- a/dcop/dcoptypes.h +++ b/dcop/dcoptypes.h @@ -37,38 +37,38 @@ inline const char* dcopTypeName( long ) { return "long int"; } inline const char* dcopTypeName( ulong ) { return "ulong"; } inline const char* dcopTypeName( double ) { return "double"; } inline const char* dcopTypeName( float ) { return "float"; } -inline const char* dcopTypeName( const char* ) { return TQCSTRING_OBJECT_NAME_STRING; } +inline const char* dcopTypeName( const char* ) { return "TQCString"; } // dcop specialities class DCOPRef; inline const char* dcopTypeName( const DCOPRef& ) { return "DCOPRef"; } // Qt variant types -class TQString; inline const char* dcopTypeName( const TQString& ) { return TQSTRING_OBJECT_NAME_STRING; } -class TQCString; inline const char* dcopTypeName( const TQCString& ) { return TQCSTRING_OBJECT_NAME_STRING; } -class TQFont; inline const char* dcopTypeName( const TQFont& ) { return TQFONT_OBJECT_NAME_STRING; } -class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return TQPIXMAP_OBJECT_NAME_STRING; } -class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return TQBRUSH_OBJECT_NAME_STRING; } -class TQRect; inline const char* dcopTypeName( const TQRect& ) { return TQRECT_OBJECT_NAME_STRING; } -class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return TQPOINT_OBJECT_NAME_STRING; } -class TQImage; inline const char* dcopTypeName( const TQImage& ) { return TQIMAGE_OBJECT_NAME_STRING; } -class TQSize; inline const char* dcopTypeName( const TQSize& ) { return TQSIZE_OBJECT_NAME_STRING; } -class TQColor; inline const char* dcopTypeName( const TQColor& ) { return TQCOLOR_OBJECT_NAME_STRING; } -class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return TQPALETTE_OBJECT_NAME_STRING; } -class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return TQCOLORGROUP_OBJECT_NAME_STRING; } -class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return TQICONSET_OBJECT_NAME_STRING; } -class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return TQDATASTREAM_OBJECT_NAME_STRING; } -class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return TQPOINTARRAY_OBJECT_NAME_STRING; } -class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return TQREGION_OBJECT_NAME_STRING; } -class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return TQBITMAP_OBJECT_NAME_STRING; } -class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return TQCURSOR_OBJECT_NAME_STRING; } -class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return TQSTRINGLIST_OBJECT_NAME_STRING; } -class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return TQSIZEPOLICY_OBJECT_NAME_STRING; } -class TQDate; inline const char* dcopTypeName( const TQDate& ) { return TQDATE_OBJECT_NAME_STRING; } -class TQTime; inline const char* dcopTypeName( const TQTime& ) { return TQTIME_OBJECT_NAME_STRING; } -class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return TQDATETIME_OBJECT_NAME_STRING; } -class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return TQBITARRAY_OBJECT_NAME_STRING; } -class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return TQKEYSEQUENCE_OBJECT_NAME_STRING; } -class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return TQVARIANT_OBJECT_NAME_STRING; } +class TQString; inline const char* dcopTypeName( const TQString& ) { return "TQString"; } +class TQCString; inline const char* dcopTypeName( const TQCString& ) { return "TQCString"; } +class TQFont; inline const char* dcopTypeName( const TQFont& ) { return "TQFont"; } +class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return "TQPixmap"; } +class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return "TQBrush"; } +class TQRect; inline const char* dcopTypeName( const TQRect& ) { return "TQRect"; } +class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return "TQPoint"; } +class TQImage; inline const char* dcopTypeName( const TQImage& ) { return "TQImage"; } +class TQSize; inline const char* dcopTypeName( const TQSize& ) { return "TQSize"; } +class TQColor; inline const char* dcopTypeName( const TQColor& ) { return "TQColor"; } +class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return "TQPalette"; } +class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return "TQColorGroup"; } +class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return "TQIconSet"; } +class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return "TQDataStream"; } +class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return "TQPointArray"; } +class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return "TQRegion"; } +class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return "TQBitmap"; } +class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return "TQCursor"; } +class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return "TQStringList"; } +class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return "TQSizePolicy"; } +class TQDate; inline const char* dcopTypeName( const TQDate& ) { return "TQDate"; } +class TQTime; inline const char* dcopTypeName( const TQTime& ) { return "TQTime"; } +class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return "TQDateTime"; } +class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return "TQBitArray"; } +class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return "TQKeySequence"; } +class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return "TQVariant"; } template<class Key, class T> class TQMap; typedef TQMap<TQString, TQVariant> TQStringVariantMap; diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h index 4a135b9d9..345d46d87 100644 --- a/dcop/kdatastream.h +++ b/dcop/kdatastream.h @@ -3,7 +3,6 @@ #include <tqdatastream.h> -#ifdef USE_QT3 inline TQDataStream & operator << (TQDataStream & str, bool b) { str << TQ_INT8(b); @@ -17,42 +16,5 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b) b = bool(l); return str; } -#endif // USE_QT3 - -#if TQT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) -inline TQDataStream & operator << (TQDataStream & str, long long int ll) -{ - TQ_UINT32 l1,l2; - l1 = ll & 0xffffffffLL; - l2 = ll >> 32; - str << l1 << l2; - return str; -} - -inline TQDataStream & operator >> (TQDataStream & str, long long int&ll) -{ - TQ_UINT32 l1,l2; - str >> l1 >> l2; - ll = ((unsigned long long int)(l2) << 32) + (long long int) l1; - return str; -} - -inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll) -{ - TQ_UINT32 l1,l2; - l1 = ll & 0xffffffffLL; - l2 = ll >> 32; - str << l1 << l2; - return str; -} - -inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll) -{ - TQ_UINT32 l1,l2; - str >> l1 >> l2; - ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1; - return str; -} -#endif #endif diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp index 1e70171d2..583a0255b 100644 --- a/dcop/testdcop.cpp +++ b/dcop/testdcop.cpp @@ -57,7 +57,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, printf("Rect x = %d, y = %d, w = %d, h = %d\n", arg1.x(), arg1.y(), arg1.width(), arg1.height()); - replyType = TQRECT_OBJECT_NAME_STRING; + replyType = "TQRect"; TQDataStream reply( replyData, IO_WriteOnly ); TQRect r(10,20,100,200); reply << r; @@ -74,7 +74,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, tqDebug("countDown() countDownAction = %p", countDownAction); if (countDownAction2) { - replyType = TQSTRING_OBJECT_NAME_STRING; + replyType = "TQString"; TQDataStream reply( replyData, IO_WriteOnly ); reply << TQString("Hey"); return true; @@ -84,13 +84,13 @@ tqDebug("countDown() countDownAction = %p", countDownAction); { countDownCount = 10; countDownAction = client->beginTransaction(); - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout())); } else { countDownCount2 = 10; countDownAction2 = client->beginTransaction(); - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2())); } return true; } @@ -104,7 +104,7 @@ void MyDCOPObject::slotTimeout() countDownCount--; if (countDownCount == 0) { - TQCString replyType = TQSTRING_OBJECT_NAME_STRING; + TQCString replyType = "TQString"; TQByteArray replyData; TQDataStream reply( replyData, IO_WriteOnly ); reply << TQString("Hello World"); @@ -113,7 +113,7 @@ void MyDCOPObject::slotTimeout() } else { - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout())); } } @@ -123,7 +123,7 @@ void MyDCOPObject::slotTimeout2() countDownCount2--; if (countDownCount2 == 0) { - TQCString replyType = TQSTRING_OBJECT_NAME_STRING; + TQCString replyType = "TQString"; TQByteArray replyData; TQDataStream reply( replyData, IO_WriteOnly ); reply << TQString("Hello World"); @@ -132,21 +132,21 @@ void MyDCOPObject::slotTimeout2() } else { - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2())); } } QCStringList MyDCOPObject::functions() { QCStringList result = DCOPObject::functions(); - result << TQRECT_OBJECT_NAME_STRING " canLaunchRockets(" TQRECT_OBJECT_NAME_STRING ")"; + result << "TQRect canLaunchRockets(TQRect)"; return result; } TestObject::TestObject(const TQCString& app) : m_app(app) { - TQTimer::singleShot(2500, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(2500, this, TQ_SLOT(slotTimeout())); } void TestObject::slotTimeout() @@ -191,10 +191,10 @@ int main(int argc, char **argv) TQCString appId = argv[1]; TestObject obj(appId); tqWarning("#1 Calling countDown"); - int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); + int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); tqDebug("#1 countDown() call id = %d", result); tqWarning("#2 Calling countDown"); - result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); + result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); tqDebug("#2 countDown() call id = %d", result); app.exec(); @@ -234,11 +234,11 @@ int main(int argc, char **argv) int n = client->registeredApplications().count(); tqDebug("number of attached applications = %d", n ); - TQObject::connect( client, TQT_SIGNAL( applicationRegistered( const TQCString&)), - obj1, TQT_SLOT( registered( const TQCString& ))); + TQObject::connect( client, TQ_SIGNAL( applicationRegistered( const TQCString&)), + obj1, TQ_SLOT( registered( const TQCString& ))); - TQObject::connect( client, TQT_SIGNAL( applicationRemoved( const TQCString&)), - obj1, TQT_SLOT( unregistered( const TQCString& ))); + TQObject::connect( client, TQ_SIGNAL( applicationRemoved( const TQCString&)), + obj1, TQ_SLOT( unregistered( const TQCString& ))); // Enable the above signals client->setNotifications( true ); diff --git a/dcop/testdcop.h b/dcop/testdcop.h index 3cb81372f..c3288bce9 100644 --- a/dcop/testdcop.h +++ b/dcop/testdcop.h @@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TestObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestObject(const TQCString &app); @@ -58,7 +58,7 @@ private: class MyDCOPObject : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: MyDCOPObject(const TQCString &name) : DCOPObject(name) {} bool process(const TQCString &fun, const TQByteArray &data, diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp index a129d7d6f..74dee9edd 100644 --- a/dcop/tests/driver.cpp +++ b/dcop/tests/driver.cpp @@ -39,7 +39,7 @@ void Driver::test() } ++count; - TQTimer::singleShot( 100, this, TQT_SLOT( test() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( test() ) ); } #include "driver.moc" @@ -58,7 +58,7 @@ int main(int argc, char** argv) app.dcopClient()->attach( ); app.dcopClient()->registerAs( "TestAppDriver" ); Driver * object = new Driver( appname ); - TQTimer::singleShot( 10, object, TQT_SLOT( test() ) ); + TQTimer::singleShot( 10, object, TQ_SLOT( test() ) ); return app.exec(); } diff --git a/dcop/tests/driver.h b/dcop/tests/driver.h index 3565d88ab..654707c4f 100644 --- a/dcop/tests/driver.h +++ b/dcop/tests/driver.h @@ -7,7 +7,7 @@ class Driver : public TQObject, public Test_stub { - Q_OBJECT + TQ_OBJECT public: Driver(const char*); diff --git a/dcop/tests/testcases b/dcop/tests/testcases index e2357eb1c..e3bd2e3d0 100644 --- a/dcop/tests/testcases +++ b/dcop/tests/testcases @@ -19,7 +19,7 @@ # 2. First you put shell like argument: # "string with spaces" 4 string_without_spaces # Then you should put c++ style arguments: -# QString::fromLatin1("string with spaces"),4,"string_with_spaces" +# TQString::fromLatin1("string with spaces"),4,"string_with_spaces" # # Note that the first argument has type TQString and the last type const char* # (adapt accordingly) @@ -29,7 +29,7 @@ TQString url () { -return QString::fromLatin1( "http://www.kde.org/"); +return TQString::fromLatin1( "http://www.kde.org/"); } - @@ -63,7 +63,7 @@ identity { return x; } -"test";QString::fromLatin1("test") +"test";TQString::fromLatin1("test") // 2.3 unsigned long int unsigned long int diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp index 229d56f7f..78cc2783a 100644 --- a/dnssd/domainbrowser.cpp +++ b/dnssd/domainbrowser.cpp @@ -86,8 +86,8 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent) d->m_domains+="local."; d->m_browseLAN=true; } - connect(TDEApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this, - TQT_SLOT(domainListChanged(int,int))); + connect(TDEApplication::kApplication(),TQ_SIGNAL(kipcMessage(int,int)),this, + TQ_SLOT(domainListChanged(int,int))); } DomainBrowser::DomainBrowser(const TQStringList& domains, bool recursive, TQObject *parent) : TQObject(parent) diff --git a/dnssd/domainbrowser.h b/dnssd/domainbrowser.h index 24cf53078..abe93507f 100644 --- a/dnssd/domainbrowser.h +++ b/dnssd/domainbrowser.h @@ -40,7 +40,7 @@ class DomainBrowserPrivate; */ class TDEDNSSD_EXPORT DomainBrowser : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Standard constructor. It takes all parameters from global configuration. diff --git a/dnssd/publicservice.cpp b/dnssd/publicservice.cpp index 05b891258..dcfc68e30 100644 --- a/dnssd/publicservice.cpp +++ b/dnssd/publicservice.cpp @@ -82,7 +82,7 @@ PublicService::PublicService(const TQString& name, const TQString& type, unsigne #ifdef HAVE_DNSSD if (Responder::self().client()) { d->m_group = avahi_entry_group_new(Responder::self().client(), publish_callback,this); - connect(&Responder::self(),TQT_SIGNAL(stateChanged(AvahiClientState)),this,TQT_SLOT(clientState(AvahiClientState))); + connect(&Responder::self(),TQ_SIGNAL(stateChanged(AvahiClientState)),this,TQ_SLOT(clientState(AvahiClientState))); } #endif if (domain.isNull()) diff --git a/dnssd/publicservice.h b/dnssd/publicservice.h index 30fbe8466..6dad448b4 100644 --- a/dnssd/publicservice.h +++ b/dnssd/publicservice.h @@ -49,7 +49,7 @@ Asynchronous publishing is better for responsiveness. Example: \code DNSSD::PublicService *service = new DNSSD::PublicService("My files","_http._tcp",80); -connect(service,TQT_SIGNAL(published(bool)),this,TQT_SLOT(wasPublished(bool))); +connect(service,TQ_SIGNAL(published(bool)),this,TQ_SLOT(wasPublished(bool))); service->publishAsync(); \endcode @@ -60,7 +60,7 @@ service->publishAsync(); class TDEDNSSD_EXPORT PublicService : public TQObject, public ServiceBase { - Q_OBJECT + TQ_OBJECT public: /** @param name Service name. If set to TQString::null, computer name will be used and will be diff --git a/dnssd/query.cpp b/dnssd/query.cpp index 3306dc256..2afa62401 100644 --- a/dnssd/query.cpp +++ b/dnssd/query.cpp @@ -74,7 +74,7 @@ public: Query::Query(const TQString& type, const TQString& domain) { d = new QueryPrivate(type,domain); - connect(&d->timeout,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout())); + connect(&d->timeout,TQ_SIGNAL(timeout()),this,TQ_SLOT(timeout())); } diff --git a/dnssd/query.h b/dnssd/query.h index 037fb9fde..21ab9b166 100644 --- a/dnssd/query.h +++ b/dnssd/query.h @@ -38,7 +38,7 @@ name, either multicast or unicast DNS will be used. */ class TDEDNSSD_EXPORT Query : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Creates new query. diff --git a/dnssd/remoteservice.h b/dnssd/remoteservice.h index b5ef4dcd9..8324f1bdc 100644 --- a/dnssd/remoteservice.h +++ b/dnssd/remoteservice.h @@ -41,7 +41,7 @@ service is resolved are name, type.and domain. */ class TDEDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase { - Q_OBJECT + TQ_OBJECT public: typedef TDESharedPtr<RemoteService> Ptr; diff --git a/dnssd/responder.h b/dnssd/responder.h index 187683c7b..5a9a41596 100644 --- a/dnssd/responder.h +++ b/dnssd/responder.h @@ -43,7 +43,7 @@ This class should not be used directly. */ class Responder : public TQObject { - Q_OBJECT + TQ_OBJECT public: Responder(); diff --git a/dnssd/servicebrowser.cpp b/dnssd/servicebrowser.cpp index 2ca87ef86..58dd4c30f 100644 --- a/dnssd/servicebrowser.cpp +++ b/dnssd/servicebrowser.cpp @@ -69,9 +69,9 @@ void ServiceBrowser::init(const TQStringList& type,DomainBrowser* domains,int fl d->m_types=type; d->m_flags=flags; d->m_domains = domains; - connect(d->m_domains,TQT_SIGNAL(domainAdded(const TQString& )),this,TQT_SLOT(addDomain(const TQString& ))); - connect(d->m_domains,TQT_SIGNAL(domainRemoved(const TQString& )),this, - TQT_SLOT(removeDomain(const TQString& ))); + connect(d->m_domains,TQ_SIGNAL(domainAdded(const TQString& )),this,TQ_SLOT(addDomain(const TQString& ))); + connect(d->m_domains,TQ_SIGNAL(domainRemoved(const TQString& )),this, + TQ_SLOT(removeDomain(const TQString& ))); } ServiceBrowser::ServiceBrowser(const TQString& type,const TQString& domain,bool autoResolve) { @@ -108,9 +108,9 @@ const DomainBrowser* ServiceBrowser::browsedDomains() const void ServiceBrowser::serviceResolved(bool success) { - TQObject* sender_obj = const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())); + TQObject* sender_obj = const_cast<TQObject*>(sender()); RemoteService* svr = static_cast<RemoteService*>(sender_obj); - disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool))); + disconnect(svr,TQ_SIGNAL(resolved(bool)),this,TQ_SLOT(serviceResolved(bool))); TQValueList<RemoteService::Ptr>::Iterator it = d->m_duringResolve.begin(); TQValueList<RemoteService::Ptr>::Iterator itEnd = d->m_duringResolve.end(); while ( it!= itEnd && svr!= (*it)) ++it; @@ -140,7 +140,7 @@ void ServiceBrowser::gotNewService(RemoteService::Ptr svr) { if (findDuplicate(svr)==(d->m_services.end())) { if (d->m_flags & AutoResolve) { - connect(svr,TQT_SIGNAL(resolved(bool )),this,TQT_SLOT(serviceResolved(bool ))); + connect(svr,TQ_SIGNAL(resolved(bool )),this,TQ_SLOT(serviceResolved(bool ))); d->m_duringResolve+=svr; svr->resolveAsync(); } else { @@ -179,11 +179,11 @@ void ServiceBrowser::addDomain(const TQString& domain) TQStringList::ConstIterator itEnd = d->m_types.end(); for (TQStringList::ConstIterator it=d->m_types.begin(); it!=itEnd; ++it) { Query* b = new Query((*it),domain); - connect(b,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, - TQT_SLOT(gotNewService(DNSSD::RemoteService::Ptr))); - connect(b,TQT_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr )),this, - TQT_SLOT(gotRemoveService(DNSSD::RemoteService::Ptr))); - connect(b,TQT_SIGNAL(finished()),this,TQT_SLOT(queryFinished())); + connect(b,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, + TQ_SLOT(gotNewService(DNSSD::RemoteService::Ptr))); + connect(b,TQ_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr )),this, + TQ_SLOT(gotRemoveService(DNSSD::RemoteService::Ptr))); + connect(b,TQ_SIGNAL(finished()),this,TQ_SLOT(queryFinished())); b->startQuery(); d->resolvers.insert(domain,b); } diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h index be2b6213b..01e9d0ccd 100644 --- a/dnssd/servicebrowser.h +++ b/dnssd/servicebrowser.h @@ -38,8 +38,8 @@ Suppose that you need list of web servers running. Example: \code DNSSD::ServiceBrowser* browser = new DNSSD::ServiceBrowser("_http._tcp"); -connect(browser,TQT_SIGNAL(serviceAdded(RemoteService::Ptr)),this,TQT_SLOT(addService(RemoteService::Ptr))); -connect(browser,TQT_SIGNAL(serviceRemoved(RemoteService::Ptr)),this,TQT_SLOT(delService(RemoteService::Ptr))); +connect(browser,TQ_SIGNAL(serviceAdded(RemoteService::Ptr)),this,TQ_SLOT(addService(RemoteService::Ptr))); +connect(browser,TQ_SIGNAL(serviceRemoved(RemoteService::Ptr)),this,TQ_SLOT(delService(RemoteService::Ptr))); browser->startBrowse(); \endcode @@ -53,7 +53,7 @@ to constructor, domains configured by user will be searched. */ class TDEDNSSD_EXPORT ServiceBrowser : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @li AutoDelete - DomainBrowser object passes in constructor should be deleted when ServiceBrowser is deleted diff --git a/doc/common/doxygen.css b/doc/common/doxygen.css index 932e6975a..c56c0e91a 100644 --- a/doc/common/doxygen.css +++ b/doc/common/doxygen.css @@ -98,6 +98,7 @@ SPAN.charliteral { color: #008080 } .line { text-align: left; font-family: monospace; +white-space: pre; } .lineno { diff --git a/doc/common/tde.css b/doc/common/tde.css index 183b62fa1..c9dc6095c 100644 --- a/doc/common/tde.css +++ b/doc/common/tde.css @@ -5,7 +5,6 @@ body { margin: 0; padding: 0; - text-align: center; font-size: 0.8em; font-family: "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", sans-serif; color: #535353; diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index 3bc5749d2..bfeaa43e5 100644 --- a/interfaces/khexedit/byteseditinterface.h +++ b/interfaces/khexedit/byteseditinterface.h @@ -206,7 +206,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) * � if( Clipboard ) * � { * � � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky... - * � � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) ); + * � � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) ); * � } * } * \endcode @@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 ) { return KParts::ComponentFactory::createInstanceFromQuery<TQWidget> - ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name ); + ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name ); } } diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h index c63c5a88e..ec77b1a48 100644 --- a/interfaces/khexedit/clipboardinterface.h +++ b/interfaces/khexedit/clipboardinterface.h @@ -35,7 +35,7 @@ namespace KHE * if( Clipboard ) * { * � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky... - * � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) ); + * � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) ); * } * \endcode * @@ -78,7 +78,7 @@ ClipboardInterface *clipboardInterface( T *t ) if( !t ) return 0; - return ::tqqt_cast<KHE::ClipboardInterface*>( t ); + return ::tqt_cast<KHE::ClipboardInterface*>( t ); } } diff --git a/interfaces/khexedit/zoominterface.h b/interfaces/khexedit/zoominterface.h index 9c6f0f677..21145cb9a 100644 --- a/interfaces/khexedit/zoominterface.h +++ b/interfaces/khexedit/zoominterface.h @@ -71,7 +71,7 @@ ZoomInterface *zoomInterface( T *t ) if( !t ) return 0; - return ::tqqt_cast<KHE::ZoomInterface*>( t ); + return ::tqt_cast<KHE::ZoomInterface*>( t ); } } diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h index 4124849d6..fbdc22de6 100644 --- a/interfaces/kregexpeditor/kregexpeditorinterface.h +++ b/interfaces/kregexpeditor/kregexpeditorinterface.h @@ -25,7 +25,7 @@ * TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" ); * if ( editorDialog ) { * // tdeutils was installed, so the dialog was found fetch the editor interface - * KRegExpEditorInterface *editor = ::tqqt_cast<KRegExpEditorInterface *>( editorDialog ); + * KRegExpEditorInterface *editor = ::tqt_cast<KRegExpEditorInterface *>( editorDialog ); * Q_ASSERT( editor ); // This should not fail! * * // now use the editor. @@ -41,7 +41,7 @@ * * Note: signals and slots must be connected to the editorDialog object, not to the editor object: * \code - * connect( editorDialog, TQT_SIGNAL( canUndo( bool ) ), undoBut, TQT_SLOT( setEnabled( bool ) ) ); + * connect( editorDialog, TQ_SIGNAL( canUndo( bool ) ), undoBut, TQ_SLOT( setEnabled( bool ) ) ); * \endcode * * If you want to create an instance of the editor widget, i.e. not the @@ -53,7 +53,7 @@ * "KRegExpEditor/KRegExpEditor", TQString::null, parent ); * if ( editorWidget ) { * // tdeutils was installed, so the widget was found fetch the editor interface - * KRegExpEditorInterface *editor = ::tqqt_cast<KRegExpEditorInterface *>( editorWidget ); + * KRegExpEditorInterface *editor = ::tqt_cast<KRegExpEditorInterface *>( editorWidget ); * Q_ASSERT( editor ); // This should not fail! * * // now use the editor. diff --git a/interfaces/tdeimproxy/TODO b/interfaces/tdeimproxy/TODO index fc66130fe..6e215680a 100644 --- a/interfaces/tdeimproxy/TODO +++ b/interfaces/tdeimproxy/TODO @@ -1,10 +1,10 @@ For the future, the following modifications need to be done: Currently there is a function : - virtual QString presenceString( const QString & uid ) = 0; + virtual TQString presenceString( const TQString & uid ) = 0; This needs to be broken into: - virtual QString presenceString( const QString & uid ) = 0; - virtual QString presenceLongString( const QString & uid ) = 0; + virtual TQString presenceString( const TQString & uid ) = 0; + virtual TQString presenceLongString( const TQString & uid ) = 0; The former returning, say "Away", the latter returning the long away message. diff --git a/interfaces/tdeimproxy/interface/kimiface.h b/interfaces/tdeimproxy/interface/kimiface.h index 2591c3ce0..aacb4217b 100644 --- a/interfaces/tdeimproxy/interface/kimiface.h +++ b/interfaces/tdeimproxy/interface/kimiface.h @@ -57,12 +57,12 @@ * @endcode * and the class implementing KIMIface must pass "KIMIface" to the DCOPObject constructor: * @code - * // just need TQObject inheritance and Q_OBJECT if you want signals and slots + * // just need TQObject inheritance and TQ_OBJECT if you want signals and slots * // no need to use K_DCOP macro again * * class MyIMIface : public TQObject, public KIMIface * { - * Q_OBJECT + * TQ_OBJECT * public: * MyIMIface(TQObject* parent = 0, const char* name) : * DCOPObject("KIMIface"), // <-- passing the interface name as required diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp index fb2db0eb4..022737ed4 100644 --- a/interfaces/tdeimproxy/library/tdeimproxy.cpp +++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp @@ -181,8 +181,8 @@ KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), TQObject() d->dc = dc; m_initialized = false; - connect( d->dc, TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); - connect( d->dc, TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) ); + connect( d->dc, TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( d->dc, TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) ); d->dc->setNotifications( true ); d->presence_strings.append( "Unknown" ); diff --git a/interfaces/tdeimproxy/library/tdeimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h index 293d1f723..5a7ff87e9 100644 --- a/interfaces/tdeimproxy/library/tdeimproxy.h +++ b/interfaces/tdeimproxy/library/tdeimproxy.h @@ -106,7 +106,7 @@ typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap; */ class TDEIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface { - Q_OBJECT + TQ_OBJECT struct Private; template<class> friend class KStaticDeleter; diff --git a/interfaces/tdemediaplayer/player.h b/interfaces/tdemediaplayer/player.h index 05582ca07..5302c721a 100644 --- a/interfaces/tdemediaplayer/player.h +++ b/interfaces/tdemediaplayer/player.h @@ -45,7 +45,7 @@ namespace KMediaPlayer */ class KDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject { -Q_OBJECT +TQ_OBJECT public: /** This constructor is what to use when no GUI is required, as in the diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp index 370805a74..be0f92111 100644 --- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp @@ -25,7 +25,7 @@ protected: { Q_UNUSED(className); Q_UNUSED(args); - return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name )); + return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ); } }; @@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate public: KFileAudioPreviewPrivate( TQWidget *parent ) { - player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) ); + player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), parent ); } ~KFileAudioPreviewPrivate() @@ -93,7 +93,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); TDEConfigGroup config( TDEGlobal::config(), ConfigGroup ); m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) ); - connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); + connect( m_autoPlay, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) ); } KFileAudioPreview::~KFileAudioPreview() diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h index 6eae52cf7..f67533df2 100644 --- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h @@ -36,7 +36,7 @@ class KFileItem; */ class KFileAudioPreview : public KPreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 ); diff --git a/interfaces/tdemediaplayer/view.h b/interfaces/tdemediaplayer/view.h index c1d9dbe41..69fce7b5f 100644 --- a/interfaces/tdemediaplayer/view.h +++ b/interfaces/tdemediaplayer/view.h @@ -33,7 +33,7 @@ namespace KMediaPlayer /** View is part of the user interface of a Player. */ class KDE_EXPORT View : public TQWidget { -Q_OBJECT +TQ_OBJECT public: /** Your typical TQWidget constructor. */ diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp index 766613551..64cf89bb8 100644 --- a/interfaces/tdescript/sample/shellscript.cpp +++ b/interfaces/tdescript/sample/shellscript.cpp @@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" ) ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent) { m_script = new TDEProcess(); - connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *))); - connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int ))); - connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int ))); + connect ( m_script, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(Exit(TDEProcess *))); + connect ( m_script, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(stdOut(TDEProcess *, char *, int ))); + connect ( m_script, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(stdErr(TDEProcess *, char *, int ))); // Connect feedback signals and slots //kdDebug() << "Building new script engine" << endl; } diff --git a/interfaces/tdescript/sample/shellscript.h b/interfaces/tdescript/sample/shellscript.h index 2cdaf7e5a..f03e17ba3 100644 --- a/interfaces/tdescript/sample/shellscript.h +++ b/interfaces/tdescript/sample/shellscript.h @@ -26,7 +26,7 @@ //using namespace KScriptInterface; class ShellScript : public KScriptInterface { - Q_OBJECT + TQ_OBJECT public: ShellScript(KScriptClientInterface *parent, const char *name, const TQStringList &args); virtual ~ShellScript(); diff --git a/interfaces/tdescript/scriptclientinterface.h b/interfaces/tdescript/scriptclientinterface.h index 0f07d34b2..e1c345e10 100644 --- a/interfaces/tdescript/scriptclientinterface.h +++ b/interfaces/tdescript/scriptclientinterface.h @@ -33,7 +33,7 @@ class TQString; * interfaces with this class. * @code * class MyScript : public TQObject, public KScriptClientInterface { - * Q_OBJECT + * TQ_OBJECT * public: * * MyScript(TQObject *parent) diff --git a/interfaces/tdescript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h index 1c37b7f71..78e6ba960 100644 --- a/interfaces/tdescript/scriptinterface.h +++ b/interfaces/tdescript/scriptinterface.h @@ -46,7 +46,7 @@ class KScriptClientInterface; **/ class KDE_EXPORT KScriptInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Return the current script code data diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index c21f1f794..62bd33605 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -40,7 +40,7 @@ ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent) m_theAction = new TDESelectAction ( i18n("TDE Scripts"), 0, this, - TQT_SLOT(runAction()), + TQ_SLOT(runAction()), m_parent->actionCollection(), "scripts"); } diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h index 7fa4fa93f..ece776c6d 100644 --- a/interfaces/tdescript/scriptloader.h +++ b/interfaces/tdescript/scriptloader.h @@ -26,9 +26,9 @@ /** * Script loader */ -class ScriptLoader : virtual public QObject +class ScriptLoader : virtual public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/interfaces/tdescript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h index d21219901..ed9db2d95 100644 --- a/interfaces/tdescript/scriptmanager.h +++ b/interfaces/tdescript/scriptmanager.h @@ -38,7 +38,7 @@ class ScriptInfo; **/ class KDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface { - Q_OBJECT + TQ_OBJECT friend class KScriptInterface; public: /** diff --git a/interfaces/tdetexteditor/blockselectiondcopinterface.h b/interfaces/tdetexteditor/blockselectiondcopinterface.h index 4b74fd2a0..66045239b 100644 --- a/interfaces/tdetexteditor/blockselectiondcopinterface.h +++ b/interfaces/tdetexteditor/blockselectiondcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent BlockSelectionInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/clipboarddcopinterface.h b/interfaces/tdetexteditor/clipboarddcopinterface.h index 8104e9d4d..9a75f9b97 100644 --- a/interfaces/tdetexteditor/clipboarddcopinterface.h +++ b/interfaces/tdetexteditor/clipboarddcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent ClipboardInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ ClipboardDCOPInterface( ClipboardInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/configinterfaceextension.h b/interfaces/tdetexteditor/configinterfaceextension.h index 23fa5bb38..f640ab0c5 100644 --- a/interfaces/tdetexteditor/configinterfaceextension.h +++ b/interfaces/tdetexteditor/configinterfaceextension.h @@ -28,7 +28,7 @@ namespace KTextEditor class KTEXTEDITOR_EXPORT ConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ConfigPage ( TQWidget *parent=0, const char *name=0 ); diff --git a/interfaces/tdetexteditor/document.h b/interfaces/tdetexteditor/document.h index 83d8b7cf6..817389ba3 100644 --- a/interfaces/tdetexteditor/document.h +++ b/interfaces/tdetexteditor/document.h @@ -32,7 +32,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor { friend class PrivateDocument; - Q_OBJECT + TQ_OBJECT public: diff --git a/interfaces/tdetexteditor/documentdcopinfo.h b/interfaces/tdetexteditor/documentdcopinfo.h index ea25284fe..aedaee6a5 100644 --- a/interfaces/tdetexteditor/documentdcopinfo.h +++ b/interfaces/tdetexteditor/documentdcopinfo.h @@ -25,7 +25,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent DocumentInfoInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ DocumentInfoDCOPInterface( DocumentInfoInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/editdcopinterface.h b/interfaces/tdetexteditor/editdcopinterface.h index f169fb15b..c0a0f6cdf 100644 --- a/interfaces/tdetexteditor/editdcopinterface.h +++ b/interfaces/tdetexteditor/editdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent EditInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ EditDCOPInterface( EditInterface *Parent, const char *name ); /** @@ -34,7 +34,7 @@ namespace KTextEditor virtual ~EditDCOPInterface(); k_dcop: /** - * @return the complete document as a single QString + * @return the complete document as a single TQString */ virtual TQString text (); diff --git a/interfaces/tdetexteditor/editinterface.h b/interfaces/tdetexteditor/editinterface.h index 05e4941f2..9da6a275d 100644 --- a/interfaces/tdetexteditor/editinterface.h +++ b/interfaces/tdetexteditor/editinterface.h @@ -48,12 +48,12 @@ class KTEXTEDITOR_EXPORT EditInterface * slots !!! */ /** - * @return the complete document as a single QString + * @return the complete document as a single TQString */ virtual TQString text () const = 0; /** - * @return a QString + * @return a TQString */ virtual TQString text ( uint startLine, uint startCol, uint endLine, uint endCol ) const = 0; diff --git a/interfaces/tdetexteditor/editor.h b/interfaces/tdetexteditor/editor.h index 8b6699f9f..475711a9d 100644 --- a/interfaces/tdetexteditor/editor.h +++ b/interfaces/tdetexteditor/editor.h @@ -40,7 +40,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart { friend class PrivateEditor; - Q_OBJECT + TQ_OBJECT public: diff --git a/interfaces/tdetexteditor/editorchooser.h b/interfaces/tdetexteditor/editorchooser.h index 251776c10..62feda5c6 100644 --- a/interfaces/tdetexteditor/editorchooser.h +++ b/interfaces/tdetexteditor/editorchooser.h @@ -16,7 +16,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget { friend class PrivateEditorChooser; - Q_OBJECT + TQ_OBJECT public: EditorChooser(TQWidget *parent=0,const char *name=0); @@ -36,7 +36,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget /* class EditorChooserBackEnd: public ComponentChooserPlugin { -Q_OBJECT +TQ_OBJECT public: EditorChooserBackEnd(TQObject *parent=0, const char *name=0); virtual ~EditorChooserBackEnd(); diff --git a/interfaces/tdetexteditor/encodingdcopinterface.h b/interfaces/tdetexteditor/encodingdcopinterface.h index 38de4e0aa..e13a6dff4 100644 --- a/interfaces/tdetexteditor/encodingdcopinterface.h +++ b/interfaces/tdetexteditor/encodingdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent EncodingInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ EncodingDCOPInterface( EncodingInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/plugin.h b/interfaces/tdetexteditor/plugin.h index 68416bf78..b13dc37e9 100644 --- a/interfaces/tdetexteditor/plugin.h +++ b/interfaces/tdetexteditor/plugin.h @@ -37,7 +37,7 @@ class KTEXTEDITOR_EXPORT Plugin : public TQObject { friend class PrivatePlugin; - Q_OBJECT + TQ_OBJECT public: Plugin ( Document *document = 0, const char *name = 0 ); diff --git a/interfaces/tdetexteditor/printdcopinterface.h b/interfaces/tdetexteditor/printdcopinterface.h index e41e6da5d..f3d176fbd 100644 --- a/interfaces/tdetexteditor/printdcopinterface.h +++ b/interfaces/tdetexteditor/printdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent PrintInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ PrintDCOPInterface( PrintInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/searchdcopinterface.h b/interfaces/tdetexteditor/searchdcopinterface.h index d4f558a26..e8a82a35b 100644 --- a/interfaces/tdetexteditor/searchdcopinterface.h +++ b/interfaces/tdetexteditor/searchdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent SearchInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ SearchDCOPInterface( SearchInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/selectiondcopinterface.h b/interfaces/tdetexteditor/selectiondcopinterface.h index aa2973540..70e6e2f0b 100644 --- a/interfaces/tdetexteditor/selectiondcopinterface.h +++ b/interfaces/tdetexteditor/selectiondcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent SelectionInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ SelectionDCOPInterface( SelectionInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp index 25c103196..f3de57447 100644 --- a/interfaces/tdetexteditor/templateinterface.cpp +++ b/interfaces/tdetexteditor/templateinterface.cpp @@ -75,8 +75,8 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget * TDEABC::StdAddressBook *addrBook = 0; TDEABC::Addressee userAddress; TQDateTime datetime = TQDateTime::currentDateTime(); - TQDate date = TQT_TQDATE_OBJECT(datetime.date()); - TQTime time = TQT_TQTIME_OBJECT(datetime.time()); + TQDate date = datetime.date(); + TQTime time = datetime.time(); TQMap<TQString,TQString>::Iterator it; for ( it = map.begin(); it != map.end(); ++it ) diff --git a/interfaces/tdetexteditor/undodcopinterface.h b/interfaces/tdetexteditor/undodcopinterface.h index b1a217036..5e324da03 100644 --- a/interfaces/tdetexteditor/undodcopinterface.h +++ b/interfaces/tdetexteditor/undodcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent UndoInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ UndoDCOPInterface( UndoInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/view.h b/interfaces/tdetexteditor/view.h index 0a807d6b3..c8cf586b8 100644 --- a/interfaces/tdetexteditor/view.h +++ b/interfaces/tdetexteditor/view.h @@ -33,7 +33,7 @@ class KTEXTEDITOR_EXPORT View : public TQWidget, public KXMLGUIClient { friend class PrivateView; - Q_OBJECT + TQ_OBJECT public: /** diff --git a/interfaces/tdetexteditor/viewcursordcopinterface.h b/interfaces/tdetexteditor/viewcursordcopinterface.h index 4bae0b520..e0c956da0 100644 --- a/interfaces/tdetexteditor/viewcursordcopinterface.h +++ b/interfaces/tdetexteditor/viewcursordcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent ViewCursorInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ ViewCursorDCOPInterface( ViewCursorInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h index b4c5cf72e..aba5b60b5 100644 --- a/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h +++ b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent ViewStatusMsgInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name ); /** diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index 83e82e5e2..b0f2b9d5f 100644 --- a/interfaces/terminal/kde_terminal_interface.h +++ b/interfaces/terminal/kde_terminal_interface.h @@ -53,13 +53,13 @@ class TQStrList; * }; * // fetch the part.. * KParts::Part* p = static_cast<KParts::Part*>( - * factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING, + * factory->create( this, "tralala", "TQObject", * "KParts::ReadOnlyPart" ) ); * assert( p ); * setCentralWidget( p->widget() ); * * // cast the part to the TerminalInterface.. - * TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + * TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); * if( ! t ) * { * // This probably happens because the konsole that is installed @@ -78,8 +78,8 @@ class TQStrList; * // or connect to one of the signals. Connect to the Part object, * // not to the TerminalInterface, since the latter is no TQObject, * // and as such cannot have signals..: - * // connect( p, TQT_SIGNAL( processExited( int ) ), - * // this, TQT_SLOT( shellExited( int ) ) ); + * // connect( p, TQ_SIGNAL( processExited( int ) ), + * // this, TQ_SLOT( shellExited( int ) ) ); * // etc. * * \endcode diff --git a/interfaces/terminal/test/main.cpp b/interfaces/terminal/test/main.cpp index 8130f85d6..f0d51b259 100644 --- a/interfaces/terminal/test/main.cpp +++ b/interfaces/terminal/test/main.cpp @@ -17,17 +17,17 @@ Win::Win() { KLibFactory* factory = KLibLoader::self()->factory( "libkonsolepart" ); assert( factory ); - KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING, "KParts::ReadOnlyPart" ) ); + KParts::Part* p = factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) ; setCentralWidget( p->widget() ); - TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); t->showShellInDir( TQDir::home().path() ); // TQStrList l; // l.append( "python" ); // t->startProgram( TQString::fromUtf8( "/usr/bin/python" ), l ); - connect( p, TQT_SIGNAL( processExited( int ) ), - this, TQT_SLOT( pythonExited( int ) ) ); + connect( p, TQ_SIGNAL( processExited( int ) ), + this, TQ_SLOT( pythonExited( int ) ) ); } @@ -46,11 +46,11 @@ int main( int argc, char** argv ) void Win::pythonExited() { std::cerr << "hee, " << p << std::endl; - std::cerr << ( ::tqqt_cast<TerminalInterface>(p) ) << std::endl; + std::cerr << ( ::tqt_cast<TerminalInterface>(p) ) << std::endl; // KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) ); - disconnect(p, TQT_SIGNAL( processExited() ), - this, TQT_SLOT( pythonExited() )); - TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + disconnect(p, TQ_SIGNAL( processExited() ), + this, TQ_SLOT( pythonExited() )); + TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); TQStrList l; l.append( "echo" ); l.append( "hello world" ); diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h index 256b0840a..bf87cb041 100644 --- a/interfaces/terminal/test/main.h +++ b/interfaces/terminal/test/main.h @@ -5,7 +5,7 @@ class Win : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT KParts::Part* p; public: Win(); diff --git a/kab/addressbook.cpp b/kab/addressbook.cpp index 017621ac7..0cf8b9307 100644 --- a/kab/addressbook.cpp +++ b/kab/addressbook.cpp @@ -100,7 +100,7 @@ const int AddressBook::Entry::NoOfFields =sizeof(AddressBook::Entry::Fields)/sizeof(AddressBook::Entry::Fields[0]); struct QStringLess - : public binary_function<const TQString&, const TQString&, bool> + : public std::function<bool(const TQString&, const TQString&)> { /** The function operator, inline. */ bool operator()(const TQString& x, const TQString& y) const @@ -420,10 +420,10 @@ AddressBook::AddressBook(TQWidget* parent, const char* name, bool loadit) i18n("Out of Memory")); kapp->quit(); // It is critical, but will possibly never happen. } - connect(data, TQT_SIGNAL(fileChanged()), TQT_SLOT(dataFileChanged())); - connect(data, TQT_SIGNAL(changed(QConfigDB*)), - TQT_SLOT(reloaded(QConfigDB*))); - connect(config, TQT_SIGNAL(fileChanged()), TQT_SLOT(configFileChanged())); + connect(data, TQ_SIGNAL(fileChanged()), TQ_SLOT(dataFileChanged())); + connect(data, TQ_SIGNAL(changed(QConfigDB*)), + TQ_SLOT(reloaded(QConfigDB*))); + connect(config, TQ_SIGNAL(fileChanged()), TQ_SLOT(configFileChanged())); // ----- set style: filename = locate( "data", STD_CONFIGFILENAME); diff --git a/kab/addressbook.h b/kab/addressbook.h index 8aa78411e..1137407b3 100644 --- a/kab/addressbook.h +++ b/kab/addressbook.h @@ -183,7 +183,7 @@ class CategoriesMap : public TQMap<int, TQString> class AddressBook : public TQFrame { // ############################################################################ - Q_OBJECT + TQ_OBJECT // ---------------------------------------------------------------------------- public: /** diff --git a/kab/kabapi.cpp b/kab/kabapi.cpp index 62a50f162..2008f1f88 100644 --- a/kab/kabapi.cpp +++ b/kab/kabapi.cpp @@ -43,8 +43,8 @@ KabAPI::KabAPI(TQWidget* parent, const char* name) setMainWidget(listbox); showButtonApply(false); enableButtonSeparator(true); - connect(listbox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(entrySelected(int))); - connect(listbox, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotDoubleClicked ( TQListBoxItem * ))); + connect(listbox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(entrySelected(int))); + connect(listbox, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotDoubleClicked ( TQListBoxItem * ))); } @@ -90,8 +90,8 @@ AddressBook::ErrorCode KabAPI::init() book=new AddressBook(0, "KABAPI::book", true); //change parent from "this" to "0" //dsweet if(book->getState()==AddressBook::NoError) { - connect(book, TQT_SIGNAL(setStatus(const TQString&)), - TQT_SLOT(setStatusSlot(const TQString&))); + connect(book, TQ_SIGNAL(setStatus(const TQString&)), + TQ_SLOT(setStatusSlot(const TQString&))); return AddressBook::NoError; } else { return AddressBook::InternError; diff --git a/kab/kabapi.h b/kab/kabapi.h index 98cae1320..b2585760a 100644 --- a/kab/kabapi.h +++ b/kab/kabapi.h @@ -68,7 +68,7 @@ class TDEListBox; class KabAPI : public KDialogBase { // ############################################################################ - Q_OBJECT + TQ_OBJECT // ---------------------------------------------------------------------------- public: /** diff --git a/kab/qconfigDB.cpp b/kab/qconfigDB.cpp index dc77a1e1b..1112f7c7d 100644 --- a/kab/qconfigDB.cpp +++ b/kab/qconfigDB.cpp @@ -656,7 +656,7 @@ KeyValueMap::insert(const TQCString& key, const TQString& value, bool force) TQCString v; // ----- v=value.utf8(); - kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::insert[QString]: trying to " + kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::insert[TQString]: trying to " "insert \"" << (!value.isNull() ? "true" : "false") << "\" for key\n -->" << v @@ -670,19 +670,19 @@ KeyValueMap::get(const TQCString& key, TQString& value) const { bool GUARD; GUARD=false; // ########################################################################### - kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QString]: trying to get " + kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[TQString]: trying to get " "a TQString value for key " << key << endl; TQCString v; // ----- get string representation: if(!get(key, v)) { - kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QString]: key " + kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[TQString]: key " << key << " not in KeyValueMap.\n"; return false; } // ----- find its state: value=TQString::fromUtf8(v); // is there a better way? - kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QString]: success, value" + kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[TQString]: success, value" " (in UTF8) is " << v << endl; return true; // ########################################################################### @@ -2221,7 +2221,7 @@ QConfigDB::watch(bool state) if(timer==0) { timer=new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(checkFileChanged())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(checkFileChanged())); } timer->start(1000); } else { // stop timer diff --git a/kab/qconfigDB.h b/kab/qconfigDB.h index 36fcd369d..f74e5886c 100644 --- a/kab/qconfigDB.h +++ b/kab/qconfigDB.h @@ -19,6 +19,7 @@ namespace std { } using namespace std; +#include <functional> #include <list> #include <map> #include <tqwidget.h> @@ -43,7 +44,7 @@ class TQTextStream; * it is called with. */ struct QCStringLess - : public binary_function<const TQCString&, const TQCString&, bool> + : public std::function<bool(const TQCString&, const TQCString&)> { /** * The function operator, inline. @@ -550,7 +551,7 @@ public: class QConfigDB : public TQWidget { // ############################################################################ - Q_OBJECT + TQ_OBJECT // ---------------------------------------------------------------------------- protected: /** diff --git a/kate/data/c.xml b/kate/data/c.xml index 501e865e3..aa250ec9c 100644 --- a/kate/data/c.xml +++ b/kate/data/c.xml @@ -197,7 +197,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> diff --git a/kate/data/diff.xml b/kate/data/diff.xml index b681b4270..62fdceb1e 100644 --- a/kate/data/diff.xml +++ b/kate/data/diff.xml @@ -15,7 +15,7 @@ 2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com> Fixed folding. --> -<language name="Diff" version="1.12" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch"> +<language name="Diff" version="1.13" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch"> <highlighting> @@ -108,8 +108,8 @@ <itemData name="Normal Text" defStyleNum="dsNormal"/> <itemData name="File" defStyleNum="dsKeyword"/> <itemData name="Header" defStyleNum="dsDataType"/> - <itemData name="Removed line" defStyleNum="dsString" color="#FF0000"/> - <itemData name="Added line" defStyleNum="dsOthers" color="#0000FF"/> + <itemData name="Removed line" defStyleNum="dsString" backgroundColor="#ffeef0"/> + <itemData name="Added line" defStyleNum="dsOthers" backgroundColor="#e6ffed"/> <itemData name="Changed line (old)" defStyleNum="dsString" color="#FF0000"/> <itemData name="Changed line (new)" defStyleNum="dsOthers" color="#0000FF"/> </itemDatas> diff --git a/kate/data/fgl-4gl.xml b/kate/data/fgl-4gl.xml index 7b2084dbd..b92523641 100644 --- a/kate/data/fgl-4gl.xml +++ b/kate/data/fgl-4gl.xml @@ -347,7 +347,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/fgl-per.xml b/kate/data/fgl-per.xml index 44bc53151..21d09df57 100644 --- a/kate/data/fgl-per.xml +++ b/kate/data/fgl-per.xml @@ -159,7 +159,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/idl.xml b/kate/data/idl.xml index a8a2787dd..06b37118b 100644 --- a/kate/data/idl.xml +++ b/kate/data/idl.xml @@ -100,7 +100,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/isocpp.xml b/kate/data/isocpp.xml index 0637867fc..3bbeb9f01 100644 --- a/kate/data/isocpp.xml +++ b/kate/data/isocpp.xml @@ -156,8 +156,8 @@ <item> Q_SIGNALS </item> <item> Q_SLOTS </item> <item> Q_UNUSED </item> - <item> SIGNAL </item> - <item> SLOT </item> + <item> Q_SIGNAL </item> + <item> Q_SLOT </item> <item> TRUE </item> <item> FALSE </item> <item> TQ_ARG </item> @@ -198,13 +198,8 @@ <item> TQ_SCRIPTABLE </item> <item> TQ_SETS </item> <item> TQ_SIGNAL </item> - <item> TQ_SIGNALS </item> <item> TQ_SLOT </item> - <item> TQ_SLOTS </item> <item> TQ_UNUSED </item> - <item> TQT_SIGNAL </item> - <item> TQT_SLOT </item> - <item> TQT_TQOBJECT </item> <item> connect </item> <item> disconnect </item> <item> emit </item> diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml index e90f0b051..916d213c1 100644 --- a/kate/data/javascript.xml +++ b/kate/data/javascript.xml @@ -101,6 +101,7 @@ <DetectChar attribute="String" context="String" char=""" /> <DetectChar attribute="String" context="String SQ" char="'" /> + <DetectChar attribute="String" context="Template String" char="`" /> <IncludeRules context="##Doxygen" /> <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/" /> @@ -154,6 +155,11 @@ <LineContinue/> <DetectChar attribute="String" context="#pop" char="'" /> </context> + <context attribute="String" lineEndContext="#pop" name="Template String"> + <HlCStringChar attribute="Char" /> + <LineContinue/> + <DetectChar attribute="String" context="#pop" char="`" /> + </context> <context attribute="Comment" lineEndContext="#pop" name="Comment"> <IncludeRules context="##Alerts" /> diff --git a/kate/data/markdown.xml b/kate/data/markdown.xml index 7d99d02ed..177b904da 100644 --- a/kate/data/markdown.xml +++ b/kate/data/markdown.xml @@ -4,7 +4,7 @@ Copyright 2008 Darrin Yeager. http://www.dyeager.org/ Dual-Licensed under both GPL and BSD licenses. - + Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/ --> @@ -25,19 +25,31 @@ <!ENTITY reflinkregex '\[[^\]\^]+\]\s*\[[^\]]*\]\s*(\s+\"[^\"]*\"){0,1}'> <!ENTITY reflinktargetregex '\[[^\]\^]+\]\:\s+[^\s]+(\s+\"[^\"]*\"){0,1}'> <!ENTITY footnoteregex "\[\^[^\]]+\]"> + <!ENTITY preregex "^\s*```\s*"> + <!ENTITY pretilderegex "^\s*~~~\s*"> + <!ENTITY preendregex "^\s*```\s*$"> + <!ENTITY pretildeendregex "^\s*~~~\s*$"> + <!ENTITY presingleline '```[^`]+```'> + <!ENTITY idlinkregex '\[[^\]\^]+\]\s*\(#[^\(]*\)'> <!ENTITY inlinelinkregex '\[[^\]\^]+\]\s*\([^\(]*\)'> <!ENTITY inlineimageregex '\!\[[^\]\^]+\]\([^\(]*\)'> <!ENTITY refimageregex '\!\[[^\]\^]+\]\[[^\[]*\]'> <!ENTITY autolinkregex '<(https?|ftp):[^\">\s]+>'> <!ENTITY mailtolinkregex '<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>'> - <!ENTITY rulerregex '^\s*([\*\-_]){3,}\s*$'> + <!ENTITY rulerregex '^ {,3}([\*\-_]\s*){3,}\s*$'> <!-- two spaces at end of line generates linebreak --> - <!ENTITY linebreakregex " $"> - <!ENTITY strikeoutregex "[~]{2}[^~].*[^~][~]{2}"> <!-- pandoc style --> + <!ENTITY linebreakregex "( |\\)$"> + <!ENTITY strikeoutregex "~~[^~\s].*[^~\s]~~"> + <!ENTITY prediffregex "^(```|~~~)\s{0,}diff"> + <!ENTITY difflineremoveregex "^-[^-].*$"> + <!ENTITY difflineaddregex "^\+[^\+].*$"> + <!ENTITY diffheader1regex "^-{3} .*$"> + <!ENTITY diffheader2regex "^(\+{3} .*|^@@.*)$"> + <!ENTITY diffheaderdiffregex "^diff .*$"> ]> - -<language name="Markdown" version="1.3" section="Markup" - extensions="*.text;*.md;*.mmd;*.mdwn" priority="15" + +<language name="Markdown" version="1.4" section="Markup" + extensions="*.md;*.mmd;*.mdwn" author="Darrin Yeager, Claes Holmerson" license="GPL,BSD" > <highlighting> @@ -50,13 +62,14 @@ <RegExpr attribute="h3" String="^###\s.*[#]?$" /> <RegExpr attribute="h4" String="^####\s.*[#]?$" /> <RegExpr attribute="h5" String="^#####\s.*[#]?$" /> + <RegExpr attribute="h6" String="^######\s.*[#]?$" /> <RegExpr attribute="strongemphasis" String="&strongemphasisregex;" /> <RegExpr attribute="strong" String="&strongregex;" /> <RegExpr attribute="emphasis" String="&emphasisregex;" /> <RegExpr attribute="ruler" String="&rulerregex;" /> + <RegExpr context="bullet" String="^ {,3}[\*\+\-]\s" /> + <RegExpr context="numlist" String="^ {,3}[\d]+\.\s" /> <RegExpr attribute="code" String="^([\s]{4,}|\t+).*$" /> - <RegExpr context="bullet" String="^[\*\+\-]\s" /> - <RegExpr context="numlist" String="^[\d]+\.\s" /> <RegExpr attribute="meta" String="^(Title|Author|Date|Copyright|Revision|CSS|LaTeX\ XSLT|Categories|Tags|BaseName|Excerpt):(.*)+$" /> <IncludeRules context="inc" /> </context> @@ -64,30 +77,56 @@ <context attribute="blockquote" lineEndContext="#pop" name="blockquote"> <RegExpr attribute="bq-strong" String="&strongregex;" /> <RegExpr attribute="bq-emphasis" String="&emphasisregex;" /> + <RegExpr attribute="bq-strongemphasis" String="&strongemphasisregex;" /> <IncludeRules context="inc" /> </context> <context attribute="bullet" lineEndContext="#pop" name="bullet" > <RegExpr attribute="bl-strong" String="&strongregex;" /> <RegExpr attribute="bl-emphasis" String="&emphasisregex;" /> + <RegExpr attribute="bl-strongemphasis" String="&strongemphasisregex;" /> <IncludeRules context="inc" /> </context> - + <context attribute="numlist" lineEndContext="#pop" name="numlist" > <RegExpr attribute="nl-strong" String="&strongregex;" /> <RegExpr attribute="nl-emphasis" String="&emphasisregex;" /> + <RegExpr attribute="nl-strongemphasis" String="&strongemphasisregex;" /> <IncludeRules context="inc" /> </context> - + <context attribute="comment" lineEndContext="#stay" name="comment" > <RegExpr String="-->" attribute="comment" context="#pop" endRegion="comment"/> </context> + <context attribute="prediff" lineEndContext="#stay" name="prediff" > + <RegExpr String="&preendregex;" attribute="prediff" context="#pop" endRegion="prediff"/> + <RegExpr attribute="difflineremove" String="&difflineremoveregex;" /> + <RegExpr attribute="difflineadd" String="&difflineaddregex;" /> + <RegExpr attribute="diffheader1" String="&diffheader1regex;" /> + <RegExpr attribute="diffheader2" String="&diffheader2regex;" /> + <RegExpr attribute="diffheaderdiff" String="&diffheaderdiffregex;" /> + </context> + + <context attribute="code" lineEndContext="#stay" name="pre" > + <RegExpr String="&preendregex;" attribute="code" context="#pop" endRegion="pre"/> + </context> + + <context attribute="code" lineEndContext="#stay" name="pretilde" > + <RegExpr String="&pretildeendregex;" attribute="code" context="#pop" endRegion="pretilde"/> + </context> + <context attribute="common" name="inc" lineEndContext="#stay" > - <RegExpr attribute="code" String="`[^`]+`" /> <RegExpr context="comment" String="<!--" beginRegion="comment" /> + <RegExpr context="prediff" String="&prediffregex;" beginRegion="prediff" /> + <RegExpr attribute="code" minimal="true" String="&presingleline;"/> + <RegExpr attribute="code" context="pre" String="&preregex;" beginRegion="pre" /> + <RegExpr attribute="code" context="pretilde" String="&pretilderegex;" beginRegion="pretilde" /> + <RegExpr attribute="code" String="``.*``" /> + <RegExpr attribute="code" String="`[^`]*`" /> <RegExpr attribute="reflink" String="&reflinkregex;" /> <RegExpr attribute="footnote" String="&footnoteregex;" /> + <RegExpr attribute="idlink" String="&idlinkregex;"/> <RegExpr attribute="inlinelink" String="&inlinelinkregex;"/> <RegExpr attribute="reflinktarget" String="&reflinktargetregex;"/> <RegExpr attribute="inlineimage" String="&inlineimageregex;"/> @@ -104,43 +143,54 @@ <itemData name="common" defStyleNum="dsNormal" /> <itemData name="emphasis" defStyleNum="dsNormal" italic="true" /> <itemData name="strong" defStyleNum="dsNormal" bold="true" /> + <itemData name="diffheader1" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" bold="true" /> + <itemData name="diffheader2" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" /> + <itemData name="diffheaderdiff" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#000000" bold="true" /> + <itemData name="difflineremove" defStyleNum="dsString" backgroundColor="#ffeef0" /> + <itemData name="difflineadd" defStyleNum="dsOthers" backgroundColor="#e6ffed" /> <itemData name="strongemphasis" defStyleNum="dsNormal" italic="true" bold="true"/> - <itemData name="ruler" defStyleNum="dsNormal" bold="true" /> - <itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" /> - <itemData name="linebreak" defStyleNum="dsNormal" underline="true" color="#999999"/> + <itemData name="ruler" defStyleNum="dsNormal" color="#e200e2" bold="true" /> + <itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" backgroundColor="#fafaaf" /> + <itemData name="linebreak" defStyleNum="dsNormal" backgroundColor="#F8E0FF" /> <itemData name="h1" defStyleNum="dsFunction" bold="true" /> <itemData name="h2" defStyleNum="dsFunction" bold="true" /> <itemData name="h3" defStyleNum="dsFunction" bold="true" /> <itemData name="h4" defStyleNum="dsFunction" bold="true" /> <itemData name="h5" defStyleNum="dsFunction" bold="true" /> - <itemData name="blockquote" defStyleNum="dsDataType" /> - <itemData name="bq-emphasis" defStyleNum="dsDataType" italic="true" /> - <itemData name="bq-strong" defStyleNum="dsDataType" bold="true" /> - <itemData name="bullet" defStyleNum="dsFloat" /> - <itemData name="bl-emphasis" defStyleNum="dsFloat" italic="true" /> - <itemData name="bl-strong" defStyleNum="dsFloat" bold="true" /> - <itemData name="numlist" defStyleNum="dsFloat" /> - <itemData name="nl-emphasis" defStyleNum="dsFloat" italic="true" /> - <itemData name="nl-strong" defStyleNum="dsFloat" bold="true" /> - <itemData name="comment" defStyleNum="dsComment" /> - <itemData name="code" defStyleNum="dsBaseN" /> - <itemData name="reflink" defStyleNum="dsOthers" underline="true" /> - <itemData name="inlinelink" defStyleNum="dsOthers" underline="true" /> + <itemData name="h6" defStyleNum="dsFunction" bold="true" /> + <itemData name="blockquote" defStyleNum="dsNormal" color="black" /> + <itemData name="bq-emphasis" defStyleNum="dsNormal" color="black" italic="true" /> + <itemData name="bq-strong" defStyleNum="dsNormal" color="black" bold="true" /> + <itemData name="bq-strongemphasis" defStyleNum="dsNormal" color="black" italic="true" bold="true" /> + <itemData name="bullet" defStyleNum="dsNormal" color="#b700b7" /> + <itemData name="bl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" /> + <itemData name="bl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" /> + <itemData name="bl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" /> + <itemData name="numlist" defStyleNum="dsNormal" color="#b700b7" /> + <itemData name="nl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" /> + <itemData name="nl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" /> + <itemData name="nl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" /> + <itemData name="comment" defStyleNum="dsComment" /> + <itemData name="pre" defStyleNum="dsNormal" backgroundColor="#eeeeee" /> + <itemData name="prediff" defStyleNum="dsNormal" backgroundColor="#eeeeee" /> + <itemData name="code" defStyleNum="dsNormal" color="darkcyan" backgroundColor="#eeeeee" /> + <itemData name="reflink" defStyleNum="dsOthers" color="blue" /> + <itemData name="idlink" defStyleNum="dsOthers" color="blue" italic="true" /> + <itemData name="inlinelink" defStyleNum="dsOthers" color="blue" /> <itemData name="autolink" defStyleNum="dsOthers" underline="true" /> <itemData name="mailtolink" defStyleNum="dsOthers" underline="true" /> <itemData name="footnote" defStyleNum="dsOthers" italic="true" /> - <itemData name="meta" defStyleNum="dsComment" /> - <itemData name="reflinktarget" defStyleNum="dsOthers" italic="false" bold="false" /> - <itemData name="inlineimage" defStyleNum="dsAlert" italic="false" bold="false" /> - <itemData name="refimage" defStyleNum="dsAlert" italic="false" bold="false" /> + <itemData name="meta" defStyleNum="dsComment" /> + <itemData name="reflinktarget" defStyleNum="dsOthers" /> + <itemData name="inlineimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" /> + <itemData name="refimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" /> </itemDatas> + </highlighting> - </highlighting> - - <general> - <comments> - <comment name="multiLine" start="<!--" end="-->" region="comment" /> - </comments> - </general> + <general> + <comments> + <comment name="multiLine" start="<!--" end="-->" region="comment" /> + </comments> + </general> - </language> +</language> diff --git a/kate/data/nesc.xml b/kate/data/nesc.xml index 5a5d0db54..688281bde 100644 --- a/kate/data/nesc.xml +++ b/kate/data/nesc.xml @@ -172,7 +172,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> </itemDatas> </highlighting> <general> diff --git a/kate/data/objectivec.xml b/kate/data/objectivec.xml index a49ed574f..a07940916 100644 --- a/kate/data/objectivec.xml +++ b/kate/data/objectivec.xml @@ -79,8 +79,8 @@ <item> Q_SIGNALS </item> <item> Q_SLOTS </item> <item> Q_UNUSED </item> - <item> SIGNAL </item> - <item> SLOT </item> + <item> Q_SIGNAL </item> + <item> Q_SLOT </item> <item> TRUE </item> <item> FALSE </item> <item> TQ_ARG </item> @@ -121,13 +121,8 @@ <item> TQ_SCRIPTABLE </item> <item> TQ_SETS </item> <item> TQ_SIGNAL </item> - <item> TQ_SIGNALS </item> <item> TQ_SLOT </item> - <item> TQ_SLOTS </item> <item> TQ_UNUSED </item> - <item> TQT_SIGNAL </item> - <item> TQT_SLOT </item> - <item> TQT_TQOBJECT </item> <item> connect </item> <item> disconnect </item> <item> emit </item> @@ -230,7 +225,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> </itemDatas> </highlighting> <general> diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml index 8be78b2d4..bfe4298d4 100644 --- a/kate/data/objectivecpp.xml +++ b/kate/data/objectivecpp.xml @@ -124,8 +124,8 @@ <item> Q_SIGNALS </item> <item> Q_SLOTS </item> <item> Q_UNUSED </item> - <item> SIGNAL </item> - <item> SLOT </item> + <item> Q_SIGNAL </item> + <item> Q_SLOT </item> <item> TRUE </item> <item> FALSE </item> <item> TQ_ARG </item> @@ -166,13 +166,8 @@ <item> TQ_SCRIPTABLE </item> <item> TQ_SETS </item> <item> TQ_SIGNAL </item> - <item> TQ_SIGNALS </item> <item> TQ_SLOT </item> - <item> TQ_SLOTS </item> <item> TQ_UNUSED </item> - <item> TQT_SIGNAL </item> - <item> TQT_SLOT </item> - <item> TQT_TQOBJECT </item> <item> connect </item> <item> disconnect </item> <item> emit </item> diff --git a/kate/data/opencl.xml b/kate/data/opencl.xml index 5c5cc7c5c..c4e2b3d39 100644 --- a/kate/data/opencl.xml +++ b/kate/data/opencl.xml @@ -241,7 +241,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml index 7942a6afa..d1e4ed488 100644 --- a/kate/data/qt4.xml +++ b/kate/data/qt4.xml @@ -34,8 +34,8 @@ <item> slots </item> <item> foreach </item> <item> forever </item> - <item> SIGNAL </item> - <item> SLOT </item> + <item> Q_SIGNAL </item> + <item> Q_SLOT </item> <!-- http://qt-project.org/doc/qt-4.8/QApplication.html#macros --> <item> qApp </item> <!-- http://qt-project.org/doc/qt-4.8/qcoreapplication.html#macros --> diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml index 004f7dab2..12924302b 100644 --- a/kate/data/update-files.xml +++ b/kate/data/update-files.xml @@ -52,7 +52,7 @@ <Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="6"/> <Definition name="Debian Control" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debiancontrol.xml" version="0.84"/> <Definition name=".desktop" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/desktop.xml" version="2-1"/> -<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.12"/> +<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.13"/> <Definition name="Django HTML Template" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/djangotemplate.xml" version="3"/> <Definition name="Dockerfile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dockerfile.xml" version="1.1"/> <Definition name="MS-DOS Batch" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dosbat.xml" version="0.30"/> @@ -136,7 +136,7 @@ <Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.1"/> <Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.0"/> <Definition name="Troff Mandoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mandoc.xml" version="2"/> -<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.3"/> +<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.4"/> <Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="4"/> <Definition name="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.1"/> <Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="2-2"/> diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h index 381e32fa2..c30a6d320 100644 --- a/kate/interfaces/document.h +++ b/kate/interfaces/document.h @@ -61,7 +61,7 @@ class KATEPARTINTERFACES_EXPORT Cursor : public KTextEditor::Cursor class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage { - Q_OBJECT + TQ_OBJECT public: ConfigPage ( TQWidget *parent=0, const char *name=0 ) : KTextEditor::ConfigPage (parent, name) { ; }; @@ -79,7 +79,7 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 ) @@ -188,7 +188,7 @@ class KATEPARTINTERFACES_EXPORT Document : public KTextEditor::Document, public public KTextEditor::MarkInterfaceExtension, public KTextEditor::SelectionInterfaceExt { - Q_OBJECT + TQ_OBJECT public: Document (); diff --git a/kate/interfaces/interfaces.cpp b/kate/interfaces/interfaces.cpp index 9cbb58977..902459c24 100644 --- a/kate/interfaces/interfaces.cpp +++ b/kate/interfaces/interfaces.cpp @@ -100,7 +100,7 @@ Document *document (KTextEditor::Document *doc) if (!doc) return 0; - return ::tqqt_cast<Kate::Document*>(doc); + return ::tqt_cast<Kate::Document*>(doc); } DocumentExt *documentExt (KTextEditor::Document *doc) @@ -121,7 +121,7 @@ View *view (KTextEditor::View *view) if (!view) return 0; - return ::tqqt_cast<Kate::View*>(view); + return ::tqt_cast<Kate::View*>(view); } } diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h index 3b2b8a4e1..fcaf43110 100644 --- a/kate/interfaces/view.h +++ b/kate/interfaces/view.h @@ -43,7 +43,7 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi public KTextEditor::PopupMenuInterface, public KTextEditor::ViewCursorInterface, public KTextEditor::CodeCompletionInterface, public KTextEditor::DynWordWrapInterface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kate/part/katearbitraryhighlight.cpp b/kate/part/katearbitraryhighlight.cpp index 927380979..1f526b7af 100644 --- a/kate/part/katearbitraryhighlight.cpp +++ b/kate/part/katearbitraryhighlight.cpp @@ -73,8 +73,8 @@ KateAttribute KateArbitraryHighlightRange::merge(TQPtrList<KateSuperRange> range void KateArbitraryHighlight::addHighlightToDocument(KateSuperRangeList* list) { m_docHLs.append(list); - connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotRangeEliminated(KateSuperRange*))); - connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*))); + connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotRangeEliminated(KateSuperRange*))); + connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*))); } void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateView* view) @@ -84,9 +84,9 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi m_viewHLs[view]->append(list); - connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*))); - connect(list, TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*))); - connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*))); + connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*))); + connect(list, TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*))); + connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*))); } void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) { diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h index 1bea4891f..222c82c2e 100644 --- a/kate/part/katearbitraryhighlight.h +++ b/kate/part/katearbitraryhighlight.h @@ -31,7 +31,7 @@ class KateView; class KateArbitraryHighlightRange : public KateSuperRange, public KateAttribute { - Q_OBJECT + TQ_OBJECT public: KateArbitraryHighlightRange(KateSuperCursor* start, KateSuperCursor* end, TQObject* parent = 0L, const char* name = 0L); @@ -59,7 +59,7 @@ public: */ class KateArbitraryHighlight : public TQObject { - Q_OBJECT + TQ_OBJECT public: KateArbitraryHighlight(KateDocument* parent = 0L, const char* name = 0L); diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index e39aba16c..f4a9df273 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -161,7 +161,7 @@ KateAutoIndent::~KateAutoIndent () KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name) : TDEActionMenu (text, parent, name), doc(_doc) { - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewIndentationAction::slotAboutToShow() @@ -170,7 +170,7 @@ void KateViewIndentationAction::slotAboutToShow() popupMenu()->clear (); for (uint z=0; z<modes.size(); ++z) - popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQT_SLOT(setMode(int)), 0, z); + popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQ_SLOT(setMode(int)), 0, z); popupMenu()->setItemChecked (doc->config()->indentationMode(), true); } @@ -187,7 +187,7 @@ KateNormalIndent::KateNormalIndent (KateDocument *_doc) : KateAutoIndent (_doc) { // if highlighting changes, update attributes - connect(_doc, TQT_SIGNAL(hlChanged()), this, TQT_SLOT(updateConfig())); + connect(_doc, TQ_SIGNAL(hlChanged()), this, TQ_SLOT(updateConfig())); } KateNormalIndent::~KateNormalIndent () @@ -479,8 +479,6 @@ void KateCSmartIndent::processLine (KateDocCursor &line) textLine->stringAtPos (firstChar, "private") || textLine->stringAtPos (firstChar, "protected") || textLine->stringAtPos (firstChar, "signals") || - textLine->stringAtPos (firstChar, "Q_SIGNALS") || - textLine->stringAtPos (firstChar, "Q_SLOTS") || textLine->stringAtPos (firstChar, "slots")) { indent = findOpeningBrace(line) + indentWidth; @@ -859,12 +857,8 @@ uint KateCSmartIndent::calcIndent(KateDocCursor &begin, bool needContinue) ch = textLine->getChar(specialIndent + 9); else if (textLine->stringAtPos(specialIndent, "signals")) ch = textLine->getChar(specialIndent + 7); - else if (textLine->stringAtPos(specialIndent, "Q_SIGNALS")) - ch = textLine->getChar(specialIndent + 9); else if (textLine->stringAtPos(specialIndent, "slots")) ch = textLine->getChar(specialIndent + 5); - else if (textLine->stringAtPos(specialIndent, "Q_SLOTS")) - ch = textLine->getChar(specialIndent + 7); if (ch.isNull() || (!ch.isSpace() && ch != '(' && ch != ':')) continue; @@ -2174,8 +2168,8 @@ KateVarIndent::KateVarIndent( KateDocument *doc ) slotVariableChanged( "var-indent-handle-couples", doc->variable( "var-indent-handle-couples" ) ); // update if a setting is changed - connect( doc, TQT_SIGNAL(variableChanged( const TQString&, const TQString&) ), - this, TQT_SLOT(slotVariableChanged( const TQString&, const TQString& )) ); + connect( doc, TQ_SIGNAL(variableChanged( const TQString&, const TQString&) ), + this, TQ_SLOT(slotVariableChanged( const TQString&, const TQString& )) ); } KateVarIndent::~KateVarIndent() diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h index fe8980d15..6a499df8e 100644 --- a/kate/part/kateautoindent.h +++ b/kate/part/kateautoindent.h @@ -43,7 +43,7 @@ class KateDocument; */ class IndenterConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -69,7 +69,7 @@ class IndenterConfigPage : public TQWidget */ class KateAutoIndent : public TQObject { - Q_OBJECT + TQ_OBJECT /** * Static methods to create and list indention modes @@ -194,7 +194,7 @@ class KateAutoIndent : public TQObject */ class KateViewIndentationAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent = 0, const char* name = 0); @@ -216,7 +216,7 @@ class KateViewIndentationAction : public TDEActionMenu */ class KateNormalIndent : public KateAutoIndent { - Q_OBJECT + TQ_OBJECT public: /** @@ -347,7 +347,7 @@ protected: class KateCSmartIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KateCSmartIndent (KateDocument *doc); @@ -378,7 +378,7 @@ class KateCSmartIndent : public KateNormalIndent class KatePythonIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KatePythonIndent (KateDocument *doc); @@ -399,7 +399,7 @@ class KatePythonIndent : public KateNormalIndent class KateXmlIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KateXmlIndent (KateDocument *doc); @@ -428,7 +428,7 @@ class KateXmlIndent : public KateNormalIndent class KateCSAndSIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KateCSAndSIndent (KateDocument *doc); @@ -491,7 +491,7 @@ class KateCSAndSIndent : public KateNormalIndent */ class KateVarIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: /** @@ -542,7 +542,7 @@ class KateVarIndent : public KateNormalIndent class KateScriptIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KateScriptIndent( KateDocument *doc ); @@ -563,7 +563,7 @@ class KateScriptIndent : public KateNormalIndent class ScriptIndentConfigPage : public IndenterConfigPage { - Q_OBJECT + TQ_OBJECT public: ScriptIndentConfigPage ( TQWidget *parent=0, const char *name=0 ); diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index cc1dcf4c5..25f00d71b 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -62,7 +62,7 @@ KateBookmarks::KateBookmarks( KateView* view, Sorting sort ) , m_view( view ) , m_sorting( sort ) { - connect (view->getDoc(), TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged())); + connect (view->getDoc(), TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged())); _tries=0; m_bookmarksMenu = 0L; } @@ -75,26 +75,26 @@ void KateBookmarks::createActions( TDEActionCollection* ac ) { m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, - this, TQT_SLOT(toggleBookmark()), + this, TQ_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, - this, TQT_SLOT(clearBookmarks()), + this, TQ_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); m_goNext = new TDEAction( i18n("Next Bookmark"), "go-next", ALT + Key_PageDown, - this, TQT_SLOT(goNext()), + this, TQ_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp, - this, TQT_SLOT(goPrevious()), + this, TQ_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); @@ -102,14 +102,14 @@ void KateBookmarks::createActions( TDEActionCollection* ac ) //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow())); - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) ); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow())); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) ); marksChanged (); bookmarkMenuAboutToHide(); - connect( m_view, TQT_SIGNAL( gotFocus( Kate::View * ) ), this, TQT_SLOT( slotViewGotFocus( Kate::View * ) ) ); - connect( m_view, TQT_SIGNAL( lostFocus( Kate::View * ) ), this, TQT_SLOT( slotViewLostFocus( Kate::View * ) ) ); + connect( m_view, TQ_SIGNAL( gotFocus( Kate::View * ) ), this, TQ_SLOT( slotViewGotFocus( Kate::View * ) ) ); + connect( m_view, TQ_SIGNAL( lostFocus( Kate::View * ) ), this, TQ_SLOT( slotViewLostFocus( Kate::View * ) ) ); } void KateBookmarks::toggleBookmark () @@ -181,7 +181,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu ) menu.insertItem( TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ), - m_view, TQT_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx ); + m_view, TQ_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx ); if ( (*it)->line < line ) { diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h index 3295141f7..05215b66a 100644 --- a/kate/part/katebookmarks.h +++ b/kate/part/katebookmarks.h @@ -37,7 +37,7 @@ class TQMenuData; class KateBookmarks : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Sorting { Position, Creation }; diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h index 2be23cbdb..96765ceba 100644 --- a/kate/part/katebuffer.h +++ b/kate/part/katebuffer.h @@ -340,7 +340,7 @@ class KateBufBlockList */ class KateBuffer : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KateBufBlock; diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp index f00825eb5..0f6cd4e53 100644 --- a/kate/part/katecmds.cpp +++ b/kate/part/katecmds.cpp @@ -110,7 +110,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view, } else if ( cmd == "run-myself" ) { -#ifndef Q_WS_WIN //todo +#ifndef TQ_WS_WIN //todo return KateFactory::self()->jscript()->execute(v, v->doc()->text(), errorMsg); #else return 0; diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index 275894483..0a3dfe771 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -129,11 +129,11 @@ KateCodeCompletion::KateCodeCompletion( KateView* view ) m_completionPopup->setFocusProxy( m_view->m_viewInternal ); m_pArgHint = new KateArgHint( m_view ); - connect( m_pArgHint, TQT_SIGNAL(argHintHidden()), - this, TQT_SIGNAL(argHintHidden()) ); + connect( m_pArgHint, TQ_SIGNAL(argHintHidden()), + this, TQ_SIGNAL(argHintHidden()) ); - connect( m_view, TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(slotCursorPosChanged()) ); + connect( m_view, TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(slotCursorPosChanged()) ); } KateCodeCompletion::~KateCodeCompletion() @@ -163,9 +163,9 @@ void KateCodeCompletion::showCompletionBox( bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionPopup) && - TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox) && - TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox->viewport()) ) + if ( o != m_completionPopup && + o != m_completionListBox && + o != m_completionListBox->viewport() ) return false; if( e->type() == TQEvent::Hide ) @@ -185,7 +185,7 @@ bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e ) } if ( e->type() == TQEvent::MouseButtonPress ) { - TQTimer::singleShot(0, this, TQT_SLOT(showComment())); + TQTimer::singleShot(0, this, TQ_SLOT(showComment())); return false; } @@ -207,7 +207,7 @@ void KateCodeCompletion::handleKey (TQKeyEvent *e) (e->key() == Key_Home ) || (e->key() == Key_End) || (e->key() == Key_Prior) || (e->key() == Key_Next )) { - TQTimer::singleShot(0,this,TQT_SLOT(showComment())); + TQTimer::singleShot(0,this,TQ_SLOT(showComment())); TQApplication::sendEvent( m_completionListBox, (TQEvent*)e ); return; } @@ -324,7 +324,7 @@ void KateCodeCompletion::updateBox( bool ) m_completionListBox->setFocus(); m_completionPopup->show(); - TQTimer::singleShot(0,this,TQT_SLOT(showComment())); + TQTimer::singleShot(0,this,TQ_SLOT(showComment())); } void KateCodeCompletion::showArgHint ( TQStringList functionList, const TQString& strWrapping, const TQString& strDelimiter ) @@ -395,7 +395,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name ) : TQFrame( parent, name, (WFlags)WType_Popup ) { setBackgroundColor( black ); - setPaletteForegroundColor( Qt::black ); + setPaletteForegroundColor( TQt::black ); labelDict.setAutoDelete( true ); layout = new TQVBoxLayout( this, 1, 2 ); @@ -404,7 +404,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name ) m_markCurrentFunction = true; - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( parent ); reset( -1, -1 ); @@ -533,7 +533,7 @@ void KateArgHint::show() bool KateArgHint::eventFilter( TQObject*, TQEvent* e ) { if( isVisible() && e->type() == TQEvent::KeyPress ){ - TQKeyEvent* ke = TQT_TQKEYEVENT( e ); + TQKeyEvent* ke = static_cast<TQKeyEvent*>( e ); if( (ke->state() & ControlButton) && ke->key() == Key_Left ){ setCurrentFunction( currentFunction() - 1 ); ke->accept(); diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h index d2c9ca636..78c68a759 100644 --- a/kate/part/katecodecompletion.h +++ b/kate/part/katecodecompletion.h @@ -46,7 +46,7 @@ class TQVBox; class KateCodeCompletionCommentLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: KateCodeCompletionCommentLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip", @@ -66,7 +66,7 @@ class KateCodeCompletionCommentLabel : public TQLabel class KateCodeCompletion : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KateViewInternal; @@ -116,7 +116,7 @@ class KateCodeCompletion : public TQObject class KateArgHint: public TQFrame { - Q_OBJECT + TQ_OBJECT public: KateArgHint( KateView* =0, const char* =0 ); diff --git a/kate/part/katecodefoldinghelpers.h b/kate/part/katecodefoldinghelpers.h index 3f6d18b27..21faeeb0d 100644 --- a/kate/part/katecodefoldinghelpers.h +++ b/kate/part/katecodefoldinghelpers.h @@ -117,7 +117,7 @@ class KateCodeFoldingTree : public TQObject { friend class KateCodeFoldingNode; - Q_OBJECT + TQ_OBJECT public: KateCodeFoldingTree (KateBuffer *buffer); diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index c9feae9da..7625af0eb 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -1155,13 +1155,13 @@ void KateRendererConfig::setSchemaInternal( int schema ) // same std colors like in KateDocument::markColor TQColor mark[7]; - mark[0] = Qt::blue; - mark[1] = Qt::red; - mark[2] = Qt::yellow; - mark[3] = Qt::magenta; - mark[4] = Qt::gray; - mark[5] = Qt::green; - mark[6] = Qt::red; + mark[0] = TQt::blue; + mark[1] = TQt::red; + mark[2] = TQt::yellow; + mark[3] = TQt::magenta; + mark[4] = TQt::gray; + mark[5] = TQt::green; + mark[6] = TQt::red; for (int i = 1; i <= KTextEditor::MarkInterface::reservedMarkersCount(); i++) { TQColor col = config->readColorEntry(TQString("Color MarkType%1").arg(i), &mark[i - 1]); diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h index 85cd5828d..5ab41e13f 100644 --- a/kate/part/katecursor.h +++ b/kate/part/katecursor.h @@ -60,7 +60,7 @@ class KateTextCursor return stream; } -#ifndef Q_WS_WIN //not needed +#ifndef TQ_WS_WIN //not needed friend void tqSwap(KateTextCursor & c1, KateTextCursor & c2) { KateTextCursor tmp = c1; c1 = c2; diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 08b63eae3..a77ecf8d7 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -117,7 +117,7 @@ KateConfigPage::KateConfigPage ( TQWidget *parent, const char *name ) : Kate::ConfigPage (parent, name) , m_changed (false) { - connect (this, TQT_SIGNAL(changed()), this, TQT_SLOT(somethingHasChanged ())); + connect (this, TQ_SIGNAL(changed()), this, TQ_SLOT(somethingHasChanged ())); } KateConfigPage::~KateConfigPage () @@ -179,7 +179,7 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent) opt[4] = new TQCheckBox(i18n("&Backspace key indents"), keys); TQRadioButton *rb1, *rb2, *rb3; - m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this ); + m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this ); m_tabs->setRadioButtonExclusive( true ); m_tabs->insert( rb1=new TQRadioButton( i18n("Insert indent &characters"), m_tabs ), 0 ); m_tabs->insert( rb2=new TQRadioButton( i18n("I&nsert tab character"), m_tabs ), 1 ); @@ -235,27 +235,27 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(indenterSelected(int))); + connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(indenterSelected(int))); - connect( opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(somethingToggled())); + connect( opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(somethingToggled())); - connect( opt[0], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[1], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[2], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[3], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[4], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[5], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[6], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[7], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); + connect( opt[0], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[1], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[2], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[3], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[4], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[5], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[6], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[7], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); - connect(indentationWidth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(indentationWidth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); - connect(m_configPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(configPage())); + connect(m_configPage, TQ_SIGNAL(clicked()), this, TQ_SLOT(configPage())); } void KateIndentConfigTab::somethingToggled() { @@ -292,7 +292,7 @@ void KateIndentConfigTab::configPage() if (!page) return; box->setStretchFactor(page, 1); - connect( &dlg, TQT_SIGNAL(okClicked()), page, TQT_SLOT(apply()) ); + connect( &dlg, TQ_SIGNAL(okClicked()), page, TQ_SLOT(apply()) ); dlg.resize(400, 300); dlg.exec(); @@ -357,26 +357,26 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) opt[0] = new TQCheckBox(i18n("Smart ho&me and smart end"), gbCursor); opt[0]->setChecked(configFlags & KateDocumentConfig::cfSmartHome); - connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); opt[1] = new TQCheckBox(i18n("Wrap c&ursor"), gbCursor); opt[1]->setChecked(configFlags & KateDocumentConfig::cfWrapCursor); - connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e6 = new TQCheckBox(i18n("&PageUp/PageDown moves cursor"), gbCursor); e6->setChecked(KateDocumentConfig::global()->pageUpDownMovesCursor()); - connect(e6, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(e6, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e4 = new KIntNumInput(KateViewConfig::global()->autoCenterLines(), gbCursor); e4->setRange(0, 1000000, 1, false); e4->setLabel(i18n("Autocenter cursor (lines):"), AlignVCenter); - connect(e4, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e4, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); layout->addWidget(gbCursor); TQRadioButton *rb1, *rb2; - m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Selection Mode"), this ); + m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Selection Mode"), this ); layout->add (m_tabs); m_tabs->setRadioButtonExclusive( true ); @@ -416,8 +416,8 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); } void KateSelectConfigTab::apply () @@ -473,16 +473,16 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) opt[3] = new TQCheckBox( i18n("&Insert spaces instead of tabulators"), gbWhiteSpace ); opt[3]->setChecked( configFlags & KateDocumentConfig::cfReplaceTabsDyn ); - connect( opt[3], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); + connect( opt[3], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); opt[2] = new TQCheckBox(i18n("&Show tabulators"), gbWhiteSpace); opt[2]->setChecked(configFlags & flags[2]); - connect(opt[2], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[2], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e2 = new KIntNumInput(KateDocumentConfig::global()->tabWidth(), gbWhiteSpace); e2->setRange(1, 16, 1, false); e2->setLabel(i18n("Tab width:"), AlignVCenter); - connect(e2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); mainLayout->addWidget(gbWhiteSpace); @@ -490,35 +490,35 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) opt[0] = new TQCheckBox(i18n("Enable static &word wrap"), gbWordWrap); opt[0]->setChecked(KateDocumentConfig::global()->wordWrap()); - connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); m_wwmarker = new TQCheckBox( i18n("&Show static word wrap marker (if applicable)"), gbWordWrap ); m_wwmarker->setChecked( KateRendererConfig::global()->wordWrapMarker() ); - connect(m_wwmarker, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(m_wwmarker, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e1 = new KIntNumInput(KateDocumentConfig::global()->wordWrapAt(), gbWordWrap); e1->setRange(20, 200, 1, false); e1->setLabel(i18n("Wrap words at:"), AlignVCenter); - connect(e1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); mainLayout->addWidget(gbWordWrap); opt[4] = new TQCheckBox( i18n("Remove &trailing spaces"), this ); mainLayout->addWidget( opt[4] ); opt[4]->setChecked( configFlags & KateDocumentConfig::cfRemoveTrailingDyn ); - connect( opt[4], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); + connect( opt[4], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); opt[1] = new TQCheckBox(i18n("Auto &brackets"), this); mainLayout->addWidget(opt[1]); opt[1]->setChecked(configFlags & flags[1]); - connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e3 = new KIntNumInput(e2, KateDocumentConfig::global()->undoSteps(), this); e3->setRange(0, 1000000, 1, false); e3->setSpecialValueText( i18n("Unlimited") ); e3->setLabel(i18n("Maximum undo steps:"), AlignVCenter); mainLayout->addWidget(e3); - connect(e3, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e3, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); TQHBoxLayout *e5Layout = new TQHBoxLayout(mainLayout); TQLabel *e5Label = new TQLabel(i18n("Smart search t&ext from:"), this); @@ -532,7 +532,7 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) e5->setCurrentItem(KateViewConfig::global()->textToSearchMode()); e5Layout->addWidget(e5); e5Label->setBuddy(e5); - connect(e5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); + connect(e5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); mainLayout->addStretch(); @@ -684,7 +684,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) blay->addWidget(gbBar); - m_bmSort = new TQButtonGroup( 1, Qt::Horizontal, i18n("Sort Bookmarks Menu"), this ); + m_bmSort = new TQButtonGroup( 1, TQt::Horizontal, i18n("Sort Bookmarks Menu"), this ); m_bmSort->setRadioButtonExclusive( true ); m_bmSort->insert( rb1=new TQRadioButton( i18n("By &position"), m_bmSort ), 0 ); m_bmSort->insert( rb2=new TQRadioButton( i18n("By c&reation"), m_bmSort ), 1 ); @@ -744,17 +744,17 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(m_dynwrap, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_dynwrapIndicatorsCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_dynwrapAlignLevel, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect(m_icons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_scrollBarMarks, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_line, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_folding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_collapseTopLevel, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_showIndentLines, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(m_dynwrap, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_dynwrapIndicatorsCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_dynwrapAlignLevel, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect(m_icons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_scrollBarMarks, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_line, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_folding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_collapseTopLevel, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_showIndentLines, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); } KateViewDefaultsConfig::~KateViewDefaultsConfig() @@ -821,7 +821,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * ) KateView* view = (KateView*)m_doc->views().at(0); m_ac = view->editActionCollection(); m_keyChooser = new KKeyChooser( m_ac, this, false ); - connect( m_keyChooser, TQT_SIGNAL( keyChange() ), this, TQT_SLOT( slotChanged() ) ); + connect( m_keyChooser, TQ_SIGNAL( keyChange() ), this, TQ_SLOT( slotChanged() ) ); m_keyChooser->show (); m_ready = true; @@ -895,7 +895,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) dirSearchDepth->setSpecialValueText( i18n("Do not use config file") ); dirSearchDepth->setLabel(i18n("Se&arch depth for config file:"), AlignVCenter); - TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Backup on Save"), this ); + TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Backup on Save"), this ); layout->addWidget( gb ); cbLocalFiles = new TQCheckBox( i18n("&Local files"), gb ); cbRemoteFiles = new TQCheckBox( i18n("&Remote files"), gb ); @@ -947,16 +947,16 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) // after initial reload, connect the stuff for the changed () signal // - connect(m_encoding, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_eol, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect( allowEolDetection, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect(blockCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect(removeSpaces, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect( cbLocalFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbRemoteFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect(dirSearchDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect( leBuPrefix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( leBuSuffix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); + connect(m_encoding, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_eol, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect( allowEolDetection, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect(blockCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect(removeSpaces, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect( cbLocalFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbRemoteFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect(dirSearchDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect( leBuPrefix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( leBuSuffix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); } void KateSaveConfigTab::apply() @@ -1130,13 +1130,13 @@ KatePartPluginConfigPage::KatePartPluginConfigPage (TQWidget *parent) : KateConf btnConfigure = new TQPushButton( i18n("Configure..."), this ); btnConfigure->setEnabled( false ); - grid->addWidget( btnConfigure, 1, 0, Qt::AlignRight ); - connect( btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()) ); + grid->addWidget( btnConfigure, 1, 0, TQt::AlignRight ); + connect( btnConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigure()) ); - connect( listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); - connect( listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)), - this, TQT_SLOT(slotStateChanged(KatePartPluginListItem *, bool))); - connect(listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQT_SLOT(slotChanged())); + connect( listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) ); + connect( listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)), + this, TQ_SLOT(slotStateChanged(KatePartPluginListItem *, bool))); + connect(listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQ_SLOT(slotChanged())); } KatePartPluginConfigPage::~KatePartPluginConfigPage () @@ -1266,8 +1266,8 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); hlCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( hlCombo ); - connect( hlCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(hlChanged(int)) ); + connect( hlCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(hlChanged(int)) ); for( int i = 0; i < KateHlManager::self()->highlights(); i++) { if (KateHlManager::self()->hlSection(i).length() > 0) @@ -1276,7 +1276,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) hlCombo->insertItem(KateHlManager::self()->hlNameTranslated(i)); } - TQGroupBox *gbInfo = new TQGroupBox( 1, Qt::Horizontal, i18n("Information"), this ); + TQGroupBox *gbInfo = new TQGroupBox( 1, TQt::Horizontal, i18n("Information"), this ); layout->add (gbInfo); // author @@ -1290,7 +1290,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) new TQLabel( i18n("License:"), hb2 ); license = new TQLabel (hb2); - TQGroupBox *gbProps = new TQGroupBox( 1, Qt::Horizontal, i18n("Properties"), this ); + TQGroupBox *gbProps = new TQGroupBox( 1, TQt::Horizontal, i18n("Properties"), this ); layout->add (gbProps); // file & mime types @@ -1312,7 +1312,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) TQToolButton *btnMTW = new TQToolButton(hbMT); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); // download/new buttons TQHBox *hbBtns = new TQHBox( this ); @@ -1321,7 +1321,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) ((TQBoxLayout*)hbBtns->layout())->addStretch(1); // hmm. hbBtns->setSpacing( KDialog::spacingHint() ); TQPushButton *btnDl = new TQPushButton(i18n("Do&wnload..."), hbBtns); - connect( btnDl, TQT_SIGNAL(clicked()), this, TQT_SLOT(hlDownload()) ); + connect( btnDl, TQ_SIGNAL(clicked()), this, TQ_SLOT(hlDownload()) ); int currentHl = m_doc ? m_doc->hlMode() : 0; hlCombo->setCurrentItem( currentHl ); @@ -1347,9 +1347,9 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) layout->addStretch (); - connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); } KateHlConfigPage::~KateHlConfigPage () @@ -1453,8 +1453,8 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b actionButton (User1)->setIconSet(SmallIconSet("ok")); transferJob = TDEIO::get(KURL(TQString(HLDOWNLOADPATH)), true, true); - connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &))); + connect(transferJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &))); // void data( TDEIO::Job *, const TQByteArray &data); resize(450, 400); } @@ -1616,7 +1616,7 @@ KateModOnHdPrompt::KateModOnHdPrompt( KateDocument *doc, TQPushButton *btnDiff = new TQPushButton( i18n("&View Difference"), w ); lo2->addStretch( 1 ); lo2->addWidget( btnDiff ); - connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) ); + connect( btnDiff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDiff()) ); TQWhatsThis::add( btnDiff, i18n( "Calculates the difference between the editor contents and the disk " "file using diff(1) and opens the diff file with the default application " @@ -1639,8 +1639,8 @@ void KateModOnHdPrompt::slotDiff() KProcIO *p = new KProcIO(); p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << m_doc->url().path(); - connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) ); - connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); + connect( p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPDone(TDEProcess*)) ); + connect( p, TQ_SIGNAL(readReady(KProcIO*)), this, TQ_SLOT(slotPRead(KProcIO*)) ); setCursor( WaitCursor ); diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h index 0f865fcea..b4b4eb137 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -79,7 +79,7 @@ class TQCheckBox; class KateConfigPage : public Kate::ConfigPage { - Q_OBJECT + TQ_OBJECT public: KateConfigPage ( TQWidget *parent=0, const char *name=0 ); @@ -97,7 +97,7 @@ class KateConfigPage : public Kate::ConfigPage class KateGotoLineDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -112,7 +112,7 @@ class KateGotoLineDialog : public KDialogBase class KateIndentConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateIndentConfigTab(TQWidget *parent); @@ -141,7 +141,7 @@ class KateIndentConfigTab : public KateConfigPage class KateSelectConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateSelectConfigTab(TQWidget *parent); @@ -164,7 +164,7 @@ class KateSelectConfigTab : public KateConfigPage class KateEditConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateEditConfigTab(TQWidget *parent); @@ -189,7 +189,7 @@ class KateEditConfigTab : public KateConfigPage class KateViewDefaultsConfig : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateViewDefaultsConfig( TQWidget *parent ); @@ -217,7 +217,7 @@ class KateViewDefaultsConfig : public KateConfigPage class KateEditKeyConfiguration: public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateEditKeyConfiguration( TQWidget* parent, KateDocument* doc ); @@ -240,7 +240,7 @@ class KateEditKeyConfiguration: public KateConfigPage class KateSaveConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateSaveConfigTab( TQWidget *parent ); @@ -265,7 +265,7 @@ class KatePartPluginListItem; class KatePartPluginListView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class KatePartPluginListItem; @@ -282,7 +282,7 @@ class KatePartPluginListView : public TDEListView class TQListViewItem; class KatePartPluginConfigPage : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KatePartPluginConfigPage (TQWidget *parent); @@ -307,7 +307,7 @@ class KatePartPluginConfigPage : public KateConfigPage class KateHlConfigPage : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateHlConfigPage (TQWidget *parent, KateDocument *doc); @@ -341,7 +341,7 @@ class KateHlConfigPage : public KateConfigPage class KateHlDownloadDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KateHlDownloadDialog(TQWidget *parent, const char *name, bool modal); @@ -369,7 +369,7 @@ class TDEProcess; */ class KateModOnHdPrompt : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: enum Status { Reload=1, // 0 is KDialogBase::Cancel diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 56e6e1846..4118cb7ef 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -171,7 +171,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, setMarksUserChangable( markType01 ); m_undoMergeTimer = new TQTimer(this); - connect(m_undoMergeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(undoCancel())); + connect(m_undoMergeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(undoCancel())); clearMarks (); clearUndo (); @@ -189,24 +189,24 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, m_indenter->updateConfig (); // some nice signals from the buffer - connect(m_buffer, TQT_SIGNAL(tagLines(int,int)), this, TQT_SLOT(tagLines(int,int))); - connect(m_buffer, TQT_SIGNAL(codeFoldingUpdated()),this,TQT_SIGNAL(codeFoldingUpdated())); + connect(m_buffer, TQ_SIGNAL(tagLines(int,int)), this, TQ_SLOT(tagLines(int,int))); + connect(m_buffer, TQ_SIGNAL(codeFoldingUpdated()),this,TQ_SIGNAL(codeFoldingUpdated())); // if the user changes the highlight with the dialog, notify the doc - connect(KateHlManager::self(),TQT_SIGNAL(changed()),TQT_SLOT(internalHlChanged())); + connect(KateHlManager::self(),TQ_SIGNAL(changed()),TQ_SLOT(internalHlChanged())); // signal for the arbitrary HL - connect(m_arbitraryHL, TQT_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQT_SLOT(tagArbitraryLines(KateView*, KateSuperRange*))); + connect(m_arbitraryHL, TQ_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQ_SLOT(tagArbitraryLines(KateView*, KateSuperRange*))); // signals for mod on hd - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(dirty (const TQString &)), - this, TQT_SLOT(slotModOnHdDirty (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(dirty (const TQString &)), + this, TQ_SLOT(slotModOnHdDirty (const TQString &)) ); - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(created (const TQString &)), - this, TQT_SLOT(slotModOnHdCreated (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(created (const TQString &)), + this, TQ_SLOT(slotModOnHdCreated (const TQString &)) ); - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(deleted (const TQString &)), - this, TQT_SLOT(slotModOnHdDeleted (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(deleted (const TQString &)), + this, TQ_SLOT(slotModOnHdDeleted (const TQString &)) ); // update doc name setDocName (""); @@ -220,7 +220,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, setWidget( view ); } - connect(this,TQT_SIGNAL(sigQueryClose(bool *, bool*)),this,TQT_SLOT(slotQueryClose_save(bool *, bool*))); + connect(this,TQ_SIGNAL(sigQueryClose(bool *, bool*)),this,TQ_SLOT(slotQueryClose_save(bool *, bool*))); m_isasking = 0; @@ -356,9 +356,9 @@ void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin) KTextEditor::View *KateDocument::createView( TQWidget *parent, const char *name ) { KateView* newView = new KateView( this, parent, name); - connect(newView, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(undoCancel())); + connect(newView, TQ_SIGNAL(cursorPositionChanged()), TQ_SLOT(undoCancel())); if ( s_fileChangedDialogsActivated ) - connect( newView, TQT_SIGNAL(gotFocus( Kate::View * )), this, TQT_SLOT(slotModifiedOnDisk()) ); + connect( newView, TQ_SIGNAL(gotFocus( Kate::View * )), this, TQ_SLOT(slotModifiedOnDisk()) ); return newView; } @@ -1986,7 +1986,7 @@ void KateDocument::configDialog() KDialogBase::Ok, kapp->mainWidget() ); -#ifndef Q_WS_WIN //TODO: reenable +#ifndef TQ_WS_WIN //TODO: reenable KWin::setIcons( kd->winId(), kapp->icon(), kapp->miniIcon() ); #endif @@ -2305,11 +2305,11 @@ bool KateDocument::openURL( const KURL &url ) m_job = TDEIO::get ( url, false, isProgressInfoEnabled() ); // connect to slots - connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinishedKate( TDEIO::Job* ) ) ); TQWidget *w = widget (); if (!w && !m_views.isEmpty ()) @@ -4654,7 +4654,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) bool found = false; for (TQStringList::size_type i = 0; !found && i < wildcards.size(); ++i) { - TQRegExp wildcard (wildcards[i], true/*Qt::CaseSensitive*/, true/*TQRegExp::Wildcard*/); + TQRegExp wildcard (wildcards[i], true/*TQt::CaseSensitive*/, true/*TQRegExp::Wildcard*/); found = wildcard.exactMatch (nameOfFile); } @@ -4964,7 +4964,7 @@ bool KateDocument::createDigest( TQCString &result ) if ( f.open( IO_ReadOnly) ) { KMD5 md5; - ret = md5.update( TQT_TQIODEVICE_OBJECT(f) ); + ret = md5.update( f ); md5.hexDigest( result ); f.close(); ret = true; diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index b417c6d7d..c16a86840 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -84,7 +84,7 @@ class KateDocument : public Kate::Document, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT friend class KateViewInternal; friend class KateRenderer; diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp index ff4184685..9296773d5 100644 --- a/kate/part/katedocumenthelpers.cpp +++ b/kate/part/katedocumenthelpers.cpp @@ -31,8 +31,8 @@ KateBrowserExtension::KateBrowserExtension( KateDocument* doc ) : KParts::BrowserExtension( doc, "katepartbrowserextension" ), m_doc (doc) { - connect( doc, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( doc, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); emit enableAction( "print", true ); } diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h index b604d47ce..0609f6841 100644 --- a/kate/part/katedocumenthelpers.h +++ b/kate/part/katedocumenthelpers.h @@ -35,7 +35,7 @@ class KateDocument; */ class KateBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp index 51549bda0..56bdfa307 100644 --- a/kate/part/katefactory.cpp +++ b/kate/part/katefactory.cpp @@ -27,7 +27,7 @@ #include "kateschema.h" #include "katesearch.h" #include "kateconfig.h" -#ifndef Q_WS_WIN //todo +#ifndef TQ_WS_WIN //todo #include "katejscript.h" #endif #include "kateluaindentscript.h" @@ -137,7 +137,7 @@ KateFactory::KateFactory () // vm allocator m_vm = new KVMAllocator (); -#ifndef Q_WS_WIN //todo +#ifndef TQ_WS_WIN //todo // create script man (search scripts) + register commands m_jscriptManager = new KateJScriptManager (); KateCmd::self()->registerCommand (m_jscriptManager); @@ -251,7 +251,7 @@ void KateFactory::deregisterRenderer ( KateRenderer *renderer ) KateJScript *KateFactory::jscript () { -#ifndef Q_WS_WIN //todo +#ifndef TQ_WS_WIN //todo if (m_jscript) return m_jscript; diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index 974262290..eeecce36a 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -273,16 +273,16 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) TQLabel *lHl = new TQLabel( i18n("&Filetype:"), hbHl ); typeCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( typeCombo ); - connect( typeCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(typeChanged(int)) ); + connect( typeCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(typeChanged(int)) ); TQPushButton *btnnew = new TQPushButton( i18n("&New"), hbHl ); - connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newType()) ); + connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newType()) ); btndel = new TQPushButton( i18n("&Delete"), hbHl ); - connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) ); + connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteType()) ); - gbProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Properties"), this ); + gbProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Properties"), this ); layout->add (gbProps); // file & mime types @@ -312,7 +312,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) TQToolButton *btnMTW = new TQToolButton(hbMT); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); TQLabel *lprio = new TQLabel( i18n("Prio&rity:"), gbProps); priority = new KIntNumInput( gbProps ); @@ -322,12 +322,12 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) reload(); - connect( name, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( section, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( varLine, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( name, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( section, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( varLine, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); TQWhatsThis::add( btnnew, i18n("Create a new file type.") ); TQWhatsThis::add( btndel, i18n("Delete the current file type.") ); @@ -519,9 +519,9 @@ void KateViewFileTypeAction::init() m_doc = 0; subMenus.setAutoDelete( true ); - popupMenu()->insertItem ( i18n("None"), this, TQT_SLOT(setType(int)), 0, 0); + popupMenu()->insertItem ( i18n("None"), this, TQ_SLOT(setType(int)), 0, 0); - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewFileTypeAction::updateMenu (Kate::Document *doc) @@ -551,12 +551,12 @@ void KateViewFileTypeAction::slotAboutToShow() int m = subMenusName.findIndex (hlSection); names << hlName; - subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); + subMenus.at(m)->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0, z+1); } else if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); + popupMenu()->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0, z+1); } } diff --git a/kate/part/katefiletype.h b/kate/part/katefiletype.h index 7a927636b..c85682249 100644 --- a/kate/part/katefiletype.h +++ b/kate/part/katefiletype.h @@ -78,7 +78,7 @@ class KateFileTypeManager class KateFileTypeConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateFileTypeConfigTab( TQWidget *parent ); @@ -114,7 +114,7 @@ class KateFileTypeConfigTab : public KateConfigPage class KateViewFileTypeAction : public Kate::ActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewFileTypeAction(const TQString& text, TQObject* parent = 0, const char* name = 0) diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 66991ca8f..1f432468d 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -1289,7 +1289,7 @@ void KateHighlighting::generateContextStack(int *ctxNum, int ctx, TQMemArray<sho */ int KateHighlighting::makeDynamicContext(KateHlContext *model, const TQStringList *args) { - QPair<KateHlContext *, TQString> key(model, args->front()); + TQPair<KateHlContext *, TQString> key(model, args->front()); short value; if (dynamicCtxs.contains(key)) @@ -1694,7 +1694,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l TQString tmp=s[0]; if (!tmp.isEmpty()) p->defStyleNum=tmp.toInt(); - QRgb col; + TQRgb col; tmp=s[1]; if (!tmp.isEmpty()) { col=tmp.toUInt(0,16); p->setTextColor(col); } @@ -3193,79 +3193,79 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) list.setAutoDelete(true); KateAttribute* normal = new KateAttribute(); - normal->setTextColor(Qt::black); - normal->setSelectedTextColor(Qt::white); + normal->setTextColor(TQt::black); + normal->setSelectedTextColor(TQt::white); list.append(normal); KateAttribute* keyword = new KateAttribute(); - keyword->setTextColor(Qt::black); - keyword->setSelectedTextColor(Qt::white); + keyword->setTextColor(TQt::black); + keyword->setSelectedTextColor(TQt::white); keyword->setBold(true); list.append(keyword); KateAttribute* dataType = new KateAttribute(); - dataType->setTextColor(Qt::darkRed); - dataType->setSelectedTextColor(Qt::white); + dataType->setTextColor(TQt::darkRed); + dataType->setSelectedTextColor(TQt::white); list.append(dataType); KateAttribute* decimal = new KateAttribute(); - decimal->setTextColor(Qt::blue); - decimal->setSelectedTextColor(Qt::cyan); + decimal->setTextColor(TQt::blue); + decimal->setSelectedTextColor(TQt::cyan); list.append(decimal); KateAttribute* basen = new KateAttribute(); - basen->setTextColor(Qt::darkCyan); - basen->setSelectedTextColor(Qt::cyan); + basen->setTextColor(TQt::darkCyan); + basen->setSelectedTextColor(TQt::cyan); list.append(basen); KateAttribute* floatAttribute = new KateAttribute(); - floatAttribute->setTextColor(Qt::darkMagenta); - floatAttribute->setSelectedTextColor(Qt::cyan); + floatAttribute->setTextColor(TQt::darkMagenta); + floatAttribute->setSelectedTextColor(TQt::cyan); list.append(floatAttribute); KateAttribute* charAttribute = new KateAttribute(); - charAttribute->setTextColor(Qt::magenta); - charAttribute->setSelectedTextColor(Qt::magenta); + charAttribute->setTextColor(TQt::magenta); + charAttribute->setSelectedTextColor(TQt::magenta); list.append(charAttribute); KateAttribute* string = new KateAttribute(); string->setTextColor(TQColor("#D00")); - string->setSelectedTextColor(Qt::red); + string->setSelectedTextColor(TQt::red); list.append(string); KateAttribute* comment = new KateAttribute(); - comment->setTextColor(Qt::darkGray); - comment->setSelectedTextColor(Qt::gray); + comment->setTextColor(TQt::darkGray); + comment->setSelectedTextColor(TQt::gray); comment->setItalic(true); list.append(comment); KateAttribute* others = new KateAttribute(); - others->setTextColor(Qt::darkGreen); - others->setSelectedTextColor(Qt::green); + others->setTextColor(TQt::darkGreen); + others->setSelectedTextColor(TQt::green); list.append(others); KateAttribute* alert = new KateAttribute(); - alert->setTextColor(Qt::black); + alert->setTextColor(TQt::black); alert->setSelectedTextColor( TQColor("#FCC") ); alert->setBold(true); alert->setBGColor( TQColor("#FCC") ); list.append(alert); KateAttribute* functionAttribute = new KateAttribute(); - functionAttribute->setTextColor(Qt::darkBlue); - functionAttribute->setSelectedTextColor(Qt::white); + functionAttribute->setTextColor(TQt::darkBlue); + functionAttribute->setSelectedTextColor(TQt::white); list.append(functionAttribute); KateAttribute* regionmarker = new KateAttribute(); - regionmarker->setTextColor(Qt::white); - regionmarker->setBGColor(Qt::gray); - regionmarker->setSelectedTextColor(Qt::gray); + regionmarker->setTextColor(TQt::white); + regionmarker->setBGColor(TQt::gray); + regionmarker->setSelectedTextColor(TQt::gray); list.append(regionmarker); KateAttribute* error = new KateAttribute(); - error->setTextColor(Qt::red); + error->setTextColor(TQt::red); error->setUnderline(true); - error->setSelectedTextColor(Qt::red); + error->setSelectedTextColor(TQt::red); list.append(error); TDEConfig *config = KateHlManager::self()->self()->getTDEConfig(); @@ -3281,7 +3281,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) s << ""; TQString tmp; - QRgb col; + TQRgb col; tmp=s[0]; if (!tmp.isEmpty()) { col=tmp.toUInt(0,16); i->setTextColor(col); } @@ -3405,7 +3405,7 @@ void KateViewHighlightAction::init() m_doc = 0; subMenus.setAutoDelete( true ); - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewHighlightAction::updateMenu (Kate::Document *doc) @@ -3437,12 +3437,12 @@ void KateViewHighlightAction::slotAboutToShow() int m = subMenusName.findIndex (hlSection); names << hlName; - subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); + subMenus.at(m)->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0, z); } else if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); + popupMenu()->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0, z); } } } diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index 207d9a245..caad80a90 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -251,7 +251,7 @@ class KateHighlighting TQValueVector<KateHlContext*> m_contexts; inline KateHlContext *contextNum (uint n) { if (n < m_contexts.size()) return m_contexts[n]; return 0; } - TQMap< QPair<KateHlContext *, TQString>, short> dynamicCtxs; + TQMap< TQPair<KateHlContext *, TQString>, short> dynamicCtxs; // make them pointers perhaps KateEmbeddedHlInfos embeddedHls; @@ -340,7 +340,7 @@ class KateHighlighting class KateHlManager : public TQObject { - Q_OBJECT + TQ_OBJECT private: KateHlManager(); @@ -408,7 +408,7 @@ class KateHlManager : public TQObject class KateViewHighlightAction: public Kate::ActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewHighlightAction(const TQString& text, TQObject* parent = 0, const char* name = 0) diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index a7bf324e8..a4fdd3627 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -57,7 +57,7 @@ //BEGIN KatePrinter bool KatePrinter::print (KateDocument *doc) { -#ifndef Q_WS_WIN //TODO: reenable +#ifndef TQ_WS_WIN //TODO: reenable KPrinter printer; // docname is now always there, including the right Untitled name @@ -192,9 +192,9 @@ bool KatePrinter::print (KateDocument *doc) tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false); tags["D"] = TDEGlobal::locale()->formatDateTime(dt, false, false); - tags["h"] = TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); - tags["y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); - tags["Y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); + tags["h"] = TDEGlobal::locale()->formatTime(dt.time(), false); + tags["y"] = TDEGlobal::locale()->formatDate(dt.date(), true); + tags["Y"] = TDEGlobal::locale()->formatDate(dt.date(), false); tags["f"] = doc->url().fileName(); tags["U"] = doc->url().prettyURL(); if ( selectionOnly ) @@ -228,9 +228,9 @@ bool KatePrinter::print (KateDocument *doc) headerTagList = TQStringList::split('|', headerTags, true); if (!headerBgColor.isValid()) - headerBgColor = Qt::lightGray; + headerBgColor = TQt::lightGray; if (!headerFgColor.isValid()) - headerFgColor = Qt::black; + headerFgColor = TQt::black; } if (useFooter) @@ -255,9 +255,9 @@ bool KatePrinter::print (KateDocument *doc) footerTagList = TQStringList::split('|', footerTags, true); if (!footerBgColor.isValid()) - footerBgColor = Qt::lightGray; + footerBgColor = TQt::lightGray; if (!footerFgColor.isValid()) - footerFgColor = Qt::black; + footerFgColor = TQt::black; // adjust maxheight, so we can know when/where to print footer maxHeight -= footerHeight; } @@ -275,7 +275,7 @@ bool KatePrinter::print (KateDocument *doc) if ( useBox ) { if (!boxColor.isValid()) - boxColor = Qt::black; + boxColor = TQt::black; if (boxWidth < 1) // shouldn't be pssible no more! boxWidth = 1; // set maxwidth to something sensible @@ -307,7 +307,7 @@ bool KatePrinter::print (KateDocument *doc) // get a title and add the height required to draw it TQString _title = i18n("Typographical Conventions for %1").arg(doc->highlight()->name()); - guideHeight += paint.boundingRect( 0, 0, _w, 1000, Qt::AlignTop|Qt::AlignHCenter, _title ).height(); + guideHeight += paint.boundingRect( 0, 0, _w, 1000, TQt::AlignTop|TQt::AlignHCenter, _title ).height(); // see how many columns we can fit in int _widest( 0 ); @@ -417,8 +417,8 @@ bool KatePrinter::print (KateDocument *doc) if (headerTagList.count() == 3) { int valign = ( (useBox||headerDrawBg||useBackground) ? - Qt::AlignVCenter : Qt::AlignTop ); - int align = valign|Qt::AlignLeft; + TQt::AlignVCenter : TQt::AlignTop ); + int align = valign|TQt::AlignLeft; int marg = ( useBox || headerDrawBg ) ? innerMargin : 0; if ( useBox ) marg += boxWidth; TQString s; @@ -427,7 +427,7 @@ bool KatePrinter::print (KateDocument *doc) s = headerTagList[i]; if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s); - align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); + align = valign|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight); } } if ( ! ( headerDrawBg || useBox || useBackground ) ) // draw a 1 px (!?) line to separate header from contents @@ -446,7 +446,7 @@ bool KatePrinter::print (KateDocument *doc) paint.fillRect(0, maxHeight+innerMargin+boxWidth, headerWidth, footerHeight, footerBgColor); if (footerTagList.count() == 3) { - int align = Qt::AlignVCenter|Qt::AlignLeft; + int align = TQt::AlignVCenter|TQt::AlignLeft; int marg = ( useBox || footerDrawBg ) ? innerMargin : 0; if ( useBox ) marg += boxWidth; TQString s; @@ -455,7 +455,7 @@ bool KatePrinter::print (KateDocument *doc) s = footerTagList[i]; if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s); - align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); + align = TQt::AlignVCenter|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight); } } } // done footer @@ -524,7 +524,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setFont( renderer.config()->fontStruct()->myFontBold ); TQRect _r; paint.drawText( _marg, y, pdmWidth-(2*_marg), maxHeight - y, - Qt::AlignTop|Qt::AlignHCenter, + TQt::AlignTop|TQt::AlignHCenter, i18n("Typographical Conventions for %1").arg(doc->highlight()->name()), -1, &_r ); int _w = pdmWidth - (_marg*2) - (innerMargin*2); int _x = _marg + innerMargin; @@ -543,7 +543,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setPen( renderer.attribute(_i)->textColor() ); paint.setFont( renderer.attribute(_i)->font( *renderer.currentFont() ) ); paint.drawText(( _x + ((_i%guideCols)*_cw)), y, _cw, renderer.fontHeight(), - Qt::AlignVCenter|Qt::AlignLeft, _d->name, -1, &_r ); + TQt::AlignVCenter|TQt::AlignLeft, _d->name, -1, &_r ); _i++; if ( _i && ! ( _i%guideCols ) ) y += renderer.fontHeight(); ++_it; @@ -561,7 +561,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setPen( renderer.config()->lineNumberColor() ); paint.drawText( (( useBox || useBackground ) ? innerMargin : 0), y, lineNumberWidth, renderer.fontHeight(), - Qt::AlignRight, TQString("%1").arg( lineCount + 1 ) ); + TQt::AlignRight, TQString("%1").arg( lineCount + 1 ) ); } endCol = renderer.textWidth(doc->kateTextLine(lineCount), startCol, maxWidth, &needWrap); @@ -626,12 +626,12 @@ bool KatePrinter::print (KateDocument *doc) return true; } -#endif //!Q_WS_WIN +#endif //!TQ_WS_WIN return false; } //END KatePrinter -#ifndef Q_WS_WIN //TODO: reenable +#ifndef TQ_WS_WIN //TODO: reenable //BEGIN KatePrintTextSettings KatePrintTextSettings::KatePrintTextSettings( KPrinter * /*printer*/, TQWidget *parent, const char *name ) : KPrintDialogPage( parent, name ) @@ -719,9 +719,9 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * lo2->setStretchFactor( lFontPreview, 1 ); TQPushButton *btnChooseFont = new TQPushButton( i18n("Choo&se Font..."), this ); lo2->addWidget( btnChooseFont ); - connect( btnChooseFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHFFont()) ); + connect( btnChooseFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHFFont()) ); // header - gbHeader = new TQGroupBox( 2, Qt::Horizontal, i18n("Header Properties"), this ); + gbHeader = new TQGroupBox( 2, TQt::Horizontal, i18n("Header Properties"), this ); lo->addWidget( gbHeader ); TQLabel *lHeaderFormat = new TQLabel( i18n("&Format:"), gbHeader ); @@ -740,7 +740,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * cbHeaderEnableBgColor = new TQCheckBox( i18n("Bac&kground"), hbHeaderColors ); kcbtnHeaderBg = new KColorButton( hbHeaderColors ); - gbFooter = new TQGroupBox( 2, Qt::Horizontal, i18n("Footer Properties"), this ); + gbFooter = new TQGroupBox( 2, TQt::Horizontal, i18n("Footer Properties"), this ); lo->addWidget( gbFooter ); // footer @@ -764,10 +764,10 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * lo->addStretch( 1 ); // user friendly - connect( cbEnableHeader, TQT_SIGNAL(toggled(bool)), gbHeader, TQT_SLOT(setEnabled(bool)) ); - connect( cbEnableFooter, TQT_SIGNAL(toggled(bool)), gbFooter, TQT_SLOT(setEnabled(bool)) ); - connect( cbHeaderEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQT_SLOT(setEnabled(bool)) ); - connect( cbFooterEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnFooterBg, TQT_SLOT(setEnabled(bool)) ); + connect( cbEnableHeader, TQ_SIGNAL(toggled(bool)), gbHeader, TQ_SLOT(setEnabled(bool)) ); + connect( cbEnableFooter, TQ_SIGNAL(toggled(bool)), gbFooter, TQ_SLOT(setEnabled(bool)) ); + connect( cbHeaderEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQ_SLOT(setEnabled(bool)) ); + connect( cbFooterEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnFooterBg, TQ_SLOT(setEnabled(bool)) ); // set defaults cbEnableHeader->setChecked( true ); @@ -922,7 +922,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons cbEnableBox = new TQCheckBox( i18n("Draw &boxes"), this ); lo->addWidget( cbEnableBox ); - gbBoxProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Box Properties"), this ); + gbBoxProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Box Properties"), this ); lo->addWidget( gbBoxProps ); TQLabel *lBoxWidth = new TQLabel( i18n("W&idth:"), gbBoxProps ); @@ -937,7 +937,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons kcbtnBoxColor = new KColorButton( gbBoxProps ); lBoxColor->setBuddy( kcbtnBoxColor ); - connect( cbEnableBox, TQT_SIGNAL(toggled(bool)), gbBoxProps, TQT_SLOT(setEnabled(bool)) ); + connect( cbEnableBox, TQ_SIGNAL(toggled(bool)), gbBoxProps, TQ_SLOT(setEnabled(bool)) ); lo->addStretch( 1 ); // set defaults: @@ -1000,4 +1000,4 @@ void KatePrintLayout::setOptions( const TQMap<TQString,TQString>& opts ) //END KatePrintLayout #include "kateprinter.moc" -#endif //!Q_WS_WIN +#endif //!TQ_WS_WIN diff --git a/kate/part/kateprinter.h b/kate/part/kateprinter.h index 283c2b58e..ef0040eac 100644 --- a/kate/part/kateprinter.h +++ b/kate/part/kateprinter.h @@ -40,7 +40,7 @@ class KatePrinter static bool print (KateDocument *doc); }; -#ifndef Q_WS_WIN //TODO: reenable +#ifndef TQ_WS_WIN //TODO: reenable //BEGIN Text settings /* Text settings page: @@ -50,7 +50,7 @@ class KatePrinter */ class KatePrintTextSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KatePrintTextSettings( KPrinter *printer, TQWidget *parent=0, const char *name=0 ); ~KatePrintTextSettings(){}; @@ -77,7 +77,7 @@ class KatePrintTextSettings : public KPrintDialogPage class KatePrintHeaderFooter : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KatePrintHeaderFooter( KPrinter *printer, TQWidget *parent=0, const char *name=0 ); ~KatePrintHeaderFooter(){}; @@ -115,7 +115,7 @@ class KatePrintHeaderFooter : public KPrintDialogPage */ class KatePrintLayout : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KatePrintLayout( KPrinter *printer, TQWidget *parent=0, const char *name=0 ); ~KatePrintLayout(){}; @@ -131,6 +131,6 @@ class KatePrintLayout : public KPrintDialogPage KColorButton* kcbtnBoxColor; }; //END Layout -#endif //!Q_WS_WIN +#endif //!TQ_WS_WIN #endif diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp index a6c524f73..67afb4bd6 100644 --- a/kate/part/katerenderer.cpp +++ b/kate/part/katerenderer.cpp @@ -352,7 +352,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // Draws the dashed underline at the start of a folded block of text. if (range->startsInvisibleBlock) { - paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, Qt::DashLine)); + paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, TQt::DashLine)); paint.drawLine(0, fs->fontHeight - 1, xEnd - xStart, fs->fontHeight - 1); } diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index b23563e11..6716d079d 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -310,7 +310,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char m_combobox->insertItem(i18n("Error")); // markType07 m_combobox->setCurrentItem(0); m_markers = new KColorButton(b, "marker_color_button"); - connect( m_combobox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboBoxChanged( int ) ) ); + connect( m_combobox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboBoxChanged( int ) ) ); blay->addWidget(gbTextArea); @@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char blay->addStretch(); // connect signal changed(); changed is emitted by a ColorButton change! - connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( changed() ), parent->parentWidget(), TQ_SLOT( slotChanged() ) ); // TQWhatsThis help TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>")); @@ -405,15 +405,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) m_schema = newSchema; // first disconnect all signals otherwise setColor emits changed - m_back ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_selected ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_current ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_bracket ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_wwmarker ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_iconborder->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_tmarker ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_markers ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); + m_back ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_selected ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_current ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_bracket ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_wwmarker ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_iconborder->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_tmarker ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_markers ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_linenumber->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); // If we havent this schema, read in from config file if ( ! m_schemas.contains( newSchema ) ) @@ -431,13 +431,13 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) // same std colors like in KateDocument::markColor TQValueVector <TQColor> mark(KTextEditor::MarkInterface::reservedMarkersCount()); Q_ASSERT(mark.size() > 6); - mark[0] = Qt::blue; - mark[1] = Qt::red; - mark[2] = Qt::yellow; - mark[3] = Qt::magenta; - mark[4] = Qt::gray; - mark[5] = Qt::green; - mark[6] = Qt::red; + mark[0] = TQt::blue; + mark[1] = TQt::red; + mark[2] = TQt::yellow; + mark[3] = TQt::magenta; + mark[4] = TQt::gray; + mark[5] = TQt::green; + mark[6] = TQt::red; SchemaColors c; TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); @@ -475,15 +475,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) } m_markers->setColor( m_schemas [ newSchema ].markerColors[ m_combobox->currentItem() ] ); - connect( m_back , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_selected , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_current , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_bracket , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_wwmarker , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_iconborder, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_tmarker , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_linenumber, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_markers , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); + connect( m_back , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_selected , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_current , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_bracket , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_wwmarker , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_iconborder, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_tmarker , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_linenumber, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_markers , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); } void KateSchemaConfigColorTab::apply () @@ -527,9 +527,9 @@ void KateSchemaConfigColorTab::slotMarkerColorChanged( const TQColor& color) void KateSchemaConfigColorTab::slotComboBoxChanged(int index) { // temporarily disconnect the changed-signal because setColor emits changed as well - m_markers->disconnect( TQT_SIGNAL( changed( const TQColor& ) ) ); + m_markers->disconnect( TQ_SIGNAL( changed( const TQColor& ) ) ); m_markers->setColor( m_schemas[m_schema].markerColors[index] ); - connect( m_markers, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); + connect( m_markers, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); } //END KateSchemaConfigColorTab @@ -544,7 +544,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false ); grid->addWidget( m_fontchooser, 0, 0); - connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (this, TQ_SIGNAL( changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); m_schema = -1; } @@ -582,7 +582,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema ) m_fontchooser->disconnect ( this ); m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) ); m_fonts[ newSchema ] = m_fontchooser->font(); - connect (m_fontchooser, TQT_SIGNAL (fontSelected( const TQFont & )), this, TQT_SLOT (slotFontSelected( const TQFont & ))); + connect (m_fontchooser, TQ_SIGNAL (fontSelected( const TQFont & )), this, TQ_SLOT (slotFontSelected( const TQFont & ))); } //END FontConfig @@ -598,7 +598,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co m_defaultStyles = new KateStyleListView( this, false ); grid->addWidget( m_defaultStyles, 0, 0); - connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_defaultStyles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); TQWhatsThis::add( m_defaultStyles, i18n( "This list displays the default styles for the current schema and " @@ -688,8 +688,8 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); hlCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( hlCombo ); - connect( hlCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(hlChanged(int)) ); + connect( hlCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(hlChanged(int)) ); for( int i = 0; i < KateHlManager::self()->highlights(); i++) { if (KateHlManager::self()->hlSection(i).length() > 0) @@ -715,7 +715,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co "to edit from the popup menu.<p>You can unset the Background and Selected " "Background colors from the context menu when appropriate.") ); - connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_styles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); } KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab() @@ -833,20 +833,20 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc TQLabel *lHl = new TQLabel( i18n("&Schema:"), hbHl ); schemaCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( schemaCombo ); - connect( schemaCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(schemaChanged(int)) ); + connect( schemaCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(schemaChanged(int)) ); TQPushButton *btnnew = new TQPushButton( i18n("&New..."), hbHl ); - connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newSchema()) ); + connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newSchema()) ); btndel = new TQPushButton( i18n("&Delete"), hbHl ); - connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSchema()) ); + connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSchema()) ); m_tabWidget = new TQTabWidget ( this ); m_tabWidget->setMargin (KDialog::marginHint()); layout->add (m_tabWidget); - connect (m_tabWidget, TQT_SIGNAL (currentChanged (TQWidget *)), this, TQT_SLOT (newCurrentPage (TQWidget *))); + connect (m_tabWidget, TQ_SIGNAL (currentChanged (TQWidget *)), this, TQ_SLOT (newCurrentPage (TQWidget *))); m_colorTab = new KateSchemaConfigColorTab (m_tabWidget); m_tabWidget->addTab (m_colorTab, i18n("Colors")); @@ -873,8 +873,8 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc reload(); - connect( defaultSchemaCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChanged()) ); + connect( defaultSchemaCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChanged()) ); } KateSchemaConfigPage::~KateSchemaConfigPage () @@ -1003,7 +1003,7 @@ void KateViewSchemaAction::init() m_view = 0; last = 0; - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewSchemaAction::updateMenu (KateView *view) @@ -1023,7 +1023,7 @@ void KateViewSchemaAction::slotAboutToShow() if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0, z+1); + popupMenu()->insertItem ( hlName, this, TQ_SLOT(setSchema(int)), 0, z+1); } } @@ -1060,10 +1060,10 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults ) addColumn( i18n("Background Selected") ); if ( showUseDefaults ) addColumn( i18n("Use Default Style") ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), - this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), + this, TQ_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); // grap the bg color, selected color and default font normalcol = TDEGlobalSettings::textColor(); bgcol = KateRendererConfig::global()->backgroundColor(); @@ -1093,21 +1093,21 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob if ( showtitle ) m.insertTitle( i->contextName(), KateStyleListItem::ContextName ); - id = m.insertItem( i18n("&Bold"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold ); + id = m.insertItem( i18n("&Bold"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold ); m.setItemChecked( id, is->bold() ); - id = m.insertItem( i18n("&Italic"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic ); + id = m.insertItem( i18n("&Italic"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic ); m.setItemChecked( id, is->italic() ); - id = m.insertItem( i18n("&Underline"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline ); + id = m.insertItem( i18n("&Underline"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline ); m.setItemChecked( id, is->underline() ); - id = m.insertItem( i18n("S&trikeout"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout ); + id = m.insertItem( i18n("S&trikeout"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout ); m.setItemChecked( id, is->strikeOut() ); m.insertSeparator(); - m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color ); - m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor ); - m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor ); - m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor ); + m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color ); + m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor ); + m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor ); + m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor ); // Unset [some] colors. I could show one only if that button was clicked, but that // would disable setting this with the keyboard (how many aren't doing just @@ -1118,14 +1118,14 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob { m.insertSeparator(); if ( style->itemSet( KateAttribute::BGColor) ) - m.insertItem( i18n("Unset Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 100 ); + m.insertItem( i18n("Unset Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 100 ); if ( style->itemSet( KateAttribute::SelectedBGColor ) ) - m.insertItem( i18n("Unset Selected Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 101 ); + m.insertItem( i18n("Unset Selected Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 101 ); } if ( ! i->isDefault() && ! i->defStyle() ) { m.insertSeparator(); - id = m.insertItem( i18n("Use &Default Style"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle ); + id = m.insertItem( i18n("Use &Default Style"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle ); m.setItemChecked( id, i->defStyle() ); } m.exec( globalPos ); @@ -1153,7 +1153,7 @@ void KateStyleListView::unsetColor( int c ) void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c) { if ( dynamic_cast<KateStyleListItem*>(i) ) { - if ( btn == Qt::LeftButton && c > 0 ) { + if ( btn == TQt::LeftButton && c > 0 ) { // map pos to item/column and call KateStyleListItem::activate(col, pos) ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); } diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index cf503be68..63cc210b5 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -92,7 +92,7 @@ class KateSchemaManager class KateViewSchemaAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0) @@ -127,7 +127,7 @@ class KateViewSchemaAction : public TDEActionMenu */ class KateStyleListView : public TQListView { - Q_OBJECT + TQ_OBJECT friend class KateStyleListItem; @@ -162,7 +162,7 @@ class KateStyleListView : public TQListView class KateSchemaConfigColorTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigColorTab( TQWidget *parent = 0, const char *name = 0 ); @@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public TQWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged) protected slots: void slotMarkerColorChanged(const TQColor&); @@ -209,7 +209,7 @@ typedef TQMap<int,TQFont> FontMap; // ### remove it class KateSchemaConfigFontTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigFontTab( TQWidget *parent = 0, const char *name = 0 ); @@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public TQWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged) private: class TDEFontChooser *m_fontchooser; @@ -236,7 +236,7 @@ class KateSchemaConfigFontTab : public TQWidget class KateSchemaConfigFontColorTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigFontColorTab( TQWidget *parent = 0, const char *name = 0 ); @@ -256,7 +256,7 @@ class KateSchemaConfigFontColorTab : public TQWidget class KateSchemaConfigHighlightTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigHighlightTab( TQWidget *parent = 0, const char *name = 0, KateSchemaConfigFontColorTab *page = 0, uint hl = 0 ); @@ -284,7 +284,7 @@ class KateSchemaConfigHighlightTab : public TQWidget class KateSchemaConfigPage : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigPage ( TQWidget *parent, class KateDocument *doc=0 ); diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index a02bbef71..b76af856b 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -58,7 +58,7 @@ KateSearch::KateSearch( KateView* view ) m_arbitraryHLList = new KateSuperRangeList(); if (arbitraryHLExample) m_doc->arbitraryHL()->addHighlightToView(m_arbitraryHLList, m_view); - connect(replacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(replaceSlot())); + connect(replacePrompt,TQ_SIGNAL(clicked()),this,TQ_SLOT(replaceSlot())); } KateSearch::~KateSearch() @@ -68,13 +68,13 @@ KateSearch::~KateSearch() void KateSearch::createActions( TDEActionCollection* ac ) { - KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis( + KStdAction::find( this, TQ_SLOT(find()), ac )->setWhatsThis( i18n("Look up the first occurrence of a piece of text or regular expression.")); - KStdAction::findNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis( + KStdAction::findNext( this, TQ_SLOT(slotFindNext()), ac )->setWhatsThis( i18n("Look up the next occurrence of the search phrase.")); - KStdAction::findPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis( + KStdAction::findPrev( this, TQ_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis( i18n("Look up the previous occurrence of the search phrase.")); - KStdAction::replace( this, TQT_SLOT(replace()), ac )->setWhatsThis( + KStdAction::replace( this, TQ_SLOT(replace()), ac )->setWhatsThis( i18n("Look up a piece of text or regular expression and replace the result with some given text.")); } @@ -729,10 +729,10 @@ bool KateSearch::doSearch( const TQString& text ) if (arbitraryHLExample) { KateArbitraryHighlightRange* hl = new KateArbitraryHighlightRange(new KateSuperCursor(m_doc, true, s.cursor), new KateSuperCursor(m_doc, true, s.cursor.line(), s.cursor.col() + s.matchedLength), this); hl->setBold(); - hl->setTextColor(Qt::white); - hl->setBGColor(Qt::black); + hl->setTextColor(TQt::white); + hl->setBGColor(TQt::black); // destroy the highlight upon change - connect(hl, TQT_SIGNAL(contentsChanged()), hl, TQT_SIGNAL(eliminated())); + connect(hl, TQ_SIGNAL(contentsChanged()), hl, TQ_SIGNAL(eliminated())); m_arbitraryHLList->append(hl); } diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h index 139cd3ff9..7ff798325 100644 --- a/kate/part/katesearch.h +++ b/kate/part/katesearch.h @@ -41,7 +41,7 @@ class TDEActionCollection; class KateSearch : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KateDocument; @@ -167,7 +167,7 @@ class KateSearch : public TQObject */ class KateReplacePrompt : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp index 84b4337d9..e19f4fb94 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -53,11 +53,11 @@ KateSpell::~KateSpell() void KateSpell::createActions( TDEActionCollection* ac ) { - KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac ); - TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); + KStdAction::spelling( this, TQ_SLOT(spellcheck()), ac ); + TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward")); - m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); + m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text")); } @@ -123,17 +123,17 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl; m_tdespell = new KSpell( m_view, i18n("Spellcheck"), - this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type ); + this, TQ_SLOT(ready(KSpell *)), ksc, true, true, type ); - connect( m_tdespell, TQT_SIGNAL(death()), - this, TQT_SLOT(spellCleanDone()) ); + connect( m_tdespell, TQ_SIGNAL(death()), + this, TQ_SLOT(spellCleanDone()) ); - connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), - this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) ); - connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), - this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) ); - connect( m_tdespell, TQT_SIGNAL(done(const TQString&)), - this, TQT_SLOT(spellResult(const TQString&)) ); + connect( m_tdespell, TQ_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), + this, TQ_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) ); + connect( m_tdespell, TQ_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), + this, TQ_SLOT(corrected(const TQString&, const TQString&, unsigned int)) ); + connect( m_tdespell, TQ_SIGNAL(done(const TQString&)), + this, TQ_SLOT(spellResult(const TQString&)) ); } void KateSpell::ready(KSpell *) diff --git a/kate/part/katespell.h b/kate/part/katespell.h index 6119d0ea4..6a5e3ad52 100644 --- a/kate/part/katespell.h +++ b/kate/part/katespell.h @@ -32,7 +32,7 @@ class KSpell; class KateSpell : public TQObject { - Q_OBJECT + TQ_OBJECT public: KateSpell( KateView* ); diff --git a/kate/part/katesupercursor.cpp b/kate/part/katesupercursor.cpp index 287786e3d..4b5d02864 100644 --- a/kate/part/katesupercursor.cpp +++ b/kate/part/katesupercursor.cpp @@ -328,15 +328,15 @@ void KateSuperRange::init() setBehaviour(DoNotExpand); // Not necessarily the best implementation - connect(m_start, TQT_SIGNAL(positionDirectlyChanged()), TQT_SIGNAL(contentsChanged())); - connect(m_end, TQT_SIGNAL(positionDirectlyChanged()), TQT_SIGNAL(contentsChanged())); + connect(m_start, TQ_SIGNAL(positionDirectlyChanged()), TQ_SIGNAL(contentsChanged())); + connect(m_end, TQ_SIGNAL(positionDirectlyChanged()), TQ_SIGNAL(contentsChanged())); - connect(m_start, TQT_SIGNAL(positionChanged()), TQT_SLOT(slotEvaluateChanged())); - connect(m_end, TQT_SIGNAL(positionChanged()), TQT_SLOT(slotEvaluateChanged())); - connect(m_start, TQT_SIGNAL(positionUnChanged()), TQT_SLOT(slotEvaluateUnChanged())); - connect(m_end, TQT_SIGNAL(positionUnChanged()), TQT_SLOT(slotEvaluateUnChanged())); - connect(m_start, TQT_SIGNAL(positionDeleted()), TQT_SIGNAL(boundaryDeleted())); - connect(m_end, TQT_SIGNAL(positionDeleted()), TQT_SIGNAL(boundaryDeleted())); + connect(m_start, TQ_SIGNAL(positionChanged()), TQ_SLOT(slotEvaluateChanged())); + connect(m_end, TQ_SIGNAL(positionChanged()), TQ_SLOT(slotEvaluateChanged())); + connect(m_start, TQ_SIGNAL(positionUnChanged()), TQ_SLOT(slotEvaluateUnChanged())); + connect(m_end, TQ_SIGNAL(positionUnChanged()), TQ_SLOT(slotEvaluateUnChanged())); + connect(m_start, TQ_SIGNAL(positionDeleted()), TQ_SIGNAL(boundaryDeleted())); + connect(m_end, TQ_SIGNAL(positionDeleted()), TQ_SIGNAL(boundaryDeleted())); } KateSuperRange::~KateSuperRange() @@ -446,7 +446,7 @@ bool KateSuperRange::boundaryOn(uint lineNum) const void KateSuperRange::slotEvaluateChanged() { - if (sender() == static_cast<TQObject*>(m_start)) { + if (sender() == m_start) { if (m_evaluate) { if (!m_endChanged) { // Only one was changed @@ -484,7 +484,7 @@ void KateSuperRange::slotEvaluateChanged() void KateSuperRange::slotEvaluateUnChanged() { - if (sender() == static_cast<TQObject*>(m_start)) { + if (sender() == m_start) { if (m_evaluate) { if (m_endChanged) { // Only one changed @@ -581,8 +581,8 @@ void KateSuperRangeList::connectAll() if (!m_connect) { m_connect = true; for (KateSuperRange* range = first(); range; range = next()) { - connect(range, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*))); - connect(range, TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated())); + connect(range, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*))); + connect(range, TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated())); } } } @@ -636,7 +636,7 @@ bool KateSuperRangeList::rangesInclude(const KateTextCursor& cursor) void KateSuperRangeList::slotEliminated() { if (sender()) { - KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))); + KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(sender())); emit rangeEliminated(range); if (m_trackingBoundaries) { @@ -727,9 +727,9 @@ int KateSuperRangeList::compareItems(TQPtrCollection::Item item1, TQPtrCollectio TQPtrCollection::Item KateSuperRangeList::newItem(TQPtrCollection::Item d) { if (m_connect) { - connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*))); - connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated())); - connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SIGNAL(tagRange(KateSuperRange*))); + connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*))); + connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated())); + connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SIGNAL(tagRange(KateSuperRange*))); // HACK HACK static_cast<KateSuperRange*>(d)->slotTagRange(); diff --git a/kate/part/katesupercursor.h b/kate/part/katesupercursor.h index 74baf07df..270227925 100644 --- a/kate/part/katesupercursor.h +++ b/kate/part/katesupercursor.h @@ -44,7 +44,7 @@ class KateView; **/ class KateSuperCursor : public TQObject, public KateDocCursor, public Kate::Cursor { - Q_OBJECT + TQ_OBJECT public: /** @@ -169,7 +169,7 @@ class KateSuperRange : public TQObject, public KateRange { friend class KateSuperRangeList; - Q_OBJECT + TQ_OBJECT public: /// Determine how the range reacts to characters inserted immediately outside the range. @@ -338,7 +338,7 @@ protected: class KateSuperRangeList : public TQObject, public TQPtrList<KateSuperRange> { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp index 52e07a2e4..5403d0308 100644 --- a/kate/part/katetemplatehandler.cpp +++ b/kate/part/katetemplatehandler.cpp @@ -38,7 +38,7 @@ KateTemplateHandler::KateTemplateHandler( , m_initOk( false ) , m_recursion( false ) { - connect( m_doc, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDocumentDestroyed() ) ); + connect( m_doc, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDocumentDestroyed() ) ); m_ranges = new KateSuperRangeList( false, this ); //false/*,this*/); if ( !m_doc->setTabInterceptor( this ) ) @@ -116,15 +116,15 @@ KateTemplateHandler::KateTemplateHandler( m_doc->tagLines( ( *it ) ->start().line(), ( *it ) ->end().line() ); } - /* connect(doc,TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this, - TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&))); - connect(doc,TQT_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this, - TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/ - connect( doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) ); - connect( doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); - connect( doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) ); + /* connect(doc,TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this, + TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&))); + connect(doc,TQ_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this, + TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/ + connect( doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) ); + connect( doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); + connect( doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) ); - ( *this ) ( Qt::Key_Tab ); + ( *this ) ( TQt::Key_Tab ); } KateTemplateHandler::~KateTemplateHandler() @@ -283,7 +283,7 @@ void KateTemplateHandler::locateRange( const KateTextCursor& cursor ) bool KateTemplateHandler::operator() ( KKey key ) { - if ( key==Qt::Key_Tab ) + if ( key==TQt::Key_Tab ) { m_currentTabStop++; @@ -324,9 +324,9 @@ void KateTemplateHandler::slotAboutToRemoveText( const KateTextRange &range ) if ( m_doc ) { - disconnect( m_doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) ); - disconnect( m_doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); - disconnect( m_doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) ); + disconnect( m_doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) ); + disconnect( m_doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); + disconnect( m_doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) ); } deleteLater(); diff --git a/kate/part/katetemplatehandler.h b/kate/part/katetemplatehandler.h index d7d56e074..f50023f46 100644 --- a/kate/part/katetemplatehandler.h +++ b/kate/part/katetemplatehandler.h @@ -29,7 +29,7 @@ class KateDocument; class KateTemplateHandler: public TQObject, public KateKeyInterceptorFunctor { - Q_OBJECT + TQ_OBJECT public: KateTemplateHandler(KateDocument *doc,uint line,uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues); virtual ~KateTemplateHandler(); diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h index 78c28e644..dec072d9d 100644 --- a/kate/part/katetextline.h +++ b/kate/part/katetextline.h @@ -167,7 +167,7 @@ class KateTextLine : public TDEShared inline uchar *attributes () const { return m_attributes.data(); } /** - * Gets a QString + * Gets a TQString * @return text of line as TQString reference */ inline const TQString& string() const { return m_text; } diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index bee2e4fb3..95e9d1eae 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -131,7 +131,7 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name ) doc->addView( this ); setFocusProxy( m_viewInternal ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); if (!doc->singleViewMode()) { setXMLFile( "katepartui.rc" ); @@ -159,8 +159,8 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name ) slotHlChanged(); /*test texthint - connect(this,TQT_SIGNAL(needTextHint(int, int, TQString &)), - this,TQT_SLOT(slotNeedTextHint(int, int, TQString &))); + connect(this,TQ_SIGNAL(needTextHint(int, int, TQString &)), + this,TQ_SLOT(slotNeedTextHint(int, int, TQString &))); enableTextHints(1000); test texthint*/ } @@ -186,22 +186,22 @@ KateView::~KateView() void KateView::setupConnections() { - connect( m_doc, TQT_SIGNAL(undoChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotNewUndo()) ); - connect( m_doc, TQT_SIGNAL(hlChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotHlChanged()) ); - connect( m_doc, TQT_SIGNAL(canceled(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanceled(const TQString&)) ); - connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)), - TQT_TQOBJECT(this), TQT_SIGNAL(dropEventPass(TQDropEvent*)) ); - connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg())); - connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg())); - connect(m_doc, TQT_SIGNAL(undoChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg())); + connect( m_doc, TQ_SIGNAL(undoChanged()), + this, TQ_SLOT(slotNewUndo()) ); + connect( m_doc, TQ_SIGNAL(hlChanged()), + this, TQ_SLOT(slotHlChanged()) ); + connect( m_doc, TQ_SIGNAL(canceled(const TQString&)), + this, TQ_SLOT(slotSaveCanceled(const TQString&)) ); + connect( m_viewInternal, TQ_SIGNAL(dropEventPass(TQDropEvent*)), + this, TQ_SIGNAL(dropEventPass(TQDropEvent*)) ); + connect(this,TQ_SIGNAL(cursorPositionChanged()),this,TQ_SLOT(slotStatusMsg())); + connect(this,TQ_SIGNAL(newStatus()),this,TQ_SLOT(slotStatusMsg())); + connect(m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotStatusMsg())); if ( m_doc->browserView() ) { - connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(slotDropEventPass(TQDropEvent*)) ); + connect( this, TQ_SIGNAL(dropEventPass(TQDropEvent*)), + this, TQ_SLOT(slotDropEventPass(TQDropEvent*)) ); } } @@ -212,84 +212,84 @@ void KateView::setupActions() m_toggleWriteLock = 0; - m_cut = a=KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), ac); + m_cut = a=KStdAction::cut(this, TQ_SLOT(cut()), ac); a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard")); - m_paste = a=KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), ac); + m_paste = a=KStdAction::pasteText(this, TQ_SLOT(paste()), ac); a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents")); - m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac); + m_copy = a=KStdAction::copy(this, TQ_SLOT(copy()), ac); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); - m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); + m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQ_SLOT(copyHTML()), ac, "edit_copy_html"); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); if (!m_doc->readOnly()) { - a=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), ac); + a=KStdAction::save(this, TQ_SLOT(save()), ac); a->setWhatsThis(i18n("Save the current document")); - a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac); + a=m_editUndo = KStdAction::undo(m_doc, TQ_SLOT(undo()), ac); a->setWhatsThis(i18n("Revert the most recent editing actions")); - a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac); + a=m_editRedo = KStdAction::redo(m_doc, TQ_SLOT(redo()), ac); a->setWhatsThis(i18n("Revert the most recent undo operation")); - (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( + (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQ_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( i18n("Use this command to wrap all lines of the current document which are longer than the width of the" " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated" " when the view is resized.")); // setup Tools menu - a=new TDEAction(i18n("&Indent"), "format-indent-more", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); + a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQ_SLOT(indent()), ac, "tools_indent"); a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Unindent"), "format-indent-less", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); + a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQ_SLOT(unIndent()), ac, "tools_unindent"); a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); - a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); + a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQ_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); + a=new TDEAction(i18n("&Align"), 0, this, TQ_SLOT(align()), ac, "tools_align"); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); - a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), + a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQ_SLOT(comment()), ac, "tools_comment"); a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>" "The characters for single/multiple line comments are defined within the language's highlighting.")); - a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), + a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQ_SLOT(uncomment()), ac, "tools_uncomment"); a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>" "The characters for single/multiple line comments are defined within the language's highlighting.")); a = m_toggleWriteLock = new TDEToggleAction( i18n("&Read Only Mode"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ), + this, TQ_SLOT( toggleWriteLock() ), ac, "tools_toggle_write_lock" ); a->setWhatsThis( i18n("Lock/unlock the document for writing") ); - a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this), - TQT_SLOT(uppercase()), ac, "tools_uppercase" ); + a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, this, + TQ_SLOT(uppercase()), ac, "tools_uppercase" ); a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this), - TQT_SLOT(lowercase()), ac, "tools_lowercase" ); + a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, this, + TQ_SLOT(lowercase()), ac, "tools_lowercase" ); a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this), - TQT_SLOT(capitalize()), ac, "tools_capitalize" ); + a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, this, + TQ_SLOT(capitalize()), ac, "tools_capitalize" ); a->setWhatsThis( i18n("Capitalize the selection, or the word under the " "cursor if no text is selected.") ); - a = new TDEAction( i18n("Delete Line"), 0, TQT_TQOBJECT(this), - TQT_SLOT( killLine() ), ac, "tools_delete_line"); + a = new TDEAction( i18n("Delete Line"), 0, this, + TQ_SLOT( killLine() ), ac, "tools_delete_line"); a->setWhatsThis(i18n("Use this to delete the current line.")); - a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this), - TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); + a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, this, + TQ_SLOT( joinLines() ), ac, "tools_join_lines" ); a->setWhatsThis(i18n("Use this to join lines together.")); } else @@ -300,19 +300,19 @@ void KateView::setupActions() m_editRedo = 0; } - a=KStdAction::print( m_doc, TQT_SLOT(print()), ac ); + a=KStdAction::print( m_doc, TQ_SLOT(print()), ac ); a->setWhatsThis(i18n("Print the current document.")); - a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload"); + a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQ_SLOT(reloadFile()), ac, "file_reload"); a->setWhatsThis(i18n("Reload the current document from disk.")); - a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac); + a=KStdAction::saveAs(this, TQ_SLOT(saveAs()), ac); a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice.")); - a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac); + a=KStdAction::gotoLine(this, TQ_SLOT(gotoLine()), ac); a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to.")); - a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); + a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQ_SLOT(configDialog()),ac, "set_confdlg"); a->setWhatsThis(i18n("Configure various aspects of this editor.")); KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight"); @@ -329,45 +329,45 @@ void KateView::setupActions() new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation"); // html export - a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html"); + a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQ_SLOT(exportAsHTML()), ac, "file_export_html"); a->setWhatsThis(i18n("This command allows you to export the current document" " with all highlighting information into a HTML document.")); - m_selectAll = a=KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAll()), ac); + m_selectAll = a=KStdAction::selectAll(this, TQ_SLOT(selectAll()), ac); a->setWhatsThis(i18n("Select the entire text of the current document.")); - m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac); + m_deSelect = a=KStdAction::deselect(this, TQ_SLOT(clearSelection()), ac); a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected.")); - a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); + a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQ_SLOT(slotIncFontSizes()), ac, "incFontSizes"); a->setWhatsThis(i18n("This increases the display font size.")); - a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); + a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQ_SLOT(slotDecFontSizes()), ac, "decFontSizes"); a->setWhatsThis(i18n("This decreases the display font size.")); a= m_toggleBlockSelection = new TDEToggleAction( i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B, - TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()), + this, TQ_SLOT(toggleBlockSelectionMode()), ac, "set_verticalSelect"); a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode.")); a= m_toggleInsert = new TDEToggleAction( i18n("Overwr&ite Mode"), Key_Insert, - TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()), + this, TQ_SLOT(toggleInsert()), ac, "set_insert" ); a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text.")); TDEToggleAction *toggleAction; a= m_toggleDynWrap = toggleAction = new TDEToggleAction( i18n("&Dynamic Word Wrap"), Key_F10, - TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()), + this, TQ_SLOT(toggleDynWordWrap()), ac, "view_dynamic_word_wrap" ); a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen.")); a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed")); - connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int))); + connect(m_setDynWrapIndicators, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDynWrapIndicators(int))); TQStringList list2; list2.append(i18n("&Off")); list2.append(i18n("Follow &Line Numbers")); @@ -376,14 +376,14 @@ void KateView::setupActions() a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction( i18n("Show Folding &Markers"), Key_F9, - TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()), + this, TQ_SLOT(toggleFoldingMarkers()), ac, "view_folding_markers" ); a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible.")); toggleAction->setCheckedState(i18n("Hide Folding &Markers")); a= m_toggleIconBar = toggleAction = new TDEToggleAction( i18n("Show &Icon Border"), Key_F6, - TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()), + this, TQ_SLOT(toggleIconBorder()), ac, "view_border"); a=toggleAction; a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance.")); @@ -391,21 +391,21 @@ void KateView::setupActions() a= toggleAction=m_toggleLineNumbers = new TDEToggleAction( i18n("Show &Line Numbers"), Key_F11, - TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()), + this, TQ_SLOT(toggleLineNumbersOn()), ac, "view_line_numbers" ); a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view.")); toggleAction->setCheckedState(i18n("Hide &Line Numbers")); a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction( i18n("Show Scroll&bar Marks"), 0, - TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()), + this, TQ_SLOT(toggleScrollBarMarks()), ac, "view_scrollbar_marks"); a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks.")); toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks")); a = toggleAction = m_toggleWWMarker = new TDEToggleAction( i18n("Show Static &Word Wrap Marker"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ), + this, TQ_SLOT( toggleWWMarker() ), ac, "view_word_wrap_marker" ); a->setWhatsThis( i18n( "Show/hide the Word Wrap Marker, a vertical line drawn at the word " @@ -414,7 +414,7 @@ void KateView::setupActions() a= m_switchCmdLine = new TDEAction( i18n("Switch to Command Line"), Key_F7, - TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()), + this, TQ_SLOT(switchToCmdLine()), ac, "switch_to_cmd_line" ); a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view.")); @@ -426,10 +426,10 @@ void KateView::setupActions() list.append("&Macintosh"); m_setEndOfLine->setItems(list); m_setEndOfLine->setCurrentItem (m_doc->config()->eol()); - connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setEol(int))); + connect(m_setEndOfLine, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEol(int))); // encoding menu - new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), TQT_TQOBJECT(ac), "set_encoding"); + new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), ac, "set_encoding"); m_search->createActions( ac ); m_spell->createActions( ac ); @@ -437,144 +437,144 @@ void KateView::setupActions() slotSelectionChanged (); - connect (this, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged())); + connect (this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); } void KateView::setupEditActions() { - m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" ); + m_editActions = new TDEActionCollection( m_viewInternal, this, "edit_actions" ); TDEActionCollection* ac = m_editActions; new TDEAction( i18n("Move Word Left"), CTRL + Key_Left, - TQT_TQOBJECT(this),TQT_SLOT(wordLeft()), + this,TQ_SLOT(wordLeft()), ac, "word_left" ); new TDEAction( i18n("Select Character Left"), SHIFT + Key_Left, - TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()), + this,TQ_SLOT(shiftCursorLeft()), ac, "select_char_left" ); new TDEAction( i18n("Select Word Left"), SHIFT + CTRL + Key_Left, - TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()), + this, TQ_SLOT(shiftWordLeft()), ac, "select_word_left" ); new TDEAction( i18n("Move Word Right"), CTRL + Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(wordRight()), + this, TQ_SLOT(wordRight()), ac, "word_right" ); new TDEAction( i18n("Select Character Right"), SHIFT + Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()), + this, TQ_SLOT(shiftCursorRight()), ac, "select_char_right" ); new TDEAction( i18n("Select Word Right"), SHIFT + CTRL + Key_Right, - TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()), + this,TQ_SLOT(shiftWordRight()), ac, "select_word_right" ); new TDEAction( i18n("Move to Beginning of Line"), Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(home()), + this, TQ_SLOT(home()), ac, "beginning_of_line" ); new TDEAction( i18n("Move to Beginning of Document"), TDEStdAccel::home(), - TQT_TQOBJECT(this), TQT_SLOT(top()), + this, TQ_SLOT(top()), ac, "beginning_of_document" ); new TDEAction( i18n("Select to Beginning of Line"), SHIFT + Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(shiftHome()), + this, TQ_SLOT(shiftHome()), ac, "select_beginning_of_line" ); new TDEAction( i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(shiftTop()), + this, TQ_SLOT(shiftTop()), ac, "select_beginning_of_document" ); new TDEAction( i18n("Move to End of Line"), Key_End, - TQT_TQOBJECT(this), TQT_SLOT(end()), + this, TQ_SLOT(end()), ac, "end_of_line" ); new TDEAction( i18n("Move to End of Document"), TDEStdAccel::end(), - TQT_TQOBJECT(this), TQT_SLOT(bottom()), + this, TQ_SLOT(bottom()), ac, "end_of_document" ); new TDEAction( i18n("Select to End of Line"), SHIFT + Key_End, - TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()), + this, TQ_SLOT(shiftEnd()), ac, "select_end_of_line" ); new TDEAction( i18n("Select to End of Document"), SHIFT + CTRL + Key_End, - TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()), + this, TQ_SLOT(shiftBottom()), ac, "select_end_of_document" ); new TDEAction( i18n("Select to Previous Line"), SHIFT + Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(shiftUp()), + this, TQ_SLOT(shiftUp()), ac, "select_line_up" ); new TDEAction( i18n("Scroll Line Up"),"", CTRL + Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(scrollUp()), + this, TQ_SLOT(scrollUp()), ac, "scroll_line_up" ); - new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), + new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQ_SLOT(down()), ac, "move_line_down"); - new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), + new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQ_SLOT(up()), ac, "move_line_up"); - new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this), - TQT_SLOT(cursorRight()), ac, "move_cursor_right"); + new TDEAction(i18n("Move Character Right"), Key_Right, this, + TQ_SLOT(cursorRight()), ac, "move_cursor_right"); - new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()), + new TDEAction(i18n("Move Character Left"), Key_Left, this, TQ_SLOT(cursorLeft()), ac, "move_cusor_left"); new TDEAction( i18n("Select to Next Line"), SHIFT + Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(shiftDown()), + this, TQ_SLOT(shiftDown()), ac, "select_line_down" ); new TDEAction( i18n("Scroll Line Down"), CTRL + Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(scrollDown()), + this, TQ_SLOT(scrollDown()), ac, "scroll_line_down" ); new TDEAction( i18n("Scroll Page Up"), TDEStdAccel::prior(), - TQT_TQOBJECT(this), TQT_SLOT(pageUp()), + this, TQ_SLOT(pageUp()), ac, "scroll_page_up" ); new TDEAction( i18n("Select Page Up"), SHIFT + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()), + this, TQ_SLOT(shiftPageUp()), ac, "select_page_up" ); new TDEAction( i18n("Move to Top of View"), CTRL + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(topOfView()), + this, TQ_SLOT(topOfView()), ac, "move_top_of_view" ); new TDEAction( i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()), + this, TQ_SLOT(shiftTopOfView()), ac, "select_top_of_view" ); new TDEAction( i18n("Scroll Page Down"), TDEStdAccel::next(), - TQT_TQOBJECT(this), TQT_SLOT(pageDown()), + this, TQ_SLOT(pageDown()), ac, "scroll_page_down" ); new TDEAction( i18n("Select Page Down"), SHIFT + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()), + this, TQ_SLOT(shiftPageDown()), ac, "select_page_down" ); new TDEAction( i18n("Move to Bottom of View"), CTRL + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()), + this, TQ_SLOT(bottomOfView()), ac, "move_bottom_of_view" ); new TDEAction( i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()), + this, TQ_SLOT(shiftBottomOfView()), ac, "select_bottom_of_view" ); new TDEAction( i18n("Move to Matching Bracket"), CTRL + Key_6, - TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()), + this, TQ_SLOT(toMatchingBracket()), ac, "to_matching_bracket" ); new TDEAction( i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6, - TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()), + this, TQ_SLOT(shiftToMatchingBracket()), ac, "select_matching_bracket" ); // anders: shortcuts doing any changes should not be created in browserextension @@ -582,40 +582,40 @@ void KateView::setupEditActions() { new TDEAction( i18n("Transpose Characters"), CTRL + Key_T, - TQT_TQOBJECT(this), TQT_SLOT(transpose()), + this, TQ_SLOT(transpose()), ac, "transpose_char" ); new TDEAction( i18n("Delete Line"), CTRL + Key_K, - TQT_TQOBJECT(this), TQT_SLOT(killLine()), + this, TQ_SLOT(killLine()), ac, "delete_line" ); new TDEAction( i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(), - TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()), + this, TQ_SLOT(deleteWordLeft()), ac, "delete_word_left" ); new TDEAction( i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(), - TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()), + this, TQ_SLOT(deleteWordRight()), ac, "delete_word_right" ); new TDEAction(i18n("Delete Next Character"), Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(keyDelete()), + this, TQ_SLOT(keyDelete()), ac, "delete_next_character"); TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace, - TQT_TQOBJECT(this), TQT_SLOT(backspace()), + this, TQ_SLOT(backspace()), ac, "backspace"); TDEShortcut cut = a->shortcut(); cut.append( KKey( SHIFT + Key_Backspace ) ); a->setShortcut( cut ); } - connect( this, TQT_SIGNAL(gotFocus(Kate::View*)), - TQT_TQOBJECT(this), TQT_SLOT(slotGotFocus()) ); - connect( this, TQT_SIGNAL(lostFocus(Kate::View*)), - TQT_TQOBJECT(this), TQT_SLOT(slotLostFocus()) ); + connect( this, TQ_SIGNAL(gotFocus(Kate::View*)), + this, TQ_SLOT(slotGotFocus()) ); + connect( this, TQ_SIGNAL(lostFocus(Kate::View*)), + this, TQ_SLOT(slotLostFocus()) ); m_editActions->readShortcutSettings( "Katepart Shortcuts" ); @@ -631,18 +631,18 @@ void KateView::setupCodeFolding() { TDEActionCollection *ac=this->actionCollection(); new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, - m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); + m_doc->foldingTree(),TQ_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, - TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); + this,TQ_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, - TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); + this,TQ_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus, - TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); + this,TQ_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); #ifdef DEBUGACCELS - TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this)); - debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree())); - debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode())); + TDEAccel* debugAccels = new TDEAccel(this,this); + debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQ_SLOT(dumpRegionTree())); + debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQ_SLOT(testTemplateCode())); debugAccels->setEnabled(true); #endif } @@ -669,16 +669,16 @@ void KateView::slotExpandLocal() void KateView::setupCodeCompletion() { m_codeCompletion = new KateCodeCompletion(this); - connect( m_codeCompletion, TQT_SIGNAL(completionAborted()), - TQT_TQOBJECT(this), TQT_SIGNAL(completionAborted())); - connect( m_codeCompletion, TQT_SIGNAL(completionDone()), - TQT_TQOBJECT(this), TQT_SIGNAL(completionDone())); - connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()), - TQT_TQOBJECT(this), TQT_SIGNAL(argHintHidden())); - connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - TQT_TQOBJECT(this), TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry))); - connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), - TQT_TQOBJECT(this), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); + connect( m_codeCompletion, TQ_SIGNAL(completionAborted()), + this, TQ_SIGNAL(completionAborted())); + connect( m_codeCompletion, TQ_SIGNAL(completionDone()), + this, TQ_SIGNAL(completionDone())); + connect( m_codeCompletion, TQ_SIGNAL(argHintHidden()), + this, TQ_SIGNAL(argHintHidden())); + connect( m_codeCompletion, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), + this, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry))); + connect( m_codeCompletion, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), + this, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); } void KateView::slotGotFocus() diff --git a/kate/part/kateview.h b/kate/part/kateview.h index 0a00ab1fc..1e113618e 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -62,7 +62,7 @@ class KateView : public Kate::View, public KTextEditor::SelectionInterfaceExt, public KTextEditor::BlockSelectionInterface { - Q_OBJECT + TQ_OBJECT friend class KateViewInternal; friend class KateIconBorder; diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index 1074615f8..872e7467c 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -65,15 +65,15 @@ KateScrollBar::KateScrollBar (Orientation orientation, KateViewInternal* parent, , m_savVisibleLines(0) , m_showMarks(false) { - connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderMaybeMoved(int))); - connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged())); + connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderMaybeMoved(int))); + connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged())); m_lines.setAutoDelete(true); } void KateScrollBar::mousePressEvent(TQMouseEvent* e) { - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) m_middleMouseDown = true; TQScrollBar::mousePressEvent(e); @@ -94,7 +94,7 @@ void KateScrollBar::mouseMoveEvent(TQMouseEvent* e) { TQScrollBar::mouseMoveEvent(e); - if (e->state() | Qt::LeftButton) + if (e->state() | TQt::LeftButton) redrawMarks(); } @@ -295,8 +295,8 @@ KateCmdLine::KateCmdLine (KateView *view) , m_command( 0L ) , m_oldCompletionObject( 0L ) { - connect (this, TQT_SIGNAL(returnPressed(const TQString &)), - this, TQT_SLOT(slotReturnPressed(const TQString &))); + connect (this, TQ_SIGNAL(returnPressed(const TQString &)), + this, TQ_SLOT(slotReturnPressed(const TQString &))); completionObject()->insertItems (KateCmd::self()->cmds()); setAutoDeleteCompletionObject( false ); @@ -375,7 +375,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text ) m_cmdend = 0; m_view->setFocus (); - TQTimer::singleShot( 4000, this, TQT_SLOT(hideMe()) ); + TQTimer::singleShot( 4000, this, TQ_SLOT(hideMe()) ); } void KateCmdLine::hideMe () // unless i have focus ;) @@ -716,7 +716,7 @@ void KateIconBorder::setIconBorderOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setLineNumbersOn( bool enable ) @@ -729,7 +729,7 @@ void KateIconBorder::setLineNumbersOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setDynWrapIndicators( int state ) @@ -742,7 +742,7 @@ void KateIconBorder::setDynWrapIndicators( int state ) updateGeometry (); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setFoldingMarkersOn( bool enable ) @@ -754,7 +754,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } TQSize KateIconBorder::sizeHint() const @@ -953,7 +953,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height) if (realLine > -1) if (m_viewInternal->lineRanges[z].startCol == 0) { if (m_lineNumbersOn) - p.drawText( lnX + 1, y, lnWidth-4, h, Qt::AlignRight|Qt::AlignVCenter, TQString("%1").arg( realLine + 1 ) ); + p.drawText( lnX + 1, y, lnWidth-4, h, TQt::AlignRight|TQt::AlignVCenter, TQString("%1").arg( realLine + 1 ) ); } else if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) { p.drawPixmap(lnX + lnWidth - m_arrow.width() - 4, y, m_arrow); } @@ -1069,7 +1069,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e ) { BorderArea area = positionToArea( e->pos() ); if( area == IconBorder) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if( m_doc->editableMarks() & KateViewConfig::global()->defaultMarkType() ) { if( m_doc->mark( cursorOnLine ) & KateViewConfig::global()->defaultMarkType() ) m_doc->removeMark( cursorOnLine, KateViewConfig::global()->defaultMarkType() ); @@ -1080,7 +1080,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e ) } } else - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { showMarkMenu( cursorOnLine, TQCursor::pos() ); } } @@ -1170,7 +1170,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos ) KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name) : TDEActionMenu (text, parent, name), doc(_doc), view (_view) { - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewEncodingAction::slotAboutToShow() @@ -1180,7 +1180,7 @@ void KateViewEncodingAction::slotAboutToShow() popupMenu()->clear (); for (uint z=0; z<modes.size(); ++z) { - popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z); + popupMenu()->insertItem ( modes[z], this, TQ_SLOT(setMode(int)), 0, z); bool found = false; TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found); diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h index ecaec3303..1e162af18 100644 --- a/kate/part/kateviewhelpers.h +++ b/kate/part/kateviewhelpers.h @@ -47,7 +47,7 @@ namespace Kate { */ class KateScrollBar : public TQScrollBar { - Q_OBJECT + TQ_OBJECT public: KateScrollBar(Orientation orientation, class KateViewInternal *parent, const char* name = 0L); @@ -94,7 +94,7 @@ class KateScrollBar : public TQScrollBar class KateCmdLine : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: KateCmdLine (KateView *view); @@ -121,7 +121,7 @@ class KateCmdLine : public KLineEdit class KateIconBorder : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateIconBorder( KateViewInternal* internalView, TQWidget *parent ); @@ -184,7 +184,7 @@ class KateIconBorder : public TQWidget class KateViewEncodingAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent = 0, const char* name = 0); diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index c536974e6..0f12f8562 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -57,7 +57,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) , editIsRunning (false) , m_view (view) , m_doc (doc) - , cursor (doc, true, 0, 0, TQT_TQOBJECT(this)) + , cursor (doc, true, 0, 0, this) , possibleTripleClick (false) , m_dummy (0) , m_startPos(doc, true, 0,0) @@ -94,7 +94,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // // scrollbar for lines // - m_lineScroll = new KateScrollBar(Qt::Vertical, this); + m_lineScroll = new KateScrollBar(TQt::Vertical, this); m_lineScroll->show(); m_lineScroll->setTracking (true); @@ -116,14 +116,14 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) m_lineLayout->addWidget(m_dummy); // Hijack the line scroller's controls, so we can scroll nicely for word-wrap - connect(m_lineScroll, TQT_SIGNAL(prevPage()), TQT_SLOT(scrollPrevPage())); - connect(m_lineScroll, TQT_SIGNAL(nextPage()), TQT_SLOT(scrollNextPage())); + connect(m_lineScroll, TQ_SIGNAL(prevPage()), TQ_SLOT(scrollPrevPage())); + connect(m_lineScroll, TQ_SIGNAL(nextPage()), TQ_SLOT(scrollNextPage())); - connect(m_lineScroll, TQT_SIGNAL(prevLine()), TQT_SLOT(scrollPrevLine())); - connect(m_lineScroll, TQT_SIGNAL(nextLine()), TQT_SLOT(scrollNextLine())); + connect(m_lineScroll, TQ_SIGNAL(prevLine()), TQ_SLOT(scrollPrevLine())); + connect(m_lineScroll, TQ_SIGNAL(nextLine()), TQ_SLOT(scrollNextLine())); - connect(m_lineScroll, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(scrollLines(int))); - connect(m_lineScroll, TQT_SIGNAL(sliderMMBMoved(int)), TQT_SLOT(scrollLines(int))); + connect(m_lineScroll, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(scrollLines(int))); + connect(m_lineScroll, TQ_SIGNAL(sliderMMBMoved(int)), TQ_SLOT(scrollLines(int))); // catch wheel events, completing the hijack m_lineScroll->installEventFilter(this); @@ -131,7 +131,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // // scrollbar for columns // - m_columnScroll = new TQScrollBar(Qt::Horizontal,m_view); + m_columnScroll = new TQScrollBar(TQt::Horizontal,m_view); // hide the column scrollbar in the dynamic word wrap mode if (m_view->dynWordWrap()) @@ -142,8 +142,8 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) m_columnScroll->setTracking(true); m_startX = 0; - connect( m_columnScroll, TQT_SIGNAL( valueChanged (int) ), - this, TQT_SLOT( scrollColumns (int) ) ); + connect( m_columnScroll, TQ_SIGNAL( valueChanged (int) ), + this, TQ_SLOT( scrollColumns (int) ) ); // // iconborder ;) @@ -151,13 +151,13 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) leftBorder = new KateIconBorder( this, m_view ); leftBorder->show (); - connect( leftBorder, TQT_SIGNAL(toggleRegionVisibility(unsigned int)), - m_doc->foldingTree(), TQT_SLOT(toggleRegionVisibility(unsigned int))); + connect( leftBorder, TQ_SIGNAL(toggleRegionVisibility(unsigned int)), + m_doc->foldingTree(), TQ_SLOT(toggleRegionVisibility(unsigned int))); - connect( doc->foldingTree(), TQT_SIGNAL(regionVisibilityChangedAt(unsigned int)), - this, TQT_SLOT(slotRegionVisibilityChangedAt(unsigned int))); - connect( doc, TQT_SIGNAL(codeFoldingUpdated()), - this, TQT_SLOT(slotCodeFoldingChanged()) ); + connect( doc->foldingTree(), TQ_SIGNAL(regionVisibilityChangedAt(unsigned int)), + this, TQ_SLOT(slotRegionVisibilityChangedAt(unsigned int))); + connect( doc, TQ_SIGNAL(codeFoldingUpdated()), + this, TQ_SLOT(slotCodeFoldingChanged()) ); displayCursor.setPos(0, 0); cursor.setPos(0, 0); @@ -182,21 +182,21 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) dragInfo.state = diNone; // timers - connect( &m_dragScrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doDragScroll() ) ); + connect( &m_dragScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doDragScroll() ) ); - connect( &m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( scrollTimeout() ) ); + connect( &m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( scrollTimeout() ) ); - connect( &m_cursorTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( cursorTimeout() ) ); + connect( &m_cursorTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( cursorTimeout() ) ); - connect( &m_textHintTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( textHintTimeout() ) ); + connect( &m_textHintTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( textHintTimeout() ) ); // selection changed to set anchor - connect( m_view, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( viewSelectionChanged() ) ); + connect( m_view, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( viewSelectionChanged() ) ); // this is a work arround for RTL desktops @@ -420,7 +420,7 @@ void KateViewInternal::scrollPos(KateTextCursor& c, bool force, bool calledExter Q_ASSERT(lines >= 0); - if (!calledExternally && QABS(viewLinesScrolled) < lines) + if (!calledExternally && TQABS(viewLinesScrolled) < lines) { updateView(false, viewLinesScrolled); @@ -456,7 +456,7 @@ void KateViewInternal::scrollColumns ( int x ) int dx = m_startX - x; m_startX = x; - if (QABS(dx) < width()) + if (TQABS(dx) < width()) scroll(dx, 0); else update(); @@ -1216,7 +1216,7 @@ void KateViewInternal::moveEdge( Bias bias, bool sel ) void KateViewInternal::home( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1257,7 +1257,7 @@ void KateViewInternal::home( bool sel ) void KateViewInternal::end( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1687,7 +1687,7 @@ int KateViewInternal::lineMaxCol(const KateLineRange& range) void KateViewInternal::cursorUp(bool sel) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Up, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Up, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1754,7 +1754,7 @@ void KateViewInternal::cursorUp(bool sel) void KateViewInternal::cursorDown(bool sel) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Down, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Down, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1889,7 +1889,7 @@ void KateViewInternal::setAutoCenterLines(int viewLines, bool updateView) void KateViewInternal::pageUp( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageUp, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageUp, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1938,7 +1938,7 @@ void KateViewInternal::pageUp( bool sel ) void KateViewInternal::pageDown( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageDown, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageDown, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2025,7 +2025,7 @@ void KateViewInternal::bottom( bool sel ) void KateViewInternal::top_home( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2037,7 +2037,7 @@ void KateViewInternal::top_home( bool sel ) void KateViewInternal::bottom_end( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2438,7 +2438,7 @@ bool KateViewInternal::isTargetSelected( const TQPoint& p ) bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e ) { - if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_lineScroll)) + if (obj == m_lineScroll) { // the second condition is to make sure a scroll on the vertical bar doesn't cause a horizontal scroll ;) if (e->type() == TQEvent::Wheel && m_lineScroll->minValue() != m_lineScroll->maxValue()) @@ -2465,7 +2465,7 @@ bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e ) m_view->m_codeCompletion->abortCompletion(); } - if ((k->key() == Qt::Key_Escape) && !m_view->config()->persistentSelection() ) + if ((k->key() == TQt::Key_Escape) && !m_view->config()->persistentSelection() ) { m_view->clearSelection(); return true; @@ -2525,7 +2525,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) kdDebug (13030) << "hint around" << endl; if( e->key() == Key_Enter || e->key() == Key_Return || - (key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) { + (key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter)) { m_view->m_codeCompletion->doComplete(); e->accept(); return; @@ -2538,14 +2538,14 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if ((key == Qt::Key_Return) || (key == Qt::Key_Enter)) + if ((key == TQt::Key_Return) || (key == TQt::Key_Enter)) { m_view->keyReturn(); e->accept(); return; } - if ((key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) + if ((key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter)) { uint ln = cursor.line(); int col = cursor.col(); @@ -2573,7 +2573,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == Qt::Key_Backspace || key == SHIFT + Qt::Key_Backspace) + if (key == TQt::Key_Backspace || key == SHIFT + TQt::Key_Backspace) { m_view->backspace(); e->accept(); @@ -2584,7 +2584,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == Qt::Key_Tab || key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab) + if (key == TQt::Key_Tab || key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab) { if (m_doc->invokeTabInterceptor(key)) { e->accept(); @@ -2592,7 +2592,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) } else if (m_doc->configFlags() & KateDocumentConfig::cfTabIndents) { - if( key == Qt::Key_Tab ) + if( key == TQt::Key_Tab ) { if (m_view->hasSelection() || (m_doc->configFlags() & KateDocumentConfig::cfTabIndentsMode)) m_doc->indent( m_view, cursor.line(), 1 ); @@ -2609,7 +2609,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab) + if (key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab) { m_doc->indent( m_view, cursor.line(), -1 ); e->accept(); @@ -2693,7 +2693,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e ) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selChangedByUser = false; if (possibleTripleClick) @@ -2820,7 +2820,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selectionMode = Word; if ( e->state() & TQt::ShiftButton ) @@ -2902,7 +2902,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e) } possibleTripleClick = true; - TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQT_SLOT(tripleClickTimeout()) ); + TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQ_SLOT(tripleClickTimeout()) ); scrollX = 0; scrollY = 0; @@ -2927,7 +2927,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selectionMode = Default; // selStartCached.setLine( -1 ); @@ -2956,7 +2956,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) e->accept (); break; - case Qt::MidButton: + case TQt::MidButton: placeCursor( e->pos() ); if( m_doc->isReadWrite() ) @@ -2977,7 +2977,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) void KateViewInternal::mouseMoveEvent( TQMouseEvent* e ) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) { if (dragInfo.state == diPending) { @@ -3263,27 +3263,44 @@ void KateViewInternal::clear() void KateViewInternal::wheelEvent(TQWheelEvent* e) { - if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != Qt::Horizontal) { - // React to this as a vertical event - if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) { - if (e->delta() > 0) - scrollPrevPage(); - else - scrollNextPage(); - } else { - scrollViewLines(-((e->delta() / 120) * TQApplication::wheelScrollLines())); - // maybe a menu was opened or a bubbled window title is on us -> we shall erase it - update(); - leftBorder->update(); - } - - } else if (columnScrollingPossible()) { - TQWheelEvent copy = *e; - TQApplication::sendEvent(m_columnScroll, ©); - - } else { - e->ignore(); - } + if (e->state() & ControlButton) + { + if (e->delta() > 0) + { + slotIncFontSizes(); + } + else + { + slotDecFontSizes(); + } + } + else + { + if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != TQt::Horizontal) + { + // React to this as a vertical event + if ( e->state() & ShiftButton ) + { + if (e->delta() > 0) + scrollPrevPage(); + else + scrollNextPage(); + } + else + { + scrollViewLines(-((e->delta() / 120) * TQApplication::wheelScrollLines())); + // maybe a menu was opened or a bubbled window title is on us -> we shall erase it + update(); + leftBorder->update(); + } + } else if (columnScrollingPossible()) { + TQWheelEvent copy = *e; + TQApplication::sendEvent(m_columnScroll, ©); + + } else { + e->ignore(); + } + } } void KateViewInternal::startDragScroll() diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h index 0d9aa7c55..77fb81e7a 100644 --- a/kate/part/kateviewinternal.h +++ b/kate/part/kateviewinternal.h @@ -52,7 +52,7 @@ enum Bias class KateViewInternal : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KateView; friend class KateIconBorder; diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index d0443da71..4f4e5692d 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -549,10 +549,10 @@ int main(int argc, char *argv[]) baseDir, args->getOption("output"), args->isSet("genoutput")); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )), - regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int ))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )), + regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int ))); regressionTest->m_keepOutput = args->isSet("keep-output"); regressionTest->m_showGui = args->isSet("show"); @@ -628,7 +628,7 @@ int main(int argc, char *argv[]) link += TQString(" <p style=\"color:green;font-weight:bold\">%1 new passes since %2</p>") .arg(regressionTest->m_passes_new) .arg(regressionTest->m_failureComp->group()); - list.tqwriteBlock( link.latin1(), link.length() ); + list.writeBlock( link.latin1(), link.length() ); list.close(); } } @@ -681,12 +681,12 @@ RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig, TQString s; f.open( IO_WriteOnly | IO_Truncate ); s = "<html><body>Follow the white rabbit"; - f.tqwriteBlock( s.latin1(), s.length() ); + f.writeBlock( s.latin1(), s.length() ); f.close(); f.setName( m_outputDir + "/index.html" ); f.open( IO_WriteOnly | IO_Truncate ); s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>"; - f.tqwriteBlock( s.latin1(), s.length() ); + f.writeBlock( s.latin1(), s.length() ); f.close(); curr = this; @@ -848,7 +848,7 @@ void RegressionTest::createLink( const TQString& test, int failures ) if (failures & NewFailure) link += "</span>"; link += "<br>\n"; - list.tqwriteBlock( link.latin1(), link.length() ); + list.writeBlock( link.latin1(), link.length() ); list.close(); } @@ -1020,7 +1020,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) cl += "<div id='dom' class='diff'>" + domDiff + "</div>"; cl += "</body></html>"; - compare.tqwriteBlock( cl.latin1(), cl.length() ); + compare.writeBlock( cl.latin1(), cl.length() ); compare.close(); } diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h index 2128ce25d..7ef1b9ee1 100644 --- a/kate/part/test_regression.h +++ b/kate/part/test_regression.h @@ -162,7 +162,7 @@ class OutputFunction : public KJS::ObjectImp */ class RegressionTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: RegressionTest(KateDocument *part, TDEConfig *baseConfig, diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 2be5b00fb..06d7c12d2 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -66,7 +66,7 @@ AutoBookmarker::AutoBookmarker( TQObject *parent, KTextEditor::ConfigInterfaceExtension() { if ( parent ) - connect( parent, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); + connect( parent, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) ); } void AutoBookmarker::addView(KTextEditor::View */*view*/) @@ -113,7 +113,7 @@ void AutoBookmarker::slotCompleted() { // get the document info KTextEditor::DocumentInfoInterface *di = - ::tqqt_cast<KTextEditor::DocumentInfoInterface*>(document()); + ::tqt_cast<KTextEditor::DocumentInfoInterface*>(document()); TQString mt; if ( di ) // we can still try match the URL otherwise mt = di->mimeType(); @@ -292,7 +292,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark TQWhatsThis::add( lePattern, i18n( "<p>A regular expression. Matching lines will be bookmarked.</p>" ) ); - connect( lePattern, TQT_SIGNAL(textChanged ( const TQString & ) ),this, TQT_SLOT( slotPatternChanged( const TQString& ) ) ); + connect( lePattern, TQ_SIGNAL(textChanged ( const TQString & ) ),this, TQ_SLOT( slotPatternChanged( const TQString& ) ) ); cbCS = new TQCheckBox( i18n("Case &sensitive"), w ); lo->addMultiCellWidget( cbCS, 1, 1, 0, 2 ); @@ -334,7 +334,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark TQToolButton *btnMTW = new TQToolButton(w); lo->addWidget( btnMTW, 4, 2 ); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); TQWhatsThis::add( btnMTW, i18n( "<p>Click this button to display a checkable list of mimetypes available " "on your system. When used, the file masks entry above will be filled in " @@ -419,10 +419,10 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char lo1->addStretch( 1 ); - connect( btnNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()) ); - connect( btnDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDel()) ); - connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()) ); - connect( lvPatterns, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotEdit()) ); + connect( btnNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()) ); + connect( btnDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDel()) ); + connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()) ); + connect( lvPatterns, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotEdit()) ); m_ents = new ABEntityList(); m_ents->setAutoDelete( true ); diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h index 9687d8ceb..1f6d1daeb 100644 --- a/kate/plugins/autobookmarker/autobookmarker.h +++ b/kate/plugins/autobookmarker/autobookmarker.h @@ -50,7 +50,7 @@ class AutoBookmarker : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface, public KTextEditor::ConfigInterfaceExtension { - Q_OBJECT + TQ_OBJECT public: AutoBookmarker( TQObject *parent = 0, const char* name = 0, @@ -96,7 +96,7 @@ class ABGlobal class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage { - Q_OBJECT + TQ_OBJECT public: AutoBookmarkerConfigPage( TQWidget *parent, const char *name ); virtual ~AutoBookmarkerConfigPage() {}; @@ -118,7 +118,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage class AutoBookmarkerEntEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmarkEnt *e ); ~AutoBookmarkerEntEditor(){}; diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index e2e3d354a..ed6cd3c6f 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -76,7 +76,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char view->insertChildClient( this ); setInstance( KGenericFactory<InsertFilePlugin>::instance() ); _job = 0; - (void) new TDEAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); + (void) new TDEAction( i18n("Insert File..."), 0, this, TQ_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); setXMLFile( "tdetexteditor_insertfileui.rc" ); } @@ -104,7 +104,7 @@ void InsertFilePluginView::slotInsertFile() KURL destURL; destURL.setPath( _tmpfile ); _job = TDEIO::file_copy( _file, destURL, 0600, true, false, true ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished ( TDEIO::Job * ) ) ); } } diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h index da08a02c7..0f7bfc2c9 100644 --- a/kate/plugins/insertfile/insertfileplugin.h +++ b/kate/plugins/insertfile/insertfileplugin.h @@ -32,7 +32,7 @@ class InsertFilePlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface { - Q_OBJECT + TQ_OBJECT public: InsertFilePlugin( TQObject *parent = 0, @@ -50,7 +50,7 @@ class InsertFilePlugin : public KTextEditor::Plugin, public KTextEditor::PluginV class InsertFilePluginView : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: InsertFilePluginView( KTextEditor::View *view, const char *name=0 ); ~InsertFilePluginView() {}; diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 4ee93cb87..306fcf596 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -66,11 +66,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) m_searchForwardAction = new TDEAction( i18n("Search Incrementally"), CTRL+ALT+Key_F, - this, TQT_SLOT(slotSearchForwardAction()), + this, TQ_SLOT(slotSearchForwardAction()), actionCollection(), "edit_isearch" ); m_searchBackwardAction = new TDEAction( i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F, - this, TQT_SLOT(slotSearchBackwardAction()), + this, TQ_SLOT(slotSearchBackwardAction()), actionCollection(), "edit_isearch_reverse" ); m_label = new TQLabel( i18n("I-Search:"), 0L, "tde toolbar widget" ); @@ -84,12 +84,12 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) m_combo->setDuplicatesEnabled( false ); m_combo->setMaximumWidth( 300 ); m_combo->lineEdit()->installEventFilter( this ); - connect( m_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTextChanged(const TQString&)) ); - connect( m_combo, TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(slotReturnPressed(const TQString&)) ); - connect( m_combo, TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), - this, TQT_SLOT(slotAddContextMenuItems(TQPopupMenu*)) ); + connect( m_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTextChanged(const TQString&)) ); + connect( m_combo, TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(slotReturnPressed(const TQString&)) ); + connect( m_combo, TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), + this, TQ_SLOT(slotAddContextMenuItems(TQPopupMenu*)) ); m_comboAction = new KWidgetAction( m_combo, i18n("Search"), 0, 0, 0, @@ -106,8 +106,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("Case Sensitive"), TDEShortcut(), actionCollection(), "isearch_case_sensitive" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setCaseSensitive(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setCaseSensitive(bool)) ); action->setChecked( m_caseSensitive ); optionMenu->insert( action ); @@ -115,8 +115,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("From Beginning"), TDEShortcut(), actionCollection(), "isearch_from_beginning" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setFromBeginning(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setFromBeginning(bool)) ); action->setChecked( m_fromBeginning ); optionMenu->insert( action ); @@ -124,8 +124,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("Regular Expression"), TDEShortcut(), actionCollection(), "isearch_reg_exp" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setRegExp(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setRegExp(bool)) ); action->setChecked( m_regExp ); optionMenu->insert( action ); @@ -134,8 +134,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) // action = new TDEToggleAction( // i18n("Auto-Wrap Search"), TDEShortcut(), // actionCollection(), "isearch_auto_wrap" ); -// connect( action, TQT_SIGNAL(toggled(bool)), -// this, TQT_SLOT(setAutoWrap(bool)) ); +// connect( action, TQ_SIGNAL(toggled(bool)), +// this, TQ_SLOT(setAutoWrap(bool)) ); // action->setChecked( m_autoWrap ); // optionMenu->insert( action ); @@ -204,7 +204,7 @@ void ISearchPluginView::setAutoWrap( bool autoWrap ) bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_combo->lineEdit()) ) + if( o != m_combo->lineEdit() ) return false; if( e->type() == TQEvent::FocusIn ) { @@ -225,7 +225,7 @@ bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e ) if( e->type() == TQEvent::KeyPress ) { TQKeyEvent *keyEvent = (TQKeyEvent*)e; - if( keyEvent->key() == Qt::Key_Escape ) + if( keyEvent->key() == TQt::Key_Escape ) quitToView( TQString::null ); } @@ -410,13 +410,13 @@ void ISearchPluginView::slotAddContextMenuItems( TQPopupMenu *menu ) if( menu ) { menu->insertSeparator(); menu->insertItem( i18n("Case Sensitive"), this, - TQT_SLOT(setCaseSensitive(bool))); + TQ_SLOT(setCaseSensitive(bool))); menu->insertItem( i18n("From Beginning"), this, - TQT_SLOT(setFromBeginning(bool))); + TQ_SLOT(setFromBeginning(bool))); menu->insertItem( i18n("Regular Expression"), this, - TQT_SLOT(setRegExp(bool))); + TQ_SLOT(setRegExp(bool))); //menu->insertItem( i18n("Auto-Wrap Search"), this, - // TQT_SLOT(setAutoWrap(bool))); + // TQ_SLOT(setAutoWrap(bool))); } } diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h index b11b2a8b6..e1893c516 100644 --- a/kate/plugins/isearch/ISearchPlugin.h +++ b/kate/plugins/isearch/ISearchPlugin.h @@ -34,7 +34,7 @@ class TQLabel; class ISearchPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface { - Q_OBJECT + TQ_OBJECT public: ISearchPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); @@ -49,7 +49,7 @@ private: class ISearchPluginView : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: ISearchPluginView( KTextEditor::View *view ); diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index e14cd9249..00edb8ced 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -76,7 +76,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view ) setInstance( KGenericFactory<KDataToolPlugin>::instance() ); m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); - connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow())); + connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShow())); setXMLFile("tdetexteditor_kdatatoolui.rc"); m_view = view; @@ -151,7 +151,7 @@ void KDataToolPluginView::aboutToShow() m_singleWord_line = line; } else { m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, - TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); + TQ_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); return; } @@ -160,12 +160,12 @@ void KDataToolPluginView::aboutToShow() TDEInstance *inst=instance(); TQValueList<KDataToolInfo> tools; - tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst ); + tools += KDataToolInfo::query( "TQString", "text/plain", inst ); if( m_singleWord ) - tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", inst ); + tools += KDataToolInfo::query( "TQString", "application/x-singleword", inst ); m_actionList = KDataToolAction::dataToolActionList( tools, this, - TQT_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); + TQ_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) { m_menu->insert(ac); @@ -173,7 +173,7 @@ void KDataToolPluginView::aboutToShow() if( m_actionList.isEmpty() ) { m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, - TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); + TQ_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); } } @@ -203,7 +203,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ text = m_wordUnderCursor; TQString mimetype = "text/plain"; - TQString datatype = TQSTRING_OBJECT_NAME_STRING; + TQString datatype = "TQString"; // If unsupported (and if we have a single word indeed), try application/x-singleword if ( !info.mimeTypes().contains( mimetype ) && m_singleWord ) diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h index a217c6f27..b3ef86767 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.h +++ b/kate/plugins/kdatatool/kate_kdatatool.h @@ -36,7 +36,7 @@ class View; class KDataToolPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface { - Q_OBJECT + TQ_OBJECT public: KDataToolPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); @@ -51,7 +51,7 @@ public: class KDataToolPluginView : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: KDataToolPluginView( KTextEditor::View *view ); diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 793f9820c..83933bfce 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -146,15 +146,15 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au setInstance( KGenericFactory<DocWordCompletionPlugin>::instance() ); (void) new TDEAction( i18n("Reuse Word Above"), CTRL+Key_8, this, - TQT_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" ); + TQ_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" ); (void) new TDEAction( i18n("Reuse Word Below"), CTRL+Key_9, this, - TQT_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" ); + TQ_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" ); (void) new TDEAction( i18n("Pop Up Completion List"), 0, this, - TQT_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" ); + TQ_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" ); (void) new TDEAction( i18n("Shell Completion"), 0, this, - TQT_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" ); + TQ_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" ); d->autopopup = new TDEToggleAction( i18n("Automatic Completion Popup"), 0, this, - TQT_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" ); + TQ_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" ); d->autopopup->setChecked( autopopup ); toggleAutoPopup(); @@ -168,8 +168,8 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au if ( ! e.isEmpty() ) d->autopopup->setEnabled( e == "true" ); - connect( view->document(), TQT_SIGNAL(variableChanged(const TQString &, const TQString &)), - this, TQT_SLOT(slotVariableChanged(const TQString &, const TQString &)) ); + connect( view->document(), TQ_SIGNAL(variableChanged(const TQString &, const TQString &)), + this, TQ_SLOT(slotVariableChanged(const TQString &, const TQString &)) ); } } @@ -203,15 +203,15 @@ void DocWordCompletionPluginView::popupCompletionList( TQString w ) void DocWordCompletionPluginView::toggleAutoPopup() { if ( d->autopopup->isChecked() ) { - if ( ! connect( m_view->document(), TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), - this, TQT_SLOT(autoPopupCompletionList()) )) + if ( ! connect( m_view->document(), TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), + this, TQ_SLOT(autoPopupCompletionList()) )) { - connect( m_view->document(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(autoPopupCompletionList()) ); + connect( m_view->document(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(autoPopupCompletionList()) ); } } else { - disconnect( m_view->document(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(autoPopupCompletionList()) ); - disconnect( m_view->document(), TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), - this, TQT_SLOT(autoPopupCompletionList()) ); + disconnect( m_view->document(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(autoPopupCompletionList()) ); + disconnect( m_view->document(), TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), + this, TQ_SLOT(autoPopupCompletionList()) ); } } diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h index f22f99d4e..e2ff3cfb2 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.h +++ b/kate/plugins/wordcompletion/docwordcompletion.h @@ -44,7 +44,7 @@ class DocWordCompletionPlugin , public KTextEditor::PluginViewInterface , public KTextEditor::ConfigInterfaceExtension { - Q_OBJECT + TQ_OBJECT public: DocWordCompletionPlugin( TQObject *parent = 0, @@ -81,7 +81,7 @@ class DocWordCompletionPlugin class DocWordCompletionPluginView : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: DocWordCompletionPluginView( uint treshold=3, bool autopopup=true, KTextEditor::View *view=0, @@ -113,7 +113,7 @@ class DocWordCompletionPluginView class DocWordCompletionConfigPage : public KTextEditor::ConfigPage { - Q_OBJECT + TQ_OBJECT public: DocWordCompletionConfigPage( DocWordCompletionPlugin *completion, TQWidget *parent, const char *name ); virtual ~DocWordCompletionConfigPage() {}; diff --git a/kded/Mainpage.dox b/kded/Mainpage.dox index 10a9da06a..95ba4a4cf 100644 --- a/kded/Mainpage.dox +++ b/kded/Mainpage.dox @@ -1,11 +1,11 @@ -/** @mainpage The Trinity Daemon +/** @mainpage The Trinity Daemon (KDED) -TrinityD runs in the background and performs a number of small tasks. Some +KDED runs in the background and performs a number of small tasks. Some of these tasks are built in, others are started on demand. <p> The chances are you are looking here because you want to write a -TrinityD module. For that, see TrinityDModule in tdecore and the -<a href="http://websvn.kde.org/trunk/Trinity/tdelibs/kded/README.kded?view=markup">TrinityD +KDED module. For that, see KDEDModule in tdecore and the +<a href="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/src/branch/master/kded">KDED README</a>. @@ -22,4 +22,4 @@ Waldo Bastian \<bastian@kde.org\> */ // DOXYGEN_REFERENCES = tdecore tdeui tdeio -// DOXYGEN_SET_PROJECT_NAME = TrinityD +// DOXYGEN_SET_PROJECT_NAME = KDED diff --git a/kded/kded.cpp b/kded/kded.cpp index e1b3b6b33..1153bcf25 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -48,7 +48,7 @@ #include <tdeio/global.h> #include <kservicetype.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <fixx11h.h> #endif @@ -110,9 +110,9 @@ Kded::Kded(bool checkUpdates, bool new_startup) else cPath = tdesycoca_env; m_pTimer = new TQTimer(this); - connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate())); + connect(m_pTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(recreate())); - TQTimer::singleShot(100, this, TQT_SLOT(installCrashHandler())); + TQTimer::singleShot(100, this, TQ_SLOT(installCrashHandler())); m_pDirWatch = 0; @@ -316,7 +316,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand) { m_modules.insert(obj, module); m_libs.insert(obj, lib); - connect(module, TQT_SIGNAL(moduleDeleted(KDEDModule *)), TQT_SLOT(slotKDEDModuleRemoved(KDEDModule *))); + connect(module, TQ_SIGNAL(moduleDeleted(KDEDModule *)), TQ_SLOT(slotKDEDModuleRemoved(KDEDModule *))); kdDebug(7020) << "Successfully loaded module '" << obj << "'\n"; return module; } @@ -400,12 +400,12 @@ void Kded::updateDirWatch() delete m_pDirWatch; m_pDirWatch = new KDirWatch; - TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(update(const TQString&))); - TQObject::connect( m_pDirWatch, TQT_SIGNAL(created(const TQString&)), - this, TQT_SLOT(update(const TQString&))); - TQObject::connect( m_pDirWatch, TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(dirDeleted(const TQString&))); + TQObject::connect( m_pDirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(update(const TQString&))); + TQObject::connect( m_pDirWatch, TQ_SIGNAL(created(const TQString&)), + this, TQ_SLOT(update(const TQString&))); + TQObject::connect( m_pDirWatch, TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(dirDeleted(const TQString&))); // For each resource for( TQStringList::ConstIterator it = m_allResourceDirs.begin(); @@ -480,7 +480,7 @@ void Kded::recreate(bool initial) if (!initial) { updateDirWatch(); // Update tree first, to be sure to miss nothing. - runBuildSycoca(this, TQT_SLOT(recreateDone())); + runBuildSycoca(this, TQ_SLOT(recreateDone())); } else { @@ -491,7 +491,7 @@ void Kded::recreate(bool initial) if(delayedCheck) { // do a proper tdesycoca check after a delay - TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck())); + TQTimer::singleShot( 60000, this, TQ_SLOT( runDelayedCheck())); m_needDelayedCheck = true; delayedCheck = false; } @@ -667,9 +667,9 @@ KUpdateD::KUpdateD() { m_pDirWatch = new KDirWatch; m_pTimer = new TQTimer; - connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(runKonfUpdate())); - TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotNewUpdateFile())); + connect(m_pTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(runKonfUpdate())); + TQObject::connect( m_pDirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotNewUpdateFile())); TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update"); for( TQStringList::ConstIterator it = dirs.begin(); @@ -704,7 +704,7 @@ void KUpdateD::slotNewUpdateFile() KHostnameD::KHostnameD(int pollInterval) { m_Timer.start(pollInterval, false /* repetitive */ ); - connect(&m_Timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkHostname())); + connect(&m_Timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkHostname())); checkHostname(); } @@ -785,7 +785,7 @@ public: if( Kded::self()->newStartup()) Kded::self()->initModules(); else - TQTimer::singleShot(500, Kded::self(), TQT_SLOT(initModules())); + TQTimer::singleShot(500, Kded::self(), TQ_SLOT(initModules())); } else runBuildSycoca(); @@ -955,8 +955,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) (void) new KHostnameD(HostnamePollInterval); // Watch for hostname changes DCOPClient *client = kapp->dcopClient(); - TQObject::connect(client, TQT_SIGNAL(applicationRemoved(const TQCString&)), - kded, TQT_SLOT(slotApplicationRemoved(const TQCString&))); + TQObject::connect(client, TQ_SIGNAL(applicationRemoved(const TQCString&)), + kded, TQ_SLOT(slotApplicationRemoved(const TQCString&))); client->setNotifications(true); client->setDaemonMode( true ); @@ -969,7 +969,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) TQByteArray data; client->send( "*", "tdesycoca", "notifyDatabaseChanged()", data ); client->send( "ksplash", "", "upAndRunning(TQString)", TQString("kded")); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XEvent e; e.xclient.type = ClientMessage; e.xclient.message_type = XInternAtom( tqt_xdisplay(), "_KDE_SPLASH_PROGRESS", False ); diff --git a/kded/kded.h b/kded/kded.h index a4968624a..ad6a8353c 100644 --- a/kded/kded.h +++ b/kded/kded.h @@ -40,7 +40,7 @@ class KService; // No need for this in libtdeio - apps only get readonly access class Kded : public TQObject, public DCOPObject, public DCOPObjectProxy { - Q_OBJECT + TQ_OBJECT public: Kded(bool checkUpdates, bool new_startup); virtual ~Kded(); @@ -175,7 +175,7 @@ private: class KUpdateD : public TQObject { - Q_OBJECT + TQ_OBJECT public: KUpdateD(); ~KUpdateD(); @@ -202,7 +202,7 @@ private: class KHostnameD : public TQObject { - Q_OBJECT + TQ_OBJECT public: KHostnameD(int pollInterval); ~KHostnameD(); diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp index 61da755b3..230f08db2 100644 --- a/kded/kdedmodule.cpp +++ b/kded/kdedmodule.cpp @@ -41,7 +41,7 @@ KDEDModule::KDEDModule(const TQCString &name) : TQObject(), DCOPObject(name) d = new KDEDModulePrivate; d->objMap = 0; d->timeout = 0; - connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(idle())); + connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(idle())); } KDEDModule::~KDEDModule() diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h index f3954e842..bdc9cb6d2 100644 --- a/kded/kdedmodule.h +++ b/kded/kdedmodule.h @@ -54,7 +54,7 @@ class Kded; class KDE_EXPORT KDEDModule : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // For inclusion in KDE4 (since it's BIC) long-needed fix for allowing // DCOP-based kdedmodules -- Gav <gav@kde.org>. // K_DCOP diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp index f7ae2ce3b..d3ba42f19 100644 --- a/kded/tdebuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -63,7 +63,7 @@ #include <stdlib.h> #include <unistd.h> #include <time.h> -#include <memory> // auto_ptr +#include <memory> typedef TQDict<KSycocaEntry> KBSEntryDict; typedef TQValueList<KSycocaEntry::List> KSycocaEntryListList; @@ -376,8 +376,8 @@ bool KBuildSycoca::build() if (!m_trackId.isEmpty()) g_vfolder->setTrackId(m_trackId); - connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)), - this, TQT_SLOT(slotCreateEntry(const TQString &, KService **))); + connect(g_vfolder, TQ_SIGNAL(newService(const TQString &, KService **)), + this, TQ_SLOT(slotCreateEntry(const TQString &, KService **))); VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true); @@ -390,8 +390,8 @@ bool KBuildSycoca::build() (void) existingResourceDirs(); *g_allResourceDirs += g_vfolder->allDirectories(); - disconnect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)), - this, TQT_SLOT(slotCreateEntry(const TQString &, KService **))); + disconnect(g_vfolder, TQ_SIGNAL(newService(const TQString &, KService **)), + this, TQ_SLOT(slotCreateEntry(const TQString &, KService **))); if (g_changed || !g_allEntries) { @@ -462,13 +462,13 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM bool KBuildSycoca::recreate() { TQString path(sycocaPath()); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN printf("tdebuildsycoca: path='%s'\n", (const char*)path); #endif // KSaveFile first writes to a temp file. // Upon close() it moves the stuff to the right place. - std::auto_ptr<KSaveFile> database( new KSaveFile(path) ); + std::unique_ptr<KSaveFile> database( new KSaveFile(path) ); if (database->status() == EACCES && TQFile::exists(path)) { TQFile::remove( path ); @@ -709,7 +709,7 @@ static TDECmdLineOptions options[] = { static const char appName[] = "tdebuildsycoca"; static const char appVersion[] = "1.1"; -class WaitForSignal : public QObject +class WaitForSignal : public TQObject { public: ~WaitForSignal() { kapp->eventLoop()->exitLoop(); } @@ -747,7 +747,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) #ifdef KBUILDSYCOCA_GUI silent = args->isSet("silent"); showprogress = args->isSet("showprogress"); - TQLabel progress( TQString("<p><br><nobr> %1 </nobr><br>").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", Qt::WType_Dialog | Qt::WStyle_DialogBorder | Qt::WStyle_Customize| Qt::WStyle_Title ); + TQLabel progress( TQString("<p><br><nobr> %1 </nobr><br>").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", TQt::WType_Dialog | TQt::WStyle_DialogBorder | TQt::WStyle_Customize| TQt::WStyle_Title ); TQString capt = i18n("TDE Configuration Manager"); if (!silent) { if (KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to reload TDE configuration?"), capt, i18n("Reload"), i18n("Do Not Reload"))) @@ -790,8 +790,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) while (dcopClient->isApplicationRegistered(appName)) { WaitForSignal *obj = new WaitForSignal; - obj->connect(dcopClient, TQT_SIGNAL(applicationRemoved(const TQCString &)), - TQT_SLOT(deleteLater())); + obj->connect(dcopClient, TQ_SIGNAL(applicationRemoved(const TQCString &)), + TQ_SLOT(deleteLater())); kapp->eventLoop()->enterLoop(); } dcopClient->setNotifications( false ); diff --git a/kded/tdebuildsycoca.h b/kded/tdebuildsycoca.h index 51e7af337..77b685a41 100644 --- a/kded/tdebuildsycoca.h +++ b/kded/tdebuildsycoca.h @@ -37,7 +37,7 @@ class TQDataStream; // No need for this in libtdeio - apps only get readonly access class KBuildSycoca : public KSycoca { - Q_OBJECT + TQ_OBJECT public: KBuildSycoca(); virtual ~KBuildSycoca(); diff --git a/kded/test/test.h b/kded/test/test.h index 9382a6fba..5ce672e0d 100644 --- a/kded/test/test.h +++ b/kded/test/test.h @@ -8,7 +8,7 @@ class TestModule : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: TestModule(const TQCString &obj); diff --git a/kded/vfolder_menu.h b/kded/vfolder_menu.h index a2536af7d..98f09702c 100644 --- a/kded/vfolder_menu.h +++ b/kded/vfolder_menu.h @@ -31,7 +31,7 @@ class VFolderMenu : public TQObject { - Q_OBJECT + TQ_OBJECT public: class appsInfo; class SubMenu { diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities index 32b528910..5792a9467 100644 --- a/kdoctools/customization/obsolete/general.entities +++ b/kdoctools/customization/obsolete/general.entities @@ -356,6 +356,7 @@ <!ENTITY SGI "<trademark>SGI</trademark>"> <!ENTITY Solaris "<trademark>Solaris</trademark>"> <!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> +<!ENTITY TQt "<trademark>TQt</trademark>"> <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'> <!ENTITY ttdemidi "<application>ttdemidi</application>"> <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'> diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 94c66ff6a..7973fbfbc 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -205,7 +205,7 @@ static TQIODevice *getBZip2device(const TQString &fileName ) if ( base ) { - base->setDevice(TQT_TQIODEVICE(f), true); + base->setDevice(f, true); return new KFilterDev(base, true); } return 0; diff --git a/kglib/TGlibEventLoop.h b/kglib/TGlibEventLoop.h index 3576cb50d..14ef0d702 100644 --- a/kglib/TGlibEventLoop.h +++ b/kglib/TGlibEventLoop.h @@ -25,11 +25,7 @@ Boston, MA 02110-1301, USA. #include <tqeventloop.h> -#ifdef USE_QT3 - #define GLIB_EVENT_LOOP TGlibEventLoop glibEventLoop; -#else - #define GLIB_EVENT_LOOP -#endif +#define GLIB_EVENT_LOOP TGlibEventLoop glibEventLoop; class TGlibEventLoop : public TQEventLoop { diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt index e4a3a5297..be10cf809 100644 --- a/kimgio/CMakeLists.txt +++ b/kimgio/CMakeLists.txt @@ -142,7 +142,7 @@ if( OPENEXR_FOUND ) DESTINATION ${PLUGIN_INSTALL_DIR} ) # FIXME COMPILE_FLAGS must be written a little better - STRING(REGEX REPLACE ";" " -I" OPENEXR_INCLUDE_FLAGS "-I${OPENEXR_INCLUDE_DIRS}") + string(REGEX REPLACE ";" " -I" OPENEXR_INCLUDE_FLAGS "-I${OPENEXR_INCLUDE_DIRS}") set_target_properties( ${target}-module PROPERTIES COMPILE_FLAGS "${OPENEXR_INCLUDE_FLAGS}" ) install( FILES exr.kimgio DESTINATION ${SERVICES_INSTALL_DIR} ) endif( OPENEXR_FOUND ) diff --git a/kimgio/README b/kimgio/README index 142823e6c..8905d31a3 100644 --- a/kimgio/README +++ b/kimgio/README @@ -1,7 +1,7 @@ KDE Image I/O library --------------------- This library allows applications that use the Qt library -(i.e. QImageIO, QImage, QPixmap and friends) to read and +(i.e. QImageIO, TQImage, QPixmap and friends) to read and write images in extra formats. Current formats include: JPEG <read> <write> diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp index 22251002c..28e4f9110 100644 --- a/kimgio/dds.cpp +++ b/kimgio/dds.cpp @@ -294,7 +294,7 @@ namespace { // Private. const uint h = header.height; for( uint y = 0; y < h; y++ ) { - QRgb * scanline = (QRgb *) img.scanLine( y ); + TQRgb * scanline = (TQRgb *) img.scanLine( y ); for( uint x = 0; x < w; x++ ) { uchar r, g, b, a; s >> b >> g >> r >> a; @@ -311,7 +311,7 @@ namespace { // Private. const uint h = header.height; for( uint y = 0; y < h; y++ ) { - QRgb * scanline = (QRgb *) img.scanLine( y ); + TQRgb * scanline = (TQRgb *) img.scanLine( y ); for( uint x = 0; x < w; x++ ) { uchar r, g, b; s >> b >> g >> r; @@ -328,7 +328,7 @@ namespace { // Private. const uint h = header.height; for( uint y = 0; y < h; y++ ) { - QRgb * scanline = (QRgb *) img.scanLine( y ); + TQRgb * scanline = (TQRgb *) img.scanLine( y ); for( uint x = 0; x < w; x++ ) { Color1555 color; s >> color.u; @@ -349,7 +349,7 @@ namespace { // Private. const uint h = header.height; for( uint y = 0; y < h; y++ ) { - QRgb * scanline = (QRgb *) img.scanLine( y ); + TQRgb * scanline = (TQRgb *) img.scanLine( y ); for( uint x = 0; x < w; x++ ) { Color4444 color; s >> color.u; @@ -370,7 +370,7 @@ namespace { // Private. const uint h = header.height; for( uint y = 0; y < h; y++ ) { - QRgb * scanline = (QRgb *) img.scanLine( y ); + TQRgb * scanline = (TQRgb *) img.scanLine( y ); for( uint x = 0; x < w; x++ ) { Color565 color; s >> color.u; @@ -524,11 +524,11 @@ namespace { // Private. const uint h = header.height; BlockDXT block; - QRgb * scanline[4]; + TQRgb * scanline[4]; for( uint y = 0; y < h; y += 4 ) { for( uint j = 0; j < 4; j++ ) { - scanline[j] = (QRgb *) img.scanLine( y + j ); + scanline[j] = (TQRgb *) img.scanLine( y + j ); } for( uint x = 0; x < w; x += 4 ) { @@ -564,11 +564,11 @@ namespace { // Private. BlockDXT block; BlockDXTAlphaExplicit alpha; - QRgb * scanline[4]; + TQRgb * scanline[4]; for( uint y = 0; y < h; y += 4 ) { for( uint j = 0; j < 4; j++ ) { - scanline[j] = (QRgb *) img.scanLine( y + j ); + scanline[j] = (TQRgb *) img.scanLine( y + j ); } for( uint x = 0; x < w; x += 4 ) { @@ -616,11 +616,11 @@ namespace { // Private. BlockDXT block; BlockDXTAlphaLinear alpha; - QRgb * scanline[4]; + TQRgb * scanline[4]; for( uint y = 0; y < h; y += 4 ) { for( uint j = 0; j < 4; j++ ) { - scanline[j] = (QRgb *) img.scanLine( y + j ); + scanline[j] = (TQRgb *) img.scanLine( y + j ); } for( uint x = 0; x < w; x += 4 ) { @@ -671,11 +671,11 @@ namespace { // Private. BlockDXT block; BlockDXTAlphaLinear alpha; - QRgb * scanline[4]; + TQRgb * scanline[4]; for( uint y = 0; y < h; y += 4 ) { for( uint j = 0; j < 4; j++ ) { - scanline[j] = (QRgb *) img.scanLine( y + j ); + scanline[j] = (TQRgb *) img.scanLine( y + j ); } for( uint x = 0; x < w; x += 4 ) { @@ -720,11 +720,11 @@ namespace { // Private. BlockDXTAlphaLinear xblock; BlockDXTAlphaLinear yblock; - QRgb * scanline[4]; + TQRgb * scanline[4]; for( uint y = 0; y < h; y += 4 ) { for( uint j = 0; j < 4; j++ ) { - scanline[j] = (QRgb *) img.scanLine( y + j ); + scanline[j] = (TQRgb *) img.scanLine( y + j ); } for( uint x = 0; x < w; x += 4 ) { @@ -941,9 +941,9 @@ namespace { // Private. // Copy face on the image. for( uint y = 0; y < header.height; y++ ) { - QRgb * src = (QRgb *) face.scanLine( y ); - QRgb * dst = (QRgb *) img.scanLine( y + offset_y ) + offset_x; - memcpy( dst, src, sizeof(QRgb) * header.width ); + TQRgb * src = (TQRgb *) face.scanLine( y ); + TQRgb * dst = (TQRgb *) img.scanLine( y + offset_y ) + offset_x; + memcpy( dst, src, sizeof(TQRgb) * header.width ); } } diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp index 5332140fa..862d8237a 100644 --- a/kimgio/exr.cpp +++ b/kimgio/exr.cpp @@ -53,7 +53,7 @@ using namespace Imf; * format into the normal 32 bit pixel format. Process is from the * ILM code. */ -QRgb RgbaToQrgba(struct Rgba imagePixel) +TQRgb RgbaToQrgba(struct Rgba imagePixel) { float r,g,b,a; diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp index 5f1832f02..0749ce751 100644 --- a/kimgio/hdr.cpp +++ b/kimgio/hdr.cpp @@ -69,7 +69,7 @@ namespace { // Private. } - static void RGBE_To_QRgbLine(uchar * image, QRgb * scanline, int width) + static void RGBE_To_QRgbLine(uchar * image, TQRgb * scanline, int width) { for (int j = 0; j < width; j++) { @@ -108,7 +108,7 @@ namespace { // Private. for (int cline = 0; cline < height; cline++) { - QRgb * scanline = (QRgb *) img.scanLine( cline ); + TQRgb * scanline = (TQRgb *) img.scanLine( cline ); // determine scanline type if ((width < MINELEN) || (MAXELEN < width)) diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp index e14f09fb5..bf53ecc3b 100644 --- a/kimgio/ico.cpp +++ b/kimgio/ico.cpp @@ -169,9 +169,9 @@ namespace if ( icon.isNull() ) return false; icon.setAlphaBuffer( true ); - TQMemArray< QRgb > colorTable( paletteSize ); + TQMemArray< TQRgb > colorTable( paletteSize ); - colorTable.fill( QRgb( 0 ) ); + colorTable.fill( TQRgb( 0 ) ); for ( unsigned i = 0; i < paletteEntries; ++i ) { unsigned char rgb[ 4 ]; @@ -188,7 +188,7 @@ namespace { stream.readRawBytes( reinterpret_cast< char* >( buf ), bpl ); unsigned char* pixel = buf; - QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] ); + TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] ); switch ( header.biBitCount ) { case 1: @@ -230,10 +230,10 @@ namespace for ( unsigned y = rec.height; y--; ) { stream.readRawBytes( reinterpret_cast< char* >( buf ), bpl ); - QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] ); + TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] ); for ( unsigned x = 0; x < rec.width; ++x, ++p ) if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) ) - *p &= TQRGB_MASK; + *p &= TQT_RGB_MASK; } delete[] buf; } diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp index 68075cf96..5b7e4318e 100644 --- a/kimgio/jp2.cpp +++ b/kimgio/jp2.cpp @@ -45,7 +45,7 @@ jas_image_t* read_image( const TQImageIO* io ) { jas_stream_t* in = 0; - // for QIODevice's other than TQFile, a temp. file is used. + // for TQIODevice's other than TQFile, a temp. file is used. KTempFile* tempf = 0; TQFile* qf = 0; diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp index 7a5c843fa..ea02b67a9 100644 --- a/kimgio/pcx.cpp +++ b/kimgio/pcx.cpp @@ -467,7 +467,7 @@ static void writeImage24( TQImage &img, TQDataStream &s, PCXHEADER &header ) for ( unsigned int x=0; x<header.width(); ++x ) { - QRgb rgb = *p++; + TQRgb rgb = *p++; r_buf[ x ] = tqRed( rgb ); g_buf[ x ] = tqGreen( rgb ); b_buf[ x ] = tqBlue( rgb ); diff --git a/kimgio/pcx.h b/kimgio/pcx.h index 3bf111773..c72b01733 100644 --- a/kimgio/pcx.h +++ b/kimgio/pcx.h @@ -27,7 +27,7 @@ class RGB public: RGB() { } - RGB( const QRgb color ) + RGB( const TQRgb color ) { r = tqRed( color ); g = tqGreen( color ); @@ -44,12 +44,12 @@ class Palette public: Palette() { } - void setColor( int i, const QRgb color ) + void setColor( int i, const TQRgb color ) { rgb[ i ] = RGB( color ); } - QRgb color( int i ) const + TQRgb color( int i ) const { return tqRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b ); } diff --git a/kimgio/rgb.cpp b/kimgio/rgb.cpp index cf1f2331a..bdda0959a 100644 --- a/kimgio/rgb.cpp +++ b/kimgio/rgb.cpp @@ -120,7 +120,7 @@ bool SGIImage::getRow(uchar *dest) bool SGIImage::readData(TQImage& img) { - QRgb *c; + TQRgb *c; TQ_UINT32 *start = m_starttab; TQByteArray lguard(m_xsize); uchar *line = (uchar *)lguard.data(); @@ -134,7 +134,7 @@ bool SGIImage::readData(TQImage& img) m_pos = m_data.begin() + *start++; if (!getRow(line)) return false; - c = (QRgb *)img.scanLine(m_ysize - y - 1); + c = (TQRgb *)img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) *c = tqRgb(line[x], line[x], line[x]); } @@ -148,7 +148,7 @@ bool SGIImage::readData(TQImage& img) m_pos = m_data.begin() + *start++; if (!getRow(line)) return false; - c = (QRgb *)img.scanLine(m_ysize - y - 1); + c = (TQRgb *)img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) *c = tqRgb(tqRed(*c), line[x], line[x]); } @@ -158,7 +158,7 @@ bool SGIImage::readData(TQImage& img) m_pos = m_data.begin() + *start++; if (!getRow(line)) return false; - c = (QRgb *)img.scanLine(m_ysize - y - 1); + c = (TQRgb *)img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) *c = tqRgb(tqRed(*c), tqGreen(*c), line[x]); } @@ -172,7 +172,7 @@ bool SGIImage::readData(TQImage& img) m_pos = m_data.begin() + *start++; if (!getRow(line)) return false; - c = (QRgb *)img.scanLine(m_ysize - y - 1); + c = (TQRgb *)img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) *c = tqRgba(tqRed(*c), tqGreen(*c), tqBlue(*c), line[x]); } @@ -394,12 +394,12 @@ bool SGIImage::scanData(const TQImage& img) TQCString bufguard(m_xsize); uchar *line = (uchar *)lineguard.data(); uchar *buf = (uchar *)bufguard.data(); - QRgb *c; + TQRgb *c; unsigned x, y; uint len; for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); + c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) buf[x] = intensity(tqRed(*c++)); len = compact(line, buf); @@ -411,7 +411,7 @@ bool SGIImage::scanData(const TQImage& img) if (m_zsize != 2) { for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); + c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) buf[x] = intensity(tqGreen(*c++)); len = compact(line, buf); @@ -419,7 +419,7 @@ bool SGIImage::scanData(const TQImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); + c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) buf[x] = intensity(tqBlue(*c++)); len = compact(line, buf); @@ -431,7 +431,7 @@ bool SGIImage::scanData(const TQImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); + c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) buf[x] = intensity(tqAlpha(*c++)); len = compact(line, buf); @@ -494,11 +494,11 @@ void SGIImage::writeVerbatim(const TQImage& img) kdDebug(399) << "writing verbatim data" << endl; writeHeader(); - QRgb *c; + TQRgb *c; unsigned x, y; for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); + c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) m_stream << TQ_UINT8(tqRed(*c++)); } @@ -508,13 +508,13 @@ void SGIImage::writeVerbatim(const TQImage& img) if (m_zsize != 2) { for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); + c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) m_stream << TQ_UINT8(tqGreen(*c++)); } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); + c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) m_stream << TQ_UINT8(tqBlue(*c++)); } @@ -524,7 +524,7 @@ void SGIImage::writeVerbatim(const TQImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); + c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) m_stream << TQ_UINT8(tqAlpha(*c++)); } diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp index 3a9d88515..65e29a8cf 100644 --- a/kimgio/tga.cpp +++ b/kimgio/tga.cpp @@ -262,7 +262,7 @@ namespace { // Private. uchar * src = image; for( int y = y_start; y != y_end; y += y_step ) { - QRgb * scanline = (QRgb *) img.scanLine( y ); + TQRgb * scanline = (TQRgb *) img.scanLine( y ); if( info.pal ) { // Paletted. @@ -377,7 +377,7 @@ KDE_EXPORT void kimgio_tga_write( TQImageIO *io ) for( int y = 0; y < img.height(); y++ ) for( int x = 0; x < img.width(); x++ ) { - const QRgb color = img.pixel( x, y ); + const TQRgb color = img.pixel( x, y ); s << TQ_UINT8( tqBlue( color ) ); s << TQ_UINT8( tqGreen( color ) ); s << TQ_UINT8( tqRed( color ) ); diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp index 1c0bb79d1..78af2e995 100644 --- a/kimgio/xcf.cpp +++ b/kimgio/xcf.cpp @@ -77,10 +77,10 @@ const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = { }; -//! Change a QRgb value's alpha only. -inline QRgb tqRgba ( QRgb rgb, int a ) +//! Change a TQRgb value's alpha only. +inline TQRgb tqRgba ( TQRgb rgb, int a ) { - return ((a & 0xff) << 24 | (rgb & TQRGB_MASK)); + return ((a & 0xff) << 24 | (rgb & TQT_RGB_MASK)); } @@ -676,7 +676,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j) for (int k = 0; k < layer.image_tiles[j][i].width(); k++) { layer.image_tiles[j][i].setPixel(k, l, tqRgb(tile[0], tile[1], tile[2])); - tile += sizeof(QRgb); + tile += sizeof(TQRgb); } } break; @@ -686,7 +686,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j) for ( int k = 0; k < layer.image_tiles[j][i].width(); k++ ) { layer.image_tiles[j][i].setPixel(k, l, tqRgba(tile[0], tile[1], tile[2], tile[3])); - tile += sizeof(QRgb); + tile += sizeof(TQRgb); } } break; @@ -696,7 +696,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j) for (int l = 0; l < layer.image_tiles[j][i].height(); l++) { for (int k = 0; k < layer.image_tiles[j][i].width(); k++) { layer.image_tiles[j][i].setPixel(k, l, tile[0]); - tile += sizeof(QRgb); + tile += sizeof(TQRgb); } } break; @@ -714,7 +714,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j) layer.image_tiles[j][i].setPixel(k, l, tile[0]); layer.alpha_tiles[j][i].setPixel(k, l, tile[1]); - tile += sizeof(QRgb); + tile += sizeof(TQRgb); } } break; @@ -723,7 +723,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j) /*! - * The GIMP stores images in a "mipmap"-like hierarchy. As far as the QImage + * The GIMP stores images in a "mipmap"-like hierarchy. As far as the TQImage * is concerned, however, only the top level (i.e., the full resolution image) * is used. * \param xcf_io the data stream connected to the XCF image. @@ -963,7 +963,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si while (length-- > 0) { *data = *xcfdata++; - data += sizeof(QRgb); + data += sizeof(TQRgb); } } else { length += 1; @@ -988,7 +988,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si while (length-- > 0) { *data = val; - data += sizeof(QRgb); + data += sizeof(TQRgb); } } } @@ -1071,14 +1071,14 @@ void XCFImageFormat::assignMaskBytes(Layer& layer, uint i, uint j) for (int l = 0; l < layer.image_tiles[j][i].height(); l++) { for (int k = 0; k < layer.image_tiles[j][i].width(); k++) { layer.mask_tiles[j][i].setPixel(k, l, tile[0]); - tile += sizeof(QRgb); + tile += sizeof(TQRgb); } } } /*! - * Construct the TQImage which will eventually be returned to the QImage + * Construct the TQImage which will eventually be returned to the TQImage * loader. * * There are a couple of situations which require that the TQImage is not @@ -1320,7 +1320,7 @@ void XCFImageFormat::copyLayerToImage(XCFImage& xcf_image) void XCFImageFormat::copyRGBToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - QRgb src = layer.image_tiles[j][i].pixel(k, l); + TQRgb src = layer.image_tiles[j][i].pixel(k, l); uchar src_a = layer.opacity; if (layer.type == RGBA_GIMAGE) @@ -1371,7 +1371,7 @@ void XCFImageFormat::copyGrayToGray(Layer& layer, uint i, uint j, int k, int l, void XCFImageFormat::copyGrayToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - QRgb src = layer.image_tiles[j][i].pixel(k, l); + TQRgb src = layer.image_tiles[j][i].pixel(k, l); uchar src_a = layer.opacity; image.setPixel(m, n, tqRgba(src, src_a)); } @@ -1393,7 +1393,7 @@ void XCFImageFormat::copyGrayToRGB(Layer& layer, uint i, uint j, int k, int l, void XCFImageFormat::copyGrayAToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - QRgb src = layer.image_tiles[j][i].pixel(k, l); + TQRgb src = layer.image_tiles[j][i].pixel(k, l); uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l); src_a = INT_MULT(src_a, layer.opacity); @@ -1474,7 +1474,7 @@ image.setPixel(m, n, src); void XCFImageFormat::copyIndexedAToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - QRgb src = layer.image_tiles[j][i].pixel(k, l); + TQRgb src = layer.image_tiles[j][i].pixel(k, l); uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l); src_a = INT_MULT(src_a, layer.opacity); @@ -1583,8 +1583,8 @@ void XCFImageFormat::mergeLayerIntoImage(XCFImage& xcf_image) void XCFImageFormat::mergeRGBToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - QRgb src = layer.image_tiles[j][i].pixel(k, l); - QRgb dst = image.pixel(m, n); + TQRgb src = layer.image_tiles[j][i].pixel(k, l); + TQRgb dst = image.pixel(m, n); uchar src_r = tqRed(src); uchar src_g = tqGreen(src); @@ -1872,7 +1872,7 @@ void XCFImageFormat::mergeGrayAToGray(Layer& layer, uint i, uint j, int k, int l void XCFImageFormat::mergeGrayToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - QRgb src = layer.image_tiles[j][i].pixel(k, l); + TQRgb src = layer.image_tiles[j][i].pixel(k, l); uchar src_a = layer.opacity; image.setPixel(m, n, tqRgba(src, src_a)); } @@ -2034,7 +2034,7 @@ void XCFImageFormat::mergeIndexedAToIndexed(Layer& layer, uint i, uint j, int k, void XCFImageFormat::mergeIndexedAToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - QRgb src = layer.image_tiles[j][i].pixel(k, l); + TQRgb src = layer.image_tiles[j][i].pixel(k, l); uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l); src_a = INT_MULT(src_a, layer.opacity); @@ -2073,7 +2073,7 @@ void XCFImageFormat::dissolveRGBPixels ( TQImage& image, int x, int y ) for (int k = 0; k < image.width(); k++) { int rand_val = rand() & 0xff; - QRgb pixel = image.pixel(k, l); + TQRgb pixel = image.pixel(k, l); if (rand_val > tqAlpha(pixel)) { image.setPixel(k, l, tqRgba(pixel, 0)); diff --git a/kimgio/xcf.h b/kimgio/xcf.h index d3b4302a9..61216488f 100644 --- a/kimgio/xcf.h +++ b/kimgio/xcf.h @@ -103,7 +103,7 @@ private: TQ_UINT32 tattoo; //!< (unique identifier?) //! As each tile is read from the file, it is buffered here. - uchar tile[TILE_WIDTH * TILE_HEIGHT * sizeof(QRgb)]; + uchar tile[TILE_WIDTH * TILE_HEIGHT * sizeof(TQRgb)]; //! The data from tile buffer is copied to the Tile by this //! method. Depending on the type of the tile (RGB, Grayscale, @@ -132,13 +132,13 @@ private: TQ_INT32 tattoo; //!< (unique identifier?) TQ_UINT32 unit; //!< Units of The GIMP (inch, mm, pica, etc...) TQ_INT32 num_colors; //!< number of colors in an indexed image - TQValueVector<QRgb> palette; //!< indexed image color palette + TQValueVector<TQRgb> palette; //!< indexed image color palette int num_layers; //!< number of layers Layer layer; //!< most recently read layer bool initialized; //!< Is the TQImage initialized? - TQImage image; //!< final QImage + TQImage image; //!< final TQImage XCFImage(void) : initialized(false) {} }; diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp index 722eba348..c2ceae05a 100644 --- a/kimgio/xview.cpp +++ b/kimgio/xview.cpp @@ -144,15 +144,15 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio ) int r, g, b; if ( image.depth() == 32 ) { - QRgb *data32 = (QRgb*) data; + TQRgb *data32 = (TQRgb*) data; r = tqRed( *data32 ) >> 5; g = tqGreen( *data32 ) >> 5; b = tqBlue( *data32 ) >> 6; - data += sizeof( QRgb ); + data += sizeof( TQRgb ); } else { - QRgb color = image.color( *data ); + TQRgb color = image.color( *data ); r = tqRed( color ) >> 5; g = tqGreen( color ) >> 5; b = tqBlue( color ) >> 6; diff --git a/libltdl b/libltdl -Subproject 0f92944b23894ebef2cb0e931c59b77017998b3 +Subproject 754b445fd5519ddca551a45b9ae6385d3ee451b diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp index 2260f25fd..a82c0b658 100644 --- a/libtdescreensaver/main.cpp +++ b/libtdescreensaver/main.cpp @@ -89,7 +89,7 @@ protected: //---------------------------------------------------------------------------- -#if defined(Q_WS_QWS) || defined(Q_WS_MACX) +#if defined(TQ_WS_QWS) || defined(TQ_WS_MACX) typedef WId Window; #endif @@ -131,7 +131,7 @@ KDE_EXPORT int main(int argc, char *argv[]) saveWin = atol(args->getOption("window-id")); } -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME if (args->isSet("root")) { saveWin = RootWindow(tqt_xdisplay(), tqt_xscreen()); diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp index 30120b164..92c106bae 100644 --- a/libtdescreensaver/tdescreensaver.cpp +++ b/libtdescreensaver/tdescreensaver.cpp @@ -22,7 +22,7 @@ #include <tqtimer.h> #include <tdeapplication.h> #include "tdescreensaver.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #else typedef WId Window; @@ -50,13 +50,13 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget() XSync(tqt_xdisplay(), false); d = new KScreenSaverPrivate; - d->owner = TQT_TQWIDGET(find( id )); + d->owner = find( id ); if ( d->owner ) installEventFilter( this ); if ( id ) { -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME XGetGeometry(tqt_xdisplay(), (Drawable)id, &root, &ai, &ai, &w, &h, &au, &au); #endif @@ -80,7 +80,7 @@ KScreenSaver::~KScreenSaver() void KScreenSaver::embed( TQWidget *w ) { TDEApplication::sendPostedEvents(); -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME XReparentWindow(tqt_xdisplay(), w->winId(), winId(), 0, 0); #endif w->setGeometry( 0, 0, width(), height() ); @@ -90,7 +90,7 @@ void KScreenSaver::embed( TQWidget *w ) bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e ) { // make sure events get to the original window owner - if ( d->owner && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + if ( d->owner && o == this ) { TQApplication::sendEvent( d->owner, e ); return false; } @@ -122,7 +122,7 @@ KBlankEffect::KBlankEffect( TQObject *parent ) : TQObject( parent ) d->currentEffect = &KBlankEffect::blankNormal; d->effectProgress = 0; d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); + connect( d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); } diff --git a/libtdescreensaver/tdescreensaver.h b/libtdescreensaver/tdescreensaver.h index 0dbb0e5d2..bfca411cd 100644 --- a/libtdescreensaver/tdescreensaver.h +++ b/libtdescreensaver/tdescreensaver.h @@ -58,7 +58,7 @@ class KBlankEffectPrivate; */ class KDE_EXPORT KScreenSaver : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * @param id The winId() of the widget to draw the screensaver into. @@ -93,7 +93,7 @@ private: */ class KBlankEffect : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBlankEffect( TQObject *parent=0 ); ~KBlankEffect(); diff --git a/libtdescreensaver/tdescreensaver_vroot.h b/libtdescreensaver/tdescreensaver_vroot.h index aae76f9d9..adb98c964 100644 --- a/libtdescreensaver/tdescreensaver_vroot.h +++ b/libtdescreensaver/tdescreensaver_vroot.h @@ -62,7 +62,7 @@ static const char vroot_rcsid[] = "#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolck #endif #include <tqwidget.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> #include <X11/Xatom.h> #include <X11/Xlib.h> diff --git a/licenses/CMakeLists.txt b/licenses/CMakeLists.txt index 697fd6b8e..a48d3dbcc 100644 --- a/licenses/CMakeLists.txt +++ b/licenses/CMakeLists.txt @@ -12,5 +12,5 @@ ##### other data ################################ install( FILES - BSD GPL_V2 LGPL_V2 GPL_V3 LGPL_V3 QPL_V1.0 ARTISTIC + BSD GPL_V2 LGPL_V2 GPL_V3 LGPL_V3 QPL_V1.0 ARTISTIC MIT DESTINATION ${DATA_INSTALL_DIR}/LICENSES ) diff --git a/licenses/MIT b/licenses/MIT new file mode 100644 index 000000000..64b34e88c --- /dev/null +++ b/licenses/MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the “Software”), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/licenses/Makefile.am b/licenses/Makefile.am index 2fd7abea3..0bf059e24 100644 --- a/licenses/Makefile.am +++ b/licenses/Makefile.am @@ -1,2 +1,2 @@ -licensesdata_DATA = BSD GPL_V2 LGPL_V2 QPL_V1.0 ARTISTIC +licensesdata_DATA = BSD GPL_V2 LGPL_V2 QPL_V1.0 ARTISTIC MIT licensesdatadir = $(kde_datadir)/LICENSES diff --git a/mimetypes/application/CMakeLists.txt b/mimetypes/application/CMakeLists.txt index 33dd5f567..88607766e 100644 --- a/mimetypes/application/CMakeLists.txt +++ b/mimetypes/application/CMakeLists.txt @@ -105,6 +105,7 @@ tde_create_translated_desktop( vnd.ms-powerpoint.template.macroEnabled.12.desktop vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop x-lzma.desktop x-tlzma.desktop x-lzip.desktop x-tlz.desktop x-txz.desktop x-xz.desktop + vnd.gentoo.ebuild.desktop DESTINATION ${MIME_INSTALL_DIR}/application PO_DIR mimetypes ) diff --git a/mimetypes/application/Makefile.am b/mimetypes/application/Makefile.am index 91fd6c9a0..101a46a6c 100644 --- a/mimetypes/application/Makefile.am +++ b/mimetypes/application/Makefile.am @@ -86,7 +86,8 @@ mimetypeapplicationdata_DATA = x-dvi.desktop x-gzdvi.desktop x-bz2dvi.desktop \ vnd.ms-powerpoint.presentation.macroEnabled.12.desktop \ vnd.ms-powerpoint.template.macroEnabled.12.desktop \ vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop \ - x-lzma.desktop x-tlzma.desktop x-lzip.desktop x-tlz.desktop x-txz.desktop x-xz.desktop + x-lzma.desktop x-tlzma.desktop x-lzip.desktop x-tlz.desktop x-txz.desktop x-xz.desktop \ + vnd.gentoo.ebuild.desktop mimetypeapplicationdatadir = $(kde_mimedir)/application diff --git a/mimetypes/application/vnd.gentoo.ebuild.desktop b/mimetypes/application/vnd.gentoo.ebuild.desktop new file mode 100644 index 000000000..5a6d1b1f6 --- /dev/null +++ b/mimetypes/application/vnd.gentoo.ebuild.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +MimeType=application/vnd.gentoo.ebuild +Comment=Gentoo ebuild file +Type=MimeType +Patterns=*.ebuild +Icon=text-x-makefile +X-TDE-IsAlso=text/plain + +[Property::X-TDE-text] +Type=bool +Value=true diff --git a/networkstatus/connectionmanager.h b/networkstatus/connectionmanager.h index 00ca4e35c..540fef443 100644 --- a/networkstatus/connectionmanager.h +++ b/networkstatus/connectionmanager.h @@ -24,7 +24,7 @@ class ConnectionManagerPrivate; class ConnectionManager : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: static ConnectionManager* self(); diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp index 41bff9edb..7060477c1 100644 --- a/networkstatus/networkstatus.cpp +++ b/networkstatus/networkstatus.cpp @@ -73,8 +73,8 @@ NetworkStatusModule::NetworkStatusModule( const TQCString & obj ) : KDEDModule( d = new Private; /* d->clientIface = new ClientIfaceImpl( this ); d->serviceIface = new ServiceIfaceImpl( this );*/ - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) ); } NetworkStatusModule::~NetworkStatusModule() diff --git a/networkstatus/networkstatus.h b/networkstatus/networkstatus.h index 4ff615ef8..cd0ab42ae 100644 --- a/networkstatus/networkstatus.h +++ b/networkstatus/networkstatus.h @@ -34,7 +34,7 @@ struct NetworkStatusStruct; class NetworkStatusModule : virtual public KDEDModule/*, public ClientIface, ServiceIface*/ // <-spot the multiple inheritance pb { -Q_OBJECT +TQ_OBJECT K_DCOP public: NetworkStatusModule( const TQCString & obj ); diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp index a77f1c1fd..92613626d 100644 --- a/networkstatus/networkstatusindicator.cpp +++ b/networkstatus/networkstatusindicator.cpp @@ -38,8 +38,8 @@ StatusBarNetworkStatusIndicator::StatusBarNetworkStatusIndicator( label->setPixmap( SmallIcon("connect_no") ); TQToolTip::add( label, i18n( "The desktop is offline" ) ); - connect( ConnectionManager::self(), TQT_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ), - TQT_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) ); + connect( ConnectionManager::self(), TQ_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ), + TQ_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) ); } diff --git a/networkstatus/networkstatusindicator.h b/networkstatus/networkstatusindicator.h index f1cfa966a..e88a41f17 100644 --- a/networkstatus/networkstatusindicator.h +++ b/networkstatus/networkstatusindicator.h @@ -29,7 +29,7 @@ class StatusBarNetworkStatusIndicator : public TQHBox { -Q_OBJECT +TQ_OBJECT public: StatusBarNetworkStatusIndicator( TQWidget * parent, const char * name ); virtual ~StatusBarNetworkStatusIndicator(); diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp index 6f713cf29..93dc096e5 100644 --- a/networkstatus/testservice.cpp +++ b/networkstatus/testservice.cpp @@ -58,7 +58,7 @@ int TestService::establish( const TQString & network ) m_status = NetworkStatus::Establishing; m_service->setNetworkStatus( "test_net", (int)m_status ); m_nextStatus = NetworkStatus::Online; - TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( slotStatusChange() ) ); return (int)NetworkStatus::RequestAccepted; } @@ -68,7 +68,7 @@ int TestService::shutdown( const TQString & network ) m_status = NetworkStatus::ShuttingDown; m_service->setNetworkStatus( "test_net", (int)m_status ); m_nextStatus = NetworkStatus::Offline; - TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( slotStatusChange() ) ); return (int)NetworkStatus::RequestAccepted; } diff --git a/networkstatus/testservice.h b/networkstatus/testservice.h index 9a7ef127d..e893ec6ea 100644 --- a/networkstatus/testservice.h +++ b/networkstatus/testservice.h @@ -29,7 +29,7 @@ class ServiceIface_stub; class TestService : virtual public TQObject, ProviderIface { -Q_OBJECT +TQ_OBJECT public: TestService(); virtual ~TestService(); diff --git a/tdeabc/HOWTO b/tdeabc/HOWTO index 1070ccd4c..d53cd8725 100644 --- a/tdeabc/HOWTO +++ b/tdeabc/HOWTO @@ -169,7 +169,7 @@ The following code will create a file resource and save a contact into it: 39: 40: // PHOTO or LOGO 41: TDEABC::Picture photo; -42: QImage img; +42: TQImage img; 43: if ( img.load( "face.png", "PNG" ) ) { 44: photo.setData( img ); 45: photo.setType( "image/png" ); @@ -252,10 +252,10 @@ as argument. In line 41 we make use of TDEABC::Picture class to store the photo of the contact. This class can contain either an URL or the raw image data in form -of a QImage, in this example we use the latter. +of a TQImage, in this example we use the latter. In line 43 we try to load the image "face.png" from the local directory and -assign this QImage to the TDEABC::Picture class via the setData() function. +assign this TQImage to the TDEABC::Picture class via the setData() function. Additionally we set the type of the picture to "image/png". From 49 - 50 we insert 2 email addresses with the first one as preferred @@ -337,7 +337,7 @@ representation of one list. 12: QStringList emails = list->emails(); 13: QStringList::Iterator eit; 14: for ( eit = emails.begin(); eit != emails.end(); ++eit ) -15: kdDebug() << QString( "\t%1" ).arg( (*eit).latin1() ) << endl; +15: kdDebug() << TQString( "\t%1" ).arg( (*eit).latin1() ) << endl; 16: } In the first line a TDEABC::DistributionListManager is created. The manager takes @@ -365,8 +365,8 @@ changed. So to make your application aware of changes use the following code: #include <tdeabc/distributionlist.h> - 1: connect( TDEABC::DistributionListWatcher::self(), SIGNAL( changed() ), - 2: this, SLOT( slotDistributionListChanged() ) ); + 1: connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + 2: this, TQ_SLOT( slotDistributionListChanged() ) ); You see, as usual, easy ;) diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp index b9d239ef4..a472b2bd0 100644 --- a/tdeabc/addressbook.cpp +++ b/tdeabc/addressbook.cpp @@ -711,15 +711,15 @@ bool AddressBook::addResource( Resource *resource ) d->mManager->add( resource ); resource->setAddressBook( this ); - connect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - connect( resource, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); + connect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + connect( resource, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); - connect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - connect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); + connect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + connect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); return true; } @@ -733,15 +733,15 @@ bool AddressBook::removeResource( Resource *resource ) resource->setAddressBook( 0 ); - disconnect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - disconnect( resource, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); + disconnect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + disconnect( resource, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); - disconnect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - disconnect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + disconnect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + disconnect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); d->mManager->remove( resource ); diff --git a/tdeabc/addressbook.h b/tdeabc/addressbook.h index 5a3d1a45a..f2fa1e0e1 100644 --- a/tdeabc/addressbook.h +++ b/tdeabc/addressbook.h @@ -42,7 +42,7 @@ class Ticket; */ class KABC_EXPORT AddressBook : public TQObject { - Q_OBJECT + TQ_OBJECT friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const AddressBook & ); friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, AddressBook & ); diff --git a/tdeabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp index 26c87d8b8..73e7b7172 100644 --- a/tdeabc/addresseedialog.cpp +++ b/tdeabc/addresseedialog.cpp @@ -72,15 +72,15 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : mAddresseeList->setAllColumnsShowFocus( true ); mAddresseeList->setFullWidth( true ); listLayout->addWidget( mAddresseeList ); - connect( mAddresseeList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( mAddresseeList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( updateEdit( TQListViewItem * ) ) ); + connect( mAddresseeList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( mAddresseeList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( updateEdit( TQListViewItem * ) ) ); mAddresseeEdit = new KLineEdit( topWidget ); mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ), - TQT_SLOT( selectItem( const TQString & ) ) ); + connect( mAddresseeEdit->completionObject(), TQ_SIGNAL( match( const TQString & ) ), + TQ_SLOT( selectItem( const TQString & ) ) ); mAddresseeEdit->setFocus(); mAddresseeEdit->completionObject()->setIgnoreCase( true ); listLayout->addWidget( mAddresseeEdit ); @@ -92,7 +92,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : topLayout->addLayout( selectedLayout ); topLayout->setSpacing( spacingHint() ); - TQGroupBox *selectedGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Selected"), + TQGroupBox *selectedGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Selected"), topWidget ); selectedLayout->addWidget( selectedGroup ); @@ -101,23 +101,23 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : mSelectedList->addColumn( i18n("Email") ); mSelectedList->setAllColumnsShowFocus( true ); mSelectedList->setFullWidth( true ); - connect( mSelectedList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( removeSelected() ) ); + connect( mSelectedList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( removeSelected() ) ); TQPushButton *unselectButton = new TQPushButton( i18n("Unselect"), selectedGroup ); - connect ( unselectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelected() ) ); + connect ( unselectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSelected() ) ); - connect( mAddresseeList, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( addSelected( TQListViewItem * ) ) ); + connect( mAddresseeList, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( addSelected( TQListViewItem * ) ) ); setInitialSize( TQSize( 650, 350 ) ); } mAddressBook = StdAddressBook::self( true ); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - TQT_SLOT( addressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ), - TQT_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + TQ_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ), + TQ_SLOT( addressBookChanged() ) ); loadAddressBook(); } diff --git a/tdeabc/addresseedialog.h b/tdeabc/addresseedialog.h index f94b49b71..4623abdb1 100644 --- a/tdeabc/addresseedialog.h +++ b/tdeabc/addresseedialog.h @@ -82,7 +82,7 @@ class KABC_EXPORT AddresseeItem : public TQListViewItem */ class KABC_EXPORT AddresseeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp index 93a327889..ef6537e28 100644 --- a/tdeabc/addresslineedit.cpp +++ b/tdeabc/addresslineedit.cpp @@ -104,22 +104,22 @@ void AddressLineEdit::init() ldapSearchDeleter.setObject( s_LDAPSearch, new LdapSearch ); ldapTextDeleter.setObject( s_LDAPText, new TQString ); } - connect( s_LDAPTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotStartLDAPLookup())); - connect( s_LDAPSearch, TQT_SIGNAL( searchData( const TQStringList& )), - TQT_SLOT( slotLDAPSearchData( const TQStringList& ))); + connect( s_LDAPTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotStartLDAPLookup())); + connect( s_LDAPSearch, TQ_SIGNAL( searchData( const TQStringList& )), + TQ_SLOT( slotLDAPSearchData( const TQStringList& ))); } if ( m_useCompletion && !m_completionInitialized ) { setCompletionObject( s_completion, false ); // we handle it ourself - connect( this, TQT_SIGNAL( completion(const TQString&)), - this, TQT_SLOT(slotCompletion() )); + connect( this, TQ_SIGNAL( completion(const TQString&)), + this, TQ_SLOT(slotCompletion() )); TDECompletionBox *box = completionBox(); - connect( box, TQT_SIGNAL( highlighted( const TQString& )), - this, TQT_SLOT( slotPopupCompletion( const TQString& ) )); - connect( box, TQT_SIGNAL( userCancelled( const TQString& )), - TQT_SLOT( userCancelled( const TQString& ))); + connect( box, TQ_SIGNAL( highlighted( const TQString& )), + this, TQ_SLOT( slotPopupCompletion( const TQString& ) )); + connect( box, TQ_SIGNAL( userCancelled( const TQString& )), + TQ_SLOT( userCancelled( const TQString& ))); m_completionInitialized = true; // don't connect muliple times. That's // ugly, tho, better have completionBox() @@ -190,7 +190,7 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e) void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e ) { - if (m_useCompletion && (e->button() == Qt::MidButton)) + if (m_useCompletion && (e->button() == TQt::MidButton)) { m_smartPaste = true; KLineEdit::mouseReleaseEvent(e); diff --git a/tdeabc/addresslineedit.h b/tdeabc/addresslineedit.h index b8f83ceab..d42e35533 100644 --- a/tdeabc/addresslineedit.h +++ b/tdeabc/addresslineedit.h @@ -49,7 +49,7 @@ class LdapSearch; */ class KABC_EXPORT AddressLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: AddressLineEdit(TQWidget* parent, bool useCompletion = true, const char *name = 0L); diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp index 7c55fccd6..3456418de 100644 --- a/tdeabc/distributionlist.cpp +++ b/tdeabc/distributionlist.cpp @@ -108,7 +108,7 @@ DistributionList::Entry::List DistributionList::entries() const return mEntries; } -typedef TQValueList< QPair<TQString, TQString> > MissingEntryList; +typedef TQValueList< TQPair<TQString, TQString> > MissingEntryList; class DistributionListManager::DistributionListManagerPrivate { @@ -275,7 +275,7 @@ DistributionListWatcher::DistributionListWatcher() mDirWatch = new KDirWatch; mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) ); - connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) ); + connect( mDirWatch, TQ_SIGNAL( dirty( const TQString& ) ), TQ_SIGNAL( changed() ) ); mDirWatch->startScan(); } diff --git a/tdeabc/distributionlist.h b/tdeabc/distributionlist.h index 44de7f0d3..ef1b1fece 100644 --- a/tdeabc/distributionlist.h +++ b/tdeabc/distributionlist.h @@ -182,13 +182,13 @@ class KABC_EXPORT DistributionListManager \code TDEABC::DistributionListWatcher *watchdog = TDEABC::DistributionListWatcher::self() - connect( watchdog, TQT_SIGNAL( changed() ), TQT_SLOT( doSomething() ) ); + connect( watchdog, TQ_SIGNAL( changed() ), TQ_SLOT( doSomething() ) ); \endcode */ class KABC_EXPORT DistributionListWatcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp index 04578e19a..9d424a927 100644 --- a/tdeabc/distributionlistdialog.cpp +++ b/tdeabc/distributionlistdialog.cpp @@ -46,7 +46,7 @@ DistributionListDialog::DistributionListDialog( AddressBook *addressBook, TQWidg mEditor = new DistributionListEditorWidget( addressBook, this ); setMainWidget( mEditor ); - connect( this, TQT_SIGNAL( okClicked() ), mEditor, TQT_SLOT( save() ) ); + connect( this, TQ_SIGNAL( okClicked() ), mEditor, TQ_SLOT( save() ) ); } DistributionListDialog::~DistributionListDialog() @@ -66,7 +66,7 @@ EmailSelector::EmailSelector( const TQStringList &emails, const TQString ¤ TQFrame *topFrame = plainPage(); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); - mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"), + mButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Email Addresses"), topFrame ); topLayout->addWidget( mButtonGroup ); @@ -147,19 +147,19 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mNameCombo = new TQComboBox( this ); nameLayout->addWidget( mNameCombo ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) ); mNewButton = new TQPushButton( i18n("New List..."), this ); nameLayout->addWidget( mNewButton ); - connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) ); + connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) ); mEditButton = new TQPushButton( i18n("Rename List..."), this ); nameLayout->addWidget( mEditButton ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) ); mRemoveButton = new TQPushButton( i18n("Remove List"), this ); nameLayout->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); TQGridLayout *gridLayout = new TQGridLayout( topLayout, 3, 3 ); gridLayout->setColStretch(1, 1); @@ -175,15 +175,15 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mAddresseeView->addColumn( i18n("Preferred Email") ); mAddresseeView->setAllColumnsShowFocus( true ); gridLayout->addWidget( mAddresseeView, 1, 0 ); - connect( mAddresseeView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionAddresseeViewChanged() ) ); - connect( mAddresseeView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( addEntry() ) ); + connect( mAddresseeView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionAddresseeViewChanged() ) ); + connect( mAddresseeView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( addEntry() ) ); mAddEntryButton = new TQPushButton( i18n("Add Entry"), this ); mAddEntryButton->setEnabled(false); gridLayout->addWidget( mAddEntryButton, 2, 0 ); - connect( mAddEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) ); + connect( mAddEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) ); mEntryView = new TQListView( this ); mEntryView->addColumn( i18n("Name") ); @@ -192,16 +192,16 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mEntryView->setEnabled(false); mEntryView->setAllColumnsShowFocus( true ); gridLayout->addMultiCellWidget( mEntryView, 1, 1, 1, 2 ); - connect( mEntryView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionEntryViewChanged() ) ); + connect( mEntryView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionEntryViewChanged() ) ); mChangeEmailButton = new TQPushButton( i18n("Change Email..."), this ); gridLayout->addWidget( mChangeEmailButton, 2, 1 ); - connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); mRemoveEntryButton = new TQPushButton( i18n("Remove Entry"), this ); gridLayout->addWidget( mRemoveEntryButton, 2, 2 ); - connect( mRemoveEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) ); + connect( mRemoveEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) ); mManager = new DistributionListManager( mAddressBook ); mManager->load(); diff --git a/tdeabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h index 0270c3605..3fd97243d 100644 --- a/tdeabc/distributionlistdialog.h +++ b/tdeabc/distributionlistdialog.h @@ -54,7 +54,7 @@ class DistributionListManager; */ class KABC_EXPORT DistributionListDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -100,7 +100,7 @@ class KABC_EXPORT EmailSelector : public KDialogBase */ class KABC_EXPORT DistributionListEditorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DistributionListEditorWidget( AddressBook *, TQWidget *parent ); diff --git a/tdeabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp index 215382f62..e2882378f 100644 --- a/tdeabc/distributionlisteditor.cpp +++ b/tdeabc/distributionlisteditor.cpp @@ -46,7 +46,7 @@ EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString TQFrame *topFrame = plainPage(); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); - mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"), + mButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Email Addresses"), topFrame ); mButtonGroup->setRadioButtonExclusive( true ); topLayout->addWidget( mButtonGroup ); @@ -128,34 +128,34 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg mNameCombo = new TQComboBox( this ); nameLayout->addWidget( mNameCombo ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) ); newButton = new TQPushButton( i18n("New List"), this ); nameLayout->addWidget( newButton ); - connect( newButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) ); + connect( newButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) ); removeButton = new TQPushButton( i18n("Remove List"), this ); nameLayout->addWidget( removeButton ); - connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); mEntryView = new TQListView( this ); mEntryView->addColumn( i18n("Name") ); mEntryView->addColumn( i18n("Email") ); mEntryView->addColumn( i18n("Use Preferred") ); topLayout->addWidget( mEntryView ); - connect(mEntryView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionEntryViewChanged())); + connect(mEntryView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionEntryViewChanged())); changeEmailButton = new TQPushButton( i18n("Change Email"), this ); topLayout->addWidget( changeEmailButton ); - connect( changeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( changeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); removeEntryButton = new TQPushButton( i18n("Remove Entry"), this ); topLayout->addWidget( removeEntryButton ); - connect( removeEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) ); + connect( removeEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) ); addEntryButton = new TQPushButton( i18n("Add Entry"), this ); topLayout->addWidget( addEntryButton ); - connect( addEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) ); + connect( addEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) ); mAddresseeView = new TQListView( this ); mAddresseeView->addColumn( i18n("Name") ); @@ -163,7 +163,7 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg topLayout->addWidget( mAddresseeView ); - connect(mAddresseeView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionAddresseeViewChanged())); + connect(mAddresseeView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionAddresseeViewChanged())); mManager = new DistributionListManager( mAddressBook ); mManager->load(); diff --git a/tdeabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h index 5c0b4c03a..e82d8961f 100644 --- a/tdeabc/distributionlisteditor.h +++ b/tdeabc/distributionlisteditor.h @@ -53,7 +53,7 @@ class KABC_EXPORT EmailSelectDialog : public KDialogBase */ class KABC_EXPORT DistributionListEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DistributionListEditor( AddressBook *, TQWidget *parent ); virtual ~DistributionListEditor(); diff --git a/tdeabc/ldapclient.cpp b/tdeabc/ldapclient.cpp index 31256f46f..5ae18b848 100644 --- a/tdeabc/ldapclient.cpp +++ b/tdeabc/ldapclient.cpp @@ -138,12 +138,12 @@ void LdapClient::startQuery( const TQString& filter ) startParseLDIF(); mActive = true; mJob = TDEIO::get( url, false, false ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDone() ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mJob, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDone() ) ); } void LdapClient::cancelQuery() @@ -158,7 +158,7 @@ void LdapClient::cancelQuery() void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data ) { -#ifndef NDEBUG // don't create the QString +#ifndef NDEBUG // don't create the TQString // TQString str( data ); // kdDebug(5700) << "LdapClient: Got \"" << str << "\"\n"; #endif @@ -285,18 +285,18 @@ LdapSearch::LdapSearch() attrs << "cn" << "mail" << "givenname" << "sn"; ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClients.append( ldapClient ); } } - connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) ); + connect( &mDataTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDataTimer() ) ); } void LdapSearch::startSearch( const TQString& txt ) diff --git a/tdeabc/ldapclient.h b/tdeabc/ldapclient.h index a4a5747a6..c05162a22 100644 --- a/tdeabc/ldapclient.h +++ b/tdeabc/ldapclient.h @@ -84,7 +84,7 @@ class KABC_EXPORT LdapObject */ class KABC_EXPORT LdapClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: LdapClient( TQObject* parent = 0, const char* name = 0 ); @@ -206,7 +206,7 @@ typedef TQValueList<LdapResult> LdapResultList; */ class KABC_EXPORT LdapSearch : public TQObject { - Q_OBJECT + TQ_OBJECT public: LdapSearch(); diff --git a/tdeabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp index 2c2dfbe75..0c5b845be 100644 --- a/tdeabc/ldapconfigwidget.cpp +++ b/tdeabc/ldapconfigwidget.cpp @@ -180,7 +180,7 @@ void LdapConfigWidget::initWidget() //without host query doesn't make sense if ( mHost ) { TQPushButton *dnquery = new TQPushButton( i18n( "Query Server" ), this ); - connect( dnquery, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryDNClicked() ) ); + connect( dnquery, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryDNClicked() ) ); mainLayout->addMultiCellWidget( dnquery, row, row, 2, 3 ); } row++; @@ -202,9 +202,9 @@ void LdapConfigWidget::initWidget() mSecSSL = new TQRadioButton( i18n( "SSL" ), btgroup, "kcfg_ldapssl" ); mainLayout->addMultiCellWidget( btgroup, row, row, 0, 3 ); - connect( mSecNO, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) ); - connect( mSecTLS, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) ); - connect( mSecSSL, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPSPort( ) ) ); + connect( mSecNO, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) ); + connect( mSecTLS, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) ); + connect( mSecSSL, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPSPort( ) ) ); mSecNO->setChecked( true ); row++; @@ -213,7 +213,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_AUTHBOX ) { TQButtonGroup *authbox = - new TQButtonGroup( 3, Qt::Horizontal, i18n( "Authentication" ), this ); + new TQButtonGroup( 3, TQt::Horizontal, i18n( "Authentication" ), this ); mAnonymous = new TQRadioButton( i18n( "Anonymous" ), authbox, "kcfg_ldapanon" ); mSimple = new TQRadioButton( i18n( "Simple" ), authbox, "kcfg_ldapsimple" ); @@ -229,14 +229,14 @@ void LdapConfigWidget::initWidget() //without host query doesn't make sense if ( mHost ) { mQueryMech = new TQPushButton( i18n( "Query Server" ), authbox ); - connect( mQueryMech, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryMechClicked() ) ); + connect( mQueryMech, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryMechClicked() ) ); } mainLayout->addMultiCellWidget( authbox, row, row+1, 0, 3 ); - connect( mAnonymous, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setAnonymous(int) ) ); - connect( mSimple, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSimple(int) ) ); - connect( mSASL, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSASL(int) ) ); + connect( mAnonymous, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setAnonymous(int) ) ); + connect( mSimple, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSimple(int) ) ); + connect( mSASL, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSASL(int) ) ); mAnonymous->setChecked( true ); } @@ -293,10 +293,10 @@ void LdapConfigWidget::sendQuery() mLdif.startParsing(); TDEIO::Job *job = TDEIO::get( _url, true, false ); job->addMetaData("no-auth-prompt","true"); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( loadResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( loadResult( TDEIO::Job* ) ) ); if ( mProg == NULL ) mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true ); @@ -615,7 +615,7 @@ void LdapConfigWidget::setFlags( int flags ) obj = ch2.first(); while ( obj != 0 ) { widget = dynamic_cast<TQWidget*> (obj); - if ( widget && TQT_BASE_OBJECT(widget->parent()) == TQT_BASE_OBJECT(this) ) { + if ( widget && widget->parent() == this ) { mainLayout->remove( widget ); delete ( widget ); } diff --git a/tdeabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h index ed39bb776..9f053bfd9 100644 --- a/tdeabc/ldapconfigwidget.h +++ b/tdeabc/ldapconfigwidget.h @@ -49,7 +49,7 @@ namespace TDEABC { class KABC_EXPORT LdapConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( LCW_Flags flags READ flagsProp WRITE setFlagsProp ) TQ_PROPERTY( TQString user READ user WRITE setUser ) diff --git a/tdeabc/ldapurl.cpp b/tdeabc/ldapurl.cpp index c20dbd39e..c1e943688 100644 --- a/tdeabc/ldapurl.cpp +++ b/tdeabc/ldapurl.cpp @@ -36,7 +36,7 @@ LDAPUrl::LDAPUrl(const KURL &_url) { m_dn = path(); if ( !TQDir::isRelativePath(m_dn) ) -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_dn.remove(0,3); // e.g. "c:/" #else m_dn.remove(0,1); @@ -48,7 +48,7 @@ void LDAPUrl::setDn( const TQString &dn) { m_dn = dn; if ( !TQDir::isRelativePath(m_dn) ) -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_dn.remove(0,3); // e.g. "c:/" #else m_dn.remove(0,1); diff --git a/tdeabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp index 1527b4893..7c4a72025 100644 --- a/tdeabc/ldifconverter.cpp +++ b/tdeabc/ldifconverter.cpp @@ -152,7 +152,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str ) ldif_out( t, "homeurl", addr.url().prettyURL() ); ldif_out( t, "description", addr.note() ); if (addr.revision().isValid()) - ldif_out(t, "modifytimestamp", dateToVCardString( TQT_TQDATETIME_OBJECT(addr.revision())) ); + ldif_out(t, "modifytimestamp", dateToVCardString( addr.revision()) ); t << "objectclass: top\n"; t << "objectclass: person\n"; diff --git a/tdeabc/lock.h b/tdeabc/lock.h index d4d04532a..6b96d9fe7 100644 --- a/tdeabc/lock.h +++ b/tdeabc/lock.h @@ -34,7 +34,7 @@ namespace TDEABC { */ class KABC_EXPORT Lock : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Constructor. diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp index 304f585f0..7502084aa 100644 --- a/tdeabc/plugins/dir/resourcedir.cpp +++ b/tdeabc/plugins/dir/resourcedir.cpp @@ -87,9 +87,9 @@ void ResourceDir::init( const TQString &path, const TQString &format ) mLock = 0; - connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( pathChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( pathChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( pathChanged() ) ); setPath( path ); } diff --git a/tdeabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h index dc9d1d06a..8c9eb66a4 100644 --- a/tdeabc/plugins/dir/resourcedir.h +++ b/tdeabc/plugins/dir/resourcedir.h @@ -40,7 +40,7 @@ class Lock; */ class KABC_EXPORT ResourceDir : public Resource { - Q_OBJECT + TQ_OBJECT public: ResourceDir( const TDEConfig* ); diff --git a/tdeabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h index 51fac5812..9ba2ec492 100644 --- a/tdeabc/plugins/dir/resourcedirconfig.h +++ b/tdeabc/plugins/dir/resourcedirconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceDirConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp index 3fa2a9406..2b25db4c4 100644 --- a/tdeabc/plugins/file/resourcefile.cpp +++ b/tdeabc/plugins/file/resourcefile.cpp @@ -83,9 +83,9 @@ void ResourceFile::init( const TQString &fileName, const TQString &formatName ) mFormat = factory->format( mFormatName ); } - connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( fileChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( fileChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( fileChanged() ) ); setFileName( fileName ); @@ -333,9 +333,9 @@ bool ResourceFile::asyncSave( Ticket *ticket ) bool ok = save( ticket ); if ( !ok ) - TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingError() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingError() ) ); else - TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingFinished() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingFinished() ) ); return ok; } diff --git a/tdeabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h index ffa19a4bf..2f38254a2 100644 --- a/tdeabc/plugins/file/resourcefile.h +++ b/tdeabc/plugins/file/resourcefile.h @@ -39,7 +39,7 @@ class Lock; */ class KABC_EXPORT ResourceFile : public Resource { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp index 2c8e0fce6..7995f3be1 100644 --- a/tdeabc/plugins/file/resourcefileconfig.cpp +++ b/tdeabc/plugins/file/resourcefileconfig.cpp @@ -51,8 +51,8 @@ ResourceFileConfig::ResourceFileConfig( TQWidget* parent, const char* name ) label = new TQLabel( i18n( "Location:" ), this ); mFileNameEdit = new KURLRequester( this ); - connect( mFileNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( checkFilePermissions( const TQString & ) ) ); + connect( mFileNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( checkFilePermissions( const TQString & ) ) ); mainLayout->addWidget( label, 1, 0 ); mainLayout->addWidget( mFileNameEdit, 1, 1 ); diff --git a/tdeabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h index 3be4cca49..0f3c12cd5 100644 --- a/tdeabc/plugins/file/resourcefileconfig.h +++ b/tdeabc/plugins/file/resourcefileconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceFileConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp index ed6675392..f7c6ed36a 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp @@ -123,7 +123,7 @@ ResourceLDAPTDEIO::~ResourceLDAPTDEIO() void ResourceLDAPTDEIO::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); @@ -173,10 +173,10 @@ TQString ResourceLDAPTDEIO::findUid( const TQString &uid ) TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ ); connect( listJob, - TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); - connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( listResult( TDEIO::Job* ) ) ); + TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( listJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( listResult( TDEIO::Job* ) ) ); enter_loop(); return d->mResultDn; @@ -511,8 +511,8 @@ TDEIO::Job *ResourceLDAPTDEIO::loadFromCache() KURL url( d->mCacheDst ); job = TDEIO::get( url, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); } return job; } @@ -535,17 +535,17 @@ bool ResourceLDAPTDEIO::load() createCache(); if ( d->mCachePolicy != Cache_Always ) { job = TDEIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } job = loadFromCache(); if ( job ) { - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } if ( mErrorMsg.isEmpty() ) { @@ -572,10 +572,10 @@ bool ResourceLDAPTDEIO::asyncLoad() createCache(); if ( d->mCachePolicy != Cache_Always ) { TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); } else { result( NULL ); } @@ -714,8 +714,8 @@ void ResourceLDAPTDEIO::result( TDEIO::Job *job ) TDEIO::Job *cjob; cjob = loadFromCache(); if ( cjob ) { - connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) ); + connect( cjob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( loadCacheResult( TDEIO::Job* ) ) ); } else { if ( !mErrorMsg.isEmpty() ) emit loadingError( this, mErrorMsg ); @@ -730,10 +730,10 @@ bool ResourceLDAPTDEIO::save( Ticket* ) d->mSaveIt = begin(); TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); if ( mErrorMsg.isEmpty() ) { kdDebug(7125) << "ResourceLDAPTDEIO save ok!" << endl; @@ -750,10 +750,10 @@ bool ResourceLDAPTDEIO::asyncSave( Ticket* ) kdDebug(7125) << "ResourceLDAPTDEIO asyncSave" << endl; d->mSaveIt = begin(); TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( saveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( saveResult( TDEIO::Job* ) ) ); return true; } diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h index 8f0565c3e..e82e94c83 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h @@ -32,7 +32,7 @@ namespace TDEABC { class KABC_EXPORT ResourceLDAPTDEIO : public Resource { - Q_OBJECT + TQ_OBJECT public: enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always }; diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp index 429e6b494..9dc8a8a57 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp @@ -58,8 +58,8 @@ ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent, const char* mEditButton = new TQPushButton( i18n( "Edit Attributes..." ), box ); mCacheButton = new TQPushButton( i18n( "Offline Use..." ), box ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editAttributes() ) ); - connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editAttributes() ) ); + connect( mCacheButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCache() ) ); } void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res ) @@ -247,7 +247,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes, mMapCombo->insertItem( i18n( "Netscape" ) ); mMapCombo->insertItem( i18n( "Evolution" ) ); mMapCombo->insertItem( i18n( "Outlook" ) ); - connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) ); + connect( mMapCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( mapChanged( int ) ) ); label = new TQLabel( i18n( "RDN prefix attribute:" ), page ); layout->addWidget( label, 1, 0 ); @@ -342,7 +342,7 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, layout->setAutoAdd( true ); mSrc = src; mDst = dst; - mCacheGroup = new TQButtonGroup( 1, Qt::Horizontal, + mCacheGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Offline Cache Policy"), page ); TQRadioButton *bt; @@ -356,10 +356,10 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, mAutoCache->setChecked( autoCache ); mAutoCache->setEnabled( bt->isChecked() ); - connect( bt, TQT_SIGNAL(toggled(bool)), mAutoCache, TQT_SLOT(setEnabled(bool)) ); + connect( bt, TQ_SIGNAL(toggled(bool)), mAutoCache, TQ_SLOT(setEnabled(bool)) ); TQPushButton *lcache = new TQPushButton( i18n("Load into Cache"), page ); - connect( lcache, TQT_SIGNAL( clicked() ), TQT_SLOT( loadCache() ) ); + connect( lcache, TQ_SIGNAL( clicked() ), TQ_SLOT( loadCache() ) ); } OfflineDialog::~OfflineDialog() diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h index d56b4de31..2d3f3571f 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h @@ -44,7 +44,7 @@ namespace TDEABC { class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 ); @@ -68,7 +68,7 @@ class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget class AttributesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AttributesDialog( const TQMap<TQString, TQString> &attributes, int rdnprefix, @@ -93,7 +93,7 @@ class AttributesDialog : public KDialogBase class OfflineDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp index cb908cd22..08fa8764a 100644 --- a/tdeabc/plugins/net/resourcenet.cpp +++ b/tdeabc/plugins/net/resourcenet.cpp @@ -192,8 +192,8 @@ bool ResourceNet::asyncLoad() TDEIO::Scheduler::checkSlaveOnHold( true ); d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false ); d->mIsLoading = true; - connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) ); + connect( d->mLoadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( downloadFinished( TDEIO::Job* ) ) ); return true; } @@ -286,8 +286,8 @@ bool ResourceNet::asyncSave( Ticket* ) TDEIO::Scheduler::checkSlaveOnHold( true ); d->mIsSaving = true; d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false ); - connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) ); + connect( d->mSaveJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( uploadFinished( TDEIO::Job* ) ) ); return true; } @@ -352,7 +352,7 @@ void ResourceNet::downloadFinished( TDEIO::Job* ) if ( !hasTempFile() || mTempFile->status() != 0 ) { d->mLastErrorString = i18n( "Download failed: Unable to create temporary file" ); - TQTimer::singleShot( 0, this, TQT_SLOT( signalError() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( signalError() ) ); return; } diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h index e190c63c8..0ce7bf862 100644 --- a/tdeabc/plugins/net/resourcenet.h +++ b/tdeabc/plugins/net/resourcenet.h @@ -44,7 +44,7 @@ class FormatPlugin; */ class KABC_EXPORT ResourceNet : public Resource { - Q_OBJECT + TQ_OBJECT public: ResourceNet( const TDEConfig* ); diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h index 513c77de2..df1a73ba6 100644 --- a/tdeabc/plugins/net/resourcenetconfig.h +++ b/tdeabc/plugins/net/resourcenetconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceNetConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp index b72afea15..a820b56df 100644 --- a/tdeabc/plugins/sql/resourcesql.cpp +++ b/tdeabc/plugins/sql/resourcesql.cpp @@ -247,7 +247,7 @@ bool ResourceSql::save( Ticket * ) (*it).prefix() + "','" + (*it).suffix() + "','" + (*it).nickName() + "','" + - (*it).birthday().toString( Qt::ISODate ) + "','" + + (*it).birthday().toString( TQt::ISODate ) + "','" + (*it).mailer() + "','" + TQString::number( (*it).timeZone().offset() ) + "','" + TQString::number( (*it).geo().latitude() ) + "','" + @@ -257,7 +257,7 @@ bool ResourceSql::save( Ticket * ) (*it).organization() + "','" + (*it).note() + "','" + (*it).productId() + "','" + - (*it).revision().toString( Qt::ISODate ) + "','" + + (*it).revision().toString( TQt::ISODate ) + "','" + (*it).sortString() + "','" + (*it).url().url() + "')" ); diff --git a/tdeabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h index e0c08880c..116248809 100644 --- a/tdeabc/plugins/sql/resourcesqlconfig.h +++ b/tdeabc/plugins/sql/resourcesqlconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class ResourceSqlConfig : public ResourceConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/resource.h b/tdeabc/resource.h index 5e9d9cb0d..d18c551d3 100644 --- a/tdeabc/resource.h +++ b/tdeabc/resource.h @@ -54,7 +54,7 @@ class KABC_EXPORT Ticket */ class KABC_EXPORT Resource : public KRES::Resource { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp index a12e83611..1bede4a84 100644 --- a/tdeabc/resourceselectdialog.cpp +++ b/tdeabc/resourceselectdialog.cpp @@ -42,7 +42,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c TQVBoxLayout *mainLayout = new TQVBoxLayout( this ); mainLayout->setMargin( marginHint() ); - TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal, this ); + TQGroupBox *groupBox = new TQGroupBox( 2, TQt::Horizontal, this ); groupBox->setTitle( i18n( "Resources" ) ); mResourceId = new TDEListBox( groupBox ); @@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c KButtonBox *buttonBox = new KButtonBox( this ); buttonBox->addStretch(); - buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) ); - buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) ); + buttonBox->addButton( KStdGuiItem::ok(), this, TQ_SLOT( accept() ) ); + buttonBox->addButton( KStdGuiItem::cancel(), this, TQ_SLOT( reject() ) ); buttonBox->layout(); mainLayout->addWidget( buttonBox ); diff --git a/tdeabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h index 1d820ece1..b8df436ac 100644 --- a/tdeabc/resourceselectdialog.h +++ b/tdeabc/resourceselectdialog.h @@ -38,7 +38,7 @@ class Resource; */ class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog { - Q_OBJECT + TQ_OBJECT public: ResourceSelectDialog( AddressBook *ab, TQWidget *parent = 0, diff --git a/tdeabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp index f8f126b83..e162ea961 100644 --- a/tdeabc/scripts/field.src.cpp +++ b/tdeabc/scripts/field.src.cpp @@ -121,7 +121,7 @@ TQString Field::value( const TDEABC::Addressee &a ) return a.preferredEmail(); case FieldImpl::Birthday: if ( a.birthday().isValid() ) - return a.birthday().date().toString( Qt::ISODate ); + return a.birthday().date().toString( TQt::ISODate ); else return TQString::null; case FieldImpl::Url: @@ -362,7 +362,7 @@ bool Field::setValue( TDEABC::Addressee &a, const TQString &value ) return true; } case FieldImpl::Birthday: - a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) ); + a.setBirthday( TQDate::fromString( value, TQt::ISODate ) ); return true; case FieldImpl::CustomField: a.insertCustom( mImpl->app(), mImpl->key(), value ); @@ -378,7 +378,7 @@ TQString Field::sortKey( const TDEABC::Addressee &a ) --CASEVALUE-- case FieldImpl::Birthday: if ( a.birthday().isValid() ) { - TQDate date = TQT_TQDATE_OBJECT(a.birthday().date()); + TQDate date = a.birthday().date(); TQString key; key.sprintf( "%02d-%02d", date.month(), date.day() ); return key; diff --git a/tdeabc/sound.h b/tdeabc/sound.h index 3ee64ac57..d4d00131f 100644 --- a/tdeabc/sound.h +++ b/tdeabc/sound.h @@ -35,7 +35,7 @@ namespace TDEABC { * \code * KTempFile tmp; * if(sound.isIntern()) { - * tmp.file()->tqwriteBlock( sound.data() ); + * tmp.file()->writeBlock( sound.data() ); * tmp.close(); * KAudioPlayer::play( tmp.name() ); * } else if(!sound.url().isEmpty()) { diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp index 73343d8a9..d834215c3 100644 --- a/tdeabc/stdaddressbook.cpp +++ b/tdeabc/stdaddressbook.cpp @@ -103,15 +103,15 @@ void StdAddressBook::init( bool asynchronous ) error( TQString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); continue; } - connect( *it, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - connect( *it, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); - - connect( *it, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - connect( *it, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); + connect( *it, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + connect( *it, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); + + connect( *it, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + connect( *it, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); } Resource *res = standardResource(); diff --git a/tdeabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp index 80bd311da..ee4513d98 100644 --- a/tdeabc/tests/testaddresslineedit.cpp +++ b/tdeabc/tests/testaddresslineedit.cpp @@ -21,7 +21,7 @@ int main( int argc,char **argv ) lineEdit->show(); app.setMainWidget( lineEdit ); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); app.exec(); diff --git a/tdeabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp index 833dca84e..4a46f8e83 100644 --- a/tdeabc/tests/testdistlist.cpp +++ b/tdeabc/tests/testdistlist.cpp @@ -51,7 +51,7 @@ int main(int argc,char **argv) editor->show(); app.setMainWidget(editor); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); app.exec(); diff --git a/tdeabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp index a48ce043f..338d703f3 100644 --- a/tdeabc/tests/testldapclient.cpp +++ b/tdeabc/tests/testldapclient.cpp @@ -97,12 +97,12 @@ void TestLDAPClient::testIntevation() // But this certainly looks fishy, it might break on non-utf8 systems. TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*gypten MDK*)(sn=*gypten MDK*))"; - connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); - connect( mClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( mClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); + connect( mClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( mClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClient->startQuery( filter ); kapp->eventLoop()->enterLoop(); delete mClient; mClient = 0; diff --git a/tdeabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h index 502115b07..8b1a9bda4 100644 --- a/tdeabc/tests/testldapclient.h +++ b/tdeabc/tests/testldapclient.h @@ -26,7 +26,7 @@ typedef TDEABC::LdapClient LdapClient; class TestLDAPClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestLDAPClient() {} diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp index f9d880753..d593945bf 100644 --- a/tdeabc/tests/testlock.cpp +++ b/tdeabc/tests/testlock.cpp @@ -77,11 +77,11 @@ LockWidget::LockWidget( const TQString &identifier ) TQPushButton *button = new TQPushButton( "Lock", this ); topLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ) ); button = new TQPushButton( "Unlock", this ); topLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( unlock() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( unlock() ) ); } mLockView = new TQListView( this ); @@ -94,15 +94,15 @@ LockWidget::LockWidget( const TQString &identifier ) TQPushButton *quitButton = new TQPushButton( "Quit", this ); topLayout->addWidget( quitButton ); - connect( quitButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) ); + connect( quitButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) ); KDirWatch *watch = KDirWatch::self(); - connect( watch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); - connect( watch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); - connect( watch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); watch->addDir( Lock::locksDir() ); watch->startScan(); } diff --git a/tdeabc/tests/testlock.h b/tdeabc/tests/testlock.h index 62466b89a..a093a9ecb 100644 --- a/tdeabc/tests/testlock.h +++ b/tdeabc/tests/testlock.h @@ -30,7 +30,7 @@ class TQListView; class KABC_EXPORT LockWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: LockWidget( const TQString &identifier ); ~LockWidget(); diff --git a/tdeabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp index 3a0883edc..4f2ea6809 100644 --- a/tdeabc/vcardformatimpl.cpp +++ b/tdeabc/vcardformatimpl.cpp @@ -331,8 +331,8 @@ void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v addTextValue( v, EntityCategories, addressee.categories().join(",") ); - addDateValue( v, EntityBirthday, TQT_TQDATE_OBJECT(addressee.birthday().date()) ); - addDateTimeValue( v, EntityRevision, TQT_TQDATETIME_OBJECT(addressee.revision()) ); + addDateValue( v, EntityBirthday, addressee.birthday().date() ); + addDateTimeValue( v, EntityRevision, addressee.revision() ); addGeoValue( v, addressee.geo() ); addUTCValue( v, addressee.timeZone() ); diff --git a/tdeabc/vcardparser/CMakeLists.txt b/tdeabc/vcardparser/CMakeLists.txt index 692b7829f..e141d1f47 100644 --- a/tdeabc/vcardparser/CMakeLists.txt +++ b/tdeabc/vcardparser/CMakeLists.txt @@ -73,12 +73,6 @@ tde_add_check_executable( testread2 LINK ${TDEABC_TESTS_LINK} ) -if( CMAKE_VERSION VERSION_LESS "2.8.4" ) - if( NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/tests" ) - execute_process( COMMAND ln -s "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${CMAKE_CURRENT_BINARY_DIR}/tests" ) - endif( ) -endif() - add_test( NAME tdeabc/vcardparser/testread2 COMMAND testread2 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ) # testread tests diff --git a/tdeabc/vcardtool.cpp b/tdeabc/vcardtool.cpp index c1e793e77..71246497f 100644 --- a/tdeabc/vcardtool.cpp +++ b/tdeabc/vcardtool.cpp @@ -139,7 +139,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version ) card.addLine( createAgent( version, (*addrIt).agent() ) ); // BDAY - card.addLine( VCardLine( "BDAY", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).birthday()) ) ) ); + card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday()) ) ); // CATEGORIES if ( version == VCard::v3_0 ) { @@ -262,7 +262,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version ) card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) ); // REV - card.addLine( VCardLine( "REV", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).revision()) ) ) ); + card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision()) ) ); // ROLE VCardLine roleLine( "ROLE", TQString((*addrIt).role()) ); diff --git a/tdecert/tdecertpart.cpp b/tdecert/tdecertpart.cpp index 02afc9b75..adeabc4cb 100644 --- a/tdecert/tdecertpart.cpp +++ b/tdecert/tdecertpart.cpp @@ -169,7 +169,7 @@ _baseGrid->addMultiCellWidget(_sideList, 0, 13, 0, 1); _importAll = new TQPushButton(i18n("Import &All"), _frame); _baseGrid->addMultiCellWidget(_importAll, 14, 14, 0, 1); -connect(_importAll, TQT_SIGNAL(clicked()), TQT_SLOT(slotImportAll())); +connect(_importAll, TQ_SIGNAL(clicked()), TQ_SLOT(slotImportAll())); @@ -184,7 +184,7 @@ grid->addMultiCellWidget(new TQLabel(i18n("TDE Secure Certificate Import"), _pkc grid->addWidget(new TQLabel(i18n("Chain:"), _pkcsFrame), 1, 0); _p12_chain = new KComboBox(_pkcsFrame); grid->addMultiCellWidget(_p12_chain, 1, 1, 1, 4); -connect(_p12_chain, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChain(int))); +connect(_p12_chain, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChain(int))); grid->addWidget(new TQLabel(i18n("Subject:"), _pkcsFrame), 2, 0); grid->addWidget(new TQLabel(i18n("Issued by:"), _pkcsFrame), 2, 3); @@ -373,10 +373,10 @@ _baseGrid->addMultiCellWidget(_launch, 14, 14, 4, 5); _baseGrid->addWidget(_import, 14, 6); _baseGrid->addWidget(_save, 14, 7); _baseGrid->addWidget(_done, 14, 8); -connect(_launch, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunch())); -connect(_import, TQT_SIGNAL(clicked()), TQT_SLOT(slotImport())); -connect(_save, TQT_SIGNAL(clicked()), TQT_SLOT(slotSave())); -connect(_done, TQT_SIGNAL(clicked()), TQT_SLOT(slotDone())); +connect(_launch, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunch())); +connect(_import, TQ_SIGNAL(clicked()), TQ_SLOT(slotImport())); +connect(_save, TQ_SIGNAL(clicked()), TQ_SLOT(slotSave())); +connect(_done, TQ_SIGNAL(clicked()), TQ_SLOT(slotDone())); _import->setEnabled(false); _save->setEnabled(false); @@ -386,8 +386,8 @@ _baseGrid->addMultiCellWidget(_pkcsFrame, 0, 12, 2, 8); _baseGrid->addMultiCellWidget(_x509Frame, 0, 12, 2, 8); _baseGrid->addMultiCellWidget(_blankFrame, 0, 12, 2, 8); -connect(_sideList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); +connect(_sideList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); setReadWrite(true); } @@ -629,7 +629,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) { // Set the valid period TQPalette cspl = _ca_validFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < c->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(TQt::UTC) < c->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -638,7 +638,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) { _ca_validFrom->setText(c->getNotBefore()); cspl = _ca_validUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > c->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(TQt::UTC) > c->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -670,7 +670,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) { // Set the valid period TQPalette cspl = _p12_validFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < c->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(TQt::UTC) < c->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -679,7 +679,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) { _p12_validFrom->setText(c->getNotBefore()); cspl = _p12_validUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > c->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(TQt::UTC) > c->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); diff --git a/tdecert/tdecertpart.h b/tdecert/tdecertpart.h index 45edb168c..5d363f78d 100644 --- a/tdecert/tdecertpart.h +++ b/tdecert/tdecertpart.h @@ -66,7 +66,7 @@ class KPKCS12Item : public TDEListViewItem { class KCertPart : public KParts::ReadWritePart { -Q_OBJECT +TQ_OBJECT public: KCertPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent = 0L, const char *name = 0L, diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp index b2de8533a..b62c9df23 100644 --- a/tdecmshell/main.cpp +++ b/tdecmshell/main.cpp @@ -170,8 +170,8 @@ void KCMShell::waitForExit() { kdDebug(780) << k_funcinfo << endl; - connect(dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT( appExit(const TQCString&) )); + connect(dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT( appExit(const TQCString&) )); exec(); } @@ -191,7 +191,7 @@ static void setIcon(TQWidget *w, const TQString &iconName) TQPixmap icon = DesktopIcon(iconName); TQPixmap miniIcon = SmallIcon(iconName); w->setIcon( icon ); //standard X11 -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY KWin::setIcons(w->winId(), icon, miniIcon ); #endif } diff --git a/tdecmshell/main.h b/tdecmshell/main.h index 01f7d84c4..6f1ee1bda 100644 --- a/tdecmshell/main.h +++ b/tdecmshell/main.h @@ -32,7 +32,7 @@ */ class KCMShell : public TDEApplication { - Q_OBJECT + TQ_OBJECT public: @@ -81,7 +81,7 @@ private: */ class KCMShellMultiDialog : public KCMultiDialog, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp index a0b32e71a..939a70e80 100644 --- a/tdeconf_update/tdeconf_update.cpp +++ b/tdeconf_update/tdeconf_update.cpp @@ -201,7 +201,7 @@ KonfUpdate::log() } } - (*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " "; + (*m_textStream) << TQDateTime::currentDateTime().toString( TQt::ISODate ) << " "; return *m_textStream; } diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index 22c3bbc88..c794a8039 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -141,7 +141,7 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 14.1.0 EMBED tdecorenetwork-static - LINK DCOP-shared tdefx-shared ICE SM ${ZLIB_LIBRARIES} + LINK DCOP-shared tdefx-shared ICE SM ${ZLIB_LIBRARIES} ${RESOLV_LIBRARIES} LINK_PRIVATE ltdlc-static ${KDESVGICONS} ${XCOMPOSITE_LIBRARIES} ${LIBIDN_LIBRARIES} ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${GAMIN_LIBRARIES} ${Backtrace_LIBRARY} diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading index a675a8922..1a90f43ef 100644 --- a/tdecore/DESIGN.iconloading +++ b/tdecore/DESIGN.iconloading @@ -42,7 +42,7 @@ That way the application's pixmap always remain valid. Some example code to get the idea: Server can publish an icon (test.png) like this: - QImage i("test.png"); + TQImage i("test.png"); QPixmap p; p.convertFromImage(i); tqWarning("Handle = %08x", p.handle()); diff --git a/tdecore/DESIGN.tdeconfig b/tdecore/DESIGN.tdeconfig index a1fb48dbd..ef8c40546 100644 --- a/tdecore/DESIGN.tdeconfig +++ b/tdecore/DESIGN.tdeconfig @@ -93,7 +93,7 @@ default so that it doesn't change when the default changes? KDE3.0 Changes ============== -*) writeEntry now returns void instead of QString. +*) writeEntry now returns void instead of TQString. *) deleteEntry functions added diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index ae4f72d47..8ef01e8fe 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -1,25 +1,25 @@ In KDE3 a kiosk-framework has been introduced. -One of the driving forces behind KDE is to put the user in control and -give him or her a large amount of possibilities to adjust KDE to his or her +One of the driving forces behind TDE is to put the user in control and +give them a large amount of possibilities to adjust TDE to their liking. However, in some situations it is required to reduce the possibilities -of KDE, e.g. because the system is to be used for one or more specific +of TDE, e.g. because the system is to be used for one or more specific dedicated tasks only. The kiosk-framework provides an easy way to disable certain features within -KDE to create a more controlled environment. +TDE to create a more controlled environment. -KDE's kiosk-framework builds on KDE's configuration framework and adds a +TDE's kiosk-framework builds on TDE's configuration framework and adds a simple application API that applications can query to get authorisation for certain operations. -The KDE kiosk-framework should be used IN ADDITION to the standard UNIX +The TDE kiosk-framework should be used IN ADDITION to the standard UNIX security measures. The configuration framework in KDE3 =================================== -Since the very beginning KDE makes use of file-hierarchy to store resources +Since the very beginning TDE makes use of file-hierarchy to store resources for its applications. Resources range from icons, wallpapers, fonts to sounds, menu-descriptions and configuration files. @@ -550,16 +550,16 @@ Some remarks: matches "/srv" and not "/srv/www". -KDE3 Resource Restrictions +TDE Resource Restrictions ========================== -Most KDE applications make use of additional resource files that are typically -located in directories under $TDEDIR/share. By default KDE allows users to +Most TDE applications make use of additional resource files that are typically +located in directories under $TDEDIR/share. By default TDE allows users to override any of these resources by placing files in the same location under $TDEHOME/share. For example, Konsole stores profiles under $TDEDIR/share/apps/konsole and users can add additional profiles by installing files in $TDEHOME/share/apps/konsole. -KDE3 Resource Restrictions make it possible to restrict the lookup of files +TDE Resource Restrictions make it possible to restrict the lookup of files to directories outside of $TDEHOME only. The following resources are defined: @@ -642,14 +642,14 @@ The following syntax is also supported: Name[$ei]=${USER} -KDE3 Kiosk Application API +TDE Kiosk Application API ========================== Three new methods have been added to TDEApplication: -- bool authorize(QString action); // Generic actions -- bool authorizeTDEAction(QString action); // For TDEActions exclusively -- bool authorizeURLAction(QString, referringURL, destinationURL) // URL Handling +- bool authorize(TQString action); // Generic actions +- bool authorizeTDEAction(TQString action); // For TDEActions exclusively +- bool authorizeURLAction(TQString, referringURL, destinationURL) // URL Handling Automatic Logout ================ diff --git a/tdecore/fixx11h.h b/tdecore/fixx11h.h index e572335a1..eb6266444 100644 --- a/tdecore/fixx11h.h +++ b/tdecore/fixx11h.h @@ -16,7 +16,7 @@ symbols may now refer to different variables (e.g. if X11 #defined NoButton, after this file is included NoButton would no longer be X11's - NoButton, but Qt::NoButton instead). At this time, + NoButton, but TQt::NoButton instead). At this time, there's no conflict known that could cause problems. The original X11 symbols are still accessible diff --git a/tdecore/generate_keys.sh b/tdecore/generate_keys.sh index d0fea1cdd..61987b57e 100755 --- a/tdecore/generate_keys.sh +++ b/tdecore/generate_keys.sh @@ -18,7 +18,7 @@ sed -n '/enum Key/!d | sed -n 's/\s*Key_/{ "/ s/,.*$/ },/ s/ =/",/ - s/Key_/Qt::Key_/ + s/Key_/TQt::Key_/ $s/.*/& }/ p' \ > kckey_a diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h index 88b904a55..bd1ca41c2 100644 --- a/tdecore/kasyncio.h +++ b/tdecore/kasyncio.h @@ -25,10 +25,6 @@ #include <tqiodevice.h> #include "tdelibs_export.h" -#ifdef Q_MOC_RUN -#define USE_QT4 -#endif // Q_MOC_RUN - class KAsyncIOPrivate; /** * Asynchronous I/O Support @@ -39,14 +35,9 @@ class KAsyncIOPrivate; * @author Thiago Macieira <thiago.macieira@kdemail.net> * @short Asynchronous I/O support */ -class TDECORE_EXPORT KAsyncIO: -#ifdef USE_QT4 -#else // USE_QT4 -public TQObject, -#endif // USE_QT4 -public TQIODevice +class TDECORE_EXPORT KAsyncIO: public TQObject, public TQIODevice { - Q_OBJECT + TQ_OBJECT protected: KAsyncIO() // cannot be accessed externally diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h index 327713e6d..ce26a1e9a 100644 --- a/tdecore/kaudioplayer.h +++ b/tdecore/kaudioplayer.h @@ -48,13 +48,13 @@ class KAudioPlayerPrivate; * * \code * KAudioPlayer player("/var/share/foo.wav"); - * connect(&button, TQT_SIGNAL(clicked()), &player, TQT_SLOT(play())); + * connect(&button, TQ_SIGNAL(clicked()), &player, TQ_SLOT(play())); * \endcode * */ //REVISED: hausmann class TDECORE_EXPORT KAudioPlayer : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Constructor. diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp index 7a080ec68..d1ba6dcf2 100644 --- a/tdecore/kbufferedio.cpp +++ b/tdecore/kbufferedio.cpp @@ -111,22 +111,12 @@ bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) return true; } -#ifdef USE_QT3 int TDEBufferedIO::bytesAvailable() const -#endif // USE_QT3 -#ifdef USE_QT4 -qint64 TDEBufferedIO::bytesAvailable() const -#endif // USE_QT4 { return readBufferSize(); } -#ifdef USE_QT3 int TDEBufferedIO::bytesToWrite() const -#endif // USE_QT3 -#ifdef USE_QT4 -qint64 TDEBufferedIO::bytesToWrite() const -#endif // USE_QT4 { return writeBufferSize(); } diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h index f00ab52b6..f51b46a60 100644 --- a/tdecore/kbufferedio.h +++ b/tdecore/kbufferedio.h @@ -55,7 +55,7 @@ class TDEBufferedIOPrivate; */ class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO { - Q_OBJECT + TQ_OBJECT protected: @@ -118,12 +118,7 @@ public: * Returns the number of bytes available for reading in the read buffer * @return the number of bytes available for reading */ -#ifdef USE_QT3 virtual int bytesAvailable() const; -#endif // USE_QT3 -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif // USE_QT4 /** * Waits for more data to be available and returns the amount of available data then. @@ -137,12 +132,7 @@ public: * Returns the number of bytes yet to write, still in the write buffer * @return the number of unwritten bytes in the write buffer */ -#ifdef USE_QT3 virtual int bytesToWrite() const; -#endif // USE_QT3 -#ifdef USE_QT4 - virtual qint64 bytesToWrite() const; -#endif // USE_QT4 /** * Checks whether there is enough data in the buffer to read a line diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp index 9d4d14661..d4f53fc39 100644 --- a/tdecore/kcalendarsystemgregorian.cpp +++ b/tdecore/kcalendarsystemgregorian.cpp @@ -58,7 +58,7 @@ int KCalendarSystemGregorian::weeksInYear(int year) const // If the last day of the year is in the first week, we have to check the // week before if ( temp.weekNumber() == 1 ) - temp = TQT_TQDATE_OBJECT(temp.addDays(-7)); + temp = temp.addDays(-7); return temp.weekNumber(); } @@ -221,17 +221,17 @@ bool KCalendarSystemGregorian::setYMD(TQDate & date, int y, int m, int d) const TQDate KCalendarSystemGregorian::addYears(const TQDate & date, int nyears) const { - return TQT_TQDATE_OBJECT(date.addYears(nyears)); + return date.addYears(nyears); } TQDate KCalendarSystemGregorian::addMonths(const TQDate & date, int nmonths) const { - return TQT_TQDATE_OBJECT(date.addMonths(nmonths)); + return date.addMonths(nmonths); } TQDate KCalendarSystemGregorian::addDays(const TQDate & date, int ndays) const { - return TQT_TQDATE_OBJECT(date.addDays(ndays)); + return date.addDays(ndays); } TQString KCalendarSystemGregorian::weekDayName(int col, bool shortName) const diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp index 2f0aa111a..e0737c5b3 100644 --- a/tdecore/kcalendarsystemhebrew.cpp +++ b/tdecore/kcalendarsystemhebrew.cpp @@ -306,7 +306,7 @@ int KCalendarSystemHebrew::weeksInYear(int year) const int nWeekNumber = weekNumber(temp); if(nWeekNumber == 1) // last week belongs to next year { - temp = TQT_TQDATE_OBJECT(temp.addDays(-7)); + temp = temp.addDays(-7); nWeekNumber = weekNumber(temp); } @@ -574,7 +574,7 @@ int KCalendarSystemHebrew::weekDayOfPray() const // Ok TQDate KCalendarSystemHebrew::addDays( const TQDate & date, int ndays ) const { - return TQT_TQDATE_OBJECT(date.addDays( ndays )); + return date.addDays( ndays ); } // Ok diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp index cc66805e0..ef94b590f 100644 --- a/tdecore/kcalendarsystemhijri.cpp +++ b/tdecore/kcalendarsystemhijri.cpp @@ -539,7 +539,7 @@ int KCalendarSystemHijri::weekDayOfPray() const TQDate KCalendarSystemHijri::addDays( const TQDate & date, int ndays ) const { - return TQT_TQDATE_OBJECT(date.addDays( ndays )); + return date.addDays( ndays ); } TQDate KCalendarSystemHijri::addMonths( const TQDate & date, int nmonths ) const diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp index 631693e45..3c71ca442 100644 --- a/tdecore/kcalendarsystemjalali.cpp +++ b/tdecore/kcalendarsystemjalali.cpp @@ -304,7 +304,7 @@ TQDate KCalendarSystemJalali::addMonths( const TQDate & date, int nmonths ) cons TQDate KCalendarSystemJalali::addDays( const TQDate & date, int ndays ) const { - return TQT_TQDATE_OBJECT(date.addDays( ndays )); + return date.addDays( ndays ); } int KCalendarSystemJalali::monthsInYear( const TQDate & date ) const diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index 3483039a7..47053223f 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -372,13 +372,13 @@ TQChar KCharsets::fromEntity(const TQString &str) TQChar res = TQChar::null; int pos = 0; - if(str[pos] == (QChar)'&') pos++; + if(str[pos] == (TQChar)'&') pos++; // Check for '�' or '�' sequence - if (str[pos] == (QChar)'#' && str.length()-pos > 1) { + if (str[pos] == (TQChar)'#' && str.length()-pos > 1) { bool ok; pos++; - if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') { + if (str[pos] == (TQChar)'x' || str[pos] == (TQChar)'X') { pos++; // '�', hexadeciaml character reference TQString tmp(str.unicode()+pos, str.length()-pos); @@ -412,7 +412,7 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len) { TQString tmp = str.left(len); TQChar res = fromEntity(tmp); - if( res != (QChar)TQChar::null ) return res; + if( res != (TQChar)TQChar::null ) return res; len--; } return TQChar::null; @@ -437,13 +437,13 @@ TQString KCharsets::resolveEntities( const TQString &input ) for ( ; p < end; ++p ) { const TQChar ch = *p; - if ( ch == (QChar)'&' ) { + if ( ch == (TQChar)'&' ) { ampersand = p; scanForSemicolon = true; continue; } - if ( ch != (QChar)';' || scanForSemicolon == false ) + if ( ch != (TQChar)';' || scanForSemicolon == false ) continue; assert( ampersand ); diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp index 306591e67..93ed7f86a 100644 --- a/tdecore/kcheckaccelerators.cpp +++ b/tdecore/kcheckaccelerators.cpp @@ -89,7 +89,7 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent ) } alwaysShow = TDEGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false ); autoCheck = TDEGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true ); - connect( &autoCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( autoCheckSlot())); + connect( &autoCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( autoCheckSlot())); } bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e) @@ -99,11 +99,11 @@ bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e) switch ( e->type() ) { // just simplify debuggin case TQEvent::Accel: - if ( key && (TQT_TQKEYEVENT(e)->key() == key) ) { + if ( key && (static_cast<TQKeyEvent*>(e)->key() == key) ) { block = true; checkAccelerators( false ); block = false; - TQT_TQKEYEVENT(e)->accept(); + static_cast<TQKeyEvent*>(e)->accept(); return true; } break; @@ -153,11 +153,11 @@ void KCheckAccelerators::createDialog(TQWidget *actWin, bool automatic) TQCheckBox* disableAutoCheck = NULL; if( automatic ) { disableAutoCheck = new TQCheckBox( i18n( "&Disable automatic checking" ), drklash ); - connect(disableAutoCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableCheck(bool))); + connect(disableAutoCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableCheck(bool))); } TQPushButton* btnClose = new TQPushButton( i18n( "&Close" ), drklash ); btnClose->setDefault( true ); - connect( btnClose, TQT_SIGNAL( clicked() ), drklash, TQT_SLOT( close() ) ); + connect( btnClose, TQ_SIGNAL( clicked() ), drklash, TQ_SLOT( close() ) ); if (disableAutoCheck) disableAutoCheck->setFocus(); else @@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on) void KCheckAccelerators::checkAccelerators( bool automatic ) { - TQWidget* actWin = TQT_TQWIDGET(tqApp->activeWindow()); + TQWidget* actWin = tqApp->activeWindow(); if ( !actWin ) return; diff --git a/tdecore/kcheckaccelerators.h b/tdecore/kcheckaccelerators.h index 00adf4fd1..d16286c26 100644 --- a/tdecore/kcheckaccelerators.h +++ b/tdecore/kcheckaccelerators.h @@ -65,7 +65,7 @@ class TQTextView; */ class TDECORE_EXPORT KCheckAccelerators : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a KCheckAccelerators instance for the given object. diff --git a/tdecore/kckey.cpp b/tdecore/kckey.cpp index 0feea1d49..95232f0d7 100644 --- a/tdecore/kckey.cpp +++ b/tdecore/kckey.cpp @@ -76,7 +76,7 @@ const KKeys kde_KKEYS[NB_KEYS] = { { "Direction_L", 0x1059 }, { "Direction_R", 0x1060 }, { "Space", 0x20 }, // translated - { "Any", Qt::Key_Space }, + { "Any", TQt::Key_Space }, { "Exclam", 0x21 }, // translated { "QuoteDbl", 0x22 }, { "NumberSign", 0x23 }, // translated diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 8ab23cccc..3aa6b9fa7 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -97,7 +97,7 @@ bool TDEClipboardSynchronizer::s_blocked = false; TDEClipboardSynchronizer * TDEClipboardSynchronizer::self() { if ( !s_self ) - s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); + s_self = new TDEClipboardSynchronizer( kapp, "KDE Clipboard" ); return s_self; } @@ -126,11 +126,11 @@ void TDEClipboardSynchronizer::setupSignals() TQClipboard *clip = TQApplication::clipboard(); disconnect( clip, NULL, this, NULL ); if( s_sync ) - connect( clip, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( clip, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); if( s_reverse_sync ) - connect( clip, TQT_SIGNAL( dataChanged() ), - TQT_SLOT( slotClipboardChanged() )); + connect( clip, TQ_SIGNAL( dataChanged() ), + TQ_SLOT( slotClipboardChanged() )); } void TDEClipboardSynchronizer::slotSelectionChanged() diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h index 8ed8dcc91..df45027f1 100644 --- a/tdecore/kclipboard.h +++ b/tdecore/kclipboard.h @@ -35,7 +35,7 @@ */ class TDECORE_EXPORT TDEClipboardSynchronizer : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Systray widget for manipulating the clipboard. */ diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h index 2bce648fb..80f61d8ad 100644 --- a/tdecore/kcompletion.h +++ b/tdecore/kcompletion.h @@ -135,7 +135,7 @@ class TDECORE_EXPORT TDECompletion : public TQObject TQ_PROPERTY( CompOrder order READ order WRITE setOrder ) TQ_PROPERTY( bool ignoreCase READ ignoreCase WRITE setIgnoreCase ) TQ_PROPERTY( TQStringList items READ items WRITE setItems ) - Q_OBJECT + TQ_OBJECT public: /** @@ -873,7 +873,7 @@ public: * the key-binding simply simply @p sum up the values of the * modifier and the actual key. For example, to use CTRL+E as * a key binding for one of the items, you would simply supply - * @p "Qt::CtrlButton + Qt::Key_E" as the second argument to this + * @p "TQt::CtrlButton + TQt::Key_E" as the second argument to this * function. * * @param item the feature whose key-binding needs to be set: diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp index 6fb5e8ff7..163b10d36 100644 --- a/tdecore/kcrash.cpp +++ b/tdecore/kcrash.cpp @@ -53,7 +53,7 @@ #include <../tdeinit/tdelauncher_cmds.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <X11/Xlib.h> #endif @@ -160,14 +160,14 @@ TDECrash::defaultCrashHandler (int sig) // argument 0 has to be drkonqi argv[i++] = "drkonqi"; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // start up on the correct display argv[i++] = "-display"; if ( tqt_xdisplay() ) argv[i++] = XDisplayString(tqt_xdisplay()); else argv[i++] = getenv("DISPLAY"); -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) // start up on the correct display argv[i++] = "-display"; argv[i++] = getenv("QWS_DISPLAY"); @@ -351,9 +351,9 @@ static char *getDisplay() /* don't test for a value from tqglobal.h but instead distinguish Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS - on the commandline (which in tqglobal.h however triggers Q_WS_QWS, + on the commandline (which in tqglobal.h however triggers TQ_WS_QWS, but we don't want to include that here) (Simon) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 */ #if !defined(QWS) display = getenv("DISPLAY"); diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index afd925190..22843da4e 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -333,7 +333,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char break; } TQFile aOutputFile( kDebug_data->config->readPathEntry(aKey, "kdebug.dbg") ); - aOutputFile.open( (TQIODevice_OpenModeFlag)((int)IO_WriteOnly | (int)IO_Append | (int)IO_Raw) ); + aOutputFile.open( IO_WriteOnly | IO_Append | IO_Raw ); aOutputFile.writeBlock( buf, strlen( buf ) ); aOutputFile.close(); break; @@ -343,7 +343,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char // Since we are in tdecore here, we cannot use KMsgBox and use // TQMessageBox instead if ( !kDebug_data->aAreaName.isEmpty() ) - aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) ); + aCaption += TQString("(%1)").arg( TQString(kDebug_data->aAreaName) ); TQMessageBox::warning( 0L, aCaption, data, i18n("&OK") ); break; } @@ -432,7 +432,7 @@ kdbgstream& kdbgstream::operator<< (TQChar ch) output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0'); else { output += ch; - if (ch == QChar('\n')) flush(); + if (ch == TQChar('\n')) flush(); } return *this; } @@ -471,7 +471,7 @@ kdbgstream& kdbgstream::operator<< (const TQWidget* widget) return *this; } output += string; - if (output.at(output.length() -1 ) == QChar('\n')) + if (output.at(output.length() -1 ) == TQChar('\n')) { flush(); } @@ -759,7 +759,13 @@ TQString formatBacktrace(void *addr) { // NOTE: if somebody would compile for some non-linux-glibc platform // check if dladdr function is avalible there Dl_info info; - dladdr(func.addr, &info); // obtain information about the function. + + // obtain information about the function. +#ifdef Q_OS_SOLARIS + dladdr((void *)func.addr, &info); +#else + dladdr(func.addr, &info); +#endif /* Solaris */ func.fileName = info.dli_fname; func.base = info.dli_fbase; @@ -816,7 +822,7 @@ TQString kdBacktrace(int levels) if (levels) { for (int i = 0; i < levels; ++i) { - rv += QString().sprintf("#%-2d ", i); + rv += TQString().sprintf("#%-2d ", i); rv += formatBacktrace(trace[i]); rv += '\n'; } diff --git a/tdecore/kdemacros.h.cmake b/tdecore/kdemacros.h.cmake index 083cc8c8d..683538f9d 100644 --- a/tdecore/kdemacros.h.cmake +++ b/tdecore/kdemacros.h.cmake @@ -41,7 +41,7 @@ #ifdef __KDE_HAVE_GCC_VISIBILITY #define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) #define KDE_EXPORT __attribute__ ((visibility("default"))) -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) #define KDE_NO_EXPORT #define KDE_EXPORT __declspec(dllexport) #else @@ -54,7 +54,7 @@ * cope with symbol visibility. */ #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \ - TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \ + TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) diff --git a/tdecore/kdemacros.h.in b/tdecore/kdemacros.h.in index 9566c386b..d72efe36c 100644 --- a/tdecore/kdemacros.h.in +++ b/tdecore/kdemacros.h.in @@ -40,7 +40,7 @@ #ifdef __KDE_HAVE_GCC_VISIBILITY #define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) #define KDE_EXPORT __attribute__ ((visibility("default"))) -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) #define KDE_NO_EXPORT #define KDE_EXPORT __declspec(dllexport) #else @@ -53,7 +53,7 @@ * cope with symbol visibility. */ #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \ - TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \ + TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h index cfdc5488c..12cf85225 100644 --- a/tdecore/kdesktopfile.h +++ b/tdecore/kdesktopfile.h @@ -33,7 +33,7 @@ class KDesktopFilePrivate; */ class TDECORE_EXPORT KDesktopFile : public TDEConfig { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index b9a6efb10..f78464287 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -222,12 +222,7 @@ KExtendedSocket::~KExtendedSocket() delete d; } -#ifdef USE_QT3 void KExtendedSocket::reset() -#endif // USE_QT3 -#ifdef USE_QT4 -bool KExtendedSocket::reset() -#endif // USE_QT4 { closeNow(); release(); @@ -644,7 +639,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->qsnIn == NULL) { d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); d->qsnIn->setEnabled(true); } @@ -692,7 +687,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->qsnOut == NULL) { d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); // if the class is being created now, there's nothing to write yet // so socketActivityWrite() will get called once and disable // the notifier @@ -707,7 +702,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->emitWrite && d->qsnOut == NULL) { d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); } return true; @@ -788,8 +783,8 @@ int KExtendedSocket::startAsyncLookup() d->resRemote.setFlags(flags); d->resRemote.setFamily(familyMask); d->resRemote.setSocketType(socktype); - TQObject::connect(&d->resRemote, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(&d->resRemote, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(dnsResultsReady())); if (!d->resRemote.start()) { @@ -805,8 +800,8 @@ int KExtendedSocket::startAsyncLookup() d->resLocal.setFlags(flags); d->resLocal.setFamily(familyMask); d->resLocal.setSocketType(socktype); - TQObject::connect(&d->resLocal, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(&d->resLocal, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(dnsResultsReady())); if (!d->resLocal.start()) { @@ -901,7 +896,7 @@ int KExtendedSocket::listen(int N) { d->status = listening; d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); } return retval == -1 ? -1 : 0; } @@ -1223,7 +1218,7 @@ int KExtendedSocket::startAsyncConnect() // signal lookupFinished to do connection if (d->status < lookupDone) { - TQObject::connect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot())); + TQObject::connect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot())); if (d->status < lookupInProgress) return startAsyncLookup(); else @@ -1233,7 +1228,7 @@ int KExtendedSocket::startAsyncConnect() // here we have d->status >= lookupDone and <= connecting // we can do our connection d->status = connecting; - TQGuardedPtr<TQObject> p = TQT_TQOBJECT(this); + TQGuardedPtr<TQObject> p = this; connectionEvent(); if (!p) return -1; // We have been deleted. @@ -1262,7 +1257,7 @@ void KExtendedSocket::cancelAsyncConnect() d->status = lookupDone; } -bool KExtendedSocket::open(TQ_OpenMode mode) +bool KExtendedSocket::open(int mode) { if (mode != IO_Raw | IO_ReadWrite) return false; // invalid open mode @@ -1436,7 +1431,7 @@ void KExtendedSocket::flush() } -TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen) { cleanError(); if (d->status < connected || d->flags & passiveSocket) @@ -1481,7 +1476,7 @@ TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG KExtendedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQ_LONG KExtendedSocket::writeBlock(const char *data, TQ_ULONG len) { cleanError(); if (d->status < connected || d->status >= closing || d->flags & passiveSocket) @@ -1557,12 +1552,7 @@ int KExtendedSocket::unreadBlock(const char *, uint) return -1; } -#ifdef USE_QT3 int KExtendedSocket::bytesAvailable() const -#endif // USE_QT3 -#ifdef USE_QT4 -qint64 KExtendedSocket::bytesAvailable() const -#endif // USE_QT4 { if (d->status < connected || d->flags & passiveSocket) return -2; @@ -1606,7 +1596,7 @@ int KExtendedSocket::getch() { unsigned char c; int retval; - retval = tqreadBlock((char*)&c, sizeof(c)); + retval = readBlock((char*)&c, sizeof(c)); if (retval < 0) return retval; @@ -1616,7 +1606,7 @@ int KExtendedSocket::getch() int KExtendedSocket::putch(int ch) { unsigned char c = (char)ch; - return tqwriteBlock((char*)&c, sizeof(c)); + return writeBlock((char*)&c, sizeof(c)); } // sets the emission of the readyRead signal @@ -1919,9 +1909,9 @@ void KExtendedSocket::connectionEvent() // error here is either EWOULDBLOCK or EINPROGRESS // so, it is a good condition d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); // ok, let the Qt event loop do the selecting for us return; @@ -1979,7 +1969,7 @@ void KExtendedSocket::dnsResultsReady() void KExtendedSocket::startAsyncConnectSlot() { - TQObject::disconnect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot())); + TQObject::disconnect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot())); if (d->status == lookupDone) startAsyncConnect(); diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h index fad502c04..095cc7a43 100644 --- a/tdecore/kextsock.h +++ b/tdecore/kextsock.h @@ -22,10 +22,6 @@ #include "tdelibs_export.h" -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX #include <sys/time.h> @@ -44,10 +40,10 @@ class KAddressInfo; /* our abstraction of it */ class TQSocketNotifier; /* - * This is extending QIODevice's error codes + * This is extending TQIODevice's error codes * * According to tqiodevice.h, the last error is IO_UnspecifiedError - * These errors will never occur in functions declared in QIODevice + * These errors will never occur in functions declared in TQIODevice * (except open, but you shouldn't call open) */ #define IO_ListenError (IO_UnspecifiedError+1) @@ -67,7 +63,7 @@ class KExtendedSocketPrivate; * only difference is that the passiveSocket flag must be passed either to * the constructor or to setSocketFlags(). If passiveSocket is used, the class will * enable functions listen() and accept() and related signals, and will - * also disable tqreadBlock() and tqwriteBlock(). + * also disable readBlock() and writeBlock(). * * To create a Unix socket, one would pass flag unixSocket to the constructor * or setSocketFlags(). The hostname and service/port can be set to whatever is @@ -92,9 +88,9 @@ class KExtendedSocketPrivate; * @author Thiago Macieira <thiago.macieira@kdemail.net> * @short an extended socket */ -class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice +class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public TQIODevice { - Q_OBJECT + TQ_OBJECT public: @@ -211,12 +207,7 @@ public: * freeing any related resources still being kept. * @since 3.1 */ -#ifdef USE_QT3 void reset(); -#endif // USE_QT3 -#ifdef USE_QT4 - bool reset(); -#endif // USE_QT4 /* * --- status, flags and internal variables --- * @@ -627,7 +618,7 @@ public: * @return true if successful, false when an error occurred or the most was * not correct */ - virtual bool open(TQ_OpenMode mode = (TQ_OpenMode)(IO_Raw | IO_ReadWrite)); + virtual bool open(int mode = (int)(IO_Raw | IO_ReadWrite)); /** * Closes the socket. If we have data still in the write buffer yet to be @@ -677,7 +668,7 @@ public: * ready to receive data, it will block, unless this is a non-blocking socket. * * This function does not touch the read buffer. You can empty it by calling - * tqreadBlock() with a null destination buffer. + * readBlock() with a null destination buffer. */ virtual void flush(); @@ -685,12 +676,7 @@ public: * Returns length of this socket. This call is not supported on sockets. * @return the length of this socket, or 0 if unsupported */ -#ifdef USE_QT3 virtual inline TQ_ULONG size() const -#endif // USE_QT3 -#ifdef USE_QT4 - virtual inline qint64 size() const -#endif // USE_QT4 { return 0; } /** @@ -745,7 +731,7 @@ public: * This function returns 0, if the function detected end-of-file condition * (socket was closed) */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * Writes a block of data to the socket. @@ -770,7 +756,7 @@ public: * The return value might be less than @p len if the output buffers cannot * accommodate that many bytes and -1 in the case of an errro. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * Peeks at a block of data from the socket. @@ -805,12 +791,7 @@ public: * @return The number of available bytes, or -1 on error or -2 if this call is invalid * in the current state. */ -#ifdef USE_QT3 virtual int bytesAvailable() const; -#endif // USE_QT3 -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif // USE_QT4 /** * Waits @p msec milliseconds for more data to be available (use 0 to diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h index e229e73fd..e6722b8dd 100644 --- a/tdecore/kgenericfactory.h +++ b/tdecore/kgenericfactory.h @@ -190,8 +190,8 @@ protected: const char *className, const TQStringList &args ) { KGenericFactoryBase<Product>::initializeMessageCatalogue(); - return TQT_TQOBJECT((KDEPrivate::ConcreteFactory<Product, ParentType> - ::create( 0, 0, parent, name, className, args ))); + return (KDEPrivate::ConcreteFactory<Product, ParentType> + ::create( 0, 0, parent, name, className, args )); } }; diff --git a/tdecore/kgenericfactory.tcc b/tdecore/kgenericfactory.tcc index e7ba1c730..dda6ec487 100644 --- a/tdecore/kgenericfactory.tcc +++ b/tdecore/kgenericfactory.tcc @@ -150,7 +150,7 @@ namespace KDEPrivate const TQStringList &args, Type2Type<TQWidget> ) { - WidgetParentType *p = dynamic_cast<WidgetParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) ); + WidgetParentType *p = dynamic_cast<WidgetParentType *>( parent ); if ( parent && !p ) return 0; return new Product( p, name, args ); @@ -160,7 +160,7 @@ namespace KDEPrivate TQObject *parent, const char *name, const TQStringList &args, Type2Type<TQObject> ) { - ParentType *p = dynamic_cast<ParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) ); + ParentType *p = dynamic_cast<ParentType *>( parent ); if ( parent && !p ) return 0; return new Product( p, name, args ); @@ -179,9 +179,9 @@ namespace KDEPrivate const char *className, const TQStringList &args ) { - return static_cast<TQObject*>(static_cast<QObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName, - parent, name, className, - args ))); + return static_cast<TQObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName, + parent, name, className, + args )); } }; diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp index 746721e40..5da0093a2 100644 --- a/tdecore/kglobalaccel.cpp +++ b/tdecore/kglobalaccel.cpp @@ -18,11 +18,11 @@ */ #include "kglobalaccel.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include "kglobalaccel_x11.h" -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) #include "kglobalaccel_win.h" -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) #include "kglobalaccel_mac.h" #else #include "kglobalaccel_emb.h" diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h index a8ed8a955..22dedd513 100644 --- a/tdecore/kglobalaccel.h +++ b/tdecore/kglobalaccel.h @@ -44,13 +44,13 @@ class TDEGlobalAccelPrivate; */ class TDECORE_EXPORT TDEGlobalAccel : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new TDEGlobalAccel object with the given pParent and * psName. - * @param pParent the parent of the QObject - * @param psName the name of the QObject + * @param pParent the parent of the TQObject + * @param psName the name of the TQObject */ TDEGlobalAccel( TQObject* pParent, const char* psName = 0 ); virtual ~TDEGlobalAccel(); @@ -76,7 +76,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * insert( "Do Something", i18n("Do Something"), * i18n("This action allows you to do something really great with this program to " * "the currently open document."), - * ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQT_SLOT(slotDoSomething()) ); + * ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQ_SLOT(slotDoSomething()) ); *\endcode * * @param sAction The internal name of the action. diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index 09c216b99..7b49ecfe4 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/kglobalaccel_win.cpp @@ -20,7 +20,7 @@ #include "config.h" #include <tqwindowdefs.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "kglobalaccel_win.h" #include "kglobalaccel.h" @@ -161,7 +161,7 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE bool failed = false; if( bGrab ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 failed = handler.error( true ); // sync now #endif // If grab failed, then ungrab any grabs that could possibly succeed @@ -283,9 +283,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } @@ -342,4 +342,4 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction ) #include "kglobalaccel_win.moc" -#endif // !Q_WS_WIN +#endif // !TQ_WS_WIN diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h index e60fed8ee..45943b071 100644 --- a/tdecore/kglobalaccel_win.h +++ b/tdecore/kglobalaccel_win.h @@ -33,7 +33,7 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase { friend class TDEGlobalAccel; - Q_OBJECT + TQ_OBJECT public: TDEGlobalAccelPrivate(); virtual ~TDEGlobalAccelPrivate(); diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index 4ee2770ba..d76b8cdac 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -20,7 +20,7 @@ #include "config.h" #include <tqwindowdefs.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include "kglobalaccel_x11.h" #include "kglobalaccel.h" @@ -35,7 +35,7 @@ #include <kdebug.h> #include <kkeynative.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <kxerrorhandler.h> #endif @@ -90,7 +90,7 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; kapp->installX11EventFilter( this ); - connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int))); + connect(kapp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int))); } TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() @@ -197,7 +197,7 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE return false; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler( XGrabErrorHandler ); #endif // We'll have to grab 8 key modifier combinations in order to cover all @@ -227,7 +227,7 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE bool failed = false; if( bGrab ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 failed = handler.error( true ); // sync now #endif // If grab failed, then ungrab any grabs that could possibly succeed @@ -313,9 +313,9 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } @@ -392,9 +392,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } @@ -423,16 +423,16 @@ void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequenc int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { TQUObject o[2]; - static_TQUType_int.set(o+1,n); + static_QUType_int.set(o+1,n); const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { TQUObject o[4]; - static_TQUType_TQString.set(o+1,pAction->name()); - static_TQUType_TQString.set(o+2,pAction->label()); - static_TQUType_ptr.set(o+3,&seq); + static_QUType_TQString.set(o+1,pAction->name()); + static_QUType_TQString.set(o+2,pAction->label()); + static_QUType_ptr.set(o+3,&seq); const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else { @@ -451,4 +451,4 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction ) #include "kglobalaccel_x11.moc" -#endif // !Q_WS_X11 +#endif // !TQ_WS_X11 diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h index b22363926..1502d89cb 100644 --- a/tdecore/kglobalaccel_x11.h +++ b/tdecore/kglobalaccel_x11.h @@ -33,7 +33,7 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase { friend class TDEGlobalAccel; - Q_OBJECT + TQ_OBJECT public: TDEGlobalAccelPrivate(); virtual ~TDEGlobalAccelPrivate(); diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp index f5b38b75a..a5cb4bcae 100644 --- a/tdecore/kiconeffect.cpp +++ b/tdecore/kiconeffect.cpp @@ -35,7 +35,7 @@ #include <kicontheme.h> #include "kiconeffect.h" -#if defined(Q_WS_WIN) || defined(Q_WS_MACX) +#if defined(TQ_WS_WIN) || defined(TQ_WS_MACX) static bool tqt_use_xrender=true; static bool tqt_has_xft=true; #else @@ -287,7 +287,7 @@ void TDEIconEffect::toGray(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, val, alpha, i; for (i=0; i<pixels; i++) { @@ -309,7 +309,7 @@ void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, val, alpha, i; float rcol = col.red(), gcol = col.green(), bcol = col.blue(); for (i=0; i<pixels; i++) @@ -348,7 +348,7 @@ void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value) void TDEIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor &white, float value) { int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, alpha, i; int rw = white.red(), gw = white.green(), bw = white.blue(); int rb = black.red(), gb = black.green(), bb = black.blue(); @@ -400,7 +400,7 @@ void TDEIconEffect::deSaturate(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); TQColor color; int h, s, v, i; for (i=0; i<pixels; i++) @@ -418,7 +418,7 @@ void TDEIconEffect::toGamma(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); TQColor color; int i, rval, gval, bval; float gamma; @@ -462,7 +462,7 @@ void TDEIconEffect::semiTransparent(TQImage &img) else for (y=0; y<height; y++) { - QRgb *line = (QRgb *) img.scanLine(y); + TQRgb *line = (TQRgb *) img.scanLine(y); for (x=(y%2); x<width; x+=2) line[x] &= 0x00ffffff; } @@ -530,8 +530,8 @@ void TDEIconEffect::semiTransparent(TQPixmap &pix) for (int y=0; y<img.height(); y++) { - QRgb *line = (QRgb *) img.scanLine(y); - QRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa; + TQRgb *line = (TQRgb *) img.scanLine(y); + TQRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa; for (int x=0; x<(img.width()+31)/32; x++) line[x] &= pattern; } @@ -557,11 +557,11 @@ TQImage TDEIconEffect::doublePixels(TQImage src) const int x, y; if (src.depth() == 32) { - QRgb *l1, *l2; + TQRgb *l1, *l2; for (y=0; y<h; y++) { - l1 = (QRgb *) src.scanLine(y); - l2 = (QRgb *) dst.scanLine(y*2); + l1 = (TQRgb *) src.scanLine(y); + l2 = (TQRgb *) dst.scanLine(y*2); for (x=0; x<w; x++) { l2[x*2] = l2[x*2+1] = l1[x]; @@ -669,14 +669,14 @@ void TDEIconEffect::overlay(TQImage &src, TQImage &overlay) if (src.depth() == 32) { - QRgb *oline, *sline; + TQRgb *oline, *sline; int r1, g1, b1, a1; int r2, g2, b2, a2; for (i=0; i<src.height(); i++) { - oline = (QRgb *) overlay.scanLine(i); - sline = (QRgb *) src.scanLine(i); + oline = (TQRgb *) overlay.scanLine(i); + sline = (TQRgb *) src.scanLine(i); for (j=0; j<src.width(); j++) { @@ -743,7 +743,7 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect) TQPainter p(widget); // Use NotROP to avoid having to repaint the pixmap each time. - p.setPen(TQPen(Qt::black, 2, Qt::DotLine)); + p.setPen(TQPen(TQt::black, 2, TQt::DotLine)); p.setRasterOp(TQt::NotROP); // The spacing between the rects we draw. diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index 8665b9ce2..f6e267a86 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -157,7 +157,7 @@ TDEIconLoader::TDEIconLoader(const TQString& _appname, TDEStandardDirs *_dirs) if (kapp) { kapp->addKipcEventMask(KIPC::IconChanged); - TQObject::connect(kapp, TQT_SIGNAL(updateIconLoaders()), d, TQT_SLOT(reconfigure())); + TQObject::connect(kapp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure())); } init( _appname, _dirs ); @@ -812,7 +812,7 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in *img = img->convertDepth(32); for (int y = 0; y < img->height(); y++) { - QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y)); + TQRgb *line = reinterpret_cast<TQRgb *>(img->scanLine(y)); for (int x = 0; x < img->width(); x++) line[x] = (line[x] & 0x00ffffff) | (TQMIN(0x80, tqAlpha(line[x])) << 24); } @@ -851,8 +851,8 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in line < favIcon.height(); ++line ) { - QRgb* fpos = reinterpret_cast< QRgb* >( favIcon.scanLine( line )); - QRgb* ipos = reinterpret_cast< QRgb* >( img->scanLine( line + y )) + x; + TQRgb* fpos = reinterpret_cast< TQRgb* >( favIcon.scanLine( line )); + TQRgb* ipos = reinterpret_cast< TQRgb* >( img->scanLine( line + y )) + x; for( int i = 0; i < favIcon.width(); ++i, ++fpos, ++ipos ) diff --git a/tdecore/kiconloader_p.h b/tdecore/kiconloader_p.h index 1e5d5f75c..dacf40ade 100644 --- a/tdecore/kiconloader_p.h +++ b/tdecore/kiconloader_p.h @@ -35,7 +35,7 @@ public: class TDEIconLoaderPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQStringList mThemesInTree; TDEIconGroup *mpGroups; diff --git a/tdecore/kidna.cpp b/tdecore/kidna.cpp index ca41fecdf..e8df061ec 100644 --- a/tdecore/kidna.cpp +++ b/tdecore/kidna.cpp @@ -21,18 +21,18 @@ #include "kidna.h" -#ifndef Q_WS_WIN //TODO kresolver not ported +#ifndef TQ_WS_WIN //TODO kresolver not ported #include "kresolver.h" #endif #include <kdebug.h> -#ifndef Q_WS_WIN //TODO knetwork not ported +#ifndef TQ_WS_WIN //TODO knetwork not ported using namespace KNetwork; #endif TQCString KIDNA::toAsciiCString(const TQString &idna) { -#ifndef Q_WS_WIN //TODO kresolver not ported +#ifndef TQ_WS_WIN //TODO kresolver not ported return KResolver::domainToAscii(idna); #else return TQCString(); @@ -41,7 +41,7 @@ TQCString KIDNA::toAsciiCString(const TQString &idna) TQString KIDNA::toAscii(const TQString &idna) { - if (idna.length() && (idna[0] == (QChar)'.')) + if (idna.length() && (idna[0] == (TQChar)'.')) { TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1))); if (host.isEmpty()) @@ -53,8 +53,8 @@ TQString KIDNA::toAscii(const TQString &idna) TQString KIDNA::toUnicode(const TQString &idna) { -#ifndef Q_WS_WIN //TODO kresolver not ported - if (idna.length() && (idna[0] == (QChar)'.')) +#ifndef TQ_WS_WIN //TODO kresolver not ported + if (idna.length() && (idna[0] == (TQChar)'.')) return idna[0] + KResolver::domainToUnicode(idna.mid(1)); return KResolver::domainToUnicode(idna); #else diff --git a/tdecore/kipc.cpp b/tdecore/kipc.cpp index e6ec7cc4e..8e6da23e2 100644 --- a/tdecore/kipc.cpp +++ b/tdecore/kipc.cpp @@ -30,7 +30,7 @@ #include <tqevent.h> #include <tqwindowdefs.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #include <kxerrorhandler.h> @@ -39,7 +39,7 @@ #include <kipc.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 static long getSimpleProperty(Window w, Atom a) { Atom real_type; @@ -59,7 +59,7 @@ static long getSimpleProperty(Window w, Atom a) void KIPC::sendMessage(Message msg, WId w, int data) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 static Atom a = 0; if (a == 0) a = XInternAtom(tqt_xdisplay(), "KIPC_COMM_ATOM", False); @@ -88,7 +88,7 @@ void KIPC::sendMessage(Message msg, WId w, int data) void KIPC::sendMessageAll(Message msg, int data) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 unsigned int i, nrootwins; Window dw1, dw2, *rootwins = 0; Display *dpy = tqt_xdisplay(); diff --git a/tdecore/kkeynative.h b/tdecore/kkeynative.h index e2774417d..5ff83ccbc 100644 --- a/tdecore/kkeynative.h +++ b/tdecore/kkeynative.h @@ -25,7 +25,7 @@ #include <tdeshortcut.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 typedef union _XEvent XEvent; #endif @@ -45,7 +45,7 @@ class TDECORE_EXPORT KKeyNative */ KKeyNative(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Extracts a new native key from the given xevent. * @param xevent the XEvent that contains the key @@ -76,7 +76,7 @@ class TDECORE_EXPORT KKeyNative */ void clear(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Initializes the native key by extracting the information * from the given xevent. @@ -111,7 +111,7 @@ class TDECORE_EXPORT KKeyNative /** * Returns the qt key code. * @return the qt key code or 0 if there is no key set. - * @see Qt::Key + * @see TQt::Key */ int keyCodeQt() const; @@ -205,7 +205,7 @@ class TDECORE_EXPORT KKeyNative */ static bool keyboardHasWinKey(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the mod flags to test diff --git a/tdecore/kkeynative_x11.cpp b/tdecore/kkeynative_x11.cpp index d5ecb24da..8ab457a26 100644 --- a/tdecore/kkeynative_x11.cpp +++ b/tdecore/kkeynative_x11.cpp @@ -23,7 +23,7 @@ #include <tqnamespace.h> #include <tqwindowdefs.h> -#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) || defined(TQ_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 #include "kkeynative.h" #include "kkeyserver_x11.h" @@ -34,7 +34,7 @@ #include <kdebug.h> #include <tdelocale.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define XK_MISCELLANY #define XK_XKB_KEYS #include <X11/X.h> @@ -56,7 +56,7 @@ static KKeyNative* gx_pkey = 0; KKeyNative::KKeyNative() { clear(); } KKeyNative::KKeyNative( const KKey& key ) { init( key ); } KKeyNative::KKeyNative( const KKeyNative& key ) { init( key ); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KKeyNative::KKeyNative( const XEvent* pEvent ) { init( pEvent ); } #endif @@ -77,7 +77,7 @@ void KKeyNative::clear() m_sym = 0; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool KKeyNative::init( const XEvent* pEvent ) { KeySym keySym; @@ -91,11 +91,11 @@ bool KKeyNative::init( const XEvent* pEvent ) bool KKeyNative::init( const KKey& key ) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_sym = key.sym(); m_code = m_sym; //key.keyCodeQt(); m_mod = key.m_mod; -#elif !defined(Q_WS_WIN) && !defined(Q_WS_MACX) +#elif !defined(TQ_WS_WIN) && !defined(TQ_WS_MACX) // Get any extra mods required by the sym. // E.g., XK_Plus requires SHIFT on the en layout. m_sym = key.sym(); @@ -167,7 +167,7 @@ KKeyNative& KKeyNative::null() KKey KKeyNative::key() const { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return KKey( m_sym, m_mod ); #else uint modSpec; @@ -192,7 +192,7 @@ int KKeyNative::keyCodeQt() const bool KKeyNative::keyboardHasWinKey() { return KKeyServer::keyboardHasWinKey(); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 uint KKeyNative::modX( KKey::ModFlag modFlag ) { return KKeyServer::modX( modFlag ); } uint KKeyNative::accelModMaskX() { return KKeyServer::accelModMaskX(); } uint KKeyNative::modXNumLock() { return KKeyServer::modXNumLock(); } @@ -201,4 +201,4 @@ uint KKeyNative::modXScrollLock() { return KKeyServer::modXScrollLo uint KKeyNative::modXModeSwitch() { return KKeyServer::modXModeSwitch(); } #endif -#endif // Q_WS_X11 +#endif // TQ_WS_X11 diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp index bb46338f4..77ca61763 100644 --- a/tdecore/kkeyserver_x11.cpp +++ b/tdecore/kkeyserver_x11.cpp @@ -25,7 +25,7 @@ #include <tqnamespace.h> #include <tqwindowdefs.h> -#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) || defined(TQ_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 #include "kkeyserver_x11.h" #include "kkeynative.h" @@ -36,7 +36,7 @@ #include <tdeglobal.h> #include <tdelocale.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 # define XK_MISCELLANY # define XK_XKB_KEYS # include <X11/X.h> @@ -48,14 +48,14 @@ #else # include <kckey.h> # define X11_ONLY(arg) -# define XK_ISO_Left_Tab Qt::Key_Backtab -# define XK_BackSpace Qt::Key_Backspace -# define XK_Sys_Req Qt::Key_SysReq -# define XK_Caps_Lock Qt::Key_CapsLock -# define XK_Num_Lock Qt::Key_NumLock -# define XK_Scroll_Lock Qt::Key_ScrollLock -# define XK_Prior Qt::Key_Prior -# define XK_Next Qt::Key_Next +# define XK_ISO_Left_Tab TQt::Key_Backtab +# define XK_BackSpace TQt::Key_Backspace +# define XK_Sys_Req TQt::Key_SysReq +# define XK_Caps_Lock TQt::Key_CapsLock +# define XK_Num_Lock TQt::Key_NumLock +# define XK_Scroll_Lock TQt::Key_ScrollLock +# define XK_Prior TQt::Key_Prior +# define XK_Next TQt::Key_Next #endif namespace KKeyServer @@ -78,7 +78,7 @@ struct ModInfo { KKey::ModFlag mod; int modQt; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 uint modX; #endif const char* psName; @@ -108,9 +108,9 @@ struct TransKey { static ModInfo g_rgModInfo[KKey::MOD_FLAG_COUNT] = { - { KKey::SHIFT, Qt::SHIFT, X11_ONLY(ShiftMask) I18N_NOOP("Shift"), TQString() }, - { KKey::CTRL, Qt::CTRL, X11_ONLY(ControlMask) I18N_NOOP("Ctrl"), TQString() }, - { KKey::ALT, Qt::ALT, X11_ONLY(Mod1Mask) I18N_NOOP("Alt"), TQString() }, + { KKey::SHIFT, TQt::SHIFT, X11_ONLY(ShiftMask) I18N_NOOP("Shift"), TQString() }, + { KKey::CTRL, TQt::CTRL, X11_ONLY(ControlMask) I18N_NOOP("Ctrl"), TQString() }, + { KKey::ALT, TQt::ALT, X11_ONLY(Mod1Mask) I18N_NOOP("Alt"), TQString() }, { KKey::WIN, KKey::QtWIN, X11_ONLY(Mod4Mask) I18N_NOOP("Win"), TQString() } }; @@ -140,7 +140,7 @@ static const SymName g_rgSymNames[] = { { 0, 0 } }; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static SymVariation g_rgSymVariation[] = { { '/', XK_KP_Divide, false }, @@ -156,85 +156,85 @@ static SymVariation g_rgSymVariation[] = // These are the X equivalents to the Qt keycodes 0x1000 - 0x1026 static const TransKey g_rgQtToSymX[] = { - { Qt::Key_Escape, XK_Escape }, - { Qt::Key_Tab, XK_Tab }, - { Qt::Key_Backtab, XK_ISO_Left_Tab }, - { Qt::Key_Backspace, XK_BackSpace }, - { Qt::Key_Return, XK_Return }, - { Qt::Key_Enter, XK_KP_Enter }, - { Qt::Key_Insert, XK_Insert }, - { Qt::Key_Delete, XK_Delete }, - { Qt::Key_Pause, XK_Pause }, + { TQt::Key_Escape, XK_Escape }, + { TQt::Key_Tab, XK_Tab }, + { TQt::Key_Backtab, XK_ISO_Left_Tab }, + { TQt::Key_Backspace, XK_BackSpace }, + { TQt::Key_Return, XK_Return }, + { TQt::Key_Enter, XK_KP_Enter }, + { TQt::Key_Insert, XK_Insert }, + { TQt::Key_Delete, XK_Delete }, + { TQt::Key_Pause, XK_Pause }, #ifdef sun - { Qt::Key_Print, XK_F22 }, + { TQt::Key_Print, XK_F22 }, #else - { Qt::Key_Print, XK_Print }, + { TQt::Key_Print, XK_Print }, #endif - { Qt::Key_SysReq, XK_Sys_Req }, - { Qt::Key_Home, XK_Home }, - { Qt::Key_End, XK_End }, - { Qt::Key_Left, XK_Left }, - { Qt::Key_Up, XK_Up }, - { Qt::Key_Right, XK_Right }, - { Qt::Key_Down, XK_Down }, + { TQt::Key_SysReq, XK_Sys_Req }, + { TQt::Key_Home, XK_Home }, + { TQt::Key_End, XK_End }, + { TQt::Key_Left, XK_Left }, + { TQt::Key_Up, XK_Up }, + { TQt::Key_Right, XK_Right }, + { TQt::Key_Down, XK_Down }, { TQt::Key_Prior, XK_Prior }, { TQt::Key_Next, XK_Next }, - //{ Qt::Key_Shift, 0 }, - //{ Qt::Key_Control, 0 }, - //{ Qt::Key_Meta, 0 }, - //{ Qt::Key_Alt, 0 }, - { Qt::Key_CapsLock, XK_Caps_Lock }, - { Qt::Key_NumLock, XK_Num_Lock }, - { Qt::Key_ScrollLock, XK_Scroll_Lock }, - { Qt::Key_F1, XK_F1 }, - { Qt::Key_F2, XK_F2 }, - { Qt::Key_F3, XK_F3 }, - { Qt::Key_F4, XK_F4 }, - { Qt::Key_F5, XK_F5 }, - { Qt::Key_F6, XK_F6 }, - { Qt::Key_F7, XK_F7 }, - { Qt::Key_F8, XK_F8 }, - { Qt::Key_F9, XK_F9 }, - { Qt::Key_F10, XK_F10 }, - { Qt::Key_F11, XK_F11 }, - { Qt::Key_F12, XK_F12 }, - { Qt::Key_F13, XK_F13 }, - { Qt::Key_F14, XK_F14 }, - { Qt::Key_F15, XK_F15 }, - { Qt::Key_F16, XK_F16 }, - { Qt::Key_F17, XK_F17 }, - { Qt::Key_F18, XK_F18 }, - { Qt::Key_F19, XK_F19 }, - { Qt::Key_F20, XK_F20 }, - { Qt::Key_F21, XK_F21 }, - { Qt::Key_F22, XK_F22 }, - { Qt::Key_F23, XK_F23 }, - { Qt::Key_F24, XK_F24 }, - { Qt::Key_F25, XK_F25 }, - { Qt::Key_F26, XK_F26 }, - { Qt::Key_F27, XK_F27 }, - { Qt::Key_F28, XK_F28 }, - { Qt::Key_F29, XK_F29 }, - { Qt::Key_F30, XK_F30 }, - { Qt::Key_F31, XK_F31 }, - { Qt::Key_F32, XK_F32 }, - { Qt::Key_F33, XK_F33 }, - { Qt::Key_F34, XK_F34 }, - { Qt::Key_F35, XK_F35 }, - { Qt::Key_Super_L, XK_Super_L }, - { Qt::Key_Super_R, XK_Super_R }, - { Qt::Key_Menu, XK_Menu }, - { Qt::Key_Hyper_L, XK_Hyper_L }, - { Qt::Key_Hyper_R, XK_Hyper_R }, - { Qt::Key_Help, XK_Help }, - //{ Qt::Key_Direction_L, XK_Direction_L }, These keys don't exist in X11 - //{ Qt::Key_Direction_R, XK_Direction_R }, + //{ TQt::Key_Shift, 0 }, + //{ TQt::Key_Control, 0 }, + //{ TQt::Key_Meta, 0 }, + //{ TQt::Key_Alt, 0 }, + { TQt::Key_CapsLock, XK_Caps_Lock }, + { TQt::Key_NumLock, XK_Num_Lock }, + { TQt::Key_ScrollLock, XK_Scroll_Lock }, + { TQt::Key_F1, XK_F1 }, + { TQt::Key_F2, XK_F2 }, + { TQt::Key_F3, XK_F3 }, + { TQt::Key_F4, XK_F4 }, + { TQt::Key_F5, XK_F5 }, + { TQt::Key_F6, XK_F6 }, + { TQt::Key_F7, XK_F7 }, + { TQt::Key_F8, XK_F8 }, + { TQt::Key_F9, XK_F9 }, + { TQt::Key_F10, XK_F10 }, + { TQt::Key_F11, XK_F11 }, + { TQt::Key_F12, XK_F12 }, + { TQt::Key_F13, XK_F13 }, + { TQt::Key_F14, XK_F14 }, + { TQt::Key_F15, XK_F15 }, + { TQt::Key_F16, XK_F16 }, + { TQt::Key_F17, XK_F17 }, + { TQt::Key_F18, XK_F18 }, + { TQt::Key_F19, XK_F19 }, + { TQt::Key_F20, XK_F20 }, + { TQt::Key_F21, XK_F21 }, + { TQt::Key_F22, XK_F22 }, + { TQt::Key_F23, XK_F23 }, + { TQt::Key_F24, XK_F24 }, + { TQt::Key_F25, XK_F25 }, + { TQt::Key_F26, XK_F26 }, + { TQt::Key_F27, XK_F27 }, + { TQt::Key_F28, XK_F28 }, + { TQt::Key_F29, XK_F29 }, + { TQt::Key_F30, XK_F30 }, + { TQt::Key_F31, XK_F31 }, + { TQt::Key_F32, XK_F32 }, + { TQt::Key_F33, XK_F33 }, + { TQt::Key_F34, XK_F34 }, + { TQt::Key_F35, XK_F35 }, + { TQt::Key_Super_L, XK_Super_L }, + { TQt::Key_Super_R, XK_Super_R }, + { TQt::Key_Menu, XK_Menu }, + { TQt::Key_Hyper_L, XK_Hyper_L }, + { TQt::Key_Hyper_R, XK_Hyper_R }, + { TQt::Key_Help, XK_Help }, + //{ TQt::Key_Direction_L, XK_Direction_L }, These keys don't exist in X11 + //{ TQt::Key_Direction_R, XK_Direction_R }, { '/', XK_KP_Divide }, { '*', XK_KP_Multiply }, { '-', XK_KP_Subtract }, { '+', XK_KP_Add }, - { Qt::Key_Return, XK_KP_Enter } + { TQt::Key_Return, XK_KP_Enter } #if TQT_VERSION >= 0x030100 // the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special @@ -285,56 +285,56 @@ static const TransKey g_rgQtToSymX[] = #define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */ // end of XF86keysyms.h , - { Qt::Key_Standby, XF86XK_Standby }, - { Qt::Key_VolumeDown, XF86XK_AudioLowerVolume }, - { Qt::Key_VolumeMute, XF86XK_AudioMute }, - { Qt::Key_VolumeUp, XF86XK_AudioRaiseVolume }, - { Qt::Key_MediaPlay, XF86XK_AudioPlay }, - { Qt::Key_MediaStop, XF86XK_AudioStop }, + { TQt::Key_Standby, XF86XK_Standby }, + { TQt::Key_VolumeDown, XF86XK_AudioLowerVolume }, + { TQt::Key_VolumeMute, XF86XK_AudioMute }, + { TQt::Key_VolumeUp, XF86XK_AudioRaiseVolume }, + { TQt::Key_MediaPlay, XF86XK_AudioPlay }, + { TQt::Key_MediaStop, XF86XK_AudioStop }, { TQt::Key_MediaPrev, XF86XK_AudioPrev }, - { Qt::Key_MediaNext, XF86XK_AudioNext }, - { Qt::Key_HomePage, XF86XK_HomePage }, - { Qt::Key_LaunchMail, XF86XK_Mail }, - { Qt::Key_Search, XF86XK_Search }, - { Qt::Key_MediaRecord, XF86XK_AudioRecord }, - { Qt::Key_LaunchMedia, XF86XK_AudioMedia }, - { Qt::Key_Launch1, XF86XK_Calculator }, - { Qt::Key_Back, XF86XK_Back }, - { Qt::Key_Forward, XF86XK_Forward }, - { Qt::Key_Stop, XF86XK_Stop }, - { Qt::Key_Refresh, XF86XK_Refresh }, - { Qt::Key_Favorites, XF86XK_Favorites }, - { Qt::Key_Launch0, XF86XK_MyComputer }, - { Qt::Key_OpenUrl, XF86XK_OpenURL }, - { Qt::Key_Launch2, XF86XK_Launch0 }, - { Qt::Key_Launch3, XF86XK_Launch1 }, - { Qt::Key_Launch4, XF86XK_Launch2 }, - { Qt::Key_Launch5, XF86XK_Launch3 }, - { Qt::Key_Launch6, XF86XK_Launch4 }, - { Qt::Key_Launch7, XF86XK_Launch5 }, - { Qt::Key_Launch8, XF86XK_Launch6 }, - { Qt::Key_Launch9, XF86XK_Launch7 }, - { Qt::Key_LaunchA, XF86XK_Launch8 }, - { Qt::Key_LaunchB, XF86XK_Launch9 }, - { Qt::Key_LaunchC, XF86XK_LaunchA }, - { Qt::Key_LaunchD, XF86XK_LaunchB }, - { Qt::Key_LaunchE, XF86XK_LaunchC }, - { Qt::Key_LaunchF, XF86XK_LaunchD }, - { Qt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp }, - { Qt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown }, - { Qt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff }, - { Qt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp }, - { Qt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown }, + { TQt::Key_MediaNext, XF86XK_AudioNext }, + { TQt::Key_HomePage, XF86XK_HomePage }, + { TQt::Key_LaunchMail, XF86XK_Mail }, + { TQt::Key_Search, XF86XK_Search }, + { TQt::Key_MediaRecord, XF86XK_AudioRecord }, + { TQt::Key_LaunchMedia, XF86XK_AudioMedia }, + { TQt::Key_Launch1, XF86XK_Calculator }, + { TQt::Key_Back, XF86XK_Back }, + { TQt::Key_Forward, XF86XK_Forward }, + { TQt::Key_Stop, XF86XK_Stop }, + { TQt::Key_Refresh, XF86XK_Refresh }, + { TQt::Key_Favorites, XF86XK_Favorites }, + { TQt::Key_Launch0, XF86XK_MyComputer }, + { TQt::Key_OpenUrl, XF86XK_OpenURL }, + { TQt::Key_Launch2, XF86XK_Launch0 }, + { TQt::Key_Launch3, XF86XK_Launch1 }, + { TQt::Key_Launch4, XF86XK_Launch2 }, + { TQt::Key_Launch5, XF86XK_Launch3 }, + { TQt::Key_Launch6, XF86XK_Launch4 }, + { TQt::Key_Launch7, XF86XK_Launch5 }, + { TQt::Key_Launch8, XF86XK_Launch6 }, + { TQt::Key_Launch9, XF86XK_Launch7 }, + { TQt::Key_LaunchA, XF86XK_Launch8 }, + { TQt::Key_LaunchB, XF86XK_Launch9 }, + { TQt::Key_LaunchC, XF86XK_LaunchA }, + { TQt::Key_LaunchD, XF86XK_LaunchB }, + { TQt::Key_LaunchE, XF86XK_LaunchC }, + { TQt::Key_LaunchF, XF86XK_LaunchD }, + { TQt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp }, + { TQt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown }, + { TQt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff }, + { TQt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp }, + { TQt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown }, #endif }; -#endif //Q_WS_X11 +#endif //TQ_WS_X11 //--------------------------------------------------------------------- // Initialization //--------------------------------------------------------------------- static bool g_bInitializedMods, g_bInitializedVariations, g_bInitializedKKeyLabels; static bool g_bMacLabels; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static uint g_modXNumLock, g_modXScrollLock, g_modXModeSwitch; bool initializeMods() @@ -386,7 +386,7 @@ static void initializeVariations() g_rgSymVariation[i].bActive = (XKeysymToKeycode( tqt_xdisplay(), g_rgSymVariation[i].symVariation ) != 0); g_bInitializedVariations = true; } -#endif //Q_WS_X11 +#endif //TQ_WS_X11 static void intializeKKeyLabels() { @@ -416,15 +416,15 @@ bool Sym::initQt( int keyQt ) { int symQt = keyQt & 0xffff; - if( (keyQt & Qt::UNICODE_ACCEL) || symQt < 0x1000 ) { + if( (keyQt & TQt::UNICODE_ACCEL) || symQt < 0x1000 ) { m_sym = TQChar(symQt).lower().unicode(); return true; } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_sym = symQt; return true; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) for( uint i = 0; i < sizeof(g_rgQtToSymX)/sizeof(TransKey); i++ ) { if( g_rgQtToSymX[i].keySymQt == symQt ) { m_sym = g_rgQtToSymX[i].keySymX; @@ -433,11 +433,11 @@ bool Sym::initQt( int keyQt ) } m_sym = 0; - if( symQt != Qt::Key_Shift && symQt != Qt::Key_Control && symQt != Qt::Key_Alt && - symQt != Qt::Key_Meta && symQt != Qt::Key_Direction_L && symQt != Qt::Key_Direction_R ) + if( symQt != TQt::Key_Shift && symQt != TQt::Key_Control && symQt != TQt::Key_Alt && + symQt != TQt::Key_Meta && symQt != TQt::Key_Direction_L && symQt != TQt::Key_Direction_R ) kdDebug(125) << "Sym::initQt( " << TQString::number(keyQt,16) << " ): failed to convert key." << endl; return false; -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) m_sym = symQt; return true; #endif @@ -459,7 +459,7 @@ bool Sym::init( const TQString& s ) } } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN // search for name in KKeys array for ( KKeys const *pKey = kde_KKEYS; pKey->code != 0xffff; pKey++) { if( tqstricmp( s.latin1(), pKey->name ) == 0 ) { @@ -468,7 +468,7 @@ bool Sym::init( const TQString& s ) } } m_sym = 0; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) // search X list: 's' as is, all lower, first letter in caps m_sym = XStringToKeysym( s.latin1() ); if( !m_sym ) { @@ -490,12 +490,12 @@ int Sym::qt() const return TQChar(m_sym).upper(); return m_sym; } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if( m_sym < 0x3000 ) return m_sym; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) if( m_sym < 0x3000 ) - return m_sym | Qt::UNICODE_ACCEL; + return m_sym | TQt::UNICODE_ACCEL; for( uint i = 0; i < sizeof(g_rgQtToSymX)/sizeof(TransKey); i++ ) if( g_rgQtToSymX[i].keySymX == m_sym ) @@ -511,7 +511,7 @@ TQString Sym::toString( bool bUserSpace ) const } // If it's a unicode character, -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN else if( m_sym < 0x1000 ) { #else else if( m_sym < 0x3000 ) { @@ -533,9 +533,9 @@ TQString Sym::toString( bool bUserSpace ) const } TQString s; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN s = TQKeySequence( m_sym ); -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) // Get X-name s = XKeysymToString( m_sym ); #endif @@ -549,7 +549,7 @@ TQString Sym::toString() const { return toString( true ); } uint Sym::getModsRequired() const { uint mod = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // FIXME: This might not be true on all keyboard layouts! if( m_sym == XK_Sys_Req ) return KKey::ALT; if( m_sym == XK_Break ) return KKey::CTRL; @@ -580,7 +580,7 @@ uint Sym::getModsRequired() const uint Sym::getSymVariation() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( !g_bInitializedVariations ) initializeVariations(); for( int i = 0; g_rgSymVariation[i].sym != 0; i++ ) @@ -603,7 +603,7 @@ void Sym::capitalizeKeyname( TQString& s ) // Public functions //--------------------------------------------------------------------- -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 uint modX( KKey::ModFlag mod ) { if( mod == KKey::WIN && !g_bInitializedMods ) @@ -632,7 +632,7 @@ uint accelModMaskX() initializeMods(); return ShiftMask | ControlMask | Mod1Mask | g_rgModInfo[3].modX; } -#endif //Q_WS_X11 +#endif //TQ_WS_X11 bool keyQtToSym( int keyQt, uint& keySym ) { @@ -648,10 +648,10 @@ bool keyQtToMod( int keyQt, uint& mod ) { mod = 0; - if( keyQt & Qt::SHIFT ) mod |= KKey::SHIFT; - if( keyQt & Qt::CTRL ) mod |= KKey::CTRL; - if( keyQt & Qt::ALT ) mod |= KKey::ALT; - if( keyQt & Qt::META ) mod |= KKey::WIN; + if( keyQt & TQt::SHIFT ) mod |= KKey::SHIFT; + if( keyQt & TQt::CTRL ) mod |= KKey::CTRL; + if( keyQt & TQt::ALT ) mod |= KKey::ALT; + if( keyQt & TQt::META ) mod |= KKey::WIN; return true; } @@ -678,7 +678,7 @@ bool modToModQt( uint mod, int& modQt ) return true; } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN //wrapped bool modXToModQt( uint modX, int& modQt ) { @@ -688,9 +688,9 @@ bool modXToModQt( uint modX, int& modQt ) TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s ) { int modQt = 0; - if (s & Qt::ShiftButton) modQt |= KKey::SHIFT; - if (s & Qt::ControlButton) modQt |= KKey::CTRL; - if (s & Qt::AltButton) modQt |= KKey::ALT; + if (s & TQt::ShiftButton) modQt |= KKey::SHIFT; + if (s & TQt::ControlButton) modQt |= KKey::CTRL; + if (s & TQt::AltButton) modQt |= KKey::ALT; return modQt; } @@ -699,7 +699,7 @@ bool keyboardHasWinKey() { return true; } -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) bool modXToModQt(uint modX, int& modQt) { @@ -715,7 +715,7 @@ bool modXToMod( uint , uint& ) { return false; } -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) bool modToModX( uint mod, uint& modX ) { @@ -785,7 +785,7 @@ bool codeXToSym( uchar codeX, uint modX, uint& sym ) sym = (uint) keySym; return true; } -#endif //!Q_WS_WIN +#endif //!TQ_WS_WIN static TQString modToString( uint mod, bool bUserSpace ) { @@ -841,7 +841,7 @@ uint stringUserToMod( const TQString& mod ) if( keySymQt < 0x1000 ) { // For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'. // So convert it back to lowercase if SHIFT isn't held down. - if( keySymQt >= Qt::Key_A && keySymQt <= Qt::Key_Z && !(keyCombQt & Qt::SHIFT) ) + if( keySymQt >= TQt::Key_A && keySymQt <= TQt::Key_Z && !(keyCombQt & TQt::SHIFT) ) keySymQt = tolower( keySymQt ); keySymX = keySymQt; } @@ -954,7 +954,7 @@ KKey Key::key() const if( m_code == CODE_FOR_QT ) return KKey( keyCodeQt() ); else { -#if defined(Q_WS_WIN) || defined(Q_WS_MACX) +#if defined(TQ_WS_WIN) || defined(TQ_WS_MACX) return KKey(); #else uint mod; @@ -1043,7 +1043,7 @@ void Variations::init( const KKey& key, bool bQt ) // Ctrl+Pause => Ctrl+Break void KKey::simplify() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( m_sym == XK_Sys_Req ) { m_sym = XK_Print; m_mod |= ALT; @@ -1066,5 +1066,5 @@ void KKey::simplify() #endif } -#endif //Q_WS_X11 || Q_WS_WIN +#endif //TQ_WS_X11 || TQ_WS_WIN diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h index 90330911b..7632984e7 100644 --- a/tdecore/kkeyserver_x11.h +++ b/tdecore/kkeyserver_x11.h @@ -71,7 +71,7 @@ namespace KKeyServer * Initializes the symbol with the given Qt key code. * @param keyQt the qt key code * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key */ bool initQt( int keyQt ); @@ -153,7 +153,7 @@ namespace KKeyServer * @param key the key to get the data from * @param bQt true to take the Qt keycode, false * for the native key code - * @see Qt::Key + * @see TQt::Key * @see KKeyNative */ bool init( const KKey& key, bool bQt ); @@ -162,7 +162,7 @@ namespace KKeyServer * Checks whether the key code is a native code. * @return true if native code of the window system, * false if it is a Qt keycode - * @see Qt::Key + * @see TQt::Key * @see KKeyNative */ bool isNative() const { return m_code != CODE_FOR_QT; } @@ -351,7 +351,7 @@ namespace KKeyServer * @param keyQt the qt key code * @param sym if successful, the symbol will be written here * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key * @see Sym */ TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); @@ -362,7 +362,7 @@ namespace KKeyServer * @param keyQt the qt key code * @param mod if successful, the modifiers will be written here * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key */ TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); @@ -371,7 +371,7 @@ namespace KKeyServer * @param sym the symbol * @param keyQt if successful, the qt key code will be written here * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key * @see Sym */ TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); @@ -383,7 +383,7 @@ namespace KKeyServer * @param modQt the mask of Qt key code modifiers will be written here, * if successful * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key * @see KKey */ TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); @@ -406,7 +406,7 @@ namespace KKeyServer * @param modQt the mask of Qt key code modifiers will be written here * if successful * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key */ //wrapped for win32 TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); @@ -414,7 +414,7 @@ namespace KKeyServer /** * Converts the Qt-compatible button state to x11 modifier. */ - TDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -435,7 +435,7 @@ namespace KKeyServer * @param modX the mask of ORed X11 modifiers * @param symX if successful, the X11 symbol will be written here * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key * @see Sym */ TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp index 87a75cebd..68dc72668 100644 --- a/tdecore/klibloader.cpp +++ b/tdecore/klibloader.cpp @@ -121,8 +121,8 @@ KLibrary::~KLibrary() for ( ; it.current() ; ++it ) { kdDebug(150) << "Factory still has object " << it.current() << " " << it.current()->name () << " Library = " << m_libname << endl; - disconnect( it.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotObjectDestroyed() ) ); + disconnect( it.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotObjectDestroyed() ) ); } m_objs.setAutoDelete(true); m_objs.clear(); @@ -172,8 +172,8 @@ KLibFactory* KLibrary::factory() return 0; } - connect( m_factory, TQT_SIGNAL( objectCreated( TQObject * ) ), - this, TQT_SLOT( slotObjectCreated( TQObject * ) ) ); + connect( m_factory, TQ_SIGNAL( objectCreated( TQObject * ) ), + this, TQ_SLOT( slotObjectCreated( TQObject * ) ) ); return m_factory; } @@ -214,15 +214,15 @@ void KLibrary::slotObjectCreated( TQObject *obj ) if ( m_objs.containsRef( obj ) ) return; // we know this object already - connect( obj, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotObjectDestroyed() ) ); + connect( obj, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotObjectDestroyed() ) ); m_objs.append( obj ); } void KLibrary::slotObjectDestroyed() { - m_objs.removeRef( TQT_TQOBJECT_CONST(sender()) ); + m_objs.removeRef( sender() ); if ( m_objs.count() == 0 ) { @@ -232,8 +232,8 @@ void KLibrary::slotObjectDestroyed() if ( !m_timer ) { m_timer = new TQTimer( this, "klibrary_shutdown_timer" ); - connect( m_timer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotTimeout() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotTimeout() ) ); } // as long as it's not stable make the timeout short, for debugging @@ -447,8 +447,8 @@ KLibrary* KLibLoader::library( const char *name ) } m_libs.insert( name, wrap ); - connect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + connect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); return wrap->lib; } @@ -470,8 +470,8 @@ void KLibLoader::unloadLibrary( const char *libname ) m_libs.remove( libname ); - disconnect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + disconnect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); close_pending( wrap ); } @@ -511,8 +511,8 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) for (; it.current(); ++it) { wrap = it.current(); if (wrap->lib) { - disconnect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + disconnect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); KLibrary* to_delete = wrap->lib; wrap->lib = 0L; // unset first, because KLibrary dtor can cause delete to_delete; // recursive call to close_pending() diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h index d9e632184..82b268c16 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -52,7 +52,7 @@ class TDECORE_EXPORT KLibrary : public TQObject friend class KLibLoader; friend class TQAsciiDict<KLibrary>; - Q_OBJECT + TQ_OBJECT public: /** * Don't create KLibrary objects on your own. Instead use KLibLoader. @@ -143,7 +143,7 @@ class TDECORE_EXPORT KLibLoader : public TQObject { friend class KLibrary; - Q_OBJECT + TQ_OBJECT public: /** * You should NEVER destruct an instance of KLibLoader @@ -322,7 +322,7 @@ private: * The KLibFactory is used to create the components, the library has to offer. * The factory of KSpread for example will create instances of KSpreadDoc, * while the Konqueror factory will create KonqView widgets. - * All objects created by the factory must be derived from TQObject, since QObject + * All objects created by the factory must be derived from TQObject, since TQObject * offers type safe casting. * * KLibFactory is an abstract class. Reimplement the @@ -332,7 +332,7 @@ private: */ class TDECORE_EXPORT KLibFactory : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Create a new factory. @@ -349,7 +349,7 @@ public: * It is valid behavior to create different kinds of objects * depending on the requested @p classname. For example a koffice * library may usually return a pointer to KoDocument. But - * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget, + * if asked for a "TQWidget", it could create a wrapper widget, * that encapsulates the Koffice specific features. * * create() automatically emits a signal objectCreated to tell @@ -363,7 +363,7 @@ public: * @param args a list of arguments */ - TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList() ); signals: /** @@ -382,7 +382,7 @@ protected: * It is valid behavior to create different kinds of objects * depending on the requested @p className. For example a koffice * library may usually return a pointer to KoDocument. But - * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget, + * if asked for a "TQWidget", it could create a wrapper widget, * that encapsulates the Koffice specific features. * * This function is called by #create() @@ -392,7 +392,7 @@ protected: * @param args a list of arguments */ virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* className = TQOBJECT_OBJECT_NAME_STRING, + const char* className = "TQObject", const TQStringList &args = TQStringList() ) = 0; diff --git a/tdecore/kmacroexpander.cpp b/tdecore/kmacroexpander.cpp index 9cfddcc63..a2ece0a40 100644 --- a/tdecore/kmacroexpander.cpp +++ b/tdecore/kmacroexpander.cpp @@ -55,7 +55,7 @@ void KMacroExpanderBase::expandMacros( TQString &str ) TQString rsts; for (pos = 0; pos < str.length(); ) { - if (ec != (QChar)0) { + if (ec != (TQChar)0) { if (str.unicode()[pos] != ec) goto nohit; if (!(len = expandEscapedMacro( str, pos, rst ))) @@ -110,7 +110,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) while (pos < str.length()) { TQChar cc( str.unicode()[pos] ); - if (ec != (QChar)0) { + if (ec != (TQChar)0) { if (cc != ec) goto nohit; if (!(len = expandEscapedMacro( str, pos, rst ))) @@ -160,20 +160,20 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) continue; nohit: if (state.current == singlequote) { - if (cc == (QChar)'\'') + if (cc == (TQChar)'\'') state = sstack.pop(); - } else if (cc == (QChar)'\\') { + } else if (cc == (TQChar)'\\') { // always swallow the char -> prevent anomalies due to expansion pos += 2; continue; } else if (state.current == dollarquote) { - if (cc == (QChar)'\'') + if (cc == (TQChar)'\'') state = sstack.pop(); - } else if (cc == (QChar)'$') { + } else if (cc == (TQChar)'$') { cc = str[++pos]; - if (cc == (QChar)'(') { + if (cc == (TQChar)'(') { sstack.push( state ); - if (str[pos + 1] == (QChar)'(') { + if (str[pos + 1] == (TQChar)'(') { Save sav = { str, pos + 2 }; ostack.push( sav ); state.current = math; @@ -183,21 +183,21 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) state.current = paren; state.dquote = false; } - } else if (cc == (QChar)'{') { + } else if (cc == (TQChar)'{') { sstack.push( state ); state.current = subst; } else if (!state.dquote) { - if (cc == (QChar)'\'') { + if (cc == (TQChar)'\'') { sstack.push( state ); state.current = dollarquote; - } else if (cc == (QChar)'"') { + } else if (cc == (TQChar)'"') { sstack.push( state ); state.current = doublequote; state.dquote = true; } } // always swallow the char -> prevent anomalies due to expansion - } else if (cc == (QChar)'`') { + } else if (cc == (TQChar)'`') { str.replace( pos, 1, "$( " ); // add space -> avoid creating $(( pos2 = pos += 3; for (;;) { @@ -206,12 +206,12 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) return false; } cc = str.unicode()[pos2]; - if (cc == (QChar)'`') + if (cc == (TQChar)'`') break; - if (cc == (QChar)'\\') { + if (cc == (TQChar)'\\') { cc = str[++pos2]; - if (cc == (QChar)'$' || cc == (QChar)'`' || cc == (QChar)'\\' || - (cc == (QChar)'"' && state.dquote)) + if (cc == (TQChar)'$' || cc == (TQChar)'`' || cc == (TQChar)'\\' || + (cc == (TQChar)'"' && state.dquote)) { str.remove( pos2 - 1, 1 ); continue; @@ -225,25 +225,25 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) state.dquote = false; continue; } else if (state.current == doublequote) { - if (cc == (QChar)'"') + if (cc == (TQChar)'"') state = sstack.pop(); - } else if (cc == (QChar)'\'') { + } else if (cc == (TQChar)'\'') { if (!state.dquote) { sstack.push( state ); state.current = singlequote; } - } else if (cc == (QChar)'"') { + } else if (cc == (TQChar)'"') { if (!state.dquote) { sstack.push( state ); state.current = doublequote; state.dquote = true; } } else if (state.current == subst) { - if (cc == (QChar)'}') + if (cc == (TQChar)'}') state = sstack.pop(); - } else if (cc == (QChar)')') { + } else if (cc == (TQChar)')') { if (state.current == math) { - if (str[pos + 1] == (QChar)')') { + if (str[pos + 1] == (TQChar)')') { state = sstack.pop(); pos += 2; } else { @@ -261,15 +261,15 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) state = sstack.pop(); else break; - } else if (cc == (QChar)'}') { + } else if (cc == (TQChar)'}') { if (state.current == KMacroExpander::group) state = sstack.pop(); else break; - } else if (cc == (QChar)'(') { + } else if (cc == (TQChar)'(') { sstack.push( state ); state.current = paren; - } else if (cc == (QChar)'{') { + } else if (cc == (TQChar)'{') { sstack.push( state ); state.current = KMacroExpander::group; } @@ -407,9 +407,9 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po return 2; } uint sl, rsl, rpos; - if (str[pos + 1] == (QChar)'{') { + if (str[pos + 1] == (TQChar)'{') { rpos = pos + 2; - for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++) + for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++) if (rpos + sl >= str.length()) return 0; rsl = sl + 3; @@ -473,9 +473,9 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL return 2; } uint sl, rsl, rpos; - if (str[pos + 1] == (QChar)'{') { + if (str[pos + 1] == (TQChar)'{') { rpos = pos + 2; - for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++) + for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++) if (rpos + sl >= str.length()) return 0; rsl = sl + 3; @@ -494,7 +494,7 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL //////////// template<class KT,class VT> -inline QString +inline TQString TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c ) { TQString str( ostr ); @@ -504,7 +504,7 @@ TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c ) } template<class KT,class VT> -inline QString +inline TQString TexpandMacrosShellQuote( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c ) { TQString str( ostr ); diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp index 2e019f73e..bfae6406a 100644 --- a/tdecore/kmanagerselection.cpp +++ b/tdecore/kmanagerselection.cpp @@ -41,7 +41,7 @@ DEALINGS IN THE SOFTWARE. #endif #include <tqobject.h> -#ifdef Q_WS_X11 // FIXME(E) +#ifdef TQ_WS_X11 // FIXME(E) #include "kmanagerselection.h" @@ -52,7 +52,7 @@ DEALINGS IN THE SOFTWARE. #include <X11/Xatom.h> class TDESelectionOwnerPrivate - : public QWidget + : public TQWidget { public: TDESelectionOwnerPrivate( TDESelectionOwner* owner ); @@ -65,7 +65,7 @@ class TDESelectionOwnerPrivate TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P ) : owner( owner_P ) { - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + kapp->installX11EventFilter( this ); } bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P ) @@ -367,7 +367,7 @@ Atom TDESelectionOwner::xa_timestamp = None; class TDESelectionWatcherPrivate - : public QWidget + : public TQWidget { public: TDESelectionWatcherPrivate( TDESelectionWatcher* watcher ); @@ -380,7 +380,7 @@ class TDESelectionWatcherPrivate TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P ) : watcher( watcher_P ) { - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + kapp->installX11EventFilter( this ); } bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P ) diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h index de294187d..59cc35c56 100644 --- a/tdecore/kmanagerselection.h +++ b/tdecore/kmanagerselection.h @@ -28,11 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <tqobject.h> #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 // FIXME(E) +#ifdef TQ_WS_X11 // FIXME(E) #include <X11/Xlib.h> @@ -50,7 +46,7 @@ class TDESelectionOwnerPrivate; class TDECORE_EXPORT TDESelectionOwner : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * This constructor initializes the object, but doesn't perform any @@ -173,7 +169,7 @@ class TDESelectionWatcherPrivate; class TDECORE_EXPORT TDESelectionWatcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * This constructor initializes the object, but doesn't perform any diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp index a9be89e76..e78fc7335 100644 --- a/tdecore/kmountpoint.cpp +++ b/tdecore/kmountpoint.cpp @@ -33,6 +33,7 @@ #include <volmgt.h> #endif #ifdef HAVE_SYS_MNTTAB_H +#include <stdio.h> #include <sys/mnttab.h> #endif #ifdef HAVE_MNTENT_H @@ -333,7 +334,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded) } free( mntctl_buffer ); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) //TODO? #else STRUCT_SETMNTENT mnttab; diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index b1989fbf6..1eb4b42fb 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <kstaticdeleter.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #include <X11/XKBlib.h> @@ -77,7 +77,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, if (!kapp) return 0; // ensure tray icon is shown and positioned before sending event to notification daemon -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XFlush(tqt_xdisplay()); #endif @@ -97,7 +97,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure! // knotify daemon needs toplevel window - TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId )); + TQWidget* widget = TQWidget::find( (WId)winId ); if( widget ) winId = (int)widget->topLevelWidget()->winId(); diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp index 76ad0b167..720778d4e 100644 --- a/tdecore/kprocctrl.cpp +++ b/tdecore/kprocctrl.cpp @@ -71,8 +71,8 @@ TDEProcessController::TDEProcessController() notifier = new TQSocketNotifier( fd[0], TQSocketNotifier::Read ); notifier->setEnabled( true ); - TQObject::connect( notifier, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotDoHousekeeping())); + TQObject::connect( notifier, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotDoHousekeeping())); } TDEProcessController::~TDEProcessController() diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h index 1cb6cc302..ac5700753 100644 --- a/tdecore/kprocctrl.h +++ b/tdecore/kprocctrl.h @@ -38,7 +38,7 @@ class TQSocketNotifier; */ class TDECORE_EXPORT TDEProcessController : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/kprocess.cpp b/tdecore/kprocess.cpp index b899c637f..85e7620a4 100644 --- a/tdecore/kprocess.cpp +++ b/tdecore/kprocess.cpp @@ -959,15 +959,15 @@ int TDEProcess::commSetupDoneP() innot = new TQSocketNotifier(in[1], TQSocketNotifier::Write, this); TQ_CHECK_PTR(innot); innot->setEnabled(false); // will be enabled when data has to be sent - TQObject::connect(innot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSendData(int))); + TQObject::connect(innot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSendData(int))); } if (communication & Stdout) { outnot = new TQSocketNotifier(out[0], TQSocketNotifier::Read, this); TQ_CHECK_PTR(outnot); - TQObject::connect(outnot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChildOutput(int))); + TQObject::connect(outnot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChildOutput(int))); if (communication & NoRead) suspend(); } @@ -975,8 +975,8 @@ int TDEProcess::commSetupDoneP() if (communication & Stderr) { errnot = new TQSocketNotifier(err[0], TQSocketNotifier::Read, this ); TQ_CHECK_PTR(errnot); - TQObject::connect(errnot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChildError(int))); + TQObject::connect(errnot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChildError(int))); } return 1; diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h index ae4a25af6..3e6250486 100644 --- a/tdecore/kprocess.h +++ b/tdecore/kprocess.h @@ -96,8 +96,8 @@ class KPty; * * *proc << "my_executable"; * *proc << "These" << "are" << "the" << "command" << "line" << "args"; - * TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - * pointer_to_my_object, TQT_SLOT(my_objects_slot(TDEProcess *))); + * TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + * pointer_to_my_object, TQ_SLOT(my_objects_slot(TDEProcess *))); * proc->start(); * \endcode * @@ -129,7 +129,7 @@ class KPty; **/ class TDECORE_EXPORT TDEProcess : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -903,7 +903,7 @@ class KShellProcessPrivate; */ class TDECORE_EXPORT KShellProcess: public TDEProcess { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/kprocio.cpp b/tdecore/kprocio.cpp index 7157662df..aac14a09e 100644 --- a/tdecore/kprocio.cpp +++ b/tdecore/kprocio.cpp @@ -67,14 +67,14 @@ KProcIO::resetAll () rbi=0; readsignalon=writeready=true; - disconnect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + disconnect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + disconnect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), - this, TQT_SLOT (sent (TDEProcess *))); + disconnect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)), + this, TQ_SLOT (sent (TDEProcess *))); outbuffer.clear(); @@ -87,17 +87,17 @@ void KProcIO::setComm (Communication comm) bool KProcIO::start (RunMode runmode, bool includeStderr) { - connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + connect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); if (includeStderr) { - connect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + connect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); } - connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), - this, TQT_SLOT (sent (TDEProcess *))); + connect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)), + this, TQ_SLOT (sent (TDEProcess *))); return TDEProcess::start (runmode, d->comm); } diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h index 4e42ee533..e58e0972c 100644 --- a/tdecore/kprocio.h +++ b/tdecore/kprocio.h @@ -49,7 +49,7 @@ class TQTextCodec; class TDECORE_EXPORT KProcIO : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/kqiodevicegzip_p.cpp b/tdecore/kqiodevicegzip_p.cpp index 0dcabed74..9ad82a653 100644 --- a/tdecore/kqiodevicegzip_p.cpp +++ b/tdecore/kqiodevicegzip_p.cpp @@ -37,7 +37,7 @@ KQIODeviceGZip::~KQIODeviceGZip(void) close(); } -bool KQIODeviceGZip::open(TQ_OpenMode mode) +bool KQIODeviceGZip::open(int mode) { if (m_gzfile) close(); // One file is already open, so close it first. @@ -78,11 +78,7 @@ void KQIODeviceGZip::flush(void) } } -#ifdef USE_QT4 -qint64 KQIODeviceGZip::size(void) const -#else // USE_QT4 TQIODevice::Offset KQIODeviceGZip::size(void) const -#endif // USE_QT4 { return 0; // You cannot determine size! } @@ -115,7 +111,7 @@ bool KQIODeviceGZip::reset(void) return (gzrewind(m_gzfile)>=0); } -TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) +TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen ) { TQ_LONG result=0; if (m_gzfile) @@ -126,7 +122,7 @@ TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) return result; } -TQT_TQIO_LONG KQIODeviceGZip::tqwriteBlock( const char *data, TQT_TQIO_ULONG len ) +TQ_LONG KQIODeviceGZip::writeBlock( const char *data, TQ_ULONG len ) { TQ_ULONG result=0; if (m_gzfile) diff --git a/tdecore/kqiodevicegzip_p.h b/tdecore/kqiodevicegzip_p.h index 0581602c1..182b26141 100644 --- a/tdecore/kqiodevicegzip_p.h +++ b/tdecore/kqiodevicegzip_p.h @@ -38,22 +38,18 @@ public: KQIODeviceGZip(const TQString& filename); ~KQIODeviceGZip(void); - bool open(TQ_OpenMode mode); + bool open(int mode); void close(void); void flush(void); -#ifdef USE_QT4 - qint64 size(void) const; -#else // USE_QT4 Offset size(void) const; -#endif // USE_QT4 Offset at(void) const; bool at(Offset pos); bool atEnd(void) const; bool reset (void); - TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ); - TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len ); + TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + TQ_LONG writeBlock( const char *data, TQ_ULONG len ); int getch(void); int putch(int ch); diff --git a/tdecore/krfcdate.cpp b/tdecore/krfcdate.cpp index d9a374d0c..327736b40 100644 --- a/tdecore/krfcdate.cpp +++ b/tdecore/krfcdate.cpp @@ -394,7 +394,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) mday = l[2].toUInt(); // Z suffix means UTC. - if ((QChar)'Z' == timeString.at(timeString.length() - 1)) { + if ((TQChar)'Z' == timeString.at(timeString.length() - 1)) { timeString.remove(timeString.length() - 1, 1); } diff --git a/tdecore/krootprop.cpp b/tdecore/krootprop.cpp index c717a1823..72fd5ae78 100644 --- a/tdecore/krootprop.cpp +++ b/tdecore/krootprop.cpp @@ -20,7 +20,7 @@ #include <tqwidget.h> #include "config.h" -#ifdef Q_WS_X11 // not needed anyway :-) +#ifdef TQ_WS_X11 // not needed anyway :-) #include "krootprop.h" #include "tdeglobal.h" diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp index 4ad96c0f2..d9b8867af 100644 --- a/tdecore/ksavefile.cpp +++ b/tdecore/ksavefile.cpp @@ -171,7 +171,7 @@ bool KSaveFile::backupFile( const TQString& qFilename, const TQString& backupDir else nameOnly = cFilename.mid(slash + 1); cBackup = TQFile::encodeName(backupDir); - if ( backupDir[backupDir.length()-1] != (QChar)'/' ) + if ( backupDir[backupDir.length()-1] != (TQChar)'/' ) cBackup += '/'; cBackup += nameOnly; } diff --git a/tdecore/kshell.cpp b/tdecore/kshell.cpp index 7e4eda947..155ecdb1c 100644 --- a/tdecore/kshell.cpp +++ b/tdecore/kshell.cpp @@ -75,17 +75,17 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) c = args.unicode()[pos++]; } while (c.isSpace()); TQString cret; - if ((flags & TildeExpand) && c == (QChar)'~') { + if ((flags & TildeExpand) && c == (TQChar)'~') { uint opos = pos; for (; ; pos++) { if (pos >= args.length()) break; c = args.unicode()[pos]; - if (c == (QChar)'/' || c.isSpace()) + if (c == (TQChar)'/' || c.isSpace()) break; if (isQuoteMeta( c )) { pos = opos; - c = (QChar)'~'; + c = (TQChar)'~'; goto notilde; } if ((flags & AbortOnMeta) && isMeta( c )) @@ -94,7 +94,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() ); if (ccret.isEmpty()) { pos = opos; - c = (QChar)'~'; + c = (TQChar)'~'; goto notilde; } if (pos >= args.length()) { @@ -111,67 +111,67 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) } // before the notilde label, as a tilde does not match anyway if (firstword) { - if (c == (QChar)'_' || (c >= (QChar)'A' && c <= (QChar)'Z') || (c >= (QChar)'a' && c <= (QChar)'z')) { + if (c == (TQChar)'_' || (c >= (TQChar)'A' && c <= (TQChar)'Z') || (c >= (TQChar)'a' && c <= (TQChar)'z')) { uint pos2 = pos; TQChar cc; do cc = args[pos2++]; - while (cc == (QChar)'_' || (cc >= (QChar)'A' && cc <= (QChar)'Z') || - (cc >= (QChar)'a' && cc <= (QChar)'z') || (cc >= (QChar)'0' && cc <= (QChar)'9')); - if (cc == (QChar)'=') + while (cc == (TQChar)'_' || (cc >= (TQChar)'A' && cc <= (TQChar)'Z') || + (cc >= (TQChar)'a' && cc <= (TQChar)'z') || (cc >= (TQChar)'0' && cc <= (TQChar)'9')); + if (cc == (TQChar)'=') goto metaerr; } } notilde: do { - if (c == (QChar)'\'') { + if (c == (TQChar)'\'') { uint spos = pos; do { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - } while (c != (QChar)'\''); + } while (c != (TQChar)'\''); cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string(); - } else if (c == (QChar)'"') { + } else if (c == (TQChar)'"') { for (;;) { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c == (QChar)'"') + if (c == (TQChar)'"') break; - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c != (QChar)'"' && c != (QChar)'\\' && - !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`'))) - cret += (QChar)'\\'; - } else if ((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`')) + if (c != (TQChar)'"' && c != (TQChar)'\\' && + !((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`'))) + cret += (TQChar)'\\'; + } else if ((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`')) goto metaerr; cret += c; } - } else if (c == (QChar)'$' && args[pos] == (QChar)'\'') { + } else if (c == (TQChar)'$' && args[pos] == (TQChar)'\'') { pos++; for (;;) { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c == (QChar)'\'') + if (c == (TQChar)'\'') break; - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; switch (c) { - case 'a': cret += (QChar)'\a'; break; - case 'b': cret += (QChar)'\b'; break; - case 'e': cret += (QChar)'\033'; break; - case 'f': cret += (QChar)'\f'; break; - case 'n': cret += (QChar)'\n'; break; - case 'r': cret += (QChar)'\r'; break; - case 't': cret += (QChar)'\t'; break; - case '\\': cret += (QChar)'\\'; break; - case '\'': cret += (QChar)'\''; break; + case 'a': cret += (TQChar)'\a'; break; + case 'b': cret += (TQChar)'\b'; break; + case 'e': cret += (TQChar)'\033'; break; + case 'f': cret += (TQChar)'\f'; break; + case 'n': cret += (TQChar)'\n'; break; + case 'r': cret += (TQChar)'\r'; break; + case 't': cret += (TQChar)'\t'; break; + case '\\': cret += (TQChar)'\\'; break; + case '\'': cret += (TQChar)'\''; break; case 'c': cret += args[pos++] & 31; break; case 'x': { @@ -189,11 +189,11 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) break; } default: - if (c >= (QChar)'0' && c <= (QChar)'7') { + if (c >= (TQChar)'0' && c <= (TQChar)'7') { int hv = c - '0'; for (int i = 0; i < 2; i++) { c = args[pos]; - if (c < (QChar)'0' || c > (QChar)'7') + if (c < (TQChar)'0' || c > (TQChar)'7') break; hv = hv * 8 + (c - '0'); pos++; @@ -209,7 +209,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) cret += c; } } else { - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; @@ -354,7 +354,7 @@ TQString KShell::joinArgsDQ( const TQStringList &args ) TQString KShell::tildeExpand( const TQString &fname ) { - if (fname[0] == (QChar)'~') { + if (fname[0] == (TQChar)'~') { int pos = fname.find( '/' ); if (pos < 0) return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() ); diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h index 541117500..0ef703208 100644 --- a/tdecore/ksimpleconfig.h +++ b/tdecore/ksimpleconfig.h @@ -40,7 +40,7 @@ class KSimpleConfigPrivate; */ class TDECORE_EXPORT KSimpleConfig : public TDEConfig { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp index cbb4ce682..7d9cfa70c 100644 --- a/tdecore/ksimpledirwatch.cpp +++ b/tdecore/ksimpledirwatch.cpp @@ -52,11 +52,17 @@ // debug #include <sys/ioctl.h> +#ifdef Q_OS_SOLARIS +#include <sys/filio.h> /* FIONREAD is defined here */ +#endif /* solaris */ + #ifdef HAVE_INOTIFY #include <unistd.h> #include <fcntl.h> #include <sys/syscall.h> +#ifdef Q_OS_LINUX #include <linux/types.h> +#endif /* Linux */ // Linux kernel headers are documented to not compile #define _S390_BITOPS_H #include <sys/inotify.h> @@ -207,7 +213,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() : rescan_timer(0, "KSimpleDirWatchPrivate::rescan_timer") { timer = new TQTimer(this, "KSimpleDirWatchPrivate::timer"); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); freq = 3600000; // 1 hour as upper bound statEntries = 0; delayRemove = false; @@ -221,7 +227,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() // used for FAM and DNOTIFY rescan_all = false; - connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); #ifdef HAVE_FAM // It's possible that FAM server can't be started @@ -230,8 +236,8 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() use_fam=true; sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc), TQSocketNotifier::Read, this); - connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(famEventReceived()) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(famEventReceived()) ); } else { kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl; @@ -267,7 +273,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this ); - connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) ); + connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) ); } #endif @@ -301,7 +307,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL)); fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL)); mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this); - connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated())); + connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated())); // Install the signal handler only once if ( dnotify_signal == 0 ) { @@ -1212,7 +1218,7 @@ void KSimpleDirWatchPrivate::emitEvent(Entry* e, int event, const TQString &file else #ifdef Q_OS_UNIX path += "/" + fileName; -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) //current drive is passed instead of / path += TQDir::currentDirPath().left(2) + "/" + fileName; #endif @@ -1366,7 +1372,7 @@ void KSimpleDirWatchPrivate::slotRescan() if ( timerRunning ) timer->start(freq); - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } bool KSimpleDirWatchPrivate::isNoisyFile( const char * filename ) @@ -1415,7 +1421,7 @@ void KSimpleDirWatchPrivate::famEventReceived() checkFAMEvent(&fe); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } void KSimpleDirWatchPrivate::checkFAMEvent(FAMEvent* fe) diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h index dd6ccf2ec..41934aa26 100644 --- a/tdecore/ksimpledirwatch.h +++ b/tdecore/ksimpledirwatch.h @@ -65,7 +65,7 @@ class KSimpleDirWatchPrivate; */ class TDEIO_EXPORT KSimpleDirWatch : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/ksimpledirwatch_p.h b/tdecore/ksimpledirwatch_p.h index cf1288064..7c6986d1a 100644 --- a/tdecore/ksimpledirwatch_p.h +++ b/tdecore/ksimpledirwatch_p.h @@ -23,7 +23,7 @@ */ class KSimpleDirWatchPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum entryStatus { Normal = 0, NonExistent }; diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp index 3f4886b8a..8de28f476 100644 --- a/tdecore/ksock.cpp +++ b/tdecore/ksock.cpp @@ -140,7 +140,7 @@ void TDESocket::enableRead( bool _state ) if ( !d->readNotifier ) { d->readNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Read ); - TQObject::connect( d->readNotifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRead(int) ) ); + TQObject::connect( d->readNotifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotRead(int) ) ); } else d->readNotifier->setEnabled( true ); @@ -156,8 +156,8 @@ void TDESocket::enableWrite( bool _state ) if ( !d->writeNotifier ) { d->writeNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Write ); - TQObject::connect( d->writeNotifier, TQT_SIGNAL( activated(int) ), this, - TQT_SLOT( slotWrite(int) ) ); + TQObject::connect( d->writeNotifier, TQ_SIGNAL( activated(int) ), this, + TQ_SLOT( slotWrite(int) ) ); } else d->writeNotifier->setEnabled( true ); @@ -357,7 +357,7 @@ bool TDEServerSocket::bindAndListen(bool suppressFailureMessages) sock = d->ks->fd(); - connect( d->ks->readNotifier(), TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) ); + connect( d->ks->readNotifier(), TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) ); return true; } diff --git a/tdecore/ksock.h b/tdecore/ksock.h index 31ca099e6..e56b0efbb 100644 --- a/tdecore/ksock.h +++ b/tdecore/ksock.h @@ -22,10 +22,6 @@ #include "tdelibs_export.h" -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX #include <tqobject.h> @@ -90,7 +86,7 @@ class TDEServerSocketPrivate; */ class TDECORE_EXPORT TDESocket : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a TDESocket with the provided file descriptor. @@ -253,7 +249,7 @@ private: */ class TDECORE_EXPORT TDEServerSocket : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h index d3eb62d0d..f523fd980 100644 --- a/tdecore/ksockaddr.h +++ b/tdecore/ksockaddr.h @@ -45,7 +45,7 @@ class TDESocketAddressPrivate; */ class TDECORE_EXPORT TDESocketAddress: public TQObject { - Q_OBJECT + TQ_OBJECT protected: /** * Creates an empty class @@ -232,7 +232,7 @@ class KInetSocketAddressPrivate; */ class TDECORE_EXPORT KInetSocketAddress: public ::TDESocketAddress { - Q_OBJECT + TQ_OBJECT public: /** * Default constructor. Does nothing @@ -583,7 +583,7 @@ class KUnixSocketAddressPrivate; */ class TDECORE_EXPORT KUnixSocketAddress: public ::TDESocketAddress { - Q_OBJECT + TQ_OBJECT public: /** * Default constructor diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp index 888ca5bc2..b7d41d136 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/kstandarddirs.cpp @@ -143,7 +143,7 @@ bool TDEStandardDirs::isRestrictedResource(const char *type, const TQString& rel void TDEStandardDirs::applyDataRestrictions(const TQString &relPath) const { TQString key; - int i = relPath.find(QChar('/')); + int i = relPath.find(TQChar('/')); if (i != -1) key = "data_"+relPath.left(i); else @@ -188,8 +188,8 @@ void TDEStandardDirs::addPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) - dir += QChar('/'); + if (dir.at(dir.length() - 1) != TQChar('/')) + dir += TQChar('/'); if (!prefixes.contains(dir)) { priorityAdd(prefixes, dir, priority); @@ -208,8 +208,8 @@ void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) - dir += QChar('/'); + if (dir.at(dir.length() - 1) != TQChar('/')) + dir += TQChar('/'); if (!d->xdgconf_prefixes.contains(dir)) { priorityAdd(d->xdgconf_prefixes, dir, priority); @@ -228,8 +228,8 @@ void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) - dir += QChar('/'); + if (dir.at(dir.length() - 1) != TQChar('/')) + dir += TQChar('/'); if (!d->xdgdata_prefixes.contains(dir)) { priorityAdd(d->xdgdata_prefixes, dir, priority); @@ -270,8 +270,8 @@ bool TDEStandardDirs::addResourceType( const char *type, relatives.insert(type, rels); } TQString copy = relativename; - if (copy.at(copy.length() - 1) != QChar('/')) - copy += QChar('/'); + if (copy.at(copy.length() - 1) != TQChar('/')) + copy += TQChar('/'); if (!rels->contains(copy)) { if (priority) rels->prepend(copy); @@ -300,8 +300,8 @@ bool TDEStandardDirs::addResourceDir( const char *type, absolutes.insert(type, paths); } TQString copy = absdir; - if (copy.at(copy.length() - 1) != QChar('/')) - copy += QChar('/'); + if (copy.at(copy.length() - 1) != TQChar('/')) + copy += TQChar('/'); if (!paths->contains(copy)) { if (priority) @@ -388,7 +388,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type, if (reldir.endsWith("/")) list.append(reldir); else - list.append(reldir+QChar('/')); + list.append(reldir+TQChar('/')); } return list; } @@ -403,7 +403,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type, it != candidates.end(); ++it) { testdir.setPath(*it + reldir); if (testdir.exists()) - list.append(testdir.absPath() + QChar('/')); + list.append(testdir.absPath() + TQChar('/')); } return list; @@ -427,14 +427,14 @@ TQString TDEStandardDirs::findResourceDir( const char *type, for (TQStringList::ConstIterator it = candidates.begin(); it != candidates.end(); ++it) { if (exists(*it + filename)) { -#ifdef Q_WS_WIN //this ensures we're using installed .la files +#ifdef TQ_WS_WIN //this ensures we're using installed .la files if ((*it).isEmpty() && filename.right(3)==".la") { #ifndef NDEBUG fprintf(stderr, "TDEStandardDirs::findResourceDir() found .la in cwd: skipping. (fname=%s)\n", filename.ascii()); #endif continue; } -#endif //Q_WS_WIN +#endif //TQ_WS_WIN return *it; } } @@ -451,7 +451,7 @@ bool TDEStandardDirs::exists(const TQString &fullPath) { KDE_struct_stat buff; if ((access(TQFile::encodeName(fullPath), R_OK) == 0) && (KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)) { - if (fullPath.at(fullPath.length() - 1) != QChar('/')) { + if (fullPath.at(fullPath.length() - 1) != TQChar('/')) { if (S_ISREG( buff.st_mode )) return true; } @@ -480,10 +480,10 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, if (!dp) return; -#ifdef Q_WS_WIN - assert(path.at(path.length() - 1) == QChar('/') || path.at(path.length() - 1) == QChar('\\')); +#ifdef TQ_WS_WIN + assert(path.at(path.length() - 1) == TQChar('/') || path.at(path.length() - 1) == TQChar('\\')); #else - assert(path.at(path.length() - 1) == QChar('/')); + assert(path.at(path.length() - 1) == TQChar('/')); #endif struct dirent *ep; @@ -508,7 +508,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, } if ( recursive ) { if ( S_ISDIR( buff.st_mode )) { - lookupDirectory(pathfn + QChar('/'), relPart + fn + QChar('/'), regexp, list, relList, recursive, unique); + lookupDirectory(pathfn + TQChar('/'), relPart + fn + TQChar('/'), regexp, list, relList, recursive, unique); } if (!regexp.exactMatch(fn)) continue; // No match @@ -560,7 +560,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, if (relpath.length()) { - int slash = relpath.find(QChar('/')); + int slash = relpath.find(TQChar('/')); if (slash < 0) rest = relpath.left(relpath.length() - 1); else { @@ -571,10 +571,10 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, if (prefix.isEmpty()) //for sanity return; -#ifdef Q_WS_WIN - assert(prefix.at(prefix.length() - 1) == QChar('/') || prefix.at(prefix.length() - 1) == QChar('\\')); +#ifdef TQ_WS_WIN + assert(prefix.at(prefix.length() - 1) == TQChar('/') || prefix.at(prefix.length() - 1) == TQChar('\\')); #else - assert(prefix.at(prefix.length() - 1) == QChar('/')); + assert(prefix.at(prefix.length() - 1) == TQChar('/')); #endif KDE_struct_stat buff; @@ -594,7 +594,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == QChar('~')) + if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == TQChar('~')) continue; if ( !pathExp.exactMatch(fn) ) @@ -606,15 +606,15 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, continue; // Couldn't stat (e.g. no permissions) } if ( S_ISDIR( buff.st_mode )) - lookupPrefix(fn + QChar('/'), rest, rfn + QChar('/'), regexp, list, relList, recursive, unique); + lookupPrefix(fn + TQChar('/'), rest, rfn + TQChar('/'), regexp, list, relList, recursive, unique); } closedir( dp ); } else { // Don't stat, if the dir doesn't exist we will find out // when we try to open it. - lookupPrefix(prefix + path + QChar('/'), rest, - relPart + path + QChar('/'), regexp, list, + lookupPrefix(prefix + path + TQChar('/'), rest, + relPart + path + TQChar('/'), regexp, list, relList, recursive, unique); } } @@ -754,7 +754,7 @@ void TDEStandardDirs::createSpecialResource(const char *type) } } } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (relink) { if (!makeDir(dir, 0700)) @@ -789,7 +789,7 @@ void TDEStandardDirs::createSpecialResource(const char *type) } } #endif - addResourceDir(type, dir+QChar('/')); + addResourceDir(type, dir+TQChar('/')); } TQStringList TDEStandardDirs::resourceDirs(const char *type) const @@ -904,9 +904,9 @@ TQStringList TDEStandardDirs::systemPaths( const TQString& pstr ) { p = tokens[ i ]; - if ( p[ 0 ] == QChar('~') ) + if ( p[ 0 ] == TQChar('~') ) { - int len = p.find( QChar('/') ); + int len = p.find( TQChar('/') ); if ( len == -1 ) len = p.length(); if ( len == 1 ) @@ -932,7 +932,7 @@ TQStringList TDEStandardDirs::systemPaths( const TQString& pstr ) TQString TDEStandardDirs::findExe( const TQString& appname, const TQString& pstr, bool ignore) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString real_appname = appname + ".exe"; #else TQString real_appname = appname; @@ -981,7 +981,7 @@ TQString TDEStandardDirs::findExe( const TQString& appname, int TDEStandardDirs::findAllExe( TQStringList& list, const TQString& appname, const TQString& pstr, bool ignore ) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString real_appname = appname + ".exe"; #else TQString real_appname = appname; @@ -1183,8 +1183,8 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode) uint len = target.length(); // append trailing slash if missing - if (dir.at(len - 1) != QChar('/')) - target += QChar('/'); + if (dir.at(len - 1) != TQChar('/')) + target += TQChar('/'); TQString base(""); uint i = 1; @@ -1192,7 +1192,7 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode) while( i < len ) { KDE_struct_stat st; - int pos = target.find(QChar('/'), i); + int pos = target.find(TQChar('/'), i); base += target.mid(i - 1, pos - i + 1); TQCString baseEncoded = TQFile::encodeName(base); // bail out if we encountered a problem @@ -1259,7 +1259,7 @@ TQString TDEStandardDirs::kfsstnd_defaultprefix() TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self(); if (!s->defaultprefix.isEmpty()) return s->defaultprefix; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN s->defaultprefix = readEnvPath("TDEDIR"); if (s->defaultprefix.isEmpty()) { s->defaultprefix = TQFile::decodeName("c:\\kde"); @@ -1279,7 +1279,7 @@ TQString TDEStandardDirs::kfsstnd_defaultbindir() TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self(); if (!s->defaultbindir.isEmpty()) return s->defaultbindir; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin"); #else //UNIX s->defaultbindir = __TDE_BINDIR; @@ -1340,15 +1340,15 @@ void TDEStandardDirs::addKDEDefaults() } if (!localKdeDir.isEmpty()) { - if (localKdeDir[localKdeDir.length()-1] != QChar('/')) - localKdeDir += QChar('/'); + if (localKdeDir[localKdeDir.length()-1] != TQChar('/')) + localKdeDir += TQChar('/'); } else { localKdeDir = TQDir::homeDirPath() + "/.trinity/"; } - if (localKdeDir != QString("-/")) + if (localKdeDir != TQString("-/")) { localKdeDir = KShell::tildeExpand(localKdeDir); addPrefix(localKdeDir); @@ -1374,7 +1374,7 @@ void TDEStandardDirs::addKDEDefaults() { xdgdirList.clear(); xdgdirList.append("/etc/xdg"); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN xdgdirList.append(kfsstnd_defaultprefix() + "/etc/xdg"); #else xdgdirList.append(KDESYSCONFDIR "/xdg"); @@ -1384,8 +1384,8 @@ void TDEStandardDirs::addKDEDefaults() TQString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); if (!localXdgDir.isEmpty()) { - if (localXdgDir[localXdgDir.length()-1] != QChar('/')) - localXdgDir += QChar('/'); + if (localXdgDir[localXdgDir.length()-1] != TQChar('/')) + localXdgDir += TQChar('/'); } else { @@ -1416,8 +1416,8 @@ void TDEStandardDirs::addKDEDefaults() it != tdedirList.end(); ++it) { TQString dir = *it; - if (dir[dir.length()-1] != QChar('/')) - dir += QChar('/'); + if (dir[dir.length()-1] != TQChar('/')) + dir += TQChar('/'); xdgdirList.append(dir+"share/"); } @@ -1428,8 +1428,8 @@ void TDEStandardDirs::addKDEDefaults() localXdgDir = readEnvPath("XDG_DATA_HOME"); if (!localXdgDir.isEmpty()) { - if (localXdgDir[localXdgDir.length()-1] != QChar('/')) - localXdgDir += QChar('/'); + if (localXdgDir[localXdgDir.length()-1] != TQChar('/')) + localXdgDir += TQChar('/'); } else { diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp index 5f73c6f7e..e6fef9350 100644 --- a/tdecore/kstringhandler.cpp +++ b/tdecore/kstringhandler.cpp @@ -419,8 +419,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa return false; // Patterns like "Makefile*" - if ( pattern[ pattern_len - 1 ] == (QChar)'*' && len + 1 >= pattern_len ) { - if ( pattern[ 0 ] == (QChar)'*' ) + if ( pattern[ pattern_len - 1 ] == (TQChar)'*' && len + 1 >= pattern_len ) { + if ( pattern[ 0 ] == (TQChar)'*' ) { return filename.find(pattern.mid(1, pattern_len - 2)) != -1; } @@ -434,7 +434,7 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa } // Patterns like "*~", "*.extension" - if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len ) + if ( pattern[ 0 ] == (TQChar)'*' && len + 1 >= pattern_len ) { const TQChar *c1 = pattern.unicode() + pattern_len - 1; const TQChar *c2 = filename.unicode() + len - 1; diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp index 3436cdabb..999446b7c 100644 --- a/tdecore/ktimezones.cpp +++ b/tdecore/ktimezones.cpp @@ -245,7 +245,7 @@ TQDateTime KTimezone::convert(const KTimezone *newZone, const TQDateTime &dateTi ::setenv("TZ", newZone->name().utf8(), 1); tzset(); TQDateTime remoteTime; - remoteTime.setTime_t(utc, Qt::LocalTime); + remoteTime.setTime_t(utc, TQt::LocalTime); // Now restore things if (!originalZone) @@ -280,7 +280,7 @@ TQString KTimezone::name() const return m_name; } -int KTimezone::offset(Qt::TimeSpec basisSpec) const +int KTimezone::offset(TQt::TimeSpec basisSpec) const { char *originalZone = ::getenv("TZ"); @@ -290,7 +290,7 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const // Set the timezone and find out what time it is there compared to the basis. ::setenv("TZ", m_name.utf8(), 1); tzset(); - TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime); + TQDateTime remoteTime = TQDateTime::currentDateTime(TQt::LocalTime); int offset = remoteTime.secsTo(basisTime); // Now restore things @@ -507,7 +507,7 @@ const KTimezone *KTimezones::local() // Compute the MD5 sum of /etc/localtime. KMD5 context(""); context.reset(); - context.update(TQT_TQIODEVICE_OBJECT(f)); + context.update(f); TQIODevice::Offset referenceSize = f.size(); TQString referenceMd5Sum = context.hexDigest(); f.close(); @@ -526,7 +526,7 @@ const KTimezone *KTimezones::local() { // Only do the heavy lifting for file sizes which match. context.reset(); - context.update(TQT_TQIODEVICE_OBJECT(f)); + context.update(f); candidateMd5Sum = context.hexDigest(); } f.close(); @@ -605,7 +605,7 @@ const KTimezone *KTimezones::local() for (ZoneMap::Iterator it = m_zones->begin(); it != m_zones->end(); ++it) { KTimezone *zone = it.data(); - int candidateOffset = QABS(zone->offset(Qt::LocalTime)); + int candidateOffset = TQABS(zone->offset(TQt::LocalTime)); if (zone->parse(matcher) && matcher.test() && (candidateOffset < bestOffset)) { // kdError() << "local=" << zone->name() << endl; diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h index 339cbf5bf..bcb1e7a99 100644 --- a/tdecore/ktimezones.h +++ b/tdecore/ktimezones.h @@ -156,7 +156,7 @@ public: * * @return offset in seconds. */ - int offset(Qt::TimeSpec basisSpec = Qt::UTC) const; + int offset(TQt::TimeSpec basisSpec = TQt::UTC) const; /** * Returns the offset of the given timezone to UTC at the given diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp index 12c9c1297..8966063d1 100644 --- a/tdecore/kuniqueapplication.cpp +++ b/tdecore/kuniqueapplication.cpp @@ -38,7 +38,7 @@ #include <kstandarddirs.h> #include <tdeaboutdata.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <twin.h> #include <tdestartupinfo.h> #endif @@ -47,12 +47,12 @@ #include "kdebug.h" #include "kuniqueapplication.h" -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <netwm.h> #include <X11/Xlib.h> #define DISPLAY "DISPLAY" #else -# ifdef Q_WS_QWS +# ifdef TQ_WS_QWS # define DISPLAY "QWS_DISPLAY" # else # define DISPLAY "DISPLAY" @@ -96,7 +96,7 @@ KUniqueApplication::start() return true; s_uniqueTestDone = true; addCmdLineOptions(); // Make sure to add cmd line options -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN s_nofork = true; #else TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("kuniqueapp"); @@ -118,7 +118,7 @@ KUniqueApplication::start() // Check to make sure that we're actually able to register with the DCOP // server. -#ifndef Q_WS_WIN //TODO +#ifndef TQ_WS_WIN //TODO if(dcopClient()->registerAs(appName, false).isEmpty()) { startKdeinit(); if(dcopClient()->registerAs(appName, false).isEmpty()) { @@ -184,7 +184,7 @@ KUniqueApplication::start() ::write(fd[1], &result, 1); ::close(fd[1]); #if 0 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // say we're up and running ( probably no new window will appear ) TDEStartupInfoId id; if( kapp != NULL ) // TDEApplication constructor unsets the env. variable @@ -209,7 +209,7 @@ KUniqueApplication::start() } { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEStartupInfoId id; if( kapp != NULL ) // TDEApplication constructor unsets the env. variable id.initId( kapp->startupId()); @@ -272,7 +272,7 @@ KUniqueApplication::start() } TQCString new_asn_id; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfoId id; if( kapp != NULL ) // TDEApplication constructor unsets the env. variable id.initId( kapp->startupId()); @@ -324,18 +324,18 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c if (s_nofork) { // Can't call newInstance directly from the constructor since it's virtual... - TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) ); } else { // Force to handle DCOP requests (newInstance call) - TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed())); } } -#ifdef Q_WS_X11 -KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual, - Qt::HANDLE colormap, bool allowStyles, bool configUnique) +#ifdef TQ_WS_X11 +KUniqueApplication::KUniqueApplication(Display *display, TQt::HANDLE visual, + TQt::HANDLE colormap, bool allowStyles, bool configUnique) : TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )), DCOPObject(TDECmdLineArgs::about->appName()) { @@ -345,11 +345,11 @@ KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual, if (s_nofork) { // Can't call newInstance directly from the constructor since it's virtual... - TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) ); } else { // Force to handle DCOP requests (newInstance call) - TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed())); } } #endif @@ -380,14 +380,14 @@ void KUniqueApplication::newInstanceNoFork() if (dcopClient()->isSuspended()) { // Try again later. - TQTimer::singleShot( 200, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(newInstanceNoFork()) ); return; } s_handleAutoStarted = false; newInstance(); d->firstInstance = false; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // KDE4 remove // A hack to make startup notification stop for apps which override newInstance() // and reuse an already existing window there, but use KWin::activateWindow() @@ -421,7 +421,7 @@ KUniqueApplication::delayRequest(const TQCString &fun, const TQByteArray &data) d->requestList.append(request); if (!d->processingRequest) { - TQTimer::singleShot(0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(processDelayed())); } } @@ -431,7 +431,7 @@ KUniqueApplication::processDelayed() if (dcopClient()->isSuspended()) { // Try again later. - TQTimer::singleShot( 200, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 200, this, TQ_SLOT(processDelayed())); return; } d->processingRequest = true; @@ -453,7 +453,7 @@ KUniqueApplication::processDelayed() s_handleAutoStarted = false; int exitCode = newInstance(); d->firstInstance = false; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 if( s_handleAutoStarted ) TDEStartupInfo::handleAutoAppStartedSending(); // KDE4 remove? #endif @@ -481,7 +481,7 @@ int KUniqueApplication::newInstance() if ( mainWidget() ) { mainWidget()->show(); -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // This is the line that handles window activation if necessary, // and what's important, it does it properly. If you reimplement newInstance(), // and don't call the inherited one, use this (but NOT when newInstance() diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h index 3b7bd8d6e..6368b53ac 100644 --- a/tdecore/kuniqueapplication.h +++ b/tdecore/kuniqueapplication.h @@ -47,7 +47,7 @@ class KUniqueApplicationPrivate; */ class TDECORE_EXPORT KUniqueApplication : public TDEApplication, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. Takes command line arguments from TDECmdLineArgs @@ -68,7 +68,7 @@ public: bool GUIenabled=true, bool configUnique=false); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Constructor. Takes command line arguments from TDECmdLineArgs * @@ -90,8 +90,8 @@ public: * @since KDE 3.3 */ KUniqueApplication( Display *display, - Qt::HANDLE visual=0, - Qt::HANDLE colormap=0, + TQt::HANDLE visual=0, + TQt::HANDLE colormap=0, bool allowStyles=true, bool configUnique=false); #endif diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index a80257f76..8122bb4bf 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -47,7 +47,7 @@ #include <tqtextcodec.h> #include <tqmutex.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN # define KURL_ROOTDIR_PATH "C:/" #else # define KURL_ROOTDIR_PATH "/" @@ -386,7 +386,7 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de orig_pos = pos; } -#ifdef Q_WS_WIN // prepend drive letter if exists (js) +#ifdef TQ_WS_WIN // prepend drive letter if exists (js) if (orig_pos >= 2 && isalpha(path[0].latin1()) && path[1]==':') { result.prepend(TQString(path[0])+":"); } @@ -670,7 +670,7 @@ void KURL::parse( const TQString& _url, int encoding_hint ) // Node 1: Accept alpha or slash TQChar x = buf[pos++]; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN /* win32: accept <letter>: or <letter>:/ or <letter>:\ */ const bool alpha = isalpha((int)x); if (alpha && len<2) @@ -791,7 +791,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint ) // Node 1: Accept alpha or slash TQChar x = buf[pos++]; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN /* win32: accept <letter>: or <letter>:/ or <letter>:\ */ const bool alpha = isalpha((int)x); if (alpha && len<2) @@ -1608,7 +1608,7 @@ TQString KURL::prettyURL( int _trailing ) const } else { - u += trailingSlash( _trailing, lazy_encode( m_strPath ) ); + u += trailingSlash( _trailing, lazy_encode( m_strPath, false ) ); } if (!m_strQuery_encoded.isNull()) @@ -1628,7 +1628,7 @@ TQString KURL::prettyURL( int _trailing, AdjustementFlags _flags) const TQString u = prettyURL(_trailing); if (_flags & StripFileProtocol && u.startsWith("file://")) { u.remove(0, 7); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return TQDir::convertSeparators(u); #endif } diff --git a/tdecore/kurl.h b/tdecore/kurl.h index 740c8a0df..283fc57f5 100644 --- a/tdecore/kurl.h +++ b/tdecore/kurl.h @@ -128,7 +128,7 @@ class TDECORE_EXPORT KURL { public: /** - * Flags to choose how file: URLs are treated when creating their QString + * Flags to choose how file: URLs are treated when creating their TQString * representation with prettyURL(int,AdjustementFlags) * * However it is recommended to use pathOrURL() instead of this variant of prettyURL() diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp index 07e669dfd..51346cf66 100644 --- a/tdecore/kurldrag.cpp +++ b/tdecore/kurldrag.cpp @@ -150,7 +150,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T return false; // Couldn't decode the URLs } -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS bool KURLDrag::decode( TQStringList const &e, KURL::List &uris ) { TQStringList::ConstIterator end(e.end()); diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h index ccaf86e1a..2c2cd911a 100644 --- a/tdecore/kurldrag.h +++ b/tdecore/kurldrag.h @@ -52,7 +52,7 @@ public: * @param urls the list of URLs * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop, * but should be 0 when copying to the clipboard - * @param name the name of the QObject + * @param name the name of the TQObject */ KURLDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 ); /** @@ -62,7 +62,7 @@ public: * @param metaData a map containing meta data * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop, * but should be 0 when copying to the clipboard - * @param name the name of the QObject + * @param name the name of the TQObject * @see metaData() */ KURLDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData, @@ -133,7 +133,7 @@ public: */ static KURL stringToUrl(const TQCString &s); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS /** * Convenience method that decodes the contents of @p e * into a list of KURLs for Qt versions without a MIME clipboard. diff --git a/tdecore/kxerrorhandler.cpp b/tdecore/kxerrorhandler.cpp index 3a8524bed..ce9197bf6 100644 --- a/tdecore/kxerrorhandler.cpp +++ b/tdecore/kxerrorhandler.cpp @@ -23,7 +23,7 @@ */ #include <tqwidget.h> -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME #include "kxerrorhandler.h" #include <assert.h> diff --git a/tdecore/kxmessages.cpp b/tdecore/kxmessages.cpp index 116c74d1c..b5f18ab04 100644 --- a/tdecore/kxmessages.cpp +++ b/tdecore/kxmessages.cpp @@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> -#ifdef Q_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E +#ifdef TQ_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E #include <X11/Xlib.h> #include <kdebug.h> diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h index 5caec19fc..d3787f6bb 100644 --- a/tdecore/kxmessages.h +++ b/tdecore/kxmessages.h @@ -30,11 +30,7 @@ DEALINGS IN THE SOFTWARE. #include <tqmap.h> #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> class TQString; @@ -52,7 +48,7 @@ class KXMessagesPrivate; class TDECORE_EXPORT KXMessages : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Creates an instance which will receive X messages. diff --git a/tdecore/libintl.cpp b/tdecore/libintl.cpp index 5d2f6a086..c7b8c7ee6 100644 --- a/tdecore/libintl.cpp +++ b/tdecore/libintl.cpp @@ -260,8 +260,8 @@ hash_string (const char *str_param) while (*str != '\0') { hval <<= 4; - hval += (unsigned long) *str++; - g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4)); + hval += (unsigned char) *str++; + g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); if (g != 0) { hval ^= g >> (HASHWORDBITS - 8); diff --git a/tdecore/libqt-mt.nmcheck b/tdecore/libqt-mt.nmcheck index e18ee438f..d5962f37a 100644 --- a/tdecore/libqt-mt.nmcheck +++ b/tdecore/libqt-mt.nmcheck @@ -4,7 +4,7 @@ Q*::* qt_* -# these should preferably go in some namespace in Qt4 +# these should preferably go in some namespace tqDebug tqFatal tqWarning diff --git a/tdecore/malloc/malloc.c b/tdecore/malloc/malloc.c index 5cdab5ac7..0c02ee307 100644 --- a/tdecore/malloc/malloc.c +++ b/tdecore/malloc/malloc.c @@ -4306,7 +4306,7 @@ static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_ remainder_size = chunksize(p); if (opts & 0x2) { /* optionally clear the elements */ - memset(mem, 0, remainder_size - SIZE_SZ - array_size) + memset(mem, 0, remainder_size - SIZE_SZ - array_size); } /* If not provided, allocate the pointer array as final part of chunk */ diff --git a/tdecore/netwm.cpp b/tdecore/netwm.cpp index c1e876eeb..1e0670333 100644 --- a/tdecore/netwm.cpp +++ b/tdecore/netwm.cpp @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tqapplication.h> -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME #include "netwm.h" @@ -1602,7 +1602,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom ) } void NETRootInfo::setActiveWindow(Window window) { - setActiveWindow( window, FromUnknown, GET_QT_X_USER_TIME(), None ); + setActiveWindow( window, FromUnknown, get_tqt_x_user_time(), None ); } void NETRootInfo::setActiveWindow(Window window, NET::RequestSource src, @@ -1811,7 +1811,7 @@ void NETRootInfo::moveResizeWindowRequest(Window window, int flags, int x, int y void NETRootInfo::restackRequest(Window window, Window above, int detail) { - restackRequest( window, FromTool, above, detail, GET_QT_X_USER_TIME() ); + restackRequest( window, FromTool, above, detail, get_tqt_x_user_time() ); } void NETRootInfo::restackRequest(Window window, RequestSource src, Window above, int detail, Time timestamp ) diff --git a/tdecore/netwm.h b/tdecore/netwm.h index ca8ed5139..8baef6ea3 100644 --- a/tdecore/netwm.h +++ b/tdecore/netwm.h @@ -29,7 +29,7 @@ #include "tdelibs_export.h" #include <tqwidget.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp index aaac54b03..08f899c8a 100644 --- a/tdecore/network/kbufferedsocket.cpp +++ b/tdecore/network/kbufferedsocket.cpp @@ -93,12 +93,7 @@ void TDEBufferedSocket::close() } } -#ifdef USE_QT3 TQ_LONG TDEBufferedSocket::bytesAvailable() const -#endif -#ifdef USE_QT4 -qint64 TDEBufferedSocket::bytesAvailable() const -#endif { if (!d->input) return KStreamSocket::bytesAvailable(); @@ -118,7 +113,7 @@ TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout) return retval; } -TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQ_LONG TDEBufferedSocket::readBlock(char *data, TQ_ULONG maxlen) { if (d->input) { @@ -131,13 +126,13 @@ TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) resetError(); return d->input->consumeBuffer(data, maxlen); } - return KStreamSocket::tqreadBlock(data, maxlen); + return KStreamSocket::readBlock(data, maxlen); } -TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) +TQ_LONG TDEBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); - return tqreadBlock(data, maxlen); + return readBlock(data, maxlen); } TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) @@ -162,7 +157,7 @@ TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre return peekBlock(data, maxlen); } -TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQ_LONG TDEBufferedSocket::writeBlock(const char *data, TQ_ULONG len) { if (state() != Connected) { @@ -189,14 +184,14 @@ TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG l return d->output->feedBuffer(data, len); } - return KStreamSocket::tqwriteBlock(data, len); + return KStreamSocket::writeBlock(data, len); } -TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, +TQ_LONG TDEBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen, const TDESocketAddress&) { // ignore the third parameter - return tqwriteBlock(data, maxlen); + return writeBlock(data, maxlen); } void TDEBufferedSocket::enableRead(bool enable) @@ -213,7 +208,7 @@ void TDEBufferedSocket::enableRead(bool enable) if (enable && state() != Connected && d->input && !d->input->isEmpty()) // this means the buffer is still dirty // allow the signal to be emitted - TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity())); } void TDEBufferedSocket::enableWrite(bool enable) @@ -284,12 +279,7 @@ TDEIOBufferBase* TDEBufferedSocket::outputBuffer() return d->output; } -#ifdef USE_QT3 TQ_ULONG TDEBufferedSocket::bytesToWrite() const -#endif -#ifdef USE_QT4 -qint64 TDEBufferedSocket::bytesToWrite() const -#endif { if (!d->output) return 0; @@ -368,7 +358,7 @@ void TDEBufferedSocket::slotReadActivity() { // buffer isn't empty // keep emitting signals till it is - TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity())); emit readyRead(); } } diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h index bd172330b..641d35cd1 100644 --- a/tdecore/network/kbufferedsocket.h +++ b/tdecore/network/kbufferedsocket.h @@ -57,7 +57,7 @@ class TDEBufferedSocketPrivate; */ class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket { - Q_OBJECT + TQ_OBJECT public: /** @@ -99,12 +99,7 @@ public: /** * Make use of the buffers. */ -#ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const; -#endif -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif /** * Make use of buffers. @@ -114,7 +109,7 @@ public: /** * Reads data from the socket. Make use of buffers. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * @overload @@ -122,7 +117,7 @@ public: * * The @p from parameter is always set to @ref peerAddress() */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Peeks data from the socket. @@ -140,7 +135,7 @@ public: /** * Writes data to the socket. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * @overload @@ -148,7 +143,7 @@ public: * * The @p to parameter is discarded. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Catch changes. @@ -183,12 +178,7 @@ public: /** * Returns the length of the output buffer. */ -#ifdef USE_QT3 virtual TQ_ULONG bytesToWrite() const; -#endif -#ifdef USE_QT4 - virtual qint64 bytesToWrite() const; -#endif /** * Closes the socket and discards any output data that had been buffered @@ -208,8 +198,6 @@ public: */ TQCString readLine(); - // KDE4: make virtual, add timeout to match the Qt4 signature - // and move to another class up the hierarchy /** * Blocks until the connection is either established, or completely * failed. @@ -255,12 +243,7 @@ public: * which required a call to reset() in order to be able to connect again * using the same device. This is not necessary in TDEBufferedSocket any more. */ -#ifdef USE_QT3 inline void reset() -#endif -#ifdef USE_QT4 - inline bool reset() -#endif { closeNow(); } }; diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp index eaf669bb9..25eb34d8e 100644 --- a/tdecore/network/kclientsocketbase.cpp +++ b/tdecore/network/kclientsocketbase.cpp @@ -48,16 +48,8 @@ public: }; KClientSocketBase::KClientSocketBase(TQObject *parent, const char *name) : -#ifdef USE_QT4 -#else // USE_QT4 - TQObject(parent, name), -#endif // USE_QT4 - d(new KClientSocketBasePrivate) -{ -#ifdef USE_QT4 - setParent(parent); - setObjectName(name); -#endif // USE_QT4 + TQObject(parent, name), d(new KClientSocketBasePrivate) +{ d->state = Idle; d->enableRead = true; d->enableWrite = false; @@ -152,10 +144,10 @@ bool KClientSocketBase::lookup() // don't restart the lookups if they had succeeded and // the input values weren't changed - TQObject::connect(&d->peerResolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); - TQObject::connect(&d->localResolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->peerResolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->localResolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); if (d->localResolver.status() <= 0) d->localResolver.start(); @@ -172,7 +164,7 @@ bool KClientSocketBase::lookup() if (blocking()) lookupFinishedSlot(); else - TQTimer::singleShot(0, this, TQT_SLOT(lookupFinishedSlot())); + TQTimer::singleShot(0, this, TQ_SLOT(lookupFinishedSlot())); } else { @@ -286,12 +278,7 @@ void KClientSocketBase::close() } // This function is unlike all the others because it is const -#ifdef USE_QT3 TQ_LONG KClientSocketBase::bytesAvailable() const -#endif -#ifdef USE_QT4 -qint64 KClientSocketBase::bytesAvailable() const -#endif { return socketDevice()->bytesAvailable(); } @@ -311,10 +298,10 @@ TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout) return retval; } -TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen) { resetError(); - TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen); + TQ_LONG retval = socketDevice()->readBlock(data, maxlen); if (retval == -1) { copyError(); @@ -323,10 +310,10 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) +TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { resetError(); - TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from); + TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from); if (retval == -1) { copyError(); @@ -359,10 +346,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre return retval; } -TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len) { resetError(); - TQ_LONG retval = socketDevice()->tqwriteBlock(data, len); + TQ_LONG retval = socketDevice()->writeBlock(data, len); if (retval == -1) { copyError(); @@ -371,10 +358,10 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l return retval; } -TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) +TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { resetError(); - TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to); + TQ_LONG retval = socketDevice()->writeBlock(data, len, to); if (retval == -1) { copyError(); @@ -440,8 +427,8 @@ void KClientSocketBase::lookupFinishedSlot() if (d->peerResolver.isRunning() || d->localResolver.isRunning() || state() != HostLookup) return; - TQObject::disconnect(&d->peerResolver, 0L, this, TQT_SLOT(lookupFinishedSlot())); - TQObject::disconnect(&d->localResolver, 0L, this, TQT_SLOT(lookupFinishedSlot())); + TQObject::disconnect(&d->peerResolver, 0L, this, TQ_SLOT(lookupFinishedSlot())); + TQObject::disconnect(&d->localResolver, 0L, this, TQ_SLOT(lookupFinishedSlot())); if (d->peerResolver.status() < 0 || d->localResolver.status() < 0) { setState(Idle); // backtrack @@ -466,7 +453,7 @@ void KClientSocketBase::stateChanging(SocketState newState) if (n) { n->setEnabled(d->enableRead); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity())); } else return; @@ -475,7 +462,7 @@ void KClientSocketBase::stateChanging(SocketState newState) if (n) { n->setEnabled(d->enableWrite); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity())); } else return; diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h index 65c852ddb..a6f9eaf92 100644 --- a/tdecore/network/kclientsocketbase.h +++ b/tdecore/network/kclientsocketbase.h @@ -32,10 +32,6 @@ #include "kresolver.h" #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define USE_QT4 -#endif // Q_MOC_RUN - namespace KNetwork { class KClientSocketBasePrivate; @@ -50,14 +46,9 @@ class KClientSocketBasePrivate; * * @author Thiago Macieira <thiago.macieira@kdemail.net> */ -class TDECORE_EXPORT KClientSocketBase : -#ifdef USE_QT4 -#else // USE_QT4 -public TQObject, -#endif // USE_QT4 -public KActiveSocketBase +class TDECORE_EXPORT KClientSocketBase : public TQObject, public KActiveSocketBase { - Q_OBJECT + TQ_OBJECT public: @@ -281,7 +272,7 @@ public: * * You should not call this function; instead, use @ref connect */ - virtual inline bool open(TQ_OpenMode) + virtual inline bool open(int) { return connect(); } /** @@ -302,12 +293,7 @@ public: * Returns the number of bytes available on this socket. * Reimplemented from TDESocketBase. */ -#ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const; -#endif -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif /** * Waits for more data. Reimplemented from TDESocketBase. @@ -317,13 +303,13 @@ public: /** * Reads data from a socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * @overload * Reads data from a socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Peeks data from the socket. Reimplemented from TDESocketBase. @@ -339,13 +325,13 @@ public: /** * Writes data to the socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * @overload * Writes data to the socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Returns the local socket address. Reimplemented from TDESocketBase. diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp index 41d9cc7e9..5fa631560 100644 --- a/tdecore/network/kdatagramsocket.cpp +++ b/tdecore/network/kdatagramsocket.cpp @@ -52,11 +52,11 @@ KDatagramSocket::KDatagramSocket(TQObject* parent, const char *name) localResolver().setFlags(KResolver::Passive); - // TQObject::connect(localResolver(), TQT_SIGNAL(finished(KResolverResults)), - // this, TQT_SLOT(lookupFinishedLocal())); - TQObject::connect(&peerResolver(), TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedPeer())); - TQObject::connect(this, TQT_SIGNAL(hostFound()), this, TQT_SLOT(lookupFinishedLocal())); + // TQObject::connect(localResolver(), TQ_SIGNAL(finished(KResolverResults)), + // this, TQ_SLOT(lookupFinishedLocal())); + TQObject::connect(&peerResolver(), TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedPeer())); + TQObject::connect(this, TQ_SIGNAL(hostFound()), this, TQ_SLOT(lookupFinishedLocal())); } KDatagramSocket::~KDatagramSocket() @@ -156,7 +156,7 @@ KDatagramPacket KDatagramSocket::receive() TDESocketAddress address; // now do the reading - size = tqreadBlock(data.data(), size, address); + size = readBlock(data.data(), size, address); if (size < 0) // error has been set return KDatagramPacket(); @@ -167,10 +167,10 @@ KDatagramPacket KDatagramSocket::receive() TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet) { - return tqwriteBlock(packet.data(), packet.size(), packet.address()); + return writeBlock(packet.data(), packet.size(), packet.address()); } -TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) +TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { if (to.family() != AF_UNSPEC) { @@ -179,7 +179,7 @@ TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDES // error handling will happen below socketDevice()->create(to.family(), SOCK_DGRAM, 0); } - return KClientSocketBase::tqwriteBlock(data, len, to); + return KClientSocketBase::writeBlock(data, len, to); } void KDatagramSocket::lookupFinishedLocal() @@ -265,7 +265,7 @@ void KDatagramSocket::setupSignals() if (n) { n->setEnabled(emitsReadyRead()); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity())); } else return; @@ -274,7 +274,7 @@ void KDatagramSocket::setupSignals() if (n) { n->setEnabled(emitsReadyWrite()); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity())); } else return; diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h index ae88fda29..b99938e8b 100644 --- a/tdecore/network/kdatagramsocket.h +++ b/tdecore/network/kdatagramsocket.h @@ -179,7 +179,7 @@ class KDatagramSocketPrivate; */ class TDECORE_EXPORT KDatagramSocket: public KClientSocketBase { - Q_OBJECT + TQ_OBJECT public: @@ -223,7 +223,7 @@ public: * * Connecting means only to designate the given address as the default * destination address for datagrams sent without destination addresses - * ( tqwriteBlock(const char *, TQ_ULONG) ). + * ( writeBlock(const char *, TQ_ULONG) ). * * @note Calling connect will not cause the socket to be bound. You have * to call @ref bind explicitly. @@ -241,7 +241,7 @@ public: /** * Writes data to the socket. Reimplemented from KClientSocketBase. */ - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Receives one datagram from the stream. The reading process is guaranteed diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp index a5fad9cbe..980fa39d5 100644 --- a/tdecore/network/khttpproxysocketdevice.cpp +++ b/tdecore/network/khttpproxysocketdevice.cpp @@ -182,7 +182,7 @@ bool KHttpProxySocketDevice::parseServerReply() if (!d->request.isEmpty()) { // send request - TQ_LONG written = tqwriteBlock(d->request, d->request.length()); + TQ_LONG written = writeBlock(d->request, d->request.length()); if (written < 0) { tqDebug("KHttpProxySocketDevice: would block writing request!"); @@ -230,7 +230,7 @@ bool KHttpProxySocketDevice::parseServerReply() { // no, headers not yet finished... // consume data from socket - tqreadBlock(buf.data(), avail); + readBlock(buf.data(), avail); d->reply += buf.data(); setError(IO_ConnectError, InProgress); return true; @@ -241,7 +241,7 @@ bool KHttpProxySocketDevice::parseServerReply() d->reply += fullHeaders.mid(d->reply.length(), index + 4); // consume from socket - tqreadBlock(buf.data(), index + 4); + readBlock(buf.data(), index + 4); } else { diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index 953ee7265..f80b9209e 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -550,7 +550,7 @@ void KResolver::emitFinished() emit finished(d->results); if (p && d->deleteWhenDone) - deleteLater(); // in QObject + deleteLater(); // in TQObject } TQString KResolver::errorString(int errorcode, int syserror) @@ -591,7 +591,7 @@ KResolverResults KResolver::resolve(const TQString& host, const TQString& service, int flags, int families) { - KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver"); + KResolver qres(host, service, tqApp, "synchronous KResolver"); qres.setFlags(flags); qres.setFamily(families); qres.start(); @@ -603,8 +603,8 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot, const TQString& host, const TQString& service, int flags, int families) { - KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver"); - TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot); + KResolver* qres = new KResolver(host, service, tqApp, "asynchronous KResolver"); + TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)), userObj, userSlot); qres->setFlags(flags); qres->setFamily(families); qres->d->deleteWhenDone = true; // this is the only difference from the example code diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h index dbcf0d102..51e605704 100644 --- a/tdecore/network/kresolver.h +++ b/tdecore/network/kresolver.h @@ -294,7 +294,7 @@ class KResolverPrivate; */ class TDECORE_EXPORT KResolver: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -759,7 +759,7 @@ public: * * \code * KResolver* qres = new KResolver(host, service); - * TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), + * TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)), * userObj, userSlot); * qres->setFlags(flags); * qres->setFamily(families); @@ -768,7 +768,7 @@ public: * * You should use it like this in your code: * \code - * KResolver::resolveAsync(myObj, TQT_SLOT(mySlot(KResolverResults)), host, service); + * KResolver::resolveAsync(myObj, TQ_SLOT(mySlot(KResolverResults)), host, service); * \endcode * * @param userObj the object whose slot @p userSlot we will connect diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h index 47a99e3ac..41dc38e90 100644 --- a/tdecore/network/kreverseresolver.h +++ b/tdecore/network/kreverseresolver.h @@ -49,7 +49,7 @@ class KReverseResolverPrivate; */ class TDECORE_EXPORT KReverseResolver: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index 94532de19..0cfba8fa5 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -61,15 +61,15 @@ public: TDEServerSocket::TDEServerSocket(TQObject* parent, const char *name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); } TDEServerSocket::TDEServerSocket(const TQString& service, TQObject* parent, const char *name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); d->resolver.setServiceName(service); } @@ -77,8 +77,8 @@ TDEServerSocket::TDEServerSocket(const TQString& node, const TQString& service, TQObject* parent, const char* name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); setAddress(node, service); } @@ -403,8 +403,8 @@ bool TDEServerSocket::doListen() } // set up ready accept signal - TQObject::connect(socketDevice()->readNotifier(), TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(readyAccept())); + TQObject::connect(socketDevice()->readNotifier(), TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(readyAccept())); d->state = TDEServerSocketPrivate::Listening; return true; } diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h index beb43aeb7..637dc92d0 100644 --- a/tdecore/network/kserversocket.h +++ b/tdecore/network/kserversocket.h @@ -50,8 +50,8 @@ class TDEServerSocketPrivate; * \code * TQString service = "http"; * TDEServerSocket *ss = new TDEServerSocket(service); - * connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - * connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + * connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + * connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); * ss->listen(); * \endcode * @@ -84,8 +84,8 @@ class TDEServerSocketPrivate; * if( !found ) { * // Couldn't connect to any port. * } else { - * connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - * connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + * connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + * connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); * ss->listen(); * } * \endcode @@ -106,7 +106,7 @@ class TDEServerSocketPrivate; */ class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp index b7171999c..c4ac6b4dc 100644 --- a/tdecore/network/ksockssocketdevice.cpp +++ b/tdecore/network/ksockssocketdevice.cpp @@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketA return 0; } -TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen) +TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from) +TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -298,12 +298,12 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddr return retval; } -TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len) +TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len) { - return tqwriteBlock(data, len, TDESocketAddress()); + return writeBlock(data, len, TDESocketAddress()); } -TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) +TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { resetError(); if (m_sockfd == -1) diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h index c899ce58f..760038143 100644 --- a/tdecore/network/ksockssocketdevice.h +++ b/tdecore/network/ksockssocketdevice.h @@ -83,8 +83,8 @@ public: /** * Overrides reading. */ - virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen); - virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Overrides peeking. @@ -95,8 +95,8 @@ public: /** * Overrides writing. */ - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len); - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Overrides getting socket address. diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp index 8f918977e..568e0d22b 100644 --- a/tdecore/network/ksrvresolverworker.cpp +++ b/tdecore/network/ksrvresolverworker.cpp @@ -226,7 +226,7 @@ bool KSrvResolverWorker::postprocess() void KSrvResolverWorker::customEvent(TQCustomEvent*) { dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv); - TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(dns, TQ_SIGNAL(resultsReady()), this, TQ_SLOT(dnsResultsReady())); } void KSrvResolverWorker::dnsResultsReady() diff --git a/tdecore/network/ksrvresolverworker_p.h b/tdecore/network/ksrvresolverworker_p.h index 5080c4a59..efb4c45f9 100644 --- a/tdecore/network/ksrvresolverworker_p.h +++ b/tdecore/network/ksrvresolverworker_p.h @@ -41,7 +41,7 @@ namespace KNetwork class KSrvResolverWorker: public TQObject, public KNetwork::KResolverWorkerBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/network/kstreamsocket.cpp b/tdecore/network/kstreamsocket.cpp index c323a212e..a36f8cc78 100644 --- a/tdecore/network/kstreamsocket.cpp +++ b/tdecore/network/kstreamsocket.cpp @@ -61,7 +61,7 @@ KStreamSocket::KStreamSocket(const TQString& node, const TQString& service, setSocketOptions(socketOptions() & ~Blocking); - TQObject::connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutSlot())); + TQObject::connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutSlot())); } KStreamSocket::~KStreamSocket() @@ -130,7 +130,7 @@ bool KStreamSocket::connect(const TQString& node, const TQString& service) // connection hasn't started yet if (!blocking()) { - QObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot())); + TQObject::connect(this, TQ_SIGNAL(hostFound()), TQ_SLOT(hostFoundSlot())); return lookup(); } @@ -196,10 +196,10 @@ bool KStreamSocket::connect(const KResolverEntry& entry) void KStreamSocket::hostFoundSlot() { - QObject::disconnect(this, TQT_SLOT(hostFoundSlot())); + TQObject::disconnect(this, TQ_SLOT(hostFoundSlot())); if (timeout() > 0) d->timer.start(timeout(), true); - TQTimer::singleShot(0, this, TQT_SLOT(connectionEvent())); + TQTimer::singleShot(0, this, TQ_SLOT(connectionEvent())); } void KStreamSocket::connectionEvent() @@ -267,13 +267,13 @@ void KStreamSocket::connectionEvent() if (socketDevice()->error() == InProgress) { TQSocketNotifier *n = socketDevice()->readNotifier(); - TQObject::connect(n, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(connectionEvent())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(connectionEvent())); n->setEnabled(true); n = socketDevice()->writeNotifier(); - TQObject::connect(n, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(connectionEvent())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(connectionEvent())); n->setEnabled(true); return; // wait for activity @@ -350,8 +350,8 @@ bool KStreamSocket::bindLocallyFor(const KResolverEntry& peer) void KStreamSocket::connectionSucceeded(const KResolverEntry& peer) { - TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQT_SLOT(connectionEvent())); - TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQT_SLOT(connectionEvent())); + TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQ_SLOT(connectionEvent())); + TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQ_SLOT(connectionEvent())); resetError(); setFlags(IO_Sequential | IO_Raw | IO_ReadWrite | IO_Open | IO_Async); diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h index 94396b38d..a7557d585 100644 --- a/tdecore/network/kstreamsocket.h +++ b/tdecore/network/kstreamsocket.h @@ -70,14 +70,14 @@ class KStreamSocketPrivate; * : socket(hostname, port) * { * // connect signals to our slots - * TQObject::connect(&socket, TQT_SIGNAL(connected(const KResolverEntry&)), - * this, TQT_SLOT(slotSocketConnected())); - * TQObject::connect(&socket, TQT_SIGNAL(gotError(int)), - * this, TQT_SLOT(slotSocketError(int))); - * TQObject::connect(&socket, TQT_SIGNAL(readyRead()), - * this, TQT_SLOT(slotSocketReadyToRead())); - * TQObject::connect(&socket, TQT_SIGNAL(readyWrite()), - * this, TQT_SLOT(slotSocketReadyToWrite())); + * TQObject::connect(&socket, TQ_SIGNAL(connected(const KResolverEntry&)), + * this, TQ_SLOT(slotSocketConnected())); + * TQObject::connect(&socket, TQ_SIGNAL(gotError(int)), + * this, TQ_SLOT(slotSocketError(int))); + * TQObject::connect(&socket, TQ_SIGNAL(readyRead()), + * this, TQ_SLOT(slotSocketReadyToRead())); + * TQObject::connect(&socket, TQ_SIGNAL(readyWrite()), + * this, TQ_SLOT(slotSocketReadyToWrite())); * * // set non-blocking mode in order to work asynchronously * socket.setBlocking(false); @@ -96,7 +96,7 @@ class KStreamSocketPrivate; */ class TDECORE_EXPORT KStreamSocket: public KClientSocketBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp index 7379eb74a..0b2ef90d7 100644 --- a/tdecore/network/tdesocketbase.cpp +++ b/tdecore/network/tdesocketbase.cpp @@ -291,7 +291,7 @@ KActiveSocketBase::~KActiveSocketBase() int KActiveSocketBase::getch() { unsigned char c; - if (tqreadBlock((char*)&c, 1) != 1) + if (readBlock((char*)&c, 1) != 1) return -1; return c; @@ -300,7 +300,7 @@ int KActiveSocketBase::getch() int KActiveSocketBase::putch(int ch) { unsigned char c = (unsigned char)ch; - if (tqwriteBlock((char*)&c, 1) != 1) + if (writeBlock((char*)&c, 1) != 1) return -1; return c; diff --git a/tdecore/network/tdesocketbase.h b/tdecore/network/tdesocketbase.h index 706900117..d2a213300 100644 --- a/tdecore/network/tdesocketbase.h +++ b/tdecore/network/tdesocketbase.h @@ -63,10 +63,10 @@ #include <tdelibs_export.h> /* - * This is extending QIODevice's error codes + * This is extending TQIODevice's error codes * * According to tqiodevice.h, the last error is IO_UnspecifiedError - * These errors will never occur in functions declared in QIODevice + * These errors will never occur in functions declared in TQIODevice * (except open, but you shouldn't call open) */ #define IO_ListenError (IO_UnspecifiedError+1) @@ -504,11 +504,7 @@ public: * This call is not supported on sockets. Reimplemented from TQIODevice. * This will always return 0. */ -#ifdef USE_QT4 - virtual qint64 size() const -#else // USE_QT4 virtual Offset size() const -#endif // USE_QT4 { return 0; } /** @@ -536,12 +532,7 @@ public: * Returns the number of bytes available for reading without * blocking. */ -#ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const = 0; -#endif -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const = 0; -#endif /** * Waits up to @p msecs for more data to be available on this socket. @@ -562,7 +553,7 @@ public: * Reimplemented from TQIODevice. See TQIODevice::readBlock for * more information. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG len) = 0; + virtual TQ_LONG readBlock(char *data, TQ_ULONG len) = 0; /** @overload * Receives data and the source address. @@ -575,7 +566,7 @@ public: * @param from the address of the sender will be stored here * @returns the actual number of bytes read */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) = 0; + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) = 0; /** * Peeks the data in the socket. @@ -610,7 +601,7 @@ public: * Reimplemented from TQIODevice. See TQIODevice::writeBlock for * more information. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len) = 0; + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len) = 0; /** @overload * Writes the given data to the destination address. @@ -623,7 +614,7 @@ public: * @param to the address to send to * @returns the number of bytes actually sent */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) = 0; + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) = 0; /** * Reads one character from the socket. diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp index 49bdbe31e..36e64e0f0 100644 --- a/tdecore/network/tdesocketbuffer.cpp +++ b/tdecore/network/tdesocketbuffer.cpp @@ -274,7 +274,7 @@ TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len) } // now try to write those bytes - TQ_LONG wrote = dev->tqwriteBlock(buf, count); + TQ_LONG wrote = dev->writeBlock(buf, count); if (wrote == -1) // error? @@ -315,7 +315,7 @@ TQ_LONG TDESocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len) // now do the reading TQByteArray a(len); - len = dev->tqreadBlock(a.data(), len); + len = dev->readBlock(a.data(), len); if (len == -1) // error? diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp index 6f3ec755b..b5aef0943 100644 --- a/tdecore/network/tdesocketdevice.cpp +++ b/tdecore/network/tdesocketdevice.cpp @@ -171,7 +171,7 @@ bool TDESocketDevice::setSocketOptions(int opts) return true; // all went well } -bool TDESocketDevice::open(TQ_OpenMode) +bool TDESocketDevice::open(int) { resetError(); return false; @@ -364,12 +364,7 @@ bool TDESocketDevice::disconnect() return true; // all is well } -#ifdef USE_QT3 TQ_LONG TDESocketDevice::bytesAvailable() const -#endif -#ifdef USE_QT4 -qint64 TDESocketDevice::bytesAvailable() const -#endif { if (m_sockfd == -1) return -1; // there's nothing to read in a closed socket @@ -419,7 +414,7 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddr return 0; } -TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQ_LONG TDESocketDevice::readBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -440,7 +435,7 @@ TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress &from) +TQ_LONG TDESocketDevice::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -503,12 +498,12 @@ TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress return retval; } -TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQ_LONG TDESocketDevice::writeBlock(const char *data, TQ_ULONG len) { - return tqwriteBlock(data, len, TDESocketAddress()); + return writeBlock(data, len, TDESocketAddress()); } -TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) +TQ_LONG TDESocketDevice::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { resetError(); if (m_sockfd == -1) diff --git a/tdecore/network/tdesocketdevice.h b/tdecore/network/tdesocketdevice.h index e5477c0c6..2196e9d3f 100644 --- a/tdecore/network/tdesocketdevice.h +++ b/tdecore/network/tdesocketdevice.h @@ -142,7 +142,7 @@ public: /** * Reimplementation from TQIODevice. You should not call this function in sockets. */ - virtual bool open(TQ_OpenMode mode); + virtual bool open(int mode); /** * Closes the socket. Reimplemented from TQIODevice. @@ -198,12 +198,7 @@ public: /** * Returns the number of bytes available for reading without blocking. */ -#ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const; -#endif -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif /** * Waits up to @p msecs for more data to be available on this socket. @@ -216,12 +211,12 @@ public: /** * Reads data from this socket. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * Reads data and the source address from this socket. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Peeks data in the socket. @@ -236,12 +231,12 @@ public: /** * Writes data to the socket. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * Writes the given data to the given destination address. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Returns this socket's local address. diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp index 3e68624c6..79f34d806 100644 --- a/tdecore/svgicons/ksvgiconengine.cpp +++ b/tdecore/svgicons/ksvgiconengine.cpp @@ -202,11 +202,7 @@ public: TQWMatrix matrix = m_engine->painter()->parseTransform(transform); TQWMatrix *current = m_engine->painter()->worldMatrix(); -#ifdef USE_QT4 -printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n"); -#else // USE_QT4 *current = matrix * *current; -#endif // USE_QT4 } void parseCommonAttributes(TQDomNode &node) @@ -445,7 +441,7 @@ printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for n { // Scale, if needed if(image.width() != (int) w || image.height() != (int) h) - image = image.smoothScale((int) w, (int) h, TQ_ScaleFree); + image = image.smoothScale((int) w, (int) h, TQImage::ScaleFree); m_engine->painter()->drawImage(x, y, image); } diff --git a/tdecore/svgicons/ksvgiconpainter.cpp b/tdecore/svgicons/ksvgiconpainter.cpp index e0e2a2ce9..7c2859656 100644 --- a/tdecore/svgicons/ksvgiconpainter.cpp +++ b/tdecore/svgicons/ksvgiconpainter.cpp @@ -57,7 +57,7 @@ public: m_clipSVP = 0; - m_fillColor = Qt::black; + m_fillColor = TQt::black; m_useFill = true; m_useStroke = false; diff --git a/tdecore/tdeaboutdata.cpp b/tdecore/tdeaboutdata.cpp index 3a147842a..48f41645d 100644 --- a/tdecore/tdeaboutdata.cpp +++ b/tdecore/tdeaboutdata.cpp @@ -446,6 +446,10 @@ TDEAboutData::license() const l = "QPL v1.0"; f = locate("data", "LICENSES/QPL_V1.0"); break; + case License_MIT: + l = "MIT"; + f = locate("data", "LICENSES/MIT"); + break; case License_Custom: if (mLicenseText && *mLicenseText) return( i18n(mLicenseText) ); diff --git a/tdecore/tdeaboutdata.h b/tdecore/tdeaboutdata.h index 06f193f75..071da368b 100644 --- a/tdecore/tdeaboutdata.h +++ b/tdecore/tdeaboutdata.h @@ -199,7 +199,8 @@ class TDECORE_EXPORT TDEAboutData License_QPL = 5, License_QPL_V1_0 = 5, License_GPL_V3 = 6, - License_LGPL_V3 = 7 + License_LGPL_V3 = 7, + License_MIT = 8 }; public: diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp index 5430c2529..5d098e4d4 100644 --- a/tdecore/tdeaccel.cpp +++ b/tdecore/tdeaccel.cpp @@ -34,7 +34,7 @@ #include "tdeaccelprivate.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 # include <X11/Xlib.h> # ifdef KeyPress // needed for --enable-final // defined by X11 headers @@ -49,7 +49,7 @@ //--------------------------------------------------------------------- // // In TDEAccelEventHandler::x11Event we do our own X11 keyboard event handling -// This allows us to map the Win key to Qt::MetaButton, Qt does not know about +// This allows us to map the Win key to TQt::MetaButton, Qt does not know about // the Win key. // // TDEAccelEventHandler::x11Event will generate an AccelOverride event. The @@ -95,7 +95,7 @@ class TDEAccelEventHandler : public TQWidget private: TDEAccelEventHandler(); -# ifdef Q_WS_X11 +# ifdef TQ_WS_X11 bool x11Event( XEvent* pEvent ); # endif @@ -109,13 +109,13 @@ bool TDEAccelEventHandler::g_bAccelActivated = false; TDEAccelEventHandler::TDEAccelEventHandler() : TQWidget( 0, "TDEAccelEventHandler" ) { -# ifdef Q_WS_X11 +# ifdef TQ_WS_X11 if ( kapp ) - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + kapp->installX11EventFilter( this ); # endif } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool tqt_try_modal( TQWidget *, XEvent * ); bool TDEAccelEventHandler::x11Event( XEvent* pEvent ) @@ -157,7 +157,7 @@ bool TDEAccelEventHandler::x11Event( XEvent* pEvent ) return false; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 //--------------------------------------------------------------------- // TDEAccelPrivate @@ -170,9 +170,9 @@ TDEAccelPrivate::TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch ) m_pAccel = pParent; m_pWatch = pWatch; m_bAutoUpdate = true; - connect( (TQAccel*)m_pAccel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyPressed(int)) ); + connect( (TQAccel*)m_pAccel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotKeyPressed(int)) ); -#ifdef Q_WS_X11 //only makes sense if TDEAccelEventHandler is working +#ifdef TQ_WS_X11 //only makes sense if TDEAccelEventHandler is working if( m_pWatch ) m_pWatch->installEventFilter( this ); #endif @@ -237,10 +237,10 @@ bool TDEAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& m_mapIDToKey[nID] = keyQt; if( action.objSlotPtr() && action.methodSlotPtr() ) { -#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ ((TQAccel*)m_pAccel)->connectItem( nID, action.objSlotPtr(), action.methodSlotPtr() ); #else - ((TQAccel*)m_pAccel)->connectItem( nID, this, TQT_SLOT(slotKeyPressed(int))); + ((TQAccel*)m_pAccel)->connectItem( nID, this, TQ_SLOT(slotKeyPressed(int))); #endif if( !action.isEnabled() ) ((TQAccel*)m_pAccel)->setItemEnabled( nID, false ); @@ -318,9 +318,9 @@ void TDEAccelPrivate::slotKeyPressed( int id ) int iAction = pMenu->idAt(1); slotMenuActivated( iAction ); } else { - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) ); pMenu->exec( m_pWatch->mapToGlobal( TQPoint( 0, 0 ) ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) ); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) ); } delete pMenu; } @@ -334,11 +334,11 @@ void TDEAccelPrivate::slotMenuActivated( int iAction ) { kdDebug(125) << "TDEAccelPrivate::slotMenuActivated( " << iAction << " )" << endl; TDEAccelAction* pAction = actions().actionPtr( iAction ); -#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ if( pAction ) { - connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); - disconnect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + disconnect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } #else emitActivatedSignal( pAction ); @@ -362,12 +362,12 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent ) TDEAccelAction* pAction = m_mapIDToAction[nID]; if( !pAction->isEnabled() ) continue; -#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ TQGuardedPtr<TDEAccelPrivate> me = this; - connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); if (me) { - disconnect( me, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } #else emitActivatedSignal( pAction ); @@ -384,25 +384,25 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent ) return false; } -#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifndef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ void TDEAccelPrivate::emitActivatedSignal( TDEAccelAction* pAction ) { if( pAction ) { TQGuardedPtr<TDEAccelPrivate> me = this; TQRegExp reg( "([ ]*TDEAccelAction.*)" ); if( reg.search( pAction->methodSlotPtr()) >= 0 ) { - connect( this, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)), + connect( this, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated( pAction ); if (me) - disconnect( me, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)), + disconnect( me, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } else { - connect( this, TQT_SIGNAL(menuItemActivated()), + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); if (me) - disconnect( me, TQT_SIGNAL(menuItemActivated()), + disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h index 2d205885c..dd0c03aad 100644 --- a/tdecore/tdeaccel.h +++ b/tdecore/tdeaccel.h @@ -74,9 +74,9 @@ class TDEAccelPrivate; * // Insert an action "Scroll Up" which is associated with the "Up" key: * pAccel->insert( "Scroll Up", i18n("Scroll up"), * i18n("Scroll up the current document by one line."), - * Qt::Key_Up, this, TQT_SLOT(slotScrollUp()) ); + * TQt::Key_Up, this, TQ_SLOT(slotScrollUp()) ); * // Insert an standard acclerator action. - * pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) ); + * pAccel->insert( TDEStdAccel::Print, this, TQ_SLOT(slotPrint()) ); * * // Update the shortcuts by read any user-defined settings from the * // application's config file. @@ -92,14 +92,14 @@ class TDEAccelPrivate; class TDECORE_EXPORT TDEAccel : public TQAccel { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new TDEAccel that watches @p pParent, which is also - * the QObject's parent. + * the TQObject's parent. * * @param pParent the parent and widget to watch for key strokes - * @param psName the name of the QObject + * @param psName the name of the TQObject */ TDEAccel( TQWidget* pParent, const char* psName = 0 ); @@ -107,8 +107,8 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * Creates a new TDEAccel that watches @p watch. * * @param watch the widget to watch for key strokes - * @param parent the parent of the QObject - * @param psName the name of the QObject + * @param parent the parent of the TQObject + * @param psName the name of the TQObject */ TDEAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 ); virtual ~TDEAccel(); @@ -159,7 +159,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * insert( "Do Something", i18n("Do Something"), * i18n("This action allows you to do something really great with this program to " * "the currently open document."), - * ALT+Key_D, this, TQT_SLOT(slotDoSomething()) ); + * ALT+Key_D, this, TQ_SLOT(slotDoSomething()) ); *\endcode * * @param sAction The internal name of the action. @@ -191,7 +191,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * * Usage: * \code - * insert( i18n("Do Something"), ALT+Key_D, this, TQT_SLOT(slotDoSomething()) ); + * insert( i18n("Do Something"), ALT+Key_D, this, TQ_SLOT(slotDoSomething()) ); * \endcode * * @param psAction The name AND label of the action. diff --git a/tdecore/tdeaccelbase.cpp b/tdecore/tdeaccelbase.cpp index 41864d47c..a3fc23e3e 100644 --- a/tdecore/tdeaccelbase.cpp +++ b/tdecore/tdeaccelbase.cpp @@ -246,7 +246,7 @@ connect new key sequences } */ -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 struct TDEAccelBase::X { uint iAction, iSeq, iVari; @@ -269,7 +269,7 @@ struct TDEAccelBase::X bool operator >( const X& x ) { return compare( x ) > 0; } bool operator <=( const X& x ) { return compare( x ) <= 0; } }; -#endif //Q_WS_X11 +#endif //TQ_WS_X11 /* #1 Ctrl+A @@ -315,7 +315,7 @@ struct TDEAccelBase::X bool TDEAccelBase::updateConnections() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdDebug(125) << "TDEAccelBase::updateConnections() this = " << this << endl; // Retrieve the list of keys to be connected, sorted by priority. // (key, variation, seq) @@ -414,11 +414,11 @@ bool TDEAccelBase::updateConnections() << (((*it).pAction) ? (*it).pAction->name() : TQString::null) << "'" << endl; } #endif -#endif //Q_WS_X11 +#endif //TQ_WS_X11 return true; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // Construct a list of keys to be connected, sorted highest priority first. void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys ) { @@ -455,7 +455,7 @@ void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys ) // sort by priority: iVariation[of first key], iSequence, iAction qHeapSort( rgKeys.begin(), rgKeys.end() ); } -#endif //Q_WS_X11 +#endif //TQ_WS_X11 bool TDEAccelBase::insertConnection( TDEAccelAction* pAction ) { diff --git a/tdecore/tdeaccelbase.h b/tdecore/tdeaccelbase.h index ecd0ce358..7a2955b66 100644 --- a/tdecore/tdeaccelbase.h +++ b/tdecore/tdeaccelbase.h @@ -79,11 +79,11 @@ class TQWidget; * a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" ); * // Insert an action "Scroll Down" which is not associated with any key: * a->insertItem( i18n("Scroll Down"), "Scroll Down", 0); - * a->connectItem( "Scroll up", myWindow, TQT_SLOT( scrollUp() ) ); + * a->connectItem( "Scroll up", myWindow, TQ_SLOT( scrollUp() ) ); * // a->insertStdItem( TDEStdAccel::Print ); //not necessary, since it * // is done automatially with the * // connect below! - * a->connectItem(TDEStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) ); + * a->connectItem(TDEStdAccel::Print, myWindow, TQ_SLOT( printDoc() ) ); * * a->readSettings(); *\endcode @@ -93,12 +93,12 @@ class TQWidget; * * \code * int id; - * id = popup->insertItem("&Print",this, TQT_SLOT(printDoc())); + * id = popup->insertItem("&Print",this, TQ_SLOT(printDoc())); * a->changeMenuAccel(popup, id, TDEStdAccel::Print ); * \endcode * * If you want a somewhat "exotic" name for your standard print action, like - * id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc())); + * id = popup->insertItem(i18n("Print &Document"),this, TQ_SLOT(printDoc())); * it might be a good idea to insert the standard action before as * a->insertStdItem( TDEStdAccel::Print, i18n("Print Document") ) * as well, so that the user can easily find the corresponding function. @@ -107,7 +107,7 @@ class TQWidget; * in a menu could be done with * * \code - * id = popup->insertItem(i18n"Scroll &up",this, TQT_SLOT(scrollUp())); + * id = popup->insertItem(i18n"Scroll &up",this, TQ_SLOT(scrollUp())); * a->changeMenuAccel(popup, id, "Scroll Up" ); * \endcode * diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp index 4618dab17..ea0b034fd 100644 --- a/tdecore/tdeaccelmanager.cpp +++ b/tdecore/tdeaccelmanager.cpp @@ -262,10 +262,10 @@ void TDEAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &u void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item) { - TQObjectList *childList = widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false); + TQObjectList *childList = widget->queryList("TQWidget", 0, false, false); for ( TQObject *it = childList->first(); it; it = childList->next() ) { - TQWidget *w = TQT_TQWIDGET(it); + TQWidget *w = static_cast<TQWidget*>(it); if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) ) continue; @@ -329,8 +329,8 @@ void TDEAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if ( !label->buddy() ) label = 0; else { - if ( label->textFormat() == Qt::RichText || - ( label->textFormat() == Qt::AutoText && + if ( label->textFormat() == TQt::RichText || + ( label->textFormat() == TQt::AutoText && TQStyleSheet::mightBeRichText( label->text() ) ) ) label = 0; } @@ -734,7 +734,7 @@ TDEPopupAccelManager::TDEPopupAccelManager(TQPopupMenu *popup) : TQObject(popup), m_popup(popup), m_count(-1) { aboutToShow(); // do one check and then connect to show - connect(popup, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShow())); + connect(popup, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShow())); } @@ -840,13 +840,13 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack) : TQObject(stack), m_stack(stack) { aboutToShow(stack->visibleWidget()); // do one check and then connect to show - connect(stack, TQT_SIGNAL(aboutToShow(TQWidget *)), TQT_SLOT(aboutToShow(TQWidget *))); + connect(stack, TQ_SIGNAL(aboutToShow(TQWidget *)), TQ_SLOT(aboutToShow(TQWidget *))); } bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e ) { if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) { - TDEAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) ); + TDEAcceleratorManager::manage( tqApp->activeWindow() ); watched->removeEventFilter( this ); } return false; diff --git a/tdecore/tdeaccelmanager_private.h b/tdecore/tdeaccelmanager_private.h index d9227e8da..fe071c982 100644 --- a/tdecore/tdeaccelmanager_private.h +++ b/tdecore/tdeaccelmanager_private.h @@ -133,7 +133,7 @@ class TQPopupMenu; class TDEPopupAccelManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -166,7 +166,7 @@ private: class QWidgetStackAccelManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/tdeaccelprivate.h b/tdecore/tdeaccelprivate.h index c91e01f42..8e6672615 100644 --- a/tdecore/tdeaccelprivate.h +++ b/tdecore/tdeaccelprivate.h @@ -11,7 +11,7 @@ class TDEAccelAction; */ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase { - Q_OBJECT + TQ_OBJECT public: TDEAccel* m_pAccel; TQWidget* m_pWatch; @@ -38,7 +38,7 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase void menuItemActivated(TDEAccelAction*); private: -#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifndef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ void emitActivatedSignal(TDEAccelAction*); #endif @@ -47,7 +47,7 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase void slotShowMenu(); void slotMenuActivated( int iAction ); - bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject + bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from TQObject }; #endif // !__TDEACCELPRIVATE_H diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 6dcafa2d5..326388614 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -95,7 +95,7 @@ #include <kmdcodec.h> #include <kglobalaccel.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <tdestartupinfo.h> #endif @@ -110,7 +110,7 @@ #include <grp.h> #include <sys/types.h> -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN #include "twin.h" #endif @@ -123,8 +123,8 @@ #include <errno.h> #include <string.h> #include <netdb.h> -#if defined Q_WS_X11 -//#ifndef Q_WS_QWS //FIXME(E): NetWM should talk to QWS... +#if defined TQ_WS_X11 +//#ifndef TQ_WS_QWS //FIXME(E): NetWM should talk to QWS... #include <netwm.h> #endif @@ -134,7 +134,7 @@ #include <paths.h> #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #ifdef COMPOSITE #include <X11/extensions/Xrender.h> @@ -149,7 +149,7 @@ #include <pwd.h> -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN #include <KDE-ICE/ICElib.h> #else typedef void* IceIOErrorHandler; @@ -160,22 +160,22 @@ typedef void* IceIOErrorHandler; #define Button3Mask (1<<10) #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define DISPLAY "DISPLAY" -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) #define DISPLAY "QWS_DISPLAY" #endif -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <kipc.h> #endif -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <Carbon/Carbon.h> #include <tqimage.h> #endif -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <sys/ioctl.h> #ifdef __linux__ #include <linux/vt.h> @@ -197,12 +197,12 @@ bool TDEApplication::loadedByKdeinit = false; DCOPClient *TDEApplication::s_DCOPClient = 0L; bool TDEApplication::s_dcopClientNeedsPostInit = false; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static Atom atom_DesktopWindow; static Atom atom_NetSupported; #endif -#if defined(Q_WS_X11) && defined(COMPOSITE) +#if defined(TQ_WS_X11) && defined(COMPOSITE) static int composite_event, composite_error, composite_opcode; static bool x11_composite_error_generated; static int x11_error(Display *dpy, XErrorEvent *ev) { @@ -221,7 +221,7 @@ TDECORE_EXPORT bool tqt_qclipboard_bailout_hack = false; template class TQPtrList<KSessionManaged>; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 extern "C" { static int kde_xio_errhandler( Display * dpy ) { @@ -245,13 +245,13 @@ static void kde_ice_ioerrorhandler( IceConn conn ) } #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN void TDEApplication_init_windows(bool GUIenabled); class QAssistantClient; #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // -------------------------------------------------------------------------------------- // Get the VT number X is running on // (code taken from GDM, daemon/getvt.c, GPLv2+) @@ -310,7 +310,7 @@ int get_x_vtnum(Display *dpy) return num; } // -------------------------------------------------------------------------------------- -#endif // Q_WS_X11 +#endif // TQ_WS_X11 /* Private data to make keeping binary compatibility easier @@ -328,10 +328,10 @@ public: app_started_timer( NULL ), m_KAppDCOPInterface( 0L ), session_save( false ) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 ,oldXErrorHandler( NULL ) ,oldXIOErrorHandler( NULL ) -#elif defined Q_WS_WIN +#elif defined TQ_WS_WIN ,qassistantclient( 0 ) #endif { @@ -339,7 +339,7 @@ public: ~TDEApplicationPrivate() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN delete qassistantclient; #endif } @@ -362,10 +362,10 @@ public: TQTimer* app_started_timer; KAppDCOPInterface *m_KAppDCOPInterface; bool session_save; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int (*oldXErrorHandler)(Display*,XErrorEvent*); int (*oldXIOErrorHandler)(Display*); -#elif defined Q_WS_WIN +#elif defined TQ_WS_WIN QAssistantClient* qassistantclient; #endif @@ -522,7 +522,7 @@ void TDEApplication::installX11EventFilter( TQWidget* filter ) return; if (!x11Filter) x11Filter = new TQPtrList<TQWidget>; - connect ( filter, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( x11FilterDestroyed() ) ); + connect ( filter, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( x11FilterDestroyed() ) ); x11Filter->append( filter ); } @@ -557,7 +557,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) // Indicate that the accelerator has been overridden. if (t == TQEvent::AccelOverride) { - TQT_TQKEYEVENT(event)->accept(); + static_cast<TQKeyEvent*>(event)->accept(); return true; } else @@ -567,11 +567,11 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) if ((t == TQEvent::AccelOverride) || (t == TQEvent::KeyPress)) { static const TDEShortcut& _selectAll = TDEStdAccel::selectAll(); - TQLineEdit *edit = ::tqqt_cast<TQLineEdit *>(receiver); + TQLineEdit *edit = ::tqt_cast<TQLineEdit *>(receiver); if (edit) { // We have a keypress for a lineedit... - TQKeyEvent *kevent = TQT_TQKEYEVENT(event); + TQKeyEvent *kevent = static_cast<TQKeyEvent*>(event); KKey key(kevent); if (_selectAll.contains(key)) { @@ -586,7 +586,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) } } // Ctrl-U deletes from start of line. - if (key == KKey(Qt::CTRL + Qt::Key_U)) + if (key == KKey(TQt::CTRL + TQt::Key_U)) { if (t == TQEvent::KeyPress) { @@ -605,11 +605,11 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) } } - TQTextEdit *medit = ::tqqt_cast<TQTextEdit *>(receiver); + TQTextEdit *medit = ::tqt_cast<TQTextEdit *>(receiver); if (medit) { // We have a keypress for a multilineedit... - TQKeyEvent *kevent = TQT_TQKEYEVENT(event); + TQKeyEvent *kevent = static_cast<TQKeyEvent*>(event); if (_selectAll.contains(KKey(kevent))) { if (t == TQEvent::KeyPress) @@ -626,9 +626,9 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) } if( t == TQEvent::Show && receiver->isWidgetType()) { - TQWidget* w = TQT_TQWIDGET( receiver ); -#if defined Q_WS_X11 - if( w->isTopLevel() && !startupId().isEmpty() && !TQT_TQSHOWEVENT(event)->spontaneous()) // TODO better done using window group leader? + TQWidget* w = static_cast<TQWidget*>( receiver ); +#if defined TQ_WS_X11 + if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader? TDEStartupInfo::setWindowStartupId( w->winId(), startupId()); #endif if( w->isTopLevel() && !w->testWFlags( WX11BypassWM ) && !w->isPopup() && !event->spontaneous()) @@ -636,7 +636,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) if( d->app_started_timer == NULL ) { d->app_started_timer = new TQTimer( this, "app_started_timer" ); - connect( d->app_started_timer, TQT_SIGNAL( timeout()), TQT_SLOT( checkAppStartedSlot())); + connect( d->app_started_timer, TQ_SIGNAL( timeout()), TQ_SLOT( checkAppStartedSlot())); } if( !d->app_started_timer->isActive()) d->app_started_timer->start( 0, true ); @@ -651,7 +651,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) if( !ic->isNull()) { w->setIcon( *ic ); -#if defined Q_WS_X11 +#if defined TQ_WS_X11 KWin::setIcons( w->winId(), *ic, miniIcon()); #endif } @@ -662,7 +662,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) void TDEApplication::checkAppStartedSlot() { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfo::handleAutoAppStartedSending(); #endif } @@ -689,7 +689,7 @@ TQString TDEApplication::sessionConfigName() const return TQString("session/%1_%2_%3").arg(name()).arg(sessionId()).arg(sessKey); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static SmcConn mySmcConnection = 0; static SmcConn tmpSmcConnection = 0; #else @@ -701,7 +701,7 @@ static TQTime* smModificationTime = 0; TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled, bool SMenabled ) : TQApplication( argc, argv, GUIenabled, SMenabled ), TDEInstance(rAppName), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), argb_visual(false), #endif @@ -729,7 +729,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled ) : TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), argb_visual(false), #endif @@ -752,10 +752,9 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam } TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) : -// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled, SMenabled ), // We need to be able to run command line apps TDEInstance( TDECmdLineArgs::about), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), argb_visual(false), #endif @@ -779,10 +778,9 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenable // FOR BINARY COMPATIBILITY ONLY // REMOVE WHEN PRACTICAL! TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) : -// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), // We need to be able to run command line apps TDEInstance( TDECmdLineArgs::about), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), argb_visual(false), #endif @@ -802,7 +800,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) : d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ), @@ -819,7 +817,7 @@ TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) : d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) : +TDEApplication::TDEApplication( Display *dpy, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ), TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) @@ -836,7 +834,7 @@ TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visu d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, +TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), @@ -855,7 +853,7 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, +TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles, TDEInstance * _instance ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), @@ -879,7 +877,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), TDEInstance( _instance ), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), #endif argb_visual(false), @@ -899,7 +897,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled ) : TQApplication( display ), TDEInstance(rAppName), @@ -930,7 +928,7 @@ int TDEApplication::xioErrhandler( Display* dpy ) if(kapp) { emit shutDown(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 d->oldXIOErrorHandler( dpy ); #else Q_UNUSED(dpy); @@ -942,7 +940,7 @@ int TDEApplication::xioErrhandler( Display* dpy ) int TDEApplication::xErrhandler( Display* dpy, void* err_ ) { // no idea how to make forward decl. for XErrorEvent -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XErrorEvent* err = static_cast< XErrorEvent* >( err_ ); if(kapp) { @@ -957,7 +955,7 @@ void TDEApplication::iceIOErrorHandler( _IceConn *conn ) { emit shutDown(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( d->oldIceIOErrorHandler != NULL ) (*d->oldIceIOErrorHandler)( conn ); #endif @@ -1002,7 +1000,7 @@ void TDEApplication::init(bool GUIenabled) KApp = this; -#ifdef Q_WS_X11 //FIXME(E) +#ifdef TQ_WS_X11 //FIXME(E) // create all required atoms in _one_ roundtrip to the X server if ( GUIenabled ) { const int max = 20; @@ -1033,7 +1031,7 @@ void TDEApplication::init(bool GUIenabled) smw = 0; // Initial KIPC event mask. -#if defined Q_WS_X11 +#if defined TQ_WS_X11 kipcEventMask = (1 << KIPC::StyleChanged) | (1 << KIPC::PaletteChanged) | (1 << KIPC::FontChanged) | (1 << KIPC::BackgroundChanged) | (1 << KIPC::ToolbarStyleChanged) | (1 << KIPC::SettingsChanged) | @@ -1050,7 +1048,7 @@ void TDEApplication::init(bool GUIenabled) // kdialog itself. // * Don't warn if we run with a read-only $HOME TQCString readOnly = getenv("TDE_HOME_READONLY"); - if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0)) + if (readOnly.isEmpty() && (qstrcmp(name(), "kdialog") != 0)) { TDEConfigGroupSaver saver(config, "KDE Action Restrictions"); if (config->readBoolEntry("warn_unwritable_config",true)) @@ -1059,7 +1057,7 @@ void TDEApplication::init(bool GUIenabled) if (GUIenabled) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // this is important since we fork() to launch the help (Matthias) fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, FD_CLOEXEC); // set up the fancy (=robust and error ignoring ) KDE xio error handlers (Matthias) @@ -1067,9 +1065,9 @@ void TDEApplication::init(bool GUIenabled) d->oldXIOErrorHandler = XSetIOErrorHandler( kde_xio_errhandler ); #endif - connect( this, TQT_SIGNAL( aboutToQuit() ), this, TQT_SIGNAL( shutDown() ) ); + connect( this, TQ_SIGNAL( aboutToQuit() ), this, TQ_SIGNAL( shutDown() ) ); -#ifdef Q_WS_X11 //FIXME(E) +#ifdef TQ_WS_X11 //FIXME(E) display = desktop()->x11Display(); #endif @@ -1101,10 +1099,10 @@ void TDEApplication::init(bool GUIenabled) TQMimeSourceFactory::addFactory( oldDefaultFactory ); } - d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) ); + d->checkAccelerators = new KCheckAccelerators( this ); } -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX if (GUIenabled) { TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(), TDEIcon::NoGroup, TDEIcon::SizeLarge, TDEIcon::DefaultState, 0L, false ); @@ -1134,7 +1132,7 @@ void TDEApplication::init(bool GUIenabled) // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage, // which makes it impossible to use the -reverse cmdline switch with KDE apps bool rtl = reverseLayout(); - installTranslator(new KDETranslator(TQT_TQOBJECT(this))); + installTranslator(new KDETranslator(this)); setReverseLayout( rtl ); if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in " "left-to-right languages (as english) or to 'RTL' in right-to-left " @@ -1147,7 +1145,7 @@ void TDEApplication::init(bool GUIenabled) pSessionConfig = 0L; bSessionManagement = true; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // register a communication window for desktop changes (Matthias) if (GUIenabled && kde_have_kipc ) { @@ -1158,7 +1156,7 @@ void TDEApplication::init(bool GUIenabled) 32, PropModeReplace, (unsigned char *)&data, 1); } d->oldIceIOErrorHandler = IceSetIOErrorHandler( kde_ice_ioerrorhandler ); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) TDEApplication_init_windows(GUIenabled); #else // FIXME(E): Implement for Qt Embedded @@ -1198,10 +1196,10 @@ DCOPClient *TDEApplication::dcopClient() s_DCOPClient->setServerAddress( args->getOption("dcopserver")); } if( kapp ) { - connect(s_DCOPClient, TQT_SIGNAL(attachFailed(const TQString &)), - kapp, TQT_SLOT(dcopFailure(const TQString &))); - connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ), - kapp, TQT_SLOT(dcopBlockUserInput(bool)) ); + connect(s_DCOPClient, TQ_SIGNAL(attachFailed(const TQString &)), + kapp, TQ_SLOT(dcopFailure(const TQString &))); + connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ), + kapp, TQ_SLOT(dcopBlockUserInput(bool)) ); } else s_dcopClientNeedsPostInit = true; @@ -1215,8 +1213,8 @@ void TDEApplication::dcopClientPostInit() if( s_dcopClientNeedsPostInit ) { s_dcopClientNeedsPostInit = false; - connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ), - TQT_SLOT(dcopBlockUserInput(bool)) ); + connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ), + TQ_SLOT(dcopBlockUserInput(bool)) ); s_DCOPClient->bindToApp(); // Make sure we get events from the DCOPClient. } } @@ -1288,7 +1286,7 @@ void TDEApplication::disableSessionManagement() { void TDEApplication::enableSessionManagement() { bSessionManagement = true; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // Session management support in Qt/TDE is awfully broken. // If konqueror disables session management right after its startup, // and enables it later (preloading stuff), it won't be properly @@ -1313,7 +1311,7 @@ void TDEApplication::enableSessionManagement() { bool TDEApplication::requestShutDown( ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQApplication::syncX(); /* use ksmserver's dcop interface if necessary */ if ( confirm == ShutdownConfirmYes || @@ -1375,7 +1373,7 @@ bool TDEApplication::requestShutDown( void TDEApplication::propagateSessionManager() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv(DISPLAY); // strip the screen number from the display @@ -1389,7 +1387,7 @@ void TDEApplication::propagateSessionManager() bool check = smEnv.isEmpty(); if ( !check && smModificationTime ) { TQFileInfo info( fName ); - TQTime current = TQT_TQTIME_OBJECT(info.lastModified().time()); + TQTime current = info.lastModified().time(); check = current > *smModificationTime; } if ( check ) { @@ -1398,7 +1396,7 @@ void TDEApplication::propagateSessionManager() if ( !f.open( IO_ReadOnly ) ) return; TQFileInfo info ( f ); - smModificationTime = new TQTime( TQT_TQTIME_OBJECT(info.lastModified().time()) ); + smModificationTime = new TQTime( info.lastModified().time() ); TQTextStream t(&f); t.setEncoding( TQTextStream::Latin1 ); TQString s = t.readLine(); @@ -1484,7 +1482,7 @@ static void checkRestartVersion( TQSessionManager& sm ) void TDEApplication::saveState( TQSessionManager& sm ) { d->session_save = true; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static bool firstTime = true; mySmcConnection = (SmcConn) sm.handle(); @@ -1570,7 +1568,7 @@ bool TDEApplication::sessionSaving() const void TDEApplication::startKdeinit() { -#ifndef Q_WS_WIN //TODO +#ifndef TQ_WS_WIN //TODO TDEInstance inst( "starttdeinitlock" ); TDELockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst )); if( lock.lock( TDELockFile::LockNoBlock ) != TDELockFile::LockOK ) { @@ -1586,7 +1584,7 @@ void TDEApplication::startKdeinit() if (srv.isEmpty()) return; if (kapp && (Tty != kapp->type())) - setOverrideCursor( tqwaitCursor ); + setOverrideCursor( TQt::waitCursor ); my_system(TQFile::encodeName(srv)+" --suicide"+" --new-startup"); if (kapp && (Tty != kapp->type())) restoreOverrideCursor(); @@ -1604,7 +1602,7 @@ void TDEApplication::dcopFailure(const TQString &msg) } if (failureCount == 2) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TDEGlobal::config()->setGroup("General"); if (TDEGlobal::config()->readBoolEntry("ignoreDCOPFailures", false)) return; @@ -1637,7 +1635,7 @@ void TDEApplication::dcopFailure(const TQString &msg) static const TDECmdLineOptions qt_options[] = { //FIXME: Check if other options are specific to Qt/X11 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 { "display <displayname>", I18N_NOOP("Use the X-server display 'displayname'"), 0}, #else { "display <displayname>", I18N_NOOP("Use the QWS display 'displayname'"), 0}, @@ -1658,13 +1656,13 @@ static const TDECmdLineOptions qt_options[] = { "button <color>", I18N_NOOP("sets the default button color"), 0}, { "name <name>", I18N_NOOP("sets the application name"), 0}, { "title <title>", I18N_NOOP("sets the application title (caption)"), 0}, -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 { "visual TrueColor", I18N_NOOP("forces the application to use a TrueColor visual on\nan 8-bit display"), 0}, { "inputstyle <inputstyle>", I18N_NOOP("sets XIM (X Input Method) input style. Possible\nvalues are onthespot, overthespot, offthespot and\nroot"), 0 }, { "im <XIM server>", I18N_NOOP("set XIM server"),0}, { "noxim", I18N_NOOP("disable XIM"), 0 }, #endif -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0}, #endif { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0}, @@ -1781,7 +1779,7 @@ void TDEApplication::parseCommandLine( ) TDECrash::setApplicationName(TQString(args->appName())); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( args->isSet( "waitforwm" ) ) { Atom type; (void) desktop(); // trigger desktop creation, we need PropertyNotify events for the root window @@ -1876,7 +1874,7 @@ TDEApplication::~TDEApplication() TDEProcessController::deref(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( d->oldXErrorHandler != NULL ) XSetErrorHandler( d->oldXErrorHandler ); if ( d->oldXIOErrorHandler != NULL ) @@ -1888,7 +1886,7 @@ TDEApplication::~TDEApplication() delete d; KApp = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 mySmcConnection = 0; delete smModificationTime; smModificationTime = 0; @@ -1904,7 +1902,7 @@ TDEApplication::~TDEApplication() } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 class KAppX11HackWidget: public TQWidget { public: @@ -1912,7 +1910,7 @@ public: }; #endif -#if defined(Q_WS_X11) && defined(COMPOSITE) +#if defined(TQ_WS_X11) && defined(COMPOSITE) bool TDEApplication::isCompositionManagerAvailable() { bool have_manager = false; @@ -2034,23 +2032,23 @@ Display* TDEApplication::openX11RGBADisplay() { return dpy; } -Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { +TQt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { getX11RGBAInformation(dpy); if (TDEApplication::isCompositionManagerAvailable() == true) { return argb_x11_visual; } else { - return (Qt::HANDLE)NULL; + return (TQt::HANDLE)NULL; } } -Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { +TQt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { getX11RGBAInformation(dpy); if (TDEApplication::isCompositionManagerAvailable() == true) { return argb_x11_colormap; } else { - return (Qt::HANDLE)NULL; + return (TQt::HANDLE)NULL; } } @@ -2091,8 +2089,8 @@ void TDEApplication::getX11RGBAInformation(Display *dpy) { } if( argb_visual ) { - argb_x11_visual = Qt::HANDLE( visual ); - argb_x11_colormap = Qt::HANDLE( colormap ); + argb_x11_visual = TQt::HANDLE( visual ); + argb_x11_colormap = TQt::HANDLE( colormap ); argb_visual = true; return; } @@ -2146,11 +2144,11 @@ Display* TDEApplication::openX11RGBADisplay() { return 0; } -Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { +TQt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { return 0; } -Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { +TQt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { return 0; } @@ -2166,7 +2164,7 @@ void TDEApplication::dcopBlockUserInput( bool b ) kapp_block_user_input = b; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool TDEApplication::x11EventFilter( XEvent *_event ) { if ( kapp_block_user_input ) { @@ -2263,11 +2261,11 @@ bool TDEApplication::x11EventFilter( XEvent *_event ) } return false; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 void TDEApplication::updateUserTimestamp( unsigned long time ) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 Display *display = tqt_xdisplay(); if (!display) { return; @@ -2283,16 +2281,16 @@ void TDEApplication::updateUserTimestamp( unsigned long time ) time = ev.xproperty.time; XDestroyWindow( display, w ); } - if( GET_QT_X_USER_TIME() == 0 - || NET::timestampCompare( time, GET_QT_X_USER_TIME() ) > 0 ) // check time > tqt_x_user_time - SET_QT_X_USER_TIME(time); + if( get_tqt_x_user_time() == 0 + || NET::timestampCompare( time, get_tqt_x_user_time() ) > 0 ) // check time > tqt_x_user_time + set_tqt_x_user_time(time); #endif } unsigned long TDEApplication::userTimestamp() const { -#if defined Q_WS_X11 - return GET_QT_X_USER_TIME(); +#if defined TQ_WS_X11 + return get_tqt_x_user_time(); #else return 0; #endif @@ -2300,16 +2298,16 @@ unsigned long TDEApplication::userTimestamp() const void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time ) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 if( time == 0 ) - time = GET_QT_X_USER_TIME(); + time = get_tqt_x_user_time(); DCOPRef( dcopId, "MainApplication-Interface" ).call( "updateUserTimestamp", time ); #endif } void TDEApplication::invokeEditSlot( const char *slot ) { - TQObject *object = TQT_TQOBJECT(focusWidget()); + TQObject *object = focusWidget(); if( !object ) return; @@ -2443,13 +2441,13 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr TQColor trinity4VisitedLink( 82, 24, 139 ); TQColor background = config->readColorEntry( "background", &trinity4Background ); - TQColor foreground = config->readColorEntry( "foreground", tqblackptr ); + TQColor foreground = config->readColorEntry( "foreground", &TQt::black ); TQColor button = config->readColorEntry( "buttonBackground", &trinity4Button ); - TQColor buttonText = config->readColorEntry( "buttonForeground", tqblackptr ); + TQColor buttonText = config->readColorEntry( "buttonForeground", &TQt::black ); TQColor highlight = config->readColorEntry( "selectBackground", &trinity4Blue ); - TQColor highlightedText = config->readColorEntry( "selectForeground", tqwhiteptr ); - TQColor base = config->readColorEntry( "windowBackground", tqwhiteptr ); - TQColor baseText = config->readColorEntry( "windowForeground", tqblackptr ); + TQColor highlightedText = config->readColorEntry( "selectForeground", &TQt::white ); + TQColor base = config->readColorEntry( "windowBackground", &TQt::white ); + TQColor baseText = config->readColorEntry( "windowForeground", &TQt::black ); TQColor link = config->readColorEntry( "linkColor", &trinity4Link ); TQColor visitedLink = config->readColorEntry( "visitedLinkColor", &trinity4VisitedLink ); @@ -2464,12 +2462,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr if (v > 128) // dark bg, light fg - need a darker disabled fg disfg = disfg.dark(lowlightVal); - else if (disfg != Qt::black) + else if (disfg != TQt::black) // light bg, dark fg - need a lighter disabled fg - but only if !black disfg = disfg.light(highlightVal); else // black fg - use darkgray disabled fg - disfg = Qt::darkGray; + disfg = TQt::darkGray; TQColorGroup disabledgrp(disfg, background, @@ -2502,12 +2500,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr if (v > 128) // dark button, light buttonText - need a darker disabled buttonText disbtntext = disbtntext.dark(lowlightVal); - else if (disbtntext != Qt::black) + else if (disbtntext != TQt::black) // light buttonText, dark button - need a lighter disabled buttonText - but only if !black disbtntext = disbtntext.light(highlightVal); else // black button - use darkgray disabled buttonText - disbtntext = Qt::darkGray; + disbtntext = TQt::darkGray; disabledgrp.setColor(TQColorGroup::ButtonText, disbtntext); disabledgrp.setColor(TQColorGroup::Midlight, background.light(110)); @@ -2521,7 +2519,7 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr void TDEApplication::tdedisplaySetPalette() { -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX //Can I have this on other platforms, please!? --Sam { TDEConfig *config = TDEGlobal::config(); @@ -2540,8 +2538,8 @@ void TDEApplication::tdedisplaySetPalette() void TDEApplication::tdedisplaySetFont() { TQApplication::setFont(TDEGlobalSettings::generalFont(), true); - TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); - TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQMenuBar"); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQPopupMenu"); TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TDEPopupTitle"); // "patch" standard TQStyleSheet to follow our fonts @@ -2593,15 +2591,15 @@ void TDEApplication::propagateSettings(SettingsCategory arg) TQApplication::setWheelScrollLines(num); bool b = config->readBoolEntry("EffectAnimateMenu", false); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, b); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, b); b = config->readBoolEntry("EffectFadeMenu", false); - TQApplication::setEffectEnabled( Qt::UI_FadeMenu, b); + TQApplication::setEffectEnabled( TQt::UI_FadeMenu, b); b = config->readBoolEntry("EffectAnimateCombo", false); - TQApplication::setEffectEnabled( Qt::UI_AnimateCombo, b); + TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, b); b = config->readBoolEntry("EffectAnimateTooltip", false); - TQApplication::setEffectEnabled( Qt::UI_AnimateTooltip, b); + TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, b); b = config->readBoolEntry("EffectFadeTooltip", false); - TQApplication::setEffectEnabled( Qt::UI_FadeTooltip, b); + TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, b); b = !config->readBoolEntry("EffectNoTooltip", false); TQToolTip::setGloballyEnabled( b ); @@ -2644,8 +2642,8 @@ void TDEApplication::installKDEPropertyMap() kdeMap->insert( "KIntSpinBox", "value" ); kdeMap->insert( "KDoubleNumInput", "value" ); // Temp til fixed in QT then enable ifdef with the correct version num - kdeMap->insert( TQGROUPBOX_OBJECT_NAME_STRING, "checked" ); - kdeMap->insert( TQTABWIDGET_OBJECT_NAME_STRING, "currentPage" ); + kdeMap->insert( "TQGroupBox", "checked" ); + kdeMap->insert( "TQTabWidget", "currentPage" ); TQSqlPropertyMap::installDefaultMap( kdeMap ); #endif } @@ -2656,7 +2654,7 @@ void TDEApplication::invokeHelp( const TQString& anchor, return invokeHelp( anchor, _appname, "" ); } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN // for win32 we're using simple help tools like Qt Assistant, // see kapplication_win.cpp void TDEApplication::invokeHelp( const TQString& anchor, @@ -2789,7 +2787,7 @@ void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const return invokeMailer(to,cc,bcc,subject,body,messageFile,attachURLs,""); } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN // on win32, for invoking browser we're using win32 API // see kapplication_win.cpp @@ -3002,7 +3000,7 @@ void TDEApplication::invokeBrowser( const TQString &url ) return invokeBrowser( url, "" ); } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN // on win32, for invoking browser we're using win32 API // see kapplication_win.cpp void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id ) @@ -3023,27 +3021,27 @@ void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startu void TDEApplication::cut() { - invokeEditSlot( TQT_SLOT( cut() ) ); + invokeEditSlot( TQ_SLOT( cut() ) ); } void TDEApplication::copy() { - invokeEditSlot( TQT_SLOT( copy() ) ); + invokeEditSlot( TQ_SLOT( copy() ) ); } void TDEApplication::paste() { - invokeEditSlot( TQT_SLOT( paste() ) ); + invokeEditSlot( TQ_SLOT( paste() ) ); } void TDEApplication::clear() { - invokeEditSlot( TQT_SLOT( clear() ) ); + invokeEditSlot( TQ_SLOT( clear() ) ); } void TDEApplication::selectAll() { - invokeEditSlot( TQT_SLOT( selectAll() ) ); + invokeEditSlot( TQ_SLOT( selectAll() ) ); } void TDEApplication::broadcastKeyCode(unsigned int keyCode) @@ -3096,7 +3094,7 @@ startServiceInternal( const TQCString &function, TQByteArray replyData; TQCString _launcher = TDEApplication::launcher(); TQValueList<TQCString> envs; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (tqt_xdisplay()) { TQCString dpystring(XDisplayString(tqt_xdisplay())); envs.append( TQCString("DISPLAY=") + dpystring ); @@ -3106,7 +3104,7 @@ startServiceInternal( const TQCString &function, } #endif stream << envs; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // make sure there is id, so that user timestamp exists stream << ( startup_id.isEmpty() ? TDEStartupInfo::createNewStartupId() : startup_id ); #endif @@ -3345,8 +3343,8 @@ void TDEApplication::setTopWidget( TQWidget *topWidget ) // set the specified icons topWidget->setIcon( icon() ); //standard X11 -#if defined Q_WS_X11 -//#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded +#if defined TQ_WS_X11 +//#ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded KWin::setIcons(topWidget->winId(), icon(), miniIcon() ); // NET_WM hints for KWin // set the app startup notification window property @@ -3363,7 +3361,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id ) { if( startup_id == d->startup_id ) return; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfo::handleAutoAppStartedSending(); // finish old startup notification if needed #endif if( startup_id.isEmpty()) @@ -3371,7 +3369,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id ) else { d->startup_id = startup_id; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfoId id; id.initId( startup_id ); long timestamp = id.timestamp(); @@ -3385,7 +3383,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id ) // not to propagate it to processes started from this app void TDEApplication::read_app_startup_id() { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfoId id = TDEStartupInfo::currentStartupIdEnv(); TDEStartupInfo::resetStartupEnv(); d->startup_id = id.id(); @@ -3593,7 +3591,7 @@ bool TDEApplication::authorizeURLAction(const TQString &action, const KURL &_bas uint TDEApplication::keyboardModifiers() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Window root; Window child; int root_x, root_y, win_x, win_y; @@ -3612,13 +3610,13 @@ uint TDEApplication::keyboardModifiers() uint TDEApplication::mouseState() { uint mousestate; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Window root; Window child; int root_x, root_y, win_x, win_y; XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child, &root_x, &root_y, &win_x, &win_y, &mousestate ); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) const bool mousebtn_swapped = GetSystemMetrics(SM_SWAPBUTTON); if (GetAsyncKeyState(VK_LBUTTON)) mousestate |= (mousebtn_swapped ? Button3Mask : Button1Mask); @@ -3626,7 +3624,7 @@ uint TDEApplication::mouseState() mousestate |= Button2Mask; if (GetAsyncKeyState(VK_RBUTTON)) mousestate |= (mousebtn_swapped ? Button1Mask : Button3Mask); -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) mousestate = GetCurrentEventButtonState(); #else //TODO: other platforms @@ -3634,10 +3632,10 @@ uint TDEApplication::mouseState() return mousestate & 0xff00; } -TQ_ButtonState TDEApplication::keyboardMouseState() +TQt::ButtonState TDEApplication::keyboardMouseState() { int ret = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Window root; Window child; int root_x, root_y, win_x, win_y; @@ -3646,52 +3644,52 @@ TQ_ButtonState TDEApplication::keyboardMouseState() &root_x, &root_y, &win_x, &win_y, &state ); // transform the same way like Qt's qt_x11_translateButtonState() if( state & Button1Mask ) - ret |= TQ_LeftButton; + ret |= LeftButton; if( state & Button2Mask ) - ret |= TQ_MidButton; + ret |= MidButton; if( state & Button3Mask ) - ret |= TQ_RightButton; + ret |= RightButton; if( state & ShiftMask ) - ret |= TQ_ShiftButton; + ret |= ShiftButton; if( state & ControlMask ) - ret |= TQ_ControlButton; + ret |= ControlButton; if( state & KKeyNative::modX( KKey::ALT )) - ret |= TQ_AltButton; + ret |= AltButton; if( state & KKeyNative::modX( KKey::WIN )) - ret |= TQ_MetaButton; -#elif defined(Q_WS_WIN) + ret |= MetaButton; +#elif defined(TQ_WS_WIN) const bool mousebtn_swapped = GetSystemMetrics(SM_SWAPBUTTON); if (GetAsyncKeyState(VK_LBUTTON)) ret |= (mousebtn_swapped ? RightButton : LeftButton); if (GetAsyncKeyState(VK_MBUTTON)) - ret |= TQ_MidButton; + ret |= MidButton; if (GetAsyncKeyState(VK_RBUTTON)) - ret |= (mousebtn_swapped ? TQ_LeftButton : TQ_RightButton); + ret |= (mousebtn_swapped ? LeftButton : RightButton); if (GetAsyncKeyState(VK_SHIFT)) - ret |= TQ_ShiftButton; + ret |= ShiftButton; if (GetAsyncKeyState(VK_CONTROL)) - ret |= TQ_ControlButton; + ret |= ControlButton; if (GetAsyncKeyState(VK_MENU)) - ret |= TQ_AltButton; + ret |= AltButton; if (GetAsyncKeyState(VK_LWIN) || GetAsyncKeyState(VK_RWIN)) - ret |= TQ_MetaButton; + ret |= MetaButton; #else //TODO: other platforms #endif return static_cast< ButtonState >( ret ); } -#if defined Q_WS_X11 +#if defined TQ_WS_X11 int TDEApplication::currentX11VT() { return get_x_vtnum(TQPaintDevice::x11AppDisplay()); } -#else // Q_WS_X11 +#else // TQ_WS_X11 int TDEApplication::currentX11VT() { return -1; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 void TDEApplication::installSigpipeHandler() { diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index 1b4fbe097..1c1563026 100644 --- a/tdecore/tdeapplication.h +++ b/tdecore/tdeapplication.h @@ -33,7 +33,7 @@ class DCOPObject; #include <tqtglobaldefines.h> typedef unsigned long Atom; -#if !defined(Q_WS_X11) +#if !defined(TQ_WS_X11) typedef void Display; #endif @@ -96,7 +96,7 @@ class TDEApplicationPrivate; class TDECORE_EXPORT TDEApplication : public TQApplication, public TDEInstance { - Q_OBJECT + TQ_OBJECT public: /** Position of the caption (presumably in the application window's * title bar). This enum appears to be unused. @@ -140,7 +140,7 @@ public: #endif // TDEAPPLICATION_BINARY_COMPAT_HACK #endif // Q_QDOC -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Constructor. Parses command-line arguments. Use this constructor when you * you want ARGB support to be automatically detected and enabled. @@ -187,7 +187,7 @@ public: * * @see RGBADisplay() */ - TDEApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles); + TDEApplication(Display *display, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles); /** * Constructor. Parses command-line arguments. Use this constructor when you @@ -212,7 +212,7 @@ public: * * @since KDE 3.3 */ - TDEApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, + TDEApplication(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0, bool allowStyles=true); /** @@ -621,7 +621,7 @@ public slots: * If the widget with focus provides a cut() slot, call that slot. Thus for a * simple application cut can be implemented as: * \code - * KStdAction::cut( kapp, TQT_SLOT( cut() ), actionCollection() ); + * KStdAction::cut( kapp, TQ_SLOT( cut() ), actionCollection() ); * \endcode */ void cut(); @@ -630,7 +630,7 @@ public slots: * If the widget with focus provides a copy() slot, call that slot. Thus for a * simple application copy can be implemented as: * \code - * KStdAction::copy( kapp, TQT_SLOT( copy() ), actionCollection() ); + * KStdAction::copy( kapp, TQ_SLOT( copy() ), actionCollection() ); * \endcode */ void copy(); @@ -639,7 +639,7 @@ public slots: * If the widget with focus provides a paste() slot, call that slot. Thus for a * simple application copy can be implemented as: * \code - * KStdAction::paste( kapp, TQT_SLOT( paste() ), actionCollection() ); + * KStdAction::paste( kapp, TQ_SLOT( paste() ), actionCollection() ); * \endcode */ void paste(); @@ -648,7 +648,7 @@ public slots: * If the widget with focus provides a clear() slot, call that slot. Thus for a * simple application clear() can be implemented as: * \code - * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" ); + * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQ_SLOT( clear() ), actionCollection(), "clear" ); * \endcode * * Note that for some widgets, this may not provide the intended bahavior. For @@ -660,7 +660,7 @@ public slots: * * \code * class MyListView : public TDEListView { - * Q_OBJECT + * TQ_OBJECT * public: * MyListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : TDEListView( parent, name, f ) {} * virtual ~MyListView() {} @@ -675,7 +675,7 @@ public slots: * If the widget with focus provides a selectAll() slot, call that slot. Thus for a * simple application select all can be implemented as: * \code - * KStdAction::selectAll( kapp, TQT_SLOT( selectAll() ), actionCollection() ); + * KStdAction::selectAll( kapp, TQ_SLOT( selectAll() ), actionCollection() ); * \endcode */ void selectAll(); @@ -935,7 +935,7 @@ public: */ TQString checkRecoverFile( const TQString& pFilename, bool& bRecover ) const; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) /** * @internal * Get the X11 display @@ -984,14 +984,14 @@ public: * * @return A pointer to the X11 display visual */ - Qt::HANDLE getX11RGBAVisual(Display *dpy); + TQt::HANDLE getX11RGBAVisual(Display *dpy); /** * Returns the X11 display colormap * * @return An X11 display colormap object */ - Qt::HANDLE getX11RGBAColormap(Display *dpy); + TQt::HANDLE getX11RGBAColormap(Display *dpy); /** * Returns whether or not X11 composition is available @@ -1262,11 +1262,11 @@ protected: */ TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * @internal Used by KUniqueApplication */ - TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap, + TDEApplication( Display *display, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles, TDEInstance* _instance ); /** @@ -1287,7 +1287,7 @@ protected: * This method is used internally to determine which edit slots are implemented * by the widget that has the focus, and to invoke those slots if available. * - * @param slot is the slot as returned using the TQT_SLOT() macro, for example TQT_SLOT( cut() ) + * @param slot is the slot as returned using the TQ_SLOT() macro, for example TQ_SLOT( cut() ) * * This method can be used in TDEApplication subclasses to implement application wide * edit actions not supported by the TDEApplication class. For example (in your subclass): @@ -1295,7 +1295,7 @@ protected: * \code * void MyApplication::deselect() * { - * invokeEditSlot( TQT_SLOT( deselect() ) ); + * invokeEditSlot( TQ_SLOT( deselect() ) ); * } * \endcode * @@ -1303,7 +1303,7 @@ protected: * focused widget if it provides this slot. You can combine this with TDEAction with: * * \code - * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQT_SLOT( cut() ), actionCollection() ); + * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQ_SLOT( cut() ), actionCollection() ); * \endcode * * @see cut() @@ -1352,9 +1352,9 @@ private: void initUrlActionRestrictions(); bool argb_visual; -#if defined(Q_WS_X11) - Qt::HANDLE argb_x11_visual; - Qt::HANDLE argb_x11_colormap; +#if defined(TQ_WS_X11) + TQt::HANDLE argb_x11_visual; + TQt::HANDLE argb_x11_colormap; #endif public: @@ -1452,7 +1452,7 @@ signals: * connect to this to monitor global font changes, especially if you are * using explicit fonts. * - * Note: If you derive from a QWidget-based class, a faster method is to + * Note: If you derive from a TQWidget-based class, a faster method is to * reimplement TQWidget::fontChange(). This is the preferred way * to get informed about font updates. */ diff --git a/tdecore/tdecmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp index 0b9e2693f..548fee4dc 100644 --- a/tdecore/tdecmdlineargs.cpp +++ b/tdecore/tdecmdlineargs.cpp @@ -43,13 +43,13 @@ #include <kstringhandler.h> #include <kstaticdeleter.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define DISPLAY "DISPLAY" -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) #define DISPLAY "QWS_DISPLAY" #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <win32_utils.h> #endif @@ -184,7 +184,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool n parsed = false; mCwd = mCwdd.setObject(mCwd, new char [PATH_MAX+1], true); (void) getcwd(mCwd, PATH_MAX); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN win32_slashify(mCwd, PATH_MAX); #endif if (!noKApp) @@ -926,7 +926,7 @@ TDECmdLineArgs::usage(const char *id) name = name.mid(1); if ((name[0] == '[') && (name[name.length()-1] == ']')) name = name.mid(1, name.length()-2); - printQ(optionFormatString.arg(QString(name), -25) + printQ(optionFormatString.arg(TQString(name), -25) .arg(description)); } else @@ -950,12 +950,12 @@ TDECmdLineArgs::usage(const char *id) opt = opt + name; if (!option->def) { - printQ(optionFormatString.arg(QString(opt), -25) + printQ(optionFormatString.arg(TQString(opt), -25) .arg(description)); } else { - printQ(optionFormatStringDef.arg(QString(opt), -25) + printQ(optionFormatStringDef.arg(TQString(opt), -25) .arg(description).arg(option->def)); } opt = ""; @@ -1099,7 +1099,7 @@ TDECmdLineArgs::setOption(const TQCString &opt, const char *value) addArgument(arg); addArgument(value); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // Hack coming up! if (arg == "-display") { diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h index 2ae0549de..0c23525af 100644 --- a/tdecore/tdeconfig.h +++ b/tdecore/tdeconfig.h @@ -42,7 +42,7 @@ class TDEConfigPrivate; */ class TDECORE_EXPORT TDEConfig : public TDEConfigBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/tdeconfig_compiler/README.dox b/tdecore/tdeconfig_compiler/README.dox index 1b4926e96..b79a086cf 100644 --- a/tdecore/tdeconfig_compiler/README.dox +++ b/tdecore/tdeconfig_compiler/README.dox @@ -213,8 +213,8 @@ color_3=#ffff00 \endverbatim The configuration options will be accessible to the application via -a QColor color(int ColorIndex) and a -void setColor(int ColorIndex, const QColor &v) function. +a TQColor color(int ColorIndex) and a +void setColor(int ColorIndex, const TQColor &v) function. Example 2: \verbatim @@ -239,8 +239,8 @@ sound_Crash=crash.wav sound_Missile=missile.wav The configuration options will be accessible to the application via -a QString sound(int SoundEvent) and a -void setSound(int SoundEvent, const QString &v) function. +a TQString sound(int SoundEvent) and a +void setSound(int SoundEvent, const TQString &v) function. - Parameterized groups diff --git a/tdecore/tdeconfig_compiler/example/example.kcfg b/tdecore/tdeconfig_compiler/example/example.kcfg index 076bfb644..346e652bb 100644 --- a/tdecore/tdeconfig_compiler/example/example.kcfg +++ b/tdecore/tdeconfig_compiler/example/example.kcfg @@ -35,7 +35,7 @@ </entry> <entry name="MyPath" type="Path"> <label>This is a path</label> - <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default> + <default code="true">QDir::homeDirPath()+TQString::fromLatin1(".hidden_file")</default> </entry> <entry name="MyPaths" type="PathList"> <label>This is a list of paths</label> diff --git a/tdecore/tdeconfig_compiler/example/general_base.ui b/tdecore/tdeconfig_compiler/example/general_base.ui index 9b41370c7..9f9d8fbb1 100644 --- a/tdecore/tdeconfig_compiler/example/general_base.ui +++ b/tdecore/tdeconfig_compiler/example/general_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>GeneralBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GeneralBase</cstring> </property> diff --git a/tdecore/tdeconfig_compiler/example/myoptions_base.ui b/tdecore/tdeconfig_compiler/example/myoptions_base.ui index 3c0c2e6cb..62f0356c5 100644 --- a/tdecore/tdeconfig_compiler/example/myoptions_base.ui +++ b/tdecore/tdeconfig_compiler/example/myoptions_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MyOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MyOptionsBase</cstring> </property> diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp index 3dd450061..a3e8e2c8f 100644 --- a/tdecore/tdeconfigbackend.cpp +++ b/tdecore/tdeconfigbackend.cpp @@ -353,7 +353,7 @@ bool TDEConfigINIBackEnd::parseConfigFiles() TQStringList tdercs = TDEGlobal::dirs()-> findAllResources("config", TQString::fromLatin1("kdeglobals")); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString etc_tderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\tderc" ); #else TQString etc_tderc = TQString::fromLatin1("/etc/tderc"); diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp index 417999df6..39e491279 100644 --- a/tdecore/tdeconfigbase.cpp +++ b/tdecore/tdeconfigbase.cpp @@ -435,7 +435,7 @@ TQVariant TDEConfigBase::readPropertyEntry( const char *pKey, case TQVariant::DateTime: return TQVariant( readDateTimeEntry( pKey, &tmp.asDateTime() ) ); case TQVariant::Date: - return TQVariant(TQT_TQDATE_OBJECT(readDateTimeEntry( pKey, &tmp.asDateTime() ).date())); + return TQVariant(readDateTimeEntry( pKey, &tmp.asDateTime() ).date()); case TQVariant::Pixmap: case TQVariant::Image: @@ -451,34 +451,10 @@ TQVariant TDEConfigBase::readPropertyEntry( const char *pKey, case TQVariant::Cursor: case TQVariant::SizePolicy: case TQVariant::Time: -#ifdef USE_QT3 case TQVariant::ByteArray: -#endif // USE_QT3 case TQVariant::BitArray: case TQVariant::KeySequence: case TQVariant::Pen: -#ifdef USE_QT4 - case TQVariant::Char: - case TQVariant::Url: - case TQVariant::Locale: - case TQVariant::RectF: - case TQVariant::SizeF: - case TQVariant::Line: - case TQVariant::LineF: - case TQVariant::PointF: - case TQVariant::RegExp: - case TQVariant::Hash: - case TQVariant::TextLength: - case QVariant::TextFormat: - case TQVariant::Matrix: - case TQVariant::Transform: - case TQVariant::Matrix4x4: - case TQVariant::Vector2D: - case TQVariant::Vector3D: - case TQVariant::Vector4D: - case TQVariant::Quaternion: - case TQVariant::UserType: -#endif // USE_QT4 { break; } @@ -983,7 +959,7 @@ TQColor TDEConfigBase::readColorEntry( const char *pKey, TQString aValue = readEntry( pKey ); if( !aValue.isEmpty() ) { - if ( aValue.at(0) == (QChar)'#' ) + if ( aValue.at(0) == (TQChar)'#' ) { aRetColor.setNamedColor(aValue); } @@ -1124,7 +1100,7 @@ void TDEConfigBase::writePathEntry( const TQString& pKey, const TQString & path, static bool cleanHomeDirPath( TQString &path, const TQString &homeDir ) { -#ifdef Q_WS_WIN //safer +#ifdef TQ_WS_WIN //safer if (!TQDir::convertSeparators(path).startsWith(TQDir::convertSeparators(homeDir))) return false; #else @@ -1378,34 +1354,10 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQVariant &prop, case TQVariant::Cursor: case TQVariant::SizePolicy: case TQVariant::Time: -#ifdef USE_QT3 case TQVariant::ByteArray: -#endif // USE_QT3 case TQVariant::BitArray: case TQVariant::KeySequence: case TQVariant::Pen: -#ifdef USE_QT4 - case TQVariant::Char: - case TQVariant::Url: - case TQVariant::Locale: - case TQVariant::RectF: - case TQVariant::SizeF: - case TQVariant::Line: - case TQVariant::LineF: - case TQVariant::PointF: - case TQVariant::RegExp: - case TQVariant::Hash: - case TQVariant::TextLength: - case QVariant::TextFormat: - case TQVariant::Matrix: - case TQVariant::Transform: - case TQVariant::Matrix4x4: - case TQVariant::Vector2D: - case TQVariant::Vector3D: - case TQVariant::Vector4D: - case TQVariant::Quaternion: - case TQVariant::UserType: -#endif // USE_QT4 { break; } @@ -1449,7 +1401,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStrList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.at(str_list.length() - 1) == (TQChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS ); } @@ -1493,7 +1445,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.at(str_list.length() - 1) == (TQChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand ); } @@ -1757,8 +1709,8 @@ void TDEConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime, TQStrList list; TQCString tempstr; - TQTime time = TQT_TQTIME_OBJECT(rDateTime.time()); - TQDate date = TQT_TQDATE_OBJECT(rDateTime.date()); + TQTime time = rDateTime.time(); + TQDate date = rDateTime.date(); list.insert( 0, tempstr.setNum( date.year() ) ); list.insert( 1, tempstr.setNum( date.month() ) ); diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h index a891409e7..79e53dcc6 100644 --- a/tdecore/tdeconfigbase.h +++ b/tdecore/tdeconfigbase.h @@ -69,7 +69,7 @@ class TDEConfigGroup; */ class TDECORE_EXPORT TDEConfigBase : public TQObject { - Q_OBJECT + TQ_OBJECT friend class TDEConfigBackEnd; diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp index 9578c05c1..7b23f43b8 100644 --- a/tdecore/tdeconfigdialogmanager.cpp +++ b/tdecore/tdeconfigdialogmanager.cpp @@ -69,52 +69,52 @@ void TDEConfigDialogManager::init(bool trackChanges) if(trackChanges) { // QT - changedMap.insert(TQBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQCHECKBOX_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQPUSHBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQRADIOBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); + changedMap.insert("TQButton", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQCheckBox", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQPushButton", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQRadioButton", TQ_SIGNAL(stateChanged(int))); // We can only store one thing, so you can't have // a ButtonGroup that is checkable. - changedMap.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, TQT_SIGNAL(clicked(int))); - changedMap.insert(TQGROUPBOX_OBJECT_NAME_STRING, TQT_SIGNAL(toggled(bool))); - changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(activated (int))); + changedMap.insert("TQButtonGroup", TQ_SIGNAL(clicked(int))); + changedMap.insert("TQGroupBox", TQ_SIGNAL(toggled(bool))); + changedMap.insert("TQComboBox", TQ_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQDATEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert(TQDATETIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert(TQDIAL_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged (int))); - changedMap.insert(TQLINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQSLIDER_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQSPINBOX_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQTIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert(TQTEXTEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged())); - changedMap.insert(TQTEXTBROWSER_OBJECT_NAME_STRING, TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert(TQMULTILINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged())); - changedMap.insert(TQLISTBOX_OBJECT_NAME_STRING, TQT_SIGNAL(selectionChanged())); - changedMap.insert(TQTABWIDGET_OBJECT_NAME_STRING, TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert("TQComboBox", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert("TQDateEdit", TQ_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert("TQDateTimeEdit", TQ_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert("TQDial", TQ_SIGNAL(valueChanged (int))); + changedMap.insert("TQLineEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert("TQSlider", TQ_SIGNAL(valueChanged(int))); + changedMap.insert("TQSpinBox", TQ_SIGNAL(valueChanged(int))); + changedMap.insert("TQTimeEdit", TQ_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert("TQTextEdit", TQ_SIGNAL(textChanged())); + changedMap.insert("TQTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert("TQMultiLineEdit", TQ_SIGNAL(textChanged())); + changedMap.insert("TQListBox", TQ_SIGNAL(selectionChanged())); + changedMap.insert("TQTabWidget", TQ_SIGNAL(currentChanged(TQWidget *))); // KDE - changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int))); - changedMap.insert( "TDEFontCombo", TQT_SIGNAL(activated (int))); - changedMap.insert( "TDEFontRequester", TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( "TDEFontChooser", TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( "KHistoryCombo", TQT_SIGNAL(activated (int))); - - changedMap.insert( "KColorButton", TQT_SIGNAL(changed(const TQColor &))); - changedMap.insert( "KDatePicker", TQT_SIGNAL(dateSelected (TQDate))); - changedMap.insert( "KDateWidget", TQT_SIGNAL(changed (TQDate))); - changedMap.insert( "KDateTimeWidget", TQT_SIGNAL(valueChanged (const TQDateTime &))); - changedMap.insert( "KEditListBox", TQT_SIGNAL(changed())); - changedMap.insert( "TDEListBox", TQT_SIGNAL(selectionChanged())); - changedMap.insert( "KLineEdit", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KPasswordEdit", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KRestrictedLine", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert( "KTextEdit", TQT_SIGNAL(textChanged())); - changedMap.insert( "KURLRequester", TQT_SIGNAL(textChanged (const TQString& ))); - changedMap.insert( "KIntNumInput", TQT_SIGNAL(valueChanged (int))); - changedMap.insert( "KIntSpinBox", TQT_SIGNAL(valueChanged (int))); - changedMap.insert( "KDoubleNumInput", TQT_SIGNAL(valueChanged (double))); + changedMap.insert( "KComboBox", TQ_SIGNAL(activated (int))); + changedMap.insert( "TDEFontCombo", TQ_SIGNAL(activated (int))); + changedMap.insert( "TDEFontRequester", TQ_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( "TDEFontChooser", TQ_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( "KHistoryCombo", TQ_SIGNAL(activated (int))); + + changedMap.insert( "KColorButton", TQ_SIGNAL(changed(const TQColor &))); + changedMap.insert( "KDatePicker", TQ_SIGNAL(dateSelected (TQDate))); + changedMap.insert( "KDateWidget", TQ_SIGNAL(changed (TQDate))); + changedMap.insert( "KDateTimeWidget", TQ_SIGNAL(valueChanged (const TQDateTime &))); + changedMap.insert( "KEditListBox", TQ_SIGNAL(changed())); + changedMap.insert( "TDEListBox", TQ_SIGNAL(selectionChanged())); + changedMap.insert( "KLineEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KPasswordEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KRestrictedLine", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert( "KTextEdit", TQ_SIGNAL(textChanged())); + changedMap.insert( "KURLRequester", TQ_SIGNAL(textChanged (const TQString& ))); + changedMap.insert( "KIntNumInput", TQ_SIGNAL(valueChanged (int))); + changedMap.insert( "KIntSpinBox", TQ_SIGNAL(valueChanged (int))); + changedMap.insert( "KDoubleNumInput", TQ_SIGNAL(valueChanged (double))); } // Go through all of the children of the widgets and find all known widgets @@ -187,8 +187,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha { // If the class name of the widget wasn't in the monitored widgets map, then look for // it again using the super class name. This fixes a problem with using QtRuby/Korundum - // widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even - // though it was a 'QWidget'. + // widgets with TDEConfigXT where 'TQt::Widget' wasn't being seen a the real deal, even + // though it was a 'TQWidget'. changedIt = changedMap.find(childWidget->metaObject()->superClassName()); } @@ -199,7 +199,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha else { connect(childWidget, *changedIt, - this, TQT_SIGNAL(widgetModified())); + this, TQ_SIGNAL(widgetModified())); TQGroupBox *gb = dynamic_cast<TQGroupBox *>(childWidget); if (!gb) @@ -209,8 +209,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha TQComboBox *cb = dynamic_cast<TQComboBox *>(childWidget); if (cb && cb->editable()) - connect(cb, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SIGNAL(widgetModified())); + connect(cb, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SIGNAL(widgetModified())); } } else @@ -218,7 +218,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha kdWarning(178) << "A widget named '" << widgetName << "' was found but there is no setting named '" << configId << "'" << endl; } } - else if (childWidget->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (childWidget->inherits("TQLabel")) { TQLabel *label = static_cast<TQLabel *>(childWidget); TQWidget *buddy = label->buddy(); @@ -238,8 +238,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className()); if (changedIt != changedMap.end()) { - if ((!d->insideGroupBox || !childWidget->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) && - !childWidget->inherits(TQGROUPBOX_OBJECT_NAME_STRING)) + if ((!d->insideGroupBox || !childWidget->inherits("TQRadioButton")) && + !childWidget->inherits("TQGroupBox")) kdDebug(178) << "Widget '" << widgetName << "' (" << childWidget->className() << ") remains unmanaged." << endl; } } @@ -291,7 +291,7 @@ void TDEConfigDialogManager::updateWidgets() blockSignals(bSignalsBlocked); if (changed) - TQTimer::singleShot(0, this, TQT_SIGNAL(widgetModified())); + TQTimer::singleShot(0, this, TQ_SIGNAL(widgetModified())); } void TDEConfigDialogManager::updateWidgetsDefault() diff --git a/tdecore/tdeconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h index ecb3640ea..d3d9644a6 100644 --- a/tdecore/tdeconfigdialogmanager.h +++ b/tdecore/tdeconfigdialogmanager.h @@ -77,7 +77,7 @@ class TQSqlPropertyMap; */ class TDECORE_EXPORT TDEConfigDialogManager : public TQObject { -Q_OBJECT +TQ_OBJECT signals: /** diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp index 8ef5f59db..09f496034 100644 --- a/tdecore/tdeglobal.cpp +++ b/tdecore/tdeglobal.cpp @@ -139,7 +139,7 @@ void TDEGlobal::setActiveInstance(TDEInstance *i) } /** - * Create a static QString + * Create a static TQString * * To be used inside functions(!) like: * static const TQString &myString = TDEGlobal::staticQString("myText"); @@ -157,7 +157,7 @@ public: }; /** - * Create a static QString + * Create a static TQString * * To be used inside functions(!) like: * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text")); diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp index 79cd4586a..97ef4394c 100644 --- a/tdecore/tdeglobalsettings.cpp +++ b/tdecore/tdeglobalsettings.cpp @@ -29,11 +29,11 @@ #include <kipc.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <windows.h> #include "qt_windows.h" #include <win32_utils.h> -static QRgb qt_colorref2qrgb(COLORREF col) +static TQRgb qt_colorref2qrgb(COLORREF col) { return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col)); } @@ -54,7 +54,7 @@ static QRgb qt_colorref2qrgb(COLORREF col) #include <tqtextstream.h> #include <tqfile.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #endif @@ -315,7 +315,7 @@ TQColor TDEGlobalSettings::toolBarHighlightColor() TQColor TDEGlobalSettings::inactiveTitleColor() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION)); #else if (!_inactiveBackground) @@ -327,7 +327,7 @@ TQColor TDEGlobalSettings::inactiveTitleColor() TQColor TDEGlobalSettings::inactiveTextColor() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT)); #else if (!_inactiveForeground) @@ -339,7 +339,7 @@ TQColor TDEGlobalSettings::inactiveTextColor() TQColor TDEGlobalSettings::activeTitleColor() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)); #else initColors(); @@ -352,11 +352,11 @@ TQColor TDEGlobalSettings::activeTitleColor() TQColor TDEGlobalSettings::activeTextColor() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)); #else TDEConfigGroup g( TDEGlobal::config(), "WM" ); - return g.readColorEntry( "activeForeground", tqwhiteptr ); + return g.readColorEntry( "activeForeground", &TQt::white ); #endif } @@ -377,7 +377,7 @@ TQColor TDEGlobalSettings::buttonBackground() TQColor TDEGlobalSettings::buttonTextColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); - return g.readColorEntry( "buttonForeground", tqblackptr ); + return g.readColorEntry( "buttonForeground", &TQt::black ); } // IMPORTANT: @@ -386,7 +386,7 @@ TQColor TDEGlobalSettings::buttonTextColor() TQColor TDEGlobalSettings::baseColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); - return g.readColorEntry( "windowBackground", tqwhiteptr ); + return g.readColorEntry( "windowBackground", &TQt::white ); } // IMPORTANT: @@ -395,7 +395,7 @@ TQColor TDEGlobalSettings::baseColor() TQColor TDEGlobalSettings::textColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); - return g.readColorEntry( "windowForeground", tqblackptr ); + return g.readColorEntry( "windowForeground", &TQt::black ); } // IMPORTANT: @@ -404,7 +404,7 @@ TQColor TDEGlobalSettings::textColor() TQColor TDEGlobalSettings::highlightedTextColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); - return g.readColorEntry( "selectForeground", tqwhiteptr ); + return g.readColorEntry( "selectForeground", &TQt::white ); } // IMPORTANT: @@ -429,7 +429,7 @@ TQColor TDEGlobalSettings::alternateBackgroundColor() TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) { - if (base == Qt::white) + if (base == TQt::white) return TQColor(238,246,255); else { @@ -437,7 +437,7 @@ TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base base.hsv( &h, &s, &v ); if (v > 128) return base.dark(106); - else if (base != Qt::black) + else if (base != TQt::black) return base.light(110); return TQColor(32,32,32); @@ -788,7 +788,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() s_mouseSettings = new KMouseSettings; KMouseSettings & s = *s_mouseSettings; // for convenience -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN TDEConfigGroup g( TDEGlobal::config(), "Mouse" ); TQString setting = g.readEntry("MouseButtonMapping"); if (setting == "RightHanded") @@ -797,7 +797,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() s.handed = KMouseSettings::LeftHanded; else { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // get settings from X server // This is a simplified version of the code in input/mouse.cpp // Keep in sync ! @@ -822,9 +822,9 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() // FIXME(E): Implement in Qt Embedded #endif } -#endif //Q_WS_WIN +#endif //TQ_WS_WIN } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN //not cached s_mouseSettings->handed = (GetSystemMetrics(SM_SWAPBUTTON) ? KMouseSettings::LeftHanded : KMouseSettings::RightHanded); #endif @@ -833,7 +833,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() void TDEGlobalSettings::rereadMouseSettings() { -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN delete s_mouseSettings; s_mouseSettings = 0L; #endif @@ -841,7 +841,7 @@ void TDEGlobalSettings::rereadMouseSettings() bool TDEGlobalSettings::isMultiHead() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return GetSystemMetrics(SM_CMONITORS) > 1; #else TQCString multiHead = getenv("TDE_MULTIHEAD"); diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp index 3e8ef6daa..754fd31b8 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp @@ -1259,23 +1259,23 @@ TDENetworkConnectionManager_BackendNM::TDENetworkConnectionManager_BackendNM(TDE } // Connect global signals - connect(d->m_networkManagerProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessGlobalStateChanged(TQ_UINT32))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessGlobalStateChanged(TQ_UINT32))); // Connect VPN signals if (d->m_vpnProxy) { - connect(d->m_vpnProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessVPNStateChanged(TQ_UINT32))); - connect(d->m_vpnProxy, SIGNAL(LoginBanner(const TQString&)), d, SLOT(internalProcessVPNLoginBanner(const TQString&))); - connect(d->m_vpnProxy, SIGNAL(Failure(TQ_UINT32)), d, SLOT(internalProcessVPNFailure(TQ_UINT32))); + connect(d->m_vpnProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNStateChanged(TQ_UINT32))); + connect(d->m_vpnProxy, TQ_SIGNAL(LoginBanner(const TQString&)), d, TQ_SLOT(internalProcessVPNLoginBanner(const TQString&))); + connect(d->m_vpnProxy, TQ_SIGNAL(Failure(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNFailure(TQ_UINT32))); } // Connect local signals if (d->m_networkDeviceProxy) { - connect(d->m_networkDeviceProxy, SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32))); + connect(d->m_networkDeviceProxy, TQ_SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, TQ_SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32))); } if (d->m_wiFiDeviceProxy) { - connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&))); - connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&))); - connect(d->m_wiFiDeviceProxy, SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), d, SLOT(internalProcessWiFiPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), d, TQ_SLOT(internalProcessWiFiPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&))); } // Create public lists @@ -1510,7 +1510,7 @@ void TDENetworkConnectionManager_BackendNMPrivate::internalProcessWiFiAccessPoin // Set up monitoring object DBus::AccessPointProxy* apProxy = new DBus::AccessPointProxy(NM_DBUS_SERVICE, dbuspath); apProxy->setConnection(TQT_DBusConnection::systemBus()); - connect(apProxy, SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), this, SLOT(internalProcessAPPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&))); + connect(apProxy, TQ_SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), this, TQ_SLOT(internalProcessAPPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&))); m_accessPointProxyList[dbuspath] = (apProxy); // Notify client applications @@ -1599,7 +1599,7 @@ TDENetworkConnectionType::TDENetworkConnectionType TDENetworkConnectionManager_B // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -1928,8 +1928,8 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (*it)); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); - connect(&connectionSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); + connect(&connectionSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -3055,7 +3055,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri // Obtain connection secrets from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); + connect(&connectionSettings, TQ_SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); int asyncCallID; ret = connectionSettings.GetSecretsAsync(asyncCallID, group, error); if (ret && error.isValid()) { @@ -3260,7 +3260,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -4492,7 +4492,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* // Save connection settings to the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(UpdateAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(&connectionSettings, TQ_SIGNAL(UpdateAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); int asyncCallID; ret = connectionSettings.UpdateAsync(asyncCallID, connectionSettingsMap, error); if (ret && error.isValid()) { @@ -4526,8 +4526,8 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* printf("[network-manager comm debug] Creating new connection\n"); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Create new connection - connect(d->m_networkManagerSettings, SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); - connect(d->m_networkManagerSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); + connect(d->m_networkManagerSettings, TQ_SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); + connect(d->m_networkManagerSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); int asyncCallID; ret = d->m_networkManagerSettings->AddConnectionAsync(asyncCallID, connectionSettingsMap, error); if (ret && error.isValid()) { @@ -4580,7 +4580,7 @@ bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) { // Obtain connection secrets from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(DeleteAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(&connectionSettings, TQ_SIGNAL(DeleteAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); int asyncCallID; ret = connectionSettings.DeleteAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -4804,8 +4804,8 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag return checkConnectionStatus(uuid); #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING - connect(d->m_networkManagerProxy, SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); - connect(d->m_networkManagerProxy, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING int asyncCallID; ret = d->m_networkManagerProxy->ActivateConnectionAsync(asyncCallID, existingConnection, TQT_DBusObjectPath(d->m_dbusDeviceString.ascii()), TQT_DBusObjectPath("/"), error); @@ -5000,7 +5000,7 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag return checkConnectionStatus(uuid); #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING - connect(d->m_networkManagerProxy, SIGNAL(DeactivateConnectionAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(DeactivateConnectionAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING int asyncCallID; ret = d->m_networkManagerProxy->DeactivateConnectionAsync(asyncCallID, existingConnection, error); @@ -5441,7 +5441,7 @@ TDENetworkConnectionManager_BackendNMPrivate::TDENetworkConnectionManager_Backen // Set up global signal handler m_dbusSignalConnection = new TQT_DBusConnection(TQT_DBusConnection::systemBus()); m_dbusSignalReceiver = new TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(this); - m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQT_SLOT(dbusSignal(const TQT_DBusMessage&))); + m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQ_SLOT(dbusSignal(const TQT_DBusMessage&))); } TDENetworkConnectionManager_BackendNMPrivate::~TDENetworkConnectionManager_BackendNMPrivate() { diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.h b/tdecore/tdehw/networkbackends/network-manager/network-manager.h index f14e4992e..8af99e846 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.h +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.h @@ -211,7 +211,7 @@ class TDENetworkConnectionManager_BackendNMPrivate; class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkConnectionManager { - Q_OBJECT + TQ_OBJECT public: TDENetworkConnectionManager_BackendNM(TDENetworkDevice* networkDevice); diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h index 61ce31329..43cafda25 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h @@ -71,7 +71,7 @@ class TDENetworkConnectionManager_BackendNMPrivate; class TDENetworkConnectionManager_BackendNM_DBusSignalReceiver : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(TDENetworkConnectionManager_BackendNMPrivate*); @@ -86,7 +86,7 @@ class TDENetworkConnectionManager_BackendNM_DBusSignalReceiver : public TQObject class TDENetworkConnectionManager_BackendNMPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDENetworkConnectionManager_BackendNMPrivate(TDENetworkConnectionManager_BackendNM*); diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp index c593d2ab6..4d9eeaab3 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.cpp +++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp @@ -509,9 +509,9 @@ void TDECryptographicCardDevice::enableCardMonitoring(bool enable) { m_watcherObject->cardDevice = this; m_watcherObject->moveToThread(m_watcherThread); - TQObject::connect(m_watcherObject, SIGNAL(statusChanged(TQString,TQString)), this, SLOT(cardStatusChanged(TQString,TQString))); - TQObject::connect(m_watcherObject, SIGNAL(pinRequested(TQString)), this, SLOT(workerRequestedPin(TQString))); - TQTimer::singleShot(0, m_watcherObject, SLOT(run())); + TQObject::connect(m_watcherObject, TQ_SIGNAL(statusChanged(TQString,TQString)), this, TQ_SLOT(cardStatusChanged(TQString,TQString))); + TQObject::connect(m_watcherObject, TQ_SIGNAL(pinRequested(TQString)), this, TQ_SLOT(workerRequestedPin(TQString))); + TQTimer::singleShot(0, m_watcherObject, TQ_SLOT(run())); m_watcherThread->start(); } diff --git a/tdecore/tdehw/tdecryptographiccarddevice.h b/tdecore/tdehw/tdecryptographiccarddevice.h index 0907322d7..8b3bd211a 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.h +++ b/tdecore/tdehw/tdecryptographiccarddevice.h @@ -38,7 +38,7 @@ typedef TQValueListIterator<X509*> X509CertificatePtrListIterator; class TDECORE_EXPORT TDECryptographicCardDevice : public TDEGenericDevice { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdehw/tdeeventdevice.cpp b/tdecore/tdehw/tdeeventdevice.cpp index c528a42db..3223e80e7 100644 --- a/tdecore/tdehw/tdeeventdevice.cpp +++ b/tdecore/tdehw/tdeeventdevice.cpp @@ -349,7 +349,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) { if (eventType() != TDEEventDeviceType::Unknown) { if (m_fd >= 0) { m_eventNotifier = new TQSocketNotifier(m_fd, TQSocketNotifier::Read, this); - connect( m_eventNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(eventReceived()) ); + connect( m_eventNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(eventReceived()) ); m_monitorActive = true; } } @@ -357,7 +357,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) { // get initial state of switches internalReadProvidedSwitches(); internalReadActiveSwitches(); - connect( this, TQT_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQT_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) ); + connect( this, TQ_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQ_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) ); } } } @@ -387,9 +387,9 @@ void TDEEventDevice::processActiveSwitches() { } void TDEEventDevice::connectNotify( const char* signal ) { - if( !m_monitorActive && qstrcmp( signal, TQT_SIGNAL(switchChanged())) == 0 ) { + if( !m_monitorActive && qstrcmp( signal, TQ_SIGNAL(switchChanged())) == 0 ) { m_watchTimer = new TQTimer(this); - connect( m_watchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processActiveSwitches()) ); + connect( m_watchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processActiveSwitches()) ); m_watchTimer->start( 2500, false ); m_monitorActive = true; diff --git a/tdecore/tdehw/tdeeventdevice.h b/tdecore/tdehw/tdeeventdevice.h index 64130508c..a1f1af6a6 100644 --- a/tdecore/tdehw/tdeeventdevice.h +++ b/tdecore/tdehw/tdeeventdevice.h @@ -79,7 +79,7 @@ class TQSocketNotifier; class TDECORE_EXPORT TDEEventDevice : public TDEGenericDevice { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdehw/tdegenericdevice.h b/tdecore/tdehw/tdegenericdevice.h index 91e9ac79e..53804cf96 100644 --- a/tdecore/tdehw/tdegenericdevice.h +++ b/tdecore/tdehw/tdegenericdevice.h @@ -30,7 +30,7 @@ class TDECORE_EXPORT TDEGenericDevice : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 0da216a87..f54b1e138 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -89,22 +89,13 @@ timespec diff(timespec start, timespec end) return temp; } -// BEGIN BLOCK -// Copied from include/linux/genhd.h -#define GENHD_FL_REMOVABLE 1 -#define GENHD_FL_MEDIA_CHANGE_NOTIFY 4 -#define GENHD_FL_CD 8 -#define GENHD_FL_UP 16 -#define GENHD_FL_SUPPRESS_PARTITION_INFO 32 -#define GENHD_FL_EXT_DEVT 64 -#define GENHD_FL_NATIVE_CAPACITY 128 -#define GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE 256 -// END BLOCK - // NOTE TO DEVELOPERS // This command will greatly help when attempting to find properties to distinguish one device from another // udevadm info --query=all --path=/sys/.... +// Some local utility functions and constants +namespace { + // This routine is courtsey of an answer on "Stack Overflow" // It takes an LSB-first int and makes it an MSB-first int (or vice versa) unsigned int reverse_bits(unsigned int x) @@ -116,6 +107,19 @@ unsigned int reverse_bits(unsigned int x) return((x >> 16) | (x << 16)); } +// Read the content of a file that supposed to contain a single line +TQString readLineFile(TQString fname) { + TQFile file( fname ); + if ( file.open( IO_ReadOnly ) ) { + TQTextStream stream( &file ); + return stream.readLine(); + } else { + return TQString::null; + } +} + +} // namespace + // Helper function implemented in tdestoragedevice.cpp TQString decodeHexEncoding(TQString str); @@ -151,7 +155,7 @@ TDEHardwareDevices::TDEHardwareDevices() { int udevmonitorfd = udev_monitor_get_fd(m_udevMonitorStruct); if (udevmonitorfd >= 0) { m_devScanNotifier = new TQSocketNotifier(udevmonitorfd, TQSocketNotifier::Read, this); - connect( m_devScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHotPluggedHardware()) ); + connect( m_devScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processHotPluggedHardware()) ); } // Read in the current mount table @@ -173,7 +177,7 @@ TDEHardwareDevices::TDEHardwareDevices() { m_procMountsFd = open("/proc/mounts", O_RDONLY, 0); if (m_procMountsFd >= 0) { m_mountScanNotifier = new TQSocketNotifier(m_procMountsFd, TQSocketNotifier::Exception, this); - connect( m_mountScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processModifiedMounts()) ); + connect( m_mountScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processModifiedMounts()) ); } // Read in the current cpu information @@ -195,20 +199,20 @@ TDEHardwareDevices::TDEHardwareDevices() { // Monitor for changed cpu information // Watched directories are set up during the initial CPU scan m_cpuWatch = new KSimpleDirWatch(this); - connect( m_cpuWatch, TQT_SIGNAL(dirty(const TQString &)), this, TQT_SLOT(processModifiedCPUs()) ); + connect( m_cpuWatch, TQ_SIGNAL(dirty(const TQString &)), this, TQ_SLOT(processModifiedCPUs()) ); #else m_cpuWatchTimer = new TQTimer(this); - connect( m_cpuWatchTimer, SIGNAL(timeout()), this, SLOT(processModifiedCPUs()) ); + connect( m_cpuWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processModifiedCPUs()) ); #endif // Some devices do not receive update signals from udev // These devices must be polled, and a good polling interval is 1 second m_deviceWatchTimer = new TQTimer(this); - connect( m_deviceWatchTimer, SIGNAL(timeout()), this, SLOT(processStatelessDevices()) ); + connect( m_deviceWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processStatelessDevices()) ); // Special case for battery and power supply polling (longer delay, 5 seconds) m_batteryWatchTimer = new TQTimer(this); - connect( m_batteryWatchTimer, SIGNAL(timeout()), this, SLOT(processBatteryDevices()) ); + connect( m_batteryWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processBatteryDevices()) ); // Update internal device information. queryHardwareInformation(); @@ -2511,36 +2515,6 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic sdevice->internalSetFileSystemName("pictbridge"); } else { - bool removable = false; - bool hotpluggable = false; - - // We can get the removable flag, but we have no idea if the device has the ability to notify on media insertion/removal - // If there is no such notification possible, then we should not set the removable flag - // udev can be such an amazing pain at times - // It exports a /capabilities node with no info on what the bits actually mean - // This information is very poorly documented as a set of #defines in include/linux/genhd.h - // We are specifically interested in GENHD_FL_REMOVABLE and GENHD_FL_MEDIA_CHANGE_NOTIFY - // The "removable" flag should also really be renamed to "hotpluggable", as that is far more precise... - TQString capabilitynodename = systempath; - capabilitynodename.append("/capability"); - TQFile capabilityfile( capabilitynodename ); - unsigned int capabilities = 0; - if ( capabilityfile.open( IO_ReadOnly ) ) { - TQTextStream stream( &capabilityfile ); - TQString capabilitystring; - capabilitystring = stream.readLine(); - capabilities = capabilitystring.toUInt(); - capabilityfile.close(); - } - if (capabilities & GENHD_FL_REMOVABLE) { - // FIXME - // For added fun this is not always true; i.e. GENHD_FL_REMOVABLE can be set when the device cannot be hotplugged (floppy drives). - hotpluggable = true; - } - if (capabilities & GENHD_FL_MEDIA_CHANGE_NOTIFY) { - removable = true; - } - // See if any other devices are exclusively using this device, such as the Device Mapper TQStringList holdingDeviceNodes; TQString holdersnodename = udev_device_get_syspath(dev); @@ -2733,21 +2707,16 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic } } - if (removable) { + if (readLineFile( systempath + "/removable" ).toUInt()) { diskstatus = diskstatus | TDEDiskDeviceStatus::Removable; } - if (hotpluggable) { - diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable; - } // Force removable flag for flash disks // udev reports disks as non-removable for card readers on PCI controllers - if (((disktype & TDEDiskDeviceType::CompactFlash) + else if ((disktype & TDEDiskDeviceType::CompactFlash) || (disktype & TDEDiskDeviceType::MemoryStick) || (disktype & TDEDiskDeviceType::SmartMedia) - || (disktype & TDEDiskDeviceType::SDMMC)) - && !(diskstatus & TDEDiskDeviceStatus::Removable) - && !(diskstatus & TDEDiskDeviceStatus::Hotpluggable)) { - diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable; + || (disktype & TDEDiskDeviceType::SDMMC)) { + diskstatus = diskstatus | TDEDiskDeviceStatus::Removable; } if ((!filesystemtype.isEmpty()) && (filesystemtype.upper() != "CRYPTO_LUKS") && @@ -2765,7 +2734,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic // type string too. For example for LUKS disk, ID_TYPE is null and DEVTYPE is "disk" diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable; } - if (removable) { + if ( diskstatus & TDEDiskDeviceStatus::Removable ) { if (sdevice->mediaInserted()) { diskstatus = diskstatus | TDEDiskDeviceStatus::Inserted; } @@ -2955,7 +2924,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic ndevice->internalSetIpV6Netmask(address); } } - s = getnameinfo(ifa->ifa_ifu.ifu_broadaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + s = ifa->ifa_ifu.ifu_broadaddr ? getnameinfo(ifa->ifa_ifu.ifu_broadaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) : EAI_NONAME; if (s == 0) { TQString address(host); if (family == AF_INET) { @@ -2966,7 +2935,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic ndevice->internalSetIpV6Broadcast(address); } } - s = getnameinfo(ifa->ifa_ifu.ifu_dstaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + s = ifa->ifa_ifu.ifu_dstaddr ? getnameinfo(ifa->ifa_ifu.ifu_dstaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) : EAI_NONAME; if (s == 0) { TQString address(host); if (family == AF_INET) { diff --git a/tdecore/tdehw/tdehardwaredevices.h b/tdecore/tdehw/tdehardwaredevices.h index db63e9d34..4e4259dfc 100644 --- a/tdecore/tdehw/tdehardwaredevices.h +++ b/tdecore/tdehw/tdehardwaredevices.h @@ -81,7 +81,7 @@ typedef TQDict<TDECPUDevice> TDECPUDeviceCache; class TDECORE_EXPORT TDEHardwareDevices : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdehw/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp index 0b6405ea3..b2ae276a8 100644 --- a/tdecore/tdehw/tdenetworkconnections.cpp +++ b/tdecore/tdehw/tdenetworkconnections.cpp @@ -707,7 +707,7 @@ TDEWiFiConnection::~TDEWiFiConnection() { TDENetworkConnectionManager::TDENetworkConnectionManager(TDENetworkDevice *networkDevice) : TQObject(), m_connectionList(NULL), m_hwNeighborList(NULL), m_networkDevice(networkDevice), m_prevConnectionStatus(TDENetworkGlobalManagerFlags::Unknown) { m_emissionTimer = new TQTimer(); - connect(m_emissionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitQueuedSignals())); + connect(m_emissionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitQueuedSignals())); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true); } @@ -962,9 +962,9 @@ TDEGlobalNetworkManager::TDEGlobalNetworkManager() : m_internalConnectionManager m_internalConnectionManager = new TDENetworkConnectionManager_BackendNM(NULL); #endif // WITH_NETWORK_MANAGER_BACKEND if (m_internalConnectionManager) { - connect(m_internalConnectionManager, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); - connect(m_internalConnectionManager, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); - connect(m_internalConnectionManager, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType))); + connect(m_internalConnectionManager, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); + connect(m_internalConnectionManager, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); + connect(m_internalConnectionManager, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType))); } } diff --git a/tdecore/tdehw/tdenetworkconnections.h b/tdecore/tdehw/tdenetworkconnections.h index 806c162a8..aa44e8edb 100644 --- a/tdecore/tdehw/tdenetworkconnections.h +++ b/tdecore/tdehw/tdenetworkconnections.h @@ -1015,7 +1015,7 @@ class TQTimer; class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -1364,7 +1364,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject class TDECORE_EXPORT TDEGlobalNetworkManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index 08fb246e1..df5f90ab7 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -504,7 +504,7 @@ TQString TDEStorageDevice::friendlyName() { TQString label = diskLabel(); if (label.isNull()) { if (deviceSize() > 0) { - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { label = i18n("%1 Removable Device").arg(deviceFriendlySize()); } else { @@ -561,7 +561,7 @@ TQString TDEStorageDevice::friendlyDeviceType() { if (isDiskOfType(TDEDiskDeviceType::HDD)) { ret = i18n("Hard Disk Drive"); - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { ret = i18n("Removable Storage"); } if (isDiskOfType(TDEDiskDeviceType::CompactFlash)) { @@ -632,7 +632,7 @@ TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) { if (isDiskOfType(TDEDiskDeviceType::HDD)) { ret = DesktopIcon("drive-harddisk" + mountString, size); - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { ret = DesktopIcon("media-flash-usb" + mountString, size); } if (isDiskOfType(TDEDiskDeviceType::CompactFlash)) { diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h index c279586f8..891b31573 100644 --- a/tdecore/tdehw/tdestoragedevice.h +++ b/tdecore/tdehw/tdestoragedevice.h @@ -22,6 +22,7 @@ #include "tdegenericdevice.h" #include "tqvariant.h" +#include "kdemacros.h" struct crypt_device; @@ -107,7 +108,7 @@ enum TDEDiskDeviceStatus { UsedByDevice = 0x00000010, UsesDevice = 0x00000020, ContainsFilesystem = 0x00000040, - Hotpluggable = 0x00000080, + // Do not use 0x00000080, it was `Hotpluggable` up to the R14.1.x series Hidden = 0x00000100, Other = 0x80000000 }; diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h index 7d2ab7db2..9697c6bb4 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -26,7 +26,7 @@ /* needed, because e.g. Q_OS_UNIX is so frequently used */ #include <tqglobal.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <tdelibs_export_win.h> #else /* Q_OS_UNIX */ diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp index 91e0865bf..3c6dc0cc8 100644 --- a/tdecore/tdelocale.cpp +++ b/tdecore/tdelocale.cpp @@ -42,7 +42,7 @@ #include "kcalendarsystemfactory.h" #include "tdelocale.h" -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <windows.h> #endif @@ -72,7 +72,7 @@ public: KCalendarSystem * calendar; bool utf8FileEncoding; TQString appName; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN char win32SystemEncoding[3+7]; //"cp " + lang ID #endif bool useMainCatalogue; @@ -1218,34 +1218,34 @@ static void _inc_by_one(TQString &str, int position) switch(last_char) { case '0': - str[i] = (QChar)'1'; + str[i] = (TQChar)'1'; break; case '1': - str[i] = (QChar)'2'; + str[i] = (TQChar)'2'; break; case '2': - str[i] = (QChar)'3'; + str[i] = (TQChar)'3'; break; case '3': - str[i] = (QChar)'4'; + str[i] = (TQChar)'4'; break; case '4': - str[i] = (QChar)'5'; + str[i] = (TQChar)'5'; break; case '5': - str[i] = (QChar)'6'; + str[i] = (TQChar)'6'; break; case '6': - str[i] = (QChar)'7'; + str[i] = (TQChar)'7'; break; case '7': - str[i] = (QChar)'8'; + str[i] = (TQChar)'8'; break; case '8': - str[i] = (QChar)'9'; + str[i] = (TQChar)'9'; break; case '9': - str[i] = (QChar)'0'; + str[i] = (TQChar)'0'; if (i == 0) str.prepend('1'); continue; case '.': @@ -1310,8 +1310,8 @@ TQString TDELocale::formatNumber(const TQString &numStr, bool round, // Skip the sign (for now) - bool neg = (tmpString[0] == (QChar)'-'); - if (neg || tmpString[0] == (QChar)'+') tmpString.remove(0, 1); + bool neg = (tmpString[0] == (TQChar)'-'); + if (neg || tmpString[0] == (TQChar)'+') tmpString.remove(0, 1); // Split off exponential part (including 'e'-symbol) TQString mantString = tmpString.section('e', 0, 0, @@ -1472,7 +1472,7 @@ double TDELocale::readNumber(const TQString &_str, bool * ok) const } TQString tot; - if (neg) tot = (QChar)'-'; + if (neg) tot = (TQChar)'-'; tot += major + '.' + minor + exponentialPart; @@ -1502,7 +1502,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const // (with a special case for parenthesis) if (negativeMonetarySignPosition() == ParensAround) { - if (str[0] == (QChar)'(' && str[str.length()-1] == (QChar)')') + if (str[0] == (TQChar)'(' && str[str.length()-1] == (TQChar)')') { neg = true; str.remove(str.length()-1,1); @@ -1569,7 +1569,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const } TQString tot; - if (neg) tot = (QChar)'-'; + if (neg) tot = (TQChar)'-'; tot += major + '.' + minior; return tot.toDouble(ok); } @@ -1626,7 +1626,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok TQChar c = fmt.at(fmtpos++); - if (c != (QChar)'%') { + if (c != (TQChar)'%') { if (c.isSpace() && str.at(strpos).isSpace()) strpos++; else if (c != str.at(strpos++)) @@ -1648,7 +1648,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok error = true; j = 1; while (error && (j < 8)) { - TQString s = calendar()->weekDayName(j, c == (QChar)'a').lower(); + TQString s = calendar()->weekDayName(j, c == (TQChar)'a').lower(); int len = s.length(); if (str.mid(strpos, len) == s) { @@ -1665,7 +1665,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok if (d->nounDeclension && d->dateMonthNamePossessive) { j = 1; while (error && (j < 13)) { - TQString s = calendar()->monthNamePossessive(j, year, c == (QChar)'b').lower(); + TQString s = calendar()->monthNamePossessive(j, year, c == (TQChar)'b').lower(); int len = s.length(); if (str.mid(strpos, len) == s) { month = j; @@ -1677,7 +1677,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok } j = 1; while (error && (j < 13)) { - TQString s = calendar()->monthName(j, year, c == (QChar)'b').lower(); + TQString s = calendar()->monthName(j, year, c == (TQChar)'b').lower(); int len = s.length(); if (str.mid(strpos, len) == s) { month = j; @@ -1766,7 +1766,7 @@ TQTime TDELocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok TQChar c = Format.at(Formatpos++); - if (c != (QChar)'%') + if (c != (TQChar)'%') { if (c.isSpace()) strpos++; @@ -1885,7 +1885,7 @@ TQString TDELocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDur switch ( TQChar(rst.at( format_index )).unicode() ) { case '%': - buffer[index++] = (QChar)'%'; + buffer[index++] = (TQChar)'%'; break; case 'H': put_it_in( buffer, index, pTime.hour() ); @@ -1969,8 +1969,8 @@ TQString TDELocale::formatDateTime(const TQDateTime &pDateTime, bool includeSeconds) const { return translate("concatenation of dates and time", "%1 %2") - .arg( formatDate( TQT_TQDATE_OBJECT(pDateTime.date()), shortFormat ) ) - .arg( formatTime( TQT_TQTIME_OBJECT(pDateTime.time()), includeSeconds ) ); + .arg( formatDate( pDateTime.date(), shortFormat ) ) + .arg( formatTime( pDateTime.time(), includeSeconds ) ); } TQString i18n(const char* text) @@ -2083,22 +2083,12 @@ void TDELocale::initFileNameEncoding(TDEConfig *) // which, on Unix platforms, use the locale's codec. } -#ifdef USE_QT3 TQCString TDELocale::encodeFileNameUTF8( const TQString & fileName ) -#endif // USE_QT3 -#ifdef USE_QT4 -QByteArray TDELocale::encodeFileNameUTF8( const QString & fileName ) -#endif // USE_QT4 { return TQString(fileName).utf8(); } -#ifdef USE_QT3 TQString TDELocale::decodeFileNameUTF8( const TQCString & localFileName ) -#endif // USE_QT3 -#ifdef USE_QT4 -QString TDELocale::decodeFileNameUTF8( const QByteArray & localFileName ) -#endif // USE_QT4 { return TQString::fromUtf8(localFileName); } @@ -2274,7 +2264,7 @@ TQString TDELocale::defaultCountry() const char * TDELocale::encoding() const { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (0==qstrcmp("System", codecForEncoding()->name())) { //win32 returns "System" codec name here but KDE apps expect a real name: diff --git a/tdecore/tdelocale.h b/tdecore/tdelocale.h index b52a32157..19525535c 100644 --- a/tdecore/tdelocale.h +++ b/tdecore/tdelocale.h @@ -1220,22 +1220,12 @@ private: /** * @internal A TQFile filename encoding function (TQFile::encodeFn). */ -#ifdef USE_QT3 static TQCString encodeFileNameUTF8( const TQString & fileName ); -#endif // USE_QT3 -#ifdef USE_QT4 - static QByteArray encodeFileNameUTF8( const QString & fileName ); -#endif // USE_QT4 /** * @internal TQFile filename decoding function (TQFile::decodeFn). */ -#ifdef USE_QT3 static TQString decodeFileNameUTF8( const TQCString & localFileName ); -#endif // USE_QT3 -#ifdef USE_QT4 - static QString decodeFileNameUTF8( const QByteArray & localFileName ); -#endif // USE_QT4 /** * @internal Changes the file name of the catalog to the correct diff --git a/tdecore/tdemultipledrag.h b/tdecore/tdemultipledrag.h index bfc408019..631959bc0 100644 --- a/tdecore/tdemultipledrag.h +++ b/tdecore/tdemultipledrag.h @@ -53,7 +53,7 @@ class KMultipleDragPrivate; */ class TDECORE_EXPORT KMultipleDrag : public TQDragObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp index 86b532f9c..e3c82ce7e 100644 --- a/tdecore/tdeshortcut.cpp +++ b/tdecore/tdeshortcut.cpp @@ -89,10 +89,10 @@ bool KKey::init( const TQKeySequence& key ) bool KKey::init( const TQKeyEvent* pEvent ) { int keyQt = pEvent->key(); - if( pEvent->state() & TQt::ShiftButton ) keyQt |= Qt::SHIFT; - if( pEvent->state() & TQt::ControlButton ) keyQt |= Qt::CTRL; - if( pEvent->state() & TQt::AltButton ) keyQt |= Qt::ALT; - if( pEvent->state() & TQt::MetaButton ) keyQt |= Qt::META; + if( pEvent->state() & TQt::ShiftButton ) keyQt |= TQt::SHIFT; + if( pEvent->state() & TQt::ControlButton ) keyQt |= TQt::CTRL; + if( pEvent->state() & TQt::AltButton ) keyQt |= TQt::ALT; + if( pEvent->state() & TQt::MetaButton ) keyQt |= TQt::META; return init( keyQt ); } diff --git a/tdecore/tdeshortcut.h b/tdecore/tdeshortcut.h index 09f7fce05..69fb3c82c 100644 --- a/tdecore/tdeshortcut.h +++ b/tdecore/tdeshortcut.h @@ -45,7 +45,7 @@ class TDECORE_EXPORT KKey * @see ModFlag */ enum { MOD_FLAG_COUNT = 4 }; - enum { QtWIN = (Qt::META) }; + enum { QtWIN = (TQt::META) }; /** * Flags to represent the modifiers. You can combine modifiers * by ORing them. @@ -68,7 +68,7 @@ class TDECORE_EXPORT KKey /** * Creates a new key for the given Qt key code. * @param keyQt the qt keycode - * @see Qt::Key + * @see TQt::Key */ KKey( int keyQt ); @@ -115,7 +115,7 @@ class TDECORE_EXPORT KKey * Initializes the key with the given Qt key code. * @param keyQt the qt keycode * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key */ bool init( int keyQt ); @@ -217,7 +217,7 @@ class TDECORE_EXPORT KKey /** * Returns the qt key code. * @return the qt key code or 0 if there is no key set. - * @see Qt::Key + * @see TQt::Key */ int keyCodeQt() const; @@ -469,7 +469,7 @@ class TDECORE_EXPORT KKeySequence */ bool operator < ( const KKeySequence& seq ) const { return compare( seq ) < 0; } - // TODO: consider adding Qt::SequenceMatch matches(...) methods for TQKeySequence equivalence + // TODO: consider adding TQt::SequenceMatch matches(...) methods for TQKeySequence equivalence /** * Converts this key sequence to a TQKeySequence. @@ -480,7 +480,7 @@ class TDECORE_EXPORT KKeySequence /** * Returns the qt key code of the first key. * @return the qt key code of the first key - * @see Qt::Key + * @see TQt::Key * @see KKey::keyCodeQt() */ int keyCodeQt() const; @@ -528,7 +528,7 @@ class TDECORE_EXPORT KKeySequence * the below code binds the escape key to the close action. * * \code -* TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() ); +* TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() ); * TDEShortcut closeShortcut = closeAction->shortcut(); * closeShortcut.append( KKey(Key_Escape)); * closeAction->setShortcut(closeShortcut); @@ -561,7 +561,7 @@ class TDECORE_EXPORT TDEShortcut * Creates a new shortcut with the given Qt key code * as the only key sequence. * @param keyQt the qt keycode - * @see Qt::Key + * @see TQt::Key */ TDEShortcut( int keyQt ); @@ -622,7 +622,7 @@ class TDECORE_EXPORT TDEShortcut * Initializes the shortcut with the given Qt key code * as the only key sequence. * @param keyQt the qt keycode - * @see Qt::Key + * @see TQt::Key */ bool init( int keyQt ); @@ -686,7 +686,7 @@ class TDECORE_EXPORT TDEShortcut * Returns the key code of the first key sequence, or * null if there is no first key sequence. * @return the key code of the first sequence's first key - * @see Qt::Key + * @see TQt::Key * @see KKeySequence::keyCodeQt() */ int keyCodeQt() const; diff --git a/tdecore/tdeshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp index c035c0df9..bf381bf78 100644 --- a/tdecore/tdeshortcutmenu.cpp +++ b/tdecore/tdeshortcutmenu.cpp @@ -84,14 +84,14 @@ void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent ) KKey key( pEvent ); switch( pEvent->key() ) { - case TQ_Key_Shift: - case TQ_Key_Control: - case TQ_Key_Alt: - case TQ_Key_Meta: - case TQ_Key_Super_L: - case TQ_Key_Super_R: - case TQ_Key_Hyper_L: - case TQ_Key_Hyper_R: + case Key_Shift: + case Key_Control: + case Key_Alt: + case Key_Meta: + case Key_Super_L: + case Key_Super_R: + case Key_Hyper_L: + case Key_Hyper_R: break; default: int iItem = searchForKey( key ); @@ -104,8 +104,8 @@ void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent ) if( iItem == -1 ) { // Let Up and Down keys navigate menu, // And permit Enter, Return to select the item. - if( pEvent->key() == Qt::Key_Up || pEvent->key() == Qt::Key_Down || - pEvent->key() == Qt::Key_Enter || pEvent->key() == Qt::Key_Return ) + if( pEvent->key() == TQt::Key_Up || pEvent->key() == TQt::Key_Down || + pEvent->key() == TQt::Key_Enter || pEvent->key() == TQt::Key_Return ) TQPopupMenu::keyPressEvent( pEvent ); else close(); diff --git a/tdecore/tdeshortcutmenu.h b/tdecore/tdeshortcutmenu.h index ece721942..0387bdbae 100644 --- a/tdecore/tdeshortcutmenu.h +++ b/tdecore/tdeshortcutmenu.h @@ -34,7 +34,7 @@ class TDEAccelActions; */ class TDECORE_EXPORT TDEShortcutMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq ); diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp index 77b979edb..22f2b0bc6 100644 --- a/tdecore/tdestartupinfo.cpp +++ b/tdecore/tdestartupinfo.cpp @@ -33,8 +33,8 @@ DEALINGS IN THE SOFTWARE. #include <tqwidget.h> #include "config.h" -#ifdef Q_WS_X11 -//#ifdef Q_WS_X11 // FIXME(E): Re-implement in a less X11 specific way +#ifdef TQ_WS_X11 +//#ifdef TQ_WS_X11 // FIXME(E): Re-implement in a less X11 specific way #include <tqglobal.h> #ifdef HAVE_CONFIG_H #include <config.h> @@ -46,13 +46,13 @@ DEALINGS IN THE SOFTWARE. #include <sys/time.h> #include <stdlib.h> #include <tqtimer.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <netwm.h> #endif #include <kdebug.h> #include <tdeapplication.h> #include <signal.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twinmodule.h> #include <kxmessages.h> #include <twin.h> @@ -93,7 +93,7 @@ struct TDEStartupInfoPrivate TQMap< TDEStartupInfoId, TDEStartupInfo::Data > silent_startups; // contains ASN's that had change: but no new: yet TQMap< TDEStartupInfoId, TDEStartupInfo::Data > uninited_startups; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWinModule* wm_module; KXMessages msgs; #endif @@ -101,7 +101,7 @@ struct TDEStartupInfoPrivate int flags; TDEStartupInfoPrivate( int flags_P ) : -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 msgs( NET_STARTUP_MSG, NULL, false ), #endif flags( flags_P ) {} @@ -130,19 +130,19 @@ void TDEStartupInfo::init( int flags_P ) return; d = new TDEStartupInfoPrivate( flags_P ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( !( d->flags & DisableKWinModule )) { d->wm_module = new KWinModule( this ); - connect( d->wm_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( slot_window_added( WId ))); - connect( d->wm_module, TQT_SIGNAL( systemTrayWindowAdded( WId )), TQT_SLOT( slot_window_added( WId ))); + connect( d->wm_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( slot_window_added( WId ))); + connect( d->wm_module, TQ_SIGNAL( systemTrayWindowAdded( WId )), TQ_SLOT( slot_window_added( WId ))); } else d->wm_module = NULL; - connect( &d->msgs, TQT_SIGNAL( gotMessage( const TQString& )), TQT_SLOT( got_message( const TQString& ))); + connect( &d->msgs, TQ_SIGNAL( gotMessage( const TQString& )), TQ_SLOT( got_message( const TQString& ))); #endif d->cleanup = new TQTimer( this, "cleanup" ); - connect( d->cleanup, TQT_SIGNAL( timeout()), TQT_SLOT( startups_cleanup())); + connect( d->cleanup, TQ_SIGNAL( timeout()), TQ_SLOT( startups_cleanup())); } TDEStartupInfo::~TDEStartupInfo() @@ -505,7 +505,7 @@ void TDEStartupInfo::appStarted( const TQCString& startup_id ) TDEStartupInfo::sendFinish( id ); else if( getenv( "DISPLAY" ) != NULL ) // don't rely on tqt_xdisplay() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Display* disp = XOpenDisplay( NULL ); if( disp != NULL ) { @@ -612,7 +612,7 @@ TDEStartupInfo::startup_t TDEStartupInfo::check_startup_internal( WId w_P, TDESt } return find_id( id, id_O, data_O ) ? Match : NoMatch; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), w_P, tqt_xrootwin(), NET::WMWindowType | NET::WMPid | NET::WMState ); pid_t pid = info.pid(); @@ -729,7 +729,7 @@ bool TDEStartupInfo::find_wclass( TQCString res_name, TQCString res_class, return false; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static Atom net_startup_atom = None; static TQCString read_startup_id_property( WId w_P ) @@ -755,7 +755,7 @@ static TQCString read_startup_id_property( WId w_P ) TQCString TDEStartupInfo::windowStartupId( WId w_P ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( net_startup_atom == None ) net_startup_atom = XInternAtom( tqt_xdisplay(), NET_STARTUP_WINDOW, False ); if( utf8_string_atom == None ) @@ -777,7 +777,7 @@ TQCString TDEStartupInfo::windowStartupId( WId w_P ) void TDEStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( id_P.isNull()) return; if( net_startup_atom == None ) @@ -791,7 +791,7 @@ void TDEStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P ) TQCString TDEStartupInfo::get_window_hostname( WId w_P ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XTextProperty tp; char** hh; int cnt; @@ -815,7 +815,7 @@ void TDEStartupInfo::setTimeout( unsigned int secs_P ) { timeout = secs_P; // schedule removing entries that are older than the new timeout - TQTimer::singleShot( 0, this, TQT_SLOT( startups_cleanup_no_age())); + TQTimer::singleShot( 0, this, TQ_SLOT( startups_cleanup_no_age())); } void TDEStartupInfo::startups_cleanup_no_age() @@ -930,7 +930,7 @@ TQCString TDEStartupInfo::createNewStartupId() if (!gethostname( hostname, 255 )) hostname[sizeof(hostname)-1] = '\0'; TQCString id = TQString(TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec ) - .arg( tm.tv_usec ).arg( getpid()).arg( GET_QT_X_USER_TIME() )).utf8(); + .arg( tm.tv_usec ).arg( getpid()).arg( get_tqt_x_user_time() )).utf8(); kdDebug( 172 ) << "[tdecore-tdestartupinfo] creating: " << id << ":" << tqAppName() << endl; return id; } @@ -1130,9 +1130,9 @@ TQString TDEStartupInfoData::to_text() const ret += TQString::fromLatin1( " DESKTOP=%1" ) .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0 if( !d->wmclass.isEmpty()) - ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) ); + ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( TQString(d->wmclass) ); if( !d->hostname.isEmpty()) - ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) ); + ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( TQString(d->hostname) ); for( TQValueList< pid_t >::ConstIterator it = d->pids.begin(); it != d->pids.end(); ++it ) @@ -1456,7 +1456,7 @@ static TQString get_str( const TQString& item_P ) { unsigned int pos = item_P.find( '=' ); - if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (QChar)'\"' ) + if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (TQChar)'\"' ) { int pos2 = item_P.left( pos + 2 ).find( '\"' ); if( pos2 < 0 ) @@ -1512,8 +1512,8 @@ static TQString escape_str( const TQString& str_P ) pos < str_P.length(); ++pos ) { - if( str_P[ pos ] == (QChar)'\\' - || str_P[ pos ] == (QChar)'"' ) + if( str_P[ pos ] == (TQChar)'\\' + || str_P[ pos ] == (TQChar)'"' ) ret += '\\'; ret += str_P[ pos ]; } diff --git a/tdecore/tdestartupinfo.h b/tdecore/tdestartupinfo.h index 9fa57cd4b..dcbe599d1 100644 --- a/tdecore/tdestartupinfo.h +++ b/tdecore/tdestartupinfo.h @@ -28,11 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <sys/types.h> #include <tqobject.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 // FIXME(E): Redo in a less X11-specific way +#ifdef TQ_WS_X11 // FIXME(E): Redo in a less X11-specific way #include <tqcstring.h> #include <tqstring.h> @@ -67,7 +63,7 @@ class TDEStartupInfoPrivate; class TDECORE_EXPORT TDEStartupInfo : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -692,6 +688,6 @@ class TDECORE_EXPORT TDEStartupInfoData TDEStartupInfoDataPrivate* d; }; -#endif //Q_WS_X11 +#endif //TQ_WS_X11 #endif diff --git a/tdecore/tdestdaccel.cpp b/tdecore/tdestdaccel.cpp index ba3e64ca5..b26948fd0 100644 --- a/tdecore/tdestdaccel.cpp +++ b/tdecore/tdestdaccel.cpp @@ -50,59 +50,59 @@ struct TDEStdAccelInfo static TDEStdAccelInfo g_infoStdAccel[] = { {AccelNone, "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, TDEShortcut(), false }, - { Open, I18N_NOOP("Open"), 0, Qt::CTRL+Qt::Key_O, 0, 0, 0, TDEShortcut(), false }, - { New, I18N_NOOP("New"), 0, Qt::CTRL+Qt::Key_N, 0, 0, 0, TDEShortcut(), false }, - { Close, I18N_NOOP("Close"), 0, Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, TDEShortcut(), false }, - { Save, I18N_NOOP("Save"), 0, Qt::CTRL+Qt::Key_S, 0, 0, 0, TDEShortcut(), false }, - { Print, I18N_NOOP("Print"), 0, Qt::CTRL+Qt::Key_P, 0, 0, 0, TDEShortcut(), false }, - { Quit, I18N_NOOP("Quit"), 0, Qt::CTRL+Qt::Key_Q, 0, 0, 0, TDEShortcut(), false }, + { Open, I18N_NOOP("Open"), 0, TQt::CTRL+TQt::Key_O, 0, 0, 0, TDEShortcut(), false }, + { New, I18N_NOOP("New"), 0, TQt::CTRL+TQt::Key_N, 0, 0, 0, TDEShortcut(), false }, + { Close, I18N_NOOP("Close"), 0, TQt::CTRL+TQt::Key_W, TQt::CTRL+TQt::Key_Escape, 0, TQt::CTRL+TQt::Key_W, TDEShortcut(), false }, + { Save, I18N_NOOP("Save"), 0, TQt::CTRL+TQt::Key_S, 0, 0, 0, TDEShortcut(), false }, + { Print, I18N_NOOP("Print"), 0, TQt::CTRL+TQt::Key_P, 0, 0, 0, TDEShortcut(), false }, + { Quit, I18N_NOOP("Quit"), 0, TQt::CTRL+TQt::Key_Q, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, TDEShortcut(), false }, - { Undo, I18N_NOOP("Undo"), 0, Qt::CTRL+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false }, - { Redo, I18N_NOOP("Redo"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false }, - { Cut, I18N_NOOP("Cut"), 0, Qt::CTRL+Qt::Key_X, 0, Qt::SHIFT+Qt::Key_Delete, 0, TDEShortcut(), false }, - { Copy, I18N_NOOP("Copy"), 0, Qt::CTRL+Qt::Key_C, 0, Qt::CTRL+Qt::Key_Insert, 0, TDEShortcut(), false }, - { Paste, I18N_NOOP("Paste"), 0, Qt::CTRL+Qt::Key_V, 0, Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false }, - { PasteSelection, I18N_NOOP("Paste Selection"), 0, 0, 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false }, - { SelectAll, "SelectAll", I18N_NOOP("Select All"), Qt::CTRL+Qt::Key_A, 0, 0, 0, TDEShortcut(), false }, - { Deselect, I18N_NOOP("Deselect"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_A, 0, 0, 0, TDEShortcut(), false }, - { DeleteWordBack, "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), Qt::CTRL+Qt::Key_Backspace, 0, 0, 0, TDEShortcut(), false }, - { DeleteWordForward, "DeleteWordForward", I18N_NOOP("Delete Word Forward"), Qt::CTRL+Qt::Key_Delete, 0, 0, 0, TDEShortcut(), false }, - { Find, I18N_NOOP("Find"), 0, Qt::CTRL+Qt::Key_F, 0, 0, 0, TDEShortcut(), false }, - { FindNext, "FindNext", I18N_NOOP("Find Next"), Qt::Key_F3, 0, 0, 0, TDEShortcut(), false }, - { FindPrev, "FindPrev", I18N_NOOP("Find Prev"), Qt::SHIFT+Qt::Key_F3, 0, 0, 0, TDEShortcut(), false }, - { Replace, I18N_NOOP("Replace"), 0, Qt::CTRL+Qt::Key_R, 0, 0, 0, TDEShortcut(), false }, + { Undo, I18N_NOOP("Undo"), 0, TQt::CTRL+TQt::Key_Z, 0, 0, 0, TDEShortcut(), false }, + { Redo, I18N_NOOP("Redo"), 0, TQt::CTRL+TQt::SHIFT+TQt::Key_Z, 0, 0, 0, TDEShortcut(), false }, + { Cut, I18N_NOOP("Cut"), 0, TQt::CTRL+TQt::Key_X, 0, TQt::SHIFT+TQt::Key_Delete, 0, TDEShortcut(), false }, + { Copy, I18N_NOOP("Copy"), 0, TQt::CTRL+TQt::Key_C, 0, TQt::CTRL+TQt::Key_Insert, 0, TDEShortcut(), false }, + { Paste, I18N_NOOP("Paste"), 0, TQt::CTRL+TQt::Key_V, 0, TQt::SHIFT+TQt::Key_Insert, 0, TDEShortcut(), false }, + { PasteSelection, I18N_NOOP("Paste Selection"), 0, 0, 0, TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, 0, TDEShortcut(), false }, + { SelectAll, "SelectAll", I18N_NOOP("Select All"), TQt::CTRL+TQt::Key_A, 0, 0, 0, TDEShortcut(), false }, + { Deselect, I18N_NOOP("Deselect"), 0, TQt::CTRL+TQt::SHIFT+TQt::Key_A, 0, 0, 0, TDEShortcut(), false }, + { DeleteWordBack, "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), TQt::CTRL+TQt::Key_Backspace, 0, 0, 0, TDEShortcut(), false }, + { DeleteWordForward, "DeleteWordForward", I18N_NOOP("Delete Word Forward"), TQt::CTRL+TQt::Key_Delete, 0, 0, 0, TDEShortcut(), false }, + { Find, I18N_NOOP("Find"), 0, TQt::CTRL+TQt::Key_F, 0, 0, 0, TDEShortcut(), false }, + { FindNext, "FindNext", I18N_NOOP("Find Next"), TQt::Key_F3, 0, 0, 0, TDEShortcut(), false }, + { FindPrev, "FindPrev", I18N_NOOP("Find Prev"), TQt::SHIFT+TQt::Key_F3, 0, 0, 0, TDEShortcut(), false }, + { Replace, I18N_NOOP("Replace"), 0, TQt::CTRL+TQt::Key_R, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, TDEShortcut(), false }, - { Home, I18N_NOOP2("Opposite to End","Home"), 0, Qt::CTRL+Qt::Key_Home, 0, Qt::Key_HomePage, 0, TDEShortcut(), false }, - { End, I18N_NOOP("End"), 0, Qt::CTRL+Qt::Key_End, 0, 0, 0, TDEShortcut(), false }, - { BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, TDEShortcut(), false}, - { EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, TDEShortcut(), false}, + { Home, I18N_NOOP2("Opposite to End","Home"), 0, TQt::CTRL+TQt::Key_Home, 0, TQt::Key_HomePage, 0, TDEShortcut(), false }, + { End, I18N_NOOP("End"), 0, TQt::CTRL+TQt::Key_End, 0, 0, 0, TDEShortcut(), false }, + { BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), TQt::Key_Home, 0, 0, 0, TDEShortcut(), false}, + { EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), TQt::Key_End, 0, 0, 0, TDEShortcut(), false}, { Prior, I18N_NOOP("Prior"), 0, TQt::Key_Prior, 0, 0, 0, TDEShortcut(), false }, { Next, I18N_NOOP2("Opposite to Prior","Next"), 0, TQt::Key_Next, 0, 0, 0, TDEShortcut(), false }, - { GotoLine, "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, TDEShortcut(), false }, - { AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, TDEShortcut(), false }, - { ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, TDEShortcut(), false }, - { ZoomOut, "ZoomOut", I18N_NOOP("Zoom Out"), Qt::CTRL+Qt::Key_Minus, 0, 0, 0, TDEShortcut(), false }, - { Up, I18N_NOOP("Up"), 0, Qt::ALT+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, - { Back, I18N_NOOP("Back"), 0, Qt::ALT+Qt::Key_Left, 0, Qt::Key_Back, 0, TDEShortcut(), false }, - { Forward, I18N_NOOP("Forward"), 0, Qt::ALT+Qt::Key_Right, 0, Qt::Key_Forward, 0, TDEShortcut(), false }, - { Reload, I18N_NOOP("Reload"), 0, Qt::Key_F5, 0, Qt::Key_Refresh, 0, TDEShortcut(), false }, - { PopupMenuContext, "PopupMenuContext", I18N_NOOP("Popup Menu Context"), Qt::Key_Menu, 0, 0, 0, TDEShortcut(), false }, - { ShowMenubar, "ShowMenubar", I18N_NOOP("Show Menu Bar"), Qt::CTRL+Qt::Key_M, 0, 0, 0, TDEShortcut(), false }, - { BackwardWord, "BackwardWord", I18N_NOOP("Backward Word"), Qt::CTRL+Qt::Key_Left, 0, 0, 0, TDEShortcut(), false }, - { ForwardWord, "ForwardWord", I18N_NOOP("Forward Word"), Qt::CTRL+Qt::Key_Right, 0, 0, 0, TDEShortcut(), false }, - { TabNext, I18N_NOOP("Activate Next Tab"), 0, Qt::CTRL+Qt::Key_Period, 0, Qt::CTRL+Qt::Key_BracketRight, 0, TDEShortcut(), false }, - { TabPrev, I18N_NOOP("Activate Previous Tab"), 0, Qt::CTRL+Qt::Key_Comma, 0, Qt::CTRL+Qt::Key_BracketLeft, 0, TDEShortcut(), false }, - { FullScreen, "FullScreen", I18N_NOOP("Full Screen Mode"), Qt::CTRL+Qt::SHIFT+Qt::Key_F, 0, 0, 0, TDEShortcut(), false }, + { GotoLine, "GotoLine", I18N_NOOP("Go to Line"), TQt::CTRL+TQt::Key_G, 0, 0, 0, TDEShortcut(), false }, + { AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), TQt::CTRL+TQt::Key_B, 0, 0, 0, TDEShortcut(), false }, + { ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), TQt::CTRL+TQt::Key_Plus, 0, 0, 0, TDEShortcut(), false }, + { ZoomOut, "ZoomOut", I18N_NOOP("Zoom Out"), TQt::CTRL+TQt::Key_Minus, 0, 0, 0, TDEShortcut(), false }, + { Up, I18N_NOOP("Up"), 0, TQt::ALT+TQt::Key_Up, 0, 0, 0, TDEShortcut(), false }, + { Back, I18N_NOOP("Back"), 0, TQt::ALT+TQt::Key_Left, 0, TQt::Key_Back, 0, TDEShortcut(), false }, + { Forward, I18N_NOOP("Forward"), 0, TQt::ALT+TQt::Key_Right, 0, TQt::Key_Forward, 0, TDEShortcut(), false }, + { Reload, I18N_NOOP("Reload"), 0, TQt::Key_F5, 0, TQt::Key_Refresh, 0, TDEShortcut(), false }, + { PopupMenuContext, "PopupMenuContext", I18N_NOOP("Popup Menu Context"), TQt::Key_Menu, 0, 0, 0, TDEShortcut(), false }, + { ShowMenubar, "ShowMenubar", I18N_NOOP("Show Menu Bar"), TQt::CTRL+TQt::Key_M, 0, 0, 0, TDEShortcut(), false }, + { BackwardWord, "BackwardWord", I18N_NOOP("Backward Word"), TQt::CTRL+TQt::Key_Left, 0, 0, 0, TDEShortcut(), false }, + { ForwardWord, "ForwardWord", I18N_NOOP("Forward Word"), TQt::CTRL+TQt::Key_Right, 0, 0, 0, TDEShortcut(), false }, + { TabNext, I18N_NOOP("Activate Next Tab"), 0, TQt::CTRL+TQt::Key_Period, 0, TQt::CTRL+TQt::Key_BracketRight, 0, TDEShortcut(), false }, + { TabPrev, I18N_NOOP("Activate Previous Tab"), 0, TQt::CTRL+TQt::Key_Comma, 0, TQt::CTRL+TQt::Key_BracketLeft, 0, TDEShortcut(), false }, + { FullScreen, "FullScreen", I18N_NOOP("Full Screen Mode"), TQt::CTRL+TQt::SHIFT+TQt::Key_F, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, TDEShortcut(), false }, - { Help, I18N_NOOP("Help"), 0, Qt::Key_F1, 0, 0, 0, TDEShortcut(), false }, - { WhatsThis, "WhatsThis", I18N_NOOP("What's This"), Qt::SHIFT+Qt::Key_F1, 0, 0, 0, TDEShortcut(), false }, + { Help, I18N_NOOP("Help"), 0, TQt::Key_F1, 0, 0, 0, TDEShortcut(), false }, + { WhatsThis, "WhatsThis", I18N_NOOP("What's This"), TQt::SHIFT+TQt::Key_F1, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, TDEShortcut(), false }, - { TextCompletion, "TextCompletion", I18N_NOOP("Text Completion"), Qt::CTRL+Qt::Key_E, 0, 0, 0, TDEShortcut(), false }, - { PrevCompletion, "PrevCompletion", I18N_NOOP("Previous Completion Match"), Qt::CTRL+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, - { NextCompletion, "NextCompletion", I18N_NOOP("Next Completion Match"), Qt::CTRL+Qt::Key_Down, 0, 0, 0, TDEShortcut(), false }, - { SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), Qt::CTRL+Qt::Key_T, 0, 0, 0, TDEShortcut(), false }, - { RotateUp, "RotateUp", I18N_NOOP("Previous Item in List"), Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, - { RotateDown, "RotateDown", I18N_NOOP("Next Item in List"), Qt::Key_Down, 0, 0, 0, TDEShortcut(), false }, + { TextCompletion, "TextCompletion", I18N_NOOP("Text Completion"), TQt::CTRL+TQt::Key_E, 0, 0, 0, TDEShortcut(), false }, + { PrevCompletion, "PrevCompletion", I18N_NOOP("Previous Completion Match"), TQt::CTRL+TQt::Key_Up, 0, 0, 0, TDEShortcut(), false }, + { NextCompletion, "NextCompletion", I18N_NOOP("Next Completion Match"), TQt::CTRL+TQt::Key_Down, 0, 0, 0, TDEShortcut(), false }, + { SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), TQt::CTRL+TQt::Key_T, 0, 0, 0, TDEShortcut(), false }, + { RotateUp, "RotateUp", I18N_NOOP("Previous Item in List"), TQt::Key_Up, 0, 0, 0, TDEShortcut(), false }, + { RotateDown, "RotateDown", I18N_NOOP("Next Item in List"), TQt::Key_Down, 0, 0, 0, TDEShortcut(), false }, { AccelNone, 0, 0, 0, 0, 0, 0, TDEShortcut(), false } }; diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp index a11175117..b39ca239e 100644 --- a/tdecore/tdesycoca.cpp +++ b/tdecore/tdesycoca.cpp @@ -42,7 +42,7 @@ #include <sys/mman.h> #endif -#ifdef Q_OS_SOLARIS +#if defined(Q_OS_SOLARIS) && !defined(__dilos__) extern "C" { extern int madvise(caddr_t, size_t, int); @@ -228,7 +228,7 @@ KSycoca::~KSycoca() void KSycoca::closeDatabase() { - QIODevice *device = 0; + TQIODevice *device = 0; if (m_str) device = m_str->device(); #ifdef HAVE_MMAP @@ -246,7 +246,7 @@ void KSycoca::closeDatabase() delete m_str; m_str = 0; delete device; - if (TQT_TQIODEVICE(d->database) != device) + if (d->database != device) delete d->database; if (m_barray) delete m_barray; m_barray = 0; diff --git a/tdecore/tdesycoca.h b/tdecore/tdesycoca.h index f8e2274e0..a96bd9d9f 100644 --- a/tdecore/tdesycoca.h +++ b/tdecore/tdesycoca.h @@ -43,7 +43,7 @@ class KSycocaFactoryList; */ class TDECORE_EXPORT KSycoca : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP protected: diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h index b784e7901..1cfc9f564 100644 --- a/tdecore/tdeversion.h +++ b/tdecore/tdeversion.h @@ -32,9 +32,9 @@ A new FEATURE REVISION level always resets the BUG AND SECURITY PATCHLEVEL. A new ABI version resets both the FEATURE REVISION and BUG AND SECURITY PATCH LEVEL. */ -#define TDE_VERSION_STRING "R14.1.0 [DEVELOPMENT]" +#define TDE_VERSION_STRING "R14.2.0~[DEVELOPMENT]" #define TDE_VERSION_MAJOR 14 -#define TDE_VERSION_MINOR 1 +#define TDE_VERSION_MINOR 2 #define TDE_VERSION_RELEASE 0 #define TDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp index 4052d5dcf..9f07b3437 100644 --- a/tdecore/tests/kdebugtest.cpp +++ b/tdecore/tests/kdebugtest.cpp @@ -6,7 +6,7 @@ #include <tqpen.h> #include <tqvariant.h> -class TestWidget : public QWidget +class TestWidget : public TQWidget { public: @@ -64,7 +64,7 @@ public: TQVariant v( 0.12345 ); kdDebug() << "Variant: " << v << endl; - v = TQPen( Qt::red ); + v = TQPen( TQt::red ); kdDebug() << "Variant: " << v << endl; TQByteArray data( 6 ); diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp index d1a678ac9..72101d8b1 100644 --- a/tdecore/tests/kipctest.cpp +++ b/tdecore/tests/kipctest.cpp @@ -8,12 +8,12 @@ MyObject::MyObject() : TQObject(0L, "testobj") { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(slotFontChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotAppearanceChanged())); - connect(kapp, TQT_SIGNAL(kipcMessage(int,int)), TQT_SLOT(slotMessage(int,int))); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged())); + connect(kapp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int))); } int main(int argc, char **argv) diff --git a/tdecore/tests/kipctest.h b/tdecore/tests/kipctest.h index 17122fbd8..d4c3d538d 100644 --- a/tdecore/tests/kipctest.h +++ b/tdecore/tests/kipctest.h @@ -5,17 +5,17 @@ class MyObject: public TQObject { - Q_OBJECT + TQ_OBJECT public: MyObject(); public slots: - void slotPaletteChanged() { printf("SIGNAL: Palette changed\n"); } - void slotStyleChanged() { printf("SIGNAL: Style changed\n"); } - void slotFontChanged() { printf("SIGNAL: Font changed\n"); } - void slotBackgroundChanged(int i) { printf("SIGNAL: Background %d changed\n", i); } - void slotAppearanceChanged() { printf("SIGNAL: Appearance changed\n"); } - void slotMessage(int id, int arg) { printf("SIGNAL: user message: %d,%d\n", id, arg); } + void slotPaletteChanged() { printf("TQ_SIGNAL: Palette changed\n"); } + void slotStyleChanged() { printf("TQ_SIGNAL: Style changed\n"); } + void slotFontChanged() { printf("TQ_SIGNAL: Font changed\n"); } + void slotBackgroundChanged(int i) { printf("TQ_SIGNAL: Background %d changed\n", i); } + void slotAppearanceChanged() { printf("TQ_SIGNAL: Appearance changed\n"); } + void slotMessage(int id, int arg) { printf("TQ_SIGNAL: user message: %d,%d\n", id, arg); } }; #endif diff --git a/tdecore/tests/klocaletest.h b/tdecore/tests/klocaletest.h index 6634b6107..433807b78 100644 --- a/tdecore/tests/klocaletest.h +++ b/tdecore/tests/klocaletest.h @@ -11,7 +11,7 @@ class TQLabel; */ class Test : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /**@name methods */ diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp index d8d86d988..b7908ec6e 100644 --- a/tdecore/tests/kprocesstest.cpp +++ b/tdecore/tests/kprocesstest.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) // p1 << "kghostview"; - TQObject::connect(&p1, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p1, TQ_SIGNAL(processExited(TDEProcess *)), &dummy, TQ_SLOT(printMessage(TDEProcess *))); printf("starting kghostview blocking (close to continue)\n"); p1.start(TDEProcess::Block); @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) printf("Starting konsole with /bin/tcsh as shell (close to continue)\n"); p2 << "konsole" << "-e" << "/bin/tcsh"; p2.setWorkingDirectory("/tmp"); - TQObject::connect(&p2, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p2, TQ_SIGNAL(processExited(TDEProcess *)), &dummy, TQ_SLOT(printMessage(TDEProcess *))); p2.start(TDEProcess::Block); // @@ -70,13 +70,13 @@ int main(int argc, char *argv[]) // p3 << "ls" << "-l"; - TQObject::connect(&p3, TQT_SIGNAL(processExited(TDEProcess *)), - &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p3, TQ_SIGNAL(processExited(TDEProcess *)), + &dummy, TQ_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p3, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p3, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); p3.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); @@ -93,16 +93,16 @@ int main(int argc, char *argv[]) // p4 << "sort"; - TQObject::connect(&p4, TQT_SIGNAL(processExited(TDEProcess *)), - &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p4, TQ_SIGNAL(processExited(TDEProcess *)), + &dummy, TQ_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p4, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p4, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(TDEProcess *)), - &dummy, TQT_SLOT(outputDone(TDEProcess *))); + TQObject::connect(&p4, TQ_SIGNAL(wroteStdin(TDEProcess *)), + &dummy, TQ_SLOT(outputDone(TDEProcess *))); p4.start(TDEProcess::NotifyOnExit, TDEProcess::All); printf("after p4.start"); diff --git a/tdecore/tests/kprocesstest.h b/tdecore/tests/kprocesstest.h index 5817af438..4bd4ab71e 100644 --- a/tdecore/tests/kprocesstest.h +++ b/tdecore/tests/kprocesstest.h @@ -17,7 +17,7 @@ class Dummy : public TQObject { - Q_OBJECT + TQ_OBJECT public slots: void printMessage(TDEProcess *proc) diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp index f7e895345..e7165092c 100644 --- a/tdecore/tests/kprociotest.cpp +++ b/tdecore/tests/kprociotest.cpp @@ -41,8 +41,8 @@ int main(int argc, char *argv[]) p << "rev"; - p.connect(&p, TQT_SIGNAL(processExited(TDEProcess*)), &dummy, TQT_SLOT(printMessage(TDEProcess*))); - p.connect(&p, TQT_SIGNAL(readReady(KProcIO*)), &dummy, TQT_SLOT(gotOutput(KProcIO*))); + p.connect(&p, TQ_SIGNAL(processExited(TDEProcess*)), &dummy, TQ_SLOT(printMessage(TDEProcess*))); + p.connect(&p, TQ_SIGNAL(readReady(KProcIO*)), &dummy, TQ_SLOT(gotOutput(KProcIO*))); bool b; diff --git a/tdecore/tests/kprociotest.h b/tdecore/tests/kprociotest.h index fd60bb87b..78b5ad926 100644 --- a/tdecore/tests/kprociotest.h +++ b/tdecore/tests/kprociotest.h @@ -17,7 +17,7 @@ class Dummy : public TQObject { - Q_OBJECT + TQ_OBJECT public slots: void printMessage(TDEProcess *proc) diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp index d00626cdf..a42c5a395 100644 --- a/tdecore/tests/ktimezonestest.cpp +++ b/tdecore/tests/ktimezonestest.cpp @@ -22,8 +22,8 @@ int main(int argc, char *argv[]) // Find some offsets for Europe/London. const char *london = "Europe/London"; timezone = timezones.zone(london); - TQDateTime winter(TQDateTime::fromString("2005-01-01T00:00:00", Qt::ISODate)); - TQDateTime summer(TQDateTime::fromString("2005-06-01T00:00:00", Qt::ISODate)); + TQDateTime winter(TQDateTime::fromString("2005-01-01T00:00:00", TQt::ISODate)); + TQDateTime summer(TQDateTime::fromString("2005-06-01T00:00:00", TQt::ISODate)); printf( "%s winter timezone offset should be 0: %d\n", london, timezone->offset(winter) ); printf( "%s summer timezone offset should be 3600: %d\n", london, timezone->offset(summer) ); @@ -34,13 +34,13 @@ int main(int argc, char *argv[]) const char *gmtBeforePst = "2005-10-30T01:00:00"; const char *gmtAfterPst = "2005-12-01T00:00:00"; TQString result; - result = timezone->convert(losAngeles, TQDateTime::fromString(bstBeforePdt, Qt::ISODate)).toString(Qt::ISODate); + result = timezone->convert(losAngeles, TQDateTime::fromString(bstBeforePdt, TQt::ISODate)).toString(TQt::ISODate); printf( "BST before PDT, %s should be 2005-03-27T15:00:00: %s\n", bstBeforePdt, result.latin1() ); - result = timezone->convert(losAngeles, TQDateTime::fromString(bstAfterPdt, Qt::ISODate)).toString(Qt::ISODate); + result = timezone->convert(losAngeles, TQDateTime::fromString(bstAfterPdt, TQt::ISODate)).toString(TQt::ISODate); printf( "BST and PDT, %s should be 2005-04-30T16:00:00: %s\n", bstAfterPdt, result.latin1() ); - result = timezone->convert(losAngeles, TQDateTime::fromString(gmtBeforePst, Qt::ISODate)).toString(Qt::ISODate); + result = timezone->convert(losAngeles, TQDateTime::fromString(gmtBeforePst, TQt::ISODate)).toString(TQt::ISODate); printf( "GMT before PST, %s should be 2005-10-29T17:00:00: %s\n", gmtBeforePst, result.latin1() ); - result = timezone->convert(losAngeles, TQDateTime::fromString(gmtAfterPst, Qt::ISODate)).toString(Qt::ISODate); + result = timezone->convert(losAngeles, TQDateTime::fromString(gmtAfterPst, TQt::ISODate)).toString(TQt::ISODate); printf( "GMT and PST, %s should be 2005-11-30T16:00:00: %s\n", gmtAfterPst, result.latin1() ); printf( "Latitude 89 should be valid: %svalid\n", KTimezone::isValidLatitude(89.0) ? "" : "in"); printf( "Latitude 91 should be invalid: %svalid\n", KTimezone::isValidLatitude(91.0) ? "" : "in"); diff --git a/tdecore/tests/tdeconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp index f5ea428c0..c785aa3b3 100644 --- a/tdecore/tests/tdeconfigtestgui.cpp +++ b/tdecore/tests/tdeconfigtestgui.cpp @@ -76,8 +76,8 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pAppFileEdit = new TQLineEdit( this, "appconfigedit" ); pAppFileEdit->setGeometry( 240, 20, 160, 20 ); - connect( pAppFileEdit, TQT_SIGNAL(returnPressed()), - TQT_SLOT(appConfigEditReturnPressed())); + connect( pAppFileEdit, TQ_SIGNAL(returnPressed()), + TQ_SLOT(appConfigEditReturnPressed())); // Label and edit for the group pGroupLabel = new TQLabel( this, "grouplabel" ); @@ -86,14 +86,14 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pGroupEdit = new TQLineEdit( this, "groupedit" ); pGroupEdit->setGeometry( 120, 60, 100, 20 ); - connect( pGroupEdit, TQT_SIGNAL(returnPressed()), - TQT_SLOT(groupEditReturnPressed())); + connect( pGroupEdit, TQ_SIGNAL(returnPressed()), + TQ_SLOT(groupEditReturnPressed())); // Edit and label for the key/value pair pKeyEdit = new TQLineEdit( this, "keyedit" ); pKeyEdit->setGeometry( 20, 100, 80, 20 ); - connect( pKeyEdit, TQT_SIGNAL( returnPressed()), - TQT_SLOT(keyEditReturnPressed())); + connect( pKeyEdit, TQ_SIGNAL( returnPressed()), + TQ_SLOT(keyEditReturnPressed())); pEqualsLabel = new TQLabel( this, "equalslabel" ); pEqualsLabel->setGeometry( 105, 100, 20, 20 ); @@ -106,7 +106,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pWriteButton = new TQPushButton( this, "writebutton" ); pWriteButton->setGeometry( 20,140, 80, 20 ); pWriteButton->setText( "Write entry" ); - connect( pWriteButton, TQT_SIGNAL(clicked()), TQT_SLOT( writeButtonClicked() ) ); + connect( pWriteButton, TQ_SIGNAL(clicked()), TQ_SLOT( writeButtonClicked() ) ); // Labels for the info line pInfoLabel1 = new TQLabel( this, "infolabel1" ); @@ -121,7 +121,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pQuitButton = new TQPushButton( this, "quitbutton" ); pQuitButton->setText( "Quit" ); pQuitButton->setGeometry( 340, 60, 60, 60 ); - connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) ); + connect( pQuitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); // create a default TDEConfig object in order to be able to start right away pConfig = new TDEConfig( TQString::null ); diff --git a/tdecore/tests/tdeconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h index a7cfd1356..4c3384d90 100644 --- a/tdecore/tests/tdeconfigtestgui.h +++ b/tdecore/tests/tdeconfigtestgui.h @@ -41,7 +41,7 @@ class TDEConfigTestView : public TQDialog { - Q_OBJECT + TQ_OBJECT public: TDEConfigTestView( TQWidget *parent=0, const char *name=0 ); ~TDEConfigTestView(); diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp index 308da8c5a..5486a2828 100644 --- a/tdecore/twin.cpp +++ b/tdecore/twin.cpp @@ -45,7 +45,7 @@ #include <tdelocale.h> #include <dcopclient.h> #include <dcopref.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <tdestartupinfo.h> #include <kxerrorhandler.h> @@ -103,7 +103,7 @@ static void twin_net_create_atoms() { /* Sends a client message to the ROOT window. */ -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z = 0 ){ XEvent ev; long mask; @@ -124,7 +124,7 @@ static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z /* Send a client message to window w */ -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static void sendClientMessage(Window w, Atom a, long x){ XEvent ev; long mask; @@ -145,7 +145,7 @@ static void sendClientMessage(Window w, Atom a, long x){ bool KWin::compositingActive() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 twin_net_create_atoms(); return XGetSelectionOwner( tqt_xdisplay(), net_wm_cm ) != None; #else @@ -153,7 +153,7 @@ bool KWin::compositingActive() #endif } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 namespace { class ContextWidget : public TQWidget @@ -213,14 +213,14 @@ bool ContextWidget::x11Event( XEvent * ev) void KWin::invokeContextHelp() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 ContextWidget w; #endif } void KWin::setSystemTrayWindowFor( WId trayWin, WId forWin ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), trayWin, tqt_xrootwin(), 0 ); if ( !forWin ) forWin = tqt_xrootwin(); @@ -236,30 +236,30 @@ void KWin::setSystemTrayWindowFor( WId trayWin, WId forWin ) void KWin::activateWindow( WId win, long time ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), 0 ); if( time == 0 ) - time = GET_QT_X_USER_TIME(); + time = get_tqt_x_user_time(); info.setActiveWindow( win, NET::FromApplication, time, kapp->activeWindow() ? kapp->activeWindow()->winId() : 0 ); -#endif // Q_WS_X11 ... +#endif // TQ_WS_X11 ... KUniqueApplication::setHandleAutoStarted(); } void KWin::forceActiveWindow( WId win, long time ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), 0 ); if( time == 0 ) - time = GET_QT_X_TIME(); + time = get_tqt_x_time(); info.setActiveWindow( win, NET::FromTool, time, 0 ); -#endif // Q_WS_X11 +#endif // TQ_WS_X11 KUniqueApplication::setHandleAutoStarted(); } void KWin::setActiveWindow( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), 0 ); info.setActiveWindow( win, NET::FromUnknown, 0, 0 ); #endif @@ -268,7 +268,7 @@ void KWin::setActiveWindow( WId win ) void KWin::demandAttention( WId win, bool set ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); info.setState( set ? NET::DemandsAttention : 0, NET::DemandsAttention ); #endif @@ -276,7 +276,7 @@ void KWin::demandAttention( WId win, bool set ) void KWin::setUserTime( WId win, long time ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); info.setUserTime( time ); #endif @@ -290,7 +290,7 @@ KWin::WindowInfo KWin::windowInfo( WId win, unsigned long properties, unsigned l WId KWin::transientFor( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler; // ignore badwindow Window transient_for = None; if( XGetTransientForHint( tqt_xdisplay(), win, &transient_for )) @@ -304,13 +304,13 @@ WId KWin::transientFor( WId win ) void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( mainwindow != 0 ) { /* Grmbl. See TQDialog::show(). That should get fixed in Qt somehow. */ - if( tqqt_cast< TQDialog* >( subwindow ) != NULL + if( tqt_cast< TQDialog* >( subwindow ) != NULL && subwindow->parentWidget() == NULL && kapp->mainWidget() != NULL ) { @@ -326,7 +326,7 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow ) WId KWin::groupLeader( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler; // ignore badwindow XWMHints *hints = XGetWMHints( tqt_xdisplay(), win ); Window window_group = None; @@ -347,7 +347,7 @@ WId KWin::groupLeader( WId win ) KWin::Info KWin::info( WId win ) { Info w; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo inf( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMState | NET::WMStrut | @@ -398,11 +398,11 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale ) TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler; // ignore badwindow #endif TQPixmap result; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( flags & NETWM ) { NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMIcon ); NETIcon ni = info.icon( width, height ); @@ -514,7 +514,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) void KWin::setIcons( WId win, const TQPixmap& icon, const TQPixmap& miniIcon ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( icon.isNull() ) return; NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); @@ -536,7 +536,7 @@ void KWin::setIcons( WId win, const TQPixmap& icon, const TQPixmap& miniIcon ) void KWin::setType( WId win, NET::WindowType windowType ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); info.setWindowType( windowType ); #endif @@ -544,7 +544,7 @@ void KWin::setType( WId win, NET::WindowType windowType ) void KWin::setState( WId win, unsigned long state ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMState ); info.setState( state, state ); #endif @@ -552,7 +552,7 @@ void KWin::setState( WId win, unsigned long state ) void KWin::clearState( WId win, unsigned long state ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMState ); info.setState( 0, state ); #endif @@ -560,7 +560,7 @@ void KWin::clearState( WId win, unsigned long state ) void KWin::setOpacity( WId win, uint percent ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 twin_net_create_atoms(); if (percent > 99) XDeleteProperty (tqt_xdisplay(), win, kde_wm_window_opacity); @@ -574,7 +574,7 @@ void KWin::setOpacity( WId win, uint percent ) void KWin::setShadowSize( WId win, uint percent ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 twin_net_create_atoms(); long shadowSize = long(0xFFFFFFFF/100.0*percent); XChangeProperty(tqt_xdisplay(), win, kde_wm_window_shadow, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &shadowSize, 1L); @@ -583,7 +583,7 @@ void KWin::setShadowSize( WId win, uint percent ) void KWin::setOnAllDesktops( WId win, bool b ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMDesktop ); if ( b ) info.setDesktop( NETWinInfo::OnAllDesktops ); @@ -596,7 +596,7 @@ void KWin::setOnAllDesktops( WId win, bool b ) void KWin::setOnDesktop( WId win, int desktop ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMDesktop ); info.setDesktop( desktop ); #endif @@ -606,7 +606,7 @@ void KWin::setExtendedStrut( WId win, int left_width, int left_start, int left_e int right_width, int right_start, int right_end, int top_width, int top_start, int top_end, int bottom_width, int bottom_start, int bottom_end ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); NETExtendedStrut strut; strut.left_width = left_width; @@ -627,7 +627,7 @@ void KWin::setExtendedStrut( WId win, int left_width, int left_start, int left_e void KWin::setStrut( WId win, int left, int right, int top, int bottom ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); NETStrut strut; strut.left = left; @@ -640,11 +640,11 @@ void KWin::setStrut( WId win, int left, int right, int top, int bottom ) int KWin::currentDesktop() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (!tqt_xdisplay()) #endif return 1; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop ); return info.currentDesktop(); #endif @@ -652,11 +652,11 @@ int KWin::currentDesktop() int KWin::numberOfDesktops() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (!tqt_xdisplay()) #endif return 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::NumberOfDesktops ); return info.numberOfDesktops(); #endif @@ -664,7 +664,7 @@ int KWin::numberOfDesktops() void KWin::setCurrentDesktop( int desktop ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop ); info.setCurrentDesktop( desktop ); #endif @@ -672,7 +672,7 @@ void KWin::setCurrentDesktop( int desktop ) void KWin::setCurrentDesktopViewport( int desktop, TQPoint viewport ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop ); NETPoint netview; netview.x = viewport.x(); @@ -683,7 +683,7 @@ void KWin::setCurrentDesktopViewport( int desktop, TQPoint viewport ) void KWin::iconifyWindow( WId win, bool animation) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( !animation ) { twin_net_create_atoms(); @@ -696,7 +696,7 @@ void KWin::iconifyWindow( WId win, bool animation) void KWin::deIconifyWindow( WId win, bool animation ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( !animation ) { twin_net_create_atoms(); @@ -708,7 +708,7 @@ void KWin::deIconifyWindow( WId win, bool animation ) void KWin::raiseWindow( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::Supported ); if( info.isSupported( NET::WM2RestackWindow )) info.restackRequest( win, None, Above ); @@ -719,7 +719,7 @@ void KWin::raiseWindow( WId win ) void KWin::lowerWindow( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::Supported ); if( info.isSupported( NET::WM2RestackWindow )) info.restackRequest( win, None, Below ); @@ -730,7 +730,7 @@ void KWin::lowerWindow( WId win ) void KWin::appStarted() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEStartupInfo::appStarted(); #endif } @@ -739,11 +739,11 @@ class KWin::WindowInfoPrivate { public: WindowInfoPrivate() -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 : info( NULL ) #endif {} -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 ~WindowInfoPrivate() { delete info; } NETWinInfo* info; #endif @@ -762,7 +762,7 @@ class KWin::WindowInfoPrivate // KWin::info() should be updated too if something has to be changed here KWin::WindowInfo::WindowInfo( WId win, unsigned long properties, unsigned long properties2 ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler; d = new WindowInfoPrivate; d->ref = 1; @@ -862,7 +862,7 @@ WId KWin::WindowInfo::win() const unsigned long KWin::WindowInfo::state() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMState ) == 0, 176 ) << "Pass NET::WMState to KWin::windowInfo()" << endl; return d->info->state(); @@ -873,7 +873,7 @@ unsigned long KWin::WindowInfo::state() const NET::MappingState KWin::WindowInfo::mappingState() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::XAWMState ) == 0, 176 ) << "Pass NET::XAWMState to KWin::windowInfo()" << endl; return d->info->mappingState(); @@ -884,7 +884,7 @@ NET::MappingState KWin::WindowInfo::mappingState() const NETExtendedStrut KWin::WindowInfo::extendedStrut() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2ExtendedStrut ) == 0, 176 ) << "Pass NET::WM2ExtendedStrut to second argument of KWin::windowInfo()" << endl; NETExtendedStrut ext = d->info->extendedStrut(); @@ -922,7 +922,7 @@ NETExtendedStrut KWin::WindowInfo::extendedStrut() const NETStrut KWin::WindowInfo::strut() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMStrut ) == 0, 176 ) << "Pass NET::WMStrut to KWin::windowInfo()" << endl; return d->info->strut(); @@ -934,7 +934,7 @@ NETStrut KWin::WindowInfo::strut() const NET::WindowType KWin::WindowInfo::windowType( int supported_types ) const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMWindowType ) == 0, 176 ) << "Pass NET::WMWindowType to KWin::windowInfo()" << endl; return d->info->windowType( supported_types ); @@ -965,7 +965,7 @@ TQString KWin::Info::visibleNameWithState() const TQString KWin::WindowInfo::visibleName() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMVisibleName ) == 0, 176 ) << "Pass NET::WMVisibleName to KWin::windowInfo()" << endl; return d->info->visibleName() && d->info->visibleName()[ 0 ] != '\0' @@ -977,7 +977,7 @@ TQString KWin::WindowInfo::visibleName() const TQString KWin::WindowInfo::name() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMName ) == 0, 176 ) << "Pass NET::WMName to KWin::windowInfo()" << endl; return d->name_; @@ -998,7 +998,7 @@ TQString KWin::WindowInfo::visibleIconNameWithState() const TQString KWin::WindowInfo::visibleIconName() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMVisibleIconName ) == 0, 176 ) << "Pass NET::WMVisibleIconName to KWin::windowInfo()" << endl; if( d->info->visibleIconName() && d->info->visibleIconName()[ 0 ] != '\0' ) @@ -1013,7 +1013,7 @@ TQString KWin::WindowInfo::visibleIconName() const TQString KWin::WindowInfo::iconName() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMIconName ) == 0, 176 ) << "Pass NET::WMIconName to KWin::windowInfo()" << endl; if( d->info->iconName() && d->info->iconName()[ 0 ] != '\0' ) @@ -1026,7 +1026,7 @@ TQString KWin::WindowInfo::iconName() const bool KWin::WindowInfo::isOnCurrentDesktop() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 return isOnDesktop( KWin::currentDesktop()); #else return false; @@ -1035,7 +1035,7 @@ bool KWin::WindowInfo::isOnCurrentDesktop() const bool KWin::WindowInfo::isOnDesktop( int desktop ) const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 ) << "Pass NET::WMDesktop to KWin::windowInfo()" << endl; return d->info->desktop() == desktop || d->info->desktop() == NET::OnAllDesktops; @@ -1046,7 +1046,7 @@ bool KWin::WindowInfo::isOnDesktop( int desktop ) const bool KWin::WindowInfo::onAllDesktops() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 ) << "Pass NET::WMDesktop to KWin::windowInfo()" << endl; return d->info->desktop() == NET::OnAllDesktops; @@ -1057,7 +1057,7 @@ bool KWin::WindowInfo::onAllDesktops() const int KWin::WindowInfo::desktop() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 ) << "Pass NET::WMDesktop to KWin::windowInfo()" << endl; return d->info->desktop(); @@ -1068,7 +1068,7 @@ int KWin::WindowInfo::desktop() const TQRect KWin::WindowInfo::geometry() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMGeometry ) == 0, 176 ) << "Pass NET::WMGeometry to KWin::windowInfo()" << endl; return d->geometry_; @@ -1079,7 +1079,7 @@ TQRect KWin::WindowInfo::geometry() const TQRect KWin::WindowInfo::frameGeometry() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMKDEFrameStrut ) == 0, 176 ) << "Pass NET::WMKDEFrameStrut to KWin::windowInfo()" << endl; return d->frame_geometry_; @@ -1090,7 +1090,7 @@ TQRect KWin::WindowInfo::frameGeometry() const WId KWin::WindowInfo::transientFor() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2TransientFor ) == 0, 176 ) << "Pass NET::WM2TransientFor to KWin::windowInfo()" << endl; return d->info->transientFor(); @@ -1101,7 +1101,7 @@ WId KWin::WindowInfo::transientFor() const WId KWin::WindowInfo::groupLeader() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2GroupLeader ) == 0, 176 ) << "Pass NET::WM2GroupLeader to KWin::windowInfo()" << endl; return d->info->groupLeader(); @@ -1112,7 +1112,7 @@ WId KWin::WindowInfo::groupLeader() const TQCString KWin::WindowInfo::windowClassClass() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowClass ) == 0, 176 ) << "Pass NET::WM2WindowClass to KWin::windowInfo()" << endl; return d->info->windowClassClass(); @@ -1123,7 +1123,7 @@ TQCString KWin::WindowInfo::windowClassClass() const TQCString KWin::WindowInfo::windowClassName() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowClass ) == 0, 176 ) << "Pass NET::WM2WindowClass to KWin::windowInfo()" << endl; return d->info->windowClassName(); @@ -1134,7 +1134,7 @@ TQCString KWin::WindowInfo::windowClassName() const TQCString KWin::WindowInfo::windowRole() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowRole ) == 0, 176 ) << "Pass NET::WM2WindowRole to KWin::windowInfo()" << endl; return d->info->windowRole(); @@ -1145,7 +1145,7 @@ TQCString KWin::WindowInfo::windowRole() const TQCString KWin::WindowInfo::clientMachine() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2ClientMachine ) == 0, 176 ) << "Pass NET::WM2ClientMachine to KWin::windowInfo()" << endl; return d->info->clientMachine(); @@ -1156,7 +1156,7 @@ TQCString KWin::WindowInfo::clientMachine() const bool KWin::WindowInfo::actionSupported( NET::Action action ) const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2AllowedActions ) == 0, 176 ) << "Pass NET::WM2AllowedActions to KWin::windowInfo()" << endl; if( allowedActionsSupported()) @@ -1169,7 +1169,7 @@ bool KWin::WindowInfo::actionSupported( NET::Action action ) const // see NETWM spec section 7.6 bool KWin::WindowInfo::isMinimized() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( mappingState() != NET::Iconic ) return false; // NETWM 1.2 compliant WM - uses NET::Hidden for minimized windows @@ -1186,7 +1186,7 @@ bool KWin::WindowInfo::isMinimized() const bool KWin::Info::isMinimized() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( mappingState != NET::Iconic ) return false; // NETWM 1.2 compliant WM - uses NET::Hidden for minimized windows @@ -1208,7 +1208,7 @@ bool KWin::Info::isIconified() const bool KWin::icccmCompliantMappingState() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static enum { noidea, yes, no } wm_is_1_2_compliant = noidea; if( wm_is_1_2_compliant == noidea ) { NETRootInfo info( tqt_xdisplay(), NET::Supported ); @@ -1222,7 +1222,7 @@ bool KWin::icccmCompliantMappingState() bool KWin::allowedActionsSupported() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static enum { noidea, yes, no } wm_supports_allowed_actions = noidea; if( wm_supports_allowed_actions == noidea ) { NETRootInfo info( tqt_xdisplay(), NET::Supported ); @@ -1236,13 +1236,13 @@ bool KWin::allowedActionsSupported() TQString KWin::readNameProperty( WId win, unsigned long atom ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XTextProperty tp; char **text = NULL; int count; #endif TQString result; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( XGetTextProperty( tqt_xdisplay(), win, &tp, atom ) != 0 && tp.value != NULL ) { if (!twin_UTF8_STRING) diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp index a37370e58..fc1a37574 100644 --- a/tdecore/twinmodule.cpp +++ b/tdecore/twinmodule.cpp @@ -22,7 +22,7 @@ */ #include <tqwidget.h> -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME #include "twinmodule.h" #include "twin.h" #include <X11/Xatom.h> @@ -445,7 +445,7 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons void KWinModule::connectNotify( const char* signal ) { - if( !d->strutSignalConnected && qstrcmp( signal, TQT_SIGNAL(strutChanged())) == 0 ) + if( !d->strutSignalConnected && qstrcmp( signal, TQ_SIGNAL(strutChanged())) == 0 ) d->strutSignalConnected = true; TQObject::connectNotify( signal ); } diff --git a/tdecore/twinmodule.h b/tdecore/twinmodule.h index 0357c1c66..356e85958 100644 --- a/tdecore/twinmodule.h +++ b/tdecore/twinmodule.h @@ -27,10 +27,6 @@ #include <tqvaluelist.h> #include "tdelibs_export.h" -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX class KWinModulePrivate; @@ -55,7 +51,7 @@ class KWinModulePrivate; */ class TDECORE_EXPORT KWinModule : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -65,7 +61,7 @@ public: /** * Creates a KWinModule object and connects to the window * manager. - * @param parent the parent for the QObject + * @param parent the parent for the TQObject * @param what The information you are interested in: * INFO_DESKTOP: currentDesktop, * numberOfDesktops, @@ -93,7 +89,7 @@ public: /** * Creates a KWinModule object and connects to the window * manager. - * @param parent the parent for the QObject + * @param parent the parent for the TQObject **/ KWinModule( TQObject* parent = 0 ); diff --git a/tdefile-plugins/elf/tdefile_elf.h b/tdefile-plugins/elf/tdefile_elf.h index cd72afc87..d7898f10d 100644 --- a/tdefile-plugins/elf/tdefile_elf.h +++ b/tdefile-plugins/elf/tdefile_elf.h @@ -38,7 +38,7 @@ class TQStringList; class KElfPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefx/kdrawutil.cpp b/tdefx/kdrawutil.cpp index 0610865cb..de5946087 100644 --- a/tdefx/kdrawutil.cpp +++ b/tdefx/kdrawutil.cpp @@ -27,13 +27,13 @@ TDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h, int y2 = y+h-1; p->fillRect(x+1, y+1, w-2, h-2, fill ? *fill : g.brush(TQColorGroup::Button)); - p->setPen(sunken ? Qt::black : g.light()); + p->setPen(sunken ? TQt::black : g.light()); p->drawLine(x, y, x2-1, y); p->drawLine(x, y, x, y2-1); p->setPen(sunken ? g.midlight() : g.mid()); p->drawLine(x+1, y2-1, x2-1, y2-1); p->drawLine(x2-1, y+1, x2-1, y2-1); - p->setPen(sunken ? g.light() : Qt::black); + p->setPen(sunken ? g.light() : TQt::black); p->drawLine(x, y2, x2, y2); p->drawLine(x2, y, x2, y2); p->setPen(oldPen); @@ -161,10 +161,10 @@ TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool 3,1,3,2,3,3,3,4,3,0,4,1,4,2,4,3,4,4,4 }; if(clear) - p->fillRect(x, y, w, h, TQBrush(Qt::color0, Qt::SolidPattern)); + p->fillRect(x, y, w, h, TQBrush(TQt::color0, TQt::SolidPattern)); - TQBrush fillBrush(Qt::color1, Qt::SolidPattern); - p->setPen(Qt::color1); + TQBrush fillBrush(TQt::color1, TQt::SolidPattern); + p->setPen(TQt::color1); if(w > 16 && h > 16){ int x2 = x+w-1; int y2 = y+h-1; @@ -223,7 +223,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int blackColor, whiteColor}; TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(), - Qt::black, Qt::white}; + TQt::black, TQt::white}; int i; for(i=0; i < 6; ++i){ @@ -246,7 +246,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int blackColor, whiteColor}; TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(), - Qt::black, Qt::white}; + TQt::black, TQt::white}; int i; TQBitmap b; diff --git a/tdefx/kdrawutil.h b/tdefx/kdrawutil.h index 909792817..bee877e6a 100644 --- a/tdefx/kdrawutil.h +++ b/tdefx/kdrawutil.h @@ -125,7 +125,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h); * @c \#include @c <kdrawutil.h> * * Paints the pixels covered by a round button of the given size with - * Qt::color1. This function is useful in TQStyle::drawControlMask(). + * TQt::color1. This function is useful in TQStyle::drawControlMask(). * * @param p The painter to use for drawing the button. * @param x The X coordinate of the button. @@ -133,7 +133,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h); * @param w The width of the button. * @param h The height of the button. * @param clear Whether to clear the rectangle specified by @p (x, y, w, h) to - * Qt::color0 before drawing the mask. + * TQt::color0 before drawing the mask. */ TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false); diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp index 277e1cc7f..8968c1b43 100644 --- a/tdefx/kimageeffect.cpp +++ b/tdefx/kimageeffect.cpp @@ -58,7 +58,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif //====================================================================== // -// Utility stuff for effects ported from ImageMagick to QImage +// Utility stuff for effects ported from ImageMagick to TQImage // //====================================================================== #define MaxRGB 255L @@ -664,7 +664,7 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent) int pixels = image.depth() > 8 ? image.width()*image.height() : image.numColors(); unsigned int *data = image.depth() > 8 ? (unsigned int *)image.bits() : - (unsigned int *)image.tqcolorTable(); + (unsigned int *)image.colorTable(); bool brighten = (percent >= 0); if(percent < 0) @@ -858,7 +858,7 @@ TQImage& KImageEffect::channelIntensity(TQImage &image, float percent, int pixels = image.depth() > 8 ? image.width()*image.height() : image.numColors(); unsigned int *data = image.depth() > 8 ? (unsigned int *)image.bits() : - (unsigned int *)image.tqcolorTable(); + (unsigned int *)image.colorTable(); bool brighten = (percent >= 0); if(percent < 0) percent = -percent; @@ -958,7 +958,7 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse, if (modImage.depth()<8) modImage = modImage.convertDepth(8); unsigned int *colorTable2 = (modImage.depth()==8) ? - modImage.tqcolorTable():0; + modImage.colorTable():0; unsigned int *data1, *data2; unsigned char *data2b; unsigned int color1, color2; @@ -1079,11 +1079,6 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity) if (dst.depth() != 32) dst = dst.convertDepth(32); -#ifdef USE_QT4 - if (dst.format() != QImage::Format_ARGB32) - dst = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB) -#endif - int pixels = dst.width() * dst.height(); #ifdef USE_SSE2_INLINE_ASM @@ -1334,13 +1329,6 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity) if (src.depth() != 32) src = src.convertDepth(32); if (dst.depth() != 32) dst = dst.convertDepth(32); -#ifdef USE_QT4 - if (src.format() != QImage::Format_ARGB32) - src = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB) - if (dst.format() != QImage::Format_ARGB32) - dst = dst.convertToFormat(QImage::Format_ARGB32); // This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB) -#endif - int pixels = src.width() * src.height(); #ifdef USE_SSE2_INLINE_ASM @@ -1800,7 +1788,7 @@ TQImage& KImageEffect::blend(TQImage &image1, TQImage &image2, if (blendImage.depth()<8) blendImage = blendImage.convertDepth(8); unsigned int *colorTable3 = (blendImage.depth()==8) ? - blendImage.tqcolorTable():0; + blendImage.colorTable():0; unsigned int *data1 = (unsigned int *)image1.bits(); unsigned int *data2 = (unsigned int *)image2.bits(); @@ -2174,7 +2162,7 @@ TQImage& KImageEffect::toGray(TQImage &img, bool fast) int pixels = img.depth() > 8 ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() : - (unsigned int *)img.tqcolorTable(); + (unsigned int *)img.colorTable(); int val, i; for(i=0; i < pixels; ++i){ val = tqGray(data[i]); @@ -2195,7 +2183,7 @@ TQImage& KImageEffect::desaturate(TQImage &img, float desat) int pixels = img.depth() > 8 ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() : - (unsigned int *)img.tqcolorTable(); + (unsigned int *)img.colorTable(); int h, s, v, i; TQColor clr; // keep constructor out of loop (mosfet) for(i=0; i < pixels; ++i){ @@ -2220,7 +2208,7 @@ TQImage& KImageEffect::contrast(TQImage &img, int c) int pixels = img.depth() > 8 ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() : - (unsigned int *)img.tqcolorTable(); + (unsigned int *)img.colorTable(); int i, r, g, b; for(i=0; i < pixels; ++i){ r = tqRed(data[i]); @@ -2791,7 +2779,7 @@ TQImage KImageEffect::sample(TQImage &src, int w, int h) } else if(depth == 1) { int r = src.bitOrder() == TQImage::LittleEndian; - memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(TQRgb)); + memcpy(dest.colorTable(), src.colorTable(), src.numColors()*sizeof(TQRgb)); for(int y=0; y < h; ++y){ unsigned char *destData = dest.scanLine(y); unsigned char *srcData = src.scanLine(y_offset[y]); @@ -2806,7 +2794,7 @@ TQImage KImageEffect::sample(TQImage &src, int w, int h) } } else{ // PseudoClass source image - memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(TQRgb)); + memcpy(dest.colorTable(), src.colorTable(), src.numColors()*sizeof(TQRgb)); for(int y=0; y < h; ++y){ unsigned char *destData = dest.scanLine(y); unsigned char *srcData = src.scanLine(y_offset[y]); @@ -2829,10 +2817,10 @@ void KImageEffect::threshold(TQImage &img, unsigned int threshold) } else{ // PsudeoClass count = img.numColors(); - data = (unsigned int *)img.tqcolorTable(); + data = (unsigned int *)img.colorTable(); } for(i=0; i < count; ++i) - data[i] = intensityValue(data[i]) < threshold ? QColor(Qt::black).rgb() : QColor(Qt::white).rgb(); + data[i] = intensityValue(data[i]) < threshold ? TQColor(TQt::black).rgb() : TQColor(TQt::white).rgb(); } void KImageEffect::hull(const int x_offset, const int y_offset, @@ -2963,7 +2951,7 @@ TQImage KImageEffect::despeckle(TQImage &src) } else{ // PsudeoClass source image unsigned char *srcData; - unsigned int *cTable = src.tqcolorTable(); + unsigned int *cTable = src.colorTable(); unsigned int pixel; for(y=0; y < src.height(); ++y){ srcData = (unsigned char *)src.scanLine(y); @@ -3142,7 +3130,7 @@ TQImage KImageEffect::addNoise(TQImage &src, NoiseType noise_type) } else{ // PsudeoClass source image unsigned char *srcData; - unsigned int *cTable = src.tqcolorTable(); + unsigned int *cTable = src.colorTable(); unsigned int pixel; for(y=0; y < src.height(); ++y){ srcData = (unsigned char *)src.scanLine(y); @@ -3204,7 +3192,7 @@ unsigned int KImageEffect::interpolateColor(TQImage *image, double x_offset, } } else{ - unsigned int *colorTable = (unsigned int *)image->tqcolorTable(); + unsigned int *colorTable = (unsigned int *)image->colorTable(); if((x >= 0) && (y >= 0) && (x < (image->width()-1)) && (y < (image->height()-1))) { unsigned char *t; t = (unsigned char *)image->scanLine(y); @@ -3304,7 +3292,7 @@ TQImage KImageEffect::implode(TQImage &src, double factor, else{ // PsudeoClass source image unsigned char *srcData; unsigned char idx; - unsigned int *cTable = src.tqcolorTable(); + unsigned int *cTable = src.colorTable(); for(y=0; y < src.height(); ++y){ srcData = (unsigned char *)src.scanLine(y); destData = (unsigned int *)dest.scanLine(y); @@ -3380,8 +3368,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r) case Rotate90: dest.create(img.height(), img.width(), img.depth()); dest.setNumColors(img.numColors()); - srcTable = (unsigned int *)img.tqcolorTable(); - destTable = (unsigned int *)dest.tqcolorTable(); + srcTable = (unsigned int *)img.colorTable(); + destTable = (unsigned int *)dest.colorTable(); for(x=0; x < img.numColors(); ++x) destTable[x] = srcTable[x]; for(y=0; y < img.height(); ++y){ @@ -3395,8 +3383,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r) case Rotate180: dest.create(img.width(), img.height(), img.depth()); dest.setNumColors(img.numColors()); - srcTable = (unsigned int *)img.tqcolorTable(); - destTable = (unsigned int *)dest.tqcolorTable(); + srcTable = (unsigned int *)img.colorTable(); + destTable = (unsigned int *)dest.colorTable(); for(x=0; x < img.numColors(); ++x) destTable[x] = srcTable[x]; for(y=0; y < img.height(); ++y){ @@ -3409,8 +3397,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r) case Rotate270: dest.create(img.height(), img.width(), img.depth()); dest.setNumColors(img.numColors()); - srcTable = (unsigned int *)img.tqcolorTable(); - destTable = (unsigned int *)dest.tqcolorTable(); + srcTable = (unsigned int *)img.colorTable(); + destTable = (unsigned int *)dest.colorTable(); for(x=0; x < img.numColors(); ++x) destTable[x] = srcTable[x]; for(y=0; y < img.height(); ++y){ @@ -3438,7 +3426,7 @@ void KImageEffect::solarize(TQImage &img, double factor) threshold = (int)(factor*(MaxRGB+1)/100.0); if(img.depth() < 32){ - data = (unsigned int *)img.tqcolorTable(); + data = (unsigned int *)img.colorTable(); count = img.numColors(); } else{ @@ -3553,7 +3541,7 @@ TQImage KImageEffect::swirl(TQImage &src, double degrees, } else{ // PsudeoClass source image unsigned char *p; - unsigned int *cTable = (unsigned int *)src.tqcolorTable(); + unsigned int *cTable = (unsigned int *)src.colorTable(); for(y=0; y < src.height(); y++){ p = (unsigned char *)src.scanLine(y); q = (unsigned int *)dest.scanLine(y); @@ -4566,7 +4554,7 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth, else{ // PsudeoClass source image unsigned char *p, *s0, *s1, *s2; int scanLineIdx; - unsigned int *cTable = (unsigned int *)src.tqcolorTable(); + unsigned int *cTable = (unsigned int *)src.colorTable(); for(y=0; y < src.height(); ++y){ scanLineIdx = TQMIN(TQMAX(y-1,0),src.height()-3); p = (unsigned char *)src.scanLine(scanLineIdx); @@ -4644,7 +4632,7 @@ void KImageEffect::contrastHSV(TQImage &img, bool sharpen) } else{ count = img.numColors(); - data = (unsigned int *)img.tqcolorTable(); + data = (unsigned int *)img.colorTable(); } for(i=0; i < count; ++i){ c.setRgb(data[i]); diff --git a/tdefx/kimageeffect.h b/tdefx/kimageeffect.h index cc79533f7..3bfd10944 100644 --- a/tdefx/kimageeffect.h +++ b/tdefx/kimageeffect.h @@ -398,7 +398,7 @@ public: const TQColor &cb, int ncols=0); /** - * Build a hash on any given QImage + * Build a hash on any given TQImage * * @param image The TQImage to process * @param lite The hash faces the indicated lighting (cardinal poles). diff --git a/tdefx/kpixmap.cpp b/tdefx/kpixmap.cpp index 8cc9e384a..30a2de570 100644 --- a/tdefx/kpixmap.cpp +++ b/tdefx/kpixmap.cpp @@ -75,7 +75,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst ) pv[2] = new int[sw]; for ( y=0; y < src->height(); y++ ) { - // p = (QRgb *)src->scanLine(y); + // p = (TQRgb *)src->scanLine(y); b = dst->scanLine(y); int endian = (TQImage::systemBitOrder() == TQImage::BigEndian); int x; @@ -357,7 +357,7 @@ bool KPixmap::checkColorTable( const TQImage &image ) } - TQRgb* ctable = image.tqcolorTable(); + TQRgb* ctable = image.colorTable(); int ncols = image.numColors(); int j; diff --git a/tdefx/kpixmapsplitter.h b/tdefx/kpixmapsplitter.h index 3e7a6dfa1..cf96515ce 100644 --- a/tdefx/kpixmapsplitter.h +++ b/tdefx/kpixmapsplitter.h @@ -42,7 +42,7 @@ class KPixmapSplitterPrivate; * splitter.setItemSize( TQSize( 20, 10 )); * * TQPixmap item( 20, 10 ); - * item.fill( Qt::white ); + * item.fill( TQt::white ); * TQRect rect = splitter.coordinates( 4 ); * if ( !rect.isEmpty() ) * bitBlt( &item, TQPoint(0,0), &somePixmap, rect, CopyROP ); diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp index e2fadb17f..2c741fc06 100644 --- a/tdefx/tdestyle.cpp +++ b/tdefx/tdestyle.cpp @@ -53,7 +53,7 @@ #include <kpixmapeffect.h> #include <kimageeffect.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 # include <X11/Xlib.h> # ifdef HAVE_XRENDER # include <X11/extensions/Xrender.h> // schroder @@ -263,11 +263,11 @@ TQString TDEStyle::defaultStyle() void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget* widget = reinterpret_cast<TQWidget*>(ptr); if ( d->useFilledFrameWorkaround ) { - if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { + if ( TQFrame *frame = ::tqt_cast< TQFrame* >( widget ) ) { TQFrame::Shape shape = frame->frameShape(); if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel) widget->installEventFilter(this); @@ -287,11 +287,11 @@ void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFl void TDEStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget* widget = reinterpret_cast<TQWidget*>(ptr); if ( d->useFilledFrameWorkaround ) { - if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { + if ( TQFrame *frame = ::tqt_cast< TQFrame* >( widget ) ) { TQFrame::Shape shape = frame->frameShape(); if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel) widget->removeEventFilter(this); @@ -310,7 +310,7 @@ void TDEStyle::polishPopupMenu( const TQStyleControlElementData &ceData, Control widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable); } - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget* widget = reinterpret_cast<TQWidget*>(ptr); TQPopupMenu *p = dynamic_cast<TQPopupMenu*>(widget); if (p) { @@ -537,7 +537,7 @@ void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, break; default: - p->fillRect(r, Qt::yellow); // Something really bad happened - highlight. + p->fillRect(r, TQt::yellow); // Something really bad happened - highlight. break; } } @@ -569,29 +569,7 @@ int TDEStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElement // ----------------------------------------------------------------------------- -// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now - -//void TDEStyle::drawPrimitive( TQ_ControlElement pe, -// TQPainter* p, -// const TQStyleControlElementData &ceData, -// ControlElementFlags elementFlags, -// const TQRect &r, -// const TQColorGroup &cg, -// SFlags flags, -// const TQStyleOption& opt ) const -//{ -// // FIXME: -// // What should "widget" be in actuality? How should I get it? From where? -// // Almost certainly it should not be null! -// TQWidget *widget = 0; -// drawControl(pe, p, ceData, elementFlags, r, cg, flags, opt, widget); -//} - -// #endif // USE_QT4 - -// ----------------------------------------------------------------------------- - -void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe, +void TDEStyle::drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -615,13 +593,13 @@ void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe, // Check if we are a normal toolbar or a hidden dockwidget. if ( parent && - (parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) || // Normal toolbar - (parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) )) // Collapsed dock + (parent->inherits("TQToolBar") || // Normal toolbar + (parent->inherits("TQMainWindow")) )) // Collapsed dock // Draw a toolbar handle drawTDEStylePrimitive( KPE_ToolBarHandle, p, ceData, elementFlags, r, cg, flags, opt, widget ); - else if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) + else if (ceData.widgetObjectTypes.contains("TQDockWindowHandle")) // Draw a dock window handle drawTDEStylePrimitive( KPE_DockWindowHandle, p, ceData, elementFlags, r, cg, flags, opt, widget ); @@ -686,7 +664,7 @@ void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe, -void TDEStyle::drawControl( TQ_ControlElement element, +void TDEStyle::drawControl( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -875,7 +853,7 @@ void TDEStyle::drawControl( TQ_ControlElement element, // ------------------------------------------------------------------------ case CE_ProgressBarGroove: { TQRect fr = subRect(SR_ProgressBarGroove, ceData, elementFlags, widget); - drawPrimitive(PE_Panel, p, ceData, elementFlags, fr, cg, Style_Sunken, TQStyleOption::SO_Default); + drawPrimitive(PE_Panel, p, ceData, elementFlags, fr, cg, Style_Sunken, TQStyleOption::Default); break; } @@ -1025,9 +1003,9 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData // Check that we are not a normal toolbar or a hidden dockwidget, // in which case we need to adjust the height for font size if (widget - && !(ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) - && !(ceData.parentWidgetData.widgetObjectTypes.contains(TQMAINWINDOW_OBJECT_NAME_STRING)) - && (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) ) + && !(ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) + && !(ceData.parentWidgetData.widgetObjectTypes.contains("TQMainWindow")) + && (ceData.widgetObjectTypes.contains("TQDockWindowHandle")) ) return widget->fontMetrics().lineSpacing(); else return TQCommonStyle::pixelMetric(m, ceData, elementFlags, widget); @@ -1086,7 +1064,7 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData // SPLITTER // ------------------------------------------------------------------------ case PM_SplitterWidth: - if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWRESIZEHANDLE_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQDockWindowResizeHandle")) return 8; // ### why do we need 2pix extra? else return 6; @@ -1131,7 +1109,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) return sibling; } -void TDEStyle::drawComplexControl( TQ_ComplexControl control, +void TDEStyle::drawComplexControl( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1437,7 +1415,7 @@ void TDEStyle::drawComplexControl( TQ_ComplexControl control, } -TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control, +TQStyle::SubControl TDEStyle::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, @@ -1455,7 +1433,7 @@ TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control, } -TQRect TDEStyle::querySubControlMetrics( TQ_ComplexControl control, +TQRect TDEStyle::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, @@ -1875,7 +1853,7 @@ TQPixmap TDEStyle::stylePixmap( StylePixmap stylepixmap, } -int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, +int TDEStyle::styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn* shr, const TQWidget* w) const { switch (sh) @@ -1936,7 +1914,7 @@ int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceDat bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if ( d->useFilledFrameWorkaround ) { @@ -1949,17 +1927,17 @@ bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, Cont // -- Karol. TQFrame *frame = 0; if ( event->type() == TQEvent::Paint - && (frame = ::tqqt_cast<TQFrame*>(object)) ) + && (frame = ::tqt_cast<TQFrame*>(object)) ) { if (frame->frameShape() != TQFrame::ToolBarPanel && frame->frameShape() != TQFrame::MenuBarPanel) return false; bool horizontal = true; TQPaintEvent* pe = (TQPaintEvent*)event; - TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame ); + TQToolBar *toolbar = ::tqt_cast< TQToolBar *>( frame ); TQRect r = pe->rect(); - if (toolbar && toolbar->orientation() == Qt::Vertical) + if (toolbar && toolbar->orientation() == TQt::Vertical) horizontal = false; if (horizontal) { @@ -2163,7 +2141,7 @@ TQImage TransparencyHandler::handleRealAlpha(TQImage img) { // Create a shadow of thickness 4. void TransparencyHandler::createShadowWindows(const TQWidget* p) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int x2 = p->x()+p->width(); int y2 = p->y()+p->height(); TQRect shadow1(x2, p->y() + 4, 4, p->height()); @@ -2222,7 +2200,7 @@ void TransparencyHandler::createShadowWindows(const TQWidget* p) void TransparencyHandler::removeShadowWindows(const TQWidget* p) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 ShadowMap::iterator it = shadowMap().find(p); if (it != shadowMap().end()) { @@ -2241,7 +2219,7 @@ void TransparencyHandler::removeShadowWindows(const TQWidget* p) bool TransparencyHandler::eventFilter( TQObject* object, TQEvent* event ) { -#if !defined Q_WS_MAC && !defined Q_WS_WIN +#if !defined TQ_WS_MAC && !defined TQ_WS_WIN // Transparency idea was borrowed from KDE2's "MegaGradient" Style, // Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org> @@ -2339,8 +2317,8 @@ void TransparencyHandler::blendToPixmap(const TQColorGroup &cg, const TQWidget* return; // Allow styles to define the blend pixmap - allows for some interesting effects. - if (::tqqt_cast<TQPopupMenu*>(p)) - tdestyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) ); + if (::tqt_cast<TQPopupMenu*>(p)) + tdestyle->renderMenuBlendPixmap( blendPix, cg, ::tqt_cast<TQPopupMenu*>(p) ); else blendPix.fill(cg.button()); // Just tint as the default behavior @@ -2361,9 +2339,9 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p) renderPix.resize( pix.width(), pix.height() ); // Allow styles to define the blend pixmap - allows for some interesting effects. - if (::tqqt_cast<TQPopupMenu*>(p)) + if (::tqt_cast<TQPopupMenu*>(p)) tdestyle->renderMenuBlendPixmap( renderPix, p->colorGroup(), - ::tqqt_cast<TQPopupMenu*>(p) ); + ::tqt_cast<TQPopupMenu*>(p) ); else renderPix.fill(p->colorGroup().button()); // Just tint as the default behavior diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h index 505682b32..c9cd11f88 100644 --- a/tdefx/tdestyle.h +++ b/tdefx/tdestyle.h @@ -56,7 +56,7 @@ struct TDEStylePrivate; */ class TDEFX_EXPORT TDEStyle: public TQCommonStyle { - Q_OBJECT + TQ_OBJECT public: @@ -245,15 +245,15 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default ) const; + const TQStyleOption& = TQStyleOption::Default ) const; /** - * This function is identical to Qt's TQStyle::tqdrawPrimitive(), except that + * This function is identical to Qt's TQStyle::drawPrimitive(), except that * it adds one further parameter, 'widget', that can be used to determine * the widget state of the TDEStylePrimitive in question. * * @see TDEStyle::TDEStylePrimitive - * @see TQStyle::tqdrawPrimitive + * @see TQStyle::drawPrimitive * @see TQStyle::drawComplexControl */ virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe, @@ -263,7 +263,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; @@ -287,39 +287,26 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default ) const; + const TQStyleOption& = TQStyleOption::Default ) const; -// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now - -// void drawPrimitive( TQ_ControlElement pe, -// TQPainter* p, -// const TQStyleControlElementData &ceData, -// ControlElementFlags elementFlags, -// const TQRect &r, -// const TQColorGroup &cg, -// SFlags flags = Style_Default, -// const TQStyleOption& = TQStyleOption::SO_Default ) const; - -// #endif // USE_QT4 - - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -328,21 +315,21 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle SFlags flags = Style_Default, SCFlags controls = SC_All, SCFlags active = SC_None, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - SubControl querySubControl( TQ_ComplexControl control, + SubControl querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - TQRect querySubControlMetrics( TQ_ComplexControl control, + TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -354,12 +341,12 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle TQPixmap stylePixmap( StylePixmap stylepixmap, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - int styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, + int styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, - const TQStyleOption &opt = TQStyleOption::SO_Default, + const TQStyleOption &opt = TQStyleOption::Default, TQStyleHintReturn* shr = 0, const TQWidget* w = 0 ) const; diff --git a/tdehtml/CMakeLists.txt b/tdehtml/CMakeLists.txt index 187eff352..624612d55 100644 --- a/tdehtml/CMakeLists.txt +++ b/tdehtml/CMakeLists.txt @@ -93,7 +93,7 @@ tde_add_library( ${target} SHARED AUTOMOC LINK ${VSCRIPT} kjava-static kjs_html-static tdehtmldom-static tdehtmlcss-static tdehtmlhtml-static tdehtmlxml-static tdehtmlrender-static tdehtmlmisc-static tdeutils-shared tdeprint-shared - LINK_PRIVATE kjs-shared ${JPEG_LIBRARIES} + LINK_PRIVATE kjs-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp index 94cca8840..31f0d6be2 100644 --- a/tdehtml/css/css_valueimpl.cpp +++ b/tdehtml/css/css_valueimpl.cpp @@ -505,7 +505,7 @@ CSSPrimitiveValueImpl::CSSPrimitiveValueImpl( RectImpl *r) m_type = CSSPrimitiveValue::CSS_RECT; } -CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(QRgb color) +CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(TQRgb color) { m_value.rgbcolor = color; m_type = CSSPrimitiveValue::CSS_RGBCOLOR; diff --git a/tdehtml/css/css_valueimpl.h b/tdehtml/css/css_valueimpl.h index 9a6203c86..952c81f8c 100644 --- a/tdehtml/css/css_valueimpl.h +++ b/tdehtml/css/css_valueimpl.h @@ -163,7 +163,7 @@ public: CSSPrimitiveValueImpl(const DOMString &str, CSSPrimitiveValue::UnitTypes type); CSSPrimitiveValueImpl(CounterImpl *c); CSSPrimitiveValueImpl( RectImpl *r); - CSSPrimitiveValueImpl(QRgb color); + CSSPrimitiveValueImpl(TQRgb color); CSSPrimitiveValueImpl(PairImpl *p); virtual ~CSSPrimitiveValueImpl(); @@ -206,7 +206,7 @@ public: return ( m_type != CSSPrimitiveValue::CSS_RECT ? 0 : m_value.rect ); } - QRgb getRGBColorValue () const { + TQRgb getRGBColorValue () const { return ( m_type != CSSPrimitiveValue::CSS_RGBCOLOR ? 0 : m_value.rgbcolor ); } @@ -232,7 +232,7 @@ protected: DOM::DOMStringImpl *string; CounterImpl *counter; RectImpl *rect; - QRgb rgbcolor; + TQRgb rgbcolor; PairImpl* pair; } m_value; }; diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp index 130fa8b61..b4b531df0 100644 --- a/tdehtml/css/cssparser.cpp +++ b/tdehtml/css/cssparser.cpp @@ -2053,7 +2053,7 @@ bool CSSParser::parseHSLParameters(Value* value, double* colorArray, bool parseA return true; } -static bool parseColor(int unit, const TQString &name, QRgb& rgb) +static bool parseColor(int unit, const TQString &name, TQRgb& rgb) { int len = name.length(); @@ -2101,7 +2101,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor() CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) { - QRgb c = tdehtml::transparentColor; + TQRgb c = tdehtml::transparentColor; if ( !strict && value->unit == CSSPrimitiveValue::CSS_NUMBER && value->fValue >= 0. && value->fValue < 1000000. ) { TQString str; diff --git a/tdehtml/css/cssparser.h b/tdehtml/css/cssparser.h index 0e00ebc16..de735fe3e 100644 --- a/tdehtml/css/cssparser.h +++ b/tdehtml/css/cssparser.h @@ -148,7 +148,7 @@ namespace DOM { CSSPrimitiveValueImpl *parseColorFromValue(Value* val); CSSValueImpl* parseCounterContent(ValueList *args, bool counters); - static bool parseColor(const TQString &name, QRgb& rgb); + static bool parseColor(const TQString &name, TQRgb& rgb); // CSS3 Parsing Routines (for properties specific to CSS3) bool parseShadow(int propId, bool important); diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp index 40dbcb2ec..e9517584e 100644 --- a/tdehtml/css/cssstyleselector.cpp +++ b/tdehtml/css/cssstyleselector.cpp @@ -1953,7 +1953,7 @@ static Length convertToLength( CSSPrimitiveValueImpl *primitiveValue, RenderStyl // color mapping code struct colorMap { int css_value; - QRgb color; + TQRgb color; }; static const colorMap cmap[] = { diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y index 6d8b18e9a..236b467dd 100644 --- a/tdehtml/css/parser.y +++ b/tdehtml/css/parser.y @@ -634,7 +634,7 @@ element_name: IDENT { CSSParser *p = static_cast<CSSParser *>(parser); DOM::DocumentImpl *doc = p->document(); - QString tag = qString($1); + TQString tag = qString($1); if ( doc ) { if (doc->isHTMLDocument()) tag = tag.lower(); @@ -699,7 +699,7 @@ attrib_id: CSSParser *p = static_cast<CSSParser *>(parser); DOM::DocumentImpl *doc = p->document(); - QString attr = qString($1); + TQString attr = qString($1); if ( doc ) { if (doc->isHTMLDocument()) attr = attr.lower(); @@ -798,7 +798,7 @@ pseudo: | ':' FUNCTION INTEGER ')' { $$ = new CSSSelector(); $$->match = CSSSelector::PseudoClass; - $$->string_arg = QString::number($3); + $$->string_arg = TQString::number($3); $$->value = domString($2); } // used by :nth-* and :lang @@ -892,7 +892,7 @@ declaration: property: IDENT maybe_space { - QString str = qString($1); + TQString str = qString($1); $$ = getPropertyID( str.lower().latin1(), str.length() ); } ; @@ -941,7 +941,7 @@ term: | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; } | STRING maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; } | IDENT maybe_space { - QString str = qString( $1 ); + TQString str = qString( $1 ); $$.id = getValueID( str.lower().latin1(), str.length() ); $$.unit = CSSPrimitiveValue::CSS_IDENT; $$.string = $1; diff --git a/tdehtml/dom/css_value.cpp b/tdehtml/dom/css_value.cpp index 4e365644a..edbf15075 100644 --- a/tdehtml/dom/css_value.cpp +++ b/tdehtml/dom/css_value.cpp @@ -483,7 +483,7 @@ RGBColor::RGBColor(const RGBColor &other) m_color = other.m_color; } -RGBColor::RGBColor(QRgb color) +RGBColor::RGBColor(TQRgb color) { m_color = color; } diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h index e2028feac..6e3d89717 100644 --- a/tdehtml/dom/css_value.h +++ b/tdehtml/dom/css_value.h @@ -596,7 +596,7 @@ public: * @deprecated */ RGBColor(const TQColor& c) { m_color = c.rgb(); } - RGBColor(QRgb color); + RGBColor(TQRgb color); RGBColor(const RGBColor &other); RGBColor & operator = (const RGBColor &other); @@ -624,9 +624,9 @@ public: /** * @internal */ - QRgb color() const { return m_color; } + TQRgb color() const { return m_color; } protected: - QRgb m_color; + TQRgb m_color; }; class RectImpl; diff --git a/tdehtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h index 3b68eafaa..79bd26385 100644 --- a/tdehtml/dom/dom2_events.h +++ b/tdehtml/dom/dom2_events.h @@ -624,7 +624,7 @@ public: * keys below represents the allowable modifier parameters for this * method (note: this was not documented properly in earlier versions): * - * Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton + * TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton * * Parameters: * @@ -709,7 +709,7 @@ public: * return false. The list of keys below represents the allowable * modifier parameters for this method (warning: this was not documented * properly in earlier versions): - * Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton + * TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton * * Parameters: * diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp index c68eb2007..88477fe03 100644 --- a/tdehtml/domtreeview.cpp +++ b/tdehtml/domtreeview.cpp @@ -28,8 +28,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char addColumn("Renderer"); setSorting(-1); part = currentpart; - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *))); m_nodedict.setAutoDelete(true); } diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h index 4156f083a..b79938b1a 100644 --- a/tdehtml/domtreeview.h +++ b/tdehtml/domtreeview.h @@ -26,7 +26,7 @@ class DOMTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0); ~DOMTreeView(); diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp index 82c11d308..0a0a2da47 100644 --- a/tdehtml/ecma/kjs_binding.cpp +++ b/tdehtml/ecma/kjs_binding.cpp @@ -50,7 +50,7 @@ Value DOMObject::get(ExecState *exec, const Identifier &p) const } catch (DOM::DOMException e) { // ### translate code into readable string ? - // ### oh, and s/QString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?) + // ### oh, and s/TQString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?) // and where does it appear to the user ? Object err = Error::create(exec, GeneralError, TQString(TQString("DOM exception %1").arg(e.code)).local8Bit()); exec->setException( err ); diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index 2e08f5ea8..27fb181bb 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -210,7 +210,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid()); p->setPen(palette().active().text()); - p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr); + p->drawText(0,height*lineno,linenoWidth,height,TQt::AlignRight,linenoStr); TQColor bgColor; TQColor textColor; @@ -232,7 +232,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor); p->setPen(textColor); p->drawText(linenoWidth+4,height*lineno,contentsWidth()-linenoWidth-4,height, - Qt::AlignLeft,m_lines[lineno]); + TQt::AlignLeft,m_lines[lineno]); } int remainingTop = height*(lastLine+1); @@ -249,7 +249,7 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0; TQString SourceFile::getCode() { if (interpreter) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); if (part && url == part->url().url() && TDEHTMLPageCache::self()->isValid(part->cacheId())) { Decoder *decoder = part->createDecoder(); TQByteArray data; @@ -333,7 +333,7 @@ EvalMultiLineEdit::EvalMultiLineEdit(TQWidget *parent) void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e) { - if (e->key() == Qt::Key_Return) { + if (e->key() == TQt::Key_Return) { if (hasSelectedText()) { m_code = selectedText(); } else { @@ -374,7 +374,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) TQVBoxLayout *vl = new TQVBoxLayout(mainWidget,5); // frame list & code - TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget); + TQSplitter *hsplitter = new TQSplitter(TQt::Vertical,mainWidget); TQSplitter *vsplitter = new TQSplitter(hsplitter); TQFont font(TDEGlobalSettings::fixedFont()); @@ -384,7 +384,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) TQWidget *contextListContainer = new TQWidget(contextContainer); m_contextList = new TQListBox(contextListContainer); m_contextList->setMinimumSize(100,200); - connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); TQHBoxLayout *clistLayout = new TQHBoxLayout(contextListContainer); clistLayout->addWidget(m_contextList); @@ -400,11 +400,11 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) TQVBoxLayout *ssdvl = new TQVBoxLayout(sourceSelDisplay); m_sourceSel = new TQComboBox(toolBar()); - connect(m_sourceSel,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSourceSelected(int))); + connect(m_sourceSel,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSourceSelected(int))); m_sourceDisplay = new SourceDisplay(this,sourceSelDisplay); ssdvl->addWidget(m_sourceDisplay); - connect(m_sourceDisplay,TQT_SIGNAL(lineDoubleClicked(int)),TQT_SLOT(slotToggleBreakpoint(int))); + connect(m_sourceDisplay,TQ_SIGNAL(lineDoubleClicked(int)),TQ_SLOT(slotToggleBreakpoint(int))); TQValueList<int> vsplitSizes; vsplitSizes.insert(vsplitSizes.end(),120); @@ -419,7 +419,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) m_evalEdit = new EvalMultiLineEdit(evalContainer); m_evalEdit->setWordWrap(TQMultiLineEdit::NoWrap); m_evalEdit->setFont(font); - connect(m_evalEdit,TQT_SIGNAL(returnPressed()),TQT_SLOT(slotEval())); + connect(m_evalEdit,TQ_SIGNAL(returnPressed()),TQ_SLOT(slotEval())); m_evalDepth = 0; TQVBoxLayout *evalLayout = new TQVBoxLayout(evalContainer); @@ -443,20 +443,20 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) m_actionCollection->setInstance(this); // Venkman use F12, KDevelop F10 - TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12))); - scNext.append(KKeySequence(KKey(Qt::Key_F10))); - m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()), + TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12))); + scNext.append(KKeySequence(KKey(TQt::Key_F10))); + m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQ_SLOT(slotNext()), m_actionCollection,"next"); - m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()), + m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQ_SLOT(slotStep()), m_actionCollection,"step"); // Venkman use F5, Kdevelop F9 - TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5))); - scCont.append(KKeySequence(KKey(Qt::Key_F9))); - m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()), + TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5))); + scCont.append(KKeySequence(KKey(TQt::Key_F9))); + m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQ_SLOT(slotContinue()), m_actionCollection,"cont"); - m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()), + m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQ_SLOT(slotStop()), m_actionCollection,"stop"); - m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()), + m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQ_SLOT(slotBreakNext()), m_actionCollection,"breaknext"); @@ -677,8 +677,8 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Close: case TQEvent::Quit: while (o->parent()) - o = TQT_TQOBJECT(o->parent()); - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + o = o->parent(); + if (o == this) return TQWidget::eventFilter(o,e); else return true; @@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch return true; KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part(); - TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart*>(part); + TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart*>(part); if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled()) return true; @@ -1048,7 +1048,7 @@ void KJSDebugWin::leaveSession() void KJSDebugWin::updateContextList() { - disconnect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + disconnect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); m_contextList->clear(); for (int i = 0; i < m_execsCount; i++) @@ -1060,7 +1060,7 @@ void KJSDebugWin::updateContextList() setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine()); } - connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); } TQString KJSDebugWin::contextStr(const Context &ctx) diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h index be6b31dda..a40b20c2f 100644 --- a/tdehtml/ecma/kjs_debugwin.h +++ b/tdehtml/ecma/kjs_debugwin.h @@ -94,7 +94,7 @@ namespace KJS { }; class KJSErrorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, bool showDebug); virtual ~KJSErrorDialog(); @@ -111,7 +111,7 @@ namespace KJS { }; class EvalMultiLineEdit : public TQMultiLineEdit { - Q_OBJECT + TQ_OBJECT public: EvalMultiLineEdit(TQWidget *parent); const TQString & code() const { return m_code; } @@ -122,7 +122,7 @@ namespace KJS { }; class SourceDisplay : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name = 0); ~SourceDisplay(); @@ -159,7 +159,7 @@ namespace KJS { */ class KJSDebugWin : public TDEMainWindow, public Debugger, public TDEInstance { - Q_OBJECT + TQ_OBJECT friend class SourceDisplay; public: KJSDebugWin(TQWidget *parent=0, const char *name=0); diff --git a/tdehtml/ecma/kjs_dom.cpp b/tdehtml/ecma/kjs_dom.cpp index 1834c5931..1f73dd9fe 100644 --- a/tdehtml/ecma/kjs_dom.cpp +++ b/tdehtml/ecma/kjs_dom.cpp @@ -1093,7 +1093,7 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List Window* active = Window::retrieveActive(exec); // Complete the URL using the "active part" (running interpreter). We do this for the security // check and to make sure we load exactly the same url as we have verified to be safe - TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(active->part()); + TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart *>(active->part()); if (tdehtmlpart) { // Security: only allow documents to be loaded from the same host TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string(); @@ -1279,7 +1279,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c case DOMDOMImplementation::CreateDocument: { // DOM2 // Initially set the URL to document of the creator... this is so that it resides in the same // host/domain for security checks. The URL will be updated if Document.load() is called. - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part()); if (part) { Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2])); KURL url = static_cast<DocumentImpl*>(part->document().handle())->URL(); diff --git a/tdehtml/ecma/kjs_events.cpp b/tdehtml/ecma/kjs_events.cpp index 35016910f..825cd4107 100644 --- a/tdehtml/ecma/kjs_events.cpp +++ b/tdehtml/ecma/kjs_events.cpp @@ -62,7 +62,7 @@ void JSEventListener::handleEvent(DOM::Event &evt) if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession()) return; #endif - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); @@ -162,7 +162,7 @@ Object JSLazyEventListener::listenerObj() const void JSLazyEventListener::parseCode() const { if (!parsed) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp index 92185d7f4..204fb46e2 100644 --- a/tdehtml/ecma/kjs_proxy.cpp +++ b/tdehtml/ecma/kjs_proxy.cpp @@ -387,8 +387,8 @@ void KJSCPUGuard::start(unsigned int ms, unsigned int i_ms) oldAlarmHandler = signal(SIGVTALRM, alarmHandler); itimerval tv = { - { i_ms / 1000, (i_ms % 1000) * 1000 }, - { ms / 1000, (ms % 1000) * 1000 } + { static_cast<time_t>( i_ms / 1000 ), static_cast<suseconds_t>( (i_ms % 1000) * 1000 ) }, + { static_cast<time_t>( ms / 1000 ), static_cast<suseconds_t>( (ms % 1000) * 1000 ) } }; setitimer(ITIMER_VIRTUAL, &tv, &oldtv); } diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp index b06cb970c..96d703833 100644 --- a/tdehtml/ecma/kjs_window.cpp +++ b/tdehtml/ecma/kjs_window.cpp @@ -42,7 +42,7 @@ #include <tdeparts/browserinterface.h> #include <twin.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <twinmodule.h> // schroder #endif @@ -111,7 +111,7 @@ namespace KJS { TQGuardedPtr<TDEHTMLPart> part; }; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS class KonquerorFunc : public DOMFunction { public: KonquerorFunc(ExecState *exec, const Konqueror* k, const char* name) @@ -160,7 +160,7 @@ Value Screen::get(ExecState *exec, const Identifier &p) const Value Screen::getValueProperty(ExecState *exec, int token) const { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY KWinModule info(0, KWinModule::INFO_DESKTOP); #endif TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget(); @@ -177,7 +177,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const return Number(m.depth()); } case AvailLeft: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY TQRect clipped = info.workArea().intersect(sg); return Number(clipped.x()-sg.x()); #else @@ -185,7 +185,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const #endif } case AvailTop: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY TQRect clipped = info.workArea().intersect(sg); return Number(clipped.y()-sg.y()); #else @@ -193,7 +193,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const #endif } case AvailHeight: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY TQRect clipped = info.workArea().intersect(sg); return Number(clipped.height()); #else @@ -201,7 +201,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const #endif } case AvailWidth: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY TQRect clipped = info.workArea().intersect(sg); return Number(clipped.width()); #else @@ -420,7 +420,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p) Object obj = Object::dynamicCast( retrieve( p ) ); #ifndef NDEBUG // obj should never be null, except when javascript has been disabled in that part. - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(p); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(p); if ( part && part->jScriptEnabled() ) { assert( obj.isValid() ); @@ -447,10 +447,10 @@ Window *Window::retrieveActive(ExecState *exec) Value Window::retrieve(KParts::ReadOnlyPart *p) { assert(p); - TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(p); + TDEHTMLPart * part = ::tqt_cast<TDEHTMLPart *>(p); KJSProxy *proxy = 0L; if (!part) { - part = ::tqqt_cast<TDEHTMLPart *>(p->parent()); + part = ::tqt_cast<TDEHTMLPart *>(p->parent()); if (part) proxy = part->framejScript(p); } else @@ -477,7 +477,7 @@ Location *Window::location() const ObjectImp* Window::frames( ExecState* exec ) const { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (part) return m_frames ? m_frames : (const_cast<Window*>(this)->m_frames = new FrameArray(exec, part)); @@ -515,7 +515,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const if (Lookup::findEntry(&WindowTable, p)) return true; - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return false; @@ -584,7 +584,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const } const HashEntry* entry = Lookup::findEntry(&WindowTable, p); - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); // properties that work on all windows if (entry) { @@ -848,7 +848,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const const_cast<Window *>(this)->put(exec, "clientInformation", nav, DontDelete|ReadOnly|Internal); return nav; } -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS case _Konqueror: { Value k( new Konqueror(part) ); const_cast<Window *>(this)->put(exec, "konqueror", k, DontDelete|ReadOnly|Internal); @@ -860,7 +860,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const case OuterHeight: case OuterWidth: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY if (!part->widget()) return Number(0); KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId()); @@ -1084,7 +1084,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v default: break; } - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (part) { switch( entry->value ) { case Status: { @@ -1221,7 +1221,7 @@ bool Window::toBoolean(ExecState *) const DOM::AbstractView Window::toAbstractView() const { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return DOM::AbstractView(); return part->document().defaultView(); @@ -1231,7 +1231,7 @@ void Window::scheduleClose() { kdDebug(6070) << "Window::scheduleClose window.close() " << m_frame << endl; Q_ASSERT(winq); - TQTimer::singleShot( 0, winq, TQT_SLOT( timeoutClose() ) ); + TQTimer::singleShot( 0, winq, TQ_SLOT( timeoutClose() ) ); } void Window::closeNow() @@ -1239,7 +1239,7 @@ void Window::closeNow() if (m_frame.isNull() || m_frame->m_part.isNull()) { kdDebug(6070) << k_funcinfo << "part is deleted already" << endl; } else { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) { kdDebug(6070) << "closeNow on non TDEHTML part" << endl; } else { @@ -1287,7 +1287,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem. return true; - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return true; // not a TDEHTMLPart @@ -1300,7 +1300,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const return false; } - TDEHTMLPart *activeTDEHTMLPart = ::tqqt_cast<TDEHTMLPart *>(activePart); + TDEHTMLPart *activeTDEHTMLPart = ::tqt_cast<TDEHTMLPart *>(activePart); if (!activeTDEHTMLPart) return true; // not a TDEHTMLPart @@ -1326,7 +1326,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const void Window::setListener(ExecState *exec, int eventId, Value func) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || !isSafeScript(exec)) return; DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); @@ -1338,7 +1338,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func) Value Window::getListener(ExecState *exec, int eventId) const { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || !isSafeScript(exec)) return Undefined(); DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); @@ -1356,7 +1356,7 @@ Value Window::getListener(ExecState *exec, int eventId) const JSEventListener *Window::getJSEventListener(const Value& val, bool html) { // This function is so hot that it's worth coding it directly with imps. - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || val.type() != ObjectType) return 0; @@ -1432,8 +1432,8 @@ void Window::setCurrentEvent( DOM::Event *evt ) void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) { Window* active = Window::retrieveActive(exec); - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); - TDEHTMLPart *active_part = ::tqqt_cast<TDEHTMLPart *>(active->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *active_part = ::tqt_cast<TDEHTMLPart *>(active->part()); // Complete the URL using the "active part" (running interpreter) if (active_part && part) { if (url[0] == TQChar('#')) { @@ -1469,7 +1469,7 @@ void Window::delayedGoHistory( int steps ) void Window::goHistory( int steps ) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if(!part) // TODO history readonlypart return; @@ -1487,7 +1487,7 @@ void Window::goHistory( int steps ) void KJS::Window::resizeTo(TQWidget* tl, int width, int height) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if(!part) // TODO resizeTo readonlypart return; @@ -1530,7 +1530,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height) Value Window::openWindow(ExecState *exec, const List& args) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return Undefined(); TDEHTMLView *widget = part->view(); @@ -1543,7 +1543,7 @@ Value Window::openWindow(ExecState *exec, const List& args) KURL url; if (!str.isEmpty()) { - TDEHTMLPart* p = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part); + TDEHTMLPart* p = ::tqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part); if ( p ) url = p->htmlDocument().completeURL(str).string(); if ( !p || @@ -1601,7 +1601,7 @@ Value Window::openWindow(ExecState *exec, const List& args) Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features) { - TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); TDEHTMLView *widget = p->view(); KParts::WindowArgs winargs; @@ -1702,7 +1702,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString // request window (new or existing if framename is set) KParts::ReadOnlyPart *newPart = 0L; emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart); - if (newPart && ::tqqt_cast<TDEHTMLPart*>(newPart)) { + if (newPart && ::tqt_cast<TDEHTMLPart*>(newPart)) { TDEHTMLPart *tdehtmlpart = static_cast<TDEHTMLPart*>(newPart); //tqDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window); tdehtmlpart->setOpener(p); @@ -1734,7 +1734,7 @@ void Window::forgetSuppressedWindows() void Window::showSuppressedWindows() { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>( m_frame->m_part ); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>( m_frame->m_part ); KJS::Interpreter *interpreter = part->jScript()->interpreter(); ExecState *exec = interpreter->globalExec(); @@ -1759,7 +1759,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) Window *window = static_cast<Window *>(thisObj.imp()); TQString str, str2; - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(window->m_frame->m_part); if (!part) return Undefined(); @@ -2113,7 +2113,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte bool ScheduledAction::execute(Window *window) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(window->m_frame->m_part); if (!part || !part->jScriptEnabled()) return false; ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter()); @@ -2169,8 +2169,8 @@ WindowQObject::WindowQObject(Window *w) if ( !parent->m_frame ) kdDebug(6070) << "WARNING: null part in " << k_funcinfo << endl; else - connect( parent->m_frame, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( parentDestroyed() ) ); + connect( parent->m_frame, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( parentDestroyed() ) ); pausedTime = 0; lastTimerId = 0; currentlyDispatching = false; @@ -2304,16 +2304,16 @@ void WindowQObject::timerEvent(TQTimerEvent *) DateTimeMS DateTimeMS::addMSecs(int s) const { DateTimeMS c = *this; - c.mTime = TQT_TQTIME_OBJECT(mTime.addMSecs(s)); + c.mTime = mTime.addMSecs(s); if (s > 0) { if (c.mTime < mTime) - c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(1)); + c.mDate = mDate.addDays(1); } else { if (c.mTime > mTime) - c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(-1)); + c.mDate = mDate.addDays(-1); } return c; } @@ -2589,7 +2589,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att TQString str = v.toString(exec).qstring(); switch (entry->value) { case Href: { - TDEHTMLPart* p =::tqqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part()); + TDEHTMLPart* p =::tqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part()); if ( p ) url = p->htmlDocument().completeURL( str ).string(); else @@ -2680,7 +2680,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) id == Location::Replace); break; case Location::Reload: { - TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(part); + TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart *>(part); if (tdehtmlpart) tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/); else @@ -2865,7 +2865,7 @@ Value HistoryFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) ///////////////////////////////////////////////////////////////////////////// -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS const ClassInfo Konqueror::info = { "Konqueror", 0, 0, 0 }; diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h index 3af34d87b..539131fd5 100644 --- a/tdehtml/ecma/kjs_window.h +++ b/tdehtml/ecma/kjs_window.h @@ -246,7 +246,7 @@ namespace KJS { }; class KDE_EXPORT WindowQObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: WindowQObject(Window *w); ~WindowQObject(); @@ -288,7 +288,7 @@ namespace KJS { TQGuardedPtr<tdehtml::ChildFrame> m_frame; }; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS class Konqueror : public ObjectImp { friend class KonquerorFunc; public: diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp index 410fd1992..d5937e9a0 100644 --- a/tdehtml/ecma/xmlhttprequest.cpp +++ b/tdehtml/ecma/xmlhttprequest.cpp @@ -420,17 +420,17 @@ void XMLHttpRequest::send(const TQString& _body) return; } - qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + qObject->connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); #ifdef APPLE_CHANGES - qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ), - TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) ); + qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const char*, int ) ), + TQ_SLOT( slotData( TDEIO::Job*, const char*, int ) ) ); #else - qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); #endif - qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); + qObject->connect( job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); #ifdef APPLE_CHANGES KWQServeRequest(tdehtml::Cache::loader(), doc->docLoader(), job); @@ -724,7 +724,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L } TQString method = args[0].toString(exec).qstring(); - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->part()); if (!part) return Undefined(); KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string()); diff --git a/tdehtml/ecma/xmlhttprequest.h b/tdehtml/ecma/xmlhttprequest.h index d1b304f30..7d3934152 100644 --- a/tdehtml/ecma/xmlhttprequest.h +++ b/tdehtml/ecma/xmlhttprequest.h @@ -122,7 +122,7 @@ namespace KJS { class XMLHttpRequestQObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: XMLHttpRequestQObject(XMLHttpRequest *_jsObject); diff --git a/tdehtml/html/Platform.h b/tdehtml/html/Platform.h index f47d28bb2..c587e0302 100644 --- a/tdehtml/html/Platform.h +++ b/tdehtml/html/Platform.h @@ -193,9 +193,7 @@ /* for Unicode, KDE uses Qt, everything else uses ICU */ #if PLATFORM(KDE) || PLATFORM(QT) -#define WTF_USE_QT4_UNICODE 1 -#elif PLATFORM(SYMBIAN) -#define WTF_USE_SYMBIAN_UNICODE 1 +#define WTF_USE_QT3_UNICODE 1 #else #define WTF_USE_ICU_UNICODE 1 #endif diff --git a/tdehtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp index 16ca7a23b..e8150a387 100644 --- a/tdehtml/html/html_baseimpl.cpp +++ b/tdehtml/html/html_baseimpl.cpp @@ -414,7 +414,7 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const RenderPart* render = static_cast<RenderPart*>( m_render ); - if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) ) + if(render->widget() && ::tqt_cast<TDEHTMLView*>( render->widget()) ) return static_cast<TDEHTMLView*>( render->widget() )->part()->xmlDocImpl(); return 0; @@ -426,7 +426,7 @@ TDEHTMLPart* HTMLFrameElementImpl::contentPart() const RenderPart* render = static_cast<RenderPart*>( m_render ); - if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) ) + if(render->widget() && ::tqt_cast<TDEHTMLView*>( render->widget()) ) return static_cast<TDEHTMLView*>( render->widget() )->part(); return 0; diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp index 52ada7a7b..c27573844 100644 --- a/tdehtml/html/html_documentimpl.cpp +++ b/tdehtml/html/html_documentimpl.cpp @@ -78,13 +78,13 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHT m_doAutoFill = false; /* dynamic history stuff to be fixed later (pfeiffer) - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )), - TQT_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( removed( const TQString& )), + TQ_SLOT( slotHistoryChanged() )); */ - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ), - TQT_SLOT( slotHistoryChanged() )); - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()), - TQT_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( inserted( const TQString& ) ), + TQ_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( cleared()), + TQ_SLOT( slotHistoryChanged() )); } HTMLDocumentImpl::~HTMLDocumentImpl() diff --git a/tdehtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h index 92f163076..f7191f31a 100644 --- a/tdehtml/html/html_documentimpl.h +++ b/tdehtml/html/html_documentimpl.h @@ -43,7 +43,7 @@ namespace DOM { class HTMLDocumentImpl : public DOM::DocumentImpl { - Q_OBJECT + TQ_OBJECT public: HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0); ~HTMLDocumentImpl(); diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp index 5dc44ad04..f87260ffe 100644 --- a/tdehtml/html/html_formimpl.cpp +++ b/tdehtml/html/html_formimpl.cpp @@ -957,14 +957,14 @@ bool HTMLGenericFormElementImpl::isFocusable() const return false; TQWidget* widget = static_cast<RenderWidget*>(m_render)->widget(); - return widget && widget->focusPolicy() >= TQ_TabFocus; + return widget && widget->focusPolicy() >= TQWidget::TabFocus; } class FocusHandleWidget : public TQWidget { public: void focusNextPrev(bool n) { - if (!focusNextPrevChild(n) && inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) + if (!focusNextPrevChild(n) && inherits("TQTextEdit")) TQWidget::focusNextPrevChild(n); } }; @@ -1018,19 +1018,13 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt) // handle tabbing out, either from a single or repeated key event. if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) { TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); - if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) { + if ( k && (k->key() == TQt::Key_Tab || k->key() == TQt::Key_BackTab) ) { TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget(); -#ifdef USE_QT4 + TQFocusEvent::setReason( k->key() == TQt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab ); if (widget) static_cast<FocusHandleWidget *>(widget) - ->focusNextPrev(k->key() == Qt::Key_Tab); -#else // USE_QT4 - TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab ); - if (widget) - static_cast<FocusHandleWidget *>(widget) - ->focusNextPrev(k->key() == Qt::Key_Tab); + ->focusNextPrev(k->key() == TQt::Key_Tab); TQFocusEvent::resetReason(); -#endif // USE_QT4 evt->setDefaultHandled(); } } @@ -1125,7 +1119,7 @@ void HTMLButtonElementImpl::defaultEventHandler(EventImpl *evt) bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT); if (!act && evt->id()==EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) { TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); - if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) + if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space)) act = true; } if (act) @@ -1149,7 +1143,7 @@ void HTMLButtonElementImpl::activate() void HTMLButtonElementImpl::click() { - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); } @@ -1365,7 +1359,7 @@ void HTMLInputElementImpl::select( ) void HTMLInputElementImpl::click() { - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0); dispatchMouseEvent(&me,0, 1); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); } @@ -1807,7 +1801,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt) bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT); if (!act && evt->id() == EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) { TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); - if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) + if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space)) act = true; } if (act) @@ -1923,7 +1917,7 @@ void HTMLLabelElementImpl::defaultEventHandler(EventImpl *evt) else if ( evt->isKeyRelatedEvent() && ( evt->id() == EventImpl::KEYUP_EVENT || evt->id() == EventImpl::KEYPRESS_EVENT ) ) { TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); - if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) + if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space)) act = true; } diff --git a/tdehtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp index f403a2385..1416ca3f4 100644 --- a/tdehtml/html/html_inlineimpl.cpp +++ b/tdehtml/html/html_inlineimpl.cpp @@ -132,11 +132,11 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt) state |= TQt::MetaButton; if ( e->button() == 0 ) - button = Qt::LeftButton; + button = TQt::LeftButton; else if ( e->button() == 1 ) - button = Qt::MidButton; + button = TQt::MidButton; else if ( e->button() == 2 ) - button = Qt::RightButton; + button = TQt::RightButton; } else if ( k ) { @@ -166,7 +166,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt) void HTMLAnchorElementImpl::click() { - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); } diff --git a/tdehtml/html/html_miscimpl.cpp b/tdehtml/html/html_miscimpl.cpp index 58804bff5..5b8d4ef4b 100644 --- a/tdehtml/html/html_miscimpl.cpp +++ b/tdehtml/html/html_miscimpl.cpp @@ -64,7 +64,6 @@ struct CollectionCache: public NodeListImpl::Cache virtual void clear(DocumentImpl* doc) { Cache::clear(doc); - //qDeletaAll here in Qt4 nameCache.clear(); } }; diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp index f2cf8c1db..8c530af61 100644 --- a/tdehtml/html/html_objectimpl.cpp +++ b/tdehtml/html/html_objectimpl.cpp @@ -136,7 +136,7 @@ void HTMLObjectBaseElementImpl::recalcStyle( StyleChange ch ) void HTMLObjectBaseElementImpl::renderAlternative() { if ( m_renderAlternative ) return; - TQTimer::singleShot( 0, this, TQT_SLOT( slotRenderAlternative() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRenderAlternative() ) ); } void HTMLObjectBaseElementImpl::slotRenderAlternative() @@ -267,7 +267,7 @@ void HTMLAppletElementImpl::attach() { TDEHTMLView* w = getDocument()->view(); -#ifndef Q_WS_QWS // FIXME? +#ifndef TQ_WS_QWS // FIXME? DOMString codeBase = getAttribute( ATTR_CODEBASE ); DOMString code = getAttribute( ATTR_CODE ); if ( !codeBase.isEmpty() ) @@ -422,7 +422,7 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const if ( !m_render ) return 0; if ( !m_render->isWidget() ) return 0; TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget(); - if( widget && ::tqqt_cast<TDEHTMLView*>( widget ) ) + if( widget && ::tqt_cast<TDEHTMLView*>( widget ) ) return static_cast<TDEHTMLView*>( widget )->part()->xmlDocImpl(); return 0; } diff --git a/tdehtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h index d10e66356..2818330e0 100644 --- a/tdehtml/html/html_objectimpl.h +++ b/tdehtml/html/html_objectimpl.h @@ -38,7 +38,7 @@ class DOMStringImpl; class HTMLObjectBaseElementImpl : public TQObject, public HTMLElementImpl { - Q_OBJECT + TQ_OBJECT public: HTMLObjectBaseElementImpl(DocumentImpl *doc); diff --git a/tdehtml/java/kjavaapplet.h b/tdehtml/java/kjavaapplet.h index bb4b20890..dd13100f7 100644 --- a/tdehtml/java/kjavaapplet.h +++ b/tdehtml/java/kjavaapplet.h @@ -48,7 +48,7 @@ class KJavaAppletPrivate; class KJavaApplet : public TQObject { -Q_OBJECT +TQ_OBJECT public: // states describing the life cycle of an applet. diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp index b644b67ca..6d8af4667 100644 --- a/tdehtml/java/kjavaappletcontext.cpp +++ b/tdehtml/java/kjavaappletcontext.cpp @@ -54,7 +54,7 @@ KJavaAppletContext::KJavaAppletContext() { d = new KJavaAppletContextPrivate; server = KJavaAppletServer::allocateJavaServer(); - connect(server->javaProcess(), TQT_SIGNAL(exited(int)), this, TQT_SLOT(javaProcessExited(int))); + connect(server->javaProcess(), TQ_SIGNAL(exited(int)), this, TQ_SLOT(javaProcessExited(int))); id = contextCount; server->createContext( id, this ); diff --git a/tdehtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h index 166c00f15..2ce7585ee 100644 --- a/tdehtml/java/kjavaappletcontext.h +++ b/tdehtml/java/kjavaappletcontext.h @@ -42,7 +42,7 @@ class KJavaAppletContextPrivate; class KJavaAppletContext : public TQObject { -Q_OBJECT +TQ_OBJECT public: KJavaAppletContext(); diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp index 23e805577..640473489 100644 --- a/tdehtml/java/kjavaappletserver.cpp +++ b/tdehtml/java/kjavaappletserver.cpp @@ -136,8 +136,8 @@ KJavaAppletServer::KJavaAppletServer() d = new KJavaAppletServerPrivate; process = new KJavaProcess(); - connect( process, TQT_SIGNAL(received(const TQByteArray&)), - this, TQT_SLOT(slotJavaRequest(const TQByteArray&)) ); + connect( process, TQ_SIGNAL(received(const TQByteArray&)), + this, TQ_SLOT(slotJavaRequest(const TQByteArray&)) ); setupJava( process ); @@ -198,7 +198,7 @@ void KJavaAppletServer::freeJavaServer() if( config.readBoolEntry( "ShutdownAppletServer", true ) ) { const int value = config.readNumEntry( "AppletServerTimeout", 60 ); - TQTimer::singleShot( value*1000, self, TQT_SLOT( checkShutdown() ) ); + TQTimer::singleShot( value*1000, self, TQ_SLOT( checkShutdown() ) ); } } } @@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) KSSLCertChain chain; chain.setChain( certs ); if ( chain.isValid() ) - answer = PermissionDialog( TQT_TQWIDGET(tqApp->activeWindow()) ).exec( text, args[0] ); + answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] ); } } sl.push_front( TQString(answer) ); @@ -777,7 +777,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent ) {} TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) { - TQGuardedPtr<TQDialog> dialog = new TQDialog( TQT_TQWIDGET(parent()), "PermissionDialog"); + TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog"); dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); dialog->setModal( true ); @@ -810,10 +810,10 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) dialog->resize( dialog->minimumSizeHint() ); //clearWState( WState_Polished ); - connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( reject, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( grant, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); + connect( no, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( reject, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( grant, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); dialog->exec(); delete dialog; @@ -826,7 +826,7 @@ PermissionDialog::~PermissionDialog() void PermissionDialog::clicked() { - m_button = TQT_TQOBJECT_CONST(sender())->name(); + m_button = sender()->name(); static_cast<const TQWidget*>(sender())->parentWidget()->close(); } diff --git a/tdehtml/java/kjavaappletserver.h b/tdehtml/java/kjavaappletserver.h index 5b82e01a1..ec8a7ed01 100644 --- a/tdehtml/java/kjavaappletserver.h +++ b/tdehtml/java/kjavaappletserver.h @@ -39,7 +39,7 @@ class JSStackFrame; class KJavaAppletServer : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** @@ -161,7 +161,7 @@ private: class PermissionDialog : public TQObject { - Q_OBJECT + TQ_OBJECT public: PermissionDialog( TQWidget* ); ~PermissionDialog(); diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp index f80690aa9..5a00e14eb 100644 --- a/tdehtml/java/kjavaappletviewer.cpp +++ b/tdehtml/java/kjavaappletviewer.cpp @@ -79,7 +79,7 @@ public: void setServer (KJavaAppletServer * s); TQGuardedPtr <KJavaAppletServer> server; private: - typedef TQMap <QPair <TQObject*, TQString>, QPair <KJavaAppletContext*, int> > + typedef TQMap <TQPair <TQObject*, TQString>, TQPair <KJavaAppletContext*, int> > ContextMap; ContextMap m_contextmap; }; @@ -347,10 +347,10 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); - connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded())); - connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&))); - connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &))); - connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &))); + connect (applet->getContext(), TQ_SIGNAL(appletLoaded()), this, TQ_SLOT(appletLoaded())); + connect (applet->getContext(), TQ_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQ_SLOT(showDocument(const TQString&, const TQString&))); + connect (applet->getContext(), TQ_SIGNAL(showStatus(const TQString &)), this, TQ_SLOT(infoMessage(const TQString &))); + connect (applet, TQ_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQ_SLOT(jsEvent (const TQStringList &))); } bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) { @@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) { KJavaAppletViewer::~KJavaAppletViewer () { m_view = 0L; - serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl); + serverMaintainer->releaseContext (parent(), baseurl); if (m_statusbar_icon) { m_statusbar->removeStatusBarItem (m_statusbar_icon); delete m_statusbar_icon; @@ -404,7 +404,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) { if (applet->size().width() > 0 || m_view->isVisible()) w->showApplet (); else - TQTimer::singleShot (10, this, TQT_SLOT (delayedCreateTimeOut ())); + TQTimer::singleShot (10, this, TQ_SLOT (delayedCreateTimeOut ())); if (!applet->failed ()) emit started (0L); return url.isValid (); diff --git a/tdehtml/java/kjavaappletviewer.h b/tdehtml/java/kjavaappletviewer.h index bb1d6e921..e00839d49 100644 --- a/tdehtml/java/kjavaappletviewer.h +++ b/tdehtml/java/kjavaappletviewer.h @@ -43,7 +43,7 @@ class TDEConfig; class CoverWidget; class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: KJavaAppletViewerBrowserExtension (KJavaAppletViewer *parent); void urlChanged (const TQString & url); @@ -57,7 +57,7 @@ public slots: }; class KJavaAppletViewerLiveConnectExtension : public KParts::LiveConnectExtension { - Q_OBJECT + TQ_OBJECT public: KJavaAppletViewerLiveConnectExtension(KJavaAppletViewer * parent); @@ -78,7 +78,7 @@ private: }; class KJavaAppletViewer : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KJavaAppletViewer (TQWidget * wparent, const char * wname, TQObject * parent, const char * name, const TQStringList &args); @@ -116,7 +116,7 @@ private: }; class KJavaAppletViewerFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KJavaAppletViewerFactory (); virtual ~KJavaAppletViewerFactory (); @@ -130,7 +130,7 @@ private: }; class AppletParameterDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AppletParameterDialog (KJavaAppletWidget * parent); protected slots: diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp index a1f5b8f11..83485019c 100644 --- a/tdehtml/java/kjavaappletwidget.cpp +++ b/tdehtml/java/kjavaappletwidget.cpp @@ -46,11 +46,11 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name ) m_applet = new KJavaApplet( this ); d = new KJavaAppletWidgetPrivate; - m_kwm = new KWinModule( TQT_TQOBJECT(this) ); + m_kwm = new KWinModule( this ); d->tmplabel = new TQLabel( this ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); - d->tmplabel->setAlignment( Qt::AlignCenter | TQt::WordBreak ); + d->tmplabel->setAlignment( TQt::AlignCenter | TQt::WordBreak ); d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); d->tmplabel->show(); @@ -66,8 +66,8 @@ KJavaAppletWidget::~KJavaAppletWidget() void KJavaAppletWidget::showApplet() { - connect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ), - this, TQT_SLOT( setWindow( WId ) ) ); + connect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ), + this, TQ_SLOT( setWindow( WId ) ) ); m_kwm->doNotManage( m_swallowTitle ); @@ -89,8 +89,8 @@ void KJavaAppletWidget::setWindow( WId w ) d->tmplabel = 0; // disconnect from KWM events - disconnect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ), - this, TQT_SLOT( setWindow( WId ) ) ); + disconnect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ), + this, TQ_SLOT( setWindow( WId ) ) ); embed( w ); diff --git a/tdehtml/java/kjavaappletwidget.h b/tdehtml/java/kjavaappletwidget.h index 872188769..4912af125 100644 --- a/tdehtml/java/kjavaappletwidget.h +++ b/tdehtml/java/kjavaappletwidget.h @@ -23,7 +23,7 @@ #define KJAVAAPPLETWIDGET_H #include <tqwidget.h> -#ifndef Q_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded +#ifndef TQ_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded #include "java/kjavaappletcontext.h" #include "java/kjavaapplet.h" #include <qxembed.h> @@ -75,7 +75,7 @@ class KJavaAppletWidgetPrivate; class KJavaAppletWidget : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: KJavaAppletWidget( TQWidget* parent=0, const char* name=0 ); diff --git a/tdehtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp index 5b1c55324..b58465d7f 100644 --- a/tdehtml/java/kjavadownloader.cpp +++ b/tdehtml/java/kjavadownloader.cpp @@ -81,14 +81,14 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url ) d->job = TDEIO::get( *d->url, false, false ); d->job->addMetaData("PropagateHttpHeader", "true"); - connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )), - this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) ); - connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)), - this, TQT_SLOT(slotConnected(TDEIO::Job*))); - connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)), - this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&))); - connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( d->job, TQ_SIGNAL(data( TDEIO::Job*, const TQByteArray& )), + this, TQ_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) ); + connect( d->job, TQ_SIGNAL(connected(TDEIO::Job*)), + this, TQ_SLOT(slotConnected(TDEIO::Job*))); + connect( d->job, TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString&)), + this, TQ_SLOT(slotMimetype(TDEIO::Job*, const TQString&))); + connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*)) ); } KJavaDownloader::~KJavaDownloader() @@ -215,10 +215,10 @@ void KJavaUploader::start() // create a suspended job d->job = TDEIO::put( *d->url, -1, false, false, false ); d->job->suspend(); - connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )), - this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) ); - connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( d->job, TQ_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )), + this, TQ_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) ); + connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*)) ); server->sendURLData( d->loaderID, CONNECTED, d->file ); KJavaAppletServer::freeJavaServer(); } diff --git a/tdehtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h index 4e3b893e8..eb9765769 100644 --- a/tdehtml/java/kjavadownloader.h +++ b/tdehtml/java/kjavadownloader.h @@ -42,7 +42,7 @@ class KJavaUploaderPrivate; class KJavaTDEIOJob : public TQObject { -Q_OBJECT +TQ_OBJECT public: virtual ~KJavaTDEIOJob(); virtual void jobCommand( int cmd ) = 0; @@ -51,7 +51,7 @@ public: class KJavaDownloader : public KJavaTDEIOJob { -Q_OBJECT +TQ_OBJECT public: KJavaDownloader( int ID, const TQString& url ); @@ -71,7 +71,7 @@ private: class KJavaUploader : public KJavaTDEIOJob { -Q_OBJECT +TQ_OBJECT public: KJavaUploader( int ID, const TQString& url ); diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp index 6b505c343..7f3a93e0a 100644 --- a/tdehtml/java/kjavaprocess.cpp +++ b/tdehtml/java/kjavaprocess.cpp @@ -54,12 +54,12 @@ KJavaProcess::KJavaProcess() : TDEProcess() javaProcess = this; //new TDEProcess(); - connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), - this, TQT_SLOT( slotWroteData() ) ); - connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ), - this, TQT_SLOT( slotReceivedData(int, int&) ) ); - connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ), - this, TQT_SLOT( slotExited (TDEProcess *) ) ); + connect( javaProcess, TQ_SIGNAL( wroteStdin( TDEProcess * ) ), + this, TQ_SLOT( slotWroteData() ) ); + connect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ), + this, TQ_SLOT( slotReceivedData(int, int&) ) ); + connect( javaProcess, TQ_SIGNAL( processExited (TDEProcess *) ), + this, TQ_SLOT( slotExited (TDEProcess *) ) ); d->jvmPath = "java"; d->mainClass = "-help"; @@ -319,8 +319,8 @@ bool KJavaProcess::invokeJVM() void KJavaProcess::killJVM() { d->processKilled = true; - disconnect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ), - this, TQT_SLOT( slotReceivedData(int, int&) ) ); + disconnect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ), + this, TQ_SLOT( slotReceivedData(int, int&) ) ); javaProcess->kill(); } diff --git a/tdehtml/java/kjavaprocess.h b/tdehtml/java/kjavaprocess.h index a479b8128..4e00d4080 100644 --- a/tdehtml/java/kjavaprocess.h +++ b/tdehtml/java/kjavaprocess.h @@ -37,9 +37,9 @@ */ class KJavaProcessPrivate; -class KJavaProcess : public TDEProcess //QObject +class KJavaProcess : public TDEProcess //TQObject { -Q_OBJECT +TQ_OBJECT public: /** @@ -110,7 +110,7 @@ public: /** * Sends a command to the KJAS Applet Server by building a QByteArray - * out of the data, and then writes it standard out. It adds each QString + * out of the data, and then writes it standard out. It adds each TQString * in the arg list, and then adds the data array. */ void send( char cmd_code, const TQStringList& args, const TQByteArray& data ); diff --git a/tdehtml/kjserrordlg.ui b/tdehtml/kjserrordlg.ui index 1c105d937..78d33aa8c 100644 --- a/tdehtml/kjserrordlg.ui +++ b/tdehtml/kjserrordlg.ui @@ -120,12 +120,12 @@ <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> <include location="global" impldecl="in implementation">kactivelabel.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>addError( const TQString & error )</slot> <slot>setURL( const TQString & url )</slot> <slot>clear()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/tdehtml/misc/CMakeLists.txt b/tdehtml/misc/CMakeLists.txt index 0babd6567..fbef060b7 100644 --- a/tdehtml/misc/CMakeLists.txt +++ b/tdehtml/misc/CMakeLists.txt @@ -38,4 +38,5 @@ set( ${target}_SRCS tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} + LINK ${JPEG_LIBRARIES} ) diff --git a/tdehtml/misc/helper.cpp b/tdehtml/misc/helper.cpp index b5191c7ca..6b9e06a14 100644 --- a/tdehtml/misc/helper.cpp +++ b/tdehtml/misc/helper.cpp @@ -66,7 +66,7 @@ double calcHue(double temp1, double temp2, double hueVal) // explanation available at http://en.wikipedia.org/wiki/HSL_color_space // all values are in the range of 0 to 1.0 -QRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a) +TQRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a) { double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s; double temp1 = 2.0 * l - temp2; diff --git a/tdehtml/misc/helper.h b/tdehtml/misc/helper.h index 10ffb8035..2433c9284 100644 --- a/tdehtml/misc/helper.h +++ b/tdehtml/misc/helper.h @@ -32,15 +32,15 @@ class TQPainter; namespace tdehtml { class RenderObject; - const QRgb transparentColor = 0x00000000; - const QRgb invertedColor = 0x00000002; + const TQRgb transparentColor = 0x00000000; + const TQRgb invertedColor = 0x00000002; extern TQPainter *printpainter; void setPrintPainter( TQPainter *printer ); bool hasSufficientContrast(const TQColor &c1, const TQColor &c2); TQColor retrieveBackgroundColor(const RenderObject *obj); - QRgb tqRgbaFromHsla(double h, double s, double l, double a); + TQRgb tqRgbaFromHsla(double h, double s, double l, double a); //enumerator for findSelectionNode enum FindSelectionResult { SelectionPointBefore, diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp index b8b94cd6b..aefa73192 100644 --- a/tdehtml/misc/knsplugininstaller.cpp +++ b/tdehtml/misc/knsplugininstaller.cpp @@ -157,7 +157,11 @@ bool KNSPluginInstallEngine::findPlugin() // get system infos // TODO/FIX : correct this to work with x86-64 machines +#ifdef Q_OS_SOLARIS + struct utsname sysinfo; +#else /* default */ utsname sysinfo; +#endif /* default */ if(uname(&sysinfo)) return false; TQString sysname(sysinfo.sysname); @@ -234,8 +238,8 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info) // start the download job m_downloadJob = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false ); // connect signals - connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long))); - connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) ); + connect(m_downloadJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long))); + connect(m_downloadJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDownloadResult(TDEIO::Job *)) ); kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl; } @@ -280,8 +284,8 @@ void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job) urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) ); } m_installFileJob = TDEIO::copy(urlList , destURL, false ); - connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long))); - connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) ); + connect(m_installFileJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long))); + connect(m_installFileJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotCopyResult(TDEIO::Job *)) ); } kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl; @@ -308,10 +312,10 @@ void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job) m_scanProc->addArgument( "nspluginscan" ); m_scanProc->addArgument( "--verbose" ); - connect( m_scanProc, TQT_SIGNAL(readyReadStdout()), - this, TQT_SLOT(readScanProcFromStdout()) ); - connect( m_scanProc, TQT_SIGNAL(processExited()), - this, TQT_SLOT(endScanProc()) ); + connect( m_scanProc, TQ_SIGNAL(readyReadStdout()), + this, TQ_SLOT(readScanProcFromStdout()) ); + connect( m_scanProc, TQ_SIGNAL(processExited()), + this, TQ_SLOT(endScanProc()) ); if ( !m_scanProc->start() ) { emit installFailed(); } @@ -422,7 +426,7 @@ void KNSPluginWizard::initLicencePage() addPage (m_licenceVBox, i18n("Plugin licence")); - connect(buttonGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAgreementClicked(int))); + connect(buttonGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAgreementClicked(int))); } void KNSPluginWizard::initInstallationProgressPage() { @@ -482,9 +486,9 @@ void KNSPluginWizard::initPagesButtonStates() void KNSPluginWizard::connectSignals() { - connect(&m_installEngine, TQT_SIGNAL(installProgress(int)), m_installationProgressBar, TQT_SLOT(setProgress(int)) ); - connect(&m_installEngine, TQT_SIGNAL(installCompleted()), this, TQT_SLOT(slotInstallationCompleted()) ); - connect(&m_installEngine, TQT_SIGNAL(installFailed()), this, TQT_SLOT(slotInstallationFailed()) ); + connect(&m_installEngine, TQ_SIGNAL(installProgress(int)), m_installationProgressBar, TQ_SLOT(setProgress(int)) ); + connect(&m_installEngine, TQ_SIGNAL(installCompleted()), this, TQ_SLOT(slotInstallationCompleted()) ); + connect(&m_installEngine, TQ_SIGNAL(installFailed()), this, TQ_SLOT(slotInstallationFailed()) ); } diff --git a/tdehtml/misc/knsplugininstaller.h b/tdehtml/misc/knsplugininstaller.h index f8caedf92..a77630c19 100644 --- a/tdehtml/misc/knsplugininstaller.h +++ b/tdehtml/misc/knsplugininstaller.h @@ -89,7 +89,7 @@ private: */ class KNSPluginInstallEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: /* @@ -171,7 +171,7 @@ private slots: */ class KNSPluginWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp index 7621b5e4f..50525c342 100644 --- a/tdehtml/misc/loader.cpp +++ b/tdehtml/misc/loader.cpp @@ -786,10 +786,10 @@ void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnima imgSource->cleanBuffer(); delete p; p = new TQPixmap(m->framePixmap()); - m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) )); - m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); - TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie())); + m->disconnectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) )); + m->disconnectStatus( this, TQ_SLOT( movieStatus( int ) )); + m->disconnectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) ); + TQTimer::singleShot(0, this, TQ_SLOT( deleteMovie())); imgSource = 0; } } @@ -849,9 +849,9 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof ) { imgSource = new ImageSource( _buffer.buffer()); m = new TQMovie( imgSource, 8192 ); - m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->connectStatus( this, TQT_SLOT( movieStatus(int))); - m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); + m->connectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) )); + m->connectStatus( this, TQ_SLOT( movieStatus(int))); + m->connectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) ); } } @@ -1128,7 +1128,7 @@ Loader::Loader() : TQObject() { m_requestsPending.setAutoDelete( true ); m_requestsLoading.setAutoDelete( true ); - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( servePendingRequests() ) ); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( servePendingRequests() ) ); } void Loader::load(DocLoader* dl, CachedObject *object, bool incremental) @@ -1171,9 +1171,9 @@ void Loader::servePendingRequests() } } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); if ( req->object->schedule() ) TDEIO::Scheduler::scheduleJob( job ); diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h index c60c13a98..e340b3023 100644 --- a/tdehtml/misc/loader.h +++ b/tdehtml/misc/loader.h @@ -255,7 +255,7 @@ namespace tdehtml */ class CachedImage : public TQObject, public CachedObject { - Q_OBJECT + TQ_OBJECT public: CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept); virtual ~CachedImage(); @@ -317,7 +317,7 @@ namespace tdehtml TQPixmap* p; TQPixmap* scaled; TQPixmap* bg; - QRgb bgColor; + TQRgb bgColor; TQSize bgSize; mutable TQPixmap* pixPart; @@ -407,7 +407,7 @@ namespace tdehtml */ class Loader : public TQObject { - Q_OBJECT + TQ_OBJECT public: Loader(); diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp index eb9762897..6f60c90e6 100644 --- a/tdehtml/rendering/render_applet.cpp +++ b/tdehtml/rendering/render_applet.cpp @@ -32,7 +32,7 @@ #include <tqlabel.h> -#ifndef Q_WS_QWS // We don't have Java in Qt Embedded +#ifndef TQ_WS_QWS // We don't have Java in Qt Embedded #include "java/kjavaappletwidget.h" #include "misc/htmltags.h" diff --git a/tdehtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp index 053e51b95..414947e1e 100644 --- a/tdehtml/rendering/render_block.cpp +++ b/tdehtml/rendering/render_block.cpp @@ -695,9 +695,9 @@ void RenderBlock::layoutBlock(bool relayoutChildren) if (scrollsOverflow() && m_layer) { // For overflow:scroll blocks, ensure we have both scrollbars in place always. if (style()->overflowX() == OSCROLL) - m_layer->showScrollbar( Qt::Horizontal, true ); + m_layer->showScrollbar( TQt::Horizontal, true ); if (style()->overflowY() == OSCROLL) - m_layer->showScrollbar( Qt::Vertical, true ); + m_layer->showScrollbar( TQt::Vertical, true ); } setContainsPageBreak(false); diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp index d804094ef..7dc07090d 100644 --- a/tdehtml/rendering/render_box.cpp +++ b/tdehtml/rendering/render_box.cpp @@ -644,8 +644,8 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba void RenderBox::outlineBox(TQPainter *p, int _tx, int _ty, const char *color) { - p->setPen(TQPen(TQColor(color), 1, Qt::DotLine)); - p->setBrush( Qt::NoBrush ); + p->setPen(TQPen(TQColor(color), 1, TQt::DotLine)); + p->setBrush( TQt::NoBrush ); p->drawRect(_tx, _ty, m_width, m_height); } diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index 9d302bfc8..f18ce9ae6 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -99,25 +99,25 @@ void RenderFormElement::layout() setNeedsLayout(false); } -TQ_Alignment RenderFormElement::textAlignment() const +TQt::AlignmentFlags RenderFormElement::textAlignment() const { switch (style()->textAlign()) { case LEFT: case TDEHTML_LEFT: - return Qt::AlignLeft; + return TQt::AlignLeft; case RIGHT: case TDEHTML_RIGHT: - return Qt::AlignRight; + return TQt::AlignRight; case CENTER: case TDEHTML_CENTER: - return Qt::AlignHCenter; + return TQt::AlignHCenter; case JUSTIFY: // Just fall into the auto code for justify. case TAAUTO: - return style()->direction() == RTL ? Qt::AlignRight : Qt::AlignLeft; + return style()->direction() == RTL ? TQt::AlignRight : TQt::AlignLeft; } assert(false); // Should never be reached. - return Qt::AlignLeft; + return TQt::AlignLeft; } // ------------------------------------------------------------------------- @@ -146,7 +146,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element) // prevent firing toggled() signals on initialization b->setChecked(element->checked()); - connect(b,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(slotStateChanged(int))); + connect(b,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(slotStateChanged(int))); } @@ -192,7 +192,7 @@ RenderRadioButton::RenderRadioButton(HTMLInputElementImpl *element) // prevent firing toggled() signals on initialization b->setChecked(element->checked()); - connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); } void RenderRadioButton::updateFromElement() @@ -263,7 +263,7 @@ void RenderSubmitButton::calcMinMaxWidth() raw = TQString::fromLatin1("X"); TQFontMetrics fm = pb->fontMetrics(); TQSize ts = fm.size( ShowPrefix, raw); - TQSize s(pb->style().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts ) + TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts ) .expandedTo(TQApplication::globalStrut())); int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) + pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; @@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi { setMouseTracking(true); TDEActionCollection *ac = new TDEActionCollection(this); - m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac ); + m_spellAction = KStdAction::spelling( this, TQ_SLOT( slotCheckSpelling() ), ac ); } LineEditWidget::~LineEditWidget() @@ -328,11 +328,11 @@ void LineEditWidget::slotCheckSpelling() } delete m_spell; - m_spell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); - connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) ); - connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); - connect( m_spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); + connect( m_spell, TQ_SIGNAL( death() ),this, TQ_SLOT( spellCheckerFinished() ) ); + connect( m_spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); + connect( m_spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); } void LineEditWidget::spellCheckerMisspelling( const TQString &_text, const TQStringList &, unsigned int pos) @@ -362,7 +362,7 @@ void LineEditWidget::spellCheckerFinished() void LineEditWidget::slotSpellCheckReady( KSpell *s ) { s->check( text() ); - connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) ); + connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) ); } void LineEditWidget::slotSpellCheckDone( const TQString &s ) @@ -380,8 +380,8 @@ TQPopupMenu *LineEditWidget::createPopupMenu() return 0L; } - connect( popup, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( extendedMenuActivated( int ) ) ); + connect( popup, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( extendedMenuActivated( int ) ) ); if (m_input->autoComplete()) { popup->insertSeparator(); @@ -414,7 +414,7 @@ void LineEditWidget::extendedMenuActivated( int id) case EditHistory: { KHistoryComboEditor dlg( compObj() ? compObj()->items() : TQStringList(), this ); - connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) ); + connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) ); dlg.exec(); } default: @@ -469,8 +469,8 @@ RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element) : RenderFormElement(element) { LineEditWidget *edit = new LineEditWidget(element, view(), view()->viewport()); - connect(edit,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); - connect(edit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); + connect(edit,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed())); + connect(edit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &))); if(element->inputType() == HTMLInputElementImpl::PASSWORD) edit->setEchoMode( TQLineEdit::Password ); @@ -785,9 +785,9 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element) w->setMode(KFile::File | KFile::ExistingOnly); w->completionObject()->setDir(TDEGlobalSettings::documentPath()); - connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); - connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); - connect(w, TQT_SIGNAL(urlSelected(const TQString &)),this,TQT_SLOT(slotUrlSelected(const TQString &))); + connect(w->lineEdit(), TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed())); + connect(w->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &))); + connect(w, TQ_SIGNAL(urlSelected(const TQString &)),this,TQ_SLOT(slotUrlSelected(const TQString &))); setQWidget(w); m_haveFocus = false; @@ -805,7 +805,7 @@ void RenderFileButton::calcMinMaxWidth() int h = fm.lineSpacing(); int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some" KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit(); - TQSize s = edit->style().tqsizeFromContents(TQStyle::CT_LineEdit, + TQSize s = edit->style().sizeFromContents(TQStyle::CT_LineEdit, edit, TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) .expandedTo(TQApplication::globalStrut()); @@ -890,7 +890,7 @@ bool ComboBoxWidget::event(TQEvent *e) return true; if (e->type()==TQEvent::KeyPress) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); switch(ke->key()) { case Key_Return: @@ -907,9 +907,9 @@ bool ComboBoxWidget::event(TQEvent *e) bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e) { - if (TQT_BASE_OBJECT(dest)==TQT_BASE_OBJECT(listBox()) && e->type()==TQEvent::KeyPress) + if (dest==listBox() && e->type()==TQEvent::KeyPress) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); bool forward = false; switch(ke->key()) { @@ -1226,8 +1226,8 @@ TDEListBox* RenderSelect::createListBox() lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single); // ### looks broken //lb->setAutoMask(true); - connect( lb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) ); -// connect( lb, TQT_SIGNAL( clicked( TQListBoxItem * ) ), this, TQT_SLOT( slotClicked() ) ); + connect( lb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); +// connect( lb, TQ_SIGNAL( clicked( TQListBoxItem * ) ), this, TQ_SLOT( slotClicked() ) ); m_ignoreSelectEvents = false; lb->setMouseTracking(true); @@ -1237,7 +1237,7 @@ TDEListBox* RenderSelect::createListBox() ComboBoxWidget *RenderSelect::createComboBox() { ComboBoxWidget *cb = new ComboBoxWidget(view()->viewport()); - connect(cb, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelected(int))); + connect(cb, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelected(int))); return cb; } @@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent) setMouseTracking(true); TDEActionCollection *ac = new TDEActionCollection(this); - m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac ); - m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac ); - m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac ); + m_findAction = KStdAction::find( this, TQ_SLOT( slotFind() ), ac ); + m_findNextAction = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), ac ); + m_replaceAction = KStdAction::replace( this, TQ_SLOT( slotReplace() ), ac ); } @@ -1387,11 +1387,11 @@ void TextAreaWidget::slotDoReplace() // Connect highlight signal to code which handles highlighting // of found text. - connect(m_replace, TQT_SIGNAL(highlight(const TQString &, int, int)), - this, TQT_SLOT(slotFindHighlight(const TQString &, int, int))); - connect(m_replace, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotReplaceNext())); - connect(m_replace, TQT_SIGNAL(replace(const TQString &, int, int, int)), - this, TQT_SLOT(slotReplaceText(const TQString &, int, int, int))); + connect(m_replace, TQ_SIGNAL(highlight(const TQString &, int, int)), + this, TQ_SLOT(slotFindHighlight(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(slotReplaceText(const TQString &, int, int, int))); m_repDlg->close(); slotReplaceNext(); @@ -1486,9 +1486,9 @@ void TextAreaWidget::slotDoFind() // Connect highlight signal to code which handles highlighting // of found text. - connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)), - this, TQT_SLOT(slotFindHighlight(const TQString &, int, int))); - connect(m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext())); + 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(slotFindNext())); m_findDlg->close(); m_find->closeFindNextDialog(); @@ -1562,7 +1562,7 @@ void TextAreaWidget::slotFind() KWin::activateWindow( m_findDlg->winId() ); } else { m_findDlg = new KFindDialog(false, this, "TDEHTML Text Area Find Dialog"); - connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) ); + connect( m_findDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoFind()) ); } m_findDlg->show(); } @@ -1578,7 +1578,7 @@ void TextAreaWidget::slotReplace() } else { m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0, TQStringList(), TQStringList(), false); - connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) ); + connect( m_repDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoReplace()) ); } m_repDlg->show(); } @@ -1618,7 +1618,7 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element) edit->setCheckSpellingEnabled( settings->autoSpellCheck() ); edit->setTabChangesFocus( ! settings->allowTabulation() ); - connect(edit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged())); + connect(edit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged())); } RenderTextArea::~RenderTextArea() diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h index d6124528d..9c46346a7 100644 --- a/tdehtml/rendering/render_form.h +++ b/tdehtml/rendering/render_form.h @@ -95,7 +95,7 @@ public: protected: virtual bool isRenderButton() const { return false; } virtual bool isEditable() const { return false; } - TQ_Alignment textAlignment() const; + TQt::AlignmentFlags textAlignment() const; TQPoint m_mousePos; int m_state; @@ -106,7 +106,7 @@ protected: // generic class for all buttons class RenderButton : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderButton(DOM::HTMLGenericFormElementImpl* node); @@ -126,7 +126,7 @@ protected: class RenderCheckBox : public RenderButton { - Q_OBJECT + TQ_OBJECT public: RenderCheckBox(DOM::HTMLInputElementImpl* node); @@ -146,7 +146,7 @@ public slots: class RenderRadioButton : public RenderButton { - Q_OBJECT + TQ_OBJECT public: RenderRadioButton(DOM::HTMLInputElementImpl* node); @@ -216,7 +216,7 @@ public: class RenderLineEdit : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderLineEdit(DOM::HTMLInputElementImpl *element); @@ -253,7 +253,7 @@ private: class LineEditWidget : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* view, TQWidget* parent); @@ -307,7 +307,7 @@ protected: class RenderFileButton : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderFileButton(DOM::HTMLInputElementImpl *element); @@ -378,7 +378,7 @@ protected: class RenderSelect : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderSelect(DOM::HTMLSelectElementImpl *element); @@ -417,7 +417,7 @@ protected slots: // ------------------------------------------------------------------------- class TextAreaWidget : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: TextAreaWidget(int wrap, TQWidget* parent); virtual ~TextAreaWidget(); @@ -452,7 +452,7 @@ private: class RenderTextArea : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderTextArea(DOM::HTMLTextAreaElementImpl *element); ~RenderTextArea(); diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp index 68c66495a..1035f97a0 100644 --- a/tdehtml/rendering/render_frames.cpp +++ b/tdehtml/rendering/render_frames.cpp @@ -66,7 +66,7 @@ RenderFrameSet::RenderFrameSet( HTMLFrameSetElementImpl *frameSet) m_resizing = m_clientresizing= false; - m_cursor = Qt::ArrowCursor; + m_cursor = TQt::ArrowCursor; m_hSplit = -1; m_vSplit = -1; @@ -498,13 +498,13 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) } - m_cursor = Qt::ArrowCursor; + m_cursor = TQt::ArrowCursor; if(m_hSplit != -1 && m_vSplit != -1) - m_cursor = Qt::SizeAllCursor; + m_cursor = TQt::SizeAllCursor; else if( m_vSplit != -1 ) - m_cursor = Qt::SizeHorCursor; + m_cursor = TQt::SizeHorCursor; else if( m_hSplit != -1 ) - m_cursor = Qt::SizeVerCursor; + m_cursor = TQt::SizeVerCursor; if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT) { @@ -548,8 +548,8 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) TDEHTMLView *view = canvas()->view(); if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) { TQPainter paint( view ); - paint.setPen( Qt::gray ); - paint.setBrush( Qt::gray ); + paint.setPen( TQt::gray ); + paint.setBrush( TQt::gray ); paint.setRasterOp( TQt::XorROP ); TQRect r(xPos(), yPos(), width(), height()); const int rBord = 3; @@ -634,9 +634,9 @@ void RenderPart::setWidget( TQWidget *widget ) #endif setQWidget( widget ); - widget->setFocusPolicy(TQ_WheelFocus); + widget->setFocusPolicy(TQWidget::WheelFocus); if(widget->inherits("TDEHTMLView")) - connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) ); + connect( widget, TQ_SIGNAL( cleared() ), this, TQ_SLOT( slotViewCleared() ) ); setNeedsLayoutAndMinMaxRecalc(); @@ -674,7 +674,7 @@ RenderFrame::RenderFrame( DOM::HTMLFrameElementImpl *frame ) void RenderFrame::slotViewCleared() { - if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) { + if(m_widget->inherits("TQScrollView")) { #ifdef DEBUG_LAYOUT kdDebug(6031) << "frame is a scrollview!" << endl; #endif @@ -888,7 +888,7 @@ bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, } // Dissociate ourselves from the current event loop (to prevent crashes // due to the message box staying up) - TQTimer::singleShot( 0, this, TQT_SLOT( slotPartLoadingErrorNotify() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPartLoadingErrorNotify() ) ); #if 0 Tokenizer *tokenizer = static_cast<DOM::DocumentImpl *>(part->document().handle())->tokenizer(); if (tokenizer) tokenizer->setOnHold( true ); @@ -989,7 +989,7 @@ void RenderPartObject::layout( ) void RenderPartObject::slotViewCleared() { - if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) { + if(m_widget->inherits("TQScrollView") ) { #ifdef DEBUG_LAYOUT kdDebug(6031) << "iframe is a scrollview!" << endl; #endif diff --git a/tdehtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h index 49d1e8dc1..a6e0640f3 100644 --- a/tdehtml/rendering/render_frames.h +++ b/tdehtml/rendering/render_frames.h @@ -61,7 +61,7 @@ public: bool canResize( int _x, int _y); void setResizing(bool e); - Qt::CursorShape cursorShape() const { return m_cursor; } + TQt::CursorShape cursorShape() const { return m_cursor; } bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside); @@ -73,7 +73,7 @@ public: #endif private: - Qt::CursorShape m_cursor; + TQt::CursorShape m_cursor; int m_oldpos; int m_gridLen[2]; int* m_gridDelta[2]; @@ -93,7 +93,7 @@ private: class RenderPart : public tdehtml::RenderWidget { - Q_OBJECT + TQ_OBJECT public: RenderPart(DOM::HTMLElementImpl* node); @@ -123,7 +123,7 @@ public slots: class RenderFrame : public tdehtml::RenderPart { - Q_OBJECT + TQ_OBJECT public: RenderFrame( DOM::HTMLFrameElementImpl *frame ); @@ -146,7 +146,7 @@ public slots: // I can hardly call the class RenderObject ;-) class RenderPartObject : public tdehtml::RenderPart { - Q_OBJECT + TQ_OBJECT public: RenderPartObject( DOM::HTMLElementImpl * ); diff --git a/tdehtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp index 3f8d6e8f0..cf945145f 100644 --- a/tdehtml/rendering/render_generated.cpp +++ b/tdehtml/rendering/render_generated.cpp @@ -358,7 +358,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty) p->drawEllipse( marker ); return; case LCIRCLE: - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); p->drawEllipse( marker ); return; case LSQUARE: @@ -366,7 +366,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty) p->drawRect( marker ); return; case LBOX: - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); p->drawRect( marker ); return; case LDIAMOND: { diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp index ad8f18bb3..bfe5781ac 100644 --- a/tdehtml/rendering/render_image.cpp +++ b/tdehtml/rendering/render_image.cpp @@ -243,10 +243,10 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) if (bUnfinishedImageFrame && paintInfo.phase == PaintActionForeground && cWidth > 2 && cHeight > 2 && !complete()) { static TQPixmap *loadingIcon; TQColor bg = tdehtml::retrieveBackgroundColor(this); - TQColor fg = tdehtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray : - (hasSufficientContrast(Qt::white, bg) ? Qt::white : Qt::black); + TQColor fg = tdehtml::hasSufficientContrast(TQt::gray, bg) ? TQt::gray : + (hasSufficientContrast(TQt::white, bg) ? TQt::white : TQt::black); paintInfo.p->setPen(TQPen(fg, 1)); - paintInfo.p->setBrush( Qt::NoBrush ); + paintInfo.p->setBrush( TQt::NoBrush ); paintInfo.p->drawRect(_tx, _ty, m_width, m_height); if (!(m_width <= 5 || m_height <= 5)) { if (!loadingIcon) { @@ -289,7 +289,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) } else if (i && !i->isTransparent()) { - paintInfo.p->setPen( Qt::black ); // used for bitmaps + paintInfo.p->setPen( TQt::black ); // used for bitmaps const TQPixmap& pix = i->pixmap(); if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) && pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid()) @@ -371,7 +371,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) paintInfo.p->setBrushOrigin(_tx, _ty - paintInfo.r.y()); paintInfo.p->fillRect(_tx, _ty, width(), height(), TQBrush(style()->palette().active().highlight(), - Qt::Dense4Pattern)); + TQt::Dense4Pattern)); } } } diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp index 15bc1b0df..5439a5310 100644 --- a/tdehtml/rendering/render_inline.cpp +++ b/tdehtml/rendering/render_inline.cpp @@ -678,7 +678,7 @@ static void paintOutlineSegment(RenderObject *o, TQPainter *p, int tx, int ty, } // kdDebug(6040) << "segment(" << x1 << "," << y1 << ") - (" << x2 << "," << y2 << ")" << endl; -/* p->setPen(Qt::gray); +/* p->setPen(TQt::gray); p->drawLine(x1,y1,x2,y2);*/ switch (curBS) { case RenderObject::BSLeft: diff --git a/tdehtml/rendering/render_layer.cpp b/tdehtml/rendering/render_layer.cpp index 2b6bbf027..1da1e0b82 100644 --- a/tdehtml/rendering/render_layer.cpp +++ b/tdehtml/rendering/render_layer.cpp @@ -604,9 +604,9 @@ void RenderLayer::updateScrollPositionFromScrollbars() } void -RenderLayer::showScrollbar(Qt::Orientation o, bool show) +RenderLayer::showScrollbar(TQt::Orientation o, bool show) { - TQScrollBar *sb = (o == Qt::Horizontal) ? m_hBar : m_vBar; + TQScrollBar *sb = (o == TQt::Horizontal) ? m_hBar : m_vBar; if (show && !sb) { TQScrollView* scrollView = m_object->document()->view(); @@ -616,14 +616,14 @@ RenderLayer::showScrollbar(Qt::Orientation o, bool show) sb->show(); if (!m_scrollMediator) m_scrollMediator = new RenderScrollMediator(this); - m_scrollMediator->connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged())); + m_scrollMediator->connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged())); } else if (!show && sb) { delete sb; sb = 0; } - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) m_hBar = sb; else m_vBar = sb; @@ -749,12 +749,12 @@ void RenderLayer::checkScrollbarsAfterLayout() || (hasOvf && m_object->style()->overflowY() == OAUTO && haveVerticalBar != needVerticalBar); if (scrollbarsChanged) { if (m_object->style()->overflowX() == OAUTO) { - showScrollbar(Qt::Horizontal, needHorizontalBar); + showScrollbar(TQt::Horizontal, needHorizontalBar); if (m_hBar) m_hBar->setEnabled(true); } if (m_object->style()->overflowY() == OAUTO) { - showScrollbar(Qt::Vertical, needVerticalBar); + showScrollbar(TQt::Vertical, needVerticalBar); if (m_vBar) m_vBar->setEnabled(true); } @@ -956,8 +956,8 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p, int ax=0; int ay=0; renderer()->absolutePosition( ax, ay ); - p->setPen(TQPen(TQColor("yellow"), 1, Qt::DotLine)); - p->setBrush( Qt::NoBrush ); + p->setPen(TQPen(TQColor("yellow"), 1, TQt::DotLine)); + p->setBrush( TQt::NoBrush ); p->drawRect(ax, ay, width(), height()); } #endif diff --git a/tdehtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h index ae5ddff65..9c73eb0bb 100644 --- a/tdehtml/rendering/render_layer.h +++ b/tdehtml/rendering/render_layer.h @@ -65,7 +65,7 @@ namespace tdehtml { class RenderScrollMediator: public TQObject { - Q_OBJECT + TQ_OBJECT public: RenderScrollMediator(RenderLayer* layer) :m_layer(layer) {} @@ -80,7 +80,7 @@ private: // This class handles the auto-scrolling of layers with overflow: marquee. class Marquee: public TQObject { - Q_OBJECT + TQ_OBJECT public: Marquee(RenderLayer* l); @@ -193,7 +193,7 @@ public: void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true); void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); } void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); } - void showScrollbar(Qt::Orientation, bool); + void showScrollbar(TQt::Orientation, bool); TQScrollBar* horizontalScrollbar() { return m_hBar; } TQScrollBar* verticalScrollbar() { return m_vBar; } int verticalScrollbarWidth(); diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp index cc9ba4e5b..17caa26ae 100644 --- a/tdehtml/rendering/render_list.cpp +++ b/tdehtml/rendering/render_list.cpp @@ -299,7 +299,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) } #ifdef BOX_DEBUG - p->setPen( Qt::red ); + p->setPen( TQt::red ); p->drawRect( _tx + xoff, _ty + yoff, offset, offset ); #endif @@ -312,7 +312,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); return; case LCIRCLE: - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); return; case LSQUARE: @@ -320,7 +320,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); return; case LBOX: - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); return; case LDIAMOND: { @@ -342,25 +342,25 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) if (!m_item.isEmpty()) { if(listPositionInside()) { if( style()->direction() == LTR) { - p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); - p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, + p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item); + p->drawText(_tx + fm.width(m_item), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, TQString::fromLatin1(". ")); } else { const TQString& punct(TQString::fromLatin1(" .")); - p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct); - p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); + p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct); + p->drawText(_tx + fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item); } } else { if (style()->direction() == LTR) { const TQString& punct(TQString::fromLatin1(". ")); - p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct); - p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item); + p->drawText(_tx-offset/2, _ty, 0, 0, TQt::AlignRight|TQt::DontClip, punct); + p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, TQt::AlignRight|TQt::DontClip, m_item); } else { const TQString& punct(TQString::fromLatin1(" .")); - p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct); - p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); + p->drawText(_tx+offset/2, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct); + p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item); } } } diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp index eacbb4d16..b1a9bdffc 100644 --- a/tdehtml/rendering/render_object.cpp +++ b/tdehtml/rendering/render_object.cpp @@ -722,7 +722,7 @@ static void calc3DColor(TQColor &color, bool darken) int g = gb - (f0 * gb / 100); int b = bb - (f0 * bb / 100); if ((r == rb) && (g == gb) && (b == bb)) - color = (color == Qt::black) ? DARK_GRAY : Qt::black; + color = (color == TQt::black) ? DARK_GRAY : TQt::black; else color.setRgb(r, g, b); } else { @@ -730,7 +730,7 @@ static void calc3DColor(TQColor &color, bool darken) int g = kMin(gb + (f1 * (MAX_COLOR - gb) / 100), 255); int b = kMin(bb + (f1 * (MAX_COLOR - bb) / 100), 255); if ((r == rb) && (g == gb) && (b == bb)) - color = (color == Qt::white) ? LIGHT_GRAY : Qt::white; + color = (color == TQt::white) ? LIGHT_GRAY : TQt::white; else color.setRgb(r, g, b); } @@ -749,12 +749,12 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, if(invalidisInvert) { p->setRasterOp(TQt::XorROP); - c = Qt::white; + c = TQt::white; } else { if(style == INSET || style == OUTSET || style == RIDGE || style == GROOVE) - c = Qt::white; + c = TQt::white; else c = textcolor; } @@ -773,7 +773,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, case DOTTED: if ( width == 1 ) { // workaround Qt brokenness - p->setPen(TQPen(c, width, Qt::SolidLine)); + p->setPen(TQPen(c, width, TQt::SolidLine)); switch(s) { case BSBottom: case BSTop: @@ -788,11 +788,11 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, break; } - p->setPen(TQPen(c, width, Qt::DotLine)); + p->setPen(TQPen(c, width, TQt::DotLine)); /* nobreak; */ case DASHED: if(style == DASHED) - p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? Qt::DotLine : Qt::DashLine)); + p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? TQt::DotLine : TQt::DashLine)); if (width > 0) switch(s) { @@ -813,7 +813,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, if (adjbw1 == 0 && adjbw2 == 0) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(c); switch(s) { @@ -921,7 +921,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, (style == INSET && ( s == BSTop || s == BSLeft ) ) ); /* nobreak; */ case SOLID: - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(c); Q_ASSERT(x2>=x1); Q_ASSERT(y2>=y1); diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp index 2d991c3a2..103cad9e8 100644 --- a/tdehtml/rendering/render_replaced.cpp +++ b/tdehtml/rendering/render_replaced.cpp @@ -186,7 +186,7 @@ bool RenderWidget::event( TQEvent *e ) repaint(); } // eat all events - except if this is a frame (in which case TDEHTMLView handles it all) - if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) ) + if ( ::tqt_cast<TDEHTMLView *>( m_widget ) ) return TQObject::event( e ); return true; } @@ -202,21 +202,21 @@ void RenderWidget::setQWidget(TQWidget *widget) { if (m_widget) { m_widget->removeEventFilter(this); - disconnect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); + disconnect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed())); m_widget->hide(); m_widget->deleteLater(); //Might happen due to event on the widget, so be careful m_widget = 0; } m_widget = widget; if (m_widget) { - connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); + connect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed())); m_widget->installEventFilter(this); - if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget)) + if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqt_cast<TQFrame*>(m_widget)) m_widget->setBackgroundMode( TQWidget::NoBackground ); - if (m_widget->focusPolicy() > TQ_StrongFocus) - m_widget->setFocusPolicy(TQ_StrongFocus); + if (m_widget->focusPolicy() > TQWidget::StrongFocus) + m_widget->setFocusPolicy(TQWidget::StrongFocus); // if we've already received a layout, apply the calculated space to the // widget immediately, but we have to have really been full constructed (with a non-null // style pointer). @@ -316,12 +316,12 @@ void RenderWidget::updateFromElement() if (v > 128) // dark bg, light fg - need a darker disabled fg disfg = disfg.dark(lowlightVal); - else if (disfg != Qt::black) + else if (disfg != TQt::black) // light bg, dark fg - need a lighter disabled fg - but only if !black disfg = disfg.light(highlightVal); else // black fg - use darkgray disabled fg - disfg = Qt::darkGray; + disfg = TQt::darkGray; pal.setColor(TQPalette::Disabled,TQColorGroup::Foreground,disfg); } @@ -330,7 +330,7 @@ void RenderWidget::updateFromElement() else m_widget->unsetPalette(); // Border: - TQFrame* frame = ::tqqt_cast<TQFrame*>(m_widget); + TQFrame* frame = ::tqt_cast<TQFrame*>(m_widget); if (frame) { if (shouldPaintBackgroundOrBorder()) { @@ -532,7 +532,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, TQObjectList childWidgets = widget->childrenListObject(); TQObjectListIterator it(childWidgets); for (; it.current(); ++it) { - TQWidget* const w = ::tqqt_cast<TQWidget *>(it.current()); + TQWidget* const w = ::tqt_cast<TQWidget *>(it.current()); if ( w && !w->isTopLevel() && !w->isHidden()) { TQRect r2 = w->geometry(); blit -= r2; @@ -613,7 +613,7 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty) bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) { // no special event processing if this is a frame (in which case TDEHTMLView handles it all) - if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) ) + if ( ::tqt_cast<TDEHTMLView *>( m_widget ) ) return false; if ( !element() ) return true; @@ -642,7 +642,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) // Don't count popup as a valid reason for losing the focus // (example: opening the options of a select combobox shouldn't emit onblur) - if ( TQT_TQFOCUSEVENT(e)->reason() != TQFocusEvent::Popup ) + if ( static_cast<TQFocusEvent*>(e)->reason() != TQFocusEvent::Popup ) handleFocusOut(); break; case TQEvent::FocusIn: @@ -663,7 +663,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) case TQEvent::KeyRelease: // TODO this seems wrong - Qt events are not correctly translated to DOM ones, // like in TDEHTMLView::dispatchKeyEvent() - if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false)) + if (element()->dispatchKeyEvent(static_cast<TQKeyEvent*>(e),false)) filtered = true; break; @@ -673,8 +673,8 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) // currently focused. this avoids accidentally changing a select box // or something while wheeling a webpage. if (tqApp->focusWidget() != widget() && - widget()->focusPolicy() <= TQ_StrongFocus) { - TQT_TQWHEELEVENT(e)->ignore(); + widget()->focusPolicy() <= TQWidget::StrongFocus) { + static_cast<TQWheelEvent*>(e)->ignore(); TQApplication::sendEvent(view(), e); filtered = true; } @@ -697,22 +697,22 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) void RenderWidget::EventPropagator::sendEvent(TQEvent *e) { switch(e->type()) { case TQEvent::MouseButtonPress: - mousePressEvent(TQT_TQMOUSEEVENT(e)); + mousePressEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseButtonRelease: - mouseReleaseEvent(TQT_TQMOUSEEVENT(e)); + mouseReleaseEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); + mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseMove: - mouseMoveEvent(TQT_TQMOUSEEVENT(e)); + mouseMoveEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::KeyPress: - keyPressEvent(TQT_TQKEYEVENT(e)); + keyPressEvent(static_cast<TQKeyEvent*>(e)); break; case TQEvent::KeyRelease: - keyReleaseEvent(TQT_TQKEYEVENT(e)); + keyReleaseEvent(static_cast<TQKeyEvent*>(e)); break; default: break; @@ -722,22 +722,22 @@ void RenderWidget::EventPropagator::sendEvent(TQEvent *e) { void RenderWidget::ScrollViewEventPropagator::sendEvent(TQEvent *e) { switch(e->type()) { case TQEvent::MouseButtonPress: - viewportMousePressEvent(TQT_TQMOUSEEVENT(e)); + viewportMousePressEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseButtonRelease: - viewportMouseReleaseEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseReleaseEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseButtonDblClick: - viewportMouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseDoubleClickEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseMove: - viewportMouseMoveEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseMoveEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::KeyPress: - keyPressEvent(TQT_TQKEYEVENT(e)); + keyPressEvent(static_cast<TQKeyEvent*>(e)); break; case TQEvent::KeyRelease: - keyReleaseEvent(TQT_TQKEYEVENT(e)); + keyReleaseEvent(static_cast<TQKeyEvent*>(e)); break; default: break; @@ -784,13 +784,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) } switch (me.button()) { case 0: - button = Qt::LeftButton; + button = TQt::LeftButton; break; case 1: - button = Qt::MidButton; + button = TQt::MidButton; break; case 2: - button = Qt::RightButton; + button = TQt::RightButton; break; default: break; @@ -809,11 +809,11 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) // << " pos=" << p << " type=" << type // << " button=" << button << " state=" << state << endl; TQMouseEvent e(type, p, button, state); - TQScrollView * sc = ::tqqt_cast<TQScrollView*>(m_widget); - if (sc && !::tqqt_cast<TQListBox*>(m_widget)) - static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(TQT_TQEVENT(&e)); + TQScrollView * sc = ::tqt_cast<TQScrollView*>(m_widget); + if (sc && !::tqt_cast<TQListBox*>(m_widget)) + static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(static_cast<TQEvent*>(&e)); else - static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&e)); + static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&e)); ret = e.isAccepted(); break; } @@ -827,7 +827,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break; TQKeyEvent* const ke = domKeyEv.qKeyEvent(); - static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke)); + static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke)); ret = ke->isAccepted(); break; } @@ -847,16 +847,16 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) // DOM: Down Press | Press | Up // Qt: (nothing) Press | Release(autorepeat) + Press(autorepeat) | Release // - // Qt::KeyPress is sent for DOM keypress and not DOM keydown to allow + // TQt::KeyPress is sent for DOM keypress and not DOM keydown to allow // sites to block a key with onkeypress, #99749 TQKeyEvent* const ke = domKeyEv.qKeyEvent(); if (ke->isAutoRepeat()) { TQKeyEvent releaseEv( TQEvent::KeyRelease, ke->key(), ke->ascii(), ke->state(), ke->text(), ke->isAutoRepeat(), ke->count() ); - static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&releaseEv)); + static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&releaseEv)); } - static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke)); + static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke)); ret = ke->isAccepted(); break; } diff --git a/tdehtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h index 3d8a68f9c..7a5ec5353 100644 --- a/tdehtml/rendering/render_replaced.h +++ b/tdehtml/rendering/render_replaced.h @@ -83,7 +83,7 @@ protected: class RenderWidget : public TQObject, public RenderReplaced, public tdehtml::Shared<RenderWidget> { - Q_OBJECT + TQ_OBJECT public: RenderWidget(DOM::NodeImpl* node); virtual ~RenderWidget(); diff --git a/tdehtml/rendering/render_style.h b/tdehtml/rendering/render_style.h index 28b6b999d..90aef33df 100644 --- a/tdehtml/rendering/render_style.h +++ b/tdehtml/rendering/render_style.h @@ -1450,7 +1450,7 @@ public: static short initialBorderHorizontalSpacing() { return 0; } static short initialBorderVerticalSpacing() { return 0; } static ECursor initialCursor() { return CURSOR_AUTO; } - static TQColor initialColor() { return Qt::black; } + static TQColor initialColor() { return TQt::black; } static CachedImage* initialBackgroundImage() { return 0; } static CachedImage* initialListStyleImage() { return 0; } static unsigned short initialBorderWidth() { return 3; } diff --git a/tdehtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp index ab0573048..bd4002a37 100644 --- a/tdehtml/rendering/render_table.cpp +++ b/tdehtml/rendering/render_table.cpp @@ -2699,8 +2699,8 @@ int RenderTableCell::borderBottom() const static void outlineBox(TQPainter *p, int _tx, int _ty, int w, int h) { - p->setPen(TQPen(TQColor("yellow"), 3, Qt::DotLine)); - p->setBrush( Qt::NoBrush ); + p->setPen(TQPen(TQColor("yellow"), 3, TQt::DotLine)); + p->setBrush( TQt::NoBrush ); p->drawRect(_tx, _ty, w, h ); } #endif diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp index 3a349844b..c2bf27af5 100644 --- a/tdehtml/rendering/render_text.cpp +++ b/tdehtml/rendering/render_text.cpp @@ -334,7 +334,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, m_reversed ? TQPainter::RTL : TQPainter::LTR); p.end(); - TQImage img = TQT_TQIMAGE_OBJECT(pixmap.convertToImage()).convertDepth(32); + TQImage img = pixmap.convertToImage().convertDepth(32); int md = thickness*thickness; // max-dist^2 @@ -398,7 +398,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, } } - pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::PreferDither); + pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::PreferDither); } // Paint next shadow effect if (shadow->next) paintShadow(pt, f, _tx, _ty, shadow->next); diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index e90f5db4f..6e2b6fa17 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -111,12 +111,12 @@ void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) if ( !m_connectedToClipboard && m_editableFormWidget ) { - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( updateEditActions() ) ); - if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) - connect( m_editableFormWidget, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + if ( m_editableFormWidget->inherits( "TQLineEdit" ) || m_editableFormWidget->inherits( "TQTextEdit" ) ) + connect( m_editableFormWidget, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( updateEditActions() ) ); m_connectedToClipboard = true; } @@ -134,14 +134,14 @@ void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) if ( m_connectedToClipboard ) { - disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( updateEditActions() ) ); if ( oldWidget ) { - if ( oldWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || oldWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) - disconnect( oldWidget, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + if ( oldWidget->inherits( "TQLineEdit" ) || oldWidget->inherits( "TQTextEdit" ) ) + disconnect( oldWidget, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( updateEditActions() ) ); } m_connectedToClipboard = false; @@ -153,14 +153,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p { if ( m_extensionProxy ) { - disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) ) { - disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ), - this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); - disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ), - this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ), + this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ), + this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) ); } } @@ -168,14 +168,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p if ( m_extensionProxy ) { - connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); + connect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) ) { - connect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ), - this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); - connect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ), - this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) ); + connect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ), + this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) ); + connect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ), + this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) ); } enableAction( "cut", m_extensionProxy->isActionEnabled( "cut" ) ); @@ -200,9 +200,9 @@ void TDEHTMLPartBrowserExtension::cut() if ( !m_editableFormWidget ) return; - if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) + if ( m_editableFormWidget->inherits( "TQLineEdit" ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->cut(); - else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) + else if ( m_editableFormWidget->inherits( "TQTextEdit" ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut(); } @@ -223,7 +223,7 @@ void TDEHTMLPartBrowserExtension::copy() TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) ); #ifndef TQT_NO_MIMECLIPBOARD TQString htmltext; /* @@ -249,13 +249,13 @@ void TDEHTMLPartBrowserExtension::copy() cb->setText(text); #endif - connect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) ); } else { - if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) + if ( m_editableFormWidget->inherits( "TQLineEdit" ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->copy(); - else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) + else if ( m_editableFormWidget->inherits( "TQTextEdit" ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->copy(); } } @@ -263,7 +263,7 @@ void TDEHTMLPartBrowserExtension::copy() void TDEHTMLPartBrowserExtension::searchProvider() { // action name is of form "previewProvider[<searchproviderprefix>:]" - const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 ); + const TQString searchProviderPrefix = TQString( sender()->name() ).mid( 14 ); KURIFilterData data; TQStringList list; @@ -303,9 +303,9 @@ void TDEHTMLPartBrowserExtension::paste() if ( !m_editableFormWidget ) return; - if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) + if ( m_editableFormWidget->inherits( "TQLineEdit" ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->paste(); - else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) + else if ( m_editableFormWidget->inherits( "TQTextEdit" ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste(); } @@ -343,9 +343,9 @@ void TDEHTMLPartBrowserExtension::updateEditActions() bool hasSelection = false; if( m_editableFormWidget) { - if ( ::tqqt_cast<TQLineEdit*>(m_editableFormWidget)) + if ( ::tqt_cast<TQLineEdit*>(m_editableFormWidget)) hasSelection = static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->hasSelectedText(); - else if(::tqqt_cast<TQTextEdit*>(m_editableFormWidget)) + else if(::tqt_cast<TQTextEdit*>(m_editableFormWidget)) hasSelection = static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->hasSelectedText(); } @@ -429,7 +429,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri if (hasSelection) { - TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" ); + TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQ_SLOT( copy() ), actionCollection(), "copy" ); copyAction->setText(i18n("&Copy Text")); copyAction->setEnabled(d->m_tdehtml->browserExtension()->isActionEnabled( "copy" )); actionCollection()->insert( tdehtml->actionCollection()->action( "selectAll" ) ); @@ -477,7 +477,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri // using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x new TDEAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(), - TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" ); + TQ_SLOT( searchProvider() ), actionCollection(), "searchProvider" ); // favorite search providers TQStringList favoriteEngines; @@ -507,7 +507,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri name = service->name(); providerList->insert( new TDEAction( name, icon, 0, d->m_tdehtml->browserExtension(), - TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) ); + TQ_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) ); } } } @@ -515,13 +515,13 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri if ( selectedText.contains("://") && KURL(selectedText).isValid() ) new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window-new", 0, - d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" ); + d->m_tdehtml->browserExtension(), TQ_SLOT( openSelection() ), actionCollection(), "openSelection" ); } else if ( url.isEmpty() && !isImage ) { actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) ); actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) ); - new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ), + new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopanimations" ); } @@ -529,14 +529,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { if (url.protocol() == "mailto") { - new TDEAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ), + new TDEAction( i18n( "Copy Email Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ), actionCollection(), "copylinklocation" ); } else { - new TDEAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ), + new TDEAction( i18n( "&Save Link As..." ), 0, this, TQ_SLOT( slotSaveLinkAs() ), actionCollection(), "savelinkas" ); - new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ), + new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ), actionCollection(), "copylinklocation" ); } } @@ -546,28 +546,28 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { if ( tdehtml->parentPart() ) { - new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotFrameInWindow() ), + new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotFrameInWindow() ), actionCollection(), "frameinwindow" ); - new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ), + new TDEAction( i18n( "Open in &This Window" ), 0, this, TQ_SLOT( slotFrameInTop() ), actionCollection(), "frameintop" ); - new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ), + new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotFrameInTab() ), actionCollection(), "frameintab" ); - new TDEAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ), + new TDEAction( i18n( "Reload Frame" ), 0, this, TQ_SLOT( slotReloadFrame() ), actionCollection(), "reloadframe" ); if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) { if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame ) - new TDEAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" ); + new TDEAction( i18n( "Block IFrame..." ), 0, this, TQ_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" ); } - new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ), + new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQ_SLOT( slotViewDocumentSource() ), actionCollection(), "viewFrameSource" ); - new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" ); + new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" ); // This one isn't in tdehtml_popupmenu.rc anymore, because Print isn't either, // and because print frame is already in the toolbar and the menu. // But leave this here, so that it's easy to read it. - new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" ); - new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); + new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQ_SLOT( print() ), actionCollection(), "printFrame" ); + new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) ); actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) ); @@ -578,7 +578,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri } else if (isImage || !url.isEmpty()) { actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) ); actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) ); - new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ), + new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopanimations" ); } @@ -597,35 +597,35 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri } else d->m_imageURL = KURL( static_cast<DOM::HTMLInputElement>( e ).src().string() ); - new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ), + new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveImageAs() ), actionCollection(), "saveimageas" ); - new TDEAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ), + new TDEAction( i18n( "Send Image..." ), 0, this, TQ_SLOT( slotSendImage() ), actionCollection(), "sendimage" ); #ifndef TQT_NO_MIMECLIPBOARD - (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ), + (new TDEAction( i18n( "Copy Image" ), 0, this, TQ_SLOT( slotCopyImage() ), actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull()); #endif if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef TQT_NO_MIMECLIPBOARD - new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ), + new TDEAction( i18n( "Copy Image Location" ), 0, this, TQ_SLOT( slotCopyImageLocation() ), actionCollection(), "copyimagelocation" ); } TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25); - new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ), + new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQ_SLOT( slotViewImage() ), actionCollection(), "viewimage" ); if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) { - new TDEAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ), + new TDEAction( i18n( "Block Image..." ), 0, this, TQ_SLOT( slotBlockImage() ), actionCollection(), "blockimage" ); if (!d->m_imageURL.host().isEmpty() && !d->m_imageURL.protocol().isEmpty()) { - new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ), + new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQ_SLOT( slotBlockHost() ), actionCollection(), "blockhost" ); } } @@ -995,7 +995,7 @@ void TDEHTMLZoomFactorAction::init(TDEHTMLPart *part, bool direction) m_popup->insertItem( i18n( "%1%" ).arg( fastZoomSizes[ofs + i] ) ); } - connect( m_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( m_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction() diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h index 7cea57956..ebdc886f9 100644 --- a/tdehtml/tdehtml_ext.h +++ b/tdehtml/tdehtml_ext.h @@ -40,7 +40,7 @@ */ class TDEHTMLPartBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT friend class TDEHTMLPart; friend class TDEHTMLView; public: @@ -114,7 +114,7 @@ private: */ class TDEHTMLPopupGUIClient : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url ); virtual ~TDEHTMLPopupGUIClient(); @@ -151,7 +151,7 @@ private: class TDEHTMLZoomFactorAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: //BCI: remove in KDE 4 TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ); diff --git a/tdehtml/tdehtml_factory.h b/tdehtml/tdehtml_factory.h index 3ad2aff8c..5d424282c 100644 --- a/tdehtml/tdehtml_factory.h +++ b/tdehtml/tdehtml_factory.h @@ -38,7 +38,7 @@ namespace DOM class KDE_EXPORT TDEHTMLFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT friend class DOM::DocumentImpl; friend class TDEHTMLViewPrivate; public: diff --git a/tdehtml/tdehtml_iface.cpp b/tdehtml/tdehtml_iface.cpp index 4bb4afd89..197a1020e 100644 --- a/tdehtml/tdehtml_iface.cpp +++ b/tdehtml/tdehtml_iface.cpp @@ -150,7 +150,7 @@ void TDEHTMLPartIface::activateNode() { KParts::ReadOnlyPart* p = part->currentFrame(); if ( p && p->widget() ) { - TQKeyEvent ev( TQKeyEvent::KeyPress, Qt::Key_Return, '\n', 0, "\n" ); + TQKeyEvent ev( TQKeyEvent::KeyPress, TQt::Key_Return, '\n', 0, "\n" ); TQApplication::sendEvent( p->widget(), &ev ); } } diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp index 319dd8162..df08f97d6 100644 --- a/tdehtml/tdehtml_pagecache.cpp +++ b/tdehtml/tdehtml_pagecache.cpp @@ -108,7 +108,7 @@ TDEHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot) int fd = dup(m_file->handle()); lseek(fd, 0, SEEK_SET); TDEHTMLPageCacheDelivery *delivery = new TDEHTMLPageCacheDelivery(fd); - recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot); + recvObj->connect(delivery, TQ_SIGNAL(emitData(const TQByteArray&)), recvSlot); delivery->recvObj = recvObj; return delivery; } @@ -210,7 +210,7 @@ TDEHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) if (!d->deliveryActive) { d->deliveryActive = true; - TQTimer::singleShot(20, this, TQT_SLOT(sendData())); + TQTimer::singleShot(20, this, TQ_SLOT(sendData())); } } @@ -265,7 +265,7 @@ TDEHTMLPageCache::sendData() byteArray.resetRawData(buf, n); d->delivery.append( delivery ); } - TQTimer::singleShot(0, this, TQT_SLOT(sendData())); + TQTimer::singleShot(0, this, TQ_SLOT(sendData())); } void diff --git a/tdehtml/tdehtml_pagecache.h b/tdehtml/tdehtml_pagecache.h index f648bd548..e16164771 100644 --- a/tdehtml/tdehtml_pagecache.h +++ b/tdehtml/tdehtml_pagecache.h @@ -40,7 +40,7 @@ class TDEHTMLPageCachePrivate; */ class TDEHTMLPageCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * static "constructor". @@ -116,7 +116,7 @@ private: class TDEHTMLPageCacheDelivery : public TQObject { friend class TDEHTMLPageCache; -Q_OBJECT +TQ_OBJECT public: TDEHTMLPageCacheDelivery(int _fd) : fd(_fd) { } diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index b822212ac..81c228e90 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -177,7 +177,7 @@ void tdehtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & script += ")"; kdDebug(6050) << "tdehtml::ChildFrame::liveConnectEvent " << script << endl; - TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(m_part->parent()); + TDEHTMLPart * part = ::tqt_cast<TDEHTMLPart *>(m_part->parent()); if (!part) return; if (!m_jscript) @@ -251,24 +251,24 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) d->m_bMousePressed = false; d->m_bRightMousePressed = false; d->m_bCleared = false; - d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" ); - d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" ); - d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" ); - d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" ); - d->m_paSaveDocument = KStdAction::saveAs( this, TQT_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" ); + d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQ_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" ); + d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQ_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" ); + d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" ); + d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQ_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" ); + d->m_paSaveDocument = KStdAction::saveAs( this, TQ_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" ); if ( parentPart() ) d->m_paSaveDocument->setShortcut( TDEShortcut() ); // avoid clashes - d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); - d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" ); + d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); + d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQ_SLOT( slotSecurity() ), actionCollection(), "security" ); d->m_paSecurity->setWhatsThis( i18n( "Security Settings<p>" "Shows the certificate of the displayed page. Only " "pages that have been transmitted using a secure, encrypted connection have a " "certificate.<p> " "Hint: If the image shows a closed lock, the page has been transmitted over a " "secure connection.") ); - d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" ); - d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" ); - d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" ); + d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQ_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" ); + d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQ_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" ); + d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" ); d->m_paSetEncoding = new TDEActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" ); d->m_paSetEncoding->setDelayed( false ); @@ -291,14 +291,14 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) //d->m_automaticDetection->insertItem( i18n( "Unicode" ), 13 ); d->m_automaticDetection->insertItem( i18n( "Western European" ), 14 ); - connect( d->m_automaticDetection, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotAutomaticDetectionLanguage( int ) ) ); + connect( d->m_automaticDetection, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAutomaticDetectionLanguage( int ) ) ); d->m_paSetEncoding->popupMenu()->insertItem( i18n( "Automatic Detection" ), d->m_automaticDetection, 0 ); d->m_paSetEncoding->insert( new TDEActionSeparator( actionCollection() ) ); - d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" ); + d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQ_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" ); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); d->m_manualDetection->setItems( encodings ); d->m_manualDetection->setCurrentItem( -1 ); @@ -353,40 +353,40 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) } - d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" ); + d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQ_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" ); if ( prof == BrowserViewGUI ) { d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n( "Enlarge Font" ), "zoom-in", "CTRL++;CTRL+=", this, - TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" ); + TQ_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" ); d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font<p>" "Make the font in this window bigger. " "Click and hold down the mouse button for a menu with all available font sizes." ) ); d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n( "Shrink Font" ), "zoom-out", CTRL + Key_Minus, this, - TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" ); + TQ_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" ); d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font<p>" "Make the font in this window smaller. " "Click and hold down the mouse button for a menu with all available font sizes." ) ); } - d->m_paFind = KStdAction::find( this, TQT_SLOT( slotFind() ), actionCollection(), "find" ); + d->m_paFind = KStdAction::find( this, TQ_SLOT( slotFind() ), actionCollection(), "find" ); d->m_paFind->setWhatsThis( i18n( "Find text<p>" "Shows a dialog that allows you to find text on the displayed page." ) ); - d->m_paFindNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "findNext" ); + d->m_paFindNext = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection(), "findNext" ); d->m_paFindNext->setWhatsThis( i18n( "Find next<p>" "Find the next occurrence of the text that you " "have found using the <b>Find Text</b> function" ) ); - d->m_paFindPrev = KStdAction::findPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" ); + d->m_paFindPrev = KStdAction::findPrev( this, TQ_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" ); d->m_paFindPrev->setWhatsThis( i18n( "Find previous<p>" "Find the previous occurrence of the text that you " "have found using the <b>Find Text</b> function" ) ); - d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()), + d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQ_SLOT( slotFindAheadText()), actionCollection(), "findAheadText"); - d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()), + d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQ_SLOT( slotFindAheadLink()), actionCollection(), "findAheadLink"); d->m_paFindAheadText->setEnabled( false ); d->m_paFindAheadLinks->setEnabled( false ); @@ -400,17 +400,17 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) d->m_paFindAheadLinks->setShortcut( TDEShortcut()); } - d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" ); + d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQ_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" ); d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>" "Some pages have several frames. To print only a single frame, click " "on it and then use this function." ) ); - d->m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectAll" ); + d->m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectAll" ); if ( parentPart() ) d->m_paSelectAll->setShortcut( TDEShortcut() ); // avoid clashes d->m_paToggleCaretMode = new TDEToggleAction(i18n("Toggle Caret Mode"), - Key_F7, this, TQT_SLOT(slotToggleCaretMode()), + Key_F7, this, TQ_SLOT(slotToggleCaretMode()), actionCollection(), "caretMode"); d->m_paToggleCaretMode->setChecked(isCaretMode()); if (parentPart()) @@ -427,30 +427,30 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) // Set the meta-refresh flag... d->m_metaRefreshEnabled = d->m_settings->isAutoDelayedActionsEnabled (); - connect( view, TQT_SIGNAL( zoomView( int ) ), TQT_SLOT( slotZoomView( int ) ) ); + connect( view, TQ_SIGNAL( zoomView( int ) ), TQ_SLOT( slotZoomView( int ) ) ); - connect( this, TQT_SIGNAL( completed() ), - this, TQT_SLOT( updateActions() ) ); - connect( this, TQT_SIGNAL( completed( bool ) ), - this, TQT_SLOT( updateActions() ) ); - connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ), - this, TQT_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( completed() ), + this, TQ_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( completed( bool ) ), + this, TQ_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( started( TDEIO::Job * ) ), + this, TQ_SLOT( updateActions() ) ); d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", TDEHTMLFactory::instance() ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), - this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), + this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) ); + connect ( &d->m_progressUpdateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressUpdate() ) ); findTextBegin(); //reset find variables - connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRedirect() ) ); + connect( &d->m_redirectionTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRedirect() ) ); d->m_dcopobject = new TDEHTMLPartIface(this); @@ -495,12 +495,12 @@ TDEHTMLPart::~TDEHTMLPart() if (!d->m_bComplete) closeURL(); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), - this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), + this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); clear(); @@ -551,10 +551,10 @@ bool TDEHTMLPart::restoreURL( const KURL &url ) m_url = url; d->m_restoreScrollPosition = true; - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); - connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); + connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); - TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &))); + TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQ_SLOT(slotRestoreData(const TQByteArray &))); emit started( 0L ); @@ -672,8 +672,8 @@ bool TDEHTMLPart::openURL( const KURL &url ) closeURL(); d->m_restoreScrollPosition = d->m_restored; - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); - connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); + connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); // initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first // data arrives) (Simon) @@ -719,14 +719,14 @@ bool TDEHTMLPart::openURL( const KURL &url ) d->m_job->setWindow(widget()->topLevelWidget()); d->m_job->addMetaData(args.metaData()); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); - connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( d->m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect ( d->m_job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( d->m_job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); d->m_bComplete = false; d->m_bLoadEventEmitted = false; @@ -742,14 +742,14 @@ bool TDEHTMLPart::openURL( const KURL &url ) d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host()); - connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( d->m_job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + this, TQ_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) ); + connect( d->m_job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + this, TQ_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) ); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotJobDone( TDEIO::Job* ) ) ); d->m_jobspeed = 0; @@ -758,8 +758,8 @@ bool TDEHTMLPart::openURL( const KURL &url ) if ( args.reload && !settings()->userStyleSheet().isEmpty() ) { KURL url( settings()->userStyleSheet() ); TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) ); } emit started( 0L ); @@ -790,7 +790,7 @@ bool TDEHTMLPart::closeURL() d->m_bLoadEventEmitted = true; // don't want that one either d->m_cachePolicy = KProtocolManager::cacheControl(); // reset cache policy - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); TDEHTMLPageCache::self()->cancelFetch(this); if ( d->m_doc && d->m_doc->parsing() ) @@ -1079,8 +1079,8 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() { d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false); TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors.")); d->m_statusBarJSErrorLabel->setPixmap(SmallIcon("bug", instance())); - connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchJSErrorDialog())); - connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(jsErrorDialogContextMenu())); + connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchJSErrorDialog())); + connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(jsErrorDialogContextMenu())); } if (!d->m_jsedlg) { d->m_jsedlg = new KJSErrorDlg; @@ -1119,8 +1119,8 @@ void TDEHTMLPart::disableJSErrorExtension() { void TDEHTMLPart::jsErrorDialogContextMenu() { TDEPopupMenu *m = new TDEPopupMenu(0L); - m->insertItem(i18n("&Hide Errors"), this, TQT_SLOT(removeJSErrorExtension())); - m->insertItem(i18n("&Disable Error Reporting"), this, TQT_SLOT(disableJSErrorExtension())); + m->insertItem(i18n("&Hide Errors"), this, TQ_SLOT(removeJSErrorExtension())); + m->insertItem(i18n("&Disable Error Reporting"), this, TQ_SLOT(disableJSErrorExtension())); m->popup(TQCursor::pos()); } @@ -1251,7 +1251,7 @@ bool TDEHTMLPart::javaEnabled() const { if (onlyLocalReferences()) return false; -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS if( d->m_bJavaOverride ) return d->m_bJavaForce; return d->m_bJavaEnabled; @@ -1347,7 +1347,7 @@ void TDEHTMLPart::setAutoloadImages( bool enable ) d->m_paLoadImages = 0; } else if ( !d->m_paLoadImages ) - d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" ); + d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQ_SLOT( slotLoadImages() ), actionCollection(), "loadImages" ); if ( d->m_paLoadImages ) { TQPtrList<TDEAction> lst; @@ -1429,8 +1429,8 @@ void TDEHTMLPart::clear() // We don't want to change between parts if we are going to delete all of them anyway if (partManager()) { - disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + disconnect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); } if (d->m_frames.count()) @@ -1464,8 +1464,8 @@ void TDEHTMLPart::clear() // Listen to part changes again if (partManager()) { - connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + connect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); } d->m_delayRedirect = 0; @@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear() d->m_startOffset = 0; d->m_endOffset = 0; #ifndef TQT_NO_CLIPBOARD - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection())); #endif d->m_jobPercent = 0; @@ -1531,7 +1531,7 @@ void TDEHTMLPart::setPageSecurity( PageSecurity sec ) d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarIconLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false ); - connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) ); + connect( d->m_statusBarIconLabel, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( slotSecurity() ) ); } else if (d->m_statusBarIconLabel) { TQToolTip::remove(d->m_statusBarIconLabel); } @@ -1844,7 +1844,7 @@ void TDEHTMLPart::slotFinished( TDEIO::Job * job ) return; } - TDEIO::TransferJob *tjob = ::tqqt_cast<TDEIO::TransferJob*>(job); + TDEIO::TransferJob *tjob = ::tqt_cast<TDEIO::TransferJob*>(job); if (tjob && tjob->isErrorPage()) { tdehtml::RenderPart *renderPart = d->m_frame ? static_cast<tdehtml::RenderPart *>(d->m_frame->m_frame) : 0; if (renderPart) { @@ -1953,7 +1953,7 @@ void TDEHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) d->m_doc->setRestoreState(args.docState); d->m_doc->open(); - connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); emit d->m_extension->enableAction( "print", true ); @@ -2071,8 +2071,8 @@ void TDEHTMLPart::resetFromScript() closeURL(); d->m_bComplete = false; d->m_bLoadEventEmitted = false; - disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); - connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); + connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); d->m_doc->setParsing(true); emit started( 0L ); @@ -2082,7 +2082,7 @@ void TDEHTMLPart::slotFinishedParsing() { d->m_doc->setParsing(false); checkEmitLoadEvent(); - disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); if (!d->m_view) return; // We are probably being destructed. @@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText() // The lineedit of the dialog would make tdehtml lose its selection, otherwise #ifndef TQT_NO_CLIPBOARD - disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) ); + disconnect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) ); #endif // Now show the dialog in which the user can choose options. @@ -3026,8 +3026,8 @@ void TDEHTMLPart::findText() d->m_lastFindState.last_dir = -1; d->m_findDialog->show(); - connect( d->m_findDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) ); - connect( d->m_findDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) ); + connect( d->m_findDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFindNext()) ); + connect( d->m_findDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFindDialogDestroyed()) ); findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog ); } @@ -3039,17 +3039,17 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent, return; #ifndef TQT_NO_CLIPBOARD - connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) ); + connect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) ); #endif // Create the KFind object delete d->m_find; d->m_find = new KFind( str, options, parent, findDialog ); d->m_find->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up - connect( d->m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); - //connect(d->m_find, TQT_SIGNAL( findNext() ), - // this, TQT_SLOT( slotFindNext() ) ); + connect( d->m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); + //connect(d->m_find, TQ_SIGNAL( findNext() ), + // this, TQ_SLOT( slotFindNext() ) ); if ( !findDialog ) { @@ -3933,7 +3933,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, return true; } - if ( button == Qt::LeftButton && ( state & ShiftButton ) ) + if ( button == TQt::LeftButton && ( state & ShiftButton ) ) { TDEIO::MetaData metaData; metaData["referrer"] = d->m_referrer; @@ -3972,7 +3972,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, args.metaData()["referrer"] = d->m_referrer; - if ( button == Qt::NoButton && (state & ShiftButton) && (state & ControlButton) ) + if ( button == TQt::NoButton && (state & ShiftButton) && (state & ControlButton) ) { emit d->m_extension->createNewWindow( cURL, args ); return true; @@ -4489,12 +4489,12 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL & //CRITICAL STUFF if ( child->m_part ) { - if (!::tqqt_cast<TDEHTMLPart*>(child->m_part) && child->m_jscript) + if (!::tqt_cast<TDEHTMLPart*>(child->m_part) && child->m_jscript) child->m_jscript->clear(); partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part ); delete (KParts::ReadOnlyPart *)child->m_part; if (child->m_liveconnect) { - disconnect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); + disconnect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); child->m_liveconnect = 0L; } } @@ -4510,70 +4510,70 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL & child->m_part = part; - if (::tqqt_cast<TDEHTMLPart*>(part)) { + if (::tqt_cast<TDEHTMLPart*>(part)) { static_cast<TDEHTMLPart*>(part)->d->m_frame = child; } else if (child->m_frame) { child->m_liveconnect = KParts::LiveConnectExtension::childObject(part); if (child->m_liveconnect) - connect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); + connect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); } KParts::StatusBarExtension *sb = KParts::StatusBarExtension::childObject(part); if (sb) sb->setStatusBar( d->m_statusBarExtension->statusBar() ); - connect( part, TQT_SIGNAL( started( TDEIO::Job *) ), - this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) ); - connect( part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotChildCompleted() ) ); - connect( part, TQT_SIGNAL( completed(bool) ), - this, TQT_SLOT( slotChildCompleted(bool) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SIGNAL( setStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( started( TDEIO::Job *) ), + this, TQ_SLOT( slotChildStarted( TDEIO::Job *) ) ); + connect( part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotChildCompleted() ) ); + connect( part, TQ_SIGNAL( completed(bool) ), + this, TQ_SLOT( slotChildCompleted(bool) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SIGNAL( setStatusBarText( const TQString & ) ) ); if ( part->inherits( "TDEHTMLPart" ) ) { - connect( this, TQT_SIGNAL( completed() ), - part, TQT_SLOT( slotParentCompleted() ) ); - connect( this, TQT_SIGNAL( completed(bool) ), - part, TQT_SLOT( slotParentCompleted() ) ); + connect( this, TQ_SIGNAL( completed() ), + part, TQ_SLOT( slotParentCompleted() ) ); + connect( this, TQ_SIGNAL( completed(bool) ), + part, TQ_SLOT( slotParentCompleted() ) ); // As soon as the child's document is created, we need to set its domain // (but we do so only once, so it can't be simply done in the child) - connect( part, TQT_SIGNAL( docCreated() ), - this, TQT_SLOT( slotChildDocCreated() ) ); + connect( part, TQ_SIGNAL( docCreated() ), + this, TQ_SLOT( slotChildDocCreated() ) ); } child->m_extension = KParts::BrowserExtension::childObject( part ); if ( child->m_extension ) { - connect( child->m_extension, TQT_SIGNAL( openURLNotify() ), - d->m_extension, TQT_SIGNAL( openURLNotify() ) ); - - connect( child->m_extension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - - connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); - - connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); - - connect( child->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ), - d->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) ); - - connect( child->m_extension, TQT_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ), - this, TQT_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) ); + connect( child->m_extension, TQ_SIGNAL( openURLNotify() ), + d->m_extension, TQ_SIGNAL( openURLNotify() ) ); + + connect( child->m_extension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + + connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); + + connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + + connect( child->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ), + d->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) ); + + connect( child->m_extension, TQ_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ), + this, TQ_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) ); child->m_extension->setBrowserInterface( d->m_extension->browserInterface() ); } @@ -4684,7 +4684,7 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha if ( factory->inherits( "KParts::Factory" ) ) res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); else - res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className )); + res = static_cast<KParts::ReadOnlyPart *>(factory->create( parentWidget, widgetName, className )); if ( res ) { serviceTypes = service->serviceTypes(); @@ -4706,10 +4706,10 @@ KParts::PartManager *TDEHTMLPart::partManager() { d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "tdehtml part manager" ); d->m_manager->setAllowNestedParts( true ); - connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); - connect( d->m_manager, TQT_SIGNAL( partRemoved( KParts::Part * ) ), - this, TQT_SLOT( slotPartRemoved( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( partRemoved( KParts::Part * ) ), + this, TQ_SLOT( slotPartRemoved( KParts::Part * ) ) ); } return d->m_manager; @@ -4717,7 +4717,7 @@ KParts::PartManager *TDEHTMLPart::partManager() void TDEHTMLPart::submitFormAgain() { - disconnect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain())); + disconnect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain())); if( d->m_doc && !d->m_doc->parsing() && d->m_submitForm) TDEHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary ); @@ -4924,7 +4924,7 @@ void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQB d->m_submitForm->target = _target; d->m_submitForm->submitContentType = contentType; d->m_submitForm->submitBoundary = boundary; - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain())); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain())); } else { @@ -5033,7 +5033,7 @@ void TDEHTMLPart::slotParentCompleted() void TDEHTMLPart::slotChildStarted( TDEIO::Job *job ) { - tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); + tdehtml::ChildFrame *child = frame( sender() ); assert( child ); @@ -5060,7 +5060,7 @@ void TDEHTMLPart::slotChildCompleted() void TDEHTMLPart::slotChildCompleted( bool pendingAction ) { - tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); + tdehtml::ChildFrame *child = frame( sender() ); if ( child ) { kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl; @@ -5088,12 +5088,12 @@ void TDEHTMLPart::slotChildDocCreated() } } // So it only happens once - disconnect( htmlFrame, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( slotChildDocCreated() ) ); + disconnect( htmlFrame, TQ_SIGNAL( docCreated() ), this, TQ_SLOT( slotChildDocCreated() ) ); } void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) { - tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() ); + tdehtml::ChildFrame *child = frame( sender()->parent() ); TDEHTMLPart *callingHtmlPart = const_cast<TDEHTMLPart *>(dynamic_cast<const TDEHTMLPart *>(sender()->parent())); // TODO: handle child target correctly! currently the script are always executed fur the parent @@ -5302,7 +5302,7 @@ bool TDEHTMLPart::frameExists( const TQString &frameName ) KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) { - TDEHTMLPart* const kp = ::tqqt_cast<TDEHTMLPart*>(framePart); + TDEHTMLPart* const kp = ::tqt_cast<TDEHTMLPart*>(framePart); if (kp) return kp->jScript(); @@ -5320,7 +5320,7 @@ KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) TDEHTMLPart *TDEHTMLPart::parentPart() { - return ::tqqt_cast<TDEHTMLPart *>( parent() ); + return ::tqt_cast<TDEHTMLPart *>( parent() ); } tdehtml::ChildFrame *TDEHTMLPart::recursiveFrameRequest( TDEHTMLPart *callingHtmlPart, const KURL &url, @@ -5733,7 +5733,7 @@ void TDEHTMLPart::setZoomFactor (int percent) d->m_zoomFactor = percent; if(d->m_doc) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); if (d->m_doc->styleSelector()) d->m_doc->styleSelector()->computeFontSizes(d->m_doc->paintDeviceMetrics(), d->m_zoomFactor); d->m_doc->recalcStyle( NodeImpl::Force ); @@ -5839,7 +5839,7 @@ TQString TDEHTMLPart::lastModified() const // Done on demand to save time when this isn't needed - but can lead // to slightly wrong results if updating the file on disk w/o reloading. TQDateTime lastModif = TQFileInfo( m_url.path() ).lastModified(); - d->m_lastModified = lastModif.toString( Qt::LocalDate ); + d->m_lastModified = lastModif.toString( TQt::LocalDate ); } //kdDebug(6050) << "TDEHTMLPart::lastModified: " << d->m_lastModified << endl; return d->m_lastModified; @@ -5879,7 +5879,7 @@ void TDEHTMLPart::reparseConfiguration() delete d->m_settings; d->m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings()); - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); tdehtml::CSSStyleSelector::reparseConfiguration(); if(d->m_doc) d->m_doc->updateStyleSelector(); TQApplication::restoreOverrideCursor(); @@ -6062,13 +6062,13 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) else d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString(); - if ( _mouse->button() == Qt::LeftButton || - _mouse->button() == Qt::MidButton ) + if ( _mouse->button() == TQt::LeftButton || + _mouse->button() == TQt::MidButton ) { d->m_bMousePressed = true; #ifndef TDEHTML_NO_SELECTION - if ( _mouse->button() == Qt::LeftButton ) + if ( _mouse->button() == TQt::LeftButton ) { if ( (!d->m_strSelectedURL.isNull() && !isEditable()) || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) @@ -6116,10 +6116,10 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) #endif } - if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) + if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) { d->m_bRightMousePressed = true; - } else if ( _mouse->button() == Qt::RightButton ) + } else if ( _mouse->button() == TQt::RightButton ) { popupMenu( d->m_strSelectedURL ); // might be deleted, don't touch "this" @@ -6129,7 +6129,7 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) void TDEHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event ) { TQMouseEvent *_mouse = event->qmouseEvent(); - if ( _mouse->button() == Qt::LeftButton ) + if ( _mouse->button() == TQt::LeftButton ) { d->m_bMousePressed = true; DOM::Node innerNode = event->innerNode(); @@ -6498,7 +6498,7 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event ) #ifndef TDEHTML_NO_SELECTION // selection stuff if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() && - ( (_mouse->state() & Qt::LeftButton) != 0 )) { + ( (_mouse->state() & TQt::LeftButton) != 0 )) { extendSelectionTo(event->x(), event->y(), event->absX(), event->absY(), innerNode); #else @@ -6530,7 +6530,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) d->m_bMousePressed = false; TQMouseEvent *_mouse = event->qmouseEvent(); - if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) + if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) { d->m_bRightMousePressed = false; KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface(); @@ -6539,7 +6539,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) } } #ifndef TQT_NO_CLIPBOARD - if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) { + if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == TQt::MidButton) && (event->url().isNull())) { kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen=" << d->m_bOpenMiddleClick << endl; @@ -6615,9 +6615,9 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) #ifndef TQT_NO_CLIPBOARD TQString text = selectedText(); text.replace(TQChar(0xa0), ' '); - disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); + disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection())); kapp->clipboard()->setText(text,TQClipboard::Selection); - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection())); #endif //kdDebug( 6000 ) << "selectedText = " << text << endl; emitSelectionChanged(); @@ -6681,13 +6681,13 @@ void TDEHTMLPart::slotSelectAll() void TDEHTMLPart::startAutoScroll() { - connect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() )); + connect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() )); d->m_scrollTimer.start(100, false); } void TDEHTMLPart::stopAutoScroll() { - disconnect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() )); + disconnect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() )); if (d->m_scrollTimer.isActive()) d->m_scrollTimer.stop(); } @@ -6876,7 +6876,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part ) return; } // kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl; - if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) ) + if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( "TQFrame" ) ) { TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() ); if (frame->frameStyle() != TQFrame::NoFrame) @@ -6904,7 +6904,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part ) d->m_activeFrame = part; - if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) ) + if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( "TQFrame" ) ) { TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() ); if (frame->frameStyle() != TQFrame::NoFrame) @@ -7114,7 +7114,7 @@ void TDEHTMLPart::restoreScrollPosition() if ( m_url.hasRef() && !d->m_restoreScrollPosition && !args.reload) { if ( !d->m_doc || !d->m_doc->parsing() ) - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); if ( !gotoAnchor(m_url.encodedHtmlRef()) ) gotoAnchor(m_url.htmlRef()); return; @@ -7127,7 +7127,7 @@ void TDEHTMLPart::restoreScrollPosition() if (d->m_view->contentsHeight() - d->m_view->visibleHeight() >= args.yOffset || d->m_bComplete) { d->m_view->setContentsPos(args.xOffset, args.yOffset); - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); } } @@ -7165,8 +7165,8 @@ void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous); d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq->wallet = wallet; - connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); - connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*))); + connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool))); + connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*))); } assert(form); d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument())); @@ -7207,8 +7207,8 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQStrin TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous); d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq->wallet = wallet; - connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); - connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*))); + connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool))); + connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*))); } d->m_wq->savers.append(qMakePair(key, data)); #endif // TDEHTML_NO_WALLET @@ -7249,7 +7249,7 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) { d->m_wallet = wallet; d->m_bWalletOpened = true; - connect(d->m_wallet, TQT_SIGNAL(walletClosed()), TQT_SLOT(slotWalletClosed())); + connect(d->m_wallet, TQ_SIGNAL(walletClosed()), TQ_SLOT(slotWalletClosed())); if (!d->m_statusBarWalletLabel) { d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); @@ -7258,8 +7258,8 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) { d->m_statusBarWalletLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false); d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance())); - connect(d->m_statusBarWalletLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchWalletManager())); - connect(d->m_statusBarWalletLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(walletMenu())); + connect(d->m_statusBarWalletLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchWalletManager())); + connect(d->m_statusBarWalletLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(walletMenu())); } else { TQToolTip::remove(d->m_statusBarWalletLabel); } @@ -7317,7 +7317,7 @@ void TDEHTMLPart::walletMenu() { #ifndef TDEHTML_NO_WALLET TDEPopupMenu *m = new TDEPopupMenu(0L); - m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed())); + m->insertItem(i18n("&Close Wallet"), this, TQ_SLOT(slotWalletClosed())); m->popup(TQCursor::pos()); #endif // TDEHTML_NO_WALLET } @@ -7360,7 +7360,7 @@ void TDEHTMLPart::setDebugScript( bool enable ) unplugActionList( "debugScriptList" ); if ( enable ) { if (!d->m_paDebugScript) { - d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" ); + d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQ_SLOT( slotDebugScript() ), actionCollection(), "debugScript" ); } d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L ); TQPtrList<TDEAction> lst; @@ -7397,7 +7397,7 @@ void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originP d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) ); TQToolTip::add( d->m_statusBarPopupLabel, i18n("This page was prevented from opening a new window via JavaScript." ) ); - connect(d->m_statusBarPopupLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(suppressedPopupMenu())); + connect(d->m_statusBarPopupLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(suppressedPopupMenu())); if (d->m_settings->jsPopupBlockerPassivePopup()) { TQPixmap px; px = MainBarIcon( "window_suppressed" ); @@ -7415,10 +7415,10 @@ void TDEHTMLPart::suppressedPopupMenu() { TDEPopupMenu *m = new TDEPopupMenu(0L); m->setCheckable(true); if ( d->m_openableSuppressedPopups ) - m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQT_SLOT(showSuppressedPopups())); - m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQT_SLOT(togglePopupPassivePopup()),0,57); + m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQ_SLOT(showSuppressedPopups())); + m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQ_SLOT(togglePopupPassivePopup()),0,57); m->setItemChecked(57,d->m_settings->jsPopupBlockerPassivePopup()); - m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQT_SLOT(launchJSConfigDialog())); + m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQ_SLOT(launchJSConfigDialog())); m->popup(TQCursor::pos()); } diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h index 20cdd68c8..7d3f01312 100644 --- a/tdehtml/tdehtml_part.h +++ b/tdehtml/tdehtml_part.h @@ -182,7 +182,7 @@ namespace TDEWallet */ class TDEHTML_EXPORT TDEHTMLPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT friend class TDEHTMLView; friend class DOM::HTMLTitleElementImpl; friend class DOM::HTMLFrameElementImpl; diff --git a/tdehtml/tdehtml_printsettings.h b/tdehtml/tdehtml_printsettings.h index 2a92d0e3c..1e1250824 100644 --- a/tdehtml/tdehtml_printsettings.h +++ b/tdehtml/tdehtml_printsettings.h @@ -26,7 +26,7 @@ class TQCheckBox; class TDEHTMLPrintSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: TDEHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0); ~TDEHTMLPrintSettings(); diff --git a/tdehtml/tdehtml_run.h b/tdehtml/tdehtml_run.h index 401bc7fd6..b4e11829a 100644 --- a/tdehtml/tdehtml_run.h +++ b/tdehtml/tdehtml_run.h @@ -37,7 +37,7 @@ namespace tdehtml class TDEHTMLRun : public KParts::BrowserRun { - Q_OBJECT + TQ_OBJECT public: TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args, bool hideErrorDialog ); diff --git a/tdehtml/tdehtml_settings.cpp b/tdehtml/tdehtml_settings.cpp index 7f799e311..2e4c5dcb6 100644 --- a/tdehtml/tdehtml_settings.cpp +++ b/tdehtml/tdehtml_settings.cpp @@ -442,7 +442,7 @@ void TDEHTMLSettings::init( TDEConfig * config, bool reset ) d->m_fallbackAccessKeysAssignments.clear(); for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it ) if( (*it).length() > 2 && (*it)[ 1 ] == ':' ) - d->m_fallbackAccessKeysAssignments.append( tqMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); + d->m_fallbackAccessKeysAssignments.append( qMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); } // Colors diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp index dc2a51c66..726f6d6c1 100644 --- a/tdehtml/tdehtmlimage.cpp +++ b/tdehtml/tdehtmlimage.cpp @@ -62,7 +62,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { - TDEHTMLPart* parentPart = ::tqqt_cast<TDEHTMLPart *>( parent ); + TDEHTMLPart* parentPart = ::tqt_cast<TDEHTMLPart *>( parent ); setInstance( TDEHTMLImageFactory::instance(), prof == TDEHTMLPart::BrowserViewGUI && !parentPart ); TQVBox *box = new TQVBox( parentWidget, widgetName ); @@ -70,7 +70,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, m_tdehtml = new TDEHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_tdehtml->setAutoloadImages( true ); m_tdehtml->widget()->installEventFilter(this); - connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) ); + connect( m_tdehtml->view(), TQ_SIGNAL( finishedLayout() ), this, TQ_SLOT( restoreScrollPosition() ) ); setWidget( box ); @@ -103,17 +103,17 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, // forward important signals from the tdehtml part // forward opening requests to parent frame (if existing) - TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent); + TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(parent); KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext; - connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), - be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); + connect(m_tdehtml->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), + be, TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); - connect( m_tdehtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, - const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, + connect( m_tdehtml->browserExtension(), TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, + const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ) ); - connect( m_tdehtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ), - m_ext, TQT_SIGNAL( enableAction( const char *, bool ) ) ); + connect( m_tdehtml->browserExtension(), TQ_SIGNAL( enableAction( const char *, bool ) ), + m_ext, TQ_SIGNAL( enableAction( const char *, bool ) ) ); m_ext->setURLDropHandlingEnabled( true ); } @@ -169,8 +169,8 @@ bool TDEHTMLImage::openURL( const KURL &url ) m_tdehtml->end(); /* - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( updateWindowCaption() ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( updateWindowCaption() ) ); */ return true; } @@ -242,7 +242,7 @@ void TDEHTMLImage::slotImageJobFinished( TDEIO::Job *job ) else { emit completed(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) ); } } @@ -304,7 +304,7 @@ bool TDEHTMLImage::eventFilter(TQObject *, TQEvent *e) { case TQEvent::Drop: { // find out if this part is embedded in a frame, and send the // event to its outside widget - TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent()); + TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(parent()); if (p) return TQApplication::sendEvent(p->widget(), e); // otherwise simply forward all dnd events to the part widget, diff --git a/tdehtml/tdehtmlimage.h b/tdehtml/tdehtmlimage.h index 8b8b5893b..6fd3fd928 100644 --- a/tdehtml/tdehtmlimage.h +++ b/tdehtml/tdehtmlimage.h @@ -39,7 +39,7 @@ namespace tdehtml */ class TDEHTMLImageFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: TDEHTMLImageFactory(); virtual ~TDEHTMLImageFactory(); @@ -59,7 +59,7 @@ private: */ class TDEHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient { - Q_OBJECT + TQ_OBJECT public: TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof ); @@ -100,7 +100,7 @@ private: */ class TDEHTMLImageBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name = 0 ); diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h index 90be612b2..132624fdd 100644 --- a/tdehtml/tdehtmlpart_p.h +++ b/tdehtml/tdehtmlpart_p.h @@ -74,7 +74,7 @@ namespace tdehtml { class KDE_EXPORT ChildFrame : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Type { Frame, IFrame, Object }; @@ -129,7 +129,7 @@ static int tdehtml_part_dcop_counter = 0; class TDEHTMLWalletQueue : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDEHTMLWalletQueue(TQObject *parent) : TQObject(parent) { #ifndef TDEHTML_NO_WALLET @@ -146,10 +146,10 @@ class TDEHTMLWalletQueue : public TQObject #ifndef TDEHTML_NO_WALLET TDEWallet::Wallet *wallet; #endif // TDEHTML_NO_WALLET - typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller; + typedef TQPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller; typedef TQValueList<Caller> CallerList; CallerList callers; - TQValueList<QPair<TQString, TQMap<TQString, TQString> > > savers; + TQValueList<TQPair<TQString, TQMap<TQString, TQString> > > savers; signals: void walletOpened(TDEWallet::Wallet*); @@ -172,7 +172,7 @@ class TDEHTMLWalletQueue : public TQObject } } wallet->setFolder(TDEWallet::Wallet::FormDataFolder()); - for (TQValueList<QPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) { + for (TQValueList<TQPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) { wallet->writeMap((*i).first, (*i).second); } } @@ -220,7 +220,7 @@ public: m_jsedlg = 0; m_formNotification = TDEHTMLPart::NoNotification; -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS m_javaContext = 0; #endif m_cacheId = 0; @@ -298,7 +298,7 @@ public: #ifndef TDEHTML_NO_WALLET delete m_wallet; #endif -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS //delete m_javaContext; #endif } @@ -350,7 +350,7 @@ public: int m_dcop_counter; DCOPObject *m_dcopobject; -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS KJavaAppletContext *m_javaContext; #endif diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 92119267e..bbc45da95 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -94,7 +94,7 @@ //#define DEBUG_PIXEL -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <fixx11h.h> #endif @@ -493,13 +493,13 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) d = new TDEHTMLViewPrivate; TQScrollView::setVScrollBarMode(d->vmode); TQScrollView::setHScrollBarMode(d->hmode); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged())); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotScrollBarMoved())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged())); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotScrollBarMoved())); // initialize QScrollView enableClipper(true); // hack to get unclipped painting on the viewport. - static_cast<TDEHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped); + static_cast<TDEHTMLView *>(viewport())->setWFlags(WPaintUnclipped); setResizePolicy(Manual); viewport()->setMouseTracking(true); @@ -512,7 +512,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) #endif #ifndef TDEHTML_NO_TYPE_AHEAD_FIND - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(findTimeout())); #endif // TDEHTML_NO_TYPE_AHEAD_FIND init(); @@ -520,7 +520,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) viewport()->show(); #ifndef NO_SMOOTH_SCROLL_HACK #define timer timer2 - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick())); #undef timer #endif } @@ -546,7 +546,7 @@ void TDEHTMLView::init() d->vertPaintBuffer = new TQPixmap(10, PAINT_BUFFER_HEIGHT); if(!d->tp) d->tp = new TQPainter(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); viewport()->setFocusProxy(this); _marginWidth = -1; // undefined @@ -579,7 +579,7 @@ void TDEHTMLView::clear() if ( d->cursor_icon_widget ) d->cursor_icon_widget->hide(); d->reset(); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); emit cleared(); TQScrollView::setHScrollBarMode(d->hmode); @@ -897,7 +897,7 @@ void TDEHTMLView::layout() void TDEHTMLView::closeChildDialogs() { - TQObjectList *dlgs = queryList(TQDIALOG_OBJECT_NAME_STRING); + TQObjectList *dlgs = queryList("TQDialog"); for (TQObject *dlg = dlgs->first(); dlg; dlg = dlgs->next()) { KDialogBase* dlgbase = dynamic_cast<KDialogBase *>( dlg ); @@ -911,8 +911,8 @@ void TDEHTMLView::closeChildDialogs() } else { - kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << TQT_TQWIDGET(dlg) << endl; - TQT_TQWIDGET(dlg)->hide(); + kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << static_cast<TQWidget*>(dlg) << endl; + static_cast<TQWidget*>(dlg)->hide(); } } delete dlgs; @@ -941,7 +941,7 @@ void TDEHTMLView::closeEvent( TQCloseEvent* ev ) void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) { if (!m_part->xmlDocImpl()) return; - if (d->possibleTripleClick && ( _mouse->button() & Qt::MouseButtonMask ) == Qt::LeftButton) + if (d->possibleTripleClick && ( _mouse->button() & TQt::MouseButtonMask ) == TQt::LeftButton) { viewportMouseDoubleClickEvent( _mouse ); // it handles triple clicks too return; @@ -958,7 +958,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) //kdDebug(6000) << "innerNode="<<mev.innerNode.nodeName().string()<<endl; - if ( (_mouse->button() == Qt::MidButton) && + if ( (_mouse->button() == TQt::MidButton) && !m_part->d->m_bOpenMiddleClick && !d->m_mouseScrollTimer && mev.url.isNull() && (mev.innerNode.elementId() != ID_INPUT) ) { TQPoint point = mapFromGlobal( _mouse->globalPos() ); @@ -967,7 +967,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) d->m_mouseScroll_byY = 0; d->m_mouseScrollTimer = new TQTimer( this ); - connect( d->m_mouseScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotMouseScrollTimer()) ); + connect( d->m_mouseScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotMouseScrollTimer()) ); if ( !d->m_mouseScrollIndicator ) { TQPixmap pixmap, icon; @@ -1095,7 +1095,7 @@ void TDEHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse ) } d->possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void TDEHTMLView::tripleClickTimeout() @@ -1112,11 +1112,11 @@ static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent TQPoint p(x-absx, y-absy); TQMouseEvent fw(me->type(), p, me->button(), me->state()); TQWidget* w = r->widget(); - TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w); - if (sc && !::tqqt_cast<TQListBox*>(w)) - static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw)); + TQScrollView* sc = ::tqt_cast<TQScrollView*>(w); + if (sc && !::tqt_cast<TQListBox*>(w)) + static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(static_cast<TQEvent*>(&fw)); else if(w) - static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw)); + static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(static_cast<TQEvent*>(&fw)); } @@ -1168,7 +1168,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseMove ); // Do not modify :hover/:active state while mouse is pressed. - m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & Qt::MouseButtonMask /*readonly ?*/, xm, ym, &mev ); + m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & TQt::MouseButtonMask /*readonly ?*/, xm, ym, &mev ); // kdDebug(6000) << "mouse move: " << _mouse->pos() // << " button " << _mouse->button() @@ -1268,7 +1268,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) } if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window-new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true ); if (d->cursor_icon_widget) { @@ -1341,7 +1341,7 @@ void TDEHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse ) DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode(); if (fn && fn != mev.innerNode.handle() && fn->renderer() && fn->renderer()->isWidget() && - _mouse->button() != Qt::MidButton) { + _mouse->button() != TQt::MidButton) { forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym); } @@ -1895,27 +1895,27 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) TQWidget *view = viewport(); - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(view)) { + if (o == view) { // we need to install an event filter on all children of the viewport to // be able to get correct stacking of children within the document. if(e->type() == TQEvent::ChildInserted) { - TQObject *c = TQT_TQOBJECT(TQT_TQCHILDEVENT(e)->child()); + TQObject *c = static_cast<TQChildEvent*>(e)->child(); if (c->isWidgetType()) { - TQWidget *w = TQT_TQWIDGET(c); + TQWidget *w = static_cast<TQWidget*>(c); // don't install the event filter on toplevels if (w->parentWidget(true) == view) { if (!strcmp(w->name(), "__tdehtml")) { w->installEventFilter(this); w->unsetCursor(); - if (!::tqqt_cast<TQFrame*>(w)) + if (!::tqt_cast<TQFrame*>(w)) w->setBackgroundMode( TQWidget::NoBackground ); static_cast<HackWidget *>(w)->setNoErase(); if (!w->childrenListObject().isEmpty()) { TQObjectListIterator it(w->childrenListObject()); for (; it.current(); ++it) { - TQWidget *widget = ::tqqt_cast<TQWidget *>(it.current()); + TQWidget *widget = ::tqt_cast<TQWidget *>(it.current()); if (widget && !widget->isTopLevel()) { - if (!::tqqt_cast<TQFrame*>(w)) + if (!::tqt_cast<TQFrame*>(w)) widget->setBackgroundMode( TQWidget::NoBackground ); static_cast<HackWidget *>(widget)->setNoErase(); widget->installEventFilter(this); @@ -1927,7 +1927,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) } } } else if (o->isWidgetType()) { - TQWidget *v = TQT_TQWIDGET(o); + TQWidget *v = static_cast<TQWidget*>(o); TQWidget *c = v; while (v && v != view) { c = v; @@ -1936,7 +1936,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) if (v && !strcmp(c->name(), "__tdehtml")) { bool block = false; - TQWidget *w = TQT_TQWIDGET(o); + TQWidget *w = static_cast<TQWidget*>(o); switch(e->type()) { case TQEvent::Paint: if (!allowWidgetPaintEvents) { @@ -1951,8 +1951,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) v = v->parentWidget(); } viewportToContents( x, y, x, y ); - TQPaintEvent *pe = TQT_TQPAINTEVENT(e); - bool asap = !d->contentsMoving && ::tqqt_cast<TQScrollView *>(c); + TQPaintEvent *pe = static_cast<TQPaintEvent*>(e); + bool asap = !d->contentsMoving && ::tqt_cast<TQScrollView *>(c); // TQScrollView needs fast repaints if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() && @@ -1969,8 +1969,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: { - if ( (w->parentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if ( (w->parentWidget() == view || ::tqt_cast<TQScrollView*>(c)) && !::tqt_cast<TQScrollBar *>(w)) { + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); TQPoint pt = w->mapTo( view, me->pos()); TQMouseEvent me2(me->type(), pt, me->button(), me->state()); @@ -1988,8 +1988,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) } case TQEvent::KeyPress: case TQEvent::KeyRelease: - if (w->parentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + if (w->parentWidget() == view && !::tqt_cast<TQScrollBar *>(w)) { + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); if (e->type() == TQEvent::KeyPress) keyPressEvent(ke); else @@ -2283,8 +2283,8 @@ void TDEHTMLView::displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview, if( !accesskey.isNull()) { TQRect rec=en->getRect(); TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose); - connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint())); + connect( origview, TQ_SIGNAL(hideAccessKeys()), lab, TQ_SLOT(close()) ); + connect( this, TQ_SIGNAL(repaintAccessKeys()), lab, TQ_SLOT(repaint())); lab->setPalette(TQToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(TQFrame::Box | TQFrame::Plain); @@ -2409,13 +2409,9 @@ bool TDEHTMLView::focusNodeWithAccessKey( TQChar c, TDEHTMLView* caller ) guard = node; } // Set focus node on the document -#ifdef USE_QT4 - m_part->xmlDocImpl()->setFocusNode(node); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Shortcut ); m_part->xmlDocImpl()->setFocusNode(node); TQFocusEvent::resetReason(); -#endif // USE_QT4 if( node != NULL && node->hasOneRef()) // deleted, only held by guard return true; emit m_part->nodeActivated(Node(node)); @@ -2785,7 +2781,7 @@ void TDEHTMLView::print(bool quick) if ( !docname.isEmpty() ) docname = KStringHandler::csqueeze(docname, 80); if(quick || printer->setup(this, i18n("Print %1").arg(docname))) { - viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs + viewport()->setCursor( TQt::waitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs // set up KPrinter printer->setFullPage(false); printer->setCreator(TQString("TDE %1.%2.%3 HTML Library").arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE)); @@ -2888,15 +2884,15 @@ void TDEHTMLView::print(bool quick) if (printHeader) { int available_width = metrics.width() - 10 - - 2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerLeft).width(), - p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerRight).width()); + 2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerLeft).width(), + p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerRight).width()); if (available_width < 150) available_width = 150; int mid_width; int squeeze = 120; do { headerMid = KStringHandler::csqueeze(docname, squeeze); - mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerMid).width(); + mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerMid).width(); squeeze -= 10; } while (mid_width > available_width); } @@ -2910,14 +2906,14 @@ void TDEHTMLView::print(bool quick) if (printHeader) { int dy = p->fontMetrics().lineSpacing(); - p->setPen(Qt::black); + p->setPen(TQt::black); p->setFont(headerFont); headerRight = TQString("#%1").arg(page); - p->drawText(0, 0, metrics.width(), dy, Qt::AlignLeft, headerLeft); - p->drawText(0, 0, metrics.width(), dy, Qt::AlignHCenter, headerMid); - p->drawText(0, 0, metrics.width(), dy, Qt::AlignRight, headerRight); + p->drawText(0, 0, metrics.width(), dy, TQt::AlignLeft, headerLeft); + p->drawText(0, 0, metrics.width(), dy, TQt::AlignHCenter, headerMid); + p->drawText(0, 0, metrics.width(), dy, TQt::AlignRight, headerRight); } @@ -2955,7 +2951,7 @@ void TDEHTMLView::print(bool quick) d->paged = false; tdehtml::setPrintPainter( 0 ); setMediaType( oldMediaType ); - m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) ); + m_part->xmlDocImpl()->setPaintDevice( this ); m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor()); m_part->xmlDocImpl()->updateStyleSelector(); viewport()->unsetCursor(); @@ -3006,7 +3002,7 @@ void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) root->setPagedMode(false); root->setStaticMode(false); - m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) ); + m_part->xmlDocImpl()->setPaintDevice( this ); } @@ -3160,13 +3156,13 @@ bool TDEHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode, int screenY = _mouse->globalY(); int button = -1; switch (_mouse->button()) { - case Qt::LeftButton: + case TQt::LeftButton: button = 0; break; - case Qt::MidButton: + case TQt::MidButton: button = 1; break; - case Qt::RightButton: + case TQt::RightButton: button = 2; break; default: @@ -3282,12 +3278,12 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e) { e->accept(); } - else if( ( (e->orientation() == Qt::Vertical && + else if( ( (e->orientation() == TQt::Vertical && ((d->ignoreWheelEvents && !verticalScrollBar()->isVisible()) || e->delta() > 0 && contentsY() <= 0 || e->delta() < 0 && contentsY() >= contentsHeight() - visibleHeight())) || - (e->orientation() == Qt::Horizontal && + (e->orientation() == TQt::Horizontal && ((d->ignoreWheelEvents && !horizontalScrollBar()->isVisible()) || e->delta() > 0 && contentsX() <=0 || e->delta() < 0 && contentsX() >= contentsWidth() - visibleWidth()))) @@ -3306,7 +3302,7 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e) TQScrollView::viewportWheelEvent( e ); #endif - TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), Qt::NoButton, e->state() ); + TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), TQt::NoButton, e->state() ); emit viewportMouseMoveEvent ( tempEvent ); delete tempEvent; } @@ -4608,9 +4604,9 @@ void TDEHTMLView::scrollViewWheelEvent( TQWheelEvent *e ) if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) step = pageStep; - if(e->orientation() == Qt::Horizontal) + if(e->orientation() == TQt::Horizontal) scrollBy(-((e->delta()*step)/120), 0); - else if(e->orientation() == Qt::Vertical) + else if(e->orientation() == TQt::Vertical) scrollBy(0,-((e->delta()*step)/120)); e->accept(); diff --git a/tdehtml/tdehtmlview.h b/tdehtml/tdehtmlview.h index 797db99fa..6f3ad6684 100644 --- a/tdehtml/tdehtmlview.h +++ b/tdehtml/tdehtmlview.h @@ -77,7 +77,7 @@ class TDEHTMLViewPrivate; **/ class TDEHTML_EXPORT TDEHTMLView : public TQScrollView { - Q_OBJECT + TQ_OBJECT friend class DOM::HTMLDocumentImpl; friend class DOM::HTMLTitleElementImpl; diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp index 15970bbaa..7afda5741 100644 --- a/tdehtml/tdemultipart/tdemultipart.cpp +++ b/tdehtml/tdemultipart/tdemultipart.cpp @@ -115,7 +115,7 @@ KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, m_tempFile = 0L; m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressInfo() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressInfo() ) ); } KMultiPart::~KMultiPart() @@ -167,10 +167,10 @@ bool KMultiPart::openURL( const KURL &url ) emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) ); - connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotJobFinished( TDEIO::Job * ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); m_numberOfFrames = 0; m_numberOfFramesSkipped = 0; @@ -324,8 +324,8 @@ void KMultiPart::setPart( const TQString& mimeType ) insertChildClient( m_part ); m_part->widget()->show(); - connect( m_part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotPartCompleted() ) ); + connect( m_part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotPartCompleted() ) ); m_isHTMLPart = ( mimeType == "text/html" ); KParts::BrowserExtension* childExtension = KParts::BrowserExtension::childObject( m_part ); @@ -336,62 +336,62 @@ void KMultiPart::setPart( const TQString& mimeType ) // Forward signals from the part's browser extension // this is very related (but not exactly like) TDEHTMLPart::processObjectRequest - connect( childExtension, TQT_SIGNAL( openURLNotify() ), - m_extension, TQT_SIGNAL( openURLNotify() ) ); + connect( childExtension, TQ_SIGNAL( openURLNotify() ), + m_extension, TQ_SIGNAL( openURLNotify() ) ); - connect( childExtension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), - m_extension, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( childExtension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), + m_extension, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); + connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); // Keep in sync with tdehtml_part.cpp - connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); if ( m_isHTMLPart ) - connect( childExtension, TQT_SIGNAL( infoMessage( const TQString & ) ), - m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) ); + connect( childExtension, TQ_SIGNAL( infoMessage( const TQString & ) ), + m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) ); // For non-HTML we prefer to show our infoMessage ourselves. childExtension->setBrowserInterface( m_extension->browserInterface() ); - connect( childExtension, TQT_SIGNAL( enableAction( const char *, bool ) ), - m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) ); - connect( childExtension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ), - m_extension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ) ); - connect( childExtension, TQT_SIGNAL( setIconURL( const KURL& ) ), - m_extension, TQT_SIGNAL( setIconURL( const KURL& ) ) ); - connect( childExtension, TQT_SIGNAL( loadingProgress( int ) ), - m_extension, TQT_SIGNAL( loadingProgress( int ) ) ); + connect( childExtension, TQ_SIGNAL( enableAction( const char *, bool ) ), + m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) ); + connect( childExtension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ), + m_extension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ) ); + connect( childExtension, TQ_SIGNAL( setIconURL( const KURL& ) ), + m_extension, TQ_SIGNAL( setIconURL( const KURL& ) ) ); + connect( childExtension, TQ_SIGNAL( loadingProgress( int ) ), + m_extension, TQ_SIGNAL( loadingProgress( int ) ) ); if ( m_isHTMLPart ) // for non-HTML we have our own - connect( childExtension, TQT_SIGNAL( speedProgress( int ) ), - m_extension, TQT_SIGNAL( speedProgress( int ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const TQString& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const TQString& ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ) ); - connect( childExtension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ), - m_extension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ) ); - connect( childExtension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ), - m_extension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ) ); - connect( childExtension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ), - m_extension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ) ); + connect( childExtension, TQ_SIGNAL( speedProgress( int ) ), + m_extension, TQ_SIGNAL( speedProgress( int ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const TQString& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const TQString& ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ) ); + connect( childExtension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ), + m_extension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ) ); + connect( childExtension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ), + m_extension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ) ); + connect( childExtension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ), + m_extension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ) ); } m_partIsLoading = false; @@ -414,7 +414,7 @@ void KMultiPart::startOfData() if ( m_gzip ) { m_filter = new HTTPFilterGZip; - connect( m_filter, TQT_SIGNAL( output( const TQByteArray& ) ), this, TQT_SLOT( reallySendData( const TQByteArray& ) ) ); + connect( m_filter, TQ_SIGNAL( output( const TQByteArray& ) ), this, TQ_SLOT( reallySendData( const TQByteArray& ) ) ); } if ( m_mimeType != m_nextMimeType ) @@ -551,7 +551,7 @@ void KMultiPart::slotJobFinished( TDEIO::Job *job ) emit completed(); - //TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) ); + //TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) ); } m_job = 0L; } diff --git a/tdehtml/tdemultipart/tdemultipart.h b/tdehtml/tdemultipart/tdemultipart.h index de309eef1..75b7c18a3 100644 --- a/tdehtml/tdemultipart/tdemultipart.h +++ b/tdehtml/tdemultipart/tdemultipart.h @@ -38,7 +38,7 @@ class KLineParser; */ class KMultiPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ); @@ -99,7 +99,7 @@ private: #if 0 class KMultiPartBrowserExtension : public KParts::BrowserExtension { - //Q_OBJECT + //TQ_OBJECT public: KMultiPartBrowserExtension( KMultiPart *parent, const char *name = 0 ); diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp index 62842e086..81b0b9a4e 100644 --- a/tdehtml/test_regression.cpp +++ b/tdehtml/test_regression.cpp @@ -118,7 +118,7 @@ PartMonitor::PartMonitor(TDEHTMLPart *_part) { m_part = _part; m_completed = false; - connect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted())); + connect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted())); m_timer_waits = 200; m_timeout_timer = new TQTimer(this); } @@ -141,12 +141,12 @@ void PartMonitor::waitForCompletion() kapp->enter_loop(); - //connect(m_timeout_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( timeout() ) ); + //connect(m_timeout_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( timeout() ) ); //m_timeout_timer->stop(); //m_timeout_timer->start( visual ? 100 : 2, true ); } - TQTimer::singleShot( 0, this, TQT_SLOT( finishTimers() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( finishTimers() ) ); kapp->enter_loop(); } @@ -161,7 +161,7 @@ void PartMonitor::finishTimers() --m_timer_waits; if ( m_timer_waits && (w && w->winq->hasTimers()) || m_part->inProgress()) { // wait a bit - TQTimer::singleShot( 10, this, TQT_SLOT(finishTimers() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT(finishTimers() ) ); return; } kapp->exit_loop(); @@ -172,9 +172,9 @@ void PartMonitor::partCompleted() m_completed = true; RenderWidget::flushWidgetResizes(); m_timeout_timer->stop(); - connect(m_timeout_timer, TQT_SIGNAL(timeout()),this, TQT_SLOT( timeout() ) ); + connect(m_timeout_timer, TQ_SIGNAL(timeout()),this, TQ_SLOT( timeout() ) ); m_timeout_timer->start( visual ? 100 : 2, true ); - disconnect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted())); + disconnect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted())); } static void signal_handler( int ) @@ -350,7 +350,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List char buf[1024]; int bytesread; while (!file.atEnd()) { - bytesread = file.tqreadBlock(buf,1024); + bytesread = file.readBlock(buf,1024); stream.writeRawBytes(buf,bytesread); } file.close(); @@ -593,10 +593,10 @@ int main(int argc, char *argv[]) args->isSet("genoutput"), !args->isSet( "html" ), !args->isSet( "js" )); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )), - regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int ))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )), + regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int ))); bool result = false; QCStringList tests = args->getOptionList("test"); @@ -642,7 +642,7 @@ int main(int argc, char *argv[]) link = TQString( "<hr>%1 failures. (%2 expected failures)" ) .arg(regressionTest->m_failures_work ) .arg( regressionTest->m_failures_fail ); - list.tqwriteBlock( link.latin1(), link.length() ); + list.writeBlock( link.latin1(), link.length() ); list.close(); } } @@ -697,12 +697,12 @@ RegressionTest::RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString s; f.open( IO_WriteOnly | IO_Truncate ); s = "<html><body>Follow the white rabbit"; - f.tqwriteBlock( s.latin1(), s.length() ); + f.writeBlock( s.latin1(), s.length() ); f.close(); f.setName( m_outputDir + "/index.html" ); f.open( IO_WriteOnly | IO_Truncate ); s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>"; - f.tqwriteBlock( s.latin1(), s.length() ); + f.writeBlock( s.latin1(), s.length() ); f.close(); m_paintBuffer = 0; @@ -965,7 +965,7 @@ TQImage RegressionTest::renderToImage() TQPainter* tp = new TQPainter; tp->begin( m_paintBuffer ); tp->translate( -px, -py ); - tp->fillRect(px, py, 512, 128, Qt::magenta); + tp->fillRect(px, py, 512, 128, TQt::magenta); m_part->document().handle()->renderer()->layer()->paint( tp, TQRect( px, py, 512, 128 ) ); tp->end(); delete tp; @@ -994,12 +994,12 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi ) for ( int y = 0; y < h; ++y ) { - QRgb* ls = ( QRgb* ) lhsi.scanLine( y ); - QRgb* rs = ( QRgb* ) rhsi.scanLine( y ); + TQRgb* ls = ( TQRgb* ) lhsi.scanLine( y ); + TQRgb* rs = ( TQRgb* ) rhsi.scanLine( y ); if ( memcmp( ls, rs, bytes ) ) { for ( int x = 0; x < w; ++x ) { - QRgb l = ls[x]; - QRgb r = rs[x]; + TQRgb l = ls[x]; + TQRgb r = rs[x]; if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) && ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) && ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) ) @@ -1032,7 +1032,7 @@ void RegressionTest::createLink( const TQString& test, int failures ) if ( failures & PaintFailure ) link += "P"; link += "]<br>\n"; - list.tqwriteBlock( link.latin1(), link.length() ); + list.writeBlock( link.latin1(), link.length() ); list.close(); } @@ -1056,7 +1056,7 @@ void RegressionTest::doJavascriptReport( const TQString &test ) text.replace( '\n', "<br>\n" ); cl += text; cl += "</tt></body></html>"; - compare.tqwriteBlock( cl.latin1(), cl.length() ); + compare.writeBlock( cl.latin1(), cl.length() ); compare.close(); } @@ -1248,7 +1248,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) cl += "<div id='dom' class='diff'>" + domDiff + "</div>"; cl += "</body></html>"; - compare.tqwriteBlock( cl.latin1(), cl.length() ); + compare.writeBlock( cl.latin1(), cl.length() ); compare.close(); } diff --git a/tdehtml/test_regression.h b/tdehtml/test_regression.h index b6791bd32..9092f22e2 100644 --- a/tdehtml/test_regression.h +++ b/tdehtml/test_regression.h @@ -38,7 +38,7 @@ class TQTimer; */ class PartMonitor : public TQObject { - Q_OBJECT + TQ_OBJECT public: PartMonitor(TDEHTMLPart *_part); ~PartMonitor(); @@ -124,7 +124,7 @@ class ScriptInterpreter; */ class RegressionTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString &outputDir, diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp index bb8a948a7..6c3d1506e 100644 --- a/tdehtml/testtdehtml.cpp +++ b/tdehtml/testtdehtml.cpp @@ -56,10 +56,10 @@ int main(int argc, char *argv[]) TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI ); Dummy *dummy = new Dummy( doc ); - TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - dummy, TQT_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) ); + TQObject::connect( doc->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + dummy, TQ_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) ); - TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) ); + TQObject::connect( doc, TQ_SIGNAL(completed()), dummy, TQ_SLOT(handleDone()) ); if (args->url(0).url().right(4).find(".xml", 0, false) == 0) { KParts::URLArgs ags(doc->browserExtension()->urlArgs()); @@ -105,25 +105,25 @@ int main(int argc, char *argv[]) e.setAttribute( "name", "print" ); toolBar.insertBefore( e, toolBar.firstChild() ); - (void)new TDEAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" ); - (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); - TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" ); + (void)new TDEAction( "Reload", "reload", TQt::Key_F5, dummy, TQ_SLOT( reload() ), doc->actionCollection(), "reload" ); + (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQ_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); + TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQ_SLOT( print() ), doc->actionCollection(), "print" ); kprint->setEnabled(true); TDEToggleAction *ta = new TDEToggleAction( "Navigable", "edit-clear", 0, doc->actionCollection(), "navigable" ); ta->setChecked(doc->isCaretMode()); - TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) )); + TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleNavigable(bool) )); ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" ); ta->setChecked(doc->isEditable()); - TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleEditable(bool) )); + TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleEditable(bool) )); toplevel->guiFactory()->addClient( doc ); doc->setJScriptEnabled(true); doc->setJavaEnabled(true); doc->setPluginsEnabled( true ); - doc->setURLCursor(TQCursor(Qt::PointingHandCursor)); + doc->setURLCursor(TQCursor(TQt::PointingHandCursor)); a.setTopWidget(doc->widget()); - TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)), - doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &))); + TQWidget::connect(doc, TQ_SIGNAL(setWindowCaption(const TQString &)), + doc->widget()->topLevelWidget(), TQ_SLOT(setCaption(const TQString &))); doc->widget()->show(); toplevel->show(); ((TQScrollView *)doc->widget())->viewport()->show(); diff --git a/tdehtml/testtdehtml.h b/tdehtml/testtdehtml.h index dcb4c1583..a6ce73675 100644 --- a/tdehtml/testtdehtml.h +++ b/tdehtml/testtdehtml.h @@ -10,7 +10,7 @@ */ class Dummy : public TQObject { - Q_OBJECT + TQ_OBJECT public: Dummy( TDEHTMLPart *part ) : TQObject( part ) { m_part = part; }; diff --git a/tdehtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp index e6af64184..1ee36c82d 100644 --- a/tdehtml/xml/dom2_eventsimpl.cpp +++ b/tdehtml/xml/dom2_eventsimpl.cpp @@ -526,52 +526,52 @@ private: /* Mapping between special Qt keycodes and virtual DOM codes */ IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] = { - {KeyEventBaseImpl::DOM_VK_BACK_SPACE, Qt::Key_Backspace}, - {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Enter}, - {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Return}, - {KeyEventBaseImpl::DOM_VK_NUM_LOCK, Qt::Key_NumLock}, - {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, Qt::Key_Alt}, - {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, Qt::Key_Control}, - {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, Qt::Key_Shift}, - {KeyEventBaseImpl::DOM_VK_META, Qt::Key_Meta}, - {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, Qt::Key_CapsLock}, - {KeyEventBaseImpl::DOM_VK_DELETE, Qt::Key_Delete}, - {KeyEventBaseImpl::DOM_VK_END, Qt::Key_End}, - {KeyEventBaseImpl::DOM_VK_ESCAPE, Qt::Key_Escape}, - {KeyEventBaseImpl::DOM_VK_HOME, Qt::Key_Home}, - {KeyEventBaseImpl::DOM_VK_PAUSE, Qt::Key_Pause}, - {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, Qt::Key_Print}, - {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, Qt::Key_ScrollLock}, - {KeyEventBaseImpl::DOM_VK_LEFT, Qt::Key_Left}, - {KeyEventBaseImpl::DOM_VK_RIGHT, Qt::Key_Right}, - {KeyEventBaseImpl::DOM_VK_UP, Qt::Key_Up}, - {KeyEventBaseImpl::DOM_VK_DOWN, Qt::Key_Down}, + {KeyEventBaseImpl::DOM_VK_BACK_SPACE, TQt::Key_Backspace}, + {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Enter}, + {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Return}, + {KeyEventBaseImpl::DOM_VK_NUM_LOCK, TQt::Key_NumLock}, + {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, TQt::Key_Alt}, + {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, TQt::Key_Control}, + {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, TQt::Key_Shift}, + {KeyEventBaseImpl::DOM_VK_META, TQt::Key_Meta}, + {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, TQt::Key_CapsLock}, + {KeyEventBaseImpl::DOM_VK_DELETE, TQt::Key_Delete}, + {KeyEventBaseImpl::DOM_VK_END, TQt::Key_End}, + {KeyEventBaseImpl::DOM_VK_ESCAPE, TQt::Key_Escape}, + {KeyEventBaseImpl::DOM_VK_HOME, TQt::Key_Home}, + {KeyEventBaseImpl::DOM_VK_PAUSE, TQt::Key_Pause}, + {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, TQt::Key_Print}, + {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, TQt::Key_ScrollLock}, + {KeyEventBaseImpl::DOM_VK_LEFT, TQt::Key_Left}, + {KeyEventBaseImpl::DOM_VK_RIGHT, TQt::Key_Right}, + {KeyEventBaseImpl::DOM_VK_UP, TQt::Key_Up}, + {KeyEventBaseImpl::DOM_VK_DOWN, TQt::Key_Down}, {KeyEventBaseImpl::DOM_VK_PAGE_DOWN, TQt::Key_Next}, {KeyEventBaseImpl::DOM_VK_PAGE_UP, TQt::Key_Prior}, - {KeyEventBaseImpl::DOM_VK_F1, Qt::Key_F1}, - {KeyEventBaseImpl::DOM_VK_F2, Qt::Key_F2}, - {KeyEventBaseImpl::DOM_VK_F3, Qt::Key_F3}, - {KeyEventBaseImpl::DOM_VK_F4, Qt::Key_F4}, - {KeyEventBaseImpl::DOM_VK_F5, Qt::Key_F5}, - {KeyEventBaseImpl::DOM_VK_F6, Qt::Key_F6}, - {KeyEventBaseImpl::DOM_VK_F7, Qt::Key_F7}, - {KeyEventBaseImpl::DOM_VK_F8, Qt::Key_F8}, - {KeyEventBaseImpl::DOM_VK_F9, Qt::Key_F9}, - {KeyEventBaseImpl::DOM_VK_F10, Qt::Key_F10}, - {KeyEventBaseImpl::DOM_VK_F11, Qt::Key_F11}, - {KeyEventBaseImpl::DOM_VK_F12, Qt::Key_F12}, - {KeyEventBaseImpl::DOM_VK_F13, Qt::Key_F13}, - {KeyEventBaseImpl::DOM_VK_F14, Qt::Key_F14}, - {KeyEventBaseImpl::DOM_VK_F15, Qt::Key_F15}, - {KeyEventBaseImpl::DOM_VK_F16, Qt::Key_F16}, - {KeyEventBaseImpl::DOM_VK_F17, Qt::Key_F17}, - {KeyEventBaseImpl::DOM_VK_F18, Qt::Key_F18}, - {KeyEventBaseImpl::DOM_VK_F19, Qt::Key_F19}, - {KeyEventBaseImpl::DOM_VK_F20, Qt::Key_F20}, - {KeyEventBaseImpl::DOM_VK_F21, Qt::Key_F21}, - {KeyEventBaseImpl::DOM_VK_F22, Qt::Key_F22}, - {KeyEventBaseImpl::DOM_VK_F23, Qt::Key_F23}, - {KeyEventBaseImpl::DOM_VK_F24, Qt::Key_F24}, + {KeyEventBaseImpl::DOM_VK_F1, TQt::Key_F1}, + {KeyEventBaseImpl::DOM_VK_F2, TQt::Key_F2}, + {KeyEventBaseImpl::DOM_VK_F3, TQt::Key_F3}, + {KeyEventBaseImpl::DOM_VK_F4, TQt::Key_F4}, + {KeyEventBaseImpl::DOM_VK_F5, TQt::Key_F5}, + {KeyEventBaseImpl::DOM_VK_F6, TQt::Key_F6}, + {KeyEventBaseImpl::DOM_VK_F7, TQt::Key_F7}, + {KeyEventBaseImpl::DOM_VK_F8, TQt::Key_F8}, + {KeyEventBaseImpl::DOM_VK_F9, TQt::Key_F9}, + {KeyEventBaseImpl::DOM_VK_F10, TQt::Key_F10}, + {KeyEventBaseImpl::DOM_VK_F11, TQt::Key_F11}, + {KeyEventBaseImpl::DOM_VK_F12, TQt::Key_F12}, + {KeyEventBaseImpl::DOM_VK_F13, TQt::Key_F13}, + {KeyEventBaseImpl::DOM_VK_F14, TQt::Key_F14}, + {KeyEventBaseImpl::DOM_VK_F15, TQt::Key_F15}, + {KeyEventBaseImpl::DOM_VK_F16, TQt::Key_F16}, + {KeyEventBaseImpl::DOM_VK_F17, TQt::Key_F17}, + {KeyEventBaseImpl::DOM_VK_F18, TQt::Key_F18}, + {KeyEventBaseImpl::DOM_VK_F19, TQt::Key_F19}, + {KeyEventBaseImpl::DOM_VK_F20, TQt::Key_F20}, + {KeyEventBaseImpl::DOM_VK_F21, TQt::Key_F21}, + {KeyEventBaseImpl::DOM_VK_F22, TQt::Key_F22}, + {KeyEventBaseImpl::DOM_VK_F23, TQt::Key_F23}, + {KeyEventBaseImpl::DOM_VK_F24, TQt::Key_F24}, {0, 0} }; @@ -657,8 +657,8 @@ void KeyEventBaseImpl::buildQKeyEvent() const } //Neuter F keys as well. - if (key >= Qt::Key_F1 && key <= Qt::Key_F35) - key = Qt::Key_ScrollLock; + if (key >= TQt::Key_F1 && key <= TQt::Key_F35) + key = TQt::Key_ScrollLock; m_keyEvent = new TQKeyEvent(id() == KEYUP_EVENT ? TQEvent::KeyRelease : TQEvent::KeyPress, key, ascii, modifiers, text); diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp index b896d05a3..245585d74 100644 --- a/tdehtml/xml/dom_docimpl.cpp +++ b/tdehtml/xml/dom_docimpl.cpp @@ -299,7 +299,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView * m_paintDeviceMetrics = 0; m_paintDevice = 0; m_decoderMibEnum = 0; - m_textColor = Qt::black; + m_textColor = TQt::black; m_view = v; m_renderArena.reset(); @@ -308,7 +308,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView * if ( v ) { m_docLoader = new DocLoader(v->part(), this ); - setPaintDevice( TQT_TQPAINTDEVICE(m_view) ); + setPaintDevice( m_view ); } else m_docLoader = new DocLoader( 0, this ); @@ -1231,7 +1231,7 @@ void DocumentImpl::attach() assert(!attached()); if ( m_view ) - setPaintDevice( TQT_TQPAINTDEVICE(m_view) ); + setPaintDevice( m_view ); if (!m_renderArena) m_renderArena.reset(new RenderArena()); @@ -1334,7 +1334,7 @@ void DocumentImpl::open( bool clearEventListeners ) m_tokenizer = createTokenizer(); m_decoderMibEnum = 0; - connect(m_tokenizer,TQT_SIGNAL(finishedParsing()),this,TQT_SIGNAL(finishedParsing())); + connect(m_tokenizer,TQ_SIGNAL(finishedParsing()),this,TQ_SIGNAL(finishedParsing())); m_tokenizer->begin(); } diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h index bcdc9500c..fc78a89b3 100644 --- a/tdehtml/xml/dom_docimpl.h +++ b/tdehtml/xml/dom_docimpl.h @@ -184,7 +184,7 @@ private: */ class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, public NodeBaseImpl { - Q_OBJECT + TQ_OBJECT public: DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v); ~DocumentImpl(); diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp index 7e2e1bc5f..22b71051f 100644 --- a/tdehtml/xml/dom_nodeimpl.cpp +++ b/tdehtml/xml/dom_nodeimpl.cpp @@ -508,13 +508,13 @@ void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int over int button = -1; switch (_mouse->button()) { - case Qt::LeftButton: + case TQt::LeftButton: button = 0; break; - case Qt::MidButton: + case TQt::MidButton: button = 1; break; - case Qt::RightButton: + case TQt::RightButton: button = 2; break; default: @@ -1659,7 +1659,7 @@ NodeImpl *NodeListImpl::item( unsigned long index ) const bool usedCache = false; if (m_cache->current.node) { //Compute distance from the requested index to the cache node - long cacheDist = QABS(long(index) - long(m_cache->position)); + long cacheDist = TQABS(long(index) - long(m_cache->position)); if (cacheDist < (long)index) { //Closer to the cached position usedCache = true; diff --git a/tdehtml/xml/dom_stringimpl.h b/tdehtml/xml/dom_stringimpl.h index c8f5ce7d8..09c746336 100644 --- a/tdehtml/xml/dom_stringimpl.h +++ b/tdehtml/xml/dom_stringimpl.h @@ -81,7 +81,7 @@ public: const TQChar &operator [] (int pos) { return s[pos]; } bool containsOnlyWhitespace() const; - // ignores trailing garbage, unlike QString + // ignores trailing garbage, unlike TQString int toInt(bool* ok = 0) const; tdehtml::Length* toLengthArray(int& len) const; diff --git a/tdehtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h index f89e5eb2f..d6b4dbe02 100644 --- a/tdehtml/xml/xml_tokenizer.h +++ b/tdehtml/xml/xml_tokenizer.h @@ -118,7 +118,7 @@ private: class Tokenizer : public TQObject { - Q_OBJECT + TQ_OBJECT public: virtual void begin() = 0; // script output must be prepended, while new data diff --git a/tdeinit/README.DCOP b/tdeinit/README.DCOP index cd5ba983e..e30db80f9 100644 --- a/tdeinit/README.DCOP +++ b/tdeinit/README.DCOP @@ -26,9 +26,9 @@ void exec_blind(QCString name, QValueList<QCString> argList); * 'startup_id' is for application startup notification, * "" is the default, "0" for none */ -serviceResult start_service_by_name(QString serviceName, QStringList url, +serviceResult start_service_by_name(TQString serviceName, QStringList url, QValueList<QCString> envs, QCString startup_id ); -serviceResult start_service_by_name(QString serviceName, QStringList url) +serviceResult start_service_by_name(TQString serviceName, QStringList url) /** * Start a service by desktop path. @@ -48,9 +48,9 @@ serviceResult start_service_by_name(QString serviceName, QStringList url) * 'startup_id' is for application startup notification, * "" is the default, "0" for none */ -serviceResult start_service_by_desktop_path(QString serviceName, QStringList url, +serviceResult start_service_by_desktop_path(TQString serviceName, QStringList url, QValueList<QCString> envs, QCString startup_id ); -serviceResult start_service_by_desktop_path(QString serviceName, QStringList url) +serviceResult start_service_by_desktop_path(TQString serviceName, QStringList url) /** @@ -70,14 +70,14 @@ serviceResult start_service_by_desktop_path(QString serviceName, QStringList url * 'startup_id' is for application startup notification, * "" is the default, "0" for none */ -serviceResult start_service_by_desktop_name(QString serviceName, QStringList url, +serviceResult start_service_by_desktop_name(TQString serviceName, QStringList url, QValueList<QCString> envs, QCString startup_id ); -serviceResult start_service_by_desktop_name(QString serviceName, QStringList url) +serviceResult start_service_by_desktop_name(TQString serviceName, QStringList url) struct serviceResult { int result; // 0 means success. > 0 means error QCString dcopName; // Contains DCOP name on success - QString error; // Contains error description on failure. + TQString error; // Contains error description on failure. } diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp index 78ed1e7c4..e8c7dd2ae 100644 --- a/tdeinit/tdeinit.cpp +++ b/tdeinit/tdeinit.cpp @@ -68,7 +68,7 @@ #endif #endif -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <tdestartupinfo.h> // schroder #endif @@ -77,8 +77,8 @@ #include "ltdl.h" #include "tdelauncher_cmds.h" -//#if defined Q_WS_X11 && ! defined K_WS_QTONLY -#ifdef Q_WS_X11 +//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +#ifdef TQ_WS_X11 //#undef K_WS_QTONLY #include <X11/Xlib.h> #include <X11/Xatom.h> @@ -107,8 +107,8 @@ extern "C" FcBool XftInitFtLibrary (void); extern char **environ; extern int lt_dlopen_flag; -//#if defined Q_WS_X11 && ! defined K_WS_QTONLY -#ifdef Q_WS_X11 +//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +#ifdef TQ_WS_X11 static int X11fd = -1; static Display *X11display = 0; static int X11_startup_notify_fd = -1; @@ -119,12 +119,12 @@ static const TDEInstance *s_instance = 0; static char sock_file[MAX_SOCK_FILE]; static char sock_file_old[MAX_SOCK_FILE]; -//#if defined Q_WS_X11 && ! defined K_WS_QTONLY -#ifdef Q_WS_X11 +//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +#ifdef TQ_WS_X11 #define DISPLAY "DISPLAY" -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) #define DISPLAY "QWS_DISPLAY" -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) #define DISPLAY "MAC_DISPLAY" #elif defined(K_WS_QTONLY) #define DISPLAY "QT_DISPLAY" @@ -159,8 +159,8 @@ static struct { bool suicide; } d; -//#if defined Q_WS_X11 && ! defined K_WS_QTONLY -#ifdef Q_WS_X11 +//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +#ifdef TQ_WS_X11 extern "C" { int tdeinit_xio_errhandler( Display * ); int tdeinit_x_errhandler( Display *, XErrorEvent *err ); @@ -219,8 +219,8 @@ static void close_fds() close(d.wrapper_old); d.wrapper_old = 0; } -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 if (X11fd >= 0) { close(X11fd); @@ -279,8 +279,8 @@ static void setup_tty( const char* tty ) static int get_current_desktop( Display* disp ) { int desktop = 0; // no desktop by default -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 // Only X11 supports multiple desktops +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 // Only X11 supports multiple desktops Atom net_current_desktop = XInternAtom( disp, "_NET_CURRENT_DESKTOP", False ); Atom type_ret; int format_ret; @@ -317,8 +317,8 @@ const char* get_env_var( const char* var, int envc, const char* envs ) return NULL; } -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded static void init_startup_info( TDEStartupInfoId& id, const char* bin, int envc, const char* envs ) { @@ -481,8 +481,8 @@ static pid_t launch(int argc, const char *_name, const char *args, return d.fork; } -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 TDEStartupInfoId startup_id; startup_id.initId( startup_id_str ); if( !startup_id.none()) @@ -549,8 +549,8 @@ static pid_t launch(int argc, const char *_name, const char *args, envs++; } -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 if( startup_id.none()) TDEStartupInfo::resetStartupEnv(); else @@ -744,8 +744,8 @@ static pid_t launch(int argc, const char *_name, const char *args, d.launcher_pid = d.fork; } } -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 if( !startup_id.none()) { if( d.fork && d.result == 0 ) // launched successfully @@ -1290,7 +1290,7 @@ static void handle_launcher_request(int sock = -1) #ifndef NDEBUG fprintf(stderr,"[tdeinit] Terminating Trinity.\n"); #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 tdeinit_xio_errhandler( 0L ); #endif } @@ -1322,7 +1322,7 @@ static void handle_requests(pid_t waitForPid) max_sock = d.wrapper_old; if (d.launcher_pid && (d.launcher[0] > max_sock)) max_sock = d.launcher[0]; -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY //#ifdef _WS_X11 if (X11fd > max_sock) max_sock = X11fd; @@ -1383,8 +1383,8 @@ static void handle_requests(pid_t waitForPid) FD_SET(d.wrapper_old, &rd_set); } FD_SET(d.deadpipe[0], &rd_set); -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 if(X11fd >= 0) FD_SET(X11fd, &rd_set); #endif @@ -1442,8 +1442,8 @@ static void handle_requests(pid_t waitForPid) return; } -//#if defined Q_WS_X11 && ! defined K_WS_QTONLY -#ifdef Q_WS_X11 +//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +#ifdef TQ_WS_X11 /* Look for incoming X11 events */ if((result > 0) && (X11fd >= 0)) { @@ -1586,7 +1586,7 @@ int tdeinit_xio_errhandler( Display *disp ) return 0; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int tdeinit_x_errhandler( Display *dpy, XErrorEvent *err ) { #ifndef NDEBUG @@ -1606,8 +1606,8 @@ int tdeinit_x_errhandler( Display *dpy, XErrorEvent *err ) } #endif -//#if defined Q_WS_X11 && ! defined K_WS_QTONLY -#ifdef Q_WS_X11 +//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +#ifdef TQ_WS_X11 // needs to be done sooner than initXconnection() because of also opening // another X connection for startup notification purposes static void setupX() @@ -1772,7 +1772,7 @@ int main(int argc, char **argv, char **envp) d.lt_dlopen_flag = lt_dlopen_flag; lt_dlopen_flag |= LTDL_GLOBAL; init_signals(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 setupX(); #endif @@ -1821,8 +1821,8 @@ int main(int argc, char **argv, char **envp) handle_requests(pid); // Wait for tdelauncher to be ready } -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 X11fd = initXconnection(); #endif @@ -1837,7 +1837,7 @@ int main(int argc, char **argv, char **envp) TQFont::initialize(); setlocale (LC_ALL, ""); setlocale (LC_NUMERIC, "C"); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (XSupportsLocale ()) { // Similar to TQApplication::create_xim() diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp index 966a2ee45..c254ebaa4 100644 --- a/tdeinit/tdelauncher.cpp +++ b/tdeinit/tdelauncher.cpp @@ -40,7 +40,7 @@ #include <tdetempfile.h> #include <kurl.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <tdestartupinfo.h> // schroder #endif @@ -52,8 +52,8 @@ #include "tdelauncher.h" #include "tdelauncher_cmds.h" -//#if defined Q_WS_X11 && ! defined K_WS_QTONLY -#ifdef Q_WS_X11 +//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +#ifdef TQ_WS_X11 //#undef K_WS_QTONLY #include <X11/Xlib.h> // schroder #endif @@ -69,7 +69,7 @@ template class TQPtrList<IdleSlave>; IdleSlave::IdleSlave(TDESocket *socket) { mConn.init(socket); - mConn.connect(this, TQT_SLOT(gotInput())); + mConn.connect(this, TQ_SLOT(gotInput())); mConn.send( CMD_SLAVE_STATUS ); mPid = 0; mBirthDate = time(0); @@ -164,20 +164,20 @@ IdleSlave::age(time_t now) TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup) // : TDEApplication( false, false ), // No Styles, No GUI - : TDEApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used + : TDEApplication( false, true ), // TQClipboard tries to construct a TQWidget so a GUI is technically needed, even though it is not used DCOPObject("tdelauncher"), tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ), dontBlockReading(false), newStartup( new_startup ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 mCached_dpy = NULL; #endif - connect(&mAutoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoStart())); + connect(&mAutoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoStart())); requestList.setAutoDelete(true); mSlaveWaitRequest.setAutoDelete(true); dcopClient()->setNotifications( true ); - connect(dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString &)), - this, TQT_SLOT( slotAppRegistered( const TQCString &))); + connect(dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString &)), + this, TQ_SLOT( slotAppRegistered( const TQCString &))); dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()", objId(), "terminateTDE()", false ); @@ -195,14 +195,14 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup) domainname.unlink(); #endif mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName))); - connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)), - TQT_SLOT(acceptSlave(TDESocket *))); + connect(mPoolSocket, TQ_SIGNAL(accepted( TDESocket *)), + TQ_SLOT(acceptSlave(TDESocket *))); - connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout())); + connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout())); tdeinitNotifier = new TQSocketNotifier(tdeinitSocket, TQSocketNotifier::Read); - connect(tdeinitNotifier, TQT_SIGNAL( activated( int )), - this, TQT_SLOT( slotKDEInitData( int ))); + connect(tdeinitNotifier, TQ_SIGNAL( activated( int )), + this, TQ_SLOT( slotKDEInitData( int ))); tdeinitNotifier->setEnabled( true ); lastRequest = 0; bProcessingQueue = false; @@ -236,8 +236,8 @@ void TDELauncher::close() TQCString filename = TQFile::encodeName(mPoolSocketName); unlink(filename.data()); } -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 if( mCached_dpy != NULL ) XCloseDisplay( mCached_dpy ); #endif @@ -746,8 +746,8 @@ TDELauncher::requestDone(TDELaunchRequest *request) DCOPresult.error += ":\n" + request->errorMsg; DCOPresult.pid = 0; -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 if (!request->startup_dpy.isEmpty()) { Display* dpy = NULL; @@ -811,7 +811,7 @@ TDELauncher::requestStart(TDELaunchRequest *request) length += (*it).length() + 1; // Envs... } length += sizeof( long ); // avoid_loops -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool startup_notify = !request->startup_id.isNull() && request->startup_id != "0"; if( startup_notify ) length += request->startup_id.length() + 1; @@ -847,7 +847,7 @@ TDELauncher::requestStart(TDELaunchRequest *request) l = 0; // avoid_loops, always false here memcpy(p, &l, sizeof(long)); p += sizeof(long); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( startup_notify ) { strcpy(p, request->startup_id.data()); @@ -859,7 +859,7 @@ TDELauncher::requestStart(TDELaunchRequest *request) strcpy(p, request->cwd.data()); p += strlen( p ) + 1; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 request_header.cmd = startup_notify ? LAUNCHER_EXT_EXEC : LAUNCHER_EXEC_NEW; #else request_header.cmd = LAUNCHER_EXEC_NEW; @@ -1050,8 +1050,8 @@ void TDELauncher::send_service_startup_info( TDELaunchRequest *request, KService::Ptr service, const TQCString& startup_id, const TQValueList<TQCString> &envs ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet request->startup_id = "0"; if( startup_id == "0" ) return; @@ -1105,8 +1105,8 @@ void TDELauncher::cancel_service_startup_info( TDELaunchRequest* request, const TQCString& startup_id, const TQValueList<TQCString> &envs ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY -//#ifdef Q_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY +//#ifdef TQ_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet if( request != NULL ) request->startup_id = "0"; if( !startup_id.isEmpty() && startup_id != "0" ) @@ -1158,7 +1158,7 @@ TDELauncher::tdeinit_exec(const TQString &app, const TQStringList &args, request->dcop_service_type = KService::DCOP_None; request->dcop_name = 0; request->pid = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 request->startup_id = startup_id; #endif request->envs = envs; @@ -1184,7 +1184,7 @@ TDELauncher::queueRequest(TDELaunchRequest *request) if (!bProcessingQueue) { bProcessingQueue = true; - TQTimer::singleShot(0, this, TQT_SLOT( slotDequeue() )); + TQTimer::singleShot(0, this, TQ_SLOT( slotDequeue() )); } } @@ -1318,7 +1318,7 @@ TDELauncher::requestSlave(const TQString &protocol, request->dcop_name = 0; request->dcop_service_type = KService::DCOP_None; request->pid = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 request->startup_id = "0"; #endif request->status = TDELaunchRequest::Launching; @@ -1358,9 +1358,9 @@ TDELauncher::acceptSlave(TDESocket *slaveSocket) IdleSlave *slave = new IdleSlave(slaveSocket); // Send it a SLAVE_STATUS command. mSlaveList.append(slave); - connect(slave, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSlaveGone())); - connect(slave, TQT_SIGNAL(statusUpdate(IdleSlave *)), - this, TQT_SLOT(slotSlaveStatus(IdleSlave *))); + connect(slave, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSlaveGone())); + connect(slave, TQ_SIGNAL(statusUpdate(IdleSlave *)), + this, TQ_SLOT(slotSlaveStatus(IdleSlave *))); if (!mTimer.isActive()) { mTimer.start(1000*10); diff --git a/tdeinit/tdelauncher.h b/tdeinit/tdelauncher.h index 1802cd6ba..0f3a1c5c2 100644 --- a/tdeinit/tdelauncher.h +++ b/tdeinit/tdelauncher.h @@ -41,7 +41,7 @@ class IdleSlave : public TQObject { - Q_OBJECT + TQ_OBJECT public: IdleSlave(TDESocket *socket); bool match( const TQString &protocol, const TQString &host, bool connected); @@ -89,7 +89,7 @@ public: KService::DCOPServiceType_t dcop_service_type; bool autoStart; TQString errorMsg; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQCString startup_id; // "" is the default, "0" for none TQCString startup_dpy; // Display to send startup notification to. #endif @@ -107,7 +107,7 @@ struct serviceResult class TDELauncher : public TDEApplication, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: TDELauncher(int _tdeinitSocket, bool new_startup); @@ -193,7 +193,7 @@ protected: TQCString mSlaveValgrindSkin; bool dontBlockReading; bool newStartup; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Display *mCached_dpy; #endif }; diff --git a/tdeinit/wrapper.c b/tdeinit/wrapper.c index d22ba5080..d43222d21 100644 --- a/tdeinit/wrapper.c +++ b/tdeinit/wrapper.c @@ -49,9 +49,9 @@ static char *getDisplay() /* don't test for a value from tqglobal.h but instead distinguish Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS - on the commandline (which in tqglobal.h however triggers Q_WS_QWS, + on the commandline (which in tqglobal.h however triggers TQ_WS_QWS, but we don't want to include that here) (Simon) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 */ #if !defined(QWS) display = getenv("DISPLAY"); diff --git a/tdeio/Mainpage.dox b/tdeio/Mainpage.dox index 057833148..493ed76fc 100644 --- a/tdeio/Mainpage.dox +++ b/tdeio/Mainpage.dox @@ -12,7 +12,7 @@ * This library also implements the System Configuration Cache (KSycoca). * * KMimeType: - * The notion of a file type, already existing in Trinity-1.x + * The notion of a file type, already existing in KDE-1.x * * KService: * To a mimetype are bound one or more applications, now called services. diff --git a/tdeio/bookmarks/kbookmarkbar.cpp b/tdeio/bookmarks/kbookmarkbar.cpp index 0f8f910c2..ca4d5d8c0 100644 --- a/tdeio/bookmarks/kbookmarkbar.cpp +++ b/tdeio/bookmarks/kbookmarkbar.cpp @@ -96,8 +96,8 @@ KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr, dptr()->m_actions.setAutoDelete( true ); - connect( mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); KBookmarkGroup toolbar = getToolbar(); fillBookmarkBar( toolbar ); @@ -198,8 +198,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) else { TDEAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -227,10 +227,10 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(), m_actionCollection, false, addEntriesBookmarkBar, bm.address()); - connect(menu, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), - this, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); - connect(menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); + connect(menu, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), + this, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); + connect(menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); menu->fillBookmarkMenu(); action->plug(m_toolBar); m_lstSubMenus.append( menu ); @@ -265,7 +265,7 @@ void KBookmarkBar::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/, void KBookmarkBar::slotBookmarkSelected() { - slotBookmarkSelected(TDEAction::ToolBarActivation, Qt::NoButton); + slotBookmarkSelected(TDEAction::ToolBarActivation, TQt::NoButton); } static const int const_sepId = -9999; // FIXME this is ugly, @@ -456,7 +456,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e ) // FIXME, see how this holds up on an empty toolbar _a = handleToolbarMouseButton( mev->pos(), dptr()->m_actions, m_pManager, pt ); - if (_a && mev->button() == Qt::RightButton) + if (_a && mev->button() == TQt::RightButton) { dptr()->m_highlightedAddress = _a->property("address").toString(); KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress ); diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h index 2b63dff4a..7e8190d7b 100644 --- a/tdeio/bookmarks/kbookmarkbar.h +++ b/tdeio/bookmarks/kbookmarkbar.h @@ -39,7 +39,7 @@ class TQPopupMenu; */ class TDEIO_EXPORT KBookmarkBar : public TQObject { - Q_OBJECT + TQ_OBJECT friend class RMB; public: diff --git a/tdeio/bookmarks/kbookmarkdombuilder.cpp b/tdeio/bookmarks/kbookmarkdombuilder.cpp index 5c0882d05..2fddaa861 100644 --- a/tdeio/bookmarks/kbookmarkdombuilder.cpp +++ b/tdeio/bookmarks/kbookmarkdombuilder.cpp @@ -36,14 +36,14 @@ KBookmarkDomBuilder::~KBookmarkDomBuilder() { } void KBookmarkDomBuilder::connectImporter(const TQObject *importer) { - connect(importer, TQT_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ), - TQT_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) )); - connect(importer, TQT_SIGNAL( newFolder(const TQString &, bool, const TQString &) ), - TQT_SLOT( newFolder(const TQString &, bool, const TQString &) )); - connect(importer, TQT_SIGNAL( newSeparator() ), - TQT_SLOT( newSeparator() ) ); - connect(importer, TQT_SIGNAL( endFolder() ), - TQT_SLOT( endFolder() ) ); + connect(importer, TQ_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ), + TQ_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) )); + connect(importer, TQ_SIGNAL( newFolder(const TQString &, bool, const TQString &) ), + TQ_SLOT( newFolder(const TQString &, bool, const TQString &) )); + connect(importer, TQ_SIGNAL( newSeparator() ), + TQ_SLOT( newSeparator() ) ); + connect(importer, TQ_SIGNAL( endFolder() ), + TQ_SLOT( endFolder() ) ); } void KBookmarkDomBuilder::newBookmark( diff --git a/tdeio/bookmarks/kbookmarkdombuilder.h b/tdeio/bookmarks/kbookmarkdombuilder.h index 44fe7b170..185904c09 100644 --- a/tdeio/bookmarks/kbookmarkdombuilder.h +++ b/tdeio/bookmarks/kbookmarkdombuilder.h @@ -28,7 +28,7 @@ * @since 3.2 */ class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *); virtual ~KBookmarkDomBuilder(); diff --git a/tdeio/bookmarks/kbookmarkimporter.cpp b/tdeio/bookmarks/kbookmarkimporter.cpp index a83e36c78..3eb13a501 100644 --- a/tdeio/bookmarks/kbookmarkimporter.cpp +++ b/tdeio/bookmarks/kbookmarkimporter.cpp @@ -70,14 +70,14 @@ void KXBELBookmarkImporterImpl::visitLeave(const KBookmarkGroup &) void KBookmarkImporterBase::setupSignalForwards(TQObject *src, TQObject *dst) { - connect(src, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), - dst, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) )); - connect(src, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), - dst, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) )); - connect(src, TQT_SIGNAL( newSeparator() ), - dst, TQT_SIGNAL( newSeparator() ) ); - connect(src, TQT_SIGNAL( endFolder() ), - dst, TQT_SIGNAL( endFolder() ) ); + connect(src, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), + dst, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) )); + connect(src, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), + dst, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) )); + connect(src, TQ_SIGNAL( newSeparator() ), + dst, TQ_SIGNAL( newSeparator() ) ); + connect(src, TQ_SIGNAL( endFolder() ), + dst, TQ_SIGNAL( endFolder() ) ); } KBookmarkImporterBase* KBookmarkImporterBase::factory( const TQString &type ) diff --git a/tdeio/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h index fab32801a..3e7158ecd 100644 --- a/tdeio/bookmarks/kbookmarkimporter.h +++ b/tdeio/bookmarks/kbookmarkimporter.h @@ -34,7 +34,7 @@ */ class TDEIO_EXPORT KBookmarkImporterBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBookmarkImporterBase() {} virtual ~KBookmarkImporterBase() {} @@ -84,7 +84,7 @@ private: */ class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser { - Q_OBJECT + TQ_OBJECT public: KXBELBookmarkImporterImpl() {} virtual void parse(); diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h index 74a4b9cd8..007dcf86a 100644 --- a/tdeio/bookmarks/kbookmarkimporter_crash.h +++ b/tdeio/bookmarks/kbookmarkimporter_crash.h @@ -34,7 +34,7 @@ */ class TDEIO_EXPORT_DEPRECATED TDECrashBookmarkImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDECrashBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {} ~TDECrashBookmarkImporter() {} diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.h b/tdeio/bookmarks/kbookmarkimporter_ie.h index 532b6f1b5..d0707cefb 100644 --- a/tdeio/bookmarks/kbookmarkimporter_ie.h +++ b/tdeio/bookmarks/kbookmarkimporter_ie.h @@ -33,7 +33,7 @@ */ class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KIEBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {} ~KIEBookmarkImporter() {} diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.h b/tdeio/bookmarks/kbookmarkimporter_ns.h index 18b1e195e..4ccee6fa3 100644 --- a/tdeio/bookmarks/kbookmarkimporter_ns.h +++ b/tdeio/bookmarks/kbookmarkimporter_ns.h @@ -34,7 +34,7 @@ */ class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KNSBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {} ~KNSBookmarkImporter() {} diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.h b/tdeio/bookmarks/kbookmarkimporter_opera.h index 4c34776e2..1235ac642 100644 --- a/tdeio/bookmarks/kbookmarkimporter_opera.h +++ b/tdeio/bookmarks/kbookmarkimporter_opera.h @@ -32,7 +32,7 @@ */ class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KOperaBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {} ~KOperaBookmarkImporter() {} diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h index 5ed57280a..fa44f5329 100644 --- a/tdeio/bookmarks/kbookmarkmanager.h +++ b/tdeio/bookmarks/kbookmarkmanager.h @@ -50,7 +50,7 @@ */ class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP protected: /** @@ -350,9 +350,9 @@ protected: */ class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: - typedef TQValueList<QPair<TQString,TQString> > QStringPairList; + typedef TQValueList<TQPair<TQString,TQString> > QStringPairList; public slots: void fillBookmarksList( KExtendedBookmarkOwner::QStringPairList & list ) { emit signalFillBookmarksList( list ); }; signals: diff --git a/tdeio/bookmarks/kbookmarkmenu.cpp b/tdeio/bookmarks/kbookmarkmenu.cpp index fd35736dd..070912eb5 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cpp +++ b/tdeio/bookmarks/kbookmarkmenu.cpp @@ -94,9 +94,9 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr, if (m_actionCollection) { m_actionCollection->setHighlightingEnabled(true); - disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 ); - connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), - this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) ); + disconnect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 ); + connect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), + this, TQ_SLOT( slotActionHighlighted( TDEAction * ) ) ); } m_bNSBookmark = m_parentAddress.isNull(); @@ -104,20 +104,20 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr, { //kdDebug(7043) << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress << endl; - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow() ) ); if ( KBookmarkSettings::self()->m_contextmenu ) { (void) _parentMenu->contextMenu(); - connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ), - this, TQT_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) )); + connect( _parentMenu, TQ_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ), + this, TQ_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) )); } if ( m_bIsRoot ) { - connect( m_pManager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( m_pManager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } } @@ -254,12 +254,12 @@ void RMB::fillContextMenu( TQPopupMenu* contextMenu, const TQString & address, i // TODO rename these, but, message freeze... umm... // if (bookmark.isGroup()) { - id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) ); + id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) ); contextMenu->setItemParameter( id, val ); /* } else { - id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) ); + id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) ); contextMenu->setItemParameter( id, val ); }*/ } @@ -271,24 +271,24 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address, int id; if (bookmark.isGroup()) { - id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) ); + id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQ_SLOT(slotRMBActionEditAt(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQ_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); + id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) ); contextMenu->setItemParameter( id, val ); } else { - id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) ); + id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQ_SLOT(slotRMBActionCopyLocation(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQ_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); + id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) ); contextMenu->setItemParameter( id, val ); } } @@ -487,7 +487,7 @@ void KBookmarkMenu::addAddBookmarksList() "bookmarks_list_add", 0, this, - TQT_SLOT( slotAddBookmarksList() ), + TQ_SLOT( slotAddBookmarksList() ), m_actionCollection, m_bIsRoot ? "add_bookmarks_list" : 0 ); paAddBookmarksList->setToolTip( i18n( "Add a folder of bookmarks for all open tabs." ) ); @@ -507,7 +507,7 @@ void KBookmarkMenu::addAddBookmark() "bookmark_add", m_bIsRoot && m_bAddShortcuts ? TDEStdAccel::addBookmark() : TDEShortcut(), this, - TQT_SLOT( slotAddBookmark() ), + TQ_SLOT( slotAddBookmark() ), m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 ); paAddBookmarks->setToolTip( i18n( "Add a bookmark for the current document" ) ); @@ -521,7 +521,7 @@ void KBookmarkMenu::addEditBookmarks() if (!kapp->authorizeTDEAction("bookmarks")) return; - TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ), + TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQ_SLOT( slotEditBookmarks() ), m_actionCollection, "edit_bookmarks" ); m_paEditBookmarks->plug( m_parentMenu ); m_paEditBookmarks->setToolTip( i18n( "Edit your bookmark collection in a separate window" ) ); @@ -542,7 +542,7 @@ void KBookmarkMenu::addNewFolder() "folder-new", //"folder", 0, this, - TQT_SLOT( slotNewFolder() ), + TQ_SLOT( slotNewFolder() ), m_actionCollection ); paNewFolder->setToolTip( i18n( "Create a new bookmark folder in this menu" ) ); @@ -607,11 +607,11 @@ void KBookmarkMenu::fillBookmarkMenu() new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append(subMenu); - connect(actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, TQT_SLOT(slotNSLoad())); + connect(actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu, TQ_SLOT(slotNSLoad())); } } @@ -637,8 +637,8 @@ void KBookmarkMenu::fillBookmarkMenu() { //kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl; TDEAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -664,10 +664,10 @@ void KBookmarkMenu::fillBookmarkMenu() m_bAddBookmark, bm.address() ); - connect(subMenu, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), - this, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); - connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect(subMenu, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), + this, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); + connect(subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append( subMenu ); } } @@ -756,7 +756,7 @@ void KBookmarkMenu::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/ void KBookmarkMenu::slotBookmarkSelected() { - slotBookmarkSelected(TDEAction::PopupMenuActivation, Qt::NoButton); + slotBookmarkSelected(TDEAction::PopupMenuActivation, TQt::NoButton); } KExtendedBookmarkOwner* KBookmarkMenu::extOwner() @@ -767,7 +767,7 @@ KExtendedBookmarkOwner* KBookmarkMenu::extOwner() void KBookmarkMenu::slotNSLoad() { // only fill menu once - m_parentMenu->disconnect(TQT_SIGNAL(aboutToShow())); + m_parentMenu->disconnect(TQ_SIGNAL(aboutToShow())); // not NSImporter, but kept old name for BC reasons KBookmarkMenuNSImporter importer( m_pManager, this, m_actionCollection ); @@ -846,10 +846,10 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString& if ( editType == InsertionMode ) { m_folderTree = KBookmarkFolderTree::createTree( m_mgr, m_main, name, m_address ); - connect( m_folderTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - this, TQT_SLOT( slotDoubleClicked(TQListViewItem*) ) ); + connect( m_folderTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( slotDoubleClicked(TQListViewItem*) ) ); vbox->addWidget( m_folderTree ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotUser1() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotUser1() ) ); } } @@ -1043,12 +1043,12 @@ void KBookmarkMenuNSImporter::openBookmarks( const TQString &location, const TQS void KBookmarkMenuNSImporter::connectToImporter(const TQObject &importer) { - connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), - TQT_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), - TQT_SLOT( newFolder( const TQString &, bool, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ) ); - connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolder() ) ); + connect( &importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), + TQ_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), + TQ_SLOT( newFolder( const TQString &, bool, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ) ); + connect( &importer, TQ_SIGNAL( endFolder() ), TQ_SLOT( endFolder() ) ); } void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCString & url, const TQString & ) @@ -1056,8 +1056,8 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin TQString _text = KStringHandler::csqueeze(text); _text.replace( '&', "&&" ); TDEAction * action = new KBookmarkAction(_text, "text-html", 0, 0, "", m_actionCollection, 0); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + m_menu, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", url ); action->setToolTip( url ); action->plug( mstack.top()->m_parentMenu ); @@ -1074,8 +1074,8 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_menu->m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - m_menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + m_menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); mstack.top()->m_lstSubMenus.append( subMenu ); mstack.push(subMenu); diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h index 807df086f..77a5c19e4 100644 --- a/tdeio/bookmarks/kbookmarkmenu.h +++ b/tdeio/bookmarks/kbookmarkmenu.h @@ -76,7 +76,7 @@ namespace TDEIO { class Job; } */ class TDEIO_EXPORT KBookmarkMenu : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KBookmarkMenuNSImporter; friend class RMB; public: @@ -238,7 +238,7 @@ protected: */ class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, TDEActionCollection * act ) : m_menu(menu), m_actionCollection(act), m_pManager(mgr) {} diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h index 31fb8cd72..7439a556b 100644 --- a/tdeio/bookmarks/kbookmarkmenu_p.h +++ b/tdeio/bookmarks/kbookmarkmenu_p.h @@ -51,7 +51,7 @@ class KBookmarkBar; class TDEPopupMenu; class KImportedBookmarksActionMenu : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString type READ type WRITE setType ) TQ_PROPERTY( TQString location READ location WRITE setLocation ) public: @@ -72,7 +72,7 @@ public: }; class KBookmarkActionMenu : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString url READ url WRITE setUrl ) TQ_PROPERTY( TQString address READ address WRITE setAddress ) TQ_PROPERTY( bool readOnly READ readOnly WRITE setReadOnly ) @@ -97,7 +97,7 @@ public: }; class KBookmarkAction : public TDEAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString url READ url WRITE setUrl ) TQ_PROPERTY( TQString address READ address WRITE setAddress ) public: @@ -135,7 +135,7 @@ public: class KBookmarkEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: typedef enum { ModifyMode, InsertionMode } BookmarkEditType; diff --git a/tdeio/httpfilter/httpfilter.cpp b/tdeio/httpfilter/httpfilter.cpp index 0f6a45790..a2ed52f43 100644 --- a/tdeio/httpfilter/httpfilter.cpp +++ b/tdeio/httpfilter/httpfilter.cpp @@ -37,8 +37,8 @@ void HTTPFilterBase::chain(HTTPFilterBase *previous) { last = previous; - connect(last, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SLOT(slotInput(const TQByteArray &))); + connect(last, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SLOT(slotInput(const TQByteArray &))); } HTTPFilterChain::HTTPFilterChain() @@ -55,14 +55,14 @@ HTTPFilterChain::addFilter(HTTPFilterBase *filter) } else { - disconnect(last, TQT_SIGNAL(output(const TQByteArray &)), 0, 0); + disconnect(last, TQ_SIGNAL(output(const TQByteArray &)), 0, 0); filter->chain(last); } last = filter; - connect(filter, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SIGNAL(output(const TQByteArray &))); - connect(filter, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SIGNAL(error(int, const TQString &))); + connect(filter, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SIGNAL(output(const TQByteArray &))); + connect(filter, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SIGNAL(error(int, const TQString &))); } void diff --git a/tdeio/httpfilter/httpfilter.h b/tdeio/httpfilter/httpfilter.h index 520a1c627..ee71a6ecd 100644 --- a/tdeio/httpfilter/httpfilter.h +++ b/tdeio/httpfilter/httpfilter.h @@ -35,7 +35,7 @@ class HTTPFilterBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: HTTPFilterBase(); ~HTTPFilterBase(); @@ -55,7 +55,7 @@ protected: class HTTPFilterChain : public HTTPFilterBase { - Q_OBJECT + TQ_OBJECT public: HTTPFilterChain(); @@ -70,7 +70,7 @@ private: class HTTPFilterMD5 : public HTTPFilterBase { - Q_OBJECT + TQ_OBJECT public: HTTPFilterMD5(); @@ -86,7 +86,7 @@ private: class HTTPFilterGZip : public HTTPFilterBase { - Q_OBJECT + TQ_OBJECT public: HTTPFilterGZip(); ~HTTPFilterGZip(); @@ -111,7 +111,7 @@ protected: class HTTPFilterDeflate : public HTTPFilterGZip { - Q_OBJECT + TQ_OBJECT public: HTTPFilterDeflate(); }; diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp index 075843259..8e16290a5 100644 --- a/tdeio/kpasswdserver/kpasswdserver.cpp +++ b/tdeio/kpasswdserver/kpasswdserver.cpp @@ -37,7 +37,7 @@ #include <tdewallet.h> #include "config.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #endif @@ -76,8 +76,8 @@ KPasswdServer::KPasswdServer(const TQCString &name) m_authPending.setAutoDelete(true); m_seqNr = 0; m_wallet = 0; - connect(this, TQT_SIGNAL(windowUnregistered(long)), - this, TQT_SLOT(removeAuthForWindowId(long))); + connect(this, TQ_SIGNAL(windowUnregistered(long)), + this, TQ_SLOT(removeAuthForWindowId(long))); } KPasswdServer::~KPasswdServer() @@ -279,7 +279,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo m_authPending.append(request); if (m_authPending.count() == 1) - TQTimer::singleShot(0, this, TQT_SLOT(processRequest())); + TQTimer::singleShot(0, this, TQ_SLOT(processRequest())); return info; } @@ -386,7 +386,7 @@ KPasswdServer::processRequest() if (hasWalletData) dlg.setKeepPassword( true ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XSetTransientForHint( tqt_xdisplay(), dlg.winId(), request->windowId); #endif @@ -493,7 +493,7 @@ KPasswdServer::processRequest() } if (m_authPending.count()) - TQTimer::singleShot(0, this, TQT_SLOT(processRequest())); + TQTimer::singleShot(0, this, TQ_SLOT(processRequest())); } diff --git a/tdeio/kpasswdserver/kpasswdserver.h b/tdeio/kpasswdserver/kpasswdserver.h index 71aab3859..c31e64449 100644 --- a/tdeio/kpasswdserver/kpasswdserver.h +++ b/tdeio/kpasswdserver/kpasswdserver.h @@ -38,7 +38,7 @@ namespace TDEWallet { class KPasswdServer : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: KPasswdServer(const TQCString &); diff --git a/tdeio/kssl/kopenssl.cpp b/tdeio/kssl/kopenssl.cpp index 312c85c17..96e4473a2 100644 --- a/tdeio/kssl/kopenssl.cpp +++ b/tdeio/kssl/kopenssl.cpp @@ -33,6 +33,8 @@ #include <unistd.h> #include "kopenssl.h" +#define STRINGIFY(x) #x + #define GET_CRYPTOLIB_SYMBOL(a) ((_cryptoLib->hasSymbol(a)) ? _cryptoLib->symbol(a) : NULL) #define GET_SSLLIB_SYMBOL(a) ((_sslLib->hasSymbol(a)) ? _sslLib->symbol(a) : NULL) @@ -343,10 +345,18 @@ TDEConfig *cfg; libnamesc << "cygcrypto.dll" << "libcrypto.dll" << ""; -#else +#else /* !OpenBSD && !CygWin */ + +#ifdef Q_OS_SOLARIS + + libpaths << "/" SYSTEM_LIBDIR KDELIBSUFF "/" + << "/usr/" SYSTEM_LIBDIR KDELIBSUFF "/" + << ""; +#else /* default */ + libpaths - #ifdef _AIX - << "/opt/freeware/lib/" + #ifdef _AIX + << "/opt/freeware/lib/" #endif << "/usr/" SYSTEM_LIBDIR "/" << "/usr/ssl/" SYSTEM_LIBDIR "/" @@ -355,43 +365,52 @@ TDEConfig *cfg; << "/usr/local/ssl/" SYSTEM_LIBDIR "/" << "/opt/openssl/" SYSTEM_LIBDIR "/" << "/" SYSTEM_LIBDIR "/" - << ""; + << ""; +#endif /* default */ // FIXME: #define here for the various OS types to optimize libnamess #ifdef hpux - << "libssl.sl" - #elif defined(_AIX) - << "libssl.a(libssl.so.0)" + << "libssl.sl" + #elif defined(_AIX) + << "libssl.a(libssl.so.0)" #elif defined(__APPLE__) << "libssl.dylib" << "libssl.0.9.dylib" - #else - #ifdef SHLIB_VERSION_NUMBER - << "libssl.so." SHLIB_VERSION_NUMBER - #endif - << "libssl.so" - << "libssl.so.0" - #endif + #else + #ifdef OPENSSL_SHLIB_VERSION + << "libssl.so." STRINGIFY(OPENSSL_SHLIB_VERSION) + #endif + #ifdef SHLIB_VERSION_NUMBER + << "libssl.so." SHLIB_VERSION_NUMBER + #endif + << "libssl.so" + << "libssl.so.3" + << "libssl.so.0" + #endif ; libnamesc - #ifdef hpux - << "libcrypto.sl" - #elif defined(_AIX) - << "libcrypto.a(libcrypto.so.0)" + #ifdef hpux + << "libcrypto.sl" + #elif defined(_AIX) + << "libcrypto.a(libcrypto.so.0)" #elif defined(__APPLE__) << "libcrypto.dylib" << "libcrypto.0.9.dylib" #else - #ifdef SHLIB_VERSION_NUMBER - << "libcrypto.so." SHLIB_VERSION_NUMBER - #endif - << "libcrypto.so" - << "libcrypto.so.0" - #endif + #ifdef OPENSSL_SHLIB_VERSION + << "libcrypto.so." STRINGIFY(OPENSSL_SHLIB_VERSION) + #endif + #ifdef SHLIB_VERSION_NUMBER + << "libcrypto.so." SHLIB_VERSION_NUMBER + #endif + << "libcrypto.so" + << "libcrypto.so.3" + << "libcrypto.so.0" + #endif ; -#endif +#endif /* __OpenBSD__ */ for (TQStringList::Iterator it = libpaths.begin(); it != libpaths.end(); diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h index 312aef2c8..18255034c 100644 --- a/tdeio/kssl/kopenssl.h +++ b/tdeio/kssl/kopenssl.h @@ -27,7 +27,7 @@ class KOpenSSLProxyPrivate; #include <klibloader.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslcertdlg.cpp b/tdeio/kssl/ksslcertdlg.cpp index 7431d4c0a..6f0d7b5a0 100644 --- a/tdeio/kssl/ksslcertdlg.cpp +++ b/tdeio/kssl/ksslcertdlg.cpp @@ -74,11 +74,11 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal) _ok = new KPushButton(i18n("Send certificate"), this); h->addWidget(_ok); - connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotSend())); + connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotSend())); d->p_pb_dontsend = new KPushButton(i18n("Do not send a certificate"), this); h->addWidget(d->p_pb_dontsend); - connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont())); + connect(d->p_pb_dontsend, TQ_SIGNAL(clicked()), TQ_SLOT(slotDont())); #ifndef TQT_NO_WIDGET_TOPEXTRA setCaption(i18n("TDE SSL Certificate Dialog")); diff --git a/tdeio/kssl/ksslcertdlg.h b/tdeio/kssl/ksslcertdlg.h index 8d6f3d777..d4ec4412f 100644 --- a/tdeio/kssl/ksslcertdlg.h +++ b/tdeio/kssl/ksslcertdlg.h @@ -41,7 +41,7 @@ class TQPushButton; * @short KDE X.509 Certificate Dialog */ class TDEIO_EXPORT KSSLCertDlg : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** * Construct a KSSL certificate dialog diff --git a/tdeio/kssl/ksslcertificate.cpp b/tdeio/kssl/ksslcertificate.cpp index edf877496..774553939 100644 --- a/tdeio/kssl/ksslcertificate.cpp +++ b/tdeio/kssl/ksslcertificate.cpp @@ -1033,7 +1033,7 @@ unsigned char *p = cert; // FIXME: return code! d->kossl->i2d_X509(getCert(), &p); - // encode it into a QString + // encode it into a TQString qba.duplicate((const char*)cert, certlen); delete[] cert; #endif diff --git a/tdeio/kssl/ksslcertificate.h b/tdeio/kssl/ksslcertificate.h index 67f6a808d..cce931867 100644 --- a/tdeio/kssl/ksslcertificate.h +++ b/tdeio/kssl/ksslcertificate.h @@ -49,7 +49,7 @@ class KSSLX509V3; #include <tdelibs_export.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslcertificatecache.cpp b/tdeio/kssl/ksslcertificatecache.cpp index 2eecd66d6..226e21c71 100644 --- a/tdeio/kssl/ksslcertificatecache.cpp +++ b/tdeio/kssl/ksslcertificatecache.cpp @@ -286,7 +286,7 @@ TQStringList KSSLCertificateCache::getHostList(KSSLCertificate& cert) { "cacheGetHostList(KSSLCertificate)", data, rettype, retval); - if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (rc && rettype == "TQStringList") { TQDataStream retStream(retval, IO_ReadOnly); TQStringList drc; retStream >> drc; @@ -347,7 +347,7 @@ TQStringList KSSLCertificateCache::getKDEKeyByEmail(const TQString &email) { "getKDEKeyByEmail(TQString)", data, rettype, retval); - if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (rc && rettype == "TQStringList") { TQDataStream retStream(retval, IO_ReadOnly); TQStringList drc; retStream >> drc; diff --git a/tdeio/kssl/ksslcertificatehome.cpp b/tdeio/kssl/ksslcertificatehome.cpp index 39470c5ab..9316bd221 100644 --- a/tdeio/kssl/ksslcertificatehome.cpp +++ b/tdeio/kssl/ksslcertificatehome.cpp @@ -44,7 +44,7 @@ return list; void KSSLCertificateHome::setDefaultCertificate(TQString name, TQString host, bool send, bool prompt) { KSimpleConfig cfg("ksslauthmap", false); -#ifdef Q_WS_WIN //temporary +#ifdef TQ_WS_WIN //temporary cfg.setGroup(host); #else cfg.setGroup(KResolver::domainToAscii(host)); @@ -156,7 +156,7 @@ KSSLPKCS12* KSSLCertificateHome::getCertificateByHost(TQString host, TQString pa TQString KSSLCertificateHome::getDefaultCertificateName(TQString host, KSSLAuthAction *aa) { KSimpleConfig cfg("ksslauthmap", false); -#ifdef Q_WS_WIN //temporary +#ifdef TQ_WS_WIN //temporary if (!cfg.hasGroup(host)) { #else if (!cfg.hasGroup(KResolver::domainToAscii(host))) { @@ -164,7 +164,7 @@ KSimpleConfig cfg("ksslauthmap", false); if (aa) *aa = AuthNone; return TQString::null; } else { -#ifdef Q_WS_WIN //temporary +#ifdef TQ_WS_WIN //temporary cfg.setGroup(host); #else cfg.setGroup(KResolver::domainToAscii(host)); diff --git a/tdeio/kssl/ksslcsessioncache.cpp b/tdeio/kssl/ksslcsessioncache.cpp index d39638717..710ce8f21 100644 --- a/tdeio/kssl/ksslcsessioncache.cpp +++ b/tdeio/kssl/ksslcsessioncache.cpp @@ -26,7 +26,7 @@ #include <kstaticdeleter.h> #include <kurl.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" @@ -54,7 +54,7 @@ #ifdef KSSL_HAVE_SSL -typedef QPair<TQString,TQString> KSSLCSession; +typedef TQPair<TQString,TQString> KSSLCSession; typedef TQPtrList<KSSLCSession> KSSLCSessions; static KSSLCSessions *sessions = 0L; diff --git a/tdeio/kssl/kssldefs.h b/tdeio/kssl/kssldefs.h index c33664b14..d981bf136 100644 --- a/tdeio/kssl/kssldefs.h +++ b/tdeio/kssl/kssldefs.h @@ -20,7 +20,7 @@ #ifndef __kssldefs_h #define __kssldefs_h -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslinfodlg.cpp b/tdeio/kssl/ksslinfodlg.cpp index 37e13854e..6d4683d95 100644 --- a/tdeio/kssl/ksslinfodlg.cpp +++ b/tdeio/kssl/ksslinfodlg.cpp @@ -107,12 +107,12 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na if (KSSL::doesSSLWork()) { button = new KPushButton(KGuiItem(i18n("C&ryptography Configuration..."),"configure"), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(launchConfig())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(launchConfig())); buttonLayout->addWidget( button ); } button = new KPushButton(KStdGuiItem::close(), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(close())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(close())); buttonLayout->addWidget( button ); button->setFocus(); @@ -188,7 +188,7 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert, layout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0); d->_chain = new KComboBox(this); layout->addMultiCellWidget(d->_chain, 1, 1, 0, 1); - connect(d->_chain, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChain(int))); + connect(d->_chain, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChain(int))); d->_chain->clear(); @@ -285,14 +285,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { d->_serialNum->setText(x->getSerialNumber()); cspl = d->_validFrom->palette(); - if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC)) + if (x->getQDTNotBefore() > TQDateTime::currentDateTime(TQt::UTC)) cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); d->_validFrom->setPalette(cspl); d->_validFrom->setText(x->getNotBefore()); cspl = d->_validUntil->palette(); - if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC)) + if (x->getQDTNotAfter() < TQDateTime::currentDateTime(TQt::UTC)) cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); d->_validUntil->setPalette(cspl); @@ -317,8 +317,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { ksv = ksvl.first(); if (ksv == KSSLCertificate::SelfSigned) { - if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) && - x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) { + if (x->getQDTNotAfter() > TQDateTime::currentDateTime(TQt::UTC) && + x->getQDTNotBefore() < TQDateTime::currentDateTime(TQt::UTC)) { if (KSSLSigners().useForSSL(*x)) ksv = KSSLCertificate::Ok; } else { @@ -411,40 +411,40 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) { TQLabel *label = 0L; if (!(tmp = cert.getValue("O")).isEmpty()) { label = new TQLabel(i18n("Organization:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("OU")).isEmpty()) { label = new TQLabel(i18n("Organizational unit:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("L")).isEmpty()) { label = new TQLabel(i18n("Locality:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("ST")).isEmpty()) { label = new TQLabel(i18n("Federal State","State:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("C")).isEmpty()) { label = new TQLabel(i18n("Country:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("CN")).isEmpty()) { label = new TQLabel(i18n("Common name:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("Email")).isEmpty()) { label = new TQLabel(i18n("Email:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); if (mailCatcher) { KURLLabel *mail = new KURLLabel(tmp, tmp, _frame); - connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &))); + connect(mail, TQ_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQ_SLOT(mailClicked(const TQString &))); } else { label = new TQLabel(tmp, _frame); label->setTextFormat(TQt::PlainText); diff --git a/tdeio/kssl/ksslinfodlg.h b/tdeio/kssl/ksslinfodlg.h index c73afbba1..9f8a731c0 100644 --- a/tdeio/kssl/ksslinfodlg.h +++ b/tdeio/kssl/ksslinfodlg.h @@ -48,7 +48,7 @@ class KSSLCertChain; * @short KDE SSL Information Dialog */ class TDEIO_EXPORT KSSLInfoDlg : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** * Construct a KSSL Information Dialog diff --git a/tdeio/kssl/ksslkeygen.cpp b/tdeio/kssl/ksslkeygen.cpp index 86fe4717d..aad837d7d 100644 --- a/tdeio/kssl/ksslkeygen.cpp +++ b/tdeio/kssl/ksslkeygen.cpp @@ -51,9 +51,9 @@ KSSLKeyGen::KSSLKeyGen(TQWidget *parent, const char *name, bool modal) setHelpEnabled(page1, false); setHelpEnabled(page2, false); setFinishEnabled(page2, false); - connect(page2->_password1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged())); - connect(page2->_password2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged())); - connect(finishButton(), TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(page2->_password1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(page2->_password2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(finishButton(), TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); #else // tell him he doesn't have SSL #endif diff --git a/tdeio/kssl/ksslkeygen.h b/tdeio/kssl/ksslkeygen.h index 5bb99a593..13b38071a 100644 --- a/tdeio/kssl/ksslkeygen.h +++ b/tdeio/kssl/ksslkeygen.h @@ -42,7 +42,7 @@ class KGWizardPage2; * @short KDE Key Generation Dialog */ class TDEIO_EXPORT KSSLKeyGen : public KWizard { - Q_OBJECT + TQ_OBJECT public: /** * Construct a keygen dialog. diff --git a/tdeio/kssl/ksslpeerinfo.cpp b/tdeio/kssl/ksslpeerinfo.cpp index d1c2d00fc..8e265cdb9 100644 --- a/tdeio/kssl/ksslpeerinfo.cpp +++ b/tdeio/kssl/ksslpeerinfo.cpp @@ -30,7 +30,7 @@ #include <ksockaddr.h> #include <kextsock.h> #include <netsupp.h> -#ifndef Q_WS_WIN //TODO kresolver not ported +#ifndef TQ_WS_WIN //TODO kresolver not ported #include "kresolver.h" #endif @@ -62,7 +62,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) { while(d->peerHost.endsWith(".")) d->peerHost.truncate(d->peerHost.length()-1); -#ifdef Q_WS_WIN //TODO kresolver not ported +#ifdef TQ_WS_WIN //TODO kresolver not ported d->peerHost = d->peerHost.lower(); #else d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); diff --git a/tdeio/kssl/ksslpkcs12.h b/tdeio/kssl/ksslpkcs12.h index c9dff0d82..14eb23376 100644 --- a/tdeio/kssl/ksslpkcs12.h +++ b/tdeio/kssl/ksslpkcs12.h @@ -21,7 +21,7 @@ #ifndef _KSSLPKCS12_H #define _KSSLPKCS12_H -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslpkcs7.h b/tdeio/kssl/ksslpkcs7.h index c94b7bc7a..3a88cb647 100644 --- a/tdeio/kssl/ksslpkcs7.h +++ b/tdeio/kssl/ksslpkcs7.h @@ -21,7 +21,7 @@ #ifndef _KSSLPKCS7_H #define _KSSLPKCS7_H -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslsession.cpp b/tdeio/kssl/ksslsession.cpp index 3c80233f1..7d597146a 100644 --- a/tdeio/kssl/ksslsession.cpp +++ b/tdeio/kssl/ksslsession.cpp @@ -55,7 +55,7 @@ unsigned char *p = csess; return TQString::null; } - // encode it into a QString + // encode it into a TQString qba.duplicate((const char*)csess, slen); delete[] csess; rc = KCodecs::base64Encode(qba); diff --git a/tdeio/kssl/ksslsettings.cpp b/tdeio/kssl/ksslsettings.cpp index 090eaef4f..aaf17cf97 100644 --- a/tdeio/kssl/ksslsettings.cpp +++ b/tdeio/kssl/ksslsettings.cpp @@ -30,7 +30,6 @@ #include <unistd.h> #include <tqfile.h> -#include <tqsortedlist.h> #include "ksslsettings.h" #include <tdeglobal.h> diff --git a/tdeio/kssl/ksslsigners.cpp b/tdeio/kssl/ksslsigners.cpp index 028ddf555..2392f4a36 100644 --- a/tdeio/kssl/ksslsigners.cpp +++ b/tdeio/kssl/ksslsigners.cpp @@ -199,7 +199,7 @@ TQStringList KSSLSigners::list() { "caList()", data, rettype, retval); - if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (rc && rettype == "TQStringList") { TQDataStream retStream(retval, IO_ReadOnly); retStream >> drc; } @@ -218,7 +218,7 @@ TQString KSSLSigners::getCert(TQString subject) { "caGetCert(TQString)", data, rettype, retval); - if (rc && rettype == TQSTRING_OBJECT_NAME_STRING) { + if (rc && rettype == "TQString") { TQDataStream retStream(retval, IO_ReadOnly); retStream >> drc; } diff --git a/tdeio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h index 58a817e83..33cec9503 100644 --- a/tdeio/kssl/ksslutils.h +++ b/tdeio/kssl/ksslutils.h @@ -22,7 +22,7 @@ #include <kdemacros.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" @@ -45,7 +45,7 @@ class TQDateTime; * * @param tm the OpenSSL ASN1_UTCTIME pointer * - * @return the date formatted in a QString + * @return the date formatted in a TQString * @see ASN1_UTCTIME_QDateTime */ KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm); @@ -66,7 +66,7 @@ KDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt); * * @param aint the OpenSSL ASN1_INTEGER pointer * - * @return the number formatted in a QString + * @return the number formatted in a TQString */ KDE_EXPORT TQString ASN1_INTEGER_QString(ASN1_INTEGER *aint); #endif diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp index e076a083e..9e3cafd19 100644 --- a/tdeio/misc/kpac/discovery.cpp +++ b/tdeio/misc/kpac/discovery.cpp @@ -53,12 +53,12 @@ namespace KPAC : Downloader( parent ), m_helper( new KProcIO ) { - connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) ); - connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) ); + connect( m_helper, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( helperOutput() ) ); + connect( m_helper, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( failed() ) ); *m_helper << "kpac_dhcp_helper"; if ( !m_helper->start() ) - TQTimer::singleShot( 0, this, TQT_SLOT( failed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( failed() ) ); } bool Discovery::initHostName() diff --git a/tdeio/misc/kpac/discovery.h b/tdeio/misc/kpac/discovery.h index 97f9cbc5c..b725fb469 100644 --- a/tdeio/misc/kpac/discovery.h +++ b/tdeio/misc/kpac/discovery.h @@ -31,7 +31,7 @@ namespace KPAC { class Discovery : public Downloader { - Q_OBJECT + TQ_OBJECT public: Discovery( TQObject* ); diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp index 298d660dc..30857df0c 100644 --- a/tdeio/misc/kpac/downloader.cpp +++ b/tdeio/misc/kpac/downloader.cpp @@ -44,9 +44,9 @@ namespace KPAC m_scriptURL = url; TDEIO::TransferJob* job = TDEIO::get( url, false, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( result( TDEIO::Job* ) ) ); } void Downloader::failed() diff --git a/tdeio/misc/kpac/downloader.h b/tdeio/misc/kpac/downloader.h index d64984446..d2264f8b2 100644 --- a/tdeio/misc/kpac/downloader.h +++ b/tdeio/misc/kpac/downloader.h @@ -31,7 +31,7 @@ namespace KPAC { class Downloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: Downloader( TQObject* ); diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp index a8f0a4062..c1140af1b 100644 --- a/tdeio/misc/kpac/proxyscout.cpp +++ b/tdeio/misc/kpac/proxyscout.cpp @@ -105,8 +105,8 @@ namespace KPAC default: return false; } - connect( m_downloader, TQT_SIGNAL( result( bool ) ), - TQT_SLOT( downloadResult( bool ) ) ); + connect( m_downloader, TQ_SIGNAL( result( bool ) ), + TQ_SLOT( downloadResult( bool ) ) ); return true; } @@ -130,7 +130,7 @@ namespace KPAC for ( RequestQueue::ConstIterator it = m_requestQueue.begin(); it != m_requestQueue.end(); ++it ) { - TQCString type = TQSTRING_OBJECT_NAME_STRING; + TQCString type = "TQString"; TQByteArray data; TQDataStream ds( data, IO_WriteOnly ); if ( success ) ds << handleRequest( ( *it ).url ); diff --git a/tdeio/misc/kpac/proxyscout.h b/tdeio/misc/kpac/proxyscout.h index 237887c95..524ee5f43 100644 --- a/tdeio/misc/kpac/proxyscout.h +++ b/tdeio/misc/kpac/proxyscout.h @@ -38,7 +38,7 @@ namespace KPAC class ProxyScout : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: ProxyScout( const TQCString& ); diff --git a/tdeio/misc/kpac/script.cpp b/tdeio/misc/kpac/script.cpp index b1f2fee82..6891d37a7 100644 --- a/tdeio/misc/kpac/script.cpp +++ b/tdeio/misc/kpac/script.cpp @@ -447,11 +447,11 @@ namespace KPAC throw Error( "No such function FindProxyForURL" ); KURL cleanUrl = url; - cleanUrl.setPass(QString()); - cleanUrl.setUser(QString()); + cleanUrl.setPass(TQString()); + cleanUrl.setUser(TQString()); if (cleanUrl.protocol().lower() == "https") { - cleanUrl.setPath(QString()); - cleanUrl.setQuery(QString()); + cleanUrl.setPath(TQString()); + cleanUrl.setQuery(TQString()); } Object thisObj; diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp index a376ebfac..33a87c13d 100644 --- a/tdeio/misc/kssld/kssld.cpp +++ b/tdeio/misc/kssld/kssld.cpp @@ -41,7 +41,6 @@ #include <pwd.h> #include <unistd.h> #include <tqfile.h> -#include <tqsortedlist.h> #include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> @@ -287,7 +286,7 @@ KSSLCNode *node; if ( !node->permanent ) { node->expires = TQDateTime::currentDateTime(); // FIXME: make this configurable - node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(5)); + node->expires = node->expires.addSecs(5); } else { node->expires = node->cert->getQDTNotAfter(); // set to certs expiry date } @@ -310,7 +309,7 @@ KSSLCNode *node; if (!permanent) { n->expires = TQDateTime::currentDateTime(); - n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(5)); + n->expires = n->expires.addSecs(5); } else { if ( !n->expires.isValid() ) n->expires = n->cert->getQDTNotAfter(); // set to certs expiry date diff --git a/tdeio/misc/kssld/kssld.h b/tdeio/misc/kssld/kssld.h index 028a30809..a20582ce2 100644 --- a/tdeio/misc/kssld/kssld.h +++ b/tdeio/misc/kssld/kssld.h @@ -38,7 +38,7 @@ class KOpenSSLProxy; class KSSLD : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp index bf3099094..d1e8ae483 100644 --- a/tdeio/misc/tdesendbugmail/main.cpp +++ b/tdeio/misc/tdesendbugmail/main.cpp @@ -122,8 +122,8 @@ int main(int argc, char **argv) { SMTP *sm = new SMTP; BugMailer bm(sm); - TQObject::connect(sm, TQT_SIGNAL(messageSent()), &bm, TQT_SLOT(slotSend())); - TQObject::connect(sm, TQT_SIGNAL(error(int)), &bm, TQT_SLOT(slotError(int))); + TQObject::connect(sm, TQ_SIGNAL(messageSent()), &bm, TQ_SLOT(slotSend())); + TQObject::connect(sm, TQ_SIGNAL(error(int)), &bm, TQ_SLOT(slotError(int))); sm->setServerHost(server); sm->setPort(25); sm->setSenderAddress(fromaddr); diff --git a/tdeio/misc/tdesendbugmail/main.h b/tdeio/misc/tdesendbugmail/main.h index 39d424bef..f06088694 100644 --- a/tdeio/misc/tdesendbugmail/main.h +++ b/tdeio/misc/tdesendbugmail/main.h @@ -6,7 +6,7 @@ class SMTP; class BugMailer : public TQObject { - Q_OBJECT + TQ_OBJECT public: BugMailer(SMTP* s) : TQObject(0, "mailer"), sm(s) {} diff --git a/tdeio/misc/tdesendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp index 470f24050..ae507e76a 100644 --- a/tdeio/misc/tdesendbugmail/smtp.cpp +++ b/tdeio/misc/tdesendbugmail/smtp.cpp @@ -38,12 +38,12 @@ SMTP::SMTP(char *serverhost, unsigned short int port, int timeout) kdDebug() << "SMTP object created" << endl; - connect(&connectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimerTick())); - connect(&timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimedOut())); - connect(&interactTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(interactTimedOut())); + connect(&connectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimerTick())); + connect(&timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimedOut())); + connect(&interactTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(interactTimedOut())); // some sendmail will give 'duplicate helo' error, quick fix for now - connect(this, TQT_SIGNAL(messageSent()), TQT_SLOT(closeConnection())); + connect(this, TQ_SIGNAL(messageSent()), TQ_SLOT(closeConnection())); } SMTP::~SMTP() @@ -175,8 +175,8 @@ void SMTP::connectTimerTick(void) state = INIT; serverState = NONE; - connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); - connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); + connect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *))); + connect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *))); // sock->enableRead(true); timeOutTimer.stop(); kdDebug() << "connected" << endl; @@ -233,8 +233,8 @@ void SMTP::socketRead(TDESocket *socket) void SMTP::socketClose(TDESocket *socket) { timeOutTimer.stop(); - disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); - disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); + disconnect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *))); + disconnect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *))); socket->enableRead(false); kdDebug() << "connection terminated" << endl; connected = false; diff --git a/tdeio/misc/tdesendbugmail/smtp.h b/tdeio/misc/tdesendbugmail/smtp.h index acdb4a3c3..3d00b4c1a 100644 --- a/tdeio/misc/tdesendbugmail/smtp.h +++ b/tdeio/misc/tdesendbugmail/smtp.h @@ -37,9 +37,9 @@ int SMTPClientStatus[] = { #define SMTP_READ_BUFFER_SIZE 256 -class SMTP:public QObject +class SMTP:public TQObject { - Q_OBJECT + TQ_OBJECT public: SMTP(char *serverhost = 0, unsigned short int port = 0, int timeout = DEFAULT_SMTP_TIMEOUT); ~SMTP(); diff --git a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui index ae52f96e0..8f72031e3 100644 --- a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui +++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui @@ -140,12 +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"/> </UI> diff --git a/tdeio/misc/tdewalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp index c431ecf69..25108bdc5 100644 --- a/tdeio/misc/tdewalletd/ktimeout.cpp +++ b/tdeio/misc/tdewalletd/ktimeout.cpp @@ -52,7 +52,7 @@ void KTimeout::addTimer(int id, int timeout) { } TQTimer *t = new TQTimer; - connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); t->start(timeout); _timers.insert(id, t); } diff --git a/tdeio/misc/tdewalletd/ktimeout.h b/tdeio/misc/tdewalletd/ktimeout.h index 441e4ed77..0aced67ae 100644 --- a/tdeio/misc/tdewalletd/ktimeout.h +++ b/tdeio/misc/tdewalletd/ktimeout.h @@ -28,7 +28,7 @@ // @internal class KTimeout : public TQObject { - Q_OBJECT + TQ_OBJECT public: KTimeout(int size = 29); virtual ~KTimeout(); diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp index 0aaec0f9a..5b7840fd0 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.cpp +++ b/tdeio/misc/tdewalletd/tdewalletd.cpp @@ -92,17 +92,17 @@ TDEWalletD::TDEWalletD(const TQCString &name) _timeouts = new KTimeout(17); _closeIdle = false; _idleTime = 0; - connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); + connect(_timeouts, TQ_SIGNAL(timedOut(int)), this, TQ_SLOT(timedOut(int))); reconfigure(); TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); connect(TDEApplication::dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(slotAppUnregistered(const TQCString&))); + TQ_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "TDEWallet Directory Watcher"); _dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet")); _dw->startScan(true); - connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); + connect(_dw, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(emitWalletListDirty())); } @@ -229,7 +229,7 @@ void TDEWalletD::openAsynchronous(const TQString& wallet, const TQCString& retur DCOPRef(appid, returnObject).send("walletOpenResult", 0); - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); } @@ -266,7 +266,7 @@ int TDEWalletD::open(const TQString& wallet, uint wId) { xact->wId = wId; xact->tType = TDEWalletTransaction::Open; xact->modal = true; // mark dialogs as modal, the app has blocking wait - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); return 0; // process later } @@ -386,7 +386,7 @@ int TDEWalletD::tryOpen(const TQString& wallet, const TQCString& password) _tryOpenBlocked.start (30 * 1000, true /*single shot*/); if (++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } rc = -1; @@ -627,7 +627,7 @@ void TDEWalletD::changePassword(const TQString& wallet, uint wId) { _transactions.append(xact); - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); } @@ -801,7 +801,7 @@ bool TDEWalletD::isOpen(int handle) { if (rc == 0 && ++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } else if (rc != 0) { _failed = 0; } @@ -1229,7 +1229,7 @@ TDEWallet::Backend *TDEWalletD::getWallet(const TQCString& appid, int handle) { if (++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } return 0L; diff --git a/tdeio/misc/tdewalletd/tdewalletd.h b/tdeio/misc/tdewalletd/tdewalletd.h index c35ebc630..65e77771e 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.h +++ b/tdeio/misc/tdewalletd/tdewalletd.h @@ -40,7 +40,7 @@ class KTimeout; class TDEWalletTransaction; class TDEWalletD : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: TDEWalletD(const TQCString &name); diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui index 3e034bac1..1cad5f4a0 100644 --- a/tdeio/misc/tdewalletd/tdewalletwizard.ui +++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui @@ -534,12 +534,12 @@ <include location="global" impldecl="in implementation">tdelocale.h</include> <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">passwordPageUpdate()</slot> <slot access="private">init()</slot> <slot>setAdvanced()</slot> <slot>setBasic()</slot> <slot access="private">destroy()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index 128b77bff..b2d02615d 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -94,11 +94,11 @@ class UIServerSystemTray:public KSystemTray :KSystemTray(uis) { TDEPopupMenu* pop= contextMenu(); - pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure())); - pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); + pop->insertItem(i18n("Settings..."), uis, TQ_SLOT(slotConfigure())); + pop->insertItem(i18n("Remove"), uis, TQ_SLOT(slotRemoveSystemTrayIcon())); setPixmap(loadIcon("document-save")); //actionCollection()->action("file_quit")->setEnabled(true); - KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(uis, TQ_SLOT(slotQuit()), actionCollection()); } }; @@ -193,8 +193,8 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString // create dialog, but don't show it defaultProgress = new TDEIO::DefaultProgress( false ); defaultProgress->setOnlyClean( true ); - connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) ); - connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) ); + connect ( defaultProgress, TQ_SIGNAL( stopped() ), this, TQ_SLOT( slotCanceled() ) ); + connect ( &m_showTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(slotShowDefaultProgress()) ); if ( showDefault ) { m_showTimer.start( 500, true ); @@ -478,7 +478,7 @@ ListProgress::ListProgress (TQWidget *parent, const char *name) //used for squeezing the text in local file name and url m_squeezer=new KSqueezedTextLabel(this); m_squeezer->hide(); - connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(columnWidthChanged(int))); + connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(columnWidthChanged(int))); } @@ -595,11 +595,11 @@ UIServer::UIServer() // setup toolbar toolBar()->insertButton("edit-delete", TOOL_CANCEL, - TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); toolBar()->insertButton("configure", TOOL_CONFIGURE, - TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT(slotConfigure()), true, i18n("Settings...")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotConfigure()), true, i18n("Settings...")); toolBar()->setBarPos( TDEToolBar::Left ); @@ -614,18 +614,18 @@ UIServer::UIServer() setCentralWidget( listProgress ); - connect( listProgress, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelection() ) ); - connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ), - TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) ); - connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)), - TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); + connect( listProgress, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelection() ) ); + connect( listProgress, TQ_SIGNAL( executed( TQListViewItem* ) ), + TQ_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) ); + connect( listProgress, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)), + TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); // setup animation timer updateTimer = new TQTimer( this ); - connect( updateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotUpdate() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotUpdate() ) ); m_bUpdateNewJob=false; setCaption(i18n("Progress Dialog")); @@ -675,10 +675,10 @@ void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQP if (m_contextMenu==0) { m_contextMenu=new TQPopupMenu(this); - m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQT_SLOT(slotCancelCurrent())); -// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQT_SLOT(slotToggleDefaultProgress())); + m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQ_SLOT(slotCancelCurrent())); +// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQ_SLOT(slotToggleDefaultProgress())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(i18n("Settings..."), this, TQT_SLOT(slotConfigure())); + m_contextMenu->insertItem(i18n("Settings..."), this, TQ_SLOT(slotConfigure())); } if ( item ) item->setSelected( true ); @@ -707,9 +707,9 @@ void UIServer::slotConfigure() if (m_configDialog==0) { m_configDialog=new ProgressConfigDialog(0); -// connect(m_configDialog,TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelConfig())); - connect(m_configDialog,TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotApplyConfig())); - connect(m_configDialog,TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApplyConfig())); +// connect(m_configDialog,TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancelConfig())); + connect(m_configDialog,TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotApplyConfig())); + connect(m_configDialog,TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApplyConfig())); } m_configDialog->m_showSystemTrayCb->setChecked(m_showSystemTray); m_configDialog->m_keepOpenCb->setChecked(m_keepListOpen); @@ -760,8 +760,8 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress ) bool show = !m_bShowList && showProgress; ProgressItem *item = new ProgressItem( listProgress, it.current(), observerAppId, s_jobId, show ); - connect( item, TQT_SIGNAL( jobCanceled( ProgressItem* ) ), - TQT_SLOT( slotJobCanceled( ProgressItem* ) ) ); + connect( item, TQ_SIGNAL( jobCanceled( ProgressItem* ) ), + TQ_SLOT( slotJobCanceled( ProgressItem* ) ) ); if ( m_bShowList && !updateTimer->isActive() ) updateTimer->start( 1000 ); @@ -1205,7 +1205,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &met meta["ssl_cipher_bits"].toInt(), KSSLCertificate::KSSLValidation(meta["ssl_cert_state"].toInt())); kdDebug(7024) << "Showing SSL Info dialog" << endl; -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN if( mainwindow != 0 ) KWin::setMainWindow( kid, mainwindow ); #endif @@ -1233,7 +1233,7 @@ KSSLCertDlgRet UIServer::showSSLCertDialog(const TQString& host, const TQStringL kcd->setupDialog(certList); kcd->setHost(host); kdDebug(7024) << "Showing SSL certificate dialog" << endl; -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN if( mainwindow != 0 ) KWin::setMainWindow( kcd, mainwindow ); #endif diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h index edb4531bc..8ba492da5 100644 --- a/tdeio/misc/uiserver.h +++ b/tdeio/misc/uiserver.h @@ -57,7 +57,7 @@ struct ListProgressColumnConfig */ class TDEIO_EXPORT ListProgress : public TDEListView { - Q_OBJECT + TQ_OBJECT public: @@ -105,7 +105,7 @@ protected: */ class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem { - Q_OBJECT + TQ_OBJECT public: ProgressItem( ListProgress* view, TQListViewItem *after, TQCString app_id, int job_id, @@ -217,7 +217,7 @@ class UIServerSystemTray; class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT UIServer(); virtual ~UIServer(); diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES index c646c13cd..7d7669569 100644 --- a/tdeio/tdefile/NOTES +++ b/tdeio/tdefile/NOTES @@ -26,7 +26,7 @@ for more integration between tdefile and konqueror. 16/08/2000. of the visible icons first" algorithm, currently in KonqIconView. (3) KFileView, the base class for any view, knows about KFileItem, has signals for dropped(), popupMenu(list of actions provided by the view), - has a QWidget * canvas() method, xOffset() and yOffset() + has a TQWidget * canvas() method, xOffset() and yOffset() (4) KFileIconView holds a QPtrDict to look up a QIconViewItem quickly from a given KFileItem. This will help for e.g. deleteItems and refreshItems. (5) KFileListView holds a QPtrDict to find the QListViewItem for a diff --git a/tdeio/tdefile/images.h b/tdeio/tdefile/images.h index f544e2f0a..0e9298383 100644 --- a/tdeio/tdefile/images.h +++ b/tdeio/tdefile/images.h @@ -3,7 +3,7 @@ #define _QEMBED_1804289383 #include <tqimage.h> #include <tqdict.h> -static const QRgb group_grey_data[] = { +static const TQRgb group_grey_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42484848,0xc39b9b9b,0xeab1b1b1,0xce9d9d9d,0x5a4d4d4d,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x563b3b3b,0xfdaeaeae,0xffcfcfcf,0xffcccccc,0xffcecece, 0xffbababa,0x62393939,0x0,0x0,0x0,0x0,0x0,0x0,0x4525252,0x9383838,0x0,0xd0515151,0xff969696,0xff959595, @@ -26,7 +26,7 @@ static const QRgb group_grey_data[] = { }; /* Generated by qembed */ -static const QRgb group_data[] = { +static const TQRgb group_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4223731d,0xc37fbb7c,0xea9bca98,0xce86b982,0x5a316e2c,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x56146610,0xfd8fce8e,0xffbae4bb,0xffb7e2b7,0xffbae3ba, 0xff9ed89d,0x62166112,0x0,0x0,0x0,0x0,0x0,0x0,0x4003ca5,0x9003171,0x0,0xd0198b17,0xff6ac468,0xff6ec665, @@ -48,7 +48,7 @@ static const QRgb group_data[] = { 0x0,0x0,0x0,0x0 }; -static const QRgb mask_data[] = { +static const TQRgb mask_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11c84a00,0x1000000,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68d14e00,0xffda6400,0x72bf4700,0x3000000,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14d04d00,0xefda6400,0xfffec300,0xf2d86300,0x24742b00, @@ -70,7 +70,7 @@ static const QRgb mask_data[] = { 0x2000000,0x2000000,0x2000000,0x0 }; -static const QRgb others_grey_data[] = { +static const TQRgb others_grey_data[] = { 0x0,0x0,0x0,0xa4c4c4c,0x5d676767,0x777c7c7c,0x3d555555,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x17535353,0xd2afafaf,0xffebebeb,0xffe5e5e5,0xfec2c2c2,0x906d6d6d,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0xa09c9c9c,0xfff1f1f1,0xfff5f5f5,0xffe6e6e6,0xffd4d4d4,0xffbebebe,0x4c424242,0x117b7b7b, @@ -92,7 +92,7 @@ static const QRgb others_grey_data[] = { 0x542e2e2e,0x200f0f0f,0x0,0x0 }; -static const QRgb others_data[] = { +static const TQRgb others_data[] = { 0x0,0x0,0x0,0xa804618,0x5d95643a,0x77a77c52,0x3d855126,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x17964f11,0xd2cfb190,0xfff8efdf,0xffffeccb,0xfeedce98,0x909b703f,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0xa0d29e66,0xfffff7e3,0xfffff8ec,0xffffedce,0xffffe0a9,0xfff5cd88,0x4c6f4316,0x11f72300, @@ -114,7 +114,7 @@ static const QRgb others_data[] = { 0x5403065a,0x2000001e,0x0,0x0 }; -static const QRgb user_green_data[] = { +static const TQRgb user_green_data[] = { 0x0,0x0,0x0,0x0,0x5029,0x6c1c6e21,0xe332aa3b,0xf83ac841,0xf838c83f,0xda369a3b,0x5a145819,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x7e1a6c1e,0xff32da39,0xff3de341,0xff3ee045,0xff3ee042,0xff3de345,0xff27d930,0x68125817, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f013105,0xf721a328,0xff22de27,0xff23dd27,0xff26dc26,0xff26dc2a,0xff22de27, @@ -136,7 +136,7 @@ static const QRgb user_green_data[] = { 0x1c020604,0x0,0x0,0x0 }; -static const QRgb user_grey_data[] = { +static const TQRgb user_grey_data[] = { 0x0,0x0,0x0,0x0,0x404040,0x6c6e6e6e,0xe3b0b0b0,0xf8cecece,0xf8cccccc,0xdaa6a6a6,0x5a575757,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x7e6b6b6b,0xffd6d6d6,0xffe6e6e6,0xffe4e4e4,0xffe4e4e4,0xffe6e6e6,0xffcccccc,0x68555555, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f282828,0xf79d9d9d,0xffcccccc,0xffcdcdcd,0xffcecece,0xffcecece,0xffcccccc, @@ -158,7 +158,7 @@ static const QRgb user_grey_data[] = { 0x1c070707,0x0,0x0,0x0 }; -static const QRgb user_data[] = { +static const TQRgb user_data[] = { 0x0,0x0,0x0,0x0,0x7f,0x6c2c68af,0xe384abdb,0xf8b2ccea,0xf8aecae9,0xda7ba3d1,0x5a20508d,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x7e2a66ac,0xffb8d4f3,0xffd2e5f9,0xffd0e3f8,0xffcfe3f8,0xffd3e5f9,0xffa7c9f0,0x681d4e8c, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f02244d,0xf75c9ade,0xffa6cbf2,0xffa7ccf2,0xffa9cef2,0xffa9cdf2,0xffa6ccf2, @@ -180,7 +180,7 @@ static const QRgb user_data[] = { 0x1c040409,0x0,0x0,0x0 }; -static const QRgb yes_data[] = { +static const TQRgb yes_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x11049c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, @@ -202,7 +202,7 @@ static const QRgb yes_data[] = { 0x0,0x0,0x0,0x0 }; -static const QRgb yespartial_data[] = { +static const TQRgb yespartial_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x114e4e4e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, @@ -228,7 +228,7 @@ static struct EmbedImage { int width, height, depth; const unsigned char *data; int numColors; - const QRgb *colorTable; + const TQRgb *colorTable; bool alpha; const char *name; } embed_image_vec[] = { @@ -256,7 +256,7 @@ static const TQImage& qembed_findImage( const TQString& name ) embed_image_vec[i].width, embed_image_vec[i].height, embed_image_vec[i].depth, - (QRgb*)embed_image_vec[i].colorTable, + (TQRgb*)embed_image_vec[i].colorTable, embed_image_vec[i].numColors, TQImage::BigEndian ); if ( embed_image_vec[i].alpha ) diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp index 8b1995005..dec306643 100644 --- a/tdeio/tdefile/kacleditwidget.cpp +++ b/tdeio/tdefile/kacleditwidget.cpp @@ -74,16 +74,16 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name ) TQHBox *hbox = new TQHBox( parent ); hbox->setSpacing( KDialog::spacingHint() ); m_listView = new KACLListView( hbox, "acl_listview" ); - connect( m_listView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateButtons() ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotUpdateButtons() ) ); TQVBox *vbox = new TQVBox( hbox ); vbox->setSpacing( KDialog::spacingHint() ); m_AddBtn = new TQPushButton( i18n( "Add Entry..." ), vbox, "add_entry_button" ); - connect( m_AddBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotAddEntry() ) ); + connect( m_AddBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotAddEntry() ) ); m_EditBtn = new TQPushButton( i18n( "Edit Entry..." ), vbox, "edit_entry_button" ); - connect( m_EditBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotEditEntry() ) ); + connect( m_EditBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotEditEntry() ) ); m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" ); - connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) ); + connect( m_DelBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotRemoveEntry() ) ); TQWidget *spacer = new TQWidget( vbox ); spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); slotUpdateButtons(); @@ -213,7 +213,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, const bool lastNonDefault = !isDefault && below && below->isDefault; if ( type == KACLListView::Mask || lastUser || lastNonDefault ) { - p->setPen( TQPen( Qt::gray, 0, TQPen::DotLine ) ); + p->setPen( TQPen( TQt::gray, 0, TQPen::DotLine ) ); if ( type == KACLListView::Mask ) p->drawLine( 0, 0, width - 1, 0 ); p->drawLine( 0, height() - 1, width - 1, height() - 1 ); @@ -409,10 +409,10 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem if ( allowDefaults ) { m_defaultCB = new TQCheckBox( i18n("Default for new files in this folder"), page, "defaultCB" ); mainLayout->addWidget( m_defaultCB ); - connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateAllowedUsersAndGroups() ) ); - connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateAllowedTypes() ) ); + connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateAllowedUsersAndGroups() ) ); + connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateAllowedTypes() ) ); } @@ -431,8 +431,8 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem TQRadioButton *namedGroupType = new TQRadioButton( i18n("Named Group"), m_buttonGroup, "namedGroupType" ); m_buttonGroup->insert( namedGroupType, KACLListView::NamedGroup ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotSelectionChanged( int ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotSelectionChanged( int ) ) ); m_widgetStack = new TQWidgetStack( page ); mainLayout->addWidget( m_widgetStack ); diff --git a/tdeio/tdefile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h index 43f4b2fca..9cbbe1385 100644 --- a/tdeio/tdefile/kacleditwidget.h +++ b/tdeio/tdefile/kacleditwidget.h @@ -24,10 +24,6 @@ #include <config.h> #endif -#ifdef Q_MOC_RUN -#define USE_POSIX_ACL -#endif // Q_MOC_RUN - #ifdef USE_POSIX_ACL #include <tdelistview.h> @@ -40,7 +36,7 @@ class TQPushButton; class KACLEditWidget : TQWidget { - Q_OBJECT + TQ_OBJECT public: KACLEditWidget( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h index 41e265053..dcbc10de6 100644 --- a/tdeio/tdefile/kacleditwidget_p.h +++ b/tdeio/tdefile/kacleditwidget_p.h @@ -24,10 +24,6 @@ #include <config.h> #endif -#ifdef Q_MOC_RUN -#define USE_POSIX_ACL -#endif // Q_MOC_RUN - #ifdef USE_POSIX_ACL #include <tdelistview.h> #include <sys/acl.h> @@ -49,7 +45,7 @@ class TQCheckBox; */ class KACLListView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class KACLListViewItem; public: @@ -133,7 +129,7 @@ private: class EditACLEntryDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: EditACLEntryDialog( KACLListView *listView, KACLListViewItem *item, diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp index 4c4f0cb06..da685daa9 100644 --- a/tdeio/tdefile/kcombiview.cpp +++ b/tdeio/tdefile/kcombiview.cpp @@ -56,8 +56,8 @@ KCombiView::KCombiView( TQWidget *parent, const char *name) left->setAcceptDrops(false); left->installEventFilter( this ); - connect( sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - TQT_SLOT( slotSortingChanged( TQDir::SortSpec ) )); + connect( sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + TQ_SLOT( slotSortingChanged( TQDir::SortSpec ) )); } KCombiView::~KCombiView() @@ -358,9 +358,9 @@ bool KCombiView::eventFilter( TQObject *o, TQEvent *e ) // only the focused view may have a selection if ( type == TQEvent::FocusIn ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(left) ) + if ( o == left ) right->clearSelection(); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(right->widget()) ) + else if ( o == right->widget() ) left->clearSelection(); } diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h index ad72063e3..cf1736409 100644 --- a/tdeio/tdefile/kcombiview.h +++ b/tdeio/tdefile/kcombiview.h @@ -54,7 +54,7 @@ class TQIconViewItem; class TDEIO_EXPORT KCombiView : public TQSplitter, public KFileView { - Q_OBJECT + TQ_OBJECT public: KCombiView( TQWidget *parent, const char *name); diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp index b59108071..fd6eca83d 100644 --- a/tdeio/tdefile/kcustommenueditor.cpp +++ b/tdeio/tdefile/kcustommenueditor.cpp @@ -94,13 +94,13 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) m_listView->addColumn(i18n("Menu")); m_listView->setFullWidth(true); m_listView->setSorting(-1); - KButtonBox *buttonBox = new KButtonBox(page, Qt::Vertical); - buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem())); - d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem())); - d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp())); - d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveDown())); + KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical); + buttonBox->addButton(i18n("New..."), this, TQ_SLOT(slotNewItem())); + d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQ_SLOT(slotRemoveItem())); + d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQ_SLOT(slotMoveUp())); + d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQ_SLOT(slotMoveDown())); buttonBox->layout(); - connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged () ), this, TQ_SLOT( refreshButton() ) ); refreshButton(); } diff --git a/tdeio/tdefile/kcustommenueditor.h b/tdeio/tdefile/kcustommenueditor.h index cb43c606f..c0f43343e 100644 --- a/tdeio/tdefile/kcustommenueditor.h +++ b/tdeio/tdefile/kcustommenueditor.h @@ -32,7 +32,7 @@ class TDEConfigBase; */ class TDEIO_EXPORT KCustomMenuEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Create a dialog for editing a custom menu diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index 8087f206d..ab8e64d92 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -99,8 +99,8 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); m_mainLayout = new TQVBoxLayout(); d->speedBar = new KFileSpeedBar( page, "speedbar" ); - connect( d->speedBar, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( setCurrentURL( const KURL& )) ); + connect( d->speedBar, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( setCurrentURL( const KURL& )) ); hlay->addWidget( d->speedBar, 0 ); hlay->addLayout( m_mainLayout, 1 ); @@ -118,15 +118,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, d->urlCombo->setCompletionObject( comp, true ); d->urlCombo->setAutoDeleteCompletionObject( true ); d->urlCombo->setDuplicatesEnabled( false ); - connect( d->urlCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotComboTextChanged( const TQString& ) )); + connect( d->urlCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); + TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQ_SLOT( slotMkdir() ), this); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); - m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this)); + m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, this, + TQ_SLOT( slotShowHiddenFoldersToggled() ), this); m_showHiddenFolders->plug(m_contextMenu); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); @@ -151,15 +151,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, m_mainLayout->addWidget( m_treeView, 1 ); m_mainLayout->addWidget( d->urlCombo, 0 ); - connect( m_treeView, TQT_SIGNAL( currentChanged( TQListViewItem * )), - TQT_SLOT( slotCurrentChanged() )); - connect( m_treeView, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )), - TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ))); + connect( m_treeView, TQ_SIGNAL( currentChanged( TQListViewItem * )), + TQ_SLOT( slotCurrentChanged() )); + connect( m_treeView, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )), + TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ))); - connect( d->urlCombo, TQT_SIGNAL( activated( const TQString& )), - TQT_SLOT( slotURLActivated( const TQString& ))); - connect( d->urlCombo, TQT_SIGNAL( returnPressed( const TQString& )), - TQT_SLOT( slotURLActivated( const TQString& ))); + connect( d->urlCombo, TQ_SIGNAL( activated( const TQString& )), + TQ_SLOT( slotURLActivated( const TQString& ))); + connect( d->urlCombo, TQ_SIGNAL( returnPressed( const TQString& )), + TQ_SLOT( slotURLActivated( const TQString& ))); setCurrentURL( d->startURL ); } @@ -194,10 +194,10 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) d->branch = createBranch( root ); } - d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *))); - connect( d->branch, TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - TQT_SLOT( slotNextDirToList( KFileTreeViewItem * ) )); + d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *))); + connect( d->branch, TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + TQ_SLOT( slotNextDirToList( KFileTreeViewItem * ) )); KURL dirToList = root; d->dirsToList.clear(); @@ -260,8 +260,8 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) openNextDir( item ); else { - d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *))); + d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *))); view()->setCurrentItem( item ); item->setSelected( true ); } diff --git a/tdeio/tdefile/kdirselectdialog.h b/tdeio/tdefile/kdirselectdialog.h index 400bd3232..fa71ab35f 100644 --- a/tdeio/tdefile/kdirselectdialog.h +++ b/tdeio/tdefile/kdirselectdialog.h @@ -38,7 +38,7 @@ class TDEToggleAction; */ class TDEIO_EXPORT KDirSelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp index b2d48b4bf..40d0b5d13 100644 --- a/tdeio/tdefile/kdirsize.cpp +++ b/tdeio/tdefile/kdirsize.cpp @@ -35,7 +35,7 @@ KDirSize::KDirSize( const KURL & directory ) KDirSize::KDirSize( const KFileItemList & lstItems ) : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems) { - TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(processList()) ); } void KDirSize::processList() @@ -70,9 +70,9 @@ void KDirSize::processList() void KDirSize::startNextJob( const KURL & url ) { TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( listJob ); } diff --git a/tdeio/tdefile/kdirsize.h b/tdeio/tdefile/kdirsize.h index 210080950..8526eeff6 100644 --- a/tdeio/tdefile/kdirsize.h +++ b/tdeio/tdefile/kdirsize.h @@ -29,7 +29,7 @@ */ class TDEIO_EXPORT KDirSize : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT protected: KDirSize( const KURL & directory ); KDirSize( const KFileItemList & lstItems ); diff --git a/tdeio/tdefile/kdiskfreesp.cpp b/tdeio/tdefile/kdiskfreesp.cpp index 1552e01d2..e29060312 100644 --- a/tdeio/tdefile/kdiskfreesp.cpp +++ b/tdeio/tdefile/kdiskfreesp.cpp @@ -48,10 +48,10 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) { dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); - 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; } diff --git a/tdeio/tdefile/kdiskfreesp.h b/tdeio/tdefile/kdiskfreesp.h index 5ffa47d9a..f17a10372 100644 --- a/tdeio/tdefile/kdiskfreesp.h +++ b/tdeio/tdefile/kdiskfreesp.h @@ -38,7 +38,7 @@ class TDEProcess; * information for a given partition (mount point). */ class TDEIO_EXPORT KDiskFreeSp : public TQObject -{ Q_OBJECT +{ TQ_OBJECT public: KDiskFreeSp( TQObject *parent=0, const char *name=0 ); /** diff --git a/tdeio/tdefile/kencodingfiledialog.h b/tdeio/tdefile/kencodingfiledialog.h index b52edd629..607a19493 100644 --- a/tdeio/tdefile/kencodingfiledialog.h +++ b/tdeio/tdefile/kencodingfiledialog.h @@ -37,7 +37,7 @@ struct KEncodingFileDialogPrivate; class TDEIO_EXPORT KEncodingFileDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT public: class Result { diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp index 7acc04ad0..de3401947 100644 --- a/tdeio/tdefile/kicondialog.cpp +++ b/tdeio/tdefile/kicondialog.cpp @@ -16,6 +16,7 @@ #include <config.h> #include <assert.h> +#include <list> #include <kiconviewsearchline.h> @@ -32,7 +33,6 @@ #include <tqlayout.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tqsortedlist.h> #include <tqimage.h> #include <tqpixmap.h> #include <tqlabel.h> @@ -93,9 +93,9 @@ TDEIconCanvas::TDEIconCanvas(TQWidget *parent, const char *name) { d = new TDEIconCanvasPrivate; mpTimer = new TQTimer(this); - connect(mpTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotLoadFiles())); - connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)), - TQT_SLOT(slotCurrentChanged(TQIconViewItem *))); + connect(mpTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotLoadFiles())); + connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)), + TQ_SLOT(slotCurrentChanged(TQIconViewItem *))); setGridX(80); setWordWrapIconText(false); setShowToolTips(true); @@ -119,7 +119,7 @@ void TDEIconCanvas::loadFiles(const TQStringList& files) void TDEIconCanvas::slotLoadFiles() { setResizeMode(Fixed); - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); // disable updates to not trigger paint events when adding child items setUpdatesEnabled( false ); @@ -267,16 +267,16 @@ void TDEIconDialog::init() TQVBoxLayout *top = new TQVBoxLayout(main); top->setSpacing( spacingHint() ); - TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main); + TQButtonGroup *bgroup = new TQButtonGroup(0, TQt::Vertical, i18n("Icon Source"), main); bgroup->layout()->setSpacing(KDialog::spacingHint()); bgroup->layout()->setMargin(KDialog::marginHint()); top->addWidget(bgroup); - connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int))); + connect(bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotButtonClicked(int))); TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2); mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup); grid->addWidget(mpRb1, 1, 0); mpCombo = new TQComboBox(bgroup); - connect(mpCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContext(int))); + connect(mpCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContext(int))); grid->addWidget(mpCombo, 1, 1); mpRb2 = new TQRadioButton(i18n("O&ther icons:"), bgroup); grid->addWidget(mpRb2, 2, 0); @@ -303,7 +303,7 @@ void TDEIconDialog::init() // signals and slots connections - connect(clearSearch, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear())); TQString wtstr = i18n("Search interactively for icon names (e.g. folder)."); TQWhatsThis::add(searchLabel, wtstr); @@ -311,20 +311,20 @@ void TDEIconDialog::init() mpCanvas = new TDEIconCanvas(main); - connect(mpCanvas, TQT_SIGNAL(executed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons())); - connect(mpCanvas, TQT_SIGNAL(returnPressed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons())); + connect(mpCanvas, TQ_SIGNAL(executed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons())); + connect(mpCanvas, TQ_SIGNAL(returnPressed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons())); mpCanvas->setMinimumSize(400, 125); top->addWidget(mpCanvas); d->searchLine->setIconView(mpCanvas); mpProgress = new KProgress(main); top->addWidget(mpProgress); - connect(mpCanvas, TQT_SIGNAL(startLoading(int)), TQT_SLOT(slotStartLoading(int))); - connect(mpCanvas, TQT_SIGNAL(progress(int)), TQT_SLOT(slotProgress(int))); - connect(mpCanvas, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished())); + connect(mpCanvas, TQ_SIGNAL(startLoading(int)), TQ_SLOT(slotStartLoading(int))); + connect(mpCanvas, TQ_SIGNAL(progress(int)), TQ_SLOT(slotProgress(int))); + connect(mpCanvas, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished())); // When pressing Ok or Cancel, stop loading icons - connect(this, TQT_SIGNAL(hidden()), mpCanvas, TQT_SLOT(stopLoading())); + connect(this, TQ_SIGNAL(hidden()), mpCanvas, TQ_SLOT(stopLoading())); static const char* const context_text[] = { I18N_NOOP( "Actions" ), @@ -401,17 +401,16 @@ void TDEIconDialog::showIcons() else filelist=mFileList; - TQSortedList <IconPath>iconlist; - iconlist.setAutoDelete(true); + std::list<IconPath> iconlist; TQStringList::Iterator it; for( it = filelist.begin(); it != filelist.end(); ++it ) - iconlist.append(new IconPath(*it)); + iconlist.push_back(IconPath(*it)); iconlist.sort(); filelist.clear(); - for ( IconPath *ip=iconlist.first(); ip != 0; ip=iconlist.next() ) - filelist.append(*ip); + for (const IconPath &ip : iconlist) + filelist.append(ip); d->searchLine->clear(); mpCanvas->loadFiles(filelist); @@ -679,7 +678,7 @@ void TDEIconButton::init( TDEIconLoader *loader ) mpLoader = loader; mpDialog = 0L; - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeIcon())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeIcon())); } TDEIconButton::~TDEIconButton() @@ -723,7 +722,7 @@ void TDEIconButton::setIcon(const TQString& icon) if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } if ( mbUser ) @@ -741,7 +740,7 @@ void TDEIconButton::slotChangeIcon() if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } mpDialog->setup( mGroup, mContext, d->m_bStrictIconSize, d->iconSize, mbUser ); diff --git a/tdeio/tdefile/kicondialog.h b/tdeio/tdefile/kicondialog.h index 7e7501eaf..1feb75dce 100644 --- a/tdeio/tdefile/kicondialog.h +++ b/tdeio/tdefile/kicondialog.h @@ -34,7 +34,7 @@ class TDEIconLoader; */ class TDEIO_EXPORT TDEIconCanvas: public TDEIconView { - Q_OBJECT + TQ_OBJECT public: TDEIconCanvas(TQWidget *parent=0L, const char *name=0L); @@ -90,7 +90,7 @@ private: */ class TDEIO_EXPORT TDEIconDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -256,7 +256,7 @@ private: */ class TDEIO_EXPORT TDEIconButton: public TQPushButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon ) TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize) TQ_PROPERTY( bool strictIconSize READ strictIconSize WRITE setStrictIconSize ) diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp index f96be72fc..140b2fded 100644 --- a/tdeio/tdefile/kimagefilepreview.cpp +++ b/tdeio/tdefile/kimagefilepreview.cpp @@ -43,7 +43,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) imageLabel = new TQLabel( this ); imageLabel->setFrameStyle( TQFrame::NoFrame ); - imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); vb->addWidget( imageLabel ); @@ -53,14 +53,14 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) autoPreview = new TQCheckBox( i18n("&Automatic preview"), this ); autoPreview->setChecked( autoMode ); hb->addWidget( autoPreview ); - connect( autoPreview, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); + connect( autoPreview, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) ); previewButton = new KPushButton( SmallIconSet("thumbnail"), i18n("&Preview"), this ); hb->addWidget( previewButton ); - connect( previewButton, TQT_SIGNAL(clicked()), TQT_SLOT(showPreview()) ); + connect( previewButton, TQ_SIGNAL(clicked()), TQ_SLOT(showPreview()) ); timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(showPreview()) ); setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() ); } @@ -109,14 +109,14 @@ void KImageFilePreview::showPreview( const KURL &url, bool force ) if ( force ) // explicitly requested previews shall always be generated! m_job->setIgnoreMaximumSize( true ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slotResult( TDEIO::Job * ))); - connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slotResult( TDEIO::Job * ))); + connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); + TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); - connect( m_job, TQT_SIGNAL( failed( const KFileItem* )), - this, TQT_SLOT( slotFailed( const KFileItem* ) )); + connect( m_job, TQ_SIGNAL( failed( const KFileItem* )), + this, TQ_SLOT( slotFailed( const KFileItem* ) )); } } } diff --git a/tdeio/tdefile/kimagefilepreview.h b/tdeio/tdefile/kimagefilepreview.h index 0604e08f0..984c1b476 100644 --- a/tdeio/tdefile/kimagefilepreview.h +++ b/tdeio/tdefile/kimagefilepreview.h @@ -30,7 +30,7 @@ namespace TDEIO { class Job; class PreviewJob; } */ class TDEIO_EXPORT KImageFilePreview : public KPreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: KImageFilePreview(TQWidget *parent); diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp index 21c75e0ce..88dff7415 100644 --- a/tdeio/tdefile/kmetaprops.cpp +++ b/tdeio/tdefile/kmetaprops.cpp @@ -150,7 +150,7 @@ void KFileMetaPropsPlugin::createLayout() if (itemList.isEmpty()) continue; - TQGroupBox *groupBox = new TQGroupBox(2, Qt::Horizontal, + TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal, TQStyleSheet::escape(mtinfo->groupInfo(*git)->translatedName()), d->m_frame); @@ -184,7 +184,7 @@ void KFileMetaPropsPlugin::createLayout() if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl; w = new KFileMetaInfoWidget(*iit, val, groupBox); d->m_editWidgets.append( w ); - connect(w, TQT_SIGNAL(valueChanged(const TQVariant&)), this, TQT_SIGNAL(changed())); + connect(w, TQ_SIGNAL(valueChanged(const TQVariant&)), this, TQ_SIGNAL(changed())); } // and then the read only items @@ -203,7 +203,7 @@ void KFileMetaPropsPlugin::createLayout() /* d->m_add = new TQPushButton(i18n("&Add"), topframe); d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); - connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); + connect(d->m_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd())); tmp->addWidget(d->m_add); // if nothing can be added, deactivate it diff --git a/tdeio/tdefile/kmetaprops.h b/tdeio/tdefile/kmetaprops.h index c842499dd..f0b37ecff 100644 --- a/tdeio/tdefile/kmetaprops.h +++ b/tdeio/tdefile/kmetaprops.h @@ -30,7 +30,7 @@ class KFileMetaInfoItem; */ class TDEIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp index 5d1aba62d..b4f4d9c7d 100644 --- a/tdeio/tdefile/knotifydialog.cpp +++ b/tdeio/tdefile/knotifydialog.cpp @@ -133,7 +133,7 @@ namespace KNotify TQHeader *header = static_cast<TQHeader*>( parentWidget() ); int section = 0; - if ( header->orientation() == Qt::Horizontal ) + if ( header->orientation() == TQt::Horizontal ) section= header->sectionAt( p.x() ); else section= header->sectionAt( p.y() ); @@ -170,8 +170,8 @@ KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal, if ( aboutData ) addApplicationEvents( aboutData->appName() ); - connect( this, TQT_SIGNAL( okClicked() ), m_notifyWidget, TQT_SLOT( save() )); - connect( this, TQT_SIGNAL( applyClicked() ), m_notifyWidget, TQT_SLOT( save() )); + connect( this, TQ_SIGNAL( okClicked() ), m_notifyWidget, TQ_SLOT( save() )); + connect( this, TQ_SIGNAL( applyClicked() ), m_notifyWidget, TQ_SLOT( save() )); } KNotifyDialog::~KNotifyDialog() @@ -264,47 +264,47 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name, d->toolTip = new KNotifyToolTip( header ); m_playButton->setIconSet( SmallIconSet( "media-playback-start" ) ); - connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() )); - - connect( m_listview, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - TQT_SLOT( slotEventChanged( TQListViewItem * ) )); - connect( m_listview, TQT_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int ))); - - connect( m_playSound, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( soundToggled( bool )) ); - connect( m_logToFile, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( loggingToggled( bool )) ); - connect( m_execute, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( executeToggled( bool )) ); - connect( m_messageBox, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( messageBoxChanged() ) ); - connect( m_passivePopup, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( messageBoxChanged() ) ); - connect( m_stderr, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( stderrToggled( bool ) ) ); - connect( m_taskbar, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( taskbarToggled( bool ) ) ); - - connect( m_soundPath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( soundFileChanged( const TQString& ))); - connect( m_logfilePath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( logfileChanged( const TQString& ) )); - connect( m_executePath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( commandlineChanged( const TQString& ) )); - - connect( m_soundPath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openSoundDialog( KURLRequester * ))); - connect( m_logfilePath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openLogDialog( KURLRequester * ))); - connect( m_executePath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openExecDialog( KURLRequester * ))); - - connect( m_extension, TQT_SIGNAL( clicked() ), - TQT_SLOT( toggleAdvanced()) ); - - connect( m_buttonEnable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() )); - connect( m_buttonDisable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() )); + connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() )); + + connect( m_listview, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + TQ_SLOT( slotEventChanged( TQListViewItem * ) )); + connect( m_listview, TQ_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int ))); + + connect( m_playSound, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( soundToggled( bool )) ); + connect( m_logToFile, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( loggingToggled( bool )) ); + connect( m_execute, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( executeToggled( bool )) ); + connect( m_messageBox, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( messageBoxChanged() ) ); + connect( m_passivePopup, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( messageBoxChanged() ) ); + connect( m_stderr, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( stderrToggled( bool ) ) ); + connect( m_taskbar, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( taskbarToggled( bool ) ) ); + + connect( m_soundPath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( soundFileChanged( const TQString& ))); + connect( m_logfilePath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( logfileChanged( const TQString& ) )); + connect( m_executePath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( commandlineChanged( const TQString& ) )); + + connect( m_soundPath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openSoundDialog( KURLRequester * ))); + connect( m_logfilePath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openLogDialog( KURLRequester * ))); + connect( m_executePath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openExecDialog( KURLRequester * ))); + + connect( m_extension, TQ_SIGNAL( clicked() ), + TQ_SLOT( toggleAdvanced()) ); + + connect( m_buttonEnable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() )); + connect( m_buttonDisable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() )); TQString whatsThis = i18n("<qt>You may use the following macros<br>" "in the commandline:<br>" @@ -851,8 +851,8 @@ Event * KNotifyWidget::currentEvent() void KNotifyWidget::openSoundDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openSoundDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openSoundDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); fileDialog->setCaption( i18n("Select Sound File") ); @@ -887,8 +887,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) void KNotifyWidget::openLogDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openLogDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openLogDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); fileDialog->setCaption( i18n("Select Log File") ); @@ -900,8 +900,8 @@ void KNotifyWidget::openLogDialog( KURLRequester *requester ) void KNotifyWidget::openExecDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openExecDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openExecDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h index c8b5b21ac..fe6dcc6ba 100644 --- a/tdeio/tdefile/knotifydialog.h +++ b/tdeio/tdefile/knotifydialog.h @@ -51,7 +51,7 @@ namespace KNotify */ class TDEIO_EXPORT KNotifyDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -188,7 +188,7 @@ namespace KNotify */ class TDEIO_EXPORT KNotifyWidget : public KNotifyWidgetBase { - Q_OBJECT + TQ_OBJECT public: KNotifyWidget( TQWidget* parent = 0, const char* name = 0, diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index 8124db5e5..527f53b51 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -157,10 +157,10 @@ TDEApplicationTree::TDEApplicationTree( TQWidget *parent ) addDesktopGroup( TQString::null ); cleanupTree(); - connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), - TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), - TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) ); } // ---------------------------------------------------------------------- @@ -404,7 +404,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQToolButton *clearButton = new TQToolButton( this ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); clearButton->setFixedSize( clearButton->sizeHint() ); - connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClear() ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) ); hbox->addWidget( clearButton ); @@ -455,23 +455,23 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) edit->comboBox()->setAutoDeleteCompletionObject( true ); } - connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) ); - connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) ); + connect ( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOK()) ); + connect ( edit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged()) ); m_pTree = new TDEApplicationTree( this ); topLayout->addWidget(m_pTree); - connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) ); - connect( m_pTree, TQT_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) ); - connect( m_pTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - TQT_SLOT( slotDbClick() ) ); + connect( m_pTree, TQ_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) ); + connect( m_pTree, TQ_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) ); + connect( m_pTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + TQ_SLOT( slotDbClick() ) ); terminal = new TQCheckBox( i18n("Run in &terminal"), this ); if (bReadOnly) terminal->hide(); - connect(terminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminalToggled(bool))); + connect(terminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminalToggled(bool))); topLayout->addWidget(terminal); @@ -509,10 +509,10 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) d->ok = b->addButton( KStdGuiItem::ok() ); d->ok->setDefault( true ); - connect( d->ok, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOK() ) ); + connect( d->ok, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOK() ) ); TQPushButton* cancel = b->addButton( KStdGuiItem::cancel() ); - connect( cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( cancel, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) ); b->layout(); topLayout->addWidget( b ); diff --git a/tdeio/tdefile/kopenwith.h b/tdeio/tdefile/kopenwith.h index e0482b87a..99a047082 100644 --- a/tdeio/tdefile/kopenwith.h +++ b/tdeio/tdefile/kopenwith.h @@ -45,7 +45,7 @@ class KOpenWithDlgPrivate; */ class TDEIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4 { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h index 4f6d53107..ecdbdd6e6 100644 --- a/tdeio/tdefile/kopenwith_p.h +++ b/tdeio/tdefile/kopenwith_p.h @@ -73,7 +73,7 @@ protected: */ class TDEApplicationTree : public TDEListView { - Q_OBJECT + TQ_OBJECT public: TDEApplicationTree( TQWidget *parent ); diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp index c45330893..d5288e822 100644 --- a/tdeio/tdefile/kpreviewprops.cpp +++ b/tdeio/tdefile/kpreviewprops.cpp @@ -54,7 +54,7 @@ void KPreviewPropsPlugin::createLayout() preview = new KFileMetaPreview(topframe); tmp->addWidget(preview) ; - connect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); + connect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), TQ_SLOT( aboutToShowPage( TQWidget* ) ) ); } KPreviewPropsPlugin::~KPreviewPropsPlugin() @@ -79,10 +79,10 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items ) void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget ) { - if ( TQT_TQOBJECT(widget) != TQT_TQOBJECT(preview->parent()) ) + if ( widget != preview->parent() ) return; - disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); + disconnect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQ_SLOT( aboutToShowPage( TQWidget* ) ) ); preview->showPreview(properties->item()->url()); } diff --git a/tdeio/tdefile/kpreviewprops.h b/tdeio/tdefile/kpreviewprops.h index d934af22a..4e7e5fbf3 100644 --- a/tdeio/tdefile/kpreviewprops.h +++ b/tdeio/tdefile/kpreviewprops.h @@ -31,7 +31,7 @@ class KFileMetaPreview; */ class TDEIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdefile/kpreviewwidgetbase.h b/tdeio/tdefile/kpreviewwidgetbase.h index 3597070ee..ba3fed7dd 100644 --- a/tdeio/tdefile/kpreviewwidgetbase.h +++ b/tdeio/tdefile/kpreviewwidgetbase.h @@ -43,7 +43,7 @@ class KURL; */ class TDEIO_EXPORT KPreviewWidgetBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index fe2401191..3796d96ad 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -135,7 +135,7 @@ extern "C" { #include "kpropertiesdialog.h" -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN # include <win32_utils.h> #endif @@ -289,7 +289,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent, const char* name, bool modal) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString localPath = item->localPath(); if (!localPath.isEmpty()) return showWin32FilePropertyDialog(localPath); @@ -301,7 +301,7 @@ bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent, bool KPropertiesDialog::showDialog(const KURL& _url, TQWidget* parent, const char* name, bool modal) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (_url.isLocalFile()) return showWin32FilePropertyDialog( _url.path() ); #endif @@ -372,8 +372,8 @@ KPropertiesDialog::~KPropertiesDialog() void KPropertiesDialog::insertPlugin (KPropsDlgPlugin* plugin) { - connect (plugin, TQT_SIGNAL (changed ()), - plugin, TQT_SLOT (setDirty ())); + connect (plugin, TQ_SIGNAL (changed ()), + plugin, TQ_SLOT (setDirty ())); m_pageList.append (plugin); } @@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages() { KPropsDlgPlugin *plugin = KParts::ComponentFactory ::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(), - TQT_TQOBJECT(this), + this, (*it)->name().latin1() ); if ( !plugin ) continue; @@ -754,7 +754,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->setColStretch(1, 0); grid->setColStretch(2, 1); grid->addColSpacing(1, KDialog::spacingHint()); - vbl->addLayout(TQT_TQLAYOUT(grid)); + vbl->addLayout(grid); int curRow = 0; if ( !d->bMultiple ) @@ -890,8 +890,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) } iconButton->setIcon(iconStr); iconArea = iconButton; - connect( iconButton, TQT_SIGNAL( iconChanged(TQString) ), - this, TQT_SLOT( slotIconChanged() ) ); + connect( iconButton, TQ_SIGNAL( iconChanged(TQString) ), + this, TQ_SLOT( slotIconChanged() ) ); } else { TQLabel *iconLabel = new TQLabel( d->m_frame ); int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); @@ -906,7 +906,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) } iconArea = iconLabel; } - grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft); + grid->addWidget(iconArea, curRow, 0, TQt::AlignLeft); if (d->bMultiple || isTrash || isDevice || isMediaNode || hasRoot) { @@ -935,8 +935,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) d->m_lined->setSelection(0, lastDot); } - connect( d->m_lined, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( nameFileChanged(const TQString & ) ) ); + connect( d->m_lined, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( nameFileChanged(const TQString & ) ) ); } grid->addWidget(nameArea, curRow++, 2); @@ -956,7 +956,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) box->setSpacing(20); l = new TQLabel(mimeComment, box ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 //TODO: wrap for win32 or mac? TQPushButton *button = new TQPushButton(box); @@ -969,7 +969,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) else TQToolTip::add(button, i18n("Edit file type")); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() )); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() )); if (!kapp->authorizeTDEAction("editfiletype")) button->hide(); @@ -1024,14 +1024,14 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // buttons m_sizeDetermineButton = new TQPushButton( i18n("Calculate"), d->m_frame ); m_sizeStopButton = new TQPushButton( i18n("Stop"), d->m_frame ); - connect( m_sizeDetermineButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeDetermine() ) ); - connect( m_sizeStopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeStop() ) ); + connect( m_sizeDetermineButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeDetermine() ) ); + connect( m_sizeStopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeStop() ) ); sizelay->addWidget(m_sizeDetermineButton, 0); sizelay->addWidget(m_sizeStopButton, 0); sizelay->addStretch(10); // so that the buttons don't grow horizontally - // auto-launch for local dirs only, and not for '/' - if ( isLocal && !hasRoot ) + // auto-launch for local dirs only, but not for '/' or medias + if ( isReallyLocal && !hasRoot ) { m_sizeDetermineButton->setText( i18n("Refresh") ); slotSizeDetermine(); @@ -1110,9 +1110,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget( d->m_freeSpaceLabel, curRow++, 2 ); KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountPoint ); } @@ -1142,7 +1142,7 @@ void KFilePropsPlugin::setFileNameReadOnly( bool ro ) void KFilePropsPlugin::slotEditFileType() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQString mime; if ( d->mimeType == KMimeType::defaultMimeType() ) { int pos = d->oldFileName.findRev( '.' ); @@ -1274,11 +1274,11 @@ void KFilePropsPlugin::slotSizeDetermine() kdDebug(250) << " URL=" << properties->item()->url().url() << endl; d->dirSizeJob = KDirSize::dirSizeJob( properties->items() ); d->dirSizeUpdateTimer = new TQTimer(this); - connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotDirSizeUpdate() ) ); + connect( d->dirSizeUpdateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotDirSizeUpdate() ) ); d->dirSizeUpdateTimer->start(500); - connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); + connect( d->dirSizeJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); m_sizeStopButton->setEnabled(true); m_sizeDetermineButton->setEnabled(false); @@ -1291,9 +1291,9 @@ void KFilePropsPlugin::slotSizeDetermine() TQString mountPoint = TDEIO::findPathMountPoint( url.path() ); KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountPoint ); } @@ -1336,7 +1336,7 @@ void KFilePropsPlugin::applyChanges() kdDebug(250) << "KFilePropsPlugin::applyChanges" << endl; - if (nameArea->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + if (nameArea->inherits("TQLineEdit")) { TQString n = ((TQLineEdit *) nameArea)->text(); // Remove trailing spaces (#4345) @@ -1379,10 +1379,10 @@ void KFilePropsPlugin::applyChanges() job = TDEIO::copy( oldurl, properties->kurl() ); } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), - TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), + TQ_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); // wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -1450,7 +1450,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job ) void KFilePropsPlugin::applyIconChanges() { - TDEIconButton *iconButton = ::tqqt_cast<TDEIconButton *>( iconArea ); + TDEIconButton *iconButton = ::tqt_cast<TDEIconButton *>( iconArea ); if ( !iconButton || !d->bIconChanged ) return; // handle icon changes - only local files (or pseudo-local) for now @@ -1676,7 +1676,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TQPushButton* pbAdvancedPerm = 0; /* Group: Access Permissions */ - gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame ); + gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), d->m_frame ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); box->addWidget (gb); @@ -1698,7 +1698,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->ownerPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 1, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that the owner is allowed to do.")); lbl = new TQLabel( i18n("Gro&up:"), gb); @@ -1706,7 +1706,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->groupPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 2, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that the members of the group are allowed to do.")); lbl = new TQLabel( i18n("O&thers:"), gb); @@ -1714,7 +1714,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->othersPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 3, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that all users, who are neither " "owner nor in the group, are allowed to do.")); @@ -1723,7 +1723,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr i18n("Only own&er can rename and delete folder content") : i18n("Is &executable"), gb ); - connect( d->extraCheckbox, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) ); + connect( d->extraCheckbox, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) ); gl->addWidget(l, 4, 1); TQWhatsThis::add(l, hasDir ? i18n("Enable this option to allow only the folder's owner to " "delete or rename the contained files and folders. Other " @@ -1733,19 +1733,19 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr "sense for programs and scripts. It is required when you want to " "execute them.")); - TQLayoutItem *spacer = TQT_TQLAYOUTITEM(new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + TQLayoutItem *spacer = new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding); gl->addMultiCell(spacer, 5, 5, 0, 1); pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb); - gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, Qt::AlignRight); - connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() )); + gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, TQt::AlignRight); + connect(pbAdvancedPerm, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowAdvancedPermissions() )); } else d->extraCheckbox = 0; /**** Group: Ownership ****/ - gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame ); + gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Ownership"), d->m_frame ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); box->addWidget (gb); @@ -1781,8 +1781,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TDEGlobalSettings::CompletionNone); usrEdit->setText(strOwner); gl->addWidget(usrEdit, 1, 1); - connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( usrEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); } else { @@ -1863,8 +1863,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); grpEdit->setText(strGroup); gl->addWidget(grpEdit, 2, 1); - connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( grpEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); } else if ((groupList.count() > 1) && isMyFile && isLocal) { @@ -1872,8 +1872,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr grpCombo->insertStringList(groupList); grpCombo->setCurrentItem(groupList.findIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); - connect( grpCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( grpCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed() ) ); } else { @@ -1887,7 +1887,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr if ( hasDir && !isLink && !isTrash ) { d->cbRecursive = new TQCheckBox( i18n("Apply changes to all subfolders and their contents"), d->m_frame ); - connect( d->cbRecursive, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) ); + connect( d->cbRecursive, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) ); box->addWidget( d->cbRecursive ); } @@ -1941,7 +1941,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { TQVBox *mainVBox = dlg.makeVBoxMainWidget(); // Group: Access Permissions - gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox ); + gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), mainVBox ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); @@ -2146,7 +2146,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { d->fileSystemSupportsACLs = fileSystemSupportsACL( pathCString ); } if ( d->fileSystemSupportsACLs ) { - std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun( &TQWidget::hide ) ); + std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn( &TQWidget::hide ) ); extendedACLs = new KACLEditWidget( mainVBox ); if ( d->extendedACL.isValid() && d->extendedACL.isExtended() ) extendedACLs->setACL( d->extendedACL ); @@ -2553,8 +2553,8 @@ void KFilePermissionsPropsPlugin::applyChanges() if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2569,8 +2569,8 @@ void KFilePermissionsPropsPlugin::applyChanges() if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2641,8 +2641,8 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) URLEdit->setURL( URLStr ); } - connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( URLEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); layout->addStretch (1); } @@ -2798,14 +2798,14 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl else cbAutoEmbed->setNoChange(); - connect( patternEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( mimeEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( cbAutoEmbed, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); + connect( patternEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( mimeEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( cbAutoEmbed, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); } KBindingPropsPlugin::~KBindingPropsPlugin() @@ -2924,8 +2924,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP device = new TQComboBox( true, d->m_frame, "ComboBox_device" ); device->insertStringList( devices ); layout->addWidget(device, 0, 1); - connect( device, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotActivated( int ) ) ); + connect( device, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotActivated( int ) ) ); readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" ); readonly->setText( i18n("Read only") ); @@ -3018,17 +3018,17 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP unmounted->setIcon( unmountedStr ); - connect( device, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed() ) ); - connect( device, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( readonly, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( unmounted, TQT_SIGNAL( iconChanged( TQString ) ), - this, TQT_SIGNAL( changed() ) ); + connect( device, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed() ) ); + connect( device, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( readonly, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( unmounted, TQ_SIGNAL( iconChanged( TQString ) ), + this, TQ_SIGNAL( changed() ) ); - connect( device, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotDeviceChanged() ) ); + connect( device, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotDeviceChanged() ) ); processLockouts(); } @@ -3065,9 +3065,9 @@ void KDevicePropsPlugin::updateInfo() if ( !mountpoint->text().isEmpty() ) { KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountpoint->text() ); @@ -3187,16 +3187,16 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) w->pathEdit->setMode(KFile::Directory | KFile::LocalOnly); w->pathEdit->lineEdit()->setAcceptDrops(false); - connect( w->nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->commandEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->pathEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); + connect( w->nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->commandEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->pathEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); - connect( w->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) ); - connect( w->addFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFiletype() ) ); - connect( w->delFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelFiletype() ) ); - connect( w->advancedButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); + connect( w->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) ); + connect( w->addFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFiletype() ) ); + connect( w->delFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelFiletype() ) ); + connect( w->advancedButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdvanced() ) ); // now populate the page TQString path = _props->kurl().path(); @@ -3313,10 +3313,10 @@ void KDesktopPropsPlugin::slotAddFiletype() mw->listView->setFullWidth(true); mw->listView->setMinimumSize(500,400); - connect(mw->listView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectMimetype())); - connect(mw->listView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), - &dlg, TQT_SLOT( slotOk())); + connect(mw->listView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectMimetype())); + connect(mw->listView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), + &dlg, TQ_SLOT( slotOk())); TQMap<TQString,TQListViewItem*> majorMap; TQListViewItem *majorGroup; @@ -3577,22 +3577,22 @@ void KDesktopPropsPlugin::slotAdvanced() delete kcom; } - connect( w->terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->terminalCloseCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->terminalCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->suidCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->startupInfoCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->systrayCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->dcopCombo, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( w->terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->terminalCloseCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->terminalCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->suidCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->startupInfoCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->systrayCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->dcopCombo, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SIGNAL( changed() ) ); if ( dlg.exec() == TQDialog::Accepted ) { @@ -3702,7 +3702,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // The groupbox about swallowing TQGroupBox* tmpQGroupBox; tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame ); - tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); + tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal ); mainlayout->addWidget(tmpQGroupBox); @@ -3729,7 +3729,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // The groupbox about run in terminal tmpQGroupBox = new TQGroupBox( d->m_frame ); - tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); + tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal ); mainlayout->addWidget(tmpQGroupBox); @@ -3768,7 +3768,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // The groupbox about run with substituted uid. tmpQGroupBox = new TQGroupBox( d->m_frame ); - tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); + tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal ); mainlayout->addWidget(tmpQGroupBox); @@ -3851,27 +3851,27 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) delete kcom; } - connect( swallowExecEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( swallowTitleEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( execEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( swallowExecEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( swallowTitleEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( execEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); if (d->nocloseonexitCheck) - connect( d->nocloseonexitCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( terminalCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( suidCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - - connect( execBrowse, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) ); - connect( terminalCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableCheckedEdit() ) ); - connect( suidCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableSuidEdit() ) ); + connect( d->nocloseonexitCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( terminalCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( suidCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + + connect( execBrowse, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) ); + connect( terminalCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableCheckedEdit() ) ); + connect( suidCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableSuidEdit() ) ); } @@ -3988,21 +3988,21 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props addExtensionButton->setIconSet( iconSet ); pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); addExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect( addExtensionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotAddExtension() ) ); + connect( addExtensionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotAddExtension() ) ); delExtensionButton = new TQPushButton( TQString::null, d->m_frame ); iconSet = SmallIconSet( "forward" ); delExtensionButton->setIconSet( iconSet ); delExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect( delExtensionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDelExtension() ) ); + connect( delExtensionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDelExtension() ) ); TQLabel *l; TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - toplayout->addLayout(TQT_TQLAYOUT(grid)); + toplayout->addLayout(grid); if ( d->m_kdesktopMode ) { @@ -4038,7 +4038,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props grid->setColStretch(2, 1); grid->setRowStretch( 0, 1 ); grid->setRowStretch( 3, 1 ); - toplayout->addLayout(TQT_TQLAYOUT(grid), 2); + toplayout->addLayout(grid, 2); extensionsList = new TQListBox( d->m_frame ); extensionsList->setSelectionMode( TQListBox::Extended ); @@ -4092,26 +4092,26 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props updateButton(); - connect( extensionsList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( updateButton() ) ); - connect( availableExtensionsList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( updateButton() ) ); + connect( extensionsList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( updateButton() ) ); + connect( availableExtensionsList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( updateButton() ) ); - connect( addExtensionButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( changed() ) ); - connect( delExtensionButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( changed() ) ); + connect( addExtensionButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( changed() ) ); + connect( delExtensionButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( changed() ) ); if ( nameEdit ) - connect( nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( availableExtensionsList, TQT_SIGNAL( selected( int ) ), - this, TQT_SIGNAL( changed() ) ); - connect( extensionsList, TQT_SIGNAL( selected( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( availableExtensionsList, TQ_SIGNAL( selected( int ) ), + this, TQ_SIGNAL( changed() ) ); + connect( extensionsList, TQ_SIGNAL( selected( int ) ), + this, TQ_SIGNAL( changed() ) ); } TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin() diff --git a/tdeio/tdefile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h index 2ff0c576d..cc1f75b86 100644 --- a/tdeio/tdefile/kpropertiesdialog.h +++ b/tdeio/tdefile/kpropertiesdialog.h @@ -69,7 +69,7 @@ namespace TDEIO { class Job; } */ class TDEIO_EXPORT KPropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -436,7 +436,7 @@ private: */ class TDEIO_EXPORT KPropsDlgPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -494,7 +494,7 @@ private: */ class TDEIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -570,7 +570,7 @@ private: */ class TDEIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: enum PermissionsMode { PermissionsOnlyFiles = 0, @@ -656,7 +656,7 @@ private: */ class TDEIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -691,7 +691,7 @@ private: */ class TDEIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -721,7 +721,7 @@ private: */ class TDEIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: KDevicePropsPlugin( KPropertiesDialog *_props ); virtual ~KDevicePropsPlugin(); @@ -774,7 +774,7 @@ class KPropertiesDesktopBase; */ class TDEIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -825,7 +825,7 @@ private: /// Remove in KDE4 class TDEIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -881,7 +881,7 @@ private: /// Remove in KDE4 class TDEIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index 3912aced3..fa6d8ea47 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -377,7 +377,7 @@ KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& descri return item; } -void KURLBar::setOrientation( Qt::Orientation orient ) +void KURLBar::setOrientation( TQt::Orientation orient ) { m_listBox->setOrientation( orient ); setSizePolicy( TQSizePolicy( isVertical() ? @@ -388,7 +388,7 @@ void KURLBar::setOrientation( Qt::Orientation orient ) TQSizePolicy::Maximum )); } -Qt::Orientation KURLBar::orientation() const +TQt::Orientation KURLBar::orientation() const { return m_listBox->orientation(); } @@ -399,7 +399,7 @@ void KURLBar::setListBox( KURLBarListBox *view ) if ( !view ) { m_listBox = new KURLBarListBox( this, "urlbar listbox" ); - setOrientation( Qt::Vertical ); + setOrientation( TQt::Vertical ); } else { m_listBox = view; @@ -410,17 +410,17 @@ void KURLBar::setListBox( KURLBarListBox *view ) m_listBox->setSelectionMode( TDEListBox::Single ); paletteChange( palette() ); - m_listBox->setFocusPolicy( TQ_TabFocus ); + m_listBox->setFocusPolicy( TQWidget::TabFocus ); - connect( m_listBox, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - TQT_SLOT( slotSelected( int, TQListBoxItem * ))); - connect( m_listBox, TQT_SIGNAL( dropped( TQDropEvent * )), - this, TQT_SLOT( slotDropped( TQDropEvent * ))); - connect( m_listBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem *, + connect( m_listBox, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), + TQ_SLOT( slotSelected( int, TQListBoxItem * ))); + connect( m_listBox, TQ_SIGNAL( dropped( TQDropEvent * )), + this, TQ_SLOT( slotDropped( TQDropEvent * ))); + connect( m_listBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem *, const TQPoint& )), - TQT_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& ))); - connect( m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotSelected( TQListBoxItem * ) )); + TQ_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& ))); + connect( m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotSelected( TQListBoxItem * ) )); } void KURLBar::setIconSize( int size ) @@ -455,12 +455,12 @@ void KURLBar::resizeEvent( TQResizeEvent *e ) void KURLBar::paletteChange( const TQPalette & ) { TQPalette pal = palette(); - TQColor gray = pal.color( TQPalette::Normal, TQColorGroup::Background ); - TQColor selectedTextColor = pal.color( TQPalette::Normal, TQColorGroup::BrightText ); - TQColor foreground = pal.color( TQPalette::Normal, TQColorGroup::Foreground ); - pal.setColor( TQPalette::Normal, TQColorGroup::Base, gray ); - pal.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, selectedTextColor ); - pal.setColor( TQPalette::Normal, TQColorGroup::Text, foreground ); + TQColor gray = pal.color( TQPalette::Active, TQColorGroup::Background ); + TQColor selectedTextColor = pal.color( TQPalette::Active, TQColorGroup::BrightText ); + TQColor foreground = pal.color( TQPalette::Active, TQColorGroup::Foreground ); + pal.setColor( TQPalette::Active, TQColorGroup::Base, gray ); + pal.setColor( TQPalette::Active, TQColorGroup::HighlightedText, selectedTextColor ); + pal.setColor( TQPalette::Active, TQColorGroup::Text, foreground ); pal.setColor( TQPalette::Inactive, TQColorGroup::Base, gray ); pal.setColor( TQPalette::Inactive, TQColorGroup::HighlightedText, selectedTextColor ); pal.setColor( TQPalette::Inactive, TQColorGroup::Text, foreground ); @@ -520,7 +520,7 @@ TQSize KURLBar::minimumSizeHint() const void KURLBar::slotSelected( int button, TQListBoxItem *item ) { - if ( button != Qt::LeftButton ) + if ( button != TQt::LeftButton ) return; slotSelected( item ); @@ -877,9 +877,9 @@ void KURLBarListBox::contextMenuEvent( TQContextMenuEvent *e ) } } -void KURLBarListBox::setOrientation( Qt::Orientation orient ) +void KURLBarListBox::setOrientation( TQt::Orientation orient ) { - if ( orient == Qt::Vertical ) { + if ( orient == TQt::Vertical ) { setColumnMode( 1 ); setRowMode( Variable ); } @@ -985,7 +985,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, } else m_appLocal = 0L; - connect(m_urlEdit->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(urlChanged(const TQString & ))); + connect(m_urlEdit->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(urlChanged(const TQString & ))); m_edit->setFocus(); setMainWidget( box ); } diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h index 4939fa830..6fec32ee3 100644 --- a/tdeio/tdefile/kurlbar.h +++ b/tdeio/tdefile/kurlbar.h @@ -229,7 +229,7 @@ class KURLBarListBox; */ class TDEIO_EXPORT KURLBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: /** @@ -277,7 +277,7 @@ public: * horizontally in one row. * @see orientation */ - virtual void setOrientation( Qt::Orientation orient ); + virtual void setOrientation( TQt::Orientation orient ); /** * @returns the current orientation mode. * @see setOrientation @@ -382,7 +382,7 @@ public: /** * @returns true if the bar is in vertical mode. */ - bool isVertical() const { return orientation() == Qt::Vertical; } + bool isVertical() const { return orientation() == TQt::Vertical; } public slots: /** @@ -492,7 +492,7 @@ class KURLBarToolTip; */ class TDEIO_EXPORT KURLBarListBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: /** @@ -510,14 +510,14 @@ public: * column. * @see orientation */ - virtual void setOrientation( Qt::Orientation orient ); + virtual void setOrientation( TQt::Orientation orient ); /** * @returns the current orientation. * @see setOrientation */ - Qt::Orientation orientation() const { return m_orientation; } + TQt::Orientation orientation() const { return m_orientation; } - bool isVertical() const { return m_orientation == Qt::Vertical; } + bool isVertical() const { return m_orientation == TQt::Vertical; } signals: /** @@ -537,7 +537,7 @@ protected: virtual void paintEvent( TQPaintEvent* ); private: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; KURLBarToolTip *m_toolTip; protected: @@ -566,7 +566,7 @@ class KURLRequester; */ class TDEIO_EXPORT KURLBarItemDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp index 66fe8efb8..f19dbe961 100644 --- a/tdeio/tdefile/kurlcombobox.cpp +++ b/tdeio/tdefile/kurlcombobox.cpp @@ -74,7 +74,7 @@ void KURLComboBox::init( Mode mode ) opendirPix = SmallIcon(TQString::fromLatin1("folder_open")); - connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int ))); + connect( this, TQ_SIGNAL( activated( int )), TQ_SLOT( slotActivated( int ))); } diff --git a/tdeio/tdefile/kurlcombobox.h b/tdeio/tdefile/kurlcombobox.h index a1fd9182d..791d96a8e 100644 --- a/tdeio/tdefile/kurlcombobox.h +++ b/tdeio/tdefile/kurlcombobox.h @@ -40,7 +40,7 @@ */ class TDEIO_EXPORT KURLComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true) TQ_PROPERTY(int maxItems READ maxItems WRITE setMaxItems DESIGNABLE true) diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index 64e25b93c..aa88c34b7 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -112,16 +112,16 @@ public: void connectSignals( TQObject *receiver ) { TQObject *sender; if ( combo ) - sender = TQT_TQOBJECT(combo); + sender = combo; else - sender = TQT_TQOBJECT(edit); - - connect( sender, TQT_SIGNAL( textChanged( const TQString& )), - receiver, TQT_SIGNAL( textChanged( const TQString& ))); - connect( sender, TQT_SIGNAL( returnPressed() ), - receiver, TQT_SIGNAL( returnPressed() )); - connect( sender, TQT_SIGNAL( returnPressed( const TQString& ) ), - receiver, TQT_SIGNAL( returnPressed( const TQString& ) )); + sender = edit; + + connect( sender, TQ_SIGNAL( textChanged( const TQString& )), + receiver, TQ_SIGNAL( textChanged( const TQString& ))); + connect( sender, TQ_SIGNAL( returnPressed() ), + receiver, TQ_SIGNAL( returnPressed() )); + connect( sender, TQ_SIGNAL( returnPressed( const TQString& ) ), + receiver, TQ_SIGNAL( returnPressed( const TQString& ) )); } void setCompletionObject( TDECompletion *comp ) { @@ -212,7 +212,7 @@ void KURLRequester::init() myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); TQToolTip::add(myButton, i18n("Open file dialog")); - connect( myButton, TQT_SIGNAL( pressed() ), TQT_SLOT( slotUpdateURL() )); + connect( myButton, TQ_SIGNAL( pressed() ), TQ_SLOT( slotUpdateURL() )); setSpacing( KDialog::spacingHint() ); @@ -220,14 +220,14 @@ void KURLRequester::init() widget->installEventFilter( this ); setFocusProxy( widget ); - d->connectSignals( TQT_TQOBJECT(this) ); - connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() )); + d->connectSignals( this ); + connect( myButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenDialog() )); myCompletion = new KURLCompletion(); d->setCompletionObject( myCompletion ); TDEAccel *accel = new TDEAccel( this ); - accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() )); + accel->insert( TDEStdAccel::Open, this, TQ_SLOT( slotOpenDialog() )); accel->readSettings(); } @@ -386,7 +386,7 @@ void KURLRequester::slotUpdateURL() bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev ) { - if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) ) + if ( ( d->edit == obj ) || ( d->combo == obj ) ) { if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut )) // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml diff --git a/tdeio/tdefile/kurlrequester.h b/tdeio/tdefile/kurlrequester.h index 5655efa5b..6ed9e8d37 100644 --- a/tdeio/tdefile/kurlrequester.h +++ b/tdeio/tdefile/kurlrequester.h @@ -55,7 +55,7 @@ class TQTimer; */ class TDEIO_EXPORT KURLRequester : public TQHBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString url READ url WRITE setURL ) TQ_PROPERTY( bool showLocalProtocol READ showLocalProtocol WRITE setShowLocalProtocol ) TQ_PROPERTY( TQString filter READ filter WRITE setFilter ) @@ -289,7 +289,7 @@ private: */ class TDEIO_EXPORT KURLComboRequester : public KURLRequester { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a KURLRequester widget with a combobox. diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp index 9f2ea9d46..a5ad1f07d 100644 --- a/tdeio/tdefile/kurlrequesterdlg.cpp +++ b/tdeio/tdefile/kurlrequesterdlg.cpp @@ -70,8 +70,8 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); urlRequester_->setFocus(); - connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&)) ); + connect( urlRequester_->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&)) ); bool state = !urlName.isEmpty(); enableButtonOK( state ); enableButton( KDialogBase::User1, state ); @@ -80,7 +80,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) KFile::ExistingOnly ); urlRequester_->setMode( mode ); */ - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotClear() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotClear() ) ); } void KURLRequesterDlg::slotTextChanged(const TQString & text) diff --git a/tdeio/tdefile/kurlrequesterdlg.h b/tdeio/tdefile/kurlrequesterdlg.h index ef97ececf..5fdbe8315 100644 --- a/tdeio/tdefile/kurlrequesterdlg.h +++ b/tdeio/tdefile/kurlrequesterdlg.h @@ -37,7 +37,7 @@ class KFileDialog; */ class TDEIO_EXPORT KURLRequesterDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index c7dc845cc..9bf947f20 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -124,16 +124,16 @@ KDirOperator::KDirOperator(const KURL& _url, setDirLister( new KDirLister( true ) ); - connect(&myCompletion, TQT_SIGNAL(match(const TQString&)), - TQT_SLOT(slotCompletionMatch(const TQString&))); + connect(&myCompletion, TQ_SIGNAL(match(const TQString&)), + TQ_SLOT(slotCompletionMatch(const TQString&))); progress = new KProgress(this, "progress"); progress->adjustSize(); progress->move(2, height() - progress->height() -2); d->progressDelayTimer = new TQTimer( this, "progress delay timer" ); - connect( d->progressDelayTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotShowProgress() )); + connect( d->progressDelayTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotShowProgress() )); myCompleteListDirty = false; @@ -144,7 +144,7 @@ KDirOperator::KDirOperator(const KURL& _url, setupActions(); setupMenu(); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); } KDirOperator::~KDirOperator() @@ -192,10 +192,10 @@ void KDirOperator::insertViewDependentActions() { if (viewActionCollection) { - disconnect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )), - this, TQT_SLOT( slotViewActionAdded( TDEAction * ))); - disconnect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )), - this, TQT_SLOT( slotViewActionRemoved( TDEAction * ))); + disconnect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )), + this, TQ_SLOT( slotViewActionAdded( TDEAction * ))); + disconnect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )), + this, TQ_SLOT( slotViewActionRemoved( TDEAction * ))); } viewActionMenu->popupMenu()->clear(); @@ -237,10 +237,10 @@ void KDirOperator::insertViewDependentActions() } } - connect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )), - TQT_SLOT( slotViewActionAdded( TDEAction * ))); - connect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )), - TQT_SLOT( slotViewActionRemoved( TDEAction * ))); + connect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )), + TQ_SLOT( slotViewActionAdded( TDEAction * ))); + connect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )), + TQ_SLOT( slotViewActionRemoved( TDEAction * ))); } } @@ -719,7 +719,7 @@ void KDirOperator::pathChanged() TQApplication::restoreOverrideCursor(); // when TDEIO::Job emits finished, the slot will restore the cursor - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); if ( !isReadable( currUrl )) { KMessageBox::error(viewWidget(), @@ -1050,18 +1050,18 @@ void KDirOperator::connectView(KFileView *view) viewActionCollection = 0L; KFileViewSignaler *sig = view->signaler(); - connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), - this, TQT_SLOT( activatedMenu(const KFileItem *, const TQPoint& ))); - connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *) ), - this, TQT_SLOT( selectDir(const KFileItem*) ) ); - connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *) ), - this, TQT_SLOT( selectFile(const KFileItem*) ) ); - connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ), - this, TQT_SLOT( highlightFile(const KFileItem*) )); - connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - this, TQT_SLOT( slotViewSortingChanged( TQDir::SortSpec ))); - connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), - this, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) ); + connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), + this, TQ_SLOT( activatedMenu(const KFileItem *, const TQPoint& ))); + connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *) ), + this, TQ_SLOT( selectDir(const KFileItem*) ) ); + connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *) ), + this, TQ_SLOT( selectFile(const KFileItem*) ) ); + connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ), + this, TQ_SLOT( highlightFile(const KFileItem*) )); + connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + this, TQ_SLOT( slotViewSortingChanged( TQDir::SortSpec ))); + connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), + this, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) ); if ( reverseAction->isChecked() != m_fileView->isReversed() ) slotSortReversed(); @@ -1071,7 +1071,7 @@ void KDirOperator::connectView(KFileView *view) m_fileView->widget()->show(); if ( listDir ) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); openURL( currUrl ); } else @@ -1124,20 +1124,20 @@ void KDirOperator::setDirLister( KDirLister *lister ) dir->setMainWindow (mainWidget); kdDebug (tdefile_area) << "mainWidget=" << mainWidget << endl; - connect( dir, TQT_SIGNAL( percent( int )), - TQT_SLOT( slotProgress( int ) )); - connect( dir, TQT_SIGNAL(started( const KURL& )), TQT_SLOT(slotStarted())); - connect( dir, TQT_SIGNAL(newItems(const KFileItemList &)), - TQT_SLOT(insertNewFiles(const KFileItemList &))); - connect( dir, TQT_SIGNAL(completed()), TQT_SLOT(slotIOFinished())); - connect( dir, TQT_SIGNAL(canceled()), TQT_SLOT(slotCanceled())); - connect( dir, TQT_SIGNAL(deleteItem(KFileItem *)), - TQT_SLOT(itemDeleted(KFileItem *))); - connect( dir, TQT_SIGNAL(redirection( const KURL& )), - TQT_SLOT( slotRedirected( const KURL& ))); - connect( dir, TQT_SIGNAL( clear() ), TQT_SLOT( slotClearView() )); - connect( dir, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) ); + connect( dir, TQ_SIGNAL( percent( int )), + TQ_SLOT( slotProgress( int ) )); + connect( dir, TQ_SIGNAL(started( const KURL& )), TQ_SLOT(slotStarted())); + connect( dir, TQ_SIGNAL(newItems(const KFileItemList &)), + TQ_SLOT(insertNewFiles(const KFileItemList &))); + connect( dir, TQ_SIGNAL(completed()), TQ_SLOT(slotIOFinished())); + connect( dir, TQ_SIGNAL(canceled()), TQ_SLOT(slotCanceled())); + connect( dir, TQ_SIGNAL(deleteItem(KFileItem *)), + TQ_SLOT(itemDeleted(KFileItem *))); + connect( dir, TQ_SIGNAL(redirection( const KURL& )), + TQ_SLOT( slotRedirected( const KURL& ))); + connect( dir, TQ_SIGNAL( clear() ), TQ_SLOT( slotClearView() )); + connect( dir, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); } void KDirOperator::insertNewFiles(const KFileItemList &newone) @@ -1163,7 +1163,7 @@ void KDirOperator::insertNewFiles(const KFileItemList &newone) ++it; } - TQTimer::singleShot(200, this, TQT_SLOT(resetCursor())); + TQTimer::singleShot(200, this, TQ_SLOT(resetCursor())); } void KDirOperator::selectDir(const KFileItem *item) @@ -1253,26 +1253,26 @@ void KDirOperator::slotCompletionMatch(const TQString& match) void KDirOperator::setupActions() { - myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" ); + myActionCollection = new TDEActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); - upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" ); + upAction = KStdAction::up( this, TQ_SLOT( cdUp() ), myActionCollection, "up" ); upAction->setText( i18n("Parent Folder") ); - backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" ); - forwardAction = KStdAction::forward( TQT_TQOBJECT(this), TQT_SLOT(forward()), myActionCollection, "forward" ); - homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" ); + backAction = KStdAction::back( this, TQ_SLOT( back() ), myActionCollection, "back" ); + forwardAction = KStdAction::forward( this, TQ_SLOT(forward()), myActionCollection, "forward" ); + homeAction = KStdAction::home( this, TQ_SLOT( home() ), myActionCollection, "home" ); homeAction->setText(i18n("Home Folder")); - reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" ); + reloadAction = KStdAction::redisplay( this, TQ_SLOT(rereadDir()), myActionCollection, "reload" ); actionSeparator = new TDEActionSeparator( myActionCollection, "separator" ); d->viewActionSeparator = new TDEActionSeparator( myActionCollection, "viewActionSeparator" ); mkdirAction = new TDEAction( i18n("New Folder..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); + this, TQ_SLOT( mkdir() ), myActionCollection, "mkdir" ); TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); - connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); + connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, this, + TQ_SLOT( deleteSelected() ), myActionCollection, "delete" ); mkdirAction->setIcon( TQString::fromLatin1("folder-new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload )); @@ -1281,16 +1281,16 @@ void KDirOperator::setupActions() // the sort menu actions sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu"); byNameAction = new TDERadioAction( i18n("By Name"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ), + this, TQ_SLOT( slotSortByName() ), myActionCollection, "by name" ); byDateAction = new TDERadioAction( i18n("By Date"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ), + this, TQ_SLOT( slotSortByDate() ), myActionCollection, "by date" ); bySizeAction = new TDERadioAction( i18n("By Size"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ), + this, TQ_SLOT( slotSortBySize() ), myActionCollection, "by size" ); reverseAction = new TDEToggleAction( i18n("Reverse"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ), + this, TQ_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); TQString sortGroup = TQString::fromLatin1("sort"); @@ -1304,17 +1304,17 @@ void KDirOperator::setupActions() caseInsensitiveAction = new TDEToggleAction(i18n("Case Insensitive"), 0, myActionCollection, "case insensitive" ); - connect( dirsFirstAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleDirsFirst() )); - connect( caseInsensitiveAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleIgnoreCase() )); + connect( dirsFirstAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleDirsFirst() )); + connect( caseInsensitiveAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleIgnoreCase() )); // the view menu actions viewActionMenu = new TDEActionMenu( i18n("&View"), myActionCollection, "view menu" ); - connect( viewActionMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( insertViewDependentActions() )); + connect( viewActionMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( insertViewDependentActions() )); shortAction = new TDERadioAction( i18n("Short View"), "view_multicolumn", TDEShortcut(), myActionCollection, "short view" ); @@ -1325,31 +1325,31 @@ void KDirOperator::setupActions() myActionCollection, "show hidden" ); // showHiddenAction->setCheckedState( i18n("Hide Hidden Files") ); separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(), - TQT_TQOBJECT(this), - TQT_SLOT(slotSeparateDirs()), + this, + TQ_SLOT(slotSeparateDirs()), myActionCollection, "separate dirs" ); TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"), "thumbnail", TDEShortcut(), myActionCollection, "preview" ); previewAction->setCheckedState(i18n("Hide Preview")); - connect( previewAction, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( togglePreview( bool ))); + connect( previewAction, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( togglePreview( bool ))); TQString viewGroup = TQString::fromLatin1("view"); shortAction->setExclusiveGroup( viewGroup ); detailedAction->setExclusiveGroup( viewGroup ); - connect( shortAction, TQT_SIGNAL( activated() ), - TQT_SLOT( slotSimpleView() )); - connect( detailedAction, TQT_SIGNAL( activated() ), - TQT_SLOT( slotDetailedView() )); - connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleHidden( bool ) )); + connect( shortAction, TQ_SIGNAL( activated() ), + TQ_SLOT( slotSimpleView() )); + connect( detailedAction, TQ_SIGNAL( activated() ), + TQ_SLOT( slotDetailedView() )); + connect( showHiddenAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleHidden( bool ) )); - new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this), - TQT_SLOT(slotProperties()), myActionCollection, "properties" ); + new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), this, + TQ_SLOT(slotProperties()), myActionCollection, "properties" ); } void KDirOperator::setupMenu() @@ -1560,7 +1560,7 @@ void KDirOperator::resizeEvent( TQResizeEvent * ) if (m_fileView) m_fileView->widget()->resize( size() ); - if ( TQT_BASE_OBJECT(progress->parent()) == TQT_BASE_OBJECT(this) ) // might be reparented into a statusbar + if ( progress->parent() == this ) // might be reparented into a statusbar progress->move(2, height() - progress->height() -2); } diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h index 915b27c88..89b1a1709 100644 --- a/tdeio/tdefile/tdediroperator.h +++ b/tdeio/tdefile/tdediroperator.h @@ -72,14 +72,14 @@ namespace TDEIO { * \code * KDirOperator *op = new KDirOperator( KURL( "file:/home/gis" ), this ); * // some signals you might be interested in - * connect(op, TQT_SIGNAL(urlEntered(const KURL&)), - * TQT_SLOT(urlEntered(const KURL&))); - * connect(op, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - * TQT_SLOT(fileHighlighted(const KFileItem *))); - * connect(op, TQT_SIGNAL(fileSelected(const KFileItem *)), - * TQT_SLOT(fileSelected(const KFileItem *))); - * connect(op, TQT_SIGNAL(finishedLoading()), - * TQT_SLOT(slotLoadingFinished())); + * connect(op, TQ_SIGNAL(urlEntered(const KURL&)), + * TQ_SLOT(urlEntered(const KURL&))); + * connect(op, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + * TQ_SLOT(fileHighlighted(const KFileItem *))); + * connect(op, TQ_SIGNAL(fileSelected(const KFileItem *)), + * TQ_SLOT(fileSelected(const KFileItem *))); + * connect(op, TQ_SIGNAL(finishedLoading()), + * TQ_SLOT(slotLoadingFinished())); * * op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" ); * op->setView(KFile::Default); @@ -95,7 +95,7 @@ namespace TDEIO { */ class TDEIO_EXPORT KDirOperator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/tdefilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h index e13e0673b..092eba9de 100644 --- a/tdeio/tdefile/tdefilebookmarkhandler.h +++ b/tdeio/tdefile/tdefilebookmarkhandler.h @@ -28,7 +28,7 @@ class TDEPopupMenu; class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: KFileBookmarkHandler( KFileDialog *dialog ); diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp index 724d20218..321684ac7 100644 --- a/tdeio/tdefile/tdefiledetailview.cpp +++ b/tdeio/tdefile/tdefiledetailview.cpp @@ -72,21 +72,21 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name) setAllColumnsShowFocus( true ); setDragEnabled(true); - connect( header(), TQT_SIGNAL( clicked(int)), - TQT_SLOT(slotSortingChanged(int) )); + connect( header(), TQ_SIGNAL( clicked(int)), + TQ_SLOT(slotSortingChanged(int) )); - connect( this, TQT_SIGNAL( returnPressed(TQListViewItem *) ), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQListViewItem *) ), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( selected( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( selected( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); + this, TQ_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); KFile::SelectionMode sm = KFileView::selectionMode(); switch ( sm ) { @@ -107,15 +107,15 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name) // for highlighting if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( highlighted( TQListViewItem * ) )); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( highlighted( TQListViewItem * ) )); // DND - connect( &(d->autoOpenTimer), TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpen() )); + connect( &(d->autoOpenTimer), TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpen() )); setSorting( sorting() ); @@ -253,8 +253,8 @@ void KFileDetailView::highlighted( TQListViewItem *item ) void KFileDetailView::setSelectionMode( KFile::SelectionMode sm ) { - disconnect( this, TQT_SIGNAL( selectionChanged() )); - disconnect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) )); + disconnect( this, TQ_SIGNAL( selectionChanged() )); + disconnect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) )); KFileView::setSelectionMode( sm ); @@ -275,11 +275,11 @@ void KFileDetailView::setSelectionMode( KFile::SelectionMode sm ) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * )), - TQT_SLOT( highlighted( TQListViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * )), + TQ_SLOT( highlighted( TQListViewItem * ))); } bool KFileDetailView::isSelected( const KFileItem *i ) const diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h index add8cd988..f40b5b374 100644 --- a/tdeio/tdefile/tdefiledetailview.h +++ b/tdeio/tdefile/tdefiledetailview.h @@ -107,7 +107,7 @@ private: */ class TDEIO_EXPORT KFileDetailView : public TDEListView, public KFileView { - Q_OBJECT + TQ_OBJECT public: KFileDetailView(TQWidget *parent, const char *name); diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index 0362998b2..cf5d97692 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -88,7 +88,7 @@ #include <tdefilespeedbar.h> #include <tdefilebookmarkhandler.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <fixx11h.h> #endif @@ -561,8 +561,8 @@ void KFileDialog::slotOk() job->setWindow (topLevelWidget()); TDEIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotStatResult( TDEIO::Job *) )); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotStatResult( TDEIO::Job *) )); } return; } @@ -570,7 +570,7 @@ void KFileDialog::slotOk() job = TDEIO::stat(d->url,!d->url.isLocalFile()); job->setWindow (topLevelWidget()); d->statJobs.append( job ); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotStatResult(TDEIO::Job*))); } @@ -770,11 +770,11 @@ void KFileDialog::setLocationText( const TQString& text ) // setCurrentItem() will cause textChanged() being emitted, // so slotLocationChanged() will be called. Make sure we don't clear // the KDirOperator's view-selection in there - disconnect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotLocationChanged( const TQString& ) ) ); + disconnect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotLocationChanged( const TQString& ) ) ); locationEdit->setCurrentItem( 0 ); - connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLocationChanged( const TQString& )) ); + connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLocationChanged( const TQString& )) ); locationEdit->setEditText( text ); // don't change selection when user has clicked on an item @@ -827,17 +827,17 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget ); d->okButton->setDefault( true ); d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget); - connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() )); - connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() )); + connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() )); + connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() )); d->customWidget = widget; d->autoSelectExtCheckBox = 0; // delayed loading d->autoSelectExtChecked = false; d->urlBar = 0; // delayed loading - TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); + TQtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true); toolbar->setFlat(true); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, toolbar, "path combo" ); @@ -896,14 +896,14 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops"); ops->setOnlyDoubleClickSelectsFiles( true ); - connect(ops, TQT_SIGNAL(urlEntered(const KURL&)), - TQT_SLOT(urlEntered(const KURL&))); - connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); - connect(ops, TQT_SIGNAL(finishedLoading()), - TQT_SLOT(slotLoadingFinished())); + connect(ops, TQ_SIGNAL(urlEntered(const KURL&)), + TQ_SLOT(urlEntered(const KURL&))); + connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); + connect(ops, TQ_SIGNAL(finishedLoading()), + TQ_SLOT(slotLoadingFinished())); ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | @@ -928,16 +928,16 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge TDEToggleAction *showSidebarAction = new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); showSidebarAction->setCheckedState(i18n("Hide Quick Access Navigation Panel")); - connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleSpeedbar( bool )) ); + connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleSpeedbar( bool )) ); TDEToggleAction *showBookmarksAction = new TDEToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks"); showBookmarksAction->setCheckedState(i18n("Hide Bookmarks")); - connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleBookmarks( bool )) ); + connect( showBookmarksAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleBookmarks( bool )) ); - TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" ); + TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " "Various options can be accessed from this menu including: <ul>" "<li>how files are sorted in the list</li>" @@ -963,12 +963,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge menu->insert( coll->action( "separate dirs" )); menu->setDelayed( false ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - ops, TQT_SLOT( updateSelectionDependentActions() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + ops, TQ_SLOT( updateSelectionDependentActions() )); menu->plug( toolbar ); //Insert a separator. - TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(Qt::Horizontal, false /*no line*/, + TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(TQt::Horizontal, false /*no line*/, toolbar); d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget); toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo); @@ -984,12 +984,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->pathCombo->setCompletionObject( pathCompletionObj ); d->pathCombo->setAutoDeleteCompletionObject( true ); - connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( enterURL( const KURL& ) )); - connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( enterURL( const KURL& ) )); + connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); TQString whatsThisText; @@ -998,8 +998,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge locationEdit = new KURLComboBox(KURLComboBox::Files, true, d->mainWidget, "LocationEdit"); locationEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLocationChanged( const TQString& )) ); + connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLocationChanged( const TQString& )) ); updateLocationWhatsThis (); d->locationLabel->setBuddy(locationEdit); @@ -1011,13 +1011,13 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge fileCompletionObj->setDir( dir ); locationEdit->setCompletionObject( fileCompletionObj ); locationEdit->setAutoDeleteCompletionObject( true ); - connect( fileCompletionObj, TQT_SIGNAL( match( const TQString& ) ), - TQT_SLOT( fileCompletion( const TQString& )) ); + connect( fileCompletionObj, TQ_SIGNAL( match( const TQString& ) ), + TQ_SLOT( fileCompletion( const TQString& )) ); - connect( locationEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotOk())); - connect(locationEdit, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( locationActivated( const TQString& ) )); + connect( locationEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotOk())); + connect(locationEdit, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( locationActivated( const TQString& ) )); // the Filter label/edit whatsThisText = i18n("<qt>This is the filter to apply to the file list. " @@ -1034,12 +1034,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge TQWhatsThis::add(filterWidget, whatsThisText); setFilter(filter); d->filterLabel->setBuddy(filterWidget); - connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged())); + connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged())); // the Automatically Select Extension checkbox // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig()) d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget); - connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked())); + connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked())); initGUI(); // activate GM @@ -1056,8 +1056,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge void KFileDialog::initSpeedbar() { d->urlBar = new KFileSpeedBar( d->mainWidget, "url bar" ); - connect( d->urlBar, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( enterURL( const KURL& )) ); + connect( d->urlBar, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( enterURL( const KURL& )) ); // need to set the current url of the urlbar manually (not via urlEntered() // here, because the initial url of KDirOperator might be the same as the @@ -1083,17 +1083,17 @@ void KFileDialog::initGUI() TQGridLayout* lafBox= new TQGridLayout(2, 3, KDialog::spacingHint()); - lafBox->addWidget(d->locationLabel, 0, 0, Qt::AlignVCenter); - lafBox->addWidget(locationEdit, 0, 1, Qt::AlignVCenter); - lafBox->addWidget(d->okButton, 0, 2, Qt::AlignVCenter); + lafBox->addWidget(d->locationLabel, 0, 0, TQt::AlignVCenter); + lafBox->addWidget(locationEdit, 0, 1, TQt::AlignVCenter); + lafBox->addWidget(d->okButton, 0, 2, TQt::AlignVCenter); - lafBox->addWidget(d->filterLabel, 1, 0, Qt::AlignVCenter); - lafBox->addWidget(filterWidget, 1, 1, Qt::AlignVCenter); - lafBox->addWidget(d->cancelButton, 1, 2, Qt::AlignVCenter); + lafBox->addWidget(d->filterLabel, 1, 0, TQt::AlignVCenter); + lafBox->addWidget(filterWidget, 1, 1, TQt::AlignVCenter); + lafBox->addWidget(d->cancelButton, 1, 2, TQt::AlignVCenter); lafBox->setColStretch(1, 4); - vbox->addLayout(TQT_TQLAYOUT(lafBox), 0); + vbox->addLayout(lafBox, 0); vbox->addSpacing(3); // add the Automatically Select Extension checkbox @@ -1336,9 +1336,9 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir, const TQString& filter, WId parent_id, const TQString& caption) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KFileDialog dlg(startDir, filter, parent, "filedialog", true); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id != 0 ) XSetTransientForHint( tqt_xdisplay(), dlg.winId(), parent_id ); #else @@ -1413,7 +1413,7 @@ TQString KFileDialog::getExistingDirectory(const TQString& startDir, TQWidget *parent, const TQString& caption) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return TQFileDialog::getExistingDirectory(startDir, parent, "getExistingDirectory", caption, true, true); #else @@ -1618,9 +1618,9 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi const TQString& caption) { bool specialDir = dir.at(0) == ':'; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id != 0 ) XSetTransientForHint(tqt_xdisplay(), dlg.winId(), parent_id); #else @@ -2263,8 +2263,8 @@ void KFileDialog::toggleBookmarks(bool show) } d->bookmarkHandler = new KFileBookmarkHandler( this ); - connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - TQT_SLOT( enterURL( const TQString& ))); + connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + TQ_SLOT( enterURL( const TQString& ))); toolbar->insertButton(TQString::fromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h index cd94ebe51..9807893d0 100644 --- a/tdeio/tdefile/tdefiledialog.h +++ b/tdeio/tdefile/tdefiledialog.h @@ -75,7 +75,7 @@ struct KFileDialogPrivate; */ class TDEIO_EXPORT KFileDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -713,7 +713,7 @@ public: * items into it, e.g.: * \code * yourAction = new TDEAction( i18n("Your Action"), 0, - * this, TQT_SLOT( yourSlot() ), + * this, TQ_SLOT( yourSlot() ), * this, "action name" ); * yourAction->plug( tdefileDialog->toolBar() ); * \endcode diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp index ed41f8f82..de4d45518 100644 --- a/tdeio/tdefile/tdefilefiltercombo.cpp +++ b/tdeio/tdefile/tdefilefiltercombo.cpp @@ -49,9 +49,9 @@ KFileFilterCombo::KFileFilterCombo( TQWidget *parent, const char *name) { setTrapReturnKey( true ); setInsertionPolicy(NoInsertion); - connect( this, TQT_SIGNAL( activated( int )), this, TQT_SIGNAL( filterChanged() )); - connect( this, TQT_SIGNAL( returnPressed() ), this, TQT_SIGNAL( filterChanged() )); - connect( this, TQT_SIGNAL( filterChanged() ), TQT_SLOT( slotFilterChanged() )); + connect( this, TQ_SIGNAL( activated( int )), this, TQ_SIGNAL( filterChanged() )); + connect( this, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( filterChanged() )); + connect( this, TQ_SIGNAL( filterChanged() ), TQ_SLOT( slotFilterChanged() )); m_allTypes = false; } @@ -179,7 +179,7 @@ void KFileFilterCombo::slotFilterChanged() bool KFileFilterCombo::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit()) && e->type() == TQEvent::FocusOut ) { + if ( o == lineEdit() && e->type() == TQEvent::FocusOut ) { if ( currentText() != d->lastFilter ) emit filterChanged(); } diff --git a/tdeio/tdefile/tdefilefiltercombo.h b/tdeio/tdefile/tdefilefiltercombo.h index f448003bb..1f1f40db9 100644 --- a/tdeio/tdefile/tdefilefiltercombo.h +++ b/tdeio/tdefile/tdefilefiltercombo.h @@ -30,7 +30,7 @@ class KFileFilterComboPrivate; class TDEIO_EXPORT KFileFilterCombo : public KComboBox { - Q_OBJECT + TQ_OBJECT public: KFileFilterCombo(TQWidget *parent= 0, const char *name= 0); diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp index e2d726319..65d33912b 100644 --- a/tdeio/tdefile/tdefileiconview.cpp +++ b/tdeio/tdefile/tdefileiconview.cpp @@ -59,13 +59,13 @@ public: noArrangement = false; ignoreMaximumSize = false; - smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent), - TQT_SLOT( slotSmallColumns() ), + smallColumns = new TDERadioAction( i18n("Small Icons"), 0, parent, + TQ_SLOT( slotSmallColumns() ), parent->actionCollection(), "small columns" ); - largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent), - TQT_SLOT( slotLargeRows() ), + largeRows = new TDERadioAction( i18n("Large Icons"), 0, parent, + TQ_SLOT( slotLargeRows() ), parent->actionCollection(), "large rows" ); @@ -75,22 +75,22 @@ public: previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), "show previews" ); - zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ), + zoomIn = KStdAction::zoomIn( parent, TQ_SLOT( zoomIn() ), parent->actionCollection(), "zoomIn" ); - zoomOut = KStdAction::zoomOut( TQT_TQOBJECT(parent), TQT_SLOT( zoomOut() ), + zoomOut = KStdAction::zoomOut( parent, TQ_SLOT( zoomOut() ), parent->actionCollection(), "zoomOut" ); previews->setGroup("previews"); zoomIn->setGroup("previews"); zoomOut->setGroup("previews"); - connect( previews, TQT_SIGNAL( toggled( bool )), - parent, TQT_SLOT( slotPreviewsToggled( bool ))); + connect( previews, TQ_SIGNAL( toggled( bool )), + parent, TQ_SLOT( slotPreviewsToggled( bool ))); - connect( &previewTimer, TQT_SIGNAL( timeout() ), - parent, TQT_SLOT( showPreviews() )); - connect( &autoOpenTimer, TQT_SIGNAL( timeout() ), - parent, TQT_SLOT( slotAutoOpen() )); + connect( &previewTimer, TQ_SIGNAL( timeout() ), + parent, TQ_SLOT( showPreviews() )); + connect( &autoOpenTimer, TQ_SIGNAL( timeout() ), + parent, TQ_SLOT( slotAutoOpen() )); } ~KFileIconViewPrivate() { @@ -133,21 +133,21 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name) slotSmallColumns(); d->smallColumns->setChecked( true ); - connect( this, TQT_SIGNAL( returnPressed(TQIconViewItem *) ), - TQT_SLOT( slotActivate( TQIconViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQIconViewItem *) ), + TQ_SLOT( slotActivate( TQIconViewItem *) ) ); // we want single click _and_ double click (as convenience) - connect( this, TQT_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ), - TQT_SLOT( selected( TQIconViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ), - TQT_SLOT( slotActivate( TQIconViewItem *) ) ); - - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - TQT_SLOT( showToolTip( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), - TQT_SLOT( removeToolTip() ) ); - connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)), - TQT_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ), + TQ_SLOT( selected( TQIconViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ), + TQ_SLOT( slotActivate( TQIconViewItem *) ) ); + + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + TQ_SLOT( showToolTip( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + TQ_SLOT( removeToolTip() ) ); + connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)), + TQ_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) ); KFile::SelectionMode sm = KFileView::selectionMode(); switch ( sm ) { @@ -167,11 +167,11 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )), - TQT_SLOT( highlighted( TQIconViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )), + TQ_SLOT( highlighted( TQIconViewItem * ))); viewport()->installEventFilter( this ); @@ -398,8 +398,8 @@ void KFileIconView::highlighted( TQIconViewItem *item ) void KFileIconView::setSelectionMode( KFile::SelectionMode sm ) { - disconnect( TQT_SIGNAL( selectionChanged() ), this ); - disconnect( TQT_SIGNAL( selectionChanged( TQIconViewItem * )), this ); + disconnect( TQ_SIGNAL( selectionChanged() ), this ); + disconnect( TQ_SIGNAL( selectionChanged( TQIconViewItem * )), this ); KFileView::setSelectionMode( sm ); switch ( KFileView::selectionMode() ) { @@ -419,11 +419,11 @@ void KFileIconView::setSelectionMode( KFile::SelectionMode sm ) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )), - TQT_SLOT( highlighted( TQIconViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )), + TQ_SLOT( highlighted( TQIconViewItem * ))); } bool KFileIconView::isSelected( const KFileItem *i ) const @@ -593,12 +593,12 @@ void KFileIconView::showPreviews() d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize); d->job->setIgnoreMaximumSize(d->ignoreMaximumSize); - connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slotPreviewResult( TDEIO::Job * ))); - connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); -// connect( d->job, TQT_SIGNAL( failed( const KFileItem* )), -// this, TQT_SLOT( slotFailed( const KFileItem* ) )); + connect( d->job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slotPreviewResult( TDEIO::Job * ))); + connect( d->job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), + TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); +// connect( d->job, TQ_SIGNAL( failed( const KFileItem* )), +// this, TQ_SLOT( slotFailed( const KFileItem* ) )); } void KFileIconView::slotPreviewResult( TDEIO::Job *job ) @@ -737,7 +737,7 @@ void KFileIconView::listingCompleted() // need to remove our tooltip, eventually bool KFileIconView::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + if ( o == viewport() || o == this ) { int type = e->type(); if ( type == TQEvent::Leave || type == TQEvent::FocusOut ) diff --git a/tdeio/tdefile/tdefileiconview.h b/tdeio/tdefile/tdefileiconview.h index c341d6048..8a03d4bc9 100644 --- a/tdeio/tdefile/tdefileiconview.h +++ b/tdeio/tdefile/tdefileiconview.h @@ -81,7 +81,7 @@ namespace TDEIO { */ class TDEIO_EXPORT KFileIconView : public TDEIconView, public KFileView { - Q_OBJECT + TQ_OBJECT public: KFileIconView(TQWidget *parent, const char *name); diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp index 4590ee381..f271b4541 100644 --- a/tdeio/tdefile/tdefilemetainfowidget.cpp +++ b/tdeio/tdefile/tdefilemetainfowidget.cpp @@ -139,7 +139,7 @@ TQWidget* KFileMetaInfoWidget::makeWidget() #if 0 case TQVariant::Size: // a QSize - case TQVariant::String: // a QString + case TQVariant::String: // a TQString case TQVariant::List: // a QValueList case TQVariant::Map: // a QMap case TQVariant::StringList: // a QStringList @@ -147,12 +147,12 @@ TQWidget* KFileMetaInfoWidget::makeWidget() case TQVariant::Pixmap: // a QPixmap case TQVariant::Brush: // a QBrush case TQVariant::Rect: // a QRect - case TQVariant::Color: // a QColor + case TQVariant::Color: // a TQColor case TQVariant::Palette: // a QPalette case TQVariant::ColorGroup: // a QColorGroup case TQVariant::IconSet: // a QIconSet case TQVariant::Point: // a QPoint - case TQVariant::Image: // a QImage + case TQVariant::Image: // a TQImage case TQVariant::CString: // a QCString case TQVariant::PointArray: // a QPointArray case TQVariant::Region: // a QRegion @@ -185,7 +185,7 @@ TQWidget* KFileMetaInfoWidget::makeBoolWidget() { TQCheckBox* cb = new TQCheckBox(this, "metainfo bool widget"); cb->setChecked(m_item.value().toBool()); - connect(cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged(bool))); + connect(cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged(bool))); return cb; } @@ -196,7 +196,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget() if (m_validator) { - if (m_validator->inherits(TQINTVALIDATOR_OBJECT_NAME_STRING)) + if (m_validator->inherits("TQIntValidator")) { sb->setMinValue(static_cast<TQIntValidator*>(m_validator)->bottom()); sb->setMaxValue(static_cast<TQIntValidator*>(m_validator)->top()); @@ -209,7 +209,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget() if (m_item.type() == TQVariant::UInt) sb->setMinValue(TQMAX(sb->minValue(), 0)); - connect(sb, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(sb, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); return sb; } @@ -229,7 +229,7 @@ TQWidget* KFileMetaInfoWidget::makeDoubleWidget() reparentValidator(dni, m_validator); } - connect(dni, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotChanged(double))); + connect(dni, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotChanged(double))); return dni; } @@ -242,7 +242,7 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() (m_validator); b->insertStringList(val->stringList()); b->setCurrentText(m_item.value().toString()); - connect(b, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotComboChanged(const TQString &))); + connect(b, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotComboChanged(const TQString &))); b->setValidator(val); reparentValidator(b, val); return b; @@ -251,8 +251,8 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() if ( m_item.attributes() & KFileMimeTypeInfo::MultiLine ) { KEdit *edit = new KEdit( this ); edit->setText( m_item.value().toString() ); - connect( edit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotMultiLineEditChanged() )); + connect( edit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotMultiLineEditChanged() )); // can't use a validator with a TQTextEdit, but we may need to delete it if ( m_validator ) reparentValidator( edit, m_validator ); @@ -265,16 +265,16 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() e->setValidator(m_validator); reparentValidator(e, m_validator); } - connect(e, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotLineEditChanged(const TQString&))); + connect(e, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotLineEditChanged(const TQString&))); return e; } TQWidget* KFileMetaInfoWidget::makeDateWidget() { TQWidget *e = new TQDateEdit(m_item.value().toDate(), this); - connect(e, TQT_SIGNAL(valueChanged(const TQDate&)), - this, TQT_SLOT(slotDateChanged(const TQDate&))); + connect(e, TQ_SIGNAL(valueChanged(const TQDate&)), + this, TQ_SLOT(slotDateChanged(const TQDate&))); return e; } @@ -301,7 +301,7 @@ void KFileMetaInfoWidget::reparentValidator( TQWidget *widget, void KFileMetaInfoWidget::slotChanged(bool value) { - Q_ASSERT(m_widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQComboBox")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; @@ -309,7 +309,7 @@ void KFileMetaInfoWidget::slotChanged(bool value) void KFileMetaInfoWidget::slotChanged(int value) { - Q_ASSERT(m_widget->inherits(TQSPINBOX_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQSpinBox")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; @@ -342,7 +342,7 @@ void KFileMetaInfoWidget::slotLineEditChanged(const TQString& value) // that may be a little expensive for long texts, but what can we do? void KFileMetaInfoWidget::slotMultiLineEditChanged() { - Q_ASSERT(m_widget->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQTextEdit")); m_value = TQVariant( static_cast<const TQTextEdit*>( sender() )->text() ); emit valueChanged(m_value); m_dirty = true; @@ -350,7 +350,7 @@ void KFileMetaInfoWidget::slotMultiLineEditChanged() void KFileMetaInfoWidget::slotDateChanged(const TQDate& value) { - Q_ASSERT(m_widget->inherits(TQDATEEDIT_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQDateEdit")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; @@ -358,7 +358,7 @@ void KFileMetaInfoWidget::slotDateChanged(const TQDate& value) void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value) { - Q_ASSERT(m_widget->inherits(TQTIMEEDIT_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQTimeEdit")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; @@ -366,7 +366,7 @@ void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value) void KFileMetaInfoWidget::slotDateTimeChanged(const TQDateTime& value) { - Q_ASSERT(m_widget->inherits(TQDATETIMEEDIT_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQDateTimeEdit")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; diff --git a/tdeio/tdefile/tdefilemetainfowidget.h b/tdeio/tdefile/tdefilemetainfowidget.h index 5ba4d6eef..57ef4ce64 100644 --- a/tdeio/tdefile/tdefilemetainfowidget.h +++ b/tdeio/tdefile/tdefilemetainfowidget.h @@ -29,7 +29,7 @@ */ class TDEIO_EXPORT KFileMetaInfoWidget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum Mode { diff --git a/tdeio/tdefile/tdefilemetapreview.cpp b/tdeio/tdefile/tdefilemetapreview.cpp index d587511e4..42f40ef9b 100644 --- a/tdeio/tdefile/tdefilemetapreview.cpp +++ b/tdeio/tdefile/tdefilemetapreview.cpp @@ -188,7 +188,7 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent ) return 0L; } - return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "tdefileaudiopreview" )); + return dynamic_cast<KPreviewWidgetBase*>( factory->create( parent, "tdefileaudiopreview" )); } void KFileMetaPreview::virtual_hook( int, void* ) {} diff --git a/tdeio/tdefile/tdefilemetapreview.h b/tdeio/tdefile/tdefilemetapreview.h index 443324da3..24fe415a2 100644 --- a/tdeio/tdefile/tdefilemetapreview.h +++ b/tdeio/tdefile/tdefilemetapreview.h @@ -17,7 +17,7 @@ class TDEIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: KFileMetaPreview(TQWidget *parent, const char *name = 0); diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp index acec61475..36fc81eb5 100644 --- a/tdeio/tdefile/tdefilepreview.cpp +++ b/tdeio/tdefile/tdefilepreview.cpp @@ -95,8 +95,8 @@ void KFilePreview::setFileView( KFileView *view ) view->setSorting( sorting() ); left = view; - connect( left->signaler(), TQT_SIGNAL( fileHighlighted(const KFileItem*) ), - TQT_SLOT( slotHighlighted( const KFileItem * ))); + connect( left->signaler(), TQ_SIGNAL( fileHighlighted(const KFileItem*) ), + TQ_SLOT( slotHighlighted( const KFileItem * ))); // Why copy the actions? --ellis, 13 Jan 02. //for ( uint i = 0; i < view->actionCollection()->count(); i++ ) @@ -110,10 +110,10 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &) left->setOnlyDoubleClickSelectsFiles( onlyDoubleClickSelectsFiles() ); if (w) { - connect(this, TQT_SIGNAL( showPreview(const KURL &) ), - w, TQT_SLOT( showPreview(const KURL &) )); - connect( this, TQT_SIGNAL( clearPreview() ), - w, TQT_SLOT( clearPreview() )); + connect(this, TQ_SIGNAL( showPreview(const KURL &) ), + w, TQ_SLOT( showPreview(const KURL &) )); + connect( this, TQ_SIGNAL( clearPreview() ), + w, TQ_SLOT( clearPreview() )); } else { preview->hide(); diff --git a/tdeio/tdefile/tdefilepreview.h b/tdeio/tdefile/tdefilepreview.h index 5d4014fe1..8ca2c6937 100644 --- a/tdeio/tdefile/tdefilepreview.h +++ b/tdeio/tdefile/tdefilepreview.h @@ -38,7 +38,7 @@ */ class TDEIO_EXPORT KFilePreview : public TQSplitter, public KFileView { - Q_OBJECT + TQ_OBJECT public: KFilePreview(TQWidget *parent, const char *name); diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp index a2fb01c2c..326e2d21e 100644 --- a/tdeio/tdefile/tdefilesharedlg.cpp +++ b/tdeio/tdefile/tdefilesharedlg.cpp @@ -152,17 +152,17 @@ void KFileSharePropsPlugin::init() TQButtonGroup *rbGroup = new TQButtonGroup( m_widget ); rbGroup->hide(); m_rbUnShare = new TQRadioButton( i18n("Not shared"), m_widget ); - connect( m_rbUnShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbUnShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbUnShare, 0 ); rbGroup->insert( m_rbUnShare ); m_rbShare = new TQRadioButton( i18n("Shared - read only for others"), m_widget ); - connect( m_rbShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbShare, 0 ); rbGroup->insert( m_rbShare ); m_rbSharerw = new TQRadioButton( i18n("Shared - writeable for others"), m_widget ); - connect( m_rbSharerw, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbSharerw, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbSharerw, 0 ); rbGroup->insert( m_rbSharerw ); @@ -193,8 +193,8 @@ void KFileSharePropsPlugin::init() label->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak ); vbox->addWidget( label, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); - connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); - vbox->addWidget( m_pbConfig, 0, Qt::AlignHCenter ); + connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); + vbox->addWidget( m_pbConfig, 0, TQt::AlignHCenter ); vbox->addStretch( 10 ); @@ -220,8 +220,8 @@ void KFileSharePropsPlugin::init() TQHBoxLayout* hBox = new TQHBoxLayout( (TQWidget *)0L ); vbox->addLayout( hBox, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); - connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); - hBox->addWidget( m_pbConfig, 0, Qt::AlignHCenter ); + connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); + hBox->addWidget( m_pbConfig, 0, TQt::AlignHCenter ); vbox->addStretch( 10 ); // align items on top break; } @@ -244,8 +244,8 @@ void KFileSharePropsPlugin::slotConfigureFileSharing() d->m_configProc = 0; return; } - connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotConfigureFileSharingDone())); + connect(d->m_configProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotConfigureFileSharingDone())); m_pbConfig->setEnabled(false); } diff --git a/tdeio/tdefile/tdefilesharedlg.h b/tdeio/tdefile/tdefilesharedlg.h index 4b817f714..e2ed6b194 100644 --- a/tdeio/tdefile/tdefilesharedlg.h +++ b/tdeio/tdefile/tdefilesharedlg.h @@ -32,7 +32,7 @@ class TQPushButton; */ class TDEIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: KFileSharePropsPlugin( KPropertiesDialog *_props ); virtual ~KFileSharePropsPlugin(); diff --git a/tdeio/tdefile/tdefilespeedbar.h b/tdeio/tdefile/tdefilespeedbar.h index 62415dadc..33c12c530 100644 --- a/tdeio/tdefile/tdefilespeedbar.h +++ b/tdeio/tdefile/tdefilespeedbar.h @@ -25,7 +25,7 @@ class TDEConfig; class TDEIO_EXPORT KFileSpeedBar : public KURLBar { - Q_OBJECT + TQ_OBJECT public: KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 ); ~KFileSpeedBar(); diff --git a/tdeio/tdefile/tdefiletreebranch.cpp b/tdeio/tdefile/tdefiletreebranch.cpp index b55c3ffb2..70e7d7c40 100644 --- a/tdeio/tdefile/tdefiletreebranch.cpp +++ b/tdeio/tdefile/tdefiletreebranch.cpp @@ -64,32 +64,32 @@ KFileTreeBranch::KFileTreeBranch( KFileTreeView *parent, const KURL& url, setShowingDotFiles( showHidden ); - connect( this, TQT_SIGNAL( refreshItems(const KFileItemList&)), - this, TQT_SLOT ( slotRefreshItems( const KFileItemList& ))); + connect( this, TQ_SIGNAL( refreshItems(const KFileItemList&)), + this, TQ_SLOT ( slotRefreshItems( const KFileItemList& ))); - connect( this, TQT_SIGNAL( newItems(const KFileItemList&)), - this, TQT_SLOT ( addItems( const KFileItemList& ))); + connect( this, TQ_SIGNAL( newItems(const KFileItemList&)), + this, TQ_SLOT ( addItems( const KFileItemList& ))); - connect( this, TQT_SIGNAL( completed(const KURL& )), - this, TQT_SLOT(slCompleted(const KURL&))); + connect( this, TQ_SIGNAL( completed(const KURL& )), + this, TQ_SLOT(slCompleted(const KURL&))); - connect( this, TQT_SIGNAL( started( const KURL& )), - this, TQT_SLOT( slotListerStarted( const KURL& ))); + connect( this, TQ_SIGNAL( started( const KURL& )), + this, TQ_SLOT( slotListerStarted( const KURL& ))); - connect( this, TQT_SIGNAL( deleteItem( KFileItem* )), - this, TQT_SLOT( slotDeleteItem( KFileItem* ))); + connect( this, TQ_SIGNAL( deleteItem( KFileItem* )), + this, TQ_SLOT( slotDeleteItem( KFileItem* ))); - connect( this, TQT_SIGNAL( canceled(const KURL&) ), - this, TQT_SLOT( slotCanceled(const KURL&) )); + connect( this, TQ_SIGNAL( canceled(const KURL&) ), + this, TQ_SLOT( slotCanceled(const KURL&) )); - connect( this, TQT_SIGNAL( clear()), - this, TQT_SLOT( slotDirlisterClear())); + connect( this, TQ_SIGNAL( clear()), + this, TQ_SLOT( slotDirlisterClear())); - connect( this, TQT_SIGNAL( clear(const KURL&)), - this, TQT_SLOT( slotDirlisterClearURL(const KURL&))); + connect( this, TQ_SIGNAL( clear(const KURL&)), + this, TQ_SLOT( slotDirlisterClearURL(const KURL&))); - connect( this, TQT_SIGNAL( redirection( const KURL& , const KURL& ) ), - this, TQT_SLOT( slotRedirect( const KURL&, const KURL& ))); + connect( this, TQ_SIGNAL( redirection( const KURL& , const KURL& ) ), + this, TQ_SLOT( slotRedirect( const KURL&, const KURL& ))); m_openChildrenURLs.append( url ); } diff --git a/tdeio/tdefile/tdefiletreebranch.h b/tdeio/tdefile/tdefiletreebranch.h index 8c9428de3..af5b323de 100644 --- a/tdeio/tdefile/tdefiletreebranch.h +++ b/tdeio/tdefile/tdefiletreebranch.h @@ -47,7 +47,7 @@ class KFileTreeView; class TDEIO_EXPORT KFileTreeBranch : public KDirLister { - Q_OBJECT + TQ_OBJECT public: /** * constructs a branch for KFileTreeView. Does not yet start to list it. diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp index 2710d4c08..e9c87f5b6 100644 --- a/tdeio/tdefile/tdefiletreeview.cpp +++ b/tdeio/tdefile/tdefiletreeview.cpp @@ -48,32 +48,32 @@ KFileTreeView::KFileTreeView( TQWidget *parent, const char *name ) setSelectionModeExt( TDEListView::Single ); m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAnimation() ) ); + connect( m_animationTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); /* The executed-Slot only opens a path, while the expanded-Slot populates it */ - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( slotExecuted( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( expanded ( TQListViewItem *) ), - this, TQT_SLOT( slotExpanded( TQListViewItem *) )); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem *) ), - this, TQT_SLOT( slotCollapsed( TQListViewItem* ))); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotExecuted( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded ( TQListViewItem *) ), + this, TQ_SLOT( slotExpanded( TQListViewItem *) )); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem *) ), + this, TQ_SLOT( slotCollapsed( TQListViewItem* ))); /* connections from the konqtree widget */ - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem * )), - this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem * )), + this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); m_bDrag = false; @@ -375,12 +375,12 @@ KFileTreeBranch* KFileTreeView::addBranch( const KURL &path, const TQString& nam KFileTreeBranch *KFileTreeView::addBranch(KFileTreeBranch *newBranch) { - connect( newBranch, TQT_SIGNAL(populateFinished( KFileTreeViewItem* )), - this, TQT_SLOT( slotPopulateFinished( KFileTreeViewItem* ))); + connect( newBranch, TQ_SIGNAL(populateFinished( KFileTreeViewItem* )), + this, TQ_SLOT( slotPopulateFinished( KFileTreeViewItem* ))); - connect( newBranch, TQT_SIGNAL( newTreeViewItems( KFileTreeBranch*, + connect( newBranch, TQ_SIGNAL( newTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& )), - this, TQT_SLOT( slotNewTreeViewItems( KFileTreeBranch*, + this, TQ_SLOT( slotNewTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& ))); m_branches.append( newBranch ); diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h index 60f756dc2..b0dd9af36 100644 --- a/tdeio/tdefile/tdefiletreeview.h +++ b/tdeio/tdefile/tdefiletreeview.h @@ -65,7 +65,7 @@ private: */ class TDEIO_EXPORT KFileTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: KFileTreeView( TQWidget *parent, const char *name = 0 ); virtual ~KFileTreeView(); diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp index f171975d8..aa82344c1 100644 --- a/tdeio/tdefile/tdefileview.cpp +++ b/tdeio/tdefile/tdefileview.cpp @@ -90,20 +90,20 @@ KFileView::~KFileView() void KFileView::setParentView(KFileView *parent) { if ( parent ) { // pass all signals right to our parent - TQObject::connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, + TQObject::connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), - parent->sig, TQT_SIGNAL( activatedMenu(const KFileItem *, + parent->sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ))); - TQObject::connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *)), - parent->sig, TQT_SIGNAL( dirActivated(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *)), - parent->sig, TQT_SIGNAL( fileSelected(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ), - parent->sig,TQT_SIGNAL(fileHighlighted(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - parent->sig, TQT_SIGNAL(sortingChanged( TQDir::SortSpec))); - TQObject::connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), - parent->sig, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&))); + TQObject::connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *)), + parent->sig, TQ_SIGNAL( dirActivated(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *)), + parent->sig, TQ_SIGNAL( fileSelected(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ), + parent->sig,TQ_SIGNAL(fileHighlighted(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + parent->sig, TQ_SIGNAL(sortingChanged( TQDir::SortSpec))); + TQObject::connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), + parent->sig, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&))); } } diff --git a/tdeio/tdefile/tdefileview.h b/tdeio/tdefile/tdefileview.h index a747f393e..6703b8c82 100644 --- a/tdeio/tdefile/tdefileview.h +++ b/tdeio/tdefile/tdefileview.h @@ -35,7 +35,7 @@ class TDEActionCollection; **/ class TDEIO_EXPORT KFileViewSignaler : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp index ce7127d9e..9239d5f4d 100644 --- a/tdeio/tdefile/tests/kfdtest.cpp +++ b/tdeio/tdefile/tests/kfdtest.cpp @@ -10,7 +10,7 @@ KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name ) : TQObject( parent, name ), m_startDir( startDir ) { - TQTimer::singleShot( 1000, this, TQT_SLOT( doit() )); + TQTimer::singleShot( 1000, this, TQ_SLOT( doit() )); } void KFDTest::doit() diff --git a/tdeio/tdefile/tests/kfdtest.h b/tdeio/tdefile/tests/kfdtest.h index 6c59550b8..5a076460e 100644 --- a/tdeio/tdefile/tests/kfdtest.h +++ b/tdeio/tdefile/tests/kfdtest.h @@ -12,7 +12,7 @@ class KFDTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: KFDTest( const TQString& startDir, TQObject *parent = 0, const char *name = 0); diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp index da031eac2..1f3f2e67d 100644 --- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp +++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp @@ -45,14 +45,14 @@ testFrame::testFrame():TDEMainWindow(0,"Test FileTreeView"), /* Connect to see the status bar */ KStatusBar* sta = statusBar(); - connect( treeView, TQT_SIGNAL( onItem( const TQString& )), - sta, TQT_SLOT( message( const TQString& ))); + connect( treeView, TQ_SIGNAL( onItem( const TQString& )), + sta, TQ_SLOT( message( const TQString& ))); - connect( treeView, TQT_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )), - this, TQT_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& ))); + connect( treeView, TQ_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )), + this, TQ_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& ))); - connect( treeView, TQT_SIGNAL( dropped( KURL::List&, KURL& )), this, - TQT_SLOT( copyURLs( KURL::List&, KURL& ))); + connect( treeView, TQ_SIGNAL( dropped( KURL::List&, KURL& )), this, + TQ_SLOT( copyURLs( KURL::List&, KURL& ))); treeView->addColumn( "File" ); treeView->addColumn( "ChildCount" ); @@ -77,10 +77,10 @@ void testFrame::showPath( const KURL &url ) if( dirOnlyMode ) treeView->setDirOnlyMode( nb, true ); nb->setOpenPixmap( pixOpen ); - connect( nb, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), - this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*))); - connect( nb, TQT_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )), - this, TQT_SLOT( slotSetChildCount( KFileTreeViewItem*, int ))); + connect( nb, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), + this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*))); + connect( nb, TQ_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )), + this, TQ_SLOT( slotSetChildCount( KFileTreeViewItem*, int ))); // nb->setChildRecurse(false ); nb->setOpen(true); diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h index 0375f8d11..246d769ef 100644 --- a/tdeio/tdefile/tests/tdefiletreeviewtest.h +++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h @@ -22,7 +22,7 @@ class testFrame: public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: testFrame(); void showPath( const KURL & ); diff --git a/tdeio/tdeio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp index 24a5c247d..54d4aeab1 100644 --- a/tdeio/tdeio/chmodjob.cpp +++ b/tdeio/tdeio/chmodjob.cpp @@ -48,7 +48,7 @@ ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask, m_newOwner( newOwner ), m_newGroup( newGroup ), m_recursive( recursive ), m_lstItems( lstItems ) { - TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(processList()) ); } void ChmodJob::processList() @@ -77,9 +77,9 @@ void ChmodJob::processList() { //kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl; TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( listJob ); return; // we'll come back later, when this one's finished diff --git a/tdeio/tdeio/chmodjob.h b/tdeio/tdeio/chmodjob.h index 87ce89683..fec1fe18b 100644 --- a/tdeio/tdeio/chmodjob.h +++ b/tdeio/tdeio/chmodjob.h @@ -36,7 +36,7 @@ namespace TDEIO { */ class TDEIO_EXPORT ChmodJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: /** * Create new ChmodJobs using the TDEIO::chmod() function. diff --git a/tdeio/tdeio/connection.cpp b/tdeio/tdeio/connection.cpp index 5ae0f5685..8b21e3a0c 100644 --- a/tdeio/tdeio/connection.cpp +++ b/tdeio/tdeio/connection.cpp @@ -143,7 +143,7 @@ void Connection::init(TDESocket *sock) if ( m_suspended ) { suspend(); } - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } dequeue(); } @@ -159,7 +159,7 @@ void Connection::init(int _fd_in, int fd_out) if ( m_suspended ) { suspend(); } - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } dequeue(); } @@ -175,7 +175,7 @@ void Connection::connect(TQObject *_receiver, const char *_member) notifier = new TQSocketNotifier(fd_in, TQSocketNotifier::Read); if ( m_suspended ) suspend(); - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } } diff --git a/tdeio/tdeio/connection.h b/tdeio/tdeio/connection.h index f573aafac..011928899 100644 --- a/tdeio/tdeio/connection.h +++ b/tdeio/tdeio/connection.h @@ -47,7 +47,7 @@ namespace TDEIO { */ class TDEIO_EXPORT Connection : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new connection. diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp index 41a76efd1..46c230f06 100644 --- a/tdeio/tdeio/dataslave.cpp +++ b/tdeio/tdeio/dataslave.cpp @@ -62,7 +62,7 @@ DataSlave::DataSlave() : //kdDebug() << this << k_funcinfo << endl; _suspended = false; timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(dispatchNext())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(dispatchNext())); } DataSlave::~DataSlave() { diff --git a/tdeio/tdeio/dataslave.h b/tdeio/tdeio/dataslave.h index f4ae32e66..9bd5bfc4f 100644 --- a/tdeio/tdeio/dataslave.h +++ b/tdeio/tdeio/dataslave.h @@ -46,7 +46,7 @@ namespace TDEIO { * @author Leo Savernik */ class DataSlave : public TDEIO::Slave { - Q_OBJECT + TQ_OBJECT public: DataSlave(); diff --git a/tdeio/tdeio/davjob.h b/tdeio/tdeio/davjob.h index 4cf8edb97..a6a2f77bb 100644 --- a/tdeio/tdeio/davjob.h +++ b/tdeio/tdeio/davjob.h @@ -54,7 +54,7 @@ namespace TDEIO { * @since 3.1 */ class TDEIO_EXPORT DavJob : public TransferJob { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp index 7198a3fd5..2944cd6aa 100644 --- a/tdeio/tdeio/defaultprogress.cpp +++ b/tdeio/tdeio/defaultprogress.cpp @@ -35,7 +35,7 @@ #include <kstdguiitem.h> #include <klineedit.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -86,7 +86,7 @@ void DefaultProgress::init() { d = new DefaultProgressPrivate; -#ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS +#ifdef TQ_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS // Set a useful icon for this window! KWin::setIcons( winId(), TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ), @@ -98,7 +98,7 @@ void DefaultProgress::init() topLayout->addStrut( 360 ); // makes dlg at least that wide TQGridLayout *grid = new TQGridLayout( 2, 3 ); - topLayout->addLayout(TQT_TQLAYOUT(grid)); + topLayout->addLayout(grid); grid->addColSpacing(1, KDialog::spacingHint()); // filenames or action name grid->addWidget(new TQLabel(i18n("Source:"), this), 0, 0); @@ -147,7 +147,7 @@ void DefaultProgress::init() topLayout->addWidget( line ); d->keepOpen = new TQCheckBox( i18n("&Keep this window open after transfer is complete"), this); - connect( d->keepOpen, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotKeepOpenToggled(bool) ) ); + connect( d->keepOpen, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotKeepOpenToggled(bool) ) ); topLayout->addWidget(d->keepOpen); d->keepOpen->hide(); @@ -155,20 +155,20 @@ void DefaultProgress::init() topLayout->addLayout(hBox); d->openFile = new KPushButton( i18n("Open &File"), this ); - connect( d->openFile, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenFile() ) ); + connect( d->openFile, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenFile() ) ); hBox->addWidget( d->openFile ); d->openFile->setEnabled(false); d->openFile->hide(); d->openLocation = new KPushButton( i18n("Open &Destination"), this ); - connect( d->openLocation, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenLocation() ) ); + connect( d->openLocation, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenLocation() ) ); hBox->addWidget( d->openLocation ); d->openLocation->hide(); hBox->addStretch(1); d->cancelClose = new KPushButton( KStdGuiItem::cancel(), this ); - connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); + connect( d->cancelClose, TQ_SIGNAL( clicked() ), TQ_SLOT( slotStop() ) ); hBox->addWidget( d->cancelClose ); resize( sizeHint() ); diff --git a/tdeio/tdeio/defaultprogress.h b/tdeio/tdeio/defaultprogress.h index de0dfd093..d3fdf785e 100644 --- a/tdeio/tdeio/defaultprogress.h +++ b/tdeio/tdeio/defaultprogress.h @@ -36,7 +36,7 @@ namespace TDEIO { */ class TDEIO_EXPORT DefaultProgress : public ProgressBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp index c4e4daa0c..66ab1202d 100644 --- a/tdeio/tdeio/forwardingslavebase.cpp +++ b/tdeio/tdeio/forwardingslavebase.cpp @@ -318,52 +318,52 @@ void ForwardingSlaveBase::connectJob(TDEIO::Job *job) kdDebug() << it.key() << " = " << it.data() << endl; #endif - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotResult(TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ), - this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( warning(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( speed(TDEIO::Job *, unsigned long) ), + this, TQ_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); } void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), - this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); + connect( job, TQ_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), + this, TQ_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); } void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), - this, TQT_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); + connect( job, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), + this, TQ_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); } void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), - this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); - connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), - this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); - connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), + this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); + connect( job, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), + this, TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); + connect( job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); } void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) ); + connect( job, TQ_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ), + this, TQ_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) ); } ////////////////////////////////////////////////////////////////////////////// diff --git a/tdeio/tdeio/forwardingslavebase.h b/tdeio/tdeio/forwardingslavebase.h index 5905fcf5e..00d38cdba 100644 --- a/tdeio/tdeio/forwardingslavebase.h +++ b/tdeio/tdeio/forwardingslavebase.h @@ -87,7 +87,7 @@ class ForwardingSlaveBasePrivate; */ class TDEIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase { -Q_OBJECT +TQ_OBJECT public: ForwardingSlaveBase(const TQCString &protocol, const TQCString &poolSocket, diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp index c53929b1e..be6e6d89a 100644 --- a/tdeio/tdeio/global.cpp +++ b/tdeio/tdeio/global.cpp @@ -1307,6 +1307,8 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er #endif #ifdef HAVE_SYS_UCRED_H #include <sys/ucred.h> +#elif defined(HAVE_UCRED_H) +#include <ucred.h> #endif #ifdef HAVE_SYS_MOUNT_H #include <sys/mount.h> diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp index f6156a966..5943ae402 100644 --- a/tdeio/tdeio/job.cpp +++ b/tdeio/tdeio/job.cpp @@ -73,7 +73,7 @@ extern "C" { #ifdef Q_OS_UNIX #include <utime.h> #endif -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <netwm.h> #include <fixx11h.h> #endif @@ -89,15 +89,23 @@ template class TQPtrList<TDEIO::Job>; class Job::JobPrivate { public: - JobPrivate() : m_autoErrorHandling( false ), m_autoWarningHandling( true ), - m_interactive( true ), m_parentJob( 0L ), m_extraFlags(0), - m_processedSize(0), m_userTimestamp(0) + JobPrivate() : m_autoErrorHandling(false), m_autoWarningHandling(true), + m_interactive(true), m_errorParentWidgetGP(0), m_parentJob(0L), + m_extraFlags(0), m_processedSize(0), m_userTimestamp(0) {} + ~JobPrivate() + { + if (m_errorParentWidgetGP) + { + delete m_errorParentWidgetGP; + } + } + bool m_autoErrorHandling; bool m_autoWarningHandling; bool m_interactive; - TQGuardedPtr<TQWidget> m_errorParentWidget; + TQGuardedPtr<TQWidget> *m_errorParentWidgetGP; // Maybe we could use the TQObject parent/child mechanism instead // (requires a new ctor, and moving the ctor code to some init()). Job* m_parentJob; @@ -106,7 +114,18 @@ public: unsigned long m_userTimestamp; }; -Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0) +static TQObject *__job_root_obj = nullptr; + +static TQObject* __getJobRoot() +{ + if (!__job_root_obj) + { + __job_root_obj = new TQObject(0, "jobroot"); + } + return __job_root_obj; +} + +Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m_percent(0) , m_progressId(0), m_speedTimer(0), d( new JobPrivate ) { // All jobs delete themselves after emiting 'result'. @@ -118,16 +137,16 @@ Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0) addMetaData("progress-id", TQString::number(m_progressId)); //kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl; // Connect global progress info signals - connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), - Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); - connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), + Observer::self(), TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); + connect( this, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); } // Don't exit while this job is running if (kapp) @@ -141,7 +160,9 @@ Job::~Job() delete m_speedTimer; delete d; if (kapp) - kapp->deref(); + { + kapp->deref(); + } } int& Job::extraFlags() @@ -164,15 +185,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData) //kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl; subjobs.append(job); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotResult(TDEIO::Job*)) ); // Forward information from that subjob. - connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )), - TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); + connect( job, TQ_SIGNAL(speed( TDEIO::Job*, unsigned long )), + TQ_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); - connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), - TQT_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); + connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), + TQ_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); if (inheritMetaData) job->mergeMetaData(m_outgoingMetaData); @@ -219,7 +240,7 @@ void Job::emitSpeed( unsigned long bytes_per_second ) if ( !m_speedTimer ) { m_speedTimer = new TQTimer(); - connect( m_speedTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSpeedTimeout() ) ); + connect( m_speedTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSpeedTimeout() ) ); } emit speed( this, bytes_per_second ); m_speedTimer->start( 5000 ); // 5 seconds interval should be enough @@ -231,7 +252,7 @@ void Job::emitResult() if ( m_progressId ) // Did we get an ID from the observer ? Observer::self()->jobFinished( m_progressId ); if ( m_error && d->m_interactive && d->m_autoErrorHandling ) - showErrorDialog( d->m_errorParentWidget ); + showErrorDialog( d->m_errorParentWidgetGP ? *d->m_errorParentWidgetGP : nullptr); emit result(this); deleteLater(); } @@ -320,8 +341,16 @@ void Job::showErrorDialog( TQWidget * parent ) void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget ) { + if (d->m_errorParentWidgetGP && (TQWidget*)(*d->m_errorParentWidgetGP) != parentWidget) + { + delete d->m_errorParentWidgetGP; + d->m_errorParentWidgetGP = nullptr; + } d->m_autoErrorHandling = enable; - d->m_errorParentWidget = parentWidget; + if (enable && parentWidget && !d->m_errorParentWidgetGP) + { + d->m_errorParentWidgetGP = new TQGuardedPtr<TQWidget>(parentWidget); + } } bool Job::isAutoErrorHandlingEnabled() const @@ -362,7 +391,7 @@ TQWidget *Job::window() const void Job::updateUserTimestamp( unsigned long time ) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 if( d->m_userTimestamp == 0 || NET::timestampCompare( time, d->m_userTimestamp ) > 0 ) d->m_userTimestamp = time; #endif @@ -449,7 +478,7 @@ SimpleJob::SimpleJob(const KURL& url, int command, const TQByteArray &packedArgs kdDebug() << "ERR_MALFORMED_URL" << endl; m_error = ERR_MALFORMED_URL; m_errorText = m_url.url(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) ); return; } } @@ -495,38 +524,38 @@ void SimpleJob::start(Slave *slave) { m_slave = slave; - connect( m_slave, TQT_SIGNAL( error( int , const TQString & ) ), - TQT_SLOT( slotError( int , const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( error( int , const TQString & ) ), + TQ_SLOT( slotError( int , const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( warning( const TQString & ) ), - TQT_SLOT( slotWarning( const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( warning( const TQString & ) ), + TQ_SLOT( slotWarning( const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( infoMessage( const TQString & ) ), - TQT_SLOT( slotInfoMessage( const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( infoMessage( const TQString & ) ), + TQ_SLOT( slotInfoMessage( const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( connected() ), - TQT_SLOT( slotConnected() ) ); + connect( m_slave, TQ_SIGNAL( connected() ), + TQ_SLOT( slotConnected() ) ); - connect( m_slave, TQT_SIGNAL( finished() ), - TQT_SLOT( slotFinished() ) ); + connect( m_slave, TQ_SIGNAL( finished() ), + TQ_SLOT( slotFinished() ) ); if ((extraFlags() & EF_TransferJobDataSent) == 0) { - connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); + connect( m_slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); + connect( m_slave, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ), - TQT_SLOT( slotSpeed( unsigned long ) ) ); + connect( m_slave, TQ_SIGNAL( speed( unsigned long ) ), + TQ_SLOT( slotSpeed( unsigned long ) ) ); } - connect( slave, TQT_SIGNAL( needProgressId() ), - TQT_SLOT( slotNeedProgressId() ) ); + connect( slave, TQ_SIGNAL( needProgressId() ), + TQ_SLOT( slotNeedProgressId() ) ); - connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ), - TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); + connect( slave, TQ_SIGNAL(metaData( const TDEIO::MetaData& ) ), + TQ_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); if (m_window) { @@ -697,8 +726,8 @@ MkdirJob::MkdirJob( const KURL& url, int command, void MkdirJob::start(Slave *slave) { - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -818,8 +847,8 @@ LocalURLJob::LocalURLJob( const KURL& url, int command, void LocalURLJob::start(Slave *slave) { - connect( slave, TQT_SIGNAL( localURL(const KURL &, bool) ), - TQT_SLOT( slotLocalURL(const KURL &, bool) ) ); + connect( slave, TQ_SIGNAL( localURL(const KURL &, bool) ), + TQ_SLOT( slotLocalURL(const KURL &, bool) ) ); SimpleJob::start(slave); } @@ -859,10 +888,10 @@ void StatJob::start(Slave *slave) m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); m_outgoingMetaData.replace( "details", TQString::number(m_details) ); - connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), - TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), + TQ_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -1164,26 +1193,26 @@ void TransferJob::resume() void TransferJob::start(Slave *slave) { assert(slave); - connect( slave, TQT_SIGNAL( data( const TQByteArray & ) ), - TQT_SLOT( slotData( const TQByteArray & ) ) ); + connect( slave, TQ_SIGNAL( data( const TQByteArray & ) ), + TQ_SLOT( slotData( const TQByteArray & ) ) ); - connect( slave, TQT_SIGNAL( dataReq() ), - TQT_SLOT( slotDataReq() ) ); + connect( slave, TQ_SIGNAL( dataReq() ), + TQ_SLOT( slotDataReq() ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); - connect( slave, TQT_SIGNAL(mimeType( const TQString& ) ), - TQT_SLOT( slotMimetype( const TQString& ) ) ); + connect( slave, TQ_SIGNAL(mimeType( const TQString& ) ), + TQ_SLOT( slotMimetype( const TQString& ) ) ); - connect( slave, TQT_SIGNAL(errorPage() ), - TQT_SLOT( slotErrorPage() ) ); + connect( slave, TQ_SIGNAL(errorPage() ), + TQ_SLOT( slotErrorPage() ) ); - connect( slave, TQT_SIGNAL( needSubURLData() ), - TQT_SLOT( slotNeedSubURLData() ) ); + connect( slave, TQ_SIGNAL( needSubURLData() ), + TQ_SLOT( slotNeedSubURLData() ) ); - connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), - TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); if (slave->suspended()) { @@ -1202,8 +1231,8 @@ void TransferJob::slotNeedSubURLData() // Job needs data from subURL. m_subJob = TDEIO::get( m_subUrl, false, false); suspend(); // Put job on hold until we have some data. - connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), - TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); + connect(m_subJob, TQ_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), + TQ_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); addSubjob(m_subJob); } @@ -1396,7 +1425,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo packedArgs, postData, showProgressInfo ); if (redirection) - TQTimer::singleShot(0, job, TQT_SLOT(slotPostRedirection()) ); + TQTimer::singleShot(0, job, TQ_SLOT(slotPostRedirection()) ); return job; } @@ -1429,10 +1458,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command, : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ), m_uploadOffset( 0 ) { - connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), - TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), + TQ_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); } void StoredTransferJob::setData( const TQByteArray& arr ) @@ -1560,8 +1589,8 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command, void DirectCopyJob::start( Slave* slave ) { - connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), - TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); SimpleJob::start(slave); } @@ -1608,7 +1637,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions, d->m_delJob = 0; d->m_sourceSize = (TDEIO::filesize_t) -1; d->m_modificationTime = static_cast<time_t>( -1 ); - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void FileCopyJob::slotStart() @@ -1702,8 +1731,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url) m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false); addSubjob( m_copyJob ); connectSubjob( m_copyJob ); - connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_copyJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } void FileCopyJob::startRenameJob(const KURL &slave_url) @@ -1716,14 +1745,14 @@ void FileCopyJob::startRenameJob(const KURL &slave_url) void FileCopyJob::connectSubjob( SimpleJob * job ) { - connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), - this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); + connect( job, TQ_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQ_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), - this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); + connect( job, TQ_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )), - this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job*, unsigned long )), + this, TQ_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); } @@ -1765,16 +1794,16 @@ void FileCopyJob::startDataPump() m_putJob = put( m_dest, m_permissions, m_overwrite, m_resume, false /* no GUI */); if ( d->m_modificationTime != static_cast<time_t>( -1 ) ) { TQDateTime dt; dt.setTime_t( d->m_modificationTime ); - m_putJob->addMetaData( "modified", dt.toString( Qt::ISODate ) ); + m_putJob->addMetaData( "modified", dt.toString( TQt::ISODate ) ); } //kdDebug(7007) << "FileCopyJob: m_putJob = " << m_putJob << " m_dest=" << m_dest << endl; // The first thing the put job will tell us is whether we can // resume or not (this is always emitted) - connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); - connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), - TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); + connect( m_putJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_putJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), + TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); addSubjob( m_putJob ); } @@ -1833,8 +1862,8 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) m_getJob->addMetaData( "resume", TDEIO::number(offset) ); // Might or might not get emitted - connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_getJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } m_putJob->slave()->setOffset( offset ); @@ -1843,10 +1872,10 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) connectSubjob( m_getJob ); // Progress info depends on get m_getJob->resume(); // Order a beer - connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); - connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), - TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( m_getJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + TQ_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( m_getJob, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), + TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); } else // copyjob { @@ -2075,9 +2104,9 @@ void ListJob::slotListEntries( const TDEIO::UDSEntryList& list ) prefix + filename + "/", includeHidden); Scheduler::scheduleJob(job); - connect(job, TQT_SIGNAL(entries( TDEIO::Job *, + connect(job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( gotEntries( TDEIO::Job*, + TQ_SLOT( gotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob(job); } @@ -2210,15 +2239,15 @@ void ListJob::start(Slave *slave) { m_error = ERR_ACCESS_DENIED; m_errorText = m_url.url(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) ); return; } - connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), - TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); - connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), + TQ_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); + connect( slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -2261,13 +2290,13 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a d->m_globalDestinationState = destinationState; if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); } - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); /** States: STATE_STATING for the dest @@ -2298,7 +2327,7 @@ void CopyJob::slotStart() */ m_reportTimer = new TQTimer(this); - connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); + connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport())); m_reportTimer->start(REPORT_TIMEOUT,false); // Stat the dest @@ -2812,9 +2841,9 @@ void CopyJob::startListing( const KURL & src ) d->m_bURLDirty = true; ListJob * newjob = listRecursive( src, false ); newjob->setUnrestricted(true); - connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( newjob ); } @@ -3142,7 +3171,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) } else { - if ( m_bCurrentOperationIsLink && ::tqqt_cast<TDEIO::DeleteJob*>( job ) ) + if ( m_bCurrentOperationIsLink && ::tqt_cast<TDEIO::DeleteJob*>( job ) ) { // Very special case, see a few lines below // We are deleting the source of a symlink we successfully moved... ignore error @@ -3159,7 +3188,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) { // Special case for moving links. That operation needs two jobs, unlike others. if ( m_bCurrentOperationIsLink && m_mode == Move - && !::tqqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done + && !::tqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done ) { subjobs.remove( job ); @@ -3519,10 +3548,10 @@ void CopyJob::copyNextFile() d->m_bURLDirty = true; } addSubjob(newjob); - connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); } else { @@ -4002,29 +4031,29 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn { if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); // See slotReport - /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + /*connect( this, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + m_observer, TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + m_observer, TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), - m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ + connect( this, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + m_observer, TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ m_reportTimer=new TQTimer(this); - connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); + connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport())); //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX m_reportTimer->start(REPORT_TIMEOUT,false); } - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void DeleteJob::slotStart() @@ -4350,9 +4379,9 @@ void DeleteJob::slotResult( Job *job ) ListJob *newjob = listRecursive( url, false ); newjob->setUnrestricted(true); // No KIOSK restrictions Scheduler::scheduleJob(newjob); - connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob(newjob); } else { @@ -4666,7 +4695,7 @@ TQString CacheInfo::cachedFileName() TQFile *CacheInfo::cachedFile() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN const char *mode = (readWrite ? "rb+" : "rb"); #else const char *mode = (readWrite ? "r+" : "r"); diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h index cd078b842..d83668f5b 100644 --- a/tdeio/tdeio/jobclasses.h +++ b/tdeio/tdeio/jobclasses.h @@ -50,8 +50,8 @@ namespace TDEIO { * * \code * TDEIO::Job * job = TDEIO::someoperation( some parameters ); - * connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - * this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + * connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + * this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); * \endcode * (other connects, specific to the job) * @@ -65,7 +65,7 @@ namespace TDEIO { * @see TDEIO::Slave */ class TDEIO_EXPORT Job : public TQObject { - Q_OBJECT + TQ_OBJECT protected: Job( bool showProgressInfo ); @@ -525,7 +525,7 @@ namespace TDEIO { * that manage subjobs but aren't scheduled directly. */ class TDEIO_EXPORT SimpleJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: /** @@ -686,7 +686,7 @@ namespace TDEIO { */ class TDEIO_EXPORT StatJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -778,7 +778,7 @@ namespace TDEIO { */ class TDEIO_EXPORT MkdirJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -836,7 +836,7 @@ namespace TDEIO { * Used for direct copy from or to the local filesystem (i.e. SlaveBase::copy()) */ class TDEIO_EXPORT DirectCopyJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -872,7 +872,7 @@ namespace TDEIO { * reading of data from the slave should be suspended. */ class TDEIO_EXPORT TransferJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1072,7 +1072,7 @@ namespace TDEIO { * @since 3.3 */ class TDEIO_EXPORT StoredTransferJob : public TDEIO::TransferJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1117,7 +1117,7 @@ namespace TDEIO { * @see TDEIO::multi_get() */ class TDEIO_EXPORT MultiGetJob : public TransferJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1205,7 +1205,7 @@ namespace TDEIO { * @see TDEIO::mimetype() */ class TDEIO_EXPORT MimetypeJob : public TransferJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1247,7 +1247,7 @@ namespace TDEIO { * @see TDEIO::file_move() */ class TDEIO_EXPORT FileCopyJob : public Job { - Q_OBJECT + TQ_OBJECT public: /** @@ -1389,7 +1389,7 @@ namespace TDEIO { * @see TDEIO::listDir() */ class TDEIO_EXPORT ListJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1505,7 +1505,7 @@ namespace TDEIO { * @see TDEIO::linkAs() */ class TDEIO_EXPORT CopyJob : public Job { - Q_OBJECT + TQ_OBJECT public: /** @@ -1760,7 +1760,7 @@ namespace TDEIO { * @see TDEIO::del() */ class TDEIO_EXPORT DeleteJob : public Job { - Q_OBJECT + TQ_OBJECT public: /** @@ -1864,7 +1864,7 @@ namespace TDEIO { */ class TDEIO_EXPORT LocalURLJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kacl.cpp b/tdeio/tdeio/kacl.cpp index fcf3cc13f..b62ac5438 100644 --- a/tdeio/tdeio/kacl.cpp +++ b/tdeio/tdeio/kacl.cpp @@ -62,7 +62,7 @@ public: bool setMaskPermissions( unsigned short v ); TQString getUserName( uid_t uid ) const; TQString getGroupName( gid_t gid ) const; - bool setAllUsersOrGroups( const TQValueList< QPair<TQString, unsigned short> > &list, acl_tag_t type ); + bool setAllUsersOrGroups( const TQValueList< TQPair<TQString, unsigned short> > &list, acl_tag_t type ); bool setNamedUserOrGroupPermissions( const TQString& name, unsigned short permissions, acl_tag_t type ); acl_t m_acl; @@ -429,7 +429,7 @@ ACLUserPermissionsList KACL::allUserPermissions() const } #ifdef USE_POSIX_ACL -bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, unsigned short> > &list, acl_tag_t type ) +bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< TQPair<TQString, unsigned short> > &list, acl_tag_t type ) { bool allIsWell = true; bool atLeastOneUserOrGroup = false; @@ -456,7 +456,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, //printACL( newACL, "After cleaning out entries: " ); // now add the entries from the list - TQValueList< QPair<TQString, unsigned short> >::const_iterator it = list.constBegin(); + TQValueList< TQPair<TQString, unsigned short> >::const_iterator it = list.constBegin(); while ( it != list.constEnd() ) { acl_create_entry( &newACL, &entry ); acl_set_tag_type( entry, type ); diff --git a/tdeio/tdeio/kacl.h b/tdeio/tdeio/kacl.h index f581f7a8e..3b96f8dfb 100644 --- a/tdeio/tdeio/kacl.h +++ b/tdeio/tdeio/kacl.h @@ -23,12 +23,12 @@ #include <sys/types.h> #include <tdeio/global.h> -typedef QPair<TQString, unsigned short> ACLUserPermissions; +typedef TQPair<TQString, unsigned short> ACLUserPermissions; typedef TQValueList<ACLUserPermissions> ACLUserPermissionsList; typedef TQValueListIterator<ACLUserPermissions> ACLUserPermissionsIterator; typedef TQValueListConstIterator<ACLUserPermissions> ACLUserPermissionsConstIterator; -typedef QPair<TQString, unsigned short> ACLGroupPermissions; +typedef TQPair<TQString, unsigned short> ACLGroupPermissions; typedef TQValueList<ACLGroupPermissions> ACLGroupPermissionsList; typedef TQValueListIterator<ACLGroupPermissions> ACLGroupPermissionsIterator; typedef TQValueListConstIterator<ACLGroupPermissions> ACLGroupPermissionsConstIterator; @@ -146,7 +146,7 @@ public: bool setNamedUserPermissions( const TQString& name, unsigned short ); /** Returns the list of all group permission entries. Each entry consists - * of a name/permissions pair. This is a QPair, therefore access is provided + * of a name/permissions pair. This is a TQPair, therefore access is provided * via the .first and .next members. * @return the list of all group permission entries. */ ACLUserPermissionsList allUserPermissions() const; @@ -170,7 +170,7 @@ public: bool setNamedGroupPermissions( const TQString& name, unsigned short ); /** Returns the list of all group permission entries. Each entry consists - * of a name/permissions pair. This is a QPair, therefor access is provided + * of a name/permissions pair. This is a TQPair, therefor access is provided * via the .first and .next members. * @return the list of all group permission entries. */ diff --git a/tdeio/tdeio/kar.cpp b/tdeio/tdeio/kar.cpp index 07072d0c6..dd8716c5b 100644 --- a/tdeio/tdeio/kar.cpp +++ b/tdeio/tdeio/kar.cpp @@ -45,7 +45,7 @@ KAr::KAr( const TQString& filename ) //kdDebug(7042) << "KAr(filename) reached." << endl; m_filename = filename; d = new KArPrivate; - setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); + setDevice( new TQFile( filename ) ); } KAr::KAr( TQIODevice * dev ) diff --git a/tdeio/tdeio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp index c6fa72371..313c8e47b 100644 --- a/tdeio/tdeio/kautomount.cpp +++ b/tdeio/tdeio/kautomount.cpp @@ -39,7 +39,7 @@ KAutoMount::KAutoMount( bool _readonly, const TQString& _format, const TQString& m_bShowFilemanagerWindow = _show_filemanager_window; TDEIO::Job* job = TDEIO::mount( _readonly, _format.ascii(), _device, _mountpoint ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void KAutoMount::slotResult( TDEIO::Job * job ) @@ -81,7 +81,7 @@ KAutoUnmount::KAutoUnmount( const TQString & _mountpoint, const TQString & _desk : m_desktopFile( _desktopFile ), m_mountpoint( _mountpoint ) { TDEIO::Job * job = TDEIO::unmount( m_mountpoint ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void KAutoUnmount::slotResult( TDEIO::Job * job ) diff --git a/tdeio/tdeio/kautomount.h b/tdeio/tdeio/kautomount.h index 203c037d9..9c56c56ec 100644 --- a/tdeio/tdeio/kautomount.h +++ b/tdeio/tdeio/kautomount.h @@ -24,10 +24,6 @@ #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX namespace TDEIO { @@ -44,7 +40,7 @@ class Job; */ class TDEIO_EXPORT KAutoMount : public TQObject { - Q_OBJECT + TQ_OBJECT friend class gcc_gives_a_warning_without_this; public: /** @@ -89,7 +85,7 @@ private: */ class TDEIO_EXPORT KAutoUnmount : public TQObject { - Q_OBJECT + TQ_OBJECT friend class gcc_gives_a_warning_without_this; public: /** diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp index 5ec790aa7..8d67808df 100644 --- a/tdeio/tdeio/kdatatool.cpp +++ b/tdeio/tdeio/kdatatool.cpp @@ -251,7 +251,7 @@ TQPtrList<TDEAction> KDataToolAction::dataToolActionList( const TQValueList<KDat { //kdDebug() << "creating action " << *uit << " " << *cit << endl; KDataToolAction * action = new KDataToolAction( *uit, *entry, *cit ); - connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), + connect( action, TQ_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), receiver, slot ); actionList.append( action ); } diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h index a77f8a9ea..d94acdc11 100644 --- a/tdeio/tdeio/kdatatool.h +++ b/tdeio/tdeio/kdatatool.h @@ -193,7 +193,7 @@ private: */ class TDEIO_EXPORT KDataToolAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: /** @@ -253,7 +253,7 @@ private: */ class TDEIO_EXPORT KDataTool : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp index 7b564f337..e5045db5b 100644 --- a/tdeio/tdeio/kdirlister.cpp +++ b/tdeio/tdeio/kdirlister.cpp @@ -63,12 +63,12 @@ KDirListerCache::KDirListerCache( int maxCount ) urlsCurrentlyHeld.setAutoDelete( true ); pendingUpdates.setAutoDelete( true ); - connect( kdirwatch, TQT_SIGNAL( dirty( const KURL& ) ), - this, TQT_SLOT( slotFileDirty( const KURL& ) ) ); - connect( kdirwatch, TQT_SIGNAL( created( const TQString& ) ), - this, TQT_SLOT( slotFileCreated( const TQString& ) ) ); - connect( kdirwatch, TQT_SIGNAL( deleted( const TQString& ) ), - this, TQT_SLOT( slotFileDeleted( const TQString& ) ) ); + connect( kdirwatch, TQ_SIGNAL( dirty( const KURL& ) ), + this, TQ_SLOT( slotFileDirty( const KURL& ) ) ); + connect( kdirwatch, TQ_SIGNAL( created( const TQString& ) ), + this, TQ_SLOT( slotFileCreated( const TQString& ) ) ); + connect( kdirwatch, TQ_SIGNAL( deleted( const TQString& ) ), + this, TQ_SLOT( slotFileDeleted( const TQString& ) ) ); } KDirListerCache::~KDirListerCache() @@ -243,12 +243,12 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, job->setWindow( lister->d->window ); } - connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), - this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), - this, TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), + this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), + this, TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); emit lister->started( _url ); @@ -608,10 +608,10 @@ void KDirListerCache::updateDirectory( const KURL& _dir ) job = TDEIO::listDir( _dir, false /* no default GUI */ ); jobs.insert( job, TQValueList<TDEIO::UDSEntry>() ); - connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); + connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) ); kdDebug(7004) << k_funcinfo << "update started in " << _dir << endl; @@ -925,7 +925,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url ) { // Nice hack to save memory: use the qt object name to store the filename TQTimer *timer = new TQTimer( this, _url.path().utf8() ); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFileDirtyDelayed()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFileDirtyDelayed()) ); pendingUpdates.insert( _url.path(), timer ); timer->start( 500, true ); } @@ -935,7 +935,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url ) // delayed updating of files, FAM is flooding us with events void KDirListerCache::slotFileDirtyDelayed() { - TQString file = TQString::fromUtf8( TQT_TQOBJECT_CONST(sender())->name() ); + TQString file = TQString::fromUtf8( sender()->name() ); kdDebug(7004) << k_funcinfo << file << endl; @@ -1357,10 +1357,10 @@ void KDirListerCache::slotRedirection( TDEIO::Job *j, const KURL& url ) // make the job an update job job->disconnect( this ); - connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); + connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) ); // FIXME: autoUpdate-Counts!! @@ -1946,44 +1946,53 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload ) d->changes = NONE; + if ( !validURL( _url ) ) { + return false; + } + + // Some ioslaves like media:/ or home:/ can provide a local url istead of a remote one // If a local path is available, monitor that instead of the given remote URL... if (!_url.isLocalFile()) { - TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url); - if (localURLJob) { - d->openURL_url[localURLJob] = _url; - d->openURL_keep[localURLJob] = _keep; - d->openURL_reload[localURLJob] = _reload; - connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); - connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); - } + TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url); + if (localURLJob) { + d->openURLContext[localURLJob] = KDirListerPrivate::OpenURLContext{_url, _keep, _reload}; + connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), + this, TQ_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); + connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed())); + d->complete = false; return true; + } } - else { - return s_pCache->listDir( this, _url, _keep, _reload ); - } + + return s_pCache->listDir( this, _url, _keep, _reload ); } void KDirLister::slotOpenURLGotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool isLocal) { - KURL realURL = d->openURL_url[job]; + auto jobIt = d->openURLContext.find(job); + + Q_ASSERT( jobIt != d->openURLContext.end() ); + + auto ctx = jobIt.data(); + KURL realURL = ctx.url; if (isLocal) { - realURL = url; - realURL.setInternalReferenceURL(d->openURL_url[job].url()); - d->m_referenceURLMap[d->openURL_url[job].url()] = url.path(); + realURL = url; + realURL.setInternalReferenceURL(ctx.url.url()); + d->m_referenceURLMap[ctx.url.url()] = url.path(); } - s_pCache->listDir( this, realURL, d->openURL_keep[job], d->openURL_reload[job] ); - d->openURL_url.remove(job); - d->openURL_keep.remove(job); - d->openURL_reload.remove(job); + d->openURLContext.remove(jobIt); + d->complete = d->jobData.isEmpty() && d->openURLContext.isEmpty(); + s_pCache->listDir( this, realURL, ctx.keep, ctx.reload ); } void KDirLister::slotLocalURLKIODestroyed() { - TDEIO::LocalURLJob* terminatedJob = const_cast<TDEIO::LocalURLJob*>(static_cast<const TDEIO::LocalURLJob*>(sender())); + TDEIO::Job* terminatedJob = const_cast<TDEIO::Job*>(static_cast<const TDEIO::Job*>(sender())); + auto jobIt = d->openURLContext.find(terminatedJob); - if (d->openURL_url.contains(terminatedJob)) { - s_pCache->listDir( this, d->openURL_url[terminatedJob], d->openURL_keep[terminatedJob], d->openURL_reload[terminatedJob] ); - d->openURL_url.remove(terminatedJob); - d->openURL_keep.remove(terminatedJob); - d->openURL_reload.remove(terminatedJob); + if (jobIt != d->openURLContext.end()) { + auto ctx = jobIt.data(); + d->openURLContext.remove(jobIt); + d->complete = d->jobData.isEmpty() && d->openURLContext.isEmpty(); + s_pCache->listDir( this, ctx.url, ctx.keep, ctx.reload ); } } @@ -1991,6 +2000,11 @@ void KDirLister::stop() { kdDebug(7003) << k_funcinfo << endl; s_pCache->stop( this ); + for( auto it = d->openURLContext.begin(); it != d->openURLContext.end(); ++it ) { + it.key()->disconnect( this ); + it.key()->kill(); + } + d->openURLContext.clear(); d->m_referenceURLMap.clear(); } @@ -1998,6 +2012,17 @@ void KDirLister::stop( const KURL& _url ) { kdDebug(7003) << k_funcinfo << _url.prettyURL() << endl; s_pCache->stop( this, _url ); + TQPtrList<TDEIO::Job> toRemove; + for( auto it = d->openURLContext.begin(); it != d->openURLContext.end(); ++it ) { + if( it.data().url ==_url ) { + it.key()->disconnect( this ); + it.key()->kill(); + toRemove.append(it.key()); + } + } + for(const auto &job: toRemove) { + d->openURLContext.remove(job); + } d->m_referenceURLMap.remove(_url.url()); } @@ -2398,7 +2423,6 @@ void KDirLister::addNewItems( const KFileItemList& items ) // TODO: make this faster - test if we have a filter at all first // DF: was this profiled? The matchesFoo() functions should be fast, w/o filters... // Of course if there is no filter and we can do a range-insertion instead of a loop, that might be good. - // But that's for Qt4, not possible with TQPtrList. for ( KFileItemListIterator kit( items ); kit.current(); ++kit ) { addNewItem( *kit ); } @@ -2642,16 +2666,16 @@ void KDirLister::jobStarted( TDEIO::ListJob *job ) void KDirLister::connectJob( TDEIO::ListJob *job ) { - connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), - this, TQT_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long )), - this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); - connect( job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), - this, TQT_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); - connect( job, TQT_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), - this, TQT_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); - connect( job, TQT_SIGNAL(speed( TDEIO::Job *, unsigned long )), - this, TQT_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); + connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), + this, TQ_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long )), + this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); + connect( job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQ_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQ_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQ_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQ_SIGNAL(speed( TDEIO::Job *, unsigned long )), + this, TQ_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); } void KDirLister::emitCompleted( const KURL& _url ) diff --git a/tdeio/tdeio/kdirlister.h b/tdeio/tdeio/kdirlister.h index a48709b19..b69a51841 100644 --- a/tdeio/tdeio/kdirlister.h +++ b/tdeio/tdeio/kdirlister.h @@ -58,7 +58,7 @@ class TDEIO_EXPORT KDirLister : public TQObject friend class KDirListerPrivate; friend class KDirListerCache; - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool autoUpdate READ autoUpdate WRITE setAutoUpdate ) TQ_PROPERTY( bool showingDotFiles READ showingDotFiles WRITE setShowingDotFiles ) TQ_PROPERTY( bool dirOnlyMode READ dirOnlyMode WRITE setDirOnlyMode ) diff --git a/tdeio/tdeio/kdirlister_p.h b/tdeio/tdeio/kdirlister_p.h index 0e1bfa259..7c3461c4b 100644 --- a/tdeio/tdeio/kdirlister_p.h +++ b/tdeio/tdeio/kdirlister_p.h @@ -111,9 +111,13 @@ public: TQStringList mimeFilter, oldMimeFilter; TQStringList mimeExcludeFilter, oldMimeExcludeFilter; - TQMap<TDEIO::Job*, KURL> openURL_url; - TQMap<TDEIO::Job*, bool> openURL_keep; - TQMap<TDEIO::Job*, bool> openURL_reload; + struct OpenURLContext { + KURL url; + bool keep; + bool reload; + }; + + TQMap<TDEIO::Job*, OpenURLContext> openURLContext; TQMap<TQString,TQString> m_referenceURLMap; }; @@ -133,7 +137,7 @@ public: */ class KDirListerCache : public TQObject, KDirNotify { - Q_OBJECT + TQ_OBJECT public: KDirListerCache( int maxCount = 10 ); ~KDirListerCache(); diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp index b3763978d..857e50703 100644 --- a/tdeio/tdeio/kdirwatch.cpp +++ b/tdeio/tdeio/kdirwatch.cpp @@ -64,11 +64,17 @@ // debug #include <sys/ioctl.h> +#ifdef Q_OS_SOLARIS +#include <sys/filio.h> /* FIONREAD */ +#endif /* solaris */ + #ifdef HAVE_INOTIFY #include <unistd.h> #include <fcntl.h> #include <sys/syscall.h> +#ifdef Q_OS_LINUX #include <linux/types.h> +#endif /* Linux */ // Linux kernel headers are documented to not compile #define _S390_BITOPS_H #include <sys/inotify.h> @@ -220,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate() : rescan_timer(0, "KDirWatchPrivate::rescan_timer") { timer = new TQTimer(this, "KDirWatchPrivate::timer"); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); freq = 3600000; // 1 hour as upper bound statEntries = 0; delayRemove = false; @@ -234,7 +240,7 @@ KDirWatchPrivate::KDirWatchPrivate() // used for FAM and DNOTIFY rescan_all = false; - connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); #ifdef HAVE_FAM // It's possible that FAM server can't be started @@ -243,8 +249,8 @@ KDirWatchPrivate::KDirWatchPrivate() use_fam=true; sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc), TQSocketNotifier::Read, this); - connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(famEventReceived()) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(famEventReceived()) ); } else { kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl; @@ -280,7 +286,7 @@ KDirWatchPrivate::KDirWatchPrivate() fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this ); - connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) ); + connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) ); } #endif @@ -314,7 +320,7 @@ KDirWatchPrivate::KDirWatchPrivate() fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL)); fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL)); mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this); - connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated())); + connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated())); // Install the signal handler only once if ( dnotify_signal == 0 ) { @@ -1243,7 +1249,7 @@ void KDirWatchPrivate::emitEvent(Entry* e, int event, const KURL &fileName) else #ifdef Q_OS_UNIX path += "/" + fileName.path(); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) //current drive is passed instead of / path += TQDir::currentDirPath().left(2) + "/" + fileName.path(); #endif @@ -1414,7 +1420,7 @@ void KDirWatchPrivate::slotRescan() timer->start(freq); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } bool KDirWatchPrivate::isNoisyFile( const char * filename ) @@ -1463,7 +1469,7 @@ void KDirWatchPrivate::famEventReceived() checkFAMEvent(&fe); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } void KDirWatchPrivate::checkFAMEvent(FAMEvent* fe) diff --git a/tdeio/tdeio/kdirwatch.h b/tdeio/tdeio/kdirwatch.h index 0ef3d1d34..ce7dae5cc 100644 --- a/tdeio/tdeio/kdirwatch.h +++ b/tdeio/tdeio/kdirwatch.h @@ -64,7 +64,7 @@ class KDirWatchPrivate; */ class TDEIO_EXPORT KDirWatch : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kdirwatch_p.h b/tdeio/tdeio/kdirwatch_p.h index a0d87fee3..46c83cf72 100644 --- a/tdeio/tdeio/kdirwatch_p.h +++ b/tdeio/tdeio/kdirwatch_p.h @@ -21,7 +21,7 @@ */ class KDirWatchPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum entryStatus { Normal = 0, NonExistent }; diff --git a/tdeio/tdeio/kfilterbase.h b/tdeio/tdeio/kfilterbase.h index 25613c101..f2c4f1225 100644 --- a/tdeio/tdeio/kfilterbase.h +++ b/tdeio/tdeio/kfilterbase.h @@ -24,7 +24,7 @@ #include <tdelibs_export.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #undef ERROR //avoid conflicts #endif @@ -37,7 +37,7 @@ class TQIODevice; */ class TDEIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create { - Q_OBJECT + TQ_OBJECT public: KFilterBase(); virtual ~KFilterBase(); diff --git a/tdeio/tdeio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp index b4e024031..4df335090 100644 --- a/tdeio/tdeio/kfilterdev.cpp +++ b/tdeio/tdeio/kfilterdev.cpp @@ -70,9 +70,9 @@ TQIODevice* KFilterDev::createFilterDevice(KFilterBase* base, TQFile* file) //we don't need a filter if (base==0) - return TQT_TQIODEVICE(new TQFile(file->name())); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) + return new TQFile(file->name()); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) - base->setDevice(TQT_TQIODEVICE(file)); + base->setDevice(file); return new KFilterDev(base); } #endif @@ -86,11 +86,11 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin : KFilterBase::findFilterByMimeType( mimetype ); if ( base ) { - base->setDevice(TQT_TQIODEVICE(f), true); + base->setDevice(f, true); return new KFilterDev(base, true); } if(!forceFilter) - return TQT_TQIODEVICE(f); + return f; else { delete f; @@ -116,7 +116,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype return 0; } -bool KFilterDev::open( TQ_OpenMode mode ) +bool KFilterDev::open( int mode ) { //kdDebug(7005) << "KFilterDev::open " << mode << endl; if ( mode == IO_ReadOnly ) @@ -132,7 +132,7 @@ bool KFilterDev::open( TQ_OpenMode mode ) d->bNeedHeader = !d->bSkipHeaders; filter->init( mode ); d->bOpenedUnderlyingDevice = !filter->device()->isOpen(); - bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQ_OpenMode)mode ) : true; + bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (int)mode ) : true; d->result = KFilterBase::OK; if ( !ret ) @@ -169,11 +169,7 @@ void KFilterDev::flush() // Hmm, might not be enough... } -#ifdef USE_QT4 -qint64 KFilterDev::size() const -#else // USE_QT4 TQIODevice::Offset KFilterDev::size() const -#endif // USE_QT4 { // Well, hmm, Houston, we have a problem. // We can't know the size of the uncompressed data @@ -236,7 +232,7 @@ bool KFilterDev::atEnd() const && d->ungetchBuffer.isEmpty(); } -TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) +TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) { Q_ASSERT ( filter->mode() == IO_ReadOnly ); //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl; @@ -355,7 +351,7 @@ TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) return dataReceived; } -TQT_TQIO_LONG KFilterDev::tqwriteBlock( const char *data /*0 to finish*/, TQT_TQIO_ULONG len ) +TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len ) { Q_ASSERT ( filter->mode() == IO_WriteOnly ); // If we had an error, return 0. diff --git a/tdeio/tdeio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h index 8dd0999a9..1783eccdf 100644 --- a/tdeio/tdeio/kfilterdev.h +++ b/tdeio/tdeio/kfilterdev.h @@ -55,7 +55,7 @@ public: */ #ifdef qdoc #else - virtual bool open( TQ_OpenMode mode ); + virtual bool open( int mode ); #endif /** * Close after reading or writing. @@ -82,11 +82,7 @@ public: // Not implemented #ifdef qdoc #else -#ifdef USE_QT4 - virtual qint64 size() const; -#else // USE_QT4 virtual TQIODevice::Offset size() const; -#endif // USE_QT4 #endif virtual TQIODevice::Offset at() const; @@ -99,8 +95,8 @@ public: #ifdef qdoc #else - virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ); - virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len ); + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ); #endif //int readLine( char *data, uint maxlen ); diff --git a/tdeio/tdeio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h index 3dc6c80f3..4337215ff 100644 --- a/tdeio/tdeio/klimitediodevice.h +++ b/tdeio/tdeio/klimitediodevice.h @@ -47,7 +47,7 @@ public: } virtual ~KLimitedIODevice() {} - virtual bool open( TQ_OpenMode m ) { + virtual bool open( int m ) { //kdDebug(7005) << "KLimitedIODevice::open m=" << m << endl; if ( m & IO_ReadOnly ) { /*bool ok = false; @@ -67,23 +67,19 @@ public: virtual void close() {} virtual void flush() {} -#ifdef USE_QT4 - virtual qint64 size() const { return m_length; } -#else // USE_QT4 virtual Offset size() const { return m_length; } -#endif // USE_QT4 - virtual TQT_TQIO_LONG tqreadBlock ( char * data, TQT_TQIO_ULONG maxlen ) + virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen ) { maxlen = TQMIN( maxlen, m_length - at() ); // Apply upper limit return m_dev->readBlock( data, maxlen ); } - virtual TQT_TQIO_LONG tqwriteBlock ( const char *, TQT_TQIO_ULONG ) { return -1; } // unsupported + virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported virtual int putch( int ) { return -1; } // unsupported virtual int getch() { char c[2]; - if ( tqreadBlock(c, 1) == -1) + if ( readBlock(c, 1) == -1) return -1; else return c[0]; diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp index 8e4eb9769..67ac7f7ea 100644 --- a/tdeio/tdeio/kmimetype.cpp +++ b/tdeio/tdeio/kmimetype.cpp @@ -855,7 +855,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf if ( fstype == "Default" ) // KDE-1 thing fstype = TQString::null; TQString point = cfg.readEntry( "MountPoint" ); -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN (void) new KAutoMount( ro, fstype, dev, point, _url.path() ); #endif retval = -1; // we don't want to return 0, but we don't want to return a pid @@ -1138,7 +1138,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT if ( fstype == "Default" ) // KDE-1 thing fstype = TQString::null; TQString point = cfg.readEntry( "MountPoint" ); -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN (void)new KAutoMount( ro, fstype, dev, point, path, false ); #endif } @@ -1148,7 +1148,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT if ( mp.isEmpty() ) return; -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN (void)new KAutoUnmount( mp, path ); #endif } diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp index 758cd4940..b8bbf9679 100644 --- a/tdeio/tdeio/kmimetypechooser.cpp +++ b/tdeio/tdeio/kmimetypechooser.cpp @@ -93,12 +93,12 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text, ((TQBoxLayout*)btns->layout())->addStretch(1); d->btnEditMimeType = new TQPushButton( i18n("&Edit..."), btns ); - connect( d->btnEditMimeType, TQT_SIGNAL(clicked()), this, TQT_SLOT(editMimeType()) ); + connect( d->btnEditMimeType, TQ_SIGNAL(clicked()), this, TQ_SLOT(editMimeType()) ); d->btnEditMimeType->setEnabled( false ); - connect( d->lvMimeTypes, TQT_SIGNAL( doubleClicked ( TQListViewItem * )), - this, TQT_SLOT( editMimeType())); - connect( d->lvMimeTypes, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); + connect( d->lvMimeTypes, TQ_SIGNAL( doubleClicked ( TQListViewItem * )), + this, TQ_SLOT( editMimeType())); + connect( d->lvMimeTypes, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) ); TQWhatsThis::add( d->btnEditMimeType, i18n( "Click this button to display the familiar TDE mime type editor.") ); @@ -193,8 +193,8 @@ void KMimeTypeChooser::editMimeType() return; TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 ); // thanks to libkonq/konq_operations.cpp - connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()), - this, TQT_SLOT(slotSycocaDatabaseChanged()) ); + connect( KSycoca::self(), TQ_SIGNAL(databaseChanged()), + this, TQ_SLOT(slotSycocaDatabaseChanged()) ); TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) diff --git a/tdeio/tdeio/kmimetypechooser.h b/tdeio/tdeio/kmimetypechooser.h index ad4c236c9..db3aa0c81 100644 --- a/tdeio/tdeio/kmimetypechooser.h +++ b/tdeio/tdeio/kmimetypechooser.h @@ -33,7 +33,7 @@ */ class TDEIO_EXPORT KMimeTypeChooser : public TQVBox { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h index c8828a0da..b0a6d7f9e 100644 --- a/tdeio/tdeio/kmimetyperesolver.h +++ b/tdeio/tdeio/kmimetyperesolver.h @@ -42,13 +42,13 @@ protected: /** * @internal - * This class is used by KMimeTypeResolver, because it can't be a QObject + * This class is used by KMimeTypeResolver, because it can't be a TQObject * itself. So an object of this class is used to handle signals, slots etc. * and forwards them to the KMimeTypeResolver instance. */ class TDEIO_EXPORT KMimeTypeResolverHelper : public TQObject { - Q_OBJECT + TQ_OBJECT public: KMimeTypeResolverHelper( KMimeTypeResolverBase *resolver, @@ -56,12 +56,12 @@ public: : m_resolver( resolver ), m_timer( new TQTimer( this ) ) { - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotProcessMimeIcons() )); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotProcessMimeIcons() )); - connect( view->horizontalScrollBar(), TQT_SIGNAL( sliderMoved(int) ), - TQT_SLOT( slotAdjust() ) ); - connect( view->verticalScrollBar(), TQT_SIGNAL( sliderMoved(int) ), - TQT_SLOT( slotAdjust() ) ); + connect( view->horizontalScrollBar(), TQ_SIGNAL( sliderMoved(int) ), + TQ_SLOT( slotAdjust() ) ); + connect( view->verticalScrollBar(), TQ_SIGNAL( sliderMoved(int) ), + TQ_SLOT( slotAdjust() ) ); view->viewport()->installEventFilter( this ); } diff --git a/tdeio/tdeio/knfsshare.cpp b/tdeio/tdeio/knfsshare.cpp index b4a3d903a..b72a94318 100644 --- a/tdeio/tdeio/knfsshare.cpp +++ b/tdeio/tdeio/knfsshare.cpp @@ -162,8 +162,8 @@ KNFSShare::KNFSShare() { d = new KNFSSharePrivate(); if (TQFile::exists(d->exportsFile)) { KDirWatch::self()->addFile(d->exportsFile); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString&))); } } diff --git a/tdeio/tdeio/knfsshare.h b/tdeio/tdeio/knfsshare.h index 64cd28dcf..1d2c306c7 100644 --- a/tdeio/tdeio/knfsshare.h +++ b/tdeio/tdeio/knfsshare.h @@ -34,7 +34,7 @@ class KNFSSharePrivate; */ class TDEIO_EXPORT KNFSShare : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Returns the one and only instance of KNFSShare diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index 44b383915..99584b5ac 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -61,7 +61,7 @@ #include <kde_file.h> #include <kstringhandler.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -562,7 +562,7 @@ static pid_t runCommandInternal( TDEProcess* proc, const KService* service, cons return 0; } TQString bin = KRun::binaryName( binName, true ); -#ifdef Q_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification +#ifdef TQ_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification bool silent; TQCString wmclass; TDEStartupInfoId id; @@ -918,7 +918,7 @@ void KRun::init ( const KURL& url, TQWidget* window, const TQCString& asn, mode_ // loop and do initialization afterwards. // Reason: We must complete the constructor before we do anything else. m_bInit = true; - connect( &m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); + connect( &m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); m_timer.start( 0, true ); kdDebug(7010) << " new KRun " << this << " " << url.prettyURL() << " timer=" << &m_timer << endl; @@ -1109,8 +1109,8 @@ void KRun::init() // It may be a directory or a file, let's stat TDEIO::StatJob *job = TDEIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo ); job->setWindow (d->m_window); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; kdDebug(7010) << " Job " << job << " is about stating " << m_strURL.url() << endl; } @@ -1158,10 +1158,10 @@ void KRun::scanFile() TDEIO::TransferJob *job = TDEIO::get( m_strURL, false /*reload*/, m_bProgressInfo ); job->setWindow (d->m_window); - connect(job, TQT_SIGNAL( result(TDEIO::Job *)), - this, TQT_SLOT( slotScanFinished(TDEIO::Job *))); - connect(job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL( result(TDEIO::Job *)), + this, TQ_SLOT( slotScanFinished(TDEIO::Job *))); + connect(job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); m_job = job; kdDebug(7010) << " Job " << job << " is about getting from " << m_strURL.url() << endl; } @@ -1341,14 +1341,14 @@ void KRun::foundMimeType( const TQString& type ) // (For instance a tar.gz is a directory contained inside a file) // It may be a directory or a file, let's stat TDEIO::StatJob *job = TDEIO::stat( m_strURL, m_bProgressInfo ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; return; } */ - TDEIO::TransferJob *job = ::tqqt_cast<TDEIO::TransferJob *>( m_job ); + TDEIO::TransferJob *job = ::tqt_cast<TDEIO::TransferJob *>( m_job ); if ( job ) { job->putOnHold(); @@ -1471,7 +1471,7 @@ TDEProcessRunner::run(TDEProcess * p, const TQString & binName) return (new TDEProcessRunner(p, binName))->pid(); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 pid_t TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const TDEStartupInfoId& id ) { @@ -1485,15 +1485,15 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName ) binName( _binName ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + process_, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) slotProcessExited( process_ ); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const TDEStartupInfoId& id ) : TQObject(), process_(p), @@ -1501,8 +1501,8 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, co id_( id ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + process_, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1545,7 +1545,7 @@ TDEProcessRunner::slotProcessExited(TDEProcess * p) kapp->deref(); } } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( !id_.none()) { TDEStartupInfoData data; diff --git a/tdeio/tdeio/krun.h b/tdeio/tdeio/krun.h index 6e5604f7a..62a1a5d91 100644 --- a/tdeio/tdeio/krun.h +++ b/tdeio/tdeio/krun.h @@ -57,7 +57,7 @@ namespace TDEIO { */ class TDEIO_EXPORT KRun : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Create a KRun object to run the preferred application for a file/URL. @@ -477,12 +477,12 @@ public: */ class TDEIO_EXPORT TDEProcessRunner : public TQObject { - Q_OBJECT + TQ_OBJECT public: static pid_t run(TDEProcess *, const TQString & binName); -#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded +#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded static pid_t run(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id ); #endif @@ -497,14 +497,14 @@ class TDEIO_EXPORT TDEProcessRunner : public TQObject private: TDEProcessRunner(TDEProcess *, const TQString & binName); -#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded +#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded TDEProcessRunner(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id ); #endif TDEProcessRunner(); TDEProcess * process_; TQString binName; -#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded +#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded TDEStartupInfoId id_; #endif }; diff --git a/tdeio/tdeio/ksambashare.cpp b/tdeio/tdeio/ksambashare.cpp index 608594ee5..d209812dd 100644 --- a/tdeio/tdeio/ksambashare.cpp +++ b/tdeio/tdeio/ksambashare.cpp @@ -181,8 +181,8 @@ KSambaShare::KSambaShare() { if (TQFile::exists(d->smbConf)) { KDirWatch::self()->addFile(d->smbConf); KDirWatch::self()->addFile(FILESHARECONF); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString&))); } } diff --git a/tdeio/tdeio/ksambashare.h b/tdeio/tdeio/ksambashare.h index ffd298588..d97a4a645 100644 --- a/tdeio/tdeio/ksambashare.h +++ b/tdeio/tdeio/ksambashare.h @@ -33,7 +33,7 @@ class KSambaSharePrivate; */ class TDEIO_EXPORT KSambaShare : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Returns the one and only instance of KSambaShare diff --git a/tdeio/tdeio/kscan.cpp b/tdeio/tdeio/kscan.cpp index b49459771..3ca269da9 100644 --- a/tdeio/tdeio/kscan.cpp +++ b/tdeio/tdeio/kscan.cpp @@ -41,7 +41,7 @@ KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KScanDialog", args ); + TQObject *res = factory->create( parent, name, "KScanDialog", args ); return dynamic_cast<KScanDialog *>( res ); } @@ -84,7 +84,7 @@ KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KOCRDialog", args ); + TQObject *res = factory->create( parent, name, "KOCRDialog", args ); return dynamic_cast<KOCRDialog *>( res ); } @@ -133,7 +133,7 @@ TQObject *KScanDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); + return createDialog( static_cast<TQWidget*>( parent ), name, modal ); } @@ -166,7 +166,7 @@ TQObject *KOCRDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); + return createDialog( static_cast<TQWidget*>( parent ), name, modal ); } void KScanDialog::virtual_hook( int id, void* data ) diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h index 940b8ceaa..cfc70e08a 100644 --- a/tdeio/tdeio/kscan.h +++ b/tdeio/tdeio/kscan.h @@ -43,8 +43,8 @@ class TQImage; * if ( !m_scanDialog ) // no scanning support installed? * return; * - * connect( m_scanDialog, TQT_SIGNAL( finalImage( const TQImage&, int )), - * TQT_SLOT( slotScanned( const TQImage&, int ) )); + * connect( m_scanDialog, TQ_SIGNAL( finalImage( const TQImage&, int )), + * TQ_SLOT( slotScanned( const TQImage&, int ) )); * } * * if ( m_scanDialog->setup() ) // only if scanner configured/available @@ -62,7 +62,7 @@ class TQImage; */ class TDEIO_EXPORT KScanDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -70,7 +70,7 @@ public: * or 0L if no scan-support * is available. Pass a suitable @p parent widget, if you like. If you * don't you have to 'delete' the returned pointer yourself. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model * @return the KScanDialog, or 0 if the function failed @@ -100,7 +100,7 @@ protected: * @param dialogFace the KDialogBase::DialogType * @param buttonMask a ORed mask of all buttons (see * KDialogBase::ButtonCode) - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model * @see KDialogBase @@ -187,7 +187,7 @@ public: /** * Your library should reimplement this method to return your KScanDialog * derived dialog. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model */ @@ -197,13 +197,13 @@ public: protected: /** * Creates a new KScanDialogFactory. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 */ KScanDialogFactory( TQObject *parent=0, const char *name=0 ); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); @@ -235,7 +235,7 @@ private: */ class TDEIO_EXPORT KOCRDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -243,7 +243,7 @@ public: * or 0L if no OCR-support * is available. Pass a suitable @p parent widget, if you like. If you * don't you have to 'delete' the returned pointer yourself. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model * @return the KOCRDialog, or 0 if the function failed @@ -260,7 +260,7 @@ protected: * @param dialogFace the KDialogBase::DialogType * @param buttonMask a ORed mask of all buttons (see * KDialogBase::ButtonCode) - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model */ @@ -323,7 +323,7 @@ public: /** * Your library should reimplement this method to return your KOCRDialog * derived dialog. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model */ @@ -333,13 +333,13 @@ public: protected: /** * Creates a new KScanDialogFactory. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 */ KOCRDialogFactory( TQObject *parent=0, const char *name=0 ); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* className = TQOBJECT_OBJECT_NAME_STRING, + const char* className = "TQObject", const TQStringList &args = TQStringList() ); diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index 05cf554c0..74df1a6b1 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -927,7 +927,7 @@ void KService::rebuildKSycoca(TQWidget *parent) DCOPClient *client = kapp->dcopClient(); int result = client->callAsync("kded", "tdebuildsycoca", "recreate()", - data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished())); + data, &dlg, TQ_SLOT(slotFinished())); if (result) { @@ -939,7 +939,7 @@ KServiceProgressDialog::KServiceProgressDialog(TQWidget *parent, const char *nam const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -968,7 +968,7 @@ KServiceProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - TQTimer::singleShot(1000, this, TQT_SLOT(close())); + TQTimer::singleShot(1000, this, TQ_SLOT(close())); } #include "kservice_p.moc" diff --git a/tdeio/tdeio/kservice_p.h b/tdeio/tdeio/kservice_p.h index 180ab8fc3..b0f0269ce 100644 --- a/tdeio/tdeio/kservice_p.h +++ b/tdeio/tdeio/kservice_p.h @@ -25,7 +25,7 @@ class KServiceProgressDialog : public KProgressDialog { - Q_OBJECT + TQ_OBJECT public: KServiceProgressDialog(TQWidget *parent, const char *name, const TQString &caption, const TQString &text); diff --git a/tdeio/tdeio/kservicetypefactory.cpp b/tdeio/tdeio/kservicetypefactory.cpp index 682a87d6b..77cda4059 100644 --- a/tdeio/tdeio/kservicetypefactory.cpp +++ b/tdeio/tdeio/kservicetypefactory.cpp @@ -234,7 +234,7 @@ KServiceType::List KServiceTypeFactory::allServiceTypes() it != list.end(); ++it) { -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS KServiceType *newServiceType = dynamic_cast<KServiceType *>((*it).data()); #else //FIXME KServiceType *newServiceType = (KServiceType*)(*it).data(); diff --git a/tdeio/tdeio/kshellcompletion.h b/tdeio/tdeio/kshellcompletion.h index a23fbe78e..632aef7a6 100644 --- a/tdeio/tdeio/kshellcompletion.h +++ b/tdeio/tdeio/kshellcompletion.h @@ -39,7 +39,7 @@ class KShellCompletionPrivate; */ class TDEIO_EXPORT KShellCompletion : public KURLCompletion { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kshred.h b/tdeio/tdeio/kshred.h index 5fabcaa5b..dae5cc3df 100644 --- a/tdeio/tdeio/kshred.h +++ b/tdeio/tdeio/kshred.h @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class TDEIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp index 058d328b7..74b47e69b 100644 --- a/tdeio/tdeio/ktar.cpp +++ b/tdeio/tdeio/ktar.cpp @@ -129,7 +129,7 @@ void KTar::prepareDevice( const TQString & filename, const TQString & mimetype, bool /*forced*/ ) { if( "application/x-tar" == mimetype ) - setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); + setDevice( new TQFile( filename ) ); else { // The compression filters are very slow with random access. @@ -149,7 +149,7 @@ void KTar::prepareDevice( const TQString & filename, // the device must be closed, however, for KArchive.setDevice() TQFile* file = d->tmpFile->file(); file->close(); - setDevice(TQT_TQIODEVICE(file)); + setDevice(file); } } diff --git a/tdeio/tdeio/ktrader.h b/tdeio/tdeio/ktrader.h index 3703f5e60..bcbb2aaa9 100644 --- a/tdeio/tdeio/ktrader.h +++ b/tdeio/tdeio/ktrader.h @@ -84,7 +84,7 @@ */ class TDEIO_EXPORT TDETrader : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * A list of services. diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h index cbd74d4e8..3c6861c15 100644 --- a/tdeio/tdeio/kurifilter.h +++ b/tdeio/tdeio/kurifilter.h @@ -306,7 +306,7 @@ public: /** * Overloaded assigenment operator. * - * This function allows you to easily assign a QString + * This function allows you to easily assign a TQString * to a KURIFilterData object. * * @return an instance of a KURIFilterData object. @@ -362,7 +362,7 @@ private: */ class TDEIO_EXPORT KURIFilterPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp index f7d095ced..1bbac7cfe 100644 --- a/tdeio/tdeio/kurlcompletion.cpp +++ b/tdeio/tdeio/kurlcompletion.cpp @@ -1333,12 +1333,12 @@ void KURLCompletion::slotIOFinished( TDEIO::Job * job ) assert( d->list_job ); connect( d->list_job, - TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotIOFinished(TDEIO::Job*)) ); + TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotIOFinished(TDEIO::Job*)) ); connect( d->list_job, - TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); + TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); delete kurl; } diff --git a/tdeio/tdeio/kurlcompletion.h b/tdeio/tdeio/kurlcompletion.h index a6b68b1b4..6c0bada4f 100644 --- a/tdeio/tdeio/kurlcompletion.h +++ b/tdeio/tdeio/kurlcompletion.h @@ -40,7 +40,7 @@ class KURLCompletionPrivate; */ class TDEIO_EXPORT KURLCompletion : public TDECompletion { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kzip.cpp b/tdeio/tdeio/kzip.cpp index 91f36a085..159d5c20a 100644 --- a/tdeio/tdeio/kzip.cpp +++ b/tdeio/tdeio/kzip.cpp @@ -385,7 +385,7 @@ bool KZip::openArchive( int mode ) return false; } Q_ASSERT( d->m_saveFile->file() ); - setDevice( TQT_TQIODEVICE(d->m_saveFile->file()) ); + setDevice( d->m_saveFile->file() ); } return true; case IO_ReadOnly: @@ -393,7 +393,7 @@ bool KZip::openArchive( int mode ) { // ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact. if ( !m_filename.isEmpty() ) { - setDevice( TQT_TQIODEVICE(new TQFile( m_filename )) ); + setDevice( new TQFile( m_filename ) ); if ( !device()->open( mode ) ) return false; } diff --git a/tdeio/tdeio/metainfojob.cpp b/tdeio/tdeio/metainfojob.cpp index 4f0721492..e00c262c8 100644 --- a/tdeio/tdeio/metainfojob.cpp +++ b/tdeio/tdeio/metainfojob.cpp @@ -61,7 +61,7 @@ MetaInfoJob::MetaInfoJob(const KFileItemList &items, bool deleteItems) // Return to event loop first, determineNextFile() might delete this; // (no idea what that means, it comes from previewjob) - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); } MetaInfoJob::~MetaInfoJob() @@ -130,8 +130,8 @@ void MetaInfoJob::getMetaInfo() TDEIO::TransferJob* job = TDEIO::get(URL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); job->addMetaData("mimeType", d->currentItem->current()->mimetype()); } diff --git a/tdeio/tdeio/metainfojob.h b/tdeio/tdeio/metainfojob.h index 44a80de1e..61f944260 100644 --- a/tdeio/tdeio/metainfojob.h +++ b/tdeio/tdeio/metainfojob.h @@ -32,7 +32,7 @@ namespace TDEIO { */ class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new MetaInfoJob. diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp index 132c87a50..da141e3ae 100644 --- a/tdeio/tdeio/netaccess.cpp +++ b/tdeio/tdeio/netaccess.cpp @@ -316,8 +316,8 @@ bool NetAccess::filecopyInternal(const KURL& src, const KURL& target, int permis ? TDEIO::file_move( src, target, permissions, overwrite, resume ) : TDEIO::file_copy( src, target, permissions, overwrite, resume ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -332,8 +332,8 @@ bool NetAccess::dircopyInternal(const KURL::List& src, const KURL& target, ? TDEIO::move( src, target ) : TDEIO::copy( src, target ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -347,8 +347,8 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source, job->setWindow (window); job->setDetails( details ); job->setSide( source ); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -358,8 +358,8 @@ KURL NetAccess::localURLInternal( const KURL & url, TQWidget* window ) m_localURL = url; TDEIO::LocalURLJob* job = TDEIO::localURL(url); job->setWindow (window); - connect(job, TQT_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) )); + connect(job, TQ_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ), + this, TQ_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) )); enter_loop(); return m_localURL; } @@ -369,8 +369,8 @@ bool NetAccess::delInternal( const KURL & url, TQWidget* window ) bJobOK = true; // success unless further error occurs TDEIO::Job * job = TDEIO::del( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -381,8 +381,8 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions, bJobOK = true; // success unless further error occurs TDEIO::Job * job = TDEIO::mkdir( url, permissions ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -393,10 +393,10 @@ TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window ) m_mimetype = TQString::fromLatin1("unknown"); TDEIO::Job * job = TDEIO::mimetype( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); enter_loop(); return m_mimetype; } @@ -437,8 +437,8 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman TDEIO::Job * job = TDEIO::special( tempPathUrl, packedArgs, true ); job->setWindow( window ); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); // since the TDEIO::special does not provide feedback we need to download the result @@ -482,21 +482,21 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* } } - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); TQMetaObject *meta = job->metaObject(); - static const char dataSignal[] = "data(TDEIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)"; + static const char dataSignal[] = "data(TDEIO::Job*,const " "TQByteArray" "&)"; if ( meta->findSignal( dataSignal ) != -1 ) { - connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); } static const char redirSignal[] = "redirection(TDEIO::Job*,const KURL&)"; if ( meta->findSignal( redirSignal ) != -1 ) { - connect( job, TQT_SIGNAL(redirection(TDEIO::Job*,const KURL&)), - this, TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); + connect( job, TQ_SIGNAL(redirection(TDEIO::Job*,const KURL&)), + this, TQ_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); } enter_loop(); @@ -516,7 +516,7 @@ void tqt_leave_modal( TQWidget *widget ); void NetAccess::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); diff --git a/tdeio/tdeio/netaccess.h b/tdeio/tdeio/netaccess.h index 7dde61385..b5e126086 100644 --- a/tdeio/tdeio/netaccess.h +++ b/tdeio/tdeio/netaccess.h @@ -58,7 +58,7 @@ namespace TDEIO { */ class TDEIO_EXPORT NetAccess : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/observer.h b/tdeio/tdeio/observer.h index 1864f9977..31e0feda0 100644 --- a/tdeio/tdeio/observer.h +++ b/tdeio/tdeio/observer.h @@ -55,7 +55,7 @@ namespace TDEIO { class TDEIO_EXPORT Observer : public TQObject, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp index 91fba050d..63c13ff22 100644 --- a/tdeio/tdeio/passdlg.cpp +++ b/tdeio/tdeio/passdlg.cpp @@ -87,13 +87,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, { lbl = new TQLabel( main ); lbl->setPixmap( pix ); - lbl->setAlignment( Qt::AlignLeft|Qt::AlignVCenter ); + lbl->setAlignment( TQt::AlignLeft|TQt::AlignVCenter ); lbl->setFixedSize( lbl->sizeHint() ); - d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft ); + d->layout->addWidget( lbl, 0, 0, TQt::AlignLeft ); } d->prompt = new TQLabel( main ); - d->prompt->setAlignment( Qt::AlignLeft|Qt::AlignVCenter|TQt::WordBreak ); - d->layout->addWidget( d->prompt, 0, 2, Qt::AlignLeft ); + d->prompt->setAlignment( TQt::AlignLeft|TQt::AlignVCenter|TQt::WordBreak ); + d->layout->addWidget( d->prompt, 0, 2, TQt::AlignLeft ); if ( prompt.isEmpty() ) setPrompt( i18n( "You need to supply a username and a password" ) ); else @@ -106,7 +106,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 4: Username field d->userNameLabel = new TQLabel( i18n("&Username:"), main ); - d->userNameLabel->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + d->userNameLabel->setAlignment( TQt::AlignVCenter | TQt::AlignLeft ); d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() ); d->userNameHBox = new TQHBox( main ); @@ -123,7 +123,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 6: Password field lbl = new TQLabel( i18n("&Password:"), main ); - lbl->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + lbl->setAlignment( TQt::AlignVCenter | TQt::AlignLeft ); lbl->setFixedSize( lbl->sizeHint() ); TQHBox* hbox = new TQHBox( main ); d->passEdit = new KLineEdit( hbox ); @@ -148,13 +148,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() ); d->keep = cfg->readBoolEntry("Keep", false ); d->keepCheckBox->setChecked( d->keep ); - connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); + connect(d->keepCheckBox, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotKeep( bool ))); d->layout->addWidget( hbox, 8, 2 ); } // Configure necessary key-bindings and connect necessar slots and signals - connect( d->userEdit, TQT_SIGNAL(returnPressed()), d->passEdit, TQT_SLOT(setFocus()) ); - connect( d->passEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->userEdit, TQ_SIGNAL(returnPressed()), d->passEdit, TQ_SLOT(setFocus()) ); + connect( d->passEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); if ( !user.isEmpty() ) { @@ -239,13 +239,13 @@ void PasswordDialog::addCommentLine( const TQString& label, TQWidget *main = mainWidget(); TQLabel* lbl = new TQLabel( label, main); - lbl->setAlignment( Qt::AlignVCenter|Qt::AlignRight ); + lbl->setAlignment( TQt::AlignVCenter|TQt::AlignRight ); lbl->setFixedSize( lbl->sizeHint() ); - d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); + d->layout->addWidget( lbl, d->nRow+2, 0, TQt::AlignLeft ); lbl = new TQLabel( comment, main); - lbl->setAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak ); + lbl->setAlignment( TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak ); calculateLabelSize(lbl); - d->layout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft ); + d->layout->addWidget( lbl, d->nRow+2, 2, TQt::AlignLeft ); d->layout->addRowSpacing( 3, 10 ); // Add a spacer d->nRow++; } @@ -315,8 +315,8 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin d->userEditCombo->insertStringList( knownLogins.keys() ); d->userEditCombo->setFocus(); - connect( d->userEditCombo, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( slotActivated( const TQString& ) ) ); + connect( d->userEditCombo, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( slotActivated( const TQString& ) ) ); } void PasswordDialog::slotActivated( const TQString& userName ) diff --git a/tdeio/tdeio/passdlg.h b/tdeio/tdeio/passdlg.h index 929fa1014..c1e3606b4 100644 --- a/tdeio/tdeio/passdlg.h +++ b/tdeio/tdeio/passdlg.h @@ -35,7 +35,7 @@ namespace TDEIO { */ class TDEIO_EXPORT PasswordDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp index d95cc7e88..61fb12c48 100644 --- a/tdeio/tdeio/pastedialog.cpp +++ b/tdeio/tdeio/pastedialog.cpp @@ -53,17 +53,17 @@ TDEIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, layout->addStretch(); - //connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - // TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); - //connect( this, TQT_SIGNAL( user1Clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); + //connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + // TQ_SLOT( slotEditTextChanged( const TQString & ) ) ); + //connect( this, TQ_SIGNAL( user1Clicked() ), m_lineEdit, TQ_SLOT( clear() ) ); //slotEditTextChanged( value ); setMinimumWidth( 350 ); m_clipboardChanged = false; if ( clipboard ) - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( slotClipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( slotClipboardDataChanged() ) ); } void TDEIO::PasteDialog::slotClipboardDataChanged() diff --git a/tdeio/tdeio/pastedialog.h b/tdeio/tdeio/pastedialog.h index 2e7bdfda1..07b4dfce5 100644 --- a/tdeio/tdeio/pastedialog.h +++ b/tdeio/tdeio/pastedialog.h @@ -34,7 +34,7 @@ namespace TDEIO { */ class PasteDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PasteDialog( const TQString &caption, const TQString &label, const TQString &value, const TQStringList& items, diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp index 38ee74ac2..d1820a69e 100644 --- a/tdeio/tdeio/previewjob.cpp +++ b/tdeio/tdeio/previewjob.cpp @@ -139,7 +139,7 @@ PreviewJob::PreviewJob( const KFileItemList &items, int width, int height, d->ignoreMaximumSize = false; // Return to event loop first, determineNextFile() might delete this; - connect(&d->startPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startPreview()) ); + connect(&d->startPreviewTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startPreview()) ); d->startPreviewTimer.start(0, true); } @@ -450,7 +450,7 @@ void PreviewJob::createThumbnail( TQString pixPath ) thumbURL.setPath(pixPath); TDEIO::TransferJob *job = TDEIO::get(thumbURL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool(); job->addMetaData("mimeType", d->currentItem.item->mimetype()); job->addMetaData("width", TQString().setNum(save ? d->cacheWidth : d->width)); diff --git a/tdeio/tdeio/previewjob.h b/tdeio/tdeio/previewjob.h index a1b9550ba..b4cecf412 100644 --- a/tdeio/tdeio/previewjob.h +++ b/tdeio/tdeio/previewjob.h @@ -34,7 +34,7 @@ namespace TDEIO { */ class TDEIO_EXPORT PreviewJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new PreviewJob. diff --git a/tdeio/tdeio/progressbase.cpp b/tdeio/tdeio/progressbase.cpp index 146f4182e..608213c6a 100644 --- a/tdeio/tdeio/progressbase.cpp +++ b/tdeio/tdeio/progressbase.cpp @@ -37,14 +37,14 @@ ProgressBase::ProgressBase( TQWidget *parent ) void ProgressBase::setJob( TDEIO::Job *job ) { // first connect all slots - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -54,37 +54,37 @@ void ProgressBase::setJob( TDEIO::Job *job ) void ProgressBase::setJob( TDEIO::CopyJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), + TQ_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), + TQ_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -94,33 +94,33 @@ void ProgressBase::setJob( TDEIO::CopyJob *job ) void ProgressBase::setJob( TDEIO::DeleteJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; diff --git a/tdeio/tdeio/progressbase.h b/tdeio/tdeio/progressbase.h index 655edeee5..9dcad7c13 100644 --- a/tdeio/tdeio/progressbase.h +++ b/tdeio/tdeio/progressbase.h @@ -69,7 +69,7 @@ namespace TDEIO */ class TDEIO_EXPORT ProgressBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp index 41d8851d9..ce2ae5323 100644 --- a/tdeio/tdeio/renamedlg.cpp +++ b/tdeio/tdeio/renamedlg.cpp @@ -48,7 +48,7 @@ #include <kguiitem.h> #include <ksqueezedtextlabel.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -99,7 +99,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver, // i.e. in a separate process. // ####### This isn't the case anymore - remove? -#if !defined(Q_WS_QWS) && !defined(Q_WS_WIN) //FIXME(E): Implement for QT Embedded & win32 +#if !defined(TQ_WS_QWS) && !defined(TQ_WS_WIN) //FIXME(E): Implement for QT Embedded & win32 if (d->modal) KWin::setState( winId(), NET::StaysOnTop ); #endif @@ -113,42 +113,42 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, setCaption( _caption ); d->bCancel = new KPushButton( KStdGuiItem::cancel(), this ); - connect(d->bCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed())); + connect(d->bCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed())); if ( ! (_mode & M_NORENAME ) ) { d->bRename = new TQPushButton( i18n( "&Rename" ), this ); d->bRename->setEnabled(false); d->bSuggestNewName = new TQPushButton( i18n( "Suggest New &Name" ), this ); - connect(d->bSuggestNewName, TQT_SIGNAL(clicked()), this, TQT_SLOT(b8Pressed())); - connect(d->bRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed())); + connect(d->bSuggestNewName, TQ_SIGNAL(clicked()), this, TQ_SLOT(b8Pressed())); + connect(d->bRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed())); } if ( ( _mode & M_MULTI ) && ( _mode & M_SKIP ) ) { d->bSkip = new TQPushButton( i18n( "&Skip" ), this ); - connect(d->bSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); + connect(d->bSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed())); d->bAutoSkip = new TQPushButton( i18n( "&Auto Skip" ), this ); - connect(d->bAutoSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b3Pressed())); + connect(d->bAutoSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b3Pressed())); } if ( _mode & M_OVERWRITE ) { d->bOverwrite = new TQPushButton( i18n( "&Overwrite" ), this ); - connect(d->bOverwrite, TQT_SIGNAL(clicked()), this, TQT_SLOT(b4Pressed())); + connect(d->bOverwrite, TQ_SIGNAL(clicked()), this, TQ_SLOT(b4Pressed())); if ( _mode & M_MULTI ) { d->bOverwriteAll = new TQPushButton( i18n( "O&verwrite All" ), this ); - connect(d->bOverwriteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b5Pressed())); + connect(d->bOverwriteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b5Pressed())); } } if ( _mode & M_RESUME ) { d->bResume = new TQPushButton( i18n( "&Resume" ), this ); - connect(d->bResume, TQT_SIGNAL(clicked()), this, TQT_SLOT(b6Pressed())); + connect(d->bResume, TQ_SIGNAL(clicked()), this, TQ_SLOT(b6Pressed())); if ( _mode & M_MULTI ) { d->bResumeAll = new TQPushButton( i18n( "R&esume All" ), this ); - connect(d->bResumeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b7Pressed())); + connect(d->bResumeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b7Pressed())); } } @@ -194,12 +194,12 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, lib->unload(); continue; } - TQObject *obj = factory->create( TQT_TQOBJECT(this), (*it)->name().latin1() ); + TQObject *obj = factory->create( this, (*it)->name().latin1() ); if(!obj) { lib->unload(); continue; } - RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(TQT_TQWIDGET(obj)); + RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(static_cast<TQWidget*>(obj)); if(!plugin ){ delete obj; continue; @@ -223,7 +223,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, // No plugin found, build default dialog TQGridLayout * gridLayout = new TQGridLayout( 0L, 9, 2, KDialog::marginHint(), KDialog::spacingHint() ); - pLayout->addLayout(TQT_TQLAYOUT(gridLayout)); + pLayout->addLayout(gridLayout); gridLayout->setColStretch(0,0); gridLayout->setColStretch(1,10); @@ -325,8 +325,8 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, TQString fileName = d->dest.fileName(); d->m_pLineEdit->setText( TDEIO::decodeFileName( fileName ) ); if ( d->bRename || d->bOverwrite ) - connect(d->m_pLineEdit, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(enableRenameButton(const TQString &))); + connect(d->m_pLineEdit, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(enableRenameButton(const TQString &))); if ( d->bSuggestNewName ) { layout2->addWidget( d->bSuggestNewName ); diff --git a/tdeio/tdeio/renamedlg.h b/tdeio/tdeio/renamedlg.h index 2183d05b6..2550f63f6 100644 --- a/tdeio/tdeio/renamedlg.h +++ b/tdeio/tdeio/renamedlg.h @@ -47,7 +47,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW */ class TDEIO_EXPORT RenameDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: /** * Construct a "rename" dialog. diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp index 3935a91cf..30c2d8375 100644 --- a/tdeio/tdeio/scheduler.cpp +++ b/tdeio/tdeio/scheduler.cpp @@ -139,9 +139,9 @@ Scheduler::Scheduler() extraJobData = new ExtraJobData; sessionData = new SessionData; slaveConfig = SlaveConfig::self(); - connect(&slaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startStep())); - connect(&coSlaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotScheduleCoSlave())); - connect(&cleanupTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCleanIdleSlaves())); + connect(&slaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startStep())); + connect(&coSlaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotScheduleCoSlave())); + connect(&cleanupTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCleanIdleSlaves())); busy = false; } @@ -541,15 +541,15 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL { slaveList->append(slave); idleSlaves->append(slave); - connect(slave, TQT_SIGNAL(slaveDied(TDEIO::Slave *)), - TQT_SLOT(slotSlaveDied(TDEIO::Slave *))); - connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), - TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); - - connect(slave,TQT_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), - sessionData,TQT_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); - connect(slave,TQT_SIGNAL(delAuthorization(const TQCString&)), sessionData, - TQT_SLOT(slotDelAuthData(const TQCString&))); + connect(slave, TQ_SIGNAL(slaveDied(TDEIO::Slave *)), + TQ_SLOT(slotSlaveDied(TDEIO::Slave *))); + connect(slave, TQ_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), + TQ_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); + + connect(slave,TQ_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), + sessionData,TQ_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); + connect(slave,TQ_SIGNAL(delAuthorization(const TQCString&)), sessionData, + TQ_SLOT(slotDelAuthData(const TQCString&))); } else { @@ -713,10 +713,10 @@ Scheduler::_getConnectedSlave(const KURL &url, const TDEIO::MetaData &config ) setupSlave(slave, url, protocol, proxy, true, &config); slave->send( CMD_CONNECT ); - connect(slave, TQT_SIGNAL(connected()), - TQT_SLOT(slotSlaveConnected())); - connect(slave, TQT_SIGNAL(error(int, const TQString &)), - TQT_SLOT(slotSlaveError(int, const TQString &))); + connect(slave, TQ_SIGNAL(connected()), + TQ_SLOT(slotSlaveConnected())); + connect(slave, TQ_SIGNAL(error(int, const TQString &)), + TQ_SLOT(slotSlaveError(int, const TQString &))); coSlaves.insert(slave, new TQPtrList<SimpleJob>()); // kdDebug(7006) << "_getConnectedSlave( " << slave << ")" << endl; @@ -772,8 +772,8 @@ Scheduler::slotSlaveConnected() Slave *slave = (Slave *)sender(); // kdDebug(7006) << "slotSlaveConnected( " << slave << ")" << endl; slave->setConnected(true); - disconnect(slave, TQT_SIGNAL(connected()), - this, TQT_SLOT(slotSlaveConnected())); + disconnect(slave, TQ_SIGNAL(connected()), + this, TQ_SLOT(slotSlaveConnected())); emit slaveConnected(slave); assert(!coIdleSlaves->contains(slave)); coIdleSlaves->append(slave); @@ -838,10 +838,10 @@ Scheduler::_disconnectSlave(TDEIO::Slave *slave) delete list; coIdleSlaves->removeRef(slave); assert(!coIdleSlaves->contains(slave)); - disconnect(slave, TQT_SIGNAL(connected()), - this, TQT_SLOT(slotSlaveConnected())); - disconnect(slave, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(slotSlaveError(int, const TQString &))); + disconnect(slave, TQ_SIGNAL(connected()), + this, TQ_SLOT(slotSlaveConnected())); + disconnect(slave, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SLOT(slotSlaveError(int, const TQString &))); if (slave->isAlive()) { idleSlaves->append(slave); @@ -865,7 +865,7 @@ Scheduler::_registerWindow(TQWidget *wid) if (!wid) return; - TQObject *obj = TQT_TQOBJECT(wid); + TQObject *obj = wid; if (!m_windowList.contains(obj)) { // We must store the window Id because by the time @@ -873,8 +873,8 @@ Scheduler::_registerWindow(TQWidget *wid) // access TQWidget::winId() (already destructed) WId windowId = wid->winId(); m_windowList.insert(obj, windowId); - connect(TQT_TQOBJECT(wid), TQT_SIGNAL(destroyed(TQObject *)), - this, TQT_SLOT(slotUnregisterWindow(TQObject*))); + connect(wid, TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(slotUnregisterWindow(TQObject*))); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << windowId; @@ -894,8 +894,8 @@ Scheduler::slotUnregisterWindow(TQObject *obj) if (it == m_windowList.end()) return; WId windowId = it.data(); - disconnect( it.key(), TQT_SIGNAL(destroyed(TQObject *)), - this, TQT_SLOT(slotUnregisterWindow(TQObject*))); + disconnect( it.key(), TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(slotUnregisterWindow(TQObject*))); m_windowList.remove( it ); if (kapp) { diff --git a/tdeio/tdeio/scheduler.h b/tdeio/tdeio/scheduler.h index fe0d050e4..f7f7bb1a7 100644 --- a/tdeio/tdeio/scheduler.h +++ b/tdeio/tdeio/scheduler.h @@ -108,7 +108,7 @@ namespace TDEIO { **/ class TDEIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT public: typedef TQPtrList<SimpleJob> JobList; diff --git a/tdeio/tdeio/sessiondata.h b/tdeio/tdeio/sessiondata.h index 4aee40497..48595c68e 100644 --- a/tdeio/tdeio/sessiondata.h +++ b/tdeio/tdeio/sessiondata.h @@ -34,7 +34,7 @@ class SlaveConfig; */ class TDEIO_EXPORT SessionData : public TQObject { - Q_OBJECT + TQ_OBJECT public: SessionData(); diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp index 5871bbd09..ffc09d559 100644 --- a/tdeio/tdeio/skipdlg.cpp +++ b/tdeio/tdeio/skipdlg.cpp @@ -32,7 +32,7 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -46,7 +46,7 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver, // i.e. in a separate process. -#ifdef Q_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32 +#ifdef TQ_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32 if (modal) KWin::setState( winId(), NET::StaysOnTop ); #endif @@ -56,15 +56,15 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo setCaption( i18n( "Information" ) ); b0 = new KPushButton( KStdGuiItem::cancel(), this ); - connect(b0, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed())); + connect(b0, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed())); if ( _multi ) { b1 = new TQPushButton( i18n( "Skip" ), this ); - connect(b1, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed())); + connect(b1, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed())); b2 = new TQPushButton( i18n( "Auto Skip" ), this ); - connect(b2, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); + connect(b2, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed())); } TQVBoxLayout *vlayout = new TQVBoxLayout( this, 10, 0 ); diff --git a/tdeio/tdeio/skipdlg.h b/tdeio/tdeio/skipdlg.h index c07086463..a63eb062b 100644 --- a/tdeio/tdeio/skipdlg.h +++ b/tdeio/tdeio/skipdlg.h @@ -36,7 +36,7 @@ namespace TDEIO { */ class TDEIO_EXPORT SkipDlg : public KDialog { - Q_OBJECT + TQ_OBJECT public: SkipDlg( TQWidget *parent, bool _multi, const TQString& _error_text, bool _modal = false ); ~SkipDlg(); diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp index b4a7c8f2a..5ced7acf8 100644 --- a/tdeio/tdeio/slave.cpp +++ b/tdeio/tdeio/slave.cpp @@ -89,12 +89,12 @@ namespace TDEIO { void Slave::accept(TDESocket *socket) { -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN slaveconn.init(socket); #endif delete serv; serv = 0; - slaveconn.connect(this, TQT_SLOT(gotInput())); + slaveconn.connect(this, TQ_SLOT(gotInput())); unlinkSocket(); } @@ -116,7 +116,7 @@ void Slave::timeout() kdDebug(7002) << "slave is slow... pid=" << m_pid << " t=" << delta_t << endl; if (delta_t < SLAVE_CONNECTION_TIMEOUT_MAX) { - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQ_SLOT(timeout())); return; } } @@ -151,9 +151,9 @@ Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString & idle_since = contact_started; m_pid = 0; m_port = 0; -#ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( TDESocket* )), - TQT_SLOT(accept(TDESocket*) ) ); +#ifndef TQ_WS_WIN + connect(serv, TQ_SIGNAL(accepted( TDESocket* )), + TQ_SLOT(accept(TDESocket*) ) ); #endif } @@ -173,9 +173,9 @@ Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol m_pid = 0; m_port = 0; if (serv != 0) { -#ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( TDESocket* )), - TQT_SLOT(accept(TDESocket*) ) ); +#ifndef TQ_WS_WIN + connect(serv, TQ_SIGNAL(accepted( TDESocket* )), + TQ_SLOT(accept(TDESocket*) ) ); #endif } } @@ -376,7 +376,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error socketfile.close(); #endif -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); @@ -418,9 +418,9 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error proc.start(TDEProcess::DontCare); -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN slave->setPID(proc.pid()); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } @@ -450,9 +450,9 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error delete slave; return 0; } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN slave->setPID(pid); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } @@ -478,7 +478,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) socketfile.unlink(); #endif -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); @@ -505,9 +505,9 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) delete slave; return 0; } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN slave->setPID(pid); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } diff --git a/tdeio/tdeio/slave.h b/tdeio/tdeio/slave.h index ae4eb00db..2f8138dc9 100644 --- a/tdeio/tdeio/slave.h +++ b/tdeio/tdeio/slave.h @@ -42,7 +42,7 @@ namespace TDEIO { */ class TDEIO_EXPORT Slave : public TDEIO::SlaveInterface { - Q_OBJECT + TQ_OBJECT protected: diff --git a/tdeio/tdeio/slaveconfig.h b/tdeio/tdeio/slaveconfig.h index a21965040..9f8562649 100644 --- a/tdeio/tdeio/slaveconfig.h +++ b/tdeio/tdeio/slaveconfig.h @@ -45,7 +45,7 @@ namespace TDEIO { */ class TDEIO_EXPORT SlaveConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: static SlaveConfig *self(); ~SlaveConfig(); diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp index 47f935cda..1b9e853ed 100644 --- a/tdeio/tdeio/slaveinterface.cpp +++ b/tdeio/tdeio/slaveinterface.cpp @@ -135,7 +135,7 @@ SlaveInterface::SlaveInterface( Connection * connection ) m_progressId = 0; d = new SlaveInterfacePrivate; - connect(&d->speed_timer, TQT_SIGNAL(timeout()), TQT_SLOT(calcSpeed())); + connect(&d->speed_timer, TQ_SIGNAL(timeout()), TQ_SLOT(calcSpeed())); } SlaveInterface::~SlaveInterface() diff --git a/tdeio/tdeio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h index 584a4f606..2f9fdbd5a 100644 --- a/tdeio/tdeio/slaveinterface.h +++ b/tdeio/tdeio/slaveinterface.h @@ -92,7 +92,7 @@ class SlaveInterfacePrivate; */ class TDEIO_EXPORT SlaveInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: SlaveInterface( Connection *connection ); diff --git a/tdeio/tdeio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp index d7ef698c4..270c997d3 100644 --- a/tdeio/tdeio/statusbarprogress.cpp +++ b/tdeio/tdeio/statusbarprogress.cpp @@ -49,7 +49,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) box->addWidget( m_pButton ); stack = new TQWidgetStack( this ); box->addWidget( stack ); - connect( m_pButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotStop() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStop() ) ); m_pProgressBar = new KProgress( this ); m_pProgressBar->setFrameStyle( TQFrame::Box | TQFrame::Raised ); @@ -144,7 +144,7 @@ bool StatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) { if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *e = (TQMouseEvent*)ev; - if ( e->button() == Qt::LeftButton ) { // toggle view on left mouse button + if ( e->button() == TQt::LeftButton ) { // toggle view on left mouse button if ( mode == Label ) { mode = Progress; } else if ( mode == Progress ) { diff --git a/tdeio/tdeio/statusbarprogress.h b/tdeio/tdeio/statusbarprogress.h index d1d591fbe..ff235e9ab 100644 --- a/tdeio/tdeio/statusbarprogress.h +++ b/tdeio/tdeio/statusbarprogress.h @@ -59,7 +59,7 @@ class Job; */ class TDEIO_EXPORT StatusbarProgress : public ProgressBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp index 0237c9fd5..d75e8804f 100644 --- a/tdeio/tdeio/tcpslavebase.cpp +++ b/tdeio/tdeio/tcpslavebase.cpp @@ -44,7 +44,7 @@ #include <ksslall.h> #include <ksslcertdlg.h> #include <tdemessagebox.h> -#ifndef Q_WS_WIN //temporary +#ifndef TQ_WS_WIN //temporary #include <kresolver.h> #endif @@ -762,7 +762,7 @@ int TCPSlaveBase::verifyCertificate() _IPmatchesCN = d->kssl->peerInfo().certMatchesAddress(); if (!_IPmatchesCN) { -#ifndef Q_WS_WIN //temporary +#ifndef TQ_WS_WIN //temporary KNetwork::KResolverResults res = KNetwork::KResolver::resolve(d->kssl->peerInfo().peerHost(), "80", KNetwork::KResolver::CanonName); if (!res.isEmpty()) { TQString old = d->kssl->peerInfo().peerHost(); diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp index 577a8a0d7..aa4d1f873 100644 --- a/tdeio/tdeio/tdefileitem.cpp +++ b/tdeio/tdeio/tdefileitem.cpp @@ -965,7 +965,7 @@ TQString KFileItem::getToolTipText(int maxcount) if(!timeStr.isEmpty()) tip += start + i18n("Modified:") + mid + timeStr + end; -#ifndef Q_WS_WIN //TODO: show win32-specific permissions +#ifndef TQ_WS_WIN //TODO: show win32-specific permissions TQString userStr = user(); TQString groupStr = group(); if(!userStr.isEmpty() || !groupStr.isEmpty()) diff --git a/tdeio/tdeio/tdefilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp index c1389695d..d6be6e17c 100644 --- a/tdeio/tdeio/tdefilemetainfo.cpp +++ b/tdeio/tdeio/tdefilemetainfo.cpp @@ -951,7 +951,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const return 0; KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService<KFilePlugin> - ( service, TQT_TQOBJECT(this), mimeType.local8Bit() ); + ( service, this, mimeType.local8Bit() ); if (!plugin) kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl; diff --git a/tdeio/tdeio/tdefilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h index 2266690e8..e0371c7dd 100644 --- a/tdeio/tdeio/tdefilemetainfo.h +++ b/tdeio/tdeio/tdefilemetainfo.h @@ -1393,7 +1393,7 @@ private: **/ class TDEIO_EXPORT KFilePlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -1643,11 +1643,11 @@ private: * supported and which groups and items are provided for it, you can ask * the KFileMetainfoProvider for it. **/ -class TDEIO_EXPORT KFileMetaInfoProvider: private QObject +class TDEIO_EXPORT KFileMetaInfoProvider: private TQObject { friend class KFilePlugin; - Q_OBJECT + TQ_OBJECT public: virtual ~KFileMetaInfoProvider(); diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp index dc3f8c05a..d13214195 100644 --- a/tdeio/tdeio/tdefileshare.cpp +++ b/tdeio/tdeio/tdefileshare.cpp @@ -54,12 +54,12 @@ bool KFileShare::s_sharingEnabled; KFileSharePrivate::KFileSharePrivate() { KDirWatch::self()->addFile(FILESHARECONF); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); - connect(KDirWatch::self(), TQT_SIGNAL(created(const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); - connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(created(const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); } KFileSharePrivate::~KFileSharePrivate() diff --git a/tdeio/tdeio/tdefileshare.h b/tdeio/tdeio/tdefileshare.h index b909a8e2f..7ef2b67a9 100644 --- a/tdeio/tdeio/tdefileshare.h +++ b/tdeio/tdeio/tdefileshare.h @@ -31,7 +31,7 @@ class KDirWatch; */ class KFileSharePrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: KFileSharePrivate(); diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp index 54987e43c..2245fcfac 100644 --- a/tdeio/tdeioexec/main.cpp +++ b/tdeio/tdeioexec/main.cpp @@ -125,7 +125,7 @@ KIOExec::KIOExec() TDEIO::Job *job = TDEIO::file_copy( url, dest ); jobList->append( job ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } } @@ -133,7 +133,7 @@ KIOExec::KIOExec() if ( tempfiles ) { // #113991 - TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) ); //slotRunApp(); // does not return return; } @@ -174,7 +174,7 @@ void KIOExec::slotResult( TDEIO::Job * job ) kdDebug() << "All files downloaded, will call slotRunApp shortly" << endl; // We know we can run the app now - but let's finish the job properly first. - TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) ); jobList->clear(); } @@ -204,7 +204,7 @@ void KIOExec::slotRunApp() kdDebug() << "EXEC " << KShell::joinArgs( params ) << endl; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // propagate the startup indentification to the started process TDEStartupInfoId id; id.initId( kapp->startupId()); @@ -215,7 +215,7 @@ void KIOExec::slotRunApp() proc << params; proc.start( TDEProcess::Block ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEStartupInfo::resetStartupEnv(); #endif diff --git a/tdeio/tdeioexec/main.h b/tdeio/tdeioexec/main.h index beb6a2297..863da887a 100644 --- a/tdeio/tdeioexec/main.h +++ b/tdeio/tdeioexec/main.h @@ -10,7 +10,7 @@ namespace TDEIO { class Job; } class KIOExec : public TQObject { - Q_OBJECT + TQ_OBJECT public: KIOExec(); diff --git a/tdeio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp index ed0a63ed9..45e4d1dda 100644 --- a/tdeio/tests/dataprotocoltest.cpp +++ b/tdeio/tests/dataprotocoltest.cpp @@ -247,7 +247,7 @@ const char * const url; #if 0 // == charset tests // -------------------- string -const QChar +const TQChar const TQChar * const charset_urls[] = { #endif diff --git a/tdeio/tests/dummymeta.h b/tdeio/tests/dummymeta.h index 4cefcc01d..20c9fec54 100644 --- a/tdeio/tests/dummymeta.h +++ b/tdeio/tests/dummymeta.h @@ -7,7 +7,7 @@ class KFileMetaInfo; class DummyMeta : public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: DummyMeta( TQObject *parent, const char *name, const TQStringList &args ); diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp index 7df3ff3f0..15770c941 100644 --- a/tdeio/tests/jobtest.cpp +++ b/tdeio/tests/jobtest.cpp @@ -160,7 +160,7 @@ static void createTestFile( const TQString& path ) TQFile f( path ); if ( !f.open( IO_WriteOnly ) ) kdFatal() << "Can't create " << path << endl; - f.tqwriteBlock( "Hello world", 11 ); + f.writeBlock( "Hello world", 11 ); f.close(); setTimeStamp( path ); } @@ -195,8 +195,8 @@ void JobTest::get() KURL u; u.setPath( filePath ); m_result = -1; TDEIO::StoredTransferJob* job = TDEIO::storedGet( u ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) ); kapp->eventLoop()->enterLoop(); assert( m_result == 0 ); // no error assert( m_data.size() == 11 ); @@ -498,8 +498,8 @@ void JobTest::listRecursive() KURL u; u.setPath( src ); TDEIO::ListJob* job = TDEIO::listRecursive( u ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); m_names.sort(); @@ -565,8 +565,8 @@ void JobTest::copyFileToSystem( bool resolve_local_urls ) // copy the file with file_copy TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d ); - connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), - this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), + this, TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); diff --git a/tdeio/tests/jobtest.h b/tdeio/tests/jobtest.h index 5bff6d0e3..bcf1af5ac 100644 --- a/tdeio/tests/jobtest.h +++ b/tdeio/tests/jobtest.h @@ -26,7 +26,7 @@ class JobTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: JobTest() {} diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp index e99de7e79..674e6a3dd 100644 --- a/tdeio/tests/kdcopcheck.cpp +++ b/tdeio/tests/kdcopcheck.cpp @@ -40,14 +40,14 @@ TestService::TestService(const TQString &exec) proc.start(); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString&)), - this, TQT_SLOT(newApp(const TQCString&))); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), - this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(appExit())); - - TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); + connect(kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)), + this, TQ_SLOT(newApp(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)), + this, TQ_SLOT(endApp(const TQCString&))); + connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(appExit())); + + TQTimer::singleShot(20*1000, this, TQ_SLOT(stop())); result = KService::DCOP_None; } diff --git a/tdeio/tests/kdcopcheck.h b/tdeio/tests/kdcopcheck.h index 593dbba1e..07236909c 100644 --- a/tdeio/tests/kdcopcheck.h +++ b/tdeio/tests/kdcopcheck.h @@ -7,7 +7,7 @@ class TestService : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestService(const TQString &exec); diff --git a/tdeio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp index b1208f41d..54cefac87 100644 --- a/tdeio/tests/kdirlistertest.cpp +++ b/tdeio/tests/kdirlistertest.cpp @@ -49,48 +49,48 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) layout->addWidget( test ); resize( layout->sizeHint() ); - connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); - connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); - connect( startT, TQT_SIGNAL( clicked() ), TQT_SLOT( startTar() ) ); - connect( test, TQT_SIGNAL( clicked() ), TQT_SLOT( test() ) ); - - connect( lister, TQT_SIGNAL( started( const KURL & ) ), - debug, TQT_SLOT( started( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( completed() ), - debug, TQT_SLOT( completed() ) ); - connect( lister, TQT_SIGNAL( completed( const KURL & ) ), - debug, TQT_SLOT( completed( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( canceled() ), - debug, TQT_SLOT( canceled() ) ); - connect( lister, TQT_SIGNAL( canceled( const KURL & ) ), - debug, TQT_SLOT( canceled( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL &, const KURL & ) ) ); - connect( lister, TQT_SIGNAL( clear() ), - debug, TQT_SLOT( clear() ) ); - connect( lister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - debug, TQT_SLOT( newItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), - debug, TQT_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - debug, TQT_SLOT( deleteItem( KFileItem * ) ) ); - connect( lister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - debug, TQT_SLOT( refreshItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( infoMessage( const TQString& ) ), - debug, TQT_SLOT( infoMessage( const TQString& ) ) ); - connect( lister, TQT_SIGNAL( percent( int ) ), - debug, TQT_SLOT( percent( int ) ) ); - connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( totalSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( processedSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( speed( int ) ), - debug, TQT_SLOT( speed( int ) ) ); - - connect( lister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( completed() ) ); + connect( startR, TQ_SIGNAL( clicked() ), TQ_SLOT( startRoot() ) ); + connect( startH, TQ_SIGNAL( clicked() ), TQ_SLOT( startHome() ) ); + connect( startT, TQ_SIGNAL( clicked() ), TQ_SLOT( startTar() ) ); + connect( test, TQ_SIGNAL( clicked() ), TQ_SLOT( test() ) ); + + connect( lister, TQ_SIGNAL( started( const KURL & ) ), + debug, TQ_SLOT( started( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( completed() ), + debug, TQ_SLOT( completed() ) ); + connect( lister, TQ_SIGNAL( completed( const KURL & ) ), + debug, TQ_SLOT( completed( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( canceled() ), + debug, TQ_SLOT( canceled() ) ); + connect( lister, TQ_SIGNAL( canceled( const KURL & ) ), + debug, TQ_SLOT( canceled( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL &, const KURL & ) ) ); + connect( lister, TQ_SIGNAL( clear() ), + debug, TQ_SLOT( clear() ) ); + connect( lister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + debug, TQ_SLOT( newItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), + debug, TQ_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + debug, TQ_SLOT( deleteItem( KFileItem * ) ) ); + connect( lister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + debug, TQ_SLOT( refreshItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( infoMessage( const TQString& ) ), + debug, TQ_SLOT( infoMessage( const TQString& ) ) ); + connect( lister, TQ_SIGNAL( percent( int ) ), + debug, TQ_SLOT( percent( int ) ) ); + connect( lister, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( totalSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( processedSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( speed( int ) ), + debug, TQ_SLOT( speed( int ) ) ); + + connect( lister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( completed() ) ); } KDirListerTest::~KDirListerTest() diff --git a/tdeio/tests/kdirlistertest.h b/tdeio/tests/kdirlistertest.h index 484121eef..550b5c1ce 100644 --- a/tdeio/tests/kdirlistertest.h +++ b/tdeio/tests/kdirlistertest.h @@ -33,7 +33,7 @@ using namespace std; class PrintSignals : public TQObject { - Q_OBJECT + TQ_OBJECT public: PrintSignals() : TQObject() { } @@ -100,7 +100,7 @@ public slots: class KDirListerTest : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KDirListerTest( TQWidget *parent=0, const char *name=0 ); ~KDirListerTest(); diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp index 9f50c2170..eed240f2d 100644 --- a/tdeio/tests/kdirwatchtest.cpp +++ b/tdeio/tests/kdirwatchtest.cpp @@ -38,9 +38,9 @@ int main (int argc, char **argv) KDirWatch *dirwatch1 = KDirWatch::self(); KDirWatch *dirwatch2 = new KDirWatch; - testObject.connect(dirwatch1, TQT_SIGNAL( dirty( const TQString &)), TQT_SLOT( dirty( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( created( const TQString &)), TQT_SLOT( created( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( deleted( const TQString &)), TQT_SLOT( deleted( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( dirty( const TQString &)), TQ_SLOT( dirty( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( created( const TQString &)), TQ_SLOT( created( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( deleted( const TQString &)), TQ_SLOT( deleted( const TQString &)) ); if (args->count() >0) { for(int i = 0; i < args->count(); i++) { diff --git a/tdeio/tests/kdirwatchtest.h b/tdeio/tests/kdirwatchtest.h index 493043c01..ee7974f6f 100644 --- a/tdeio/tests/kdirwatchtest.h +++ b/tdeio/tests/kdirwatchtest.h @@ -21,7 +21,7 @@ class myTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: myTest() { }; public slots: diff --git a/tdeio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp index ed59f3c19..773ce476b 100644 --- a/tdeio/tests/kdirwatchunittest.cpp +++ b/tdeio/tests/kdirwatchunittest.cpp @@ -120,9 +120,9 @@ void KDirWatchTest::allTests() TQDir* dir = new TQDir(m_workingDir); VERIFY (dir != 0); - connect(d, TQT_SIGNAL (dirty( const TQString &)), TQT_SLOT( slotDirty( const TQString &)) ); - connect(d, TQT_SIGNAL (created( const TQString &)), TQT_SLOT( slotCreated( const TQString &)) ); - connect(d, TQT_SIGNAL (deleted( const TQString &)), TQT_SLOT( slotDeleted( const TQString &)) ); + connect(d, TQ_SIGNAL (dirty( const TQString &)), TQ_SLOT( slotDirty( const TQString &)) ); + connect(d, TQ_SIGNAL (created( const TQString &)), TQ_SLOT( slotCreated( const TQString &)) ); + connect(d, TQ_SIGNAL (deleted( const TQString &)), TQ_SLOT( slotDeleted( const TQString &)) ); VERIFY (dir->mkdir (m_workingDir)); diff --git a/tdeio/tests/kdirwatchunittest.h b/tdeio/tests/kdirwatchunittest.h index 416aeecfe..99c7f73c3 100644 --- a/tdeio/tests/kdirwatchunittest.h +++ b/tdeio/tests/kdirwatchunittest.h @@ -24,7 +24,7 @@ class KDirWatchTest : public KUnitTest::Tester { - Q_OBJECT + TQ_OBJECT public: enum { sigDirty, sigCreated, sigDeleted }; diff --git a/tdeio/tests/kfiltertest.cpp b/tdeio/tests/kfiltertest.cpp index f16b957ab..ed73d6782 100644 --- a/tdeio/tests/kfiltertest.cpp +++ b/tdeio/tests/kfiltertest.cpp @@ -35,7 +35,7 @@ void test_block( const TQString & fileName ) TQByteArray array(1024); int n; - while ( ( n = dev->tqreadBlock( array.data(), array.size() ) ) ) + while ( ( n = dev->readBlock( array.data(), array.size() ) ) ) { kdDebug() << "readBlock returned " << n << endl << endl; // TQCString s(array,n+1); // Terminate with 0 before printing @@ -55,9 +55,9 @@ void test_block_write( const TQString & fileName ) if ( !dev->open( IO_WriteOnly ) ) { kdWarning() << "open failed " << endl; return; } TQCString s("hello\n"); - int ret = dev->tqwriteBlock( s, s.size()-1 ); + int ret = dev->writeBlock( s, s.size()-1 ); kdDebug() << "writeBlock ret=" << ret << endl; - //ret = dev->tqwriteBlock( s, s.size()-1 ); + //ret = dev->writeBlock( s, s.size()-1 ); //kdDebug() << "writeBlock ret=" << ret << endl; dev->close(); delete dev; diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp index 7562b488a..c10a36898 100644 --- a/tdeio/tests/kruntest.cpp +++ b/tdeio/tests/kruntest.cpp @@ -56,9 +56,9 @@ Receiver::Receiver() start = new TQPushButton( "Launch KRuns", this ); stop = new TQPushButton( "Stop those KRuns", this ); stop->setEnabled(false); - TQObject::connect( h, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()) ); - TQObject::connect( start, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart()) ); - TQObject::connect( stop, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStop()) ); + TQObject::connect( h, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) ); + TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) ); + TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) ); adjustSize(); show(); diff --git a/tdeio/tests/kruntest.h b/tdeio/tests/kruntest.h index 68e7a7280..b8870816c 100644 --- a/tdeio/tests/kruntest.h +++ b/tdeio/tests/kruntest.h @@ -25,7 +25,7 @@ class testKRun : public KRun { - Q_OBJECT + TQ_OBJECT public: testKRun( const KURL& _url, mode_t _mode = 0, @@ -42,7 +42,7 @@ public: class TQPushButton; class Receiver : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Receiver(); ~Receiver() {} diff --git a/tdeio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp index 3237f0180..f30e7ad10 100644 --- a/tdeio/tests/previewtest.cpp +++ b/tdeio/tests/previewtest.cpp @@ -19,7 +19,7 @@ PreviewTest::PreviewTest() m_url->setText("/home/malte/gore_bush.jpg"); layout->addWidget(m_url, 0, 0); TQPushButton *btn = new TQPushButton("Generate", this); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); layout->addWidget(btn, 0, 1); m_preview = new TQLabel(this); m_preview->setMinimumSize(400, 300); @@ -31,9 +31,9 @@ void PreviewTest::slotGenerate() KURL::List urls; urls.append(m_url->text()); TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); - connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed())); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQ_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); + connect(job, TQ_SIGNAL(failed(const KFileItem *)), TQ_SLOT(slotFailed())); } void PreviewTest::slotResult(TDEIO::Job*) diff --git a/tdeio/tests/previewtest.h b/tdeio/tests/previewtest.h index 5ef82916d..2a3f5e5d1 100644 --- a/tdeio/tests/previewtest.h +++ b/tdeio/tests/previewtest.h @@ -8,7 +8,7 @@ class KFileItem; class PreviewTest : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PreviewTest(); diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp index 4b14a6bb6..0c517c808 100644 --- a/tdeio/tests/speed.cpp +++ b/tdeio/tests/speed.cpp @@ -32,10 +32,10 @@ SpeedTest::SpeedTest( const KURL & url ) { Job *job = listRecursive( url ); //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS ! - connect(job, TQT_SIGNAL( result( TDEIO::Job*)), - TQT_SLOT( finished( TDEIO::Job* ) )); - /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(job, TQ_SIGNAL( result( TDEIO::Job*)), + TQ_SLOT( finished( TDEIO::Job* ) )); + /*connect(job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); */ } diff --git a/tdeio/tests/speed.h b/tdeio/tests/speed.h index cd59cb6f6..1e9dab6a1 100644 --- a/tdeio/tests/speed.h +++ b/tdeio/tests/speed.h @@ -9,7 +9,7 @@ namespace TDEIO { } class SpeedTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: SpeedTest(const KURL & url); diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp index 4d52eab2e..bd5a1f1bb 100644 --- a/tdeio/tests/tdeioslavetest.cpp +++ b/tdeio/tests/tdeioslavetest.cpp @@ -63,7 +63,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Operation groupbox & buttons opButtons = new TQButtonGroup( "Operation", main_widget ); topLayout->addWidget( opButtons, 10 ); - connect( opButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeOperation(int)) ); + connect( opButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeOperation(int)) ); TQBoxLayout *hbLayout = new TQHBoxLayout( opButtons, 15 ); @@ -117,7 +117,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Progress groupbox & buttons progressButtons = new TQButtonGroup( "Progress dialog mode", main_widget ); topLayout->addWidget( progressButtons, 10 ); - connect( progressButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeProgressMode(int)) ); + connect( progressButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeProgressMode(int)) ); hbLayout = new TQHBoxLayout( progressButtons, 15 ); @@ -145,19 +145,19 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) pbStart = new TQPushButton( "&Start", main_widget ); pbStart->setFixedSize( pbStart->sizeHint() ); - connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); + connect( pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); pbStop->setFixedSize( pbStop->sizeHint() ); pbStop->setEnabled( false ); - connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); + connect( pbStop, TQ_SIGNAL(clicked()), TQ_SLOT(stopJob()) ); hbLayout->addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); close->setFixedSize( close->sizeHint() ); - connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); + connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); @@ -166,10 +166,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) slave = 0; // slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org")); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)), - this, TQT_SLOT(slotSlaveConnected())); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), - this, TQT_SLOT(slotSlaveError())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave*)), + this, TQ_SLOT(slotSlaveConnected())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), + this, TQ_SLOT(slotSlaveError())); } @@ -242,14 +242,14 @@ void KioslaveTest::startJob() { switch ( selectedOperation ) { case List: myJob = TDEIO::listDir( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case ListRecursive: myJob = TDEIO::listRecursive( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case Stat: @@ -258,15 +258,15 @@ void KioslaveTest::startJob() { case Get: myJob = TDEIO::get( src, true ); - connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect(myJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); break; case Put: putBuffer = 0; myJob = TDEIO::put( src, -1, true, false); - connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), - TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); + connect(myJob, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), + TQ_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); break; case Copy: @@ -300,11 +300,11 @@ void KioslaveTest::startJob() { job = myJob; } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if (progressMode == ProgressStatus) { statusProgress->setJob( job ); diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h index 7f11bd4e3..efe089fd9 100644 --- a/tdeio/tests/tdeioslavetest.h +++ b/tdeio/tests/tdeioslavetest.h @@ -27,7 +27,7 @@ #include "tdeio/slave.h" class KioslaveTest : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: KioslaveTest( TQString src, TQString dest, uint op, uint pr ); diff --git a/tdeioslave/file/file.cpp b/tdeioslave/file/file.cpp index b7ac91bfd..a069cc5a8 100644 --- a/tdeioslave/file/file.cpp +++ b/tdeioslave/file/file.cpp @@ -569,7 +569,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum // set modification time const TQString mtimeStr = metaData( "modified" ); if ( !mtimeStr.isEmpty() ) { - TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( mtimeStr, Qt::ISODate )); + TQDateTime dt = TQDateTime::fromString( mtimeStr, TQt::ISODate ); if ( dt.isValid() ) { KDE_struct_stat dest_statbuf; if (KDE_stat( _dest_orig.data(), &dest_statbuf ) == 0) { @@ -1336,10 +1336,10 @@ void FileProtocol::special( const TQByteArray &data) TQString filename; stream >> filename; KShred shred( filename ); - connect( &shred, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); - connect( &shred, TQT_SIGNAL( infoMessage( const TQString & ) ), - this, TQT_SLOT( slotInfoMessage( const TQString & ) ) ); + connect( &shred, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + this, TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); + connect( &shred, TQ_SIGNAL( infoMessage( const TQString & ) ), + this, TQ_SLOT( slotInfoMessage( const TQString & ) ) ); if (!shred.shred()) error( TDEIO::ERR_CANNOT_DELETE, filename ); else @@ -1446,15 +1446,15 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c buffer.sprintf( "%s %s %s %s 2>%s", mountProg.latin1(), readonly.data(), dev.data(), point.data(), tmp ); else // mount giving device + mountpoint + fstype -#if defined(__svr4__) && defined(__sun__) - // MACRO for Solaris 8 and I +#if defined(Q_OS_SOLARIS) + // MACRO for Solaris 8 and I // believe this is true for SVR4 in general - buffer.sprintf( "%s -F %s %s %s %s 2>%s" - mountProg.latin1() - fstype.data() - _ro ? "-oro" : "" - dev.data() - point.data() + buffer.sprintf( "%s -F %s %s %s %s 2>%s", + mountProg.latin1(), + fstype.data(), + _ro ? "-oro" : "", + dev.data(), + point.data(), tmp ); #elif defined(__OpenBSD__) buffer.sprintf( "%s %s %s -t %s %s %s 2>%s", "tdesu", mountProg.latin1(), readonly.data(), diff --git a/tdeioslave/file/file.h b/tdeioslave/file/file.h index 226e0a428..04a6ed225 100644 --- a/tdeioslave/file/file.h +++ b/tdeioslave/file/file.h @@ -42,7 +42,7 @@ class FileProtocol : public TQObject, public TDEIO::SlaveBase { - Q_OBJECT + TQ_OBJECT public: FileProtocol( const TQCString &pool, const TQCString &app); virtual ~FileProtocol() { } diff --git a/tdeioslave/http/README.webdav b/tdeioslave/http/README.webdav index e2a0f5d35..7d0d2528b 100644 --- a/tdeioslave/http/README.webdav +++ b/tdeioslave/http/README.webdav @@ -44,9 +44,9 @@ To create a lock, call a special request, with the following data: int, value 5 (LOCK request) KURL url - the location of the resource to lock -QString scope - the scope of the lock, currently "exclusive" or "shared" -QString type - the type of the lock, currently only "write" -QString owner (optional) - owner contact details (url) +TQString scope - the scope of the lock, currently "exclusive" or "shared" +TQString type - the type of the lock, currently only "write" +TQString owner (optional) - owner contact details (url) Additionally, the lock timeout requested from the server may be altered from the default of Infinity by setting the metadata "davTimeout" to the number of seconds, or 0 for diff --git a/tdeioslave/http/http.cpp b/tdeioslave/http/http.cpp index 8cd0f7a64..cd5d51a63 100644 --- a/tdeioslave/http/http.cpp +++ b/tdeioslave/http/http.cpp @@ -4444,10 +4444,10 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ ) HTTPFilterChain chain; - TQObject::connect(&chain, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SLOT(slotData(const TQByteArray &))); - TQObject::connect(&chain, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(error(int, const TQString &))); + TQObject::connect(&chain, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SLOT(slotData(const TQByteArray &))); + TQObject::connect(&chain, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SLOT(error(int, const TQString &))); // decode all of the transfer encodings while (!m_qTransferEncodings.isEmpty()) diff --git a/tdeioslave/http/http.h b/tdeioslave/http/http.h index aacdf1d47..51ec5b232 100644 --- a/tdeioslave/http/http.h +++ b/tdeioslave/http/http.h @@ -48,7 +48,7 @@ namespace TDEIO { class HTTPProtocol : public TQObject, public TDEIO::TCPSlaveBase { - Q_OBJECT + TQ_OBJECT public: HTTPProtocol( const TQCString &protocol, const TQCString &pool, const TQCString &app ); diff --git a/tdeioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp index 798b06318..52a2b7967 100644 --- a/tdeioslave/http/kcookiejar/kcookieserver.cpp +++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp @@ -87,7 +87,7 @@ KCookieServer::KCookieServer(const TQCString &name) mRequestList = new RequestList; mAdvicePending = false; mTimer = new TQTimer(); - connect( mTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotSave())); + connect( mTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotSave())); mConfig = new TDEConfig("kcookiejarrc"); mCookieJar->loadConfig( mConfig ); @@ -107,8 +107,8 @@ KCookieServer::KCookieServer(const TQCString &name) { mCookieJar->loadCookies( filename); } - connect(this, TQT_SIGNAL(windowUnregistered(long)), - this, TQT_SLOT(slotDeleteSessionCookies(long))); + connect(this, TQ_SIGNAL(windowUnregistered(long)), + this, TQ_SLOT(slotDeleteSessionCookies(long))); } KCookieServer::~KCookieServer() diff --git a/tdeioslave/http/kcookiejar/kcookieserver.h b/tdeioslave/http/kcookiejar/kcookieserver.h index 2cbb9ccf1..4603808e0 100644 --- a/tdeioslave/http/kcookiejar/kcookieserver.h +++ b/tdeioslave/http/kcookiejar/kcookieserver.h @@ -38,7 +38,7 @@ class TDEConfig; class KCookieServer : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: KCookieServer(const TQCString &); diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp index 5b78d6956..a014387a2 100644 --- a/tdeioslave/http/kcookiejar/kcookiewin.cpp +++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp @@ -65,7 +65,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconloader.h> #include <tdeapplication.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #endif @@ -76,11 +76,11 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, int defaultButton, bool showDetails ) :KDialog( parent, "cookiealert", true ) { -#ifndef Q_WS_QWS //FIXME(E): Implement for Qt Embedded +#ifndef TQ_WS_QWS //FIXME(E): Implement for Qt Embedded setCaption( i18n("Cookie Alert") ); setIcon( SmallIcon("cookie") ); // all cookies in the list should have the same window at this time, so let's take the first -# ifdef Q_WS_X11 +# ifdef TQ_WS_X11 if( cookieList.first()->windowIds().count() > 0 ) { XSetTransientForHint( tqt_xdisplay(), winId(), cookieList.first()->windowIds().first()); @@ -102,7 +102,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, hBox->setSpacing( KDialog::spacingHint() ); TQLabel* icon = new TQLabel( hBox ); icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) ); - icon->setAlignment( Qt::AlignCenter ); + icon->setAlignment( TQt::AlignCenter ); icon->setFixedSize( 2*icon->sizeHint() ); int count = cookieList.count(); @@ -111,7 +111,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, TQString txt = i18n("You received a cookie from", "You received %n cookies from", count); TQLabel* lbl = new TQLabel( txt, vBox ); - lbl->setAlignment( Qt::AlignCenter ); + lbl->setAlignment( TQt::AlignCenter ); KHttpCookiePtr cookie = cookieList.first(); TQString host (cookie->host()); @@ -128,10 +128,10 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, if (cookie->isCrossDomain()) txt += i18n(" <b>[Cross Domain!]</b>"); lbl = new TQLabel( txt, vBox ); - lbl->setAlignment( Qt::AlignCenter ); + lbl->setAlignment( TQt::AlignCenter ); lbl = new TQLabel( i18n("Do you want to accept or reject?"), vBox ); - lbl->setAlignment( Qt::AlignCenter ); - vlayout->addWidget( hBox, 0, Qt::AlignLeft ); + lbl->setAlignment( TQt::AlignCenter ); + vlayout->addWidget( hBox, 0, TQt::AlignLeft ); // Cookie Details dialog... m_detailView = new KCookieDetail( cookieList, count, this ); @@ -182,20 +182,20 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, TQPushButton* btn = new TQPushButton( i18n("&Accept"), bbox ); btn->setDefault( true ); btn->setFocus(); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); bbLay->addWidget( btn ); btn = new TQPushButton( i18n("&Reject"), bbox ); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); bbLay->addWidget( btn ); bbLay->addStretch( 1 ); #ifndef TQT_NO_ACCEL TQAccel* a = new TQAccel( this ); - a->connectItem( a->insertItem(Qt::Key_Escape), btn, TQT_SLOT(animateClick()) ); + a->connectItem( a->insertItem(TQt::Key_Escape), btn, TQ_SLOT(animateClick()) ); #endif m_button = new TQPushButton( bbox ); m_button->setText( m_showDetails ? i18n("&Details <<"):i18n("&Details >>") ); - connect( m_button, TQT_SIGNAL(clicked()), TQT_SLOT(slotCookieDetails()) ); + connect( m_button, TQ_SIGNAL(clicked()), TQ_SLOT(slotCookieDetails()) ); bbLay->addWidget( m_button ); #ifndef TQT_NO_WHATSTHIS TQWhatsThis::add( m_button, i18n("See or modify the cookie information") ); @@ -315,7 +315,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount, TQPushButton* btnNext = new TQPushButton( i18n("Next cookie","&Next >>"), this ); btnNext->setFixedSize( btnNext->sizeHint() ); grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 ); - connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) ); + connect( btnNext, TQ_SIGNAL(clicked()), TQ_SLOT(slotNextCookie()) ); #ifndef TQT_NO_TOOLTIP TQToolTip::add( btnNext, i18n("Show details of the next cookie") ); #endif diff --git a/tdeioslave/http/kcookiejar/kcookiewin.h b/tdeioslave/http/kcookiejar/kcookiewin.h index d739732dc..ddf744019 100644 --- a/tdeioslave/http/kcookiejar/kcookiewin.h +++ b/tdeioslave/http/kcookiejar/kcookiewin.h @@ -39,7 +39,7 @@ class KURLLabel; class KCookieDetail : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public : KCookieDetail( KHttpCookieList cookieList, int cookieCount, TQWidget *parent=0, @@ -63,7 +63,7 @@ private slots: class KCookieWin : public KDialog { - Q_OBJECT + TQ_OBJECT public : KCookieWin( TQWidget *parent, KHttpCookieList cookieList, int defaultButton=0, diff --git a/tdeioslave/iso/kiso.cpp b/tdeioslave/iso/kiso.cpp index 513bd7c04..fdd2df413 100644 --- a/tdeioslave/iso/kiso.cpp +++ b/tdeioslave/iso/kiso.cpp @@ -157,7 +157,7 @@ void KIso::prepareDevice( const TQString & filename, { /* 'hack' for Qt's false assumption that only S_ISREG is seekable */ if( "inode/blockdevice" == mimetype ) - setDevice( TQT_TQIODEVICE(new QFileHack( filename )) ); + setDevice( new QFileHack( filename ) ); else { if( "application/x-gzip" == mimetype @@ -190,7 +190,7 @@ KIso::~KIso() /* callback function for libisofs */ static int readf(char *buf, long long start, long long len,void *udata) { - TQIODevice* dev = ( static_cast<KIso*> (udata) )->device(); + TQIODevice* dev = ( static_cast<KIso*>(udata) )->device(); if (dev->at(start<<11)) { if ((dev->readBlock(buf, len<<11)) != -1) return (len); diff --git a/tdemarkdown/md4c/CMakeLists.txt b/tdemarkdown/md4c/CMakeLists.txt index cab797eb9..c3f4bdaf1 100644 --- a/tdemarkdown/md4c/CMakeLists.txt +++ b/tdemarkdown/md4c/CMakeLists.txt @@ -1,5 +1,10 @@ -cmake_minimum_required(VERSION 3.4) +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) + project(MD4C C) set(MD_VERSION_MAJOR 0) diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp index efb10d734..cdc35d208 100644 --- a/tdemdi/tdemdi/dockcontainer.cpp +++ b/tdemdi/tdemdi/dockcontainer.cpp @@ -119,7 +119,7 @@ DockContainer::~DockContainer() it = m_map.begin(); KDockWidget *w=it.key(); if (m_overlapButtons.contains(w)) { - (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]); + (::tqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } m_map.remove(w); @@ -148,7 +148,7 @@ void DockContainer::init() // try to restore splitter size if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()-> + KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()-> parent()); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); @@ -184,11 +184,11 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt if (((KDockWidget*)parentWidget())->mayBeShow()) ((KDockWidget*)parentWidget())->dockBack(); - if (::tqqt_cast<KDockWidgetHeader*>(w->getHeader())) + if (::tqt_cast<KDockWidgetHeader*>(w->getHeader())) { kdDebug(760)<<"*** KDockWidgetHeader has been found"<<endl; - KDockWidgetHeader *hdr=::tqqt_cast<KDockWidgetHeader*>(w->getHeader()); + KDockWidgetHeader *hdr=::tqt_cast<KDockWidgetHeader*>(w->getHeader()); KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); @@ -200,7 +200,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt m_overlapButtons.insert(w,btn); btn->setOn(!isOverlapMode()); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeOverlapMode())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeOverlapMode())); } m_tb->appendTab(pixmap.isNull()?SmallIcon("misc"):pixmap,tab,w->tabPageLabel()); @@ -209,7 +209,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt //FB m_tb->setTab(tab,true); - connect(m_tb->tab(tab),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); + connect(m_tb->tab(tab),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int))); kdDebug(760)<<"DockContainer::insertWidget()"<<endl; @@ -233,7 +233,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) { - if (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_tb)) { + if (obj==m_tb) { if ( (event->type()==TQEvent::Resize) && (m_ws->isHidden()) ) { TQSize size=((TQResizeEvent*)event)->size(); if (m_vertical) @@ -246,7 +246,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) switch ( event->type() ){ case TQEvent::MouseButtonPress: { - KDockWidget * w=m_revMap[tqt_dynamic_cast<KMultiTabBarTab*>(obj)->id()]; + KDockWidget * w=m_revMap[dynamic_cast<KMultiTabBarTab*>(obj)->id()]; if (!w) { kdDebug()<<"NoWidget"<<endl; break; @@ -255,13 +255,13 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) kdDebug()<<"NO HEADER"<<endl; break; } - KDockWidgetHeader *hdr=::tqqt_cast<KDockWidgetHeader*>(w->getHeader()); + KDockWidgetHeader *hdr=::tqt_cast<KDockWidgetHeader*>(w->getHeader()); if (!hdr) { kdDebug()<<"Wrong header type in DockContainer::eventFilter"<<endl; break; } m_dockManager=w->dockManager(); - m_dragPanel=TQT_TQOBJECT(hdr->dragPanel()); + m_dragPanel=hdr->dragPanel(); if (m_dragPanel) m_movingState=WaitingForMoveStart; delete m_startEvent; m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event)); @@ -279,7 +279,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) if (m_movingState==WaitingForMoveStart) { TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() ); if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay()) { - m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent)); + m_dockManager->eventFilter(m_dragPanel,static_cast<TQEvent*>(m_startEvent)); m_dockManager->eventFilter(m_dragPanel,event); m_movingState=Moving; } @@ -307,7 +307,7 @@ void DockContainer::showWidget(KDockWidget *w) { void DockContainer::changeOverlapMode() { - const KDockButton_Private *btn=tqt_dynamic_cast<const KDockButton_Private*>(sender()); + const KDockButton_Private *btn=dynamic_cast<const KDockButton_Private*>(sender()); kdDebug(760)<<"DockContainer::changeOverlapMode: button=="<<btn<<endl; @@ -355,7 +355,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg) m_map.remove(w); m_revMap.remove(id); if (m_overlapButtons.contains(w)) { - (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]); + (::tqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } KDockContainer::removeWidget(w); @@ -403,7 +403,7 @@ void DockContainer::tabClicked(int t) } m_ws->raiseWidget(t); if (m_ws->widget(t)) { - KDockWidget *tmpDw=::tqqt_cast<KDockWidget*>(m_ws->widget(t)); + KDockWidget *tmpDw=::tqt_cast<KDockWidget*>(m_ws->widget(t)); if (tmpDw) { if (tmpDw->getWidget()) tmpDw->getWidget()->setFocus(); } else kdDebug(760)<<"Something really weird is going on"<<endl; @@ -420,7 +420,7 @@ void DockContainer::tabClicked(int t) // try save splitter position if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()-> + KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()-> parent()); if ( sp ) m_separatorPos = sp->separatorPos(); @@ -473,7 +473,7 @@ void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix) // try to save the splitter position if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()-> + KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()-> parent()); if ( sp ) cfg->writeEntry( "separatorPosition", m_separatorPos ); @@ -573,14 +573,14 @@ void DockContainer::load(TDEConfig* cfg,const TQString& group_or_prefix) kapp->syncX();*/ m_delayedRaise=it.data(); - TQTimer::singleShot(0,this,TQT_SLOT(delayedRaise())); + TQTimer::singleShot(0,this,TQ_SLOT(delayedRaise())); kdDebug(760)<<"************** raising *******: "<<it.key()->name()<<endl; break; } } } - if (m_delayedRaise==-1) TQTimer::singleShot(0,this,TQT_SLOT(init())); + if (m_delayedRaise==-1) TQTimer::singleShot(0,this,TQ_SLOT(init())); cfg->setGroup(grp); } @@ -612,7 +612,7 @@ void DockContainer::toggle() { if (m_tb->isTabRaised(oldtab)) { m_tb->setTab(oldtab,false); tabClicked(oldtab); - // KMDI::MainWindow *mainFrm = tqt_dynamic_cast<KMDI::MainWindow*>(m_mainWin); + // KMDI::MainWindow *mainFrm = dynamic_cast<KMDI::MainWindow*>(m_mainWin); // if (mainFrm && mainFrm->activeWindow() ) // TODO // mainFrm->activeWindow()->setFocus(); diff --git a/tdemdi/tdemdi/dockcontainer.h b/tdemdi/tdemdi/dockcontainer.h index 57855bfa0..cbe71a944 100644 --- a/tdemdi/tdemdi/dockcontainer.h +++ b/tdemdi/tdemdi/dockcontainer.h @@ -38,7 +38,7 @@ namespace KMDI class DockContainer: public TQWidget, public KDockContainer { - Q_OBJECT + TQ_OBJECT public: DockContainer(TQWidget *parent, TQWidget *win, int position, int flags); diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp index 92a24acd5..32f0c2aea 100644 --- a/tdemdi/tdemdi/guiclient.cpp +++ b/tdemdi/tdemdi/guiclient.cpp @@ -57,8 +57,8 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) { m_mdiMainFrm=mdiMainFrm; - connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -79,18 +79,18 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) m_toolMenu=new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu"); m_gotoToolDockMenu=new TDEActionMenu(i18n("Tool &Docks"),actionCollection(),"tdemdi_tooldock_menu"); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQ_SIGNAL(toggleTop()), actionCollection(),"tdemdi_activate_top")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQ_SIGNAL(toggleLeft()), actionCollection(),"tdemdi_activate_left")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQ_SIGNAL(toggleRight()), actionCollection(),"tdemdi_activate_right")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQ_SIGNAL(toggleBottom()), actionCollection(),"tdemdi_activate_bottom")); m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQ_SLOT(prevToolViewInDock()), actionCollection(),"tdemdi_prev_toolview")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQ_SLOT(nextToolViewInDock()), actionCollection(),"tdemdi_next_toolview")); actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -146,12 +146,12 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) cfg->setGroup( _grp ); TDEAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()), - /*TQString::null*/sc,tqt_dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), + /*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), m_mdiMainFrm,actionCollection(), aname.latin1() ); ((ToggleToolViewAction*)a)->setCheckedState(TQString(i18n("Hide %1").arg(mtva->wrappedWidget()->caption()))); - connect(a,TQT_SIGNAL(destroyed(TQObject*)),this,TQT_SLOT(actionDeleted(TQObject*))); + connect(a,TQ_SIGNAL(destroyed(TQObject*)),this,TQ_SLOT(actionDeleted(TQObject*))); m_toolViewActions.append(a); m_toolMenu->insert(a); @@ -181,9 +181,9 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor { if (m_dw) { - connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); - connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged())); - connect(m_dw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWidgetDestroyed())); + connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); + connect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged())); + connect(m_dw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotWidgetDestroyed())); setChecked(m_dw->mayBeHide()); } @@ -201,7 +201,7 @@ void ToggleToolViewAction::anDWChanged() else if ((!isChecked()) && m_dw->mayBeHide()) setChecked(true); else if (isChecked() && (m_dw->parentDockTabGroup() && - ((::tqqt_cast<KDockWidget*>(m_dw->parentDockTabGroup()-> + ((::tqt_cast<KDockWidget*>(m_dw->parentDockTabGroup()-> parent()))->mayBeShow()))) setChecked(false); } @@ -218,8 +218,8 @@ void ToggleToolViewAction::slotToggled(bool t) void ToggleToolViewAction::slotWidgetDestroyed() { - disconnect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged())); - disconnect(this,TQT_SIGNAL(toggled(bool)),0,0); + disconnect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged())); + disconnect(this,TQ_SIGNAL(toggled(bool)),0,0); unplugAll(); deleteLater(); diff --git a/tdemdi/tdemdi/guiclient.h b/tdemdi/tdemdi/guiclient.h index d4f752d64..14ccfa10a 100644 --- a/tdemdi/tdemdi/guiclient.h +++ b/tdemdi/tdemdi/guiclient.h @@ -44,7 +44,7 @@ class GUIClientPrivate; class GUIClient : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: GUIClient( KMDI::MainWindow *mdiMainFrm, const char *name = 0 ); @@ -78,7 +78,7 @@ class GUIClient : public TQObject, public KXMLGUIClient class ToggleToolViewAction:public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut = TDEShortcut(), diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp index 4f23e3a9e..925f7619a 100644 --- a/tdemdi/tdemdi/mainwindow.cpp +++ b/tdemdi/tdemdi/mainwindow.cpp @@ -139,7 +139,7 @@ void MainWindow::setupMainDock () setMainDockWidget(dw); // connect signals to collapse sidebars - connect(m_tabWidget,TQT_SIGNAL(focusInEvent()),this,TQT_SIGNAL(collapseOverlapContainers())); + connect(m_tabWidget,TQ_SIGNAL(focusInEvent()),this,TQ_SIGNAL(collapseOverlapContainers())); } void MainWindow::setupToolViews () @@ -153,7 +153,7 @@ void MainWindow::setupToolViews () KDockWidget *w=mainDock; if (mainDock->parentDockTabGroup()) { - w=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent())); + w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } TQPtrList<KDockWidget> leftReparentWidgets; @@ -162,7 +162,7 @@ void MainWindow::setupToolViews () TQPtrList<KDockWidget> topReparentWidgets; if (mainDock->parentDockTabGroup()) { - mainDock=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent())); + mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft); @@ -180,40 +180,40 @@ void MainWindow::setupToolViews () m_leftContainer->manualDock(mainDock, KDockWidget::DockLeft,20); tmpDC->init(); - connect (this,TQT_SIGNAL(toggleLeft()),tmpDC,TQT_SLOT(toggle())); - connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped())); - connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*))); + connect (this,TQ_SIGNAL(toggleLeft()),tmpDC,TQ_SLOT(toggle())); + connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped())); + connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*))); + connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*))); m_rightContainer->setWidget(tmpDC=new DockContainer(m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode)); m_rightContainer->setEnableDocking(KDockWidget::DockRight); m_rightContainer->manualDock(mainDock, KDockWidget::DockRight,80); tmpDC->init(); - connect (this,TQT_SIGNAL(toggleRight()),tmpDC,TQT_SLOT(toggle())); - connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped())); - connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*))); + connect (this,TQ_SIGNAL(toggleRight()),tmpDC,TQ_SLOT(toggle())); + connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped())); + connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*))); + connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*))); m_topContainer->setWidget(tmpDC=new DockContainer(m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode)); m_topContainer->setEnableDocking(KDockWidget::DockTop); m_topContainer->manualDock(mainDock, KDockWidget::DockTop,20); tmpDC->init(); - connect (this,TQT_SIGNAL(toggleTop()),tmpDC,TQT_SLOT(toggle())); - connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped())); - connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*))); + connect (this,TQ_SIGNAL(toggleTop()),tmpDC,TQ_SLOT(toggle())); + connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped())); + connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*))); + connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*))); m_bottomContainer->setWidget(tmpDC=new DockContainer(m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode)); m_bottomContainer->setEnableDocking(KDockWidget::DockBottom); m_bottomContainer->manualDock(mainDock, KDockWidget::DockBottom,80); tmpDC->init(); - connect (this,TQT_SIGNAL(toggleBottom()),tmpDC,TQT_SLOT(toggle())); - connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped())); - connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*))); + connect (this,TQ_SIGNAL(toggleBottom()),tmpDC,TQ_SLOT(toggle())); + connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped())); + connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*))); + connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*))); m_leftContainer->setDockSite( KDockWidget::DockCenter ); m_rightContainer->setDockSite( KDockWidget::DockCenter ); @@ -240,10 +240,10 @@ void MainWindow::setupGUIClient () { m_guiClient = new KMDIPrivate::GUIClient (this); - connect(m_guiClient,TQT_SIGNAL(toggleTop()),this,TQT_SIGNAL(toggleTop())); - connect(m_guiClient,TQT_SIGNAL(toggleLeft()),this,TQT_SIGNAL(toggleLeft())); - connect(m_guiClient,TQT_SIGNAL(toggleRight()),this,TQT_SIGNAL(toggleRight())); - connect(m_guiClient,TQT_SIGNAL(toggleBottom()),this,TQT_SIGNAL(toggleBottom())); + connect(m_guiClient,TQ_SIGNAL(toggleTop()),this,TQ_SIGNAL(toggleTop())); + connect(m_guiClient,TQ_SIGNAL(toggleLeft()),this,TQ_SIGNAL(toggleLeft())); + connect(m_guiClient,TQ_SIGNAL(toggleRight()),this,TQ_SIGNAL(toggleRight())); + connect(m_guiClient,TQ_SIGNAL(toggleBottom()),this,TQ_SIGNAL(toggleBottom())); } TabWidget *MainWindow::tabWidget () @@ -311,23 +311,23 @@ void MainWindow::setToolViewStyle(int flag) { d->m_styleIDEAlMode = flag; // see KMultiTabBar for the first 3 bits - DockContainer *tmpL=::tqqt_cast<KMDI::DockContainer*>(m_leftContainer->getWidget()); + DockContainer *tmpL=::tqt_cast<KMDI::DockContainer*>(m_leftContainer->getWidget()); if (tmpL) tmpL->setStyle(flag); - DockContainer *tmpR=::tqqt_cast<KMDI::DockContainer*>(m_rightContainer->getWidget()); + DockContainer *tmpR=::tqt_cast<KMDI::DockContainer*>(m_rightContainer->getWidget()); if (tmpR) tmpR->setStyle(flag); - DockContainer *tmpT=::tqqt_cast<KMDI::DockContainer*>(m_topContainer->getWidget()); + DockContainer *tmpT=::tqt_cast<KMDI::DockContainer*>(m_topContainer->getWidget()); if (tmpT) tmpT->setStyle(flag); - DockContainer *tmpB=::tqqt_cast<KMDI::DockContainer*>(m_bottomContainer->getWidget()); + DockContainer *tmpB=::tqt_cast<KMDI::DockContainer*>(m_bottomContainer->getWidget()); if (tmpB) tmpB->setStyle(flag); d->m_toolviewStyle = flag; bool toolviewExists = false; TQMap<TQWidget*,KMDI::ToolViewAccessor*>::Iterator it; for (it = m_toolViews->begin(); it != m_toolViews->end(); ++it) { - KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>(it.data()->wrapperWidget()); + KDockWidget *dockWidget = dynamic_cast<KDockWidget*>(it.data()->wrapperWidget()); if (dockWidget) { if (flag == KMDI::IconOnly) { @@ -373,18 +373,18 @@ void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToRe void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) { KDockWidget *mainDock=getMainDockWidget(); if (mainDock->parentDockTabGroup()) { - mainDock=tqt_dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); + mainDock=dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); // FIXME: will likely crash below due to unchecked cast } KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw); if (widget) { if (widget->parentDockTabGroup()) { - widget=static_cast<KDockWidget*>(TQT_TQWIDGET(widget->parentDockTabGroup()->parent())); + widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent()); } if (widget) { - KDockTabGroup *tg=tqt_dynamic_cast<KDockTabGroup*>(widget-> + KDockTabGroup *tg=dynamic_cast<KDockTabGroup*>(widget-> getWidget()); if (tg) { kdDebug(760)<<"KDockTabGroup found"<<endl; diff --git a/tdemdi/tdemdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h index 133abd4a9..835093e6e 100644 --- a/tdemdi/tdemdi/mainwindow.h +++ b/tdemdi/tdemdi/mainwindow.h @@ -71,7 +71,7 @@ class TabWidget; class KMDI_EXPORT MainWindow : public KParts::DockMainWindow { - Q_OBJECT + TQ_OBJECT friend class KMDI::ToolViewAccessor; diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp index 01eb6d889..5dff64920 100644 --- a/tdemdi/tdemdi/tabwidget.cpp +++ b/tdemdi/tdemdi/tabwidget.cpp @@ -70,7 +70,7 @@ TabWidget::TabWidget(TQWidget* parent, const char* name) setHoverCloseButton(true); - connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); + connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); } TabWidget::~TabWidget() @@ -89,9 +89,9 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child()); + TQObject* pLostChild = ((TQChildEvent*)e)->child(); if ((pLostChild != 0L) && (pLostChild->isWidgetType())) { - TQObjectList *list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = pLostChild->queryList( "TQWidget" ); list->insert(0, pLostChild); // add the lost child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all lost child widgets TQObject * o; @@ -108,13 +108,13 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e ) // if we got a new child and we are attached to the MDI system we // install ourself as event filter for the new child and its children // (as we did when we were added to the MDI system). - TQObject* pNewChild = TQT_TQOBJECT(((TQChildEvent*)e)->child()); + TQObject* pNewChild = ((TQChildEvent*)e)->child(); if ((pNewChild != 0L) && (pNewChild->isWidgetType())) { TQWidget* pNewWidget = (TQWidget*)pNewChild; if (pNewWidget->testWFlags((WFlags)(WType_Dialog | WShowModal))) return false; - TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = pNewWidget->queryList( "TQWidget" ); list->insert(0, pNewChild); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets TQObject * o; @@ -122,7 +122,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e ) TQWidget* widg = (TQWidget*)o; ++it; widg->installEventFilter(this); - connect(widg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(childDestroyed())); + connect(widg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(childDestroyed())); } delete list; // delete the list, not the objects } @@ -135,10 +135,10 @@ void TabWidget::childDestroyed() { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender()); + const TQObject* pLostChild = sender(); if ((pLostChild != 0L) && (pLostChild->isWidgetType())) { - TQObjectList *list = ((TQObject*)(pLostChild))->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget"); list->insert(0, pLostChild); // add the lost child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all lost child widgets TQObject * obj; diff --git a/tdemdi/tdemdi/tabwidget.h b/tdemdi/tdemdi/tabwidget.h index dd79f92a7..ecae1ec64 100644 --- a/tdemdi/tdemdi/tabwidget.h +++ b/tdemdi/tdemdi/tabwidget.h @@ -55,7 +55,7 @@ namespace KMDI class KMDI_EXPORT TabWidget : public KTabWidget { - Q_OBJECT + TQ_OBJECT public: TabWidget(TQWidget* parent, const char* name=0); diff --git a/tdemdi/tdemdi/toolviewaccessor.cpp b/tdemdi/tdemdi/toolviewaccessor.cpp index 1b640b532..24242b0df 100644 --- a/tdemdi/tdemdi/toolviewaccessor.cpp +++ b/tdemdi/tdemdi/toolviewaccessor.cpp @@ -37,7 +37,7 @@ ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, TQWidget *widgetTo mdiMainFrm=parent; d=new KMDIPrivate::ToolViewAccessorPrivate(); if (widgetToWrap->inherits("KDockWidget")) { - d->widgetContainer=tqt_dynamic_cast<KDockWidget*>(widgetToWrap); + d->widgetContainer=dynamic_cast<KDockWidget*>(widgetToWrap); d->widget=d->widgetContainer->getWidget(); } else { d->widget=widgetToWrap; @@ -82,7 +82,7 @@ ToolViewAccessor::~ToolViewAccessor() { TQWidget *ToolViewAccessor::wrapperWidget() { if (!d->widgetContainer) { d->widgetContainer=mdiMainFrm->createDockWidget( "ToolViewAccessor::null",TQPixmap()); - connect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*))); + connect(d->widgetContainer,TQ_SIGNAL(widgetSet(TQWidget*)),this,TQ_SLOT(setWidgetToWrap(TQWidget*))); } return d->widgetContainer; } @@ -96,7 +96,7 @@ void ToolViewAccessor::setWidgetToWrap(TQWidget *widgetToWrap, const TQString& t { Q_ASSERT(!(d->widget)); Q_ASSERT(!widgetToWrap->inherits("KDockWidget")); - disconnect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*))); + disconnect(d->widgetContainer,TQ_SIGNAL(widgetSet(TQWidget*)),this,TQ_SLOT(setWidgetToWrap(TQWidget*))); delete d->widget; d->widget=widgetToWrap; KDockWidget *tmp=d->widgetContainer; diff --git a/tdemdi/tdemdi/toolviewaccessor.h b/tdemdi/tdemdi/toolviewaccessor.h index 2278a3931..d27a50c0f 100644 --- a/tdemdi/tdemdi/toolviewaccessor.h +++ b/tdemdi/tdemdi/toolviewaccessor.h @@ -39,7 +39,7 @@ class MainWindow; class ToolViewAccessor : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KMDI::MainWindow; friend class KMDIPrivate::GUIClient; diff --git a/tdemdi/tdemdichildarea.cpp b/tdemdi/tdemdichildarea.cpp index 0cc3738cd..bebbf0b71 100644 --- a/tdemdi/tdemdichildarea.cpp +++ b/tdemdi/tdemdichildarea.cpp @@ -58,7 +58,7 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent ) m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor(); m_pZ = new TQPtrList<KMdiChildFrm>; m_pZ->setAutoDelete( true ); - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); m_defaultChildFrmSize = TQSize( 400, 300 ); } @@ -218,12 +218,8 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ ) else child->raise(); -#ifdef USE_QT4 - child->m_pClient->setFocus(); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Other ); child->m_pClient->setFocus(); -#endif // USE_QT4 } } @@ -253,7 +249,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e ) void KMdiChildArea::mousePressEvent( TQMouseEvent *e ) { //Popup the window menu - if ( e->button() & Qt::RightButton ) + if ( e->button() & TQt::RightButton ) emit popupWindowMenu( mapToGlobal( e->pos() ) ); } diff --git a/tdemdi/tdemdichildarea.h b/tdemdi/tdemdichildarea.h index a3361bc9b..a755df515 100644 --- a/tdemdi/tdemdichildarea.h +++ b/tdemdi/tdemdichildarea.h @@ -54,7 +54,7 @@ class KMDI_EXPORT KMdiChildArea : public TQFrame friend class KMdiChildFrmCaption; friend class KMdiChildFrm; -Q_OBJECT +TQ_OBJECT // attributes public: diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp index 4bdc98984..ba5048b87 100644 --- a/tdemdi/tdemdichildfrm.cpp +++ b/tdemdi/tdemdichildfrm.cpp @@ -138,10 +138,10 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" ); m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) ); - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) ); - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pMaximize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( maximizePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), this, TQ_SLOT( undockPressed() ) ); m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) ); if ( m_pIconButtonPixmap->isNull() ) @@ -149,15 +149,15 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) redecorateButtons(); - m_pWinIcon->setFocusPolicy( TQ_NoFocus ); - m_pUnixIcon->setFocusPolicy( TQ_NoFocus ); - m_pClose->setFocusPolicy( TQ_NoFocus ); - m_pMinimize->setFocusPolicy( TQ_NoFocus ); - m_pMaximize->setFocusPolicy( TQ_NoFocus ); - m_pUndock->setFocusPolicy( TQ_NoFocus ); + m_pWinIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pClose->setFocusPolicy( TQWidget::NoFocus ); + m_pMinimize->setFocusPolicy( TQWidget::NoFocus ); + m_pMaximize->setFocusPolicy( TQWidget::NoFocus ); + m_pUndock->setFocusPolicy( TQWidget::NoFocus ); setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setMouseTracking( true ); @@ -238,19 +238,19 @@ void KMdiChildFrm::setResizeCursor( int resizeCorner ) break; case KMDI_RESIZE_LEFT: case KMDI_RESIZE_RIGHT: - TQApplication::setOverrideCursor( tqsizeHorCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeHorCursor, true ); break; case KMDI_RESIZE_TOP: case KMDI_RESIZE_BOTTOM: - TQApplication::setOverrideCursor( tqsizeVerCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeVerCursor, true ); break; case KMDI_RESIZE_TOPLEFT: case KMDI_RESIZE_BOTTOMRIGHT: - TQApplication::setOverrideCursor( tqsizeFDiagCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeFDiagCursor, true ); break; case KMDI_RESIZE_BOTTOMLEFT: case KMDI_RESIZE_TOPRIGHT: - TQApplication::setOverrideCursor( tqsizeBDiagCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeBDiagCursor, true ); break; } } @@ -283,7 +283,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( m_bResizing ) { - if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) ) + if ( !( e->state() & TQt::RightButton ) && !( e->state() & TQt::MidButton ) ) { // same as: if no button or left button pressed TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() ); @@ -540,8 +540,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) } m_pMinimize->setPixmap( *m_pMinButtonPixmap ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); setGeometry( m_restoredRect ); break; case Normal: @@ -566,8 +566,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) // reset to maximize-captionbar m_pMaximize->setPixmap( *m_pRestoreButtonPixmap ); m_pMinimize->setPixmap( *m_pMinButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER; int nFrameHeight = KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR + m_pCaption->heightHint(); @@ -705,7 +705,7 @@ void KMdiChildFrm::setIcon( const TQPixmap& pxm ) if ( p.width() != 18 || p.height() != 18 ) { TQImage img = p.convertToImage(); - p = img.smoothScale( 18, 18, TQ_ScaleMin ); + p = img.smoothScale( 18, 18, TQImage::ScaleMin ); } const bool do_resize = m_pIconButtonPixmap->size() != p.size(); *m_pIconButtonPixmap = p; @@ -750,9 +750,9 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) } // memorize the focuses in a dictionary because they will get lost during reparenting - TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>; + TQDict<TQWidget::FocusPolicy>* pFocPolDict = new TQDict<TQWidget::FocusPolicy>; pFocPolDict->setAutoDelete( true ); - TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = m_pClient->queryList( "TQWidget" ); TQObjectListIt it( *list ); // iterate over the buttons TQObject * obj; int i = 1; @@ -768,14 +768,14 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) widg->setName( tmpStr.latin1() ); i++; } - TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy; + TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy; *pFocPol = widg->focusPolicy(); pFocPolDict->insert( widg->name(), pFocPol ); } delete list; // delete the list, not the objects //Reparent if needed - if ( TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this) ) + if ( w->parent() != this ) { //reparent to this widget , no flags , point , show it TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos ); @@ -795,7 +795,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) linkChildren( pFocPolDict ); - TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); + TQObject::connect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) ); if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() ) setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); @@ -814,10 +814,10 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) if ( !m_pClient ) return ; - TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); + TQObject::disconnect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) ); //reparent to desktop widget , no flags , point , show it - TQDict<TQ_FocusPolicy>* pFocPolDict; + TQDict<TQWidget::FocusPolicy>* pFocPolDict; pFocPolDict = unlinkChildren(); // get name of focused child widget @@ -833,7 +833,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) m_pClient->setMaximumSize( maxs.width(), maxs.height() ); // remember the focus policies using the dictionary and reset them - TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = m_pClient->queryList( "TQWidget" ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject * obj; TQWidget* firstFocusableChildWidget = 0; @@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent + TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol ) widg->setFocusPolicy( *pFocPol ); @@ -851,7 +851,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) widg->setFocus(); // get first and last focusable widget - if ( ( widg->focusPolicy() == TQ_StrongFocus ) || ( widg->focusPolicy() == TQ_TabFocus ) ) + if ( ( widg->focusPolicy() == TQWidget::StrongFocus ) || ( widg->focusPolicy() == TQWidget::TabFocus ) ) { if ( firstFocusableChildWidget == 0 ) firstFocusableChildWidget = widg; // first widget @@ -860,7 +860,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) } else { - if ( widg->focusPolicy() == TQ_WheelFocus ) + if ( widg->focusPolicy() == TQWidget::WheelFocus ) { if ( firstFocusableChildWidget == 0 ) firstFocusableChildWidget = widg; // first widget @@ -877,29 +877,29 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) m_pClient->setLastFocusableChildWidget( lastFocusableChildWidget ); // reset the focus policy of the view - m_pClient->setFocusPolicy( TQ_ClickFocus ); + m_pClient->setFocusPolicy( TQWidget::ClickFocus ); // lose information about the view (because it's undocked now) m_pClient = 0; } //============== linkChildren =============// -void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ) +void KMdiChildFrm::linkChildren( TQDict<TQWidget::FocusPolicy>* pFocPolDict ) { // reset the focus policies for all widgets in the view (take them from the dictionary) - TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList* list = m_pClient->queryList( "TQWidget" ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject* obj; while ( ( obj = it.current() ) != 0 ) { // for each found object... TQWidget* widg = ( TQWidget* ) obj; ++it; - TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent + TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol != 0 ) widg->setFocusPolicy( *pFocPol ); - if ( !( widg->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) ) + if ( !( widg->inherits( "TQPopupMenu" ) ) ) widg->installEventFilter( this ); } @@ -907,14 +907,14 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ) delete pFocPolDict; // reset the focus policies for the rest - m_pWinIcon->setFocusPolicy( TQ_NoFocus ); - m_pUnixIcon->setFocusPolicy( TQ_NoFocus ); - m_pClient->setFocusPolicy( TQ_ClickFocus ); - m_pCaption->setFocusPolicy( TQ_NoFocus ); - m_pUndock->setFocusPolicy( TQ_NoFocus ); - m_pMinimize->setFocusPolicy( TQ_NoFocus ); - m_pMaximize->setFocusPolicy( TQ_NoFocus ); - m_pClose->setFocusPolicy( TQ_NoFocus ); + m_pWinIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pClient->setFocusPolicy( TQWidget::ClickFocus ); + m_pCaption->setFocusPolicy( TQWidget::NoFocus ); + m_pUndock->setFocusPolicy( TQWidget::NoFocus ); + m_pMinimize->setFocusPolicy( TQWidget::NoFocus ); + m_pMaximize->setFocusPolicy( TQWidget::NoFocus ); + m_pClose->setFocusPolicy( TQWidget::NoFocus ); // install the event filter (catch mouse clicks) for the rest m_pWinIcon->installEventFilter( this ); @@ -930,13 +930,13 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ) //============== unlinkChildren =============// -TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren() +TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren() { // memorize the focuses in a dictionary because they will get lost during reparenting - TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>; + TQDict<TQWidget::FocusPolicy>* pFocPolDict = new TQDict<TQWidget::FocusPolicy>; pFocPolDict->setAutoDelete( true ); - TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = m_pClient->queryList( "TQWidget" ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject * obj; int i = 1; @@ -953,7 +953,7 @@ TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren() w->setName( tmpStr.latin1() ); i++; } - TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy; + TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy; *pFocPol = w->focusPolicy(); // memorize focus policy pFocPolDict->insert( w->name(), pFocPol ); @@ -1085,7 +1085,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) TQObject* pObj = obj; while ( ( pObj != 0L ) && !bIsChild ) { - bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) ); + bIsChild = ( pObj == this ); pObj = pObj->parent(); } // unset the resize cursor if the cursor moved from the frame into a inner widget @@ -1095,13 +1095,13 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) break; case TQEvent::MouseButtonPress: { - if ( !hasParent( TQT_TQOBJECT(m_pClient), obj ) ) + if ( !hasParent( m_pClient, obj ) ) { bool bIsSecondClick = false; if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() ) bIsSecondClick = true; // of a possible double click - if ( !( ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) ) && bIsSecondClick ) ) + if ( !( ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) && bIsSecondClick ) ) { // in case we didn't click on the icon button TQFocusEvent focusEvent( TQFocusEvent::FocusIn ); @@ -1112,16 +1112,16 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) m_pClient->activate(); } - if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) ) + if ( ( obj->parent() != m_pCaption ) && ( obj != m_pCaption ) ) { TQWidget* w = ( TQWidget* ) obj; - if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) ) + if ( ( w->focusPolicy() == TQWidget::ClickFocus ) || ( w->focusPolicy() == TQWidget::StrongFocus ) ) { w->setFocus(); } } } - if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) ) + if ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) { // in case we clicked on the icon button if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() ) @@ -1154,8 +1154,8 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child()); - if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ ) + TQObject* pLostChild = ( ( TQChildEvent* ) e )->child(); + if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ ) { TQObjectList* list = pLostChild->queryList(); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code @@ -1176,11 +1176,11 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) // if we got a new child we install ourself as event filter for the new // child and its children (as we did when we got our client). // XXX see linkChildren() and focus policy stuff - TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); - if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) ) + TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child(); + if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) ) { - TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild ); - TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild ); + TQObjectList *list = pNewWidget->queryList( "TQWidget" ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets TQObject * obj; @@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - if ( !::tqqt_cast<TQPopupMenu*>( widg ) ) + if ( !::tqt_cast<TQPopupMenu*>( widg ) ) { widg->installEventFilter( this ); } @@ -1234,11 +1234,11 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) { - m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) ); - m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) ); - m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) ); - m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQT_SLOT( minimizePressed() ) ); - m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQT_SLOT( maximizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQ_SLOT( minimizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQ_SLOT( maximizePressed() ) ); if ( state() == Normal ) m_pSystemMenu->setItemEnabled( m_pSystemMenu->idAt( 0 ), false ); else if ( state() == Maximized ) @@ -1256,20 +1256,20 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const else { if ( state() != Normal ) - m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) ); if ( state() != Maximized ) - m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQT_SLOT( maximizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQ_SLOT( maximizePressed() ) ); if ( state() != Minimized ) - m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQT_SLOT( minimizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQ_SLOT( minimizePressed() ) ); if ( state() != Maximized ) - m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) ); if ( state() == Normal ) - m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) ); } - m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQT_SLOT( undockPressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQ_SLOT( undockPressed() ) ); m_pSystemMenu->insertSeparator(); - m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQT_SLOT( closePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQ_SLOT( closePressed() ) ); return m_pSystemMenu; } @@ -1301,8 +1301,8 @@ void KMdiChildFrm::switchToMinimizeLayout() // temporary use of minimize button for restore function m_pMinimize->setPixmap( *m_pRestoreButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); // resizing resize( 300, minimumHeight() ); diff --git a/tdemdi/tdemdichildfrm.h b/tdemdi/tdemdichildfrm.h index 20f7ac347..8bdac6e40 100644 --- a/tdemdi/tdemdichildfrm.h +++ b/tdemdi/tdemdichildfrm.h @@ -51,7 +51,7 @@ class TQToolButton; */ class KMDI_EXPORT KMdiWin32IconButton : public TQLabel { - Q_OBJECT + TQ_OBJECT public: KMdiWin32IconButton( TQWidget* parent, const char* name = 0 ); virtual void mousePressEvent( TQMouseEvent* ); @@ -132,7 +132,7 @@ class KMDI_EXPORT KMdiChildFrm : public TQFrame friend class KMdiChildArea; friend class KMdiChildFrmCaption; - Q_OBJECT + TQ_OBJECT // attributes public: @@ -422,13 +422,13 @@ protected: * Restore the focus policies for _all_ widgets in the view using the list given as parameter. * Install the event filter for all direct child widgets of this. (See KMdiChildFrm::eventFilter) */ - void linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ); + void linkChildren( TQDict<TQWidget::FocusPolicy>* pFocPolDict ); /** * Backups all focus policies of _all_ child widgets in the MDI childview since they get lost during a reparent. * Remove all event filters for all direct child widgets of this. (See KMdiChildFrm::eventFilter) */ - TQDict<TQ_FocusPolicy>* unlinkChildren(); + TQDict<TQWidget::FocusPolicy>* unlinkChildren(); /** * Calculates the corner id for the resize cursor. The return value can be tested for: diff --git a/tdemdi/tdemdichildfrmcaption.cpp b/tdemdi/tdemdichildfrmcaption.cpp index 6930eaebf..e988a41f7 100644 --- a/tdemdi/tdemdichildfrmcaption.cpp +++ b/tdemdi/tdemdichildfrmcaption.cpp @@ -41,7 +41,7 @@ #include <tdelocale.h> #include <iostream> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN //TODO: one day gradient can be added for win98/winnt5+ // ask system properties on windows #ifndef SPI_GETGRADIENTCAPTIONS @@ -72,7 +72,7 @@ KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent ) m_bActive = false; m_pParent = parent; setBackgroundMode( NoBackground ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); m_bChildInDrag = false; } @@ -85,17 +85,17 @@ KMdiChildFrmCaption::~KMdiChildFrmCaption() void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { setMouseTracking( false ); if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) { - TQApplication::setOverrideCursor( tqsizeAllCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeAllCursor, true ); } m_pParent->m_bDragging = true; m_offset = mapToParent( e->pos() ); } - else if ( e->button() == Qt::RightButton ) + else if ( e->button() == TQt::RightButton ) { m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) ); } @@ -105,7 +105,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) TQApplication::restoreOverrideCursor(); @@ -313,7 +313,7 @@ void KMdiChildFrmCaption::slot_moveViaSystemMenu() grabMouse(); if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) - TQApplication::setOverrideCursor( tqsizeAllCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeAllCursor, true ); m_pParent->m_bDragging = true; m_offset = mapFromGlobal( TQCursor::pos() ); diff --git a/tdemdi/tdemdichildfrmcaption.h b/tdemdi/tdemdichildfrmcaption.h index 7028202d8..9ae9f94e6 100644 --- a/tdemdi/tdemdichildfrmcaption.h +++ b/tdemdi/tdemdichildfrmcaption.h @@ -43,7 +43,7 @@ class KMdiChildFrmCaptionPrivate; */ class KMDI_EXPORT KMdiChildFrmCaption : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp index cbfdb04d5..be2ea32fa 100644 --- a/tdemdi/tdemdichildview.cpp +++ b/tdemdi/tdemdichildview.cpp @@ -63,7 +63,7 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c m_szCaption = i18n( "Unnamed" ); m_sTabCaption = m_szCaption; - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); installEventFilter( this ); // store the current time @@ -88,7 +88,7 @@ KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f setGeometry( 0, 0, 0, 0 ); // reset m_szCaption = i18n( "Unnamed" ); m_sTabCaption = m_szCaption; - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); installEventFilter( this ); // store the current time @@ -363,7 +363,7 @@ void KMdiChildView::youAreDetached() if ( myIconPtr() ) setIcon( *( myIconPtr() ) ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); emit isDetachedNow(); } @@ -493,10 +493,10 @@ void KMdiChildView::slot_childDestroyed() // if we lost a child we uninstall ourself as event filter for the lost // child and its children - const TQObject * pLostChild = TQT_TQOBJECT_CONST(sender()); + const TQObject * pLostChild = sender(); if ( pLostChild && ( pLostChild->isWidgetType() ) ) { - TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" ); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all lost child widgets TQObject* obj; @@ -524,11 +524,11 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( e->type() == TQEvent::KeyPress && isAttached() ) { TQKeyEvent* ke = ( TQKeyEvent* ) e; - if ( ke->key() == Qt::Key_Tab ) + if ( ke->key() == TQt::Key_Tab ) { TQWidget* w = ( TQWidget* ) obj; - TQ_FocusPolicy wfp = w->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || w->focusPolicy() == TQ_WheelFocus ) + TQWidget::FocusPolicy wfp = w->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || w->focusPolicy() == TQWidget::WheelFocus ) { if ( m_lastFocusableChildWidget != 0 ) { @@ -545,7 +545,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) { if ( obj->isWidgetType() ) { - TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList * list = queryList( "TQWidget" ); if ( list->find( obj ) != -1 ) m_focusedChildWidget = ( TQWidget* ) obj; @@ -566,10 +566,10 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) { - TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList * list = pLostChild->queryList( "TQWidget" ); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all lost child widgets TQObject * o; @@ -578,8 +578,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * widg = ( TQWidget* ) o; ++it; widg->removeEventFilter( this ); - TQ_FocusPolicy wfp = widg->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus ) + TQWidget::FocusPolicy wfp = widg->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) { if ( m_firstFocusableChildWidget == widg ) m_firstFocusableChildWidget = 0L; // reset first widget @@ -596,13 +596,13 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) // if we got a new child and we are attached to the MDI system we // install ourself as event filter for the new child and its children // (as we did when we were added to the MDI system). - TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) ) { TQWidget * pNewWidget = ( TQWidget* ) pNewChild; if ( pNewWidget->testWFlags( (WFlags)(WType_Dialog | WShowModal) ) ) return false; - TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = pNewWidget->queryList( "TQWidget" ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets TQObject * o; @@ -611,9 +611,9 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * widg = ( TQWidget* ) o; ++it; widg->installEventFilter( this ); - connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) ); - TQ_FocusPolicy wfp = widg->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus ) + connect( widg, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slot_childDestroyed() ) ); + TQWidget::FocusPolicy wfp = widg->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) { if ( m_firstFocusableChildWidget == 0 ) m_firstFocusableChildWidget = widg; // first widge @@ -629,14 +629,14 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( e->type() == TQEvent::IconChange ) { // tqDebug("KMDiChildView:: TQEvent:IconChange intercepted\n"); - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) + if ( obj == this ) iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() ); - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_trackChanges) ) + else if ( obj == m_trackChanges ) setIcon( m_trackChanges->icon() ? ( *( m_trackChanges->icon() ) ) : TQPixmap() ); } if ( e->type() == TQEvent::CaptionChange ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) + if ( obj == this ) captionUpdated( this, caption() ); } } @@ -647,7 +647,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) /** Switches interposing in event loop of all current child widgets off. */ void KMdiChildView::removeEventFilterForAllChildren() { - TQObjectList* list = queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList* list = queryList( "TQWidget" ); TQObjectListIt it( *list ); // iterate over all child widgets TQObject* obj; while ( ( obj = it.current() ) != 0 ) diff --git a/tdemdi/tdemdichildview.h b/tdemdi/tdemdichildview.h index 0c05b5a47..4db44ed83 100644 --- a/tdemdi/tdemdichildview.h +++ b/tdemdi/tdemdichildview.h @@ -94,7 +94,7 @@ class KMdiChildViewPrivate; * flags = KMdi::Hide; * } * // set the accelerators for Toplevel MDI mode (each toplevel window needs its own accels - * connect( m_pParent, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(initKeyAccel(TQWidget*)) ); + * connect( m_pParent, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(initKeyAccel(TQWidget*)) ); * * m_pParent->addWindow( pMDICover, flags); * // correct the default settings of KMdi ('cause we haven't a tab order for subwidget focuses) @@ -109,7 +109,7 @@ class KMDI_EXPORT KMdiChildView : public TQWidget { friend class KMdiMainFrm; friend class KMdiChildFrm; - Q_OBJECT + TQ_OBJECT // attributes protected: @@ -465,7 +465,7 @@ protected: virtual void closeEvent( TQCloseEvent *e ); /** - * It only catches TQEvent::KeyPress events there. If a Qt::Key_Tab is pressed, the internal MDI focus + * It only catches TQEvent::KeyPress events there. If a TQt::Key_Tab is pressed, the internal MDI focus * handling is called. That means if the last focusable child widget of this is called, it will jump to the * first focusable child widget of this. * See KMdiChildView::setFirstFocusableChildWidget and KMdiChildView::lastFirstFocusableChildWidget diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp index 010974666..c5b3e10ee 100644 --- a/tdemdi/tdemdidockcontainer.cpp +++ b/tdemdi/tdemdidockcontainer.cpp @@ -140,7 +140,7 @@ KMdiDockContainer::~KMdiDockContainer() KDockWidget *w = it.key(); if ( m_overlapButtons.contains( w ) ) { - ( ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[w] ); + ( ::tqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[w] ); m_overlapButtons.remove( w ); } m_map.remove( w ); @@ -172,7 +172,7 @@ void KMdiDockContainer::init() // try to restore splitter size if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->parent() ); + KDockSplitter * sp = ::tqt_cast<KDockSplitter*>( parentDockWidget()->parent() ); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -207,12 +207,12 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() ) ( ( KDockWidget* ) parentWidget() ) ->dockBack(); - if ( ::tqqt_cast<KDockWidgetHeader*>(w->getHeader()) ) + if ( ::tqt_cast<KDockWidgetHeader*>(w->getHeader()) ) { kdDebug( 760 ) << k_funcinfo << "The dockwidget we're adding has a header" << endl; kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl; - KDockWidgetHeader *hdr = ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ); + KDockWidgetHeader *hdr = ::tqt_cast<KDockWidgetHeader*>( w->getHeader() ); KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) ); @@ -223,7 +223,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const m_overlapButtons.insert( w, btn ); btn->setOn( !isOverlapMode() ); - connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) ); + connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeOverlapMode() ) ); } m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() ); @@ -231,7 +231,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() << " to the tabbar" << endl; - connect( m_tb->tab( tab ), TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( tabClicked( int ) ) ); + connect( m_tb->tab( tab ), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( tabClicked( int ) ) ); mTabCnt++; m_inserted = tab; @@ -252,7 +252,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) { case TQEvent::MouseButtonPress: { - KMultiTabBarTab* kmtbTab = tqt_dynamic_cast<KMultiTabBarTab*>( obj ); + KMultiTabBarTab* kmtbTab = dynamic_cast<KMultiTabBarTab*>( obj ); if ( !kmtbTab ) { kdDebug(760) << k_funcinfo << "Got a mouse button press but we have no tab" << endl; @@ -272,7 +272,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) break; } - KDockWidgetHeader *hdr = ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ); + KDockWidgetHeader *hdr = ::tqt_cast<KDockWidgetHeader*>( w->getHeader() ); if ( !hdr ) { kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl; @@ -280,7 +280,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) } m_dockManager = w->dockManager(); - m_dragPanel = TQT_TQOBJECT(hdr->dragPanel()); + m_dragPanel = hdr->dragPanel(); if ( m_dragPanel ) m_movingState = WaitingForMoveStart; @@ -303,7 +303,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() ); if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { - m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) ); + m_dockManager->eventFilter( m_dragPanel, static_cast<TQEvent*>(m_startEvent) ); m_dockManager->eventFilter( m_dragPanel, event ); m_movingState = Moving; } @@ -332,7 +332,7 @@ void KMdiDockContainer::showWidget( KDockWidget *w ) void KMdiDockContainer::changeOverlapMode() { - const KDockButton_Private * btn = tqt_dynamic_cast<const KDockButton_Private*>( sender() ); + const KDockButton_Private * btn = dynamic_cast<const KDockButton_Private*>( sender() ); if ( !btn ) return ; @@ -387,7 +387,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg ) m_revMap.remove( id ); if ( m_overlapButtons.contains( w ) ) { - ( ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[ w ] ); + ( ::tqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[ w ] ); m_overlapButtons.remove( w ); } KDockContainer::removeWidget( w ); @@ -442,7 +442,7 @@ void KMdiDockContainer::tabClicked( int t ) if ( m_ws->widget( t ) ) { m_ws->raiseWidget( t ); - KDockWidget * tmpDw = ::tqqt_cast<KDockWidget*>( m_ws->widget( t ) ); + KDockWidget * tmpDw = ::tqt_cast<KDockWidget*>( m_ws->widget( t ) ); if ( tmpDw ) { if ( tmpDw->getWidget() ) @@ -467,7 +467,7 @@ void KMdiDockContainer::tabClicked( int t ) // try save splitter position if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->parent() ); + KDockSplitter * sp = ::tqt_cast<KDockSplitter*>( parentDockWidget()->parent() ); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -613,7 +613,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) if ( it.key() ->name() == raise ) { m_delayedRaise = it.data(); - TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); kdDebug( 760 ) << k_funcinfo << "raising " << it.key()->name() << endl; break; } @@ -621,7 +621,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) } if ( m_delayedRaise == -1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); } void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix ) @@ -638,7 +638,7 @@ void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix ) // try to save the splitter position if ( parentDockWidget() && parentDockWidget() ->parent() ) { - KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget() -> parent() ); + KDockSplitter * sp = ::tqt_cast<KDockSplitter*>( parentDockWidget() -> parent() ); if ( sp ) cfg->writeEntry( "separatorPosition", m_separatorPos ); } @@ -744,7 +744,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) kapp->syncX();*/ m_delayedRaise = it.data(); - TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); kdDebug( 760 ) << k_funcinfo << "raising" << it.key() ->name() << endl; break; } @@ -752,7 +752,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) } if ( m_delayedRaise == -1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); cfg->setGroup( grp ); } @@ -794,7 +794,7 @@ void KMdiDockContainer::toggle() kdDebug( 760 ) << k_funcinfo << "lowering tab" << endl; m_tb->setTab( oldtab, false ); tabClicked( oldtab ); - KMdiMainFrm *mainFrm = tqt_dynamic_cast<KMdiMainFrm*>( m_mainWin ); + KMdiMainFrm *mainFrm = dynamic_cast<KMdiMainFrm*>( m_mainWin ); if ( mainFrm && mainFrm->activeWindow() ) mainFrm->activeWindow()->setFocus(); } diff --git a/tdemdi/tdemdidockcontainer.h b/tdemdi/tdemdidockcontainer.h index 9ef606d06..009a00901 100644 --- a/tdemdi/tdemdidockcontainer.h +++ b/tdemdi/tdemdidockcontainer.h @@ -36,7 +36,7 @@ class KDockButton_Private; class KMDI_EXPORT KMdiDockContainer: public TQWidget, public KDockContainer { - Q_OBJECT + TQ_OBJECT public: KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags ); diff --git a/tdemdi/tdemdidocumentviewtabwidget.cpp b/tdemdi/tdemdidocumentviewtabwidget.cpp index 824aa12c4..7ef98747f 100644 --- a/tdemdi/tdemdidocumentviewtabwidget.cpp +++ b/tdemdi/tdemdidocumentviewtabwidget.cpp @@ -18,7 +18,7 @@ KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const ch m_visibility = KMdi::ShowWhenMoreThanOneTab; tabBar() ->hide(); setHoverCloseButton( true ); - connect( this, TQT_SIGNAL( closeRequest( TQWidget* ) ), this, TQT_SLOT( closeTab( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( closeRequest( TQWidget* ) ), this, TQ_SLOT( closeTab( TQWidget* ) ) ); } KMdiDocumentViewTabWidget::~KMdiDocumentViewTabWidget() @@ -32,28 +32,28 @@ void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, const TQString & labe { KTabWidget::addTab( child, label ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); } void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label ) { KTabWidget::addTab( child, iconset, label ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); } void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, TQTab * tab ) { KTabWidget::addTab( child, tab ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & label, int index ) { KTabWidget::insertTab( child, label, index ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); tabBar() ->repaint(); } @@ -61,7 +61,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & { KTabWidget::insertTab( child, iconset, label, index ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); tabBar() ->repaint(); } @@ -69,14 +69,14 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i { KTabWidget::insertTab( child, tab, index ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); tabBar() ->repaint(); } void KMdiDocumentViewTabWidget::removePage ( TQWidget * w ) { KTabWidget::removePage( w ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); } void KMdiDocumentViewTabWidget::updateIconInView( TQWidget *w, TQPixmap icon ) diff --git a/tdemdi/tdemdidocumentviewtabwidget.h b/tdemdi/tdemdidocumentviewtabwidget.h index 1481a86a8..14b5cc7b5 100644 --- a/tdemdi/tdemdidocumentviewtabwidget.h +++ b/tdemdi/tdemdidocumentviewtabwidget.h @@ -22,7 +22,7 @@ class TDEPopupMenu; class KMDI_EXPORT KMdiDocumentViewTabWidget: public KTabWidget { - Q_OBJECT + TQ_OBJECT public: KMdiDocumentViewTabWidget( TQWidget* parent, const char* name = 0 ); ~KMdiDocumentViewTabWidget(); diff --git a/tdemdi/tdemdifocuslist.cpp b/tdemdi/tdemdifocuslist.cpp index dc689ae99..edabbae4d 100644 --- a/tdemdi/tdemdifocuslist.cpp +++ b/tdemdi/tdemdifocuslist.cpp @@ -31,19 +31,19 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) { //this method should never be called twice on the same hierarchy m_list.insert( w, w->focusPolicy() ); - w->setFocusPolicy( TQ_ClickFocus ); + w->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; - connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + connect( w, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); + TQObjectList *l = w->queryList( "TQWidget" ); TQObjectListIt it( *l ); TQObject *obj; while ( ( obj = it.current() ) != 0 ) { TQWidget * wid = ( TQWidget* ) obj; m_list.insert( wid, wid->focusPolicy() ); - wid->setFocusPolicy( TQ_ClickFocus ); + wid->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl; - connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); + connect( wid, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); ++it; } delete l; @@ -51,7 +51,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) void KMdiFocusList::restore() { - for ( TQMap<TQWidget*, TQ_FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it ) + for ( TQMap<TQWidget*, TQWidget::FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it ) { it.key() ->setFocusPolicy( it.data() ); } diff --git a/tdemdi/tdemdifocuslist.h b/tdemdi/tdemdifocuslist.h index 18749862b..d3fdc039c 100644 --- a/tdemdi/tdemdifocuslist.h +++ b/tdemdi/tdemdifocuslist.h @@ -25,7 +25,7 @@ class KMDI_EXPORT KMdiFocusList: public TQObject { - Q_OBJECT + TQ_OBJECT public: KMdiFocusList( TQObject *parent ); ~KMdiFocusList(); @@ -34,7 +34,7 @@ public: protected slots: void objectHasBeenDestroyed( TQObject* ); private: - TQMap<TQWidget*, TQ_FocusPolicy> m_list; + TQMap<TQWidget*, TQWidget::FocusPolicy> m_list; }; diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp index b4c4bc593..d10ef90bb 100644 --- a/tdemdi/tdemdiguiclient.cpp +++ b/tdemdi/tdemdiguiclient.cpp @@ -63,9 +63,9 @@ ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShort { if ( m_dw ) { - connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); - connect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) ); - connect( m_dw, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) ); + connect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) ); + connect( m_dw, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotWidgetDestroyed() ) ); setChecked( m_dw->mayBeHide() ); } } @@ -83,7 +83,7 @@ void ToggleToolViewAction::anDWChanged() else if ( ( !isChecked() ) && m_dw->mayBeHide() ) setChecked( true ); else if ( isChecked() && ( m_dw->parentDockTabGroup() && - ( ( ::tqqt_cast<KDockWidget*>( m_dw->parentDockTabGroup() -> + ( ( ::tqt_cast<KDockWidget*>( m_dw->parentDockTabGroup() -> parent() ) ) ->mayBeShow() ) ) ) setChecked( false ); } @@ -104,8 +104,8 @@ void ToggleToolViewAction::slotToggled( bool t ) void ToggleToolViewAction::slotWidgetDestroyed() { - disconnect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) ); - disconnect( this, TQT_SIGNAL( toggled( bool ) ), 0, 0 ); + disconnect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) ); + disconnect( this, TQ_SIGNAL( toggled( bool ) ), 0, 0 ); unplugAll(); deleteLater(); } @@ -116,8 +116,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c { m_mdiMode = KMdi::ChildframeMode; m_mdiMainFrm = mdiMainFrm; - connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -143,27 +143,27 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c TQStringList modes; modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" ); m_mdiModeAction->setItems( modes ); - connect( m_mdiModeAction, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( changeViewMode( int ) ) ); + connect( m_mdiModeAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( changeViewMode( int ) ) ); } else m_mdiModeAction = 0; - connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), - this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); + connect( m_mdiMainFrm, TQ_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), + this, TQ_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQ_SIGNAL( toggleTop() ), actionCollection(), "tdemdi_activate_top" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQ_SIGNAL( toggleLeft() ), actionCollection(), "tdemdi_activate_left" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQ_SIGNAL( toggleRight() ), actionCollection(), "tdemdi_activate_right" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQ_SIGNAL( toggleBottom() ), actionCollection(), "tdemdi_activate_bottom" ) ); m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQ_SLOT( prevToolViewInDock() ), actionCollection(), "tdemdi_prev_toolview" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQ_SLOT( nextToolViewInDock() ), actionCollection(), "tdemdi_next_toolview" ) ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -225,7 +225,7 @@ void KMDIGUIClient::setupActions() // m_toolBars = builder.toolBars(); // m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString::null, 0, - // this, TQT_SLOT(blah()),actionCollection(),"nothing")); + // this, TQ_SLOT(blah()),actionCollection(),"nothing")); TQPtrList<TDEAction> addList; if ( m_toolViewActions.count() < 3 ) @@ -258,14 +258,14 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) sc = TDEShortcut( cfg->readEntry( aname, "" ) ); cfg->setGroup( _grp ); TDEAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ), - /*TQString::null*/sc, tqt_dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ), + /*TQString::null*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ), m_mdiMainFrm, actionCollection(), aname.latin1() ); #if KDE_IS_VERSION(3,2,90) ( ( ToggleToolViewAction* ) a ) ->setCheckedState( TQString(i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() )) ); #endif - connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) ); + connect( a, TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( actionDeleted( TQObject* ) ) ); m_toolViewActions.append( a ); m_toolMenu->insert( a ); mtva->d->action = a; diff --git a/tdemdi/tdemdiguiclient.h b/tdemdi/tdemdiguiclient.h index ef0f8bcbf..31550a234 100644 --- a/tdemdi/tdemdiguiclient.h +++ b/tdemdi/tdemdiguiclient.h @@ -41,7 +41,7 @@ namespace KMDIPrivate class KMDI_EXPORT KMDIGUIClient : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: KMDIGUIClient( KMdiMainFrm *mdiMainFrm, bool showMDIModeAction, const char *name = 0 ); @@ -120,7 +120,7 @@ private: */ class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: ToggleToolViewAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0, diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp index ae5f1b584..2358b73ac 100644 --- a/tdemdi/tdemdimainfrm.cpp +++ b/tdemdi/tdemdimainfrm.cpp @@ -93,7 +93,7 @@ #include "kde2laptop_closebutton.xpm" #include "kde2laptop_closebutton_menu.xpm" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #ifndef NO_KDE #include <X11/X.h> // schroder #include <X11/Xlib.h> // schroder @@ -108,7 +108,7 @@ /* I hate the defines in the X11 header files. Get rid of one of them */ #undef KeyPress #endif -#endif // Q_WS_X11 && ! K_WS_QTONLY +#endif // TQ_WS_X11 && ! K_WS_QTONLY using namespace KParts; @@ -184,7 +184,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pToolViews = new TQMap<TQWidget*, KMdiToolViewAccessor*>; // This seems to be needed (re-check it after Qt2.0 comed out) - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); // create the central widget createMdiManager(); @@ -207,7 +207,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pWindowMenu = new TQPopupMenu( this, "window_menu" ); m_pWindowMenu->setCheckable( true ); - TQObject::connect( m_pWindowMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillWindowMenu() ) ); + TQObject::connect( m_pWindowMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillWindowMenu() ) ); m_pDockMenu = new TQPopupMenu( this, "dock_menu" ); m_pDockMenu->setCheckable( true ); @@ -218,7 +218,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" ); d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(), - TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); + this, TQ_SLOT(closeActiveView()), actionCollection(), "window_close"); // the MDI view taskbar createTaskBar(); @@ -249,11 +249,11 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod // drag end timer m_pDragEndTimer = new TQTimer(); - connect( m_pDragEndTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( dragEndTimeOut() ) ); - connect( guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient* ) ), - this, TQT_SLOT( verifyToplevelHeight() ) ); - connect( guiFactory(), TQT_SIGNAL( clientRemoved( KXMLGUIClient* ) ), - this, TQT_SLOT( verifyToplevelHeight() ) ); + connect( m_pDragEndTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( dragEndTimeOut() ) ); + connect( guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient* ) ), + this, TQ_SLOT( verifyToplevelHeight() ) ); + connect( guiFactory(), TQ_SIGNAL( clientRemoved( KXMLGUIClient* ) ), + this, TQ_SLOT( verifyToplevelHeight() ) ); } void KMdiMainFrm::verifyToplevelHeight() @@ -271,21 +271,21 @@ void KMdiMainFrm::verifyToplevelHeight() void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) { m_mdiGUIClient = new KMDIPrivate::KMDIGUIClient( this, showModeMenu ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleTop() ), this, TQT_SIGNAL( toggleTop() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleLeft() ), this, TQT_SIGNAL( toggleLeft() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleRight() ), this, TQT_SIGNAL( toggleRight() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleBottom() ), this, TQT_SIGNAL( toggleBottom() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleTop() ), this, TQ_SIGNAL( toggleTop() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleLeft() ), this, TQ_SIGNAL( toggleLeft() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleRight() ), this, TQ_SIGNAL( toggleRight() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleBottom() ), this, TQ_SIGNAL( toggleBottom() ) ); if ( m_mdiMode == KMdi::IDEAlMode ) { if ( m_topContainer ) - connect( this, TQT_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_leftContainer ) - connect( this, TQT_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_rightContainer ) - connect( this, TQT_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_bottomContainer ) - connect( this, TQT_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQ_SLOT( toggle() ) ); } emit mdiModeHasBeenChangedTo( m_mdiMode ); @@ -363,16 +363,16 @@ void KMdiMainFrm::createMdiManager() kdDebug(760) << k_funcinfo << "creating MDI manager" << endl; m_pMdi = new KMdiChildArea( this ); setCentralWidget( m_pMdi ); - TQObject::connect( m_pMdi, TQT_SIGNAL( nowMaximized( bool ) ), - this, TQT_SLOT( setEnableMaximizedChildFrmMode( bool ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ), - this, TQT_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ), - this, TQT_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( popupWindowMenu( TQPoint ) ), - this, TQT_SLOT( popupWindowMenu( TQPoint ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( lastChildFrmClosed() ), - this, TQT_SIGNAL( lastChildFrmClosed() ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( nowMaximized( bool ) ), + this, TQ_SLOT( setEnableMaximizedChildFrmMode( bool ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ), + this, TQ_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ), + this, TQ_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( popupWindowMenu( TQPoint ) ), + this, TQ_SLOT( popupWindowMenu( TQPoint ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( lastChildFrmClosed() ), + this, TQ_SIGNAL( lastChildFrmClosed() ) ); } //============ createTaskBar ==============// @@ -458,14 +458,14 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) d->closeWindowAction->setEnabled(true); // common connections used when under MDI control - TQObject::connect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( activated( KMdiChildView* ) ), this, TQT_SIGNAL( viewActivated( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( deactivated( KMdiChildView* ) ), this, TQT_SIGNAL( viewDeactivated( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( activated( KMdiChildView* ) ), this, TQ_SIGNAL( viewActivated( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( deactivated( KMdiChildView* ) ), this, TQ_SIGNAL( viewDeactivated( KMdiChildView* ) ) ); if ( index == -1 ) m_pDocumentViews->append( pWnd ); @@ -475,7 +475,7 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) if ( m_pTaskBar ) { KMdiTaskBarButton* but = m_pTaskBar->addWinButton( pWnd ); - TQObject::connect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) ); } // embed the view depending on the current MDI mode @@ -487,8 +487,8 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) m_documentTabWidget->insertTab( pWnd, pixmap, pWnd->tabCaption(), index ); - connect( pWnd, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); - connect( pWnd, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); + connect( pWnd, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); + connect( pWnd, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); } else { @@ -698,7 +698,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) pWnd->setGeometry( TQRect( m_pMdi->getCascadePoint( m_pDocumentViews->count() - 1 ), defaultChildFrmSize() ) ); } } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { XSetTransientForHint( tqt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); @@ -708,7 +708,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) return ; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { XSetTransientForHint( tqt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); @@ -736,19 +736,19 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) if ( m_pWinList->count() == 0 ) m_pCurrentWindow = 0L; - TQObject::disconnect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) ); if ( m_pTaskBar ) { KMdiTaskBarButton * but = m_pTaskBar->getButton( pWnd ); if ( but != 0L ) { - TQObject::disconnect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) ); } m_pTaskBar->removeWinButton( pWnd ); } @@ -989,19 +989,19 @@ TQPopupMenu* KMdiMainFrm::taskBarPopup( KMdiChildView *pWnd, bool /*bIncludeWind m_pTaskBarPopup->clear(); if ( pWnd->isAttached() ) { - m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQT_SLOT( detach() ) ); + m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQ_SLOT( detach() ) ); m_pTaskBarPopup->insertSeparator(); if ( pWnd->isMinimized() || pWnd->isMaximized() ) - m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQT_SLOT( restore() ) ); + m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQ_SLOT( restore() ) ); if ( !pWnd->isMaximized() ) - m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQT_SLOT( maximize() ) ); + m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQ_SLOT( maximize() ) ); if ( !pWnd->isMinimized() ) - m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQT_SLOT( minimize() ) ); + m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQ_SLOT( minimize() ) ); } else - m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQT_SLOT( attach() ) ); + m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQ_SLOT( attach() ) ); m_pTaskBarPopup->insertSeparator(); - m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQT_SLOT( close() ) ); + m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQ_SLOT( close() ) ); // the window has a view...get the window popup m_pTaskBarPopup->insertSeparator(); m_pTaskBarPopup->insertItem( i18n( "Operations" ), windowPopup( pWnd, false ) ); //alvoid recursion @@ -1291,12 +1291,12 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis KDockWidget* dockWindow = 0L; /* pDockW */ KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */ KDockWidget* undockCandidate = 0L; /* pUndockCandidate */ - TQWidget* pW = TQT_TQWIDGET( ( *it ) ); + TQWidget* pW = static_cast<TQWidget*>( ( *it ) ); // find the oldest ancestor of the current dockwidget that can be undocked while ( !pW->isTopLevel() ) { - if ( ::tqqt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) + if ( ::tqt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) { undockCandidate = static_cast<KDockWidget*>( pW ); if ( undockCandidate->enableDocking() != KDockWidget::DockNone ) @@ -1421,7 +1421,7 @@ void KMdiMainFrm::switchToToplevelMode() TQPtrListIterator<KMdiChildView> tdemdicvit( *m_pDocumentViews ); for ( tdemdicvit.toFirst(); ( *tdemdicvit ); ++tdemdicvit ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XSetTransientForHint( tqt_xdisplay(), ( *tdemdicvit )->winId(), winId() ); #endif ( *tdemdicvit )->show(); @@ -1633,7 +1633,7 @@ void KMdiMainFrm::switchToTabPageMode() if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); if ( m_pDocumentViews->count() > 0 ) m_pClose->show(); } @@ -1650,7 +1650,7 @@ void KMdiMainFrm::finishTabPageMode() if ( m_mdiMode == KMdi::TabPageMode ) { m_pClose->hide(); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); TQPtrListIterator<KMdiChildView> it( *m_pDocumentViews ); for ( ; it.current(); ++it ) @@ -1715,7 +1715,7 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace() #endif delete m_documentTabWidget; m_documentTabWidget = new KMdiDocumentViewTabWidget( m_pDockbaseAreaOfDocumentViews ); - connect( m_documentTabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, TQT_SLOT( slotDocCurrentChanged( TQWidget* ) ) ); + connect( m_documentTabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, TQ_SLOT( slotDocCurrentChanged( TQWidget* ) ) ); m_pDockbaseAreaOfDocumentViews->setWidget( m_documentTabWidget ); m_documentTabWidget->show(); TQPtrListIterator<KMdiChildView> it4( *m_pDocumentViews ); @@ -1724,11 +1724,11 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace() KMdiChildView* pView = it4.current(); m_documentTabWidget->addTab( pView, pView->icon() ? *( pView->icon() ) : TQPixmap(), pView->tabCaption() ); /* - connect(pView,TQT_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)), - m_documentTabWidget,TQT_SLOT(updateView(TQWidget*,TQPixmap,const TQString&))); + connect(pView,TQ_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)), + m_documentTabWidget,TQ_SLOT(updateView(TQWidget*,TQPixmap,const TQString&))); */ - connect( pView, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); - connect( pView, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); + connect( pView, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); + connect( pView, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); } } @@ -1739,28 +1739,28 @@ void KMdiMainFrm::setIDEAlModeStyle( int flags ) d->m_styleIDEAlMode = flags; // see KMultiTabBar for the first 3 bits if ( m_leftContainer ) { - KMdiDockContainer * tmpL = ::tqqt_cast<KMdiDockContainer*>( m_leftContainer->getWidget() ); + KMdiDockContainer * tmpL = ::tqt_cast<KMdiDockContainer*>( m_leftContainer->getWidget() ); if ( tmpL ) tmpL->setStyle( flags ); } if ( m_rightContainer ) { - KMdiDockContainer * tmpR = ::tqqt_cast<KMdiDockContainer*>( m_rightContainer->getWidget() ); + KMdiDockContainer * tmpR = ::tqt_cast<KMdiDockContainer*>( m_rightContainer->getWidget() ); if ( tmpR ) tmpR->setStyle( flags ); } if ( m_topContainer ) { - KMdiDockContainer * tmpT = ::tqqt_cast<KMdiDockContainer*>( m_topContainer->getWidget() ); + KMdiDockContainer * tmpT = ::tqt_cast<KMdiDockContainer*>( m_topContainer->getWidget() ); if ( tmpT ) tmpT->setStyle( flags ); } if ( m_bottomContainer ) { - KMdiDockContainer * tmpB = ::tqqt_cast<KMdiDockContainer*>( m_bottomContainer->getWidget() ); + KMdiDockContainer * tmpB = ::tqt_cast<KMdiDockContainer*>( m_bottomContainer->getWidget() ); if ( tmpB ) tmpB->setStyle( flags ); } @@ -1777,7 +1777,7 @@ void KMdiMainFrm::setToolviewStyle( int flag ) TQMap<TQWidget*, KMdiToolViewAccessor*>::Iterator it; for ( it = m_pToolViews->begin(); it != m_pToolViews->end(); ++it ) { - KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>( it.data()->wrapperWidget() ); + KDockWidget *dockWidget = dynamic_cast<KDockWidget*>( it.data()->wrapperWidget() ); if ( dockWidget ) { switch ( flag ) @@ -1858,7 +1858,7 @@ void KMdiMainFrm::switchToIDEAlMode() if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); if ( m_pDocumentViews->count() > 0 ) m_pClose->show(); } @@ -1886,7 +1886,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = tqt_dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); + mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); // FIXME: will likely crash below due to unchecked cast } @@ -1899,11 +1899,11 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); if ( widget && widget->parentDockTabGroup() ) { - widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) ); + widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() ); if ( widget ) { - KDockTabGroup* tg = tqt_dynamic_cast<KDockTabGroup*>( widget->getWidget() ); + KDockTabGroup* tg = dynamic_cast<KDockTabGroup*>( widget->getWidget() ); if ( tg ) { kdDebug(760) << k_funcinfo << "KDockTabGroup found" << endl; @@ -1931,7 +1931,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() KDockWidget *mainDock = getMainDockWidget(); KDockWidget *w = mainDock; if ( mainDock->parentDockTabGroup() ) - w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) ); + w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); TQPtrList<KDockWidget> leftReparentWidgets; TQPtrList<KDockWidget> rightReparentWidgets; @@ -1939,7 +1939,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() TQPtrList<KDockWidget> topReparentWidgets; if ( mainDock->parentDockTabGroup() ) - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); + mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); @@ -1956,40 +1956,40 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() m_leftContainer->manualDock( mainDock, KDockWidget::DockLeft, 20 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleLeft() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleLeft() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_rightContainer->setWidget( tmpDC = new KMdiDockContainer( m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode ) ); m_rightContainer->setEnableDocking( KDockWidget::DockRight ); m_rightContainer->manualDock( mainDock, KDockWidget::DockRight, 80 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleRight() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleRight() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_topContainer->setWidget( tmpDC = new KMdiDockContainer( m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode ) ); m_topContainer->setEnableDocking( KDockWidget::DockTop ); m_topContainer->manualDock( mainDock, KDockWidget::DockTop, 20 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleTop() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleTop() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_bottomContainer->setWidget( tmpDC = new KMdiDockContainer( m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode ) ); m_bottomContainer->setEnableDocking( KDockWidget::DockBottom ); m_bottomContainer->manualDock( mainDock, KDockWidget::DockBottom, 80 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleBottom() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleBottom() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_leftContainer->setDockSite( KDockWidget::DockCenter ); m_rightContainer->setDockSite( KDockWidget::DockCenter ); @@ -2024,7 +2024,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) { assert( m_pClose ); m_pClose->hide(); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); TQStringList leftNames; @@ -2118,7 +2118,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) TQStringList KMdiMainFrm::prepareIdealToTabs( KDockWidget* container ) { - KDockContainer * pDW = tqt_dynamic_cast<KDockContainer*>( container->getWidget() ); + KDockContainer * pDW = dynamic_cast<KDockContainer*>( container->getWidget() ); TQStringList widgetNames = ( ( KMdiDockContainer* ) pDW ) ->containedWidgets(); for ( TQStringList::iterator it = widgetNames.begin();it != widgetNames.end();++it ) { @@ -2137,7 +2137,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW KDockWidget * mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); + mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); } if ( widgetNames.count() > 0 ) @@ -2432,23 +2432,23 @@ void KMdiMainFrm::setEnableMaximizedChildFrmMode( bool enableMaxChildFrameMode ) if ( !pCurrentChild || !m_pMainMenuBar ) return ; - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( undockPressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( maximizePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( maximizePressed() ) ); m_pMinimize->show(); m_pUndock->show(); m_pRestore->show(); if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook ) { - m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQT_SLOT( closePressed() ), 0, -1, 0 ); + m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQ_SLOT( closePressed() ), 0, -1, 0 ); } else { m_pMainMenuBar->insertItem( *pCurrentChild->icon(), pCurrentChild->systemMenu(), -1, 0 ); if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( closePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( closePressed() ) ); m_pClose->show(); } else @@ -2484,10 +2484,10 @@ void KMdiMainFrm::switchOffMaximizeModeForMenu( KMdiChildFrm* oldChild ) if ( oldChild ) { Q_ASSERT( m_pClose ); - TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) ); - TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) ); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) ); + TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) ); } m_pUndock->hide(); m_pMinimize->hide(); @@ -2506,7 +2506,7 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF if ( newChild ) { if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook ) - m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQT_SLOT( closePressed() ), 0, -1, 0 ); + m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQ_SLOT( closePressed() ), 0, -1, 0 ); else m_pMainMenuBar->insertItem( *newChild->icon(), newChild->systemMenu(), -1, 0 ); } @@ -2515,18 +2515,18 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF { m_pMainMenuBar->removeItem( m_pMainMenuBar->idAt( 1 ) ); Q_ASSERT( m_pClose ); - TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) ); - TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) ); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) ); + TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) ); } if ( newChild ) { Q_ASSERT( m_pClose ); - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( undockPressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( maximizePressed() ) ); - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( closePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( maximizePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( closePressed() ) ); } } @@ -2574,7 +2574,7 @@ void KMdiMainFrm::fillWindowMenu() d->closeWindowAction->plug(m_pWindowMenu); - int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQT_SLOT( closeAllViews() ) ); + int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQ_SLOT( closeAllViews() ) ); if ( noViewOpened ) { d->closeWindowAction->setEnabled(false); @@ -2583,7 +2583,7 @@ void KMdiMainFrm::fillWindowMenu() if ( !tabPageMode && !IDEAlMode ) { - int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQT_SLOT( iconifyAllViews() ) ); + int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQ_SLOT( iconifyAllViews() ) ); if ( noViewOpened ) m_pWindowMenu->setItemEnabled( iconifyId, false ); } @@ -2591,10 +2591,10 @@ void KMdiMainFrm::fillWindowMenu() m_pWindowMenu->insertSeparator(); m_pWindowMenu->insertItem( i18n( "&MDI Mode" ), m_pMdiModeMenu ); m_pMdiModeMenu->clear(); - m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQT_SLOT( switchToToplevelMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQT_SLOT( switchToChildframeMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQT_SLOT( switchToTabPageMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQT_SLOT( switchToIDEAlMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQ_SLOT( switchToToplevelMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQ_SLOT( switchToChildframeMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQ_SLOT( switchToTabPageMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQ_SLOT( switchToIDEAlMode() ) ); switch ( m_mdiMode ) { case KMdi::ToplevelMode: @@ -2618,13 +2618,13 @@ void KMdiMainFrm::fillWindowMenu() { int placMenuId = m_pWindowMenu->insertItem( i18n( "&Tile" ), m_pPlacingMenu ); m_pPlacingMenu->clear(); - m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQT_SLOT( cascadeWindows() ) ); - m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQT_SLOT( cascadeMaximized() ) ); - m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQT_SLOT( expandVertical() ) ); - m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQT_SLOT( expandHorizontal() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQT_SLOT( tileAnodine() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQT_SLOT( tilePragma() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQT_SLOT( tileVertically() ) ); + m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQ_SLOT( cascadeWindows() ) ); + m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQ_SLOT( cascadeMaximized() ) ); + m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQ_SLOT( expandVertical() ) ); + m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQ_SLOT( expandHorizontal() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQ_SLOT( tileAnodine() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQ_SLOT( tilePragma() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQ_SLOT( tileVertically() ) ); if ( m_mdiMode == KMdi::ToplevelMode ) { m_pWindowMenu->setItemEnabled( placMenuId, false ); @@ -2686,7 +2686,7 @@ void KMdiMainFrm::fillWindowMenu() } if ( putHere ) { - m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount ); + m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount ); if ( pView == m_pCurrentWindow ) { m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( indx + entryCount ), true ); @@ -2694,7 +2694,7 @@ void KMdiMainFrm::fillWindowMenu() pView->setWindowMenuID( i ); if ( !tabPageMode ) { - m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, indx ); + m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, indx ); if ( pView->isAttached() ) { m_pDockMenu->setItemChecked( m_pDockMenu->idAt( indx ), true ); @@ -2707,7 +2707,7 @@ void KMdiMainFrm::fillWindowMenu() } if ( !inserted ) { // append it - m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount ); + m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount ); if ( pView == m_pCurrentWindow ) { m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( windowItemCount + entryCount ), true ); @@ -2715,7 +2715,7 @@ void KMdiMainFrm::fillWindowMenu() pView->setWindowMenuID( i ); if ( !tabPageMode ) { - m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount ); + m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount ); if ( pView->isAttached() ) { m_pDockMenu->setItemChecked( m_pDockMenu->idAt( windowItemCount ), true ); diff --git a/tdemdi/tdemdimainfrm.h b/tdemdi/tdemdimainfrm.h index 22efc9e9a..780df6fc4 100644 --- a/tdemdi/tdemdimainfrm.h +++ b/tdemdi/tdemdimainfrm.h @@ -240,7 +240,7 @@ class KMDI_EXPORT KMdiMainFrm : public KParts::DockMainWindow { friend class KMdiChildView; friend class KMdiTaskBar; - Q_OBJECT + TQ_OBJECT friend class KMdiToolViewAccessor; // attributes diff --git a/tdemdi/tdemditaskbar.cpp b/tdemdi/tdemditaskbar.cpp index 75c76f6fd..b2b2c0652 100644 --- a/tdemdi/tdemditaskbar.cpp +++ b/tdemdi/tdemditaskbar.cpp @@ -67,7 +67,7 @@ KMdiTaskBarButton::KMdiTaskBarButton( KMdiTaskBar *pTaskBar, KMdiChildView *win_ m_pWindow = win_ptr; TQToolTip::add ( this, win_ptr->caption() ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } KMdiTaskBarButton::~KMdiTaskBarButton() @@ -77,10 +77,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: emit leftMouseButtonClicked( m_pWindow ); break; - case Qt::RightButton: + case TQt::RightButton: emit rightMouseButtonClicked( m_pWindow ); break; default: @@ -156,7 +156,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock ) m_pButtonList->setAutoDelete( true ); //QT30 setFontPropagation(TQWidget::SameFont); setMinimumWidth( 1 ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); parent->moveToolBar( this, dock ); //XXX obsolete! } @@ -175,11 +175,11 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr ) } KMdiTaskBarButton *b = new KMdiTaskBarButton( this, win_ptr ); - TQObject::connect( b, TQT_SIGNAL( clicked() ), win_ptr, TQT_SLOT( setFocus() ) ); - TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) ); + TQObject::connect( b, TQ_SIGNAL( clicked() ), win_ptr, TQ_SLOT( setFocus() ) ); + TQObject::connect( b, TQ_SIGNAL( clicked( KMdiChildView* ) ), this, TQ_SLOT( setActiveButton( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( buttonTextChanged( int ) ), this, TQ_SLOT( layoutTaskBar( int ) ) ); m_pButtonList->append( b ); b->setToggleButton( true ); b->setText( win_ptr->tabCaption() ); @@ -363,7 +363,7 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) newButtonWidth = buttonAreaWidth / buttonCount; else newButtonWidth = 0; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) newButtonWidth = 80; if ( newButtonWidth > 0 ) for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) diff --git a/tdemdi/tdemditaskbar.h b/tdemdi/tdemditaskbar.h index 17df32014..a68e2d945 100644 --- a/tdemdi/tdemditaskbar.h +++ b/tdemdi/tdemditaskbar.h @@ -50,7 +50,7 @@ class KMdiTaskBarButtonPrivate; */ class KMDI_EXPORT KMdiTaskBarButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT // methods public: /** @@ -128,7 +128,7 @@ class KMdiTaskBarPrivate; */ class KMDI_EXPORT KMdiTaskBar : public TDEToolBar { - Q_OBJECT + TQ_OBJECT public: /** * Constructor (NoFocus, minimum width = 1, an internal TQPtrList of taskbar buttons (autodelete)) diff --git a/tdemdi/tdemditoolviewaccessor.cpp b/tdemdi/tdemditoolviewaccessor.cpp index f6b6ddae0..ce5886253 100644 --- a/tdemdi/tdemditoolviewaccessor.cpp +++ b/tdemdi/tdemditoolviewaccessor.cpp @@ -36,7 +36,7 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widge d = new KMdiToolViewAccessorPrivate(); if ( widgetToWrap->inherits( "KDockWidget" ) ) { - d->widgetContainer = tqt_dynamic_cast<KDockWidget*>( widgetToWrap ); + d->widgetContainer = dynamic_cast<KDockWidget*>( widgetToWrap ); d->widget = d->widgetContainer->getWidget(); } else @@ -95,7 +95,7 @@ TQWidget *KMdiToolViewAccessor::wrapperWidget() if ( !d->widgetContainer ) { d->widgetContainer = mdiMainFrm->createDockWidget( "KMdiToolViewAccessor::null", TQPixmap() ); - connect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) ); + connect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) ); } return d->widgetContainer; } @@ -110,7 +110,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri { Q_ASSERT( !( d->widget ) ); Q_ASSERT( !widgetToWrap->inherits( "KDockWidget" ) ); - disconnect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) ); + disconnect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) ); delete d->widget; d->widget = widgetToWrap; KDockWidget *tmp = d->widgetContainer; diff --git a/tdemdi/tdemditoolviewaccessor.h b/tdemdi/tdemditoolviewaccessor.h index 85dda10cc..0d851d5bf 100644 --- a/tdemdi/tdemditoolviewaccessor.h +++ b/tdemdi/tdemditoolviewaccessor.h @@ -37,7 +37,7 @@ class KMDIGUIClient; class KMDI_EXPORT KMdiToolViewAccessor : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KMdiMainFrm; diff --git a/tdemdi/test/hello.cpp b/tdemdi/test/hello.cpp index d92233ea6..0790ce491 100644 --- a/tdemdi/test/hello.cpp +++ b/tdemdi/test/hello.cpp @@ -22,7 +22,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) : KMdiChildView(title, parentWidget), t(text), b(0) { TQTimer *timer = new TQTimer(this); - TQObject::connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) ); + TQObject::connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(animate()) ); timer->start( 40 ); resize( 260, 130 ); diff --git a/tdemdi/test/hello.h b/tdemdi/test/hello.h index b6ce589a0..9af080d11 100644 --- a/tdemdi/test/hello.h +++ b/tdemdi/test/hello.h @@ -20,7 +20,7 @@ class TQPaintEvent; class Hello : public KMdiChildView { - Q_OBJECT + TQ_OBJECT public: Hello( const char *title, const char *text, TQWidget* parentWidget = 0 ); signals: diff --git a/tdemdi/test/main.cpp b/tdemdi/test/main.cpp index c89cb2faa..7d404ea8e 100644 --- a/tdemdi/test/main.cpp +++ b/tdemdi/test/main.cpp @@ -54,19 +54,19 @@ int main( int argc, char **argv ) Hello* h1 = new Hello( "Hello1", "Click the right mouse button on the mainframe!", mainWdg); h1->setTabCaption("Tab changed"); - h1->setBackgroundColor( Qt::white ); + h1->setBackgroundColor( TQt::white ); mainWdg->addWindow( h1); // SHOW(h1->caption()); // SHOW(h1->tabCaption()); TQWidget* w = new TQWidget(mainWdg); - KMdiChildView* h2 = mainWdg->createWrapper(w, "I'm a common but wrapped QWidget!", "Hello2"); + KMdiChildView* h2 = mainWdg->createWrapper(w, "I'm a common but wrapped TQWidget!", "Hello2"); mainWdg->addWindow( h2 ); // SHOW(h2->caption()); // SHOW(h2->tabCaption()); Hello* h3 = new Hello( "Hello3", "Dock me using the taskbar button context menu!", 0); - h3->setBackgroundColor( Qt::white ); + h3->setBackgroundColor( TQt::white ); h3->setFont( TQFont("times",20,TQFont::Bold) ); mainWdg->addWindow( h3, KMdi::Detach ); // undock this! h3->setGeometry( 20, 20, 400, 100); diff --git a/tdemdi/test/mainwidget.cpp b/tdemdi/test/mainwidget.cpp index 494a42c4f..6438ff978 100644 --- a/tdemdi/test/mainwidget.cpp +++ b/tdemdi/test/mainwidget.cpp @@ -90,7 +90,7 @@ MainWidget::~MainWidget() TQString s = doc.toString(); TQFile f("/tmp/dc.txt"); f.open(IO_ReadWrite); - f.tqwriteBlock(s.latin1(), s.length()); + f.writeBlock(s.latin1(), s.length()); f.close(); } @@ -114,7 +114,7 @@ RestartWidget::RestartWidget():TDEMainWindow() TQLabel* l = new TQLabel("This is for the testing of\nKMdiMainFrm::read/writeDockConfig().\n", this); TQCheckBox* b1 = new TQCheckBox("KMdiMainFrm close/restart", this); b1->toggle(); - TQObject::connect(b1, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(onStateChanged(int))); + TQObject::connect(b1, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(onStateChanged(int))); bl->add(l); bl->add(b1); bl->setMargin(10); diff --git a/tdemdi/test/mainwidget.h b/tdemdi/test/mainwidget.h index f1635d25e..a59989f9a 100644 --- a/tdemdi/test/mainwidget.h +++ b/tdemdi/test/mainwidget.h @@ -29,7 +29,7 @@ */ class MainWidget : public KMdiMainFrm { - Q_OBJECT + TQ_OBJECT public: MainWidget(TQDomElement& dockConfig,KMdi::MdiMode mode); virtual ~MainWidget(); @@ -50,7 +50,7 @@ private: */ class RestartWidget : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT // methods public: RestartWidget(); diff --git a/tdenewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp index 81450fd68..9a1cb2ee2 100644 --- a/tdenewstuff/downloaddialog.cpp +++ b/tdenewstuff/downloaddialog.cpp @@ -156,12 +156,12 @@ void DownloadDialog::init(Engine *engine) box->add(d->m_loadingLabel); box->addItem(new TQSpacerItem(0, 0, TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_SLOT(slotPage(TQWidget*))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), TQ_SLOT(slotPage(TQWidget*))); if(!engine) { m_loader = new ProviderLoader(this); - connect(m_loader, TQT_SIGNAL(providersLoaded(Provider::List*)), TQT_SLOT(slotProviders(Provider::List*))); + connect(m_loader, TQ_SIGNAL(providersLoaded(Provider::List*)), TQ_SLOT(slotProviders(Provider::List*))); } m_entries.setAutoDelete(true); @@ -273,7 +273,7 @@ void DownloadDialog::addProvider(Provider *p) ctl->addTab(w_l, i18n("Latest")); m_curtab = 0; - connect(ctl, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(slotTab())); + connect(ctl, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(slotTab())); TQHBoxLayout *box = new TQHBoxLayout(frame); box->add(ctl); @@ -296,9 +296,9 @@ void DownloadDialog::addProvider(Provider *p) d->m_lvtmp_l->addColumn(i18n("Release Date")); d->m_lvtmp_l->setSorting(2, false); - connect(d->m_lvtmp_r, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected())); - connect(d->m_lvtmp_d, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected())); - connect(d->m_lvtmp_l, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected())); + connect(d->m_lvtmp_r, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected())); + connect(d->m_lvtmp_d, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected())); + connect(d->m_lvtmp_l, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected())); rt = new TQTextBrowser(frame); rt->setMinimumWidth(150); @@ -315,10 +315,10 @@ void DownloadDialog::addProvider(Provider *p) vbox->add(de); vbox->add(in); - connect(rt, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotEmail(const TQString&))); + connect(rt, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotEmail(const TQString&))); - connect(in, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall())); - connect(de, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails())); + connect(in, TQ_SIGNAL(clicked()), TQ_SLOT(slotInstall())); + connect(de, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails())); TQVBoxLayout *box2 = new TQVBoxLayout(w_r); box2->add(d->m_lvtmp_r); @@ -340,7 +340,7 @@ void DownloadDialog::addProvider(Provider *p) if(m_engine) slotPage(frame); - TQTimer::singleShot(100, this, TQT_SLOT(slotFinish())); + TQTimer::singleShot(100, this, TQ_SLOT(slotFinish())); } void DownloadDialog::slotResult(TDEIO::Job *job) @@ -439,7 +439,7 @@ int DownloadDialog::installStatus(Entry *entry) if(datestring.isNull()) installed = 0; else { - date = TQT_TQDATE_OBJECT(TQDate::fromString(datestring, Qt::ISODate)); + date = TQDate::fromString(datestring, TQt::ISODate); if(!date.isValid()) installed = 0; else if(date < entry->releaseDate()) installed = -1; else installed = 1; @@ -583,10 +583,10 @@ void DownloadDialog::slotInstall() // in the direct download ability for this to even be considered. if (e->payload().url().contains(OPENDESKTOP_REDIRECT_URL)) { TDEIO::TransferJob *job = TDEIO::get( KURL( e->payload() ), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { slotInstallPhase2(); @@ -616,7 +616,7 @@ void DownloadDialog::slotInstallPhase2() KURL dest = KURL(m_s->downloadDestination(e)); TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotInstalled(TDEIO::Job*))); } } @@ -668,7 +668,7 @@ void DownloadDialog::slotJobResult( TDEIO::Job *job ) void DownloadDialog::install(Entry *e) { kapp->config()->setGroup("TDENewStuffStatus"); - kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate))); + kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(TQt::ISODate))); kapp->config()->sync(); TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small); @@ -713,7 +713,7 @@ void DownloadDialog::slotInstalled(TDEIO::Job *job) bool ret = job && (job->error() == 0); if(ret) { - TDEIO::FileCopyJob *cjob = ::tqqt_cast<TDEIO::FileCopyJob*>(job); + TDEIO::FileCopyJob *cjob = ::tqt_cast<TDEIO::FileCopyJob*>(job); if(cjob) { ret = m_s->install(cjob->destURL().path()); @@ -944,9 +944,9 @@ void DownloadDialog::loadProvider(Provider *p) d->m_variants[variantjob] = urlvariants; m_data[variantjob] = ""; - connect(variantjob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(variantjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(variantjob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(variantjob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } if(variants.count() == 0) return; @@ -963,9 +963,9 @@ void DownloadDialog::loadProvider(Provider *p) //m_jobs[job] = p; // not used anymore due to variants m_data[job] = ""; - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void DownloadDialog::setType(TQString type) diff --git a/tdenewstuff/downloaddialog.h b/tdenewstuff/downloaddialog.h index 5756a4e6e..207d24fb4 100644 --- a/tdenewstuff/downloaddialog.h +++ b/tdenewstuff/downloaddialog.h @@ -56,7 +56,7 @@ class Engine; */ class KDE_EXPORT DownloadDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT struct Private; public: /** diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp index 1427f7eb7..5d843afeb 100644 --- a/tdenewstuff/engine.cpp +++ b/tdenewstuff/engine.cpp @@ -84,8 +84,8 @@ void Engine::download() kdDebug() << "Engine::download()" << endl; connect( mProviderLoader, - TQT_SIGNAL( providersLoaded( Provider::List * ) ), - TQT_SLOT( getMetaInformation( Provider::List * ) ) ); + TQ_SIGNAL( providersLoaded( Provider::List * ) ), + TQ_SLOT( getMetaInformation( Provider::List * ) ) ); mProviderLoader->load( mType, mProviderList ); } @@ -106,10 +106,10 @@ void Engine::getMetaInformation( Provider::List *providers ) if ( p->downloadUrl().isEmpty() ) continue; TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl(), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) ); mNewStuffJobData.insert( job, "" ); mProviderJobs[ job ] = p; @@ -218,8 +218,8 @@ void Engine::download( Entry *entry ) kdDebug() << " DESTINATION: " << destination.url() << endl; TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) ); } void Engine::slotDownloadJobResult( TDEIO::Job *job ) @@ -248,8 +248,8 @@ void Engine::upload(const TQString &fileName, const TQString &previewName ) mPreviewFile = previewName; connect( mProviderLoader, - TQT_SIGNAL( providersLoaded( Provider::List * ) ), - TQT_SLOT( selectUploadProvider( Provider::List * ) ) ); + TQ_SIGNAL( providersLoaded( Provider::List * ) ), + TQ_SLOT( selectUploadProvider( Provider::List * ) ) ); mProviderLoader->load( mType ); } @@ -340,8 +340,8 @@ void Engine::upload( Entry *entry ) destination.setFileName( fi.fileName() ); TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) ); } else { emit uploadFinished( false ); } @@ -402,8 +402,8 @@ void Engine::slotUploadPayloadJobResult( TDEIO::Job *job ) previewDestination.setFileName( fi.fileName() ); TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination ); - connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) ); + connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) ); } void Engine::slotUploadPreviewJobResult( TDEIO::Job *job ) @@ -421,8 +421,8 @@ void Engine::slotUploadPreviewJobResult( TDEIO::Job *job ) metaDestination.setFileName( fi.fileName() ); TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination ); - connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) ); + connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) ); } void Engine::slotUploadMetaJobResult( TDEIO::Job *job ) diff --git a/tdenewstuff/engine.h b/tdenewstuff/engine.h index 432f3b04c..0cac342ab 100644 --- a/tdenewstuff/engine.h +++ b/tdenewstuff/engine.h @@ -51,7 +51,7 @@ class ProviderDialog; */ class KDE_EXPORT Engine : public TQObject { - Q_OBJECT + TQ_OBJECT struct Private; public: /** diff --git a/tdenewstuff/entry.cpp b/tdenewstuff/entry.cpp index 7539bb679..a1a00b723 100644 --- a/tdenewstuff/entry.cpp +++ b/tdenewstuff/entry.cpp @@ -332,7 +332,7 @@ void Entry::parseDomElement( const TQDomElement &element ) if ( e.tagName() == "version" ) setVersion( e.text().stripWhiteSpace() ); // if ( e.tagName() == "release" ) setRelease( e.text().toInt() ); if ( e.tagName() == "created" ) { - TQDate date = TQT_TQDATE_OBJECT(TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate )); + TQDate date = TQDate::fromString( e.text().stripWhiteSpace(), TQt::ISODate ); setReleaseDate( date ); } if ( e.tagName() == "smallpreviewpic1" ) { @@ -366,7 +366,7 @@ TQDomElement Entry::createDomElement( TQDomDocument &doc, addElement( doc, entry, "downloads", TQString::number( downloads() ) ); addElement( doc, entry, "created", - releaseDate().toString( Qt::ISODate ) ); + releaseDate().toString( TQt::ISODate ) ); addElement( doc, entry, "description", summary() ); addElement( doc, entry, "preview", preview().url() ); diff --git a/tdenewstuff/ghns.cpp b/tdenewstuff/ghns.cpp index 3217de80e..7a42ce098 100644 --- a/tdenewstuff/ghns.cpp +++ b/tdenewstuff/ghns.cpp @@ -51,7 +51,7 @@ GhnsWidget::GhnsWidget() TQPushButton *button = new TQPushButton( "Wallpapers", this ); topLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( downloadWallpapers() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( downloadWallpapers() ) ); topLayout->addSpacing( 5 ); @@ -61,7 +61,7 @@ GhnsWidget::GhnsWidget() TQPushButton *closeButton = new TQPushButton( "Close", this ); buttonLayout->addWidget( closeButton ); - connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) ); } GhnsWidget::~GhnsWidget() diff --git a/tdenewstuff/ghns.h b/tdenewstuff/ghns.h index 7eea0c489..3cb70da65 100644 --- a/tdenewstuff/ghns.h +++ b/tdenewstuff/ghns.h @@ -32,7 +32,7 @@ class GhnsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: GhnsWidget(); ~GhnsWidget(); diff --git a/tdenewstuff/knewstuffbutton.cpp b/tdenewstuff/knewstuffbutton.cpp index 3baa83397..529573547 100644 --- a/tdenewstuff/knewstuffbutton.cpp +++ b/tdenewstuff/knewstuffbutton.cpp @@ -53,7 +53,7 @@ Button::Button(TQWidget* parent, const char* name) void Button::init() { setIconSet(SmallIconSet("knewstuff")); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(showDialog())); } void Button::setButtonText(const TQString& what) diff --git a/tdenewstuff/knewstuffbutton.h b/tdenewstuff/knewstuffbutton.h index e4a98ae3a..7cad1b0a8 100644 --- a/tdenewstuff/knewstuffbutton.h +++ b/tdenewstuff/knewstuffbutton.h @@ -36,7 +36,7 @@ class DownloadDialog; */ class Button : public KPushButton { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdenewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp index 0f95c8c0c..d2c81ae35 100644 --- a/tdenewstuff/knewstuffsecure.cpp +++ b/tdenewstuff/knewstuffsecure.cpp @@ -37,7 +37,7 @@ TDENewStuffSecure::TDENewStuffSecure(const TQString &type, TQWidget *parentWidg : TDENewStuff(type, parentWidget) { m_tempDir = 0L; - connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool))); + connect(engine(), TQ_SIGNAL(uploadFinished(bool)), TQ_SLOT(slotUploadFinished(bool))); } @@ -74,7 +74,7 @@ bool TDENewStuffSecure::install(const TQString &fileName) else { m_tarName.prepend(m_tempDir->name()); - connect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int))); + connect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int))); Security::ref()->checkValidity(m_tarName); } } else @@ -154,7 +154,7 @@ void TDENewStuffSecure::slotValidated(int result) cfg->sync(); } removeTempDirectory(); - disconnect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int))); + disconnect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int))); } void TDENewStuffSecure::downloadResource() @@ -173,7 +173,7 @@ bool TDENewStuffSecure::createUploadFile(const TQString &fileName) void TDENewStuffSecure::uploadResource(const TQString& fileName) { - connect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); + connect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int))); removeTempDirectory(); m_tempDir = new KTempDir(); m_tempDir->setAutoDelete(true); @@ -194,7 +194,7 @@ void TDENewStuffSecure::slotFileSigned(int result) { if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel) { - disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); + disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int))); removeTempDirectory(); return; } @@ -217,7 +217,7 @@ void TDENewStuffSecure::slotFileSigned(int result) tar.close(); TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true); TDENewStuff::upload(m_signedFileName, TQString::null); - disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); + disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int))); } } diff --git a/tdenewstuff/knewstuffsecure.h b/tdenewstuff/knewstuffsecure.h index 1c292a9a8..bb07a8637 100644 --- a/tdenewstuff/knewstuffsecure.h +++ b/tdenewstuff/knewstuffsecure.h @@ -39,7 +39,7 @@ to the standard TDENewStuff class. */ class KDE_EXPORT TDENewStuffSecure : public TQObject, public TDENewStuff { - Q_OBJECT + TQ_OBJECT public: /** Constructor. diff --git a/tdenewstuff/provider.cpp b/tdenewstuff/provider.cpp index 022570b01..8247aa40f 100644 --- a/tdenewstuff/provider.cpp +++ b/tdenewstuff/provider.cpp @@ -213,10 +213,10 @@ void Provider::parseDomElement( const TQDomElement &element ) kdDebug() << "Provider::parseDomElement(): contentTypeUrl: " << contentTypeUrl << endl; TDEIO::TransferJob *job = TDEIO::get( KURL( contentTypeUrl ), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); } } @@ -365,12 +365,12 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl; TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ), - TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ), + TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ) ); // job->dumpObjectInfo(); } @@ -389,7 +389,7 @@ void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data ) void ProviderLoader::slotJobResult( TDEIO::Job *job ) { if ( job->error() ) { - job->showErrorDialog( TQT_TQWIDGET(parent()) ); + job->showErrorDialog( static_cast<TQWidget*>(parent()) ); emit error(); return; } @@ -399,7 +399,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job ) TQDomDocument doc; if ( !doc.setContent( mJobData ) ) { - KMessageBox::error( TQT_TQWIDGET(parent()), i18n("Error parsing providers list.") ); + KMessageBox::error( static_cast<TQWidget*>(parent()), i18n("Error parsing providers list.") ); emit error(); return; } @@ -417,9 +417,9 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job ) TQDomElement p = n.toElement(); if ( p.tagName() == "provider" ) { - Provider* prov = new Provider( p, mContentType, TQT_TQWIDGET(parent()) ); + Provider* prov = new Provider( p, mContentType, static_cast<TQWidget*>(parent()) ); mProviders.append( prov ); - connect( prov, TQT_SIGNAL( providerLoaded() ), this, TQT_SLOT( providerLoaded() ) ); + connect( prov, TQ_SIGNAL( providerLoaded() ), this, TQ_SLOT( providerLoaded() ) ); } } } diff --git a/tdenewstuff/provider.h b/tdenewstuff/provider.h index 0a65d64fc..0c62edca1 100644 --- a/tdenewstuff/provider.h +++ b/tdenewstuff/provider.h @@ -46,7 +46,7 @@ namespace KNS { */ class KDE_EXPORT Provider : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef TQPtrList<Provider> List; @@ -190,7 +190,7 @@ class KDE_EXPORT Provider : public TQObject */ class KDE_EXPORT ProviderLoader : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. diff --git a/tdenewstuff/providerdialog.h b/tdenewstuff/providerdialog.h index fe7652f14..d951801bd 100644 --- a/tdenewstuff/providerdialog.h +++ b/tdenewstuff/providerdialog.h @@ -42,7 +42,7 @@ class Engine; */ class ProviderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** Constructor. diff --git a/tdenewstuff/security.cpp b/tdenewstuff/security.cpp index 3bca16166..6952f1ec6 100644 --- a/tdenewstuff/security.cpp +++ b/tdenewstuff/security.cpp @@ -50,15 +50,15 @@ void Security::readKeys() { if (m_gpgRunning) { - TQTimer::singleShot(5, this, TQT_SLOT(readKeys())); + TQTimer::singleShot(5, this, TQ_SLOT(readKeys())); return; } m_runMode = List; m_keys.clear(); KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; - connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); + connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *))); if (!readProcess->start(TDEProcess::NotifyOnExit, true)) KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>")); else @@ -69,14 +69,14 @@ void Security::readSecretKeys() { if (m_gpgRunning) { - TQTimer::singleShot(5, this, TQT_SLOT(readSecretKeys())); + TQTimer::singleShot(5, this, TQ_SLOT(readSecretKeys())); return; } m_runMode = ListSecret; KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys"; - connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); + connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *))); if (readProcess->start(TDEProcess::NotifyOnExit, true)) m_gpgRunning = true; } @@ -206,7 +206,7 @@ void Security::slotCheckValidity() { if (!m_keysRead || m_gpgRunning) { - TQTimer::singleShot(5, this, TQT_SLOT(slotCheckValidity())); + TQTimer::singleShot(5, this, TQ_SLOT(slotCheckValidity())); return; } if (m_keys.count() == 0) @@ -226,7 +226,7 @@ void Security::slotCheckValidity() if (file.open(IO_ReadOnly)) { context.reset(); - context.update(TQT_TQIODEVICE_OBJECT(file)); + context.update(file); md5sum = context.hexDigest(); file.close(); } @@ -248,8 +248,8 @@ void Security::slotCheckValidity() //verify the signature KProcIO *verifyProcess=new KProcIO(); *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName; - connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); + connect(verifyProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(verifyProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *))); if (verifyProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; else @@ -270,7 +270,7 @@ void Security::slotSignFile() { if (!m_keysRead || m_gpgRunning) { - TQTimer::singleShot(5, this, TQT_SLOT(slotSignFile())); + TQTimer::singleShot(5, this, TQ_SLOT(slotSignFile())); return; } @@ -298,7 +298,7 @@ void Security::slotSignFile() if (file.open(IO_ReadOnly)) { context.reset(); - context.update(TQT_TQIODEVICE_OBJECT(file)); + context.update(file); md5sum = context.hexDigest(); file.close(); } @@ -328,8 +328,8 @@ void Security::slotSignFile() //verify the signature KProcIO *signProcess=new KProcIO(); *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName; - connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); + connect(signProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(signProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *))); m_runMode = Sign; if (signProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; diff --git a/tdenewstuff/security.h b/tdenewstuff/security.h index 230821e7e..ac3f4f1a0 100644 --- a/tdenewstuff/security.h +++ b/tdenewstuff/security.h @@ -43,7 +43,7 @@ namespace KNS { class Security : public TQObject { -Q_OBJECT +TQ_OBJECT public: static Security* const ref() { diff --git a/tdenewstuff/testnewstuff.cpp b/tdenewstuff/testnewstuff.cpp index f9fc7269f..8232e1f1e 100644 --- a/tdenewstuff/testnewstuff.cpp +++ b/tdenewstuff/testnewstuff.cpp @@ -72,17 +72,17 @@ MyWidget::MyWidget() TQPushButton *downloadButton = new TQPushButton( "Download", this ); topLayout->addWidget( downloadButton ); - connect( downloadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( download() ) ); + connect( downloadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( download() ) ); TQPushButton *uploadButton = new TQPushButton( "Upload", this ); topLayout->addWidget( uploadButton ); - connect( uploadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( upload() ) ); + connect( uploadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( upload() ) ); topLayout->addSpacing( 5 ); TQPushButton *closeButton = new TQPushButton( "Close", this ); topLayout->addWidget( closeButton ); - connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) ); } MyWidget::~MyWidget() diff --git a/tdenewstuff/testnewstuff.h b/tdenewstuff/testnewstuff.h index acd9aece4..9d4f71274 100644 --- a/tdenewstuff/testnewstuff.h +++ b/tdenewstuff/testnewstuff.h @@ -42,7 +42,7 @@ class TestNewStuff : public TDENewStuff class MyWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MyWidget(); ~MyWidget(); diff --git a/tdenewstuff/uploaddialog.h b/tdenewstuff/uploaddialog.h index 3fc068e3a..906f2ea9f 100644 --- a/tdenewstuff/uploaddialog.h +++ b/tdenewstuff/uploaddialog.h @@ -46,7 +46,7 @@ class Entry; */ class UploadDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** Constructor. diff --git a/tdeparts/COMMENTS b/tdeparts/COMMENTS index cd65e2db9..d36d98eef 100644 --- a/tdeparts/COMMENTS +++ b/tdeparts/COMMENTS @@ -576,7 +576,7 @@ issue compared to what's above though. delegation. It works like this: We have KReadOnlyPart (short KROP) and KonqyViewerExtension (short KVE). KVE is just - a child of KROP that you can query with the QObject::child method. + a child of KROP that you can query with the TQObject::child method. Views which are konquy aware feature their own implementation of KVE and konquy is happy :-) If a KROP does not feature a KVE then Konqui installs a default KVE that just ignores diff --git a/tdeparts/browserextension.cpp b/tdeparts/browserextension.cpp index ec31eea3e..9b134819d 100644 --- a/tdeparts/browserextension.cpp +++ b/tdeparts/browserextension.cpp @@ -377,14 +377,14 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent, d->m_actionStatus.setBit( i, slotNames.contains( it.key()+"()" ) ); } - connect( m_part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( this, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( this, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( slotEnableAction( const char *, bool ) ) ); - connect( this, TQT_SIGNAL( setActionText( const char *, const TQString& ) ), - this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) ); + connect( m_part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( this, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( this, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( slotEnableAction( const char *, bool ) ) ); + connect( this, TQ_SIGNAL( setActionText( const char *, const TQString& ) ), + this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) ); } BrowserExtension::~BrowserExtension() @@ -496,7 +496,7 @@ void BrowserExtension::slotOpenURLRequest( const KURL &url, const KParts::URLArg req.m_delayedURL = url; req.m_delayedArgs = args; d->m_requests.append( req ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotEmitOpenURLRequestDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotEmitOpenURLRequestDelayed() ) ); } void BrowserExtension::slotEmitOpenURLRequestDelayed() @@ -576,19 +576,19 @@ void BrowserExtension::createActionSlotMap() assert(!s_actionSlotMap); s_actionSlotMap = actionSlotMapsd.setObject( s_actionSlotMap, new ActionSlotMap ); - s_actionSlotMap->insert( "cut", TQT_SLOT( cut() ) ); - s_actionSlotMap->insert( "copy", TQT_SLOT( copy() ) ); - s_actionSlotMap->insert( "paste", TQT_SLOT( paste() ) ); - s_actionSlotMap->insert( "rename", TQT_SLOT( rename() ) ); - s_actionSlotMap->insert( "trash", TQT_SLOT( trash() ) ); - s_actionSlotMap->insert( "del", TQT_SLOT( del() ) ); - s_actionSlotMap->insert( "properties", TQT_SLOT( properties() ) ); - s_actionSlotMap->insert( "editMimeType", TQT_SLOT( editMimeType() ) ); - s_actionSlotMap->insert( "print", TQT_SLOT( print() ) ); + s_actionSlotMap->insert( "cut", TQ_SLOT( cut() ) ); + s_actionSlotMap->insert( "copy", TQ_SLOT( copy() ) ); + s_actionSlotMap->insert( "paste", TQ_SLOT( paste() ) ); + s_actionSlotMap->insert( "rename", TQ_SLOT( rename() ) ); + s_actionSlotMap->insert( "trash", TQ_SLOT( trash() ) ); + s_actionSlotMap->insert( "del", TQ_SLOT( del() ) ); + s_actionSlotMap->insert( "properties", TQ_SLOT( properties() ) ); + s_actionSlotMap->insert( "editMimeType", TQ_SLOT( editMimeType() ) ); + s_actionSlotMap->insert( "print", TQ_SLOT( print() ) ); // Tricky. Those aren't actions in fact, but simply methods that a browserextension // can have or not. No need to return them here. - //s_actionSlotMap->insert( "reparseConfiguration", TQT_SLOT( reparseConfiguration() ) ); - //s_actionSlotMap->insert( "refreshMimeTypes", TQT_SLOT( refreshMimeTypes() ) ); + //s_actionSlotMap->insert( "reparseConfiguration", TQ_SLOT( reparseConfiguration() ) ); + //s_actionSlotMap->insert( "refreshMimeTypes", TQ_SLOT( refreshMimeTypes() ) ); // nothing for setSaveViewPropertiesLocally either // Create the action-number map diff --git a/tdeparts/browserextension.h b/tdeparts/browserextension.h index a84c3c837..6d1c4d144 100644 --- a/tdeparts/browserextension.h +++ b/tdeparts/browserextension.h @@ -257,7 +257,7 @@ class BrowserExtensionPrivate; * to implement the virtual methods [and the standard-actions slots, see below]. * * The way to associate the BrowserExtension with the part is to simply - * create the BrowserExtension as a child of the part (in QObject's terms). + * create the BrowserExtension as a child of the part (in TQObject's terms). * The hosting application will look for it automatically. * * Another aspect of the browser integration is that a set of standard @@ -307,7 +307,7 @@ class BrowserExtensionPrivate; */ class TDEPARTS_EXPORT BrowserExtension : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled ) public: /** @@ -435,7 +435,7 @@ public: typedef TQMap<TQCString,TQCString> ActionSlotMap; /** * Returns a map containing the action names as keys and corresponding - * TQT_SLOT()'ified method names as data entries. + * TQ_SLOT()'ified method names as data entries. * * This is very useful for * the host component, when connecting the own signals with the @@ -455,7 +455,7 @@ public: * Connecting to the slot can be done like this: * * \code - * connect( yourObject, TQT_SIGNAL( yourSignal() ), + * connect( yourObject, TQ_SIGNAL( yourSignal() ), * extension, mapIterator.data() ) * \endcode * @@ -723,7 +723,7 @@ private: */ class TDEPARTS_EXPORT BrowserHostExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: BrowserHostExtension( KParts::ReadOnlyPart *parent, const char *name = 0L ); @@ -791,12 +791,12 @@ private: */ class TDEPARTS_EXPORT LiveConnectExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Type { TypeVoid=0, TypeBool, TypeFunction, TypeNumber, TypeObject, TypeString }; - typedef TQValueList<QPair<Type, TQString> > ArgList; + typedef TQValueList<TQPair<Type, TQString> > ArgList; LiveConnectExtension( KParts::ReadOnlyPart *parent, const char *name = 0L ); diff --git a/tdeparts/browserinterface.cpp b/tdeparts/browserinterface.cpp index e02ae34cc..46c89e348 100644 --- a/tdeparts/browserinterface.cpp +++ b/tdeparts/browserinterface.cpp @@ -33,21 +33,21 @@ void BrowserInterface::callMethod( const char *name, const TQVariant &argument ) case TQVariant::Invalid: break; case TQVariant::String: - static_TQUType_TQString.set( o + 1, argument.toString() ); + static_QUType_TQString.set( o + 1, argument.toString() ); break; case TQVariant::StringList: strLst = argument.toStringList(); - static_TQUType_ptr.set( o + 1, &strLst ); + static_QUType_ptr.set( o + 1, &strLst ); break; case TQVariant::Int: - static_TQUType_int.set( o + 1, argument.toInt() ); + static_QUType_int.set( o + 1, argument.toInt() ); break; case TQVariant::UInt: i = argument.toUInt(); - static_TQUType_ptr.set( o + 1, &i ); + static_QUType_ptr.set( o + 1, &i ); break; case TQVariant::Bool: - static_TQUType_bool.set( o + 1, argument.toBool() ); + static_QUType_bool.set( o + 1, argument.toBool() ); break; default: return; } diff --git a/tdeparts/browserinterface.h b/tdeparts/browserinterface.h index 5934c2c9c..558781bf4 100644 --- a/tdeparts/browserinterface.h +++ b/tdeparts/browserinterface.h @@ -37,7 +37,7 @@ namespace KParts */ class TDEPARTS_EXPORT BrowserInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: BrowserInterface( TQObject *parent, const char *name = 0 ); virtual ~BrowserInterface(); diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp index c459e818e..95df76ece 100644 --- a/tdeparts/browserrun.cpp +++ b/tdeparts/browserrun.cpp @@ -146,10 +146,10 @@ void BrowserRun::scanFile() job->addMetaData( m_args.metaData() ); job->setWindow( m_window ); - connect( job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotBrowserScanFinished(TDEIO::Job *))); - connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), - this, TQT_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &))); + connect( job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotBrowserScanFinished(TDEIO::Job *))); + connect( job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), + this, TQ_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &))); m_job = job; } @@ -244,8 +244,8 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString& destURL.setPath( tempFile.name() ); TDEIO::Job *job = TDEIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ ); job->setWindow (m_window); - connect( job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) ); return Delayed; // We'll continue after the job has finished } } diff --git a/tdeparts/browserrun.h b/tdeparts/browserrun.h index 0b7e1f514..95fb8a08b 100644 --- a/tdeparts/browserrun.h +++ b/tdeparts/browserrun.h @@ -41,7 +41,7 @@ namespace KParts { */ class TDEPARTS_EXPORT BrowserRun : public KRun { - Q_OBJECT + TQ_OBJECT public: /** * @param url the URL we're probing diff --git a/tdeparts/componentfactory.h b/tdeparts/componentfactory.h index 728b34efa..c0b8068f9 100644 --- a/tdeparts/componentfactory.h +++ b/tdeparts/componentfactory.h @@ -66,7 +66,7 @@ namespace KParts T::staticMetaObject()->className(), args ); - T *result = tqt_dynamic_cast<T *>( object ); + T *result = dynamic_cast<T *>( object ); if ( !result ) delete object; return result; @@ -104,7 +104,7 @@ namespace KParts T::staticMetaObject()->className(), args ); - T *result = tqt_dynamic_cast<T *>( object ); + T *result = dynamic_cast<T *>( object ); if ( !result ) delete object; return result; @@ -178,7 +178,7 @@ namespace KParts *error = ErrNoFactory; return 0; } - KParts::Factory *partFactory = tqt_dynamic_cast<KParts::Factory *>( factory ); + KParts::Factory *partFactory = dynamic_cast<KParts::Factory *>( factory ); if ( !partFactory ) { library->unload(); diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp index 9c8d72112..e7ce785ac 100644 --- a/tdeparts/dockmainwindow.cpp +++ b/tdeparts/dockmainwindow.cpp @@ -62,7 +62,7 @@ DockMainWindow::DockMainWindow( TQWidget* parent, const char *name, WFlags f ) : KDockMainWindow( parent, name, f ) { d = new DockMainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } DockMainWindow::~DockMainWindow() @@ -89,15 +89,15 @@ void DockMainWindow::createGUI( Part * part ) factory->removeClient( d->m_activePart ); - disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); } if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); + loadPlugins( this, this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -105,10 +105,10 @@ void DockMainWindow::createGUI( Part * part ) if ( part ) { // do this before sending the activate event - connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); factory->addClient( part ); diff --git a/tdeparts/dockmainwindow.h b/tdeparts/dockmainwindow.h index 4974390de..64cd3bd35 100644 --- a/tdeparts/dockmainwindow.h +++ b/tdeparts/dockmainwindow.h @@ -46,7 +46,7 @@ class DockMainWindowPrivate; */ class TDEPARTS_EXPORT DockMainWindow : public KDockMainWindow, virtual public PartBase { - Q_OBJECT + TQ_OBJECT public: /** * Constructor, same signature as KDockMainWindow. diff --git a/tdeparts/factory.cpp b/tdeparts/factory.cpp index 485bd9a36..0b7d1c84c 100644 --- a/tdeparts/factory.cpp +++ b/tdeparts/factory.cpp @@ -63,7 +63,7 @@ const TDEInstance *Factory::partInstanceFromLibrary( const TQCString &libraryNam KLibFactory *factory = library->factory(); if ( !factory ) return 0; - KParts::Factory *pfactory = tqt_dynamic_cast<KParts::Factory *>( factory ); + KParts::Factory *pfactory = dynamic_cast<KParts::Factory *>( factory ); if ( !pfactory ) return 0; return pfactory->partInstance(); @@ -77,6 +77,6 @@ Part *Factory::createPartObject( TQWidget *, const char *, TQObject *, const cha TQObject *Factory::createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { assert( !parent || parent->isWidgetType() ); - return createPart( TQT_TQWIDGET( parent ), name, parent, name, classname, args ); + return createPart( static_cast<TQWidget*>( parent ), name, parent, name, classname, args ); } #include "factory.moc" diff --git a/tdeparts/factory.h b/tdeparts/factory.h index 28b8cc7ad..82312ca19 100644 --- a/tdeparts/factory.h +++ b/tdeparts/factory.h @@ -39,7 +39,7 @@ class Part; */ class TDEPARTS_EXPORT Factory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: Factory( TQObject *parent = 0, const char *name = 0 ); virtual ~Factory(); @@ -119,7 +119,7 @@ protected: /** * Reimplemented from KLibFactory. Calls createPart() */ - virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject *createObject( TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList() ); /** This 'enum' along with the structure below is NOT part of the public API. * It's going to disappear in KDE 4.0 and is likely to change inbetween. diff --git a/tdeparts/genericfactory.h b/tdeparts/genericfactory.h index 27e76a753..0ecc72e4e 100644 --- a/tdeparts/genericfactory.h +++ b/tdeparts/genericfactory.h @@ -111,7 +111,7 @@ namespace KParts if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) ) { - KParts::ReadWritePart *rwp = tqt_dynamic_cast<KParts::ReadWritePart *>( part ); + KParts::ReadWritePart *rwp = dynamic_cast<KParts::ReadWritePart *>( part ); if ( rwp ) rwp->setReadWrite( false ); } @@ -137,11 +137,11 @@ namespace KParts args ); // (this cast is guaranteed to work...) - KParts::Part *part = tqt_dynamic_cast<KParts::Part *>( object ); + KParts::Part *part = dynamic_cast<KParts::Part *>( object ); if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) ) { - KParts::ReadWritePart *rwp = tqt_dynamic_cast<KParts::ReadWritePart *>( part ); + KParts::ReadWritePart *rwp = dynamic_cast<KParts::ReadWritePart *>( part ); if ( rwp ) rwp->setReadWrite( false ); } diff --git a/tdeparts/historyprovider.cpp b/tdeparts/historyprovider.cpp index 9c893ae53..067895872 100644 --- a/tdeparts/historyprovider.cpp +++ b/tdeparts/historyprovider.cpp @@ -40,7 +40,7 @@ public: HistoryProvider * HistoryProvider::self() { if ( !s_self ) - s_self = new HistoryProvider( TQT_TQOBJECT(kapp), "history provider" ); + s_self = new HistoryProvider( kapp, "history provider" ); return s_self; } diff --git a/tdeparts/historyprovider.h b/tdeparts/historyprovider.h index 616668e99..d5f4f817d 100644 --- a/tdeparts/historyprovider.h +++ b/tdeparts/historyprovider.h @@ -40,7 +40,7 @@ namespace KParts { */ class TDEPARTS_EXPORT HistoryProvider : public TQObject { - Q_OBJECT + TQ_OBJECT public: static HistoryProvider * self(); diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp index b3245da9b..26adbd838 100644 --- a/tdeparts/mainwindow.cpp +++ b/tdeparts/mainwindow.cpp @@ -61,21 +61,21 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) : TDEMainWindow( parent, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::MainWindow( const char *name, WFlags f ) : TDEMainWindow( 0L, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::MainWindow( int cflags, TQWidget* parent, const char *name, WFlags f ) : TDEMainWindow( cflags, parent, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } MainWindow::~MainWindow() @@ -107,15 +107,15 @@ void MainWindow::createGUI( Part * part ) factory->removeClient( d->m_activePart ); - disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); } if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); + loadPlugins( this, this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -123,10 +123,10 @@ void MainWindow::createGUI( Part * part ) if ( part ) { // do this before sending the activate event - connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); factory->addClient( part ); diff --git a/tdeparts/mainwindow.h b/tdeparts/mainwindow.h index f39c9f7c0..1721ecc81 100644 --- a/tdeparts/mainwindow.h +++ b/tdeparts/mainwindow.h @@ -46,7 +46,7 @@ class MainWindowPrivate; */ class TDEPARTS_EXPORT MainWindow : public TDEMainWindow, virtual public PartBase { - Q_OBJECT + TQ_OBJECT public: /** * Constructor, same signature as TDEMainWindow. diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp index 075b13d77..b65106ea7 100644 --- a/tdeparts/part.cpp +++ b/tdeparts/part.cpp @@ -146,8 +146,8 @@ Part::~Part() if ( m_widget ) { // We need to disconnect first, to avoid calling it ! - disconnect( m_widget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( m_widget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); } if ( m_manager ) @@ -195,8 +195,8 @@ void Part::setWidget( TQWidget *widget ) { assert ( !m_widget ); // otherwise we get two connects m_widget = widget; - connect( m_widget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( m_widget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); // Tell the actionCollection() which widget its // action shortcuts should be connected to. @@ -367,7 +367,7 @@ bool ReadOnlyPart::openURL( const KURL &url ) d->m_job = TDEIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo ); d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 ); emit started( d->m_job ); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); return true; } } @@ -639,7 +639,7 @@ bool ReadWritePart::saveToURL() } d->m_uploadJob = TDEIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ ); d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 ); - connect( d->m_uploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( d->m_uploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -690,7 +690,7 @@ bool ReadWritePart::waitSaveComplete() d->m_waitForSave = true; TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); diff --git a/tdeparts/part.h b/tdeparts/part.h index 90c1804c5..1c91a8d5e 100644 --- a/tdeparts/part.h +++ b/tdeparts/part.h @@ -180,7 +180,7 @@ private: */ class TDEPARTS_EXPORT Part : public TQObject, public PartBase { - Q_OBJECT + TQ_OBJECT public: @@ -337,7 +337,7 @@ class ReadOnlyPartPrivate; */ class TDEPARTS_EXPORT ReadOnlyPart : public Part { - Q_OBJECT + TQ_OBJECT friend class ReadWritePart; public: /** @@ -543,7 +543,7 @@ private: */ class TDEPARTS_EXPORT ReadWritePart : public ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp index 777d6a77b..1ca3f9dab 100644 --- a/tdeparts/partmanager.cpp +++ b/tdeparts/partmanager.cpp @@ -45,7 +45,7 @@ public: m_selectedWidget = 0; m_bAllowNestedParts = false; m_bIgnoreScrollBars = false; - m_activationButtonMask = Qt::LeftButton | Qt::MidButton | Qt::RightButton; + m_activationButtonMask = TQt::LeftButton | TQt::MidButton | TQt::RightButton; m_reason = PartManager::NoReason; } ~PartManagerPrivate() @@ -55,16 +55,16 @@ public: switch( ev->type() ) { case TQEvent::MouseButtonPress: case TQEvent::MouseButtonDblClick: { - TQMouseEvent* mev = TQT_TQMOUSEEVENT( ev ); - m_reason = mev->button() == Qt::LeftButton + TQMouseEvent* mev = static_cast<TQMouseEvent*>( ev ); + m_reason = mev->button() == TQt::LeftButton ? PartManager::ReasonLeftClick - : ( mev->button() == Qt::MidButton + : ( mev->button() == TQt::MidButton ? PartManager::ReasonMidClick : PartManager::ReasonRightClick ); break; } case TQEvent::FocusIn: - m_reason = TQT_TQFOCUSEVENT( ev )->reason(); + m_reason = static_cast<TQFocusEvent*>( ev )->reason(); break; default: kdWarning(1000) << "PartManagerPrivate::setReason got unexpected ev type " << ev->type() << endl; @@ -119,8 +119,8 @@ PartManager::~PartManager() { for ( TQPtrListIterator<TQWidget> it( d->m_managedTopLevelWidgets ); it.current(); ++it ) - disconnect( it.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); + disconnect( it.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); for ( TQPtrListIterator<Part> it( d->m_parts ); it.current(); ++it ) { @@ -183,7 +183,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) if ( !obj->isWidgetType() ) return false; - TQWidget *w = TQT_TQWIDGET( obj ); + TQWidget *w = static_cast<TQWidget*>( obj ); if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) || w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) @@ -192,7 +192,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) TQMouseEvent* mev = 0L; if ( ev->type() == TQEvent::MouseButtonPress || ev->type() == TQEvent::MouseButtonDblClick ) { - mev = TQT_TQMOUSEEVENT( ev ); + mev = static_cast<TQMouseEvent*>( ev ); #ifdef DEBUG_PARTMANAGER kdDebug(1000) << "PartManager::eventFilter button: " << mev->button() << " " << "d->m_activationButtonMask=" << d->m_activationButtonMask << endl; #endif @@ -208,7 +208,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) ) return false; - if ( d->m_bIgnoreScrollBars && w->inherits( TQSCROLLBAR_OBJECT_NAME_STRING ) ) + if ( d->m_bIgnoreScrollBars && w->inherits( "TQScrollBar" ) ) return false; if ( mev ) // mouse press or mouse double-click event @@ -351,11 +351,11 @@ void PartManager::addPart( Part *part, bool setActive ) } // Prevent focus problems - if ( part->widget() && part->widget()->focusPolicy() == TQ_NoFocus ) + if ( part->widget() && part->widget()->focusPolicy() == TQWidget::NoFocus ) { kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of NoFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl; } - if ( part->widget() && part->widget()->focusPolicy() == TQ_TabFocus ) + if ( part->widget() && part->widget()->focusPolicy() == TQWidget::TabFocus ) { kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of TabFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl; } @@ -419,7 +419,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) //tree recursively (Simon) if ( part && !d->m_bAllowNestedParts ) { - TQObject *parentPart = TQT_TQOBJECT(part->parent()); // ### this relies on people using KParts::Factory! + TQObject *parentPart = part->parent(); // ### this relies on people using KParts::Factory! if ( parentPart && parentPart->inherits( "KParts::Part" ) ) { KParts::Part *parPart = static_cast<KParts::Part *>( parentPart ); @@ -455,8 +455,8 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( oldActivePart, &ev ); if ( oldActiveWidget ) { - disconnect( oldActiveWidget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( oldActiveWidget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); TQApplication::sendEvent( oldActiveWidget, &ev ); } @@ -473,8 +473,8 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( d->m_activePart, &ev ); if ( d->m_activeWidget ) { - connect( d->m_activeWidget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( d->m_activeWidget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); TQApplication::sendEvent( d->m_activeWidget, &ev ); } } @@ -568,8 +568,8 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel ) return; d->m_managedTopLevelWidgets.append( topLevel ); - connect( topLevel, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); + connect( topLevel, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); } void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel ) diff --git a/tdeparts/partmanager.h b/tdeparts/partmanager.h index 19e161d44..30a25e37a 100644 --- a/tdeparts/partmanager.h +++ b/tdeparts/partmanager.h @@ -48,7 +48,7 @@ class PartManagerPrivate; */ class TDEPARTS_EXPORT PartManager : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( SelectionPolicy ) TQ_PROPERTY( SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy ) TQ_PROPERTY( bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts ) @@ -130,7 +130,7 @@ public: /** * Specifies which mouse buttons the partmanager should react upon. * By default it reacts on all mouse buttons (LMB/MMB/RMB). - * @param buttonMask a combination of TQt::ButtonState values e.g. Qt::LeftButton | Qt::MidButton + * @param buttonMask a combination of TQt::ButtonState values e.g. TQt::LeftButton | TQt::MidButton */ void setActivationButtonMask( short int buttonMask ); /** diff --git a/tdeparts/plugin.h b/tdeparts/plugin.h index 6815e9f02..cdb55b00b 100644 --- a/tdeparts/plugin.h +++ b/tdeparts/plugin.h @@ -48,7 +48,7 @@ namespace KParts */ class TDEPARTS_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: /** * Struct holding information about a plugin diff --git a/tdeparts/statusbarextension.cpp b/tdeparts/statusbarextension.cpp index f8e15b061..353ec733c 100644 --- a/tdeparts/statusbarextension.cpp +++ b/tdeparts/statusbarextension.cpp @@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const { if ( !m_statusBar ) { TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget(); - TDEMainWindow* mw = tqt_dynamic_cast<TDEMainWindow *>( w->topLevelWidget() ); + TDEMainWindow* mw = dynamic_cast<TDEMainWindow *>( w->topLevelWidget() ); if ( mw ) m_statusBar = mw->statusBar(); } diff --git a/tdeparts/statusbarextension.h b/tdeparts/statusbarextension.h index da00286cf..49a165f4e 100644 --- a/tdeparts/statusbarextension.h +++ b/tdeparts/statusbarextension.h @@ -52,7 +52,7 @@ namespace KParts */ class TDEPARTS_EXPORT StatusBarExtension : public TQObject { - Q_OBJECT + TQ_OBJECT public: StatusBarExtension( KParts::ReadOnlyPart *parent, const char *name=0L ); diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp index fedf93ee6..e44e4c2e2 100644 --- a/tdeparts/tests/example.cpp +++ b/tdeparts/tests/example.cpp @@ -21,8 +21,8 @@ Shell::Shell() m_manager = new KParts::PartManager( this ); // When the manager says the active part changes, the builder updates (recreates) the GUI - connect( m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( createGUI( KParts::Part * ) ) ); + connect( m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( createGUI( KParts::Part * ) ) ); // We can do this "switch active part" because we have a splitter with // two items in it. @@ -34,13 +34,13 @@ Shell::Shell() TDEActionCollection *coll = actionCollection(); - (void)new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); - (void)new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); + (void)new TDEAction( "&View local file", 0, this, TQ_SLOT( slotFileOpen() ), coll, "open_local_file" ); + (void)new TDEAction( "&View remote file", 0, this, TQ_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); - m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); - m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); + m_paEditFile = new TDEAction( "&Edit file", 0, this, TQ_SLOT( slotFileEdit() ), coll, "edit_file" ); + m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQ_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); m_paCloseEditor->setEnabled(false); - TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQ_SLOT( close() ), coll, "shell_quit" ); paQuit->setIconSet(TQIconSet(BarIcon("system-log-out"))); (void)new TDEAction( "Yet another menu item", 0, coll, "shell_yami" ); diff --git a/tdeparts/tests/example.h b/tdeparts/tests/example.h index 76541437d..9264bfa25 100644 --- a/tdeparts/tests/example.h +++ b/tdeparts/tests/example.h @@ -10,7 +10,7 @@ class TQWidget; class Shell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: Shell(); virtual ~Shell(); diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp index 39af41a73..723343303 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -21,9 +21,9 @@ Shell::Shell() setXMLFile( "ghostviewtest_shell.rc" ); TDEAction * paOpen = new TDEAction( "&Open file" , "document-open", 0, this, - TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); + TQ_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); - TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQ_SLOT( close() ), actionCollection(), "file_quit" ); // Try to find a postscript component first TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)"); diff --git a/tdeparts/tests/ghostview.h b/tdeparts/tests/ghostview.h index 2974ded5e..983813f27 100644 --- a/tdeparts/tests/ghostview.h +++ b/tdeparts/tests/ghostview.h @@ -5,7 +5,7 @@ class Shell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: Shell(); virtual ~Shell(); diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp index 3fe7f1a7a..eae4e80af 100644 --- a/tdeparts/tests/normalktm.cpp +++ b/tdeparts/tests/normalktm.cpp @@ -29,21 +29,21 @@ Shell::Shell() TQPopupMenu * pFile = new TQPopupMenu( this ); menuBar()->insertItem( "File", pFile ); TQObject * coll = this; - TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); + TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQ_SLOT( slotFileOpen() ), coll, "open_local_file" ); // No XML : we need to plug our actions ourselves paLocal->plug( pFile ); - TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); + TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQ_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); paRemote->plug( pFile ); - m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); + m_paEditFile = new TDEAction( "&Edit file", 0, this, TQ_SLOT( slotFileEdit() ), coll, "edit_file" ); m_paEditFile->plug( pFile ); - m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); + m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQ_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); m_paCloseEditor->setEnabled(false); m_paCloseEditor->plug( pFile ); - TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQ_SLOT( close() ), coll, "shell_quit" ); paQuit->setIconSet(TQIconSet(BarIcon("system-log-out"))); paQuit->plug( pFile ); diff --git a/tdeparts/tests/normalktm.h b/tdeparts/tests/normalktm.h index f60d490a6..962a71cc7 100644 --- a/tdeparts/tests/normalktm.h +++ b/tdeparts/tests/normalktm.h @@ -10,7 +10,7 @@ class TQWidget; class Shell : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: Shell(); virtual ~Shell(); diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp index ad81b91b3..9ab7b7d69 100644 --- a/tdeparts/tests/notepad.cpp +++ b/tdeparts/tests/notepad.cpp @@ -26,7 +26,7 @@ NotepadPart::NotepadPart( TQWidget* parentWidget, const char*, m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" ); setWidget( m_edit ); - (void)new TDEAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); + (void)new TDEAction( "Search and replace", 0, this, TQ_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); setXMLFile( "notepadpart.rc" ); setReadWrite( true ); } @@ -39,9 +39,9 @@ void NotepadPart::setReadWrite( bool rw ) { m_edit->setReadOnly( !rw ); if (rw) - connect( m_edit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( setModified() ) ); + connect( m_edit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( setModified() ) ); else - disconnect( m_edit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( setModified() ) ); + disconnect( m_edit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( setModified() ) ); ReadWritePart::setReadWrite( rw ); } diff --git a/tdeparts/tests/notepad.h b/tdeparts/tests/notepad.h index bd502599b..25d452fac 100644 --- a/tdeparts/tests/notepad.h +++ b/tdeparts/tests/notepad.h @@ -15,7 +15,7 @@ class TQMultiLineEdit; */ class NotepadPart : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: NotepadPart( TQWidget*, const char* widgetName, TQObject* parent, const char* name, diff --git a/tdeparts/tests/parts.h b/tdeparts/tests/parts.h index 37af4911e..b2e8d2ee9 100644 --- a/tdeparts/tests/parts.h +++ b/tdeparts/tests/parts.h @@ -11,7 +11,7 @@ class GUIActivateEvent; class Part1 : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: Part1( TQObject *parent, TQWidget * parentWidget ); virtual ~Part1(); @@ -26,7 +26,7 @@ protected: class Part2 : public KParts::Part { - Q_OBJECT + TQ_OBJECT public: Part2( TQObject *parent, TQWidget * parentWidget ); virtual ~Part2(); diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp index ae7af326f..927bc9123 100644 --- a/tdeparts/tests/plugin_spellcheck.cpp +++ b/tdeparts/tests/plugin_spellcheck.cpp @@ -11,7 +11,7 @@ PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name, const TQStringList& ) : Plugin( parent, name ) { - (void) new TDEAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()), + (void) new TDEAction( "&Select current line (plugin)", 0, this, TQ_SLOT(slotSpellCheck()), actionCollection(), "tools-check-spelling" ); } diff --git a/tdeparts/tests/plugin_spellcheck.h b/tdeparts/tests/plugin_spellcheck.h index d27966c0c..3c7506c5c 100644 --- a/tdeparts/tests/plugin_spellcheck.h +++ b/tdeparts/tests/plugin_spellcheck.h @@ -5,7 +5,7 @@ class PluginSpellCheck : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: PluginSpellCheck( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index 0fd5e8116..0e03b04a2 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -48,15 +48,15 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) m_state = None; m_status = false; m_actionindex = 0; - connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); m_side = new SidePixmap(this); m_doit = new TQPushButton(i18n("&Export"), this); m_cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); - connect(m_doit, TQT_SIGNAL(clicked()), TQT_SLOT(slotActionClicked())); + connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); + connect(m_doit, TQ_SIGNAL(clicked()), TQ_SLOT(slotActionClicked())); m_bar = new TQProgressBar(this); m_text = new KActiveLabel(this); TQLabel *m_title = new TQLabel(i18n("Export Printer Driver to Windows Clients"), this); @@ -64,7 +64,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) TQFont f(m_title->font()); f.setBold(true); m_title->setFont(f); - KSeparator *m_sep = new KSeparator(Qt::Horizontal, this); + KSeparator *m_sep = new KSeparator(TQt::Horizontal, this); m_textinfo = new TQLabel( this ); m_logined = new TQLineEdit( this ); m_passwded = new TQLineEdit( this ); @@ -109,7 +109,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) l1->addWidget(m_sep); l1->addWidget(m_text); TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 ); - l1->addLayout( TQT_TQLAYOUT(l3) ); + l1->addLayout( l3 ); l3->addWidget( m_loginlab, 1, 0 ); l3->addWidget( m_passwdlab, 2, 0 ); l3->addWidget( m_serverlab, 0, 0 ); @@ -245,7 +245,7 @@ void CupsAddSmb::checkActionStatus() void CupsAddSmb::nextAction() { if (m_actionindex < (int)(m_actions.count())) - TQTimer::singleShot(1, this, TQT_SLOT(doNextAction())); + TQTimer::singleShot(1, this, TQ_SLOT(doNextAction())); } void CupsAddSmb::doNextAction() diff --git a/tdeprint/cups/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h index 9aeccdd4a..5fa8a3f71 100644 --- a/tdeprint/cups/cupsaddsmb2.h +++ b/tdeprint/cups/cupsaddsmb2.h @@ -34,7 +34,7 @@ class TQLineEdit; class CupsAddSmb : public KDialog { - Q_OBJECT + TQ_OBJECT public: enum State { None, Start, MkDir, Copy, AddDriver, AddPrinter }; diff --git a/tdeprint/cups/cupsdconf2/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp index 83b4d0813..d3a137527 100644 --- a/tdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp @@ -41,8 +41,8 @@ AddressDialog::AddressDialog(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(w, 2, 2, 0, 5); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); m1->addWidget(type_, 0, 1); m1->addWidget(address_, 1, 1); diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp index 3268c72bc..e73dac19d 100644 --- a/tdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp @@ -49,14 +49,14 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) TQLabel *l3 = new TQLabel(i18n("To:"), dummy); TQGridLayout *m1 = new TQGridLayout(dummy, 3, 2, 0, 5); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); m1->addWidget(type_, 0, 1); m1->addWidget(from_, 1, 1); m1->addWidget(to_, 2, 1); - connect(type_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); + connect(type_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); slotTypeChanged(type_->currentItem()); setCaption(i18n("Browse Address")); diff --git a/tdeprint/cups/cupsdconf2/browsedialog.h b/tdeprint/cups/cupsdconf2/browsedialog.h index 8db12bc34..cc4a12907 100644 --- a/tdeprint/cups/cupsdconf2/browsedialog.h +++ b/tdeprint/cups/cupsdconf2/browsedialog.h @@ -28,7 +28,7 @@ struct CupsdConf; class BrowseDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: BrowseDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cups-util.c b/tdeprint/cups/cupsdconf2/cups-util.c index e3039ea94..907459c65 100644 --- a/tdeprint/cups/cupsdconf2/cups-util.c +++ b/tdeprint/cups/cupsdconf2/cups-util.c @@ -513,13 +513,23 @@ cups_local_auth(http_t *http) /* I - Connection */ * See if we are accessing localhost... the struct has changed in newer versions - PiggZ (adam@piggz.co.uk) */ -#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) - if (!httpAddrLocalhost(http)) +#if (CUPS_VERSION_MAJOR >= 2) + if (!httpAddrLocalhost(httpGetAddress(http))) + { + return (0); + } +#elif CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) + if (!httpAddrLocalhost(http)) + { + return (0); + } #else if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 && - strcasecmp(http->hostname, "localhost") != 0) + strcasecmp(http->hostname, "localhost") != 0) + { + return (0); + } #endif - return (0); /* * Try opening a certificate file for this PID. If that fails, diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index e66048b73..91ef705bf 100644 --- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -79,12 +79,12 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) m2->addWidget(cups_); m2->addWidget(slp_); m2->addStretch(1); - m1->addWidget(l1, 1, 0, Qt::AlignRight); - m1->addWidget(l2, 2, 0, Qt::AlignRight); - m1->addWidget(l3, 3, 0, Qt::AlignRight); - m1->addWidget(l4, 4, 0, Qt::AlignRight|Qt::AlignTop); - m1->addWidget(l5, 5, 0, Qt::AlignRight); - m1->addWidget(l6, 6, 0, Qt::AlignRight|Qt::AlignTop); + m1->addWidget(l1, 1, 0, TQt::AlignRight); + m1->addWidget(l2, 2, 0, TQt::AlignRight); + m1->addWidget(l3, 3, 0, TQt::AlignRight); + m1->addWidget(l4, 4, 0, TQt::AlignRight|TQt::AlignTop); + m1->addWidget(l5, 5, 0, TQt::AlignRight); + m1->addWidget(l6, 6, 0, TQt::AlignRight|TQt::AlignTop); m1->addWidget(browseport_, 1, 1); m1->addWidget(browseinterval_, 2, 1); m1->addWidget(browsetimeout_, 3, 1); @@ -97,29 +97,29 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) m3->addWidget(hideimplicitmembers_, 1, 0); m3->addWidget(useshortnames_, 1, 1); - connect(browsing_, TQT_SIGNAL(toggled(bool)), cups_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), slp_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseport_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseinterval_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browsetimeout_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseaddresses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseorder_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useimplicitclasses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useanyclasses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), hideimplicitmembers_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useshortnames_, TQT_SLOT(setEnabled(bool))); - - connect(browsing_, TQT_SIGNAL(toggled(bool)), l1, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l2, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l3, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l4, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l5, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l6, TQT_SLOT(setEnabled(bool))); - - connect(browseaddresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(browseaddresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(browseaddresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(browseinterval_, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), cups_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), slp_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseport_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseinterval_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browsetimeout_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseaddresses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseorder_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useimplicitclasses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useanyclasses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), hideimplicitmembers_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useshortnames_, TQ_SLOT(setEnabled(bool))); + + connect(browsing_, TQ_SIGNAL(toggled(bool)), l1, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l2, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l3, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l4, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l5, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l6, TQ_SLOT(setEnabled(bool))); + + connect(browseaddresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(browseaddresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(browseaddresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(browseinterval_, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(intervalChanged(int))); browsing_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h index bdbff1844..53bc266d7 100644 --- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h +++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h @@ -29,7 +29,7 @@ class TQComboBox; class CupsdBrowsingPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdBrowsingPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.h b/tdeprint/cups/cupsdconf2/cupsddialog.h index 85eee172e..683e998d7 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.h +++ b/tdeprint/cups/cupsdconf2/cupsddialog.h @@ -28,7 +28,7 @@ struct CupsdConf; class CupsdDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CupsdDialog(TQWidget *parent = 0, const char *name = 0); ~CupsdDialog(); @@ -52,7 +52,7 @@ protected: private: TQPtrList<CupsdPage> pagelist_; CupsdConf *conf_; - QString filename_; + TQString filename_; }; #endif diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp index 282657255..82848d03e 100644 --- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp @@ -54,13 +54,13 @@ CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight|Qt::AlignTop); - m1->addWidget(l4, 3, 0, Qt::AlignRight); - m1->addWidget(l5, 4, 0, Qt::AlignRight); - m1->addWidget(l6, 5, 0, Qt::AlignRight); - m1->addWidget(l7, 6, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight|TQt::AlignTop); + m1->addWidget(l4, 3, 0, TQt::AlignRight); + m1->addWidget(l5, 4, 0, TQt::AlignRight); + m1->addWidget(l6, 5, 0, TQt::AlignRight); + m1->addWidget(l7, 6, 0, TQt::AlignRight); m1->addWidget(datadir_, 0, 1); m1->addWidget(documentdir_, 1, 1); m1->addWidget(fontpath_, 2, 1); diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp index e9cb1a0ad..8de8f429a 100644 --- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp @@ -54,10 +54,10 @@ CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7); m1->setRowStretch(4, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 3, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 3, 0, TQt::AlignRight); m1->addWidget(user_, 0, 1); m1->addWidget(group_, 1, 1); m1->addWidget(ripcache_, 2, 1); diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp index 4fe84d769..1ac0c739b 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -62,14 +62,14 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name) m1->addWidget(keepjobhistory_, 0, 1); m1->addWidget(keepjobfiles_, 1, 1); m1->addWidget(autopurgejobs_, 2, 1); - m1->addWidget(l1, 3, 0, Qt::AlignRight); - m1->addWidget(l2, 4, 0, Qt::AlignRight); - m1->addWidget(l3, 5, 0, Qt::AlignRight); + m1->addWidget(l1, 3, 0, TQt::AlignRight); + m1->addWidget(l2, 4, 0, TQt::AlignRight); + m1->addWidget(l3, 5, 0, TQt::AlignRight); m1->addWidget(maxjobs_, 3, 1); m1->addWidget(maxjobsperprinter_, 4, 1); m1->addWidget(maxjobsperuser_, 5, 1); - connect(keepjobhistory_, TQT_SIGNAL(toggled(bool)), TQT_SLOT(historyChanged(bool))); + connect(keepjobhistory_, TQ_SIGNAL(toggled(bool)), TQ_SLOT(historyChanged(bool))); keepjobhistory_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.h b/tdeprint/cups/cupsdconf2/cupsdjobspage.h index abbbd140d..8f6668aa3 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.h +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.h @@ -27,7 +27,7 @@ class TQCheckBox; class CupsdJobsPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdJobsPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp index 22128b39c..2052ece24 100644 --- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -66,11 +66,11 @@ CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); m1->setRowStretch(5, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 3, 0, Qt::AlignRight); - m1->addWidget(l5, 4, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 3, 0, TQt::AlignRight); + m1->addWidget(l5, 4, 0, TQt::AlignRight); m1->addWidget(accesslog_, 0, 1); m1->addWidget(errorlog_, 1, 1); m1->addWidget(pagelog_, 2, 1); diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index e939c151f..f040f430c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -74,12 +74,12 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 2, 0, Qt::AlignRight); - m1->addWidget(l3, 3, 0, Qt::AlignRight); - m1->addWidget(l4, 4, 0, Qt::AlignRight); - m1->addWidget(l5, 5, 0, Qt::AlignRight); - m1->addWidget(l6, 6, 0, Qt::AlignTop|Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 2, 0, TQt::AlignRight); + m1->addWidget(l3, 3, 0, TQt::AlignRight); + m1->addWidget(l4, 4, 0, TQt::AlignRight); + m1->addWidget(l5, 5, 0, TQt::AlignRight); + m1->addWidget(l6, 6, 0, TQt::AlignTop|TQt::AlignRight); m1->addWidget(keepalive_, 1, 1); m1->addWidget(hostnamelookup_, 0, 1); m1->addWidget(keepalivetimeout_, 2, 1); @@ -88,10 +88,10 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name) m1->addWidget(clienttimeout_, 5, 1); m1->addWidget(listen_, 6, 1); - connect(listen_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(listen_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(listen_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(keepalive_, TQT_SIGNAL(toggled(bool)), keepalivetimeout_, TQT_SLOT(setEnabled(bool))); + connect(listen_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(listen_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(listen_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(keepalive_, TQ_SIGNAL(toggled(bool)), keepalivetimeout_, TQ_SLOT(setEnabled(bool))); keepalive_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h index be46c280f..912d4bb4a 100644 --- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h +++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h @@ -30,7 +30,7 @@ class SizeWidget; class CupsdNetworkPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdNetworkPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdpage.h b/tdeprint/cups/cupsdconf2/cupsdpage.h index aadbd54b9..9d8008d1f 100644 --- a/tdeprint/cups/cupsdconf2/cupsdpage.h +++ b/tdeprint/cups/cupsdconf2/cupsdpage.h @@ -26,7 +26,7 @@ struct CupsdConf; class CupsdPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CupsdPage(TQWidget *parent = 0, const char *name = 0); virtual ~CupsdPage(); @@ -46,9 +46,9 @@ protected: protected: CupsdConf *conf_; - QString label_; - QString header_; - QString pixmap_; + TQString label_; + TQString header_; + TQString pixmap_; }; #endif diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 6d6061264..1a5fa9e53 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -55,21 +55,21 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); m1->setRowStretch(5, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 3, 0, Qt::AlignRight); - m1->addWidget(l5, 4, 0, Qt::AlignRight|Qt::AlignTop); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 3, 0, TQt::AlignRight); + m1->addWidget(l5, 4, 0, TQt::AlignRight|TQt::AlignTop); m1->addWidget(remoteroot_, 0, 1); m1->addWidget(systemgroup_, 1, 1); m1->addWidget(encryptcert_, 2, 1); m1->addWidget(encryptkey_, 3, 1); m1->addWidget(locations_, 4, 1); - connect(locations_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(locations_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(locations_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(locations_, TQT_SIGNAL(deleted(int)), TQT_SLOT(slotDeleted(int))); + connect(locations_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(locations_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(locations_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(locations_, TQ_SIGNAL(deleted(int)), TQ_SLOT(slotDeleted(int))); } bool CupsdSecurityPage::loadConfig(CupsdConf *conf, TQString&) diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h index 5e97c1cf8..ebe86b6ad 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h @@ -30,7 +30,7 @@ struct CupsLocation; class CupsdSecurityPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdSecurityPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp index e89356af9..ac38bb19c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -88,7 +88,7 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name) TQLabel *l6 = new TQLabel(i18n("Printcap file:"), this); TQLabel *l7 = new TQLabel(i18n("Printcap format:"), this); - connect(classification_, TQT_SIGNAL(activated(int)), TQT_SLOT(classChanged(int))); + connect(classification_, TQ_SIGNAL(activated(int)), TQ_SLOT(classChanged(int))); classification_->setCurrentItem(0); charset_->setCurrentItem(0); printcapformat_->setCurrentItem(0); @@ -97,13 +97,13 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7); m1->setRowStretch(8, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 4, 0, Qt::AlignRight); - m1->addWidget(l5, 5, 0, Qt::AlignRight); - m1->addWidget(l6, 6, 0, Qt::AlignRight); - m1->addWidget(l7, 7, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 4, 0, TQt::AlignRight); + m1->addWidget(l5, 5, 0, TQt::AlignRight); + m1->addWidget(l6, 6, 0, TQt::AlignRight); + m1->addWidget(l7, 7, 0, TQt::AlignRight); m1->addWidget(servername_, 0, 1); m1->addWidget(serveradmin_, 1, 1); m1->addWidget(charset_, 4, 1); diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.h b/tdeprint/cups/cupsdconf2/cupsdserverpage.h index f1f9eed2f..13bac0f6e 100644 --- a/tdeprint/cups/cupsdconf2/cupsdserverpage.h +++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.h @@ -28,7 +28,7 @@ class TQComboBox; class CupsdServerPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdServerPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp index c28329e67..52db651d3 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -39,11 +39,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) TQLabel *cupslogo_ = new TQLabel(this); TQString logopath = locate("data", TQString("tdeprint/cups_logo.png")); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - cupslogo_->setAlignment(Qt::AlignCenter); + cupslogo_->setAlignment(TQt::AlignCenter); TQLabel *kupslogo_ = new TQLabel(this); logopath = locate("data", TQString("tdeprint/kde_logo.png")); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - kupslogo_->setAlignment(Qt::AlignCenter); + kupslogo_->setAlignment(TQt::AlignCenter); TQLabel *helptxt_ = new TQLabel(this); helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. " diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp index 2e0d523f0..fd7f6b6c6 100644 --- a/tdeprint/cups/cupsdconf2/editlist.cpp +++ b/tdeprint/cups/cupsdconf2/editlist.cpp @@ -43,11 +43,11 @@ EditList::EditList(TQWidget *parent, const char *name) m1->addWidget(delbtn_, 2, 1); m1->addWidget(defbtn_, 3, 1); - connect(addbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(add())); - connect(editbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); - connect(delbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); - connect(defbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(defaultList())); - connect(list_, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSelected(int))); + connect(addbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(add())); + connect(editbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit())); + connect(delbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete())); + connect(defbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(defaultList())); + connect(list_, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSelected(int))); slotSelected(-1); } diff --git a/tdeprint/cups/cupsdconf2/editlist.h b/tdeprint/cups/cupsdconf2/editlist.h index 19a2da8c8..45783b0e3 100644 --- a/tdeprint/cups/cupsdconf2/editlist.h +++ b/tdeprint/cups/cupsdconf2/editlist.h @@ -28,7 +28,7 @@ class TQPushButton; class EditList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: EditList(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp index 0754ae573..a203f4e5e 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp @@ -66,8 +66,8 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) order_->insertItem(i18n("Allow, Deny")); order_->insertItem(i18n("Deny, Allow")); - connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int))); - connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); + connect(authclass_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotClassChanged(int))); + connect(authtype_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); TQLabel *l1 = new TQLabel(i18n("Resource:"), dummy); TQLabel *l2 = new TQLabel(i18n("Authentication:"), dummy); @@ -80,14 +80,14 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(dummy, 8, 2, 0, 5); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 3, 0, Qt::AlignRight); - m1->addWidget(l5, 4, 0, Qt::AlignRight); - m1->addWidget(l6, 5, 0, Qt::AlignRight); - m1->addWidget(l7, 6, 0, Qt::AlignRight); - m1->addWidget(l8, 7, 0, Qt::AlignRight|Qt::AlignTop); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 3, 0, TQt::AlignRight); + m1->addWidget(l5, 4, 0, TQt::AlignRight); + m1->addWidget(l6, 5, 0, TQt::AlignRight); + m1->addWidget(l7, 6, 0, TQt::AlignRight); + m1->addWidget(l8, 7, 0, TQt::AlignRight|TQt::AlignTop); m1->addWidget(resource_, 0, 1); m1->addWidget(authtype_, 1, 1); m1->addWidget(authclass_, 2, 1); @@ -104,9 +104,9 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) slotClassChanged(AUTHCLASS_ANONYMOUS); encryption_->setCurrentItem(ENCRYPT_IFREQUESTED); - connect(addresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(addresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(addresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); + connect(addresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(addresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(addresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); } void LocationDialog::setInfos(CupsdConf *conf) diff --git a/tdeprint/cups/cupsdconf2/locationdialog.h b/tdeprint/cups/cupsdconf2/locationdialog.h index f0c182f42..2afd3600b 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.h +++ b/tdeprint/cups/cupsdconf2/locationdialog.h @@ -30,7 +30,7 @@ struct CupsLocation; class LocationDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: LocationDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp index f758d5d1e..a1fc7dd00 100644 --- a/tdeprint/cups/cupsdconf2/portdialog.cpp +++ b/tdeprint/cups/cupsdconf2/portdialog.cpp @@ -45,9 +45,9 @@ PortDialog::PortDialog(TQWidget *parent, const char *name) TQVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10); TQGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5); - m1->addLayout(TQT_TQLAYOUT(m2)); - m2->addWidget(l1, 0, 0, Qt::AlignRight); - m2->addWidget(l2, 1, 0, Qt::AlignRight); + m1->addLayout(m2); + m2->addWidget(l1, 0, 0, TQt::AlignRight); + m2->addWidget(l2, 1, 0, TQt::AlignRight); m2->addMultiCellWidget(usessl_, 2, 2, 0, 1); m2->addWidget(address_, 0, 1); m2->addWidget(port_, 1, 1); diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp index c3a6d50d2..e82a6fba6 100644 --- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -31,7 +31,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name) edit_ = new TQLineEdit(this); button_ = new KPushButton(this); button_->setPixmap(SmallIcon("document-open")); - connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked())); + connect(button_,TQ_SIGNAL(clicked()),TQ_SLOT(buttonClicked())); TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); main_->addWidget(edit_); diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.h b/tdeprint/cups/cupsdconf2/qdirlineedit.h index d852897c3..f682d6fbe 100644 --- a/tdeprint/cups/cupsdconf2/qdirlineedit.h +++ b/tdeprint/cups/cupsdconf2/qdirlineedit.h @@ -28,7 +28,7 @@ class TQPushButton; class QDirLineEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: QDirLineEdit(bool file, TQWidget *parent = 0, const char *name = 0); ~QDirLineEdit(); diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index e6cade32e..cc1392577 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -34,14 +34,14 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) m_view->header()->hide(); m_view->addColumn(""); m_view->setFullWidth(true); - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*))); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelected(TQListViewItem*))); m_add = new TQPushButton(this); m_add->setPixmap(SmallIcon("folder-new")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked())); m_remove = new TQPushButton(this); m_remove->setPixmap(SmallIcon("edit-delete")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked())); m_remove->setEnabled(false); m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2)); diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h index a55f3355e..47b9530d3 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h @@ -28,7 +28,7 @@ class TQPushButton; class QDirMultiLineEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: QDirMultiLineEdit(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdoprint.c b/tdeprint/cups/cupsdoprint.c index 999b5f493..3741d7509 100644 --- a/tdeprint/cups/cupsdoprint.c +++ b/tdeprint/cups/cupsdoprint.c @@ -146,7 +146,7 @@ int main(int argc, char* argv[]) char *a; cups_option_t *options = NULL; int num_options = 0; - char* files[100] = {0}; + const char* files[100] = {0}; int num_files = 0; int jobID = 0; diff --git a/tdeprint/cups/image.cpp b/tdeprint/cups/image.cpp index ce56bb4b9..d26b01400 100644 --- a/tdeprint/cups/image.cpp +++ b/tdeprint/cups/image.cpp @@ -249,10 +249,10 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne { float mat[3][3] = {{1.0,0.0,0.0},{0.0,1.0,0.0},{0.0,0.0,1.0}}; int lut[3][3][256]; - QRgb c; + TQRgb c; int r,g,b,v,r2,g2,b2; float gam = 1.0/(float(gamma)/1000.0); - QImage img(image); + TQImage img(image); saturate(mat,saturation*0.01); huerotate(mat,(float)hue); diff --git a/tdeprint/cups/imageposition.cpp b/tdeprint/cups/imageposition.cpp index 8ff617665..436af9ac4 100644 --- a/tdeprint/cups/imageposition.cpp +++ b/tdeprint/cups/imageposition.cpp @@ -25,16 +25,16 @@ static void draw3DPage(TQPainter *p, TQRect r) { // draw white page - p->fillRect(r,Qt::white); + p->fillRect(r,TQt::white); // draw 3D border - p->setPen(Qt::black); + p->setPen(TQt::black); p->moveTo(r.left(),r.bottom()); p->lineTo(r.right(),r.bottom()); p->lineTo(r.right(),r.top()); - p->setPen(Qt::darkGray); + p->setPen(TQt::darkGray); p->lineTo(r.left(),r.top()); p->lineTo(r.left(),r.bottom()); - p->setPen(Qt::gray); + p->setPen(TQt::gray); p->moveTo(r.left()+1,r.bottom()-1); p->lineTo(r.right()-1,r.bottom()-1); p->lineTo(r.right()-1,r.top()+1); diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp index e2401d6d3..549010f44 100644 --- a/tdeprint/cups/imagepreview.cpp +++ b/tdeprint/cups/imagepreview.cpp @@ -55,7 +55,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga } void ImagePreview::paintEvent(TQPaintEvent*){ - QImage tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_); + TQImage tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_); int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2; TQPixmap buffer(width(), height()); diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp index 63f0207dd..e16b38dd5 100644 --- a/tdeprint/cups/ippreportdlg.cpp +++ b/tdeprint/cups/ippreportdlg.cpp @@ -62,7 +62,7 @@ void IppReportDlg::slotUser1() rich.draw(&painter, margin, margin, r, colorGroup()); TQString s = caption() + ": " + TQString::number(page); TQRect br = painter.fontMetrics().boundingRect(s); - painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s); + painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, TQt::AlignRight|TQt::AlignTop, s); r.moveBy(0, r.height()-10); painter.translate(0, -(r.height()-10)); if (r.top() < hh) diff --git a/tdeprint/cups/ippreportdlg.h b/tdeprint/cups/ippreportdlg.h index e61ccd7b7..9d622562e 100644 --- a/tdeprint/cups/ippreportdlg.h +++ b/tdeprint/cups/ippreportdlg.h @@ -27,7 +27,7 @@ class KTextEdit; class IppReportDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: IppReportDlg(TQWidget *parent = 0, const char *name = 0); static void report(IppRequest *req, int group, const TQString& caption = TQString::null); diff --git a/tdeprint/cups/ipprequest.h b/tdeprint/cups/ipprequest.h index 84a7c5b18..8577c9b93 100644 --- a/tdeprint/cups/ipprequest.h +++ b/tdeprint/cups/ipprequest.h @@ -102,7 +102,7 @@ protected: private: ipp_t *request_; - QString host_; + TQString host_; int port_; bool connect_; int dump_; diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index 10a455226..7dd7e5abc 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -35,7 +35,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) setPageHeader(i18n("CUPS Folder Settings")); setPagePixmap("folder"); - TQGroupBox *m_dirbox = new TQGroupBox(0, Qt::Vertical, i18n("Installation Folder"), this); + TQGroupBox *m_dirbox = new TQGroupBox(0, TQt::Vertical, i18n("Installation Folder"), this); m_installdir = new KURLRequester(m_dirbox); m_installdir->setMode((KFile::Mode)(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly)); m_stddir = new TQCheckBox(i18n("Standard installation (/)"), m_dirbox); @@ -44,18 +44,18 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lay0->addWidget(m_dirbox); lay0->addStretch(1); - TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_dirbox->layout()), 10); + TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10); lay1->addWidget(m_stddir); lay1->addWidget(m_installdir); - connect(m_stddir,TQT_SIGNAL(toggled(bool)),m_installdir,TQT_SLOT(setDisabled(bool))); + connect(m_stddir,TQ_SIGNAL(toggled(bool)),m_installdir,TQ_SLOT(setDisabled(bool))); m_stddir->setChecked(true); } void KMConfigCupsDir::loadConfig(TDEConfig *conf) { conf->setGroup("CUPS"); - QString dir = conf->readPathEntry("InstallDir"); + TQString dir = conf->readPathEntry("InstallDir"); m_stddir->setChecked(dir.isEmpty()); m_installdir->setURL(dir); } diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index f93c1a4b3..9f05f3b16 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -41,7 +41,7 @@ public: }; PortValidator::PortValidator(TQWidget *parent, const char *name) -: TQIntValidator(1, 65535, TQT_TQOBJECT(parent), name) +: TQIntValidator(1, 65535, parent, name) { } @@ -62,8 +62,8 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) : TQWidget(parent,name) { // widget creation - TQGroupBox *m_hostbox = new TQGroupBox(0, Qt::Vertical, i18n("Server Information"), this); - TQGroupBox *m_loginbox = new TQGroupBox(0, Qt::Vertical, i18n("Account Information"), this); + TQGroupBox *m_hostbox = new TQGroupBox(0, TQt::Vertical, i18n("Server Information"), this); + TQGroupBox *m_loginbox = new TQGroupBox(0, TQt::Vertical, i18n("Account Information"), this); TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), m_hostbox); TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), m_hostbox); m_host = new TQLineEdit(m_hostbox); @@ -103,9 +103,9 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) lay3->addMultiCellWidget(m_anonymous,3,3,0,1); // connections - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setDisabled(bool))); - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setDisabled(bool))); - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_savepwd,TQT_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_savepwd,TQ_SLOT(setDisabled(bool))); } void KMCupsConfigWidget::load() diff --git a/tdeprint/cups/kmcupsjobmanager.h b/tdeprint/cups/kmcupsjobmanager.h index 0635dd8ea..00b218c20 100644 --- a/tdeprint/cups/kmcupsjobmanager.h +++ b/tdeprint/cups/kmcupsjobmanager.h @@ -28,7 +28,7 @@ class KMPrinter; class KMCupsJobManager : public KMJobManager { - Q_OBJECT + TQ_OBJECT public: KMCupsJobManager(TQObject *parent, const char *name, const TQStringList &/*args*/); diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index ee1c62728..3e5876451 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -292,8 +292,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) // Give 2 seconds to connect to the printer, or abort KExtendedSocket *kes = new KExtendedSocket(p->uri().host(), p->uri().port()); - connect(kes, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(hostPingSlot())); - connect(kes, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(hostPingFailedSlot())); + connect(kes, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(hostPingSlot())); + connect(kes, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(hostPingFailedSlot())); if (kes->startAsyncConnect() != 0) { delete kes; m_hostSuccess = false; @@ -938,9 +938,9 @@ TQStringList KMCupsManager::detectLocalPrinters() void KMCupsManager::createPluginActions(TDEActionCollection *coll) { - TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); + TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQ_SLOT(exportDriver()), coll, "plugin_export_driver"); act->setGroup("plugin"); - act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); + act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQ_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); act->setGroup("plugin"); } @@ -1020,12 +1020,12 @@ void KMCupsManager::checkUpdatePossibleInternal() delete m_socket; m_socket = new KNetwork::TDEBufferedSocket; m_socket->setTimeout( 1500 ); - connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), - TQT_SLOT( slotConnectionSuccess() ) ); - connect( m_socket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( m_socket, TQ_SIGNAL( connected(const KResolverEntry&) ), + TQ_SLOT( slotConnectionSuccess() ) ); + connect( m_socket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); trials = 5; - TQTimer::singleShot( 1, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( slotAsyncConnect() ) ); } void KMCupsManager::slotConnectionSuccess() @@ -1044,7 +1044,7 @@ void KMCupsManager::slotConnectionSuccess() if ( trials > 0 ) { trials--; - TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) ); } else { @@ -1074,7 +1074,7 @@ void KMCupsManager::slotConnectionFailed( int errcode ) //m_socket->cancelAsyncConnect(); trials--; m_socket->close(); - TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) ); return; } diff --git a/tdeprint/cups/kmcupsmanager.h b/tdeprint/cups/kmcupsmanager.h index 1e7c21b19..cc4a74a85 100644 --- a/tdeprint/cups/kmcupsmanager.h +++ b/tdeprint/cups/kmcupsmanager.h @@ -35,7 +35,7 @@ class KMCupsManager : public KMManager friend class KMWIppPrinter; friend class KMCupsJobManager; - Q_OBJECT + TQ_OBJECT public: KMCupsManager(TQObject *parent, const char *name, const TQStringList & /*args*/); virtual ~KMCupsManager(); diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp index 03b85bb0a..8438a7c1b 100644 --- a/tdeprint/cups/kmcupsuimanager.cpp +++ b/tdeprint/cups/kmcupsuimanager.cpp @@ -134,7 +134,7 @@ void KMCupsUiManager::setupWizard(KMWizard *wizard) backend->addBackend(KMWizard::Class,i18n("Cl&ass of printers"),false,whatsThisClassOfPrinters); IppRequest req; - QString uri; + TQString uri; req.setOperation(CUPS_GET_DEVICES); uri = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); @@ -234,7 +234,7 @@ void KMCupsUiManager::setupPrintDialogPages(TQPtrList<KPrintDialogPage>* pages) void KMCupsUiManager::setupJobViewer(TQListView *lv) { lv->addColumn(i18n("Priority")); - lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter); + lv->setColumnAlignment(lv->columns()-1, TQt::AlignRight|TQt::AlignVCenter); lv->addColumn(i18n("Billing Information")); - lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter); + lv->setColumnAlignment(lv->columns()-1, TQt::AlignRight|TQt::AlignVCenter); } diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp index a8ec8d425..e2b4423d0 100644 --- a/tdeprint/cups/kmwipp.cpp +++ b/tdeprint/cups/kmwipp.cpp @@ -34,7 +34,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name) m_ID = KMWizard::IPP; m_title = i18n("Remote IPP server"); m_nextpage = KMWizard::IPPSelect; - lineEdit( 1 )->setValidator( new TQIntValidator( TQT_TQOBJECT(this) ) ); + lineEdit( 1 )->setValidator( new TQIntValidator( this ) ); setInfo(i18n("<p>Enter the information concerning the remote IPP server " "owning the targeted printer. This wizard will poll the server " diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp index f7a4f0593..bbc878055 100644 --- a/tdeprint/cups/kmwippprinter.cpp +++ b/tdeprint/cups/kmwippprinter.cpp @@ -70,12 +70,12 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(20); - connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) ); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); - connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport())); + connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) ); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) ); + connect(m_ippreport, TQ_SIGNAL(clicked()), TQ_SLOT(slotIppReport())); // layout TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); diff --git a/tdeprint/cups/kmwippprinter.h b/tdeprint/cups/kmwippprinter.h index f578afba9..24758ab4a 100644 --- a/tdeprint/cups/kmwippprinter.h +++ b/tdeprint/cups/kmwippprinter.h @@ -31,7 +31,7 @@ class NetworkScanner; class KMWIppPrinter : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWIppPrinter(TQWidget *parent = 0, const char *name = 0); ~KMWIppPrinter(); diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp index 497fa03c3..67707b3ea 100644 --- a/tdeprint/cups/kmwother.cpp +++ b/tdeprint/cups/kmwother.cpp @@ -53,7 +53,7 @@ KMWOther::KMWOther(TQWidget *parent, const char *name) m_uriview->addColumn( "" ); m_uriview->header()->hide(); m_uriview->setSorting( -1 ); - connect( m_uriview, TQT_SIGNAL( pressed( TQListViewItem* ) ), TQT_SLOT( slotPressed( TQListViewItem* ) ) ); + connect( m_uriview, TQ_SIGNAL( pressed( TQListViewItem* ) ), TQ_SLOT( slotPressed( TQListViewItem* ) ) ); TQVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15); TQVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5); diff --git a/tdeprint/cups/kmwother.h b/tdeprint/cups/kmwother.h index a650482f4..c25913a52 100644 --- a/tdeprint/cups/kmwother.h +++ b/tdeprint/cups/kmwother.h @@ -28,7 +28,7 @@ class TQListViewItem; class KMWOther : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWOther(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/kmwquota.h b/tdeprint/cups/kmwquota.h index d8895c80d..e63f01aa4 100644 --- a/tdeprint/cups/kmwquota.h +++ b/tdeprint/cups/kmwquota.h @@ -27,7 +27,7 @@ class TQComboBox; class KMWQuota : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWQuota(TQWidget *parent = 0, const char *name = 0); virtual ~KMWQuota(); diff --git a/tdeprint/cups/kmwusers.h b/tdeprint/cups/kmwusers.h index cae8844a6..82c0d8a75 100644 --- a/tdeprint/cups/kmwusers.h +++ b/tdeprint/cups/kmwusers.h @@ -27,7 +27,7 @@ class TQComboBox; class KMWUsers : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWUsers(TQWidget *parent = 0, const char *name = 0); virtual ~KMWUsers(); diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp index f804b249d..03271fa1c 100644 --- a/tdeprint/cups/kphpgl2page.cpp +++ b/tdeprint/cups/kphpgl2page.cpp @@ -110,7 +110,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) setTitle("HP-GL/2"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("HP-GL/2 Options"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("HP-GL/2 Options"), this); m_blackplot = new TQCheckBox(i18n("&Use only black pen"), box); TQWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page); @@ -119,7 +119,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) TQWhatsThis::add(m_fitplot, whatsThisFitplotHpgl2Page); m_penwidth = new KIntNumInput(1000, box); - m_penwidth->setLabel(i18n("&Pen width:"), Qt::AlignLeft|Qt::AlignVCenter); + m_penwidth->setLabel(i18n("&Pen width:"), TQt::AlignLeft|TQt::AlignVCenter); m_penwidth->setSuffix(" [um]"); m_penwidth->setRange(0, 10000, 100, true); TQWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page); @@ -128,7 +128,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) l0->addWidget(box); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), 10); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), 10); l1->addWidget(m_blackplot); l1->addWidget(m_fitplot); l1->addWidget(m_penwidth); diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 8d23fe3e0..0c6eb4770 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -236,11 +236,11 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) setTitle(i18n("Image")); - TQGroupBox *colorbox = new TQGroupBox(0, Qt::Vertical, i18n("Color Settings"), this); + TQGroupBox *colorbox = new TQGroupBox(0, TQt::Vertical, i18n("Color Settings"), this); TQWhatsThis::add(this, whatsThisImagePage); - TQGroupBox *sizebox = new TQGroupBox(0, Qt::Vertical, i18n("Image Size"), this); + TQGroupBox *sizebox = new TQGroupBox(0, TQt::Vertical, i18n("Image Size"), this); TQWhatsThis::add(sizebox, whatsThisSizeImagePage); - TQGroupBox *positionbox = new TQGroupBox(0, Qt::Vertical, i18n("Image Position"), this); + TQGroupBox *positionbox = new TQGroupBox(0, TQt::Vertical, i18n("Image Position"), this); TQWhatsThis::add(positionbox, whatsThisPositionImagePage); m_brightness = new KIntNumInput(100, colorbox); @@ -263,10 +263,10 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_gamma->setRange(1, 3000, 100, true); TQWhatsThis::add(m_gamma, whatsThisGammaImagePage); - connect(m_brightness, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - connect(m_hue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - connect(m_saturation, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - //connect(m_gamma, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); + connect(m_brightness, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + connect(m_hue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + connect(m_saturation, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + //connect(m_gamma, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); m_preview = new ImagePreview(colorbox); bool useColor = (driver ? driver->get("colordevice") == "1" : true); @@ -278,11 +278,11 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQImage img(locate("data", "tdeprint/preview.png")); m_preview->setImage(img); - KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox); + KSeparator *sep = new KSeparator(TQt::Horizontal, colorbox); TQPushButton *defbtn = new TQPushButton(i18n("&Default Settings"), colorbox); TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage); - connect(defbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultClicked())); + connect(defbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultClicked())); slotDefaultClicked(); m_sizetype = new TQComboBox(sizebox); @@ -297,7 +297,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_size->setRange(1, 1200, 20, true); m_size->setValue(72); - connect(m_sizetype, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeTypeChanged(int))); + connect(m_sizetype, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeTypeChanged(int))); m_sizetype->setCurrentItem(0); slotSizeTypeChanged(0); @@ -342,8 +342,8 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_horizgrp->insert(hcenter, 1); m_horizgrp->insert(right, 2); } - connect(m_vertgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged())); - connect(m_horizgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged())); + connect(m_vertgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged())); + connect(m_horizgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged())); m_vertgrp->setButton(1); m_horizgrp->setButton(1); slotPositionChanged(); @@ -361,7 +361,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l1->addWidget(m_gamma, 4, 0); l1->addMultiCellWidget(m_preview, 0, 3, 1, 1); l1->addWidget(defbtn, 4, 1); - TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3); + TQVBoxLayout *l2 = new TQVBoxLayout(sizebox->layout(), 3); l2->addStretch(1); l2->addWidget(lab); l2->addWidget(m_sizetype); @@ -374,12 +374,12 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l3->addLayout(l4, 0, 1); l3->addLayout(l5, 1, 0); l3->addWidget(m_position, 1, 1); - l4->addWidget(left, Qt::AlignLeft); - l4->addWidget(hcenter, Qt::AlignCenter); - l4->addWidget(right, Qt::AlignRight); - l5->addWidget(top, Qt::AlignTop); - l5->addWidget(vcenter, Qt::AlignVCenter); - l5->addWidget(bottom, Qt::AlignBottom); + l4->addWidget(left, TQt::AlignLeft); + l4->addWidget(hcenter, TQt::AlignCenter); + l4->addWidget(right, TQt::AlignRight); + l5->addWidget(top, TQt::AlignTop); + l5->addWidget(vcenter, TQt::AlignVCenter); + l5->addWidget(bottom, TQt::AlignBottom); } KPImagePage::~KPImagePage() diff --git a/tdeprint/cups/kpimagepage.h b/tdeprint/cups/kpimagepage.h index 1a6bc6e44..71bf31e0b 100644 --- a/tdeprint/cups/kpimagepage.h +++ b/tdeprint/cups/kpimagepage.h @@ -30,7 +30,7 @@ class ImagePosition; class KPImagePage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPImagePage(DrMain *driver = 0, TQWidget *parent = 0, const char *name = 0); ~KPImagePage(); diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp index d7f13c8a4..0a3513c67 100644 --- a/tdeprint/cups/kpschedulepage.cpp +++ b/tdeprint/cups/kpschedulepage.cpp @@ -166,7 +166,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name) TQLabel *lab2 = new TQLabel(i18n("T&op/Bottom page label:"), this); TQWhatsThis::add(lab2, whatsThisPageLabel); lab2->setBuddy(m_pagelabel); - m_priority->setLabel(i18n("&Job priority:"), Qt::AlignVCenter|Qt::AlignLeft); + m_priority->setLabel(i18n("&Job priority:"), TQt::AlignVCenter|TQt::AlignLeft); TQWhatsThis::add(m_priority, whatsThisJobPriority); KSeparator *sep0 = new KSeparator(this); @@ -186,7 +186,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name) l0->addMultiCellWidget(m_priority, 4, 4, 0, 1); l0->setRowStretch(5, 1); - connect(m_time, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeChanged())); + connect(m_time, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeChanged())); } KPSchedulePage::~KPSchedulePage() @@ -220,8 +220,8 @@ void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts) else if (t == "third-shift") item = 7; else { - TQTime qt = TQT_TQTIME_OBJECT(TQTime::fromString(t)); - m_tedit->setTime(TQT_TQTIME_OBJECT(qt.addSecs(-3600 * m_gmtdiff))); + TQTime qt = TQTime::fromString(t); + m_tedit->setTime(qt.addSecs(-3600 * m_gmtdiff)); item = 8; } diff --git a/tdeprint/cups/kpschedulepage.h b/tdeprint/cups/kpschedulepage.h index 4be11fab9..163cdcf23 100644 --- a/tdeprint/cups/kpschedulepage.h +++ b/tdeprint/cups/kpschedulepage.h @@ -29,7 +29,7 @@ class KIntNumInput; class KPSchedulePage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPSchedulePage(TQWidget *parent = 0, const char *name = 0); ~KPSchedulePage(); diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index 6fb0652ce..4e990007e 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -188,31 +188,31 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) setTitle(i18n("Text")); m_block = false; - TQGroupBox *formatbox = new TQGroupBox(0, Qt::Vertical, i18n("Text Format"), this); + TQGroupBox *formatbox = new TQGroupBox(0, TQt::Vertical, i18n("Text Format"), this); TQWhatsThis::add(formatbox, whatsThisFormatTextPage); - TQGroupBox *prettybox = new TQGroupBox(0, Qt::Vertical, i18n("Syntax Highlighting"), this); + TQGroupBox *prettybox = new TQGroupBox(0, TQt::Vertical, i18n("Syntax Highlighting"), this); TQWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage); - TQGroupBox *marginbox = new TQGroupBox(0, Qt::Vertical, i18n("Margins"), this); + TQGroupBox *marginbox = new TQGroupBox(0, TQt::Vertical, i18n("Margins"), this); TQWhatsThis::add(marginbox, whatsThisMarginsTextPage); m_cpi = new KIntNumInput(10, formatbox); TQWhatsThis::add(m_cpi, whatsThisCPITextPage); - m_cpi->setLabel(i18n("&Chars per inch:"), Qt::AlignLeft|Qt::AlignVCenter); + m_cpi->setLabel(i18n("&Chars per inch:"), TQt::AlignLeft|TQt::AlignVCenter); m_cpi->setRange(1, 999, 1, false); m_lpi = new KIntNumInput(m_cpi, 6, formatbox); TQWhatsThis::add(m_lpi, whatsThisLPITextPage); - m_lpi->setLabel(i18n("&Lines per inch:"), Qt::AlignLeft|Qt::AlignVCenter); + m_lpi->setLabel(i18n("&Lines per inch:"), TQt::AlignLeft|TQt::AlignVCenter); m_lpi->setRange(1, 999, 1, false); m_columns = new KIntNumInput(m_lpi, 1, formatbox); TQWhatsThis::add(m_columns, whatsThisColumnsTextPage); - m_columns->setLabel(i18n("C&olumns:"), Qt::AlignLeft|Qt::AlignVCenter); + m_columns->setLabel(i18n("C&olumns:"), TQt::AlignLeft|TQt::AlignVCenter); m_columns->setRange(1, 10, 1, false); - KSeparator *sep = new KSeparator(Qt::Horizontal, formatbox); - connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int))); + KSeparator *sep = new KSeparator(TQt::Horizontal, formatbox); + connect(m_columns, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotColumnsChanged(int))); m_prettypix = new TQLabel(prettybox); TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); - m_prettypix->setAlignment(Qt::AlignCenter); + m_prettypix->setAlignment(TQt::AlignCenter); TQRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox); TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage); TQRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox); @@ -222,7 +222,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) m_prettyprint->insert(off, 0); m_prettyprint->insert(on, 1); m_prettyprint->setButton(0); - connect(m_prettyprint, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPrettyChanged(int))); + connect(m_prettyprint, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPrettyChanged(int))); slotPrettyChanged(0); m_margin = new MarginWidget(marginbox); @@ -233,16 +233,16 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) l0->addWidget(formatbox, 0, 0); l0->addWidget(prettybox, 0, 1); l0->addMultiCellWidget(marginbox, 1, 1, 0, 1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(formatbox->layout()), 5); + TQVBoxLayout *l1 = new TQVBoxLayout(formatbox->layout(), 5); l1->addWidget(m_cpi); l1->addWidget(m_lpi); l1->addWidget(sep); l1->addWidget(m_columns); - TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(prettybox->layout()), 2, 2, 10); + TQGridLayout *l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10); l2->addWidget(off, 0, 0); l2->addWidget(on, 1, 0); l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1); - TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(marginbox->layout()), 10); + TQVBoxLayout *l3 = new TQVBoxLayout(marginbox->layout(), 10); l3->addWidget(m_margin); } diff --git a/tdeprint/cups/kptextpage.h b/tdeprint/cups/kptextpage.h index 504e2d5c2..5aecfb526 100644 --- a/tdeprint/cups/kptextpage.h +++ b/tdeprint/cups/kptextpage.h @@ -30,7 +30,7 @@ class MarginWidget; class KPTextPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPTextPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0); ~KPTextPage(); diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp index 92eb7fc84..f4a07aa88 100644 --- a/tdeprint/driver.cpp +++ b/tdeprint/driver.cpp @@ -66,7 +66,7 @@ void DrBase::setOptions(const TQMap<TQString,TQString>& opts) void DrBase::getOptions(TQMap<TQString,TQString>& opts, bool incldef) { - QString val = valueText(); + TQString val = valueText(); if ( incldef || get( "persistent" ) == "1" || get("default") != val ) opts[name()] = val; } @@ -455,7 +455,7 @@ DrIntegerOption::~DrIntegerOption() TQString DrIntegerOption::valueText() { - QString s = TQString::number(m_value); + TQString s = TQString::number(m_value); return s; } @@ -505,7 +505,7 @@ DrFloatOption::~DrFloatOption() TQString DrFloatOption::valueText() { - QString s = TQString::number(m_value,'f',3); + TQString s = TQString::number(m_value,'f',3); return s; } @@ -555,7 +555,7 @@ DrListOption::~DrListOption() TQString DrListOption::valueText() { - QString s = (m_current ? m_current->name() : TQString::null); + TQString s = (m_current ? m_current->name() : TQString::null); return s; } @@ -654,7 +654,7 @@ bool DrConstraint::check(DrMain *driver) if (m_option1 && m_option2 && m_option1->currentChoice() && m_option2->currentChoice()) { bool f1(false), f2(false); - QString c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name()); + TQString c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name()); // check choices if (m_choice1.isEmpty()) f1 = (c1 != "None" && c1 != "Off" && c1 != "False"); @@ -665,7 +665,7 @@ bool DrConstraint::check(DrMain *driver) else f2 = (c2 == m_choice2); // tag options - QString s((f1 && f2 ? "1" : "0")); + TQString s((f1 && f2 ? "1" : "0")); if (!m_option1->conflict()) m_option1->setConflict(f1 && f2); if (!m_option2->conflict()) m_option2->setConflict(f1 && f2); // return value diff --git a/tdeprint/driver.h b/tdeprint/driver.h index 813c0b7f6..9848be9a6 100644 --- a/tdeprint/driver.h +++ b/tdeprint/driver.h @@ -87,7 +87,7 @@ public: protected: TQMap<TQString,TQString> m_map; - QString m_name; // used as a search key, better to have defined directly + TQString m_name; // used as a search key, better to have defined directly Type m_type; bool m_conflict; }; @@ -212,7 +212,7 @@ public: virtual void setValueText(const TQString& s); protected: - QString m_value; + TQString m_value; }; /********************************** @@ -336,8 +336,8 @@ public: bool check(DrMain*); protected: - QString m_opt1, m_opt2; - QString m_choice1, m_choice2; + TQString m_opt1, m_opt2; + TQString m_choice1, m_choice2; DrListOption *m_option1, *m_option2; }; @@ -376,7 +376,7 @@ public: TQSize margins() const; protected: - QString m_name; + TQString m_name; float m_width, m_height, m_left, m_bottom, m_right, m_top; }; diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp index 0b66c51d9..0b4266c11 100644 --- a/tdeprint/driveritem.cpp +++ b/tdeprint/driveritem.cpp @@ -44,7 +44,7 @@ void DriverItem::updateText() { if (m_item) { - QString s(m_item->get("text")); + TQString s(m_item->get("text")); if (m_item->isOption()) s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText())); if (m_item->type() == DrBase::List) @@ -91,25 +91,25 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width, if (!m_item || !m_item->isOption() || isSelected()) { p->setPen((isSelected() ? cg.highlightedText() : (m_conflict ? red : cg.text()))); - p->drawText(w,0,width-w,height(),Qt::AlignLeft|Qt::AlignVCenter,text(0)); + p->drawText(w,0,width-w,height(),TQt::AlignLeft|TQt::AlignVCenter,text(0)); } else { int w1(0); - QString s(m_item->get("text") + ": <"); + TQString s(m_item->get("text") + ": <"); w1 = p->fontMetrics().width(s); p->setPen(cg.text()); - p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); + p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s); w += w1; p->setPen((m_conflict ? red : darkGreen)); s = m_item->prettyText(); w1 = p->fontMetrics().width(s); - p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); + p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s); w += w1; p->setPen(cg.text()); s = TQString::fromLatin1(">"); w1 = p->fontMetrics().width(s); - p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); + p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s); } } diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp index fece6c40c..285a0864d 100644 --- a/tdeprint/driverview.cpp +++ b/tdeprint/driverview.cpp @@ -95,7 +95,7 @@ DriverView::DriverView(TQWidget *parent, const char *name) m_driver = 0; TQSplitter *splitter = new TQSplitter(this); - splitter->setOrientation(Qt::Vertical); + splitter->setOrientation(TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 10); vbox->addWidget(splitter); @@ -105,8 +105,8 @@ DriverView::DriverView(TQWidget *parent, const char *name) m_optview = new DrOptionView(splitter); TQWhatsThis::add(m_optview, whatsThisOptionSettingsDriverPage); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(m_optview,TQT_SIGNAL(changed()),TQT_SLOT(slotChanged())); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_optview,TQ_SIGNAL(changed()),TQ_SLOT(slotChanged())); } DriverView::~DriverView() diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h index 7e06648fa..5db76a0cd 100644 --- a/tdeprint/driverview.h +++ b/tdeprint/driverview.h @@ -38,7 +38,7 @@ public: class TDEPRINT_EXPORT DriverView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DriverView(TQWidget *parent = 0, const char *name = 0); ~DriverView(); diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp index de20a62fa..d58c20863 100644 --- a/tdeprint/droptionview.cpp +++ b/tdeprint/droptionview.cpp @@ -56,7 +56,7 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name) : OptionBaseView(parent,name) { m_edit = new TQLineEdit(this); - m_slider = new TQSlider(Qt::Horizontal,this); + m_slider = new TQSlider(TQt::Horizontal,this); m_slider->setTickmarks(TQSlider::Below); TQLabel *lab = new TQLabel(i18n("Value:"),this); m_minval = new TQLabel(this); @@ -78,8 +78,8 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name) sub2_->addWidget(m_slider,1); sub2_->addWidget(m_maxval,0); - connect(m_slider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotSliderChanged(int))); - connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotEditChanged(const TQString&))); + connect(m_slider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotSliderChanged(int))); + connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotEditChanged(const TQString&))); } void OptionNumericView::setOption(DrBase *opt) @@ -123,7 +123,7 @@ void OptionNumericView::slotSliderChanged(int value) { if (blockSS) return; - QString txt; + TQString txt; if (m_integer) txt = TQString::number(value); else @@ -172,7 +172,7 @@ OptionStringView::OptionStringView(TQWidget *parent, const char *name) main_->addWidget(m_edit,0); main_->addStretch(1); - connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SIGNAL(valueChanged(const TQString&))); } void OptionStringView::setOption(DrBase *opt) @@ -196,7 +196,7 @@ OptionListView::OptionListView(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(m_list); - connect(m_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); + connect(m_list,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); } void OptionListView::setOption(DrBase *opt) @@ -226,7 +226,7 @@ void OptionListView::slotSelectionChanged() { if (blockSS) return; - QString s = m_choices[m_list->currentItem()]; + TQString s = m_choices[m_list->currentItem()]; emit valueChanged(s); } @@ -246,7 +246,7 @@ OptionBooleanView::OptionBooleanView(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(m_group); - connect(m_group,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotSelected(int))); + connect(m_group,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotSelected(int))); } void OptionBooleanView::setOption(DrBase *opt) @@ -283,32 +283,32 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name) m_stack = new TQWidgetStack(this); OptionBaseView *w = new OptionListView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::List); w = new OptionStringView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::String); w = new OptionNumericView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::Integer); w = new OptionBooleanView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::Boolean); w = new OptionBaseView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,0); // empty widget m_stack->raiseWidget(w); setTitle(i18n("No Option Selected")); - setColumnLayout(0, Qt::Vertical ); + setColumnLayout(0, TQt::Vertical ); layout()->setSpacing( KDialog::spacingHint() ); layout()->setMargin( KDialog::marginHint() ); - TQVBoxLayout *main_ = new TQVBoxLayout(TQT_TQLAYOUT(layout()), KDialog::marginHint()); + TQVBoxLayout *main_ = new TQVBoxLayout(layout(), KDialog::marginHint()); main_->addWidget(m_stack); m_item = 0; diff --git a/tdeprint/droptionview.h b/tdeprint/droptionview.h index 6114efcbd..9304db3b3 100644 --- a/tdeprint/droptionview.h +++ b/tdeprint/droptionview.h @@ -37,7 +37,7 @@ class DriverItem; class OptionBaseView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: OptionBaseView(TQWidget *parent = 0, const char *name = 0); virtual void setOption(DrBase*); @@ -52,7 +52,7 @@ protected: class OptionNumericView : public OptionBaseView { - Q_OBJECT + TQ_OBJECT public: OptionNumericView(TQWidget *parent = 0, const char *name = 0); void setOption(DrBase *opt); @@ -82,7 +82,7 @@ private: class OptionListView : public OptionBaseView { - Q_OBJECT + TQ_OBJECT public: OptionListView(TQWidget *parent = 0, const char *name = 0); void setOption(DrBase *opt); @@ -98,7 +98,7 @@ private: class OptionBooleanView : public OptionBaseView { - Q_OBJECT + TQ_OBJECT public: OptionBooleanView(TQWidget *parent = 0, const char *name = 0); void setOption(DrBase *opt); @@ -114,7 +114,7 @@ private: class DrOptionView : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: DrOptionView(TQWidget *parent = 0, const char *name = 0); void setAllowFixed(bool on) { m_allowfixed = on; } diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp index dd694b31b..df3949903 100644 --- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -35,13 +35,13 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl() // look for executable TQString KFoomaticPrinterImpl::executable() { - QString exe = TDEStandardDirs::findExe("foomatic-printjob"); + TQString exe = TDEStandardDirs::findExe("foomatic-printjob"); return exe; } bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) { - QString exe = executable(); + TQString exe = executable(); if (!exe.isEmpty()) { cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies()); diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp index e1e741003..6953be7cc 100644 --- a/tdeprint/foomatic/kmfoomaticmanager.cpp +++ b/tdeprint/foomatic/kmfoomaticmanager.cpp @@ -76,7 +76,7 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool) return NULL; } - QString cmd = "foomatic-combo-xml -p "; + TQString cmd = "foomatic-combo-xml -p "; cmd += TDEProcess::quote(printer->option("printer")); cmd += " -d "; cmd += TDEProcess::quote(printer->option("driver")); @@ -99,7 +99,7 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem) printer->setState(KMPrinter::Idle); /*if (printer->name().find('/') != -1) { - QString s(printer->name()); + TQString s(printer->name()); int p = s.find('/'); printer->setPrinterName(s.left(p)); printer->setInstanceName(s.mid(p+1)); @@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) { driver->set("manufacturer", pelem.namedItem("make").toElement().text()); driver->set("model", pelem.namedItem("model").toElement().text()); - QString s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); + TQString s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); driver->set("description", s); driver->set("text", s); @@ -148,14 +148,14 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) { if (o.tagName() == "option") { - QString type = o.attribute("type"); + TQString type = o.attribute("type"); DrBase *dropt(0); if (type == "bool" || type == "enum") { if (type == "bool") dropt = new DrBooleanOption(); else dropt = new DrListOption(); - QString defval = o.namedItem("arg_defval").toElement().text(), valuetext; + TQString defval = o.namedItem("arg_defval").toElement().text(), valuetext; QDomNode val = o.namedItem("enum_vals").firstChild(); while (!val.isNull()) { @@ -177,7 +177,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) else dropt = new DrFloatOption(); dropt->set("minval", o.namedItem("arg_min").toElement().text()); dropt->set("maxval", o.namedItem("arg_max").toElement().text()); - QString defval = o.namedItem("arg_defval").toElement().text(); + TQString defval = o.namedItem("arg_defval").toElement().text(); dropt->set("default", defval); dropt->setValueText(defval); } diff --git a/tdeprint/foomatic2loader.cpp b/tdeprint/foomatic2loader.cpp index c498477fd..0856cc012 100644 --- a/tdeprint/foomatic2loader.cpp +++ b/tdeprint/foomatic2loader.cpp @@ -53,7 +53,7 @@ bool Foomatic2Loader::readFromFile( const TQString& filename ) TQFile f( filename ); m_foodata.clear(); if ( f.open( IO_ReadOnly ) ) - return read( TQT_TQIODEVICE(&f) ); + return read( &f ); return false; } @@ -63,7 +63,7 @@ bool Foomatic2Loader::readFromBuffer( const TQString& buffer ) TQBuffer d( buf ); m_foodata.clear(); if ( d.open( IO_ReadOnly ) ) - return read( TQT_TQIODEVICE(&d) ); + return read( &d ); return false; } diff --git a/tdeprint/fooscanner.l b/tdeprint/fooscanner.l index df8f6e778..7770f28bb 100644 --- a/tdeprint/fooscanner.l +++ b/tdeprint/fooscanner.l @@ -72,7 +72,7 @@ D [[:digit:]] %% -void tdeprint_foomatic2scanner_init( QIODevice *d ) +void tdeprint_foomatic2scanner_init( TQIODevice *d ) { tdeprint_foomatic2scanner_device = d; } diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 16ec56c32..216d4c14b 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -49,7 +49,7 @@ #define UNLOAD_OBJECT(x) if (x != 0) { delete x; x = 0; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 extern void tqt_generate_epsf( bool b ); #endif @@ -101,7 +101,7 @@ KMFactory::KMFactory() // This is fixed in Qt 3.0, but for Qt 2.x we need to disable it explicitly. // If this is a problem for anyone, we can add a public method to set this flag. // (David Faure, doing as advised by Lars Knoll) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 tqt_generate_epsf( false ); #endif #endif diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h index baaf48477..86aaad676 100644 --- a/tdeprint/kmfactory.h +++ b/tdeprint/kmfactory.h @@ -44,7 +44,7 @@ class KPReloadObject; class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp index 9f314539e..c0974d646 100644 --- a/tdeprint/kmjob.cpp +++ b/tdeprint/kmjob.cpp @@ -78,7 +78,7 @@ TQString KMJob::pixmap() return TQString::fromLatin1("application-x-executable"); // normal case - QString str("tdeprint_job"); + TQString str("tdeprint_job"); switch (m_state) { case KMJob::Printing: @@ -104,7 +104,7 @@ TQString KMJob::pixmap() TQString KMJob::stateString() { - QString str; + TQString str; switch (m_state) { case KMJob::Printing: diff --git a/tdeprint/kmjob.h b/tdeprint/kmjob.h index 51b4f90d1..7b9f8c3c1 100644 --- a/tdeprint/kmjob.h +++ b/tdeprint/kmjob.h @@ -111,9 +111,9 @@ protected: protected: // normal members int m_ID; - QString m_name; - QString m_printer; - QString m_owner; + TQString m_name; + TQString m_printer; + TQString m_owner; int m_state; int m_size; int m_type; @@ -123,7 +123,7 @@ protected: bool m_remote; // internal members - QString m_uri; + TQString m_uri; TQValueVector<TQString> m_attributes; }; diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h index fce6e61d2..e2aa01f5b 100644 --- a/tdeprint/kmjobmanager.h +++ b/tdeprint/kmjobmanager.h @@ -45,7 +45,7 @@ class TDEAction; */ class TDEPRINT_EXPORT KMJobManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum JobType { ActiveJobs = 0, CompletedJobs = 1 }; diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index 19fdbc7cc..3393edc58 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -421,7 +421,7 @@ TQString KMManager::testPage() { TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); - QString tpage = conf->readPathEntry("TestPage"); + TQString tpage = conf->readPathEntry("TestPage"); if (tpage.isEmpty()) tpage = locate("data","tdeprint/testprint.ps"); return tpage; diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h index d90a02d23..67cca0978 100644 --- a/tdeprint/kmmanager.h +++ b/tdeprint/kmmanager.h @@ -47,7 +47,7 @@ class PrinterFilter; */ class TDEPRINT_EXPORT KMManager : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KMVirtualManager; friend class KMSpecialManager; @@ -170,7 +170,7 @@ protected: virtual void checkUpdatePossibleInternal(); protected: - QString m_errormsg; + TQString m_errormsg; KMPrinterList m_printers, m_fprinters; // filtered printers bool m_hasmanagement; int m_printeroperationmask; diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp index c7676e382..3d28831ba 100644 --- a/tdeprint/kmprinter.cpp +++ b/tdeprint/kmprinter.cpp @@ -90,7 +90,7 @@ TQString KMPrinter::pixmap() { if (!m_pixmap.isEmpty()) return m_pixmap; - QString str("tdeprint_printer"); + TQString str("tdeprint_printer"); if (!isValid()) str.append("_defect"); else { @@ -133,7 +133,7 @@ int KMPrinter::compare(KMPrinter *p1, KMPrinter *p2) TQString KMPrinter::stateString() const { - QString s; + TQString s; switch (state()) { case KMPrinter::Idle: s = i18n("Idle"); break; @@ -184,7 +184,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent) true); dialog->setOperationMode (KFileDialog::Saving); - QString mimetype = option("kde-special-mimetype"); + TQString mimetype = option("kde-special-mimetype"); if (!mimetype.isEmpty()) { diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index 16a0ab616..84da26fe9 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -43,7 +43,7 @@ KMSpecialManager::KMSpecialManager(KMManager *parent, const char *name) bool KMSpecialManager::savePrinters() { // for root, use a global location. - QString confname; + TQString confname; if (getuid() == 0) { confname = locate("data", "tdeprint/specials.desktop"); @@ -139,7 +139,7 @@ bool KMSpecialManager::loadDesktopFile(const TQString& filename) int n = conf.readNumEntry("Number",0); for (int i=0;i<n;i++) { - QString grpname = TQString::fromLatin1("Printer %1").arg(i); + TQString grpname = TQString::fromLatin1("Printer %1").arg(i); if (!conf.hasGroup(grpname)) continue; conf.setGroup(grpname); KMPrinter *printer = new KMPrinter; @@ -213,7 +213,7 @@ DrMain* KMSpecialManager::loadDriver(KMPrinter *pr) TQString KMSpecialManager::setupCommand(const TQString& cmd, const TQMap<TQString,TQString>& opts) { - QString s(cmd); + TQString s(cmd); if (!s.isEmpty()) { KXmlCommand *xmlCmd = loadCommand(cmd); diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp index 309da96a9..5759664c8 100644 --- a/tdeprint/kmthreadjob.cpp +++ b/tdeprint/kmthreadjob.cpp @@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob() TQString KMThreadJob::jobFile() { - QString f = locateLocal("data","tdeprint/printjobs"); + TQString f = locateLocal("data","tdeprint/printjobs"); return f; } diff --git a/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp index 4dd6966d3..c1a7a442a 100644 --- a/tdeprint/kmuimanager.cpp +++ b/tdeprint/kmuimanager.cpp @@ -144,7 +144,7 @@ void KMUiManager::setupPropertyDialog(KPrinterPropertyDialog *dlg) // retrieve the KPrinter object KPrinter *prt(0); if (dlg->parent() && dlg->parent()->isA("KPrintDialog")) - prt = static_cast<KPrintDialog*>(TQT_TQWIDGET(dlg->parent()))->printer(); + prt = static_cast<KPrintDialog*>(dlg->parent())->printer(); // add margin page if ( ( prt && !prt->fullPage() && prt->applicationType() == KPrinter::Dialog ) diff --git a/tdeprint/kmuimanager.h b/tdeprint/kmuimanager.h index e59c61e40..6b9113d33 100644 --- a/tdeprint/kmuimanager.h +++ b/tdeprint/kmuimanager.h @@ -35,7 +35,7 @@ class TQListView; class TDEPRINT_EXPORT KMUiManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum PrintDialogFlagType { diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp index 9262f3e3c..4bf58b3c1 100644 --- a/tdeprint/kmvirtualmanager.cpp +++ b/tdeprint/kmvirtualmanager.cpp @@ -38,7 +38,7 @@ static TQString instanceName(const TQString& prname, const TQString& instname) { - QString str(prname); + TQString str(prname); if (!instname.isEmpty()) str.append("/"+instname); return str; @@ -60,7 +60,7 @@ KMPrinter* KMVirtualManager::findPrinter(const TQString& name) KMPrinter* KMVirtualManager::findInstance(KMPrinter *p, const TQString& name) { - QString instname(instanceName(p->printerName(),name)); + TQString instname(instanceName(p->printerName(),name)); return findPrinter(instname); } @@ -96,7 +96,7 @@ void KMVirtualManager::setDefault(KMPrinter *p, bool saveflag) bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name) { - QString instname(instanceName(p->printerName(),name)); + TQString instname(instanceName(p->printerName(),name)); KMPrinter *printer = findPrinter(instname); if (printer) return printer->isSoftDefault(); @@ -106,7 +106,7 @@ bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name) void KMVirtualManager::create(KMPrinter *p, const TQString& name) { - QString instname = instanceName(p->printerName(),name); + TQString instname = instanceName(p->printerName(),name); if (findPrinter(instname) != NULL) return; KMPrinter *printer = new KMPrinter; printer->setName(instname); @@ -123,7 +123,7 @@ void KMVirtualManager::create(KMPrinter *p, const TQString& name) void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& name) { - QString instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name)); + TQString instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name)); KMPrinter *prsrc = findPrinter(instsrc); if (!prsrc || findPrinter(instname) != NULL) return; KMPrinter *printer = new KMPrinter; @@ -137,7 +137,7 @@ void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& n void KMVirtualManager::remove(KMPrinter *p, const TQString& name) { - QString instname = instanceName(p->printerName(),name); + TQString instname = instanceName(p->printerName(),name); KMPrinter *printer = findPrinter(instname); if (!printer) return; if (name.isEmpty()) @@ -153,7 +153,7 @@ void KMVirtualManager::remove(KMPrinter *p, const TQString& name) void KMVirtualManager::setAsDefault(KMPrinter *p, const TQString& name, TQWidget *parent) { - QString instname(instanceName(p->printerName(),name)); + TQString instname(instanceName(p->printerName(),name)); if ( p->isSpecial() ) { @@ -294,7 +294,7 @@ void KMVirtualManager::loadFile(const TQString& filename) void KMVirtualManager::triggerSave() { - QString filename; + TQString filename; if (getuid() == 0) { if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups"))) diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp index 27b647208..f0afae75b 100644 --- a/tdeprint/kpcopiespage.cpp +++ b/tdeprint/kpcopiespage.cpp @@ -165,7 +165,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) setId(KPrinter::CopiesPage); // widget creation - TQButtonGroup *m_pagebox = new TQButtonGroup(0, Qt::Vertical, i18n("Page Selection"), this); + TQButtonGroup *m_pagebox = new TQButtonGroup(0, TQt::Vertical, i18n("Page Selection"), this); TQWhatsThis::add(m_pagebox, whatsThisPageSelectionLabel); m_all = new TQRadioButton(i18n("&All"), m_pagebox); TQWhatsThis::add(m_all, whatsThisAllPagesLabel); @@ -175,19 +175,19 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) TQWhatsThis::add(m_range, whatsThisPageRangeLabel); m_rangeedit = new TQLineEdit(m_pagebox); TQWhatsThis::add(m_rangeedit, whatsThisPageRangeLabel); - connect(m_range, TQT_SIGNAL(clicked()), m_rangeedit, TQT_SLOT(setFocus())); + connect(m_range, TQ_SIGNAL(clicked()), m_rangeedit, TQ_SLOT(setFocus())); TQToolTip::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); // TQWhatsThis::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); //TQLabel *m_rangeexpl = new TQLabel(m_pagebox); //m_rangeexpl->setText(i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); - TQGroupBox *m_copybox = new TQGroupBox(0, Qt::Vertical, i18n("Output Settings"), this); + TQGroupBox *m_copybox = new TQGroupBox(0, TQt::Vertical, i18n("Output Settings"), this); TQWhatsThis::add(m_copybox, whatsThisCopiesLabel); m_collate = new TQCheckBox(i18n("Co&llate"), m_copybox); TQWhatsThis::add(m_collate, whatsThisCollateLabel); m_order = new TQCheckBox(i18n("Re&verse"), m_copybox); TQWhatsThis::add(m_order, whatsThisReverseLabel); m_collatepix = new TQLabel(m_copybox); - m_collatepix->setAlignment(Qt::AlignCenter); + m_collatepix->setAlignment(TQt::AlignCenter); m_collatepix->setMinimumHeight(70); TQLabel *m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox); m_copies = new TQSpinBox(m_copybox); @@ -203,7 +203,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) TQLabel *m_pagesetlabel = new TQLabel(i18n("Page &set:"), m_pagebox); m_pagesetlabel->setBuddy(m_pageset); TQWhatsThis::add(m_pagesetlabel, whatsThisPageSetLabel); - KSeparator *sepline = new KSeparator(Qt::Horizontal, m_pagebox); + KSeparator *sepline = new KSeparator(TQt::Horizontal, m_pagebox); sepline->setMinimumHeight(10); TQWidget::setTabOrder( m_all, m_current ); @@ -221,7 +221,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) l1->setColStretch(1,1); l1->addWidget(m_pagebox,0,0); l1->addWidget(m_copybox,0,1); - TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->layout()), 5); + TQVBoxLayout *l3 = new TQVBoxLayout(m_pagebox->layout(), 5); l3->addWidget(m_all); l3->addWidget(m_current); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 5); @@ -249,9 +249,9 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) slotCollateClicked(); // connections - connect(m_rangeedit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotRangeEntered())); - connect(m_collate,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked())); - connect(m_order,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked())); + connect(m_rangeedit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotRangeEntered())); + connect(m_collate,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked())); + connect(m_order,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked())); if (!kapp->authorize("print/copies")) { diff --git a/tdeprint/kpcopiespage.h b/tdeprint/kpcopiespage.h index ddb2b4f2a..2011c7ade 100644 --- a/tdeprint/kpcopiespage.h +++ b/tdeprint/kpcopiespage.h @@ -33,7 +33,7 @@ class KPrinter; class TDEPRINT_EXPORT KPCopiesPage : public KPrintDialogPage, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KPCopiesPage(KPrinter *prt = 0, TQWidget *parent = 0, const char *name = 0); ~KPCopiesPage(); diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp index 768e4b475..7ac9b146c 100644 --- a/tdeprint/kpfilterpage.cpp +++ b/tdeprint/kpfilterpage.cpp @@ -133,7 +133,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) m_view->setLineWidth(1); m_view->setSorting(-1); m_view->header()->hide(); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotItemSelected(TQListViewItem*))); m_add = new TQToolButton(this); TQWhatsThis::add(m_add, whatsThisAddFilterButton); @@ -160,12 +160,12 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) m_configure->setIconSet(BarIconSet("configure")); TQToolTip::add(m_configure, i18n("Configure filter")); - connect(m_add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddClicked())); - connect(m_remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemoveClicked())); - connect(m_up,TQT_SIGNAL(clicked()),TQT_SLOT(slotUpClicked())); - connect(m_down,TQT_SIGNAL(clicked()),TQT_SLOT(slotDownClicked())); - connect(m_configure,TQT_SIGNAL(clicked()),TQT_SLOT(slotConfigureClicked())); - connect(m_view,TQT_SIGNAL(doubleClicked(TQListViewItem*)),TQT_SLOT(slotConfigureClicked())); + connect(m_add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddClicked())); + connect(m_remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemoveClicked())); + connect(m_up,TQ_SIGNAL(clicked()),TQ_SLOT(slotUpClicked())); + connect(m_down,TQ_SIGNAL(clicked()),TQ_SLOT(slotDownClicked())); + connect(m_configure,TQ_SIGNAL(clicked()),TQ_SLOT(slotConfigureClicked())); + connect(m_view,TQ_SIGNAL(doubleClicked(TQListViewItem*)),TQ_SLOT(slotConfigureClicked())); m_info = new KActiveLabel(this); TQWhatsThis::add(m_info, whatsThisFilterInfoPane); diff --git a/tdeprint/kpfilterpage.h b/tdeprint/kpfilterpage.h index a5bc7f757..9845b87b8 100644 --- a/tdeprint/kpfilterpage.h +++ b/tdeprint/kpfilterpage.h @@ -33,7 +33,7 @@ class TQTextBrowser; class KPFilterPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPFilterPage(TQWidget *parent = 0, const char *name = 0); ~KPFilterPage(); diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index 821290704..bce57cd1f 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -262,15 +262,15 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const // widget creation TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); - m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_pagesizelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight); TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel); TQLabel *m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this); - m_papertypelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_papertypelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight); TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel); TQLabel *m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this); - m_inputslotlabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_inputslotlabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight); TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel); m_pagesize = new TQComboBox(this); @@ -286,16 +286,16 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const m_papertypelabel->setBuddy(m_papertype); m_inputslotlabel->setBuddy(m_inputslot); - m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); + m_orientbox = new TQButtonGroup(0, TQt::Vertical, i18n("Orientation"), this); TQWhatsThis::add(m_orientbox, whatsThisGeneralOrientationLabel); - m_duplexbox = new TQButtonGroup(0, Qt::Vertical, i18n("Duplex Printing"), this); + m_duplexbox = new TQButtonGroup(0, TQt::Vertical, i18n("Duplex Printing"), this); TQWhatsThis::add(m_duplexbox, whatsThisGeneralDuplexLabel); - m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); + m_nupbox = new TQButtonGroup(0, TQt::Vertical, i18n("Pages per Sheet"), this); TQWhatsThis::add(m_nupbox, whatsThisGeneralPagesPerSheetLabel); - m_bannerbox = new TQGroupBox(0, Qt::Vertical, i18n("Banners"), this); + m_bannerbox = new TQGroupBox(0, TQt::Vertical, i18n("Banners"), this); TQWhatsThis::add(m_bannerbox, whatsThisGeneralBannersLabel); TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox); @@ -305,19 +305,19 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const m_portrait->setChecked(true); m_orientpix = new TQLabel(m_orientbox); - m_orientpix->setAlignment(Qt::AlignCenter); + m_orientpix->setAlignment(TQt::AlignCenter); TQRadioButton *m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox); TQRadioButton *m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox); TQRadioButton *m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox); m_dupnone->setChecked(true); m_duplexpix = new TQLabel(m_duplexbox); - m_duplexpix->setAlignment(Qt::AlignCenter); + m_duplexpix->setAlignment(TQt::AlignCenter); TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); TQRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox); TQRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox); m_nup1->setChecked(true); m_nuppix = new TQLabel(m_nupbox); - m_nuppix->setAlignment(Qt::AlignCenter); + m_nuppix->setAlignment(TQt::AlignCenter); m_startbanner = new TQComboBox(m_bannerbox); m_endbanner = new TQComboBox(m_bannerbox); TQLabel *m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox); @@ -331,9 +331,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint()); TQGridLayout *lay2 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); lay0->addStretch(1); - lay0->addLayout(TQT_TQLAYOUT(lay1)); + lay0->addLayout(lay1); lay0->addStretch(1); - lay0->addLayout(TQT_TQLAYOUT(lay2)); + lay0->addLayout(lay2); lay0->addStretch(2); lay1->addWidget(m_pagesizelabel, 0, 0); lay1->addWidget(m_papertypelabel, 1, 0); @@ -376,9 +376,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const lay6->setColStretch(1, 1); // connections (+ misc) - connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int))); - connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int))); - connect(m_duplexbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotDuplexChanged(int))); + connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int))); + connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int))); + connect(m_duplexbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotDuplexChanged(int))); // init initialize(); diff --git a/tdeprint/kpgeneralpage.h b/tdeprint/kpgeneralpage.h index dc8eef580..eea610cdc 100644 --- a/tdeprint/kpgeneralpage.h +++ b/tdeprint/kpgeneralpage.h @@ -30,7 +30,7 @@ class TQLabel; class TDEPRINT_EXPORT KPGeneralPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent = 0, const char *name = 0); ~KPGeneralPage(); diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp index 019cf34d9..d4b87994e 100644 --- a/tdeprint/kpmarginpage.cpp +++ b/tdeprint/kpmarginpage.cpp @@ -42,7 +42,7 @@ KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, cons setTitle(i18n("Margins")); m_usedriver = true; - TQGroupBox *box = new TQGroupBox(1, Qt::Vertical, i18n("Margins"), this); + TQGroupBox *box = new TQGroupBox(1, TQt::Vertical, i18n("Margins"), this); m_margin = new MarginWidget(box, "MarginWidget", (m_printer != 0)); //m_margin->setSymetricMargins(true); //if (m_printer) @@ -75,7 +75,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) if (driver() && m_usedriver ) { - QString pageSize(ps); + TQString pageSize(ps); if (pageSize.isEmpty()) { @@ -105,7 +105,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts) { - QString orient = opts["orientation-requested"]; + TQString orient = opts["orientation-requested"]; bool land = (orient.isEmpty()? opts["kde-orientation"] == "Landscape" : orient == "4" || orient == "5"); TQString ps = opts[ "kde-printsize" ]; if ( ps.isEmpty() ) @@ -120,7 +120,7 @@ void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts) initPageSize(ps, land); bool marginset(false); - QString value; + TQString value; if (!(value=opts["kde-margin-top"]).isEmpty() && value.toFloat() != m_margin->top()) { marginset = true; diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp index 9c0a42501..23e11a760 100644 --- a/tdeprint/kpposterpage.cpp +++ b/tdeprint/kpposterpage.cpp @@ -199,15 +199,15 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name ) m_postersize->setCurrentItem( findIndex( KPrinter::A3 ) ); slotPosterSizeChanged( m_postersize->currentItem() ); - connect( m_postercheck, TQT_SIGNAL( toggled( bool ) ), dummy, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_postercheck, TQ_SIGNAL( toggled( bool ) ), dummy, TQ_SLOT( setEnabled( bool ) ) ); dummy->setEnabled( false ); - connect( m_postersize, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotPosterSizeChanged( int ) ) ); - connect( m_cutmargin, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotMarginChanged( int ) ) ); - connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), m_printsize, TQT_SLOT( setDisabled( bool ) ) ); + connect( m_postersize, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotPosterSizeChanged( int ) ) ); + connect( m_cutmargin, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotMarginChanged( int ) ) ); + connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), m_printsize, TQ_SLOT( setDisabled( bool ) ) ); m_printsize->setEnabled( false ); - connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotLockToggled( bool ) ) ); - connect( m_selection, TQT_SIGNAL( textChanged( const TQString& ) ), m_preview, TQT_SLOT( setSelectedPages( const TQString& ) ) ); - connect( m_preview, TQT_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQT_SLOT( setText( const TQString& ) ) ); + connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotLockToggled( bool ) ) ); + connect( m_selection, TQ_SIGNAL( textChanged( const TQString& ) ), m_preview, TQ_SLOT( setSelectedPages( const TQString& ) ) ); + connect( m_preview, TQ_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQ_SLOT( setText( const TQString& ) ) ); if ( KMFactory::self()->settings()->application != KPrinter::Dialog && KMFactory::self()->settings()->application >= 0 ) diff --git a/tdeprint/kpposterpage.h b/tdeprint/kpposterpage.h index ce4858aa3..bd5352a51 100644 --- a/tdeprint/kpposterpage.h +++ b/tdeprint/kpposterpage.h @@ -32,7 +32,7 @@ class TQLineEdit; class KPPosterPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPPosterPage( TQWidget *parent = 0, const char *name = 0 ); ~KPPosterPage(); diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index c0ca5656e..e6088d489 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -116,11 +116,11 @@ void KPQtPage::init() m_pagesize = new TQComboBox(this); TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel); TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); - m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_pagesizelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight); m_pagesizelabel->setBuddy(m_pagesize); - m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); + m_orientbox = new TQButtonGroup(0, TQt::Vertical, i18n("Orientation"), this); TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel); - m_colorbox = new TQButtonGroup(0, Qt::Vertical, i18n("Color Mode"), this); + m_colorbox = new TQButtonGroup(0, TQt::Vertical, i18n("Color Mode"), this); TQWhatsThis::add(m_colorbox, whatsThisColorModeOtPageLabel); TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox); TQWhatsThis::add(m_portrait, whatsThisOrientationOtPageLabel); @@ -129,7 +129,7 @@ void KPQtPage::init() TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel); m_orientpix = new TQLabel(m_orientbox); - m_orientpix->setAlignment(Qt::AlignCenter); + m_orientpix->setAlignment(TQt::AlignCenter); TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel); TQRadioButton *m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox); @@ -137,10 +137,10 @@ void KPQtPage::init() TQRadioButton *m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox); m_colorpix = new TQLabel(m_colorbox); - m_colorpix->setAlignment(Qt::AlignCenter); + m_colorpix->setAlignment(TQt::AlignCenter); TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel); - m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); + m_nupbox = new TQButtonGroup(0, TQt::Vertical, i18n("Pages per Sheet"), this); // TQWhatsThis::add(m_nupbox, whatsThisPagesPerSheetOtPageLabel); TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); TQWhatsThis::add(m_nup1, whatsThisPagesPerSheetOtPageLabel); @@ -152,7 +152,7 @@ void KPQtPage::init() TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel); m_nuppix = new TQLabel(m_nupbox); - m_nuppix->setAlignment(Qt::AlignCenter); + m_nuppix->setAlignment(TQt::AlignCenter); TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel); // layout creation @@ -218,9 +218,9 @@ void KPQtPage::init() } // connections - connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int))); - connect(m_colorbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotColorModeChanged(int))); - connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int))); + connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int))); + connect(m_colorbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotColorModeChanged(int))); + connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int))); } void KPQtPage::slotOrientationChanged(int ID) @@ -235,7 +235,7 @@ void KPQtPage::slotColorModeChanged(int ID) void KPQtPage::slotNupChanged(int ID) { - QString pixstr; + TQString pixstr; switch (ID) { case NUP_1: pixstr = "tdeprint_nup1"; break; @@ -256,7 +256,7 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts) slotColorModeChanged(ID); if (driver()) { - QString val = opts["PageSize"]; + TQString val = opts["PageSize"]; if (!val.isEmpty()) { DrListOption *opt = static_cast<DrListOption*>(driver()->findOption("PageSize")); diff --git a/tdeprint/kpqtpage.h b/tdeprint/kpqtpage.h index ee78ffa86..cfeefa465 100644 --- a/tdeprint/kpqtpage.h +++ b/tdeprint/kpqtpage.h @@ -31,7 +31,7 @@ class DrMain; class TDEPRINT_EXPORT KPQtPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPQtPage(TQWidget *parent = 0, const char *name = 0); KPQtPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp index 4a4aac597..d09997785 100644 --- a/tdeprint/kprintaction.cpp +++ b/tdeprint/kprintaction.cpp @@ -67,8 +67,8 @@ KPrintAction::~KPrintAction() void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); d->type = type; d->parentWidget = parentWidget; diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h index 94549402f..a381ac6dd 100644 --- a/tdeprint/kprintaction.h +++ b/tdeprint/kprintaction.h @@ -26,7 +26,7 @@ class KPrinter; class TDEPRINT_EXPORT KPrintAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: enum PrinterType { All, Regular, Specials }; diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 9df774510..25691e673 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -262,7 +262,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) setCaption(i18n("Print")); // widget creation - TQGroupBox *m_pbox = new TQGroupBox(0,Qt::Vertical,i18n("Printer"), this); + TQGroupBox *m_pbox = new TQGroupBox(0,TQt::Vertical,i18n("Printer"), this); d->m_type = new TQLabel(m_pbox); TQWhatsThis::add(d->m_type, whatsThisPrinterType); d->m_state = new TQLabel(m_pbox); @@ -396,19 +396,19 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) l3->addMultiCellWidget(d->m_cmd,2,2,1,2); // connections - connect(d->m_ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept())); - connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject())); - connect(d->m_properties,TQT_SIGNAL(clicked()),TQT_SLOT(slotProperties())); - connect(d->m_default,TQT_SIGNAL(clicked()),TQT_SLOT(slotSetDefault())); - connect(d->m_printers,TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); - connect(d->m_options,TQT_SIGNAL(clicked()),TQT_SLOT(slotOptions())); - connect(d->m_wizard,TQT_SIGNAL(clicked()),TQT_SLOT(slotWizard())); - connect(d->m_extbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotExtensionClicked())); - connect(d->m_filter, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); - connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp())); - connect(d->m_file, TQT_SIGNAL(urlSelected(const TQString&)), TQT_SLOT(slotOutputFileSelected(const TQString&))); - connect( d->m_file, TQT_SIGNAL( openFileDialog( KURLRequester* ) ), TQT_SLOT( slotOpenFileDialog() ) ); - connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect(d->m_ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept())); + connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject())); + connect(d->m_properties,TQ_SIGNAL(clicked()),TQ_SLOT(slotProperties())); + connect(d->m_default,TQ_SIGNAL(clicked()),TQ_SLOT(slotSetDefault())); + connect(d->m_printers,TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int))); + connect(d->m_options,TQ_SIGNAL(clicked()),TQ_SLOT(slotOptions())); + connect(d->m_wizard,TQ_SIGNAL(clicked()),TQ_SLOT(slotWizard())); + connect(d->m_extbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotExtensionClicked())); + connect(d->m_filter, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool))); + connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp())); + connect(d->m_file, TQ_SIGNAL(urlSelected(const TQString&)), TQ_SLOT(slotOutputFileSelected(const TQString&))); + connect( d->m_file, TQ_SIGNAL( openFileDialog( KURLRequester* ) ), TQ_SLOT( slotOpenFileDialog() ) ); + connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); d->b_optionsEnabled = kapp->authorize("print/options") && kapp->authorize("print/selection"); d->b_propertiesEnabled = kapp->authorize("print/properties") && kapp->authorize("print/selection"); @@ -484,12 +484,12 @@ void KPrintDialog::setDialogPages(TQPtrList<KPrintDialogPage> *pages) d->m_pages.append(pages->take(0)); d->m_pages.first()->reparent(d->m_dummy, TQPoint(0,0)); d->m_pages.first()->show(); - delete d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING); + delete d->m_dummy->child("TabWidget", "TQTabWidget"); } else { // more than one page. - TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); + TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); if (!tabs) { // TQTabWidget doesn't exist. Create it and reparent all @@ -554,7 +554,7 @@ void KPrintDialog::initialize(KPrinter *printer) if (plist) { - QString oldP = d->m_printers->currentText(); + TQString oldP = d->m_printers->currentText(); d->m_printers->clear(); TQPtrListIterator<KMPrinter> it(*plist); int defsoft(-1), defhard(-1), defsearch(-1); @@ -822,7 +822,7 @@ void KPrintDialog::slotWizard() void KPrintDialog::reload() { // remove printer dependent pages (usually from plugin) - TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); + TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); for (uint i=0; i<d->m_pages.count(); i++) if (d->m_pages.at(i)->onlyRealPrinters()) { @@ -841,7 +841,7 @@ void KPrintDialog::reload() d->m_dummy->show(); // other initializations setFlags(KMFactory::self()->uiManager()->dialogFlags()); - connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); init(); } @@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag ) if ( d->m_pages.count() > 1 ) { - TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); + TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); tabs->setTabEnabled( d->m_pages.at( index ), flag ); } else @@ -969,8 +969,8 @@ void KPrintDialog::slotOpenFileDialog() KMPrinter *prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText()); if (prt) { - QString mimetype(prt->option("kde-special-mimetype")); - QString ext(prt->option("kde-special-extension")); + TQString mimetype(prt->option("kde-special-mimetype")); + TQString ext(prt->option("kde-special-extension")); if (!mimetype.isEmpty()) { diff --git a/tdeprint/kprintdialog.h b/tdeprint/kprintdialog.h index c23e9cdc1..0c14f1407 100644 --- a/tdeprint/kprintdialog.h +++ b/tdeprint/kprintdialog.h @@ -40,7 +40,7 @@ class KPrintDialogPage; */ class TDEPRINT_EXPORT KPrintDialog : public KDialog, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KPrintDialog(TQWidget *parent = 0, const char *name = 0); ~KPrintDialog(); diff --git a/tdeprint/kprintdialogpage.h b/tdeprint/kprintdialogpage.h index 46152ee13..4cddf7f13 100644 --- a/tdeprint/kprintdialogpage.h +++ b/tdeprint/kprintdialogpage.h @@ -89,7 +89,7 @@ class DrMain; */ class TDEPRINT_EXPORT KPrintDialogPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Standard constructor. @@ -144,7 +144,7 @@ public: * @returns the page title * @see setTitle() */ - QString title() const { return m_title; } + TQString title() const { return m_title; } /** * Set the page title. This title will be used as tab name for this page in the print * dialog. @@ -183,7 +183,7 @@ protected: KMPrinter *m_printer; DrMain *m_driver; int m_ID; - QString m_title; + TQString m_title; bool m_onlyreal; }; diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 010297e5a..35d0dbe20 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -101,14 +101,14 @@ public: bool m_restore; bool m_previewonly; WId m_parentId; - QString m_docfilename; + TQString m_docfilename; TQString m_docdirectory; KPrinterWrapper *m_wrapper; TQMap<TQString,TQString> m_options; - QString m_tmpbuffer; - QString m_printername; - QString m_searchname; - QString m_errormsg; + TQString m_tmpbuffer; + TQString m_printername; + TQString m_searchname; + TQString m_errormsg; bool m_ready; int m_pagenumber; DrPageSize *m_pagesize; @@ -597,12 +597,15 @@ int KPrinter::metric(int m) const return val; } -void KPrinter::setOrientation(Orientation o) +void KPrinter::setOrientation(Orientation o, bool locking) { KMFactory::self()->settings()->orientation = o; setOption("kde-orientation",(o == Landscape ? "Landscape" : "Portrait")); d->m_impl->broadcastOption("kde-orientation",(o == Landscape ? "Landscape" : "Portrait")); - d->m_impl->broadcastOption( "kde-orientation-fixed", "1" ); + if (locking) + { + d->m_impl->broadcastOption( "kde-orientation-fixed", "1" ); + } } void KPrinter::setOption( const TQString& key, const TQString& value, bool broadcast ) @@ -612,11 +615,14 @@ void KPrinter::setOption( const TQString& key, const TQString& value, bool broad d->m_impl->broadcastOption( key, value ); } -void KPrinter::setPageSize(PageSize s) +void KPrinter::setPageSize(PageSize s, bool locking) { KMFactory::self()->settings()->pageSize = s; setOption("kde-pagesize",TQString::number((int)s),true); - d->m_impl->broadcastOption( "kde-pagesize-fixed", "1" ); + if (locking) + { + d->m_impl->broadcastOption( "kde-pagesize-fixed", "1" ); + } } void KPrinter::setOptions(const TQMap<TQString,TQString>& opts) diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h index 0ac329604..6a0cde6d0 100644 --- a/tdeprint/kprinter.h +++ b/tdeprint/kprinter.h @@ -289,7 +289,7 @@ public: /** * See TQPrinter::setOrientation(). */ - void setOrientation(Orientation); + void setOrientation(Orientation, bool locking = false); /** * See TQPrinter::pageOrder(). */ @@ -347,7 +347,7 @@ public: /** * See TQPrinter::setPageSize(). */ - void setPageSize(PageSize); + void setPageSize(PageSize, bool locking = false); /** * See TQPrinter::printerName(). */ diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index edd380009..171b1b524 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -79,7 +79,7 @@ void KPrinterImpl::preparePrinting(KPrinter *printer) // Find the page size: // 1) print option // 2) default driver option - QString psname = printer->option("PageSize"); + TQString psname = printer->option("PageSize"); if (psname.isEmpty()) { DrListOption *opt = (DrListOption*)driver->findOption("PageSize"); diff --git a/tdeprint/kprinterimpl.h b/tdeprint/kprinterimpl.h index 24da07be4..2913a1406 100644 --- a/tdeprint/kprinterimpl.h +++ b/tdeprint/kprinterimpl.h @@ -33,7 +33,7 @@ class KMPrinter; class TDEPRINT_EXPORT KPrinterImpl : public TQObject { - Q_OBJECT + TQ_OBJECT public: KPrinterImpl(TQObject *parent = 0, const char *name = 0); virtual ~KPrinterImpl(); diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp index c120ba843..24479daba 100644 --- a/tdeprint/kprinterpropertydialog.cpp +++ b/tdeprint/kprinterpropertydialog.cpp @@ -40,7 +40,7 @@ KPrinterPropertyDialog::KPrinterPropertyDialog(KMPrinter *p, TQWidget *parent, c // set a margin m_tw = new TQTabWidget(this); m_tw->setMargin(10); - connect(m_tw,TQT_SIGNAL(currentChanged(TQWidget*)),TQT_SLOT(slotCurrentChanged(TQWidget*))); + connect(m_tw,TQ_SIGNAL(currentChanged(TQWidget*)),TQ_SLOT(slotCurrentChanged(TQWidget*))); setMainWidget(m_tw); if (m_printer) diff --git a/tdeprint/kprinterpropertydialog.h b/tdeprint/kprinterpropertydialog.h index e76f38212..62647fd24 100644 --- a/tdeprint/kprinterpropertydialog.h +++ b/tdeprint/kprinterpropertydialog.h @@ -32,7 +32,7 @@ class TQTabWidget; class TDEPRINT_EXPORT KPrinterPropertyDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KPrinterPropertyDialog(KMPrinter *printer, TQWidget *parent = 0, const char *name = 0); ~KPrinterPropertyDialog(); diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index d4de7925d..e2642e514 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -45,7 +45,7 @@ KPreviewProc::KPreviewProc() : TDEProcess() { m_bOk = false; - connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); } KPreviewProc::~KPreviewProc() @@ -129,7 +129,7 @@ static KLibFactory* componentFactory() static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOnly) { - QString msg(msg_); + TQString msg(msg_); if (previewOnly) { KMessageBox::error(parent, msg); @@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) // create main view and actions setMainWidget(d->mainwidget_); if (previewOnly) - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print"); + KStdAction::close(this, TQ_SLOT(reject()), d->actions_, "close_print"); else { - new TDEAction(i18n("Print"), "document-print", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); - new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); + new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQ_SLOT(accept()), d->actions_, "continue_print"); + new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(reject()), d->actions_, "stop_print"); } } @@ -171,7 +171,7 @@ KPrintPreview::~KPrintPreview() void KPrintPreview::initView(KLibFactory *factory) { // load the component - d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(TQT_TQOBJECT(d->mainwidget_), "gvpart", "KParts::ReadOnlyPart"); + d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(d->mainwidget_, "gvpart", "KParts::ReadOnlyPart"); // populate the toolbar if (d->previewonly_) @@ -248,7 +248,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId conf->setGroup("General"); KLibFactory *factory(0); bool externalPreview = conf->readBoolEntry("ExternalPreview", false); - TQWidget *parentW = TQT_TQWIDGET(TQWidget::find(parentId)); + TQWidget *parentW = TQWidget::find(parentId); TQString exe; if (!externalPreview && isPS && (factory = componentFactory()) != 0) { @@ -275,7 +275,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId exe = conf->readPathEntry("PreviewCommand", "gv"); if (TDEStandardDirs::findExe(exe).isEmpty()) { - QString msg = i18n("The preview program %1 cannot be found. " + TQString msg = i18n("The preview program %1 cannot be found. " "Check that the program is correctly installed and " "located in a directory included in your PATH " "environment variable.").arg(exe); @@ -314,7 +314,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId // start the preview process if (!proc.startPreview()) { - QString msg = i18n("Preview failed: unable to start program %1.").arg(exe); + TQString msg = i18n("Preview failed: unable to start program %1.").arg(exe); return continuePrint(msg, parentW, previewOnly); } else if (!previewOnly) diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h index ae99fb405..678f74454 100644 --- a/tdeprint/kprintpreview.h +++ b/tdeprint/kprintpreview.h @@ -29,7 +29,7 @@ class KLibFactory; class KPrintPreview : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KPrintPreview(TQWidget *parent = 0, bool previewOnly = false); ~KPrintPreview(); @@ -49,7 +49,7 @@ private: class KPreviewProc : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: KPreviewProc(); virtual ~KPreviewProc(); diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index 2b0c0f6f6..13ed3f7ca 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -26,9 +26,9 @@ KPrintProcess::KPrintProcess() : KShellProcess() { // redirect everything to a single buffer - connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) ); + connect(this,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(this,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect( this, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotExited( TDEProcess* ) ) ); m_state = None; } diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h index 5ceb3835e..544dd7e1e 100644 --- a/tdeprint/kprintprocess.h +++ b/tdeprint/kprintprocess.h @@ -25,7 +25,7 @@ class KPrintProcess : public KShellProcess { - Q_OBJECT + TQ_OBJECT public: KPrintProcess(); ~KPrintProcess(); @@ -54,7 +54,7 @@ protected slots: void slotExited( TDEProcess* ); private: - QString m_buffer; + TQString m_buffer; TQStringList m_tempfiles; TQString m_output, m_tempoutput, m_command; int m_state; diff --git a/tdeprint/lpd/gschecker.cpp b/tdeprint/lpd/gschecker.cpp index 99044918b..2ea194453 100644 --- a/tdeprint/lpd/gschecker.cpp +++ b/tdeprint/lpd/gschecker.cpp @@ -41,7 +41,7 @@ void GsChecker::loadDriverList() if (proc.open("gs -h",IO_ReadOnly)) { QTextStream t(&proc); - QString buffer, line; + TQString buffer, line; bool ok(false); while (!t.eof()) { diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp index 3647f0b38..843e73409 100644 --- a/tdeprint/lpd/klpdprinterimpl.cpp +++ b/tdeprint/lpd/klpdprinterimpl.cpp @@ -40,7 +40,7 @@ TQString KLpdPrinterImpl::executable() bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) { - QString exestr = executable(); + TQString exestr = executable(); if (exestr.isEmpty()) { printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr")); diff --git a/tdeprint/lpd/kmlpdfactory.h b/tdeprint/lpd/kmlpdfactory.h index ffc05af71..8748e1e19 100644 --- a/tdeprint/lpd/kmlpdfactory.h +++ b/tdeprint/lpd/kmlpdfactory.h @@ -29,7 +29,7 @@ public: virtual ~KLpdFactory(); protected: - TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList()); + TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = "TQObject", const TQStringList& args = TQStringList()); }; #endif diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index e72733f89..ab0a9d3dc 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -44,7 +44,7 @@ // only there to allow testing on my system. Should be removed // when everything has proven to be working and stable -QString lpdprefix = ""; +TQString lpdprefix = ""; TQString ptPrinterType(KMPrinter*); //************************************************************************************************ @@ -83,7 +83,7 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer) PrintcapEntry *entry = m_entries.find(printer->name()); if (entry) { - QString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp")); + TQString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp")); printer->setDescription(i18n("Local printer queue (%1)").arg(type.isEmpty() ? i18n("Unknown type of local printer queue", "Unknown") : type)); printer->setLocation(i18n("<Not available>")); printer->setDriverInfo(driver.isEmpty() ? i18n("Unknown Driver", "Unknown") : driver); @@ -221,7 +221,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer) bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state) { KPipeProcess proc; - QString cmd = programName(0); + TQString cmd = programName(0); cmd += " "; cmd += state ? "up" : "down"; cmd += " "; @@ -229,7 +229,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state) if (proc.open(cmd)) { QTextStream t(&proc); - QString buffer; + TQString buffer; while (!t.eof()) buffer.append(t.readLine()); if (buffer.startsWith("?Privilege")) @@ -287,11 +287,11 @@ TQString KMLpdManager::programName(int f) void KMLpdManager::checkStatus() { KPipeProcess proc; - QString cmd = programName(0) + " status all"; + TQString cmd = programName(0) + " status all"; if (proc.open(cmd)) { QTextStream t(&proc); - QString line; + TQString line; KMPrinter *printer(0); int p(-1); while (!t.eof()) @@ -326,7 +326,7 @@ void KMLpdManager::loadPrintcapFile(const TQString& filename) if (f.exists() && f.open(IO_ReadOnly)) { QTextStream t(&f); - QString line, comment; + TQString line, comment; PrintcapEntry *entry; while (!t.eof()) { @@ -391,7 +391,7 @@ void KMLpdManager::loadPrinttoolDb(const TQString& filename) DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry) { - QString ptdbfilename = driverDirectory() + "/printerdb"; + TQString ptdbfilename = driverDirectory() + "/printerdb"; if (entry->file == ptdbfilename) { PrinttoolEntry *ptentry = findPrinttoolEntry(entry->modelname); @@ -419,7 +419,7 @@ DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config) return NULL; // check for printtool driver (only for configuration) - QString sd = entry->arg("sd"), dr(entry->comment(7)); + TQString sd = entry->arg("sd"), dr(entry->comment(7)); if (TQFile::exists(sd+"/postscript.cfg") && config && !dr.isEmpty()) { TQMap<TQString,TQString> map = loadPrinttoolCfgFile(sd+"/postscript.cfg"); @@ -462,7 +462,7 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file if (f.exists() && f.open(IO_ReadOnly)) { QTextStream t(&f); - QString line, name, val; + TQString line, name, val; int p(-1); while (!t.eof()) { @@ -488,14 +488,14 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQString& dirname, const TQMap<TQString,TQString>& options) { // defines input and output file - QString fname = TQFileInfo(templatefile).fileName(); + TQString fname = TQFileInfo(templatefile).fileName(); fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1("")); QFile fin(templatefile); QFile fout(dirname + "/" + fname); if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly)) { QTextStream tin(&fin), tout(&fout); - QString line, name; + TQString line, name; int p(-1); while (!tin.eof()) { @@ -525,7 +525,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) { // To be able to save a printer driver, a printcap entry MUST exist. // We can then retrieve the spool directory from it. - QString spooldir; + TQString spooldir; PrintcapEntry *ent = findPrintcapEntry(printer->printerName()); if (!ent) return false; @@ -541,7 +541,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) options["PS_SEND_EOF"] = "NO"; if (!checkGsDriver(options["GSDEVICE"])) return false; - QString resol(options["RESOLUTION"]), color(options["COLOR"]); + TQString resol(options["RESOLUTION"]), color(options["COLOR"]); // update entry comment to make printtool happy and save printcap file ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15))); ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter"); @@ -565,7 +565,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry) { KURL dev(printer->device()); - QString prot = dev.protocol(), sd(entry->arg("sd")); + TQString prot = dev.protocol(), sd(entry->arg("sd")); entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer)); if (prot == "smb" || prot == "ncp" || prot == "socket") { @@ -619,7 +619,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry) // first check if it has a "sd" defined if (entry->arg("sd").isEmpty()) entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name; - QString sd = entry->arg("sd"); + TQString sd = entry->arg("sd"); if (!TDEStandardDirs::exists(sd)) { if (!TDEStandardDirs::makeDir(sd,0750)) @@ -641,7 +641,7 @@ bool KMLpdManager::validateDbDriver(KMDBEntry *entry) TQString ptPrinterType(KMPrinter *p) { - QString type, prot = p->device().protocol(); + TQString type, prot = p->device().protocol(); if (prot == "lpd") type = "REMOTE"; else if (prot == "smb") type = "SMB"; else if (prot == "ncp") type = "NCP"; diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp index 54f19c405..4d45a9760 100644 --- a/tdeprint/lpd/lpdtools.cpp +++ b/tdeprint/lpd/lpdtools.cpp @@ -88,8 +88,8 @@ bool PrintcapEntry::readLine(const TQString& line) { int p = l[i].find('='); if (p == -1) p = 2; - QString key = l[i].left(p); - QString value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p)); + TQString key = l[i].left(p); + TQString value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p)); m_args[key] = value; } return true; @@ -114,7 +114,7 @@ void PrintcapEntry::writeEntry(TQTextStream& t) TQString PrintcapEntry::comment(int index) { - QString w; + TQString w; if (m_comment.startsWith("##PRINTTOOL3##")) { int p(0); @@ -166,7 +166,7 @@ TQStringList splitPrinttoolLine(const TQString& line) bool PrinttoolEntry::readEntry(TQTextStream& t) { - QString line; + TQString line; QStringList args; m_resolutions.setAutoDelete(true); @@ -264,7 +264,7 @@ DrMain* PrinttoolEntry::createDriver() ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi)); lopt->addChoice(ch); } - QString defval = lopt->choices()->first()->name(); + TQString defval = lopt->choices()->first()->name(); lopt->set("default",defval); lopt->setValueText(defval); } @@ -290,7 +290,7 @@ DrMain* PrinttoolEntry::createDriver() ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment)); lopt->addChoice(ch); } - QString defval = lopt->choices()->first()->name(); + TQString defval = lopt->choices()->first()->name(); lopt->set("default",defval); lopt->setValueText(defval); } @@ -394,7 +394,7 @@ DrMain* PrinttoolEntry::createDriver() TQString getPrintcapLine(TQTextStream& t, TQString *lastcomment) { - QString line, buffer, comm; + TQString line, buffer, comm; while (!t.eof()) { buffer = t.readLine().stripWhiteSpace(); diff --git a/tdeprint/lpd/lpdtools.h b/tdeprint/lpd/lpdtools.h index 692dd0fa2..ef28ff089 100644 --- a/tdeprint/lpd/lpdtools.h +++ b/tdeprint/lpd/lpdtools.h @@ -38,8 +38,8 @@ public: TQString arg(const TQString& key) const { return m_args[key]; } TQString comment(int i); private: - QString m_name; - QString m_comment; + TQString m_name; + TQString m_comment; TQMap<TQString,TQString> m_args; }; @@ -48,13 +48,13 @@ private: struct Resolution { int xdpi, ydpi; - QString comment; + TQString comment; }; struct BitsPerPixel { - QString bpp; - QString comment; + TQString bpp; + TQString comment; }; class PrinttoolEntry @@ -64,7 +64,7 @@ public: bool readEntry(TQTextStream& t); DrMain* createDriver(); private: - QString m_name, m_gsdriver, m_description, m_about; + TQString m_name, m_gsdriver, m_description, m_about; TQPtrList<Resolution> m_resolutions; TQPtrList<BitsPerPixel> m_depths; }; diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp index e628a1c41..fe6a6aa7b 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -47,7 +47,7 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer) // look for executable, starting with "lpr" TQString KLpdUnixPrinterImpl::executable() { - QString exe = TDEStandardDirs::findExe("lpr"); + TQString exe = TDEStandardDirs::findExe("lpr"); if (exe.isEmpty()) exe = TDEStandardDirs::findExe("lp"); return exe; diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp index 7a291f6df..fa20b17da 100644 --- a/tdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp @@ -186,7 +186,7 @@ void KMLpdUnixManager::parseEtcPrintcap() TQFile f(getPrintcapFileName()); if (f.exists() && f.open(IO_ReadOnly)) { - KTextBuffer t(TQT_TQIODEVICE(&f)); + KTextBuffer t(&f); TQMap<TQString,TQString> entry; while (!t.eof()) @@ -247,7 +247,7 @@ void KMLpdUnixManager::parseEtcPrintersConf() TQFile f(getEtcPrintersConfName()); if (f.exists() && f.open(IO_ReadOnly)) { - KTextBuffer t(TQT_TQIODEVICE(&f)); + KTextBuffer t(&f); TQMap<TQString,TQString> entry; TQString default_printer; @@ -297,7 +297,7 @@ void KMLpdUnixManager::parseEtcLpPrinters() TQFile f(it.current()->absFilePath() + "/configuration"); if (f.exists() && f.open(IO_ReadOnly)) { - KTextBuffer t(TQT_TQIODEVICE(&f)); + KTextBuffer t(&f); TQString line, remote; while (!t.eof()) { @@ -358,7 +358,7 @@ void KMLpdUnixManager::parseSpoolInterface() TQFile f(it.current()->absFilePath()); if (f.exists() && f.open(IO_ReadOnly)) { - KTextBuffer t(TQT_TQIODEVICE(&f)); + KTextBuffer t(&f); TQString line, remote; while (!t.eof()) diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp index bf61919c3..e70e85907 100644 --- a/tdeprint/lpr/editentrydialog.cpp +++ b/tdeprint/lpr/editentrydialog.cpp @@ -86,12 +86,12 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c slotTypeChanged(0); m_block = false; - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(m_string, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_boolean, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_number, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_string, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_boolean, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_number, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); + connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); resize(500,400); } diff --git a/tdeprint/lpr/editentrydialog.h b/tdeprint/lpr/editentrydialog.h index f4359dd89..888f87eed 100644 --- a/tdeprint/lpr/editentrydialog.h +++ b/tdeprint/lpr/editentrydialog.h @@ -33,7 +33,7 @@ class TQWidgetStack; class EditEntryDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: EditEntryDialog(PrintcapEntry *entry, TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp index 4dbe5e378..03a75001a 100644 --- a/tdeprint/lpr/klprprinterimpl.cpp +++ b/tdeprint/lpr/klprprinterimpl.cpp @@ -42,7 +42,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) return false; cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() ); - QString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer); + TQString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer); if (!opts.isEmpty()) cmd += (" " + opts); return true; @@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value KPrinterImpl::broadcastOption(key,value); if (key == "kde-pagesize") { - QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); + TQString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); KPrinterImpl::broadcastOption("PageSize",pagename); } } diff --git a/tdeprint/lpr/klprprinterimpl.h b/tdeprint/lpr/klprprinterimpl.h index 508173f1d..3d3e9a080 100644 --- a/tdeprint/lpr/klprprinterimpl.h +++ b/tdeprint/lpr/klprprinterimpl.h @@ -32,7 +32,7 @@ public: void broadcastOption(const TQString& key, const TQString& value); private: - QString m_exepath; + TQString m_exepath; }; #endif diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp index fed1dd17d..ffd8db77a 100644 --- a/tdeprint/lpr/kmconfiglpr.cpp +++ b/tdeprint/lpr/kmconfiglpr.cpp @@ -34,7 +34,7 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name) setPageHeader(i18n("Spooler Settings")); setPagePixmap("gear"); - TQGroupBox *m_modebox = new TQGroupBox(1, Qt::Vertical, i18n("Spooler"), this); + TQGroupBox *m_modebox = new TQGroupBox(1, TQt::Vertical, i18n("Spooler"), this); m_mode = new TQComboBox(m_modebox); m_mode->insertItem("LPR (BSD compatible)"); diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 046f082f7..f207df9ee 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt) void KMLprManager::createPluginActions(TDEActionCollection *coll) { - TDEAction *act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); + TDEAction *act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQ_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); act->setGroup("plugin"); } diff --git a/tdeprint/lpr/kmlprmanager.h b/tdeprint/lpr/kmlprmanager.h index d26af4d77..c4be757b1 100644 --- a/tdeprint/lpr/kmlprmanager.h +++ b/tdeprint/lpr/kmlprmanager.h @@ -34,7 +34,7 @@ class KPrinter; class KMLprManager : public KMManager { - Q_OBJECT + TQ_OBJECT public: KMLprManager(TQObject *parent, const char *name, const TQStringList & /*args*/); diff --git a/tdeprint/lpr/lprsettings.h b/tdeprint/lpr/lprsettings.h index 590eafdff..2545993fc 100644 --- a/tdeprint/lpr/lprsettings.h +++ b/tdeprint/lpr/lprsettings.h @@ -58,9 +58,9 @@ protected: private: static LprSettings* m_self; Mode m_mode; - QString m_printcapfile; + TQString m_printcapfile; bool m_local; - QString m_spooldir; + TQString m_spooldir; TQString m_defaultremotehost; }; diff --git a/tdeprint/lpr/printcapreader.cpp b/tdeprint/lpr/printcapreader.cpp index 718ffca21..8a1e1ee9a 100644 --- a/tdeprint/lpr/printcapreader.cpp +++ b/tdeprint/lpr/printcapreader.cpp @@ -27,7 +27,7 @@ void PrintcapReader::setPrintcapFile(TQFile *f) { if (f->isOpen()) { - m_stream.setDevice(TQT_TQIODEVICE(f)); + m_stream.setDevice(f); m_buffer = TQString::null; } } diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp index 5bddffe02..58a051370 100644 --- a/tdeprint/management/cjanuswidget.cpp +++ b/tdeprint/management/cjanuswidget.cpp @@ -74,7 +74,7 @@ void CJanusWidget::CListBoxItem::paint(TQPainter *p) int w1 = (listBox()->contentsWidth()-m_pix.width())/2; p->drawPixmap(w1,5,m_pix); - p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),Qt::AlignHCenter,text()); + p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),TQt::AlignHCenter,text()); } //*********************************************************************************** @@ -143,7 +143,7 @@ CJanusWidget::CJanusWidget(TQWidget *parent, const char *name) f = m_iconlist->font(); f.setBold(true); m_iconlist->setFont(f); - connect(m_iconlist,TQT_SIGNAL(selectionChanged(TQListBoxItem*)),TQT_SLOT(slotSelected(TQListBoxItem*))); + connect(m_iconlist,TQ_SIGNAL(selectionChanged(TQListBoxItem*)),TQ_SLOT(slotSelected(TQListBoxItem*))); m_empty = new TQWidget(this, "Empty"); m_stack->addWidget(m_empty,0); diff --git a/tdeprint/management/cjanuswidget.h b/tdeprint/management/cjanuswidget.h index d33be1499..5b178c824 100644 --- a/tdeprint/management/cjanuswidget.h +++ b/tdeprint/management/cjanuswidget.h @@ -30,7 +30,7 @@ class TQListBoxItem; class CJanusWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CJanusWidget(TQWidget *parent, const char *name); ~CJanusWidget(); diff --git a/tdeprint/management/jobitem.h b/tdeprint/management/jobitem.h index 580a1b84f..66beeb7d2 100644 --- a/tdeprint/management/jobitem.h +++ b/tdeprint/management/jobitem.h @@ -40,7 +40,7 @@ public: private: KMJob *m_job; int m_ID; - QString m_uri; + TQString m_uri; }; inline int JobItem::jobID() const diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp index 984d2c128..132ca990c 100644 --- a/tdeprint/management/kiconselectaction.cpp +++ b/tdeprint/management/kiconselectaction.cpp @@ -76,7 +76,7 @@ void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList& int TDEIconSelectAction::plug(TQWidget* widget, int index) { int value(-1); - if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) + if (widget->inherits("TQPopupMenu")) { createPopupMenu(); value = TDESelectAction::plug(widget, index); @@ -94,7 +94,7 @@ int TDEIconSelectAction::plug(TQWidget* widget, int index) bar->getButton(id)->setPopup(d->m_menu, true); bar->setItemEnabled(id, isEnabled()); addContainer(bar, id); - connect(bar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotDestroyed())); + connect(bar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotDestroyed())); value = containerCount()-1; } diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h index 26e703fbf..7403d311a 100644 --- a/tdeprint/management/kiconselectaction.h +++ b/tdeprint/management/kiconselectaction.h @@ -26,7 +26,7 @@ class TDEIconSelectActionPrivate; class TDEIconSelectAction : public TDESelectAction { - Q_OBJECT + TQ_OBJECT public: TDEIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0); virtual ~TDEIconSelectAction(); diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp index 971f8cce5..3c82c8663 100644 --- a/tdeprint/management/kmconfigcommand.cpp +++ b/tdeprint/management/kmconfigcommand.cpp @@ -34,7 +34,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) setPageHeader(i18n("Command Settings")); setPagePixmap("application-x-executable"); - TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this); + TQGroupBox *gb = new TQGroupBox(0, TQt::Horizontal, i18n("Edit/Create Commands"), this); TQLabel *lab = new TQLabel(i18n( "<p>Command objects perform a conversion from input to output.<br>" "They are used as the basis to build both print filters " @@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(gb); l0->addStretch(1); - TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()), KDialog::spacingHint()); + TQVBoxLayout *l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint()); l2->addWidget(lab); l2->addWidget(sel); } diff --git a/tdeprint/management/kmconfigdialog.h b/tdeprint/management/kmconfigdialog.h index 6a47995cc..30dd2b2ef 100644 --- a/tdeprint/management/kmconfigdialog.h +++ b/tdeprint/management/kmconfigdialog.h @@ -27,7 +27,7 @@ class TDEPRINT_EXPORT KMConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMConfigDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index b7be0a1e6..18354839d 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -41,7 +41,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) setPageHeader(i18n("Printer Filtering Settings")); setPagePixmap("filter"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Printer Filter"), this); m_list1 = new TDEListBox(box); m_list1->setSelectionMode(TDEListBox::Extended); @@ -63,10 +63,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(lab); TQGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint()); - l1->addLayout(TQT_TQLAYOUT(l2)); + l1->addLayout(l2); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); l2->setColStretch(0, 1); @@ -80,10 +80,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) l3->addWidget(lab1, 0); l3->addWidget(m_locationre, 1); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); - connect(m_list1, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(m_list2, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked())); + connect(m_list1, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(m_list2, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); m_add->setEnabled(false); m_remove->setEnabled(false); } diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h index 8338ebd6f..1e0f6e2c9 100644 --- a/tdeprint/management/kmconfigfilter.h +++ b/tdeprint/management/kmconfigfilter.h @@ -28,7 +28,7 @@ class TQLineEdit; class KMConfigFilter : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigFilter(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index 4d9854774..7107bc74d 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -43,8 +43,8 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) setPageHeader(i18n("Font Settings")); setPagePixmap("fonts"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this); - TQGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Embedding"), this); + TQGroupBox *box2 = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Path"), this); m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box); m_fontpath = new TDEListView(box2); @@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); lab0->setBuddy(m_addpath); - TQVBoxLayout *l0 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l0->addWidget(m_embedfonts); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box2->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint()); l1->addWidget(m_fontpath); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); l1->addLayout(l2); @@ -91,12 +91,12 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) "font path is used, so adding those directories is not needed. The default " "search path should be sufficient in most cases.")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); - connect(m_fontpath, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelected())); - connect(m_addpath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown())); + connect(m_fontpath, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelected())); + connect(m_addpath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged(const TQString&))); m_add->setEnabled(false); m_remove->setEnabled(false); m_up->setEnabled(false); diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h index 8bd285f38..9ac9a43f5 100644 --- a/tdeprint/management/kmconfigfonts.h +++ b/tdeprint/management/kmconfigfonts.h @@ -29,7 +29,7 @@ class TQCheckBox; class KMConfigFonts : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigFonts(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index edf8902bf..1b21dbca6 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -45,7 +45,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) setPageHeader(i18n("General Settings")); setPagePixmap("document-print"); - TQGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); + TQGroupBox *m_timerbox = new TQGroupBox(0, TQt::Vertical, i18n("Refresh Interval"), this); m_timer = new KIntNumInput(m_timerbox,"Timer"); m_timer->setRange(0,30); m_timer->setSuffix( i18n( " sec" ) ); @@ -54,19 +54,19 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) "<b>TDE Print</b> components like the print manager " "and the job viewer.")); - TQGroupBox *m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this); + TQGroupBox *m_testpagebox = new TQGroupBox(0, TQt::Vertical, i18n("Test Page"), this); m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck"); m_testpage = new KURLRequester(m_testpagebox,"TestPage"); m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox); - connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool))); - connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool))); - connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview())); - connect(m_testpage->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(testPageChanged(const TQString & ))); + connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),m_testpage,TQ_SLOT(setEnabled(bool))); + connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabledPreviewButton(bool))); + connect(m_preview,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestPagePreview())); + connect(m_testpage->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(testPageChanged(const TQString & ))); m_testpage->setDisabled(true); m_preview->setDisabled(true); m_defaulttestpage->setCursor(KCursor::handCursor()); - TQGroupBox *m_statusbox = new TQGroupBox(0, Qt::Vertical, i18n("Miscellaneous"), this); + TQGroupBox *m_statusbox = new TQGroupBox(0, TQt::Vertical, i18n("Miscellaneous"), this); m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox); m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox); @@ -76,10 +76,10 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) lay0->addWidget(m_testpagebox); lay0->addWidget(m_statusbox); lay0->addStretch(1); - TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_timerbox->layout()), + TQVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->layout(), KDialog::spacingHint()); lay1->addWidget(m_timer); - TQVBoxLayout *lay2 = new TQVBoxLayout(TQT_TQLAYOUT(m_testpagebox->layout()), + TQVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->layout(), KDialog::spacingHint()); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0); lay2->addWidget(m_defaulttestpage); @@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) lay2->addLayout(lay3); lay3->addStretch(1); lay3->addWidget(m_preview); - TQVBoxLayout *lay4 = new TQVBoxLayout(TQT_TQLAYOUT(m_statusbox->layout()), + TQVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->layout(), KDialog::spacingHint()); lay4->addWidget(m_statusmsg); lay4->addWidget(m_uselast); diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h index b82a91daa..190b4f38a 100644 --- a/tdeprint/management/kmconfiggeneral.h +++ b/tdeprint/management/kmconfiggeneral.h @@ -28,7 +28,7 @@ class TQCheckBox; class TQPushButton; class KMConfigGeneral : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigGeneral(TQWidget *parent = 0); diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp index 1c712de3d..39b783d48 100644 --- a/tdeprint/management/kmconfigjobs.cpp +++ b/tdeprint/management/kmconfigjobs.cpp @@ -34,7 +34,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) setPageHeader(i18n("Print Job Settings")); setPagePixmap("application-x-executable"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Jobs Shown"), this); m_limit = new KIntNumInput(box); m_limit->setRange(0, 9999, 1, true); @@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 0); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(m_limit); } diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h index 29818d68a..0edab1056 100644 --- a/tdeprint/management/kmconfigjobs.h +++ b/tdeprint/management/kmconfigjobs.h @@ -26,7 +26,7 @@ class KIntNumInput; class KMConfigJobs : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigJobs(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h index f29b8a23e..533ff80f4 100644 --- a/tdeprint/management/kmconfigpage.h +++ b/tdeprint/management/kmconfigpage.h @@ -28,7 +28,7 @@ class TDEConfig; class TDEPRINT_EXPORT KMConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMConfigPage(TQWidget *parent = 0, const char *name = 0); @@ -45,9 +45,9 @@ protected: void setPagePixmap(const TQString& s) { m_pixmap = s; } protected: - QString m_name; - QString m_header; - QString m_pixmap; + TQString m_name; + TQString m_header; + TQString m_pixmap; }; #endif diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp index 2fdcbcb4b..b3c8aa39e 100644 --- a/tdeprint/management/kmconfigpreview.cpp +++ b/tdeprint/management/kmconfigpreview.cpp @@ -36,7 +36,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) setPageHeader(i18n("Preview Settings")); setPagePixmap("filefind"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Preview Program"), this); m_useext = new TQCheckBox(i18n("&Use external preview program"), box); m_program = new KURLRequester(box); @@ -50,12 +50,12 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(lab); l1->addWidget(m_useext); l1->addWidget(m_program); - connect(m_useext, TQT_SIGNAL(toggled(bool)), m_program, TQT_SLOT(setEnabled(bool))); + connect(m_useext, TQ_SIGNAL(toggled(bool)), m_program, TQ_SLOT(setEnabled(bool))); m_program->setEnabled(false); } diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 6154ebea2..720b213a3 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name) m_dlg = 0; m_status = true; - connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*))); } KMDBCreator::~KMDBCreator() @@ -112,7 +112,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true); m_dlg->setLabelText(i18n("Please wait while TDE rebuilds a driver database.")); m_dlg->setCaption(i18n("Driver Database")); - connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled())); + connect(m_dlg,TQ_SIGNAL(canceled()),TQ_SLOT(slotCancelled())); } m_dlg->setMinimumDuration(0); // always show the dialog m_dlg->setProgress(0); // to force showing diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h index 4b1983ae6..1aadc5026 100644 --- a/tdeprint/management/kmdbcreator.h +++ b/tdeprint/management/kmdbcreator.h @@ -30,7 +30,7 @@ class TQProgressDialog; class KMDBCreator : public TQObject { - Q_OBJECT + TQ_OBJECT public: KMDBCreator(TQObject *parent = 0, const char *name = 0); ~KMDBCreator(); diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index 5a172281b..80c44a5a8 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -47,7 +47,7 @@ KMDriverDB::KMDriverDB(TQObject *parent, const char *name) : TQObject(parent,name) { m_creator = new KMDBCreator(this,"db-creator"); - connect(m_creator,TQT_SIGNAL(dbCreated()),TQT_SLOT(slotDbCreated())); + connect(m_creator,TQ_SIGNAL(dbCreated()),TQ_SLOT(slotDbCreated())); m_entries.setAutoDelete(true); m_pnpentries.setAutoDelete(true); diff --git a/tdeprint/management/kmdriverdb.h b/tdeprint/management/kmdriverdb.h index c5af6d53e..8dec3e8f0 100644 --- a/tdeprint/management/kmdriverdb.h +++ b/tdeprint/management/kmdriverdb.h @@ -31,7 +31,7 @@ class KMDBCreator; class KMDriverDB : public TQObject { - Q_OBJECT + TQ_OBJECT public: static KMDriverDB* self(); diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index 7223dbcd3..c49af544a 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -62,7 +62,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0); TQHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10); - main_->addLayout(TQT_TQLAYOUT(sub1_)); + main_->addLayout(sub1_); main_->addLayout(sub2_); main_->addWidget(m_raw); sub1_->addWidget(l1,0,0); @@ -74,19 +74,19 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) sub2_->addWidget(m_other,0); // build connections - connect(KMDriverDB::self(),TQT_SIGNAL(dbLoaded(bool)),TQT_SLOT(slotDbLoaded(bool))); - connect(KMDriverDB::self(), TQT_SIGNAL(error(const TQString&)), TQT_SLOT(slotError(const TQString&))); - connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),TQT_SLOT(slotManufacturerSelected(const TQString&))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_postscript,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_raw,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotPostscriptToggled(bool))); - connect(m_other,TQT_SIGNAL(clicked()),TQT_SLOT(slotOtherClicked())); + connect(KMDriverDB::self(),TQ_SIGNAL(dbLoaded(bool)),TQ_SLOT(slotDbLoaded(bool))); + connect(KMDriverDB::self(), TQ_SIGNAL(error(const TQString&)), TQ_SLOT(slotError(const TQString&))); + connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),TQ_SLOT(slotManufacturerSelected(const TQString&))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_postscript,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_raw,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotPostscriptToggled(bool))); + connect(m_other,TQ_SIGNAL(clicked()),TQ_SLOT(slotOtherClicked())); } KMDriverDbWidget::~KMDriverDbWidget() @@ -240,7 +240,7 @@ void KMDriverDbWidget::slotOtherClicked() if (driver) { m_external = filename; - disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); + disconnect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&))); m_manu->clear(); m_model->clear(); TQString s = driver->get("manufacturer"); @@ -264,7 +264,7 @@ void KMDriverDbWidget::slotOtherClicked() else { m_external = TQString::null; - connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); + connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&))); m_other->setText(i18n("Other")); m_desc = TQString::null; slotDbLoaded(true); diff --git a/tdeprint/management/kmdriverdbwidget.h b/tdeprint/management/kmdriverdbwidget.h index 05b50536d..2841fd51f 100644 --- a/tdeprint/management/kmdriverdbwidget.h +++ b/tdeprint/management/kmdriverdbwidget.h @@ -29,7 +29,7 @@ class TQPushButton; class KMDriverDbWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMDriverDbWidget(TQWidget *parent = 0, const char *name = 0); ~KMDriverDbWidget(); diff --git a/tdeprint/management/kmdriverdialog.h b/tdeprint/management/kmdriverdialog.h index 8b7b01c45..3a62619ed 100644 --- a/tdeprint/management/kmdriverdialog.h +++ b/tdeprint/management/kmdriverdialog.h @@ -27,7 +27,7 @@ class DrMain; class KMDriverDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMDriverDialog(TQWidget *parent = 0, const char *name = 0); ~KMDriverDialog(); diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 5cd37c948..bfc34570d 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -129,8 +129,8 @@ KMIconView::KMIconView(TQWidget *parent, const char *name) m_items.setAutoDelete(false); setViewMode(KMIconView::Big); - connect(this,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); - connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); + connect(this,TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); + connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); } KMIconView::~KMIconView() diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h index 1c8cb197e..ba56cabb1 100644 --- a/tdeprint/management/kmiconview.h +++ b/tdeprint/management/kmiconview.h @@ -40,14 +40,14 @@ protected: private: int m_mode; - QString m_pixmap; + TQString m_pixmap; char m_state; bool m_isclass; }; class KMIconView : public TDEIconView { - Q_OBJECT + TQ_OBJECT public: enum ViewMode { Big, Small }; diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp index bae2b6ad6..06b37713d 100644 --- a/tdeprint/management/kminfopage.cpp +++ b/tdeprint/management/kminfopage.cpp @@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) { m_title = new TQLabel(this); m_titlepixmap = new TQLabel(this); - m_titlepixmap->setAlignment(Qt::AlignCenter); + m_titlepixmap->setAlignment(TQt::AlignCenter); KSeparator* sep = new KSeparator( KSeparator::HLine, this); m_type = new TQLabel(this); m_description = new TQLabel(this); @@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) m_uri = new TQLabel(this); m_device = new TQLabel(this); TQLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this); - m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_loclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_desclabel = new TQLabel(i18n("Description:"), this); - m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_desclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_typelabel = new TQLabel(i18n("Type:"), this); - m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_typelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this); - m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_statelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_urilabel = new TQLabel(i18n("URI:"), this); - m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_urilabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); m_devlabel = new TQLabel(i18n("Device:"), this); - m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_devlabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_modellabel = new TQLabel(i18n("Model:"), this); - m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_modellabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5); TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); @@ -125,7 +125,7 @@ void KMInfoPage::setPrinter(KMPrinter *p) m_uri->setText(p->uri().prettyURL()); if (p->isClass(false)) { - QString s; + TQString s; for (TQStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it) s.append(KURL(*it).prettyURL() + ", "); s.truncate(s.length()-2); diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index 45030a587..411f86325 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -78,20 +78,20 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons btn->setText(txt); btn->setIconSet(BarIconSet(pixmap)); btn->setFlat(true); - connect(btn, TQT_SIGNAL(clicked()), receiver); + connect(btn, TQ_SIGNAL(clicked()), receiver); m_buttons.append(btn); } void KMInstancePage::initActions() { - addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew())); - addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy())); - addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove())); + addButton(i18n("New..."), "document-new", TQ_SLOT(slotNew())); + addButton(i18n("Copy..."), "edit-copy", TQ_SLOT(slotCopy())); + addButton(i18n("Remove"), "edittrash", TQ_SLOT(slotRemove())); m_buttons.append(0); - addButton(i18n("Set as Default"), "application-x-executable", TQT_SLOT(slotDefault())); - addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings())); + addButton(i18n("Set as Default"), "application-x-executable", TQ_SLOT(slotDefault())); + addButton(i18n("Settings"), "configure", TQ_SLOT(slotSettings())); m_buttons.append(0); - addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest())); + addButton(i18n("Test..."), "document-print", TQ_SLOT(slotTest())); } void KMInstancePage::setPrinter(KMPrinter *p) diff --git a/tdeprint/management/kminstancepage.h b/tdeprint/management/kminstancepage.h index 56b045fe2..67bef455e 100644 --- a/tdeprint/management/kminstancepage.h +++ b/tdeprint/management/kminstancepage.h @@ -30,7 +30,7 @@ class TQButton; class KMInstancePage : public TQWidget, public KMPrinterPage { - Q_OBJECT + TQ_OBJECT public: KMInstancePage(TQWidget *parent = 0, const char *name = 0); ~KMInstancePage(); diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 70a6c6e85..c64f765a8 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -105,7 +105,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name) resize( conf->readSizeEntry( "Size", &defSize ) ); } - connect(KMFactory::self()->manager(), TQT_SIGNAL(printerListUpdated()),TQT_SLOT(slotPrinterListUpdated())); + connect(KMFactory::self()->manager(), TQ_SIGNAL(printerListUpdated()),TQ_SLOT(slotPrinterListUpdated())); } KMJobViewer::~KMJobViewer() @@ -240,18 +240,18 @@ void KMJobViewer::init() m_view->addColumn(i18n("Status", "State")); m_view->addColumn(i18n("Size (KB)")); m_view->addColumn(i18n("Page(s)")); - m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter); - connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); + m_view->setColumnAlignment(5,TQt::AlignRight|TQt::AlignVCenter); + connect( m_view, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); //m_view->addColumn(i18n("Printer")); - //m_view->setColumnAlignment(6,Qt::AlignRight|Qt::AlignVCenter); + //m_view->setColumnAlignment(6,TQt::AlignRight|TQt::AlignVCenter); KMFactory::self()->uiManager()->setupJobViewer(m_view); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); m_view->setSorting(0); m_view->setAllColumnsShowFocus(true); m_view->setSelectionMode(TQListView::Extended); - connect(m_view,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); - connect(m_view,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int))); + connect(m_view,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); + connect(m_view,TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int))); setCentralWidget(m_view); } @@ -261,26 +261,26 @@ void KMJobViewer::init() void KMJobViewer::initActions() { // job actions - TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); - TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); - TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); - TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); + TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQ_SLOT(slotHold()),actionCollection(),"job_hold"); + TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQ_SLOT(slotResume()),actionCollection(),"job_resume"); + TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQ_SLOT(slotRemove()),actionCollection(),"job_remove"); + TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQ_SLOT(slotRestart()),actionCollection(),"job_restart"); TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move"); mact->setDelayed(false); - connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu())); + connect(mact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotMove(int))); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowMoveMenu())); TDEToggleAction *tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed"); tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowCompleted(bool))); TDEToggleAction *uact = new TDEToggleAction(i18n("Show Only User Jobs"), "preferences-desktop-personal", 0, actionCollection(), "view_user_jobs"); uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"preferences-desktop-personal")); - connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool))); + connect(uact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUserOnly(bool))); m_userfield = new TQLineEdit(0); m_userfield->setText(getenv("USER")); - connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged())); - connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool))); + connect(m_userfield, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotUserChanged())); + connect(uact, TQ_SIGNAL(toggled(bool)), m_userfield, TQ_SLOT(setEnabled(bool))); m_userfield->setEnabled(false); m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); KWidgetAction *ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username"); @@ -288,8 +288,8 @@ void KMJobViewer::initActions() if (!m_pop) { m_pop = new TQPopupMenu(this); - connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); + connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); hact->plug(m_pop); ract->plug(m_pop); m_pop->insertSeparator(); @@ -302,10 +302,10 @@ void KMJobViewer::initActions() // Filter actions TDEActionMenu *fact = new TDEActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify"); fact->setDelayed(false); - connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowPrinterMenu())); + connect(fact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int))); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowPrinterMenu())); if (!m_standalone) { @@ -324,12 +324,12 @@ void KMJobViewer::initActions() } else {// stand-alone application - KStdAction::quit(TQT_TQOBJECT(kapp),TQT_SLOT(quit()),actionCollection()); - KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(slotClose()),actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); + KStdAction::quit(kapp,TQ_SLOT(quit()),actionCollection()); + KStdAction::close(this,TQ_SLOT(slotClose()),actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); // refresh action - new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); + new TDEAction(i18n("Refresh"),"reload",0,this,TQ_SLOT(slotRefresh()),actionCollection(),"refresh"); // create status bar KStatusBar *statusbar = statusBar(); @@ -338,7 +338,7 @@ void KMJobViewer::initActions() TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); m_stickybox->setChecked(conf->readBoolEntry("KeepWindow",false)); - connect(m_stickybox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeepWindowChange(bool))); + connect(m_stickybox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeepWindowChange(bool))); statusbar->addWidget( m_stickybox, 1, false ); statusbar->insertItem(" " + i18n("Max.: %1").arg(i18n("Unlimited"))+ " ", 0, 0, true); statusbar->setItemFixed(0); @@ -617,7 +617,7 @@ void KMJobViewer::loadPluginActions() for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it) { // connect the action to this - connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int))); + connect((*it), TQ_SIGNAL(activated(int)), TQ_SLOT(pluginActionActivated(int))); // should add it to the toolbar and menubar (*it)->plug(toolBar(), toolbarindex++); diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h index f9e6ffb80..38db6c16c 100644 --- a/tdeprint/management/kmjobviewer.h +++ b/tdeprint/management/kmjobviewer.h @@ -48,7 +48,7 @@ class TQCheckBox; */ class TDEPRINT_EXPORT KMJobViewer : public TDEMainWindow, public KMPrinterPage, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMJobViewer(TQWidget *parent = 0, const char *name = 0); ~KMJobViewer(); diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 806cc0d9f..09c89d915 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -81,7 +81,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p) int st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay); m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0)); update = (oldstate != m_state); - QString name = (p->isVirtual() ? p->instanceName() : p->name()); + TQString name = (p->isVirtual() ? p->instanceName() : p->name()); if (name != text(0)) setText(0, name); setPixmap(0, SmallIcon(p->pixmap(), 0, st)); @@ -117,10 +117,10 @@ KMListView::KMListView(TQWidget *parent, const char *name) setLineWidth(1); setSorting(0); - connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int))); - connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); - connect(this,TQT_SIGNAL(onItem(TQListViewItem*)),TQT_SLOT(slotOnItem(TQListViewItem*))); - connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport())); + connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int))); + connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); + connect(this,TQ_SIGNAL(onItem(TQListViewItem*)),TQ_SLOT(slotOnItem(TQListViewItem*))); + connect(this,TQ_SIGNAL(onViewport()),TQ_SLOT(slotOnViewport())); m_root = new KMListViewItem(this,i18n("Print System")); m_root->setPixmap(0,SmallIcon("tdeprint_printer")); diff --git a/tdeprint/management/kmlistview.h b/tdeprint/management/kmlistview.h index 20ddc5731..472f0d2cc 100644 --- a/tdeprint/management/kmlistview.h +++ b/tdeprint/management/kmlistview.h @@ -28,7 +28,7 @@ class KMPrinter; class KMListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: KMListView(TQWidget *parent = 0, const char *name = 0); ~KMListView(); diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index ce3f356d8..af03b68d7 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -111,12 +111,12 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection * m_layout->addWidget(m_plugin, 0); // connections - connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer())); - connect(m_printerview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); - connect(m_printerview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&))); - connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect(KMTimer::self(),TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer())); + connect(m_printerview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); + connect(m_printerview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&))); + connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); // actions if (coll) @@ -148,7 +148,7 @@ void KMMainView::restoreSettings() TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons)); - setOrientation(conf->readNumEntry("Orientation", Qt::Vertical)); + setOrientation(conf->readNumEntry("Orientation", TQt::Vertical)); bool view = conf->readBoolEntry("ViewToolBar",false); slotToggleToolBar(view); ((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view); @@ -179,57 +179,57 @@ void KMMainView::initActions() iconlst << "view_icon" << "view_detailed" << "view_tree"; vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst); vact->setCurrentItem(0); - connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); + connect(vact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeView(int))); TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); - stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); + stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); - stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); - - new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove"); - new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); - new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); - new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); - new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); - new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); - new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); - new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); - new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh"); + stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + + new TDEAction(i18n("&Remove"),"edittrash",0,this,TQ_SLOT(slotRemove()),m_actions,"printer_remove"); + new TDEAction(i18n("&Configure..."),"configure",0,this,TQ_SLOT(slotConfigure()),m_actions,"printer_configure"); + new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQ_SLOT(slotAdd()),m_actions,"printer_add"); + new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQ_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQ_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQ_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQ_SLOT(slotTest()),m_actions,"printer_test"); + new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQ_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQ_SLOT(slotInit()),m_actions,"view_refresh"); TDEIconSelectAction *dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); iconlst.clear(); iconlst << "view_top_bottom" << "view_left_right"; dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst); dact->setCurrentItem(0); - connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); + connect(dact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeDirection(int))); - new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); - new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); - new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); + new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQ_SLOT(slotServerRestart()),m_actions,"server_restart"); + new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotToggleToolBar(bool))); tact = new TDEToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" ); tact->setCheckedState(i18n("Hide Me&nu Toolbar")); - connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) ); + connect( tact, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotToggleMenuBar( bool ) ) ); tact = new TDEToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos"); tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos")); tact->setChecked(true); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowPrinterInfos(bool))); tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter"); tact->setChecked(KMManager::self()->isFilterEnabled()); - connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); + connect(tact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool))); TDEActionMenu *mact = new TDEActionMenu(i18n("Pri&nter Tools"), "applications-utilities", m_actions, "printer_tool"); mact->setDelayed(false); - connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); + connect(mact->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotToolSelected(int))); TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { @@ -493,7 +493,7 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p void KMMainView::slotChangePrinterState() { - TQString opname = TQT_TQOBJECT_CONST(sender())->name(); + TQString opname = sender()->name(); if (m_current && opname.startsWith("printer_")) { opname = opname.mid(8); @@ -608,13 +608,13 @@ void KMMainView::slotSoftDefault() void KMMainView::setOrientation(int o) { - int ID = (o == Qt::Horizontal ? 1 : 0); + int ID = (o == TQt::Horizontal ? 1 : 0); ((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID); slotChangeDirection(ID); } int KMMainView::orientation() const -{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); } +{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? TQt::Horizontal : TQt::Vertical); } void KMMainView::slotChangeDirection(int d) { @@ -776,7 +776,7 @@ void KMMainView::reload() loadPluginActions(); // redo the connection as the old manager object has been removed - connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); // We must delay the refresh such that all objects has been // correctly reloaded (otherwise, crash in KMJobViewer). @@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID) { TQStringList args; args << m_current->device() << m_current->printerName(); - KDialogBase *dlg = static_cast<KDialogBase*>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "Tool", 0, args))); + KDialogBase *dlg = static_cast<KDialogBase*>(factory->create(this, "Tool", 0, args)); if (dlg) dlg->exec(); delete dlg; diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h index b35e7ef0f..9c55fe433 100644 --- a/tdeprint/management/kmmainview.h +++ b/tdeprint/management/kmmainview.h @@ -52,7 +52,7 @@ class TQMenuBar; */ class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMMainView(TQWidget *parent = 0, const char *name = 0, TDEActionCollection *coll = 0); ~KMMainView(); diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp index d311f75c3..c937d3875 100644 --- a/tdeprint/management/kmprinterview.cpp +++ b/tdeprint/management/kmprinterview.cpp @@ -39,12 +39,12 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) m_current = TQString(); m_listset = false; - connect(m_iconview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); - connect(m_listview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); - connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&))); - connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&))); - connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); - connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); + connect(m_iconview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); + connect(m_listview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); + connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&))); + connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&))); + connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); + connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); setViewType(m_type); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); @@ -85,7 +85,7 @@ void KMPrinterView::setViewType(ViewType t) default: break; } - QString oldcurrent = m_current; + TQString oldcurrent = m_current; if ( m_listset ) setPrinterList(KMManager::self()->printerList(false)); if (m_type == KMPrinterView::Tree) diff --git a/tdeprint/management/kmprinterview.h b/tdeprint/management/kmprinterview.h index 14354a3b5..b73bc46da 100644 --- a/tdeprint/management/kmprinterview.h +++ b/tdeprint/management/kmprinterview.h @@ -30,7 +30,7 @@ class TQIconViewItem; class KMPrinterView : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: enum ViewType { Icons = 0, List, Tree }; @@ -55,7 +55,7 @@ private: KMIconView *m_iconview; KMListView *m_listview; ViewType m_type; - QString m_current; + TQString m_current; bool m_listset; }; diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp index c94838098..b1a993893 100644 --- a/tdeprint/management/kmpropcontainer.cpp +++ b/tdeprint/management/kmpropcontainer.cpp @@ -53,9 +53,9 @@ void KMPropContainer::setWidget(KMPropWidget *w) { m_widget = w; m_widget->reparent(this,TQPoint(0,0)); - connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange())); - connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool))); - connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool))); + connect(m_button,TQ_SIGNAL(clicked()),m_widget,TQ_SLOT(slotChange())); + connect(m_widget,TQ_SIGNAL(enable(bool)),TQ_SIGNAL(enable(bool))); + connect(m_widget,TQ_SIGNAL(enableChange(bool)),TQ_SLOT(slotEnableChange(bool))); TQVBoxLayout *lay = dynamic_cast<TQVBoxLayout*>(layout()); if (lay) { diff --git a/tdeprint/management/kmpropcontainer.h b/tdeprint/management/kmpropcontainer.h index d191dfeb6..eadcde1e3 100644 --- a/tdeprint/management/kmpropcontainer.h +++ b/tdeprint/management/kmpropcontainer.h @@ -28,7 +28,7 @@ class KMPrinter; class KMPropContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMPropContainer(TQWidget *parent = 0, const char *name = 0); ~KMPropContainer(); diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp index 6f20494fc..7fc31d977 100644 --- a/tdeprint/management/kmpropdriver.cpp +++ b/tdeprint/management/kmpropdriver.cpp @@ -44,7 +44,7 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name) main_->setRowStretch(3,1); main_->addWidget(l1,0,0); main_->addWidget(l2,1,0); - main_->addWidget(l3,2,0,Qt::AlignTop|Qt::AlignLeft); + main_->addWidget(l3,2,0,TQt::AlignTop|TQt::AlignLeft); main_->addWidget(m_manufacturer,0,1); main_->addWidget(m_model,1,1); main_->addWidget(m_driverinfo,2,1); diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index c38b399c6..eefa38372 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -55,7 +55,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) m_widgets.append(w); KMPropContainer *ctn = new KMPropContainer(this,"Container"); ctn->setWidget(w); - connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); + connect(ctn,TQ_SIGNAL(enable(bool)),TQ_SLOT(slotEnable(bool))); TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h index 5acee87fd..c54011d25 100644 --- a/tdeprint/management/kmpropertypage.h +++ b/tdeprint/management/kmpropertypage.h @@ -31,7 +31,7 @@ class KMPrinter; class TDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMPropertyPage(TQWidget *parent = 0, const char *name = 0); ~KMPropertyPage(); diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp index 50c1a75e8..c38b4c186 100644 --- a/tdeprint/management/kmpropwidget.cpp +++ b/tdeprint/management/kmpropwidget.cpp @@ -34,7 +34,7 @@ KMPropWidget::KMPropWidget(TQWidget *parent, const char *name) m_printer = 0; m_canchange = ((KMFactory::self()->manager()->printerOperationMask() & KMManager::PrinterCreation) && KMFactory::self()->manager()->hasManagement()); - connect(this,TQT_SIGNAL(enable(bool)),this,TQT_SIGNAL(enableChange(bool))); + connect(this,TQ_SIGNAL(enable(bool)),this,TQ_SIGNAL(enableChange(bool))); } KMPropWidget::~KMPropWidget() diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h index 9d418066a..3c8d0050d 100644 --- a/tdeprint/management/kmpropwidget.h +++ b/tdeprint/management/kmpropwidget.h @@ -29,7 +29,7 @@ class KMWizard; class TDEPRINT_EXPORT KMPropWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMPropWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KMPropWidget(); @@ -53,9 +53,9 @@ protected: virtual void configureWizard(KMWizard*); protected: - QString m_pixmap; - QString m_title; - QString m_header; + TQString m_pixmap; + TQString m_title; + TQString m_header; KMPrinter *m_printer; bool m_canchange; }; diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp index db6dc1486..3f2a22a75 100644 --- a/tdeprint/management/kmspecialprinterdlg.cpp +++ b/tdeprint/management/kmspecialprinterdlg.cpp @@ -50,7 +50,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) // widget creation m_name = new TQLineEdit(dummy); - connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & ))); + connect(m_name, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotTextChanged(const TQString & ))); m_description = new TQLineEdit(dummy); m_location = new TQLineEdit(dummy); TQLabel *m_namelabel = new TQLabel(i18n("&Name:"), dummy); @@ -63,10 +63,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, dummy); sep->setFixedHeight(10); - TQGroupBox *m_gb = new TQGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy); + TQGroupBox *m_gb = new TQGroupBox(1, TQt::Horizontal, i18n("Command &Settings"), dummy); m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this); - TQGroupBox *m_outfile_gb = new TQGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy ); + TQGroupBox *m_outfile_gb = new TQGroupBox( 0, TQt::Horizontal, i18n( "Outp&ut File" ), dummy ); m_usefile = new TQCheckBox( i18n("&Enable output file"), m_outfile_gb); @@ -92,10 +92,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) m_icon->setIcon("document-print"); m_icon->setFixedSize(TQSize(48,48)); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extension, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extensionlabel, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetype, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extension, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extensionlabel, TQ_SLOT( setEnabled( bool ) ) ); m_mimetypelabel->setEnabled( false ); m_mimetype->setEnabled( false ); m_extensionlabel->setEnabled( false ); @@ -125,10 +125,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) // layout creation TQVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10); TQGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5); - l0->addLayout(TQT_TQLAYOUT(l1)); + l0->addLayout(l1); l1->setColStretch(2,1); l1->addColSpacing(0,60); - l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, Qt::AlignCenter); + l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, TQt::AlignCenter); l1->addWidget(m_namelabel, 0, 1); l1->addWidget(m_desclabel, 1, 1); l1->addWidget(m_loclabel, 2, 1); diff --git a/tdeprint/management/kmspecialprinterdlg.h b/tdeprint/management/kmspecialprinterdlg.h index 3d334c7fd..efa927474 100644 --- a/tdeprint/management/kmspecialprinterdlg.h +++ b/tdeprint/management/kmspecialprinterdlg.h @@ -31,7 +31,7 @@ class KXmlCommandSelector; class KMSpecialPrinterDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMSpecialPrinterDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp index a0b1aa78d..a8ef55ee0 100644 --- a/tdeprint/management/kmtimer.cpp +++ b/tdeprint/management/kmtimer.cpp @@ -37,7 +37,7 @@ KMTimer* KMTimer::self() KMTimer::KMTimer(TQObject *parent, const char *name) : TQTimer(parent, name), m_count(0) { - connect(this, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(this, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); } KMTimer::~KMTimer() diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h index 0c2e0169a..d64c9c091 100644 --- a/tdeprint/management/kmtimer.h +++ b/tdeprint/management/kmtimer.h @@ -36,7 +36,7 @@ */ class TDEPRINT_EXPORT KMTimer : public TQTimer { - Q_OBJECT + TQ_OBJECT public: void delay(int t); ~KMTimer(); diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp index e04467632..e7ff0faff 100644 --- a/tdeprint/management/kmwclass.cpp +++ b/tdeprint/management/kmwclass.cpp @@ -46,8 +46,8 @@ KMWClass::KMWClass(TQWidget *parent, const char *name) TQToolButton *remove = new TQToolButton(this); add->setIconSet(BarIcon("forward")); remove->setIconSet(BarIcon("back")); - connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd())); - connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove())); + connect(add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAdd())); + connect(remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemove())); TQLabel *l1 = new TQLabel(i18n("Available printers:"), this); TQLabel *l2 = new TQLabel(i18n("Class printers:"), this); diff --git a/tdeprint/management/kmwclass.h b/tdeprint/management/kmwclass.h index a74f20117..286f930e7 100644 --- a/tdeprint/management/kmwclass.h +++ b/tdeprint/management/kmwclass.h @@ -26,7 +26,7 @@ class TDEListBox; class KMWClass : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWClass(TQWidget *parent = 0, const char *name = 0); ~KMWClass(); diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index cc52f1015..8d4e1e802 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -44,7 +44,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name) "you want to use. You will have the opportunity to test it as well as to " "change it if necessary.</p>")); m_drivercomment = new KPushButton(i18n("Driver Information"), this); - connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment())); + connect(m_drivercomment, TQ_SIGNAL(clicked()), TQ_SLOT(slotDriverComment())); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(l1,0); diff --git a/tdeprint/management/kmwdriverselect.h b/tdeprint/management/kmwdriverselect.h index 9c78008c1..6419232dd 100644 --- a/tdeprint/management/kmwdriverselect.h +++ b/tdeprint/management/kmwdriverselect.h @@ -28,7 +28,7 @@ class TQPushButton; class KMWDriverSelect : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWDriverSelect(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 73871988a..dcc83d661 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -65,14 +65,14 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) TQGridLayout *lay2 = new TQGridLayout(0, 3, 3, 0, 0); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); lay1->addWidget(l0,0); - lay1->addLayout(TQT_TQLAYOUT(lay2),0); + lay1->addLayout(lay2,0); lay1->addLayout(lay3,0); lay1->addStretch(1); lay2->setColStretch(2,1); lay2->addColSpacing(1,10); lay2->addWidget(l1,0,0); lay2->addWidget(l2,1,0); - lay2->addWidget(l3,2,0,Qt::AlignLeft|Qt::AlignTop); + lay2->addWidget(l3,2,0,TQt::AlignLeft|TQt::AlignTop); lay2->addWidget(m_manufacturer,0,2); lay2->addWidget(m_model,1,2); lay2->addWidget(m_driverinfo,2,2); @@ -80,8 +80,8 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) lay3->addWidget(m_settings,0); lay3->addStretch(1); - connect(m_test,TQT_SIGNAL(clicked()),TQT_SLOT(slotTest())); - connect(m_settings,TQT_SIGNAL(clicked()),TQT_SLOT(slotSettings())); + connect(m_test,TQ_SIGNAL(clicked()),TQ_SLOT(slotTest())); + connect(m_settings,TQ_SIGNAL(clicked()),TQ_SLOT(slotSettings())); } KMWDriverTest::~KMWDriverTest() diff --git a/tdeprint/management/kmwdrivertest.h b/tdeprint/management/kmwdrivertest.h index 5c1aefaee..4bf68f06a 100644 --- a/tdeprint/management/kmwdrivertest.h +++ b/tdeprint/management/kmwdrivertest.h @@ -28,7 +28,7 @@ class DrMain; class KMWDriverTest : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWDriverTest(TQWidget *parent = 0, const char *name = 0); ~KMWDriverTest(); diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp index bc894c478..87f2e21f2 100644 --- a/tdeprint/management/kmwizard.cpp +++ b/tdeprint/management/kmwizard.cpp @@ -74,10 +74,10 @@ KMWizard::KMWizard(TQWidget *parent, const char *name) KSeparator* sep2 = new KSeparator( KSeparator::HLine, this); TQPushButton *m_help = new KPushButton(KStdGuiItem::help(), this); - connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject())); - connect(m_next,TQT_SIGNAL(clicked()),TQT_SLOT(slotNext())); - connect(m_prev,TQT_SIGNAL(clicked()),TQT_SLOT(slotPrev())); - connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp())); + connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject())); + connect(m_next,TQ_SIGNAL(clicked()),TQ_SLOT(slotNext())); + connect(m_prev,TQ_SIGNAL(clicked()),TQ_SLOT(slotPrev())); + connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp())); m_side = new SidePixmap(this); if (!m_side->isValid()) diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h index 171158b37..63849c5bb 100644 --- a/tdeprint/management/kmwizard.h +++ b/tdeprint/management/kmwizard.h @@ -36,7 +36,7 @@ class SidePixmap; class TDEPRINT_EXPORT KMWizard : public TQDialog { - Q_OBJECT + TQ_OBJECT public: enum PageType { Start = 0, diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h index b02dbe9fe..f2a2565d6 100644 --- a/tdeprint/management/kmwizardpage.h +++ b/tdeprint/management/kmwizardpage.h @@ -28,7 +28,7 @@ class KMPrinter; class TDEPRINT_EXPORT KMWizardPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMWizardPage(TQWidget *parent = 0, const char *name = 0); virtual ~KMWizardPage(); @@ -43,7 +43,7 @@ public: bool needsInitOnBack() { return m_needsinitonback; } protected: - QString m_title; + TQString m_title; int m_ID; int m_nextpage; bool m_needsinitonback; diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp index a3180000f..dce5fef41 100644 --- a/tdeprint/management/kmwlocal.cpp +++ b/tdeprint/management/kmwlocal.cpp @@ -50,10 +50,10 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name) TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); root->setPixmap(0, SmallIcon("tdeprint_computer")); root->setOpen(true); - connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); + connect(m_ports, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotPortSelected(TQListViewItem*))); TQLabel *l1 = new TQLabel(i18n("URI:"), this); m_localuri = new TQLineEdit(this); - connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_localuri, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotTextChanged( const TQString& ) ) ); m_parents[0] = new TQListViewItem(root, i18n("Parallel")); m_parents[1] = new TQListViewItem(root, m_parents[0], i18n("Serial")); m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB")); diff --git a/tdeprint/management/kmwlocal.h b/tdeprint/management/kmwlocal.h index e65128747..0216fae8f 100644 --- a/tdeprint/management/kmwlocal.h +++ b/tdeprint/management/kmwlocal.h @@ -30,7 +30,7 @@ class TQListViewItem; class KMWLocal : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWLocal(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp index 3c4794ad1..631d4253b 100644 --- a/tdeprint/management/kmwlpd.cpp +++ b/tdeprint/management/kmwlpd.cpp @@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg) void KMWLpd::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); + TQString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); p->setDevice(dev); } @@ -81,12 +81,12 @@ bool checkLpdQueue(const char *host, const char *queue) char res[64] = {0}; snprintf(res,64,"%c%s\n",(char)4,queue); - if (sock.tqwriteBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) + if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) return false; char buf[1024] = {0}; int n, tot(1); - while ((n = sock.tqreadBlock(res, 63)) > 0) + while ((n = sock.readBlock(res, 63)) > 0) { res[n] = 0; tot += n; diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp index e8378371a..88f8fb416 100644 --- a/tdeprint/management/kmwname.cpp +++ b/tdeprint/management/kmwname.cpp @@ -50,7 +50,7 @@ bool KMWName::isValid(TQString& msg) } else if (text(0).find(TQRegExp("\\s")) != -1) { - QString conv = text(0); + TQString conv = text(0); conv.replace(TQRegExp("\\s"), ""); int result = KMessageBox::warningYesNoCancel(this, i18n("It is usually not a good idea to include spaces " diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp index 3cd71aadd..f7340b71b 100644 --- a/tdeprint/management/kmwpassword.cpp +++ b/tdeprint/management/kmwpassword.cpp @@ -63,8 +63,8 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name) m_login->setEnabled(false); m_password->setEnabled(false); - connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool))); - connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool))); + connect(btn3,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setEnabled(bool))); + connect(btn3,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setEnabled(bool))); // layout TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 ); @@ -72,7 +72,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name) main_->addSpacing( 10 ); main_->addWidget( m_btngroup ); TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 ); - main_->addLayout( TQT_TQLAYOUT(l1) ); + main_->addLayout( l1 ); main_->addStretch( 1 ); l1->setColSpacing( 0, 35 ); l1->setColStretch( 2, 1 ); diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp index 44b2f493c..94bffc2b8 100644 --- a/tdeprint/management/kmwsmb.cpp +++ b/tdeprint/management/kmwsmb.cpp @@ -51,7 +51,7 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); - lay0->addLayout(TQT_TQLAYOUT(lay1),0); + lay0->addLayout(lay1,0); lay0->addWidget(m_view,1); lay0->addLayout(lay3,0); lay0->addSpacing(10); @@ -67,10 +67,10 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name) lay3->addWidget(m_scan); lay3->addWidget(m_abort); - connect(m_scan,TQT_SIGNAL(clicked()),TQT_SLOT(slotScan())); - connect(m_abort,TQT_SIGNAL(clicked()),TQT_SLOT(slotAbort())); - connect(m_view,TQT_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&))); - connect(m_view,TQT_SIGNAL(running(bool)),m_abort,TQT_SLOT(setEnabled(bool))); + connect(m_scan,TQ_SIGNAL(clicked()),TQ_SLOT(slotScan())); + connect(m_abort,TQ_SIGNAL(clicked()),TQ_SLOT(slotAbort())); + connect(m_view,TQ_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&))); + connect(m_view,TQ_SIGNAL(running(bool)),m_abort,TQ_SLOT(setEnabled(bool))); } bool KMWSmb::isValid(TQString& msg) diff --git a/tdeprint/management/kmwsmb.h b/tdeprint/management/kmwsmb.h index 695379a79..e8c5361ec 100644 --- a/tdeprint/management/kmwsmb.h +++ b/tdeprint/management/kmwsmb.h @@ -28,7 +28,7 @@ class TQLabel; class KMWSmb : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWSmb(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp index a3fb71b3d..6692d8785 100644 --- a/tdeprint/management/kmwsocket.cpp +++ b/tdeprint/management/kmwsocket.cpp @@ -60,11 +60,11 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(40); - connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) ); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); + connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) ); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) ); // layout TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); diff --git a/tdeprint/management/kmwsocket.h b/tdeprint/management/kmwsocket.h index 7489d6ec7..b765c594d 100644 --- a/tdeprint/management/kmwsocket.h +++ b/tdeprint/management/kmwsocket.h @@ -29,7 +29,7 @@ class NetworkScanner; class KMWSocket : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWSocket(TQWidget *parent = 0, const char *name = 0); ~KMWSocket(); diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp index 02b0a6b69..27c7bba47 100644 --- a/tdeprint/management/kmwsocketutil.cpp +++ b/tdeprint/management/kmwsocketutil.cpp @@ -58,7 +58,7 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na mm->setFixedWidth(fontMetrics().width(mm->text())+10); mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + mask_->setAlignment(TQt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); diff --git a/tdeprint/management/kmwsocketutil.h b/tdeprint/management/kmwsocketutil.h index dfb9f490e..a0194e5c9 100644 --- a/tdeprint/management/kmwsocketutil.h +++ b/tdeprint/management/kmwsocketutil.h @@ -26,8 +26,8 @@ struct SocketInfo { - QString IP; - QString Name; + TQString IP; + TQString Name; int Port; }; @@ -39,7 +39,7 @@ class KMWSocketUtil; class SocketConfig : public KDialogBase { friend class KMWSocketUtil; - Q_OBJECT + TQ_OBJECT public: SocketConfig(KMWSocketUtil *util, TQWidget *parent = 0, const char *name = 0); ~SocketConfig(); diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index 1fe9a51f2..1b0ecb183 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -125,7 +125,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam m_commandlab->setBuddy(m_command); m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy ); - TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy); + TQGroupBox *gb = new TQGroupBox(0, TQt::Horizontal, i18n("Va&lues"), m_dummy); m_stack = new TQWidgetStack(gb); TQWidget *w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack); m_stack->addWidget(w1, 1); @@ -159,8 +159,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam KSeparator *sep1 = new KSeparator(KSeparator::HLine, m_dummy); - TQGroupBox *gb_input = new TQGroupBox(0, Qt::Horizontal, i18n("&Input From"), this); - TQGroupBox *gb_output = new TQGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this); + TQGroupBox *gb_input = new TQGroupBox(0, TQt::Horizontal, i18n("&Input From"), this); + TQGroupBox *gb_output = new TQGroupBox(0, TQt::Horizontal, i18n("O&utput To"), this); TQLabel *m_inputfilelab = new TQLabel(i18n("File:"), gb_input); TQLabel *m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input); TQLabel *m_outputfilelab = new TQLabel(i18n("File:"), gb_output); @@ -184,7 +184,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam TQHBoxLayout *l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQGridLayout *l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); l2->addLayout(l0, 1); - l0->addLayout(TQT_TQLAYOUT(l10)); + l0->addLayout(l10); l10->addMultiCellWidget(m_view, 0, 0, 0, 1); l10->addWidget(gb_input, 1, 0); l10->addWidget(gb_output, 1, 1); @@ -201,16 +201,16 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l7->addStretch(1); l0->addWidget(m_dummy, 1); TQGridLayout *l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint()); - l1->addWidget(m_desclab, 0, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_desclab, 0, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_desc, 0, 1); l1->addMultiCellWidget(sep1, 1, 1, 0, 1); - l1->addWidget(m_namelab, 2, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_namelab, 2, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_name, 2, 1); - l1->addWidget(m_typelab, 3, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_typelab, 3, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_type, 3, 1); - l1->addWidget(m_formatlab, 4, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_formatlab, 4, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_format, 4, 1); - l1->addWidget(m_defaultlab, 5, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_defaultlab, 5, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_default, 5, 1); l1->addWidget( m_persistent, 6, 1 ); l1->addMultiCellWidget(gb, 7, 7, 0, 1); @@ -225,8 +225,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l6->addStretch(1); TQGridLayout *l5 = new TQGridLayout(w1, 3, 2, 0, KDialog::spacingHint()); l5->setRowStretch(2, 1); - l5->addWidget(m_editlab1, 0, 0, Qt::AlignRight|Qt::AlignVCenter); - l5->addWidget(m_editlab2, 1, 0, Qt::AlignRight|Qt::AlignVCenter); + l5->addWidget(m_editlab1, 0, 0, TQt::AlignRight|TQt::AlignVCenter); + l5->addWidget(m_editlab2, 1, 0, TQt::AlignRight|TQt::AlignVCenter); l5->addWidget(m_edit1, 0, 1); l5->addWidget(m_edit2, 1, 1); @@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l9->addWidget(m_outputfile, 0, 1); l9->addWidget(m_outputpipe, 1, 1); - TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout())); + TQVBoxLayout *l11 = new TQVBoxLayout(gb->layout()); l11->addWidget(m_stack); TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); @@ -252,29 +252,29 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l12->addWidget( m_commentlab ); l12->addWidget( m_comment ); - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelectionChanged(TQListViewItem*))); - connect(m_values, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotValueSelected(TQListViewItem*))); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddValue())); - connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveValue())); - connect(m_apply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyChanges())); - connect(m_addgrp, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddGroup())); - connect(m_addopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddOption())); - connect(m_delopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveItem())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); - connect(m_command, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotCommandChanged(const TQString&))); - connect(m_view, TQT_SIGNAL(itemRenamed(TQListViewItem*,int)), TQT_SLOT(slotOptionRenamed(TQListViewItem*,int))); - connect(m_desc, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_format, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_default, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_edit1, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_edit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect( m_persistent, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_values, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotValueSelected(TQListViewItem*))); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); + connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddValue())); + connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveValue())); + connect(m_apply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyChanges())); + connect(m_addgrp, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddGroup())); + connect(m_addopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddOption())); + connect(m_delopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveItem())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown())); + connect(m_command, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotCommandChanged(const TQString&))); + connect(m_view, TQ_SIGNAL(itemRenamed(TQListViewItem*,int)), TQ_SLOT(slotOptionRenamed(TQListViewItem*,int))); + connect(m_desc, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_format, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_default, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_edit1, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_edit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect( m_persistent, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); m_dummy->setEnabled(false); viewItem(0); @@ -836,8 +836,8 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) TQWidget *dummy = new TQWidget(this, "TopDetail"); TQWidget *topmain = new TQWidget(this, "TopMain"); - TQGroupBox *m_gb1 = new TQGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy); - TQGroupBox *m_gb2 = new TQGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain); + TQGroupBox *m_gb1 = new TQGroupBox(0, TQt::Horizontal, i18n("Supported &Input Formats"), dummy); + TQGroupBox *m_gb2 = new TQGroupBox(0, TQt::Horizontal, i18n("Requirements"), topmain); m_description = new TQLineEdit(topmain); m_idname = new TQLabel(topmain); @@ -877,7 +877,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(topmain, 0, 10); TQGridLayout *l5 = new TQGridLayout(0, 2, 2, 0, 5); - l0->addLayout(TQT_TQLAYOUT(l5)); + l0->addLayout(l5); l5->addWidget(m_idnamelab, 0, 0); l5->addWidget(m_idname, 0, 1); l5->addWidget(m_desclab, 1, 0); @@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l6->addWidget(m_mimetypelab, 0); l6->addWidget(m_mimetype, 1); l7->addWidget(m_gb1); - TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10); + TQGridLayout *l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10); l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2); l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0); l2->addWidget(m_addmime, 1, 1); l2->addWidget(m_removemime, 2, 1); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); - TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10); + TQHBoxLayout *l4 = new TQHBoxLayout(m_gb2->layout(), 10); l4->addWidget(m_requirements); TQVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); l4->addLayout(l8); @@ -910,14 +910,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l8->addWidget(m_removereq); l8->addStretch(1); - connect(m_addmime, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddMime())); - connect(m_removemime, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveMime())); - connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); - connect(m_requirements, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotReqSelected(TQListViewItem*))); - connect(m_availablemime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotAvailableSelected(TQListBoxItem*))); - connect(m_selectedmime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotSelectedSelected(TQListBoxItem*))); - connect(m_addreq, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddReq())); - connect(m_removereq, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveReq())); + connect(m_addmime, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddMime())); + connect(m_removemime, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveMime())); + connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand())); + connect(m_requirements, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotReqSelected(TQListViewItem*))); + connect(m_availablemime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotAvailableSelected(TQListBoxItem*))); + connect(m_selectedmime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotSelectedSelected(TQListBoxItem*))); + connect(m_addreq, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddReq())); + connect(m_removereq, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveReq())); KMimeType::List list = KMimeType::allMimeTypes(); for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it) diff --git a/tdeprint/management/kxmlcommanddlg.h b/tdeprint/management/kxmlcommanddlg.h index d69c19e62..d4c574514 100644 --- a/tdeprint/management/kxmlcommanddlg.h +++ b/tdeprint/management/kxmlcommanddlg.h @@ -42,7 +42,7 @@ class KXmlCommand; class KXmlCommandAdvancedDlg : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KXmlCommandAdvancedDlg(TQWidget *parent = 0, const char *name = 0); ~KXmlCommandAdvancedDlg(); @@ -93,7 +93,7 @@ private: class KXmlCommandDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KXmlCommandDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index 95f2b94a7..71ae148c3 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/management/kxmlcommandselector.cpp @@ -44,19 +44,19 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const : TQWidget(parent, name) { m_cmd = new TQComboBox(this); - connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int))); + connect(m_cmd, TQ_SIGNAL(activated(int)), TQ_SLOT(slotCommandSelected(int))); TQPushButton *m_add = new KPushButton(this); TQPushButton *m_edit = new KPushButton(this); m_add->setPixmap(SmallIcon("document-new")); m_edit->setPixmap(SmallIcon("configure")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand())); - connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddCommand())); + connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand())); TQToolTip::add(m_add, i18n("New command")); TQToolTip::add(m_edit, i18n("Edit command")); m_shortinfo = new TQLabel(this); m_helpbtn = new KPushButton( this ); m_helpbtn->setIconSet( SmallIconSet( "help" ) ); - connect( m_helpbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHelpCommand() ) ); + connect( m_helpbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHelpCommand() ) ); TQToolTip::add( m_helpbtn, i18n( "Information" ) ); m_helpbtn->setEnabled( false ); @@ -71,14 +71,14 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const m_line = new TQLineEdit(this); m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this); m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this); - connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_browse, TQT_SLOT(setDisabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_cmd, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_add, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_edit, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_shortinfo, TQT_SLOT(setEnabled(bool))); - connect( m_usefilter, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotXmlCommandToggled( bool ) ) ); + connect(m_browse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse())); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_line, TQ_SLOT(setDisabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_browse, TQ_SLOT(setDisabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_cmd, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_add, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_edit, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_shortinfo, TQ_SLOT(setEnabled(bool))); + connect( m_usefilter, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotXmlCommandToggled( bool ) ) ); m_usefilter->setChecked(true); m_usefilter->setChecked(false); //setFocusProxy(m_line); @@ -91,7 +91,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const l1->addWidget(m_line); l1->addWidget(m_browse); - KSeparator *sep = new KSeparator(Qt::Horizontal, this); + KSeparator *sep = new KSeparator(TQt::Horizontal, this); l0->addWidget(sep); } else @@ -99,7 +99,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const TQGridLayout *l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5); int c(0); - l0->addLayout(TQT_TQLAYOUT(l2)); + l0->addLayout(l2); if (m_usefilter) { l2->addWidget(m_usefilter, 0, c++); @@ -115,7 +115,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const l3->addWidget(m_edit); if ( dlg ) - connect( this, TQT_SIGNAL( commandValid( bool ) ), dlg, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( this, TQ_SIGNAL( commandValid( bool ) ), dlg, TQ_SLOT( enableButtonOK( bool ) ) ); loadCommands(); } diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h index 5b2d109ea..40b8f4bd3 100644 --- a/tdeprint/management/kxmlcommandselector.h +++ b/tdeprint/management/kxmlcommandselector.h @@ -34,7 +34,7 @@ class KDialogBase; class TDEPRINT_EXPORT KXmlCommandSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KXmlCommandSelector(bool canBeNull = true, TQWidget *parent = 0, const char *name = 0, KDialogBase *dlg = 0); diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp index ec859dc63..f9d7e585f 100644 --- a/tdeprint/management/networkscanner.cpp +++ b/tdeprint/management/networkscanner.cpp @@ -104,7 +104,7 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this ); d->timer = new TQTimer( this ); #ifdef USE_QSOCKET - d->socket = new TQSocket( TQT_TQOBJECT(this) ); + d->socket = new TQSocket( this ); #else d->socket = new KExtendedSocket(); #endif @@ -118,15 +118,15 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) l0->addWidget( d->settings, 3, 0 ); l0->addWidget( d->scan, 3, 1 ); - connect( d->timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) ); - connect( d->settings, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSettingsClicked() ) ); - connect( d->scan, TQT_SIGNAL( clicked() ), TQT_SLOT( slotScanClicked() ) ); + connect( d->timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) ); + connect( d->settings, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSettingsClicked() ) ); + connect( d->scan, TQ_SIGNAL( clicked() ), TQ_SLOT( slotScanClicked() ) ); #ifdef USE_QSOCKET - connect( d->socket, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnectionSuccess() ) ); - connect( d->socket, TQT_SIGNAL( error( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQ_SIGNAL( error( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); #else - connect( d->socket, TQT_SIGNAL( connectionSuccess() ), TQT_SLOT( slotConnectionSuccess() ) ); - connect( d->socket, TQT_SIGNAL( connectionFailed( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQ_SIGNAL( connectionSuccess() ), TQ_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQ_SIGNAL( connectionFailed( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); #endif } @@ -219,7 +219,7 @@ void NetworkScanner::next() else { d->bar->setProgress( d->currentaddress ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotNext() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotNext() ) ); } } @@ -344,7 +344,7 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char * mm->setFixedWidth(fontMetrics().width(mm->text())+10); mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + mask_->setAlignment(TQt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); diff --git a/tdeprint/management/networkscanner.h b/tdeprint/management/networkscanner.h index 80a017676..7218472a5 100644 --- a/tdeprint/management/networkscanner.h +++ b/tdeprint/management/networkscanner.h @@ -27,7 +27,7 @@ class TDEPRINT_EXPORT NetworkScanner : public TQWidget { - Q_OBJECT + TQ_OBJECT public: NetworkScanner( int port = 9100, TQWidget *parent = 0, const char *name = 0 ); @@ -77,7 +77,7 @@ class TQComboBox; class NetworkScannerConfig : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NetworkScannerConfig(NetworkScanner *scanner, const char *name = 0); diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp index 377a28217..3a19b6262 100644 --- a/tdeprint/management/pluginaction.cpp +++ b/tdeprint/management/pluginaction.cpp @@ -23,7 +23,7 @@ PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name) : TDEAction(txt, icon, accel, parent, name), m_id(ID) { - connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated())); + connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActivated())); } void PluginAction::slotActivated() diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h index 0f87460fd..d8aa98ca6 100644 --- a/tdeprint/management/pluginaction.h +++ b/tdeprint/management/pluginaction.h @@ -24,7 +24,7 @@ class TDEPRINT_EXPORT PluginAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent = 0, const char *name = 0); diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index f5977bfb0..0363c6338 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -52,9 +52,9 @@ SmbView::SmbView(TQWidget *parent, const char *name) m_proc = new TDEProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotSelectionChanged(TQListViewItem*))); } SmbView::~SmbView() diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h index 51193254e..7eb7623cb 100644 --- a/tdeprint/management/smbview.h +++ b/tdeprint/management/smbview.h @@ -27,7 +27,7 @@ class KTempFile; class SmbView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: SmbView(TQWidget *parent = 0, const char *name = 0); ~SmbView(); diff --git a/tdeprint/marginpreview.cpp b/tdeprint/marginpreview.cpp index 45f70b7f1..20fa3574b 100644 --- a/tdeprint/marginpreview.cpp +++ b/tdeprint/marginpreview.cpp @@ -37,16 +37,16 @@ static void draw3DPage(TQPainter *p, TQRect r) { // draw white page - p->fillRect(r,Qt::white); + p->fillRect(r,TQt::white); // draw 3D border - p->setPen(Qt::black); + p->setPen(TQt::black); p->moveTo(r.left(),r.bottom()); p->lineTo(r.right(),r.bottom()); p->lineTo(r.right(),r.top()); - p->setPen(Qt::darkGray); + p->setPen(TQt::darkGray); p->lineTo(r.left(),r.top()); p->lineTo(r.left(),r.bottom()); - p->setPen(Qt::gray); + p->setPen(TQt::gray); p->moveTo(r.left()+1,r.bottom()-1); p->lineTo(r.right()-1,r.bottom()-1); p->lineTo(r.right()-1,r.top()+1); @@ -189,7 +189,7 @@ void MarginPreview::mouseMoveEvent(TQMouseEvent *e) if (nopreview_ || state_ == Fixed) return; int pos = locateMouse(e->pos()); - if (state_ == None && e->button() == Qt::NoButton) + if (state_ == None && e->button() == TQt::NoButton) { switch (pos) { @@ -262,7 +262,7 @@ void MarginPreview::drawTempLine(TQPainter *p) void MarginPreview::mousePressEvent(TQMouseEvent *e) { - if (e->button() != Qt::LeftButton || state_ != None) + if (e->button() != TQt::LeftButton || state_ != None) return; int mpos = locateMouse(e->pos()); if (mpos) diff --git a/tdeprint/marginpreview.h b/tdeprint/marginpreview.h index e0ed3e775..6c01bde73 100644 --- a/tdeprint/marginpreview.h +++ b/tdeprint/marginpreview.h @@ -24,7 +24,7 @@ class MarginPreview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MarginPreview(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/marginvaluewidget.cpp b/tdeprint/marginvaluewidget.cpp index e4f1365c6..fc43b8bef 100644 --- a/tdeprint/marginvaluewidget.cpp +++ b/tdeprint/marginvaluewidget.cpp @@ -31,7 +31,7 @@ MarginValueWidget::MarginValueWidget(KNumInput *below, double value, TQWidget *p m_margin = ( float )value; setMode(m_mode); setRange(0, 999, 1, false); - connect(this, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotValueChanged(double))); + connect(this, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotValueChanged(double))); } float MarginValueWidget::margin() diff --git a/tdeprint/marginvaluewidget.h b/tdeprint/marginvaluewidget.h index 97f1409c1..1e9266d0e 100644 --- a/tdeprint/marginvaluewidget.h +++ b/tdeprint/marginvaluewidget.h @@ -24,7 +24,7 @@ class MarginValueWidget : public KDoubleNumInput { - Q_OBJECT + TQ_OBJECT public: enum Mode { Pixels = 0, IN, CM, MM }; MarginValueWidget(KNumInput *below, double value = 18.0, TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp index c483be123..d46cd8e2f 100644 --- a/tdeprint/marginwidget.cpp +++ b/tdeprint/marginwidget.cpp @@ -155,10 +155,10 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU TQWhatsThis::add(m_left, whatsThisLeftMarginWidget); m_right = new MarginValueWidget(m_left, 0.0, this); TQWhatsThis::add(m_right, whatsThisRightMarginWidget); - m_top->setLabel(i18n("&Top:"), Qt::AlignLeft|Qt::AlignVCenter); - m_bottom->setLabel(i18n("&Bottom:"), Qt::AlignLeft|Qt::AlignVCenter); - m_left->setLabel(i18n("Le&ft:"), Qt::AlignLeft|Qt::AlignVCenter); - m_right->setLabel(i18n("&Right:"), Qt::AlignLeft|Qt::AlignVCenter); + m_top->setLabel(i18n("&Top:"), TQt::AlignLeft|TQt::AlignVCenter); + m_bottom->setLabel(i18n("&Bottom:"), TQt::AlignLeft|TQt::AlignVCenter); + m_left->setLabel(i18n("Le&ft:"), TQt::AlignLeft|TQt::AlignVCenter); + m_right->setLabel(i18n("&Right:"), TQt::AlignLeft|TQt::AlignVCenter); m_units = new TQComboBox(this); TQWhatsThis::add(m_units, whatsThisMeasurementUnitMarginWidget); m_units->insertItem(i18n("Pixels (1/72nd in)")); @@ -169,25 +169,25 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU m_units->insertItem( i18n( "Millimeters (mm)" ) ); } m_units->setCurrentItem(0); - connect(m_units, TQT_SIGNAL(activated(int)), m_top, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_bottom, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_left, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_right, TQT_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_top, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_bottom, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_left, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_right, TQ_SLOT(setMode(int))); m_preview = new MarginPreview(this); TQWhatsThis::add(m_preview, whatsThisDragAndPreviewMarginWidget); m_preview->setMinimumSize(60, 80); m_preview->setPageSize(m_pagesize[ 0 ], m_pagesize[ 1 ]); - connect(m_preview, TQT_SIGNAL(marginChanged(int,float)), TQT_SLOT(slotMarginPreviewChanged(int,float))); - connect(m_top, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_bottom, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_left, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_right, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); + connect(m_preview, TQ_SIGNAL(marginChanged(int,float)), TQ_SLOT(slotMarginPreviewChanged(int,float))); + connect(m_top, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_bottom, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_left, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_right, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); slotMarginValueChanged(); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_top, TQT_SLOT(setEnabled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_left, TQT_SLOT(setEnabled(bool))); - //connect(m_custom, TQT_SIGNAL(toggled(bool)), m_units, TQT_SLOT(setEnabled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCustomMarginsToggled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_preview, TQT_SLOT(enableRubberBand(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_top, TQ_SLOT(setEnabled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_left, TQ_SLOT(setEnabled(bool))); + //connect(m_custom, TQ_SIGNAL(toggled(bool)), m_units, TQ_SLOT(setEnabled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCustomMarginsToggled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_preview, TQ_SLOT(enableRubberBand(bool))); m_top->setEnabled(false); m_bottom->setEnabled(false); m_left->setEnabled(false); @@ -237,8 +237,8 @@ void MarginWidget::setSymetricMargins(bool on) m_right->setEnabled(on && m_custom->isChecked()); if (on) { - connect(m_top, TQT_SIGNAL(marginChanged(float)), m_bottom, TQT_SLOT(setMargin(float))); - connect(m_left, TQT_SIGNAL(marginChanged(float)), m_right, TQT_SLOT(setMargin(float))); + connect(m_top, TQ_SIGNAL(marginChanged(float)), m_bottom, TQ_SLOT(setMargin(float))); + connect(m_left, TQ_SIGNAL(marginChanged(float)), m_right, TQ_SLOT(setMargin(float))); m_bottom->setMargin(m_top->margin()); m_right->setMargin(m_left->margin()); } diff --git a/tdeprint/marginwidget.h b/tdeprint/marginwidget.h index 0668beeb2..89e2e1af4 100644 --- a/tdeprint/marginwidget.h +++ b/tdeprint/marginwidget.h @@ -32,7 +32,7 @@ class TQComboBox; class TDEPRINT_EXPORT MarginWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MarginWidget(TQWidget *parent = 0, const char *name = 0, bool allowMetricUnit = true); ~MarginWidget(); diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp index 7f642896e..ba3d69c8b 100644 --- a/tdeprint/messagewindow.cpp +++ b/tdeprint/messagewindow.cpp @@ -50,7 +50,7 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, if ( delay == 0 ) slotTimer(); else - TQTimer::singleShot( delay, this, TQT_SLOT( slotTimer() ) ); + TQTimer::singleShot( delay, this, TQ_SLOT( slotTimer() ) ); } MessageWindow::~MessageWindow() diff --git a/tdeprint/messagewindow.h b/tdeprint/messagewindow.h index 26de652db..7c64c0c5c 100644 --- a/tdeprint/messagewindow.h +++ b/tdeprint/messagewindow.h @@ -29,7 +29,7 @@ class TQLabel; class TDEPRINT_EXPORT MessageWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ~MessageWindow(); diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp index b2a686f6e..22383ff98 100644 --- a/tdeprint/plugincombobox.cpp +++ b/tdeprint/plugincombobox.cpp @@ -63,7 +63,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name) m_pluginlist.append((*it).name); } - connect(m_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); + connect(m_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); configChanged(); } diff --git a/tdeprint/plugincombobox.h b/tdeprint/plugincombobox.h index fc217667b..247a20b53 100644 --- a/tdeprint/plugincombobox.h +++ b/tdeprint/plugincombobox.h @@ -30,7 +30,7 @@ class TQLabel; class TDEPRINT_EXPORT PluginComboBox : public TQWidget, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: PluginComboBox(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp index 80f9b1f81..2f7109477 100644 --- a/tdeprint/posterpreview.cpp +++ b/tdeprint/posterpreview.cpp @@ -54,8 +54,8 @@ PosterPreview::~PosterPreview() void PosterPreview::init() { m_process = new TDEProcess; - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQ_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0; m_dirty = false; @@ -83,7 +83,7 @@ void PosterPreview::setDirty() if ( !m_dirty ) { m_dirty = true; - TQTimer::singleShot( 1, this, TQT_SLOT( updatePoster() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( updatePoster() ) ); } } @@ -144,9 +144,9 @@ void PosterPreview::drawContents( TQPainter *painter ) if ( pw > 0 && ph > 0 ) p->fillRect( x+m_mw+px, y+m_mh+py, TQMIN( pw, m_pw-2*m_mw-px ), TQMIN( ph, m_ph-2*m_mh-py ), ( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); - p->setPen( Qt::DotLine ); + p->setPen( TQt::DotLine ); p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh ); - p->setPen( Qt::SolidLine ); + p->setPen( TQt::SolidLine ); pw -= m_pw-2*m_mw-px; px = 0; @@ -177,7 +177,7 @@ void PosterPreview::mouseMoveEvent( TQMouseEvent *e ) void PosterPreview::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton && m_boundingrect.isValid() ) + if ( e->button() == TQt::LeftButton && m_boundingrect.isValid() ) { if ( m_boundingrect.contains( e->pos() ) ) { diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h index d9a23cb59..e5970dc9f 100644 --- a/tdeprint/posterpreview.h +++ b/tdeprint/posterpreview.h @@ -27,7 +27,7 @@ class TDEProcess; class PosterPreview : public TQFrame { - Q_OBJECT + TQ_OBJECT public: PosterPreview( TQWidget *parent = 0, const char *name = 0 ); PosterPreview( const TQString& postersize, const TQString& mediasize, TQWidget *parent = 0, const char *name = 0 ); diff --git a/tdeprint/ppdparser.y b/tdeprint/ppdparser.y index f750d9316..99677e65f 100644 --- a/tdeprint/ppdparser.y +++ b/tdeprint/ppdparser.y @@ -74,7 +74,7 @@ imgarea: IMGAREA OPTION ':' QUOTED { builder->putImageableArea | IMGAREA OPTION '/' TRANSLATION ':' QUOTED { builder->putImageableArea($2[0], $6[0]); } ; -openui: OPENUI OPTION ':' string { builder->openUi($2[0], QString::null, $4[0]); } +openui: OPENUI OPTION ':' string { builder->openUi($2[0], TQString::null, $4[0]); } | OPENUI OPTION '/' TRANSLATION ':' string { builder->openUi($2[0], $4[0], $6[0]); } ; @@ -82,7 +82,7 @@ endui: CLOSEUI ':' string { builder->endUi($3[0]); } | CLOSEUI string { builder->endUi($2[0]); } ; -opengroup: OPENGROUP ':' string { builder->openGroup($3.join(" "), QString::null); } +opengroup: OPENGROUP ':' string { builder->openGroup($3.join(" "), TQString::null); } | OPENGROUP ':' string '/' TRANSLATION { builder->openGroup($3.join(" "), $5[0]); } ; @@ -91,15 +91,15 @@ endgroup: CLOSEGROUP ':' string { builder->endGroup($3.join(" ; constraint: CONSTRAINT ':' KEYWORD OPTION KEYWORD OPTION { builder->putConstraint($3[0], $5[0], $4[0], $6[0]); } - | CONSTRAINT ':' KEYWORD OPTION KEYWORD { builder->putConstraint($3[0], $5[0], $4[0], QString::null); } - | CONSTRAINT ':' KEYWORD KEYWORD OPTION { builder->putConstraint($3[0], $4[0], QString::null, $5[0]); } - | CONSTRAINT ':' KEYWORD KEYWORD { builder->putConstraint($3[0], $4[0], QString::null, QString::null); } + | CONSTRAINT ':' KEYWORD OPTION KEYWORD { builder->putConstraint($3[0], $5[0], $4[0], TQString::null); } + | CONSTRAINT ':' KEYWORD KEYWORD OPTION { builder->putConstraint($3[0], $4[0], TQString::null, $5[0]); } + | CONSTRAINT ':' KEYWORD KEYWORD { builder->putConstraint($3[0], $4[0], TQString::null, TQString::null); } ; ppdelement: KEYWORD ':' value { builder->putStatement2($1[0], $3[0]); } - | KEYWORD OPTION ':' value { builder->putStatement($1[0], $2[0], QString::null, $4); } + | KEYWORD OPTION ':' value { builder->putStatement($1[0], $2[0], TQString::null, $4); } | KEYWORD OPTION '/' TRANSLATION ':' value { builder->putStatement($1[0], $2[0], $4[0], $6); } - | KEYWORD OPTION '/' ':' value { builder->putStatement($1[0], $2[0], QString::null, $4); } + | KEYWORD OPTION '/' ':' value { builder->putStatement($1[0], $2[0], TQString::null, $4); } | DEFAULT ':' string { builder->putDefault($1[0], $3[0]); } | DEFAULT ':' string '/' TRANSLATION { builder->putDefault($1[0], $3[0]); } | openui diff --git a/tdeprint/ppdscanner.l b/tdeprint/ppdscanner.l index 168e3a535..361f94317 100644 --- a/tdeprint/ppdscanner.l +++ b/tdeprint/ppdscanner.l @@ -25,7 +25,7 @@ #define yylval tdeprint_ppdlval -QIODevice *tdeprint_ppdscanner_device = NULL; +TQIODevice *tdeprint_ppdscanner_device = NULL; #define YY_INPUT(buf,result,max_size) \ { \ if (tdeprint_ppdscanner_device) \ @@ -122,7 +122,7 @@ L [[:alnum:]] %% -void tdeprint_ppdscanner_init(QIODevice *d) +void tdeprint_ppdscanner_init(TQIODevice *d) { tdeprint_ppdscanner_device = d; tdeprint_ppdscanner_lno = 1; diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp index 870da43c4..38f914faf 100644 --- a/tdeprint/rlpr/kmproxywidget.cpp +++ b/tdeprint/rlpr/kmproxywidget.cpp @@ -29,7 +29,7 @@ #include <kcursor.h> KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) -: TQGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name) +: TQGroupBox(0, TQt::Vertical, i18n("Proxy Settings"), parent, name) { TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), this); TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), this); @@ -37,12 +37,12 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) m_useproxy->setCursor(KCursor::handCursor()); m_proxyhost = new TQLineEdit(this); m_proxyport = new TQLineEdit(this); - m_proxyport->setValidator(new TQIntValidator(TQT_TQOBJECT(m_proxyport))); + m_proxyport->setValidator(new TQIntValidator(m_proxyport)); m_hostlabel->setBuddy(m_proxyhost); m_portlabel->setBuddy(m_proxyport); - connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyhost,TQT_SLOT(setEnabled(bool))); - connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyport,TQT_SLOT(setEnabled(bool))); + connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyhost,TQ_SLOT(setEnabled(bool))); + connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyport,TQ_SLOT(setEnabled(bool))); m_proxyhost->setEnabled(false); m_proxyport->setEnabled(false); diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp index 056cba1f0..1cb156342 100644 --- a/tdeprint/rlpr/kmwrlpr.cpp +++ b/tdeprint/rlpr/kmwrlpr.cpp @@ -63,7 +63,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name) TQLabel *m_queuelabel = new TQLabel(i18n("Queue:"), this); m_hostlabel->setBuddy(m_host); m_queuelabel->setBuddy(m_queue); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); TQHBoxLayout *lay0 = new TQHBoxLayout(this, 0, 10); TQVBoxLayout *lay1 = new TQVBoxLayout(0, 0, 5); diff --git a/tdeprint/rlpr/kmwrlpr.h b/tdeprint/rlpr/kmwrlpr.h index dc375303d..916390471 100644 --- a/tdeprint/rlpr/kmwrlpr.h +++ b/tdeprint/rlpr/kmwrlpr.h @@ -28,7 +28,7 @@ class TQListViewItem; class KMWRlpr : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWRlpr(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp index 4ef5ebe1e..09653930c 100644 --- a/tdeprint/rlpr/krlprprinterimpl.cpp +++ b/tdeprint/rlpr/krlprprinterimpl.cpp @@ -44,10 +44,10 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) if (!rpr) return false; - QString host(rpr->option("host")), queue(rpr->option("queue")); + TQString host(rpr->option("host")), queue(rpr->option("queue")); if (!host.isEmpty() && !queue.isEmpty()) { - QString exestr = TDEStandardDirs::findExe("rlpr"); + TQString exestr = TDEStandardDirs::findExe("rlpr"); if (exestr.isEmpty()) { printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("rlpr")); @@ -59,7 +59,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) // proxy settings TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("RLPR"); - QString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null); + TQString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null); if (!host.isEmpty()) { cmd.append(" -X ").append(quote(host)); diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp index 311950e02..602329f33 100644 --- a/tdeprint/tdefilelist.cpp +++ b/tdeprint/tdefilelist.cpp @@ -107,38 +107,38 @@ KFileList::KFileList(TQWidget *parent, const char *name) m_files->setSelectionMode(TQListView::Extended); m_files->header()->setStretchEnabled(true, 2); TQWhatsThis::add(m_files, whatsThisFileSelectionListview); - connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(m_files, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); m_add = new TQToolButton(this); m_add->setIconSet(SmallIconSet("document-open")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddFile())); TQToolTip::add(m_add, i18n("Add file")); TQWhatsThis::add(m_add, whatsThisAddFileButton); m_remove = new TQToolButton(this); m_remove->setIconSet(SmallIconSet("remove")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveFile())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveFile())); TQToolTip::add(m_remove, i18n("Remove file")); TQWhatsThis::add(m_remove, whatsThisRemoveFileButton); m_remove->setEnabled(false); m_open = new TQToolButton(this); m_open->setIconSet(SmallIconSet("filefind")); - connect(m_open, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenFile())); + connect(m_open, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenFile())); TQToolTip::add(m_open, i18n("Open file")); TQWhatsThis::add(m_open, whatsThisOpenFileButton); m_open->setEnabled(false); m_up = new TQToolButton(this); m_up->setIconSet(SmallIconSet("go-up")); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); TQToolTip::add(m_up, i18n("Move up")); TQWhatsThis::add(m_up, whatsThisMoveFileUpButton); m_up->setEnabled(false); m_down = new TQToolButton(this); m_down->setIconSet(SmallIconSet("go-down")); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown())); TQToolTip::add(m_down, i18n("Move down")); TQWhatsThis::add(m_down, whatsThisMoveFileDownButton); m_down->setEnabled(false); diff --git a/tdeprint/tdefilelist.h b/tdeprint/tdefilelist.h index 912abd07a..0c36657ba 100644 --- a/tdeprint/tdefilelist.h +++ b/tdeprint/tdefilelist.h @@ -30,7 +30,7 @@ class TQListViewItem; class KFileList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KFileList(TQWidget *parent = 0, const char *name = 0); virtual ~KFileList(); diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp index a1985e804..36cc935ec 100644 --- a/tdeprint/tdeprintcheck.cpp +++ b/tdeprint/tdeprintcheck.cpp @@ -74,7 +74,7 @@ bool KdeprintChecker::check(const TQStringList& uris) bool KdeprintChecker::checkURL(const KURL& url) { - QString prot(url.protocol()); + TQString prot(url.protocol()); if (prot == "config") return checkConfig(url); else if (prot == "exec") @@ -89,7 +89,7 @@ bool KdeprintChecker::checkURL(const KURL& url) bool KdeprintChecker::checkConfig(const KURL& url) { // get the config filename (may contain a path) - QString f(url.path().mid(1)); + TQString f(url.path().mid(1)); bool state(false); // first check for standard KDE config file @@ -116,13 +116,13 @@ bool KdeprintChecker::checkConfig(const KURL& url) bool KdeprintChecker::checkExec(const KURL& url) { - QString execname(url.path().mid(1)); + TQString execname(url.path().mid(1)); return !(TDEStandardDirs::findExe(execname).isEmpty()); } bool KdeprintChecker::checkService(const KURL& url) { - QString serv(url.path().mid(1)); + TQString serv(url.path().mid(1)); KExtendedSocket sock; bool ok; diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 754f67c3c..c3e1e474c 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -78,7 +78,7 @@ StatusWindow::StatusWindow(int pid) l0->addMultiCellWidget(m_label, 0, 0, 1, 2); l0->addWidget(m_button, 1, 2); l0->addMultiCellWidget(m_icon, 0, 1, 0, 0); - connect(m_button, TQT_SIGNAL(clicked()), TQT_SLOT(hide())); + connect(m_button, TQ_SIGNAL(clicked()), TQ_SLOT(hide())); resize(200, 50); } @@ -115,8 +115,8 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla TQString command(cmd); TQRegExp re( "\\$out\\{([^}]*)\\}" ); - connect(proc,TQT_SIGNAL(printTerminated(KPrintProcess*)),TQT_SLOT(slotPrintTerminated(KPrintProcess*))); - connect(proc,TQT_SIGNAL(printError(KPrintProcess*,const TQString&)),TQT_SLOT(slotPrintError(KPrintProcess*,const TQString&))); + connect(proc,TQ_SIGNAL(printTerminated(KPrintProcess*)),TQ_SLOT(slotPrintTerminated(KPrintProcess*))); + connect(proc,TQ_SIGNAL(printError(KPrintProcess*,const TQString&)),TQ_SLOT(slotPrintError(KPrintProcess*,const TQString&))); proc->setCommand( command ); if ( re.search( command ) != -1 ) { @@ -200,7 +200,7 @@ void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appN w->setCaption(i18n("Printing Status - %1").arg("(pid="+TQString::number(pid)+")")); else w->setCaption(i18n("Printing Status - %1").arg(appName)); - connect(w, TQT_SIGNAL(destroyed()), TQT_SLOT(slotClosed())); + connect(w, TQ_SIGNAL(destroyed()), TQ_SLOT(slotClosed())); w->show(); m_windows.insert(pid, w); } @@ -242,7 +242,7 @@ TQString KDEPrintd::requestPassword( const TQString& user, const TQString& host, req->transaction = callingDcopClient()->beginTransaction(); m_requestsPending.append( req ); if ( m_requestsPending.count() == 1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) ); return "::"; } @@ -291,7 +291,7 @@ void KDEPrintd::processRequest() m_requestsPending.remove( ( unsigned int )0 ); if ( m_requestsPending.count() > 0 ) - TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) ); } void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, const TQString& host, int port ) diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h index 4ef54b894..e8a5fe51f 100644 --- a/tdeprint/tdeprintd.h +++ b/tdeprint/tdeprintd.h @@ -33,7 +33,7 @@ class StatusWindow; class KDEPrintd : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index e60aae845..8c44543d9 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -28,7 +28,7 @@ void drawColorWheel( TQPainter *p ) { TQFont f( "times", 18, TQFont::Bold ); p->setFont( f ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->setWindow( 0, 0, 500, 500 ); // defines coordinate system for ( int i=0; i<36; i++ ) { // draws 36 rotated rectangles @@ -83,12 +83,12 @@ void drawFonts( TQPainter *p ) void drawShapes( TQPainter *p ) { - TQBrush b1( Qt::blue ); - TQBrush b2( Qt::green, Qt::Dense6Pattern ); // green 12% fill - TQBrush b3( Qt::NoBrush ); // void brush - TQBrush b4( Qt::CrossPattern ); // black cross pattern + TQBrush b1( TQt::blue ); + TQBrush b2( TQt::green, TQt::Dense6Pattern ); // green 12% fill + TQBrush b3( TQt::NoBrush ); // void brush + TQBrush b4( TQt::CrossPattern ); // black cross pattern - p->setPen( Qt::red ); + p->setPen( TQt::red ); p->setBrush( b1 ); p->drawRect( 10, 10, 200, 100 ); p->setBrush( b2 ); @@ -133,7 +133,7 @@ DrawView::DrawView() // Create a button group to contain all buttons bgroup = new TQButtonGroup( this ); bgroup->resize( 200, 200 ); - connect( bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateIt(int)) ); + connect( bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateIt(int)) ); // Calculate the size for the radio buttons int maxwidth = 80; @@ -164,7 +164,7 @@ DrawView::DrawView() print = new TQPushButton( "Print...", bgroup ); print->resize( 80, 30 ); print->move( maxwidth/2 - print->width()/2, maxindex*30+20 ); - connect( print, TQT_SIGNAL(clicked()), TQT_SLOT(printIt()) ); + connect( print, TQ_SIGNAL(clicked()), TQ_SLOT(printIt()) ); bgroup->resize( maxwidth, print->y()+print->height()+10 ); diff --git a/tdeprint/tests/drawdemo.h b/tdeprint/tests/drawdemo.h index 963da64db..13f1df77a 100644 --- a/tdeprint/tests/drawdemo.h +++ b/tdeprint/tests/drawdemo.h @@ -8,7 +8,7 @@ class DrawView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DrawView(); ~DrawView(); diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp index 2f172acc0..c9188c25f 100644 --- a/tdeprint/tests/helpwindow.cpp +++ b/tdeprint/tests/helpwindow.cpp @@ -48,26 +48,26 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, browser = new TQTextBrowser( this ); browser->mimeSourceFactory()->setFilePath( _path ); browser->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - connect( browser, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( textChanged() ) ); + connect( browser, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( textChanged() ) ); setCentralWidget( browser ); if ( !home_.isEmpty() ) browser->setSource( home_ ); - connect( browser, TQT_SIGNAL( highlighted( const TQString&) ), - statusBar(), TQT_SLOT( message( const TQString&)) ); + connect( browser, TQ_SIGNAL( highlighted( const TQString&) ), + statusBar(), TQ_SLOT( message( const TQString&)) ); resize( 640,700 ); TQPopupMenu* file = new TQPopupMenu( this ); - file->insertItem( "&New Window", this, TQT_SLOT( newWindow() ), ALT | Key_N ); - file->insertItem( "&Open File", this, TQT_SLOT( openFile() ), ALT | Key_O ); - file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P ); + file->insertItem( "&New Window", this, TQ_SLOT( newWindow() ), ALT | Key_N ); + file->insertItem( "&Open File", this, TQ_SLOT( openFile() ), ALT | Key_O ); + file->insertItem( "&Print", this, TQ_SLOT( print() ), ALT | Key_P ); file->insertSeparator(); - file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q ); - file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); + file->insertItem( "&Close", this, TQ_SLOT( close() ), ALT | Key_Q ); + file->insertItem( "E&xit", tqApp, TQ_SLOT( closeAllWindows() ), ALT | Key_X ); // The same three icons are used twice each. TQIconSet icon_back( TQPixmap("back.xpm") ); @@ -76,33 +76,33 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, TQPopupMenu* go = new TQPopupMenu( this ); backwardId = go->insertItem( icon_back, - "&Backward", browser, TQT_SLOT( backward() ), + "&Backward", browser, TQ_SLOT( backward() ), ALT | Key_Left ); forwardId = go->insertItem( icon_forward, - "&Forward", browser, TQT_SLOT( forward() ), + "&Forward", browser, TQ_SLOT( forward() ), ALT | Key_Right ); - go->insertItem( icon_home, "&Home", browser, TQT_SLOT( home() ) ); + go->insertItem( icon_home, "&Home", browser, TQ_SLOT( home() ) ); TQPopupMenu* help = new TQPopupMenu( this ); - help->insertItem( "&About ...", this, TQT_SLOT( about() ) ); - help->insertItem( "About &Qt ...", this, TQT_SLOT( aboutQt() ) ); + help->insertItem( "&About ...", this, TQ_SLOT( about() ) ); + help->insertItem( "About &Qt ...", this, TQ_SLOT( aboutQt() ) ); hist = new TQPopupMenu( this ); TQStringList::Iterator it = history.begin(); for ( ; it != history.end(); ++it ) mHistory[ hist->insertItem( *it ) ] = *it; - connect( hist, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( histChosen( int ) ) ); + connect( hist, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( histChosen( int ) ) ); bookm = new TQPopupMenu( this ); - bookm->insertItem( tr( "Add Bookmark" ), this, TQT_SLOT( addBookmark() ) ); + bookm->insertItem( tr( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) ); bookm->insertSeparator(); TQStringList::Iterator it2 = bookmarks.begin(); for ( ; it2 != bookmarks.end(); ++it2 ) mBookmarks[ bookm->insertItem( *it2 ) ] = *it2; - connect( bookm, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( bookmChosen( int ) ) ); + connect( bookm, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( bookmChosen( int ) ) ); menuBar()->insertItem( tr("&File"), file ); menuBar()->insertItem( tr("&Go"), go ); @@ -113,29 +113,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, menuBar()->setItemEnabled( forwardId, false); menuBar()->setItemEnabled( backwardId, false); - connect( browser, TQT_SIGNAL( backwardAvailable( bool ) ), - this, TQT_SLOT( setBackwardAvailable( bool ) ) ); - connect( browser, TQT_SIGNAL( forwardAvailable( bool ) ), - this, TQT_SLOT( setForwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( backwardAvailable( bool ) ), + this, TQ_SLOT( setBackwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( forwardAvailable( bool ) ), + this, TQ_SLOT( setForwardAvailable( bool ) ) ); TQToolBar* toolbar = new TQToolBar( this ); addToolBar( toolbar, "Toolbar"); TQToolButton* button; - button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQT_SLOT(backward()), toolbar ); - connect( browser, TQT_SIGNAL( backwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT(backward()), toolbar ); + connect( browser, TQ_SIGNAL( backwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( false ); - button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQT_SLOT(forward()), toolbar ); - connect( browser, TQT_SIGNAL( forwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT(forward()), toolbar ); + connect( browser, TQ_SIGNAL( forwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( false ); - button = new TQToolButton( icon_home, tr("Home"), "", browser, TQT_SLOT(home()), toolbar ); + button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT(home()), toolbar ); toolbar->addSeparator(); pathCombo = new TQComboBox( true, toolbar ); - connect( pathCombo, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( pathSelected( const TQString & ) ) ); + connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( pathSelected( const TQString & ) ) ); toolbar->setStretchableWidget( pathCombo ); setRightJustification( true ); setDockEnabled( DockLeft, false ); diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h index 2ff3d3649..53a424d1b 100644 --- a/tdeprint/tests/helpwindow.h +++ b/tdeprint/tests/helpwindow.h @@ -22,7 +22,7 @@ class TQPopupMenu; class HelpWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: HelpWindow( const TQString& home_, const TQString& path, TQWidget* parent = 0, const char *name=0 ); ~HelpWindow(); diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp index c91cd23a7..0405fafe3 100644 --- a/tdeprint/tests/main.cpp +++ b/tdeprint/tests/main.cpp @@ -34,8 +34,8 @@ int main( int argc, char ** argv ) else help->showMaximized(); - TQObject::connect( &a, TQT_SIGNAL(lastWindowClosed()), - &a, TQT_SLOT(quit()) ); + TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()), + &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/tdeprint/tests/richpage.cpp b/tdeprint/tests/richpage.cpp index f12040b71..4abc71ea2 100644 --- a/tdeprint/tests/richpage.cpp +++ b/tdeprint/tests/richpage.cpp @@ -57,7 +57,7 @@ RichPage::~RichPage() void RichPage::setOptions(const TQMap<TQString,TQString>& opts) { - QString value; + TQString value; value = opts["app-rich-margin"]; if (!value.isEmpty()) diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index 901d509c9..8ba04447a 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -39,17 +39,17 @@ class EscpFactory : public KLibFactory public: EscpFactory(TQObject *parent = 0, const char *name = 0) : KLibFactory(parent, name) {} protected: - TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList()) + TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList()) { Q_UNUSED(className); - KDialogBase *dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); + KDialogBase *dlg = new KDialogBase(static_cast<TQWidget*>(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); EscpWidget *w = new EscpWidget(dlg); if (args.count() > 0) w->setDevice(args[0]); if (args.count() > 1) w->setPrinterName(args[1]); dlg->setMainWidget(w); - return TQT_TQOBJECT(dlg); + return dlg; } }; @@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) { m_hasoutput = false; - connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); TQPushButton *cleanbtn = new TQPushButton(this, "-c"); cleanbtn->setPixmap(DesktopIcon("application-x-executable")); @@ -90,11 +90,11 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) m_device->setFont(f); m_useraw = new TQCheckBox(i18n("&Use direct connection (might need root permissions)"), this); - connect(cleanbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(nozzlebtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(alignbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); + connect(cleanbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(nozzlebtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(alignbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(inkbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(identbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); TQLabel *printerlab = new TQLabel(i18n("Printer:"), this); printerlab->setAlignment(AlignRight|AlignVCenter); @@ -243,7 +243,7 @@ void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len) void EscpWidget::slotButtonClicked() { - TQString arg = TQT_TQOBJECT_CONST(sender())->name(); + TQString arg = sender()->name(); startCommand(arg); } diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h index 4ad284d00..21441091f 100644 --- a/tdeprint/tools/escputil/escpwidget.h +++ b/tdeprint/tools/escputil/escpwidget.h @@ -29,7 +29,7 @@ class TQCheckBox; class EscpWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: EscpWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/treecombobox.cpp b/tdeprint/treecombobox.cpp index 5cee0cacc..1cbbb0c72 100644 --- a/tdeprint/treecombobox.cpp +++ b/tdeprint/treecombobox.cpp @@ -123,7 +123,7 @@ void TreeListBoxItem::paint(TQPainter *p) p->drawPixmap(xo, yo, *pix); xo += (pix->width() + 2); } - p->drawText(xo, 0, r.width()-xo, height(listBox()), Qt::AlignLeft, m_path[m_depth]); + p->drawText(xo, 0, r.width()-xo, height(listBox()), TQt::AlignLeft, m_path[m_depth]); } //----------------------------------------------------------------------------------------- diff --git a/tderandr/ktimerdialog.cpp b/tderandr/ktimerdialog.cpp index eba497372..766d4ae50 100644 --- a/tderandr/ktimerdialog.cpp +++ b/tderandr/ktimerdialog.cpp @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); - connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); + connect( totalTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotInternalTimeout() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new TQVBox( this, "mainWidget" ); @@ -98,7 +98,7 @@ void KTimerDialog::setMainWidget( TQWidget *widget ) if ( widget->parentWidget() != mainWidget ) { widget->reparent( newWidget, 0, TQPoint(0,0) ); } else { - newWidget->insertChild( TQT_TQOBJECT(widget) ); + newWidget->insertChild( widget ); } timerWidget->reparent( newWidget, 0, TQPoint(0, 0) ); diff --git a/tderandr/ktimerdialog.h b/tderandr/ktimerdialog.h index 965a72393..0d844a27f 100644 --- a/tderandr/ktimerdialog.h +++ b/tderandr/ktimerdialog.h @@ -44,7 +44,7 @@ class TQLabel; */ class KTimerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp index d00641154..412e4d195 100644 --- a/tderandr/randr.cpp +++ b/tderandr/randr.cpp @@ -274,8 +274,8 @@ KDE_EXPORT bool RandRScreen::confirm() KDialog::centerOnScreen(&acceptDialog, m_screen); m_shownDialog = &acceptDialog; - connect( m_shownDialog, TQT_SIGNAL( destroyed()), this, TQT_SLOT( shownDialogDestroyed())); - connect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized())); + connect( m_shownDialog, TQ_SIGNAL( destroyed()), this, TQ_SLOT( shownDialogDestroyed())); + connect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized())); return acceptDialog.exec(); } @@ -283,7 +283,7 @@ KDE_EXPORT bool RandRScreen::confirm() KDE_EXPORT void RandRScreen::shownDialogDestroyed() { m_shownDialog = NULL; - disconnect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized())); + disconnect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized())); } KDE_EXPORT void RandRScreen::desktopResized() @@ -866,8 +866,8 @@ KDE_EXPORT bool RandRScreen::showTestConfigurationDialog() KDialog::centerOnScreen(&acceptDialog, 0); m_shownDialog = &acceptDialog; - connect( m_shownDialog, TQT_SIGNAL( destroyed()), this, TQT_SLOT( shownDialogDestroyed())); - connect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized())); + connect( m_shownDialog, TQ_SIGNAL( destroyed()), this, TQ_SLOT( shownDialogDestroyed())); + connect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized())); return acceptDialog.exec(); } diff --git a/tderandr/randr.h b/tderandr/randr.h index ee00b2065..36e87badd 100644 --- a/tderandr/randr.h +++ b/tderandr/randr.h @@ -100,7 +100,7 @@ class TDERANDR_EXPORT SingleScreenData { class RandRScreen : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum orientations { @@ -297,8 +297,8 @@ private: ScreenList m_screens; bool m_valid; - QString m_errorCode; - QString m_version; + TQString m_errorCode; + TQString m_version; int m_eventBase; int m_errorBase; diff --git a/tderesources/configdialog.cpp b/tderesources/configdialog.cpp index 4eb528835..a2520380b 100644 --- a/tderesources/configdialog.cpp +++ b/tderesources/configdialog.cpp @@ -46,7 +46,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, TQVBoxLayout *mainLayout = new TQVBoxLayout( main, 0, spacingHint() ); - TQGroupBox *generalGroupBox = new TQGroupBox( 2, Qt::Horizontal, main ); + TQGroupBox *generalGroupBox = new TQGroupBox( 2, TQt::Horizontal, main ); generalGroupBox->layout()->setSpacing( spacingHint() ); generalGroupBox->setTitle( i18n( "General Settings" ) ); @@ -61,7 +61,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, mainLayout->addWidget( generalGroupBox ); - TQGroupBox *resourceGroupBox = new TQGroupBox( 2, Qt::Horizontal, main ); + TQGroupBox *resourceGroupBox = new TQGroupBox( 2, TQt::Horizontal, main ); resourceGroupBox->layout()->setSpacing( spacingHint() ); resourceGroupBox->setTitle( i18n( "%1 Resource Settings" ) .arg( factory->typeName( resource->type() ) ) ); @@ -74,12 +74,12 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, mConfigWidget->setInEditMode( false ); mConfigWidget->loadSettings( mResource ); mConfigWidget->show(); - connect( mConfigWidget, TQT_SIGNAL( setReadOnly( bool ) ), - TQT_SLOT( setReadOnly( bool ) ) ); + connect( mConfigWidget, TQ_SIGNAL( setReadOnly( bool ) ), + TQ_SLOT( setReadOnly( bool ) ) ); } - connect( mName, TQT_SIGNAL( textChanged(const TQString &)), - TQT_SLOT( slotNameChanged(const TQString &))); + connect( mName, TQ_SIGNAL( textChanged(const TQString &)), + TQ_SLOT( slotNameChanged(const TQString &))); slotNameChanged( mName->text() ); setMinimumSize( sizeHint() ); diff --git a/tderesources/configdialog.h b/tderesources/configdialog.h index 94f5ab107..37b1bf166 100644 --- a/tderesources/configdialog.h +++ b/tderesources/configdialog.h @@ -34,7 +34,7 @@ namespace KRES { class TDERESOURCES_EXPORT ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: // Resource=0: create new resource ConfigDialog( TQWidget *parent, const TQString& resourceFamily, diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp index 4ba33cc83..8b1443168 100644 --- a/tderesources/configpage.cpp +++ b/tderesources/configpage.cpp @@ -105,7 +105,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) TQVBoxLayout *mainLayout = new TQVBoxLayout( this ); TQGroupBox *groupBox = new TQGroupBox( i18n( "Resources" ), this ); - groupBox->setColumnLayout(0, Qt::Vertical ); + groupBox->setColumnLayout(0, TQt::Vertical ); groupBox->layout()->setSpacing( 6 ); groupBox->layout()->setMargin( 11 ); TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->layout(), 2, 2 ); @@ -121,14 +121,14 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) mListView->addColumn( i18n( "Standard" ) ); groupBoxLayout->addWidget( mListView, 1, 0 ); - connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) ); - KButtonBox *buttonBox = new KButtonBox( groupBox, Qt::Vertical ); - mAddButton = buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()) ); - mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT(slotRemove()) ); + connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( slotEdit() ) ); + KButtonBox *buttonBox = new KButtonBox( groupBox, TQt::Vertical ); + mAddButton = buttonBox->addButton( i18n( "&Add..." ), this, TQ_SLOT(slotAdd()) ); + mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQ_SLOT(slotRemove()) ); mRemoveButton->setEnabled( false ); - mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT(slotEdit()) ); + mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQ_SLOT(slotEdit()) ); mEditButton->setEnabled( false ); - mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), TQT_TQOBJECT(this), TQT_SLOT(slotStandard()) ); + mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQ_SLOT(slotStandard()) ); mStandardButton->setEnabled( false ); buttonBox->layout(); @@ -136,12 +136,12 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) mainLayout->addWidget( groupBox ); - connect( mFamilyCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotFamilyChanged( int ) ) ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() ) ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( slotItemClicked( TQListViewItem * ) ) ); + connect( mFamilyCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotFamilyChanged( int ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( slotItemClicked( TQListViewItem * ) ) ); mLastItem = 0; diff --git a/tderesources/configpage.h b/tderesources/configpage.h index 789735d5e..a9bd37ada 100644 --- a/tderesources/configpage.h +++ b/tderesources/configpage.h @@ -51,7 +51,7 @@ class ConfigViewItem; class TDERESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Resource> { - Q_OBJECT + TQ_OBJECT public: ConfigPage( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/configwidget.h b/tderesources/configwidget.h index a9d20aa8b..e8014090d 100644 --- a/tderesources/configwidget.h +++ b/tderesources/configwidget.h @@ -32,7 +32,7 @@ namespace KRES { class TDERESOURCES_EXPORT ConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ConfigWidget( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/kcmtderesources.cpp b/tderesources/kcmtderesources.cpp index 60eda28b2..a5c8cdc2e 100644 --- a/tderesources/kcmtderesources.cpp +++ b/tderesources/kcmtderesources.cpp @@ -38,7 +38,7 @@ KCMTDEResources::KCMTDEResources( TQWidget *parent, const char *name, const TQSt TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigPage = new KRES::ConfigPage( this ); layout->addWidget( mConfigPage ); - connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( mConfigPage, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); setButtons( Help | Apply ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmtderesources" ), diff --git a/tderesources/kcmtderesources.h b/tderesources/kcmtderesources.h index 4c6b99214..75a2b92c0 100644 --- a/tderesources/kcmtderesources.h +++ b/tderesources/kcmtderesources.h @@ -26,7 +26,7 @@ class TDERESOURCES_EXPORT KCMTDEResources : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KCMTDEResources( TQWidget *parent, const char *name, const TQStringList& ); diff --git a/tderesources/resource.h b/tderesources/resource.h index 5c05ea4e0..3c5383799 100644 --- a/tderesources/resource.h +++ b/tderesources/resource.h @@ -128,7 +128,7 @@ extern "C" class ResourceExampleConfig : public KRES::ResourceConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceExampleConfig( TQWidget *parent = 0, const char *name = 0 ); @@ -257,7 +257,7 @@ class TDERESOURCES_EXPORT Resource : public TQObject friend class Factory; friend class ManagerImpl; - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<Resource *> List; diff --git a/tderesources/selectdialog.cpp b/tderesources/selectdialog.cpp index c8009ae47..baba01039 100644 --- a/tderesources/selectdialog.cpp +++ b/tderesources/selectdialog.cpp @@ -45,7 +45,7 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent, TQVBoxLayout *mainLayout = new TQVBoxLayout( this ); mainLayout->setMargin( marginHint() ); - TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal, this ); + TQGroupBox *groupBox = new TQGroupBox( 2, TQt::Horizontal, this ); groupBox->setTitle( i18n( "Resources" ) ); mResourceId = new TDEListBox( groupBox ); @@ -57,8 +57,8 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent, KButtonBox *buttonBox = new KButtonBox( this ); buttonBox->addStretch(); - buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) ); - buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) ); + buttonBox->addButton( KStdGuiItem::ok(), this, TQ_SLOT( accept() ) ); + buttonBox->addButton( KStdGuiItem::cancel(), this, TQ_SLOT( reject() ) ); buttonBox->layout(); mainLayout->addWidget( buttonBox ); @@ -75,10 +75,10 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent, } mResourceId->setCurrentItem( 0 ); - connect( mResourceId, TQT_SIGNAL(returnPressed(TQListBoxItem*)), - TQT_SLOT(accept()) ); - connect( mResourceId, TQT_SIGNAL( executed( TQListBoxItem* ) ), - TQT_SLOT( accept() ) ); + connect( mResourceId, TQ_SIGNAL(returnPressed(TQListBoxItem*)), + TQ_SLOT(accept()) ); + connect( mResourceId, TQ_SIGNAL( executed( TQListBoxItem* ) ), + TQ_SLOT( accept() ) ); } Resource *SelectDialog::resource() diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp index 675044140..00c55922f 100644 --- a/tdersync/rsyncconfigdialog.cpp +++ b/tdersync/rsyncconfigdialog.cpp @@ -126,7 +126,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, layout->addWidget(mLabel); // Create an exclusive button group - TQButtonGroup *layoutg = new TQButtonGroup( 1, Qt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget); + TQButtonGroup *layoutg = new TQButtonGroup( 1, TQt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget); layout->addWidget( layoutg ); layoutg->setExclusive( TRUE ); @@ -146,7 +146,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, //(void)new TQRadioButton( "Ra&diobutton 3", layoutg ); // Create an exclusive button group - TQButtonGroup *layoutm = new TQButtonGroup( 1, Qt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget); + TQButtonGroup *layoutm = new TQButtonGroup( 1, TQt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget); layout->addWidget( layoutm ); layoutg->setExclusive( TRUE ); @@ -156,7 +156,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, } // Create an exclusive button group - TQButtonGroup *layouta = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Synchronization")+TQString(":"), mainWidget); + TQButtonGroup *layouta = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Synchronization")+TQString(":"), mainWidget); layout->addWidget( layouta ); layouta->setExclusive( FALSE ); diff --git a/tdersync/rsyncconfigdialog.h b/tdersync/rsyncconfigdialog.h index 2ce05b8db..1427866f2 100644 --- a/tdersync/rsyncconfigdialog.h +++ b/tdersync/rsyncconfigdialog.h @@ -37,7 +37,7 @@ class RsyncConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdersync/tdersync.cpp b/tdersync/tdersync.cpp index 7ffa150d0..828b4ce71 100644 --- a/tdersync/tdersync.cpp +++ b/tdersync/tdersync.cpp @@ -479,7 +479,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_ m_progressDialog->setAutoClose(true); m_progressDialog->progressBar()->setTotalSteps(2); m_progressDialog->progressBar()->setValue(1); - connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotRsyncCancelled())); + connect (m_progressDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotRsyncCancelled())); if (m_bInSpecialSync) m_progressDialog->move(0,0); m_progressDialog->show(); m_progressDialogExists = true; @@ -602,7 +602,7 @@ KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset m_progressDialog->progressBar()->setFormat("%v / %m"); m_progressDialog->progressBar()->setTotalSteps(0); m_progressDialog->setAutoClose(true); - connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotUnisonCancelled())); + connect (m_progressDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotUnisonCancelled())); if (m_bInSpecialSync) m_progressDialog->move(0,0); m_progressDialog->show(); m_progressDialogExists = true; @@ -977,8 +977,8 @@ KDE_EXPORT void KRsync::slotSetup() m_configDialog->show(); - connect (m_configDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSetupOK())); - connect (m_configDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotSetupCancelled())); + connect (m_configDialog, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSetupOK())); + connect (m_configDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotSetupCancelled())); } KDE_EXPORT void KRsync::slotSetupOK() diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h index 54d3090ed..25bcb8e01 100644 --- a/tdersync/tdersync.h +++ b/tdersync/tdersync.h @@ -84,7 +84,7 @@ namespace KParts class KRsync : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdespell2/Makefile.am b/tdespell2/Makefile.am index 455b1f5c5..6e6549f5b 100644 --- a/tdespell2/Makefile.am +++ b/tdespell2/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libtdespell2base.la -AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes) +AM_CPPFLAGS = -DKDE_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes) tdespell2baseincludedir = $(includedir)/tdespell2 diff --git a/tdespell2/README b/tdespell2/README index 53d6f4e27..bca8de6a4 100644 --- a/tdespell2/README +++ b/tdespell2/README @@ -52,7 +52,7 @@ Broker::Ptr broker = Broker::openBroker( someKSettingsObject ); Dictionary *enDict = broker->dictionary( "en_US" ); Dictionary *deDict = broker->dictionary( "de_DE" ); -void someFunc( const QString& word ) +void someFunc( const TQString& word ) { if ( enDict->check( word ) ) { kdDebug()<<"Word \""<<word<<"\" is misspelled." <<endl; diff --git a/tdespell2/backgroundchecker.cpp b/tdespell2/backgroundchecker.cpp index 799edf120..954ad8f64 100644 --- a/tdespell2/backgroundchecker.cpp +++ b/tdespell2/backgroundchecker.cpp @@ -46,10 +46,10 @@ BackgroundChecker::BackgroundChecker( const Broker::Ptr& broker, TQObject* paren //d->thread.setBroker( broker ); d->engine = new BackgroundEngine( this ); d->engine->setBroker( broker ); - connect( d->engine, TQT_SIGNAL(misspelling( const TQString&, int )), - TQT_SIGNAL(misspelling( const TQString&, int )) ); - connect( d->engine, TQT_SIGNAL(done()), - TQT_SLOT(slotEngineDone()) ); + connect( d->engine, TQ_SIGNAL(misspelling( const TQString&, int )), + TQ_SIGNAL(misspelling( const TQString&, int )) ); + connect( d->engine, TQ_SIGNAL(done()), + TQ_SLOT(slotEngineDone()) ); } BackgroundChecker::~BackgroundChecker() diff --git a/tdespell2/backgroundchecker.h b/tdespell2/backgroundchecker.h index 84deea5c8..6f9163b26 100644 --- a/tdespell2/backgroundchecker.h +++ b/tdespell2/backgroundchecker.h @@ -48,7 +48,7 @@ namespace KSpell2 */ class KDE_EXPORT BackgroundChecker : public TQObject { - Q_OBJECT + TQ_OBJECT public: BackgroundChecker( const Broker::Ptr& broker, TQObject *parent =0, const char *name =0 ); diff --git a/tdespell2/backgroundengine.cpp b/tdespell2/backgroundengine.cpp index 9eafe1b2e..21ab03478 100644 --- a/tdespell2/backgroundengine.cpp +++ b/tdespell2/backgroundengine.cpp @@ -87,7 +87,7 @@ void BackgroundEngine::setFilter( Filter *filter ) void BackgroundEngine::start() { - TQTimer::singleShot( 0, this, TQT_SLOT(checkNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(checkNext()) ); } void BackgroundEngine::stop() @@ -96,7 +96,7 @@ void BackgroundEngine::stop() void BackgroundEngine::continueChecking() { - TQTimer::singleShot( 0, this, TQT_SLOT(checkNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(checkNext()) ); } void BackgroundEngine::checkNext() diff --git a/tdespell2/backgroundengine.h b/tdespell2/backgroundengine.h index 9ddbe7289..365d3ebbf 100644 --- a/tdespell2/backgroundengine.h +++ b/tdespell2/backgroundengine.h @@ -33,7 +33,7 @@ namespace KSpell2 class Dictionary; class BackgroundEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: BackgroundEngine( TQObject *parent ); ~BackgroundEngine(); diff --git a/tdespell2/broker.h b/tdespell2/broker.h index f4029c487..2ccc63635 100644 --- a/tdespell2/broker.h +++ b/tdespell2/broker.h @@ -47,7 +47,7 @@ namespace KSpell2 class KDE_EXPORT Broker : public TQObject, public TDEShared { - Q_OBJECT + TQ_OBJECT public: typedef TDESharedPtr<Broker> Ptr; /** diff --git a/tdespell2/client.h b/tdespell2/client.h index 07f6fce6e..c115b3847 100644 --- a/tdespell2/client.h +++ b/tdespell2/client.h @@ -39,7 +39,7 @@ namespace KSpell2 */ class KDE_EXPORT Client : public TQObject { - Q_OBJECT + TQ_OBJECT public: Client( TQObject *parent = 0, const char *name=0 ); diff --git a/tdespell2/defaultdictionary.cpp b/tdespell2/defaultdictionary.cpp index 39b80e7cf..d501012fd 100644 --- a/tdespell2/defaultdictionary.cpp +++ b/tdespell2/defaultdictionary.cpp @@ -39,8 +39,8 @@ DefaultDictionary::DefaultDictionary( const TQString& lang, Broker *broker ) d = new Private; d->dict = broker->dictionary(); d->broker = broker; - connect( broker, TQT_SIGNAL(configurationChanged()), - TQT_SLOT(defaultConfigurationChanged()) ); + connect( broker, TQ_SIGNAL(configurationChanged()), + TQ_SLOT(defaultConfigurationChanged()) ); } DefaultDictionary::~DefaultDictionary() diff --git a/tdespell2/defaultdictionary.h b/tdespell2/defaultdictionary.h index 1a0090751..f3ee83339 100644 --- a/tdespell2/defaultdictionary.h +++ b/tdespell2/defaultdictionary.h @@ -32,7 +32,7 @@ namespace KSpell2 class DefaultDictionary : public TQObject, public Dictionary { - Q_OBJECT + TQ_OBJECT public: DefaultDictionary( const TQString& lang, Broker *broker ); ~DefaultDictionary(); diff --git a/tdespell2/plugins/aspell/tdespell_aspellclient.h b/tdespell2/plugins/aspell/tdespell_aspellclient.h index 1384b0242..9a71bfa69 100644 --- a/tdespell2/plugins/aspell/tdespell_aspellclient.h +++ b/tdespell2/plugins/aspell/tdespell_aspellclient.h @@ -33,7 +33,7 @@ using KSpell2::Dictionary; class ASpellClient : public KSpell2::Client { - Q_OBJECT + TQ_OBJECT public: ASpellClient( TQObject *parent, const char *name, const TQStringList & /* args */ ); ~ASpellClient(); diff --git a/tdespell2/plugins/hspell/tdespell_hspellclient.h b/tdespell2/plugins/hspell/tdespell_hspellclient.h index 00a89749e..a18928900 100644 --- a/tdespell2/plugins/hspell/tdespell_hspellclient.h +++ b/tdespell2/plugins/hspell/tdespell_hspellclient.h @@ -37,7 +37,7 @@ using KSpell2::Dictionary; class HSpellClient : public KSpell2::Client { - Q_OBJECT + TQ_OBJECT public: HSpellClient( TQObject *parent, const char *name, const TQStringList & /* args */ ); ~HSpellClient(); diff --git a/tdespell2/plugins/ispell/tdespell_ispellclient.h b/tdespell2/plugins/ispell/tdespell_ispellclient.h index 7deee7de8..b15453bd3 100644 --- a/tdespell2/plugins/ispell/tdespell_ispellclient.h +++ b/tdespell2/plugins/ispell/tdespell_ispellclient.h @@ -33,7 +33,7 @@ using KSpell2::Dictionary; class ISpellClient : public KSpell2::Client { - Q_OBJECT + TQ_OBJECT public: ISpellClient( TQObject *parent, const char *name, const TQStringList & /* args */ ); ~ISpellClient(); diff --git a/tdespell2/tests/Makefile.am b/tdespell2/tests/Makefile.am index fc94843b5..c33439d68 100644 --- a/tdespell2/tests/Makefile.am +++ b/tdespell2/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes) +AM_CPPFLAGS = -DKDE_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes) METASOURCES = AUTO diff --git a/tdespell2/tests/backgroundtest.cpp b/tdespell2/tests/backgroundtest.cpp index 92c7e7792..79ba20331 100644 --- a/tdespell2/tests/backgroundtest.cpp +++ b/tdespell2/tests/backgroundtest.cpp @@ -134,10 +134,10 @@ BackgroundTest::BackgroundTest() : TQObject( 0 ) { m_checker = new BackgroundChecker( Broker::openBroker(), this ); - connect( m_checker, TQT_SIGNAL(done()), - TQT_SLOT(slotDone()) ); - connect( m_checker, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SLOT(slotMisspelling(const TQString&, int)) ); + connect( m_checker, TQ_SIGNAL(done()), + TQ_SLOT(slotDone()) ); + connect( m_checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SLOT(slotMisspelling(const TQString&, int)) ); m_len = strlen( text ); m_checker->checkText( text ); m_timer.start(); diff --git a/tdespell2/tests/backgroundtest.h b/tdespell2/tests/backgroundtest.h index 2f08e9ce0..1fb16fd60 100644 --- a/tdespell2/tests/backgroundtest.h +++ b/tdespell2/tests/backgroundtest.h @@ -28,7 +28,7 @@ class BackgroundTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: BackgroundTest(); diff --git a/tdespell2/tests/test_dialog.cpp b/tdespell2/tests/test_dialog.cpp index d6441bde6..a84aeaf30 100644 --- a/tdespell2/tests/test_dialog.cpp +++ b/tdespell2/tests/test_dialog.cpp @@ -40,8 +40,8 @@ void TestDialog::check( const TQString& buffer ) KSpell2::Dialog *dlg = new KSpell2::Dialog( new BackgroundChecker( Broker::openBroker(), this, "checker" ), 0, "my dialog" ); - connect( dlg, TQT_SIGNAL(done(const TQString&)), - TQT_SLOT(doneChecking(const TQString&)) ); + connect( dlg, TQ_SIGNAL(done(const TQString&)), + TQ_SLOT(doneChecking(const TQString&)) ); dlg->setBuffer( buffer ); dlg->show(); } diff --git a/tdespell2/tests/test_dialog.h b/tdespell2/tests/test_dialog.h index e8a6cf970..924c1281b 100644 --- a/tdespell2/tests/test_dialog.h +++ b/tdespell2/tests/test_dialog.h @@ -28,7 +28,7 @@ class TestDialog : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestDialog(); diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am index a2d3757d3..42837ec1f 100644 --- a/tdespell2/ui/Makefile.am +++ b/tdespell2/ui/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdespell2.la # Put most of the code in a noinst lib, for the unit tests to be able to use internal classes. noinst_LTLIBRARIES = libtdespell2_noinst.la -KDE_CXXFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT +KDE_CXXFLAGS = -DKDE_NO_COMPAT INCLUDES = -I$(top_srcdir)/tdespell2 $(all_includes) tdespell2includedir = $(includedir)/tdespell2 diff --git a/tdespell2/ui/configdialog.h b/tdespell2/ui/configdialog.h index 43a785490..4147c2f84 100644 --- a/tdespell2/ui/configdialog.h +++ b/tdespell2/ui/configdialog.h @@ -28,7 +28,7 @@ namespace KSpell2 class Broker; class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog( Broker *broker, TQWidget *parent ); diff --git a/tdespell2/ui/configwidget.cpp b/tdespell2/ui/configwidget.cpp index 2317f7307..8efaddb04 100644 --- a/tdespell2/ui/configwidget.cpp +++ b/tdespell2/ui/configwidget.cpp @@ -71,7 +71,7 @@ void ConfigWidget::init( Broker *broker ) d->ui->m_ignoreListBox->insertStringList( ignoreList ); d->ui->m_bgSpellCB->setChecked( d->broker->settings()->backgroundCheckerEnabled() ); d->ui->m_bgSpellCB->hide();//hidden by default - connect( d->ui->m_ignoreListBox, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) ); + connect( d->ui->m_ignoreListBox, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) ); layout->addWidget( d->ui ); } diff --git a/tdespell2/ui/configwidget.h b/tdespell2/ui/configwidget.h index 2f65ed20e..071e83272 100644 --- a/tdespell2/ui/configwidget.h +++ b/tdespell2/ui/configwidget.h @@ -29,7 +29,7 @@ namespace KSpell2 class Broker; class KDE_EXPORT ConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ConfigWidget( Broker *broker, TQWidget *parent, const char *name =0 ); ~ConfigWidget(); diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp index 0c45f3cd1..9eb592a5c 100644 --- a/tdespell2/ui/dialog.cpp +++ b/tdespell2/ui/dialog.cpp @@ -69,7 +69,7 @@ Dialog::Dialog( BackgroundChecker *checker, initGui(); initConnections(); - setMainWidget( TQT_TQWIDGET(d->ui) ); + setMainWidget( static_cast<TQWidget*>(d->ui) ); } Dialog::~Dialog() @@ -79,35 +79,35 @@ Dialog::~Dialog() void Dialog::initConnections() { - connect( TQT_TQOBJECT(d->ui->m_addBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotAddWord()) ); - connect( TQT_TQOBJECT(d->ui->m_replaceBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotReplaceWord()) ); - connect( TQT_TQOBJECT(d->ui->m_replaceAllBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotReplaceAll()) ); - connect( TQT_TQOBJECT(d->ui->m_skipBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotSkip()) ); - connect( TQT_TQOBJECT(d->ui->m_skipAllBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotSkipAll()) ); - connect( TQT_TQOBJECT(d->ui->m_suggestBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotSuggest()) ); - connect( TQT_TQOBJECT(d->ui->m_language), TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotChangeLanguage(const TQString&)) ); - connect( TQT_TQOBJECT(d->ui->m_suggestions), TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SIGNAL(misspelling(const TQString&, int)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SLOT(slotMisspelling(const TQString&, int)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(done()), - TQT_SLOT(slotDone()) ); - connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT( slotReplaceWord() ) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotFinished()) ); - connect( this, TQT_SIGNAL(cancelClicked()),this, TQT_SLOT(slotCancel()) ); - connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReplaceWord()) ); - connect( d->ui->m_autoCorrect, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAutocorrect()) ); + connect( d->ui->m_addBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAddWord()) ); + connect( d->ui->m_replaceBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReplaceWord()) ); + connect( d->ui->m_replaceAllBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReplaceAll()) ); + connect( d->ui->m_skipBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSkip()) ); + connect( d->ui->m_skipAllBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSkipAll()) ); + connect( d->ui->m_suggestBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSuggest()) ); + connect( d->ui->m_language, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotChangeLanguage(const TQString&)) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SIGNAL(misspelling(const TQString&, int)) ); + connect( d->checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SLOT(slotMisspelling(const TQString&, int)) ); + connect( d->checker, TQ_SIGNAL(done()), + TQ_SLOT(slotDone()) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT( slotReplaceWord() ) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotFinished()) ); + connect( this, TQ_SIGNAL(cancelClicked()),this, TQ_SLOT(slotCancel()) ); + connect( d->ui->m_replacement, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReplaceWord()) ); + connect( d->ui->m_autoCorrect, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAutocorrect()) ); // button use by kword/kpresenter // hide by default d->ui->m_autoCorrect->hide(); diff --git a/tdespell2/ui/dialog.h b/tdespell2/ui/dialog.h index d07ddacce..a531408bf 100644 --- a/tdespell2/ui/dialog.h +++ b/tdespell2/ui/dialog.h @@ -29,7 +29,7 @@ namespace KSpell2 class BackgroundChecker; class KDE_EXPORT Dialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: Dialog( BackgroundChecker *checker, TQWidget *parent, const char *name=0 ); diff --git a/tdespell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp index 32970f9e4..080737dae 100644 --- a/tdespell2/ui/highlighter.cpp +++ b/tdespell2/ui/highlighter.cpp @@ -87,7 +87,7 @@ int Highlighter::highlightParagraph( const TQString& text, w = d->filter->nextWord(); } } - //TQTimer::singleShot( 0, this, TQT_SLOT(checkWords()) ); + //TQTimer::singleShot( 0, this, TQ_SLOT(checkWords()) ); return 0; } @@ -127,12 +127,12 @@ void Highlighter::setCurrentLanguage( const TQString& lang ) void Highlighter::setMisspelled( int start, int count ) { - setFormat( start , count, Qt::red ); + setFormat( start , count, TQt::red ); } void Highlighter::unsetMisspelled( int start, int count ) { - setFormat( start, count, Qt::black ); + setFormat( start, count, TQt::black ); } /* @@ -142,7 +142,7 @@ void Highlighter::checkWords() if ( !w.end ) { if ( !d->dict->check( w.word ) ) { setFormat( w.start, w.word.length(), - Qt::red ); + TQt::red ); } } }*/ diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp index 305a140c8..768bceb05 100644 --- a/tdestyles/asteroid/asteroid.cpp +++ b/tdestyles/asteroid/asteroid.cpp @@ -83,7 +83,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin); AsteroidStyle::AsteroidStyle() : TDEStyle(AllowMenuTransparency) { if (tqApp->inherits("TDEApplication")) { - connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(tqApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); } backwards = TQApplication::reverseLayout(); @@ -97,7 +97,7 @@ AsteroidStyle::~AsteroidStyle() void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *w = reinterpret_cast<TQWidget*>(ptr); /* Screwing with the palette is fun! and required in order to make it feel authentic. -clee */ @@ -107,7 +107,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to? bool isProtectedObject = false; - TQObject *curparent = TQT_TQOBJECT(w); + TQObject *curparent = w; while (curparent) { if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem") || curparent->inherits("KJanusWidget") @@ -124,7 +124,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme } } - if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQPushButton")) { installObjectEventHandler(ceData, elementFlags, ptr, this); } else { @@ -283,7 +283,7 @@ void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp, } } -int AsteroidStyle::styleHint( TQ_StyleHint stylehint, +int AsteroidStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, @@ -313,7 +313,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint, } } -void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, +void AsteroidStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -907,7 +907,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, } } - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(sf & Style_Enabled ? cg.foreground() : cg.light()); } @@ -969,7 +969,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, } } -void AsteroidStyle::drawControl(TQ_ControlElement ce, +void AsteroidStyle::drawControl(ControlElement ce, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1675,11 +1675,11 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } else if (mi->pixmap()) { TQPixmap *pixmap = mi->pixmap(); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); } p->drawPixmap(xpos, y, *pixmap); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } } } @@ -1710,7 +1710,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } } -void AsteroidStyle::drawControlMask(TQ_ControlElement ce, +void AsteroidStyle::drawControlMask(ControlElement ce, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1757,7 +1757,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce, } } -void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, +void AsteroidStyle::drawComplexControl(ComplexControl cc, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1883,7 +1883,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, int i; for( i=0; i<64; i++ ) a.setPoint( i, 0, i*2+1 ); - p.setPen( Qt::color1 ); + p.setPen( TQt::color1 ); p.drawPoints( a ); p.end(); TQApplication::flushX(); @@ -1891,7 +1891,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, p.begin( horizontalLine ); for( i=0; i<64; i++ ) a.setPoint( i, i*2+1, 0 ); - p.setPen( Qt::color1 ); + p.setPen( TQt::color1 ); p.drawPoints( a ); p.end(); TQApplication::flushX(); @@ -1985,7 +1985,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, p->drawRect(hr); bool draw_skinny_frame = false; -// if (!ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING)) draw_skinny_frame = true; +// if (!ceData.widgetObjectTypes.contains("TQComboBox")) draw_skinny_frame = true; if (ceData.comboBoxListBoxFlags & CEF_IsVisible) draw_skinny_frame = true; if (draw_skinny_frame) { p->setPen(cg.mid()); @@ -2173,7 +2173,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, } } -void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc, +void AsteroidStyle::drawComplexControlMask(ComplexControl cc, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2289,7 +2289,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData & } case PM_DefaultFrameWidth: { - if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQPopupMenu")) { return 3; } else { return TDEStyle::pixelMetric(pm, ceData, elementFlags, w); @@ -2373,7 +2373,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat } } -TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc, +TQRect AsteroidStyle::querySubControlMetrics(ComplexControl cc, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, @@ -2618,7 +2618,7 @@ bool AsteroidStyle::objectEventHandler( const TQStyleControlElementData &ceData, /* Win2K has this interesting behaviour where it sets the current default button to whatever pushbutton the user presses the mouse on. I _think_ this emulates that properly. -clee */ - if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQPushButton")) { if (e->type() == TQEvent::MouseButtonPress) { widgetActionRequest(ceData, elementFlags, source, WAR_SetDefault); } diff --git a/tdestyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h index d6be130aa..8cea936c0 100644 --- a/tdestyles/asteroid/asteroid.h +++ b/tdestyles/asteroid/asteroid.h @@ -11,7 +11,7 @@ class AsteroidStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: AsteroidStyle(); @@ -44,12 +44,12 @@ public: const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; - void drawPrimitive(TQ_PrimitiveElement, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -58,7 +58,7 @@ public: SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default) const; - void drawControl(TQ_ControlElement, + void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -68,7 +68,7 @@ public: const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - void drawControlMask(TQ_ControlElement, + void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -76,7 +76,7 @@ public: const TQStyleOption &, const TQWidget * = 0) const; - void drawComplexControl(TQ_ComplexControl, + void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -88,7 +88,7 @@ public: const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - void drawComplexControlMask(TQ_ComplexControl, + void drawComplexControlMask(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -102,7 +102,7 @@ public: TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - TQRect querySubControlMetrics(TQ_ComplexControl, + TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp index d1666406f..9cf26d102 100644 --- a/tdestyles/highcolor/highcolor.cpp +++ b/tdestyles/highcolor/highcolor.cpp @@ -190,19 +190,19 @@ HighColorStyle::~HighColorStyle() void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); // Put in order of highest occurrence to maximise hit rate - if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) { + if (widget->inherits("TQPushButton")) { installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING) || widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { + } else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) { widget->setBackgroundMode(TQWidget::NoBackground); - } else if (type == HighColor && widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { + } else if (type == HighColor && widget->inherits("TQToolBarExtensionWidget")) { installObjectEventHandler(ceData, elementFlags, ptr, this); } else if ( !qstrcmp( widget->name(), kdeToolbarWidget) ) { widget->setBackgroundMode( NoBackground ); // We paint the whole background. installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (widget->inherits(TQTOOLBOXBUTTON_OBJECT_NAME_STRING)) { + } else if (widget->inherits("TQToolBoxButton")) { TQFont font = widget->font(); font.setBold(true); widget->setFont(font); @@ -215,14 +215,14 @@ void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElem void HighColorStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) { + if (widget->inherits("TQPushButton")) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING) || widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { + else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) { widget->setBackgroundMode(TQWidget::PaletteBackground); - } else if (type == HighColor && widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { + } else if (type == HighColor && widget->inherits("TQToolBarExtensionWidget")) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } else if ( !qstrcmp( widget->name(), kdeToolbarWidget) ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); @@ -240,7 +240,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg { TQColor col = cg.button(); -#ifdef Q_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals +#ifdef TQ_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals if ( TQPaintDevice::x11AppDepth() >= 24 ) KPixmapEffect::gradient( pix, col.light(120), col.dark(115), KPixmapEffect::HorizontalGradient ); @@ -251,7 +251,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg // This function draws primitive elements as well as their masks. -void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, +void HighColorStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -430,7 +430,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, if (p && p->device()->devType() == TQInternal::Widget) { TQHeader* hdr = dynamic_cast<TQHeader*>(p->device()); if (hdr) - horizontal = hdr->orientation() == Qt::Horizontal; + horizontal = hdr->orientation() == TQt::Horizontal; } int x,y,w,h; @@ -730,7 +730,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, maskBmp.setMask(maskBmp); } - p->setPen(Qt::color1); + p->setPen(TQt::color1); p->drawPixmap(r.x(), r.y(), maskBmp); break; } @@ -1144,7 +1144,7 @@ void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, } -void HighColorStyle::drawControl( TQ_ControlElement element, +void HighColorStyle::drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1480,20 +1480,20 @@ void HighColorStyle::drawControl( TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags); TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); @@ -1520,7 +1520,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element, } -void HighColorStyle::drawControlMask( TQ_ControlElement element, +void HighColorStyle::drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1548,7 +1548,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element, } -void HighColorStyle::drawComplexControl( TQ_ComplexControl control, +void HighColorStyle::drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1683,22 +1683,22 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control, } else if (!ceData.parentWidgetData.widgetObjectTypes.isEmpty()) { - if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) + if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) { TQToolBar* parent = (TQToolBar*)widget->parent(); TQRect pr = parent->rect(); renderGradient( p, r, cg.button(), - parent->orientation() == Qt::Vertical, + parent->orientation() == TQt::Vertical, r.x(), r.y(), pr.width()-2, pr.height()-2); } - else if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) + else if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBarExtensionWidget")) { TQWidget* parent = (TQWidget*)widget->parent(); TQToolBar* toolbar = (TQToolBar*)parent->parent(); TQRect tr = toolbar->rect(); - if ( toolbar->orientation() == Qt::Horizontal ) { + if ( toolbar->orientation() == TQt::Horizontal ) { renderGradient( p, r, cg.button(), false, r.x(), r.y(), r.width(), tr.height() ); } else { @@ -1735,7 +1735,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control, } -void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control, +void HighColorStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2016,7 +2016,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData TQToolBar* toolbar; - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); @@ -2032,14 +2032,14 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *widget = TQT_TQWIDGET(object); - TQWidget *parent = TQT_TQWIDGET(object->parent()); + TQWidget *widget = static_cast<TQWidget*>(object); + TQWidget *parent = static_cast<TQWidget*>(object->parent()); int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { x_offset += parent->x(); y_offset += parent->y(); - parent = TQT_TQWIDGET(parent->parent()); + parent = static_cast<TQWidget*>(parent->parent()); } TQRect r = ceData.rect; @@ -2048,7 +2048,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData // Check if the parent is a QToolbar, and use its orientation, else guess. TQToolBar* tb = dynamic_cast<TQToolBar*>(parent); - if (tb) horiz_grad = tb->orientation() == Qt::Vertical; + if (tb) horiz_grad = tb->orientation() == TQt::Vertical; TQPainter p( widget ); renderGradient(&p, r, parent->colorGroup().button(), horiz_grad, @@ -2067,15 +2067,15 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData if ( event->type() == TQEvent::Paint ) { - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast<TQWidget*>(object); TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect; TQPainter p( widget ); renderGradient(&p, wr, toolbar->colorGroup().button(), - toolbar->orientation() == Qt::Vertical, + toolbar->orientation() == TQt::Vertical, wr.x(), wr.y(), tr.width() - 2, tr.height() - 2); p.setPen( toolbar->colorGroup().dark() ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); else p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 ); diff --git a/tdestyles/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h index d8b7251db..4019dc10b 100644 --- a/tdestyles/highcolor/highcolor.h +++ b/tdestyles/highcolor/highcolor.h @@ -57,7 +57,7 @@ class TQPopupMenu; class HighColorStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: enum StyleType { HighColor = 0, Default, B3 }; @@ -81,7 +81,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -90,7 +90,7 @@ class HighColorStyle : public TDEStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -100,7 +100,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement element, + void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -108,7 +108,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -120,7 +120,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControlMask( TQ_ComplexControl control, + void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -158,7 +158,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/highcontrast/config/highcontrastconfig.cpp b/tdestyles/highcontrast/config/highcontrastconfig.cpp index 8d8df0e79..a570a6eab 100644 --- a/tdestyles/highcontrast/config/highcontrastconfig.cpp +++ b/tdestyles/highcontrast/config/highcontrastconfig.cpp @@ -57,7 +57,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( "/highcontraststyle/Settings/wideLines", false); wideLinesBox->setChecked(originalWideLinesState); - connect(wideLinesBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateChanged())); + connect(wideLinesBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateChanged())); } HighContrastStyleConfig::~HighContrastStyleConfig() diff --git a/tdestyles/highcontrast/config/highcontrastconfig.h b/tdestyles/highcontrast/config/highcontrastconfig.h index d52a22b47..0f0a5ca09 100644 --- a/tdestyles/highcontrast/config/highcontrastconfig.h +++ b/tdestyles/highcontrast/config/highcontrastconfig.h @@ -31,7 +31,7 @@ class TQCheckBox; class HighContrastStyleConfig: public TQWidget { - Q_OBJECT + TQ_OBJECT public: HighContrastStyleConfig(TQWidget* parent); ~HighContrastStyleConfig(); diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp index 0d67fd94b..5ef1f36d6 100644 --- a/tdestyles/highcontrast/highcontrast.cpp +++ b/tdestyles/highcontrast/highcontrast.cpp @@ -154,14 +154,14 @@ void HighContrastStyle::polish( TQPalette& pal ) void HighContrastStyle::polish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (widget->inherits (TQBUTTON_OBJECT_NAME_STRING) - || widget->inherits (TQCOMBOBOX_OBJECT_NAME_STRING) - || widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING) - || widget->inherits (TQLINEEDIT_OBJECT_NAME_STRING) - || widget->inherits (TQTEXTEDIT_OBJECT_NAME_STRING)) + if (widget->inherits ("TQButton") + || widget->inherits ("TQComboBox") + || widget->inherits ("TQSpinWidget") + || widget->inherits ("TQLineEdit") + || widget->inherits ("TQTextEdit")) { installObjectEventHandler(ceData, elementFlags, ptr, this); @@ -181,9 +181,9 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control void HighContrastStyle::unPolish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (widget->inherits (TQWIDGET_OBJECT_NAME_STRING) || widget->inherits (TQCOMBOBOX_OBJECT_NAME_STRING) || widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING) || widget->inherits (TQLINEEDIT_OBJECT_NAME_STRING) || widget->inherits (TQTEXTEDIT_OBJECT_NAME_STRING)) { + if (widget->inherits ("TQWidget") || widget->inherits ("TQComboBox") || widget->inherits ("TQSpinWidget") || widget->inherits ("TQLineEdit") || widget->inherits ("TQTextEdit")) { installObjectEventHandler(ceData, elementFlags, ptr, this); } } @@ -219,12 +219,12 @@ void HighContrastStyle::setColorsByState (TQPainter* p, const TQColorGroup& cg, if ((flags & Style_Enabled) && (flags & highlight)) { - p->setPen (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine)); + p->setPen (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine)); p->setBackgroundColor (cg.highlight()); } else { - p->setPen (TQPen (fg, basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine)); + p->setPen (TQPen (fg, basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine)); p->setBackgroundColor (bg); } @@ -253,7 +253,7 @@ void HighContrastStyle::drawRoundRect (TQPainter* p, TQRect r, int offset, bool addOffset (&r3, lineWidth); p->save(); - p->setPen (Qt::NoPen); + p->setPen (TQt::NoPen); if (filled) p->fillRect (r3, p->backgroundColor()); p->drawRect (r3); @@ -286,7 +286,7 @@ void HighContrastStyle::drawEllipse (TQPainter* p, TQRect r, int offset, bool fi p->drawRoundRect (r, 99, 99); } -void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset) const +void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset) const { p->save(); addOffset (&r, offset); @@ -337,7 +337,7 @@ void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement a } // This function draws primitive elements -void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, +void HighContrastStyle::drawPrimitive (PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -371,9 +371,9 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, case PE_FocusRect: { p->save(); p->setBrush (TQBrush ()); - p->setPen (TQPen (cg.highlight(), basicLineWidth, Qt::SolidLine)); + p->setPen (TQPen (cg.highlight(), basicLineWidth, TQt::SolidLine)); drawRoundRect (p, r, basicLineWidth, false); - p->setPen (TQPen (cg.highlightedText(), basicLineWidth, Qt::DashLine)); + p->setPen (TQPen (cg.highlightedText(), basicLineWidth, TQt::DashLine)); drawRoundRect (p, r, basicLineWidth, false); p->restore(); break; @@ -472,7 +472,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, case PE_ProgressBarChunk: { - p->fillRect (r, Qt::color1); + p->fillRect (r, TQt::color1); break; } @@ -506,7 +506,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, break; } case PE_IndicatorMask: { - p->fillRect (r, Qt::color1); + p->fillRect (r, TQt::color1); break; } case PE_CheckMark: { @@ -535,10 +535,10 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, break; } case PE_ExclusiveIndicatorMask: { - p->fillRect (r, Qt::color0); - p->setBackgroundColor (Qt::color1); - p->setPen (Qt::NoPen); - p->setBrush (Qt::color1); + p->fillRect (r, TQt::color0); + p->setBackgroundColor (TQt::color1); + p->setPen (TQt::NoPen); + p->setBrush (TQt::color1); p->drawEllipse (r); break; } @@ -551,7 +551,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, setColorsButton (p, cg, flags); p->fillRect (r, p->backgroundColor()); - p->setPen (TQPen (p->pen().color(), 1, Qt::DashLine)); + p->setPen (TQPen (p->pen().color(), 1, TQt::DashLine)); if (flags & Style_Horizontal) p->drawLine (r.center().x(), r.top(), r.center().x(), r.bottom()); else @@ -713,7 +713,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, { setColorsButton (p, cg); p->fillRect (r, p->backgroundColor()); - p->setBrush (TQBrush (p->pen().color(), Qt::BDiagPattern)); + p->setBrush (TQBrush (p->pen().color(), TQt::BDiagPattern)); drawRoundRect (p, r); break; } @@ -724,7 +724,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, case KPE_SliderGroove: { setColorsText (p, cg, flags); TQRect r2 (r); - if (ceData.widgetObjectTypes.contains(TQSLIDER_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQSlider")) { if (ceData.orientation == TQt::Horizontal) { @@ -764,7 +764,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, // Probably it would be better to add a KPM_ListViewExpander metric // to the TDEStyle TDEStylePixelMetric enum, and have the TDEStyle // drawComplexControl handle it. - TQ_PrimitiveElement direction; + PrimitiveElement direction; if (flags & Style_On) { // Collapsed = On direction = PE_ArrowRight; @@ -784,7 +784,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, } -void HighContrastStyle::drawControl (TQ_ControlElement element, +void HighContrastStyle::drawControl (ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1133,20 +1133,20 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags); TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); @@ -1162,7 +1162,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, } } -void HighContrastStyle::drawControlMask (TQ_ControlElement element, +void HighContrastStyle::drawControlMask (ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1207,7 +1207,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) return sibling; } -void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, +void HighContrastStyle::drawComplexControl (ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1262,12 +1262,12 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, setColorsButton (p, cg, flags); // Draw arrows if required if (controls & SC_SpinWidgetDown) { - TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags); + TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags); drawRoundRect (p, r2); drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth); } if (controls & SC_SpinWidgetUp) { - TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags); + TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags); drawRoundRect (p, r2); drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth); } @@ -1490,7 +1490,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, } } -void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c, +void HighContrastStyle::drawComplexControlMask(ComplexControl c, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -1535,7 +1535,7 @@ void HighContrastStyle::drawItem( TQPainter *p, p->restore(); } -TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control, +TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -1622,7 +1622,7 @@ int HighContrastStyle::pixelMetric(PixelMetric m, const TQStyleControlElementDat } case PM_DefaultFrameWidth: { - if (widget && (ceData.widgetObjectTypes.contains (TQLINEEDIT_OBJECT_NAME_STRING) || ceData.widgetObjectTypes.contains (TQTEXTEDIT_OBJECT_NAME_STRING))) + if (widget && (ceData.widgetObjectTypes.contains ("TQLineEdit") || ceData.widgetObjectTypes.contains ("TQTextEdit"))) return 2*basicLineWidth; else return basicLineWidth; diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h index 30d498b96..688742fb6 100644 --- a/tdestyles/highcontrast/highcontrast.h +++ b/tdestyles/highcontrast/highcontrast.h @@ -48,7 +48,7 @@ class TQPopupMenu; class HighContrastStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: HighContrastStyle(); @@ -69,7 +69,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -78,7 +78,7 @@ class HighContrastStyle : public TDEStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -88,7 +88,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement element, + void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -96,7 +96,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -108,7 +108,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControlMask( TQ_ComplexControl control, + void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -116,7 +116,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - TQRect querySubControlMetrics( TQ_ComplexControl control, + TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -149,7 +149,7 @@ class HighContrastStyle : public TDEStyle TQRect subRect (SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * widget) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; @@ -166,7 +166,7 @@ class HighContrastStyle : public TDEStyle void drawRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; void drawRoundRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; void drawEllipse (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; - void drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset = 0) const; + void drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset = 0) const; int basicLineWidth; // Disable copy constructor and = operator diff --git a/tdestyles/keramik/genembed.cpp b/tdestyles/keramik/genembed.cpp index c816b2a0f..cbbecae65 100644 --- a/tdestyles/keramik/genembed.cpp +++ b/tdestyles/keramik/genembed.cpp @@ -227,7 +227,7 @@ int main(int argc, char** argv) for (int pos=0; pos<size; pos++) { - QRgb basePix = (QRgb)*read; + TQRgb basePix = (TQRgb)*read; if (tqAlpha(basePix) != 255) reallySolid = false; @@ -245,7 +245,7 @@ int main(int argc, char** argv) read = reinterpret_cast< TQ_UINT32* >(input.bits() ); for (int pos=0; pos<size; pos++) { - QRgb basePix = (QRgb)*read; + TQRgb basePix = (TQRgb)*read; //cout<<(r*destAlpha.alphas[pos])<<"\n"; //cout<<(int)destAlpha.alphas[pos]<<"\n"; TQColor clr(basePix); diff --git a/tdestyles/keramik/gradients.cpp b/tdestyles/keramik/gradients.cpp index ca89abd61..a113d7a3c 100644 --- a/tdestyles/keramik/gradients.cpp +++ b/tdestyles/keramik/gradients.cpp @@ -35,7 +35,7 @@ namespace struct GradientCacheEntry { TQPixmap* m_pixmap; - QRgb m_color; + TQRgb m_color; bool m_menu; int m_width; int m_height; diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index 2b7213eee..65603b30f 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -123,7 +123,7 @@ namespace namespace { - void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::TQ_PrimitiveElement pe, bool down, bool enabled) + void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::PrimitiveElement pe, bool down, bool enabled) { TQPointArray a; @@ -179,7 +179,7 @@ void KeramikStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg, { TQColor col = cg.button(); -#ifdef Q_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals +#ifdef TQ_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals if ( TQPaintDevice::x11AppDepth() >= 24 ) KPixmapEffect::gradient( pix, col.light(120), col.dark(115), KPixmapEffect::HorizontalGradient ); @@ -251,20 +251,20 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap, switch (stylepixmap) { case SP_TitleBarMinButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_iconify, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); //return qpixmap_from_bits( iconify_bits, "title-iconify.png" ); case SP_TitleBarMaxButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_maximize, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); case SP_TitleBarCloseButton: if (widget && widget->inherits("KDockWidgetHeader")) return Keramik::PixmapLoader::the().pixmap(keramik_title_close_tiny, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); else return Keramik::PixmapLoader::the().pixmap(keramik_title_close, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); case SP_TitleBarNormalButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_restore, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); default: break; } @@ -290,7 +290,7 @@ KeramikStyle::KeramikStyle() if (animateProgressBar) { animationTimer = new TQTimer( this ); - connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) ); + connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) ); } firstComboPopupRelease = false; @@ -329,7 +329,7 @@ KeramikStyle::~KeramikStyle() void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if (!qstrcmp(app->argv()[0], "kicker")) { kickerMode = true; @@ -339,28 +339,28 @@ void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); // Put in order of highest occurrence to maximise hit rate - if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) || widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) ) + if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) || widget->inherits("TQToolButton") ) { installObjectEventHandler(ceData, elementFlags, ptr, this); - if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQComboBox" ) ) widget->setBackgroundMode( NoBackground ); } - else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) ) widget->setBackgroundMode( NoBackground ); else if ( widget->parentWidget() && - ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || + ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) || widget->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 4 ); listbox->setBackgroundMode( NoBackground ); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { + } else if (widget->inherits("TQToolBarExtensionWidget")) { installObjectEventHandler(ceData, elementFlags, ptr, this); //widget->setBackgroundMode( NoBackground ); } @@ -369,11 +369,11 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen installObjectEventHandler(ceData, elementFlags, ptr, this); } - if (animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget)) + if (animateProgressBar && ::tqt_cast<TQProgressBar*>(widget)) { installObjectEventHandler(ceData, elementFlags, ptr, this); progAnimWidgets[static_cast<TQProgressBar*>(widget)] = 0; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*))); if (!animationTimer->isActive()) animationTimer->start( 50, false ); } @@ -384,35 +384,35 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); //### TODO: This needs major cleanup (and so does polish() ) - if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) ) { - if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQComboBox" ) ) widget->setBackgroundMode( PaletteButton ); removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) ) widget->setBackgroundMode( PaletteBackground ); else if ( widget->parentWidget() && - ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || + ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) || widget->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 1 ); listbox->setBackgroundMode( PaletteBackground ); removeObjectEventHandler(ceData, elementFlags, ptr, this); widget->clearMask(); - } else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { + } else if (widget->inherits("TQToolBarExtensionWidget")) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } else if ( !qstrcmp( widget->name(), kdeToolbarWidget ) ) { widget->setBackgroundMode( PaletteBackground ); removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if ( ::tqqt_cast<TQProgressBar*>(widget) ) + else if ( ::tqt_cast<TQProgressBar*>(widget) ) { progAnimWidgets.remove(static_cast<TQProgressBar*>(widget)); } @@ -423,7 +423,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem void KeramikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(static_cast<TQProgressBar*>(TQT_TQWIDGET(obj))); + progAnimWidgets.remove(static_cast<TQProgressBar*>(obj)); } @@ -487,13 +487,13 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *parent = (widget)?TQT_TQWIDGET(widget->parentWidget()):(TQWidget*)NULL; + TQWidget *parent = (widget)?widget->parentWidget():NULL; int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { x_offset += parent->x(); y_offset += parent->y(); - parent = TQT_TQWIDGET(parent->parent()); + parent = static_cast<TQWidget*>(parent->parent()); } TQRect pr = ceData.parentWidgetData.rect; @@ -543,7 +543,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr } // This function draws primitive elements as well as their masks. -void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, +void KeramikStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -969,7 +969,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, if (kickerMode) { if (p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame" ) + TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame" ) { int x2 = x + r.width() - 1; int y2 = y + r.height() - 1; @@ -1107,7 +1107,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, TQWidget* paintWidget = dynamic_cast<TQWidget*>(p->device()); TQToolBar* parent = 0; if (paintWidget) - parent = ::tqqt_cast<TQToolBar*>(paintWidget->parentWidget()); + parent = ::tqt_cast<TQToolBar*>(paintWidget->parentWidget()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal) ); if ( !(flags & Style_Horizontal) ) @@ -1267,10 +1267,10 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if (horizontal) Keramik::ScaledPainter( keramik_slider ).draw( p, r, disabled ? cg.button() : hl, - Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); else Keramik::ScaledPainter( keramik_vslider ).draw( p, r, disabled ? cg.button() : hl, - Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); break; } @@ -1283,8 +1283,8 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQToolBar* parent = 0; - if (widget && widget->parent() && widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) - parent = static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent())); + if (widget && widget->parent() && widget->parent()->inherits("TQToolBar")) + parent = static_cast<TQToolBar*>(widget->parent()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal)); if (flags & Style_Horizontal) { @@ -1380,7 +1380,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C return false; } -void KeramikStyle::drawControl( TQ_ControlElement element, +void KeramikStyle::drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1414,7 +1414,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, } else { - if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) + if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) toolbarBlendWidget = widget; drawPrimitive( PE_ButtonCommand, p, ceData, elementFlags, r, cg, flags ); @@ -1520,7 +1520,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, case CE_ToolButtonLabel: { - bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAR_OBJECT_NAME_STRING ); + bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBar" ); TQRect nr = r; if (!onToolbar) @@ -1588,7 +1588,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, case CE_DockWindowEmptyArea: { TQRect pr = r; - if (ceData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQToolBar")) { const TQToolBar* tb = static_cast<const TQToolBar*>(widget); if (tb->place() == TQDockWindow::OutsideDock) @@ -1600,10 +1600,10 @@ void KeramikStyle::drawControl( TQ_ControlElement element, //toolbar we normally paint over. } Keramik::GradientPainter::renderGradient( p, pr, cg.button(), - tb->orientation() == Qt::Horizontal); + tb->orientation() == TQt::Horizontal); } else - TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, + TDEStyle::drawControl( (ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, r, cg, flags, opt, widget ); break; } @@ -1818,20 +1818,20 @@ void KeramikStyle::drawControl( TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - itemFrame; TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); @@ -1963,7 +1963,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, } } -void KeramikStyle::drawControlMask( TQ_ControlElement element, +void KeramikStyle::drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1995,7 +1995,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceDat } } -void KeramikStyle::drawComplexControl( TQ_ComplexControl control, +void KeramikStyle::drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2029,7 +2029,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, if (controls == SC_All) { //Double-buffer only when we are in the slower full-blend mode - if ( ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING) || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) ) + if ( ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar") || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) ) { buf = new TQPixmap( r.width(), r.height() ); br.setX(0); @@ -2100,7 +2100,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, p2->setPen( cg.buttonText() ); p2->drawLineSegments( a ); - Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); } else //Size-constrained combo -- loose the ripple. { @@ -2125,7 +2125,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, p2->fillRect( er, cg.base() ); drawPrimitive( PE_PanelLineEdit, p2, ceData, elementFlags, er, cg ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( p2, er, cg.button(), - Qt::black, false, pmodeFullBlend() ); + TQt::black, false, pmodeFullBlend() ); } else if ( elementFlags & CEF_HasFocus ) { @@ -2164,7 +2164,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, case CC_SpinWidget: { const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget ); - TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags ); + TQRect br = visualRect( querySubControlMetrics( (ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags ); if ( controls & SC_SpinWidgetButtonField ) { Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() ); @@ -2257,10 +2257,10 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, // TOOLBUTTON // ------------------------------------------------------------------- case CC_ToolButton: { - bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING); + bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"); bool onExtender = !onToolbar && - ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING) && - widget && widget->parentWidget()->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); + ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBarExtensionWidget") && + widget && widget->parentWidget()->parentWidget()->inherits( "TQToolBar" ); bool onControlButtons = false; if (!onToolbar && !onExtender && !ceData.parentWidgetData.widgetObjectTypes.isEmpty() && @@ -2312,8 +2312,8 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, { // This assumes floating toolbars can't have extenders, //(so if we're on an extender, we're not floating) - TQWidget* parent = static_cast<TQWidget*> (TQT_TQWIDGET(widget->parent())); - TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(parent->parent())); + TQWidget* parent = static_cast<TQWidget*> (static_cast<TQWidget*>(widget->parent())); + TQToolBar* toolbar = static_cast<TQToolBar*>(parent->parent()); TQRect tr = ceData.parentWidgetData.rect; bool horiz = ceData.toolBarData.orientation == TQt::Horizontal; @@ -2361,7 +2361,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, } } -void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control, +void KeramikStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2437,7 +2437,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce case PM_TabBarTabShiftVertical: { - if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQTabBar")) { if (ceData.tabBarData.shape == TQTabBar::RoundedBelow || ceData.tabBarData.shape == TQTabBar::TriangularBelow) @@ -2492,7 +2492,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, case CT_ToolButton: { - bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); + bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "TQToolBar" ); if (!onToolbar) //Behaves like a button, so scale appropriately to the border { int w = contentSize.width(); @@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, } -TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, +TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint& point, @@ -2585,7 +2585,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine ) { TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget ); - if ( static_cast< const TQScrollBar* >( widget )->orientation() == Qt::Horizontal ) + if ( static_cast< const TQScrollBar* >( widget )->orientation() == TQt::Horizontal ) { if ( point.x() < addline.center().x() ) result = SC_ScrollBarSubLine; } @@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, return result; } -TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, +TQRect KeramikStyle::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -2778,7 +2778,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, #include <config.h> -#if !defined Q_WS_X11 || defined K_WS_QTONLY +#if !defined TQ_WS_X11 || defined K_WS_QTONLY #undef HAVE_X11_EXTENSIONS_SHAPE_H #endif @@ -2795,29 +2795,29 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event )) return true; - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if ( !object->isWidgetType() ) return false; //Combo line edits get special frames - if ( event->type() == TQEvent::Paint && ::tqqt_cast<TQLineEdit*>(object) ) + if ( event->type() == TQEvent::Paint && ::tqt_cast<TQLineEdit*>(object) ) { static bool recursion = false; if (recursion ) return false; recursion = true; - object->event( TQT_TQPAINTEVENT( event ) ); - TQWidget* widget = TQT_TQWIDGET( object ); + object->event( static_cast<TQPaintEvent*>( event ) ); + TQWidget* widget = static_cast<TQWidget*>( object ); TQPainter p( widget ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect, - widget->palette().color( TQPalette::Normal, TQColorGroup::Button ), - Qt::black, false, Keramik::TilePainter::PaintFullBlend); + widget->palette().color( TQPalette::Active, TQColorGroup::Button ), + TQt::black, false, Keramik::TilePainter::PaintFullBlend); recursion = false; return true; } - else if ( ::tqqt_cast<TQListBox*>(object) ) + else if ( ::tqt_cast<TQListBox*>(object) ) { //Handle combobox drop downs switch (event->type()) @@ -2826,8 +2826,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, //Combo dropdowns are shaped case TQEvent::Resize: { - TQListBox* listbox = static_cast<TQListBox*>(TQT_TQWIDGET(object)); - TQResizeEvent* resize = TQT_TQRESIZEEVENT(event); + TQListBox* listbox = static_cast<TQListBox*>(object); + TQResizeEvent* resize = static_cast<TQResizeEvent*>(event); if (resize->size().height() < 6) return false; @@ -2859,8 +2859,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { TQPainter p( listbox ); Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(), - listbox->palette().color( TQPalette::Normal, TQColorGroup::Button ), - listbox->palette().color( TQPalette::Normal, TQColorGroup::Background ) ); + listbox->palette().color( TQPalette::Active, TQColorGroup::Button ), + listbox->palette().color( TQPalette::Active, TQColorGroup::Background ) ); TQPaintEvent newpaint( paint->region().intersect( listbox->contentsRect() ), paint->erased() ); recursion = true; @@ -2891,8 +2891,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { firstComboPopupRelease = false; - TQMouseEvent* mev = TQT_TQMOUSEEVENT(event); - TQListBox* box = static_cast<TQListBox*>(TQT_TQWIDGET(object)); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(event); + TQListBox* box = static_cast<TQListBox*>(object); TQWidget* parent = box->parentWidget(); if (!parent) @@ -2919,24 +2919,24 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { // Draw a gradient background for custom widgets in the toolbar // that have specified a "tde toolbar widget" name. - renderToolbarWidgetBackground(0, ceData, elementFlags, TQT_TQWIDGET(object)); + renderToolbarWidgetBackground(0, ceData, elementFlags, static_cast<TQWidget*>(object)); return false; // Now draw the contents } #if 0 // FIXME // This does not work on modern systems // Rather than resorting to hacks like this, which can stop working at any time, the required functionality should simply be added to TQt3! - else if (event->type() == TQEvent::Paint && object->parent() && ::tqqt_cast<TQToolBar*>(object->parent()) - && !::tqqt_cast<TQPopupMenu*>(object) ) + else if (event->type() == TQEvent::Paint && object->parent() && ::tqt_cast<TQToolBar*>(object->parent()) + && !::tqt_cast<TQPopupMenu*>(object) ) { // We need to override the paint event to draw a // gradient on a QToolBarExtensionWidget. - TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(object->parent())); - TQWidget* widget = TQT_TQWIDGET(object); + TQToolBar* toolbar = static_cast<TQToolBar*>(object->parent()); + TQWidget* widget = static_cast<TQWidget*>(object); TQRect wr = widget->rect (), tr = toolbar->rect(); TQPainter p( widget ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) { Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(), true /*horizontal*/, false /*not a menu*/, @@ -2952,7 +2952,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, //Draw terminator line, too p.setPen( toolbar->colorGroup().mid() ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); else p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 ); @@ -2961,7 +2961,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, } #endif // Track show events for progress bars - if ( animateProgressBar && ::tqqt_cast<TQProgressBar*>(object) ) + if ( animateProgressBar && ::tqt_cast<TQProgressBar*>(object) ) { if ((event->type() == TQEvent::Show) && !animationTimer->isActive()) { diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h index 3792027e3..23cc0d044 100644 --- a/tdestyles/keramik/keramik.h +++ b/tdestyles/keramik/keramik.h @@ -41,7 +41,7 @@ class TQProgressBar; class KeramikStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: KeramikStyle(); @@ -65,7 +65,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -74,7 +74,7 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -84,7 +84,7 @@ public: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawControlMask( TQ_ControlElement element, + void drawControlMask( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -92,7 +92,7 @@ public: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -104,7 +104,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawComplexControlMask( TQ_ComplexControl control, + void drawComplexControlMask( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -121,21 +121,21 @@ public: const TQStyleOption& opt, const TQWidget* widget = 0 ) const; - SubControl querySubControl( TQ_ComplexControl control, + SubControl querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint& point, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - TQRect querySubControlMetrics( TQ_ComplexControl control, + TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/keramik/pixmaploader.cpp b/tdestyles/keramik/pixmaploader.cpp index 73d7eb8d9..b506f9300 100644 --- a/tdestyles/keramik/pixmaploader.cpp +++ b/tdestyles/keramik/pixmaploader.cpp @@ -316,7 +316,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const { if (mode == PaintTrivialMask) { - p->fillRect(x, y, width, height, Qt::color1); + p->fillRect(x, y, width, height, TQt::color1); return; } @@ -425,12 +425,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const const TQBitmap* mask = scale( col, row, w, h, color, bg, disabled, false ).mask(); if (mask) { - p->setBackgroundColor(Qt::color0); - p->setPen(Qt::color1); + p->setBackgroundColor(TQt::color0); + p->setPen(TQt::color1); p->drawTiledPixmap( xpos, ypos, realW, realH, *mask); } else - p->fillRect ( xpos, ypos, realW, realH, Qt::color1); + p->fillRect ( xpos, ypos, realW, realH, TQt::color1); } } else @@ -445,12 +445,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask(); if (mask) { - p->setBackgroundColor(Qt::color0); - p->setPen(Qt::color1); + p->setBackgroundColor(TQt::color0); + p->setPen(TQt::color1); p->drawTiledPixmap( xpos, ypos, realW, realH, *mask); } else - p->fillRect ( xpos, ypos, realW, realH, Qt::color1); + p->fillRect ( xpos, ypos, realW, realH, TQt::color1); } } diff --git a/tdestyles/keramik/pixmaploader.h b/tdestyles/keramik/pixmaploader.h index b03cf3800..3bfcd2d1b 100644 --- a/tdestyles/keramik/pixmaploader.h +++ b/tdestyles/keramik/pixmaploader.h @@ -67,8 +67,8 @@ namespace Keramik int m_id; int m_width; int m_height; - QRgb m_colorCode; - QRgb m_bgCode; + TQRgb m_colorCode; + TQRgb m_bgCode; bool m_disabled; bool m_blended; diff --git a/tdestyles/klegacy/klegacystyle.cpp b/tdestyles/klegacy/klegacystyle.cpp index 8daf82c06..1dcfadf56 100644 --- a/tdestyles/klegacy/klegacystyle.cpp +++ b/tdestyles/klegacy/klegacystyle.cpp @@ -81,7 +81,6 @@ #include <tqregexp.h> #include <tqscrollbar.h> #include <tqscrollview.h> -#include <tqsemimodal.h> #include <tqsizegrip.h> #include <tqslider.h> #include <tqspinbox.h> @@ -387,7 +386,7 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, // draw the image bool mask = image->hasAlphaBuffer(); TQBitmap bm(width, height); - bm.fill(Qt::color1); + bm.fill(TQt::color1); TQImage nimage[3][3]; int xx = -1, yy = -1; @@ -404,12 +403,12 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, if (nimage[yy][xx].isNull()) continue; bitBlt(pixmap, x2[xx], y2[yy], &nimage[yy][xx], - 0, 0, w2[xx], h2[yy], Qt::CopyROP); + 0, 0, w2[xx], h2[yy], TQt::CopyROP); if (mask) { TQImage am = nimage[yy][xx].createAlphaMask(); bitBlt(&bm, x2[xx], y2[yy], &am, - 0, 0, w2[xx], h2[yy], Qt::CopyROP); + 0, 0, w2[xx], h2[yy], TQt::CopyROP); } } } @@ -419,14 +418,14 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, } else { for (int y = 0; y < height; y += image->height()) for (int x = 0; x < width; x += image->width()) - bitBlt(pixmap, x, y, image, 0, 0, -1, -1, Qt::CopyROP); + bitBlt(pixmap, x, y, image, 0, 0, -1, -1, TQt::CopyROP); if (image->hasAlphaBuffer()) { TQImage mask = image->createAlphaMask(); if (! mask.isNull() && mask.depth() == 1) { TQBitmap bm(width, height); - bm.fill(Qt::color1); + bm.fill(TQt::color1); bm = mask; pixmap->setMask(bm); } @@ -707,7 +706,6 @@ static GtkObject *initialize(TQPtrDict<GtkObject> &dict) { dict.insert(TQRadioButton::staticMetaObject(), myGtkRadioButton); dict.insert(TQScrollBar::staticMetaObject(), myGtkScrollbar); dict.insert(TQScrollView::staticMetaObject(), myGtkViewport); - dict.insert(TQSemiModal::staticMetaObject(), myGtkDialog); dict.insert(TQSizeGrip::staticMetaObject(), myGtkWidget); dict.insert(TQSlider::staticMetaObject(), myGtkScale); dict.insert(TQSpinBox::staticMetaObject(), myGtkSpinButton); @@ -1210,13 +1208,13 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) { if (equals.isNull() || parameter.isNull() || equals != "=") continue; if (parameter == "UP") - imagedata->key.data.arrowDirection = Qt::UpArrow + 1; + imagedata->key.data.arrowDirection = TQt::UpArrow + 1; else if (parameter == "DOWN") - imagedata->key.data.arrowDirection = Qt::DownArrow + 1; + imagedata->key.data.arrowDirection = TQt::DownArrow + 1; else if (parameter == "LEFT") - imagedata->key.data.arrowDirection = Qt::LeftArrow + 1; + imagedata->key.data.arrowDirection = TQt::LeftArrow + 1; else if (parameter == "RIGHT") - imagedata->key.data.arrowDirection = Qt::RightArrow + 1; + imagedata->key.data.arrowDirection = TQt::RightArrow + 1; } else if (next == "border") { filestream >> equals; filestream >> parameter; @@ -1323,9 +1321,9 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) { if (equals.isNull() || parameter.isNull() || equals != "=") continue; if (parameter == "VERTICAL") - imagedata->key.data.orientation = Qt::Vertical + 1; + imagedata->key.data.orientation = TQt::Vertical + 1; else if (parameter == "HORIZONTAL") - imagedata->key.data.orientation = Qt::Horizontal + 1; + imagedata->key.data.orientation = TQt::Horizontal + 1; } else if (next == "overlay_border") { filestream >> equals; filestream >> parameter; @@ -1821,9 +1819,9 @@ void KLegacyStyle::polish(TQApplication *app) { brush.setColor(gobj->backColor(KLegacy::Active)); pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush); - brush = pal.brush(TQPalette::Normal, TQColorGroup::Button); + brush = pal.brush(TQPalette::Active, TQColorGroup::Button); brush.setColor(gobj->backColor(KLegacy::Normal)); - pal.setBrush(TQPalette::Normal, TQColorGroup::Button, brush); + pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush); brush = pal.brush(TQPalette::Disabled, TQColorGroup::Button); brush.setColor(gobj->backColor(KLegacy::Insensitive)); @@ -1898,23 +1896,23 @@ void KLegacyStyle::polish(TQWidget *widget) { bool immediateRender = false; bool bgPixmap = false; - if (widget->inherits(TQBUTTON_OBJECT_NAME_STRING)) { + if (widget->inherits("TQButton")) { metaobject = TQButton::staticMetaObject(); eventFilter = true; } - if (widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) { + if (widget->inherits("TQComboBox")) { metaobject = TQComboBox::staticMetaObject(); eventFilter = true; } - if (widget->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) { + if (widget->inherits("TQScrollBar")) { metaobject = TQScrollBar::staticMetaObject(); eventFilter = true; mouseTrack = true; } - if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING)) { + if (widget->inherits("TQMenuBar")) { eventFilter = true; immediateRender = true; @@ -1930,7 +1928,7 @@ void KLegacyStyle::polish(TQWidget *widget) { widget->setBackgroundMode(TQWidget::PaletteBackground); } - if (widget->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (widget->inherits("TQToolBar")) { metaobject = TQToolBar::staticMetaObject(); eventFilter = true; @@ -1944,7 +1942,7 @@ void KLegacyStyle::polish(TQWidget *widget) { widget->setBackgroundMode(TQWidget::PaletteBackground); } - if (widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { + if (widget->inherits("TQLineEdit")) { metaobject = TQLineEdit::staticMetaObject(); eventFilter = true; @@ -1968,7 +1966,7 @@ void KLegacyStyle::polish(TQWidget *widget) { detail = "base"; } - if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (widget->inherits("TQPopupMenu")) { tqDebug("polishing popup '%s'", widget->className()); metaobject = TQPopupMenu::staticMetaObject(); widget->setBackgroundMode(TQWidget::PaletteBackground); @@ -2216,7 +2214,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) { key.data.shadow = KLegacy::In; } else { key.data.state = ((btn->isEnabled()) ? - ((static_cast<TQWidget *>( btn ) == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) : + ((btn == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) : KLegacy::Insensitive); key.data.shadow = ((btn->isOn() || btn->isDown()) ? KLegacy::In : KLegacy::Out); @@ -2544,7 +2542,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h, key.data.state = KLegacy::Normal; key.data.shadow = KLegacy::Out; - if (priv->lastWidget && priv->lastWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) + if (priv->lastWidget && priv->lastWidget->inherits("TQComboBox")) key.data.state = KLegacy::Prelight; TQPixmap *pix = gobj->draw(key, w, h, "optionmenu"); @@ -3081,7 +3079,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { { TQWidget *w = (TQWidget *) obj; - if (w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && w->width() < 700) { + if (w->inherits("TQPopupMenu") && w->width() < 700) { GtkObject *gobj = priv->gtkDict.find(TQPopupMenu::staticMetaObject()); if (gobj) { @@ -3151,7 +3149,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (p && (! p->isNull())) w->setBackgroundPixmap(*p); } - } else if (w->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { + } else if (w->inherits("TQLineEdit")) { GtkObject *gobj = priv->gtkDict.find(TQLineEdit::staticMetaObject()); if (gobj) { @@ -3191,8 +3189,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { w->setPalette(pal); } } - } else if (w->inherits(TQMENUBAR_OBJECT_NAME_STRING) || - w->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { + } else if (w->inherits("TQMenuBar") || + w->inherits("TQToolBar")) { GtkObject *gobj = priv->gtkDict.find(TQMenuBar::staticMetaObject()); if (gobj) { @@ -3256,13 +3254,13 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { case TQEvent::Enter: { - if (obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING) || - obj->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || - obj->inherits(TQSLIDER_OBJECT_NAME_STRING) || - obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) { + if (obj->inherits("TQPushButton") || + obj->inherits("TQComboBox") || + obj->inherits("TQSlider") || + obj->inherits("TQScrollBar")) { priv->lastWidget = (TQWidget *) obj; priv->lastWidget->repaint(false); - } else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) { + } else if (obj->inherits("TQRadioButton")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel() && w->isEnabled()) { @@ -3277,11 +3275,11 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (pix && (! pix->isNull())) { TQPalette pal = w->palette(); - TQBrush brush = pal.brush(TQPalette::Normal, + TQBrush brush = pal.brush(TQPalette::Active, TQColorGroup::Background); brush.setPixmap(*pix); - pal.setBrush(TQPalette::Normal, + pal.setBrush(TQPalette::Active, TQColorGroup::Background, brush); w->setPalette(pal); @@ -3290,7 +3288,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { } } } - } else if (obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) { + } else if (obj->inherits("TQCheckBox")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel() && w->isEnabled()) { @@ -3305,11 +3303,11 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (pix && (! pix->isNull())) { TQPalette pal = w->palette(); - TQBrush brush = pal.brush(TQPalette::Normal, + TQBrush brush = pal.brush(TQPalette::Active, TQColorGroup::Background); brush.setPixmap(*pix); - pal.setBrush(TQPalette::Normal, + pal.setBrush(TQPalette::Active, TQColorGroup::Background, brush); w->setPalette(pal); @@ -3328,8 +3326,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (obj == priv->lastWidget) { priv->lastWidget = 0; ((TQWidget *) obj)->repaint(false); - } else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || - obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) { + } else if (obj->inherits("TQRadioButton") || + obj->inherits("TQCheckBox")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel()) { @@ -3346,7 +3344,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { { TQMouseEvent *me = (TQMouseEvent *) e; priv->mousePos = me->pos(); - if (obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING) && + if (obj->inherits("TQScrollBar") && (! (me->state() & (LeftButton | MidButton | RightButton)))) { priv->hovering = true; ((TQWidget *) obj)->repaint(false); diff --git a/tdestyles/klegacy/klegacystyle.h b/tdestyles/klegacy/klegacystyle.h index f82fd5d0a..dccf6cae1 100644 --- a/tdestyles/klegacy/klegacystyle.h +++ b/tdestyles/klegacy/klegacystyle.h @@ -31,8 +31,8 @@ class KLegacyStylePrivate; -class Q_EXPORT KLegacyStyle : public TDEStyle { - Q_OBJECT +class TQ_EXPORT KLegacyStyle : public TDEStyle { + TQ_OBJECT public: KLegacyStyle(void); virtual ~KLegacyStyle(void); diff --git a/tdestyles/kthemestyle/kthemebase.cpp b/tdestyles/kthemestyle/kthemebase.cpp index 8e1f5605f..c666e2c86 100644 --- a/tdestyles/kthemestyle/kthemebase.cpp +++ b/tdestyles/kthemestyle/kthemebase.cpp @@ -231,7 +231,7 @@ union kthemeKey{ unsigned int cacheKey; }; -#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) TQT_TQPAINTDEVICE_CONST(static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x))) +#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x)) void KThemeBase::generateBorderPix( int i ) { @@ -243,42 +243,42 @@ void KThemeBase::generateBorderPix( int i ) TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] ); TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, 0, pbWidth[ i ], pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::TopLeft, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::TopRight, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::BottomLeft, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); @@ -287,23 +287,23 @@ void KThemeBase::generateBorderPix( int i ) tmp.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] ); destMask.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], 0, + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], 0, pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0, + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0, pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::Top, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); @@ -312,23 +312,23 @@ void KThemeBase::generateBorderPix( int i ) tmp.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 ); destMask.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbWidth[ i ], pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::Left, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); tmp.setMask( destMask ); @@ -439,7 +439,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ ) { if ( config.entryList( configFileName + widgetEntries[ i ] ).size() ) applyResourceGroup( &config, i ); -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME else { @@ -617,7 +617,7 @@ void KThemeBase::applyConfigFile( TQSettings& config ) d->overrideWindowForeground = false; -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME for ( int input = 0; input < WIDGETS; ++input ) { @@ -813,10 +813,10 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const const TQBitmap *srcMask = tmp->mask(); int bdWidth = tmp->width(); - bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bdWidth, + bitBlt( pixmap, 0, 0, tmp, 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, + bitBlt( &mask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( 0, 0, bdWidth, bdWidth, color1 ); @@ -824,30 +824,30 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight ); srcMask = tmp->mask(); - bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, + bitBlt( pixmap, w - bdWidth, 0, tmp, 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, + bitBlt( &mask, w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft ); srcMask = tmp->mask(); - bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, + bitBlt( pixmap, 0, h - bdWidth, tmp, 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, + bitBlt( &mask, 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight ); srcMask = tmp->mask(); - bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, + bitBlt( pixmap, w - bdWidth, h - bdWidth, tmp, 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, h - bdWidth, bdWidth, bdWidth, color1 ); @@ -860,7 +860,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const srcMask = tmp->mask(); p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, w - bdWidth * 2, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 ); @@ -870,7 +870,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth, *tmp ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, w - bdWidth * 2, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth, @@ -882,7 +882,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const srcMask = tmp->mask(); p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, h - bdWidth * 2, TQt::CopyROP, false ); else mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 ); @@ -892,7 +892,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, *tmp ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, h - bdWidth * 2, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, color1 ); @@ -1111,7 +1111,7 @@ TQColorGroup* KThemeBase::makeColorGroup( const TQColor &fg, const TQColor &bg, void KThemeBase::applyMiscResourceGroup( TQSettings *config ) { -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME d->props.erase( "Misc" ); // clear the old property TQString base = configFileName + "Misc/"; @@ -1181,7 +1181,7 @@ static TQColor readColorEntry( Prop& prop, TQString setting, const TQColor& def void KThemeBase::readMiscResourceGroup() { -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME Prop & prop = d->props[ "Misc" ]; sbPlacement = ( SButton ) readNumEntry( prop, "SButtonPosition", @@ -1198,7 +1198,7 @@ void KThemeBase::readMiscResourceGroup() void KThemeBase::applyResourceGroup( TQSettings *config, int i ) { -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME TQString tmpStr; int tmpVal; @@ -1357,7 +1357,7 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i ) void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdnames, bool *loadArray ) { -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME if ( loadArray[ i ] == true ) { return ; // already been preloaded. @@ -1636,7 +1636,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal ) disfg = disfg.light( highlightVal ); else // black fg - use darkgray disabled fg - disfg = Qt::darkGray; + disfg = TQt::darkGray; TQColorGroup disabledgrp( disfg, background, //TODO:Convert this to the new ctor. @@ -1738,7 +1738,7 @@ KThemeCache::KThemeCache( int maxSize, TQObject *parent, const char *name ) cache.setMaxCost( maxSize * 1024 ); cache.setAutoDelete( true ); flushTimer.start( 300000 ); // 5 minutes - connect( &flushTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( flushTimeout() ) ); + connect( &flushTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( flushTimeout() ) ); } void KThemeCache::flushTimeout() diff --git a/tdestyles/kthemestyle/kthemebase.h b/tdestyles/kthemestyle/kthemebase.h index 01ecab138..5317c806c 100644 --- a/tdestyles/kthemestyle/kthemebase.h +++ b/tdestyles/kthemestyle/kthemebase.h @@ -122,7 +122,7 @@ inline bool KThemePixmap::isOld() */ class KThemeCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * The scale hints supported by the cache. Note that Tiled is not here @@ -213,7 +213,7 @@ class KThemeBasePrivate; */ class KThemeBase: public TDEStyle { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a new KThemeBase object. @@ -517,12 +517,12 @@ protected: SFlags flags = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const { - TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg, + TDEStyle::drawPrimitive ( pe, p, ceData, elementFlags, r, cg, flags, option ); } - virtual void drawControl( TQ_ControlElement element, + virtual void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -536,7 +536,7 @@ protected: r, cg, how, opt, widget ); } - virtual void drawControlMask( TQ_ControlElement element, + virtual void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -548,7 +548,7 @@ protected: } - virtual void drawComplexControl( TQ_ComplexControl control, + virtual void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp index a3e83e8f7..0316ded89 100644 --- a/tdestyles/kthemestyle/kthemestyle.cpp +++ b/tdestyles/kthemestyle/kthemestyle.cpp @@ -422,7 +422,7 @@ KThemeStyle::~KThemeStyle() void KThemeStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if (!qstrcmp(app->argv()[0], "kicker")) { kickerMode = true; @@ -450,7 +450,7 @@ void KThemeStyle::polish( TQPalette &p ) if ( isPixmap( Background ) ) { - TQBrush bgBrush( p.color( TQPalette::Normal, + TQBrush bgBrush( p.color( TQPalette::Active, TQColorGroup::Background ), *uncached( Background ) ); brushHandle = uncached( Background )->handle(); @@ -470,7 +470,7 @@ void KThemeStyle::paletteChanged() void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); app->setPalette( oldPalette, true ); } @@ -478,7 +478,7 @@ void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData, bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if( object->inherits("KActiveLabel")) @@ -486,7 +486,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C if(event->type() == TQEvent::Move || event->type() == TQEvent::Resize || event->type() == TQEvent::Show) { - TQWidget *w = TQT_TQWIDGET(object); + TQWidget *w = static_cast<TQWidget*>(object); TQPoint pos(0, 0); pos = w->mapTo(w->topLevelWidget(), pos); TQPixmap pix(uncached( Background )->size()); @@ -499,16 +499,16 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C pos.x(), pos.y()); p.end(); TQPalette pal(w->palette()); - TQBrush brush( pal.color( TQPalette::Normal, + TQBrush brush( pal.color( TQPalette::Active, TQColorGroup::Background), pix ); pal.setBrush(TQColorGroup::Base, brush); w->setPalette(pal); } } - if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits(TQLABEL_OBJECT_NAME_STRING)) + if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits("TQLabel")) { - TQWidget* lb = TQT_TQWIDGET(object); + TQWidget* lb = static_cast<TQWidget*>(object); if (lb->backgroundMode() == TQt::PaletteButton) lb->setBackgroundMode(TQt::PaletteBackground); removeObjectEventHandler(ceData, elementFlags, source, this); @@ -520,13 +520,13 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *w = reinterpret_cast<TQWidget*>(ptr); - if (::tqqt_cast<TQStatusBar*>(w)) - w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Normal, TQColorGroup::Background)); + if (::tqt_cast<TQStatusBar*>(w)) + w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Active, TQColorGroup::Background)); - if (::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) + if (::tqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) installObjectEventHandler(ceData, elementFlags, ptr, this); if (w->backgroundPixmap() && !w->isTopLevel() && @@ -550,9 +550,9 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen { polishLock = true; - TQColorGroup clrGroup( Qt::black, TQColor( 255, 255, 220 ), - TQColor( 96, 96, 96 ), Qt::black, Qt::black, - Qt::black, TQColor( 255, 255, 220 ) ); + TQColorGroup clrGroup( TQt::black, TQColor( 255, 255, 220 ), + TQColor( 96, 96, 96 ), TQt::black, TQt::black, + TQt::black, TQColor( 255, 255, 220 ) ); TQPalette toolTip ( clrGroup, clrGroup, clrGroup ); TQToolTip::setPalette( toolTip ); @@ -565,7 +565,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen return ; } - if ( ::tqqt_cast<TQMenuBar*>(w) ) + if ( ::tqt_cast<TQMenuBar*>(w) ) { w->setBackgroundMode( TQWidget::NoBackground ); } @@ -573,7 +573,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen { w->setBackgroundMode( TQWidget::PaletteBackground ); } - else if ( ::tqqt_cast<TQPopupMenu*>(w) ) + else if ( ::tqt_cast<TQPopupMenu*>(w) ) { popupPalette = w->palette(); if ( isColor( MenuItem ) || isColor( MenuItemDown ) ) @@ -593,7 +593,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen w->setBackgroundMode( TQWidget::NoBackground ); } - else if ( ::tqqt_cast<TQCheckBox*>(w) ) + else if ( ::tqt_cast<TQCheckBox*>(w) ) { if ( isColor( IndicatorOff ) || isColor( IndicatorOn ) ) { @@ -608,7 +608,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen w->setPalette( newPal ); } } - else if ( ::tqqt_cast<TQRadioButton*>(w) ) + else if ( ::tqt_cast<TQRadioButton*>(w) ) { if ( isColor( ExIndicatorOff ) || isColor( ExIndicatorOn ) ) { @@ -631,7 +631,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *w = reinterpret_cast<TQWidget*>(ptr); if (w->backgroundPixmap() && !w->isTopLevel()) @@ -644,21 +644,21 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem } //Toolbar labels should nornally be PaletteButton - if ( ::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) + if ( ::tqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) w->setBackgroundMode( TQWidget::PaletteButton ); //The same for menu bars, popup menus - else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQPopupMenu*>(w) ) + else if ( ::tqt_cast<TQMenuBar*>(w) || ::tqt_cast<TQPopupMenu*>(w) ) w->setBackgroundMode( TQWidget::PaletteButton ); - //For toolbar internal separators, return to button, too (can't use tqqt_cast here since don't have access to the class) + //For toolbar internal separators, return to button, too (can't use tqt_cast here since don't have access to the class) else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) ) w->setBackgroundMode( TQWidget::PaletteButton ); //For scrollbars, we don't do much, since the widget queries the style on the switch //Drop some custom palettes. ### this really should check the serial number to be 100% correct. - if ( ::tqqt_cast<TQPopupMenu*>(w) || ::tqqt_cast<TQCheckBox*>(w) || ::tqqt_cast<TQRadioButton*>(w) || ::tqqt_cast<TQStatusBar*>(w) ) + if ( ::tqt_cast<TQPopupMenu*>(w) || ::tqt_cast<TQCheckBox*>(w) || ::tqt_cast<TQRadioButton*>(w) || ::tqt_cast<TQStatusBar*>(w) ) w->unsetPalette(); } @@ -677,7 +677,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, if ( gradientHint( type ) == GrReverseBevel ) { int i; - bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h, + bitBlt( p->device(), x, y, scalePixmap( w, h, type ), 0, 0, w, h, TQt::CopyROP, true ); p->setPen( g.text() ); for ( i = 0; i < borderWidth( type ); ++i, ++x, ++y, w -= 2, h -= 2 ) @@ -717,7 +717,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, } if ( borderPixmap( type ) ) { - bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h, + bitBlt( p->device(), x, y, scaleBorder( w, h, type ), 0, 0, w, h, TQt::CopyROP, false ); } else @@ -927,7 +927,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask(); if ( mask ) { - p->setPen( Qt::color1 ); + p->setPen( TQt::color1 ); p->drawPixmap( x, y, *mask ); } else @@ -945,7 +945,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt IndicatorOff ) ->mask(); if ( mask ) { - p->setPen( Qt::color1 ); + p->setPen( TQt::color1 ); p->drawPixmap( x, y, *mask ); } else @@ -1686,14 +1686,14 @@ void KThemeStyle::drawControl( ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x + diffw, y + itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } @@ -1851,7 +1851,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if ( !roundSlider() ) { const TQSlider * slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; if ( horizontal ) { drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true, @@ -1867,7 +1867,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, { //This code is from HighColorDefault.. const TQSlider* slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; int gcenter = ( horizontal ? r.height() : r.width() ) / 2; TQRect gr; @@ -1903,7 +1903,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if ( isPixmap( Slider ) ) { const TQSlider * slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; if ( horizontal ) { bitBlt( p->device(), x, y + ( h - uncached( Slider ) ->height() ) / 2, @@ -1928,7 +1928,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, //This code again from HighColor.. //...except sans the gradient.. const TQSlider* slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; int x, y, w, h; r.rect( &x, &y, &w, &h ); int x2 = x + w - 1; @@ -2013,7 +2013,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, -void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, +void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & g, SFlags how , SCFlags controls, SCFlags active, const TQStyleOption & opt, const TQWidget * widget ) const @@ -2115,7 +2115,7 @@ void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, { const TQScrollBar *sb = ( const TQScrollBar* ) widget; bool maxedOut = ( sb->minValue() == sb->maxValue() ); - bool horizontal = ( sb->orientation() == Qt::Horizontal ); + bool horizontal = ( sb->orientation() == TQt::Horizontal ); SFlags sflags = ( ( horizontal ? Style_Horizontal : Style_Default ) | ( maxedOut ? Style_Default : Style_Enabled ) ); @@ -2374,7 +2374,7 @@ void KThemeStyle::drawShade( TQPainter *p, int x, int y, int w, int h, ++x, ++y; --x2, --y2; } - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawPoints( bPntArray ); p->drawLineSegments( bLineArray ); p->setPen( highPen ); diff --git a/tdestyles/kthemestyle/kthemestyle.h b/tdestyles/kthemestyle/kthemestyle.h index ca112ed14..029301aae 100644 --- a/tdestyles/kthemestyle/kthemestyle.h +++ b/tdestyles/kthemestyle/kthemestyle.h @@ -67,7 +67,7 @@ Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org> class KThemeStyle: public KThemeBase { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a new KThemeStyle object. @@ -104,7 +104,7 @@ public: const TQWidget *widget = 0 ) const; - virtual void drawComplexControl( TQ_ComplexControl control, + virtual void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -227,7 +227,7 @@ protected: mutable TQPixmap* menuCache; mutable TQPixmap* vsliderCache; - Qt::HANDLE brushHandle; + TQt::HANDLE brushHandle; bool brushHandleSet; bool kickerMode; diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp index 35b7cc813..fbf197b88 100644 --- a/tdestyles/light/lightstyle-v2.cpp +++ b/tdestyles/light/lightstyle-v2.cpp @@ -129,7 +129,7 @@ static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg if (fill) p->fillRect(br, *fill); } -void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, +void LightStyleV2::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -298,7 +298,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, if ( p && p->device()->devType() == TQInternal::Widget ) { TQWidget *w = (TQWidget *) p->device(); TQWidget *p = w->parentWidget(); - if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (p->inherits("TQDockWindow") && ! p->inherits("TQToolBar")) { drawTitle = true; title = p->caption(); } @@ -447,7 +447,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarSubLine: { TQRect fr = r, ar = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen(cg.dark()); if (flags & Style_Horizontal) { @@ -472,7 +472,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarAddLine: { TQRect fr = r, ar = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen(cg.dark()); if (flags & Style_Horizontal) { @@ -642,7 +642,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, } } -void LightStyleV2::drawControl( TQ_ControlElement control, +void LightStyleV2::drawControl( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -948,10 +948,10 @@ void LightStyleV2::drawControl( TQ_ControlElement control, } else if (mi->pixmap()) { TQPixmap pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } if (mi->popup()) @@ -999,7 +999,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, } } -void LightStyleV2::drawControlMask( TQ_ControlElement control, +void LightStyleV2::drawControlMask( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1045,7 +1045,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData &c return rect; } -void LightStyleV2::drawComplexControl( TQ_ComplexControl control, +void LightStyleV2::drawComplexControl( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1119,7 +1119,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; TQRect frame, up, down; - frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, + frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetFrame, data, widget); up = ceData.spinWidgetData.upRect; down = ceData.spinWidgetData.downRect; @@ -1129,7 +1129,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, &cg.brush(TQColorGroup::Base)); if ((controls & SC_SpinWidgetUp) && up.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetUp; + PrimitiveElement pe = PE_SpinWidgetUp; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetPlus; @@ -1162,7 +1162,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, } if ((controls & SC_SpinWidgetDown) && down.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetDown; + PrimitiveElement pe = PE_SpinWidgetDown; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetMinus; @@ -1329,7 +1329,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, } } -TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control, +TQRect LightStyleV2::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, @@ -1424,7 +1424,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control, return ret; } -TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control, +TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, @@ -1625,7 +1625,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents, return ret; } -int LightStyleV2::styleHint( TQ_StyleHint stylehint, +int LightStyleV2::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h index 90b3e89c9..17240ac88 100644 --- a/tdestyles/light/lightstyle-v2.h +++ b/tdestyles/light/lightstyle-v2.h @@ -30,13 +30,13 @@ #ifdef QT_PLUGIN # define Q_EXPORT_STYLE_LIGHT_V2 #else -# define Q_EXPORT_STYLE_LIGHT_V2 Q_EXPORT +# define Q_EXPORT_STYLE_LIGHT_V2 TQ_EXPORT #endif // QT_PLUGIN class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: LightStyleV2(); @@ -44,27 +44,27 @@ public: void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, + TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, + SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const; int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; @@ -72,7 +72,7 @@ public: TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp index 92b0d04da..790c03d79 100644 --- a/tdestyles/light/lightstyle-v3.cpp +++ b/tdestyles/light/lightstyle-v3.cpp @@ -212,7 +212,7 @@ static void drawLightBevel( TQPainter *p, p->fillRect( br, *fill ); } -void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, +void LightStyleV3::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -430,7 +430,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, if ( p && p->device()->devType() == TQInternal::Widget ) { TQWidget *w = (TQWidget *) p->device(); TQWidget *p = w->parentWidget(); - if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (p->inherits("TQDockWindow") && ! p->inherits("TQToolBar")) { drawTitle = true; title = p->caption(); } @@ -590,7 +590,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarSubLine: { TQRect br = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen( cg.background() ); if (flags & Style_Horizontal) { @@ -624,7 +624,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarAddLine: { TQRect br = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen( cg.background() ); if (flags & Style_Horizontal) { @@ -830,7 +830,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, } } -void LightStyleV3::drawControl( TQ_ControlElement control, +void LightStyleV3::drawControl( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1068,10 +1068,10 @@ void LightStyleV3::drawControl( TQ_ControlElement control, } else if (mi->pixmap()) { TQPixmap pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } if (mi->popup()) @@ -1114,7 +1114,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, } } -void LightStyleV3::drawControlMask( TQ_ControlElement control, +void LightStyleV3::drawControlMask( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1178,7 +1178,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData &c return rect; } -void LightStyleV3::drawComplexControl( TQ_ComplexControl control, +void LightStyleV3::drawComplexControl( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1248,7 +1248,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; TQRect frame, up, down; - frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, + frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetFrame, data, widget); up = ceData.spinWidgetData.upRect; down = ceData.spinWidgetData.downRect; @@ -1257,7 +1257,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, drawPrimitive( PE_Panel, p, ceData, elementFlags, frame, cg, flags | Style_Sunken ); if ((controls & SC_SpinWidgetUp) && up.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetUp; + PrimitiveElement pe = PE_SpinWidgetUp; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetPlus; @@ -1275,7 +1275,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, } if ((controls & SC_SpinWidgetDown) && down.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetDown; + PrimitiveElement pe = PE_SpinWidgetDown; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetMinus; @@ -1455,7 +1455,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, } } -TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control, +TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, @@ -1606,7 +1606,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control, return ret; } -TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control, +TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, @@ -1854,7 +1854,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, return ret; } -int LightStyleV3::styleHint( TQ_StyleHint stylehint, +int LightStyleV3::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h index 0330c8f87..8f03cca74 100644 --- a/tdestyles/light/lightstyle-v3.h +++ b/tdestyles/light/lightstyle-v3.h @@ -33,13 +33,13 @@ #ifdef QT_PLUGIN # define Q_EXPORT_STYLE_LIGHT_V3 #else -# define Q_EXPORT_STYLE_LIGHT_V3 Q_EXPORT +# define Q_EXPORT_STYLE_LIGHT_V3 TQ_EXPORT #endif // QT_PLUGIN class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle { - Q_OBJECT + TQ_OBJECT TQStyle *basestyle; public: @@ -48,27 +48,27 @@ public: void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, + TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, + SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const; int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; @@ -76,7 +76,7 @@ public: TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/plastik/config/plastikconf.cpp b/tdestyles/plastik/config/plastikconf.cpp index 4900f708e..35dd2a1b2 100644 --- a/tdestyles/plastik/config/plastikconf.cpp +++ b/tdestyles/plastik/config/plastikconf.cpp @@ -118,19 +118,19 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent) origCheckMarkColor = s.readEntry("/plastikstyle/Settings/checkMarkColor", "black"); checkMarkColor->setColor(origCheckMarkColor); -// connect(scrollBarLines, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawToolBarSeparator, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawToolBarItemSeparator, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); -// connect(drawFocusRect, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawTriangularExpander, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(inputFocusHighlight, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(customOverHighlightColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(overHighlightColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); - connect(customFocusHighlightColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(focusHighlightColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); - connect(customCheckMarkColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(checkMarkColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); +// connect(scrollBarLines, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawToolBarSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawToolBarItemSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); +// connect(drawFocusRect, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawTriangularExpander, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(inputFocusHighlight, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(customOverHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(overHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); + connect(customFocusHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(focusHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); + connect(customCheckMarkColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(checkMarkColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); if ( customOverHighlightColor->isChecked() ) overHighlightColor->setEnabled(true); else diff --git a/tdestyles/plastik/config/plastikconf.h b/tdestyles/plastik/config/plastikconf.h index 512ad6f2e..6973a0d0b 100644 --- a/tdestyles/plastik/config/plastikconf.h +++ b/tdestyles/plastik/config/plastikconf.h @@ -31,7 +31,7 @@ class TQCheckBox; class PlastikStyleConfig: public TQWidget { - Q_OBJECT + TQ_OBJECT public: PlastikStyleConfig(TQWidget* parent); ~PlastikStyleConfig(); diff --git a/tdestyles/plastik/misc.cpp b/tdestyles/plastik/misc.cpp index d1a52d61e..48918306e 100644 --- a/tdestyles/plastik/misc.cpp +++ b/tdestyles/plastik/misc.cpp @@ -23,8 +23,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i { // normal button... - QRgb rgb = bgColor.rgb(); - QRgb rgb_b = fgColor.rgb(); + TQRgb rgb = bgColor.rgb(); + TQRgb rgb_b = fgColor.rgb(); int alpha = a; if(alpha>255) alpha = 255; if(alpha<0) alpha = 0; diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 0db70b8a9..5ff3b8619 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -184,7 +184,7 @@ PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrol if ( _animateProgressBar ) { animationTimer = new TQTimer( this ); - connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) ); + connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) ); } } @@ -197,7 +197,7 @@ void PlastikStyle::updateProgressPos() bool visible = false; for (iter = progAnimWidgets.begin(); iter != progAnimWidgets.end(); ++iter) { - if ( !::tqqt_cast<TQProgressBar*>(iter.key()) ) + if ( !::tqt_cast<TQProgressBar*>(iter.key()) ) continue; pb = dynamic_cast<TQProgressBar*>(iter.key()); @@ -225,7 +225,7 @@ PlastikStyle::~PlastikStyle() void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if (!qstrcmp(app->argv()[0], "kicker")) @@ -237,39 +237,39 @@ void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? tdehtmlWidgets[widget] = true; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(tdehtmlWidgetDestroyed(TQObject*))); } - // use tqqt_cast where possible to check if the widget inheits one of the classes. might improve + // use tqt_cast where possible to check if the widget inheits one of the classes. might improve // performance compared to TQObject::inherits() - if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) || - ::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) || - ::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) || - ::tqqt_cast<TQToolButton*>(widget) || widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) + if ( ::tqt_cast<TQPushButton*>(widget) || ::tqt_cast<TQComboBox*>(widget) || + ::tqt_cast<TQSpinWidget*>(widget) || ::tqt_cast<TQSlider*>(widget) || + ::tqt_cast<TQCheckBox*>(widget) || ::tqt_cast<TQRadioButton*>(widget) || + ::tqt_cast<TQToolButton*>(widget) || widget->inherits("TQSplitterHandle") ) { // widget->setBackgroundMode(PaletteBackground); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQLineEdit*>(widget)) { + } else if (::tqt_cast<TQLineEdit*>(widget)) { installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQTabBar*>(widget)) { + } else if (::tqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(true); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQPopupMenu*>(widget)) { + } else if (::tqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode( NoBackground ); } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) { installObjectEventHandler(ceData, elementFlags, ptr, this); } - if( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget) ) + if( _animateProgressBar && ::tqt_cast<TQProgressBar*>(widget) ) { installObjectEventHandler(ceData, elementFlags, ptr, this); progAnimWidgets[widget] = 0; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*))); if (!animationTimer->isActive()) animationTimer->start( 50, false ); } @@ -280,32 +280,32 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? tdehtmlWidgets.remove(widget); } - // use tqqt_cast to check if the widget inheits one of the classes. - if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) || - ::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) || - ::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) || - ::tqqt_cast<TQToolButton*>(widget) || ::tqqt_cast<TQLineEdit*>(widget) || - widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) + // use tqt_cast to check if the widget inheits one of the classes. + if ( ::tqt_cast<TQPushButton*>(widget) || ::tqt_cast<TQComboBox*>(widget) || + ::tqt_cast<TQSpinWidget*>(widget) || ::tqt_cast<TQSlider*>(widget) || + ::tqt_cast<TQCheckBox*>(widget) || ::tqt_cast<TQRadioButton*>(widget) || + ::tqt_cast<TQToolButton*>(widget) || ::tqt_cast<TQLineEdit*>(widget) || + widget->inherits("TQSplitterHandle") ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if (::tqqt_cast<TQTabBar*>(widget)) { + else if (::tqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(false); removeObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQPopupMenu*>(widget)) { + } else if (::tqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode( PaletteBackground ); } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } - if ( ::tqqt_cast<TQProgressBar*>(widget) ) + if ( ::tqt_cast<TQProgressBar*>(widget) ) { progAnimWidgets.remove(widget); } @@ -316,12 +316,12 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj) { - tdehtmlWidgets.remove(TQT_TQWIDGET(obj)); + tdehtmlWidgets.remove(static_cast<TQWidget*>(obj)); } void PlastikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(TQT_TQWIDGET(obj)); + progAnimWidgets.remove(static_cast<TQWidget*>(obj)); } void PlastikStyle::renderContour(TQPainter *p, @@ -664,7 +664,7 @@ void PlastikStyle::renderPixel(TQPainter *p, if(fullAlphaBlend) // full alpha blend: paint into an image with alpha buffer and convert to a pixmap ... { - QRgb rgb = color.rgb(); + TQRgb rgb = color.rgb(); // generate a quite unique key -- use the unused width field to store the alpha value. CacheEntry search(cAlphaDot, alpha, 0, rgb); int key = search.key(); @@ -697,8 +697,8 @@ void PlastikStyle::renderPixel(TQPainter *p, } else // don't use an alpha buffer: calculate the resulting color from the alpha value, the fg- and the bg-color. { - QRgb rgb_a = color.rgb(); - QRgb rgb_b = background.rgb(); + TQRgb rgb_a = color.rgb(); + TQRgb rgb_b = background.rgb(); int a = alpha; if(a>255) a = 255; if(a<0) a = 0; @@ -827,7 +827,7 @@ void PlastikStyle::renderGradient(TQPainter *painter, int r_w = result->rect().width(); int r_h = result->rect().height(); int r_x, r_y, r_x2, r_y2; - TQT_TQRECT_OBJECT(result->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); + result->rect().coords(&r_x, &r_y, &r_x2, &r_y2); int rDiff, gDiff, bDiff; int rc, gc, bc; @@ -894,7 +894,7 @@ void PlastikStyle::renderPanel(TQPainter *p, if (kickerMode && p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame") { + TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame") { // Stolen wholesale from Keramik. I don't like it, but oh well. if (sunken) { const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; @@ -1451,7 +1451,7 @@ void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe, } -void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, +void PlastikStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2159,7 +2159,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, a.translate(0, 0); } - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { if (flags & Style_Enabled) { p->setPen(cg.buttonText()); } else { @@ -2181,7 +2181,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, } -void PlastikStyle::drawControl(TQ_ControlElement element, +void PlastikStyle::drawControl(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2682,20 +2682,20 @@ void PlastikStyle::drawControl(TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( r.width() - pixmap->width() ) / 2 ) + ( ( r.width() - pixmap->width() ) % 2 ); p->drawPixmap( r.x()+diffw, r.y()+1, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - 1; TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, r.y() + r.height() / 2 - dim / 2, dim, dim), r ); @@ -2737,7 +2737,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element, } } -void PlastikStyle::drawControlMask(TQ_ControlElement element, +void PlastikStyle::drawControlMask(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2759,7 +2759,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element, } } -void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, +void PlastikStyle::drawComplexControlMask(ComplexControl c, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2782,7 +2782,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, } } -void PlastikStyle::drawComplexControl(TQ_ComplexControl control, +void PlastikStyle::drawComplexControl(ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -3013,7 +3013,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control, const TQSpinWidget *sw = dynamic_cast<const TQSpinWidget *>(widget); SFlags sflags = flags; - TQ_PrimitiveElement pe; + PrimitiveElement pe; bool hasFocus = false; if (sw) @@ -3199,7 +3199,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, } } -TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control, +TQRect PlastikStyle::querySubControlMetrics(ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -3346,7 +3346,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce return 1; case PM_DefaultFrameWidth: { - if(widget && ::tqqt_cast<TQPopupMenu*>(widget)) + if(widget && ::tqt_cast<TQPopupMenu*>(widget)) return 1; else return 2; @@ -3452,7 +3452,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, case CT_ToolButton: { - if(widget->parent() && ::tqqt_cast<TQToolBar*>(widget->parent()) ) + if(widget->parent() && ::tqt_cast<TQToolBar*>(widget->parent()) ) return TQSize( s.width()+2*4, s.height()+2*4 ); else return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); @@ -3465,7 +3465,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); } -int PlastikStyle::styleHint( TQ_StyleHint stylehint, +int PlastikStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, @@ -3497,13 +3497,13 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) ) return true; - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* obj = reinterpret_cast<TQObject*>(source); if (!obj->isWidgetType() ) return false; // Track show events for progress bars - if ( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(obj) ) + if ( _animateProgressBar && ::tqt_cast<TQProgressBar*>(obj) ) { if ((ev->type() == TQEvent::Show) && !animationTimer->isActive()) { @@ -3512,7 +3512,7 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, } if ( !qstrcmp(obj->name(), "tde toolbar widget") ) { - TQWidget* lb = TQT_TQWIDGET(obj); + TQWidget* lb = static_cast<TQWidget*>(obj); if (lb->backgroundMode() == TQt::PaletteButton) lb->setBackgroundMode(TQt::PaletteBackground); removeObjectEventHandler(ceData, elementFlags, source, this); diff --git a/tdestyles/plastik/plastik.h b/tdestyles/plastik/plastik.h index 68f707d79..89946fd48 100644 --- a/tdestyles/plastik/plastik.h +++ b/tdestyles/plastik/plastik.h @@ -56,7 +56,7 @@ class TQTimer; class PlastikStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: PlastikStyle(); @@ -76,7 +76,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive(TQ_PrimitiveElement pe, + void drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -85,7 +85,7 @@ public: SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawControl(TQ_ControlElement element, + void drawControl(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -95,9 +95,9 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; + void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; - void drawComplexControl(TQ_ComplexControl control, + void drawComplexControl(ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -115,14 +115,14 @@ public: TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const; - TQRect querySubControlMetrics(TQ_ComplexControl control, + TQRect querySubControlMetrics(ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControlMask(TQStyle::TQ_ComplexControl c, + void drawComplexControlMask(TQStyle::ComplexControl c, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -137,7 +137,7 @@ public: const TQStyleOption &o, const TQWidget *w = 0) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; @@ -317,13 +317,13 @@ private: CacheEntryType type; int width; int height; - QRgb c1Rgb; - QRgb c2Rgb; + TQRgb c1Rgb; + TQRgb c2Rgb; bool horizontal; TQPixmap* pixmap; - CacheEntry(CacheEntryType t, int w, int h, QRgb c1, QRgb c2 = 0, + CacheEntry(CacheEntryType t, int w, int h, TQRgb c1, TQRgb c2 = 0, bool hor = false, TQPixmap* p = 0 ): type(t), width(w), height(h), c1Rgb(c1), c2Rgb(c2), horizontal(hor), pixmap(p) {} diff --git a/tdestyles/web/webstyle.cpp b/tdestyles/web/webstyle.cpp index 073a46368..cce42ed15 100644 --- a/tdestyles/web/webstyle.cpp +++ b/tdestyles/web/webstyle.cpp @@ -60,7 +60,7 @@ static TQColor contrastingForeground(const TQColor & fg, const TQColor & bg) if ((diff > -72) && (diff < 72)) { - return (vbg < 128) ? Qt::white : Qt::black; + return (vbg < 128) ? TQt::white : TQt::black; } else { @@ -250,10 +250,10 @@ WebStyle::unPolish(TQApplication *) void WebStyle::polish(TQWidget * w) { - if (w->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (w->inherits("TQPushButton")) w->installEventFilter(this); - else if (w->inherits(TQGROUPBOX_OBJECT_NAME_STRING) || w->inherits(TQFRAME_OBJECT_NAME_STRING)) + else if (w->inherits("TQGroupBox") || w->inherits("TQFrame")) { TQFrame * f(static_cast<TQFrame *>(w)); @@ -282,7 +282,7 @@ WebStyle::polish(TQWidget * w) void WebStyle::unPolish(TQWidget * w) { - if (w->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (w->inherits("TQPushButton")) w->removeEventFilter(this); else if (w == _currentFrame) @@ -471,8 +471,8 @@ WebStyle::drawScrollBarControls p->setBrush(g.button()); p->drawRect(rAdd); - Qt::ArrowType t = - sb->orientation() == Horizontal ? Qt::RightArrow : Qt::DownArrow; + TQt::ArrowType t = + sb->orientation() == Horizontal ? TQt::RightArrow : TQt::DownArrow; // Is it me or is TDEStyle::drawArrow broken ? @@ -500,8 +500,8 @@ WebStyle::drawScrollBarControls p->setBrush(g.button()); p->drawRect(rSub); - Qt::ArrowType t = - sb->orientation() == Horizontal ? Qt::LeftArrow : Qt::UpArrow; + TQt::ArrowType t = + sb->orientation() == Horizontal ? TQt::LeftArrow : TQt::UpArrow; drawArrow ( @@ -785,7 +785,7 @@ WebStyle::drawIndicatorMask int /* state */ ) { - p->fillRect(x, y, w, h, Qt::color1); + p->fillRect(x, y, w, h, TQt::color1); } void @@ -805,8 +805,8 @@ WebStyle::drawExclusiveIndicatorMask if (0 == h % 2) --h; - p->setPen(Qt::color1); - p->setBrush(Qt::color1); + p->setPen(TQt::color1); + p->setBrush(TQt::color1); p->drawEllipse(x, y, w, h); } @@ -866,7 +866,7 @@ WebStyle::drawComboButton p->drawPoint(w - 6, h - 10); if (editable) - p->fillRect(comboButtonFocusRect(x, y, w, h), Qt::red); + p->fillRect(comboButtonFocusRect(x, y, w, h), TQt::red); p->restore(); } @@ -904,12 +904,12 @@ WebStyle::drawSliderGroove { p->save(); - p->setPen(TQPen(g.dark(), 0, Qt::DotLine)); + p->setPen(TQPen(g.dark(), 0, TQt::DotLine)); - if( o == Qt::Horizontal ) + if( o == TQt::Horizontal ) p->drawLine(x, y + h / 2, w, y + h / 2); else - if( o == Qt::Vertical ) + if( o == TQt::Vertical ) p->drawLine(x + w / 2, y, x + w / 2, h); p->restore(); @@ -919,7 +919,7 @@ WebStyle::drawSliderGroove WebStyle::drawArrow ( TQPainter * p, - Qt::ArrowType type, + TQt::ArrowType type, bool down, int x, int y, @@ -955,10 +955,10 @@ WebStyle::drawSlider int sl = sliderLength(); - if( o == Qt::Horizontal ) + if( o == TQt::Horizontal ) p->drawEllipse(x, y + h / 2 - sl / 2, sl, sl); else - if( o == Qt::Vertical ) + if( o == TQt::Vertical ) p->drawEllipse(x + w / 2 - sl / 2, y, sl, sl); p->restore(); @@ -1046,7 +1046,7 @@ WebStyle::drawTDEToolBarButton { bool toggleAndOn = false; - if (button->inherits(TQBUTTON_OBJECT_NAME_STRING)) + if (button->inherits("TQButton")) { TQButton * b = static_cast<TQButton *>(button); toggleAndOn = b->isToggleButton() && b->isOn(); @@ -1495,7 +1495,7 @@ WebStyle::drawTabMask bool ) { - p->fillRect(tab->rect(), Qt::color1); + p->fillRect(tab->rect(), TQt::color1); } void @@ -1641,7 +1641,7 @@ WebStyle::drawKickerTaskButton p->setPen(contrastingForeground(g.text(), bg)); } - p->setPen(Qt::white); + p->setPen(TQt::white); p->drawText ( @@ -1655,7 +1655,7 @@ WebStyle::drawKickerTaskButton } p->restore(); - p->setPen(Qt::white); + p->setPen(TQt::white); } int diff --git a/tdestyles/web/webstyle.h b/tdestyles/web/webstyle.h index 0e4c59dbd..ab8742691 100644 --- a/tdestyles/web/webstyle.h +++ b/tdestyles/web/webstyle.h @@ -186,7 +186,7 @@ class WebStyle : public TDEStyle void drawArrow ( TQPainter *, - Qt::ArrowType, + TQt::ArrowType, bool down, int x, int y, @@ -406,7 +406,7 @@ class WebStyle : public TDEStyle int popupMenuItemHeight(bool, TQMenuItem *, const TQFontMetrics &); - GUIStyle guiStyle() const { return Qt::MotifStyle; } + GUIStyle guiStyle() const { return TQt::MotifStyle; } bool eventFilter(TQObject *, TQEvent *); }; diff --git a/tdesu/client.cpp b/tdesu/client.cpp index fe5733ee7..8cde02067 100644 --- a/tdesu/client.cpp +++ b/tdesu/client.cpp @@ -19,6 +19,9 @@ #include <pwd.h> #include <errno.h> #include <string.h> +#ifdef HAVE_UCRED_H +#include <ucred.h> +#endif /* HAVE_UCRED_H */ #include <sys/types.h> #include <sys/socket.h> @@ -50,7 +53,7 @@ public: TDEsuClient::TDEsuClient() { sockfd = -1; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQCString display(getenv("DISPLAY")); if (display.isEmpty()) { @@ -146,6 +149,21 @@ int TDEsuClient::connect() return -1; } # endif +#elif defined(HAVE_GETPEERUCRED) + ucred_t *cred = nullptr; + + if (getpeerucred(sockfd, &cred) == 0) { + uid_t peer_uid = ucred_geteuid(cred); + + ucred_free(cred); + if (peer_uid != getuid()) { + kdWarning(900) << "socket not owned by me! socket uid = " << peer_uid << endl; + close(sockfd); sockfd = -1; + return -1; + } + } + if (cred != nullptr) + ucred_free(cred); #else struct ucred cred; socklen_t siz = sizeof(cred); diff --git a/tdesu/kcookie.cpp b/tdesu/kcookie.cpp index 63013dae0..038715c8d 100644 --- a/tdesu/kcookie.cpp +++ b/tdesu/kcookie.cpp @@ -33,7 +33,7 @@ KCookie::KCookie() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 getXCookie(); #endif setDcopTransport("local"); @@ -85,7 +85,7 @@ void KCookie::getXCookie() char buf[1024]; FILE *f; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 m_Display = getenv("DISPLAY"); #else m_Display = getenv("QWS_DISPLAY"); @@ -95,7 +95,7 @@ void KCookie::getXCookie() kdError(900) << k_lineinfo << "$DISPLAY is not set.\n"; return; } -#ifdef Q_WS_X11 // No need to mess with X Auth stuff +#ifdef TQ_WS_X11 // No need to mess with X Auth stuff TQCString disp = m_Display; if (!memcmp(disp.data(), "localhost:", 10)) disp.remove(0, 9); diff --git a/tdesu/kcookie.h b/tdesu/kcookie.h index eb097a2a2..9c93be2a2 100644 --- a/tdesu/kcookie.h +++ b/tdesu/kcookie.h @@ -34,7 +34,7 @@ public: */ TQCString display() { return m_Display; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Returns the X11 magic cookie, if available. */ @@ -74,7 +74,7 @@ private: bool m_bHaveICECookies; TQCString m_Display; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQCString m_DisplayAuth; #endif TQCString m_DCOPSrv; diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp index 721dceddb..cc4222358 100644 --- a/tdesu/stub.cpp +++ b/tdesu/stub.cpp @@ -95,7 +95,7 @@ int StubProcess::ConverseStub(int check) } else if (line == "display") { writeLine(display()); } else if (line == "display_auth") { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 writeLine(displayAuth()); #else writeLine(""); diff --git a/tdesu/stub.h b/tdesu/stub.h index f4216d7f4..e4d2bed4b 100644 --- a/tdesu/stub.h +++ b/tdesu/stub.h @@ -98,7 +98,7 @@ protected: * desired. By default, it returns the value returned by KCookie. */ virtual TQCString display() { return m_pCookie->display(); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * See display. */ diff --git a/tdeui/kaboutdialog_private.h b/tdeui/kaboutdialog_private.h index 7a6245a81..057e8a6c1 100644 --- a/tdeui/kaboutdialog_private.h +++ b/tdeui/kaboutdialog_private.h @@ -34,7 +34,7 @@ class TQVBoxLayout; */ class KImageTrackLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: enum MouseMode @@ -68,7 +68,7 @@ class TDEAboutContainerBasePrivate; */ class TDEAboutContainerBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum LayoutType diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp index 0e5abc5ad..2e7af38c3 100644 --- a/tdeui/kactivelabel.cpp +++ b/tdeui/kactivelabel.cpp @@ -44,23 +44,23 @@ void KActiveLabel::init() setVScrollBarMode(TQScrollView::AlwaysOff); setHScrollBarMode(TQScrollView::AlwaysOff); setFrameStyle(TQFrame::NoFrame); - setFocusPolicy( TQ_TabFocus ); + setFocusPolicy( TQWidget::TabFocus ); paletteChanged(); - connect(this, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(openLink(const TQString &))); + connect(this, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(openLink(const TQString &))); if (kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); } } void KActiveLabel::paletteChanged() { TQPalette p = kapp ? kapp->palette() : palette(); - p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); - p.setColor(TQColorGroup::Text, p.color(TQPalette::Normal, TQColorGroup::Foreground)); + p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background)); + p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground)); setPalette(p); } diff --git a/tdeui/kactivelabel.h b/tdeui/kactivelabel.h index 5832a4fa1..9f49dd05c 100644 --- a/tdeui/kactivelabel.h +++ b/tdeui/kactivelabel.h @@ -36,7 +36,7 @@ class KActiveLabelPrivate; */ class TDEUI_EXPORT KActiveLabel : public TQTextBrowser { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index 1805714f2..25a0b6847 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -43,10 +43,10 @@ KAnimWidget::KAnimWidget( const TQString& icons, int size, TQWidget *parent, : TQFrame( parent, name ), d( new KAnimWidgetPrivate ) { - connect( &d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimerUpdate())); + connect( &d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimerUpdate())); if (parent && parent->inherits( "TDEToolBar" )) - connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(updateIcons())); + connect(parent, TQ_SIGNAL(modechange()), this, TQ_SLOT(updateIcons())); d->loadingCompleted = false; d->size = size; @@ -140,7 +140,7 @@ void KAnimWidget::mousePressEvent( TQMouseEvent *e ) void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && rect().contains( e->pos() ) ) emit clicked(); diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h index 77abf837a..046522d01 100644 --- a/tdeui/kanimwidget.h +++ b/tdeui/kanimwidget.h @@ -54,7 +54,7 @@ class KAnimWidgetPrivate; */ class TDEUI_EXPORT KAnimWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int size READ size WRITE setSize ) TQ_PROPERTY( TQString icons READ icons WRITE setIcons ) diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp index 4dbbe5bab..c02e4a028 100644 --- a/tdeui/karrowbutton.cpp +++ b/tdeui/karrowbutton.cpp @@ -24,10 +24,10 @@ class KArrowButtonPrivate { public: - Qt::ArrowType arrow; + TQt::ArrowType arrow; }; -KArrowButton::KArrowButton(TQWidget *parent, Qt::ArrowType arrow, +KArrowButton::KArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name) : TQPushButton(parent, name) { @@ -45,14 +45,14 @@ TQSize KArrowButton::sizeHint() const return TQSize( 12, 12 ); } -void KArrowButton::setArrowType(Qt::ArrowType a) +void KArrowButton::setArrowType(TQt::ArrowType a) { if (d->arrow != a) { d->arrow = a; repaint(); } } -Qt::ArrowType KArrowButton::arrowType() const +TQt::ArrowType KArrowButton::arrowType() const { return d->arrow; } @@ -63,7 +63,7 @@ void KArrowButton::drawButton(TQPainter *p) const unsigned int margin = 2; p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); - style().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ), + style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ), colorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default, TQStyleOption( 2, 0 ) ); @@ -95,15 +95,15 @@ void KArrowButton::drawButton(TQPainter *p) TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft; switch (d->arrow) { - case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: e = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: e = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Enabled; if ( isDown() ) flags |= TQStyle::Style_Down; - style().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ), + style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ), colorGroup(), flags ); } diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h index c490c8aab..a1843ad18 100644 --- a/tdeui/karrowbutton.h +++ b/tdeui/karrowbutton.h @@ -37,7 +37,7 @@ class KArrowButtonPrivate; */ class TDEUI_EXPORT KArrowButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp ) public: @@ -48,7 +48,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton * @param arrow The direction the arrrow should be pointing in * @param name An internal name for this widget */ - KArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, + KArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); /** @@ -65,11 +65,11 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton * Returns the arrow type * @since 3.4 */ - Qt::ArrowType arrowType() const; + TQt::ArrowType arrowType() const; // hacks for moc braindamages with enums int arrowTp() const { return (int) arrowType(); } - void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); } + void setArrowTp( int tp ) { setArrowType( (TQt::ArrowType) tp ); } public slots: /** * Defines in what direction the arrow is pointing to. Will repaint the @@ -77,7 +77,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton * * @param a The direction this arrow should be pointing in */ - void setArrowType(Qt::ArrowType a); + void setArrowType(TQt::ArrowType a); protected: /** diff --git a/tdeui/kauthicon.h b/tdeui/kauthicon.h index 3aad21dba..697182483 100644 --- a/tdeui/kauthicon.h +++ b/tdeui/kauthicon.h @@ -46,7 +46,7 @@ class KAuthIconPrivate; */ class TDEUI_EXPORT KAuthIcon : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -102,7 +102,7 @@ class KRootPermsIconPrivate; */ class TDEUI_EXPORT KRootPermsIcon : public KAuthIcon { - Q_OBJECT + TQ_OBJECT public: KRootPermsIcon(TQWidget *parent = 0, const char *name = 0); @@ -134,7 +134,7 @@ class KWritePermsIconPrivate; */ class TDEUI_EXPORT KWritePermsIcon : public KAuthIcon { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 44243715d..dca2efc46 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -120,9 +120,9 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou // Configure email button m_configureEmail = new TQPushButton( i18n("Configure Email..."), parent ); - connect( m_configureEmail, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotConfigureEmail() ) ); - glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, (TQ_Alignment)(AlignTop|AlignRight) ); + connect( m_configureEmail, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotConfigureEmail() ) ); + glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, TQt::AlignTop|TQt::AlignRight ); // To qwtstr = i18n( "The email address this bug report is sent to." ); @@ -152,7 +152,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou d->appcombo = new KComboBox( false, parent, "app"); TQWhatsThis::add( d->appcombo, qwtstr ); d->appcombo->insertStrList((const char**)packages); - connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int))); + connect(d->appcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(appChanged(int))); d->appname = TQString::fromLatin1( m_aboutData ? m_aboutData->productName() : tqApp->name() ); @@ -241,7 +241,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou lay->addWidget( label ); // The multiline-edit - m_lineedit = new TQMultiLineEdit( parent, TQMULTILINEEDIT_OBJECT_NAME_STRING ); + m_lineedit = new TQMultiLineEdit( parent, "TQMultiLineEdit" ); m_lineedit->setMinimumHeight( 180 ); // make it big m_lineedit->setWordWrap(TQMultiLineEdit::WidgetWidth); lay->addWidget( m_lineedit, 10 /*stretch*/ ); @@ -272,8 +272,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou lay->addWidget( d->submitBugButton ); lay->addSpacing(10); - connect( d->submitBugButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotOk())); + connect( d->submitBugButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotOk())); } } @@ -321,7 +321,7 @@ void KBugReport::slotConfigureEmail() if (m_process) return; m_process = new TDEProcess; *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount"); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom())); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotSetFrom())); if (!m_process->start()) { kdDebug() << "Couldn't start tdecmshell.." << endl; diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h index 3110d3dd6..3720f7031 100644 --- a/tdeui/kbugreport.h +++ b/tdeui/kbugreport.h @@ -42,7 +42,7 @@ class KBugReportPrivate; */ class TDEUI_EXPORT KBugReport : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Creates a bug-report dialog. diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp index faa26e95e..54329412e 100644 --- a/tdeui/kbuttonbox.cpp +++ b/tdeui/kbuttonbox.cpp @@ -130,7 +130,7 @@ KButtonBox::addButton( TQPushButton * pb = addButton(text, noexpand); if ((0 != receiver) && (0 != slot)) - TQObject::connect(pb, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(pb, TQ_SIGNAL(clicked()), receiver, slot); return pb; } @@ -146,7 +146,7 @@ KButtonBox::addButton( TQPushButton * pb = addButton(guiitem, noexpand); if ((0 != receiver) && (0 != slot)) - TQObject::connect(pb, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(pb, TQ_SIGNAL(clicked()), receiver, slot); return pb; } @@ -183,7 +183,7 @@ void KButtonBox::layout() { void KButtonBox::placeButtons() { - if(data->orientation == Qt::Horizontal) { + if(data->orientation == TQt::Horizontal) { // calculate free size and stretches int fs = width() - 2 * data->border; int stretch = 0; @@ -323,7 +323,7 @@ TQSize KButtonBox::sizeHint() const { else s = bs; - if(data->orientation == Qt::Horizontal) + if(data->orientation == TQt::Horizontal) dw += s.width(); else dw += s.height(); @@ -335,7 +335,7 @@ TQSize KButtonBox::sizeHint() const { ++itr; } - if(data->orientation == Qt::Horizontal) + if(data->orientation == TQt::Horizontal) return TQSize(dw, bs.height() + 2 * data->border); else return TQSize(bs.width() + 2 * data->border, dw); @@ -344,7 +344,7 @@ TQSize KButtonBox::sizeHint() const { TQSizePolicy KButtonBox::sizePolicy() const { - return data->orientation == Qt::Horizontal? + return data->orientation == TQt::Horizontal? TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) : TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); } diff --git a/tdeui/kbuttonbox.h b/tdeui/kbuttonbox.h index 6044bdb53..5e0ce32fa 100644 --- a/tdeui/kbuttonbox.h +++ b/tdeui/kbuttonbox.h @@ -41,7 +41,7 @@ class KButtonBoxPrivate; class TDEUI_EXPORT KButtonBox : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -51,7 +51,7 @@ public: * addButton() are laid out from top to bottom, otherwise they * are laid out from left to right. */ - KButtonBox(TQWidget *parent, Orientation _orientation = Qt::Horizontal, + KButtonBox(TQWidget *parent, Orientation _orientation = TQt::Horizontal, int border = 0, int _autoborder = 6); /** diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index 5561e5883..064e905d2 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -78,7 +78,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ setToolTips(); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setBackgroundMode( TQWidget::NoBackground ); } @@ -173,7 +173,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col ) } if ( c == focusItem.unicode() && hasFocus() ) { - style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), + style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), colorGroup() ); focusPos = TQPoint( col, row ); } @@ -382,32 +382,32 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); lFont->resize( lFont->sizeHint() ); - lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lFont->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); lFont->setMaximumWidth( lFont->sizeHint().width() ); fontCombo = new TQComboBox( true, bar ); fillFontCombo(); fontCombo->resize( fontCombo->sizeHint() ); - connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) ); + connect( fontCombo, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( fontSelected( const TQString & ) ) ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); lTable->resize( lTable->sizeHint() ); - lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lTable->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); lTable->setMaximumWidth( lTable->sizeHint().width() ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); tableSpinBox->resize( tableSpinBox->sizeHint() ); - connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) ); + connect( tableSpinBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( tableChanged( int ) ) ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); lUnicode->resize( lUnicode->sizeHint() ); - lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lUnicode->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); - TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); + TQValidator* const validator = new TQRegExpValidator( rx, this ); d->unicodeLine = new KLineEdit( bar ); d->unicodeLine->setValidator(validator); @@ -415,7 +415,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f d->unicodeLine->resize( d->unicodeLine->sizeHint() ); slotUpdateUnicode(_chr); - connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); + connect( d->unicodeLine, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotUnicodeEntered() ) ); charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQString(TQVBox::font().family()) : _font, _chr, _tableNum ); const TQSize sz( charTable->contentsWidth() + 4 , @@ -429,20 +429,20 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f setFont( _font.isEmpty() ? TQString(TQVBox::font().family()) : _font ); setTableNum( _tableNum ); - connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( slotUpdateUnicode( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( charHighlighted( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( highlighted() ), this, TQT_SLOT( charHighlighted() ) ); - connect( charTable, TQT_SIGNAL( activated( const TQChar & ) ), this, TQT_SLOT( charActivated( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( activated() ), this, TQT_SLOT( charActivated() ) ); - connect( charTable, TQT_SIGNAL( focusItemChanged( const TQChar & ) ), - this, TQT_SLOT( charFocusItemChanged( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( focusItemChanged() ), this, TQT_SLOT( charFocusItemChanged() ) ); - connect( charTable, TQT_SIGNAL( tableUp() ), this, TQT_SLOT( charTableUp() ) ); - connect( charTable, TQT_SIGNAL( tableDown() ), this, TQT_SLOT( charTableDown() ) ); + connect( charTable, TQ_SIGNAL( highlighted( const TQChar & ) ), this, TQ_SLOT( slotUpdateUnicode( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( highlighted( const TQChar & ) ), this, TQ_SLOT( charHighlighted( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( highlighted() ), this, TQ_SLOT( charHighlighted() ) ); + connect( charTable, TQ_SIGNAL( activated( const TQChar & ) ), this, TQ_SLOT( charActivated( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( activated() ), this, TQ_SLOT( charActivated() ) ); + connect( charTable, TQ_SIGNAL( focusItemChanged( const TQChar & ) ), + this, TQ_SLOT( charFocusItemChanged( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( focusItemChanged() ), this, TQ_SLOT( charFocusItemChanged() ) ); + connect( charTable, TQ_SIGNAL( tableUp() ), this, TQ_SLOT( charTableUp() ) ); + connect( charTable, TQ_SIGNAL( tableDown() ), this, TQ_SLOT( charTableDown() ) ); - connect( charTable, TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(slotDoubleClicked())); + connect( charTable, TQ_SIGNAL(doubleClicked()),this,TQ_SLOT(slotDoubleClicked())); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( charTable ); } diff --git a/tdeui/kcharselect.h b/tdeui/kcharselect.h index a434154f0..4db7056f5 100644 --- a/tdeui/kcharselect.h +++ b/tdeui/kcharselect.h @@ -50,7 +50,7 @@ class KCharSelectPrivate; class TDEUI_EXPORT KCharSelectTable : public TQGridView { - Q_OBJECT + TQ_OBJECT public: KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font, @@ -139,7 +139,7 @@ private: class TDEUI_EXPORT KCharSelect : public TQVBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString fontFamily READ font WRITE setFont ) TQ_PROPERTY( int tableNum READ tableNum WRITE setTableNum ) TQ_PROPERTY( bool fontComboEnabled READ isFontComboEnabled WRITE enableFontCombo ) diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp index 60e250575..90cf47e2a 100644 --- a/tdeui/kcmenumngr.cpp +++ b/tdeui/kcmenumngr.cpp @@ -59,7 +59,7 @@ void KContextMenuManager::insert( TQWidget* widget, TQPopupMenu* popup ) if ( !manager ) manager = new KContextMenuManager; - manager->connect( widget, TQT_SIGNAL( destroyed() ), manager, TQT_SLOT( widgetDestroyed() ) ); + manager->connect( widget, TQ_SIGNAL( destroyed() ), manager, TQ_SLOT( widgetDestroyed() ) ); manager->menus.insert( widget, popup ); widget->installEventFilter( manager ); } @@ -70,7 +70,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) TQPoint pos; switch ( e->type() ) { case TQEvent::MouseButtonPress: - if (((TQMouseEvent*) e )->button() != Qt::RightButton ) + if (((TQMouseEvent*) e )->button() != TQt::RightButton ) break; if ( !showOnPress ) return true; // eat event for safety @@ -78,7 +78,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) pos = ((TQMouseEvent*) e )->globalPos(); break; case TQEvent::MouseButtonRelease: - if ( showOnPress || ((TQMouseEvent*) e )->button() != Qt::RightButton ) + if ( showOnPress || ((TQMouseEvent*) e )->button() != TQt::RightButton ) break; popup = menus[o]; pos = ((TQMouseEvent*) e )->globalPos(); diff --git a/tdeui/kcmenumngr.h b/tdeui/kcmenumngr.h index f59ec8286..4483fae92 100644 --- a/tdeui/kcmenumngr.h +++ b/tdeui/kcmenumngr.h @@ -77,7 +77,7 @@ the position of the micro focus hint of the widget ( TQWidget::microFocusHint() class TDEUI_EXPORT KContextMenuManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index 5a42406a0..8f34024d8 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -47,7 +47,7 @@ KColorButton::KColorButton( TQWidget *parent, const char *name ) setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::KColorButton( const TQColor &c, TQWidget *parent, @@ -60,7 +60,7 @@ KColorButton::KColorButton( const TQColor &c, TQWidget *parent, setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::KColorButton( const TQColor &c, const TQColor &defaultColor, TQWidget *parent, @@ -73,7 +73,7 @@ KColorButton::KColorButton( const TQColor &c, const TQColor &defaultColor, TQWid setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::~KColorButton() @@ -126,13 +126,13 @@ void KColorButton::drawButtonLabel( TQPainter *painter ) if ( hasFocus() ) { TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); } } TQSize KColorButton::sizeHint() const { - return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). + return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). expandedTo(TQApplication::globalStrut()); } @@ -174,7 +174,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e) void KColorButton::mouseMoveEvent( TQMouseEvent *e) { - if( (e->state() & Qt::LeftButton) && + if( (e->state() & TQt::LeftButton) && (e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { // Drag color object diff --git a/tdeui/kcolorbutton.h b/tdeui/kcolorbutton.h index a9ca78ea8..d2ccc61b9 100644 --- a/tdeui/kcolorbutton.h +++ b/tdeui/kcolorbutton.h @@ -36,7 +36,7 @@ class KColorButtonPrivate; */ class TDEUI_EXPORT KColorButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor color READ color WRITE setColor ) TQ_PROPERTY( TQColor defaultColor READ defaultColor WRITE setDefaultColor ) diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp index 87d5de32a..fd43ddcff 100644 --- a/tdeui/kcolorcombo.cpp +++ b/tdeui/kcolorcombo.cpp @@ -79,23 +79,23 @@ static void createStandardPalette() int i = 0; - standardPalette[i++] = Qt::red; - standardPalette[i++] = Qt::green; - standardPalette[i++] = Qt::blue; - standardPalette[i++] = Qt::cyan; - standardPalette[i++] = Qt::magenta; - standardPalette[i++] = Qt::yellow; - standardPalette[i++] = Qt::darkRed; - standardPalette[i++] = Qt::darkGreen; - standardPalette[i++] = Qt::darkBlue; - standardPalette[i++] = Qt::darkCyan; - standardPalette[i++] = Qt::darkMagenta; - standardPalette[i++] = Qt::darkYellow; - standardPalette[i++] = Qt::white; - standardPalette[i++] = Qt::lightGray; - standardPalette[i++] = Qt::gray; - standardPalette[i++] = Qt::darkGray; - standardPalette[i++] = Qt::black; + standardPalette[i++] = TQt::red; + standardPalette[i++] = TQt::green; + standardPalette[i++] = TQt::blue; + standardPalette[i++] = TQt::cyan; + standardPalette[i++] = TQt::magenta; + standardPalette[i++] = TQt::yellow; + standardPalette[i++] = TQt::darkRed; + standardPalette[i++] = TQt::darkGreen; + standardPalette[i++] = TQt::darkBlue; + standardPalette[i++] = TQt::darkCyan; + standardPalette[i++] = TQt::darkMagenta; + standardPalette[i++] = TQt::darkYellow; + standardPalette[i++] = TQt::white; + standardPalette[i++] = TQt::lightGray; + standardPalette[i++] = TQt::gray; + standardPalette[i++] = TQt::darkGray; + standardPalette[i++] = TQt::black; } #endif @@ -121,8 +121,8 @@ KColorCombo::KColorCombo( TQWidget *parent, const char *name ) addColors(); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); - connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) ); } diff --git a/tdeui/kcolorcombo.h b/tdeui/kcolorcombo.h index bade8efcb..084537441 100644 --- a/tdeui/kcolorcombo.h +++ b/tdeui/kcolorcombo.h @@ -38,7 +38,7 @@ class KColorComboInternal; */ class TDEUI_EXPORT KColorCombo : public TQComboBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor color READ color WRITE setColor ) public: diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index b37bcf42c..8296c8319 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -68,7 +68,7 @@ #include "config.h" #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> // defined in qapplication_x11.cpp @@ -191,23 +191,23 @@ static void createStandardPalette() int i = 0; - standardPalette[i++] = Qt::red; - standardPalette[i++] = Qt::green; - standardPalette[i++] = Qt::blue; - standardPalette[i++] = Qt::cyan; - standardPalette[i++] = Qt::magenta; - standardPalette[i++] = Qt::yellow; - standardPalette[i++] = Qt::darkRed; - standardPalette[i++] = Qt::darkGreen; - standardPalette[i++] = Qt::darkBlue; - standardPalette[i++] = Qt::darkCyan; - standardPalette[i++] = Qt::darkMagenta; - standardPalette[i++] = Qt::darkYellow; - standardPalette[i++] = Qt::white; - standardPalette[i++] = Qt::lightGray; - standardPalette[i++] = Qt::gray; - standardPalette[i++] = Qt::darkGray; - standardPalette[i++] = Qt::black; + standardPalette[i++] = TQt::red; + standardPalette[i++] = TQt::green; + standardPalette[i++] = TQt::blue; + standardPalette[i++] = TQt::cyan; + standardPalette[i++] = TQt::magenta; + standardPalette[i++] = TQt::yellow; + standardPalette[i++] = TQt::darkRed; + standardPalette[i++] = TQt::darkGreen; + standardPalette[i++] = TQt::darkBlue; + standardPalette[i++] = TQt::darkCyan; + standardPalette[i++] = TQt::darkMagenta; + standardPalette[i++] = TQt::darkYellow; + standardPalette[i++] = TQt::white; + standardPalette[i++] = TQt::lightGray; + standardPalette[i++] = TQt::gray; + standardPalette[i++] = TQt::darkGray; + standardPalette[i++] = TQt::black; } @@ -263,7 +263,7 @@ void KHSSelector::drawPalette( TQPixmap *pixmap ) //----------------------------------------------------------------------------- KValueSelector::KValueSelector( TQWidget *parent, const char *name ) - : TDESelector( Qt::Vertical, parent, name ), _hue(0), _sat(0) + : TDESelector( TQt::Vertical, parent, name ), _hue(0), _sat(0) { setRange( 0, 255 ); pixmap.setOptimization( TQPixmap::BestOptim ); @@ -298,9 +298,9 @@ void KValueSelector::drawPalette( TQPixmap *pixmap ) TQImage image( xSize, ySize, 32 ); TQColor col; uint *p; - QRgb rgb; + TQRgb rgb; - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) { for ( int v = 0; v < ySize; v++ ) { @@ -315,7 +315,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap ) } } - if( orientation() == Qt::Vertical ) + if( orientation() == TQt::Vertical ) { for ( int v = 0; v < ySize; v++ ) { @@ -429,7 +429,7 @@ int KColorCells::posToCell(const TQPoint &pos, bool ignoreBorders) void KColorCells::mouseMoveEvent( TQMouseEvent *e ) { - if( !(e->state() & Qt::LeftButton)) return; + if( !(e->state() & TQt::LeftButton)) return; if(inMouse) { int delay = TDEGlobalSettings::dndEventDelay(); @@ -533,7 +533,7 @@ void KColorPatch::drawContents( TQPainter *painter ) void KColorPatch::mouseMoveEvent( TQMouseEvent *e ) { // Drag color object - if( !(e->state() & Qt::LeftButton)) return; + if( !(e->state() & TQt::LeftButton)) return; KColorDrag *d = new KColorDrag( color, this); d->dragCopy(); } @@ -597,12 +597,12 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) mNamedColorList->setFixedSize(minSize); mNamedColorList->hide(); layout->addWidget(mNamedColorList); - connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )), - this, TQT_SLOT( slotColorTextSelected( const TQString & )) ); + connect( mNamedColorList, TQ_SIGNAL(highlighted( const TQString & )), + this, TQ_SLOT( slotColorTextSelected( const TQString & )) ); setFixedSize( sizeHint()); - connect( combo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotSetPalette( const TQString &))); + connect( combo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotSetPalette( const TQString &))); } KPaletteTable::~KPaletteTable() @@ -704,7 +704,7 @@ KPaletteTable::readNamedColor( void ) // preventing the real dialog to become visible until the // error dialog box is removed (== bad UI). // - TQTimer::singleShot( 10, this, TQT_SLOT(slotShowNamedColorReadError()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotShowNamedColorReadError()) ); } } @@ -831,10 +831,10 @@ KPaletteTable::setPalette( const TQString &_paletteName ) { cells->setColor( i, mPalette->color(i) ); } - connect( cells, TQT_SIGNAL( colorSelected( int ) ), - TQT_SLOT( slotColorCellSelected( int ) ) ); - connect( cells, TQT_SIGNAL( colorDoubleClicked( int ) ), - TQT_SLOT( slotColorCellDoubleClicked( int ) ) ); + connect( cells, TQ_SIGNAL( colorSelected( int ) ), + TQ_SLOT( slotColorCellSelected( int ) ) ); + connect( cells, TQ_SIGNAL( colorDoubleClicked( int ) ), + TQ_SLOT( slotColorCellDoubleClicked( int ) ) ); sv->addChild( cells ); cells->show(); sv->updateScrollBars(); @@ -930,7 +930,7 @@ public: TQCheckBox *cbDefaultColor; KColor defaultColor; KColor selColor; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 QX11EventFilter oldfilter; #endif }; @@ -944,12 +944,12 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d = new KColorDialogPrivate; d->bRecursion = true; d->bColorPicking = false; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 d->oldfilter = 0; #endif d->cbDefaultColor = 0L; - connect( this, TQT_SIGNAL(okClicked(void)),this,TQT_SLOT(slotWriteSettings(void))); - connect( this, TQT_SIGNAL(closeClicked(void)),this,TQT_SLOT(slotWriteSettings(void))); + connect( this, TQ_SIGNAL(okClicked(void)),this,TQ_SLOT(slotWriteSettings(void))); + connect( this, TQ_SIGNAL(closeClicked(void)),this,TQ_SLOT(slotWriteSettings(void))); TQLabel *label; @@ -981,7 +981,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) l_left->addSpacing(10); TQGridLayout *l_lbot = new TQGridLayout(3, 6); - l_left->addLayout(TQT_TQLAYOUT(l_lbot)); + l_left->addLayout(l_lbot); // // the palette and value selector go into the H-box @@ -989,14 +989,14 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->hsSelector = new KHSSelector( page ); d->hsSelector->setMinimumSize(140, 70); l_ltop->addWidget(d->hsSelector, 8); - connect( d->hsSelector, TQT_SIGNAL( valueChanged( int, int ) ), - TQT_SLOT( slotHSChanged( int, int ) ) ); + connect( d->hsSelector, TQ_SIGNAL( valueChanged( int, int ) ), + TQ_SLOT( slotHSChanged( int, int ) ) ); d->valuePal = new KValueSelector( page ); d->valuePal->setMinimumSize(26, 70); l_ltop->addWidget(d->valuePal, 1); - connect( d->valuePal, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( slotVChanged( int ) ) ); + connect( d->valuePal, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( slotVChanged( int ) ) ); // @@ -1006,28 +1006,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 2); d->hedit = new KColorSpinBox( 0, 359, 1, page ); - d->hedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->hedit) ) ); + d->hedit->setValidator( new TQIntValidator( d->hedit ) ); l_lbot->addWidget(d->hedit, 0, 3); - connect( d->hedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->hedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("S:"), page ); label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 1, 2); d->sedit = new KColorSpinBox( 0, 255, 1, page ); - d->sedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->sedit) ) ); + d->sedit->setValidator( new TQIntValidator( d->sedit ) ); l_lbot->addWidget(d->sedit, 1, 3); - connect( d->sedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->sedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("V:"), page ); label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 2); d->vedit = new KColorSpinBox( 0, 255, 1, page ); - d->vedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->vedit) ) ); + d->vedit->setValidator( new TQIntValidator( d->vedit ) ); l_lbot->addWidget(d->vedit, 2, 3); - connect( d->vedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->vedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); // // add the RGB fields @@ -1036,28 +1036,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 4); d->redit = new KColorSpinBox( 0, 255, 1, page ); - d->redit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->redit) ) ); + d->redit->setValidator( new TQIntValidator( d->redit ) ); l_lbot->addWidget(d->redit, 0, 5); - connect( d->redit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->redit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("G:"), page ); label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget( label, 1, 4); d->gedit = new KColorSpinBox( 0, 255,1, page ); - d->gedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->gedit) ) ); + d->gedit->setValidator( new TQIntValidator( d->gedit ) ); l_lbot->addWidget(d->gedit, 1, 5); - connect( d->gedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->gedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("B:"), page ); label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 4); d->bedit = new KColorSpinBox( 0, 255, 1, page ); - d->bedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->bedit) ) ); + d->bedit->setValidator( new TQIntValidator( d->bedit ) ); l_lbot->addWidget(d->bedit, 2, 5); - connect( d->bedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->bedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); // // the entry fields should be wide enough to hold 8888888 @@ -1083,13 +1083,13 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->table = new KPaletteTable( page ); d->l_right->addWidget(d->table, 10); - connect( d->table, TQT_SIGNAL( colorSelected( const TQColor &, const TQString & ) ), - TQT_SLOT( slotColorSelected( const TQColor &, const TQString & ) ) ); + connect( d->table, TQ_SIGNAL( colorSelected( const TQColor &, const TQString & ) ), + TQ_SLOT( slotColorSelected( const TQColor &, const TQString & ) ) ); connect( d->table, - TQT_SIGNAL( colorDoubleClicked( const TQColor &, const TQString & ) ), - TQT_SLOT( slotColorDoubleClicked( const TQColor &, const TQString & ) ) + TQ_SIGNAL( colorDoubleClicked( const TQColor &, const TQString & ) ), + TQ_SLOT( slotColorDoubleClicked( const TQColor &, const TQString & ) ) ); // Store the default value for saving time. d->originalPalette = d->table->palette(); @@ -1107,7 +1107,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQPushButton *button = new TQPushButton( page ); button->setText(i18n("&Add to Custom Colors")); l_hbox->addWidget(button, 0, AlignLeft); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( slotAddToCustomColors())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( slotAddToCustomColors())); // // The color picker button @@ -1115,7 +1115,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) button = new TQPushButton( page ); button->setPixmap( BarIcon("colorpicker")); l_hbox->addWidget(button, 0, AlignHCenter ); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( slotColorPicker())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( slotColorPicker())); // // a little space between @@ -1131,30 +1131,30 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label = new TQLabel( page ); label->setText(i18n("Name:")); - l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, Qt::AlignLeft); + l_grid->addWidget(label, 0, 1, TQt::AlignLeft); d->colorName = new TQLabel( page ); - l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, Qt::AlignLeft); + l_grid->addWidget(d->colorName, 0, 2, TQt::AlignLeft); label = new TQLabel( page ); label->setText(i18n("HTML:")); - l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, Qt::AlignLeft); + l_grid->addWidget(label, 1, 1, TQt::AlignLeft); d->htmlName = new KLineEdit( page ); d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD")); d->htmlName->setFixedWidth(w); - l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, Qt::AlignLeft); + l_grid->addWidget(d->htmlName, 1, 2, TQt::AlignLeft); - connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotHtmlChanged() ) ); + connect( d->htmlName, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotHtmlChanged() ) ); d->patch = new KColorPatch( page ); d->patch->setFixedSize(48, 48); - l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter); - connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), - TQT_SLOT( setColor( const TQColor&))); + l_grid->addMultiCellWidget(d->patch, 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); + connect( d->patch, TQ_SIGNAL( colorChanged( const TQColor&)), + TQ_SLOT( setColor( const TQColor&))); tl_layout->activate(); page->setMinimumSize( page->sizeHint() ); @@ -1177,7 +1177,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) KColorDialog::~KColorDialog() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (d->bColorPicking) tqt_set_x11_event_filter(d->oldfilter); #endif @@ -1187,7 +1187,7 @@ KColorDialog::~KColorDialog() bool KColorDialog::eventFilter( TQObject *obj, TQEvent *ev ) { - if ((TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->htmlName)) || (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->hsSelector))) + if ((obj == d->htmlName) || (obj == d->hsSelector)) switch(ev->type()) { case TQEvent::DragEnter: @@ -1226,7 +1226,7 @@ KColorDialog::setDefaultColor( const TQColor& col ) mainWidget()->setMinimumSize( mainWidget()->sizeHint() ); disableResize(); - connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) ); + connect( d->cbDefaultColor, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDefaultColorClicked() ) ); } d->defaultColor = col; @@ -1486,7 +1486,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name ) static TQWidget *kde_color_dlg_widget = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static int kde_color_dlg_handler(XEvent *event) { if (event->type == ButtonRelease) @@ -1503,11 +1503,11 @@ void KColorDialog::slotColorPicker() { d->bColorPicking = true; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 d->oldfilter = tqt_set_x11_event_filter(kde_color_dlg_handler); #endif kde_color_dlg_widget = this; - grabMouse( tqcrossCursor ); + grabMouse( TQt::crossCursor ); grabKeyboard(); } @@ -1517,7 +1517,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e ) if (d->bColorPicking) { d->bColorPicking = false; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 tqt_set_x11_event_filter(d->oldfilter); d->oldfilter = 0; #endif @@ -1532,7 +1532,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e ) TQColor KColorDialog::grabColor(const TQPoint &p) { - TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget *desktop = TQApplication::desktop(); TQPixmap pm = TQPixmap::grabWindow( desktop->winId(), p.x(), p.y(), 1, 1); TQImage i = pm.convertToImage(); return i.pixel(0,0); @@ -1546,7 +1546,7 @@ KColorDialog::keyPressEvent( TQKeyEvent *e ) if (e->key() == Key_Escape) { d->bColorPicking = false; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 tqt_set_x11_event_filter(d->oldfilter); d->oldfilter = 0; #endif diff --git a/tdeui/kcolordialog.h b/tdeui/kcolordialog.h index e580ad582..a2ea4b52f 100644 --- a/tdeui/kcolordialog.h +++ b/tdeui/kcolordialog.h @@ -25,7 +25,7 @@ #ifndef KDELIBS_KCOLORDIALOG_H #define KDELIBS_KCOLORDIALOG_H -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS // FIXME(E): Do we need the KColorDialog extra functionality in Qt Embedded? #include <tqcolordialog.h> #define KColorDialog QColorDialog @@ -57,7 +57,7 @@ class KColorCells; */ class TDEUI_EXPORT KHSSelector : public KXYSelector { - Q_OBJECT + TQ_OBJECT public: /** @@ -101,7 +101,7 @@ class KValueSelectorPrivate; */ class TDEUI_EXPORT KValueSelector : public TDESelector { - Q_OBJECT + TQ_OBJECT public: /** @@ -197,7 +197,7 @@ private: **/ class TDEUI_EXPORT KPaletteTable : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KPaletteTable( TQWidget *parent, int minWidth=210, int cols = 16); ~KPaletteTable(); @@ -252,7 +252,7 @@ private: */ class TDEUI_EXPORT KColorCells : public TQGridView { - Q_OBJECT + TQ_OBJECT public: KColorCells( TQWidget *parent, int rows, int cols ); ~KColorCells(); @@ -310,7 +310,7 @@ private: */ class TDEUI_EXPORT KColorPatch : public TQFrame { - Q_OBJECT + TQ_OBJECT public: KColorPatch( TQWidget *parent ); virtual ~KColorPatch(); @@ -376,7 +376,7 @@ private: **/ class TDEUI_EXPORT KColorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -491,6 +491,6 @@ class TDEUI_EXPORT KColorDialog : public KDialogBase KColorDialogPrivate *d; }; -#endif // !Q_WS_QWS +#endif // !TQ_WS_QWS #endif // KDELIBS_KCOLORDIALOG_H diff --git a/tdeui/kcolordrag.h b/tdeui/kcolordrag.h index 289938b00..7c46faf2d 100644 --- a/tdeui/kcolordrag.h +++ b/tdeui/kcolordrag.h @@ -34,7 +34,7 @@ class KColorDragPrivate; * See the Qt drag'n'drop documentation. */ class TDEUI_EXPORT KColorDrag : public TQStoredDrag { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index 3b2b770ee..bcde35467 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -249,7 +249,7 @@ void KComboBox::wheelEvent( TQWheelEvent *ev ) void KComboBox::setLineEdit( TQLineEdit *edit ) { if ( !editable() && edit && - !qstrcmp( edit->className(), TQLINEEDIT_OBJECT_NAME_STRING ) ) + !qstrcmp( edit->className(), "TQLineEdit" ) ) { // uic generates code that creates a read-only KComboBox and then // calls combo->setEditable( true ), which causes TQComboBox to set up @@ -261,12 +261,12 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) } TQComboBox::setLineEdit( edit ); - d->klineEdit = tqt_dynamic_cast<KLineEdit*>( edit ); + d->klineEdit = dynamic_cast<KLineEdit*>( edit ); setDelegate( d->klineEdit ); // Connect the returnPressed signal for both Q[K]LineEdits' if (edit) - connect( edit, TQT_SIGNAL( returnPressed() ), TQT_SIGNAL( returnPressed() )); + connect( edit, TQ_SIGNAL( returnPressed() ), TQ_SIGNAL( returnPressed() )); if ( d->klineEdit ) { @@ -274,32 +274,32 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) // lineedit without us noticing. And TDECompletionBase::delegate would // be a dangling pointer then, so prevent that. Note: only do this // when it is a KLineEdit! - connect( edit, TQT_SIGNAL( destroyed() ), TQT_SLOT( lineEditDeleted() )); + connect( edit, TQ_SIGNAL( destroyed() ), TQ_SLOT( lineEditDeleted() )); - connect( d->klineEdit, TQT_SIGNAL( returnPressed( const TQString& )), - TQT_SIGNAL( returnPressed( const TQString& ) )); + connect( d->klineEdit, TQ_SIGNAL( returnPressed( const TQString& )), + TQ_SIGNAL( returnPressed( const TQString& ) )); - connect( d->klineEdit, TQT_SIGNAL( completion( const TQString& )), - TQT_SIGNAL( completion( const TQString& )) ); + connect( d->klineEdit, TQ_SIGNAL( completion( const TQString& )), + TQ_SIGNAL( completion( const TQString& )) ); - connect( d->klineEdit, TQT_SIGNAL( substringCompletion( const TQString& )), - TQT_SIGNAL( substringCompletion( const TQString& )) ); + connect( d->klineEdit, TQ_SIGNAL( substringCompletion( const TQString& )), + TQ_SIGNAL( substringCompletion( const TQString& )) ); connect( d->klineEdit, - TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )), - TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) ); + TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )), + TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) ); connect( d->klineEdit, - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); connect( d->klineEdit, - TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), - TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )) ); + TQ_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), + TQ_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )) ); connect( d->klineEdit, - TQT_SIGNAL( completionBoxActivated( const TQString& )), - TQT_SIGNAL( activated( const TQString& )) ); + TQ_SIGNAL( completionBoxActivated( const TQString& )), + TQ_SIGNAL( activated( const TQString& )) ); } } @@ -390,10 +390,10 @@ void KHistoryCombo::init( bool useCompletion ) if ( histControl == "ignoredups" || histControl == "ignoreboth" ) setDuplicatesEnabled( false ); - connect( this, TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), - TQT_SLOT(addContextMenuItems(TQPopupMenu*)) ); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotReset() )); - connect( this, TQT_SIGNAL( returnPressed(const TQString&) ), TQT_SLOT(slotReset())); + connect( this, TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), + TQ_SLOT(addContextMenuItems(TQPopupMenu*)) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotReset() )); + connect( this, TQ_SIGNAL( returnPressed(const TQString&) ), TQ_SLOT(slotReset())); } KHistoryCombo::~KHistoryCombo() @@ -455,10 +455,10 @@ void KHistoryCombo::addContextMenuItems( TQPopupMenu* menu ) { menu->insertSeparator(); if (d->bHistoryEditorEnabled) { - int idedit = menu->insertItem( SmallIconSet("edit"), i18n("&Edit History..."), this, TQT_SLOT( slotEdit()) ); + int idedit = menu->insertItem( SmallIconSet("edit"), i18n("&Edit History..."), this, TQ_SLOT( slotEdit()) ); menu->setItemEnabled(idedit, count()); } - int id = menu->insertItem( SmallIconSet("history_clear"), i18n("Clear &History"), this, TQT_SLOT( slotClear())); + int id = menu->insertItem( SmallIconSet("history_clear"), i18n("Clear &History"), this, TQ_SLOT( slotClear())); if (!count()) menu->setItemEnabled(id, false); } @@ -697,7 +697,7 @@ void KHistoryCombo::slotClear() void KHistoryCombo::slotEdit() { KHistoryComboEditor dlg( historyItems(), this ); - connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) ); + connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) ); dlg.exec(); } @@ -747,7 +747,7 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget TQLabel* slbl = new TQLabel(i18n("&Search:"), searchbox); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchbox); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); // Add ListView m_pListView = new TDEListView( box ); @@ -766,8 +766,8 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget m_pListView->setMinimumSize( m_pListView->sizeHint() ); - connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); enableButton( KDialogBase::User1, false ); diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index e0c2e2704..8e6afbbe4 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -114,7 +114,7 @@ class KURL; * KComboBox *combo = new KComboBox( true, this, "mywidget" ); * TDECompletion *comp = combo->completionObject(); * // Connect to the return pressed signal - optional - * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(combo,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * * // Provide the to be completed strings. Note that those are separate from the combo's * // contents. @@ -128,7 +128,7 @@ class KURL; * KURLCompletion *comp = new KURLCompletion(); * combo->setCompletionObject( comp ); * // Connect to the return pressed signal - optional - * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(combo,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * Note that you have to either delete the allocated completion object @@ -141,7 +141,7 @@ class KURL; * // Tell the widget not to handle completion and rotation * combo->setHandleSignals( false ); * // Set your own completion key for manual completions. - * combo->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End ); + * combo->setKeyBinding( TDECompletionBase::TextCompletion, TQt::End ); * // Hide the context (popup) menu * combo->setContextMenuEnabled( false ); * \endcode @@ -150,7 +150,7 @@ class KURL; */ class TDEUI_EXPORT KComboBox : public TQComboBox, public TDECompletionBase { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion ) TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled ) TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled ) @@ -539,7 +539,7 @@ class KPixmapProvider; */ class TDEUI_EXPORT KHistoryCombo : public KComboBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems ) public: @@ -553,8 +553,8 @@ public: * use * * \code - * connect( combo, TQT_SIGNAL( activated( const TQString& )), - * combo, TQT_SLOT( addToHistory( const TQString& ))); + * connect( combo, TQ_SIGNAL( activated( const TQString& )), + * combo, TQ_SLOT( addToHistory( const TQString& ))); * \endcode * * Use TQComboBox::setMaxCount() to limit the history. @@ -798,7 +798,7 @@ private: class TDEUI_EXPORT KHistoryComboEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KHistoryComboEditor( const TQStringList& entries, TQWidget *parent = 0L ); diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp index 5357e557a..cd30b861b 100644 --- a/tdeui/kcommand.cpp +++ b/tdeui/kcommand.cpp @@ -84,25 +84,25 @@ KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool wi if (withMenus) { TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo", - TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQT_SLOT( undo() ), + TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQ_SLOT( undo() ), actionCollection, KStdAction::stdName( KStdAction::Undo ) ); - connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); - connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); + connect( undo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUndoAboutToShow() ) ); + connect( undo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) ); m_undo = undo; m_undoPopup = undo->popupMenu(); TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo", - TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQT_SLOT( redo() ), + TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQ_SLOT( redo() ), actionCollection, KStdAction::stdName( KStdAction::Redo ) ); - connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) ); - connect( redo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) ); + connect( redo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotRedoAboutToShow() ) ); + connect( redo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) ); m_redo = redo; m_redoPopup = redo->popupMenu(); } else { - m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), actionCollection ); - m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), actionCollection ); + m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), actionCollection ); + m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), actionCollection ); m_undoPopup = 0L; m_redoPopup = 0L; } diff --git a/tdeui/kcommand.h b/tdeui/kcommand.h index e27e5178b..f043afe00 100644 --- a/tdeui/kcommand.h +++ b/tdeui/kcommand.h @@ -154,7 +154,7 @@ protected: * to the name of the command. */ class TDEUI_EXPORT KCommandHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a command history, to store commands. diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 17f523d86..ae0a83935 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -49,7 +49,7 @@ TQCursor KCursor::handCursor() TDEConfig *config = TDEGlobal::config(); TDEConfigGroupSaver saver( config, "General" ); -#ifndef Q_WS_WIN // this mask doesn't work too well on win32 +#ifndef TQ_WS_WIN // this mask doesn't work too well on win32 if ( config->readEntry("handCursorStyle", "Windows") == "Windows" ) { static const unsigned char HAND_BITS[] = { @@ -74,7 +74,7 @@ TQCursor KCursor::handCursor() hand_cursor->handle(); } else -#endif //! Q_WS_WIN +#endif //! TQ_WS_WIN hand_cursor = new TQCursor(PointingHandCursor); } @@ -145,72 +145,72 @@ TQCursor KCursor::workingCursor() */ TQCursor KCursor::arrowCursor() { - return tqarrowCursor; + return TQt::arrowCursor; } TQCursor KCursor::upArrowCursor() { - return tqupArrowCursor; + return TQt::upArrowCursor; } TQCursor KCursor::crossCursor() { - return tqcrossCursor; + return TQt::crossCursor; } TQCursor KCursor::waitCursor() { - return tqwaitCursor; + return TQt::waitCursor; } TQCursor KCursor::ibeamCursor() { - return tqibeamCursor; + return TQt::ibeamCursor; } TQCursor KCursor::sizeVerCursor() { - return tqsizeVerCursor; + return TQt::sizeVerCursor; } TQCursor KCursor::sizeHorCursor() { - return tqsizeHorCursor; + return TQt::sizeHorCursor; } TQCursor KCursor::sizeBDiagCursor() { - return tqsizeBDiagCursor; + return TQt::sizeBDiagCursor; } TQCursor KCursor::sizeFDiagCursor() { - return tqsizeFDiagCursor; + return TQt::sizeFDiagCursor; } TQCursor KCursor::sizeAllCursor() { - return tqsizeAllCursor; + return TQt::sizeAllCursor; } TQCursor KCursor::blankCursor() { - return tqblankCursor; + return TQt::blankCursor; } TQCursor KCursor::whatsThisCursor() { - return tqwhatsThisCursor; + return TQt::whatsThisCursor; } // auto-hide cursor stuff @@ -250,8 +250,8 @@ KCursorPrivateAutoHideEventFilter::KCursorPrivateAutoHideEventFilter( TQWidget* , m_isOwnCursor( false ) { m_widget->setMouseTracking( true ); - connect( &m_autoHideTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( hideCursor() ) ); + connect( &m_autoHideTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( hideCursor() ) ); } KCursorPrivateAutoHideEventFilter::~KCursorPrivateAutoHideEventFilter() @@ -294,7 +294,7 @@ void KCursorPrivateAutoHideEventFilter::unhideCursor() TQWidget* w = actualWidget(); - if ( w->cursor().shape() != Qt::BlankCursor ) // someone messed with the cursor already + if ( w->cursor().shape() != TQt::BlankCursor ) // someone messed with the cursor already return; if ( m_isOwnCursor ) @@ -308,7 +308,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const TQWidget* w = m_widget; // Is w a scrollview ? Call setCursor on the viewport in that case. - TQScrollView * sv = tqt_dynamic_cast<TQScrollView *>( w ); + TQScrollView * sv = dynamic_cast<TQScrollView *>( w ); if ( sv ) w = sv->viewport(); @@ -317,7 +317,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const bool KCursorPrivateAutoHideEventFilter::eventFilter( TQObject *o, TQEvent *e ) { - Q_ASSERT( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_widget) ); + Q_ASSERT( o == m_widget ); switch ( e->type() ) { @@ -392,8 +392,8 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve m_eventFilters.insert( w, filter ); if ( !customEventFilter ) w->installEventFilter( filter ); - connect( w, TQT_SIGNAL( destroyed(TQObject*) ), - this, TQT_SLOT( slotWidgetDestroyed(TQObject*) ) ); + connect( w, TQ_SIGNAL( destroyed(TQObject*) ), + this, TQ_SLOT( slotWidgetDestroyed(TQObject*) ) ); } else { @@ -402,8 +402,8 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve return; w->removeEventFilter( filter ); delete filter; - disconnect( w, TQT_SIGNAL( destroyed(TQObject*) ), - this, TQT_SLOT( slotWidgetDestroyed(TQObject*) ) ); + disconnect( w, TQ_SIGNAL( destroyed(TQObject*) ), + this, TQ_SLOT( slotWidgetDestroyed(TQObject*) ) ); } } diff --git a/tdeui/kcursor_private.h b/tdeui/kcursor_private.h index 0ed1789e6..999280f74 100644 --- a/tdeui/kcursor_private.h +++ b/tdeui/kcursor_private.h @@ -38,7 +38,7 @@ class TQWidget; */ class KCursorPrivateAutoHideEventFilter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KCursorPrivateAutoHideEventFilter( TQWidget* widget ); @@ -71,7 +71,7 @@ private: class KCursorPrivate : public TQObject { friend class KCursor; // to shut up the compiler - Q_OBJECT + TQ_OBJECT public: static KCursorPrivate *self(); diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index f29e32762..0622cbc1a 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -92,7 +92,7 @@ void KDatePicker::fillWeeksCombo(const TQDate &date) // make sure that the week of the lastDay is always inserted: in Chinese calendar // system, this is not always the case if(day < lastDay && day.daysTo(lastDay) < 7 && calendar->weekNumber(day) != calendar->weekNumber(lastDay)) - day = TQT_TQDATE_OBJECT(lastDay.addDays(-7)); + day = lastDay.addDays(-7); } } @@ -187,17 +187,17 @@ void KDatePicker::init( const TQDate &dt ) monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); } - connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); - connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); - connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked())); - connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked())); - connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked())); - connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked())); - connect(d->selectWeek, TQT_SIGNAL(activated(int)), TQT_SLOT(weekSelected(int))); - connect(d->todayButton, TQT_SIGNAL(clicked()), TQT_SLOT(todayButtonClicked())); - connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked())); - connect(selectYear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectYearClicked())); - connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed())); + connect(table, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(dateChangedSlot(TQDate))); + connect(table, TQ_SIGNAL(tableClicked()), TQ_SLOT(tableClickedSlot())); + connect(monthForward, TQ_SIGNAL(clicked()), TQ_SLOT(monthForwardClicked())); + connect(monthBackward, TQ_SIGNAL(clicked()), TQ_SLOT(monthBackwardClicked())); + connect(yearForward, TQ_SIGNAL(clicked()), TQ_SLOT(yearForwardClicked())); + connect(yearBackward, TQ_SIGNAL(clicked()), TQ_SLOT(yearBackwardClicked())); + connect(d->selectWeek, TQ_SIGNAL(activated(int)), TQ_SLOT(weekSelected(int))); + connect(d->todayButton, TQ_SIGNAL(clicked()), TQ_SLOT(todayButtonClicked())); + connect(selectMonth, TQ_SIGNAL(clicked()), TQ_SLOT(selectMonthClicked())); + connect(selectYear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectYearClicked())); + connect(line, TQ_SIGNAL(returnPressed()), TQ_SLOT(lineEnterPressed())); table->setFocus(); @@ -225,8 +225,8 @@ KDatePicker::eventFilter(TQObject *o, TQEvent *e ) if ( (k->key() == TQt::Key_Prior) || (k->key() == TQt::Key_Next) || - (k->key() == Qt::Key_Up) || - (k->key() == Qt::Key_Down) ) + (k->key() == TQt::Key_Up) || + (k->key() == TQt::Key_Down) ) { TQApplication::sendEvent( table, e ); table->setFocus(); @@ -371,7 +371,7 @@ KDatePicker::selectMonthClicked() int day = calendar->day(date); // ----- construct a valid date in this month: calendar->setYMD(date, calendar->year(date), month, 1); - date = TQT_TQDATE_OBJECT(date.addDays(TQMIN(day, calendar->daysInMonth(date)) - 1)); + date = date.addDays(TQMIN(day, calendar->daysInMonth(date)) - 1); // ----- set this month setDate(date); } @@ -394,7 +394,7 @@ KDatePicker::selectYearClicked() picker->setYear( table->getDate().year() ); picker->selectAll(); popup->setMainWidget(picker); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); + connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int))); picker->setFocus(); if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height())))) { @@ -416,7 +416,7 @@ KDatePicker::selectYearClicked() } delete popup; - TQTimer::singleShot(0, this, TQT_SLOT(ensureSelectYearIsUp())); + TQTimer::singleShot(0, this, TQ_SLOT(ensureSelectYearIsUp())); } void @@ -507,7 +507,7 @@ KDatePicker::setFontSize(int s) maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); } - TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, + TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); selectMonth->setMinimumSize(metricBound); @@ -528,8 +528,8 @@ KDatePicker::setCloseButton( bool enable ) d->navigationLayout->addWidget(d->closeButton); TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); - connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + connect( d->closeButton, TQ_SIGNAL( clicked() ), + topLevelWidget(), TQ_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h index 4e13f860e..32455144d 100644 --- a/tdeui/kdatepicker.h +++ b/tdeui/kdatepicker.h @@ -50,7 +50,7 @@ class KDateTable; **/ class TDEUI_EXPORT KDatePicker: public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQDate date READ date WRITE setDate) TQ_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton ) TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize ) diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index ec5a1a132..7d76c3fc1 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -84,7 +84,7 @@ public: KDateValidator::KDateValidator(TQWidget* parent, const char* name) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { } @@ -124,7 +124,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags kdDebug() << "KDateTable ctor: WARNING: Given date is invalid, using current date." << endl; date_=TQDate::currentDate(); } - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -140,7 +140,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f) { d = new KDateTablePrivate; setFontSize(10); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -158,12 +158,12 @@ KDateTable::~KDateTable() void KDateTable::initAccels() { TDEAccel* accel = new TDEAccel(this, "date table accel"); - accel->insert(TDEStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth())); - accel->insert(TDEStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth())); - accel->insert(TDEStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth())); - accel->insert(TDEStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth())); - accel->insert(TDEStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek())); - accel->insert(TDEStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek())); + accel->insert(TDEStdAccel::Next, this, TQ_SLOT(nextMonth())); + accel->insert(TDEStdAccel::Prior, this, TQ_SLOT(previousMonth())); + accel->insert(TDEStdAccel::Home, this, TQ_SLOT(beginningOfMonth())); + accel->insert(TDEStdAccel::End, this, TQ_SLOT(endOfMonth())); + accel->insert(TDEStdAccel::BeginningOfLine, this, TQ_SLOT(beginningOfWeek())); + accel->insert(TDEStdAccel::EndOfLine, this, TQ_SLOT(endOfWeek())); accel->readSettings(); } @@ -351,22 +351,22 @@ void KDateTable::previousMonth() void KDateTable::beginningOfMonth() { - setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.day()))); + setDate(date.addDays(1 - date.day())); } void KDateTable::endOfMonth() { - setDate(TQT_TQDATE_OBJECT(date.addDays(date.daysInMonth() - date.day()))); + setDate(date.addDays(date.daysInMonth() - date.day())); } void KDateTable::beginningOfWeek() { - setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.dayOfWeek()))); + setDate(date.addDays(1 - date.dayOfWeek())); } void KDateTable::endOfWeek() { - setDate(TQT_TQDATE_OBJECT(date.addDays(7 - date.dayOfWeek()))); + setDate(date.addDays(7 - date.dayOfWeek())); } void @@ -374,22 +374,22 @@ KDateTable::keyPressEvent( TQKeyEvent *e ) { switch( e->key() ) { case Key_Up: - setDate(TQT_TQDATE_OBJECT(date.addDays(-7))); + setDate(date.addDays(-7)); break; case Key_Down: - setDate(TQT_TQDATE_OBJECT(date.addDays(7))); + setDate(date.addDays(7)); break; case Key_Left: - setDate(TQT_TQDATE_OBJECT(date.addDays(-1))); + setDate(date.addDays(-1)); break; case Key_Right: - setDate(TQT_TQDATE_OBJECT(date.addDays(1))); + setDate(date.addDays(1)); break; case Key_Minus: - setDate(TQT_TQDATE_OBJECT(date.addDays(-1))); + setDate(date.addDays(-1)); break; case Key_Plus: - setDate(TQT_TQDATE_OBJECT(date.addDays(1))); + setDate(date.addDays(1)); break; case Key_N: setDate(TQDate::currentDate()); @@ -447,7 +447,7 @@ KDateTable::setFontSize(int size) void KDateTable::wheelEvent ( TQWheelEvent * e ) { - setDate(TQT_TQDATE_OBJECT(date.addMonths( -(int)(e->delta()/120)) )); + setDate(date.addMonths( -(int)(e->delta()/120)) ); e->accept(); } @@ -497,7 +497,7 @@ KDateTable::contentsMousePressEvent(TQMouseEvent *e) emit tableClicked(); - if ( e->button() == Qt::RightButton && d->popupMenuEnabled ) + if ( e->button() == TQt::RightButton && d->popupMenuEnabled ) { TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) ); @@ -609,7 +609,7 @@ void KDateTable::unsetCustomDatePainting( const TQDate &date ) KDateInternalWeekSelector::KDateInternalWeekSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; @@ -618,7 +618,7 @@ KDateInternalWeekSelector::KDateInternalWeekSelector setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(weekEnteredSlot())); } void @@ -756,7 +756,7 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) void KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) { - if(!isEnabled() || e->button() != Qt::LeftButton) + if(!isEnabled() || e->button() != TQt::LeftButton) { KNotifyClient::beep(); return; @@ -783,7 +783,7 @@ KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) void KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) { - if (e->state() & Qt::LeftButton) + if (e->state() & TQt::LeftButton) { int row, col; TQPoint mouseCoord; @@ -850,7 +850,7 @@ KDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) KDateInternalYearSelector::KDateInternalYearSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; @@ -861,7 +861,7 @@ KDateInternalYearSelector::KDateInternalYearSelector // we have to respect the limits of TQDate here, I fear: val->setRange(0, 8000); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(yearEnteredSlot())); } void @@ -1008,7 +1008,7 @@ TDEPopupFrame::exec(TQPoint pos) popup(pos); repaint(); d->exec = true; - const TQGuardedPtr<TQObject> that = TQT_TQOBJECT(this); + const TQGuardedPtr<TQObject> that = this; tqApp->enter_loop(); if ( !that ) return TQDialog::Rejected; diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h index 4bc1444ca..2b3b3b93f 100644 --- a/tdeui/kdatetbl.h +++ b/tdeui/kdatetbl.h @@ -39,7 +39,7 @@ class TDEPopupMenu; */ class TDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit { - Q_OBJECT + TQ_OBJECT protected: TQIntValidator *val; int result; @@ -66,7 +66,7 @@ private: */ class TDEUI_EXPORT KDateInternalMonthPicker : public TQGridView { - Q_OBJECT + TQ_OBJECT protected: /** * Store the month that has been clicked [1..12]. @@ -139,7 +139,7 @@ private: */ class TDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit { - Q_OBJECT + TQ_OBJECT protected: TQIntValidator *val; int result; @@ -165,7 +165,7 @@ private: */ class TDEUI_EXPORT TDEPopupFrame : public TQFrame { - Q_OBJECT + TQ_OBJECT protected: /** * The result. It is returned from exec() when the popup window closes. @@ -186,7 +186,7 @@ public slots: */ void close(int r); /** - * Hides the widget. Reimplemented from QWidget + * Hides the widget. Reimplemented from TQWidget */ void hide(); @@ -262,7 +262,7 @@ public: */ class TDEUI_EXPORT KDateTable : public TQGridView { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQDate date READ getDate WRITE setDate ) TQ_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled ) diff --git a/tdeui/kdatetimewidget.cpp b/tdeui/kdatetimewidget.cpp index d7b677af9..1aa9332be 100644 --- a/tdeui/kdatetimewidget.cpp +++ b/tdeui/kdatetimewidget.cpp @@ -44,16 +44,16 @@ void KDateTimeWidget::init() d->dateWidget = new KDateWidget(this); d->timeWidget = new KTimeWidget(this); - connect(d->dateWidget, TQT_SIGNAL(changed(TQDate)), - TQT_SLOT(slotValueChanged())); - connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)), - TQT_SLOT(slotValueChanged())); + connect(d->dateWidget, TQ_SIGNAL(changed(TQDate)), + TQ_SLOT(slotValueChanged())); + connect(d->timeWidget, TQ_SIGNAL(valueChanged(const TQTime &)), + TQ_SLOT(slotValueChanged())); } void KDateTimeWidget::setDateTime(const TQDateTime & datetime) { - d->dateWidget->setDate(TQT_TQDATE_OBJECT(datetime.date())); - d->timeWidget->setTime(TQT_TQTIME_OBJECT(datetime.time())); + d->dateWidget->setDate(datetime.date()); + d->timeWidget->setTime(datetime.time()); } TQDateTime KDateTimeWidget::dateTime() const diff --git a/tdeui/kdatetimewidget.h b/tdeui/kdatetimewidget.h index 26c3cf670..d2b0b4e31 100644 --- a/tdeui/kdatetimewidget.h +++ b/tdeui/kdatetimewidget.h @@ -39,7 +39,7 @@ */ class TDEUI_EXPORT KDateTimeWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime ) public: diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp index 2fc9dda0a..8a7206d4a 100644 --- a/tdeui/kdatewidget.cpp +++ b/tdeui/kdatewidget.cpp @@ -88,9 +88,9 @@ void KDateWidget::init() d->m_year = new KDateWidgetSpinBox(locale->calendar()->minValidYear(), locale->calendar()->maxValidYear(), this); - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); + connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); } void KDateWidget::init(const TQDate& date) @@ -112,9 +112,9 @@ void KDateWidget::init(const TQDate& date) d->m_year = new KDateWidgetSpinBox(locale->calendar()->minValidYear(), locale->calendar()->maxValidYear(), this); - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); + connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); } KDateWidget::~KDateWidget() diff --git a/tdeui/kdatewidget.h b/tdeui/kdatewidget.h index c89b382c1..3f68dc0da 100644 --- a/tdeui/kdatewidget.h +++ b/tdeui/kdatewidget.h @@ -35,7 +35,7 @@ */ class TDEUI_EXPORT KDateWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQDate date READ date WRITE setDate ) public: diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp index d0e7a84cf..5a90b5af9 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp @@ -32,8 +32,8 @@ KDETrayProxy::KDETrayProxy() : selection( makeSelectionAtom()) { - connect( &selection, TQT_SIGNAL( newOwner( Window )), TQT_SLOT( newOwner( Window ))); - connect( &module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId ))); + connect( &selection, TQ_SIGNAL( newOwner( Window )), TQ_SLOT( newOwner( Window ))); + connect( &module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId ))); selection.owner(); for( TQValueList< WId >::ConstIterator it = module.windows().begin(); it != module.windows().end(); @@ -143,7 +143,7 @@ void KDETrayProxy::dockWindow( Window w, Window owner ) ev.xclient.window = owner; ev.xclient.message_type = atom; ev.xclient.format = 32; - ev.xclient.data.l[ 0 ] = GET_QT_X_TIME(); + ev.xclient.data.l[ 0 ] = get_tqt_x_time(); ev.xclient.data.l[ 1 ] = 0; // SYSTEM_TRAY_REQUEST_DOCK ev.xclient.data.l[ 2 ] = w; ev.xclient.data.l[ 3 ] = 0; // unused diff --git a/tdeui/kdetrayproxy/kdetrayproxy.h b/tdeui/kdetrayproxy/kdetrayproxy.h index 9331aad5c..2231be9ab 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.h +++ b/tdeui/kdetrayproxy/kdetrayproxy.h @@ -28,7 +28,7 @@ class KDETrayProxy : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KDETrayProxy(); public slots: diff --git a/tdeui/kdetrayproxy/module.h b/tdeui/kdetrayproxy/module.h index 67ed1a29d..5ce759eb4 100644 --- a/tdeui/kdetrayproxy/module.h +++ b/tdeui/kdetrayproxy/module.h @@ -28,7 +28,7 @@ class KDETrayModule : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: KDETrayModule( const TQCString& obj ); diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 72925525c..68471847d 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -41,7 +41,7 @@ #include <tqpushbutton.h> #include "config.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <netwm.h> #endif @@ -130,7 +130,7 @@ void KDialog::setPlainCaption( const TQString &caption ) { TQDialog::setCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 ); info.setName( caption.utf8().data() ); #endif @@ -141,7 +141,7 @@ void KDialog::resizeLayout( TQWidget *w, int margin, int spacing ) { if( w->layout() ) { - resizeLayout( TQT_TQLAYOUTITEM(w->layout()), margin, spacing ); + resizeLayout( w->layout(), margin, spacing ); } if( !w->childrenListObject().isEmpty() ) @@ -295,7 +295,7 @@ void KDialogQueue::queueDialog(TQDialog *dialog) { KDialogQueue *_this = self(); _this->d->queue.append(dialog); - TQTimer::singleShot(0, _this, TQT_SLOT(slotShowQueuedDialog())); + TQTimer::singleShot(0, _this, TQ_SLOT(slotShowQueuedDialog())); } void KDialogQueue::slotShowQueuedDialog() @@ -317,7 +317,7 @@ void KDialogQueue::slotShowQueuedDialog() delete dialog; if (!d->queue.isEmpty()) - TQTimer::singleShot(20, this, TQT_SLOT(slotShowQueuedDialog())); + TQTimer::singleShot(20, this, TQ_SLOT(slotShowQueuedDialog())); else ksdkdq.destructObject(); // Suicide. } @@ -326,7 +326,7 @@ void KDialog::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) - : TQWidget( parent, "", Qt::WDestructiveClose ) + : TQWidget( parent, "", TQt::WDestructiveClose ) { TQVBoxLayout* vbox = new TQVBoxLayout( this ); @@ -375,7 +375,7 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) TQWidget* swidget = new TQWidget( frame ); swidget->resize(2, frame->sizeHint().width()); - swidget->setBackgroundColor(Qt::black); + swidget->setBackgroundColor(TQt::black); seperatorbox->addWidget( swidget, AlignCenter ); TQLabel* label = new TQLabel( i18n("Trinity Desktop Environment"), frame ); @@ -396,7 +396,7 @@ KSMModalDialogHeader::~KSMModalDialogHeader() } KSMModalDialog::KSMModalDialog(TQWidget* parent) - : TQWidget( 0, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WType_Dialog | Qt::WStyle_Title | Qt::WStyle_StaysOnTop | Qt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false) + : TQWidget( 0, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WType_Dialog | TQt::WStyle_Title | TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false) { // Signal that we do not want any window controls to be shown at all @@ -461,7 +461,7 @@ void KSMModalDialog::keepMeOnTop() { if (!m_keepOnTopTimer) { m_keepOnTopTimer = new TQTimer(); - connect(m_keepOnTopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(keepMeOnTop())); + connect(m_keepOnTopTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(keepMeOnTop())); m_keepOnTopTimer->start(100, FALSE); } setActiveWindow(); diff --git a/tdeui/kdialog.h b/tdeui/kdialog.h index ad48693fe..1e19ca365 100644 --- a/tdeui/kdialog.h +++ b/tdeui/kdialog.h @@ -51,7 +51,7 @@ class TQLayoutItem; */ class TDEUI_EXPORT KDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: @@ -188,7 +188,7 @@ class TDEUI_EXPORT KDialog : public TQDialog class KDialogQueuePrivate; class TDEUI_EXPORT KDialogQueue : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -217,7 +217,7 @@ protected: */ class TDEUI_EXPORT KSMModalDialogHeader : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KSMModalDialogHeader( TQWidget* parent ); @@ -240,7 +240,7 @@ class TQFrame; class TQGridLayout; class TDEUI_EXPORT KSMModalDialog : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KSMModalDialog( TQWidget* parent ); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 1f7fbd5e3..d1cec7389 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -104,12 +104,12 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal, :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); enableButtonSeparator( separator ); makeButtonBox( buttonMask, defaultButton, user1, user2, user3 ); @@ -126,16 +126,16 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption, :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); mJanus = new KJanusWidget( this, "janus", dialogFace ); - connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)), - this, TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mJanus, TQ_SIGNAL(aboutToShowPage(TQWidget *)), + this, TQ_SIGNAL(aboutToShowPage(TQWidget *))); if( !mJanus || !mJanus->isValid() ) { return; } @@ -155,16 +155,16 @@ KDialogBase::KDialogBase( KDialogBase::DialogType dialogFace, WFlags f, TQWidge :KDialog( parent, name, modal, f ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); mJanus = new KJanusWidget( this, "janus", dialogFace ); - connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)), - this, TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mJanus, TQ_SIGNAL(aboutToShowPage(TQWidget *)), + this, TQ_SIGNAL(aboutToShowPage(TQWidget *))); if( !mJanus || !mJanus->isValid() ) { return; } @@ -183,13 +183,13 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask, :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(true), - mButtonOrientation(Qt::Horizontal),mEscapeButton(escapeButton), + mButtonOrientation(TQt::Horizontal),mEscapeButton(escapeButton), d(new KDialogBasePrivate) { setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); enableButtonSeparator( separator ); @@ -235,7 +235,7 @@ void SButton::resize( bool sameWidth, int margin, if( s.width() > w ) { w = s.width(); } } - if( orientation == Qt::Horizontal ) + if( orientation == TQt::Horizontal ) { for( p = list.first(); p; p = list.next() ) { @@ -281,7 +281,7 @@ KDialogBase::delayedDestruct() { if (isVisible()) hide(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotDelayedDestruct())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotDelayedDestruct())); } void @@ -299,7 +299,7 @@ void KDialogBase::setupLayout() // mTopLayout = new TQVBoxLayout( this, marginHint(), spacingHint() ); - if( mButtonOrientation == Qt::Horizontal ) + if( mButtonOrientation == TQt::Horizontal ) { mTopLayout = new TQBoxLayout( this, TQBoxLayout::TopToBottom, marginHint(), spacingHint() ); @@ -349,10 +349,10 @@ void KDialogBase::setButtonBoxOrientation( int orientation ) mButtonOrientation = orientation; if( mActionSep ) { - mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? + mActionSep->setOrientation( mButtonOrientation == TQt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); } - if( mButtonOrientation == Qt::Vertical ) + if( mButtonOrientation == TQt::Vertical ) { enableLinkedHelp(false); // 2000-06-18 Espen: No support for this yet. } @@ -373,15 +373,15 @@ void KDialogBase::makeRelay() { if( mTile ) { - connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); + connect( mTile, TQ_SIGNAL(pixmapChanged()), TQ_SLOT(updateBackground()) ); return; } mTile = new KDialogBaseTile; if( mTile ) { - connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); - connect( tqApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); + connect( mTile, TQ_SIGNAL(pixmapChanged()), TQ_SLOT(updateBackground()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), mTile, TQ_SLOT(cleanup()) ); } } @@ -395,8 +395,8 @@ void KDialogBase::enableButtonSeparator( bool state ) return; } mActionSep = new KSeparator( this ); - mActionSep->setFocusPolicy(TQ_NoFocus); - mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? + mActionSep->setFocusPolicy(TQWidget::NoFocus); + mActionSep->setOrientation( mButtonOrientation == TQt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); mActionSep->show(); } @@ -506,7 +506,7 @@ TQSize KDialogBase::minimumSizeHint() const if( d->mButton.box ) { s2 = d->mButton.box->minimumSize(); - if( mButtonOrientation == Qt::Horizontal ) + if( mButtonOrientation == TQt::Horizontal ) { s1.rwidth() = TQMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); @@ -576,35 +576,35 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, { KPushButton *pb = d->mButton.append( Help, KStdGuiItem::help() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) ); } if( d->mButton.mask & Default ) { KPushButton *pb = d->mButton.append( Default, KStdGuiItem::defaults() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefault()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefault()) ); } if( d->mButton.mask & Details ) { KPushButton *pb = d->mButton.append( Details, TQString() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails()) ); setDetails(false); } if( d->mButton.mask & User3 ) { KPushButton *pb = d->mButton.append( User3, user3 ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser3()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotUser3()) ); } if( d->mButton.mask & User2 ) { KPushButton *pb = d->mButton.append( User2, user2 ); if( mMessageBoxMode ) { - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotYes()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotYes()) ); } else { - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUser2()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUser2()) ); } } if( d->mButton.mask & User1 ) @@ -612,39 +612,39 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, KPushButton *pb = d->mButton.append( User1, user1 ); if( mMessageBoxMode ) { - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNo()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNo()) ); } else { - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser1()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotUser1()) ); } } if( d->mButton.mask & Ok ) { KPushButton *pb = d->mButton.append( Ok, KStdGuiItem::ok() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotOk()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotOk()) ); } if( d->mButton.mask & Apply ) { KPushButton *pb = d->mButton.append( Apply, KStdGuiItem::apply() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotApply()) ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(applyPressed()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotApply()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(applyPressed()) ); } if( d->mButton.mask & Try ) { KPushButton *pb = d->mButton.append( Try, i18n( "&Try" ) ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotTry()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotTry()) ); } if( d->mButton.mask & Cancel ) { KPushButton *pb = d->mButton.append( Cancel, KStdGuiItem::cancel() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancel()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancel()) ); } if( d->mButton.mask & Close ) { KPushButton *pb = d->mButton.append( Close, KStdGuiItem::close() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotClose()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotClose()) ); } if( defaultButton != NoDefault ) @@ -686,7 +686,7 @@ void KDialogBase::setButtonStyle( int style ) layoutMax = 6; layout = layoutRule[ d->mButton.style ]; } - else if (mButtonOrientation == Qt::Horizontal) + else if (mButtonOrientation == TQt::Horizontal) { static const unsigned int layoutRule[5][10] = { @@ -720,7 +720,7 @@ void KDialogBase::setButtonStyle( int style ) } TQBoxLayout *lay; - if( mButtonOrientation == Qt::Horizontal ) + if( mButtonOrientation == TQt::Horizontal ) { lay = new TQBoxLayout( d->mButton.box, TQBoxLayout::LeftToRight, 0, spacingHint()); @@ -1256,8 +1256,8 @@ void KDialogBase::enableLinkedHelp( bool state ) mUrlHelp->setBackgroundPixmap(*mTile->get()); } mUrlHelp->setMinimumHeight( fontMetrics().height() + marginHint() ); - connect(mUrlHelp,TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(helpClickedSlot(const TQString &))); + connect(mUrlHelp,TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(helpClickedSlot(const TQString &))); mUrlHelp->show(); } else diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index 1bc910fd6..25f4613ae 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -190,7 +190,7 @@ class KDialogBaseTile; */ class TDEUI_EXPORT KDialogBase : public KDialog { - Q_OBJECT + TQ_OBJECT public: @@ -575,9 +575,9 @@ class TDEUI_EXPORT KDialogBase : public KDialog * toplevel widget for this particular page. The widget contains a * TQGridLayout layout so the widget children are positioned in a grid. * - * @param n Specifies the number of columns if @p dir is Qt::Horizontal - * or the number of rows if @p dir is Qt::Vertical. - * @param dir Can be Qt::Horizontal or Qt::Vertical. + * @param n Specifies the number of columns if @p dir is TQt::Horizontal + * or the number of rows if @p dir is TQt::Vertical. + * @param dir Can be TQt::Horizontal or TQt::Vertical. * @param itemName String used in the list or as tab item name. * @param header Header text use in the list modes @p Ignored in @p Tabbed * mode. If empty, the item text is used instead. @@ -673,9 +673,9 @@ class TDEUI_EXPORT KDialogBase : public KDialog * constructor where you define the face (Plain, Swallow, Tabbed, * TreeList, IconList). * - * @param n Specifies the number of columns if 'dir' is Qt::Horizontal - * or the number of rows if 'dir' is Qt::Vertical. - * @param dir Can be Qt::Horizontal or Qt::Vertical. + * @param n Specifies the number of columns if 'dir' is TQt::Horizontal + * or the number of rows if 'dir' is TQt::Vertical. + * @param dir Can be TQt::Horizontal or TQt::Vertical. * * @return The main widget or 0 if any of the rules described above * were broken. diff --git a/tdeui/kdialogbase_priv.h b/tdeui/kdialogbase_priv.h index 84db3b84f..59cef2f25 100644 --- a/tdeui/kdialogbase_priv.h +++ b/tdeui/kdialogbase_priv.h @@ -30,7 +30,7 @@ */ class TDEUI_EXPORT KDialogBaseButton : public KPushButton { - Q_OBJECT + TQ_OBJECT public: KDialogBaseButton( const KGuiItem &text, int key, TQWidget *parent=0, @@ -47,7 +47,7 @@ class TDEUI_EXPORT KDialogBaseButton : public KPushButton */ class TDEUI_EXPORT KDialogBaseTile : public TQObject { - Q_OBJECT + TQ_OBJECT public: KDialogBaseTile( TQObject *parent=0, const char *name=0 ); diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index bf99c6801..8e8b924c2 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -43,7 +43,7 @@ #include <tdeglobalsettings.h> #include "config.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #endif @@ -122,7 +122,7 @@ void KDockMainWindow::setMainDockWidget( KDockWidget* mdw ) void KDockMainWindow::setView( TQWidget *view ) { if ( view->isA("KDockWidget") ){ - if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this ); + if ( view->parent() != this ) ((KDockWidget*)view)->applyToWidget( this ); } #ifndef NO_KDE2 @@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -219,7 +219,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #ifdef BORDERLESS_WINDOWS setCursor(TQCursor(ArrowCursor)); #endif - d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); + d = new KDockWidgetHeaderPrivate( this ); layout = new TQHBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); @@ -230,28 +230,28 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) TQToolTip::add( closeButton, i18n("Close") ); closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock())); stayButton = new KDockButton_Private( this, "DockStayButton" ); TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") ); stayButton->setToggleButton( true ); stayButton->setPixmap( const_cast< const char** >(not_close_xpm) ); stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked())); + connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked())); dockbackButton = new KDockButton_Private( this, "DockbackButton" ); TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack())); d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" ); TQToolTip::add( d->toDesktopButton, i18n("Detach") ); d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); + connect( d->toDesktopButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop())); stayButton->hide(); d->dummy = new TQWidget( this ); @@ -498,7 +498,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( TQT_TQOBJECT(this) ); + manager->childDock->append( this ); installEventFilter( manager ); eDocking = DockFullDocking; @@ -522,7 +522,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP setIcon( pixmap); widget = 0L; - TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); + TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) ); applyToWidget( parent, TQPoint(0,0) ); } @@ -535,7 +535,7 @@ void KDockWidget::setPixmap(const TQPixmap& pixmap) { dtg->changeTab(this,pixmap,dtg->tabLabel(this)); TQWidget *contWid=parentDockContainer(); if (contWid) { - KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(contWid); + KDockContainer *x = dynamic_cast<KDockContainer*>(contWid); if (x) { x->setPixmap(this,pixmap); } @@ -556,14 +556,14 @@ KDockWidget::~KDockWidget() } if (latestKDockContainer()) { - KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(latestKDockContainer()); + KDockContainer *x = dynamic_cast<KDockContainer*>(latestKDockContainer()); if (x) { x->removeWidget(this); } } emit iMBeingClosed(); - if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this)); - manager->childDock->remove(TQT_TQOBJECT(this)); + if (manager->d) manager->d->containerDocks.remove(this); + manager->childDock->remove(this); delete pix; delete d; // destroy private data d=0; @@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe) TQWidget::paintEvent(pe); TQPainter paint; paint.begin( this ); - style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -719,7 +719,7 @@ void KDockWidget::setLatestKDockContainer(TQWidget* container) { if (container) { - if (tqt_dynamic_cast<KDockContainer*>(container)) + if (dynamic_cast<KDockContainer*>(container)) d->container=container; else d->container=0; @@ -729,7 +729,7 @@ void KDockWidget::setLatestKDockContainer(TQWidget* container) TQWidget* KDockWidget::latestKDockContainer() { if (!(d->container)) return 0; - if (tqt_dynamic_cast<KDockContainer*>(d->container.operator->())) return d->container; + if (dynamic_cast<KDockContainer*>(d->container.operator->())) return d->container; return 0; } @@ -778,11 +778,11 @@ void KDockWidget::updateHeader() setCursor(TQCursor(ArrowCursor)); #endif - if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){ + if ( (parent() == manager->main) || isGroup || (eDocking == KDockWidget::DockNone) ){ header->hide(); } else { header->setTopLevel( false ); - if (widget && tqt_dynamic_cast<KDockContainer*>(widget)) + if (widget && dynamic_cast<KDockContainer*>(widget)) header->hide(); else header->show(); @@ -799,7 +799,7 @@ void KDockWidget::updateHeader() void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) { - if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) ) + if ( parent() != s ) { hide(); reparent(s, 0, TQPoint(0,0), false); @@ -818,7 +818,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) move(p); #ifndef NO_KDE2 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (d->transient && d->_parent) XSetTransientForHint( tqt_xdisplay(), winId(), d->_parent->winId() ); @@ -828,7 +828,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) #else KWin::setType( winId(), d->windowType ); #endif // BORDERLESS_WINDOW -#endif // Q_WS_X11 +#endif // TQ_WS_X11 #endif } @@ -921,7 +921,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) { if (!parent()) return 0; if (!parent()->inherits("KDockSplitter")) return 0; - Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? Qt::Vertical:Qt::Horizontal; + Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? TQt::Vertical:TQt::Horizontal; if (((KDockSplitter*)(parent()))->orientation()==orientation) { KDockWidget *neighbor= @@ -930,15 +930,15 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast()); if (neighbor==this) - return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos)); else - if (neighbor->getWidget() && (::tqqt_cast<KDockTabGroup*>(neighbor->getWidget()))) + if (neighbor->getWidget() && (::tqt_cast<KDockTabGroup*>(neighbor->getWidget()))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); else return neighbor; } else - return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos)); return 0; } @@ -999,7 +999,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, * dock tab group, and our parent isn't a KDockContainer, and we have no explicit * parent dock container...we can't do much yet */ if ( parent() && !parent()->inherits("KDockSplitter") && !parentDockTabGroup() && - !(tqt_dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){ + !(dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){ // kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl; // kdDebug(282)<<parent()->name()<<endl; success = false; @@ -1064,11 +1064,11 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if (!contWid) contWid=target->widget; if (contWid) { - KDockContainer *cont=tqt_dynamic_cast<KDockContainer*>(contWid); + KDockContainer *cont=dynamic_cast<KDockContainer*>(contWid); if (cont) { if (latestKDockContainer() && (latestKDockContainer()!=contWid)) { - KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(latestKDockContainer()); + KDockContainer* dc = dynamic_cast<KDockContainer*>(latestKDockContainer()); if (dc) { dc->removeWidget(this); } @@ -1124,7 +1124,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if ( dockPos == KDockWidget::DockCenter ) { KDockTabGroup* tab = new KDockTabGroup( newDock, "_dock_tab"); - TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*))); + TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*))); newDock->setWidget( tab ); target->applyToWidget( tab ); @@ -1161,13 +1161,13 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, // if to dock not to the center of the target dockwidget, // dock to newDock KDockSplitter* panner = 0L; - if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Horizontal, spliPos ); - if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Vertical , spliPos ); + if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", TQt::Horizontal, spliPos ); + if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", TQt::Vertical , spliPos ); newDock->setWidget( panner ); panner->setOpaqueResize(manager->splitterOpaqueResize()); panner->setKeepSize(manager->splitterKeepSize()); - panner->setFocusPolicy( TQ_NoFocus ); + panner->setFocusPolicy( TQWidget::NoFocus ); target->applyToWidget( panner ); applyToWidget( panner ); target->formerDockPos = target->currentDockPos; @@ -1227,7 +1227,7 @@ TQWidget *KDockWidget::parentDockContainer() const { if (!parent()) return 0L; TQWidget* candidate = parentWidget()->parentWidget(); - if (candidate && tqt_dynamic_cast<KDockContainer*>(candidate)) return candidate; + if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate; return 0L; } @@ -1238,7 +1238,7 @@ void KDockWidget::setForcedFixedWidth(int w) setFixedWidth(w); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - ::tqqt_cast<KDockSplitter*>(parent())->setForcedFixedWidth(this,w); + ::tqt_cast<KDockSplitter*>(parent())->setForcedFixedWidth(this,w); } void KDockWidget::setForcedFixedHeight(int h) @@ -1247,7 +1247,7 @@ void KDockWidget::setForcedFixedHeight(int h) setFixedHeight(h); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - ::tqqt_cast<KDockSplitter*>(parent())->setForcedFixedHeight(this,h); + ::tqt_cast<KDockSplitter*>(parent())->setForcedFixedHeight(this,h); } int KDockWidget::forcedFixedWidth() @@ -1270,7 +1270,7 @@ void KDockWidget::restoreFromForcedFixedSize() setMaximumHeight(32000); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - ::tqqt_cast<KDockSplitter*>(parent())->restoreFromForcedFixedSize(this); + ::tqt_cast<KDockSplitter*>(parent())->restoreFromForcedFixedSize(this); } void KDockWidget::toDesktop() @@ -1347,13 +1347,13 @@ void KDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation == TQt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation == TQt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); @@ -1382,7 +1382,7 @@ void KDockWidget::undock() { // kdDebug(282)<<"undocked from dockcontainer"<<endl; undockedFromContainer=true; - KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(d->container.operator->()); + KDockContainer* dc = dynamic_cast<KDockContainer*>(d->container.operator->()); if (dc) { dc->undockWidget(this); setFormerBrotherDockWidget(dc->parentDockWidget()); @@ -1449,7 +1449,7 @@ void KDockWidget::setWidget( TQWidget* mw ) { if ( !mw ) return; - if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){ + if ( mw->parent() != this ){ mw->reparent(this, 0, TQPoint(0,0), false); } @@ -1462,11 +1462,11 @@ void KDockWidget::setWidget( TQWidget* mw ) layout = new TQVBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); - KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(widget); + KDockContainer* dc = dynamic_cast<KDockContainer*>(widget); if (dc) { d->isContainer=true; - manager->d->containerDocks.append(TQT_TQOBJECT(this)); + manager->d->containerDocks.append(this); } else { @@ -1505,13 +1505,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) bool KDockWidget::mayBeHide() const { - bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (parent() != manager->main); return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)KDockWidget::DockNone ) ); } bool KDockWidget::mayBeShow() const { - bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (parent() != manager->main); return ( !isGroup && !isTabGroup && f && !isVisible() ); } @@ -1538,7 +1538,7 @@ void KDockWidget::makeDockVisible() } if (parentDockContainer()) { TQWidget *contWid=parentDockContainer(); - KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(contWid); + KDockContainer *x = dynamic_cast<KDockContainer*>(contWid); if (x) { x->showWidget(this); } @@ -1560,15 +1560,15 @@ void KDockWidget::setFormerBrotherDockWidget(KDockWidget *dockWidget) { formerBrotherDockWidget = dockWidget; if( formerBrotherDockWidget ) - TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); } void KDockWidget::loseFormerBrotherDockWidget() { if( formerBrotherDockWidget ) - TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; repaint(); } @@ -1658,8 +1658,8 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) menu = new TQPopupMenu(); #endif - connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) ); - connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) ); + connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) ); + connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) ); childDock = new TQObjectList(); childDock->setAutoDelete( false ); @@ -1699,7 +1699,7 @@ void KDockManager::activate() obj->show(); } } - if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show(); + if ( !main->inherits("TQDialog") ) main->show(); } bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) @@ -1719,7 +1719,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; case TQEvent::MouseButtonPress: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( curdw->eDocking != (int)KDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); @@ -1744,7 +1744,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) } break; case TQEvent::MouseButtonRelease: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( dragging ){ if ( !dropCancel ) drop(); @@ -1822,7 +1822,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; } - if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) && + if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) && (curdw->eDocking != (int)KDockWidget::DockNone) ) { startDrag( curdw); } @@ -1860,9 +1860,9 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; - if (tqt_dynamic_cast<KDockContainer*>(w)) return 0L; + if ( tqt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L; + if (dynamic_cast<KDockContainer*>(w)) return 0L; if (!childDockWidgetList) return 0L; if ( childDockWidgetList->find(w) != -1 ) return 0L; @@ -1957,7 +1957,7 @@ void KDockManager::startDrag( KDockWidget* w ) curPos = KDockWidget::DockDesktop; dragging = true; - TQApplication::setOverrideCursor(TQCursor(tqsizeAllCursor)); + TQApplication::setOverrideCursor(TQCursor(TQt::sizeAllCursor)); } void KDockManager::dragMove( KDockWidget* dw, TQPoint pos ) @@ -2213,7 +2213,7 @@ void KDockManager::writeConfig(TQDomElement &base) TQObjectListIt it(*childDock); KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { - if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) + if ( obj1->parent() == main ) mainWidgetStr = TQString::fromLatin1(obj1->name()); nList.append(obj1->name()); ++it; @@ -2221,7 +2221,7 @@ void KDockManager::writeConfig(TQDomElement &base) for (TQObjectListIt it(d->containerDocks);it.current();++it) { - KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); + KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); if (dc) { dc->prepareSave(nList); } @@ -2241,7 +2241,7 @@ void KDockManager::writeConfig(TQDomElement &base) TQDomElement groupEl; if (obj->d->isContainer) { - KDockContainer* x = tqt_dynamic_cast<KDockContainer*>(obj->widget); + KDockContainer* x = dynamic_cast<KDockContainer*>(obj->widget); if (x) { groupEl=doc.createElement("dockContainer"); x->save(groupEl); @@ -2379,7 +2379,7 @@ void KDockManager::readConfig(TQDomElement &base) if (!(cont->d->isContainer)) { kdDebug(282)<<"restoration of dockContainer is only supported for already existing dock containers"<<endl; } else { - KDockContainer *dc=tqt_dynamic_cast<KDockContainer*>(cont->getWidget()); + KDockContainer *dc=dynamic_cast<KDockContainer*>(cont->getWidget()); if (!dc) kdDebug(282)<<"Error while trying to handle dockcontainer configuration restoration"<<endl; else { dc->load(childEl); @@ -2401,7 +2401,7 @@ void KDockManager::readConfig(TQDomElement &base) KDockWidget *second = getDockWidgetFromName(secondName); if (first && second) { obj = first->manualDock(second, - (orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, + (orientation == (int)TQt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, separatorPos); if (obj) obj->setName(name.latin1()); @@ -2512,7 +2512,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget) { if (!autoCreateDock) return; autoCreateDock->setAutoDelete(false); - autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget)); + autoCreateDock->removeRef(pDockWidget); autoCreateDock->setAutoDelete(true); } @@ -2548,14 +2548,14 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group ) ++it; //debug(" +Add subdock %s", obj->name()); nList.append( obj->name() ); - if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) ) + if ( obj->parent() == main ) c->writeEntry( "Main:view", obj->name() ); } // kdDebug(282)<<TQString("list size: %1").arg(nList.count())<<endl; for (TQObjectListIt it(d->containerDocks);it.current();++it) { - KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); + KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget); if (dc) { dc->prepareSave(nList); } @@ -2571,7 +2571,7 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group ) obj->header->saveConfig( c ); } if (obj->d->isContainer) { - KDockContainer* x = tqt_dynamic_cast<KDockContainer*>(obj->widget); + KDockContainer* x = dynamic_cast<KDockContainer*>(obj->widget); if (x) { x->save(c,group); } @@ -2734,7 +2734,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group ) } if (obj && obj->d->isContainer) { - tqt_dynamic_cast<KDockContainer*>(obj->widget)->load(c,group); + dynamic_cast<KDockContainer*>(obj->widget)->load(c,group); removeFromAutoCreateList(obj); } if ( obj && obj->header){ @@ -2758,7 +2758,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group ) Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" ); if ( first && last ){ - obj = first->manualDock( last, ( p == Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); + obj = first->manualDock( last, ( p == TQt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); if (obj){ obj->setName( oname.latin1() ); } @@ -2774,7 +2774,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group ) KDockWidget* d2 = getDockWidgetFromName( list.current() ); tabDockGroup = d2->manualDock( d1, KDockWidget::DockCenter ); if ( tabDockGroup ){ - KDockTabGroup* tab = tqt_dynamic_cast<KDockTabGroup*>(tabDockGroup->widget); + KDockTabGroup* tab = dynamic_cast<KDockTabGroup*>(tabDockGroup->widget); list.next(); while ( list.current() && tabDockGroup ){ KDockWidget* tabDock = getDockWidgetFromName( list.current() ); @@ -2791,7 +2791,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group ) obj = tabDockGroup; } - if (obj && obj->d->isContainer) tqt_dynamic_cast<KDockContainer*>(obj->widget)->load(c,group); + if (obj && obj->d->isContainer) dynamic_cast<KDockContainer*>(obj->widget)->load(c,group); if ( obj && obj->header){ obj->header->loadConfig( c ); } @@ -2890,7 +2890,7 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName ) if ( autoCreateDock ){ kdDebug(282)<<"Autocreating dock: "<<dockName<<endl; autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) ); - autoCreateDock->append( TQT_TQOBJECT(autoCreate) ); + autoCreateDock->append( autoCreate ); } return autoCreate; } @@ -3105,7 +3105,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) #ifndef NO_KDE2 // kdDebug(282)<<"KDockArea::resize"<<endl; #endif - TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false); + TQObjectList *list=queryList("TQWidget",0,false); TQObjectListIt it( *list ); // iterate over the buttons TQObject *obj; @@ -3123,7 +3123,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) // TQPtrList<TQObject> list(children()); // TQObject *obj=((TQPtrList<TQObject*>)children())->at(i); TQObject *obj=children()->getFirst(); - if (split = tqt_dynamic_cast<KDockSplitter*>(obj)) + if (split = dynamic_cast<KDockSplitter*>(obj)) { split->setGeometry( TQRect(TQPoint(0,0), size() )); // break; @@ -3179,7 +3179,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) { m_overlapMode=true; if (parentDockWidget() && parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl; - KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()-> + KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()-> parent()); if (sp) sp->resizeEvent(0); @@ -3191,7 +3191,7 @@ void KDockContainer::deactivateOverlapMode() { m_overlapMode=false; if (parentDockWidget() && parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl; - KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()-> + KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()-> parent()); if (sp) sp->resizeEvent(0); @@ -3280,7 +3280,7 @@ void KDockContainer::prepareSave(TQStringList &names) TQWidget *KDockTabGroup::transientTo() { TQWidget *tT=0; for (int i=0;i<count();i++) { - KDockWidget *dw=::tqqt_cast<KDockWidget*>(page(i)); + KDockWidget *dw=::tqt_cast<KDockWidget*>(page(i)); TQWidget *tmp; if ((tmp=dw->transientTo())) { if (!tT) tT=tmp; diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h index e6c9bae1a..6c6d48d92 100644 --- a/tdeui/kdockwidget.h +++ b/tdeui/kdockwidget.h @@ -37,7 +37,7 @@ - KDockWidget - IMPORTANT CLASS: the one and only dockwidget class - KDockManager - helper class - KDockMainWindow - IMPORTANT CLASS: a special TDEMainWindow that can have dockwidgets - - KDockArea - like KDockMainWindow but inherits just QWidget + - KDockArea - like KDockMainWindow but inherits just TQWidget IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition! */ @@ -102,7 +102,7 @@ namespace KMDI */ class TDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -152,7 +152,7 @@ private: */ class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -198,7 +198,7 @@ private: */ class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag { - Q_OBJECT + TQ_OBJECT public: @@ -240,7 +240,7 @@ private: */ class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader { - Q_OBJECT + TQ_OBJECT public: @@ -366,7 +366,7 @@ private: */ class TDEUI_EXPORT KDockTabGroup : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -427,7 +427,7 @@ private: */ class TDEUI_EXPORT KDockWidget: public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KDockManager; friend class KDockSplitter; @@ -448,7 +448,7 @@ public: * @param parent Parent widget * @param strCaption Title of the dockwidget window (shown when toplevel) * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption - * @param f Qt::WidgetFlags widget flags + * @param f TQt::WidgetFlags widget flags */ KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null, @@ -914,7 +914,7 @@ private: */ class TDEUI_EXPORT KDockManager: public TQObject { - Q_OBJECT + TQ_OBJECT friend class KDockWidget; friend class KDockMainWindow; @@ -1313,7 +1313,7 @@ private: */ class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KDockManager; @@ -1330,7 +1330,7 @@ public: * * @param parent Parent widget for the dock main widget * @param name internal object name - * @param f Qt::WidgetFlags widget flags + * @param f TQt::WidgetFlags widget flags */ #ifdef qdoc KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); @@ -1484,7 +1484,7 @@ private: class TDEUI_EXPORT KDockArea : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KDockManager; diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp index a067efe2a..13e5a7ea6 100644 --- a/tdeui/kdockwidget_private.cpp +++ b/tdeui/kdockwidget_private.cpp @@ -61,10 +61,10 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->setLineWidth(1); divider->raise(); - if (m_orientation == Qt::Horizontal) - divider->setCursor(TQCursor(tqsizeVerCursor)); + if (m_orientation == TQt::Horizontal) + divider->setCursor(TQCursor(TQt::sizeVerCursor)); else - divider->setCursor(TQCursor(tqsizeHorCursor)); + divider->setCursor(TQCursor(TQt::sizeHorCursor)); divider->installEventFilter(this); initialised= true; @@ -173,7 +173,7 @@ void KDockSplitter::setupMinMaxSize() { // Set the minimum and maximum sizes for the KDockSplitter (this) int minx, maxx, miny, maxy; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { miny = child0->minimumHeight() + child1->minimumHeight() + 4; maxy = child0->maximumHeight() + child1->maximumHeight() + 4; minx = (child0->minimumWidth() > child1->minimumWidth()) ? child0->minimumWidth() : child1->minimumWidth(); @@ -266,15 +266,15 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // if (ev && isVisible() && divider->isVisible()) { // real resize event. -// kdDebug(282)<<"mKeepSize : "<< ((m_orientation == Qt::Horizontal) ? "Horizontal":"Vertical") <<endl; +// kdDebug(282)<<"mKeepSize : "<< ((m_orientation == TQt::Horizontal) ? "Horizontal":"Vertical") <<endl; if (mKeepSize) { // keep the splitter on a fixed position. This may be a bit inaccurate, because // xpos saves a proportional value, which means there might occur rounding errors. // However, this works surprising well! - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if (ev->oldSize().height() != ev->size().height()) { - if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { + if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { // dockwidget is on the bottom. move xpos so that the size from child1 stays xpos = (int)ceil(((double)factor) * checkValue(height() - child1->height() - 4) / height()); } else { @@ -286,7 +286,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } } else { if (ev->oldSize().width() != width()) { - if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { + if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { xpos = (int)ceil(((double)factor) * checkValue(width() - child1->width() - 4) / width()); } else { // xpos should not change @@ -307,7 +307,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // values. // if ( isVisible()) { - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if (fixedHeight0!=-1) xpos = checkValue(fixedHeight0) * factor / height(); else if (fixedHeight1!=-1) @@ -327,16 +327,16 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) /* // --- debugging information --- kdDebug(282) << "isVisible() is : " << isVisible() << endl; - kdDebug(282) << "Orientation : " << (m_orientation==Qt::Horizontal?"Horizontal":"Vertical") + kdDebug(282) << "Orientation : " << (m_orientation==TQt::Horizontal?"Horizontal":"Vertical") << endl; kdDebug(282) << "Splitter visibility : " << divider->isVisible() << endl;; kdDebug(282) << "Splitter procentual pos: " << xpos << endl; if (c0->getWidget()) { - dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget()); + dc=dynamic_cast<KDockContainer*>(c0->getWidget()); kdDebug(282) << "Child 0 KDockContainer?: " << dc << endl; } if (c1->getWidget()) { - dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()); + dc=dynamic_cast<KDockContainer*>(c1->getWidget()); kdDebug(282) << "Child 1 KDockContainer?: " << dc << endl; } kdDebug(282) << "Child0 : " << child0 << endl; @@ -346,16 +346,16 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // // handle overlapped widgets only. // - if( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || - ( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { - if ((c0->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget())) + if( ( (m_orientation==TQt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || + ( (m_orientation==TQt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { + if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget())) && (dc->isOverlapMode())) { // child0 ist a KDockContainer int position; child0->show(); child0->raise(); divider->raise(); - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { position = checkValueOverlapped( height() * xpos / factor, child0 ); child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, dc->m_nonOverlapSize, width(), height()-dc->m_nonOverlapSize); @@ -367,14 +367,14 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) divider->setGeometry(position, 0, 4, height()); } } else { - if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget())) + if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget())) && (dc->isOverlapMode())) { // child1 ist a KDockContainer int position; child1->show(); child1->raise(); divider->raise(); - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { position = checkValueOverlapped( height() * xpos / factor, child1 ); child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize); child1->setGeometry(0, position+4, width(), height()-position-4); @@ -399,11 +399,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // the child0 and child1 adjoin. // if (stdHandling) { - int position = checkValue( (m_orientation == Qt::Vertical ? width() : height()) * xpos / factor ); + int position = checkValue( (m_orientation == TQt::Vertical ? width() : height()) * xpos / factor ); int diff = 0; - if (m_orientation == Qt::Horizontal) { - if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { + if (m_orientation == TQt::Horizontal) { + if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { // bottom is dockcontainer if( divider->isVisible() ) { child0->setGeometry(0, 0, width(), position); @@ -419,7 +419,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } divider->setGeometry(0, position, width(), 4); } else { - if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) { + if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { // right is dockcontainer if( divider->isVisible() ) { child0->setGeometry(0, 0, position, height()); @@ -442,7 +442,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const { if (initialised) { - if (m_orientation == Qt::Vertical) { + if (m_orientation == TQt::Vertical) { if (child0==overlappingWidget) { if (position < child0->minimumWidth() || position > width()) position = child0->minimumWidth(); @@ -450,7 +450,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge if (position > (width()-child1->minimumWidth()-4) || position < 0) position = width()-child1->minimumWidth()-4; } - } else {// orientation == Qt::Horizontal + } else {// orientation == TQt::Horizontal if (child0==overlappingWidget) { if (position < (child0->minimumHeight()) || position > height()) position = child0->minimumHeight(); @@ -466,7 +466,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge int KDockSplitter::checkValue( int position ) const { if (initialised) { - if (m_orientation == Qt::Vertical) { + if (m_orientation == TQt::Vertical) { if (position < child0->minimumWidth()) position = child0->minimumWidth(); if ((width()-4-position) < (child1->minimumWidth())) @@ -481,9 +481,9 @@ int KDockSplitter::checkValue( int position ) const if (position < 0) position = 0; - if ((m_orientation == Qt::Vertical) && (position > width())) + if ((m_orientation == TQt::Vertical) && (position > width())) position = width(); - if ((m_orientation == Qt::Horizontal) && (position > height())) + if ((m_orientation == TQt::Horizontal) && (position > height())) position = height(); return position; @@ -499,7 +499,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) mev= (TQMouseEvent*)e; child0->setUpdatesEnabled(mOpaqueResize); child1->setUpdatesEnabled(mOpaqueResize); - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; @@ -539,7 +539,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) child0->setUpdatesEnabled(true); child1->setUpdatesEnabled(true); mev= (TQMouseEvent*)e; - if (m_orientation == Qt::Horizontal){ + if (m_orientation == TQt::Horizontal){ if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; @@ -625,7 +625,7 @@ KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name ) :TQPushButton( parent, name ) { moveMouse = false; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } KDockButton_Private::~KDockButton_Private() @@ -701,7 +701,7 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) { if (w) { TQWidget* embeddedWdg = ((KDockWidget*)w)->getWidget(); - if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) { + if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) { embeddedWdg->setFocus(); } } diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h index a72532e3d..b6cc685d0 100644 --- a/tdeui/kdockwidget_private.h +++ b/tdeui/kdockwidget_private.h @@ -47,7 +47,7 @@ class TDEUI_EXPORT KDockSplitter : public TQWidget // which copies the whole definition of the class to be able to access separatorPosInPercent etc. // This needs real fixing in KDE4. - Q_OBJECT + TQ_OBJECT public: /** * Constructor. @@ -56,7 +56,7 @@ public: * @param orient orientation. Either @p Vertical or @p Horizontal * @param pos procentual position of the splitter. Must be int [0...100]. */ - KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Qt::Vertical, int pos= 50); + KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= TQt::Vertical, int pos= 50); virtual ~KDockSplitter(){} /** @@ -247,7 +247,7 @@ private: */ class TDEUI_EXPORT KDockButton_Private : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: KDockButton_Private( TQWidget *parent=0, const char *name=0 ); ~KDockButton_Private(); @@ -272,7 +272,7 @@ private: */ class KDockWidgetPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: KDockWidgetPrivate(); ~KDockWidgetPrivate(); diff --git a/tdeui/kdockwindow.h b/tdeui/kdockwindow.h index 4b7a34049..851502488 100644 --- a/tdeui/kdockwindow.h +++ b/tdeui/kdockwindow.h @@ -31,7 +31,7 @@ */ class KDE_DEPRECATED KDockWindow : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: KDockWindow( TQWidget* parent = 0, const char* name = 0 ) : KSystemTray( parent, name ) {} diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp index 532e4aaaa..44bd6d6f2 100644 --- a/tdeui/kdualcolorbutton.cpp +++ b/tdeui/kdualcolorbutton.cpp @@ -46,8 +46,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget* (const unsigned char *)dcolorarrow_bits, true); arrowBitmap->setMask(*arrowBitmap); // heh resetPixmap = new TQPixmap((const char **)dcolorreset_xpm); - fg = TQBrush(Qt::black, Qt::SolidPattern); - bg = TQBrush(Qt::white, Qt::SolidPattern); + fg = TQBrush(TQt::black, TQt::SolidPattern); + bg = TQBrush(TQt::white, TQt::SolidPattern); curColor = Foreground; dragFlag = false; miniCtlFlag = false; @@ -67,8 +67,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo (const unsigned char *)dcolorarrow_bits, true); arrowBitmap->setMask(*arrowBitmap); resetPixmap = new TQPixmap((const char **)dcolorreset_xpm); - fg = TQBrush(fgColor, Qt::SolidPattern); - bg = TQBrush(bgColor, Qt::SolidPattern); + fg = TQBrush(fgColor, TQt::SolidPattern); + bg = TQBrush(bgColor, TQt::SolidPattern); curColor = Foreground; dragFlag = false; miniCtlFlag = false; @@ -111,7 +111,7 @@ TQSize KDualColorButton::sizeHint() const void KDualColorButton::setForeground(const TQColor &c) { - fg = TQBrush(c, Qt::SolidPattern); + fg = TQBrush(c, TQt::SolidPattern); repaint(false); emit fgChanged(fg.color()); @@ -119,7 +119,7 @@ void KDualColorButton::setForeground(const TQColor &c) void KDualColorButton::setBackground(const TQColor &c) { - bg = TQBrush(c, Qt::SolidPattern); + bg = TQBrush(c, TQt::SolidPattern); repaint(false); emit bgChanged(bg.color()); @@ -128,9 +128,9 @@ void KDualColorButton::setBackground(const TQColor &c) void KDualColorButton::setCurrentColor(const TQColor &c) { if(curColor == Background) - bg = TQBrush(c, Qt::SolidPattern); + bg = TQBrush(c, TQt::SolidPattern); else - fg = TQBrush(c, Qt::SolidPattern); + fg = TQBrush(c, TQt::SolidPattern); repaint(false); } @@ -211,8 +211,8 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) miniCtlFlag = true; } else if(ev->pos().x() < bgRect.x()){ - fg.setColor(Qt::black); - bg.setColor(Qt::white); + fg.setColor(TQt::black); + bg.setColor(TQt::white); emit fgChanged(fg.color()); emit bgChanged(bg.color()); miniCtlFlag = true; diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h index 2495750f8..15e04d39d 100644 --- a/tdeui/kdualcolorbutton.h +++ b/tdeui/kdualcolorbutton.h @@ -47,7 +47,7 @@ class TQBitmap; */ class TDEUI_EXPORT KDualColorButton : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( DualColor ) TQ_PROPERTY( TQColor foreground READ foreground WRITE setForeground ) TQ_PROPERTY( TQColor background READ background WRITE setBackground ) diff --git a/tdeui/keditcl.h b/tdeui/keditcl.h index aefd3df81..2f84e4622 100644 --- a/tdeui/keditcl.h +++ b/tdeui/keditcl.h @@ -36,7 +36,7 @@ class TQVButtonGroup; class TDEUI_EXPORT KEdGotoLine : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KEdGotoLine( TQWidget *parent=0, const char *name=0, bool modal=true ); @@ -58,7 +58,7 @@ private: /// class TDEUI_EXPORT KEdFind : public KDialogBase { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString text READ getText WRITE setText ) TQ_PROPERTY( bool caseSensitivity READ case_sensitive WRITE setCaseSensitive ) TQ_PROPERTY( bool direction READ get_direction WRITE setDirection ) @@ -108,7 +108,7 @@ private: /// class TDEUI_EXPORT KEdReplace : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -170,7 +170,7 @@ private: class TDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit { - Q_OBJECT + TQ_OBJECT public: /** @@ -403,7 +403,7 @@ protected: private: TQTimer* repaintTimer; - QString killbufferstring; + TQString killbufferstring; TQWidget *parent; KEdFind *srchdialog; KEdReplace *replace_dialog; diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp index a550a7af1..85ccd1c88 100644 --- a/tdeui/keditcl1.cpp +++ b/tdeui/keditcl1.cpp @@ -67,8 +67,8 @@ KEdit::KEdit(TQWidget *_parent, const char *name) setAcceptDrops(true); KCursor::setAutoHideCursor( this, true ); - connect(this, TQT_SIGNAL(cursorPositionChanged(int,int)), - this, TQT_SLOT(slotCursorPositionChanged())); + connect(this, TQ_SIGNAL(cursorPositionChanged(int,int)), + this, TQ_SLOT(slotCursorPositionChanged())); } diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp index 0c147e4b8..3ccb5226b 100644 --- a/tdeui/keditcl2.cpp +++ b/tdeui/keditcl2.cpp @@ -58,8 +58,8 @@ void KEdit::search(){ if( !srchdialog ) { srchdialog = new KEdFind( this, "searchdialog", false); - connect(srchdialog,TQT_SIGNAL(search()),this,TQT_SLOT(search_slot())); - connect(srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot())); + connect(srchdialog,TQ_SIGNAL(search()),this,TQ_SLOT(search_slot())); + connect(srchdialog,TQ_SIGNAL(done()),this,TQ_SLOT(searchdone_slot())); } // If we already searched / replaced something before make sure it shows @@ -254,10 +254,10 @@ void KEdit::replace() if( !replace_dialog ) { replace_dialog = new KEdReplace( this, "replace_dialog", false ); - connect(replace_dialog,TQT_SIGNAL(find()),this,TQT_SLOT(replace_search_slot())); - connect(replace_dialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replace_slot())); - connect(replace_dialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replace_all_slot())); - connect(replace_dialog,TQT_SIGNAL(done()),this,TQT_SLOT(replacedone_slot())); + connect(replace_dialog,TQ_SIGNAL(find()),this,TQ_SLOT(replace_search_slot())); + connect(replace_dialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replace_slot())); + connect(replace_dialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replace_all_slot())); + connect(replace_dialog,TQ_SIGNAL(done()),this,TQ_SLOT(replacedone_slot())); } TQString string = replace_dialog->getText(); @@ -715,8 +715,8 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) d->combo->setMinimumWidth(fontMetrics().maxWidth()*20); d->combo->setFocus(); - connect(d->combo, TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textSearchChanged ( const TQString & ))); + connect(d->combo, TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textSearchChanged ( const TQString & ))); topLayout->addWidget(d->combo); @@ -734,7 +734,7 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) enableButton( KDialogBase::User1, !d->combo->currentText().isEmpty() ); if ( !modal ) - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCancel() ) ); } KEdFind::~KEdFind() @@ -834,7 +834,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) { setWFlags( WType_TopLevel ); - setButtonBoxOrientation( Qt::Vertical ); + setButtonBoxOrientation( TQt::Vertical ); TQFrame *page = makeMainWidget(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); @@ -856,8 +856,8 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) d->replaceCombo->setMinimumWidth(fontMetrics().maxWidth()*20); topLayout->addWidget(d->replaceCombo); - connect(d->searchCombo, TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textSearchChanged ( const TQString & ))); + connect(d->searchCombo, TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textSearchChanged ( const TQString & ))); TQButtonGroup *group = new TQButtonGroup( i18n("Options"), page ); topLayout->addWidget( group ); diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp index 142c4b437..92efce083 100644 --- a/tdeui/keditlistbox.cpp +++ b/tdeui/keditlistbox.cpp @@ -105,10 +105,10 @@ void KEditListBox::init( bool checkAtEntering, int buttons, d->buttons = 0; setButtons( buttons ); - connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&))); + connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&))); m_lineEdit->setTrapReturnKey(true); - connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem())); - connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); + connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem())); + connect(m_listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int))); // maybe supplied lineedit has some text already typedSomething( m_lineEdit->text() ); @@ -124,7 +124,7 @@ void KEditListBox::setButtons( uint buttons ) servNewButton = new TQPushButton(i18n("&Add"), this); servNewButton->setEnabled(false); servNewButton->show(); - connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); grid->addWidget(servNewButton, 2, 1); } else if ( ( buttons & Add ) == 0 && servNewButton ) { @@ -136,7 +136,7 @@ void KEditListBox::setButtons( uint buttons ) servRemoveButton = new TQPushButton(i18n("&Remove"), this); servRemoveButton->setEnabled(false); servRemoveButton->show(); - connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); grid->addWidget(servRemoveButton, 3, 1); } else if ( ( buttons & Remove ) == 0 && servRemoveButton ) { @@ -148,12 +148,12 @@ void KEditListBox::setButtons( uint buttons ) servUpButton = new TQPushButton(i18n("Move &Up"), this); servUpButton->setEnabled(false); servUpButton->show(); - connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp())); + connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp())); servDownButton = new TQPushButton(i18n("Move &Down"), this); servDownButton->setEnabled(false); servDownButton->show(); - connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown())); + connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown())); grid->addWidget(servUpButton, 4, 1); grid->addWidget(servDownButton, 5, 1); @@ -418,7 +418,7 @@ void KEditListBox::virtual_hook( int, void* ) KEditListBox::CustomEditor::CustomEditor( KComboBox *combo ) { m_representationWidget = combo; - m_lineEdit = tqt_dynamic_cast<KLineEdit*>( combo->lineEdit() ); + m_lineEdit = dynamic_cast<KLineEdit*>( combo->lineEdit() ); assert( m_lineEdit ); } diff --git a/tdeui/keditlistbox.h b/tdeui/keditlistbox.h index c6930128b..0a986b93e 100644 --- a/tdeui/keditlistbox.h +++ b/tdeui/keditlistbox.h @@ -43,7 +43,7 @@ class KEditListBoxPrivate; */ class TDEUI_EXPORT KEditListBox : public TQGroupBox { - Q_OBJECT + TQ_OBJECT TQ_SETS( Button ) diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index 13d928b52..193a2e4ac 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -422,8 +422,8 @@ void KEditToolbar::init() setMainWidget(m_widget); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(acceptOK(bool))); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(acceptOK(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(enableButtonApply(bool))); enableButtonApply(false); setMinimumSize(sizeHint()); @@ -499,8 +499,8 @@ void KEditToolbar::slotDefault() setMainWidget(m_widget); m_widget->show(); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(acceptOK(bool))); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(acceptOK(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(enableButtonApply(bool))); enableButtonApply(false); emit newToolbarConfig(); @@ -762,8 +762,8 @@ void KEditToolbarWidget::setupLayout() m_toolbarCombo->setEnabled(false); d->m_comboLabel->setBuddy(m_toolbarCombo); d->m_comboSeparator = new KSeparator(this); - connect(m_toolbarCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotToolbarSelected(const TQString&))); + connect(m_toolbarCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotToolbarSelected(const TQString&))); // TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this); // new_toolbar->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall)); @@ -785,10 +785,10 @@ void KEditToolbarWidget::setupLayout() int column2 = m_inactiveList->addColumn(""); // text m_inactiveList->setSorting( column2 ); inactive_label->setBuddy(m_inactiveList); - connect(m_inactiveList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotInactiveSelected(TQListViewItem *))); - connect(m_inactiveList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(slotInsertButton())); + connect(m_inactiveList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotInactiveSelected(TQListViewItem *))); + connect(m_inactiveList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(slotInsertButton())); // our list of active actions TQLabel *active_label = new TQLabel(i18n("Curr&ent actions:"), this); @@ -804,14 +804,14 @@ void KEditToolbarWidget::setupLayout() m_activeList->setSorting(-1); active_label->setBuddy(m_activeList); - connect(m_inactiveList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); - connect(m_activeList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); - connect(m_activeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotActiveSelected(TQListViewItem *))); - connect(m_activeList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(slotRemoveButton())); + connect(m_inactiveList, TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); + connect(m_activeList, TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); + connect(m_activeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotActiveSelected(TQListViewItem *))); + connect(m_activeList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(slotRemoveButton())); // "change icon" button d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this ); @@ -819,8 +819,8 @@ void KEditToolbarWidget::setupLayout() d->m_hasKDialog = !kdialogExe.isEmpty(); d->m_changeIcon->setEnabled( d->m_hasKDialog ); - connect( d->m_changeIcon, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotChangeIcon() ) ); + connect( d->m_changeIcon, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotChangeIcon() ) ); // The buttons in the middle TQIconSet iconSet; @@ -830,26 +830,26 @@ void KEditToolbarWidget::setupLayout() m_upAction->setIconSet( iconSet ); m_upAction->setEnabled(false); m_upAction->setAutoRepeat(true); - connect(m_upAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotUpButton())); + connect(m_upAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotUpButton())); m_insertAction = new TQToolButton(this); iconSet = TQApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" ); m_insertAction->setIconSet( iconSet ); m_insertAction->setEnabled(false); - connect(m_insertAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotInsertButton())); + connect(m_insertAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotInsertButton())); m_removeAction = new TQToolButton(this); iconSet = TQApplication::reverseLayout() ? SmallIconSet( "forward" ) : SmallIconSet( "back" ); m_removeAction->setIconSet( iconSet ); m_removeAction->setEnabled(false); - connect(m_removeAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveButton())); + connect(m_removeAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveButton())); m_downAction = new TQToolButton(this); iconSet = SmallIconSet( "go-down" ); m_downAction->setIconSet( iconSet ); m_downAction->setEnabled(false); m_downAction->setAutoRepeat(true); - connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton())); + connect(m_downAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotDownButton())); d->m_helpArea = new TQLabel(this); d->m_helpArea->setAlignment( TQt::WordBreak ); @@ -890,7 +890,7 @@ void KEditToolbarWidget::setupLayout() changeIcon_layout->addStretch( 1 ); list_layout->addLayout(inactive_layout); - list_layout->addLayout(TQT_TQLAYOUT(button_layout)); + list_layout->addLayout(button_layout); list_layout->addLayout(active_layout); top_layout->addLayout(name_layout); @@ -1405,8 +1405,8 @@ void KEditToolbarWidget::slotChangeIcon() m_activeList->setEnabled( false ); // don't change the current item m_toolbarCombo->setEnabled( false ); // don't change the current toolbar - connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( d->m_kdialogProcess, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); } void KEditToolbarWidget::slotProcessExited( TDEProcess* ) diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h index 8afe67352..d59756b71 100644 --- a/tdeui/kedittoolbar.h +++ b/tdeui/kedittoolbar.h @@ -67,7 +67,7 @@ namespace KEditToolbarInternal * { * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(actionCollection()); - * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + * connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); * dlg.exec(); * } * @@ -92,7 +92,7 @@ namespace KEditToolbarInternal * \code * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(factory()); - * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + * connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); * dlg.exec(); * * void MyClass::slotNewToolbarConfig() // This is called when OK, Apply or Defaults is clicked @@ -108,7 +108,7 @@ namespace KEditToolbarInternal */ class TDEUI_EXPORT KEditToolbar : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Constructor for apps that do not use components. @@ -268,7 +268,7 @@ private: */ class TDEUI_EXPORT KEditToolbarWidget : public TQWidget, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. This is the only entry point to this class. You diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index 8ca2022f3..a274ec737 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -89,13 +89,13 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData, if (actions) { - KStdAction::helpContents(this, TQT_SLOT(appHelpActivated()), actions); + KStdAction::helpContents(this, TQ_SLOT(appHelpActivated()), actions); if (showWhatsThis) - KStdAction::whatsThis(this, TQT_SLOT(contextHelpActivated()), actions); - KStdAction::reportBug(this, TQT_SLOT(reportBug()), actions); - KStdAction::aboutApp(this, TQT_SLOT(aboutApplication()), actions); - KStdAction::aboutKDE(this, TQT_SLOT(aboutKDE()), actions); - KStdAction::switchApplicationLanguage(this, TQT_SLOT(switchApplicationLanguage()), actions); + KStdAction::whatsThis(this, TQ_SLOT(contextHelpActivated()), actions); + KStdAction::reportBug(this, TQ_SLOT(reportBug()), actions); + KStdAction::aboutApp(this, TQ_SLOT(aboutApplication()), actions); + KStdAction::aboutKDE(this, TQ_SLOT(aboutKDE()), actions); + KStdAction::switchApplicationLanguage(this, TQ_SLOT(switchApplicationLanguage()), actions); } } @@ -122,14 +122,14 @@ TDEPopupMenu* KHelpMenu::menu() TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name()); mMenu = new TDEPopupMenu(); - connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed())); + connect( mMenu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(menuDestroyed())); bool need_separator = false; if (kapp->authorizeTDEAction("help_contents")) { mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall), TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents ); - mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) ); + mMenu->connectItem( menuHelpContents, this, TQ_SLOT(appHelpActivated()) ); mMenu->setAccel( TDEStdAccel::shortcut(TDEStdAccel::Help), menuHelpContents ); need_separator = true; } @@ -138,7 +138,7 @@ TDEPopupMenu* KHelpMenu::menu() { TQToolButton* wtb = TQWhatsThis::whatsThisButton(0); mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis); - mMenu->connectItem( menuWhatsThis, this, TQT_SLOT(contextHelpActivated()) ); + mMenu->connectItem( menuWhatsThis, this, TQ_SLOT(contextHelpActivated()) ); delete wtb; mMenu->setAccel( SHIFT + Key_F1, menuWhatsThis ); need_separator = true; @@ -149,7 +149,7 @@ TDEPopupMenu* KHelpMenu::menu() if (need_separator) mMenu->insertSeparator(); mMenu->insertItem( SmallIcon("bug"), i18n( "&Report Bug/Request Enhancement..." ), menuReportBug ); - mMenu->connectItem( menuReportBug, this, TQT_SLOT(reportBug()) ); + mMenu->connectItem( menuReportBug, this, TQ_SLOT(reportBug()) ); need_separator = true; } @@ -158,7 +158,7 @@ TDEPopupMenu* KHelpMenu::menu() if (need_separator) mMenu->insertSeparator(); mMenu->insertItem( SmallIcon("locale"), i18n( "Switch application &language..." ), menuSwitchLanguage ); - mMenu->connectItem( menuSwitchLanguage, this, TQT_SLOT(switchApplicationLanguage()) ); + mMenu->connectItem( menuSwitchLanguage, this, TQ_SLOT(switchApplicationLanguage()) ); need_separator = true; } @@ -169,13 +169,13 @@ TDEPopupMenu* KHelpMenu::menu() { mMenu->insertItem( kapp->miniIcon(), TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp ); - mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) ); + mMenu->connectItem( menuAboutApp, this, TQ_SLOT( aboutApplication() ) ); } if (kapp->authorizeTDEAction("help_about_kde")) { - mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &Trinity" ), menuAboutKDE ); - mMenu->connectItem( menuAboutKDE, this, TQT_SLOT( aboutKDE() ) ); + mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &TDE" ), menuAboutKDE ); + mMenu->connectItem( menuAboutKDE, this, TQ_SLOT( aboutKDE() ) ); } } @@ -197,7 +197,7 @@ void KHelpMenu::aboutApplication() if( !mAboutApp ) { mAboutApp = new TDEAboutApplication( d->mAboutData, mParent, "about", false ); - connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } mAboutApp->show(); } @@ -213,7 +213,7 @@ void KHelpMenu::aboutApplication() KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes, mParent, "about", false, true, KStdGuiItem::ok() ); - connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); TQHBox *hbox = new TQHBox( mAboutApp ); mAboutApp->setMainWidget( hbox ); @@ -239,7 +239,7 @@ void KHelpMenu::aboutKDE() if( !mAboutKDE ) { mAboutKDE = new TDEAboutKDE( mParent, "aboutkde", false ); - connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutKDE, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } mAboutKDE->show(); } @@ -250,7 +250,7 @@ void KHelpMenu::reportBug() if( !mBugReport ) { mBugReport = new KBugReport( mParent, false, d->mAboutData ); - connect( mBugReport, TQT_SIGNAL(finished()),this,TQT_SLOT( dialogFinished()) ); + connect( mBugReport, TQ_SIGNAL(finished()),this,TQ_SLOT( dialogFinished()) ); } mBugReport->show(); } @@ -260,7 +260,7 @@ void KHelpMenu::switchApplicationLanguage() if ( !d->mSwitchApplicationLanguage ) { d->mSwitchApplicationLanguage = new KSwitchLanguageDialog( mParent, "switchlanguagedialog", false ); - connect( d->mSwitchApplicationLanguage, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( d->mSwitchApplicationLanguage, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } d->mSwitchApplicationLanguage->show(); } @@ -268,7 +268,7 @@ void KHelpMenu::switchApplicationLanguage() void KHelpMenu::dialogFinished() { - TQTimer::singleShot( 0, this, TQT_SLOT(timerExpired()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(timerExpired()) ); } @@ -308,7 +308,7 @@ void KHelpMenu::contextHelpActivated() TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true ); while ( w && !w->isTopLevel() && !w->inherits("QXEmbed") ) w = w->parentWidget(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( w && w->inherits("QXEmbed") ) (( QXEmbed*) w )->enterWhatsThisMode(); #endif diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h index 25e118b5b..ad0e65140 100644 --- a/tdeui/khelpmenu.h +++ b/tdeui/khelpmenu.h @@ -60,7 +60,7 @@ class KHelpMenuPrivate; * * \code * mHelpMenu = new KHelpMenu( this, <someText> ); - * connect( this, TQT_SIGNAL(someSignal()), mHelpMenu,TQT_SLOT(mHelpMenu->aboutKDE())); + * connect( this, TQ_SIGNAL(someSignal()), mHelpMenu,TQ_SLOT(mHelpMenu->aboutKDE())); * \endcode * * IMPORTANT: @@ -97,8 +97,8 @@ class KHelpMenuPrivate; * { * .. * KHelpMenu *helpMenu = new KHelpMenu( this ); - * connect( helpMenu, TQT_SIGNAL(showAboutApplication()), - * this, TQT_SLOT(myDialogSlot())); + * connect( helpMenu, TQ_SIGNAL(showAboutApplication()), + * this, TQ_SLOT(myDialogSlot())); * .. * } * @@ -116,7 +116,7 @@ class KHelpMenuPrivate; * { * KHelpMenu *helpMenu = new KHelpMenu( this ); * TDEPopupMenu *help = mHelpMenu->menu(); - * help->connectItem( KHelpMenu::menuAboutApp, this, TQT_SLOT(myDialogSlot()) ); + * help->connectItem( KHelpMenu::menuAboutApp, this, TQ_SLOT(myDialogSlot()) ); * } * * void MyClass::myDialogSlot() @@ -130,7 +130,7 @@ class KHelpMenuPrivate; class TDEUI_EXPORT KHelpMenu : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum MenuId diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index 04b78f389..517730b9c 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -61,23 +61,23 @@ TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f ) { d = new TDEIconViewPrivate; - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); if ( kapp ) { // maybe null when used inside designer - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } m_pCurrentItem = 0L; m_pAutoSelect = new TQTimer( this ); - connect( m_pAutoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); + connect( m_pAutoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); - connect( &d->dragHoldTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragHoldTimeout()) ); + connect( &d->dragHoldTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragHoldTimeout()) ); } TDEIconView::~TDEIconView() @@ -128,25 +128,25 @@ void TDEIconView::slotSettingsChanged(int category) m_bUseSingle = TDEGlobalSettings::singleClick(); //kdDebug() << "TDEIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; - disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, + disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ) ); -// disconnect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *, +// disconnect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQIconViewItem *, +// this, TQ_SLOT( slotExecute( TQIconViewItem *, // const TQPoint & ) ) ); if( m_bUseSingle ) { - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ) ); } else { -// connect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *, +// connect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQIconViewItem *, +// this, TQ_SLOT( slotExecute( TQIconViewItem *, // const TQPoint & ) ) ); } @@ -310,7 +310,7 @@ void TDEIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) TQIconViewItem* item = findItem( e->pos() ); if( item ) { - if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) + if( (e->button() == TQt::LeftButton) && !m_bUseSingle ) emitExecute( item, e->globalPos() ); emit doubleClicked( item, e->globalPos() ); @@ -324,7 +324,7 @@ void TDEIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const T if( d->doubleClickIgnoreTimer.isActive() ) return; // Ignore double click - if( (btn == Qt::LeftButton) && item ) + if( (btn == TQt::LeftButton) && item ) emitExecute( item, pos ); } @@ -388,7 +388,7 @@ void TDEIconView::cancelPendingHeldSignal() void TDEIconView::wheelEvent( TQWheelEvent *e ) { if (horizontalScrollBar() && (arrangement() == TQIconView::TopToBottom)) { - TQWheelEvent ce(e->pos(), e->delta(), e->state(), Qt::Horizontal); + TQWheelEvent ce(e->pos(), e->delta(), e->state(), TQt::Horizontal); TQApplication::sendEvent( horizontalScrollBar(), &ce); if (ce.isAccepted()) { e->accept(); @@ -757,7 +757,7 @@ void TDEIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) p->setPen( TQPen( cg.highlightedText() ) ); } else { - if ( iconView()->itemTextBackground() != Qt::NoBrush ) { + if ( iconView()->itemTextBackground() != TQt::NoBrush ) { p->fillRect( textRect( false ), iconView()->itemTextBackground() ); } p->setPen( cg.text() ); diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h index 8c0cd5a24..f29bf61d4 100644 --- a/tdeui/kiconview.h +++ b/tdeui/kiconview.h @@ -42,7 +42,7 @@ class TDEUI_EXPORT TDEIconView : public TQIconView { friend class TDEIconViewItem; - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Mode ) TQ_PROPERTY( Mode mode READ mode WRITE setMode ) diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp index 77b8082ea..f853221ff 100644 --- a/tdeui/kiconviewsearchline.cpp +++ b/tdeui/kiconviewsearchline.cpp @@ -152,15 +152,15 @@ void TDEIconViewSearchLine::setCaseSensitive( bool cs ) void TDEIconViewSearchLine::setIconView( TQIconView *iv ) { if ( d->iconView != NULL ) - disconnect( d->iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + disconnect( d->iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); d->iconView = iv; if ( iv != NULL ) { - connect( d->iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + connect( d->iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); setEnabled( true ); } else @@ -190,13 +190,13 @@ void TDEIconViewSearchLine::init( TQIconView *iconView ) d->iconView = iconView; - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( queueSearch( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( queueSearch( const TQString & ) ) ); if ( iconView != NULL ) { - connect( iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + connect( iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); setEnabled( true ); } else @@ -231,7 +231,7 @@ void TDEIconViewSearchLine::queueSearch( const TQString &s ) { d->queuedSearches++; d->search = s; - TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( activateSearch() ) ); } void TDEIconViewSearchLine::activateSearch() @@ -244,7 +244,7 @@ void TDEIconViewSearchLine::activateSearch() d->queuedSearches = 0; } else { - TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( activateSearch() ) ); } } diff --git a/tdeui/kiconviewsearchline.h b/tdeui/kiconviewsearchline.h index cef09b3ea..3988a7c9b 100644 --- a/tdeui/kiconviewsearchline.h +++ b/tdeui/kiconviewsearchline.h @@ -37,7 +37,7 @@ class TQIconViewItem; */ class TDEUI_EXPORT TDEIconViewSearchLine : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/kinputdialog.cpp b/tdeui/kinputdialog.cpp index 831cf2560..5bf89ae20 100644 --- a/tdeui/kinputdialog.cpp +++ b/tdeui/kinputdialog.cpp @@ -17,10 +17,6 @@ Boston, MA 02110-1301, USA. */ -#ifdef USE_QT4 -#undef Status -#endif // USE_QT4 - #include <tqlayout.h> #include <tqlabel.h> #include <tqvalidator.h> @@ -81,9 +77,9 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, if ( !mask.isEmpty() ) d->m_lineEdit->setInputMask( mask ); - connect( d->m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), d->m_lineEdit, TQT_SLOT( clear() ) ); + connect( d->m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotEditTextChanged( const TQString & ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), d->m_lineEdit, TQ_SLOT( clear() ) ); slotEditTextChanged( value ); setMinimumWidth( 350 ); @@ -109,7 +105,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_textEdit->setFocus(); d->m_label->setBuddy( d->m_textEdit ); - connect( this, TQT_SIGNAL( user1Clicked() ), d->m_textEdit, TQT_SLOT( clear() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), d->m_textEdit, TQ_SLOT( clear() ) ); setMinimumWidth( 400 ); } @@ -180,10 +176,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_comboBox->setCurrentItem( current ); layout->addWidget( d->m_comboBox ); - connect( d->m_comboBox, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotUpdateButtons( const TQString & ) ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), - d->m_comboBox, TQT_SLOT( clearEdit() ) ); + connect( d->m_comboBox, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotUpdateButtons( const TQString & ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), + d->m_comboBox, TQ_SLOT( clearEdit() ) ); slotUpdateButtons( d->m_comboBox->currentText() ); d->m_comboBox->setFocus(); } else { @@ -192,10 +188,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_listBox->setSelected( current, true ); d->m_listBox->ensureCurrentVisible(); layout->addWidget( d->m_listBox, 10 ); - connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); d->m_listBox->setFocus(); } @@ -236,10 +232,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, } else { - connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); TQString text = select.first(); item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch ); @@ -374,7 +370,7 @@ TQString KInputDialog::getItem( const TQString &caption, const TQString &label, editable, parent, name ); if ( !editable) { - connect( dlg.listBox(), TQT_SIGNAL(doubleClicked ( TQListBoxItem *)), &dlg, TQT_SLOT( slotOk())); + connect( dlg.listBox(), TQ_SIGNAL(doubleClicked ( TQListBoxItem *)), &dlg, TQ_SLOT( slotOk())); } bool _ok = ( dlg.exec() == Accepted ); diff --git a/tdeui/kinputdialog.h b/tdeui/kinputdialog.h index d1e148d9a..6fad6b54e 100644 --- a/tdeui/kinputdialog.h +++ b/tdeui/kinputdialog.h @@ -47,7 +47,7 @@ class KInputDialogPrivate; */ class TDEUI_EXPORT KInputDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT private: diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 513ae2d8a..a17afc59c 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -115,8 +115,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mTreeList->header()->hide(); mTreeList->setRootIsDecorated(true); mTreeList->setSorting( -1 ); - connect( mTreeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage()) ); - connect( mTreeList, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect( mTreeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage()) ); + connect( mTreeList, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotItemClicked(TQListViewItem *))); // // Page area. Title at top with a separator below and a pagestack using @@ -143,8 +143,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mIconList->setFont( listFont ); mIconList->verticalScrollBar()->installEventFilter( this ); - connect( mIconList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage())); - connect( mIconList, TQT_SIGNAL(onItem(TQListBoxItem *)), TQT_SLOT(slotOnItem(TQListBoxItem *))); + connect( mIconList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage())); + connect( mIconList, TQ_SIGNAL(onItem(TQListBoxItem *)), TQ_SLOT(slotOnItem(TQListBoxItem *))); hbox->addSpacing( KDialog::marginHint() ); page = new TQFrame( this ); @@ -170,8 +170,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) vbox->addWidget( mTitleSep ); mPageStack = new TQWidgetStack( page ); - connect(mPageStack, TQT_SIGNAL(aboutToShow(TQWidget *)), - TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mPageStack, TQ_SIGNAL(aboutToShow(TQWidget *)), + TQ_SIGNAL(aboutToShowPage(TQWidget *))); vbox->addWidget( mPageStack, 10 ); } else if( mFace == Tabbed ) @@ -180,8 +180,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mTabControl = new TQTabWidget( this ); mTabControl->setMargin (KDialog::marginHint()); - connect(mTabControl, TQT_SIGNAL(currentChanged(TQWidget *)), - TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mTabControl, TQ_SIGNAL(currentChanged(TQWidget *)), + TQ_SIGNAL(aboutToShowPage(TQWidget *))); topLayout->addWidget( mTabControl, 10 ); } else if( mFace == Swallow ) @@ -197,7 +197,7 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) } if ( kapp ) - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); mValid = true; setSwallowedWidget(0); // Set default size if 'mFace' is Swallow. @@ -254,7 +254,7 @@ TQFrame *KJanusWidget::addPage( const TQStringList &items, const TQString &heade void KJanusWidget::pageGone( TQObject *obj ) { - removePage( TQT_TQWIDGET( obj ) ); + removePage( static_cast<TQWidget*>( obj ) ); } void KJanusWidget::slotReopen( TQListViewItem * item ) @@ -430,19 +430,19 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, const TQString &header,const TQPixmap &pixmap ) { - connect(page, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(pageGone(TQObject*))); + connect(page, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(pageGone(TQObject*))); if( mFace == Tabbed ) { mTabControl->addTab (page, items.last()); - d->mIntToPage[d->mNextPageIndex] = static_cast<TQWidget*>(page); - d->mPageToInt[static_cast<TQWidget*>(page)] = d->mNextPageIndex; + d->mIntToPage[d->mNextPageIndex] = page; + d->mPageToInt[page] = d->mNextPageIndex; d->mNextPageIndex++; } else if( mFace == TreeList || mFace == IconList ) { - d->mIntToPage[d->mNextPageIndex] = static_cast<TQWidget*>(page); - d->mPageToInt[static_cast<TQWidget*>(page)] = d->mNextPageIndex; + d->mIntToPage[d->mNextPageIndex] = page; + d->mPageToInt[page] = d->mNextPageIndex; mPageStack->addWidget( page, 0 ); if (items.isEmpty()) { @@ -536,7 +536,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) } else { - if( TQT_BASE_OBJECT(widget->parent()) != TQT_BASE_OBJECT(mSwallowPage) ) + if( widget->parent() != mSwallowPage ) { widget->reparent( mSwallowPage, 0, TQPoint(0,0) ); } @@ -684,7 +684,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const // and addGridPage() but not with addPage() which returns a child of // the toplevel page. addPage() returns a TQFrame so I check for that. // - if( widget->isA(TQFRAME_OBJECT_NAME_STRING) ) + if( widget->isA("TQFrame") ) { return d->mPageToInt[widget->parentWidget()]; } @@ -726,7 +726,7 @@ void KJanusWidget::slotItemClicked(TQListViewItem *it) it->setOpen(!it->isOpen()); } -// hack because qt does not support Q_OBJECT in nested classes +// hack because qt does not support TQ_OBJECT in nested classes void KJanusWidget::slotOnItem(TQListBoxItem *qitem) { mIconList->slotOnItem( qitem ); @@ -856,9 +856,9 @@ void KJanusWidget::unfoldTreeList( bool persist ) if( mFace == TreeList ) { if( persist ) - connect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) ); + connect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) ); else - disconnect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) ); + disconnect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) ); for( TQListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() ) item->setOpen( true ); @@ -878,7 +878,7 @@ void KJanusWidget::addButtonBelowList( const TQString & text, TQObject * recv, c if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame ) { TQPushButton * button = new TQPushButton( text, d->mListFrame, "KJanusWidget::buttonBelowList" ); - connect( button, TQT_SIGNAL( clicked() ), recv, slot ); + connect( button, TQ_SIGNAL( clicked() ), recv, slot ); } } @@ -887,7 +887,7 @@ void KJanusWidget::addButtonBelowList( const KGuiItem & item, TQObject * recv, c if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame ) { KPushButton * button = new KPushButton( item, d->mListFrame, "KJanusWidget::buttonBelowList" ); - connect( button, TQT_SIGNAL( clicked() ), recv, slot ); + connect( button, TQ_SIGNAL( clicked() ), recv, slot ); } } @@ -1017,7 +1017,7 @@ void KJanusWidget::IconListBox::leaveEvent( TQEvent *ev ) } } -// hack because qt does not support Q_OBJECT in nested classes +// hack because qt does not support TQ_OBJECT in nested classes void KJanusWidget::IconListBox::slotOnItem(TQListBoxItem *qitem) { TDEListBox::slotOnItem( qitem ); @@ -1110,14 +1110,14 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap() pix = new TQPixmap( 32, 32 ); TQPainter p( pix ); p.eraseRect( 0, 0, pix->width(), pix->height() ); - p.setPen( Qt::red ); + p.setPen( TQt::red ); p.drawRect ( 0, 0, pix->width(), pix->height() ); p.end(); TQBitmap mask( pix->width(), pix->height(), true ); - mask.fill( Qt::black ); + mask.fill( TQt::black ); p.begin( &mask ); - p.setPen( Qt::white ); + p.setPen( TQt::white ); p.drawRect ( 0, 0, pix->width(), pix->height() ); p.end(); @@ -1149,14 +1149,14 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter ) void KJanusWidget::IconListItem::paintContents( TQPainter *painter ) { TQFontMetrics fm = painter->fontMetrics(); - int ht = fm.boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height(); + int ht = fm.boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height(); int wp = mPixmap.width(); int hp = mPixmap.height(); painter->drawPixmap( (mMinimumWidth - wp) / 2, 5, mPixmap ); if( !text().isEmpty() ) { - painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, Qt::AlignCenter, text() ); + painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, TQt::AlignCenter, text() ); } } @@ -1168,7 +1168,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const } else { - int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height(); + int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height(); return (mPixmap.height() + ht + 10); } } @@ -1176,7 +1176,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const int KJanusWidget::IconListItem::width( const TQListBox *lb ) const { - int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).width() + 10; + int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).width() + 10; int wp = mPixmap.width() + 10; int w = TQMAX( wt, wp ); return TQMAX( w, mMinimumWidth ); diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h index 604765029..1bc8ed332 100644 --- a/tdeui/kjanuswidget.h +++ b/tdeui/kjanuswidget.h @@ -66,7 +66,7 @@ class KGuiItem; */ class TDEUI_EXPORT KJanusWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT private: class IconListBox : public TDEListBox diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp index 9b530b751..201ade557 100644 --- a/tdeui/kkeybutton.cpp +++ b/tdeui/kkeybutton.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include "config.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define XK_XKB_KEYS #define XK_MISCELLANY #include <X11/Xlib.h> // For x11Event() @@ -46,7 +46,7 @@ const int XKeyRelease = KeyRelease; #undef FocusOut #undef FocusIn #endif // KeyPress -#endif // Q_WS_X11 +#endif // TQ_WS_X11 //static const char* psTemp[] = { // I18N_NOOP("Primary"), I18N_NOOP("Alternate"), I18N_NOOP("Multi-Key") @@ -69,9 +69,9 @@ KKeyButton::KKeyButton(TQWidget *parent, const char *name) : TQPushButton( parent, name ) { d = new KKeyButtonPrivate; - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); m_bEditing = false; - connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureShortcut()) ); + connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureShortcut()) ); setShortcut( TDEShortcut(), true ); } diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h index 889319884..03b551679 100644 --- a/tdeui/kkeybutton.h +++ b/tdeui/kkeybutton.h @@ -39,7 +39,7 @@ */ class TDEUI_EXPORT KKeyButton: public TQPushButton { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 35fe0e45f..052710d89 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -54,7 +54,7 @@ #include <tdeaboutdata.h> #include <kstaticdeleter.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define XK_XKB_KEYS #define XK_MISCELLANY #include <X11/Xlib.h> // For x11Event() @@ -326,7 +326,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(this); searchLayout->addWidget(listViewSearch); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); TQString wtstr = i18n("Search interactively for shortcut names (e.g. Copy) " "or combination of keys (e.g. Ctrl+C) by typing them here."); @@ -340,7 +340,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) // fill up the split list box with the action/key pairs. // TQGridLayout *stackLayout = new TQGridLayout(2, 2, 2); - topLayout->addLayout( TQT_TQLAYOUT(stackLayout), 10 ); + topLayout->addLayout( stackLayout, 10 ); stackLayout->setRowStretch( 1, 10 ); // Only list will stretch d->pList = new TDEListView( this ); @@ -364,13 +364,13 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->pList->addColumn(i18n("Shortcut")); d->pList->addColumn(i18n("Alternate")); - connect( d->pList, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(slotListItemSelected(TQListViewItem*)) ); + connect( d->pList, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(slotListItemSelected(TQListViewItem*)) ); // handle double clicking an item - connect ( d->pList, TQT_SIGNAL ( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT ( captureCurrentItem()) ); - connect ( d->pList, TQT_SIGNAL ( spacePressed( TQListViewItem* )), TQT_SLOT( captureCurrentItem())); + connect ( d->pList, TQ_SIGNAL ( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT ( captureCurrentItem()) ); + connect ( d->pList, TQ_SIGNAL ( spacePressed( TQListViewItem* )), TQ_SLOT( captureCurrentItem())); // // CREATE CHOOSE KEY GROUP // @@ -396,7 +396,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //grid->addMultiCellWidget( rb, 1, 1, 1, 2 ); grid->addWidget( m_prbNone, 1, 0 ); TQWhatsThis::add( m_prbNone, i18n("The selected action will not be associated with any key.") ); - connect( m_prbNone, TQT_SIGNAL(clicked()), TQT_SLOT(slotNoKey()) ); + connect( m_prbNone, TQ_SIGNAL(clicked()), TQ_SLOT(slotNoKey()) ); m_prbDef = new TQRadioButton( i18n("default key", "De&fault"), d->fCArea ); d->kbGroup->insert( m_prbDef, DefaultKey ); @@ -404,7 +404,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //grid->addMultiCellWidget( rb, 2, 2, 1, 2 ); grid->addWidget( m_prbDef, 1, 1 ); TQWhatsThis::add( m_prbDef, i18n("This will bind the default key to the selected action. Usually a reasonable choice.") ); - connect( m_prbDef, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultKey()) ); + connect( m_prbDef, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultKey()) ); m_prbCustom = new TQRadioButton( i18n("C&ustom"), d->fCArea ); d->kbGroup->insert( m_prbCustom, CustomKey ); @@ -413,16 +413,16 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) grid->addWidget( m_prbCustom, 1, 2 ); TQWhatsThis::add( m_prbCustom, i18n("If this option is selected you can create a customized key binding for the" " selected action using the buttons below.") ); - connect( m_prbCustom, TQT_SIGNAL(clicked()), TQT_SLOT(slotCustomKey()) ); + connect( m_prbCustom, TQ_SIGNAL(clicked()), TQ_SLOT(slotCustomKey()) ); - //connect( d->kbGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( keyMode( int ) ) ); + //connect( d->kbGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( keyMode( int ) ) ); TQBoxLayout *pushLayout = new TQHBoxLayout( KDialog::spacingHint() ); grid->addLayout( pushLayout, 1, 3 ); d->pbtnShortcut = new KKeyButton(d->fCArea, "key"); d->pbtnShortcut->setEnabled( false ); - connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(capturedShortcut(const TDEShortcut&)) ); + connect( d->pbtnShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(capturedShortcut(const TDEShortcut&)) ); grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 ); wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, " @@ -451,7 +451,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //d->stdDict->setAutoDelete( true ); //if (type == Application || type == ApplicationGlobal) // readStdKeys(); - connect( kapp, TQT_SIGNAL( settingsChanged( int )), TQT_SLOT( slotSettingsChanged( int ))); + connect( kapp, TQ_SIGNAL( settingsChanged( int )), TQ_SLOT( slotSettingsChanged( int ))); if( allChoosers == NULL ) allChoosers = allChoosersDeleter.setObject( allChoosers, new TQValueList< KKeyChooser* > ); allChoosers->append( this ); @@ -1092,7 +1092,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts { m_pKeyChooser = new KKeyChooser( this, type, bAllowLetterShortcuts ); setMainWidget( m_pKeyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_pKeyChooser, TQ_SLOT(allDefault()) ); TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); @@ -1104,7 +1104,7 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char { m_pKeyChooser = new KKeyChooser( this, KKeyChooser::Application, bAllowLetterShortcuts ); setMainWidget( m_pKeyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_pKeyChooser, TQ_SLOT(allDefault()) ); TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h index af395682e..bbfa07f59 100644 --- a/tdeui/kkeydialog.h +++ b/tdeui/kkeydialog.h @@ -57,7 +57,7 @@ class KKeyChooserItem; */ class TDEUI_EXPORT KKeyChooser : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum ActionType { Application, ApplicationGlobal, Standard, Global }; @@ -273,7 +273,7 @@ typedef KKeyChooser KKeyChooser; */ class TDEUI_EXPORT KKeyDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/klanguagebutton.cpp b/tdeui/klanguagebutton.cpp index abbc4f5d3..ff6695dec 100644 --- a/tdeui/klanguagebutton.cpp +++ b/tdeui/klanguagebutton.cpp @@ -172,10 +172,10 @@ void KLanguageButton::insertSubmenu( const TQIconSet & icon, checkInsertPos( pi, text, index ); pi->insertItem( icon, text, p, count(), index ); m_ids->append( id ); - connect( p, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( p, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SLOT( slotHighlighted( int ) ) ); + connect( p, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( p, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SLOT( slotHighlighted( int ) ) ); } void KLanguageButton::insertSubmenu( const TQString &text, const TQString &id, @@ -218,10 +218,10 @@ void KLanguageButton::clear() d->button->setPopup( m_popup ); - connect( m_popup, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( m_popup, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( slotHighlighted( int ) ) ); + connect( m_popup, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( m_popup, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( slotHighlighted( int ) ) ); if ( !d->staticText ) { diff --git a/tdeui/klanguagebutton.h b/tdeui/klanguagebutton.h index e13ad9566..c6bb122c5 100644 --- a/tdeui/klanguagebutton.h +++ b/tdeui/klanguagebutton.h @@ -46,7 +46,7 @@ class TQPopupMenu; */ class TDEUI_EXPORT KLanguageButton : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp index 6b29ac0ca..4f12ec12e 100644 --- a/tdeui/kled.cpp +++ b/tdeui/kled.cpp @@ -225,7 +225,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn with a thin gray "border" (pen) - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); pen.setWidth( scale ); @@ -280,7 +280,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -328,7 +328,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp color = colorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing - brush.setStyle( Qt::NoBrush ); // Switch off the brush + brush.setStyle( TQt::NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse paint.drawEllipse( 2, 2, width, width ); @@ -376,7 +376,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -421,7 +421,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp // from the upper left. pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs? - brush.setStyle( (Qt::BrushStyle)NoBrush ); // Switch off the brush + brush.setStyle( (TQt::BrushStyle)NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse // Set the initial color value to colorGroup().light() (bright) and start @@ -494,8 +494,8 @@ KLed::paintRectFrame(bool raised) TQBrush darkBrush(d->offcolor); int w=width(); int h=height(); - TQColor black=Qt::black; - TQColor white=Qt::white; + TQColor black=TQt::black; + TQColor white=TQt::white; // ----- if(raised) { diff --git a/tdeui/kled.h b/tdeui/kled.h index 7307be06a..5bca61467 100644 --- a/tdeui/kled.h +++ b/tdeui/kled.h @@ -44,7 +44,7 @@ class TQColor; */ class TDEUI_EXPORT KLed : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( State Shape Look ) TQ_PROPERTY( State state READ state WRITE setState ) TQ_PROPERTY( Shape shape READ shape WRITE setShape ) @@ -236,7 +236,7 @@ public: * in OFF state. * Defaults to 300. * - * @see QColor + * @see TQColor * * @param darkfactor sets the factor to darken the LED. * @short sets the factor to darken the LED. diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index 92afc91fd..c1fc7d8f0 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -136,13 +136,13 @@ void KLineEdit::init() d->autoSuggest = (mode == TDEGlobalSettings::CompletionMan || mode == TDEGlobalSettings::CompletionPopupAuto || mode == TDEGlobalSettings::CompletionAuto); - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotRestoreSelectionColors())); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotRestoreSelectionColors())); TQPalette p = palette(); if ( !d->previousHighlightedTextColor.isValid() ) - d->previousHighlightedTextColor=p.color(TQPalette::Normal,TQColorGroup::HighlightedText); + d->previousHighlightedTextColor=p.color(TQPalette::Active,TQColorGroup::HighlightedText); if ( !d->previousHighlightColor.isValid() ) - d->previousHighlightColor=p.color(TQPalette::Normal,TQColorGroup::Highlight); + d->previousHighlightColor=p.color(TQPalette::Active,TQColorGroup::Highlight); d->drawClickMsg = false; } @@ -420,10 +420,10 @@ bool KLineEdit::copySqueezedText(bool clipboard) const return false; TQString t = d->squeezedText; t = t.mid(start, end - start); - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection ); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, - TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, + TQ_SLOT(clipboardChanged()) ); return true; } return false; @@ -526,7 +526,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { KeyBindingMap keys = getKeyBindings(); TDEGlobalSettings::Completion mode = completionMode(); - bool noModifier = (e->state() == Qt::NoButton || + bool noModifier = (e->state() == TQt::NoButton || e->state() == TQt::ShiftButton || e->state() == TQt::Keypad); @@ -536,7 +536,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { if ( !d->userSelection && hasSelectedText() && ( e->key() == Key_Right || e->key() == Key_Left ) && - e->state()== Qt::NoButton ) + e->state()== TQt::NoButton ) { TQString old_txt = text(); d->disableRestoreSelection = true; @@ -817,18 +817,18 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { possibleTripleClick=true; TQTimer::singleShot( TQApplication::doubleClickInterval(),this, - TQT_SLOT(tripleClickTimeout()) ); + TQ_SLOT(tripleClickTimeout()) ); } TQLineEdit::mouseDoubleClickEvent( e ); } void KLineEdit::mousePressEvent( TQMouseEvent* e ) { - if ( possibleTripleClick && e->button() == Qt::LeftButton ) + if ( possibleTripleClick && e->button() == TQt::LeftButton ) { selectAll(); e->accept(); @@ -841,7 +841,7 @@ void KLineEdit::mouseReleaseEvent( TQMouseEvent* e ) { TQLineEdit::mouseReleaseEvent( e ); if (TQApplication::clipboard()->supportsSelection() ) { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { // Fix copying of squeezed text if needed copySqueezedText( false ); } @@ -879,8 +879,8 @@ TQPopupMenu *KLineEdit::createPopupMenu() if ( compObj() && !isReadOnly() && kapp->authorize("lineedit_text_completion") ) { TQPopupMenu *subMenu = new TQPopupMenu( popup ); - connect( subMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( completionMenuActivated( int ) ) ); + connect( subMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( completionMenuActivated( int ) ) ); popup->insertSeparator(); popup->insertItem( SmallIconSet("completion"), i18n("Text Completion"), @@ -1006,12 +1006,12 @@ void KLineEdit::dropEvent(TQDropEvent *e) bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if( o == this ) { - KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev ); + KCursor::autoHideEventFilter( this, ev ); if ( ev->type() == TQEvent::AccelOverride ) { - TQKeyEvent *e = TQT_TQKEYEVENT( ev ); + TQKeyEvent *e = static_cast<TQKeyEvent*>( ev ); if (overrideAccel (e)) { e->accept(); @@ -1020,14 +1020,14 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) } else if( ev->type() == TQEvent::KeyPress ) { - TQKeyEvent *e = TQT_TQKEYEVENT( ev ); + TQKeyEvent *e = static_cast<TQKeyEvent*>( ev ); - if( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) + if( e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter ) { bool trap = d->completionBox && d->completionBox->isVisible(); bool stopEvent = trap || (d->grabReturnKeyEvents && - (e->state() == Qt::NoButton || + (e->state() == TQt::NoButton || e->state() == TQt::Keypad)); // Qt will emit returnPressed() itself if we return false @@ -1088,14 +1088,12 @@ void KLineEdit::setCompletionBox( TDECompletionBox *box ) d->completionBox = box; if ( handleSignals() ) { - connect( d->completionBox, TQT_SIGNAL(highlighted( const TQString& )), - TQT_SLOT(setTextWorkaround( const TQString& )) ); - connect( d->completionBox, TQT_SIGNAL(userCancelled( const TQString& )), - TQT_SLOT(userCancelled( const TQString& )) ); - - // TODO: we need our own slot, and to call setModified(true) if Qt4 has that. - connect( d->completionBox, TQT_SIGNAL( activated( const TQString& )), - TQT_SIGNAL(completionBoxActivated( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL(highlighted( const TQString& )), + TQ_SLOT(setTextWorkaround( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL(userCancelled( const TQString& )), + TQ_SLOT(userCancelled( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL( activated( const TQString& )), + TQ_SIGNAL(completionBoxActivated( const TQString& )) ); } } @@ -1182,7 +1180,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) int key = e->key(); ButtonState state = e->state(); if ((key == Key_Backtab || key == Key_Tab) && - (state == Qt::NoButton || (state & TQt::ShiftButton))) + (state == TQt::NoButton || (state & TQt::ShiftButton))) { return true; } @@ -1273,12 +1271,12 @@ void KLineEdit::setCompletionObject( TDECompletion* comp, bool hsig ) { TDECompletion *oldComp = compObj(); if ( oldComp && handleSignals() ) - disconnect( oldComp, TQT_SIGNAL( matches( const TQStringList& )), - this, TQT_SLOT( setCompletedItems( const TQStringList& ))); + disconnect( oldComp, TQ_SIGNAL( matches( const TQStringList& )), + this, TQ_SLOT( setCompletedItems( const TQStringList& ))); if ( comp && hsig ) - connect( comp, TQT_SIGNAL( matches( const TQStringList& )), - this, TQT_SLOT( setCompletedItems( const TQStringList& ))); + connect( comp, TQ_SIGNAL( matches( const TQStringList& )), + this, TQ_SLOT( setCompletedItems( const TQStringList& ))); TDECompletionBase::setCompletionObject( comp, hsig ); } diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h index 82179fa05..6c56d6a3a 100644 --- a/tdeui/klineedit.h +++ b/tdeui/klineedit.h @@ -99,7 +99,7 @@ class KURL; * KLineEdit *edit = new KLineEdit( this, "mywidget" ); * TDECompletion *comp = edit->completionObject(); * // Connect to the return pressed signal - optional - * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(edit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * To use a customized completion objects or your @@ -110,7 +110,7 @@ class KURL; * KURLCompletion *comp = new KURLCompletion(); * edit->setCompletionObject( comp ); * // Connect to the return pressed signal - optional - * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(edit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * Note if you specify your own completion object you have to either delete @@ -127,7 +127,7 @@ class KURL; * edit->setHandleSignals( false ); * * // Set your own key-bindings for a text completion mode. - * edit->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End ); + * edit->setKeyBinding( TDECompletionBase::TextCompletion, TQt::End ); * * // Hide the context (popup) menu * edit->setContextMenuEnabled( false ); @@ -146,7 +146,7 @@ class TDEUI_EXPORT KLineEdit : public TQLineEdit, public TDECompletionBase { friend class KComboBox; - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled ) TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled ) TQ_PROPERTY( bool trapEnterKeyEvent READ trapReturnKey WRITE setTrapReturnKey ) diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp index 8fc0a9a4f..9bdd429ce 100644 --- a/tdeui/klineeditdlg.cpp +++ b/tdeui/klineeditdlg.cpp @@ -46,12 +46,12 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, edit = new KLineEdit( plainPage(), 0L ); edit->setMinimumWidth(edit->sizeHint().width() * 3); label->setBuddy(edit); // please "scheck" style - // connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); - connect( edit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&)) ); + // connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(accept()) ); + connect( edit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&)) ); topLayout->addWidget( edit, 1 ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) ); edit->setText( _value ); if ( _value.isEmpty() ) { @@ -76,7 +76,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, edit = new KLineEdit( this, 0L ); edit->setMinimumWidth(edit->sizeHint().width() * 3); - connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(accept()) ); if ( _file_mode ) { completion = new KURLCompletion(); @@ -91,8 +91,8 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, if (_file_mode) { TQPushButton *browse = new TQPushButton(i18n("&Browse..."), this); layout->addWidget(browse, 1, 2, AlignCenter); - connect(browse, TQT_SIGNAL(clicked()), - TQT_SLOT(slotBrowse())); + connect(browse, TQ_SIGNAL(clicked()), + TQ_SLOT(slotBrowse())); } TQFrame *hLine = new TQFrame(this); @@ -104,17 +104,17 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, TQPushButton *ok = bBox->addButton(KStdGuiItem::ok()); ok->setDefault(true); - connect( ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect( ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); bBox->addStretch(1); TQPushButton *clear = bBox->addButton(KStdGuiItem::clear()); - connect( clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClear())); + connect( clear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClear())); bBox->addStretch(1); TQPushButton *cancel = bBox->addButton(KStdGuiItem::cancel()); - connect( cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect( cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); bBox->layout(); diff --git a/tdeui/klineeditdlg.h b/tdeui/klineeditdlg.h index efa4b4a4a..e0b609dcd 100644 --- a/tdeui/klineeditdlg.h +++ b/tdeui/klineeditdlg.h @@ -39,7 +39,7 @@ class TQValidator; class TDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Create a dialog that asks for a single line of text. _value is diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 46f7f2b5c..0820fd29b 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -298,9 +298,9 @@ void KIntNumInput::init(int val, int _base) if (_base != 10) m_spin->setValidator(new KIntValidator(this, _base, "KNumInput::KIntValidtr")); - connect(m_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinValueChanged(int))); - connect(this, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotEmitRelativeValueChanged(int))); + connect(m_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinValueChanged(int))); + connect(this, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotEmitRelativeValueChanged(int))); setFocusProxy(m_spin); layout(true); @@ -344,10 +344,10 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider) m_slider->setRange(lower, upper); else { m_slider = new TQSlider(lower, upper, step, m_spin->value(), - Qt::Horizontal, this); + TQt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), - m_spin, TQT_SLOT(setValue(int))); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), + m_spin, TQ_SLOT(setValue(int))); } // calculate (upper-lower)/10 without overflowing int's: @@ -616,10 +616,10 @@ void KDoubleNumInput::init(double value, double lower, double upper, d->spin = new KDoubleSpinBox( lower, upper, step, value, precision, this, "KDoubleNumInput::d->spin" ); setFocusProxy(d->spin); - connect( d->spin, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(valueChanged(double)) ); - connect( this, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotEmitRelativeValueChanged(double)) ); + connect( d->spin, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(valueChanged(double)) ); + connect( this, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotEmitRelativeValueChanged(double)) ); updateLegacyMembers(); @@ -754,8 +754,8 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, if( m_slider ) { // don't update the slider to avoid an endless recursion TQSpinBox * spin = d->spin; - disconnect(spin, TQT_SIGNAL(valueChanged(int)), - m_slider, TQT_SLOT(setValue(int)) ); + disconnect(spin, TQ_SIGNAL(valueChanged(int)), + m_slider, TQ_SLOT(setValue(int)) ); } d->spin->setRange( lower, upper, step, d->spin->precision() ); @@ -771,14 +771,14 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, m_slider->setValue(slvalue); } else { m_slider = new TQSlider(slmin, slmax, slstep, slvalue, - Qt::Horizontal, this); + TQt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); // feedback line: when one moves, the other moves, too: - connect(m_slider, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(sliderMoved(int)) ); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(sliderMoved(int)) ); } - connect(spin, TQT_SIGNAL(valueChanged(int)), - m_slider, TQT_SLOT(setValue(int)) ); + connect(spin, TQ_SIGNAL(valueChanged(int)), + m_slider, TQ_SLOT(setValue(int)) ); // calculate ( slmax - slmin ) / 10 without overflowing ints: int major = calcDiffByTen( slmax, slmin ); if ( !major ) major = slstep; // ### needed? @@ -901,7 +901,7 @@ class KDoubleSpinBoxValidator : public KDoubleValidator { public: KDoubleSpinBoxValidator( double bottom, double top, int decimals, KDoubleSpinBox* sb, const char *name ) - : KDoubleValidator( bottom, top, decimals, TQT_TQOBJECT(sb), name ), spinBox( sb ) { } + : KDoubleValidator( bottom, top, decimals, sb, name ), spinBox( sb ) { } virtual State validate( TQString& str, int& pos ) const; @@ -1011,10 +1011,10 @@ public: KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->setAlignment( Qt::AlignRight ); + editor()->setAlignment( TQt::AlignRight ); d = new Private(); updateValidator(); - connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)) ); } KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, @@ -1022,11 +1022,11 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->setAlignment( Qt::AlignRight ); + editor()->setAlignment( TQt::AlignRight ); d = new Private(); setRange( lower, upper, step, precision ); setValue( value ); - connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)) ); } KDoubleSpinBox::~KDoubleSpinBox() { diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h index 4716d8051..28ff17d68 100644 --- a/tdeui/knuminput.h +++ b/tdeui/knuminput.h @@ -48,7 +48,7 @@ class KIntSpinBox; */ class TDEUI_EXPORT KNumInput : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString label READ label WRITE setLabel ) public: @@ -187,7 +187,7 @@ private: class TDEUI_EXPORT KIntNumInput : public KNumInput { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int value READ value WRITE setValue ) TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) @@ -213,7 +213,7 @@ public: * * @param value initial value for the control * @param base numeric base used for display - * @param parent parent QWidget + * @param parent parent TQWidget * @param name internal name for this widget */ KIntNumInput(int value, TQWidget* parent=0, int base = 10, const char *name=0); @@ -232,7 +232,7 @@ public: * @param below append KIntNumInput to the KNumInput chain * @param value initial value for the control * @param base numeric base used for display - * @param parent parent QWidget + * @param parent parent TQWidget * @param name internal name for this widget */ KIntNumInput(KNumInput* below, int value, TQWidget* parent=0, int base = 10, const char *name=0); @@ -433,7 +433,7 @@ class KDoubleLine; class TDEUI_EXPORT KDoubleNumInput : public KNumInput { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( double value READ value WRITE setValue ) TQ_PROPERTY( double minValue READ minValue WRITE setMinValue ) @@ -457,7 +457,7 @@ public: * Constructor * * @param value initial value for the control - * @param parent parent QWidget + * @param parent parent TQWidget * @param name internal name for this widget */ KDoubleNumInput(double value, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED; @@ -470,7 +470,7 @@ public: * @param value initial value for the control * @param step step size to use for up/down arrow clicks * @param precision number of digits after the decimal point - * @param parent parent QWidget + * @param parent parent TQWidget * @param name internal name for this widget * @since 3.1 */ @@ -490,7 +490,7 @@ public: * * @param below * @param value initial value for the control - * @param parent parent QWidget + * @param parent parent TQWidget * @param name internal name for this widget **/ KDoubleNumInput(KNumInput* below, double value, TQWidget* parent=0, const char* name=0) KDE_DEPRECATED; @@ -512,7 +512,7 @@ public: * @param value initial value for the control * @param step step size to use for up/down arrow clicks * @param precision number of digits after the decimal point - * @param parent parent QWidget + * @param parent parent TQWidget * @param name internal name for this widget * @since 3.1 */ @@ -706,7 +706,7 @@ private: */ class TDEUI_EXPORT KIntSpinBox : public TQSpinBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int base READ base WRITE setBase ) @@ -836,7 +836,7 @@ private: **/ class TDEUI_EXPORT KDoubleSpinBox : public TQSpinBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers ) TQ_OVERRIDE( double maxValue READ maxValue WRITE setMaxValue ) diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp index 6cf486ad1..62099dd32 100644 --- a/tdeui/knumvalidator.cpp +++ b/tdeui/knumvalidator.cpp @@ -35,7 +35,7 @@ // KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { _base = base; if (_base < 2) _base = 2; @@ -45,7 +45,7 @@ KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) } KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { _base = base; if (_base > 36) _base = 36; @@ -162,7 +162,7 @@ public: KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -170,7 +170,7 @@ KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) } KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -179,7 +179,7 @@ KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, } KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers = localeAware; diff --git a/tdeui/knumvalidator.h b/tdeui/knumvalidator.h index 5c7b31484..fd42a0fa6 100644 --- a/tdeui/knumvalidator.h +++ b/tdeui/knumvalidator.h @@ -179,7 +179,7 @@ class TDEUI_EXPORT KFloatValidator : public TQValidator { **/ class TDEUI_EXPORT KDoubleValidator : public TQDoubleValidator { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers ) public: /** Constuct a locale-aware KDoubleValidator with default range diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp index f88cb5a8a..22ca4428c 100644 --- a/tdeui/kpanelapplet.cpp +++ b/tdeui/kpanelapplet.cpp @@ -94,12 +94,12 @@ void KPanelApplet::positionChange( Position ) popupDirectionChange( popupDirection() ); } -Qt::Orientation KPanelApplet::orientation() const +TQt::Orientation KPanelApplet::orientation() const { if( _position == pTop || _position == pBottom ) { - return Qt::Horizontal; + return TQt::Horizontal; } else { - return Qt::Vertical; + return TQt::Vertical; } } @@ -146,15 +146,15 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch) if (watch) { - if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) == -1) + if (d->watchedForFocus.find(widget) == -1) { - d->watchedForFocus.append(TQT_TQOBJECT(widget)); + d->watchedForFocus.append(widget); widget->installEventFilter(this); } } - else if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) != -1) + else if (d->watchedForFocus.find(widget) != -1) { - d->watchedForFocus.remove(TQT_TQOBJECT(widget)); + d->watchedForFocus.remove(widget); widget->removeEventFilter(this); } } diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index a8729e331..df3bca44b 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -96,7 +96,7 @@ class TQPopupMenu; **/ class TDEUI_EXPORT KPanelApplet : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/kpanelappmenu.h b/tdeui/kpanelappmenu.h index 56131e290..39b6b8e4e 100644 --- a/tdeui/kpanelappmenu.h +++ b/tdeui/kpanelappmenu.h @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class TDEUI_EXPORT KPanelAppMenu : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a new menu with the given title. diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp index 31fbd4343..d332ba2a1 100644 --- a/tdeui/kpanelextension.cpp +++ b/tdeui/kpanelextension.cpp @@ -98,12 +98,12 @@ void KPanelExtension::action( Action a ) reportBug(); } -Qt::Orientation KPanelExtension::orientation() +TQt::Orientation KPanelExtension::orientation() { if (_position == Left || _position == Right) - return Qt::Vertical; + return TQt::Vertical; else - return Qt::Horizontal; + return TQt::Horizontal; } KPanelExtension::Size KPanelExtension::sizeSetting() const diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index f97e85482..2c817ae39 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -96,7 +96,7 @@ class KPanelExtensionPrivate; **/ class TDEUI_EXPORT KPanelExtension : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp index 287208b66..f2a3d8f08 100644 --- a/tdeui/kpanelmenu.cpp +++ b/tdeui/kpanelmenu.cpp @@ -59,8 +59,8 @@ void KPanelMenu::init(const TQString& path) setInitialized( false ); d->startPath = path; - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); // setup cache timer TDEConfig *config = TDEGlobal::config(); @@ -99,8 +99,8 @@ void KPanelMenu::hideEvent(TQHideEvent *ev) { // start the cache timer if(d->clearDelay) { - disconnect(&(d->t), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClear())); - connect(&(d->t), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClear())); + disconnect(&(d->t), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClear())); + connect(&(d->t), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClear())); d->t.start(d->clearDelay, true); } TQPopupMenu::hideEvent(ev); diff --git a/tdeui/kpanelmenu.h b/tdeui/kpanelmenu.h index 03b700b82..972fb2bc1 100644 --- a/tdeui/kpanelmenu.h +++ b/tdeui/kpanelmenu.h @@ -52,7 +52,7 @@ class KPanelMenuPrivate; */ class TDEUI_EXPORT KPanelMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 38f63484f..c34801777 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -230,12 +230,12 @@ void KPasswordDialog::init() lbl->setPixmap(pix); lbl->setAlignment(AlignHCenter|AlignVCenter); lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter); + m_pGrid->addWidget(lbl, 0, 0, TQt::AlignCenter); } m_pHelpLbl = new TQLabel(m_pMain); m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak); - m_pGrid->addWidget(m_pHelpLbl, 0, 2, (TQ_Alignment)AlignLeft); + m_pGrid->addWidget(m_pHelpLbl, 0, 2, TQt::AlignLeft); m_pGrid->addRowSpacing(1, 10); m_pGrid->setRowStretch(1, 12); @@ -248,7 +248,7 @@ void KPasswordDialog::init() lbl->setAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Password:")); lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft); + m_pGrid->addWidget(lbl, 7, 0, TQt::AlignLeft); TQHBoxLayout *h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 7, 2); @@ -277,9 +277,9 @@ void KPasswordDialog::init() m_Keep = 0; m_keepWarnLbl->hide(); } - connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool))); - m_pGrid->addWidget(cb, 9, 2, (TQ_Alignment)(AlignLeft|AlignVCenter)); -// m_pGrid->addWidget(m_keepWarnLbl, 13, 2, (TQ_Alignment)(AlignLeft|AlignVCenter)); + connect(cb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeep(bool))); + m_pGrid->addWidget(cb, 9, 2, TQt::AlignLeft|TQt::AlignVCenter); +// m_pGrid->addWidget(m_keepWarnLbl, 13, 2, TQt::AlignLeft|TQt::AlignVCenter); m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3); } else if (m_Type == NewPassword) { m_pGrid->addRowSpacing(8, 10); @@ -287,7 +287,7 @@ void KPasswordDialog::init() lbl->setAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Verify:")); lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft); + m_pGrid->addWidget(lbl, 9, 0, TQt::AlignLeft); h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 9, 2); @@ -330,8 +330,8 @@ void KPasswordDialog::init() d->m_MatchLabel->setText(i18n("Passwords do not match")); - connect( m_pEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(enableOkBtn()) ); - connect( m_pEdit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(enableOkBtn()) ); + connect( m_pEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(enableOkBtn()) ); + connect( m_pEdit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(enableOkBtn()) ); enableOkBtn(); } @@ -381,12 +381,12 @@ void KPasswordDialog::addLine(TQString key, TQString value) TQLabel *lbl = new TQLabel(key, m_pMain); lbl->setAlignment(AlignLeft|AlignTop); lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft); + m_pGrid->addWidget(lbl, m_Row+2, 0, TQt::AlignLeft); lbl = new TQLabel(value, m_pMain); lbl->setAlignment(AlignTop|WordBreak); lbl->setFixedSize(275, lbl->heightForWidth(275)); - m_pGrid->addWidget(lbl, m_Row+2, 2, (TQ_Alignment)AlignLeft); + m_pGrid->addWidget(lbl, m_Row+2, 2, TQt::AlignLeft); ++m_Row; } @@ -446,7 +446,7 @@ void KPasswordDialog::slotKeep(bool keep) else { m_keepWarnLbl->hide(); } - TQTimer::singleShot(0, this, SLOT(slotLayout())); + TQTimer::singleShot(0, this, TQ_SLOT(slotLayout())); } m_Keep = keep; diff --git a/tdeui/kpassdlg.h b/tdeui/kpassdlg.h index 9272e63c3..039f1c506 100644 --- a/tdeui/kpassdlg.h +++ b/tdeui/kpassdlg.h @@ -38,7 +38,7 @@ class TQWidget; class TDEUI_EXPORT KPasswordEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT public: enum EchoModes { OneStar, ThreeStars, NoEcho }; @@ -150,7 +150,7 @@ private: class TDEUI_EXPORT KPasswordDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index ce6126314..eb626a767 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -25,7 +25,7 @@ #include <tdeglobalsettings.h> #include "config.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <netwm.h> #endif @@ -96,8 +96,8 @@ void KPassivePopup::init( int popupStyle ) setPalette(TQToolTip::palette()); setAutoMask(TRUE); } - connect( hideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( hide() ) ); - connect( this, TQT_SIGNAL( clicked() ), TQT_SLOT( hide() ) ); + connect( hideTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( hide() ) ); + connect( this, TQ_SIGNAL( clicked() ), TQ_SLOT( hide() ) ); } KPassivePopup::~KPassivePopup() @@ -143,7 +143,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption, TQString sizedCaption = caption; TQString sizedText = text; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int max_width; NETRootInfo info( tqt_xdisplay(), @@ -172,13 +172,13 @@ TQVBox * KPassivePopup::standardView(const TQString& caption, if ( !sizedCaption.isEmpty() ) { ttl = new TQLabel( sizedCaption, hb ? hb : vb, "title_label" ); TQFont fnt = ttl->font(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 truncateStringToFit(sizedCaption, fnt, max_width); ttl->setText(sizedCaption); #endif fnt.setBold( true ); ttl->setFont( fnt ); - ttl->setAlignment( Qt::AlignHCenter ); + ttl->setAlignment( TQt::AlignHCenter ); if ( hb ) { hb->setStretchFactor( ttl, 10 ); // enforce centering } @@ -186,7 +186,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption, if ( !sizedText.isEmpty() ) { msg = new TQLabel( sizedText, vb, "msg_label" ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQStringList textLines = TQStringList::split("\n", sizedText, true); for (TQStringList::Iterator it = textLines.begin(); it != textLines.end(); ++it) { truncateStringToFit(*it, msg->font(), max_width); @@ -295,7 +295,7 @@ void KPassivePopup::hideEvent( TQHideEvent * ) TQRect KPassivePopup::defaultArea() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::NumberOfDesktops | NET::CurrentDesktop | @@ -317,7 +317,7 @@ void KPassivePopup::positionSelf() { TQRect target; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( !window ) { target = defaultArea(); } @@ -442,7 +442,7 @@ void KPassivePopup::updateMask() TQBitmap mask( width(), height(), true ); TQPainter p( &mask ); - TQBrush brush( Qt::white, Qt::SolidPattern ); + TQBrush brush( TQt::white, TQt::SolidPattern ); p.setBrush( brush ); int i = 0, z = 0; diff --git a/tdeui/kpassivepopup.h b/tdeui/kpassivepopup.h index 89a05a671..bc1b9ed1c 100644 --- a/tdeui/kpassivepopup.h +++ b/tdeui/kpassivepopup.h @@ -65,7 +65,7 @@ class TQVBox; */ class TDEUI_EXPORT KPassivePopup : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete ) TQ_PROPERTY (int timeout READ timeout WRITE setTimeout ) diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp index 47f6c405f..74d3c64b1 100644 --- a/tdeui/kpixmapio.cpp +++ b/tdeui/kpixmapio.cpp @@ -28,7 +28,7 @@ #include <sys/shm.h> #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -51,7 +51,7 @@ struct KPixmapIOPrivate int threshold; int bpp; int byteorder; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XImage *ximage; #ifdef HAVE_MITSHM XShmSegmentInfo *shminfo; @@ -664,7 +664,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) { uchar *src; TQ_INT32 val, *dst; - TQRgb pixel, *clut = img.tqcolorTable(); + TQRgb pixel, *clut = img.colorTable(); for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); @@ -721,7 +721,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) { uchar *src; TQ_INT32 val, *dst; - TQRgb pixel, *clut = img.tqcolorTable(); + TQRgb pixel, *clut = img.colorTable(); for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); @@ -780,7 +780,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) { uchar *src, *dst; int w1 = width/4; - TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4; + TQRgb *clut = img.colorTable(), d1, d2, d3, d4; for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); @@ -841,7 +841,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) { uchar *src, *dst; int w1 = width/4; - TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4; + TQRgb *clut = img.colorTable(), d1, d2, d3, d4; for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); @@ -878,7 +878,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) } else { uchar *src; - TQRgb *dst, *clut = img.tqcolorTable(); + TQRgb *dst, *clut = img.colorTable(); for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp index 7083dac72..43cfa311d 100644 --- a/tdeui/kpixmapregionselectorwidget.cpp +++ b/tdeui/kpixmapregionselectorwidget.cpp @@ -110,7 +110,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() painter.begin(&m_linedPixmap); painter.setRasterOp( TQt::XorROP ); painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), - TQBrush( TQColor(255,255,255), Qt::BDiagPattern) ); + TQBrush( TQColor(255,255,255), TQt::BDiagPattern) ); painter.end(); TQImage image=m_linedPixmap.convertToImage(); @@ -141,13 +141,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), - TQT_TQOBJECT(popup), "rotateclockwise"); + 0, this, TQ_SLOT(rotateClockwise()), + popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), - TQT_TQOBJECT(popup), "rotatecounterclockwise"); + 0, this, TQ_SLOT(rotateCounterclockwise()), + popup, "rotatecounterclockwise"); action->plug(popup); /* @@ -213,7 +213,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQMouseEvent *mev= (TQMouseEvent *)(ev); //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; - if ( mev->button() == Qt::RightButton ) + if ( mev->button() == TQt::RightButton ) { TDEPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); @@ -227,12 +227,12 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; - cursor.setShape( Qt::SizeAllCursor ); + cursor.setShape( TQt::SizeAllCursor ); } else { m_state=Resizing; - cursor.setShape( Qt::CrossCursor ); + cursor.setShape( TQt::CrossCursor ); } TQApplication::setOverrideCursor(cursor); @@ -426,7 +426,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) { /* We have to resize the pixmap to get it complete on the screen */ TQImage image=m_originalPixmap.convertToImage(); - m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) ); + m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) ); double oldZoomFactor = m_zoomFactor; m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width(); diff --git a/tdeui/kpixmapregionselectorwidget.h b/tdeui/kpixmapregionselectorwidget.h index 0277a0d10..7d6f37b99 100644 --- a/tdeui/kpixmapregionselectorwidget.h +++ b/tdeui/kpixmapregionselectorwidget.h @@ -43,7 +43,7 @@ class TDEPopupMenu; */ class TDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Constructor for a KPixmapRegionSelectorWidget. diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp index 8fb050a11..701b1f7f7 100644 --- a/tdeui/kprogress.cpp +++ b/tdeui/kprogress.cpp @@ -179,7 +179,7 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name, mMinDuration(2000), d(new KProgressDialogPrivate) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); #endif mShowTimer = new TQTimer(this); @@ -196,9 +196,9 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name, mProgressBar = new KProgress(mainWidget); layout->addWidget(mProgressBar); - connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)), - this, TQT_SLOT(slotAutoActions(int))); - connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); + connect(mProgressBar, TQ_SIGNAL(percentageChanged(int)), + this, TQ_SLOT(slotAutoActions(int))); + connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow())); mShowTimer->start(mMinDuration, true); } diff --git a/tdeui/kprogress.h b/tdeui/kprogress.h index 49dce88c0..ada1f4fc0 100644 --- a/tdeui/kprogress.h +++ b/tdeui/kprogress.h @@ -45,7 +45,7 @@ */ class TDEUI_EXPORT KProgress : public TQProgressBar { - Q_OBJECT + TQ_OBJECT public: /** @@ -186,7 +186,7 @@ private: */ class TDEUI_EXPORT KProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp index 2472207f4..02b60afe4 100644 --- a/tdeui/kprogressbox.cpp +++ b/tdeui/kprogressbox.cpp @@ -67,7 +67,7 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name, mMinDuration(2000), d(new KProgressBoxDialogPrivate) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); #endif mShowTimer = new TQTimer(this); @@ -86,9 +86,9 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name, mTextBox = new KTextEdit(mainWidget); layout->addWidget(mTextBox); - connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)), - this, TQT_SLOT(slotAutoActions(int))); - connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); + connect(mProgressBar, TQ_SIGNAL(percentageChanged(int)), + this, TQ_SLOT(slotAutoActions(int))); + connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow())); mShowTimer->start(mMinDuration, true); } diff --git a/tdeui/kprogressbox.h b/tdeui/kprogressbox.h index 448b37abe..5d9f3bd8b 100644 --- a/tdeui/kprogressbox.h +++ b/tdeui/kprogressbox.h @@ -53,7 +53,7 @@ */ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 6f994dbe3..3c73de83e 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -106,8 +106,8 @@ void KPushButton::init( const KGuiItem &item ) if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), - TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), + TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } } @@ -193,7 +193,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e ) return; } - if ( (e->state() & Qt::LeftButton) && + if ( (e->state() & TQt::LeftButton) && (e->pos() - startPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h index ee7bb3b52..44f174da9 100644 --- a/tdeui/kpushbutton.h +++ b/tdeui/kpushbutton.h @@ -36,7 +36,7 @@ class TQDragObject; */ class TDEUI_EXPORT KPushButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(int stdItem READ guiItm WRITE setGuiItm ) TQ_PROPERTY(bool isDragEnabled READ isDragEnabled WRITE setDragEnabled) diff --git a/tdeui/krestrictedline.h b/tdeui/krestrictedline.h index 142bd5444..26af032b8 100644 --- a/tdeui/krestrictedline.h +++ b/tdeui/krestrictedline.h @@ -43,7 +43,7 @@ */ class TDEUI_EXPORT KRestrictedLine : public KLineEdit { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString validChars READ validChars WRITE setValidChars ) public: @@ -85,7 +85,7 @@ protected: private: /// TQString of valid characters for this line - QString qsValidChars; + TQString qsValidChars; protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp index 517821ea1..5a0923566 100644 --- a/tdeui/krootpixmap.cpp +++ b/tdeui/krootpixmap.cpp @@ -37,7 +37,7 @@ class KRootPixmapData { public: TQWidget *toplevel; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWinModule *twin; #endif }; @@ -67,14 +67,14 @@ void KRootPixmap::init() m_bActive = false; m_bCustomPaint = false; - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); -#ifdef Q_WS_X11 - connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint())); +#ifdef TQ_WS_X11 + connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); d->twin = new KWinModule( this ); - connect(d->twin, TQT_SIGNAL(windowChanged(WId, unsigned int)), TQT_SLOT(desktopChanged(WId, unsigned int))); - connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int))); + connect(d->twin, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int))); + connect(d->twin, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(desktopChanged(int))); #endif d->toplevel = m_pWidget->topLevelWidget(); @@ -91,7 +91,7 @@ KRootPixmap::~KRootPixmap() int KRootPixmap::currentDesktop() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop ); rinfo.activate(); return rinfo.currentDesktop(); @@ -187,7 +187,7 @@ void KRootPixmap::desktopChanged(int desktop) !wallpaperForDesktop(m_Desk).isNull()) return; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops && pixmapName(m_Desk) != pixmapName(desktop)) #endif @@ -196,7 +196,7 @@ void KRootPixmap::desktopChanged(int desktop) void KRootPixmap::desktopChanged( WId window, unsigned int properties ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( !(properties & NET::WMDesktop) || (window != m_pWidget->topLevelWidget()->winId())) return; @@ -232,7 +232,7 @@ void KRootPixmap::repaint(bool force) return; } m_Rect = TQRect(p1, p2); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 m_Desk = KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop(); if ((m_Desk == NET::OnAllDesktops) || (m_Desk == 0)) { m_Desk = currentDesktop(); @@ -254,7 +254,7 @@ void KRootPixmap::repaint(bool force) bool KRootPixmap::isAvailable() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 return m_pPixmap->isAvailable(pixmapName(m_Desk)); #else return m_pPixmap->isNull(); @@ -263,7 +263,7 @@ bool KRootPixmap::isAvailable() const TQString KRootPixmap::pixmapName(int desk) { TQString pattern = TQString("DESKTOP%1"); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int screen_number = DefaultScreen(tqt_xdisplay()); if (screen_number) { pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1"; @@ -275,7 +275,7 @@ TQString KRootPixmap::pixmapName(int desk) { void KRootPixmap::enableExports() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdDebug(270) << k_lineinfo << "activating background exports.\n"; DCOPClient *client = kapp->dcopClient(); if (!client->isAttached()) diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h index 5f279be6d..485580fbb 100644 --- a/tdeui/krootpixmap.h +++ b/tdeui/krootpixmap.h @@ -15,7 +15,7 @@ #include <tqcolor.h> #include <tdelibs_export.h> -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME class TQRect; class TQWidget; @@ -45,7 +45,7 @@ class KRootPixmapData; */ class TDEUI_EXPORT KRootPixmap: public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -235,6 +235,6 @@ private: void init(); }; -#endif // ! Q_WS_QWS +#endif // ! TQ_WS_QWS #endif // __KRootPixmap_h_Included__ diff --git a/tdeui/kruler.cpp b/tdeui/kruler.cpp index fed264981..eac7d8c99 100644 --- a/tdeui/kruler.cpp +++ b/tdeui/kruler.cpp @@ -94,7 +94,7 @@ public: KRuler::KRuler(TQWidget *parent, const char *name) : TQFrame(parent, name), range(INIT_MIN_VALUE, INIT_MAX_VALUE, 1, 10, INIT_VALUE), - dir(Qt::Horizontal) + dir(TQt::Horizontal) { init(); setFixedHeight(FIX_WIDTH); @@ -108,7 +108,7 @@ KRuler::KRuler(Orientation orient, dir(orient) { init(); - if (orient == Qt::Horizontal) + if (orient == TQt::Horizontal) setFixedHeight(FIX_WIDTH); else setFixedWidth(FIX_WIDTH); @@ -123,7 +123,7 @@ KRuler::KRuler(Orientation orient, int widgetWidth, { init(); - if (orient == Qt::Horizontal) + if (orient == TQt::Horizontal) setFixedHeight(widgetWidth); else setFixedWidth(widgetWidth); @@ -362,7 +362,7 @@ KRuler::setEndLabel(const TQString& label) endlabel = label; // premeasure the fontwidth and save it - if (dir == Qt::Vertical) { + if (dir == TQt::Vertical) { TQFont font = this->font(); font.setPointSize(LABEL_SIZE); TQFontMetrics fm(font); @@ -551,7 +551,7 @@ KRuler::slotNewValue(int _value) } // get the rectangular of the old and the new ruler pointer // and repaint only him - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { TQRect oldrec(-5+oldvalue,10, 11,6); TQRect newrec(-5+_value,10, 11,6); repaint( oldrec.unite(newrec) ); @@ -604,7 +604,7 @@ KRuler::drawContents(TQPainter *p) int value = range.value(), minval = range.minValue(), maxval; - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { maxval = range.maxValue() + offset_ - (d->lengthFix?(height()-d->endOffset_length):d->endOffset_length); @@ -636,7 +636,7 @@ KRuler::drawContents(TQPainter *p) // draw endlabel if (d->showEndL) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->translate( fontOffset, 0 ); p->drawText( END_LABEL_X, END_LABEL_Y, endlabel ); } @@ -659,7 +659,7 @@ KRuler::drawContents(TQPainter *p) if (showtm) { fend = ppm*tmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine((int)f, BASE_MARK_X1, (int)f, BASE_MARK_X2); } else { @@ -671,7 +671,7 @@ KRuler::drawContents(TQPainter *p) // draw the little marks fend = ppm*lmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2); } else { @@ -683,7 +683,7 @@ KRuler::drawContents(TQPainter *p) // draw medium marks fend = ppm*mmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2); } else { @@ -695,7 +695,7 @@ KRuler::drawContents(TQPainter *p) // draw big marks fend = ppm*bmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2); } else { @@ -705,7 +705,7 @@ KRuler::drawContents(TQPainter *p) } if (showem) { // draw end marks - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { p->drawLine(minval-offset_, END_MARK_X1, minval-offset_, END_MARK_X2); p->drawLine(maxval-offset_, END_MARK_X1, maxval-offset_, END_MARK_X2); } @@ -718,7 +718,7 @@ KRuler::drawContents(TQPainter *p) // draw pointer if (d->showpointer) { TQPointArray pa(4); - if (dir == Qt::Horizontal) { + if (dir == TQt::Horizontal) { pa.setPoints(3, value-5, 10, value+5, 10, value/*+0*/,15); } else { diff --git a/tdeui/kruler.h b/tdeui/kruler.h index 2ad699b5e..c962fd947 100644 --- a/tdeui/kruler.h +++ b/tdeui/kruler.h @@ -69,7 +69,7 @@ */ class TDEUI_EXPORT KRuler : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) TQ_PROPERTY( int value READ value WRITE setValue ) diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index cb211e4df..8256ad72a 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -101,18 +101,18 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, TQGridLayout *glay = new TQGridLayout( this, 6, 3, 0, KDialog::spacingHint() ); cb1 = new TQCheckBox( i18n("Create &root/affix combinations" " not in dictionary"), this, "NoRootAffix" ); - connect( cb1, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sNoAff(bool)) ); + connect( cb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sNoAff(bool)) ); glay->addMultiCellWidget( cb1, 0, 0, 0, 2 ); cb2 = new TQCheckBox( i18n("Consider run-together &words" " as spelling errors"), this, "RunTogether" ); - connect( cb2, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sRunTogether(bool)) ); + connect( cb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sRunTogether(bool)) ); glay->addMultiCellWidget( cb2, 1, 1, 0, 2 ); dictcombo = new TQComboBox( this, "DictFromList" ); dictcombo->setInsertionPolicy( TQComboBox::NoInsertion ); - connect( dictcombo, TQT_SIGNAL (activated(int)), - this, TQT_SLOT (sSetDictionary(int)) ); + connect( dictcombo, TQ_SIGNAL (activated(int)), + this, TQ_SLOT (sSetDictionary(int)) ); glay->addMultiCellWidget( dictcombo, 2, 2, 1, 2 ); dictlist = new TQLabel( dictcombo, i18n("&Dictionary:"), this ); @@ -136,8 +136,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, encodingcombo->insertItem( "CP1251" ); encodingcombo->insertItem( "CP1255" ); - connect( encodingcombo, TQT_SIGNAL(activated(int)), this, - TQT_SLOT(sChangeEncoding(int)) ); + connect( encodingcombo, TQ_SIGNAL(activated(int)), this, + TQ_SLOT(sChangeEncoding(int)) ); glay->addMultiCellWidget( encodingcombo, 3, 3, 1, 2 ); TQLabel *tmpQLabel = new TQLabel( encodingcombo, i18n("&Encoding:"), this); @@ -149,8 +149,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, clientcombo->insertItem( i18n("Aspell") ); clientcombo->insertItem( i18n("Hspell") ); clientcombo->insertItem( i18n("Zemberek") ); - connect( clientcombo, TQT_SIGNAL (activated(int)), this, - TQT_SLOT (sChangeClient(int)) ); + connect( clientcombo, TQ_SIGNAL (activated(int)), this, + TQ_SLOT (sChangeClient(int)) ); glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 ); tmpQLabel = new TQLabel( clientcombo, i18n("&Client:"), this ); @@ -159,7 +159,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, if( addHelpButton ) { TQPushButton *pushButton = new KPushButton( KStdGuiItem::help(), this ); - connect( pushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(sHelp()) ); + connect( pushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(sHelp()) ); glay->addWidget(pushButton, 5, 2); } @@ -926,7 +926,7 @@ KSpellConfig::sSetDictionary (int i) { setDictionary (langfnames[i]); setDictFromList (true); - TQTimer::singleShot( 0, this, TQT_SIGNAL( configChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SIGNAL( configChanged() ) ); } void diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h index b0ca46fd9..21ce54013 100644 --- a/tdeui/ksconfig.h +++ b/tdeui/ksconfig.h @@ -86,7 +86,7 @@ enum KSpellClients { class TDEUI_EXPORT KSpellConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp index cf37c4403..f0d77be26 100644 --- a/tdeui/kscrollview.cpp +++ b/tdeui/kscrollview.cpp @@ -40,11 +40,11 @@ struct KScrollView::KScrollViewPrivate { bool scrolling; }; -KScrollView::KScrollView( TQWidget *parent, const char *name, Qt::WFlags f ) +KScrollView::KScrollView( TQWidget *parent, const char *name, TQt::WFlags f ) : TQScrollView( parent, name, f ) { d = new KScrollViewPrivate; - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick())); } KScrollView::~KScrollView() diff --git a/tdeui/kscrollview.h b/tdeui/kscrollview.h index 315ea1c81..7082f3dba 100644 --- a/tdeui/kscrollview.h +++ b/tdeui/kscrollview.h @@ -29,10 +29,10 @@ **/ class TDEUI_EXPORT KScrollView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: - KScrollView( TQWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0 ); + KScrollView( TQWidget *parent = 0, const char *name = 0, TQt::WFlags f = 0 ); ~KScrollView(); diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp index c5a4879d8..f97a54080 100644 --- a/tdeui/kseparator.cpp +++ b/tdeui/kseparator.cpp @@ -49,7 +49,7 @@ void KSeparator::setOrientation(int orientation) { switch(orientation) { - case Qt::Vertical: + case TQt::Vertical: case VLine: setFrameStyle( TQFrame::VLine | TQFrame::Sunken ); setMinimumSize(2, 0); @@ -58,7 +58,7 @@ void KSeparator::setOrientation(int orientation) default: kdWarning() << "KSeparator::setOrientation(): invalid orientation, using default orientation HLine" << endl; - case Qt::Horizontal: + case TQt::Horizontal: case HLine: setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); setMinimumSize(0, 2); @@ -95,7 +95,7 @@ void KSeparator::drawFrame(TQPainter *p) } TQStyleOption opt( lineWidth(), midLineWidth() ); - style().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g, + style().drawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g, TQStyle::Style_Sunken, opt ); } diff --git a/tdeui/kseparator.h b/tdeui/kseparator.h index f21c4c99b..908a0d57a 100644 --- a/tdeui/kseparator.h +++ b/tdeui/kseparator.h @@ -32,7 +32,7 @@ */ class TDEUI_EXPORT KSeparator : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int orientation READ orientation WRITE setOrientation ) public: /** diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp index d4d830d57..a6d965dd0 100644 --- a/tdeui/ksharedpixmap.cpp +++ b/tdeui/ksharedpixmap.cpp @@ -20,7 +20,7 @@ #include <tqwindowdefs.h> #include <tqwidget.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <tdeapplication.h> #include <krootprop.h> diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h index 29b7821ff..a77e40683 100644 --- a/tdeui/ksharedpixmap.h +++ b/tdeui/ksharedpixmap.h @@ -16,11 +16,7 @@ #include <kpixmap.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <tqstring.h> #include <tqpixmap.h> @@ -45,7 +41,7 @@ class TDESharedPixmapPrivate; * An example: copy from a shared pixmap: * \code * TDESharedPixmap *pm = new TDESharedPixmap; - * connect(pm, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); + * connect(pm, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); * pm->loadFromShared("My Pixmap"); * \endcode * @@ -57,7 +53,7 @@ class TDEUI_EXPORT TDESharedPixmap: public TQWidget, public KPixmap { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/ksplashscreen.h b/tdeui/ksplashscreen.h index f4d1c22ef..9980cc203 100644 --- a/tdeui/ksplashscreen.h +++ b/tdeui/ksplashscreen.h @@ -40,7 +40,7 @@ class TQPixmap; */ class TDEUI_EXPORT KSplashScreen : public TQSplashScreen { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/ksqueezedtextlabel.h b/tdeui/ksqueezedtextlabel.h index 586c9b27b..2dfa70bec 100644 --- a/tdeui/ksqueezedtextlabel.h +++ b/tdeui/ksqueezedtextlabel.h @@ -44,7 +44,7 @@ * QLabel */ class TDEUI_EXPORT KSqueezedTextLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp index daa22f46b..ce6585686 100644 --- a/tdeui/kstatusbar.cpp +++ b/tdeui/kstatusbar.cpp @@ -44,8 +44,8 @@ KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id, setAlignment( AlignHCenter | AlignVCenter | SingleLine ); - connect (this, TQT_SIGNAL(itemPressed(int)), parent, TQT_SIGNAL(pressed(int))); - connect (this, TQT_SIGNAL(itemReleased(int)), parent, TQT_SIGNAL(released(int))); + connect (this, TQ_SIGNAL(itemPressed(int)), parent, TQ_SIGNAL(pressed(int))); + connect (this, TQ_SIGNAL(itemReleased(int)), parent, TQ_SIGNAL(released(int))); } void KStatusBarLabel::mousePressEvent (TQMouseEvent *) diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h index 2c7574a79..cbf305d83 100644 --- a/tdeui/kstatusbar.h +++ b/tdeui/kstatusbar.h @@ -34,7 +34,7 @@ class KStatusBar; */ class TDEUI_EXPORT KStatusBarLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: @@ -86,7 +86,7 @@ signals: */ class TDEUI_EXPORT KStatusBar : public TQStatusBar { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h index db1199757..76aad98a8 100644 --- a/tdeui/kstdaction.h +++ b/tdeui/kstdaction.h @@ -52,13 +52,13 @@ class TDEToggleFullScreenAction; * \code * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("document-new")), * TDEStdAccel::shortcut(TDEStdAccel::New), this, - * TQT_SLOT(fileNew()), actionCollection()); + * TQ_SLOT(fileNew()), actionCollection()); * \endcode * * You could drop that and replace it with: * * \code - * TDEAction *newAct = KStdAction::openNew(this, TQT_SLOT(fileNew()), + * TDEAction *newAct = KStdAction::openNew(this, TQ_SLOT(fileNew()), * actionCollection()); * \endcode * @@ -84,7 +84,7 @@ class TDEToggleFullScreenAction; * do something like: * * \code - * (void)KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection(), "my_cut"); + * (void)KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection(), "my_cut"); * \endcode * * Now, in your local XML resource file (e.g., yourappui.rc), simply @@ -102,14 +102,14 @@ class TDEToggleFullScreenAction; * * Another non-standard usage concerns instantiating the action in the * first place. Usually, you would use the member functions as - * shown above (e.g., KStdAction::cut(this, SLOT, parent)). You + * shown above (e.g., KStdAction::cut(this, TQ_SLOT, parent)). You * may, however, do this using the enums provided. This author can't * think of a reason why you would want to, but, hey, if you do, * here's how: * * \code - * (void)KStdAction::action(KStdAction::New, this, TQT_SLOT(fileNew()), actionCollection()); - * (void)KStdAction::action(KStdAction::Cut, this, TQT_SLOT(editCut()), actionCollection()); + * (void)KStdAction::action(KStdAction::New, this, TQ_SLOT(fileNew()), actionCollection()); + * (void)KStdAction::action(KStdAction::Cut, this, TQ_SLOT(editCut()), actionCollection()); * \endcode * * @author Kurt Granroth <granroth@kde.org> @@ -212,7 +212,7 @@ namespace KStdAction * Open a recently used document. The signature of the slot being called * is of the form slotURLSelected( const KURL & ). * @param recvr object to receive slot - * @param slot The TQT_SLOT to invoke when a URL is selected. The slot's + * @param slot The slot to invoke when a URL is selected. The slot's * signature is slotURLSelected( const KURL & ). * @param parent parent widget * @param name name of widget @@ -532,7 +532,7 @@ namespace KStdAction * Display the configure key bindings dialog. * * Note that you might be able to use the pre-built KXMLGUIFactory's fuction: - * KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + * KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); */ TDEUI_EXPORT TDEAction *keyBindings(const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name = 0 ); diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h index e9aba5231..827b2adca 100644 --- a/tdeui/kstdaction_p.h +++ b/tdeui/kstdaction_p.h @@ -111,7 +111,7 @@ static const KStdActionInfo g_rgActionInfo[] = { ReportBug, TDEStdAccel::AccelNone, "help_report_bug", I18N_NOOP("&Report Bug/Request Enhancement..."), 0, "bug" }, { SwitchApplicationLanguage, TDEStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, "preferences-desktop-locale" }, { AboutApp, TDEStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 }, - { AboutKDE, TDEStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" }, + { AboutKDE, TDEStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &TDE"), 0,"about_kde" }, { ActionNone, TDEStdAccel::AccelNone, 0, 0, 0, 0 } }; diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp index 3091092f5..0ed7241dd 100644 --- a/tdeui/kstdguiitem.cpp +++ b/tdeui/kstdguiitem.cpp @@ -199,7 +199,7 @@ KGuiItem KStdGuiItem::forward( BidiMode useBidi ) TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward() { - return tqMakePair( back( UseRTL ), forward( UseRTL ) ); + return qMakePair( back( UseRTL ), forward( UseRTL ) ); } KGuiItem KStdGuiItem::print() diff --git a/tdeui/kstringvalidator.h b/tdeui/kstringvalidator.h index b23bc87bd..55c00a3ab 100644 --- a/tdeui/kstringvalidator.h +++ b/tdeui/kstringvalidator.h @@ -58,7 +58,7 @@ * @author Marc Mutz <mutz@kde.org> **/ class TDEUI_EXPORT KStringListValidator : public TQValidator { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList stringList READ stringList WRITE setStringList ) TQ_PROPERTY( bool rejecting READ isRejecting WRITE setRejecting ) TQ_PROPERTY( bool fixupEnabled READ isFixupEnabled WRITE setFixupEnabled ) @@ -118,7 +118,7 @@ private: **/ class TDEUI_EXPORT KMimeTypeValidator : public TQValidator { - Q_OBJECT + TQ_OBJECT public: KMimeTypeValidator( TQObject* parent, const char* name=0) : TQValidator( parent, name ) {} diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index c82ffb83d..0d4563b6f 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -100,7 +100,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( topLayout->addLayout(languageHorizontalLayout); d->languagesLayout = new TQGridLayout(0 , 2); - languageHorizontalLayout->addLayout(TQT_TQLAYOUT(d->languagesLayout)); + languageHorizontalLayout->addLayout(d->languagesLayout); languageHorizontalLayout->addStretch(); TQStringList defaultLanguages = d->applicationLanguageList(); @@ -122,7 +122,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( KPushButton *addLangButton = new KPushButton(i18n("Add fallback language"), d->page, "addLangButton"); TQToolTip::add(addLangButton, i18n("Adds one more language which will be used if other translations do not contain proper translation")); - connect(addLangButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddLanguageButton())); + connect(addLangButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddLanguageButton())); addButtonHorizontalLayout->addWidget(addLangButton); addButtonHorizontalLayout->addStretch(); @@ -142,7 +142,7 @@ void KSwitchLanguageDialog::slotAddLanguageButton() void KSwitchLanguageDialog::removeButtonClicked() { - TQObject const *signalSender = TQT_TQOBJECT_CONST(sender()); + TQObject const *signalSender = sender(); if (signalSender == NULL) { @@ -150,7 +150,7 @@ void KSwitchLanguageDialog::removeButtonClicked() return; } - KPushButton *removeButton = const_cast<KPushButton*>(::tqqt_cast<const KPushButton*>(signalSender)); + KPushButton *removeButton = const_cast<KPushButton*>(::tqt_cast<const KPushButton*>(signalSender)); if (removeButton == NULL) { @@ -291,9 +291,9 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo TQObject::connect( languageButton, - TQT_SIGNAL(activated( const TQString &)), + TQ_SIGNAL(activated( const TQString &)), p, - TQT_SLOT(languageOnButtonChanged(const TQString &)) + TQ_SLOT(languageOnButtonChanged(const TQString &)) ); LanguageRowData languageRowData; @@ -305,9 +305,9 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo TQObject::connect( removeButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), p, - TQT_SLOT(removeButtonClicked()) + TQ_SLOT(removeButtonClicked()) ); } @@ -323,12 +323,12 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo int numRows = languagesLayout->numRows(); TQLabel *languageLabel = new TQLabel(labelText, page); - languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQ_Alignment)TQt::AlignAuto ); - languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQ_Alignment)TQt::AlignAuto ); + languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQt::AlignmentFlags)TQt::AlignAuto ); + languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQt::AlignmentFlags)TQt::AlignAuto ); if (primaryLanguage == false) { - languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQ_Alignment)TQt::AlignAuto ); + languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQt::AlignmentFlags)TQt::AlignAuto ); languageRowData.setRowWidgets( languageLabel, diff --git a/tdeui/kswitchlanguagedialog.h b/tdeui/kswitchlanguagedialog.h index 9e0a3ff87..64ffe171c 100644 --- a/tdeui/kswitchlanguagedialog.h +++ b/tdeui/kswitchlanguagedialog.h @@ -37,7 +37,7 @@ class KSwitchLanguageDialogPrivate; class TDEUI_EXPORT KSwitchLanguageDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index 9e63fc929..8e46e14ec 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -300,11 +300,11 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, textEdit->viewport()->installEventFilter( this ); d->rehighlightRequest = new TQTimer(this); - connect( d->rehighlightRequest, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRehighlight() )); + connect( d->rehighlightRequest, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRehighlight() )); d->spellTimeout = new TQTimer(this); - connect( d->spellTimeout, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotKSpellNotResponding() )); + connect( d->spellTimeout, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotKSpellNotResponding() )); if ( d->globalConfig ) { d->spellKey = spellKey(); @@ -314,8 +314,8 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, } else { d->mDict = new TQDict<int>(4001); - connect( d->mSpellConfig, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotLocalSpellConfigChanged() ) ); + connect( d->mSpellConfig, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotLocalSpellConfigChanged() ) ); } slotDictionaryChanged(); @@ -339,8 +339,8 @@ void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) if ( cg.readEntry("KSpell_DoSpellChecking") != "0" ) { if ( d->globalConfig ) { - connect( d->sDictionaryMonitor, TQT_SIGNAL( destroyed()), - this, TQT_SLOT( slotDictionaryChanged() )); + connect( d->sDictionaryMonitor, TQ_SIGNAL( destroyed()), + this, TQ_SLOT( slotDictionaryChanged() )); } if ( spell != d->spell ) { @@ -352,10 +352,10 @@ void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { d->spell->addPersonal( *it ); } - connect( spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int )), - this, TQT_SLOT( slotMisspelling( const TQString &, const TQStringList &, unsigned int ))); - connect( spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int )), - this, TQT_SLOT( slotCorrected( const TQString &, const TQString &, unsigned int ))); + connect( spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int )), + this, TQ_SLOT( slotMisspelling( const TQString &, const TQStringList &, unsigned int ))); + connect( spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int )), + this, TQ_SLOT( slotCorrected( const TQString &, const TQString &, unsigned int ))); d->checksRequested = 0; d->checksDone = 0; d->completeRehighlightRequired = true; @@ -514,7 +514,7 @@ void KDictSpellingHighlighter::slotRehighlight() } if (d->checksDone == d->checksRequested) d->completeRehighlightRequired = false; - TQTimer::singleShot( 0, this, TQT_SLOT( slotAutoDetection() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAutoDetection() )); } void KDictSpellingHighlighter::slotDictionaryChanged() @@ -526,7 +526,7 @@ void KDictSpellingHighlighter::slotDictionaryChanged() d->autoDict.clear(); d->spell = new KSpell( 0, i18n( "Incremental Spellcheck" ), this, - TQT_SLOT( slotSpellReady( KSpell * ) ), d->mSpellConfig ); + TQ_SLOT( slotSpellReady( KSpell * ) ), d->mSpellConfig ); } void KDictSpellingHighlighter::slotLocalSpellConfigChanged() @@ -609,7 +609,7 @@ void KDictSpellingHighlighter::slotKSpellNotResponding() bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::FocusIn)) { + if (o == textEdit() && (e->type() == TQEvent::FocusIn)) { if ( d->globalConfig ) { TQString skey = spellKey(); if ( d->spell && d->spellKey != skey ) { @@ -619,8 +619,8 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) } } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::KeyPress)) { - TQKeyEvent *k = TQT_TQKEYEVENT(e); + if (o == textEdit() && (e->type() == TQEvent::KeyPress)) { + TQKeyEvent *k = static_cast<TQKeyEvent*>(e); d->autoReady = true; if (d->rehighlightRequest->isActive()) // try to stay out of the users way d->rehighlightRequest->changeInterval( 500 ); @@ -657,11 +657,11 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) if ( k->key() == Key_Space || k->key() == Key_Enter || k->key() == Key_Return ) { - TQTimer::singleShot( 0, this, TQT_SLOT( slotAutoDetection() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAutoDetection() )); } } - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()->viewport()) && + else if ( o == textEdit()->viewport() && ( e->type() == TQEvent::MouseButtonPress )) { d->autoReady = true; if ( intraWordEditing() ) { diff --git a/tdeui/ksyntaxhighlighter.h b/tdeui/ksyntaxhighlighter.h index 6ac4264ab..45ad7da36 100644 --- a/tdeui/ksyntaxhighlighter.h +++ b/tdeui/ksyntaxhighlighter.h @@ -93,7 +93,7 @@ private: */ class TDEUI_EXPORT KDictSpellingHighlighter : public TQObject, public KSpellingHighlighter { -Q_OBJECT +TQ_OBJECT public: KDictSpellingHighlighter( TQTextEdit *textEdit, diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index b5baf87dd..096d9637c 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -28,7 +28,7 @@ #include "tdelocale.h" #include "tdeaboutdata.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #include <twinmodule.h> #include <qxembed.h> @@ -61,14 +61,14 @@ public: KSystemTray::KSystemTray( TQWidget* parent, const char* name ) : TQLabel( parent, name, (WFlags)WType_TopLevel ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 QXEmbed::initialize(); #endif d = new KSystemTrayPrivate; d->actionCollection = new TDEActionCollection(this); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): tqt_xrootwin() ); #endif setBackgroundMode(X11ParentRelative); @@ -77,14 +77,14 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) menu = new TDEPopupMenu( this ); menu->insertTitle( kapp->miniIcon(), kapp->caption() ); move( -1000, -1000 ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); + KStdAction::quit(this, TQ_SLOT(maybeQuit()), d->actionCollection); if (parentWidget()) { new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), + this, TQ_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); d->on_all_desktops = info.onAllDesktops(); #else @@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->on_all_desktops = false; } setCaption( TDEGlobal::instance()->aboutData()->programName()); - setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); + setAlignment( alignment() | TQt::AlignVCenter | TQt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications setScaledContents(true); @@ -148,12 +148,12 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e ) return; switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: toggleActive(); break; - case Qt::MidButton: + case TQt::MidButton: // fall through - case Qt::RightButton: + case TQt::RightButton: if ( parentWidget() ) { TDEAction* action = d->actionCollection->action("minimizeRestore"); if ( parentWidget()->isVisible() ) @@ -244,7 +244,7 @@ void KSystemTray::activateOrHide() if ( !pw ) return; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::WindowInfo info1 = KWin::windowInfo( pw->winId(), NET::XAWMState | NET::WMState ); // mapped = visible (but possibly obscured) bool mapped = (info1.mappingState() == NET::Visible) && !info1.isMinimized(); @@ -288,7 +288,7 @@ void KSystemTray::minimizeRestore( bool restore ) TQWidget* pw = parentWidget(); if( !pw ) return; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::WindowInfo info = KWin::windowInfo( pw->winId(), NET::WMGeometry | NET::WMDesktop ); if ( restore ) { @@ -333,7 +333,7 @@ void KSystemTray::setPixmap( const TQPixmap& p ) iconPixmapToSet.convertFromImage(correctedImage); } TQLabel::setPixmap( iconPixmapToSet ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setIcons( winId(), iconPixmapToSet, TQPixmap()); #endif } diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h index f7e81c9b1..5c66dc143 100644 --- a/tdeui/ksystemtray.h +++ b/tdeui/ksystemtray.h @@ -62,7 +62,7 @@ class KSystemTrayPrivate; **/ class TDEUI_EXPORT KSystemTray : public TQLabel { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index 29479c0e9..ed30bc466 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -43,12 +43,12 @@ KTabBar::KTabBar( TQWidget *parent, const char *name ) setMouseTracking( true ); mEnableCloseButtonTimer = new TQTimer( this ); - connect( mEnableCloseButtonTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( enableCloseButton() ) ); + connect( mEnableCloseButtonTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( enableCloseButton() ) ); mActivateDragSwitchTabTimer = new TQTimer( this ); - connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) ); + connect( mActivateDragSwitchTabTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( activateDragSwitchTab() ) ); - connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange())); + connect(this, TQ_SIGNAL(layoutChanged()), TQ_SLOT(onLayoutChange())); } KTabBar::~KTabBar() @@ -87,7 +87,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; TQTab *tab = selectTab( e->pos() ); @@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabBar::mousePressEvent( TQMouseEvent *e ) { - if( e->button() == Qt::LeftButton ) { + if( e->button() == TQt::LeftButton ) { mEnableCloseButtonTimer->stop(); mDragStart = e->pos(); } - else if( e->button() == Qt::RightButton ) { + else if( e->button() == TQt::RightButton ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) ); @@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e ) void KTabBar::mouseMoveEvent( TQMouseEvent *e ) { - if ( e->state() == Qt::LeftButton ) { + if ( e->state() == TQt::LeftButton ) { TQTab *tab = selectTab( e->pos() ); if ( mDragSwitchTab && tab != mDragSwitchTab ) { mActivateDragSwitchTabTimer->stop(); @@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } } } - else if ( e->state() == Qt::MidButton ) { + else if ( e->state() == TQt::MidButton ) { if (mReorderStartTab==-1) { int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); @@ -144,7 +144,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) TQTab *tab = selectTab( e->pos() ); if( tab && mTabReorderingEnabled ) { mReorderStartTab = indexOf( tab->identifier() ); - grabMouse( tqsizeAllCursor ); + grabMouse( TQt::sizeAllCursor ); return; } } @@ -201,7 +201,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mEnableCloseButtonTimer->start( TQApplication::doubleClickInterval(), true ); } mHoverCloseButtonTab = t; - connect( mHoverCloseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( closeButtonClicked() ) ); + connect( mHoverCloseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( closeButtonClicked() ) ); return; } } @@ -230,7 +230,7 @@ void KTabBar::activateDragSwitchTab() void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) { - if( e->button() == Qt::MidButton ) { + if( e->button() == TQt::MidButton ) { if ( mReorderStartTab==-1 ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { @@ -240,7 +240,7 @@ void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) } else { releaseMouse(); - setCursor( tqarrowCursor ); + setCursor( TQt::arrowCursor ); mReorderStartTab=-1; mReorderPreviousTab=-1; } @@ -282,7 +282,7 @@ void KTabBar::dropEvent( TQDropEvent *e ) #ifndef TQT_NO_WHEELEVENT void KTabBar::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Qt::Horizontal ) + if ( e->orientation() == TQt::Horizontal ) return; emit( wheelDelta( e->delta() ) ); @@ -298,9 +298,19 @@ void KTabBar::setTabColor( int id, const TQColor& color ) } } +void KTabBar::resetTabColor( int id ) +{ + TQTab *t = tab(id); + if (t) { + if (mTabColors.contains(id)) + mTabColors.remove(id); + repaint(t->rect(), false); + } +} + const TQColor &KTabBar::tabColor( int id ) const { - if ( mTabColors.contains( id ) ) + if ( mTabColors.contains(id) && mTabColors[id].isValid() ) return mTabColors[id]; return colorGroup().foreground(); @@ -359,7 +369,7 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, flags |= TQStyle::Style_HasFocus; TQColorGroup cg( colorGroup() ); - if ( mTabColors.contains( t->identifier() ) ) + if ( mTabColors.contains(t->identifier()) && mTabColors[t->identifier()].isValid() ) cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] ); style().drawControl( TQStyle::CE_TabBarLabel, p, this, r, diff --git a/tdeui/ktabbar.h b/tdeui/ktabbar.h index c5ea25c6d..c6602d0c6 100644 --- a/tdeui/ktabbar.h +++ b/tdeui/ktabbar.h @@ -34,7 +34,7 @@ class KTabBarPrivate; */ class TDEUI_EXPORT KTabBar: public TQTabBar { - Q_OBJECT + TQ_OBJECT public: KTabBar( TQWidget* parent=0, const char* name=0 ); @@ -44,6 +44,7 @@ public: const TQColor &tabColor( int ) const; void setTabColor( int, const TQColor& ); + void resetTabColor( int ); virtual int insertTab( TQTab *, int index = -1 ); virtual void removeTab( TQTab * ); diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp index 0ff9f64e4..193e68a38 100644 --- a/tdeui/ktabctl.cpp +++ b/tdeui/ktabctl.cpp @@ -35,7 +35,7 @@ KTabCtl::KTabCtl(TQWidget *parent, const char *name) : TQWidget(parent, name) { tabs = new TQTabBar(this, "_tabbar"); - connect(tabs, TQT_SIGNAL(selected(int)), this, TQT_SLOT(showTab(int))); + connect(tabs, TQ_SIGNAL(selected(int)), this, TQ_SLOT(showTab(int))); tabs->move(2, 1); blBorder = true; diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h index 28de4805b..dcd7756e9 100644 --- a/tdeui/ktabctl.h +++ b/tdeui/ktabctl.h @@ -47,7 +47,7 @@ */ class TDEUI_EXPORT KTabCtl : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KTabCtl(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index d6800ab9a..bcccc4c9a 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -58,16 +58,16 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f ) setHoverCloseButtonDelayed(false); - connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & ))); - connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int ))); - connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int ))); - connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int ))); - connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * ))); - connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int ))); - connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int ))); + connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & ))); + connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int ))); + connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int ))); + connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int ))); + connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * ))); + connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int ))); + connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int ))); #ifndef TQT_NO_WHEELEVENT - connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int ))); + connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int ))); #endif } @@ -135,6 +135,14 @@ void KTabWidget::setTabColor( TQWidget *w, const TQColor& color ) } } +void KTabWidget::resetTabColor( TQWidget *w ) +{ + TQTab *t = tabBar()->tabAt( indexOf( w ) ); + if (t) { + static_cast<KTabBar*>(tabBar())->resetTabColor( t->identifier() ); + } +} + TQColor KTabWidget::tabColor( TQWidget *w ) const { TQTab *t = tabBar()->tabAt( indexOf( w ) ); @@ -182,7 +190,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) int iw = 0; if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, + x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } @@ -328,7 +336,7 @@ void KTabWidget::dropEvent( TQDropEvent *e ) #ifndef TQT_NO_WHEELEVENT void KTabWidget::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Qt::Horizontal ) + if ( e->orientation() == TQt::Horizontal ) return; if ( isEmptyTabbarSpace( e->pos() ) ) @@ -357,7 +365,7 @@ void KTabWidget::wheelDelta(int delta) void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; if ( isEmptyTabbarSpace( e->pos() ) ) { @@ -369,12 +377,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( contextMenu( mapToGlobal( e->pos() ) ) ); return; } - } else if ( e->button() == Qt::MidButton ) { + } else if ( e->button() == TQt::MidButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( mouseMiddleClick() ); return; diff --git a/tdeui/ktabwidget.h b/tdeui/ktabwidget.h index d0a75b38b..1290e6307 100644 --- a/tdeui/ktabwidget.h +++ b/tdeui/ktabwidget.h @@ -35,7 +35,7 @@ class KTabWidgetPrivate; */ class TDEUI_EXPORT KTabWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled ) TQ_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton ) TQ_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed WRITE setHoverCloseButtonDelayed ) @@ -56,6 +56,11 @@ public: void setTabColor( TQWidget *, const TQColor& color ); /*! + Reset the color of the tab of the given widget. + */ + void resetTabColor( TQWidget * ); + + /*! Returns the tab color for the given widget. */ TQColor tabColor( TQWidget * ) const; diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index a0331ccf7..f53973352 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -32,8 +32,8 @@ KTextBrowser::KTextBrowser( TQWidget *parent, const char *name, { // //1999-10-04 Espen Sand: Not required anymore ? - //connect( this, TQT_SIGNAL(highlighted(const TQString &)), - // this, TQT_SLOT(refChanged(const TQString &))); + //connect( this, TQ_SIGNAL(highlighted(const TQString &)), + // this, TQ_SLOT(refChanged(const TQString &))); } KTextBrowser::~KTextBrowser( void ) diff --git a/tdeui/ktextbrowser.h b/tdeui/ktextbrowser.h index 0d6885329..eb79078c9 100644 --- a/tdeui/ktextbrowser.h +++ b/tdeui/ktextbrowser.h @@ -41,7 +41,7 @@ class TDEUI_EXPORT KTextBrowser : public TQTextBrowser { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick ) public: diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index 3ebb1375f..22d8dd0ab 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -229,16 +229,16 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos ) menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ), - this, TQT_SLOT( checkSpelling() ) ); + this, TQ_SLOT( checkSpelling() ) ); if( text().isEmpty() ) menu->setItemEnabled( id, false ); id = menu->insertItem( i18n( "Auto Spell Check" ), - this, TQT_SLOT( toggleAutoSpellCheck() ) ); + this, TQ_SLOT( toggleAutoSpellCheck() ) ); menu->setItemChecked(id, d->checkSpellingEnabled); menu->insertSeparator(); - id=menu->insertItem(i18n("Allow Tabulations"),this,TQT_SLOT(slotAllowTab())); + id=menu->insertItem(i18n("Allow Tabulations"),this,TQ_SLOT(slotAllowTab())); menu->setItemChecked(id, !tabChangesFocus()); } @@ -332,7 +332,7 @@ void KTextEdit::setReadOnly(bool readOnly) if ( d->customPalette ) { TQPalette p = palette(); - TQColor color = p.color(TQPalette::Normal, TQColorGroup::Base); + TQColor color = p.color(TQPalette::Active, TQColorGroup::Base); p.setColor(TQColorGroup::Base, color); p.setColor(TQColorGroup::Background, color); setPalette( p ); @@ -351,16 +351,16 @@ void KTextEdit::checkSpelling() { delete d->spell; d->spell = new KSpell( this, i18n( "Spell Checking" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); - connect( d->spell, TQT_SIGNAL( death() ), - this, TQT_SLOT( spellCheckerFinished() ) ); + connect( d->spell, TQ_SIGNAL( death() ), + this, TQ_SLOT( spellCheckerFinished() ) ); - connect( d->spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ), - this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); + connect( d->spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ), + this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); - connect( d->spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ), - this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); + connect( d->spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ), + this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); } void KTextEdit::spellCheckerMisspelling( const TQString &text, const TQStringList &, unsigned int pos ) @@ -398,7 +398,7 @@ void KTextEdit::spellCheckerFinished() void KTextEdit::slotSpellCheckReady( KSpell *s ) { s->check( text() ); - connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) ); + connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) ); } void KTextEdit::slotSpellCheckDone( const TQString &s ) diff --git a/tdeui/ktextedit.h b/tdeui/ktextedit.h index 930409b04..8ba6f382f 100644 --- a/tdeui/ktextedit.h +++ b/tdeui/ktextedit.h @@ -42,7 +42,7 @@ class KSpell; */ class TDEUI_EXPORT KTextEdit : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/ktimewidget.cpp b/tdeui/ktimewidget.cpp index 4d48b2129..aaa0be9e4 100644 --- a/tdeui/ktimewidget.cpp +++ b/tdeui/ktimewidget.cpp @@ -41,8 +41,8 @@ void KTimeWidget::init() d->timeWidget = new TQTimeEdit(this); - connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)), - TQT_SIGNAL(valueChanged(const TQTime &))); + connect(d->timeWidget, TQ_SIGNAL(valueChanged(const TQTime &)), + TQ_SIGNAL(valueChanged(const TQTime &))); } void KTimeWidget::setTime(const TQTime & time) diff --git a/tdeui/ktimewidget.h b/tdeui/ktimewidget.h index 9ac6923f3..5d170434b 100644 --- a/tdeui/ktimewidget.h +++ b/tdeui/ktimewidget.h @@ -36,7 +36,7 @@ */ class TDEUI_EXPORT KTimeWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQTime time READ time WRITE setTime ) public: diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h index 70d63521e..ff044460c 100644 --- a/tdeui/ktimezonewidget.h +++ b/tdeui/ktimezonewidget.h @@ -59,7 +59,7 @@ class KTimezoneWidgetPrivate; class TDEUI_EXPORT KTimezoneWidget : public TDEListView { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 1cc520640..2c8a8ef08 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconeffect.h> #include <tdeglobalsettings.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -189,7 +189,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) img = TQImage(locate("data", "tdewizard/pics/wizard_small.png")); // colorize and check to figure the correct color TDEIconEffect::colorize(img, mBlendedColor, 1.0); - QRgb colPixel( img.pixel(0,0) ); + TQRgb colPixel( img.pixel(0,0) ); mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel)); } @@ -204,7 +204,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) mDatabase = db; setCaption(i18n("Tip of the Day")); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setIcons( winId(), TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 32 ), TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 16 ) ); @@ -268,7 +268,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQLabel *l = new TQLabel(hbox); l->setPixmap(img); l->setBackgroundColor(mBlendedColor); - l->setAlignment(Qt::AlignRight | Qt::AlignBottom); + l->setAlignment(TQt::AlignRight | TQt::AlignBottom); resize(550, 230); TQSize sh = size(); @@ -304,10 +304,10 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TDEConfigGroup config(kapp->config(), "TipOfDay"); mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true)); - connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip())); - connect(prev, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevTip())); - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(mTipOnStart, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showOnStart(bool))); + connect(next, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextTip())); + connect(prev, TQ_SIGNAL(clicked()), this, TQ_SLOT(prevTip())); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(mTipOnStart, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showOnStart(bool))); ok->setFocus(); @@ -425,7 +425,7 @@ static TQString fixTip(TQString tip) bool KTipDialog::eventFilter(TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mTipText) && e->type()== TQEvent::KeyPress && + if (o == mTipText && e->type()== TQEvent::KeyPress && (((TQKeyEvent *)e)->key() == Key_Return || ((TQKeyEvent *)e)->key() == Key_Space )) accept(); diff --git a/tdeui/ktip.h b/tdeui/ktip.h index a506902bf..b6fe3c0b6 100644 --- a/tdeui/ktip.h +++ b/tdeui/ktip.h @@ -107,7 +107,7 @@ private: */ class TDEUI_EXPORT KTipDialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** * Construct a tip dialog. diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 539984466..4a296a284 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -37,7 +37,7 @@ public: Private (const TQString& url, KURLLabel* label) : URL (url), LinkColor (TDEGlobalSettings::linkColor()), - HighlightedLinkColor (Qt::red), + HighlightedLinkColor (TQt::red), Tip(url), Cursor (0L), Underline (true), @@ -50,7 +50,7 @@ public: MarginAltered(false), Timer (new TQTimer (label)) { - connect (Timer, TQT_SIGNAL (timeout ()), label, TQT_SLOT (updateColor ())); + connect (Timer, TQ_SIGNAL (timeout ()), label, TQ_SLOT (updateColor ())); } ~Private () @@ -87,7 +87,7 @@ KURLLabel::KURLLabel (const TQString& url, const TQString& text, setFont (font()); setUseCursor (true); setLinkColor (d->LinkColor); - setFocusPolicy( TQ_StrongFocus ); //better accessibility + setFocusPolicy( TQWidget::StrongFocus ); //better accessibility setMouseTracking (true); } @@ -98,7 +98,7 @@ KURLLabel::KURLLabel (TQWidget* parent, const char* name) setFont (font()); setUseCursor (true); setLinkColor (d->LinkColor); - setFocusPolicy( TQ_StrongFocus ); //better accessibility + setFocusPolicy( TQWidget::StrongFocus ); //better accessibility setMouseTracking (true); } @@ -122,17 +122,17 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e) switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: emit leftClickedURL (); emit leftClickedURL (d->URL); break; - case Qt::MidButton: + case TQt::MidButton: emit middleClickedURL (); emit middleClickedURL (d->URL); break; - case Qt::RightButton: + case TQt::RightButton: emit rightClickedURL (); emit rightClickedURL (d->URL); break; @@ -308,7 +308,7 @@ void KURLLabel::enterEvent (TQEvent* e) TQLabel::enterEvent (e); TQRect r( activeRect() ); - if (!r.contains( TQT_TQMOUSEEVENT(e)->pos() )) + if (!r.contains( static_cast<TQMouseEvent*>(e)->pos() )) return; if (!d->AltPixmap.isNull() && pixmap()) @@ -355,7 +355,7 @@ bool KURLLabel::event (TQEvent *e) { // use parentWidget() unless you are a toplevel widget, then try qAapp TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette(); - p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); + p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background)); p.setColor(TQColorGroup::Foreground, palette().active().foreground()); setPalette(p); d->LinkColor = TDEGlobalSettings::linkColor(); @@ -367,13 +367,13 @@ bool KURLLabel::event (TQEvent *e) if (result && hasFocus()) { TQPainter p(this); TQRect r( activeRect() ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() ); } return result; } else if (e->type() == TQEvent::KeyPress) { - TQKeyEvent* ke = TQT_TQKEYEVENT(e); - if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) { + TQKeyEvent* ke = static_cast<TQKeyEvent*>(e); + if (ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Return) { setLinkColor (d->HighlightedLinkColor); d->Timer->start (300); emit leftClickedURL (); @@ -384,12 +384,12 @@ bool KURLLabel::event (TQEvent *e) } else if (e->type() == TQEvent::MouseButtonPress) { TQRect r( activeRect() ); - d->MousePressed = r.contains(TQT_TQMOUSEEVENT(e)->pos()); + d->MousePressed = r.contains(static_cast<TQMouseEvent*>(e)->pos()); } else if (e->type() == TQEvent::MouseMove) { if (d->Cursor) { TQRect r( activeRect() ); - bool inside = r.contains(TQT_TQMOUSEEVENT(e)->pos()); + bool inside = r.contains(static_cast<TQMouseEvent*>(e)->pos()); if (d->WasInsideRect != inside) { if (inside) TQLabel::setCursor(*d->Cursor); @@ -428,11 +428,11 @@ void KURLLabel::setMargin( int margin ) d->MarginAltered = true; } -void KURLLabel::setFocusPolicy( TQ_FocusPolicy policy ) +void KURLLabel::setFocusPolicy( TQWidget::FocusPolicy policy ) { TQLabel::setFocusPolicy(policy); if (!d->MarginAltered) { - TQLabel::setMargin(policy == TQ_NoFocus ? 0 : 3); //better default : better look when focused + TQLabel::setMargin(policy == TQWidget::NoFocus ? 0 : 3); //better default : better look when focused } } diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h index c35d3156b..ab5ff067e 100644 --- a/tdeui/kurllabel.h +++ b/tdeui/kurllabel.h @@ -51,8 +51,8 @@ class TQPixmap; * KURLLabel *address = new KURLLabel(this); * address->setText("My homepage"); * address->setURL("http://www.home.com/~me"); - * connect(address, TQT_SIGNAL(leftClickedURL(const TQString&)), - * TQT_SLOT(processMyURL(const TQString&))); + * connect(address, TQ_SIGNAL(leftClickedURL(const TQString&)), + * TQ_SLOT(processMyURL(const TQString&))); * \endcode * * In this example, the text "My homepage" would be displayed @@ -70,7 +70,7 @@ class TQPixmap; */ class TDEUI_EXPORT KURLLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY (TQString url READ url WRITE setURL) TQ_PROPERTY (TQString tipText READ tipText WRITE setTipText ) TQ_PROPERTY (TQPixmap altPixmap READ altPixmap WRITE setAltPixmap) @@ -163,7 +163,7 @@ public: */ #ifdef qdoc #else - virtual void setFocusPolicy ( TQ_FocusPolicy policy ); + virtual void setFocusPolicy ( TQWidget::FocusPolicy policy ); #endif /** diff --git a/tdeui/kwhatsthismanager_p.h b/tdeui/kwhatsthismanager_p.h index 084c83641..ddc7c0e86 100644 --- a/tdeui/kwhatsthismanager_p.h +++ b/tdeui/kwhatsthismanager_p.h @@ -45,7 +45,7 @@ class TQTextEdit; **/ class TDEUI_EXPORT KWhatsThisManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static void init (); bool eventFilter (TQObject *o, TQEvent *e); diff --git a/tdeui/kwizard.h b/tdeui/kwizard.h index 56995a2e0..4fafd5933 100644 --- a/tdeui/kwizard.h +++ b/tdeui/kwizard.h @@ -45,7 +45,7 @@ */ class TDEUI_EXPORT KWizard : public TQWizard { - Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/tdeui/kwordwrap.cpp b/tdeui/kwordwrap.cpp index de031c966..471a7227a 100644 --- a/tdeui/kwordwrap.cpp +++ b/tdeui/kwordwrap.cpp @@ -236,9 +236,9 @@ void KWordWrap::drawText( TQPainter *painter, int textX, int textY, int flags ) break; int end = (*it); int x = textX; - if ( flags & Qt::AlignHCenter ) + if ( flags & TQt::AlignHCenter ) x += ( maxwidth - *itw ) / 2; - else if ( flags & Qt::AlignRight ) + else if ( flags & TQt::AlignRight ) x += maxwidth - *itw; painter->drawText( x, textY + y + ascent, m_text.mid( start, end - start + 1 ) ); y += height; @@ -246,9 +246,9 @@ void KWordWrap::drawText( TQPainter *painter, int textX, int textY, int flags ) } // Draw the last line int x = textX; - if ( flags & Qt::AlignHCenter ) + if ( flags & TQt::AlignHCenter ) x += ( maxwidth - *itw ) / 2; - else if ( flags & Qt::AlignRight ) + else if ( flags & TQt::AlignRight ) x += maxwidth - *itw; if ( (d->m_constrainingRect.height() < 0) || ((y + height) <= d->m_constrainingRect.height()) ) { diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h index 3fb48acd9..803389ed3 100644 --- a/tdeui/kwordwrap.h +++ b/tdeui/kwordwrap.h @@ -91,8 +91,8 @@ public: /** * Draw the text that has been previously wrapped, at position x,y. - * Flags are for alignment, e.g. Qt::AlignHCenter. Default is - * Qt::AlignAuto. + * Flags are for alignment, e.g. TQt::AlignHCenter. Default is + * TQt::AlignAuto. * @param painter the TQPainter to use. * @param x the horizontal position of the text * @param y the vertical position of the text diff --git a/tdeui/kxmlgui.xsd b/tdeui/kxmlgui.xsd index dc2fad341..da7bf04e4 100644 --- a/tdeui/kxmlgui.xsd +++ b/tdeui/kxmlgui.xsd @@ -56,7 +56,7 @@ <xsd:annotation> <xsd:documentation> - The name used for every name and group attribute. Maps to QObject::name() in most cases. + The name used for every name and group attribute. Maps to TQObject::name() in most cases. </xsd:documentation> </xsd:annotation> <xsd:restriction base="xsd:Name"> diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp index b02ed5b08..c3dd1c233 100644 --- a/tdeui/kxmlguibuilder.cpp +++ b/tdeui/kxmlguibuilder.cpp @@ -117,7 +117,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ if ( element.tagName().lower() == d->tagMainWindow ) { TDEMainWindow *mainwindow = 0; - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) mainwindow = static_cast<TDEMainWindow *>(d->m_widget); return mainwindow; @@ -127,7 +127,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ { KMenuBar *bar; - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) bar = static_cast<TDEMainWindow *>(d->m_widget)->menuBar(); else bar = new KMenuBar( d->m_widget ); @@ -145,7 +145,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ // And we don't want to set the parent for a standalone popupmenu, // otherwise its shortcuts appear. TQWidget* p = parent; - while ( p && !::tqqt_cast<TDEMainWindow *>( p ) ) + while ( p && !::tqt_cast<TDEMainWindow *>( p ) ) p = p->parentWidget(); TQCString name = element.attribute( d->attrName ).utf8(); @@ -181,14 +181,14 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ pix = SmallIconSet( icon, 16, instance ); } - if ( parent && ::tqqt_cast<KMenuBar *>( parent ) ) + if ( parent && ::tqt_cast<KMenuBar *>( parent ) ) { if ( !icon.isEmpty() ) id = static_cast<KMenuBar *>(parent)->insertItem( pix, i18nText, popup, -1, index ); else id = static_cast<KMenuBar *>(parent)->insertItem( i18nText, popup, -1, index ); } - else if ( parent && ::tqqt_cast<TQPopupMenu *>( parent ) ) + else if ( parent && ::tqt_cast<TQPopupMenu *>( parent ) ) { if ( !icon.isEmpty() ) id = static_cast<TQPopupMenu *>(parent)->insertItem( pix, i18nText, popup, -1, index ); @@ -205,13 +205,13 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ TQCString name = element.attribute( d->attrName ).utf8(); - TDEToolBar *bar = static_cast<TDEToolBar*>(TQT_TQWIDGET(d->m_widget->child( name, "TDEToolBar" ))); + TDEToolBar *bar = static_cast<TDEToolBar*>(d->m_widget->child( name, "TDEToolBar" )); if( !bar ) { bar = new TDEToolBar( d->m_widget, name, honor, false ); } - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) { if ( d->m_client && !d->m_client->xmlFile().isEmpty() ) bar->setXMLGUIClient( d->m_client ); @@ -224,7 +224,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ if ( element.tagName().lower() == d->tagStatusBar ) { - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) { TDEMainWindow *mainWin = static_cast<TDEMainWindow *>(d->m_widget); mainWin->statusBar()->show(); @@ -241,26 +241,26 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD { // Warning parent can be 0L - if ( ::tqqt_cast<TQPopupMenu *>( container ) ) + if ( ::tqt_cast<TQPopupMenu *>( container ) ) { if ( parent ) { - if ( ::tqqt_cast<KMenuBar *>( parent ) ) + if ( ::tqt_cast<KMenuBar *>( parent ) ) static_cast<KMenuBar *>(parent)->removeItem( id ); - else if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) + else if ( ::tqt_cast<TQPopupMenu *>( parent ) ) static_cast<TQPopupMenu *>(parent)->removeItem( id ); } delete container; } - else if ( ::tqqt_cast<TDEToolBar *>( container ) ) + else if ( ::tqt_cast<TDEToolBar *>( container ) ) { TDEToolBar *tb = static_cast<TDEToolBar *>( container ); tb->saveState( element ); delete tb; } - else if ( ::tqqt_cast<KMenuBar *>( container ) ) + else if ( ::tqt_cast<KMenuBar *>( container ) ) { KMenuBar *mb = static_cast<KMenuBar *>( container ); mb->hide(); @@ -269,9 +269,9 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD // sure that TQMainWindow::d->mb does not point to a deleted // menubar object. } - else if ( ::tqqt_cast<KStatusBar *>( container ) ) + else if ( ::tqt_cast<KStatusBar *>( container ) ) { - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) container->hide(); else delete static_cast<KStatusBar *>(container); @@ -291,7 +291,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo { if ( element.tagName().lower() == d->tagSeparator ) { - if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) + if ( ::tqt_cast<TQPopupMenu *>( parent ) ) { // Don't insert multiple separators in a row TQPopupMenu *menu = static_cast<TQPopupMenu *>(parent); @@ -317,9 +317,9 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo else return menu->insertSeparator( index ); } - else if ( ::tqqt_cast<TQMenuBar *>( parent ) ) + else if ( ::tqt_cast<TQMenuBar *>( parent ) ) return static_cast<TQMenuBar *>(parent)->insertSeparator( index ); - else if ( ::tqqt_cast<TDEToolBar *>( parent ) ) + else if ( ::tqt_cast<TDEToolBar *>( parent ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( parent ); @@ -351,12 +351,12 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo } else if ( element.tagName().lower() == d->tagTearOffHandle ) { - if ( ::tqqt_cast<TQPopupMenu *>( parent ) && TDEGlobalSettings::insertTearOffHandle()) + if ( ::tqt_cast<TQPopupMenu *>( parent ) && TDEGlobalSettings::insertTearOffHandle()) return static_cast<TQPopupMenu *>(parent)->insertTearOffHandle( -1, index ); } else if ( element.tagName().lower() == d->tagMenuTitle ) { - if ( ::tqqt_cast<TDEPopupMenu *>( parent ) ) + if ( ::tqt_cast<TDEPopupMenu *>( parent ) ) { TQString i18nText; TQCString text = element.text().utf8(); @@ -389,11 +389,11 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo void KXMLGUIBuilder::removeCustomElement( TQWidget *parent, int id ) { - if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) + if ( ::tqt_cast<TQPopupMenu *>( parent ) ) static_cast<TQPopupMenu *>(parent)->removeItem( id ); - else if ( ::tqqt_cast<TQMenuBar *>( parent ) ) + else if ( ::tqt_cast<TQMenuBar *>( parent ) ) static_cast<TQMenuBar *>(parent)->removeItem( id ); - else if ( ::tqqt_cast<TDEToolBar *>( parent ) ) + else if ( ::tqt_cast<TDEToolBar *>( parent ) ) static_cast<TDEToolBar *>(parent)->removeItemDelayed( id ); } @@ -421,7 +421,7 @@ void KXMLGUIBuilder::setBuilderInstance( TDEInstance *instance ) void KXMLGUIBuilder::finalizeGUI( KXMLGUIClient * ) { - if ( !d->m_widget || !::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( !d->m_widget || !::tqt_cast<TDEMainWindow *>( d->m_widget ) ) return; #if 0 TDEToolBar *toolbar = 0; diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index 233907b72..8e9b376b2 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -552,7 +552,7 @@ void KXMLGUIFactory::configureAction( TDEAction *action, const TQDomAttr &attrib int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSettings ) { - KKeyDialog dlg( bAllowLetterShortcuts, tqt_dynamic_cast<TQWidget*>(parent()) ); + KKeyDialog dlg( bAllowLetterShortcuts, dynamic_cast<TQWidget*>(parent()) ); TQPtrListIterator<KXMLGUIClient> it( d->m_clients ); KXMLGUIClient *client; while( (client=it.current()) !=0 ) diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h index ae726dd9c..775446308 100644 --- a/tdeui/kxmlguifactory.h +++ b/tdeui/kxmlguifactory.h @@ -61,7 +61,7 @@ class BuildHelper; class TDEUI_EXPORT KXMLGUIFactory : public TQObject { friend class KXMLGUI::BuildHelper; - Q_OBJECT + TQ_OBJECT public: /** * Constructs a KXMLGUIFactory. The provided @p builder KXMLGUIBuilder will be called @@ -183,7 +183,7 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject * This slot can be connected dirrectly to the action to configure shortcuts. This is very simple to * do that by adding a single line * \code - * KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + * KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); * \endcode * * @param bAllowLetterShortcuts Set to false if unmodified alphanumeric diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index 6ba25fff7..23076e38d 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -54,7 +54,7 @@ #include <tqfocusdata.h> // L0001: QXEmbed works only under X windows. -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 # include <X11/X.h> # include <X11/Xlib.h> @@ -199,7 +199,7 @@ static void sendXEmbedMessage( WId window, long message, long detail = 0, ev.xclient.window = window; ev.xclient.message_type = xembed; ev.xclient.format = 32; - ev.xclient.data.l[0] = GET_QT_X_TIME(); + ev.xclient.data.l[0] = get_tqt_x_time(); ev.xclient.data.l[1] = message; ev.xclient.data.l[2] = detail; ev.xclient.data.l[3] = data1; @@ -219,7 +219,7 @@ static void sendClientMessage(Window window, Atom a, long x) ev.xclient.message_type = a; ev.xclient.format = 32; ev.xclient.data.l[0] = x; - ev.xclient.data.l[1] = GET_QT_X_TIME(); + ev.xclient.data.l[1] = get_tqt_x_time(); XSendEvent(tqt_xdisplay(), window, false, NoEventMask, &ev); } @@ -310,7 +310,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // active and has just been given the Qt focus (L0614) or // because the widget already had the Qt focus and just became // active (L0615). - if ( TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) && + if ( tqApp->focusWidget() == o && ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) { TQFocusEvent* fe = (TQFocusEvent*) e; if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse || @@ -319,11 +319,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // Variable `obeyFocus' suggests that this is the result of mouse // activity in the client. The XEMBED_REQUEST_FOCUS message causes // the embedding widget to take the Qt focus (L2085). -#ifdef USE_QT4 - WId window = ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->effectiveWinId(); -#else // USE_QT4 WId window = ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->parentWinId; -#endif // USE_QT4 focusMap->remove( tqApp->focusWidget()->topLevelWidget() ); sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS ); } else if ( fe->reason() == TQFocusEvent::ActiveWindow ) { @@ -344,7 +340,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::KeyPress: - if (TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) && + if (tqApp->focusWidget() == o && ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) { // L0620: The following code replaces the Qt code that // handles focus focus changes with the tab key. See the @@ -365,32 +361,20 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) bool tabForward = true; if ( !(k->state() & ControlButton || k->state() & AltButton) ) { if ( k->key() == Key_Backtab || (k->key() == Key_Tab && (k->state() & ShiftButton)) ) { -#ifdef USE_QT4 - res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false ); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Backtab ); res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false ); TQFocusEvent::resetReason(); -#endif // USE_QT4 } else if ( k->key() == Key_Tab ) { -#ifdef USE_QT4 - res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true ); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Tab ); res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true ); TQFocusEvent::resetReason(); -#endif // USE_QT4 } } if (res) { // L0625: We changed the focus because of tab/backtab key // Now check whether we have been looping around. TQFocusData *fd = ((QPublicWidget*)w)->focusData(); -#ifdef USE_QT4 - WId window = ((QPublicWidget*)w->topLevelWidget())->effectiveWinId(); -#else // USE_QT4 WId window = ((QPublicWidget*)w->topLevelWidget())->topData()->parentWinId; -#endif // USE_QT4 TQWidget *cw = 0; TQWidget *fw = fd->home(); if (tabForward && window) { @@ -435,9 +419,9 @@ static int qxembed_x11_event_filter( XEvent* e) long message = e->xclient.data.l[1]; long detail = e->xclient.data.l[2]; // L0671: Keep Qt message time up to date - if ( msgtime > GET_QT_X_TIME() ) - SET_QT_X_TIME(msgtime); - TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); + if ( msgtime > get_tqt_x_time() ) + set_tqt_x_time(msgtime); + TQWidget* w = TQWidget::find( e->xclient.window ); if ( !w ) break; switch ( message) { @@ -445,12 +429,7 @@ static int qxembed_x11_event_filter( XEvent* e) // L0675: We just have been embedded into a XEMBED aware widget. TQTLWExtra *extra = ((QPublicWidget*)w->topLevelWidget())->topData(); extra->embedded = 1; -#ifdef USE_QT4 - // [FIXME] - printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n"); -#else // USE_QT4 extra->parentWinId = e->xclient.data.l[3]; -#endif // USE_QT4 w->topLevelWidget()->show(); break; } @@ -500,7 +479,7 @@ static int qxembed_x11_event_filter( XEvent* e) // L0683: Set focus on saved focus widget if ( focusCurrent ) { focusCurrent->setFocus(); - if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( focusCurrent )) + if( QXEmbed* emb = dynamic_cast< QXEmbed* >( focusCurrent )) emb->updateEmbeddedFocus( true ); } else if ( !w->topLevelWidget()->focusWidget() ) @@ -509,29 +488,19 @@ static int qxembed_x11_event_filter( XEvent* e) case XEMBED_FOCUS_FIRST: { // L0684: Search first widget in tab chain -#ifdef USE_QT4 - w->topLevelWidget()->setFocus(); - ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Tab ); w->topLevelWidget()->setFocus(); ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true); TQFocusEvent::resetReason(); -#endif // USE_QT4 } break; case XEMBED_FOCUS_LAST: { // L0686: Search last widget in tab chain -#ifdef USE_QT4 - w->topLevelWidget()->setFocus(); - ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Backtab ); w->topLevelWidget()->setFocus(); ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false); TQFocusEvent::resetReason(); -#endif // USE_QT4 } break; default: @@ -544,7 +513,7 @@ static int qxembed_x11_event_filter( XEvent* e) // We first record what the focus widget was // and clear the Qt focus. if ( w->topLevelWidget()->focusWidget() ) { - if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget())) + if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget())) emb->updateEmbeddedFocus( false ); focusMap->insert( w->topLevelWidget(), new TQGuardedPtr<TQWidget>(w->topLevelWidget()->focusWidget() ) ); @@ -556,7 +525,7 @@ static int qxembed_x11_event_filter( XEvent* e) } } else if ( e->xclient.format == 32 && e->xclient.message_type ) { if ( e->xclient.message_type == tqt_wm_protocols ) { - TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); + TQWidget* w = TQWidget::find( e->xclient.window ); if ( !w ) break; // L0690: This is for the embedding side! @@ -569,8 +538,8 @@ static int qxembed_x11_event_filter( XEvent* e) Atom a = e->xclient.data.l[0]; if ( a == tqt_wm_take_focus ) { // L0695: update Qt message time variable - if ( (ulong) e->xclient.data.l[1] > GET_QT_X_TIME() ) - SET_QT_X_TIME(e->xclient.data.l[1]); + if ( (ulong) e->xclient.data.l[1] > get_tqt_x_time() ) + set_tqt_x_time(e->xclient.data.l[1]); // L0696: There is no problem when the window is not active. // Qt will generate a WindowActivate event that will // do the job (L1310). This does not happen if the @@ -661,7 +630,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // See L0660, L0671, L0685. initialize(); window = 0; - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setKeyCompression( false ); // L0910: Trick Qt to create extraData(); @@ -694,7 +663,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) if ( tqApp->activeWindow() == topLevelWidget() ) if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), - RevertToParent, GET_QT_X_TIME() ); + RevertToParent, get_tqt_x_time() ); // L0915: ??? [drag&drop?] setAcceptDrops( true ); } @@ -746,7 +715,7 @@ QXEmbed::~QXEmbed() int revert; XGetInputFocus( tqt_xdisplay(), &focus, &revert ); if( focus == d->focusProxy->winId()) - XSetInputFocus( tqt_xdisplay(), topLevelWidget()->winId(), RevertToParent, GET_QT_X_TIME() ); + XSetInputFocus( tqt_xdisplay(), topLevelWidget()->winId(), RevertToParent, get_tqt_x_time() ); // L01045: Delete our private data. delete d; } @@ -810,13 +779,13 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) switch ( e->type() ) { case TQEvent::WindowActivate: - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) { + if ( o == topLevelWidget() ) { // L1310: Qt thinks the application window has just been activated. // Make sure the X11 focus is on the focus proxy window. See L0686. if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) if (! hasFocus() ) XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), - RevertToParent, GET_QT_X_TIME() ); + RevertToParent, get_tqt_x_time() ); if (d->xplain) // L1311: Activation has changed. Grab state might change. See L2800. checkGrab(); @@ -826,7 +795,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::WindowDeactivate: - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) { + if ( o == topLevelWidget() ) { if (d->xplain) // L1321: Activation has changed. Grab state might change. See L2800. checkGrab(); @@ -838,9 +807,9 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) case TQEvent::Move: { TQWidget* pos = this; - while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(topLevelWidget())) + while( pos != o && pos != topLevelWidget()) pos = pos->parentWidget(); - if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) { + if( pos == o ) { // L1390: Send fake configure notify events whenever the // global position of the client changes. See L2900. TQPoint globalPos = mapToGlobal(TQPoint(0,0)); @@ -900,7 +869,7 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){ // This is dual safety here because FocusIn implies this. // But see L1581 for an example where this really matters. XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), - RevertToParent, GET_QT_X_TIME() ); + RevertToParent, get_tqt_x_time() ); if (d->xplain) { // L1520: Qt focus has changed. Grab state might change. See L2800. checkGrab(); @@ -950,7 +919,7 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){ // Function isActiveWindow() also returns true when a modal // dialog child of this window is active. XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), - RevertToParent, GET_QT_X_TIME() ); + RevertToParent, get_tqt_x_time() ); } @@ -1168,13 +1137,9 @@ bool QXEmbed::x11Event( XEvent* e) if (d->xplain && d->xgrab) { // L2060: The passive grab has intercepted a mouse click // in the embedded client window. Take the focus. -#ifdef USE_QT4 - setFocus(); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Mouse ); setFocus(); TQFocusEvent::resetReason(); -#endif // USE_QT4 // L2064: Resume X11 event processing. XAllowEvents(tqt_xdisplay(), ReplayPointer, CurrentTime); // L2065: Qt should not know about this. @@ -1213,20 +1178,12 @@ bool QXEmbed::x11Event( XEvent* e) if( ((QPublicWidget*)topLevelWidget())->topData()->embedded ) { focusMap->remove( topLevelWidget() ); focusMap->insert( topLevelWidget(), new TQGuardedPtr<TQWidget>( this )); -#ifdef USE_QT4 - WId window = ((QPublicWidget*)topLevelWidget())->effectiveWinId(); -#else // USE_QT4 WId window = ((QPublicWidget*)topLevelWidget())->topData()->parentWinId; -#endif // USE_QT4 sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS ); } else { -#ifdef USE_QT4 - setFocus(); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Mouse ); setFocus(); TQFocusEvent::resetReason(); -#endif // USE_QT4 } break; default: @@ -1318,12 +1275,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) XReparentWindow(tqt_xdisplay(), client->winId(), window, 0, 0); // L2451: These two lines are redundant. See L0680. ((QXEmbed*)client)->topData()->embedded = true; -#ifdef USE_QT4 - // [FIXME] - printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n"); -#else // USE_QT4 ((QXEmbed*)client)->topData()->parentWinId = window; -#endif // USE_QT4 // L2452: This seems redundant because L2020 maps the window. // But calling show() might also set Qt internal flags. client->show(); @@ -1447,4 +1399,4 @@ void QXEmbed::reparent( TQWidget * parent, WFlags f, const TQPoint & p, bool sho // for KDE #include "qxembed.moc" -#endif // Q_WS_X11 +#endif // TQ_WS_X11 diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h index 5c409fd51..c21b96eac 100644 --- a/tdeui/qxembed.h +++ b/tdeui/qxembed.h @@ -25,11 +25,7 @@ #include <tqwidget.h> #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 class QXEmbedData; @@ -61,7 +57,7 @@ class QXEmbedData; */ class TDEUI_EXPORT QXEmbed : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp index e9eb2f4b8..636d336f2 100644 --- a/tdeui/tdeaboutapplication.cpp +++ b/tdeui/tdeaboutapplication.cpp @@ -96,8 +96,8 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData ) url->setText(aboutData->homepage()); url->setURL(aboutData->homepage()); appPage->addWidget( url ); - connect( url, TQT_SIGNAL(leftClickedURL(const TQString &)), - this, TQT_SLOT(openURLSlot(const TQString &))); + connect( url, TQ_SIGNAL(leftClickedURL(const TQString &)), + this, TQ_SLOT(openURLSlot(const TQString &))); } int authorCount = aboutData->authors().count(); diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp index d0ab3dc3d..57bc84d24 100644 --- a/tdeui/tdeaboutdialog.cpp +++ b/tdeui/tdeaboutdialog.cpp @@ -96,15 +96,15 @@ TDEAboutContributor::TDEAboutContributor( TQWidget *_parent, const char *wname, kurl->setFloat(true); kurl->setUnderline(true); kurl->setMargin(0); - connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(emailClickedSlot(const TQString &))); + connect(kurl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(emailClickedSlot(const TQString &))); kurl = static_cast<KURLLabel *>(mText[2]); kurl->setFloat(true); kurl->setUnderline(true); kurl->setMargin(0); - connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(urlClickedSlot(const TQString &))); + connect(kurl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(urlClickedSlot(const TQString &))); mLabel[3]->setAlignment( AlignTop ); @@ -227,8 +227,8 @@ void TDEAboutContributor::updateLayout( void ) { if( mShowHeader ) { - gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQ_Alignment)AlignLeft ); - gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft ); + gbox->addWidget( mLabel[i], r, 0, (TQt::AlignmentFlags)AlignLeft ); + gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft ); mLabel[i]->show(); mText[i]->show(); } @@ -237,11 +237,11 @@ void TDEAboutContributor::updateLayout( void ) mLabel[i]->hide(); if( !i ) { - gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQ_Alignment)AlignLeft ); + gbox->addMultiCellWidget( mText[i], r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft ); } else { - gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft ); + gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft ); } mText[i]->show(); } @@ -359,8 +359,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, vbox = new TQVBoxLayout( mImageFrame, 1 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); vbox->addStretch(10); vbox->addWidget( mImageLabel ); vbox->addStretch(10); @@ -386,8 +386,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, gbox->setColStretch( 2, 10 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); gbox->addWidget( mImageLabel, 1, 1 ); gbox->activate(); } @@ -410,8 +410,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, vbox = new TQVBoxLayout( mImageFrame, 1 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); vbox->addStretch(10); vbox->addWidget( mImageLabel ); vbox->addStretch(10); @@ -475,10 +475,10 @@ TQFrame *TDEAboutContainerBase::addTextPage( const TQString &title, browser->setMinimumHeight( fontMetrics().lineSpacing()*numLines ); vbox->addWidget(browser); - connect(browser, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(browser, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(browser, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(browser, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); } else { @@ -527,10 +527,10 @@ TDEAboutContainer *TDEAboutContainerBase::addContainerPage( const TQString &titl innerAlignment ); mPageTab->addTab( container, title ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -559,10 +559,10 @@ TDEAboutContainer *TDEAboutContainerBase::addScrolledContainerPage( scrollView->addChild( container ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -591,10 +591,10 @@ TDEAboutContainer *TDEAboutContainerBase::addContainer( int childAlignment, 0, KDialog::spacingHint(), childAlignment, innerAlignment ); mTopLayout->addWidget( container, 0, childAlignment ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -800,7 +800,7 @@ void TDEAboutContainer::childEvent( TQChildEvent *e ) ++itr; if( o->isWidgetType() ) { - TQT_TQWIDGET(o)->setMinimumWidth( s.width() ); + static_cast<TQWidget*>(o)->setMinimumWidth( s.width() ); } } } @@ -826,7 +826,7 @@ TQSize TDEAboutContainer::sizeHint( void ) const if( o->isWidgetType() ) { ++numChild; - TQWidget* const w= TQT_TQWIDGET(o); + TQWidget* const w= static_cast<TQWidget*>(o); TQSize s = w->minimumSize(); if( s.isEmpty() ) @@ -883,10 +883,10 @@ void TDEAboutContainer::addPerson( const TQString &_name, const TQString &_email TDEAboutContributor* const cont = new TDEAboutContributor( this, "pers", _name, _email, _url, _task, showHeader, showFrame, showBold ); - connect( cont, TQT_SIGNAL( openURL(const TQString&)), - this, TQT_SIGNAL( urlClick(const TQString &))); - connect( cont, TQT_SIGNAL( sendEmail(const TQString &, const TQString &)), - this, TQT_SIGNAL( mailClick(const TQString &, const TQString &))); + connect( cont, TQ_SIGNAL( openURL(const TQString&)), + this, TQ_SIGNAL( urlClick(const TQString &))); + connect( cont, TQ_SIGNAL( sendEmail(const TQString &, const TQString &)), + this, TQ_SIGNAL( mailClick(const TQString &, const TQString &))); } @@ -938,7 +938,7 @@ void TDEAboutContainer::addImage( const TQString &fileName, int alignment ) class TDEAboutContributor : public QFrame { // ############################################################################ - Q_OBJECT + TQ_OBJECT // ---------------------------------------------------------------------------- public: /** The Qt constructor. */ @@ -1011,10 +1011,10 @@ TDEAboutContributor::TDEAboutContributor(TQWidget* parent, const char* n) } setFrameStyle(TQFrame::Panel | TQFrame::Raised); // ----- - connect(email, TQT_SIGNAL(leftClickedURL(const TQString&)), - TQT_SLOT(emailClickedSlot(const TQString&))); - connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), - TQT_SLOT(urlClickedSlot(const TQString&))); + connect(email, TQ_SIGNAL(leftClickedURL(const TQString&)), + TQ_SLOT(emailClickedSlot(const TQString&))); + connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)), + TQ_SLOT(urlClickedSlot(const TQString&))); // ############################################################ } @@ -1026,7 +1026,7 @@ TDEAboutContributor::setName(const TQString& n) // ############################################################ } -QString +TQString TDEAboutContributor::getName() { // ########################################################### @@ -1041,7 +1041,7 @@ TDEAboutContributor::setURL(const TQString& u) // ########################################################### } -QString +TQString TDEAboutContributor::getURL() { // ########################################################### @@ -1057,7 +1057,7 @@ TDEAboutContributor::setEmail(const TQString& e) // ########################################################### } -QString +TQString TDEAboutContributor::getEmail() { // ########################################################### @@ -1328,14 +1328,14 @@ TDEAboutWidget::TDEAboutWidget(TQWidget *_parent, const char *_name) logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised); version->setAlignment(AlignCenter); // ----- - connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(author, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); - connect(maintainer, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(maintainer, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); + connect(author, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(author, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); + connect(maintainer, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(maintainer, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); // ################################################################# } @@ -1439,9 +1439,9 @@ TDEAboutWidget::addContributor(const TQString &_name, const TQString &_email, c->setURL(_url); c->setWork(_w); contributors.append(c); - connect(c, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(c, TQT_SIGNAL(openURL(const TQString&)), TQT_SLOT(openURLSlot(const TQString&))); + connect(c, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(c, TQ_SIGNAL(openURL(const TQString&)), TQ_SLOT(openURLSlot(const TQString&))); // ############################################################################ } @@ -1515,10 +1515,10 @@ TDEAboutDialog::TDEAboutDialog(TQWidget *_parent, const char *_name, bool modal) tqApp->quit(); } setMainWidget(about); - connect(about, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(about, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); + connect(about, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(about, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); // ################################################################# } @@ -1537,12 +1537,12 @@ TDEAboutDialog::TDEAboutDialog( int layoutType, const TQString &_caption, mContainerBase = new TDEAboutContainerBase( layoutType, this ); setMainWidget(mContainerBase); - connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)), - this, TQT_SLOT(openURLSlot(const TQString &))); - connect( mContainerBase, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - this, TQT_SLOT(sendEmailSlot(const TQString &,const TQString &))); - connect( mContainerBase, TQT_SIGNAL(mouseTrack(int, const TQMouseEvent *)), - this, TQT_SLOT(mouseTrackSlot(int, const TQMouseEvent *))); + connect( mContainerBase, TQ_SIGNAL(urlClick(const TQString &)), + this, TQ_SLOT(openURLSlot(const TQString &))); + connect( mContainerBase, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + this, TQ_SLOT(sendEmailSlot(const TQString &,const TQString &))); + connect( mContainerBase, TQ_SIGNAL(mouseTrack(int, const TQMouseEvent *)), + this, TQ_SLOT(mouseTrackSlot(int, const TQMouseEvent *))); } diff --git a/tdeui/tdeaboutdialog.h b/tdeui/tdeaboutdialog.h index 0ebb89174..d637a64b7 100644 --- a/tdeui/tdeaboutdialog.h +++ b/tdeui/tdeaboutdialog.h @@ -49,7 +49,7 @@ class TDEAboutContainerPrivate; */ class TDEUI_EXPORT TDEAboutContainer : public TQFrame { - Q_OBJECT + TQ_OBJECT public: TDEAboutContainer( TQWidget *parent=0, const char *name=0, @@ -91,7 +91,7 @@ class TDEAboutContributorPrivate; */ class TDEUI_EXPORT TDEAboutContributor : public TQFrame { - Q_OBJECT + TQ_OBJECT public: TDEAboutContributor( TQWidget *parent=0, const char *name=0, @@ -149,7 +149,7 @@ class TDEUI_EXPORT TDEAboutContributor : public TQFrame */ class TDEUI_EXPORT TDEAboutWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -282,7 +282,7 @@ class TDEAboutDialogPrivate; */ class TDEUI_EXPORT TDEAboutDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/tdeabouttde.cpp b/tdeui/tdeabouttde.cpp index 64d9fa95b..b29d482f3 100644 --- a/tdeui/tdeabouttde.cpp +++ b/tdeui/tdeabouttde.cpp @@ -85,7 +85,7 @@ TDEAboutKDE::TDEAboutKDE( TQWidget *parent, const char *name, bool modal ) setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null ); setTitle(i18n("Trinity Desktop Environment. Release %1"). arg(TQString::fromLatin1(TDE_VERSION_STRING)) ); - addTextPage( i18n("About Trinity","&About"), text1, true ); + addTextPage( i18n("About TDE","&About"), text1, true ); addTextPage( i18n("&Report Bugs/Request Enhancements"), text2, true ); addTextPage( i18n("&Join the Trinity Team"), text3, true ); addTextPage( i18n("&Support Trinity"), text4, true ); diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp index 63f633d95..d63e71feb 100644 --- a/tdeui/tdeaction.cpp +++ b/tdeui/tdeaction.cpp @@ -256,13 +256,13 @@ void TDEAction::initPrivate( const TQString& text, const TDEShortcut& cut, { d->m_cutDefault = cut; - m_parentCollection = tqt_dynamic_cast<TDEActionCollection *>( parent() ); + m_parentCollection = dynamic_cast<TDEActionCollection *>( parent() ); kdDebug(129) << "TDEAction::initPrivate(): this = " << this << " name = \"" << name() << "\" cut = " << cut.toStringInternal() << " m_parentCollection = " << m_parentCollection << endl; if ( m_parentCollection ) m_parentCollection->insert( this ); if ( receiver && slot ) - connect( this, TQT_SIGNAL( activated() ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), receiver, slot ); if( !cut.isNull() && !qstrcmp( name(), "unnamed" ) ) kdWarning(129) << "TDEAction::initPrivate(): trying to assign a shortcut (" << cut.toStringInternal() << ") to an unnamed action." << endl; @@ -462,7 +462,7 @@ bool TDEAction::updateTDEAccelShortcut( TDEAccel* tdeaccel ) kdDebug(129) << "Inserting " << name() << ", " << d->text() << ", " << d->plainText() << endl; b = tdeaccel->insert( name(), d->plainText(), TQString::null, d->m_cut, - this, TQT_SLOT(slotActivated()), + this, TQ_SLOT(slotActivated()), isShortcutConfigurable(), isEnabled() ); } } @@ -478,7 +478,7 @@ void TDEAction::insertTDEAccel( TDEAccel* tdeaccel ) if ( !tdeaccel->actions().actionPtr( name() ) ) { if( updateTDEAccelShortcut( tdeaccel ) ) { d->m_tdeaccelList.append( tdeaccel ); - connect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); } } else @@ -496,7 +496,7 @@ void TDEAction::removeTDEAccel( TDEAccel* tdeaccel ) if( (*itr) == tdeaccel ) { tdeaccel->remove( name() ); accelList.remove( itr ); - disconnect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + disconnect( tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); break; } } @@ -515,11 +515,11 @@ void TDEAction::updateShortcut( int i ) int id = itemId( i ); TQWidget* w = container( i ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>(w); updateShortcut( menu, id ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->setAccel( d->m_cut.keyCodeQt(), id ); } @@ -616,7 +616,7 @@ void TDEAction::updateToolTip( int i ) { TQWidget *w = container( i ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) + if ( ::tqt_cast<TDEToolBar *>( w ) ) TQToolTip::add( static_cast<TDEToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() ); } @@ -649,7 +649,7 @@ int TDEAction::plug( TQWidget *w, int index ) plugShortcut(); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( w ); int id; @@ -664,12 +664,12 @@ int TDEAction::plug( TQWidget *w, int index ) else instance = TDEGlobal::instance(); id = menu->insertItem( d->iconSet( TDEIcon::Small, 0, instance ), d->text(), this,//dsweet - TQT_SLOT( slotPopupActivated() ), keyQt, + TQ_SLOT( slotPopupActivated() ), keyQt, -1, index ); } else id = menu->insertItem( d->text(), this, - TQT_SLOT( slotPopupActivated() ), + TQ_SLOT( slotPopupActivated() ), keyQt, -1, index ); // If the shortcut is already in a TDEAccel object, then @@ -686,14 +686,14 @@ int TDEAction::plug( TQWidget *w, int index ) menu->TQMenuData::setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( menu, this ); return d->m_containers.count() - 1; } - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( w ); @@ -706,8 +706,8 @@ int TDEAction::plug( TQWidget *w, int index ) if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index ); } else @@ -715,8 +715,8 @@ int TDEAction::plug( TQWidget *w, int index ) TQString icon = d->iconName(); if ( icon.isEmpty() ) icon = "unknown"; - bar->insertButton( icon, id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( icon, id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index, instance ); } @@ -731,7 +731,7 @@ int TDEAction::plug( TQWidget *w, int index ) addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( bar, this ); @@ -749,17 +749,17 @@ void TDEAction::unplug( TQWidget *w ) return; int id = itemId( i ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu *menu = static_cast<TQPopupMenu *>( w ); menu->removeItem( id ); } - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( w ); bar->removeItemDelayed( id ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) { TQMenuBar *bar = static_cast<TQMenuBar *>( w ); bar->removeItem( id ); @@ -791,10 +791,10 @@ void TDEAction::plugAccel(TDEAccel *kacc, bool configurable) d->m_tdeaccel = kacc; d->m_tdeaccel->insert(name(), d->plainText(), TQString::null, TDEShortcut(d->m_cut), - this, TQT_SLOT(slotActivated()), + this, TQ_SLOT(slotActivated()), configurable, isEnabled()); - connect(d->m_tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed())); - //connect(d->m_tdeaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged())); + connect(d->m_tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed())); + //connect(d->m_tdeaccel, TQ_SIGNAL(keycodeChanged()), this, TQ_SLOT(slotKeycodeChanged())); } else { @@ -822,7 +822,7 @@ void TDEAction::plugMainWindowAccel( TQWidget *w ) while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store tl = n; - TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow + TDEMainWindow * mw = dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow if (mw) plugAccel( mw->accel() ); else @@ -863,11 +863,11 @@ void TDEAction::updateEnabled( int i ) { TQWidget *w = container( i ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) + if ( ::tqt_cast<TQPopupMenu *>( w ) ) static_cast<TQPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) static_cast<TDEToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); } @@ -909,18 +909,18 @@ void TDEAction::updateText( int i ) { TQWidget *w = container( i ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { int id = itemId( i ); static_cast<TQPopupMenu*>(w)->changeItem( id, d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), id ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( i ), d->text() ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget *button = static_cast<TDEToolBar *>(w)->getWidget( itemId( i ) ); - if ( ::tqqt_cast<TDEToolBarButton *>( button ) ) + if ( ::tqt_cast<TDEToolBarButton *>( button ) ) static_cast<TDEToolBarButton *>(button)->setText( d->plainText() ); } } @@ -949,15 +949,15 @@ void TDEAction::updateIcon( int id ) { TQWidget* w = container( id ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { int itemId_ = itemId( id ); static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet( TDEIcon::Small ), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( TDEIcon::Small ), d->text() ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) static_cast<TDEToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() ); } @@ -980,16 +980,16 @@ void TDEAction::updateIconSet( int id ) { TQWidget *w = container( id ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { int itemId_ = itemId( id ); static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { if ( icon().isEmpty() && d->hasIcon() ) // only if there is no named icon ( scales better ) static_cast<TDEToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() ); @@ -1057,12 +1057,12 @@ TQWidget* TDEAction::container( int index ) const TDEToolBar* TDEAction::toolBar( int index ) const { - return tqt_dynamic_cast<TDEToolBar *>( d->m_containers[ index ].m_container ); + return dynamic_cast<TDEToolBar *>( d->m_containers[ index ].m_container ); } TQPopupMenu* TDEAction::popupMenu( int index ) const { - return tqt_dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container ); + return dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container ); } TQWidget* TDEAction::representative( int index ) const @@ -1103,17 +1103,17 @@ void TDEAction::addContainer( TQWidget* c, TQWidget* w ) void TDEAction::activate() { - emit activated( TDEAction::EmulatedActivation, Qt::NoButton ); + emit activated( TDEAction::EmulatedActivation, TQt::NoButton ); slotActivated(); } void TDEAction::slotActivated() { - const TQObject *senderObj = TQT_TQOBJECT_CONST(sender()); + const TQObject *senderObj = sender(); if ( senderObj ) { - if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) ) - emit activated( TDEAction::AccelActivation, Qt::NoButton ); + if ( ::tqt_cast<TDEAccelPrivate *>( senderObj ) ) + emit activated( TDEAction::AccelActivation, TQt::NoButton ); } emit activated(); } @@ -1124,16 +1124,16 @@ void TDEAction::slotActivated() // only called by QPopupMenus, we plugged us in. void TDEAction::slotPopupActivated() { - if( ::tqqt_cast<TQSignal *>(sender())) + if( ::tqt_cast<TQSignal *>(sender())) { - int id = tqt_dynamic_cast<const TQSignal *>(sender())->value().toInt(); + int id = dynamic_cast<const TQSignal *>(sender())->value().toInt(); int pos = findContainer(id); if(pos != -1) { - TQPopupMenu* qpm = tqt_dynamic_cast<TQPopupMenu *>( container(pos) ); + TQPopupMenu* qpm = dynamic_cast<TQPopupMenu *>( container(pos) ); if(qpm) { - TDEPopupMenu* kpm = tqt_dynamic_cast<TDEPopupMenu *>( qpm ); + TDEPopupMenu* kpm = dynamic_cast<TDEPopupMenu *>( qpm ); TQt::ButtonState state; if ( kpm ) // TDEPopupMenu? Nice, it stores the state. state = kpm->state(); @@ -1149,7 +1149,7 @@ void TDEAction::slotPopupActivated() } kdWarning(129)<<"Don't connect TDEAction::slotPopupActivated() to anything, expect into QPopupMenus which are in containers. Use slotActivated instead."<<endl; - emit activated( TDEAction::PopupMenuActivation, Qt::NoButton ); + emit activated( TDEAction::PopupMenuActivation, TQt::NoButton ); slotActivated(); } @@ -1159,7 +1159,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state ) emit activated( TDEAction::ToolBarActivation, state ); // RightButton isn't really an activation - if ( ( state & Qt::LeftButton ) || ( state & Qt::MidButton ) ) + if ( ( state & TQt::LeftButton ) || ( state & TQt::MidButton ) ) slotActivated(); } @@ -1167,7 +1167,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state ) void TDEAction::slotDestroyed() { kdDebug(129) << "TDEAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl; - const TQObject* const o = TQT_TQOBJECT_CONST(sender()); + const TQObject* const o = sender(); #ifndef KDE_NO_COMPAT // KDE 4: remove if ( o == d->m_tdeaccel ) @@ -1184,7 +1184,7 @@ void TDEAction::slotDestroyed() { if ( o == *itr ) { - disconnect( *itr, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + disconnect( *itr, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); accelList.remove(itr); return; } @@ -1193,7 +1193,7 @@ void TDEAction::slotDestroyed() int i; do { - i = findContainer( TQT_TQWIDGET_CONST( static_cast<const QObject*>(o) ) ); + i = findContainer( static_cast<const TQWidget*>(o) ); if ( i != -1 ) removeContainer( i ); } while ( i != -1 ); diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h index cc803022f..9bf232c49 100644 --- a/tdeui/tdeaction.h +++ b/tdeui/tdeaction.h @@ -109,12 +109,12 @@ class TDEMainWindow; * * \code * TQSignalMapper *desktopNumberMapper = new TQSignalMapper( this ); - * connect( desktopNumberMapper, TQT_SIGNAL( mapped( int ) ), - * this, TQT_SLOT( moveWindowToDesktop( int ) ) ); + * connect( desktopNumberMapper, TQ_SIGNAL( mapped( int ) ), + * this, TQ_SLOT( moveWindowToDesktop( int ) ) ); * * for ( uint i = 0; i < numberOfDesktops; ++i ) { * TDEAction *desktopAction = new TDEAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... ); - * connect( desktopAction, TQT_SIGNAL( activated() ), desktopNumberMapper, TQT_SLOT( map() ) ); + * connect( desktopAction, TQ_SIGNAL( activated() ), desktopNumberMapper, TQ_SLOT( map() ) ); * desktopNumberMapper->setMapping( desktopAction, i ); * } * \endcode @@ -135,7 +135,7 @@ class TDEMainWindow; * \code * TDEAction *newAct = new TDEAction(i18n("&New"), "document-new", * TDEStdAccel::shortcut(TDEStdAccel::New), - * this, TQT_SLOT(fileNew()), + * this, TQ_SLOT(fileNew()), * actionCollection(), "new"); * \endcode * This line creates our action. It says that wherever this action is @@ -202,7 +202,7 @@ class TDEMainWindow; class TDEUI_EXPORT TDEAction : public TQObject { friend class TDEActionCollection; - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int containerCount READ containerCount ) TQ_PROPERTY( TQString plainText READ plainText ) TQ_PROPERTY( TQString text READ text WRITE setText ) @@ -215,7 +215,7 @@ class TDEUI_EXPORT TDEAction : public TQObject public: /** * Constructs an action with text, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. * * If you do not want or have a keyboard shortcut, @@ -228,8 +228,8 @@ public: * * @param text The text that will be displayed. * @param cut The corresponding keyboard shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -239,7 +239,7 @@ public: /** * Constructs an action with text, icon, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. * * If you do not want or have a keyboard shortcut, set the @@ -251,8 +251,8 @@ public: * @param text The text that will be displayed. * @param pix The icon to display. * @param cut The corresponding keyboard shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -262,7 +262,7 @@ public: /** * Constructs an action with text, icon, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. The icon is loaded on demand later based on where it * is plugged in. * @@ -275,8 +275,8 @@ public: * @param text The text that will be displayed. * @param pix The icon to display. * @param cut The corresponding keyboard shortcut (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -290,8 +290,8 @@ public: * * @param item The KGuiItem with the label and (optional) icon. * @param cut The corresponding keyboard shortcut (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index a1e9f28a3..ad9c4d102 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -137,7 +137,7 @@ TDEToggleAction::~TDEToggleAction() int TDEToggleAction::plug( TQWidget* widget, int index ) { - if ( !::tqqt_cast<TQPopupMenu *>( widget ) && !::tqqt_cast<TDEToolBar *>( widget ) ) + if ( !::tqt_cast<TQPopupMenu *>( widget ) && !::tqt_cast<TDEToolBar *>( widget ) ) { kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl; return -1; @@ -149,7 +149,7 @@ int TDEToggleAction::plug( TQWidget* widget, int index ) if ( _index == -1 ) return _index; - if ( ::tqqt_cast<TDEToolBar *>( widget ) ) { + if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( widget ); bar->setToggle( itemId( _index ), true ); @@ -180,7 +180,7 @@ void TDEToggleAction::setChecked( bool c ) if ( !list.isEmpty() ) { TQObjectListIt it( list ); for( ; it.current(); ++it ) { - if ( ::tqqt_cast<TDEToggleAction *>( it.current() ) && it.current() != this && + if ( ::tqt_cast<TDEToggleAction *>( it.current() ) && it.current() != this && static_cast<TDEToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) { TDEToggleAction *a = static_cast<TDEToggleAction*>(it.current()); if( a->isChecked() ) { @@ -197,7 +197,7 @@ void TDEToggleAction::updateChecked( int id ) { TQWidget *w = container( id ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* pm = static_cast<TQPopupMenu*>(w); int itemId_ = itemId( id ); if ( !d->m_checkedGuiItem ) @@ -219,12 +219,12 @@ void TDEToggleAction::updateChecked( int id ) updateShortcut( pm, itemId_ ); } } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) // not handled in plug... + else if ( ::tqt_cast<TQMenuBar *>( w ) ) // not handled in plug... static_cast<TQMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getButton( itemId( id ) ); - if ( r && ::tqqt_cast<TDEToolBarButton *>( r ) ) { + if ( r && ::tqt_cast<TDEToolBarButton *>( r ) ) { static_cast<TDEToolBar*>( w )->setButton( itemId( id ), d->m_checked ); if ( d->m_checkedGuiItem && d->m_checkedGuiItem->hasIcon() ) { const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem(); @@ -322,12 +322,12 @@ void TDERadioAction::slotActivated() { if ( isChecked() ) { - const TQObject *senderObj = TQT_TQOBJECT_CONST(sender()); + const TQObject *senderObj = sender(); - if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) ) + if ( !senderObj || !::tqt_cast<const TDEToolBarButton *>( senderObj ) ) return; - const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); + const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( senderObj ) )->on( true ); return; } @@ -507,7 +507,7 @@ void TDESelectAction::setupMenu() const for( uint id = 0; it != d->m_list.end(); ++it, ++id ) { TQString text = *it; if ( !text.isEmpty() ) - d->m_menu->insertItem( d->makeMenuText( text ), this, TQT_SLOT( slotActivated( int ) ), 0, id ); + d->m_menu->insertItem( d->makeMenuText( text ), this, TQ_SLOT( slotActivated( int ) ), 0, id ); else d->m_menu->insertSeparator(); } @@ -537,10 +537,10 @@ void TDESelectAction::changeItem( int id, int index, const TQString& text) return; TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = (static_cast<TDEToolBar*>( w ))->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->changeItem(text, index ); @@ -587,9 +587,9 @@ void TDESelectAction::updateCurrentItem( int id ) return; TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) { + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) { + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->setCurrentItem( d->m_current ); } @@ -604,9 +604,9 @@ int TDESelectAction::comboWidth() const void TDESelectAction::updateComboWidth( int id ) { TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) { + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) { + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->setMinimumWidth( d->m_comboWidth ); cb->setMaximumWidth( d->m_comboWidth ); @@ -618,9 +618,9 @@ void TDESelectAction::updateItems( int id ) { kdDebug(129) << "TDEAction::updateItems( " << id << ", lst )" << endl; // remove -- ellis TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) { + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) { + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->clear(); TQStringList lst = comboItems(); @@ -641,7 +641,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDESelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( ::tqqt_cast<TQPopupMenu *>( widget) ) + if ( ::tqt_cast<TQPopupMenu *>( widget) ) { // Create the PopupMenu and store it in m_menu (void)popupMenu(); @@ -661,23 +661,23 @@ int TDESelectAction::plug( TQWidget *widget, int index ) menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } - else if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + else if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar* bar = static_cast<TDEToolBar*>( widget ); int id_ = TDEAction::getToolButtonID(); bar->insertCombo( comboItems(), id_, isEditable(), - TQT_SIGNAL( activated( const TQString & ) ), this, - TQT_SLOT( slotActivated( const TQString & ) ), isEnabled(), + TQ_SIGNAL( activated( const TQString & ) ), this, + TQ_SLOT( slotActivated( const TQString & ) ), isEnabled(), toolTip(), -1, index ); TQComboBox *cb = bar->getCombo( id_ ); if ( cb ) { - if (!isEditable()) cb->setFocusPolicy(TQ_NoFocus); + if (!isEditable()) cb->setFocusPolicy(TQWidget::NoFocus); cb->setMinimumWidth( cb->sizeHint().width() ); if ( d->m_comboWidth > 0 ) { @@ -691,13 +691,13 @@ int TDESelectAction::plug( TQWidget *widget, int index ) addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); updateCurrentItem( containerCount() - 1 ); return containerCount() - 1; } - else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqt_cast<TQMenuBar *>( widget ) ) { // Create the PopupMenu and store it in m_menu (void)popupMenu(); @@ -713,7 +713,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -754,9 +754,9 @@ void TDESelectAction::clear() void TDESelectAction::updateClear( int id ) { TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) { + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) { + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->clear(); } @@ -771,7 +771,7 @@ void TDESelectAction::slotActivated( int id ) setCurrentItem( id ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. - TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) ); } void TDESelectAction::slotActivated( const TQString &text ) @@ -793,7 +793,7 @@ void TDESelectAction::slotActivated( const TQString &text ) setCurrentItem( comboItems().findIndex( text ) ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. - TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) ); } void TDESelectAction::slotActivated() @@ -858,7 +858,7 @@ TDEListAction::TDEListAction( const TQString& text, const TDEShortcut& cut, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix, @@ -885,7 +885,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( const TQString& text, const TQString& pix, @@ -896,7 +896,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQString& pix, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( TQObject* parent, const char* name ) @@ -970,7 +970,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1015,7 +1015,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1034,7 +1034,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1052,10 +1052,10 @@ void TDERecentFilesAction::init() { TDERecentFilesAction *that = const_cast<TDERecentFilesAction*>(this); that->d->m_popup = new TDEPopupMenu; - connect(d->m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow())); - connect(d->m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); - connect( this, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( itemSelected( const TQString& ) ) ); + connect(d->m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow())); + connect(d->m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); + connect( this, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( itemSelected( const TQString& ) ) ); setMenuAccelsEnabled( false ); } @@ -1272,7 +1272,7 @@ int TDERecentFilesAction::plug( TQWidget *widget, int index ) return -1; // This is very related to TDEActionMenu::plug. // In fact this class could be an interesting base class for TDEActionMenu - if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = (TDEToolBar *)widget; @@ -1284,13 +1284,13 @@ int TDERecentFilesAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotClicked() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotClicked() ), isEnabled(), plainText(), index, instance ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); bar->setDelayedPopup( id_, d->m_popup, true); @@ -1526,20 +1526,20 @@ int TDEFontAction::plug( TQWidget *w, int index ) { if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( ::tqqt_cast<TDEToolBar *>( w ) ) + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TDEToolBar* bar = static_cast<TDEToolBar*>( w ); int id_ = TDEAction::getToolButtonID(); TDEFontCombo *cb = new TDEFontCombo( items(), bar ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - TQT_SLOT( slotActivated( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + TQ_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); updateCurrentItem( containerCount() - 1 ); @@ -1796,7 +1796,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDEActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( ::tqqt_cast<TQPopupMenu *>( widget ) ) + if ( ::tqt_cast<TQPopupMenu *>( widget ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); int id; @@ -1809,22 +1809,22 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) menu->setItemEnabled( id, false ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( menu, this ); return containerCount() - 1; } - else if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + else if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( widget ); int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index ); else { @@ -1835,8 +1835,8 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); } @@ -1845,7 +1845,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) if (!whatsThis().isEmpty()) TQWhatsThis::add( bar->getButton(id_), whatsThis() ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if (delayed()) { bar->setDelayedPopup( id_, popupMenu(), stickyMenu() ); @@ -1858,7 +1858,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) return containerCount() - 1; } - else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqt_cast<TQMenuBar *>( widget ) ) { TQMenuBar *bar = static_cast<TQMenuBar *>( widget ); @@ -1870,7 +1870,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) bar->setItemEnabled( id, false ); addContainer( bar, id ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -1943,15 +1943,15 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index ) return -1; // This is very related to TDEActionMenu::plug. // In fact this class could be an interesting base class for TDEActionMenu - if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = (TDEToolBar *)widget; int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), isEnabled(), plainText(), index ); } else { @@ -1961,15 +1961,15 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( icon(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), isEnabled(), plainText(), index, instance ); } addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if (delayed()) { bar->setDelayedPopup( id_, popupMenu(), stickyMenu() ); @@ -2028,7 +2028,7 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index ) while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store tl = n; - TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow + TDEMainWindow * mw = dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow if ( mw ) m_toolBar = mw->toolBar( m_toolBarName ); @@ -2036,9 +2036,9 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index ) if( m_toolBar ) { setChecked( m_toolBar->isVisible() ); - connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(setChecked(bool)) ); + connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(setChecked(bool)) ); // Also emit toggled when the toolbar's visibility changes (see comment in header) - connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SIGNAL(toggled(bool)) ); + connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SIGNAL(toggled(bool)) ); } else { setEnabled( false ); } @@ -2055,7 +2055,7 @@ void TDEToggleToolBarAction::setChecked( bool c ) m_toolBar->hide(); } TQMainWindow* mw = m_toolBar->mainWindow(); - if ( mw && ::tqqt_cast<TDEMainWindow *>( mw ) ) + if ( mw && ::tqt_cast<TDEMainWindow *>( mw ) ) static_cast<TDEMainWindow *>( mw )->setSettingsDirty(); } TDEToggleAction::setChecked( c ); @@ -2103,7 +2103,7 @@ void TDEToggleFullScreenAction::setChecked( bool c ) bool TDEToggleFullScreenAction::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(window) ) + if( o == window ) if( e->type() == TQEvent::WindowStateChange ) { if( window->isFullScreen() != isChecked()) @@ -2122,7 +2122,7 @@ KWidgetAction::KWidgetAction( TQWidget* widget, , m_widget( widget ) , m_autoSized( false ) { - connect( this, TQT_SIGNAL(enabled(bool)), widget, TQT_SLOT(setEnabled(bool)) ); + connect( this, TQ_SIGNAL(enabled(bool)), widget, TQ_SLOT(setEnabled(bool)) ); } KWidgetAction::~KWidgetAction() @@ -2153,7 +2153,7 @@ int KWidgetAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( !::tqqt_cast<TDEToolBar *>( w ) ) { + if ( !::tqt_cast<TDEToolBar *>( w ) ) { kdError() << "KWidgetAction::plug: KWidgetAction must be plugged into TDEToolBar." << endl; return -1; } @@ -2173,8 +2173,8 @@ int KWidgetAction::plug( TQWidget* w, int index ) TQWhatsThis::add( m_widget, whatsThis() ); addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2187,7 +2187,7 @@ void KWidgetAction::unplug( TQWidget *w ) TDEToolBar* toolBar = (TDEToolBar*)m_widget->parent(); if ( toolBar == w ) { - disconnect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) ); + disconnect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) ); m_widget->reparent( 0L, TQPoint(), false /*showIt*/ ); } TDEAction::unplug( w ); @@ -2217,18 +2217,18 @@ TDEActionSeparator::~TDEActionSeparator() int TDEActionSeparator::plug( TQWidget *widget, int index ) { - if ( ::tqqt_cast<TQPopupMenu *>( widget) ) + if ( ::tqt_cast<TQPopupMenu *>( widget) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); int id = menu->insertSeparator( index ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } - else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqt_cast<TQMenuBar *>( widget ) ) { TQMenuBar *menuBar = static_cast<TQMenuBar *>( widget ); @@ -2236,11 +2236,11 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) addContainer( menuBar, id ); - connect( menuBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menuBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } - else if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + else if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *toolBar = static_cast<TDEToolBar *>( widget ); @@ -2248,7 +2248,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2265,8 +2265,8 @@ TDEPasteTextAction::TDEPasteTextAction( const TQString& text, : TDEAction( text, icon, cut, receiver, slot, parent, name ) { m_popup = new TDEPopupMenu; - connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow())); - connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); + connect(m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow())); + connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); m_popup->setCheckable(true); m_mixedMode = true; } @@ -2285,7 +2285,7 @@ int TDEPasteTextAction::plug( TQWidget *widget, int index ) { if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = (TDEToolBar *)widget; @@ -2297,13 +2297,13 @@ int TDEPasteTextAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); bar->setDelayedPopup( id_, m_popup, true ); @@ -2357,7 +2357,7 @@ void TDEPasteTextAction::menuItemActivated( int id) if (reply.isValid()) kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl; } - TQTimer::singleShot(20, this, TQT_SLOT(slotActivated())); + TQTimer::singleShot(20, this, TQ_SLOT(slotActivated())); } void TDEPasteTextAction::slotActivated() diff --git a/tdeui/tdeactionclasses.h b/tdeui/tdeactionclasses.h index 86594f179..f7536a6b3 100644 --- a/tdeui/tdeactionclasses.h +++ b/tdeui/tdeactionclasses.h @@ -67,7 +67,7 @@ class TDEMainWindow; */ class TDEUI_EXPORT TDEToggleAction : public TDEAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) TQ_PROPERTY( TQString exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup ) @@ -88,8 +88,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -120,8 +120,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -132,8 +132,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -230,7 +230,7 @@ private: */ class TDEUI_EXPORT TDERadioAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: /** @@ -248,8 +248,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -280,8 +280,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -292,8 +292,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -330,7 +330,7 @@ private: */ class TDEUI_EXPORT TDESelectAction : public TDEAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem ) TQ_PROPERTY( TQStringList items READ items WRITE setItems ) @@ -355,8 +355,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -387,8 +387,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -399,8 +399,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -583,7 +583,7 @@ private: */ class TDEUI_EXPORT_DEPRECATED TDEListAction : public TDESelectAction { - Q_OBJECT + TQ_OBJECT public: /** @@ -602,8 +602,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -634,8 +634,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -647,8 +647,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -699,7 +699,7 @@ private: */ class TDEUI_EXPORT TDERecentFilesAction : public TDEListAction // TODO public TDESelectAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( uint maxItems READ maxItems WRITE setMaxItems ) public: @@ -717,8 +717,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -757,8 +757,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -773,8 +773,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -909,7 +909,7 @@ private: class TDEUI_EXPORT TDEFontAction : public TDESelectAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString font READ font WRITE setFont ) public: @@ -960,7 +960,7 @@ private: class TDEUI_EXPORT TDEFontSizeAction : public TDESelectAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize ) public: @@ -1019,7 +1019,7 @@ private: */ class TDEUI_EXPORT TDEActionMenu : public TDEAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed ) TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) @@ -1093,7 +1093,7 @@ private: */ class TDEUI_EXPORT TDEToolBarPopupAction : public TDEAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed ) TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) @@ -1124,8 +1124,8 @@ public: * @param text The text that will be displayed. * @param icon The icon to display. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -1143,8 +1143,8 @@ public: * * @param item The text and icon that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -1216,7 +1216,7 @@ private: */ class TDEUI_EXPORT TDEToggleToolBarAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: /** @@ -1263,14 +1263,14 @@ private: */ class TDEUI_EXPORT TDEToggleFullScreenAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: /** * Create a TDEToggleFullScreenAction * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param window the window that will switch to/from full screen mode * @param name An internal name for this action. @@ -1308,7 +1308,7 @@ private: */ class TDEUI_EXPORT KWidgetAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: /** @@ -1353,7 +1353,7 @@ private: class TDEUI_EXPORT TDEActionSeparator : public TDEAction { - Q_OBJECT + TQ_OBJECT public: TDEActionSeparator( TQObject* parent = 0, const char* name = 0 ); @@ -1380,7 +1380,7 @@ private: */ class TDEUI_EXPORT TDEPasteTextAction: public TDEAction { - Q_OBJECT + TQ_OBJECT public: /** @@ -1393,8 +1393,8 @@ public: * @param text The text that will be displayed. * @param icon The icon to display. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp index 98e8264b6..7f4fe0191 100644 --- a/tdeui/tdeactioncollection.cpp +++ b/tdeui/tdeactioncollection.cpp @@ -110,7 +110,7 @@ TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name, kdWarning(129) << "TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name, TDEInstance *instance )" << endl; //ellis kdDebug(129) << kdBacktrace() << endl; d = new TDEActionCollectionPrivate; - TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent ); + TQWidget* w = dynamic_cast<TQWidget*>( parent ); if( w ) setWidget( w ); //d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0); @@ -501,21 +501,21 @@ void TDEActionCollection::connectHighlight( TQWidget *container, TDEAction *acti { actionList = new TQPtrList<TDEAction>; - if ( ::tqqt_cast<TQPopupMenu *>( container ) ) + if ( ::tqt_cast<TQPopupMenu *>( container ) ) { - connect( container, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( slotMenuItemHighlighted( int ) ) ); - connect( container, TQT_SIGNAL( aboutToHide() ), - this, TQT_SLOT( slotMenuAboutToHide() ) ); + connect( container, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( slotMenuItemHighlighted( int ) ) ); + connect( container, TQ_SIGNAL( aboutToHide() ), + this, TQ_SLOT( slotMenuAboutToHide() ) ); } - else if ( ::tqqt_cast<TDEToolBar *>( container ) ) + else if ( ::tqt_cast<TDEToolBar *>( container ) ) { - connect( container, TQT_SIGNAL( highlighted( int, bool ) ), - this, TQT_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); + connect( container, TQ_SIGNAL( highlighted( int, bool ) ), + this, TQ_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); } - connect( container, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotDestroyed() ) ); + connect( container, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotDestroyed() ) ); d->m_dctHighlightContainers.insert( container, actionList ); } @@ -547,7 +547,7 @@ void TDEActionCollection::slotMenuItemHighlighted( int id ) if ( d->m_currentHighlightAction ) emit actionHighlighted( d->m_currentHighlightAction, false ); - TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() )); + TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() )); d->m_currentHighlightAction = findAction( container, id ); @@ -581,7 +581,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight ) if ( !d->m_highlight ) return; - TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() )); + TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() )); TDEAction *action = findAction( container, id ); @@ -606,7 +606,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight ) void TDEActionCollection::slotDestroyed() { - d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())) ) ); + d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(sender()) ) ); } TDEAction *TDEActionCollection::findAction( TQWidget *container, int id ) diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h index ae6fd6575..4de022d3e 100644 --- a/tdeui/tdeactioncollection.h +++ b/tdeui/tdeactioncollection.h @@ -69,10 +69,10 @@ typedef TQValueList<TDEAction *> TDEActionPtrList; * * \code * actionCollection()->setHighlightingEnabled(true); - * connect(actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - * statusBar(), TQT_SLOT( message( const TQString & ) ) ); - * connect(actionCollection(), TQT_SIGNAL( clearStatusText() ), - * statusBar(), TQT_SLOT( clear() ) ); + * connect(actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + * statusBar(), TQ_SLOT( message( const TQString & ) ) ); + * connect(actionCollection(), TQ_SIGNAL( clearStatusText() ), + * statusBar(), TQ_SLOT( clear() ) ); * \endcode */ class TDEUI_EXPORT TDEActionCollection : public TQObject @@ -80,7 +80,7 @@ class TDEUI_EXPORT TDEActionCollection : public TQObject friend class TDEAction; friend class KXMLGUIClient; - Q_OBJECT + TQ_OBJECT public: TDEActionCollection( TQWidget *parent, const char *name = 0, TDEInstance *instance = 0 ); diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp index 9583775c4..4ac8ac71d 100644 --- a/tdeui/tdeactionselector.cpp +++ b/tdeui/tdeactionselector.cpp @@ -99,18 +99,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) loadIcons(); - connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); - connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); - connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); - connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); - connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); @@ -392,7 +392,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e ) } return true; } - else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQListBox" ) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/tdeui/tdeactionselector.h b/tdeui/tdeactionselector.h index 6aeaac3d8..d9ee62873 100644 --- a/tdeui/tdeactionselector.h +++ b/tdeui/tdeactionselector.h @@ -77,7 +77,7 @@ class TDEActionSelectorPrivate; */ class TDEUI_EXPORT TDEActionSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( ButtonIconSize InsertionPolicy ) TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp index d447ec17e..06ca1acda 100644 --- a/tdeui/tdecmodule.cpp +++ b/tdeui/tdecmodule.cpp @@ -98,7 +98,7 @@ void TDECModule::init() TDEConfigDialogManager* TDECModule::addConfig( TDEConfigSkeleton *config, TQWidget* widget ) { TDEConfigDialogManager* manager = new TDEConfigDialogManager( widget, config, name() ); - connect( manager, TQT_SIGNAL( widgetModified() ), TQT_SLOT( widgetChanged() )); + connect( manager, TQ_SIGNAL( widgetModified() ), TQ_SLOT( widgetChanged() )); d->managers.append( manager ); return manager; } diff --git a/tdeui/tdecmodule.h b/tdeui/tdecmodule.h index 186ee6656..920769d33 100644 --- a/tdeui/tdecmodule.h +++ b/tdeui/tdecmodule.h @@ -68,7 +68,7 @@ class TDEInstance; */ class TDEUI_EXPORT TDECModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp index a8a2bd237..9ff9b95e5 100644 --- a/tdeui/tdecompletionbox.cpp +++ b/tdeui/tdecompletionbox.cpp @@ -61,19 +61,19 @@ TDECompletionBox::TDECompletionBox( TQWidget *parent, const char *name ) if ( parent ) setFocusProxy( parent ); else - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setVScrollBarMode( Auto ); setHScrollBarMode( AlwaysOff ); - connect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem * )), - TQT_SLOT( slotActivated( TQListBoxItem * )) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem * )), + TQ_SLOT( slotActivated( TQListBoxItem * )) ); // grmbl, just TQListBox workarounds :[ Thanks Volker. - connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem * )), - TQT_SLOT( slotCurrentChanged() )); - connect( this, TQT_SIGNAL( clicked( TQListBoxItem * )), - TQT_SLOT( slotItemClicked( TQListBoxItem * )) ); + connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem * )), + TQ_SLOT( slotCurrentChanged() )); + connect( this, TQ_SIGNAL( clicked( TQListBoxItem * )), + TQ_SLOT( slotItemClicked( TQListBoxItem * )) ); } TDECompletionBox::~TDECompletionBox() @@ -109,13 +109,13 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) { int type = e->type(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_parent) ) { + if ( o == d->m_parent ) { if ( isVisible() ) { if ( type == TQEvent::KeyPress ) { - TQKeyEvent *ev = TQT_TQKEYEVENT( e ); + TQKeyEvent *ev = static_cast<TQKeyEvent*>( e ); switch ( ev->key() ) { case Key_BackTab: - if ( d->tabHandling && (ev->state() == Qt::NoButton || + if ( d->tabHandling && (ev->state() == TQt::NoButton || (ev->state() & ShiftButton)) ) { up(); ev->accept(); @@ -123,7 +123,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) } break; case Key_Tab: - if ( d->tabHandling && (ev->state() == Qt::NoButton) ) { + if ( d->tabHandling && (ev->state() == TQt::NoButton) ) { down(); // Only on TAB!! ev->accept(); return true; @@ -185,7 +185,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) else if ( type == TQEvent::AccelOverride ) { // Override any acceleartors that match // the key sequences we use here... - TQKeyEvent *ev = TQT_TQKEYEVENT( e ); + TQKeyEvent *ev = static_cast<TQKeyEvent*>( e ); switch ( ev->key() ) { case Key_Down: case Key_Up: @@ -199,7 +199,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) break; case Key_Tab: case Key_BackTab: - if ( ev->state() == Qt::NoButton || + if ( ev->state() == TQt::NoButton || (ev->state() & ShiftButton)) { ev->accept(); @@ -230,11 +230,11 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) // any mouse-click on something else than "this" makes us hide else if ( type == TQEvent::MouseButtonPress ) { - TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); + TQMouseEvent *ev = static_cast<TQMouseEvent*>( e ); if ( !rect().contains( ev->pos() )) // this widget hide(); - if ( !d->emitSelected && currentItem() && !::tqqt_cast<TQScrollBar*>(o) ) + if ( !d->emitSelected && currentItem() && !::tqt_cast<TQScrollBar*>(o) ) { emit highlighted( currentText() ); hide(); @@ -343,9 +343,9 @@ TQRect TDECompletionBox::calculateGeometry() const // to adjust it. Do that here as well, for consistency const TQObject* combo; if ( d->m_parent && (combo = d->m_parent->parent() ) && - combo->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) ) + combo->inherits("TQComboBox") ) { - const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo)); + const TQComboBox* cb = static_cast<const TQComboBox*>(combo); //Expand to the combo width w = TQMAX( w, cb->width() ); diff --git a/tdeui/tdecompletionbox.h b/tdeui/tdecompletionbox.h index b804411b1..e3f74e819 100644 --- a/tdeui/tdecompletionbox.h +++ b/tdeui/tdecompletionbox.h @@ -42,7 +42,7 @@ class TQEvent; */ class TDEUI_EXPORT TDECompletionBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling ) TQ_PROPERTY(TQString cancelledText READ cancelledText WRITE setCancelledText) TQ_PROPERTY( bool activateOnSelect READ activateOnSelect WRITE setActivateOnSelect ) diff --git a/tdeui/tdeconfigdialog.cpp b/tdeui/tdeconfigdialog.cpp index df43defc5..274355910 100644 --- a/tdeui/tdeconfigdialog.cpp +++ b/tdeui/tdeconfigdialog.cpp @@ -65,11 +65,11 @@ TDEConfigDialog::TDEConfigDialog( TQWidget *parent, const char *name, setName(genericName); } - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateButtons())); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault())); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateButtons())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateWidgetsDefault())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateButtons())); d->manager = new TDEConfigDialogManager(this, config); setupManagerConnections(d->manager); @@ -150,12 +150,12 @@ void TDEConfigDialog::addPageInternal(TQWidget *page, void TDEConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager) { - connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot())); - connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(manager, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChangedSlot())); + connect(manager, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); - connect(this, TQT_SIGNAL(okClicked()), manager, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), manager, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault())); + connect(this, TQ_SIGNAL(okClicked()), manager, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), manager, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(defaultClicked()), manager, TQ_SLOT(updateWidgetsDefault())); } TDEConfigDialog* TDEConfigDialog::exists(const char* name) diff --git a/tdeui/tdeconfigdialog.h b/tdeui/tdeconfigdialog.h index 3eeed5b6f..6ce44da22 100644 --- a/tdeui/tdeconfigdialog.h +++ b/tdeui/tdeconfigdialog.h @@ -52,8 +52,8 @@ class TDEConfigDialogManager; * TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", MySettings::self(), KDialogBase::IconList); * dialog->addPage(new General(0, "General"), i18n("General") ); * dialog->addPage(new Appearance(0, "Style"), i18n("Appearance") ); - * connect(dialog, TQT_SIGNAL(settingsChanged()), mainWidget, TQT_SLOT(loadSettings())); - * connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); + * connect(dialog, TQ_SIGNAL(settingsChanged()), mainWidget, TQ_SLOT(loadSettings())); + * connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); * dialog->show(); * } * \endcode @@ -70,7 +70,7 @@ class TDEConfigDialogManager; * @since 3.2 */ class TDEUI_EXPORT TDEConfigDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT signals: /** diff --git a/tdeui/tdefontcombo.cpp b/tdeui/tdefontcombo.cpp index cc3b090b7..31cc23849 100644 --- a/tdeui/tdefontcombo.cpp +++ b/tdeui/tdefontcombo.cpp @@ -283,7 +283,7 @@ void TDEFontCombo::init() setInsertionPolicy(NoInsertion); setAutoCompletion(true); setSize(12); - connect( this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotModified(int))); + connect( this, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotModified(int))); } TDEFontCombo::~TDEFontCombo() diff --git a/tdeui/tdefontcombo.h b/tdeui/tdefontcombo.h index 308b7e047..2ddf7f638 100644 --- a/tdeui/tdefontcombo.h +++ b/tdeui/tdefontcombo.h @@ -34,7 +34,7 @@ */ class TDEUI_EXPORT TDEFontCombo : public KComboBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString family READ currentFont WRITE setCurrentFont) TQ_PROPERTY(bool bold READ bold WRITE setBold DESIGNABLE true) TQ_PROPERTY(bool italic READ italic WRITE setItalic DESIGNABLE true) diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp index d29ea60be..2b657a7a8 100644 --- a/tdeui/tdefontdialog.cpp +++ b/tdeui/tdefontdialog.cpp @@ -85,8 +85,8 @@ class TDEFontChooser::TDEFontChooserPrivate { public: TDEFontChooserPrivate() - { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, Qt::black); - m_palette.setColor(TQPalette::Active, TQColorGroup::Base, Qt::white); } + { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black); + m_palette.setColor(TQPalette::Active, TQColorGroup::Base, TQt::white); } TQPalette m_palette; }; @@ -131,8 +131,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, familyLayout->addSpacing( checkBoxGap ); if (diff) { familyCheckbox = new TQCheckBox(i18n("Font"), page); - connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); - familyLayout->addWidget(familyCheckbox, 0, Qt::AlignLeft); + connect(familyCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); + familyLayout->addWidget(familyCheckbox, 0, TQt::AlignLeft); TQString familyCBToolTipText = i18n("Change font family?"); TQString familyCBWhatsThisText = @@ -143,15 +143,15 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, } else { familyCheckbox = 0; familyLabel = new TQLabel( i18n("Font:"), page, "familyLabel" ); - familyLayout->addWidget(familyLabel, 1, Qt::AlignLeft); + familyLayout->addWidget(familyLabel, 1, TQt::AlignLeft); } gridLayout->addLayout(familyLayout, row, 0 ); TQHBoxLayout *styleLayout = new TQHBoxLayout(); if (diff) { styleCheckbox = new TQCheckBox(i18n("Font style"), page); - connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); - styleLayout->addWidget(styleCheckbox, 0, Qt::AlignLeft); + connect(styleCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); + styleLayout->addWidget(styleCheckbox, 0, TQt::AlignLeft); TQString styleCBToolTipText = i18n("Change font style?"); TQString styleCBWhatsThisText = @@ -162,7 +162,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, } else { styleCheckbox = 0; styleLabel = new TQLabel( i18n("Font style:"), page, "styleLabel"); - styleLayout->addWidget(styleLabel, 1, Qt::AlignLeft); + styleLayout->addWidget(styleLabel, 1, TQt::AlignLeft); } styleLayout->addSpacing( checkBoxGap ); gridLayout->addLayout(styleLayout, row, 1 ); @@ -170,8 +170,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, TQHBoxLayout *sizeLayout = new TQHBoxLayout(); if (diff) { sizeCheckbox = new TQCheckBox(i18n("Size"),page); - connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); - sizeLayout->addWidget(sizeCheckbox, 0, Qt::AlignLeft); + connect(sizeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); + sizeLayout->addWidget(sizeCheckbox, 0, TQt::AlignLeft); TQString sizeCBToolTipText = i18n("Change font size?"); TQString sizeCBWhatsThisText = @@ -182,7 +182,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, } else { sizeCheckbox = 0; sizeLabel = new TQLabel( i18n("Size:"), page, "sizeLabel"); - sizeLayout->addWidget(sizeLabel, 1, Qt::AlignLeft); + sizeLayout->addWidget(sizeLabel, 1, TQt::AlignLeft); } sizeLayout->addSpacing( checkBoxGap ); sizeLayout->addSpacing( checkBoxGap ); // prevent label from eating border @@ -200,8 +200,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, i18n("Here you can choose the font family to be used." ); TQWhatsThis::add( familyListBox, fontFamilyWhatsThisText ); TQWhatsThis::add(diff?(TQWidget *) familyCheckbox:(TQWidget *) familyLabel, fontFamilyWhatsThisText ); - connect(familyListBox, TQT_SIGNAL(highlighted(const TQString &)), - TQT_SLOT(family_chosen_slot(const TQString &))); + connect(familyListBox, TQ_SIGNAL(highlighted(const TQString &)), + TQ_SLOT(family_chosen_slot(const TQString &))); if(!fontList.isEmpty()) { familyListBox->insertStringList(fontList); @@ -230,8 +230,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, styleListBox->setMinimumHeight( minimumListHeight( styleListBox, visibleListSize ) ); - connect(styleListBox, TQT_SIGNAL(highlighted(const TQString &)), - TQT_SLOT(style_chosen_slot(const TQString &))); + connect(styleListBox, TQ_SIGNAL(highlighted(const TQString &)), + TQ_SLOT(style_chosen_slot(const TQString &))); sizeListBox = new TDEListBox( page, "sizeListBox"); @@ -258,7 +258,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, sizeLayout2->setColStretch( 1, 1 ); // to prevent text from eating the right border sizeLayout2->addMultiCellWidget( sizeOfFont, 0, 0, 0, 1); sizeLayout2->addMultiCellWidget(sizeListBox, 1,1, 0,1); - sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, Qt::AlignLeft); + sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, TQt::AlignLeft); TQWhatsThis::add( sizeIsRelativeCheckBox, sizeIsRelativeCBWhatsThisText ); TQToolTip::add( sizeIsRelativeCheckBox, sizeIsRelativeCBToolTipText ); } @@ -280,11 +280,11 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, sizeListBox->setMinimumHeight( minimumListHeight( sizeListBox, visibleListSize ) ); - connect( sizeOfFont, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT(size_value_slot(int))); + connect( sizeOfFont, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT(size_value_slot(int))); - connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), - TQT_SLOT(size_chosen_slot(const TQString&)) ); + connect( sizeListBox, TQ_SIGNAL(highlighted(const TQString&)), + TQ_SLOT(size_chosen_slot(const TQString&)) ); sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. row ++; @@ -296,14 +296,14 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, //i18n: This is a classical test phrase. (It contains all letters from A to Z.) sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); - sampleEdit->setAlignment(Qt::AlignCenter); + sampleEdit->setAlignment(TQt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " "You may edit it to test special characters." ); TQWhatsThis::add( sampleEdit, sampleEditWhatsThisText ); - connect(this, TQT_SIGNAL(fontSelected(const TQFont &)), - TQT_SLOT(displaySample(const TQFont &))); + connect(this, TQ_SIGNAL(fontSelected(const TQFont &)), + TQ_SLOT(displaySample(const TQFont &))); TQVBoxLayout *vbox; if( makeFrame ) diff --git a/tdeui/tdefontdialog.h b/tdeui/tdefontdialog.h index de966d47d..0946c1b6e 100644 --- a/tdeui/tdefontdialog.h +++ b/tdeui/tdefontdialog.h @@ -53,7 +53,7 @@ class KIntNumInput; */ class TDEUI_EXPORT TDEFontChooser : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQFont font READ font WRITE setFont ) public: @@ -347,7 +347,7 @@ private: * @version $Id$ */ class TDEUI_EXPORT TDEFontDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/tdefontrequester.cpp b/tdeui/tdefontrequester.cpp index 2cabede01..d5dd3b08c 100644 --- a/tdeui/tdefontrequester.cpp +++ b/tdeui/tdefontrequester.cpp @@ -43,7 +43,7 @@ TDEFontRequester::TDEFontRequester( TQWidget *parent, const char *name, layout->addWidget( m_sampleLabel, 1 ); layout->addWidget( m_button ); - connect( m_button, TQT_SIGNAL( clicked() ), TQT_SLOT( buttonClicked() ) ); + connect( m_button, TQ_SIGNAL( clicked() ), TQ_SLOT( buttonClicked() ) ); displaySampleText(); setToolTip(); diff --git a/tdeui/tdefontrequester.h b/tdeui/tdefontrequester.h index 9d324545a..ef0a17c59 100644 --- a/tdeui/tdefontrequester.h +++ b/tdeui/tdefontrequester.h @@ -43,7 +43,7 @@ class TQPushButton; */ class TDEUI_EXPORT TDEFontRequester : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString title READ title WRITE setTitle ) TQ_PROPERTY( TQString sampleText READ sampleText WRITE setSampleText ) diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp index 0e4c5d520..256e1669d 100644 --- a/tdeui/tdelistbox.cpp +++ b/tdeui/tdelistbox.cpp @@ -30,22 +30,22 @@ TDEListBox::TDEListBox( TQWidget *parent, const char *name, WFlags f ) : TQListBox( parent, name, f ), d(0) { - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), - this, TQT_SLOT( slotOnItem( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), + this, TQ_SLOT( slotOnItem( TQListBoxItem * ) ) ); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } m_pCurrentItem = 0L; m_pAutoSelect = new TQTimer( this ); - connect( m_pAutoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); + connect( m_pAutoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); } void TDEListBox::slotOnItem( TQListBoxItem *item ) @@ -75,27 +75,27 @@ void TDEListBox::slotSettingsChanged(int category) return; m_bUseSingle = TDEGlobalSettings::singleClick(); - disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, + disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ) ); -// disconnect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem *, +// disconnect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQListBoxItem *, +// this, TQ_SLOT( slotExecute( TQListBoxItem *, // const TQPoint & ) ) ); if( m_bUseSingle ) { - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ) ); } else { -// connect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem *, +// connect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQListBoxItem *, +// this, TQ_SLOT( slotExecute( TQListBoxItem *, // const TQPoint & ) ) ); } @@ -249,14 +249,14 @@ void TDEListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) if( item ) { emit doubleClicked( item, e->globalPos() ); - if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) + if( (e->button() == TQt::LeftButton) && !m_bUseSingle ) emitExecute( item, e->globalPos() ); } } void TDEListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos ) { - if( (btn == Qt::LeftButton) && item ) + if( (btn == TQt::LeftButton) && item ) emitExecute( item, pos ); } diff --git a/tdeui/tdelistbox.h b/tdeui/tdelistbox.h index e7666af32..591349320 100644 --- a/tdeui/tdelistbox.h +++ b/tdeui/tdelistbox.h @@ -39,7 +39,7 @@ **/ class TDEUI_EXPORT TDEListBox : public TQListBox { - Q_OBJECT + TQ_OBJECT public: TDEListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp index c0c52ce48..868be813d 100644 --- a/tdeui/tdelistview.cpp +++ b/tdeui/tdelistview.cpp @@ -109,9 +109,9 @@ public: initialFileManagerItem(0) { renameable.append(0); - connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int))); - connect(editor, TQT_SIGNAL(renameNext(TQListViewItem*,int)), listview, TQT_SLOT(renameNextProxy(TQListViewItem*,int))); - connect(editor, TQT_SIGNAL(renamePrev(TQListViewItem*,int)), listview, TQT_SLOT(renamePrevProxy(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(done(TQListViewItem*,int)), listview, TQ_SLOT(doneEditing(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(renameNext(TQListViewItem*,int)), listview, TQ_SLOT(renameNextProxy(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(renamePrev(TQListViewItem*,int)), listview, TQ_SLOT(renamePrevProxy(TQListViewItem*,int))); } ~TDEListViewPrivate () @@ -189,9 +189,9 @@ TDEListViewLineEdit::TDEListViewLineEdit(TDEListView *parent) { setFrame( false ); hide(); - connect( parent, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotSelectionChanged() )); - connect( parent, TQT_SIGNAL( itemRemoved( TQListViewItem * ) ), - TQT_SLOT( slotItemRemoved( TQListViewItem * ) )); + connect( parent, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotSelectionChanged() )); + connect( parent, TQ_SIGNAL( itemRemoved( TQListViewItem * ) ), + TQ_SLOT( slotItemRemoved( TQListViewItem * ) )); } TDEListViewLineEdit::~TDEListViewLineEdit() @@ -344,7 +344,7 @@ bool TDEListViewLineEdit::event(TQEvent *pe) keyPressEvent(k); return true; } - else if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) && + else if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab) && p->tabOrderedRenaming() && p->itemsRenameable() && !(k->state() & ControlButton || k->state() & AltButton)) { @@ -374,11 +374,11 @@ void TDEListViewLineEdit::keyPressEvent(TQKeyEvent *e) emit renamePrev(i,c); } } - else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) + else if (e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter) terminate(true); - else if(e->key() == Qt::Key_Escape) + else if(e->key() == TQt::Key_Escape) terminate(false); - else if (e->key() == Qt::Key_Down || e->key() == Qt::Key_Up) + else if (e->key() == TQt::Key_Down || e->key() == TQt::Key_Up) { terminate(true); KLineEdit::keyPressEvent(e); @@ -459,42 +459,42 @@ TDEListView::TDEListView( TQWidget *parent, const char *name ) { setDragAutoScroll(true); - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) ); - connect (this, TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(cleanDropVisualizer())); - connect (this, TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(cleanItemHighlighter())); + connect (this, TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(cleanDropVisualizer())); + connect (this, TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(cleanItemHighlighter())); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } - connect(&d->autoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); - connect(&d->dragExpand, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotDragExpand() ) ); + connect(&d->autoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); + connect(&d->dragExpand, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotDragExpand() ) ); // context menu handling if (d->showContextMenusOnPress) { - connect (this, TQT_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect (this, TQ_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } else { - connect (this, TQT_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect (this, TQ_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } - connect (this, TQT_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)), - this, TQT_SLOT (emitContextMenu (TDEListView*, TQListViewItem*))); + connect (this, TQ_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)), + this, TQ_SLOT (emitContextMenu (TDEListView*, TQListViewItem*))); d->alternateBackground = TDEGlobalSettings::alternateBackgroundColor(); } @@ -585,12 +585,12 @@ void TDEListView::slotSettingsChanged(int category) d->dragDelay = TDEGlobalSettings::dndEventDelay(); d->bUseSingle = TDEGlobalSettings::singleClick(); - disconnect(this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); + disconnect(this, TQ_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); if( d->bUseSingle ) - connect (this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); + connect (this, TQ_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); d->bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); if ( !d->disableAutoSelection ) @@ -607,17 +607,17 @@ void TDEListView::slotSettingsChanged(int category) if (d->showContextMenusOnPress) { - disconnect (0L, 0L, this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + disconnect (0L, 0L, this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } else { - disconnect (0L, 0L, this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + disconnect (0L, 0L, this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } break; @@ -828,7 +828,7 @@ void TDEListView::contentsMousePressEvent( TQMouseEvent *e ) treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() ) && ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) ); - if (e->button() == Qt::LeftButton && !rootDecoClicked) + if (e->button() == TQt::LeftButton && !rootDecoClicked) { //Start a drag d->startDragPos = e->pos(); @@ -885,7 +885,7 @@ void TDEListView::contentsMouseMoveEvent( TQMouseEvent *e ) void TDEListView::contentsMouseReleaseEvent( TQMouseEvent *e ) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { // If the row was already selected, maybe we want to start an in-place editing if ( d->pressedOnSelected && itemsRenameable() ) @@ -921,7 +921,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) // We don't want to call the parent method because it does setOpen, // whereas we don't do it in single click mode... (David) //TQListView::contentsMouseDoubleClickEvent( e ); - if ( !e || e->button() != Qt::LeftButton ) { + if ( !e || e->button() != TQt::LeftButton ) { return; } @@ -934,7 +934,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) if( item ) { emit doubleClicked( item, e->globalPos(), col ); - if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) { + if( (e->button() == TQt::LeftButton) && !d->bUseSingle ) { emitExecute( item, e->globalPos(), col ); } } @@ -942,7 +942,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) void TDEListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c ) { - if( (btn == Qt::LeftButton) && item ) { + if( (btn == TQt::LeftButton) && item ) { emitExecute(item, pos, c); } } @@ -1399,7 +1399,7 @@ TQRect TDEListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item r = itemRect(item); r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize()); if (painter) - style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), TQStyle::Style_FocusAtBorder, colorGroup().highlight()); } @@ -1601,7 +1601,7 @@ void TDEListView::fileManagerKeyPressEvent (TQKeyEvent* e) } if (((!selectedItems) || ((selectedItems==1) && (d->selectedUsingMouse))) - && (e_state==Qt::NoButton) + && (e_state==TQt::NoButton) && ((e->key()==Key_Down) || (e->key()==Key_Up) || (e->key()==Key_Next) @@ -2152,7 +2152,7 @@ void TDEListView::viewportPaintEvent(TQPaintEvent *e) TQPainter painter(viewport()); // This is where we actually draw the drop-highlighter - style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(), TQStyle::Style_FocusAtBorder); } d->painting = false; @@ -2456,7 +2456,7 @@ TQColor TDEListViewItem::backgroundColor(int column) // calculate a different color if the current column is sorted (only if more than 1 column) if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) ) { - if ( color == Qt::black ) + if ( color == TQt::black ) color = TQColor(55, 55, 55); // dark gray else { diff --git a/tdeui/tdelistview.h b/tdeui/tdelistview.h index 6b02b6891..c07d040e4 100644 --- a/tdeui/tdelistview.h +++ b/tdeui/tdelistview.h @@ -85,7 +85,7 @@ class TDEUI_EXPORT TDEListView : public TQListView { friend class TDEListViewItem; - Q_OBJECT + TQ_OBJECT TQ_ENUMS( SelectionModeExt ) TQ_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth ) diff --git a/tdeui/tdelistviewlineedit.h b/tdeui/tdelistviewlineedit.h index 0a87394ab..b7c166096 100644 --- a/tdeui/tdelistviewlineedit.h +++ b/tdeui/tdelistviewlineedit.h @@ -28,7 +28,7 @@ **/ class TDEUI_EXPORT TDEListViewLineEdit : public KLineEdit { -Q_OBJECT +TQ_OBJECT public: TDEListViewLineEdit(TDEListView *parent); ~TDEListViewLineEdit(); diff --git a/tdeui/tdelistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp index 50ad3d276..88ac3746c 100644 --- a/tdeui/tdelistviewsearchline.cpp +++ b/tdeui/tdelistviewsearchline.cpp @@ -63,15 +63,15 @@ TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, TDEListView *list d->listView = listView; - connect(this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(queueSearch(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(queueSearch(const TQString &))); if(listView) { - connect(listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + connect(listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - connect(listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + connect(listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } else setEnabled(false); @@ -84,8 +84,8 @@ TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, const char *name) d->listView = 0; - connect(this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(queueSearch(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(queueSearch(const TQString &))); setEnabled(false); } @@ -178,21 +178,21 @@ void TDEListViewSearchLine::setSearchColumns(const TQValueList<int> &columns) void TDEListViewSearchLine::setListView(TDEListView *lv) { if(d->listView) { - disconnect(d->listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + disconnect(d->listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - disconnect(d->listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + disconnect(d->listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } d->listView = lv; if(lv) { - connect(d->listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + connect(d->listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - connect(d->listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + connect(d->listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } setEnabled(bool(lv)); @@ -237,7 +237,7 @@ TQPopupMenu *TDEListViewSearchLine::createPopupMenu() if (d->listView->columns()>1) { TQPopupMenu *subMenu = new TQPopupMenu(popup); - connect(subMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(searchColumnsMenuActivated(int))); + connect(subMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(searchColumnsMenuActivated(int))); popup->insertSeparator(); popup->insertItem(i18n("Search Columns"), subMenu); @@ -285,7 +285,7 @@ void TDEListViewSearchLine::queueSearch(const TQString &search) { d->queuedSearches++; d->search = search; - TQTimer::singleShot(200, this, TQT_SLOT(activateSearch())); + TQTimer::singleShot(200, this, TQ_SLOT(activateSearch())); } void TDEListViewSearchLine::activateSearch() @@ -425,7 +425,7 @@ TDEListViewSearchLineWidget::TDEListViewSearchLineWidget(TDEListView *listView, setSpacing(5); - TQTimer::singleShot(0, this, TQT_SLOT(createWidgets())); + TQTimer::singleShot(0, this, TQ_SLOT(createWidgets())); } TDEListViewSearchLineWidget::~TDEListViewSearchLineWidget() @@ -460,7 +460,7 @@ void TDEListViewSearchLineWidget::createWidgets() label->setBuddy(d->searchLine); label->show(); - connect(d->clearButton, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear())); + connect(d->clearButton, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear())); } TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const @@ -470,7 +470,7 @@ TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const void TDEListViewSearchLineWidget::positionInToolBar() { - TDEToolBar *toolBar = tqt_dynamic_cast<TDEToolBar *>(parent()); + TDEToolBar *toolBar = dynamic_cast<TDEToolBar *>(parent()); if(toolBar) { diff --git a/tdeui/tdelistviewsearchline.h b/tdeui/tdelistviewsearchline.h index cf02c492c..aeac7d668 100644 --- a/tdeui/tdelistviewsearchline.h +++ b/tdeui/tdelistviewsearchline.h @@ -46,7 +46,7 @@ class TQToolButton; class TDEUI_EXPORT TDEListViewSearchLine : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: @@ -218,7 +218,7 @@ private: */ class TDEUI_EXPORT TDEListViewSearchLineWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index 225b910e4..817c14423 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -49,7 +49,7 @@ #include <tdelocale.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <netwm.h> #endif @@ -126,7 +126,7 @@ public: TQApplication::sendEvent( window, &e ); canceled = !e.isAccepted(); /* Don't even think_about deleting widgets with - Qt::WDestructiveClose flag set at this point. We + TQt::WDestructiveClose flag set at this point. We are faking a close event, but we are *not*_ closing the window. The purpose of the faked close event is to prepare the application so it @@ -184,7 +184,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags) mHelpMenu = 0; kapp->setTopWidget( this ); actionCollection()->setWidget( this ); - connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown())); + connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); if( !memberList ) memberList = new TQPtrList<TDEMainWindow>; @@ -290,7 +290,7 @@ void TDEMainWindow::parseGeometry(bool parsewidth) assert ( !kapp->geometryArgument().isNull() ); assert ( d->care_about_geometry ); -#if defined Q_WS_X11 +#if defined TQ_WS_X11 int x, y; int w, h; int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); @@ -340,8 +340,8 @@ TDEPopupMenu* TDEMainWindow::helpMenu( const TQString &aboutAppText, bool showWh if ( !mHelpMenu ) return 0; - connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ), - this, TQT_SLOT( showAboutApplication() ) ); + connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ), + this, TQ_SLOT( showAboutApplication() ) ); } return mHelpMenu->menu(); @@ -351,8 +351,8 @@ TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis ) { if( !mHelpMenu ) { mHelpMenu = new KHelpMenu( this, TQString::null, showWhatsThis ); - connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ), - this, TQT_SLOT( showAboutApplication() ) ); + connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ), + this, TQ_SLOT( showAboutApplication() ) ); } return mHelpMenu->menu(); @@ -403,7 +403,7 @@ void TDEMainWindow::hide() d->hiddenDockWindows.clear(); - TQObjectList *list = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING ); + TQObjectList *list = queryList( "TQDockWindow" ); for( TQObjectListIt it( *list ); it.current(); ++it ) { TQDockWindow *dw = (TQDockWindow*)it.current(); if ( dw->isTopLevel() && dw->isVisible() ) { @@ -433,7 +433,7 @@ bool TDEMainWindow::restore( int number, bool show ) KXMLGUIFactory *TDEMainWindow::guiFactory() { if ( !factory_ ) - factory_ = new KXMLGUIFactory( this, TQT_TQOBJECT(this), "guifactory" ); + factory_ = new KXMLGUIFactory( this, this, "guifactory" ); return factory_; } @@ -441,7 +441,7 @@ int TDEMainWindow::configureToolbars() { saveMainWindowSettings(TDEGlobal::config()); KEditToolbar dlg(actionCollection(), xmlFile(), true, this); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(saveNewToolbarConfig())); return dlg.exec(); } @@ -458,7 +458,7 @@ void TDEMainWindow::setupGUI( int options, const TQString & xmlfile ) { void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xmlfile ) { if( options & Keys ){ KStdAction::keyBindings(guiFactory(), - TQT_SLOT(configureShortcuts()), actionCollection()); + TQ_SLOT(configureShortcuts()), actionCollection()); } if( (options & StatusBar) && internalStatusBar() ){ @@ -467,8 +467,8 @@ void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & if( options & ToolBar ){ setStandardToolBarMenuEnabled( true ); - KStdAction::configureToolbars(TQT_TQOBJECT(this), - TQT_SLOT(configureToolbars() ), actionCollection()); + KStdAction::configureToolbars(this, + TQ_SLOT(configureToolbars() ), actionCollection()); } if( options & Create ){ @@ -600,7 +600,7 @@ void TDEMainWindow::setCaption( const TQString &caption, bool modified ) void TDEMainWindow::setPlainCaption( const TQString &caption ) { TQMainWindow::setCaption( caption ); -#if defined Q_WS_X11 +#if defined TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 ); info.setName( caption.utf8().data() ); #endif @@ -659,7 +659,7 @@ void TDEMainWindow::closeEvent ( TQCloseEvent *e ) if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted? if ( queryExit() && !kapp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app? // don't call queryExit() twice - disconnect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown())); + disconnect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); d->shuttingDown = true; kapp->deref(); // ...and quit application. } else { @@ -804,9 +804,9 @@ bool TDEMainWindow::isStandardToolBarMenuEnabled() const void TDEMainWindow::createStandardStatusBarAction(){ if(!d->showStatusBarAction){ - d->showStatusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(setSettingsDirty()), actionCollection()); + d->showStatusBarAction = KStdAction::showStatusbar(this, TQ_SLOT(setSettingsDirty()), actionCollection()); KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. - connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); + connect(d->showStatusBarAction, TQ_SIGNAL(toggled(bool)), sb, TQ_SLOT(setShown(bool))); d->showStatusBarAction->setChecked(sb->isHidden()); } } @@ -913,7 +913,7 @@ void TDEMainWindow::saveWindowSize( TDEConfig * config ) const int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); int w, h; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // save maximalization as desktop size + 1 in that direction KWin::WindowInfo info = KWin::windowInfo( winId(), NET::WMState ); w = info.state() & NET::MaxHoriz ? desk.width() + 1 : width(); @@ -963,7 +963,7 @@ void TDEMainWindow::restoreWindowSize( TDEConfig * config ) } } if ( !size.isEmpty() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int state = 0; if (size.width() > desk.width()) { state = state | NET::MaxHoriz; @@ -1017,7 +1017,7 @@ void TDEMainWindow::setSettingsDirty() if ( !d->settingsTimer ) { d->settingsTimer = new TQTimer( this ); - connect( d->settingsTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAutoSaveSettings() ) ); + connect( d->settingsTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( saveAutoSaveSettings() ) ); } d->settingsTimer->start( 500, true ); } @@ -1039,10 +1039,10 @@ void TDEMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWi d->autoSaveGroup = groupName; d->autoSaveWindowSize = saveWindowSize; // Get notified when the user moves a toolbar around - disconnect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), - this, TQT_SLOT( setSettingsDirty() ) ); - connect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), - this, TQT_SLOT( setSettingsDirty() ) ); + disconnect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), + this, TQ_SLOT( setSettingsDirty() ) ); + connect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), + this, TQ_SLOT( setSettingsDirty() ) ); // Now read the previously saved settings applyMainWindowSettings( TDEGlobal::config(), groupName ); @@ -1244,7 +1244,7 @@ TQSize TDEMainWindow::sizeForCentralWidgetSize(TQSize size) void TDEMainWindow::setIcon( const TQPixmap& p ) { TQMainWindow::setIcon( p ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which // is used by TDEMainWindow, sets it KWin::setIcons( winId(), p, TQPixmap()); diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h index 856590ab9..446b9c937 100644 --- a/tdeui/tdemainwindow.h +++ b/tdeui/tdemainwindow.h @@ -98,7 +98,7 @@ class DCOPObject; class TDEUI_EXPORT TDEMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient { friend class KMWSessionManaged; - Q_OBJECT + TQ_OBJECT public: /** @@ -541,8 +541,8 @@ public: * this function) a connection needs to be made to let TDEMainWindow * know when that status (hidden/shown) of the statusbar has changed. * For example: - * connect(action, TQT_SIGNAL(activated()), - * tdemainwindow, TQT_SLOT(setSettingsDirty())); + * connect(action, TQ_SIGNAL(activated()), + * tdemainwindow, TQ_SLOT(setSettingsDirty())); * Otherwise the status (hidden/show) of the statusbar might not be saved * by TDEMainWindow. * @since 3.2 @@ -683,7 +683,7 @@ public slots: * This slot can be connected dirrectly to the action to configure shortcuts. * This is very simple to do that by adding a single line * \code - * KStdAction::configureToolbars( guiFactory(), TQT_SLOT( configureToolbars() ), + * KStdAction::configureToolbars( guiFactory(), TQ_SLOT( configureToolbars() ), * actionCollection() ); * \endcode * @@ -734,8 +734,8 @@ public slots: * \code * TDEIconLoader &loader = *TDEGlobal::iconLoader(); * TQPixmap pixmap = loader.loadIcon( "help" ); - * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()), - * this, TQT_SLOT(appHelpActivated()), true, i18n("Help") ); + * toolBar(0)->insertButton( pixmap, 0, TQ_SIGNAL(clicked()), + * this, TQ_SLOT(appHelpActivated()), true, i18n("Help") ); * \endcode * */ diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp index 0404249b0..a18fb80ed 100644 --- a/tdeui/tdemainwindowiface.cpp +++ b/tdeui/tdemainwindowiface.cpp @@ -34,7 +34,7 @@ TDEMainWindowInterface::TDEMainWindowInterface(TDEMainWindow * mainWindow) { m_MainWindow = mainWindow; m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this ); - m_dcopPropertyProxy = new KDCOPPropertyProxy(TQT_TQOBJECT(m_MainWindow)); + m_dcopPropertyProxy = new KDCOPPropertyProxy(m_MainWindow); } TDEMainWindowInterface::~TDEMainWindowInterface() diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp index 0a5fe0188..e7c901d56 100644 --- a/tdeui/tdemenubar.cpp +++ b/tdeui/tdemenubar.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <kmanagerselection.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #include <twinmodule.h> #include <qxembed.h> @@ -74,7 +74,7 @@ public: : forcedTopLevel( false ), topLevel( false ), wasTopLevel( false ), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 selection( NULL ), #endif min_size( 0, 0 ) @@ -82,7 +82,7 @@ public: } ~KMenuBarPrivate() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 delete selection; #endif } @@ -93,7 +93,7 @@ public: int lineWidth; // dtto int margin; // dtto bool fallback_mode; // dtto -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDESelectionWatcher* selection; #endif TQTimer selection_timer; @@ -101,7 +101,7 @@ public: static Atom makeSelectionAtom(); }; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static Atom selection_atom = None; static Atom msg_type_atom = None; @@ -121,7 +121,7 @@ void initAtoms() Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( selection_atom == None ) initAtoms(); return selection_atom; @@ -133,19 +133,19 @@ Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom() KMenuBar::KMenuBar(TQWidget *parent, const char *name) : TQMenuBar(parent, name) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 QXEmbed::initialize(); #endif d = new KMenuBarPrivate; - connect( &d->selection_timer, TQT_SIGNAL( timeout()), - this, TQT_SLOT( selectionTimeout())); + connect( &d->selection_timer, TQ_SIGNAL( timeout()), + this, TQ_SLOT( selectionTimeout())); - connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); + connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( updateFallbackSize())); if ( kapp ) // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)), - this, TQT_SLOT(slotReadConfig())); + connect( kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), + this, TQ_SLOT(slotReadConfig())); slotReadConfig(); } @@ -176,13 +176,13 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) d->topLevel = top_level; if ( isTopLevelMenu() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 d->selection = new TDESelectionWatcher( KMenuBarPrivate::makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); - connect( d->selection, TQT_SIGNAL( newOwner( Window )), - this, TQT_SLOT( updateFallbackSize())); - connect( d->selection, TQT_SIGNAL( lostOwner()), - this, TQT_SLOT( updateFallbackSize())); + connect( d->selection, TQ_SIGNAL( newOwner( Window )), + this, TQ_SLOT( updateFallbackSize())); + connect( d->selection, TQ_SIGNAL( lostOwner()), + this, TQ_SLOT( updateFallbackSize())); #endif d->frameStyle = frameStyle(); d->lineWidth = lineWidth(); @@ -190,7 +190,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) d->fallback_mode = false; bool wasShown = !isHidden(); reparent( parentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setType( winId(), NET::TopMenu ); if( parentWidget()) XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); @@ -206,7 +206,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) show(); } else { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 delete d->selection; d->selection = NULL; #endif @@ -244,7 +244,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) { if ( d->topLevel ) { - if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()) ) + if ( parentWidget() && obj == parentWidget()->topLevelWidget() ) { if( ev->type() == TQEvent::Resize ) return false; // ignore resizing of parent, TQMenuBar would try to adjust size @@ -257,20 +257,20 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) // will update the state properly setTopLevelMenuInternal( d->topLevel ); } - if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent ) + if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); #else //TODO: WIN32? #endif setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible()); } - if( parentWidget() && !parentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget())) + if( parentWidget() && !parentWidget()->isTopLevel() && obj == parentWidget()) { // if the parent is not toplevel, KMenuBar needs to match its visibility status if( ev->type() == TQEvent::Show ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); #else //TODO: WIN32? @@ -283,7 +283,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) } else { - if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget())) + if( parentWidget() && obj == parentWidget()->topLevelWidget()) { if( ev->type() == TQEvent::WindowStateChange && !parentWidget()->topLevelWidget()->isFullScreen() ) @@ -303,7 +303,7 @@ void KMenuBar::updateFallbackSize() { if( !d->topLevel ) return; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( d->selection->owner() != None ) #endif { // somebody is managing us, don't mess anything, undo changes @@ -340,7 +340,7 @@ void KMenuBar::selectionTimeout() int margin = 0; move(area.left() - margin, area.top() - margin); setFixedSize(area.width() + 2* margin , heightForWidth( area.width() + 2 * margin ) ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int strut_height = height() - margin; if( strut_height < 0 ) strut_height = 0; @@ -426,7 +426,7 @@ TQSize KMenuBar::sizeHint() const return TQSize( w, h ); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool KMenuBar::x11Event( XEvent* ev ) { if( ev->type == ClientMessage && ev->xclient.message_type == msg_type_atom diff --git a/tdeui/tdemenubar.h b/tdeui/tdemenubar.h index 18ee3bf90..07345978d 100644 --- a/tdeui/tdemenubar.h +++ b/tdeui/tdemenubar.h @@ -41,7 +41,7 @@ class TDEUI_EXPORT KMenuBar : public TQMenuBar { - Q_OBJECT + TQ_OBJECT public: @@ -91,7 +91,7 @@ protected: virtual void showEvent( TQShowEvent* ); virtual void resizeEvent( TQResizeEvent* ); virtual bool eventFilter(TQObject *, TQEvent *); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 virtual bool x11Event( XEvent* ); #endif virtual void closeEvent( TQCloseEvent* ); diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp index 3208e94d8..49648a74d 100644 --- a/tdeui/tdemessagebox.cpp +++ b/tdeui/tdemessagebox.cpp @@ -45,7 +45,7 @@ #include <kiconloader.h> #include <tdeglobalsettings.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #endif @@ -164,7 +164,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, if (!icon.isNull()) label1->setPixmap(icon); - lay->addWidget( label1, 0, Qt::AlignCenter ); + lay->addWidget( label1, 0, TQt::AlignCenter ); lay->addSpacing(KDialog::spacingHint()); // Enforce <p>text</p> otherwise the word-wrap doesn't work well TQString qt_text = qrichtextify( text ); @@ -214,8 +214,8 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, KActiveLabel *label2 = new KActiveLabel( qt_text, contents ); if (!(options & KMessageBox::AllowLink)) { - TQObject::disconnect(label2, TQT_SIGNAL(linkClicked(const TQString &)), - label2, TQT_SLOT(openLink(const TQString &))); + TQObject::disconnect(label2, TQ_SIGNAL(linkClicked(const TQString &)), + label2, TQ_SLOT(openLink(const TQString &))); } // We add 10 pixels extra to compensate for some KActiveLabel margins. @@ -250,8 +250,8 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, label3->setMinimumSize(label3->sizeHint()); if (!(options & KMessageBox::AllowLink)) { - TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)), - label3, TQT_SLOT(openLink(const TQString &))); + TQObject::disconnect(label3, TQ_SIGNAL(linkClicked(const TQString &)), + label3, TQ_SLOT(openLink(const TQString &))); } } else { TQTextEdit* te = new TQTextEdit(details, TQString::null, detailsGroup); @@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No, @@ -432,7 +432,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text, buttonYes, buttonNo); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -483,7 +483,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id, buttonYes, buttonNo); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -565,7 +565,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text, buttonYes, buttonNo); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownContinue(dontAskAgainName) ) return Continue; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -637,7 +637,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text, buttonContinue, KStdGuiItem::cancel() ); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -713,7 +713,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text, buttonYes, buttonNo); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -755,7 +755,7 @@ void KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringList &strlist, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes, @@ -764,7 +764,7 @@ KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringLi KStdGuiItem::ok() ); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -794,7 +794,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text, KStdGuiItem::ok() ); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -832,7 +832,7 @@ void KMessageBox::sorryWId(WId parent_id, const TQString &text, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes, @@ -841,7 +841,7 @@ KMessageBox::sorryWId(WId parent_id, const TQString &text, KStdGuiItem::ok() ); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -871,7 +871,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text, KStdGuiItem::ok() ); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif @@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri if ( !shouldBeShownContinue(dontShowAgainName) ) return; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Information") : caption, KDialogBase::Yes, @@ -917,7 +917,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri KStdGuiItem::ok() ); if( options & PlainCaption ) dialog->setPlainCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id ) XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif diff --git a/tdeui/tdepassivepopupstack.cpp b/tdeui/tdepassivepopupstack.cpp index 9f116059f..cef63db18 100644 --- a/tdeui/tdepassivepopupstack.cpp +++ b/tdeui/tdepassivepopupstack.cpp @@ -60,9 +60,9 @@ KPassivePopup* TDEPassivePopupStackContainer::displayMessage(TQString title, TQS leftCorner.setX(mRightOfStack-popupSize.width()); leftCorner.setY(mTopOfStack); } - connect(popup, SIGNAL(hidden(KPassivePopup*)), this, SLOT(popupClosed(KPassivePopup*))); - connect(popup, SIGNAL(clicked(TQPoint)), this, SLOT(popupClicked(TQPoint))); - connect(popup, SIGNAL(destroyed(TQObject*)), this, SLOT(popupDestroyed(TQObject*))); + connect(popup, TQ_SIGNAL(hidden(KPassivePopup*)), this, TQ_SLOT(popupClosed(KPassivePopup*))); + connect(popup, TQ_SIGNAL(clicked(TQPoint)), this, TQ_SLOT(popupClicked(TQPoint))); + connect(popup, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(popupDestroyed(TQObject*))); mPopupList.append(popup); mPopupIDMap[popup] = id; popup->show(leftCorner); @@ -104,4 +104,4 @@ void TDEPassivePopupStackContainer::popupDestroyed(TQObject* object) { } } -#include "tdepassivepopupstack.moc"
\ No newline at end of file +#include "tdepassivepopupstack.moc" diff --git a/tdeui/tdepassivepopupstack.h b/tdeui/tdepassivepopupstack.h index 61ef209e1..13ac29f44 100644 --- a/tdeui/tdepassivepopupstack.h +++ b/tdeui/tdepassivepopupstack.h @@ -32,7 +32,7 @@ typedef TQMap<KPassivePopup*, TQString> TQStringPopupIDMap; class TDEUI_EXPORT TDEPassivePopupStackContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDEPassivePopupStackContainer(TQWidget *parent=0, const char *name=0); diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp index 3fd8a90e2..5195c64a8 100644 --- a/tdeui/tdepopupmenu.cpp +++ b/tdeui/tdepopupmenu.cpp @@ -21,10 +21,6 @@ #include <tqtimer.h> #include <tqfontmetrics.h> -#ifdef USE_QT4 -#undef None -#endif // USE_QT4 - #include <tqstyle.h> #include "tdepopupmenu.h" @@ -90,7 +86,7 @@ void TDEPopupTitle::paintEvent(TQPaintEvent *) { TQRect r(rect()); TQPainter p(this); - kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active()); + kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active()); if (!miniicon.isNull()) p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon); @@ -128,7 +124,7 @@ public: , shortcuts(false) , autoExec(false) , lastHitIndex(-1) - , state(Qt::NoButton) + , state(TQt::NoButton) , m_ctxMenu(0) {} @@ -168,7 +164,7 @@ TDEPopupMenu::TDEPopupMenu(TQWidget *parent, const char *name) { d = new TDEPopupMenuPrivate; resetKeyboardVars(); - connect(&(d->clearTimer), TQT_SIGNAL(timeout()), TQT_SLOT(resetKeyboardVars())); + connect(&(d->clearTimer), TQ_SIGNAL(timeout()), TQ_SLOT(resetKeyboardVars())); } TDEPopupMenu::~TDEPopupMenu() @@ -278,7 +274,7 @@ void TDEPopupMenu::closeEvent(TQCloseEvent*e) void TDEPopupMenu::activateItemAt(int index) { - d->state = Qt::NoButton; + d->state = TQt::NoButton; TQPopupMenu::activateItemAt(index); } @@ -289,7 +285,7 @@ TQt::ButtonState TDEPopupMenu::state() const void TDEPopupMenu::keyPressEvent(TQKeyEvent* e) { - d->state = Qt::NoButton; + d->state = TQt::NoButton; if (!d->shortcuts) { // continue event processing by Qpopup //e->ignore(); @@ -518,7 +514,7 @@ TQPopupMenu* TDEPopupMenu::contextMenu() if (!d->m_ctxMenu) { d->m_ctxMenu = new TQPopupMenu(this); - connect(d->m_ctxMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(ctxMenuHiding())); + connect(d->m_ctxMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(ctxMenuHiding())); } return d->m_ctxMenu; @@ -563,7 +559,7 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TQPopupMenu* subMenu = item->popup(); if (subMenu) { - disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); + disconnect(subMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(ctxMenuHideShowingMenu())); } } @@ -580,8 +576,8 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { - connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu())); - TQTimer::singleShot(100, subMenu, TQT_SLOT(hide())); + connect(subMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(ctxMenuHideShowingMenu())); + TQTimer::singleShot(100, subMenu, TQ_SLOT(hide())); } if (!TDEPopupMenuPrivate::s_continueCtxMenuShow) @@ -592,7 +588,7 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TDEPopupMenuPrivate::s_contextedMenu = this; d->m_ctxMenu->popup(this->mapToGlobal(pos)); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(itemHighlighted(int))); } /* @@ -607,7 +603,7 @@ void TDEPopupMenu::ctxMenuHideShowingMenu() TQPopupMenu* subMenu = item->popup(); if (subMenu) { - TQTimer::singleShot(0, subMenu, TQT_SLOT(hide())); + TQTimer::singleShot(0, subMenu, TQ_SLOT(hide())); } } } @@ -619,11 +615,11 @@ void TDEPopupMenu::ctxMenuHiding() TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { - disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); + disconnect(subMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(ctxMenuHideShowingMenu())); } } - disconnect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int))); + disconnect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(itemHighlighted(int))); TDEPopupMenuPrivate::s_continueCtxMenuShow = true; } diff --git a/tdeui/tdepopupmenu.h b/tdeui/tdepopupmenu.h index 7f84a5fc5..1a03ad11b 100644 --- a/tdeui/tdepopupmenu.h +++ b/tdeui/tdepopupmenu.h @@ -37,7 +37,7 @@ */ class TDEUI_EXPORT TDEPopupTitle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -121,7 +121,7 @@ private: * @author Hamish Rodda <rodda@kde.org> */ class TDEUI_EXPORT TDEPopupMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/tdeselect.cpp b/tdeui/tdeselect.cpp index 272f7a144..3d453f01e 100644 --- a/tdeui/tdeselect.cpp +++ b/tdeui/tdeselect.cpp @@ -122,7 +122,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev ) TQPainter painter; painter.begin( this ); - style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, + style().drawPrimitive(TQStyle::PE_Panel, &painter, borderRect, colorGroup(), TQStyle::Style_Sunken); @@ -160,7 +160,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e ) void KXYSelector::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Qt::Horizontal ) + if ( e->orientation() == TQt::Horizontal ) setValues( xValue() + e->delta()/120, yValue() ); else setValues( xValue(), yValue() + e->delta()/120 ); @@ -238,7 +238,7 @@ void KXYSelector::drawCursor( TQPainter *p, int xp, int yp ) TDESelector::TDESelector( TQWidget *parent, const char *name ) : TQWidget( parent, name ), TQRangeControl() { - _orientation = Qt::Horizontal; + _orientation = TQt::Horizontal; _indent = true; } @@ -258,7 +258,7 @@ TQRect TDESelector::contentsRect() const { int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw ); else return TQRect( iw, w, width() - 2 * iw, height() - w * 2 - 5 ); @@ -277,11 +277,11 @@ void TDESelector::paintEvent( TQPaintEvent * ) if ( indent() ) { TQRect r = rect(); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) r.addCoords(0, iw - w, -iw, w - iw); else r.addCoords(iw - w, 0, w - iw, -iw); - style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, + style().drawPrimitive(TQStyle::PE_Panel, &painter, r, colorGroup(), TQStyle::Style_Sunken); } @@ -332,7 +332,7 @@ void TDESelector::moveArrow( const TQPoint &pos ) int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) val = ( maxValue() - minValue() ) * (height()-pos.y()-5+w) / (height()-iw*2) + minValue(); else @@ -348,7 +348,7 @@ TQPoint TDESelector::calcArrowPos( int val ) int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { p.setY( height() - ( (height()-2*iw) * val / ( maxValue() - minValue() ) + 5 ) ); @@ -377,7 +377,7 @@ void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) painter->setBrush( TQBrush( colorGroup().buttonText() ) ); array.setPoint( 0, pos.x()+0, pos.y()+0 ); array.setPoint( 1, pos.x()+5, pos.y()+5 ); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { array.setPoint( 2, pos.x()+5, pos.y()-5 ); } @@ -390,7 +390,7 @@ void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) } else { - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { repaint(pos.x(), pos.y()-5, 6, 11, true); } @@ -442,7 +442,7 @@ void KGradientSelector::drawContents( TQPainter *painter ) int greenDiff = color2.green() - color1.green(); int blueDiff = color2.blue() - color1.blue(); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { for ( int y = 0; y < image.height(); y++ ) { @@ -488,7 +488,7 @@ void KGradientSelector::drawContents( TQPainter *painter ) painter->drawPixmap( contentsRect().x(), contentsRect().y(), p ); - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) { int yPos = contentsRect().top() + painter->fontMetrics().ascent() + 2; int xPos = contentsRect().left() + (contentsRect().width() - diff --git a/tdeui/tdeselect.h b/tdeui/tdeselect.h index 19321da1b..748b5897a 100644 --- a/tdeui/tdeselect.h +++ b/tdeui/tdeselect.h @@ -42,7 +42,7 @@ */ class TDEUI_EXPORT KXYSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int xValue READ xValue WRITE setXValue ) TQ_PROPERTY( int yValue READ yValue WRITE setYValue ) @@ -158,7 +158,7 @@ private: */ class TDEUI_EXPORT TDESelector : public TQWidget, public TQRangeControl { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int value READ value WRITE setValue ) TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) @@ -292,7 +292,7 @@ private: **/ class TDEUI_EXPORT KGradientSelector : public TDESelector { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor firstColor READ firstColor WRITE setFirstColor ) TQ_PROPERTY( TQColor secondColor READ secondColor WRITE setSecondColor ) diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp index 4d95970b6..be0386dea 100644 --- a/tdeui/tdeshortcutdialog.cpp +++ b/tdeui/tdeshortcutdialog.cpp @@ -21,7 +21,7 @@ #include <tqvariant.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define XK_XKB_KEYS #define XK_MISCELLANY #include <X11/Xlib.h> // For x11Event() @@ -37,7 +37,7 @@ #undef FocusOut #undef FocusIn #endif -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) # include <kkeyserver.h> #endif @@ -91,21 +91,21 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort m_simple->m_btnClearShortcut->setPixmap( SmallIcon( "locationbar_erase" ) ); m_adv->m_btnClearPrimary->setPixmap( SmallIcon( "locationbar_erase" ) ); m_adv->m_btnClearAlternate->setPixmap( SmallIcon( "locationbar_erase" ) ); - connect(m_simple->m_btnClearShortcut, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearShortcut())); - connect(m_adv->m_btnClearPrimary, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearPrimary())); - connect(m_adv->m_btnClearAlternate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearAlternate())); - - connect(m_adv->m_txtPrimary, TQT_SIGNAL(clicked()), - m_adv->m_btnPrimary, TQT_SLOT(animateClick())); - connect(m_adv->m_txtAlternate, TQT_SIGNAL(clicked()), - m_adv->m_btnAlternate, TQT_SLOT(animateClick())); - connect(m_adv->m_btnPrimary, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectPrimary())); - connect(m_adv->m_btnAlternate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectAlternate())); + connect(m_simple->m_btnClearShortcut, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearShortcut())); + connect(m_adv->m_btnClearPrimary, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearPrimary())); + connect(m_adv->m_btnClearAlternate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearAlternate())); + + connect(m_adv->m_txtPrimary, TQ_SIGNAL(clicked()), + m_adv->m_btnPrimary, TQ_SLOT(animateClick())); + connect(m_adv->m_txtAlternate, TQ_SIGNAL(clicked()), + m_adv->m_btnAlternate, TQ_SLOT(animateClick())); + connect(m_adv->m_btnPrimary, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectPrimary())); + connect(m_adv->m_btnAlternate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectAlternate())); KGuiItem ok = KStdGuiItem::ok(); ok.setText( i18n( "OK" ) ); @@ -121,7 +121,7 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort s_showMore = TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); updateDetails(); - #ifdef Q_WS_X11 + #ifdef TQ_WS_X11 kapp->installX11EventFilter( this ); // Allow button to capture X Key Events. #endif } @@ -276,7 +276,7 @@ void TDEShortcutDialog::slotMultiKeyMode( bool bOn ) } } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /* we don't use the generic Qt code on X11 because it allows us to grab the keyboard so that all keypresses are seen */ @@ -387,7 +387,7 @@ void TDEShortcutDialog::x11KeyReleaseEvent( XEvent* pEvent ) updateShortcutDisplay(); } } -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e ) { kdDebug() << e->text() << " " << (int)e->text()[0].latin1()<< " " << (int)e->ascii() << endl; @@ -442,7 +442,7 @@ void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e ) updateShortcutDisplay(); if( !m_adv->m_btnMultiKey->isChecked() ) - TQTimer::singleShot(500, this, TQT_SLOT(accept())); + TQTimer::singleShot(500, this, TQ_SLOT(accept())); } return; } @@ -520,7 +520,7 @@ void TDEShortcutDialog::keyPressed( KKey key ) updateShortcutDisplay(); if( !m_adv->m_btnMultiKey->isChecked() ) - TQTimer::singleShot(500, this, TQT_SLOT(accept())); + TQTimer::singleShot(500, this, TQ_SLOT(accept())); } #include "tdeshortcutdialog.moc" diff --git a/tdeui/tdeshortcutdialog.h b/tdeui/tdeshortcutdialog.h index afad6fda2..348996878 100644 --- a/tdeui/tdeshortcutdialog.h +++ b/tdeui/tdeshortcutdialog.h @@ -40,7 +40,7 @@ class TDEShortcutDialogAdvanced; */ class TDEUI_EXPORT TDEShortcutDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShortcut, TQWidget* parent = 0, const char* name = 0 ); ~TDEShortcutDialog(); @@ -67,13 +67,13 @@ private: void keyPressed( KKey key ); void updateDetails(); - #ifdef Q_WS_X11 + #ifdef TQ_WS_X11 virtual bool x11Event( XEvent *pEvent ); //void x11EventKeyPress( XEvent *pEvent ); void x11KeyPressEvent( XEvent* pEvent ); void x11KeyReleaseEvent( XEvent* pEvent ); #endif - #ifdef Q_WS_WIN + #ifdef TQ_WS_WIN virtual void keyPressEvent( TQKeyEvent * e ); virtual bool event(TQEvent * e); #endif diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp index e5d21d45b..d2326412b 100644 --- a/tdeui/tdespell.cpp +++ b/tdeui/tdespell.cpp @@ -97,10 +97,10 @@ public: // Connects a slot to KProcIO's output signal -#define OUTPUT(x) (connect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *)))) +#define OUTPUT(x) (connect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *)))) // Disconnect a slot from... -#define NOOUTPUT(x) (disconnect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *)))) +#define NOOUTPUT(x) (disconnect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *)))) @@ -296,11 +296,11 @@ KSpell::startIspell() if (trystart == 0) //don't connect these multiple times { - connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) ); + connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(ispellErrors(TDEProcess *, char *, int)) ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(ispellExit (TDEProcess *)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(ispellExit (TDEProcess *)) ); OUTPUT(KSpell2); } @@ -308,7 +308,7 @@ KSpell::startIspell() if ( !proc->start() ) { m_status = Error; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath())); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath())); } } @@ -331,14 +331,14 @@ void KSpell::KSpell2( KProcIO * ) if ( proc->readln( line, true ) == -1 ) { - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } if ( line[0] != '@' ) //@ indicates that ispell is working fine { - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -346,7 +346,7 @@ void KSpell::KSpell2( KProcIO * ) if ( !ignore("kde") ) { kdDebug(750) << "@KDE was false" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -354,7 +354,7 @@ void KSpell::KSpell2( KProcIO * ) if ( !ignore("linux") ) { kdDebug(750) << "@Linux was false" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -375,12 +375,12 @@ KSpell::setUpDialog( bool reallyuseprogressbar ) progressbar && reallyuseprogressbar, modaldlg ); ksdlg->setCaption( caption ); - connect( ksdlg, TQT_SIGNAL(command(int)), - this, TQT_SLOT(slotStopCancel(int)) ); - connect( this, TQT_SIGNAL(progress(unsigned int)), - ksdlg, TQT_SLOT(slotProgress(unsigned int)) ); + connect( ksdlg, TQ_SIGNAL(command(int)), + this, TQ_SLOT(slotStopCancel(int)) ); + connect( this, TQ_SIGNAL(progress(unsigned int)), + ksdlg, TQ_SLOT(slotProgress(unsigned int)) ); -#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded +#ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded KWin::setIcons( ksdlg->winId(), kapp->icon(), kapp->miniIcon() ); #endif if ( modaldlg ) @@ -488,7 +488,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) return false; } ///set the dialog signal handler - dialog3slot = TQT_SLOT(checkWord3()); + dialog3slot = TQ_SLOT(checkWord3()); usedialog = _usedialog; setUpDialog( false ); @@ -503,7 +503,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) while (proc->readln( blank_line, true ) != -1); // eat spurious blanks OUTPUT(checkWord2); - // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); + // connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3())); proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell @@ -532,7 +532,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) ///set the dialog signal handler if ( !suggest ) { - dialog3slot = TQT_SLOT(checkWord3()); + dialog3slot = TQ_SLOT(checkWord3()); usedialog = _usedialog; setUpDialog( false ); if ( _usedialog ) @@ -547,7 +547,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) while (proc->readln( blank_line, true ) != -1); // eat spurious blanks OUTPUT(checkWord2); - // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); + // connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3())); proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell @@ -578,7 +578,7 @@ void KSpell::checkWord2( KProcIO* ) if ( mistake && usedialog ) { cwword = word; - dialog( word, sugg, TQT_SLOT(checkWord3()) ); + dialog( word, sugg, TQ_SLOT(checkWord3()) ); d->checkNextTimer->start( 0, true ); return; } @@ -626,14 +626,14 @@ void KSpell::suggestWord( KProcIO * ) if ( mistake && usedialog ) { cwword=word; - dialog( word, sugg, TQT_SLOT(checkWord3()) ); + dialog( word, sugg, TQ_SLOT(checkWord3()) ); return; } } void KSpell::checkWord3() { - disconnect( this, TQT_SIGNAL(dialog3()), this, TQT_SLOT(checkWord3()) ); + disconnect( this, TQ_SIGNAL(dialog3()), this, TQ_SLOT(checkWord3()) ); emit corrected( cwword, replacement(), 0L ); } @@ -792,7 +792,7 @@ bool KSpell::checkList (TQStringList *_wordlist, bool _usedialog) setUpDialog(); //set the dialog signal handler - dialog3slot = TQT_SLOT (checkList4 ()); + dialog3slot = TQ_SLOT (checkList4 ()); proc->writeStdin (TQString("%")); // turn off terse mode & check one word at a time @@ -883,7 +883,7 @@ void KSpell::checkList3a (KProcIO *) cwword = word; dlgon = true; // show the dialog - dialog( word, sugg, TQT_SLOT(checkList4()) ); + dialog( word, sugg, TQ_SLOT(checkList4()) ); return; } else @@ -930,7 +930,7 @@ void KSpell::checkList4 () dlgon=false; TQString old; - disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkList4())); + disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkList4())); //others should have been processed by dialog() already switch (dlgresult) @@ -980,7 +980,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) usedialog = _usedialog; setUpDialog(); //set the dialog signal handler - dialog3slot = TQT_SLOT(check3()); + dialog3slot = TQ_SLOT(check3()); kdDebug(750) << "KS: check" << endl; origbuffer = _buffer; @@ -1090,7 +1090,7 @@ void KSpell::check2( KProcIO * ) //kdDebug(750) << "(Before dialog) word=[" << word << "] cwword =[" << cwword << "]\n" << endl; if ( usedialog ) { // show the word in the dialog - dialog( word, sugg, TQT_SLOT(check3()) ); + dialog( word, sugg, TQ_SLOT(check3()) ); } else { // No dialog, just emit misspelling and continue d->m_bNoMisspellingsEncountered = false; @@ -1152,7 +1152,7 @@ void KSpell::check2( KProcIO * ) void KSpell::check3 () // evaluates the return value of the dialog { - disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (check3())); + disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (check3())); kdDebug(750) << "check3 [" << cwword << "] [" << replacement() << "] " << dlgresult << endl; //others should have been processed by dialog() already @@ -1199,7 +1199,7 @@ KSpell::slotStopCancel (int result) if (!dialog3slot.isEmpty()) { dlgresult=result; - connect (this, TQT_SIGNAL (dialog3()), this, dialog3slot.ascii()); + connect (this, TQ_SIGNAL (dialog3()), this, dialog3slot.ascii()); emit dialog3(); } } @@ -1211,7 +1211,7 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl dialog3slot = _slot; dialogwillprocess = true; - connect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) ); + connect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) ); TQString tmpBuf = newbuffer; kdDebug(750)<<" position = "<<lastpos<<endl; @@ -1238,7 +1238,7 @@ void KSpell::dialog2( int result ) { TQString qs; - disconnect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) ); + disconnect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) ); dialogwillprocess = false; dlgresult = result; ksdlg->standby(); @@ -1277,7 +1277,7 @@ void KSpell::dialog2( int result ) break; } - connect( this, TQT_SIGNAL(dialog3()), this, dialog3slot.ascii() ); + connect( this, TQ_SIGNAL(dialog3()), this, dialog3slot.ascii() ); emit dialog3(); } @@ -1334,7 +1334,7 @@ void KSpell::ispellExit( TDEProcess* ) return; // Dead already kdDebug(750) << "Death" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); } // This is always called from the event loop to make @@ -1423,12 +1423,12 @@ void KSpell::slotModalReady() //kdDebug(750) << "MODAL READY------------------" << endl; Q_ASSERT( m_status == Running ); - connect( this, TQT_SIGNAL( done( const TQString & ) ), - this, TQT_SLOT( slotModalDone( const TQString & ) ) ); - TQObject::connect( this, TQT_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ), - this, TQT_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) ); - TQObject::connect( this, TQT_SIGNAL( death() ), - this, TQT_SLOT( slotModalSpellCheckerFinished( ) ) ); + connect( this, TQ_SIGNAL( done( const TQString & ) ), + this, TQ_SLOT( slotModalDone( const TQString & ) ) ); + TQObject::connect( this, TQ_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ), + this, TQ_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) ); + TQObject::connect( this, TQ_SIGNAL( death() ), + this, TQ_SLOT( slotModalSpellCheckerFinished( ) ) ); check( modaltext ); } @@ -1463,8 +1463,8 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption, d->checking = false; d->aspellV6 = false; d->checkNextTimer = new TQTimer( this ); - connect( d->checkNextTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( checkNext() )); + connect( d->checkNextTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( checkNext() )); autoDelete = false; modaldlg = _modal; progressbar = _progressbar; @@ -1559,10 +1559,10 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption, if ( obj && slot ) // caller wants to know when tdespell is ready - connect( this, TQT_SIGNAL(ready(KSpell *)), obj, slot); + connect( this, TQ_SIGNAL(ready(KSpell *)), obj, slot); else // Hack for modal spell checking - connect( this, TQT_SIGNAL(ready(KSpell *)), this, TQT_SLOT(slotModalReady()) ); + connect( this, TQ_SIGNAL(ready(KSpell *)), this, TQ_SLOT(slotModalReady()) ); proc = new KProcIO( codec ); diff --git a/tdeui/tdespell.h b/tdeui/tdespell.h index f09571004..802c5567b 100644 --- a/tdeui/tdespell.h +++ b/tdeui/tdespell.h @@ -45,7 +45,7 @@ class KSpellDlg; class TDEUI_EXPORT KSpell : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/tdespelldlg.cpp b/tdeui/tdespelldlg.cpp index 9e8206505..f111eb50f 100644 --- a/tdeui/tdespelldlg.cpp +++ b/tdeui/tdespelldlg.cpp @@ -60,44 +60,44 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b d->ui = new KSpellUI( this ); setMainWidget( d->ui ); - connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(replace())); - connect( this, TQT_SIGNAL(ready(bool)), - d->ui->m_replaceBtn, TQT_SLOT(setEnabled(bool)) ); + connect( d->ui->m_replaceBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(replace())); + connect( this, TQ_SIGNAL(ready(bool)), + d->ui->m_replaceBtn, TQ_SLOT(setEnabled(bool)) ); - connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(replaceAll())); - connect(this, TQT_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_replaceAllBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(replaceAll())); + connect(this, TQ_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignore())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_skipBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(ignore())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_skipAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignoreAll())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipAllBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_skipAllBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(ignoreAll())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_skipAllBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_addBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_addBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(add())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_addBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_suggestBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(suggest())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_suggestBtn, TQT_SLOT(setEnabled(bool)) ); + connect( d->ui->m_suggestBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(suggest())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_suggestBtn, TQ_SLOT(setEnabled(bool)) ); d->ui->m_suggestBtn->hide(); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(stop())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(stop())); - connect( d->ui->m_replacement, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(textChanged(const TQString &)) ); + connect( d->ui->m_replacement, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(textChanged(const TQString &)) ); - connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), TQT_SLOT(replace()) ); - connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->ui->m_replacement, TQ_SIGNAL(returnPressed()), TQ_SLOT(replace()) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( d->ui->m_suggestions, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( replace() ) ); + connect( d->ui->m_suggestions, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( replace() ) ); d->spellConfig = new KSpellConfig( 0, 0 ,0, false ); d->spellConfig->fillDicts( d->ui->m_language ); - connect( d->ui->m_language, TQT_SIGNAL(activated(int)), - d->spellConfig, TQT_SLOT(sSetDictionary(int)) ); - connect( d->spellConfig, TQT_SIGNAL(configChanged()), - TQT_SLOT(slotConfigChanged()) ); + connect( d->ui->m_language, TQ_SIGNAL(activated(int)), + d->spellConfig, TQ_SLOT(sSetDictionary(int)) ); + connect( d->spellConfig, TQ_SIGNAL(configChanged()), + TQ_SLOT(slotConfigChanged()) ); setHelp( "spelldlg", "tdespell" ); setMinimumSize( sizeHint() ); diff --git a/tdeui/tdespelldlg.h b/tdeui/tdespelldlg.h index c4731800f..565464c4e 100644 --- a/tdeui/tdespelldlg.h +++ b/tdeui/tdespelldlg.h @@ -45,7 +45,7 @@ enum KS_RESULT { class TDEUI_EXPORT KSpellDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT class KSpellDlgPrivate; KSpellDlgPrivate *d; diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index 7c6902fed..817af5007 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -149,8 +149,8 @@ TDEToolBarSeparator::TDEToolBarSeparator(Orientation o , bool l, TQToolBar *pare const char* name ) :TQFrame( parent, name ), line( l ) { - connect( parent, TQT_SIGNAL(orientationChanged(Orientation)), - this, TQT_SLOT(setOrientation(Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(Orientation)), + this, TQ_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -167,10 +167,10 @@ void TDEToolBarSeparator::drawContents( TQPainter* p ) if ( line ) { TQStyle::SFlags flags = TQStyle::Style_Default; - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) flags = flags | TQStyle::Style_Horizontal; - style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p, + style().drawPrimitive(TQStyle::PE_DockWindowSeparator, p, contentsRect(), colorGroup(), flags); } else { TQFrame::drawContents(p); @@ -185,7 +185,7 @@ void TDEToolBarSeparator::styleChange( TQStyle& ) TQSize TDEToolBarSeparator::sizeHint() const { int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); + return orientation() == TQt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); } TQSizePolicy TDEToolBarSeparator::sizePolicy() const @@ -195,7 +195,7 @@ TQSizePolicy TDEToolBarSeparator::sizePolicy() const TDEToolBar::TDEToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig ) : TQToolBar( TQString::fromLatin1( name ), - tqt_dynamic_cast<TQMainWindow*>(parent), + dynamic_cast<TQMainWindow*>(parent), parent, false, name ? name : "mainToolBar") { @@ -232,16 +232,16 @@ void TDEToolBar::init( bool readConfig, bool honorStyle ) d->m_honorStyle = honorStyle; context = 0; layoutTimer = new TQTimer( this ); - connect( layoutTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( rebuildLayout() ) ); - connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRepaint() ) ); + connect( layoutTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( rebuildLayout() ) ); + connect( &(d->repaintTimer), TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRepaint() ) ); if ( kapp ) { // may be null when started inside designer - connect(kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)), this, TQT_SLOT(slotAppearanceChanged())); + connect(kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged())); // request notification of changes in icon style kapp->addKipcEventMask(KIPC::IconChanged); - connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int))); + connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int))); } // finally, read in our configurable settings @@ -249,11 +249,11 @@ void TDEToolBar::init( bool readConfig, bool honorStyle ) slotReadConfig(); if ( mainWindow() ) - connect( mainWindow(), TQT_SIGNAL( toolBarPositionChanged( TQToolBar * ) ), - this, TQT_SLOT( toolBarPosChanged( TQToolBar * ) ) ); + connect( mainWindow(), TQ_SIGNAL( toolBarPositionChanged( TQToolBar * ) ), + this, TQ_SLOT( toolBarPosChanged( TQToolBar * ) ) ); // Hack to make sure we recalculate our size when we dock. - connect( this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(rebuildLayout()) ); + connect( this, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), TQ_SLOT(rebuildLayout()) ); } int TDEToolBar::insertButton(const TQString& icon, int id, bool enabled, @@ -422,7 +422,7 @@ int TDEToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slo insertWidgetInternal( anim, index, id ); if ( receiver ) - connect( anim, TQT_SIGNAL(clicked()), receiver, slot); + connect( anim, TQ_SIGNAL(clicked()), receiver, slot); return index; } @@ -432,7 +432,7 @@ KAnimWidget *TDEToolBar::animatedWidget( int id ) Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return 0; - KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(*it); + KAnimWidget *aw = dynamic_cast<KAnimWidget *>(*it); if ( aw ) return aw; TQObjectList *l = queryList( "KAnimWidget" ); @@ -442,7 +442,7 @@ KAnimWidget *TDEToolBar::animatedWidget( int id ) } for ( TQObject *o = l->first(); o; o = l->next() ) { - KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(o); + KAnimWidget *aw = dynamic_cast<KAnimWidget *>(o); if ( aw ) { delete l; @@ -615,7 +615,7 @@ KComboBox * TDEToolBar::getCombo(int id) Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return 0; - return tqt_dynamic_cast<KComboBox *>( *it ); + return dynamic_cast<KComboBox *>( *it ); } @@ -624,7 +624,7 @@ KLineEdit * TDEToolBar::getLined (int id) Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return 0; - return tqt_dynamic_cast<KLineEdit *>( *it ); + return dynamic_cast<KLineEdit *>( *it ); } @@ -633,7 +633,7 @@ TDEToolBarButton * TDEToolBar::getButton (int id) Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return 0; - return tqt_dynamic_cast<TDEToolBarButton *>( *it ); + return dynamic_cast<TDEToolBarButton *>( *it ); } @@ -947,7 +947,7 @@ void TDEToolBar::setFlat (bool flag) else mainWindow()->moveDockWindow( this, DockTop ); // And remember to save the new look later - TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow()); + TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow()); if ( kmw ) kmw->setSettingsDirty(); } @@ -1093,7 +1093,7 @@ void TDEToolBar::saveSettings(TDEConfig *config, const TQString &_configGroup) // reappear at the same position the next time. // The whole set of indexes has to be saved. //kdDebug(220) << name() << " writing index " << index << endl; - TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow()); + TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow()); // don't save if there's only one toolbar // Don't use kmw->toolBarIterator() because you might @@ -1145,12 +1145,12 @@ TQString TDEToolBar::text() const void TDEToolBar::doConnections( TDEToolBarButton *button ) { - connect(button, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL( clicked( int ) ) ); - connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL( doubleClicked( int ) ) ); - connect(button, TQT_SIGNAL(released(int)), this, TQT_SIGNAL( released( int ) ) ); - connect(button, TQT_SIGNAL(pressed(int)), this, TQT_SIGNAL( pressed( int ) ) ); - connect(button, TQT_SIGNAL(toggled(int)), this, TQT_SIGNAL( toggled( int ) ) ); - connect(button, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SIGNAL( highlighted( int, bool ) ) ); + connect(button, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL( clicked( int ) ) ); + connect(button, TQ_SIGNAL(doubleClicked(int)), this, TQ_SIGNAL( doubleClicked( int ) ) ); + connect(button, TQ_SIGNAL(released(int)), this, TQ_SIGNAL( released( int ) ) ); + connect(button, TQ_SIGNAL(pressed(int)), this, TQ_SIGNAL( pressed( int ) ) ); + connect(button, TQ_SIGNAL(toggled(int)), this, TQ_SIGNAL( toggled( int ) ) ); + connect(button, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SIGNAL( highlighted( int, bool ) ) ); } void TDEToolBar::mousePressEvent ( TQMouseEvent *m ) @@ -1159,7 +1159,7 @@ void TDEToolBar::mousePressEvent ( TQMouseEvent *m ) return; TQMainWindow *mw = mainWindow(); if ( mw->toolBarsMovable() && d->m_enableContext ) { - if ( m->button() == Qt::RightButton ) { + if ( m->button() == TQt::RightButton ) { TQGuardedPtr<TDEToolBar> guard( this ); int i = contextMenu()->exec( m->globalPos(), 0 ); // "Configure Toolbars" recreates toolbars, so we might not exist anymore. @@ -1204,7 +1204,7 @@ void TDEToolBar::mousePressEvent ( TQMouseEvent *m ) else return; // assume this was an action handled elsewhere, no need for setSettingsDirty() } - TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mw); + TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mw); if ( kmw ) kmw->setSettingsDirty(); } @@ -1238,17 +1238,17 @@ void TDEToolBar::rebuildLayout() for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( w == rightAligned ) continue; - TDEToolBarSeparator *ktbs = tqt_dynamic_cast<TDEToolBarSeparator *>(w); + TDEToolBarSeparator *ktbs = dynamic_cast<TDEToolBarSeparator *>(w); if ( ktbs && !ktbs->showLine() ) { - l->addSpacing( orientation() == Qt::Vertical ? w->sizeHint().height() : w->sizeHint().width() ); + l->addSpacing( orientation() == TQt::Vertical ? w->sizeHint().height() : w->sizeHint().width() ); w->hide(); continue; } - if ( tqt_dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu? + if ( dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu? continue; l->addWidget( w ); w->show(); - if ((orientation() == Qt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? + if ((orientation() == TQt::Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? l->addSpacing(2); // A little bit extra spacing behind it. } if ( rightAligned ) { @@ -1270,14 +1270,14 @@ void TDEToolBar::rebuildLayout() void TDEToolBar::childEvent( TQChildEvent *e ) { if ( e->child()->isWidgetType() ) { - TQWidget * w = tqt_dynamic_cast<TQWidget *>(e->child()); + TQWidget * w = dynamic_cast<TQWidget *>(e->child()); if (!w || !(::qstrcmp( "qt_dockwidget_internal", w->name()))) { TQToolBar::childEvent( e ); return; } if ( e->type() == TQEvent::ChildInserted ) { - if ( !tqt_dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu + if ( !dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu // prevent items that have been explicitly inserted by insert*() from // being inserted again if ( !widget2id.contains( w ) ) @@ -1309,8 +1309,8 @@ void TDEToolBar::insertWidgetInternal( TQWidget *w, int &index, int id ) // we can't have it in widgets, or something is really wrong //widgets.removeRef( w ); - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); if ( index == -1 || index > (int)widgets.count() ) { index = (int)widgets.count(); widgets.append( w ); @@ -1337,7 +1337,7 @@ void TDEToolBar::setStretchableWidget( TQWidget *w ) TQSizePolicy TDEToolBar::sizePolicy() const { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); else return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); @@ -1350,7 +1350,7 @@ TQSize TDEToolBar::sizeHint() const ncThis->polish(); - int margin = static_cast<TQWidget*>(ncThis)->layout()->margin() + frameWidth(); + int margin = ncThis->layout()->margin() + frameWidth(); switch( barPos() ) { case TDEToolBar::Top: @@ -1367,7 +1367,7 @@ TQSize TDEToolBar::sizeHint() const minSize = minSize.expandedTo(TQSize(0, sh.height())); minSize += TQSize(sh.width()+1, 0); - if (tqt_dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ? + if (dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ? minSize += TQSize(2, 0); // A little bit extra spacing behind it. } @@ -1478,7 +1478,7 @@ void TDEToolBar::slotAppearanceChanged() applyAppearanceSettings(TDEGlobal::config(), TQString::null, true /* lose local settings */ ); // And remember to save the new look later - TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow()); + TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow()); if ( kmw ) kmw->setSettingsDirty(); } @@ -1750,7 +1750,7 @@ void TDEToolBar::toolBarPosChanged( TQToolBar *tb ) if ( d->oldPos == DockMinimized ) rebuildLayout(); d->oldPos = (TQMainWindow::ToolBarDock)barPos(); - TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow()); + TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow()); if ( kmw ) kmw->setSettingsDirty(); } @@ -2125,10 +2125,10 @@ TDEPopupMenu *TDEToolBar::contextMenu() context->setItemChecked(CONTEXT_ICONS, true); context->insertItem( i18n("Icon Size"), size ); - connect( context, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotContextAboutToShow() ) ); + connect( context, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotContextAboutToShow() ) ); // Unplugging a submenu from abouttohide leads to the popupmenu floating around // So better simply call that code from after exec() returns (DF) - //connect( context, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotContextAboutToHide() ) ); + //connect( context, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotContextAboutToHide() ) ); return context; } @@ -2139,7 +2139,7 @@ void TDEToolBar::slotContextAboutToShow() // and ToolBarHandler::setupActions() deletes it, so better not keep it around. // So we currently plug/unplug the last two actions of the menu. // Another way would be to keep around the actions and plug them all into a (new each time) popupmenu. - TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow()); + TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow()); if ( kmw ) { kmw->setupToolbarMenuActions(); // Only allow hiding a toolbar if the action is also plugged somewhere else (e.g. menubar) @@ -2219,7 +2219,7 @@ void TDEToolBar::slotContextAboutToHide() { // We have to unplug whatever slotContextAboutToShow plugged into the menu. // Unplug the toolbar menu action - TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow()); + TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow()); if ( kmw && kmw->toolBarMenuAction() ) if ( kmw->toolBarMenuAction()->containerCount() > 1 ) kmw->toolBarMenuAction()->unplug(context); @@ -2237,7 +2237,7 @@ void TDEToolBar::slotContextAboutToHide() TQPtrListIterator<TQWidget> it( widgets ); TQWidget *wdg; while ( ( wdg = it.current() ) != 0 ) { - if ( wdg->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) ) + if ( wdg->inherits( "TQToolButton" ) ) static_cast<TQToolButton*>( wdg )->setDown( false ); ++it; } diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h index f59d78174..919af5cfe 100644 --- a/tdeui/tdetoolbar.h +++ b/tdeui/tdetoolbar.h @@ -57,7 +57,7 @@ class TDEToolBarPrivate; class TDEUI_EXPORT TDEToolBarSeparator : public TQFrame { - Q_OBJECT + TQ_OBJECT public: TDEToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 ); @@ -103,7 +103,7 @@ private: class TDEUI_EXPORT TDEToolBar : public TQToolBar { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( IconText BarPosition ) TQ_PROPERTY( IconText iconText READ iconText WRITE setIconText ) @@ -466,8 +466,8 @@ public: * You will insert a normal button with connection (or use signals from * toolbar): * \code - * bar->insertButton(icon, id, TQT_SIGNAL(clicked ()), this, - * TQT_SLOT (slotClick()), true, "click or wait for popup"); + * bar->insertButton(icon, id, TQ_SIGNAL(clicked ()), this, + * TQ_SLOT (slotClick()), true, "click or wait for popup"); * \endcode * And then add a delayed popup: * \code @@ -645,7 +645,7 @@ public: * You can do with this whatever you want, * except change its height (hardcoded). If you change its width * you will probably have to call TQToolBar::updateRects(true) - * @see QWidget + * @see TQWidget * @see updateRects() */ TQWidget *getWidget (int id); // ### KDE4: make this const! diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp index 791b47db1..1c3f550db 100644 --- a/tdeui/tdetoolbarbutton.cpp +++ b/tdeui/tdetoolbarbutton.cpp @@ -123,21 +123,21 @@ TDEToolBarButton::TDEToolBarButton( const TQString& _icon, int _id, TQToolButton::setTextLabel(_txt); d->m_instance = _instance; - d->m_parent = tqt_dynamic_cast<TDEToolBar*>(_parent); + d->m_parent = dynamic_cast<TDEToolBar*>(_parent); if (d->m_parent) { - connect(d->m_parent, TQT_SIGNAL( modechange() ), - this, TQT_SLOT( modeChange() )); + connect(d->m_parent, TQ_SIGNAL( modechange() ), + this, TQ_SLOT( modeChange() )); } - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); // connect all of our slots and start trapping events - connect(this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() ) ); - connect(this, TQT_SIGNAL( pressed() ), - this, TQT_SLOT( slotPressed() ) ); - connect(this, TQT_SIGNAL( released() ), - this, TQT_SLOT( slotReleased() ) ); + connect(this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() ) ); + connect(this, TQ_SIGNAL( pressed() ), + this, TQ_SLOT( slotPressed() ) ); + connect(this, TQ_SIGNAL( released() ), + this, TQ_SLOT( slotReleased() ) ); installEventFilter(this); d->m_iconName = _icon; @@ -156,21 +156,21 @@ TDEToolBarButton::TDEToolBarButton( const TQPixmap& pixmap, int _id, d->m_id = _id; TQToolButton::setTextLabel(txt); - d->m_parent = tqt_dynamic_cast<TDEToolBar*>(_parent); + d->m_parent = dynamic_cast<TDEToolBar*>(_parent); if (d->m_parent) { - connect(d->m_parent, TQT_SIGNAL( modechange() ), - this, TQT_SLOT( modeChange() )); + connect(d->m_parent, TQ_SIGNAL( modechange() ), + this, TQ_SLOT( modeChange() )); } - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); // connect all of our slots and start trapping events - connect(this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() )); - connect(this, TQT_SIGNAL( pressed() ), - this, TQT_SLOT( slotPressed() )); - connect(this, TQT_SIGNAL( released() ), - this, TQT_SLOT( slotReleased() )); + connect(this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() )); + connect(this, TQ_SIGNAL( pressed() ), + this, TQ_SLOT( slotPressed() )); + connect(this, TQ_SIGNAL( released() ), + this, TQ_SLOT( slotReleased() )); installEventFilter(this); // set our pixmap and do our initial setup @@ -251,7 +251,7 @@ void TDEToolBarButton::modeChange() break; } - mysize = style().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize). + mysize = style().sizeFromContents(TQStyle::CT_ToolButton, this, mysize). expandedTo(TQApplication::globalStrut()); // make sure that this isn't taller then it is wide @@ -410,7 +410,7 @@ void TDEToolBarButton::enterEvent(TQEvent *) bool TDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if (o == this) { // Popup the menu when the left mousebutton is pressed and the mouse @@ -419,12 +419,12 @@ bool TDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { if (ev->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); d->m_mousePressPos = mev->pos(); } else if (ev->type() == TQEvent::MouseMove) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if ((mev->pos() - d->m_mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { @@ -455,10 +455,10 @@ void TDEToolBarButton::mousePressEvent( TQMouseEvent * e ) { d->m_buttonDown = true; - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) { // Get TQToolButton to show the button being down while pressed - TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); + TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), TQt::LeftButton, e->state() ); TQToolButton::mousePressEvent(&ev); return; } @@ -468,9 +468,9 @@ void TDEToolBarButton::mousePressEvent( TQMouseEvent * e ) void TDEToolBarButton::mouseReleaseEvent( TQMouseEvent * e ) { TQt::ButtonState state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask)); - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) { - TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); + TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), TQt::LeftButton, e->state() ); TQToolButton::mouseReleaseEvent(&ev); } else @@ -628,7 +628,7 @@ void TDEToolBarButton::drawButton( TQPainter *_painter ) if (isDown()) arrowFlags |= TQStyle::Style_Down; if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; - style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, + style().drawPrimitive(TQStyle::PE_ArrowDown, _painter, TQRect(width()-7, height()-7, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } @@ -676,8 +676,8 @@ void TDEToolBarButton::slotClicked() // emit buttonClicked when the button was clicked while being in an extension popupmenu if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) { ButtonState state = TDEApplication::keyboardMouseState(); - if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton ) - state = ButtonState( Qt::LeftButton | state ); + if ( ( state & TQt::MouseButtonMask ) == TQt::NoButton ) + state = ButtonState( TQt::LeftButton | state ); emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton } } @@ -734,9 +734,9 @@ void TDEToolBarButton::setToggle(bool flag) { setToggleButton(flag); if (flag) - connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); else - disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + disconnect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); } TQSize TDEToolBarButton::sizeHint() const diff --git a/tdeui/tdetoolbarbutton.h b/tdeui/tdetoolbarbutton.h index 16831b0d7..0c2d65fb4 100644 --- a/tdeui/tdetoolbarbutton.h +++ b/tdeui/tdetoolbarbutton.h @@ -43,7 +43,7 @@ class TQPainter; */ class TDEUI_EXPORT TDEToolBarButton : public TQToolButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp index dd9cf7087..37540ae92 100644 --- a/tdeui/tdetoolbarhandler.cpp +++ b/tdeui/tdetoolbarhandler.cpp @@ -51,7 +51,7 @@ namespace TQPtrListIterator<TQDockWindow> dockWindowIt( dockWindows ); for ( ; dockWindowIt.current(); ++dockWindowIt ) { - TDEToolBar *toolBar = tqt_dynamic_cast<TDEToolBar *>( dockWindowIt.current() ); + TDEToolBar *toolBar = dynamic_cast<TDEToolBar *>( dockWindowIt.current() ); if ( !toolBar ) continue; @@ -177,8 +177,8 @@ void ToolBarHandler::setupActions() /* for ( TQPtrListIterator<TDEToolBar> toolBarIt( m_toolBars ); toolBarIt.current(); ++toolBarIt ) - connect( toolBarIt.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( setupActions() ) ); + connect( toolBarIt.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( setupActions() ) ); */ if (kapp && kapp->authorizeTDEAction("options_show_toolbar")) @@ -198,8 +198,8 @@ void ToolBarHandler::init( TDEMainWindow *mainWindow ) d = 0; m_mainWindow = mainWindow; - connect( m_mainWindow->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( m_mainWindow->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -232,12 +232,12 @@ void ToolBarHandler::connectToActionContainer( TDEAction *action ) void ToolBarHandler::connectToActionContainer( TQWidget *container ) { - TQPopupMenu *popupMenu = tqt_dynamic_cast<TQPopupMenu *>( container ); + TQPopupMenu *popupMenu = dynamic_cast<TQPopupMenu *>( container ); if ( !popupMenu ) return; - connect( popupMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupActions() ) ); + connect( popupMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupActions() ) ); } #include "tdetoolbarhandler.moc" diff --git a/tdeui/tdetoolbarhandler.h b/tdeui/tdetoolbarhandler.h index fe25ace98..aea84b84b 100644 --- a/tdeui/tdetoolbarhandler.h +++ b/tdeui/tdetoolbarhandler.h @@ -33,7 +33,7 @@ namespace KDEPrivate class ToolBarHandler : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: ToolBarHandler( TDEMainWindow *mainWindow, const char *name = 0 ); ToolBarHandler( TDEMainWindow *mainWindow, TQObject *parent, const char *name = 0 ); diff --git a/tdeui/tdetoolbarlabelaction.cpp b/tdeui/tdetoolbarlabelaction.cpp index 07cfbb731..e75e0a755 100644 --- a/tdeui/tdetoolbarlabelaction.cpp +++ b/tdeui/tdetoolbarlabelaction.cpp @@ -85,8 +85,8 @@ void TDEToolBarLabelAction::init() konq_misc.cpp */ d->m_label->setBackgroundMode(TQt::PaletteButton); d->m_label->setAlignment((TQApplication::reverseLayout() - ? Qt::AlignRight : Qt::AlignLeft) | - Qt::AlignVCenter | TQt::ShowPrefix ); + ? TQt::AlignRight : TQt::AlignLeft) | + TQt::AlignVCenter | TQt::ShowPrefix ); d->m_label->adjustSize(); } diff --git a/tdeui/tdetoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h index c330c9254..801f0ed78 100644 --- a/tdeui/tdetoolbarlabelaction.h +++ b/tdeui/tdetoolbarlabelaction.h @@ -35,11 +35,11 @@ class TQLabel; * * KHistoryCombo* findCombo = new KHistoryCombo(true, this); * KWidgetAction* action - * = new KWidgetAction(findCombo, i18n("F&ind Combo"), Qt::Key_F6, this, - * TQT_SLOT(slotFocus()), actionCollection(), "find_combo"); + * = new KWidgetAction(findCombo, i18n("F&ind Combo"), TQt::Key_F6, this, + * TQ_SLOT(slotFocus()), actionCollection(), "find_combo"); * * new TDEToolBarLabelAction(findCombo, i18n("F&ind "), 0, this, - * TQT_SLOT(slotFocus()), actionCollection(), + * TQ_SLOT(slotFocus()), actionCollection(), * "find_label"); * * \endcode @@ -54,8 +54,8 @@ public: * * @param text The label's and the action's text. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -70,8 +70,8 @@ public: * typed. * @param text The label's and the action's text. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -93,8 +93,8 @@ public: * * @param label the label which is displayed in the toolbar. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdetoolbarradiogroup.cpp b/tdeui/tdetoolbarradiogroup.cpp index 937354357..0f5febb0a 100644 --- a/tdeui/tdetoolbarradiogroup.cpp +++ b/tdeui/tdetoolbarradiogroup.cpp @@ -36,7 +36,7 @@ TDEToolBarRadioGroup::TDEToolBarRadioGroup (TDEToolBar *_parent, const char *_na { buttons = new TDEToolBarButtonList(); tb = _parent; - connect (tb, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int))); + connect (tb, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int))); } TDEToolBarRadioGroup::~TDEToolBarRadioGroup() diff --git a/tdeui/tdetoolbarradiogroup.h b/tdeui/tdetoolbarradiogroup.h index d262aa539..5df8c5a20 100644 --- a/tdeui/tdetoolbarradiogroup.h +++ b/tdeui/tdetoolbarradiogroup.h @@ -48,7 +48,7 @@ class TDEToolBarRadioGroupPrivate; */ class TDEUI_EXPORT TDEToolBarRadioGroup : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index c3b6d1ddc..7226eb6f5 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -66,7 +66,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) hBox->addSpacing( 5 ); //Selection mode selection - m_pbgMode = new TQButtonGroup( 1, Qt::Horizontal, "Selection Mode", this); + m_pbgMode = new TQButtonGroup( 1, TQt::Horizontal, "Selection Mode", this); m_pbgMode->insert(new TQRadioButton("NoSlection", m_pbgMode), TopLevel::NoSelection ); m_pbgMode->insert(new TQRadioButton("Single", m_pbgMode), TopLevel::Single ); m_pbgMode->insert(new TQRadioButton("Multi", m_pbgMode), TopLevel::Multi ); @@ -74,52 +74,52 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) m_pbgMode->setExclusive( true ); vBox->addWidget( m_pbgMode ); - connect( m_pbgMode, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotSwitchMode( int ) ) ); + connect( m_pbgMode, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotSwitchMode( int ) ) ); //Signal labels - TQGroupBox* gbWiget = new TQGroupBox( 1, Qt::Horizontal, "Widget", this); + TQGroupBox* gbWiget = new TQGroupBox( 1, TQt::Horizontal, "Widget", this); m_plblWidget = new TQLabel( gbWiget ); vBox->addWidget( gbWiget ); - TQGroupBox* gbSignal = new TQGroupBox( 1, Qt::Horizontal, "emitted Signal", this); + TQGroupBox* gbSignal = new TQGroupBox( 1, TQt::Horizontal, "emitted Signal", this); m_plblSignal = new TQLabel( gbSignal ); vBox->addWidget( gbSignal ); - TQGroupBox* gbItem = new TQGroupBox( 1, Qt::Horizontal, "on Item", this); + TQGroupBox* gbItem = new TQGroupBox( 1, TQt::Horizontal, "on Item", this); m_plblItem = new TQLabel( gbItem ); vBox->addWidget( gbItem ); - TQButtonGroup* bgListView = new TQButtonGroup( 1, Qt::Horizontal, "TDEListView", this); + TQButtonGroup* bgListView = new TQButtonGroup( 1, TQt::Horizontal, "TDEListView", this); TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView); vBox->addWidget( bgListView ); - connect( cbListView, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleSingleColumn( bool ) ) ); + connect( cbListView, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleSingleColumn( bool ) ) ); TDEGlobal::config()->reparseConfiguration(); //Create IconView - TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "TDEIconView", this); + TQGroupBox* gbIconView = new TQGroupBox( 1, TQt::Horizontal, "TDEIconView", this); m_pIconView = new TDEIconView( gbIconView ); hBox->addWidget( gbIconView ); hBox->addSpacing( 5 ); - connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( slotIconViewExec( TQIconViewItem* ) ) ); //Create ListView - TQGroupBox* gbListView = new TQGroupBox( 1, Qt::Horizontal, "TDEListView", this); + TQGroupBox* gbListView = new TQGroupBox( 1, TQt::Horizontal, "TDEListView", this); m_pListView = new TDEListView( gbListView ); m_pListView->addColumn("Item"); m_pListView->addColumn("Text"); hBox->addWidget( gbListView ); hBox->addSpacing( 5 ); - connect( m_pListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) ); + connect( m_pListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( slotListViewExec( TQListViewItem* ) ) ); //Create ListBox - TQGroupBox* gbListBox = new TQGroupBox( 1, Qt::Horizontal, "TDEListBox", this); + TQGroupBox* gbListBox = new TQGroupBox( 1, TQt::Horizontal, "TDEListBox", this); m_pListBox = new TDEListBox( gbListBox ); hBox->addWidget( gbListBox ); - connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), - this, TQT_SLOT( slotListBoxExec( TQListBoxItem* ) ) ); + connect( m_pListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ), + this, TQ_SLOT( slotListBoxExec( TQListBoxItem* ) ) ); //Initialize buttons cbListView->setChecked( !m_pListView->allColumnsShowFocus() ); @@ -137,10 +137,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) new TQListBoxPixmap( m_pListBox, TQPixmap(item_xpm), TQString("Item%1").arg(i)); } - connect( m_pIconView, TQT_SIGNAL( clicked( TQIconViewItem* ) ), - this, TQT_SLOT( slotClicked( TQIconViewItem* ) ) ); - connect( m_pIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ), - this, TQT_SLOT( slotDoubleClicked( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( clicked( TQIconViewItem* ) ), + this, TQ_SLOT( slotClicked( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ), + this, TQ_SLOT( slotDoubleClicked( TQIconViewItem* ) ) ); } void TopLevel::slotSwitchMode( int id ) diff --git a/tdeui/tests/itemcontainertest.h b/tdeui/tests/itemcontainertest.h index cb6cc3a51..bb8c7fefc 100644 --- a/tdeui/tests/itemcontainertest.h +++ b/tdeui/tests/itemcontainertest.h @@ -11,7 +11,7 @@ class TQLabel; class TopLevel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TopLevel( TQWidget *parent=0, const char *name=0 ); diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp index 4672b76ee..6484791b5 100644 --- a/tdeui/tests/kblendtest.cpp +++ b/tdeui/tests/kblendtest.cpp @@ -28,7 +28,7 @@ void KBlendWidget::paintEvent(TQPaintEvent */*ev*/) image = TQImage("testimage.png"); TQPainter p(this); - p.setPen(Qt::black); + p.setPen(TQt::black); // you see here use of anti_dir param (blend from down to up, here) time.start(); diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp index c9eb1134b..3390ce5f3 100644 --- a/tdeui/tests/kbuttonboxtest.cpp +++ b/tdeui/tests/kbuttonboxtest.cpp @@ -37,16 +37,16 @@ int main(int argc, char **argv) { "the window!\n" "Press OK or Cancel when done" , w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->addButton("Help"); @@ -65,17 +65,17 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are right aligned\n"\ "Try resizing the window!", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->layout(); tl->addWidget(bbox,0); tl->activate(); @@ -91,17 +91,17 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are middle aligned\n"\ "Try resizing the window!", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->layout(); tl->addWidget(bbox,0); @@ -120,17 +120,17 @@ int main(int argc, char **argv) { "the maximum width for all buttons\n" "since it will look ugly -- " "anyway, it works", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addButton("Push me and I give you a banana"); bbox->addStretch(1); @@ -152,17 +152,17 @@ int main(int argc, char **argv) { "prevent this strange effect as seen\n" "the former example!" ,w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addButton("Push me and I give you a banana", true); bbox->addStretch(1); @@ -182,16 +182,16 @@ int main(int argc, char **argv) { "to make vertically aligned buttons\n" "too?" ,w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->layout(); diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp index dbe39484c..a7738a7ed 100644 --- a/tdeui/tests/kcolordlgtest.cpp +++ b/tdeui/tests/kcolordlgtest.cpp @@ -33,7 +33,7 @@ int main( int argc, char *argv[] ) aConfig.setGroup( "KColorDialog-test" ); color = aConfig.readColorEntry( "Chosen" ); - int nRet = KColorDialog::getColor( color, Qt::red /*testing default color*/ ); + int nRet = KColorDialog::getColor( color, TQt::red /*testing default color*/ ); aConfig.writeEntry( "Chosen", color ); return nRet; diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp index 243de265b..09b4a56c1 100644 --- a/tdeui/tests/kcolortest.cpp +++ b/tdeui/tests/kcolortest.cpp @@ -25,7 +25,7 @@ void KColorWidget::paintEvent(TQPaintEvent *) { if(!pixmap.isNull()) bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } void KColorWidget::doIntensityLoop() @@ -46,11 +46,11 @@ void KColorWidget::doIntensityLoop() KImageEffect::intensity(image, -1./max); else { uint *qptr=(uint *)image.bits(); - QRgb qrgb; + TQRgb qrgb; int size=pixmap.width()*pixmap.height(); for (int i=0;i<size; i++, qptr++) { - qrgb=*(QRgb *)qptr; + qrgb=*(TQRgb *)qptr; *qptr=tqRgb((int)(tqRed(qrgb)*1./max), (int)(tqGreen(qrgb)*1./max), (int)(tqBlue(qrgb)*1./max)); @@ -58,7 +58,7 @@ void KColorWidget::doIntensityLoop() } pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } stop = t.elapsed(); tqDebug ("Total fullscreen %s dim time for %d steps : %f s", @@ -71,7 +71,7 @@ void KColorWidget::doIntensityLoop() KImageEffect::fade(image, 1./max, black); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } } stop = t.elapsed(); @@ -87,14 +87,14 @@ void KColorWidget::doIntensityLoop() KImageEffect::intensity(image, 1./max); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } for(count=0; count < max; ++count){ KImageEffect::intensity(image, -1./max); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } image = original; image.detach(); @@ -103,13 +103,13 @@ void KColorWidget::doIntensityLoop() KImageEffect::channelIntensity(image, -1./max, KImageEffect::Red); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } for(count=0; count < max; ++count){ KImageEffect::channelIntensity(image, 1./max, KImageEffect::Red); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } image = original; image.detach(); @@ -118,13 +118,13 @@ void KColorWidget::doIntensityLoop() KImageEffect::channelIntensity(image, -1./max, KImageEffect::Green); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } for(count=0; count < max; ++count){ KImageEffect::channelIntensity(image, 1./max, KImageEffect::Green); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } image = original; image.detach(); @@ -133,13 +133,13 @@ void KColorWidget::doIntensityLoop() KImageEffect::channelIntensity(image, -1./max, KImageEffect::Blue); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } for(count=0; count < max; ++count){ KImageEffect::channelIntensity(image, 1./max, KImageEffect::Blue); pixmap.convertFromImage(image); bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(), - Qt::CopyROP, true); + TQt::CopyROP, true); } } } diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index d2b59a4c2..7e51396c1 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -40,8 +40,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" ); lbl->setBuddy (m_qc); - TQObject::connect (m_qc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_qc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_qc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_qc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); // Read-only combobox @@ -53,8 +53,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_ro, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_ro, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); // Read-write combobox @@ -68,10 +68,10 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_rw->setDuplicatesEnabled( true ); m_rw->setInsertionPolicy( TQComboBox::NoInsertion ); m_rw->setTrapReturnKey( true ); - TQObject::connect (m_rw, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_rw, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&))); - TQObject::connect (m_rw, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); - TQObject::connect (m_rw, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&))); + TQObject::connect (m_rw, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_rw, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&))); + TQObject::connect (m_rw, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); + TQObject::connect (m_rw, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(slotReturnPressed(const TQString&))); vbox->addWidget (hbox); // History combobox... @@ -84,9 +84,9 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) lbl->setBuddy (m_hc); m_hc->setDuplicatesEnabled( true ); m_hc->setInsertionPolicy( TQComboBox::NoInsertion ); - TQObject::connect (m_hc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_hc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&))); - TQObject::connect (m_hc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); + TQObject::connect (m_hc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_hc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&))); + TQObject::connect (m_hc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); vbox->addWidget (hbox); m_hc->setTrapReturnKey(true); @@ -99,19 +99,19 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_konqc = new KComboBox( true, hbox, "KonqyCombo" ); lbl->setBuddy (m_konqc); m_konqc->setMaxCount( 10 ); - TQObject::connect (m_konqc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_konqc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); - TQObject::connect (m_konqc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); + TQObject::connect (m_konqc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_konqc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_konqc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); vbox->addWidget (hbox); // Create an exit button hbox = new TQHBox (this); m_btnExit = new TQPushButton( "E&xit", hbox ); - TQObject::connect( m_btnExit, TQT_SIGNAL(clicked()), TQT_SLOT(quitApp()) ); + TQObject::connect( m_btnExit, TQ_SIGNAL(clicked()), TQ_SLOT(quitApp()) ); // Create a disable button... m_btnEnable = new TQPushButton( "Disa&ble", hbox ); - TQObject::connect (m_btnEnable, TQT_SIGNAL(clicked()), TQT_SLOT(slotDisable())); + TQObject::connect (m_btnEnable, TQ_SIGNAL(clicked()), TQ_SLOT(slotDisable())); vbox->addWidget (hbox); @@ -150,7 +150,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_konqc->setCurrentItem( m_konqc->count()-1 ); m_timer = new TQTimer (this); - connect (m_timer, TQT_SIGNAL (timeout()), TQT_SLOT (slotTimeout())); + connect (m_timer, TQ_SIGNAL (timeout()), TQ_SLOT (slotTimeout())); } KComboBoxTest::~KComboBoxTest() diff --git a/tdeui/tests/kcomboboxtest.h b/tdeui/tests/kcomboboxtest.h index 6566c9097..577b09080 100644 --- a/tdeui/tests/kcomboboxtest.h +++ b/tdeui/tests/kcomboboxtest.h @@ -11,7 +11,7 @@ class KComboBox; class KComboBoxTest : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KComboBoxTest ( TQWidget *parent=0, const char *name=0 ); diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp index 261534465..a6c010fc7 100644 --- a/tdeui/tests/kcompletiontest.cpp +++ b/tdeui/tests/kcompletiontest.cpp @@ -38,11 +38,11 @@ Form1::Form1( TQWidget* parent, const char* name ) GroupBox1 = new TQGroupBox( this, "GroupBox1" ); GroupBox1->setTitle( "Completion Test" ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); + GroupBox1->setColumnLayout(0, TQt::Vertical ); GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); + GroupBox1Layout->setAlignment( TQt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); @@ -74,8 +74,8 @@ Form1::Form1( TQWidget* parent, const char* name ) combo->setCompletionObject( edit->completionObject() ); // combo->setMaxCount( 5 ); combo->setHistoryItems( defaultItems(), true ); - connect( combo, TQT_SIGNAL( activated( const TQString& )), - combo, TQT_SLOT( addToHistory( const TQString& ))); + connect( combo, TQ_SIGNAL( activated( const TQString& )), + combo, TQ_SLOT( addToHistory( const TQString& ))); TQToolTip::add( combo, "KHistoryCombo" ); Layout2->addWidget( combo ); @@ -84,7 +84,7 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1 = new TQPushButton( GroupBox1, "PushButton1" ); PushButton1->setText( "Add" ); - connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() )); + connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() )); Layout2->addWidget( PushButton1 ); Layout9->addLayout( Layout2 ); @@ -96,7 +96,7 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1_4 = new TQPushButton( GroupBox1, "PushButton1_4" ); PushButton1_4->setText( "Remove" ); - connect( PushButton1_4, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() )); + connect( PushButton1_4, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() )); Layout3->addWidget( PushButton1_4 ); Layout9->addLayout( Layout3 ); @@ -106,8 +106,8 @@ Form1::Form1( TQWidget* parent, const char* name ) ListBox1 = new TQListBox( GroupBox1, "ListBox1" ); Layout8->addWidget( ListBox1 ); - connect( ListBox1, TQT_SIGNAL( highlighted( const TQString& )), - TQT_SLOT( slotHighlighted( const TQString& ))); + connect( ListBox1, TQ_SIGNAL( highlighted( const TQString& )), + TQ_SLOT( slotHighlighted( const TQString& ))); TQToolTip::add( ListBox1, "Contains the contents of the completion object.\n:x is the weighting, i.e. how often an item has been inserted"); Layout7 = new TQVBoxLayout; @@ -116,13 +116,13 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1_3 = new TQPushButton( GroupBox1, "PushButton1_3" ); PushButton1_3->setText( "Completion items" ); - connect( PushButton1_3, TQT_SIGNAL( clicked() ), TQT_SLOT( slotList() )); + connect( PushButton1_3, TQ_SIGNAL( clicked() ), TQ_SLOT( slotList() )); Layout7->addWidget( PushButton1_3 ); PushButton1_2 = new TQPushButton( GroupBox1, "PushButton1_2" ); PushButton1_2->setText( "Clear" ); - connect( PushButton1_2, TQT_SIGNAL( clicked() ), - edit->completionObject(), TQT_SLOT( clear() )); + connect( PushButton1_2, TQ_SIGNAL( clicked() ), + edit->completionObject(), TQ_SLOT( clear() )); Layout7->addWidget( PushButton1_2 ); Layout8->addLayout( Layout7 ); Layout9->addLayout( Layout8 ); diff --git a/tdeui/tests/kcompletiontest.h b/tdeui/tests/kcompletiontest.h index 9443401eb..03cb6ed2a 100644 --- a/tdeui/tests/kcompletiontest.h +++ b/tdeui/tests/kcompletiontest.h @@ -27,7 +27,7 @@ class KLineEdit; class Form1 : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Form1( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp index 8eab0b125..3daf22b08 100644 --- a/tdeui/tests/kdesattest.cpp +++ b/tdeui/tests/kdesattest.cpp @@ -15,7 +15,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name) slide = new KDoubleNumInput(700, this, "desat"); slide->setRange(0, 1, 0.001); slide->setLabel("Desaturate: ", AlignVCenter | AlignLeft); - connect(slide,TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(change(double))); + connect(slide,TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(change(double))); resize(image.width()*2, image.height() + slide->height()); slide->setGeometry(0, image.height(), image.width()*2, slide->height()); @@ -33,7 +33,7 @@ void KDesatWidget::paintEvent(TQPaintEvent */*ev*/) TQString say; TQPainter p(this); - p.setPen(Qt::black); + p.setPen(TQt::black); // original image time.start(); diff --git a/tdeui/tests/kdesattest.h b/tdeui/tests/kdesattest.h index 8e04c08c6..4faaa2798 100644 --- a/tdeui/tests/kdesattest.h +++ b/tdeui/tests/kdesattest.h @@ -13,7 +13,7 @@ class KDesatWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: KDesatWidget(TQWidget *parent=0, const char *name=0); diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp index 538e2b888..57b8d2a08 100644 --- a/tdeui/tests/kdocktest.cpp +++ b/tdeui/tests/kdocktest.cpp @@ -18,7 +18,7 @@ DockTest::DockTest( TQWidget* parent ) m_blueDock->setCaption( "Blue" ); m_blueDock->setGeometry( 50, 50, 100, 100 ); TQWidget *l = new TQWidget( m_blueDock ); - l->setBackgroundColor( Qt::blue ); + l->setBackgroundColor( TQt::blue ); l->setMinimumSize( 100,100 ); m_blueDock->setWidget( l ); @@ -32,7 +32,7 @@ DockTest::DockTest( TQWidget* parent ) m_redDock->setCaption( "Red" ); m_redDock->setGeometry( 50, 50, 100, 100 ); l = new TQWidget( m_redDock ); - l->setBackgroundColor( Qt::red ); + l->setBackgroundColor( TQt::red ); l->setMinimumSize( 100,100 ); m_redDock->setWidget( l ); m_redDock->manualDock( m_blueDock, KDockWidget::DockLeft, 3000 ); @@ -45,7 +45,7 @@ DockTest::DockTest( TQWidget* parent ) m_yellowDock->setCaption( "Yellow" ); m_yellowDock->setGeometry( 50, 50, 100, 100 ); l = new TQWidget( m_yellowDock ); - l->setBackgroundColor( Qt::yellow ); + l->setBackgroundColor( TQt::yellow ); l->setMinimumSize( 100,100 ); m_yellowDock->setWidget( l ); m_yellowDock->manualDock( m_blueDock, KDockWidget::DockTop, 5000 ); diff --git a/tdeui/tests/kdocktest.h b/tdeui/tests/kdocktest.h index f23d22a35..d38ac029a 100644 --- a/tdeui/tests/kdocktest.h +++ b/tdeui/tests/kdocktest.h @@ -6,7 +6,7 @@ class TQWidget; class DockTest : public KDockArea { - Q_OBJECT + TQ_OBJECT public: DockTest( TQWidget* parent=0 ); diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp index a922acf2d..ba3f97d74 100644 --- a/tdeui/tests/kdockwidgetdemo.cpp +++ b/tdeui/tests/kdockwidgetdemo.cpp @@ -116,8 +116,8 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const fd->reparent(d_fd, TQPoint(0,0)); d_fd->setWidget( fd ); - connect( dirView, TQT_SIGNAL( folderSelected( const TQString & ) ), fd, TQT_SLOT( setDir2( const TQString & ) ) ); - connect( fd, TQT_SIGNAL( dirEntered( const TQString & ) ), dirView, TQT_SLOT( setDir( const TQString & ) ) ); + connect( dirView, TQ_SIGNAL( folderSelected( const TQString & ) ), fd, TQ_SLOT( setDir2( const TQString & ) ) ); + connect( fd, TQ_SIGNAL( dirEntered( const TQString & ) ), dirView, TQ_SLOT( setDir( const TQString & ) ) ); d_fd->setDockSite( KDockWidget::DockTop|KDockWidget::DockLeft|KDockWidget::DockRight|KDockWidget::DockBottom ); d_fd->setEnableDocking(KDockWidget::DockNone); @@ -128,16 +128,16 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const d_dirView->manualDock( d_fd, KDockWidget::DockLeft, 20 ); d_preview->manualDock( d_fd, KDockWidget::DockBottom, 70 ); - connect(fd, TQT_SIGNAL(fileHighlighted(const TQString&)), preview, TQT_SLOT(showPreview(const TQString&))); - connect(fd, TQT_SIGNAL(signalDone(int)), this, TQT_SLOT(done(int))); + connect(fd, TQ_SIGNAL(fileHighlighted(const TQString&)), preview, TQ_SLOT(showPreview(const TQString&))); + connect(fd, TQ_SIGNAL(signalDone(int)), this, TQ_SLOT(done(int))); - connect(fd, TQT_SIGNAL(dirEntered(const TQString&)), this, TQT_SLOT(changeDir(const TQString&))); - connect(dirView, TQT_SIGNAL(folderSelected(const TQString&)), this, TQT_SLOT(changeDir(const TQString&))); + connect(fd, TQ_SIGNAL(dirEntered(const TQString&)), this, TQ_SLOT(changeDir(const TQString&))); + connect(dirView, TQ_SIGNAL(folderSelected(const TQString&)), this, TQ_SLOT(changeDir(const TQString&))); b_tree = new TQToolButton( fd ); TQToolTip::add( b_tree, "Show/Hide Tree" ); b_tree->setPixmap( TQPixmap( dir_tree_xpm ) ); - connect( b_tree, TQT_SIGNAL(clicked()), d_dirView, TQT_SLOT(changeHideShowState()) ); + connect( b_tree, TQ_SIGNAL(clicked()), d_dirView, TQ_SLOT(changeHideShowState()) ); b_tree->setToggleButton(true); b_tree->setOn(true); fd->addToolButton( b_tree, true ); @@ -145,13 +145,13 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const b_preview = new TQToolButton( fd ); TQToolTip::add( b_preview, "Show/Hide Preview" ); b_preview->setPixmap( TQPixmap( preview_xpm ) ); - connect( b_preview, TQT_SIGNAL(clicked()), d_preview, TQT_SLOT(changeHideShowState()) ); + connect( b_preview, TQ_SIGNAL(clicked()), d_preview, TQ_SLOT(changeHideShowState()) ); b_preview->setToggleButton(true); b_preview->setOn(true); fd->addToolButton( b_preview ); - connect( dockManager, TQT_SIGNAL(change()), this, TQT_SLOT(dockChange())); - connect( dockManager, TQT_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQT_SLOT(setDockDefaultPos(KDockWidget*))); + connect( dockManager, TQ_SIGNAL(change()), this, TQ_SLOT(dockChange())); + connect( dockManager, TQ_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQ_SLOT(setDockDefaultPos(KDockWidget*))); setCaption("Open File"); resize(550,450); tqDebug("read config"); @@ -403,7 +403,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent ) TQToolTip::add( p, tr( "Bookmarks" ) ); bookmarkMenu = new TQPopupMenu( this ); - connect( bookmarkMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( bookmarkChosen( int ) ) ); + connect( bookmarkMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( bookmarkChosen( int ) ) ); addId = bookmarkMenu->insertItem( "Add bookmark" ); clearId = bookmarkMenu->insertItem( TQPixmap(folder_trash), "Clear bookmarks" ); bookmarkMenu->insertSeparator(); @@ -416,7 +416,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent ) TQToolTip::add( b, tr( "Go Home!" ) ); b->setPixmap( TQPixmap( homepage_xpm ) ); - connect( b, TQT_SIGNAL( clicked() ), this, TQT_SLOT( goHome() ) ); + connect( b, TQ_SIGNAL( clicked() ), this, TQ_SLOT( goHome() ) ); addToolButton( b ); } @@ -695,12 +695,12 @@ TQString Directory::text( int column ) const DirectoryView::DirectoryView( TQWidget *parent, const char *name ) :TQListView( parent, name ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); setAcceptDrops( true ); viewport()->setAcceptDrops( true ); diff --git a/tdeui/tests/kdockwidgetdemo.h b/tdeui/tests/kdockwidgetdemo.h index b6f029cd5..f3227fb86 100644 --- a/tdeui/tests/kdockwidgetdemo.h +++ b/tdeui/tests/kdockwidgetdemo.h @@ -29,7 +29,7 @@ class Preview; class DirectoryView; class SFileDialog : public TQDialog -{Q_OBJECT +{TQ_OBJECT public: SFileDialog( TQString initially = TQString::null, @@ -87,7 +87,7 @@ private: }; class DirectoryView : public TQListView -{Q_OBJECT +{TQ_OBJECT public: DirectoryView( TQWidget *parent = 0, const char *name = 0 ); virtual void setOpen ( TQListViewItem *, bool ); @@ -108,7 +108,7 @@ private: }; /******************************************************************************************************/ class PixmapView : public TQScrollView -{Q_OBJECT +{TQ_OBJECT public: PixmapView( TQWidget *parent ); void setPixmap( const TQPixmap &pix ); @@ -119,7 +119,7 @@ private: }; class Preview : public TQWidgetStack -{Q_OBJECT +{TQ_OBJECT public: Preview( TQWidget *parent ); @@ -133,7 +133,7 @@ private: }; class CustomFileDialog : public TQFileDialog -{Q_OBJECT +{TQ_OBJECT public: CustomFileDialog( TQWidget* parent ); ~CustomFileDialog(); diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp index aacac19a0..154d02463 100644 --- a/tdeui/tests/kdockwidgettest.cpp +++ b/tdeui/tests/kdockwidgettest.cpp @@ -101,7 +101,7 @@ DockApplication::DockApplication( const char* name ) l->setBackgroundColor(white); l->setMinimumSize(100,100); dock5->setWidget(l); - if (::tqqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 5"); + if (::tqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 5"); /*****************************************************/ /*****************************************************/ @@ -112,7 +112,7 @@ DockApplication::DockApplication( const char* name ) l->setBackgroundColor(white); l->setMinimumSize(100,100); dock6->setWidget(l); - if (::tqqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 6"); + if (::tqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 6"); /*****************************************************/ @@ -120,12 +120,12 @@ DockApplication::DockApplication( const char* name ) TQPushButton* b1 = new TQPushButton(mainW); b1->setGeometry(10, 10, 250, 25); b1->setText("write dock config"); - connect(b1, TQT_SIGNAL(clicked()), TQT_SLOT(wConfig())); + connect(b1, TQ_SIGNAL(clicked()), TQ_SLOT(wConfig())); TQPushButton* b2 = new TQPushButton(mainW); b2->setGeometry(10, 35, 250, 25); b2->setText("read dock config"); - connect(b2, TQT_SIGNAL(clicked()), TQT_SLOT(rConfig())); + connect(b2, TQ_SIGNAL(clicked()), TQ_SLOT(rConfig())); m_bname = new TQPushButton(mainW); m_bname->setGeometry(10, 60, 250, 25); @@ -134,12 +134,12 @@ DockApplication::DockApplication( const char* name ) TQPushButton *b3 = new TQPushButton(mainW); b3->setGeometry(10,95,250,25); b3->setText("change the icon of the green widget"); - connect(b3,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix1())); + connect(b3,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix1())); TQPushButton *b4 = new TQPushButton(mainW); b4->setGeometry(10,130,250,25); b4->setText("remove icon "); - connect(b4,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix2())); + connect(b4,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix2())); setGeometry(200, 100, 500, 300); @@ -170,11 +170,11 @@ void DockApplication::initMenuBar() TQPixmap p(folder); TQPopupMenu *file_menu = new TQPopupMenu(); - file_menu->insertItem(p, "Change Green Widget Caption", this, TQT_SLOT(cap()) ); + file_menu->insertItem(p, "Change Green Widget Caption", this, TQ_SLOT(cap()) ); file_menu->insertSeparator(); - file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQT_SLOT(greenMain()) ); - file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQT_SLOT(blueMain()) ); - file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQT_SLOT(nullMain()) ); + file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQ_SLOT(greenMain()) ); + file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQ_SLOT(blueMain()) ); + file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQ_SLOT(nullMain()) ); KMenuBar* menu_bar = menuBar(); menu_bar->insertItem( "&Test", file_menu ); diff --git a/tdeui/tests/kdockwidgettest.h b/tdeui/tests/kdockwidgettest.h index 4cc952857..315c23267 100644 --- a/tdeui/tests/kdockwidgettest.h +++ b/tdeui/tests/kdockwidgettest.h @@ -22,7 +22,7 @@ class TQPushButton; class DockApplication : public KDockMainWindow -{Q_OBJECT +{TQ_OBJECT public: DockApplication( const char* name ); ~DockApplication(); @@ -57,7 +57,7 @@ private: class CTW:public TQTabWidget,public KDockContainer { - Q_OBJECT + TQ_OBJECT public: CTW(TQWidget *parent):TQTabWidget(parent,"MyDockContainer"),KDockContainer(){insertTab(new TQLabel("BLAH",this),"BLUP");} virtual ~CTW(){;} diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp index 512bfc610..a9be04cac 100644 --- a/tdeui/tests/kdualcolortest.cpp +++ b/tdeui/tests/kdualcolortest.cpp @@ -12,12 +12,12 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) KDualColorButton *colorBtn = new KDualColorButton(lbl->colorGroup().text(), lbl->colorGroup().background(), this); - connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)), - TQT_SLOT(slotFgChanged(const TQColor &))); - connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)), - TQT_SLOT(slotBgChanged(const TQColor &))); - connect(colorBtn, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)), - TQT_SLOT(slotCurrentChanged(KDualColorButton::DualColor))); + connect(colorBtn, TQ_SIGNAL(fgChanged(const TQColor &)), + TQ_SLOT(slotFgChanged(const TQColor &))); + connect(colorBtn, TQ_SIGNAL(bgChanged(const TQColor &)), + TQ_SLOT(slotBgChanged(const TQColor &))); + connect(colorBtn, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)), + TQ_SLOT(slotCurrentChanged(KDualColorButton::DualColor))); TQHBoxLayout *layout = new TQHBoxLayout(this, 5); layout->addWidget(colorBtn, 0); diff --git a/tdeui/tests/kdualcolortest.h b/tdeui/tests/kdualcolortest.h index 2c38b7af0..bfea58493 100644 --- a/tdeui/tests/kdualcolortest.h +++ b/tdeui/tests/kdualcolortest.h @@ -6,7 +6,7 @@ class KDualColorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KDualColorWidget(TQWidget *parent=0, const char *name=0); protected slots: diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp index 4ee8c0f93..f828e31f7 100644 --- a/tdeui/tests/kgradienttest.cpp +++ b/tdeui/tests/kgradienttest.cpp @@ -13,13 +13,13 @@ void KGradientWidget::paintEvent(TQPaintEvent */*ev*/) int it, ft; TQString say; - TQColor ca = Qt::black, cb = Qt::blue; + TQColor ca = TQt::black, cb = TQt::blue; int x = 0, y = 0; pix.resize(width()/cols, height()/rows); TQPainter p(this); - p.setPen(Qt::white); + p.setPen(TQt::white); // draw once, so that the benchmarking be fair :-) KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient); diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp index d392fcbc5..d2829606e 100644 --- a/tdeui/tests/khashtest.cpp +++ b/tdeui/tests/khashtest.cpp @@ -21,7 +21,7 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/) pix.resize(width()/cols, height()/rows); TQPainter p(this); - p.setPen(Qt::white); + p.setPen(TQt::white); // draw once, so that the benchmarking be fair :-) KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient); @@ -86,9 +86,9 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/) pix.resize(width()/cols, height()/rows); say.setNum( ft - it); say += " ms, CrossDiagonal"; p.drawPixmap(x*width()/cols, y*height()/rows, pix); - p.setPen(Qt::blue); + p.setPen(TQt::blue); p.drawText(5+(x++)*width()/cols, 15+y*height()/rows, say); - p.setPen(Qt::white); + p.setPen(TQt::white); y++; // next row diff --git a/tdeui/tests/khashtest.h b/tdeui/tests/khashtest.h index 05de5c435..ea1c161aa 100644 --- a/tdeui/tests/khashtest.h +++ b/tdeui/tests/khashtest.h @@ -12,7 +12,7 @@ class KHashWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KHashWidget(TQWidget *parent=0, const char *name=0) diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp index 71e72fb13..798145f47 100644 --- a/tdeui/tests/kjanuswidgettest.cpp +++ b/tdeui/tests/kjanuswidgettest.cpp @@ -18,7 +18,7 @@ int main(int argc, char** argv) TQCheckBox* cb2 = new TQCheckBox( "a", page2 ); janus->show(); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); return app.exec(); } diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp index 8a16c122f..4694bd2c9 100644 --- a/tdeui/tests/kledtest.cpp +++ b/tdeui/tests/kledtest.cpp @@ -22,7 +22,7 @@ KLedTest::KLedTest(TQWidget* parent) if (kled_round) { //KLed l(KLed::red, &qw); // create lamp //KLed l(KLed::blue, &qw); // create lamp - l = new KLed(Qt::green, this); // create lamp + l = new KLed(TQt::green, this); // create lamp //KLed l(KLed::yellow, &qw); // create lamp //KLed l(KLed::orange, &qw); // create lamp @@ -42,9 +42,9 @@ KLedTest::KLedTest(TQWidget* parent) t_toggle.start(1000, false); t_color.start(3500, false); t_look.start(3500, false); - TQObject::connect(&t_toggle, TQT_SIGNAL(timeout()), l, TQT_SLOT(toggle())); - TQObject::connect(&t_color, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextColor())); - TQObject::connect(&t_look, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextLook())); + TQObject::connect(&t_toggle, TQ_SIGNAL(timeout()), l, TQ_SLOT(toggle())); + TQObject::connect(&t_color, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextColor())); + TQObject::connect(&t_look, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextLook())); l->show(); resize(240,140); } @@ -55,7 +55,7 @@ KLedTest::KLedTest(TQWidget* parent) for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) { for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1)) { - leds[index]=new KLed(Qt::yellow, state, + leds[index]=new KLed(TQt::yellow, state, (KLed::Look)(look+1), (KLed::Shape)(shape+1), this); leds[index]->setGeometry(x, y, LedWidth, LedHeight); @@ -66,7 +66,7 @@ KLedTest::KLedTest(TQWidget* parent) y+=Grid+LedHeight; } setFixedSize(x+Grid, y+Grid); - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); timer.start(500); } } diff --git a/tdeui/tests/kledtest.h b/tdeui/tests/kledtest.h index 5652e306e..dce5fb3a8 100644 --- a/tdeui/tests/kledtest.h +++ b/tdeui/tests/kledtest.h @@ -8,7 +8,7 @@ class KLedTest : public TQWidget { - Q_OBJECT + TQ_OBJECT protected: TQTimer timer; KLed *leds[/*KLed::NoOfShapes*/2* /*KLed::NoOfLooks*/3* /*KLed::NoOfStates*/2]; diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp index 20e9b6ca8..e9601ccec 100644 --- a/tdeui/tests/klineedittest.cpp +++ b/tdeui/tests/klineedittest.cpp @@ -31,28 +31,28 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name ) m_lineedit->completionObject()->setItems( list ); m_lineedit->setFixedSize(500,30); m_lineedit->setEnableSqueezedText( true ); - connect( m_lineedit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) ); - connect( m_lineedit, TQT_SIGNAL( returnPressed(const TQString&) ), - TQT_SLOT( slotReturnPressed(const TQString&) ) ); + connect( m_lineedit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) ); + connect( m_lineedit, TQ_SIGNAL( returnPressed(const TQString&) ), + TQ_SLOT( slotReturnPressed(const TQString&) ) ); TQHBox *hbox = new TQHBox (this); m_btnExit = new TQPushButton( "E&xit", hbox ); m_btnExit->setFixedSize(100,30); - connect( m_btnExit, TQT_SIGNAL( clicked() ), TQT_SLOT( quitApp() ) ); + connect( m_btnExit, TQ_SIGNAL( clicked() ), TQ_SLOT( quitApp() ) ); m_btnReadOnly = new TQPushButton( "&Read Only", hbox ); m_btnReadOnly->setToggleButton (true); m_btnReadOnly->setFixedSize(100,30); - connect( m_btnReadOnly, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotReadOnly(bool) ) ); + connect( m_btnReadOnly, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotReadOnly(bool) ) ); m_btnEnable = new TQPushButton( "Dis&able", hbox ); m_btnEnable->setToggleButton (true); m_btnEnable->setFixedSize(100,30); - connect( m_btnEnable, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotEnable(bool) ) ); + connect( m_btnEnable, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotEnable(bool) ) ); m_btnHide = new TQPushButton( "Hi&de", hbox ); m_btnHide->setFixedSize(100,30); - connect( m_btnHide, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHide() ) ); + connect( m_btnHide, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHide() ) ); layout->addWidget( m_lineedit ); layout->addWidget( hbox ); @@ -113,7 +113,7 @@ void KLineEditTest::slotHide() m_btnHide->setEnabled( false ); m_lineedit->setText( "My dog ate the homework, whaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaa! I want my mommy!" ); - TQTimer::singleShot( 1000, this, TQT_SLOT(show()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(show()) ); } int main ( int argc, char **argv) diff --git a/tdeui/tests/klineedittest.h b/tdeui/tests/klineedittest.h index 6fee4dbc4..63cb1d459 100644 --- a/tdeui/tests/klineedittest.h +++ b/tdeui/tests/klineedittest.h @@ -11,7 +11,7 @@ class KLineEdit; class KLineEditTest : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KLineEditTest( TQWidget *parent=0, const char *name=0 ); diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp index 9a333dfda..8e99df1b9 100644 --- a/tdeui/tests/knuminputtest.cpp +++ b/tdeui/tests/knuminputtest.cpp @@ -26,7 +26,7 @@ void TopLevel::slotPrint( double n ) { kdDebug() << "slotPrint( " << n << " )" << endl; } -#define conn(x,y) connect( x, TQT_SIGNAL(valueChanged(y)), TQT_SLOT(slotPrint(y))) +#define conn(x,y) connect( x, TQ_SIGNAL(valueChanged(y)), TQ_SLOT(slotPrint(y))) TopLevel::TopLevel(TQWidget *parent, const char *name) : TQWidget(parent, name) { @@ -67,10 +67,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) i6->setLabel("Height (should be 2xWidth):"); i6->setRange(0, 200, 1, false); i6->setReferencePoint( 10 ); - connect( i5, TQT_SIGNAL(relativeValueChanged(double)), - i6, TQT_SLOT(setRelativeValue(double)) ); - connect( i6, TQT_SIGNAL(relativeValueChanged(double)), - i5, TQT_SLOT(setRelativeValue(double)) ); + connect( i5, TQ_SIGNAL(relativeValueChanged(double)), + i6, TQ_SLOT(setRelativeValue(double)) ); + connect( i6, TQ_SIGNAL(relativeValueChanged(double)), + i5, TQ_SLOT(setRelativeValue(double)) ); i7 = new KIntNumInput(i6, 0, b1, 10); i7->setLabel("math test:", AlignVCenter|AlignLeft ); @@ -119,10 +119,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) d7 = new KDoubleNumInput(d6, -30, 30, 0, 0.001, 3, b2, "d7"); d7->setReferencePoint( -3 ); - connect( d6, TQT_SIGNAL(relativeValueChanged(double)), - d7, TQT_SLOT(setRelativeValue(double)) ); - connect( d7, TQT_SIGNAL(relativeValueChanged(double)), - d6, TQT_SLOT(setRelativeValue(double)) ); + connect( d6, TQ_SIGNAL(relativeValueChanged(double)), + d7, TQ_SLOT(setRelativeValue(double)) ); + connect( d7, TQ_SIGNAL(relativeValueChanged(double)), + d6, TQ_SLOT(setRelativeValue(double)) ); l->addWidget(b2); } diff --git a/tdeui/tests/knuminputtest.h b/tdeui/tests/knuminputtest.h index 32a9e9098..e5d1c6d7f 100644 --- a/tdeui/tests/knuminputtest.h +++ b/tdeui/tests/knuminputtest.h @@ -8,7 +8,7 @@ class KDoubleNumInput; class TopLevel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TopLevel( TQWidget *parent=0, const char *name=0 ); diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp index a14cb3366..c08c03a8c 100644 --- a/tdeui/tests/kpanelmenutest.cpp +++ b/tdeui/tests/kpanelmenutest.cpp @@ -15,8 +15,8 @@ TestWidget::TestWidget(TQWidget *parent, const char *name) KPanelAppMenu *ssub = subMenu->insertMenu(locate("mini", "x.png"), "One more"); - connect(testMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuCalled(int))); - connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubMenuCalled(int))); + connect(testMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuCalled(int))); + connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubMenuCalled(int))); init(); setText("We added \"Client Test\" to kicker. Click the TDE Menu to check."); diff --git a/tdeui/tests/kpanelmenutest.h b/tdeui/tests/kpanelmenutest.h index 361ae545a..f6c81eac8 100644 --- a/tdeui/tests/kpanelmenutest.h +++ b/tdeui/tests/kpanelmenutest.h @@ -6,7 +6,7 @@ class TestWidget : public TQLabel { - Q_OBJECT + TQ_OBJECT public: TestWidget(TQWidget *parent=0, const char *name=0); ~TestWidget(){delete testMenu;} diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp index 628c5096e..28bc2a362 100644 --- a/tdeui/tests/krulertest.cpp +++ b/tdeui/tests/krulertest.cpp @@ -76,14 +76,14 @@ KRulerTest::KRulerTest( const char *name ) vruler->setOffset( 0 ); vruler->setRange( 0, 1000 ); - connect( bigwidget, TQT_SIGNAL(newXPos(int)), - hruler, TQT_SLOT(slotNewValue(int)) ); - connect( bigwidget, TQT_SIGNAL(newYPos(int)), - vruler, TQT_SLOT(slotNewValue(int)) ); - connect( bigwidget, TQT_SIGNAL(newWidth(int)), - TQT_SLOT(slotNewWidth(int)) ); - connect( bigwidget, TQT_SIGNAL(newHeight(int)), - TQT_SLOT(slotNewHeight(int)) ); + connect( bigwidget, TQ_SIGNAL(newXPos(int)), + hruler, TQ_SLOT(slotNewValue(int)) ); + connect( bigwidget, TQ_SIGNAL(newYPos(int)), + vruler, TQ_SLOT(slotNewValue(int)) ); + connect( bigwidget, TQ_SIGNAL(newWidth(int)), + TQ_SLOT(slotNewWidth(int)) ); + connect( bigwidget, TQ_SIGNAL(newHeight(int)), + TQ_SLOT(slotNewHeight(int)) ); layout->addWidget(miniwidget, 0, 0); layout->addWidget(hruler, 0, 1); @@ -101,38 +101,38 @@ KRulerTest::KRulerTest( const char *name ) showTM->adjustSize(); showTM->move(5,15); showTM->setChecked(true); - connect(showTM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetTinyMarks(bool)) ); + connect(showTM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetTinyMarks(bool)) ); showLM = new TQCheckBox("show little marks", showMarks); showLM->adjustSize(); showLM->move(5,35); showLM->setChecked(true); - connect(showLM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetLittleMarks(bool)) ); + connect(showLM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetLittleMarks(bool)) ); showMM = new TQCheckBox("show medium marks", showMarks); showMM->adjustSize(); showMM->move(5,55); showMM->setChecked(true); - connect(showMM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetMediumMarks(bool)) ); + connect(showMM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetMediumMarks(bool)) ); showBM = new TQCheckBox("show big marks", showMarks); showBM->adjustSize(); showBM->move(5,75); showBM->setChecked(true); - connect(showBM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetBigMarks(bool)) ); + connect(showBM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetBigMarks(bool)) ); showEM = new TQCheckBox("show end marks", showMarks); showEM->adjustSize(); showEM->move(5,95); showEM->setChecked(true); - connect(showEM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetEndMarks(bool)) ); + connect(showEM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetEndMarks(bool)) ); showPT = new TQCheckBox("show ruler pointer", showMarks); showPT->adjustSize(); showPT->move(5,115); showPT->setChecked(true); - connect(showPT, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetRulerPointer(bool)) ); + connect(showPT, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetRulerPointer(bool)) ); fixLen = new TQCheckBox("fix ruler length", showMarks); fixLen->adjustSize(); fixLen->move(5,135); fixLen->setChecked(true); - connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFixRulerLength(bool)) ); - connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckLength(bool)) ); + connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFixRulerLength(bool)) ); + connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckLength(bool)) ); lineEdit = new TQGroupBox("Value of begin/end", bigwidget); lineEdit->setFixedSize(140, 80); @@ -141,26 +141,26 @@ KRulerTest::KRulerTest( const char *name ) beginMark->setRange(-1000, 1000, 1, false); beginMark->move(5, 15); beginMark->setFixedSize(beginMark->sizeHint()); - connect(beginMark, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotNewOffset(int)) ); - connect(beginMark, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotNewOffset(int)) ); + connect(beginMark, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotNewOffset(int)) ); + connect(beginMark, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotNewOffset(int)) ); endMark = new KIntNumInput(0, lineEdit); endMark->setRange(-1000, 1000, 1, false); endMark->move(5, 35); endMark->setFixedSize(endMark->sizeHint()); - connect(endMark, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotEndOffset(int)) ); - connect(endMark, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotEndOffset(int)) ); + connect(endMark, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotEndOffset(int)) ); + connect(endMark, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotEndOffset(int)) ); lengthInput = new KIntNumInput(0, lineEdit); lengthInput->setRange(-1000, 1000, 1, false); lengthInput->move(5, 55); lengthInput->setFixedSize(lengthInput->sizeHint()); - connect(lengthInput, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotEndOffset(int)) ); - connect(lengthInput, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotEndOffset(int)) ); + connect(lengthInput, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotEndOffset(int)) ); + connect(lengthInput, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotEndOffset(int)) ); vertrot = new TQGroupBox("Value of rotate translate for Vert.", bigwidget); @@ -171,22 +171,22 @@ KRulerTest::KRulerTest( const char *name ) transX->move(5, 15); transX->setFixedSize(transX->sizeHint()); //transX->setLabel("transx", AlignLeft); - connect(transX, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetXTrans(double)) ); + connect(transX, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetXTrans(double)) ); transY = new KDoubleNumInput(-12.0, vertrot); transY->setRange(-1000, 1000, 1, false); transY->move(5, 35); transY->setFixedSize(transY->sizeHint()); //transY->setLabel("transy", AlignLeft); - connect(transY, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetYTrans(double)) ); + connect(transY, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetYTrans(double)) ); rotV = new KDoubleNumInput(90.0, vertrot); rotV->setRange(-1000, 1000, 1, false); rotV->move(5, 55); rotV->setFixedSize(rotV->sizeHint()); //rotV->setLabel("rot", AlignLeft); - connect(rotV, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetRotate(double)) ); + connect(rotV, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetRotate(double)) ); metricstyle = new TQButtonGroup("metric styles", bigwidget); @@ -212,7 +212,7 @@ KRulerTest::KRulerTest( const char *name ) mmetric->adjustSize(); mmetric->move(5,95); metricstyle->insert(mmetric, (int)KRuler::Metres); - connect ( metricstyle, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSetMStyle(int)) ); + connect ( metricstyle, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotSetMStyle(int)) ); setCentralWidget(mainframe); diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h index 0175db3aa..1bcc5ade1 100644 --- a/tdeui/tests/krulertest.h +++ b/tdeui/tests/krulertest.h @@ -19,7 +19,7 @@ class TQGroupBox; class MouseWidget : public TQFrame { -Q_OBJECT +TQ_OBJECT public: MouseWidget( TQWidget *parent=0, const char *name=0, WFlags f=0 ); @@ -42,7 +42,7 @@ private: class KRulerTest : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: KRulerTest( const char *name = 0L ); ~KRulerTest(); diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp index 0a8c6d10c..a2bb2b6e8 100644 --- a/tdeui/tests/kstatusbartest.cpp +++ b/tdeui/tests/kstatusbartest.cpp @@ -23,7 +23,7 @@ testWindow::testWindow (TQWidget *, const char *name) fileMenu = new TQPopupMenu; menuBar->insertItem ("&File", fileMenu); fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), - TQT_SLOT( quit() ), ALT + Key_Q ); + TQ_SLOT( quit() ), ALT + Key_Q ); statusbar = new KStatusBar (this); statusbar->insertItem("Zoom: XXXX", 0); statusbar->insertItem("XXX", 1); @@ -34,8 +34,8 @@ testWindow::testWindow (TQWidget *, const char *name) insert = true; statusbar->changeItem("Line: 13567", 2); - connect (statusbar, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(slotPress(int))); - connect (statusbar, TQT_SIGNAL(released(int)), this, TQT_SLOT(slotClick(int))); + connect (statusbar, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(slotPress(int))); + connect (statusbar, TQ_SIGNAL(released(int)), this, TQ_SLOT(slotClick(int))); widget = new TQMultiLineEdit (this); @@ -53,7 +53,7 @@ testWindow::testWindow (TQWidget *, const char *name) smenu->insertItem("400%"); smenu->insertItem("oo%"); - connect (smenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenu(int))); + connect (smenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenu(int))); } void testWindow::slotClick(int id) diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h index 712f24352..d61f3b422 100644 --- a/tdeui/tests/kstatusbartest.h +++ b/tdeui/tests/kstatusbartest.h @@ -10,7 +10,7 @@ class TQMultiLineEdit; class testWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: testWindow (TQWidget *parent=0, const char *name=0); diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp index 05fe2aeb3..27229e436 100644 --- a/tdeui/tests/ktabctltest.cpp +++ b/tdeui/tests/ktabctltest.cpp @@ -43,10 +43,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) */ test = new KTabCtl(this, "test"); - connect(test, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(tabChanged(int))); + connect(test, TQ_SIGNAL(tabSelected(int)), this, TQ_SLOT(tabChanged(int))); TQWidget *w = new TQWidget(test, "_page1"); TQPushButton *bt = new TQPushButton("Click me to quit", w, "_bt1"); - connect(bt, TQT_SIGNAL(clicked()), this, TQT_SLOT(okPressed())); + connect(bt, TQ_SIGNAL(clicked()), this, TQ_SLOT(okPressed())); bt->adjustSize(); bt->move(20, 20); test->addTab(w, "Seite 1"); diff --git a/tdeui/tests/ktabctltest.h b/tdeui/tests/ktabctltest.h index 6dd3b932a..fe327c4c1 100644 --- a/tdeui/tests/ktabctltest.h +++ b/tdeui/tests/ktabctltest.h @@ -12,7 +12,7 @@ class TQMultiLineEdit; class TopLevel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TopLevel( TQWidget *parent=0, const char *name=0 ); diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp index 64d2795fc..362df8558 100644 --- a/tdeui/tests/ktabwidgettest.cpp +++ b/tdeui/tests/ktabwidgettest.cpp @@ -21,21 +21,21 @@ Test::Test( TQWidget* parent, const char *name ) mWidget->addTab( new TQLabel( "Testlabel 2", mWidget ), "Two" ); mWidget->addTab( new TQWidget( mWidget), SmallIcon( "konsole" ), "Three" ); mWidget->addTab( new TQWidget( mWidget), "Four" ); - mWidget->setTabColor( mWidget->page(0), Qt::red ); - mWidget->setTabColor( mWidget->page(1), Qt::blue ); - - connect( mWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), TQT_SLOT( currentChanged( TQWidget * ) ) ); - connect( mWidget, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQT_SLOT(contextMenu( TQWidget *, const TQPoint & ))); - connect( mWidget, TQT_SIGNAL( contextMenu( const TQPoint & )), TQT_SLOT(tabbarContextMenu( const TQPoint & ))); - connect( mWidget, TQT_SIGNAL( mouseDoubleClick( TQWidget * )), TQT_SLOT(mouseDoubleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( mouseMiddleClick() ), TQT_SLOT(addTab() )); - connect( mWidget, TQT_SIGNAL( mouseMiddleClick( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SLOT(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQDropEvent * ))); - connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * ))); - connect( mWidget, TQT_SIGNAL( initiateDrag( TQWidget * )), TQT_SLOT(initiateDrag( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( movedTab( int, int )), TQT_SLOT(movedTab( int, int ))); + mWidget->setTabColor( mWidget->page(0), TQt::red ); + mWidget->setTabColor( mWidget->page(1), TQt::blue ); + + connect( mWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), TQ_SLOT( currentChanged( TQWidget * ) ) ); + connect( mWidget, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQ_SLOT(contextMenu( TQWidget *, const TQPoint & ))); + connect( mWidget, TQ_SIGNAL( contextMenu( const TQPoint & )), TQ_SLOT(tabbarContextMenu( const TQPoint & ))); + connect( mWidget, TQ_SIGNAL( mouseDoubleClick( TQWidget * )), TQ_SLOT(mouseDoubleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( mouseMiddleClick() ), TQ_SLOT(addTab() )); + connect( mWidget, TQ_SIGNAL( mouseMiddleClick( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SLOT(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQDropEvent * ))); + connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * ))); + connect( mWidget, TQ_SIGNAL( initiateDrag( TQWidget * )), TQ_SLOT(initiateDrag( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( movedTab( int, int )), TQ_SLOT(movedTab( int, int ))); mWidget->setTabReorderingEnabled( true ); TQWidget * grid = new TQWidget(this); @@ -43,53 +43,53 @@ Test::Test( TQWidget* parent, const char *name ) TQPushButton * addTab = new TQPushButton( "Add Tab", grid ); gridlayout->addWidget( addTab, 0, 0 ); - connect( addTab, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) ); + connect( addTab, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) ); TQPushButton * removeTab = new TQPushButton( "Remove Current Tab", grid ); gridlayout->addWidget( removeTab, 0, 1 ); - connect( removeTab, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) ); + connect( removeTab, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) ); mLeftButton = new TQCheckBox( "Show left button", grid ); gridlayout->addWidget( mLeftButton, 1, 0 ); - connect( mLeftButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftButton(bool) ) ); + connect( mLeftButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftButton(bool) ) ); mLeftButton->setChecked(true); TQCheckBox * leftPopup = new TQCheckBox( "Enable left popup", grid ); gridlayout->addWidget( leftPopup, 2, 0 ); - connect( leftPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftPopup(bool) ) ); + connect( leftPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftPopup(bool) ) ); leftPopup->setChecked(true); mRightButton = new TQCheckBox( "Show right button", grid ); gridlayout->addWidget( mRightButton, 1, 1 ); - connect( mRightButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightButton(bool) ) ); + connect( mRightButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightButton(bool) ) ); mRightButton->setChecked(true); TQCheckBox * rightPopup = new TQCheckBox( "Enable right popup", grid ); gridlayout->addWidget( rightPopup, 2, 1 ); - connect( rightPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightPopup(bool) ) ); + connect( rightPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightPopup(bool) ) ); rightPopup->setChecked(true); mTabsBottom = new TQCheckBox( "Show tabs at bottom", grid ); gridlayout->addWidget( mTabsBottom, 3, 0 ); - connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) ); + connect( mTabsBottom, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabPosition(bool) ) ); TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid ); gridlayout->addWidget( tabshape, 3, 1 ); - connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); + connect( tabshape, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabShape(bool) ) ); TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid ); gridlayout->addWidget( tabClose, 4, 0 ); - connect( tabClose, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleCloseButtons(bool) ) ); + connect( tabClose, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleCloseButtons(bool) ) ); tabClose->setChecked(true); TQCheckBox * showlabels = new TQCheckBox( "Show labels", grid ); gridlayout->addWidget( showlabels, 4, 1 ); - connect( showlabels, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( toggleLabels(bool) ) ); + connect( showlabels, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( toggleLabels(bool) ) ); } void Test::currentChanged(TQWidget* w) { - mWidget->setTabColor( w, Qt::black ); + mWidget->setTabColor( w, TQt::black ); } void Test::addTab() @@ -137,7 +137,7 @@ void Test::toggleLeftButton(bool state) if (state) { if (!mLeftWidget) { mLeftWidget = new TQToolButton( mWidget ); - connect( mLeftWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) ); + connect( mLeftWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) ); mLeftWidget->setIconSet( SmallIcon( "tab_new" ) ); mLeftWidget->setTextLabel("New"); mLeftWidget->setTextPosition(TQToolButton::Right); @@ -162,7 +162,7 @@ void Test::toggleLeftPopup(bool state) mLeftPopup->insertSeparator(); mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Button Tab", 1); mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Label Tab", 2); - connect(mLeftPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(leftPopupActivated(int))); + connect(mLeftPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(leftPopupActivated(int))); } mLeftWidget->setPopup(mLeftPopup); } @@ -188,7 +188,7 @@ void Test::toggleRightButton(bool state) if (state) { if ( !mRightWidget) { mRightWidget = new TQToolButton( mWidget ); - TQObject::connect( mRightWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) ); + TQObject::connect( mRightWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) ); mRightWidget->setIconSet( SmallIcon( "tab_remove" ) ); mRightWidget->setTextLabel("Close"); mRightWidget->setTextPosition(TQToolButton::Right); @@ -212,7 +212,7 @@ void Test::toggleRightPopup(bool state) mRightPopup->insertSeparator(); mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Left Tab", 0); mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Right Tab", 2); - connect(mRightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(rightPopupActivated(int))); + connect(mRightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(rightPopupActivated(int))); } mRightWidget->setPopup(mRightPopup); } @@ -264,7 +264,7 @@ void Test::contextMenu(TQWidget *w, const TQPoint &p) mContextPopup->insertSeparator(); mContextPopup->insertItem( mWidget->isTabEnabled(w) ? "Disable Tab" : "Enable Tab", 2); mContextPopup->insertItem( mWidget->tabToolTip(w).isEmpty() ? "Set Tooltip" : "Remove Tooltip", 3); - connect(mContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(mContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); mContextWidget = w; mContextPopup->popup(p); @@ -300,7 +300,7 @@ void Test::tabbarContextMenu(const TQPoint &p) mTabbarContextPopup->insertItem(SmallIcon( "tab_remove" ), mRightWidget->isVisible() ? "Hide \"Remove\" Button" : "Show \"Remove\" Button", 1); mTabbarContextPopup->insertSeparator(); mTabbarContextPopup->insertItem(mWidget->tabPosition()==TQTabWidget::Top ? "Put Tabbar to Bottom" : "Put Tabbar to Top", 2); - connect(mTabbarContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(tabbarContextMenuActivated(int))); + connect(mTabbarContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(tabbarContextMenuActivated(int))); mTabbarContextPopup->popup(p); } @@ -326,7 +326,7 @@ void Test::mouseDoubleClick(TQWidget *w) mWidget->label( mWidget->indexOf( w ) ), &ok, this ); if ( ok && !text.isEmpty() ) { mWidget->changeTab( w, text ); - mWidget->setTabColor( w, Qt::green ); + mWidget->setTabColor( w, TQt::green ); } } diff --git a/tdeui/tests/ktabwidgettest.h b/tdeui/tests/ktabwidgettest.h index 7c178bd32..eba95ef7b 100644 --- a/tdeui/tests/ktabwidgettest.h +++ b/tdeui/tests/ktabwidgettest.h @@ -15,7 +15,7 @@ class Test : public TQVBox { - Q_OBJECT + TQ_OBJECT public: Test( TQWidget* parent=0, const char *name =0 ); diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp index 40904000b..839a9c71a 100644 --- a/tdeui/tests/kunbalancedgrdtest.cpp +++ b/tdeui/tests/kunbalancedgrdtest.cpp @@ -20,13 +20,13 @@ void KGradientWidget::paintEvent(TQPaintEvent *) int it, ft; TQString say; - TQColor ca = Qt::black, cb = Qt::cyan; + TQColor ca = TQt::black, cb = TQt::cyan; int x = 0, y = 0; pix.resize(width()/cols, height()/rows); TQPainter p(this); - p.setPen(Qt::white); + p.setPen(TQt::white); // draw once, so that the benchmarking be fair :-) KPixmapEffect::unbalancedGradient(pix,ca, cb, @@ -138,8 +138,8 @@ myTopWidget::myTopWidget (TQWidget *parent, const char *name) ySlider = new TQSlider ( -200, 200, 1, 100, TQSlider::Horizontal, this); lay->addWidget(ySlider, 1, 2); - connect(xSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance())); - connect(ySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance())); + connect(xSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance())); + connect(ySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance())); rebalance(); diff --git a/tdeui/tests/kunbalancedgrdtest.h b/tdeui/tests/kunbalancedgrdtest.h index 8b7893772..db4c99f80 100644 --- a/tdeui/tests/kunbalancedgrdtest.h +++ b/tdeui/tests/kunbalancedgrdtest.h @@ -30,7 +30,7 @@ private: class myTopWidget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: myTopWidget(TQWidget *parent=0, const char *name=0); diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp index 0635188d0..591e71d7e 100644 --- a/tdeui/tests/kwizardtest.cpp +++ b/tdeui/tests/kwizardtest.cpp @@ -27,17 +27,17 @@ int main(int argc, char **argv) { TDEApplication a(argc,argv,"kwizardtest"); KWizard *wiz = new KWizard(0, "kwizardtest", false); - TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()), - &a, TQT_SLOT(quit())); - TQObject::connect((TQObject*) wiz->finishButton(), TQT_SIGNAL(clicked()), - &a, TQT_SLOT(quit())); + TQObject::connect((TQObject*) wiz->cancelButton(), TQ_SIGNAL(clicked()), + &a, TQ_SLOT(quit())); + TQObject::connect((TQObject*) wiz->finishButton(), TQ_SIGNAL(clicked()), + &a, TQ_SLOT(quit())); for(int i = 1; i < 11; i++) { TQWidget *p = new TQWidget; TQString msg = TQString("This is page %1 out of 10").arg(i); TQLabel *label = new TQLabel(msg, p); TQHBoxLayout *layout = new TQHBoxLayout(p, 5); - label->setAlignment(Qt::AlignCenter); + label->setAlignment(TQt::AlignCenter); label->setFixedSize(300, 200); layout->addWidget(label); TQString title = TQString("%1. page").arg(i); diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index b72e9dc68..d32593094 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -48,7 +48,7 @@ int main( int argc, char **argv ) Client *part = new Client; (void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" ); - (void)new TDEAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" ); + (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQ_SLOT( slotSec() ), part->actionCollection(), "security" ); part->setXMLFile( "./kxmlguitest_part.rc" ); diff --git a/tdeui/tests/kxmlguitest.h b/tdeui/tests/kxmlguitest.h index bc88711f7..9d1789301 100644 --- a/tdeui/tests/kxmlguitest.h +++ b/tdeui/tests/kxmlguitest.h @@ -6,7 +6,7 @@ class Client : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: Client() {} diff --git a/tdeui/tests/qxembedtest.cpp b/tdeui/tests/qxembedtest.cpp index 4965e5487..fe6c9aef9 100644 --- a/tdeui/tests/qxembedtest.cpp +++ b/tdeui/tests/qxembedtest.cpp @@ -25,10 +25,10 @@ main(int argc, char**argv) TQApplication a(argc,argv); - TQWidget *main = new TQVBox(NULL,"main",Qt::WDestructiveClose); + TQWidget *main = new TQVBox(NULL,"main",TQt::WDestructiveClose); TQWidget *top = new TQHBox(main); TQPushButton *quit = new TQPushButton("Quit", top); - TQObject::connect( quit, TQT_SIGNAL(clicked()), main, TQT_SLOT(close()) ); + TQObject::connect( quit, TQ_SIGNAL(clicked()), main, TQ_SLOT(close()) ); TQLineEdit *edit = new TQLineEdit(top); edit->setText( "Just to see focus changes"); QXEmbed *embed = new QXEmbed(main); diff --git a/tdeui/tests/tdeactiontest.cpp b/tdeui/tests/tdeactiontest.cpp index e892bb306..676872e96 100644 --- a/tdeui/tests/tdeactiontest.cpp +++ b/tdeui/tests/tdeactiontest.cpp @@ -10,7 +10,7 @@ int main( int argc, char **argv ) { TDEApplication app( argc, argv, "tdeactiontest" ); - TDEActionCollection coll( static_cast<TQObject *>( 0 ) ); + TDEActionCollection coll( 0 ); TQGuardedPtr<TDEAction> action1 = new TDERadioAction("test",0, &coll); TQGuardedPtr<TDEAction> action2 = new TDERadioAction("test",0, &coll); diff --git a/tdeui/tests/tdemainwindowrestoretest.h b/tdeui/tests/tdemainwindowrestoretest.h index d0279cdae..5e6531dbb 100644 --- a/tdeui/tests/tdemainwindowrestoretest.h +++ b/tdeui/tests/tdemainwindowrestoretest.h @@ -4,42 +4,42 @@ #include <tdemainwindow.h> class MainWin1 : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWin1() : TDEMainWindow() {} virtual ~MainWin1() {} }; class MainWin2 : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWin2() : TDEMainWindow() {} virtual ~MainWin2() {} }; class MainWin3 : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWin3() : TDEMainWindow() {} virtual ~MainWin3() {} }; class MainWin4 : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWin4() : TDEMainWindow() {} virtual ~MainWin4() {} }; class MainWin5 : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWin5() : TDEMainWindow() {} virtual ~MainWin5() {} }; class MainWin6 : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWin6() : TDEMainWindow() {} virtual ~MainWin6() {} diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp index bf92dc11c..ffaaa8862 100644 --- a/tdeui/tests/tdemainwindowtest.cpp +++ b/tdeui/tests/tdemainwindowtest.cpp @@ -9,7 +9,7 @@ MainWindow::MainWindow() { - TQTimer::singleShot( 2*1000, this, TQT_SLOT( showMessage() ) ); + TQTimer::singleShot( 2*1000, this, TQ_SLOT( showMessage() ) ); setCentralWidget( new TQLabel( "foo", this ) ); diff --git a/tdeui/tests/tdemainwindowtest.h b/tdeui/tests/tdemainwindowtest.h index 5512c7f9f..3bf613aaf 100644 --- a/tdeui/tests/tdemainwindowtest.h +++ b/tdeui/tests/tdemainwindowtest.h @@ -5,7 +5,7 @@ class MainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow(); diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp index f9a97bad4..637031443 100644 --- a/tdeui/tests/tdepopuptest.cpp +++ b/tdeui/tests/tdepopuptest.cpp @@ -24,7 +24,7 @@ public: menu->insertItem("Item1"); menu->insertItem("Item2"); menu->insertSeparator(); - menu->insertItem("Quit", tqApp, TQT_SLOT(quit())); + menu->insertItem("Quit", tqApp, TQ_SLOT(quit())); } }; diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp index f826f13b0..8fd5170e0 100644 --- a/tdeui/tests/twindowtest.cpp +++ b/tdeui/tests/twindowtest.cpp @@ -56,13 +56,13 @@ setAutoSaveSettings(); // We insert item "Exit" with accelerator ALT-Q, and connect // it to application's exit-slot. fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), - TQT_SLOT( quit() ), ALT + Key_Q ); + TQ_SLOT( quit() ), ALT + Key_Q ); // Another popup... toolBarMenu = new TQPopupMenu; menuBar->insertItem ("&Toolbars", toolBarMenu); - toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQT_SLOT(slotHide1())); - toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQT_SLOT(slotHide2())); + toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQ_SLOT(slotHide1())); + toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQ_SLOT(slotHide2())); itemsMenu = new TQPopupMenu; menuBar->insertItem ("&Items", itemsMenu); @@ -71,15 +71,15 @@ setAutoSaveSettings(); lineL = true; // Lined is enabled greenF = false; // Frame not inserted - itemsMenu->insertItem ("delete/insert exit button", this, TQT_SLOT(slotExit())); - itemsMenu->insertItem ("insert/delete green frame!", this, TQT_SLOT(slotFrame())); - itemsMenu->insertItem ("enable/disable Lined", this, TQT_SLOT(slotLined())); - itemsMenu->insertItem ("Toggle fileNew", this, TQT_SLOT(slotNew())); - itemsMenu->insertItem ("Clear comboBox", this, TQT_SLOT(slotClearCombo())); - itemsMenu->insertItem ("Insert List in Combo", this, TQT_SLOT(slotInsertListInCombo())); - itemsMenu->insertItem ("Make item 3 curent", this, TQT_SLOT(slotMakeItem3Current())); - //itemsMenu->insertItem ("Insert clock!", this, TQT_SLOT(slotInsertClock())); - itemsMenu->insertItem ("Important!", this, TQT_SLOT(slotImportant())); + itemsMenu->insertItem ("delete/insert exit button", this, TQ_SLOT(slotExit())); + itemsMenu->insertItem ("insert/delete green frame!", this, TQ_SLOT(slotFrame())); + itemsMenu->insertItem ("enable/disable Lined", this, TQ_SLOT(slotLined())); + itemsMenu->insertItem ("Toggle fileNew", this, TQ_SLOT(slotNew())); + itemsMenu->insertItem ("Clear comboBox", this, TQ_SLOT(slotClearCombo())); + itemsMenu->insertItem ("Insert List in Combo", this, TQ_SLOT(slotInsertListInCombo())); + itemsMenu->insertItem ("Make item 3 curent", this, TQ_SLOT(slotMakeItem3Current())); + //itemsMenu->insertItem ("Insert clock!", this, TQ_SLOT(slotInsertClock())); + itemsMenu->insertItem ("Important!", this, TQ_SLOT(slotImportant())); menuBar->insertSeparator(); helpMenu = new KHelpMenu(this, "KWindowTest was programmed by Sven Radej"); @@ -113,30 +113,30 @@ setAutoSaveSettings(); // First four buttons pix = BarIcon("document-new"); - itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()), + itemId = tb->insertButton(pix, 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()), true, "Create.. (toggles upper button)", 50); pix = BarIcon("document-open"); - tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), + tb->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()), false, "Open"); pix = BarIcon("filefloppy"); - tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), + tb->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()), true, "Save (beep or delayed popup)"); tb->setDelayedPopup(2, itemsMenu); pix = BarIcon("document-print"); - tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()), + tb->insertButton(pix, 3, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrint()), true, "Print (enables/disables open)"); // And a combobox // arguments: text (or strList), ID, writable, signal, object, slot, enabled, // tooltiptext, size - tb->insertCombo (TQString("one"), 4, true, TQT_SIGNAL(activated(const TQString&)), this, - TQT_SLOT(slotList(const TQString&)), true, "ComboBox", 150); + tb->insertCombo (TQString("one"), 4, true, TQ_SIGNAL(activated(const TQString&)), this, + TQ_SLOT(slotList(const TQString&)), true, "ComboBox", 150); // Then one line editor // arguments: text, id, signal, object (this), slot, enabled, tooltiptext, size - tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQT_SIGNAL(returnPressed()), this, - TQT_SLOT(slotReturn()), true, "Location", 200); + tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQ_SIGNAL(returnPressed()), this, + TQ_SLOT(slotReturn()), true, "Location", 200); // Set this Lined to auto size itself. Note that only one item (Lined or Combo) // Can be set to autosize; If you specify more of them only last (according to @@ -148,8 +148,8 @@ setAutoSaveSettings(); // Now add another button and align it right pix = BarIcon("system-log-out"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), - TQT_SLOT( quit() ), true, "Exit"); + tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(), + TQ_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); // Another toolbar @@ -159,16 +159,16 @@ setAutoSaveSettings(); pix = BarIcon("document-new"); tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)"); tb1->setToggle(0); - tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool))); + tb1->addConnection (0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggle(bool))); pix = BarIcon("document-open"); - tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), + tb1->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()), true, "Open (starts progres in sb)"); tb1->insertSeparator (); pix = BarIcon("filefloppy"); - tb1->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), + tb1->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()), true, "Save file2 (autorepeat)"); tb1->setAutoRepeat(2); @@ -201,7 +201,7 @@ setAutoSaveSettings(); rg->addButton(6); rg->addButton(7); - connect (tb1, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int))); + connect (tb1, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int))); // Set caption for floating toolbars tb->setTitle ("Toolbar 1"); @@ -216,8 +216,8 @@ setAutoSaveSettings(); //addToolBar (tb1); //addToolBar (tb); - connect (tb, TQT_SIGNAL(highlighted(int,bool)), this, TQT_SLOT(slotMessage(int, bool))); - connect (tb1, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SLOT(slotMessage(int, bool))); + connect (tb, TQ_SIGNAL(highlighted(int,bool)), this, TQ_SLOT(slotMessage(int, bool))); + connect (tb1, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SLOT(slotMessage(int, bool))); // Floating is enabled by default, so you don't need this. // tb->enableFloating(true); @@ -243,7 +243,7 @@ setAutoSaveSettings(); completions->insertItem("/home/"); completions->insertItem("/vmlinuz :-)"); - connect (completions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotCompletionsMenu(int))); + connect (completions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotCompletionsMenu(int))); pr = 0; } /***********************************/ @@ -273,7 +273,7 @@ void testWindow::slotOpen() // statusBar->message(pr); timer = new TQTimer (pr); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGoGoGoo())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGoGoGoo())); timer->start(100); } @@ -408,8 +408,8 @@ void testWindow::slotExit () { TQPixmap pix; pix = BarIcon("system-log-out"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), - TQT_SLOT( quit() ), true, "Exit"); + tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(), + TQ_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); exitB = true; } diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h index d1d9d460e..12cc0f297 100644 --- a/tdeui/tests/twindowtest.h +++ b/tdeui/tests/twindowtest.h @@ -15,7 +15,7 @@ class KHelpMenu; class testWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: testWindow (TQWidget *parent=0, const char *name=0); diff --git a/tdeui/twindowinfo.cpp b/tdeui/twindowinfo.cpp index 436aa5227..ec1a448c5 100644 --- a/tdeui/twindowinfo.cpp +++ b/tdeui/twindowinfo.cpp @@ -67,12 +67,12 @@ void KWindowInfo::message( const TQString &text, const TQPixmap &pix, int timeou if ( timeout < 0 ) timeout = DEFAULT_MESSAGE_TIMEOUT; if ( timeout != 0 ) - TQTimer::singleShot( timeout, this, TQT_SLOT( restore() ) ); + TQTimer::singleShot( timeout, this, TQ_SLOT( restore() ) ); } void KWindowInfo::permanent( const TQString &text ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 oldMiniIcon = KWin::icon( win->winId(), 16, 16, true ); oldIcon = KWin::icon( win->winId(), 34, 34, false ); if ( oldIcon.isNull() ) @@ -85,7 +85,7 @@ void KWindowInfo::permanent( const TQString &text ) void KWindowInfo::permanent( const TQString &text, const TQPixmap &pix ) { if ( !oldText.isNull() ) { - TQObjectList *l = queryList( TQTIMER_OBJECT_NAME_STRING ); + TQObjectList *l = queryList( "TQTimer" ); TQObjectListIt it( *l ); TQObject *obj; @@ -117,7 +117,7 @@ void KWindowInfo::display( const TQString &text, const TQPixmap &pix ) win->setCaption( text ); win->setIcon( icon ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setIcons( win->winId(), icon, icon ); #endif } @@ -135,7 +135,7 @@ void KWindowInfo::save() } oldText = win->caption(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 oldMiniIcon = KWin::icon( win->winId(), 16, 16, true ); oldIcon = KWin::icon( win->winId(), 34, 34, false ); if ( oldIcon.isNull() ) @@ -162,7 +162,7 @@ void KWindowInfo::restore() } win->setIcon( oldIcon ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setIcons( win->winId(), oldIcon, oldMiniIcon ); #endif win->setCaption( oldText ); diff --git a/tdeui/twindowinfo.h b/tdeui/twindowinfo.h index d15942b47..26a274aa1 100644 --- a/tdeui/twindowinfo.h +++ b/tdeui/twindowinfo.h @@ -38,7 +38,7 @@ */ class TDEUI_EXPORT KWindowInfo : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp index bc2df2f66..0e070f79b 100644 --- a/tdeui/twindowlistmenu.cpp +++ b/tdeui/twindowlistmenu.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqglobal.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include "config.h" #include <tqpainter.h> @@ -85,9 +85,9 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection: KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) : TDEPopupMenu(parent, name) { - twin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(this); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); } KWindowListMenu::~KWindowListMenu() @@ -127,9 +127,9 @@ void KWindowListMenu::init() map.clear(); int unclutter = insertItem( i18n("Unclutter Windows"), - this, TQT_SLOT( slotUnclutterWindows() ) ); + this, TQ_SLOT( slotUnclutterWindows() ) ); int cascade = insertItem( i18n("Cascade Windows"), - this, TQT_SLOT( slotCascadeWindows() ) ); + this, TQ_SLOT( slotCascadeWindows() ) ); // if we only have one desktop we won't be showing titles, so put a separator in if (nd == 1) @@ -253,5 +253,5 @@ void KWindowListMenu::slotCascadeWindows() void KWindowListMenu::virtual_hook( int id, void* data ) { TDEPopupMenu::virtual_hook( id, data ); } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 diff --git a/tdeui/twindowlistmenu.h b/tdeui/twindowlistmenu.h index 20da236f1..0e7884e39 100644 --- a/tdeui/twindowlistmenu.h +++ b/tdeui/twindowlistmenu.h @@ -28,18 +28,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdepopupmenu.h> #include <tqmap.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 // not yet available for non-X11 +#ifdef TQ_WS_X11 // not yet available for non-X11 class KWinModule; class KWindowListMenuPrivate; class TDEUI_EXPORT KWindowListMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: KWindowListMenu( TQWidget *parent = 0, const char *name = 0 ); @@ -69,6 +65,6 @@ private: KWindowListMenuPrivate *d; }; -#endif // Q_WS_X11 +#endif // TQ_WS_X11 #endif diff --git a/tdeunittest/runner.h b/tdeunittest/runner.h index 76c662bb7..cff4ac718 100644 --- a/tdeunittest/runner.h +++ b/tdeunittest/runner.h @@ -96,7 +96,7 @@ namespace KUnitTest */ class TDEUNITTEST_EXPORT Runner : public TQObject { - Q_OBJECT + TQ_OBJECT public: /*! Registers a test case. A registry will be automatically created if necessary. diff --git a/tdeunittest/tester.cpp b/tdeunittest/tester.cpp index 11a24e653..d168280be 100644 --- a/tdeunittest/tester.cpp +++ b/tdeunittest/tester.cpp @@ -40,10 +40,10 @@ namespace KUnitTest void SlotTester::invokeMember(const TQString &str) { - TQString slotname = TQString::number(TQSLOT_CODE) + str; - connect(this, TQT_SIGNAL(invoke()), this, slotname.ascii()); + TQString slotname = TQString::number(TQ_SLOT_CODE) + str; + connect(this, TQ_SIGNAL(invoke()), this, slotname.ascii()); emit invoke(); - disconnect(this, TQT_SIGNAL(invoke()), this, slotname.ascii()); + disconnect(this, TQ_SIGNAL(invoke()), this, slotname.ascii()); } void SlotTester::allTests() diff --git a/tdeunittest/tester.h b/tdeunittest/tester.h index 3f0e45acf..07d65ce56 100644 --- a/tdeunittest/tester.h +++ b/tdeunittest/tester.h @@ -685,7 +685,7 @@ namespace KUnitTest */ class TDEUNITTEST_EXPORT SlotTester : public Tester { - Q_OBJECT + TQ_OBJECT public: SlotTester(const char *name = 0L); diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp index 742e78eef..3d4fd5556 100644 --- a/tdeutils/kcmultidialog.cpp +++ b/tdeutils/kcmultidialog.cpp @@ -89,11 +89,11 @@ KCMultiDialog::KCMultiDialog( int dialogFace, const KGuiItem &user2, inline void KCMultiDialog::init() { - connect( this, TQT_SIGNAL( finished()), TQT_SLOT( dialogClosed())); + connect( this, TQ_SIGNAL( finished()), TQ_SLOT( dialogClosed())); showButton( User1, false ); showButton( User2, false ); enableButton(Apply, false); - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShow(TQWidget *))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShow(TQWidget *))); setInitialSize(TQSize(640,480)); moduleParentComponents.setAutoDelete( true ); @@ -310,7 +310,7 @@ void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo, moduleParentComponents.insert( module, new TQStringList( parentComponents ) ); - connect(module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); + connect(module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); if( m_modules.count() == 0 ) aboutToShowPage( page ); @@ -338,7 +338,7 @@ void KCMultiDialog::removeAllModules() { kdDebug( 710 ) << "remove 2" << endl; TDECModuleProxy * kcm = ( *it ).kcm; - TQObject * page = TQT_TQOBJECT(kcm->parent()); + TQObject * page = kcm->parent(); kcm->hide(); if( page ) { @@ -368,7 +368,7 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) if( ! obj ) return; - TDECModuleProxy * module = ::tqqt_cast<TDECModuleProxy*>(obj); + TDECModuleProxy * module = ::tqt_cast<TDECModuleProxy*>(obj); if( ! module ) return; d->currentModule = module; @@ -378,15 +378,15 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) enableButton( KDialogBase::Default, d->currentModule->buttons() & TDECModule::Default ); - disconnect( this, TQT_SIGNAL(user2Clicked()), 0, 0 ); + disconnect( this, TQ_SIGNAL(user2Clicked()), 0, 0 ); if (d->currentModule->moduleInfo().needsRootPrivileges()) { if ( !d->currentModule->rootMode() ) { /* Enable the Admin Mode button */ enableButton( User2, true ); - connect( this, TQT_SIGNAL(user2Clicked()), d->currentModule, TQT_SLOT( runAsRoot() )); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT( disableRModeButton() )); + connect( this, TQ_SIGNAL(user2Clicked()), d->currentModule, TQ_SLOT( runAsRoot() )); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT( disableRModeButton() )); } else enableButton( User2, false); @@ -401,7 +401,7 @@ void KCMultiDialog::rootExit() void KCMultiDialog::disableRModeButton() { enableButton( User2, false ); - connect ( d->currentModule, TQT_SIGNAL( childClosed() ), TQT_SLOT( rootExit() )); + connect ( d->currentModule, TQ_SIGNAL( childClosed() ), TQ_SLOT( rootExit() )); } void KCMultiDialog::dialogClosed() diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h index 8f30603e6..89aedf0a5 100644 --- a/tdeutils/kcmultidialog.h +++ b/tdeutils/kcmultidialog.h @@ -42,7 +42,7 @@ class TDECModuleInfo; */ class TDEUTILS_EXPORT KCMultiDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeutils/kfind.cpp b/tdeutils/kfind.cpp index 74fb46e9a..f306fa254 100644 --- a/tdeutils/kfind.cpp +++ b/tdeutils/kfind.cpp @@ -212,8 +212,8 @@ KDialogBase* KFind::findNextDialog( bool create ) if ( !m_dialog && create ) { m_dialog = new KFindNextDialog( m_pattern, parentWidget() ); - connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotFindNext() ) ); - connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); + connect( m_dialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotFindNext() ) ); + connect( m_dialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) ); } return m_dialog; } diff --git a/tdeutils/kfind.h b/tdeutils/kfind.h index 054eeb259..c71f2a41e 100644 --- a/tdeutils/kfind.h +++ b/tdeutils/kfind.h @@ -50,11 +50,11 @@ * * // Connect highlight signal to code which handles highlighting * // of found text. - * connect( m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - * this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + * connect( m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + * this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); * // Connect findNext signal - called when pressing the button in the dialog - * connect( m_find, TQT_SIGNAL( findNext() ), - * this, TQT_SLOT( slotFindNext() ) ); + * connect( m_find, TQ_SIGNAL( findNext() ), + * this, TQ_SLOT( slotFindNext() ) ); * \endcode * * If you are using a non-modal find dialog (the recommended new way @@ -103,7 +103,7 @@ class TDEUTILS_EXPORT KFind : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp index 31e502eb6..529043a16 100644 --- a/tdeutils/kfinddialog.cpp +++ b/tdeutils/kfinddialog.cpp @@ -116,7 +116,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha topLayout->setSpacing( KDialog::spacingHint() ); topLayout->setMargin( 0 ); - m_findGrp = new TQGroupBox(0, Qt::Vertical, i18n("Find"), page); + m_findGrp = new TQGroupBox(0, TQt::Vertical, i18n("Find"), page); m_findGrp->layout()->setSpacing( KDialog::spacingHint() ); // m_findGrp->layout()->setMargin( KDialog::marginHint() ); m_findLayout = new TQGridLayout(m_findGrp->layout()); @@ -137,7 +137,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha m_findLayout->addWidget(m_regExpItem, 2, 1); topLayout->addWidget(m_findGrp); - m_replaceGrp = new TQGroupBox(0, Qt::Vertical, i18n("Replace With"), page); + m_replaceGrp = new TQGroupBox(0, TQt::Vertical, i18n("Replace With"), page); m_replaceGrp->layout()->setSpacing( KDialog::spacingHint() ); // m_replaceGrp->layout()->setMargin( KDialog::marginHint() ); m_replaceLayout = new TQGridLayout(m_replaceGrp->layout()); @@ -159,7 +159,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha m_replaceLayout->addWidget(m_backRefItem, 2, 1); topLayout->addWidget(m_replaceGrp); - m_optionGrp = new TQGroupBox(0, Qt::Vertical, i18n("Options"), page); + m_optionGrp = new TQGroupBox(0, TQt::Vertical, i18n("Options"), page); m_optionGrp->layout()->setSpacing(KDialog::spacingHint()); // m_optionGrp->layout()->setMargin(KDialog::marginHint()); optionsLayout = new TQGridLayout(m_optionGrp->layout()); @@ -193,13 +193,13 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha m_placeholders = 0L; // signals and slots connections - connect(m_selectedText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectedTextToggled(bool))); - connect(m_regExp, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRegexCheckBoxToggled(bool))); - connect(m_backRef, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPlaceholdersCheckBoxToggled(bool))); - connect(m_regExpItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPatterns())); - connect(m_backRefItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPlaceholders())); + connect(m_selectedText, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSelectedTextToggled(bool))); + connect(m_regExp, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotRegexCheckBoxToggled(bool))); + connect(m_backRef, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPlaceholdersCheckBoxToggled(bool))); + connect(m_regExpItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPatterns())); + connect(m_backRefItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPlaceholders())); - connect(m_find, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(textSearchChanged( const TQString & ))); + connect(m_find, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(textSearchChanged( const TQString & ))); // tab order setTabOrder(m_find, m_regExp); @@ -439,13 +439,13 @@ void KFindDialog::showPatterns() { if ( !d->m_regexpDialogQueryDone ) { - d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); d->m_regexpDialogQueryDone = true; } if ( d->m_regexpDialog ) { - KRegExpEditorInterface *iface = tqt_dynamic_cast<KRegExpEditorInterface *>( d->m_regexpDialog ); + KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( d->m_regexpDialog ); assert( iface ); iface->setRegExp( pattern() ); @@ -508,7 +508,7 @@ void KFindDialog::showPlaceholders() if (!m_placeholders) { m_placeholders = new TQPopupMenu(this); - connect( m_placeholders, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPlaceholdersAboutToShow()) ); + connect( m_placeholders, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPlaceholdersAboutToShow()) ); } // Insert the selection into the edit control. diff --git a/tdeutils/kfinddialog.h b/tdeutils/kfinddialog.h index 687939e05..35710d72d 100644 --- a/tdeutils/kfinddialog.h +++ b/tdeutils/kfinddialog.h @@ -62,7 +62,7 @@ class TQCheckBox; * else * { * m_findDia = new KFindDialog(false,...); - * connect( m_findDia, TQT_SIGNAL(okClicked()), this, TQT_SLOT(findTextNext()) ); + * connect( m_findDia, TQ_SIGNAL(okClicked()), this, TQ_SLOT(findTextNext()) ); * } * \endcode * Don't forget to delete and reset m_findDia when closed. @@ -74,7 +74,7 @@ class TQCheckBox; class TDEUTILS_EXPORT KFindDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp index 6afa7c8d3..af771bd8f 100644 --- a/tdeutils/kpluginselector.cpp +++ b/tdeutils/kpluginselector.cpp @@ -184,14 +184,14 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); TDEListView * listview = new TDEListView( this ); d->tooltip = new KPluginListViewToolTip( listview->viewport(), listview ); - connect( listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( pressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); listview->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); listview->setAcceptDrops( false ); listview->setFullWidth( true ); @@ -246,7 +246,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent, { //FIXME: not very verbose TQLabel * label = new TQLabel( i18n( "Error" ), parent ); - label->setAlignment( Qt::AlignCenter ); + label->setAlignment( TQt::AlignCenter ); return label; } @@ -256,7 +256,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent, moduleinfo.service()->property( "X-TDE-ParentComponents" ).toStringList() ); d->moduleParentComponents.insert( module, parentComponents ); - connect( module, TQT_SIGNAL( changed( bool ) ), TQT_SLOT( clientChanged( bool ) ) ); + connect( module, TQ_SIGNAL( changed( bool ) ), TQ_SLOT( clientChanged( bool ) ) ); return module; } @@ -264,7 +264,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch { //if we have Services for the plugin we should be able to //create KCM(s) - TQApplication::setOverrideCursor( Qt::WaitCursor ); + TQApplication::setOverrideCursor( TQt::WaitCursor ); if( plugininfo->kcmServices().size() > 1 ) { // we need a tabwidget @@ -523,7 +523,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name ) TQBoxLayout * hbox = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); hbox->setAutoAdd( true ); - TQSplitter* splitter = new TQSplitter( Qt::Horizontal, this ); + TQSplitter* splitter = new TQSplitter( TQt::Horizontal, this ); d->frame = new TQFrame( splitter, "KPluginSelector left frame" ); d->frame->setFrameStyle( TQFrame::NoFrame ); ( new TQVBoxLayout( d->frame, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); @@ -536,7 +536,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name ) TQLabel * label = new TQLabel( i18n( "(This plugin is not configurable)" ), d->widgetstack ); ( new TQVBoxLayout( label, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); - label->setAlignment( Qt::AlignCenter ); + label->setAlignment( TQt::AlignCenter ); label->setMinimumSize( 200, 200 ); d->widgetstack->addWidget( label, 1 ); @@ -564,8 +564,8 @@ void KPluginSelector::checkNeedForTabWidget() "KPluginSelector TabWidget" ); w->reparent( d->tabwidget, TQPoint( 0, 0 ) ); d->tabwidget->addTab( w, w->catName() ); - connect( d->tabwidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), w, - TQT_SLOT( tabWidgetChanged( TQWidget * ) ) ); + connect( d->tabwidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), w, + TQ_SLOT( tabWidgetChanged( TQWidget * ) ) ); } } } @@ -605,16 +605,16 @@ void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugin w = new KPluginSelectionWidget( plugininfos, this, d->tabwidget, catname, category, cfgGroup ); d->tabwidget->addTab( w, catname ); - connect( d->tabwidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), w, - TQT_SLOT( tabWidgetChanged( TQWidget * ) ) ); + connect( d->tabwidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), w, + TQ_SLOT( tabWidgetChanged( TQWidget * ) ) ); } else w = new KPluginSelectionWidget( plugininfos, this, d->frame, catname, category, cfgGroup ); w->setMinimumSize( 200, 200 ); - connect( w, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); - connect( w, TQT_SIGNAL( configCommitted( const TQCString & ) ), this, - TQT_SIGNAL( configCommitted( const TQCString & ) ) ); + connect( w, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); + connect( w, TQ_SIGNAL( configCommitted( const TQCString & ) ), this, + TQ_SIGNAL( configCommitted( const TQCString & ) ) ); d->pswidgets += w; } @@ -696,7 +696,7 @@ void KPluginSelector::defaults() // tabwidget - defaults() will be called for all of them) TQWidget * pluginconfig = d->widgetstack->visibleWidget(); - TDECModuleProxy * kcm = ::tqqt_cast<TDECModuleProxy*>(pluginconfig); + TDECModuleProxy * kcm = ::tqt_cast<TDECModuleProxy*>(pluginconfig); if( kcm ) { kdDebug( 702 ) << "call TDECModule::defaults() for the plugins KCM" diff --git a/tdeutils/kpluginselector.h b/tdeutils/kpluginselector.h index 111abfe0d..12d484d0e 100644 --- a/tdeutils/kpluginselector.h +++ b/tdeutils/kpluginselector.h @@ -61,7 +61,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget { friend class KPluginSelectionWidget; - Q_OBJECT + TQ_OBJECT public: /** * Create a new KPluginSelector. diff --git a/tdeutils/kpluginselector_p.h b/tdeutils/kpluginselector_p.h index 79a39ca94..1983a6468 100644 --- a/tdeutils/kpluginselector_p.h +++ b/tdeutils/kpluginselector_p.h @@ -41,7 +41,7 @@ class TDECModuleInfo; */ class KPluginSelectionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Create a new Plugin Selector widget. diff --git a/tdeutils/kreplace.cpp b/tdeutils/kreplace.cpp index 98e3ce93c..9540d2d7a 100644 --- a/tdeutils/kreplace.cpp +++ b/tdeutils/kreplace.cpp @@ -91,10 +91,10 @@ KReplaceNextDialog* KReplace::dialog() if ( !m_dialog ) { m_dialog = new KReplaceNextDialog( parentWidget() ); - connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotReplaceAll() ) ); - connect( m_dialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotSkip() ) ); - connect( m_dialog, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotReplace() ) ); - connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); + connect( m_dialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotReplaceAll() ) ); + connect( m_dialog, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotSkip() ) ); + connect( m_dialog, TQ_SIGNAL( user3Clicked() ), this, TQ_SLOT( slotReplace() ) ); + connect( m_dialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) ); } return static_cast<KReplaceNextDialog *>(m_dialog); } diff --git a/tdeutils/kreplace.h b/tdeutils/kreplace.h index e30e20b44..f14887e25 100644 --- a/tdeutils/kreplace.h +++ b/tdeutils/kreplace.h @@ -50,14 +50,14 @@ class KReplaceNextDialog; * * // Connect signals to code which handles highlighting * // of found text, and on-the-fly replacement. - * connect( m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - * this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + * connect( m_replace, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + * this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); * // Connect findNext signal - called when pressing the button in the dialog - * connect( m_replace, TQT_SIGNAL( findNext() ), - * this, TQT_SLOT( slotReplaceNext() ) ); + * connect( m_replace, TQ_SIGNAL( findNext() ), + * this, TQ_SLOT( slotReplaceNext() ) ); * // Connect replace signal - called when doing a replacement - * connect( m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ), - * this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) ); + * connect( m_replace, TQ_SIGNAL( replace(const TQString &, int, int, int) ), + * this, TQ_SLOT( slotReplace(const TQString &, int, int, int) ) ); * \endcode * Then initialize the variables determining the "current position" * (to the cursor, if the option FromCursor is set, @@ -97,7 +97,7 @@ class KReplaceNextDialog; class TDEUTILS_EXPORT KReplace : public KFind { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeutils/kreplacedialog.h b/tdeutils/kreplacedialog.h index 573a059f2..9e787730e 100644 --- a/tdeutils/kreplacedialog.h +++ b/tdeutils/kreplacedialog.h @@ -59,7 +59,7 @@ class TQRect; class TDEUTILS_EXPORT KReplaceDialog: public KFindDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeutils/ksettings/README.dox b/tdeutils/ksettings/README.dox index 40d54ee3d..83a71767e 100644 --- a/tdeutils/ksettings/README.dox +++ b/tdeutils/ksettings/README.dox @@ -15,7 +15,7 @@ the following: create the 'Configure MyApp' StdAction like this: \code -KStdAction::preferences( this, SLOT( showConfigDialog() ), actionCollection ); +KStdAction::preferences( this, TQ_SLOT( showConfigDialog() ), actionCollection ); \endcode and the slot looks like this: @@ -35,7 +35,7 @@ KSettings::Dialog: m_dlg = new KSettings::Dialog( QStringList::split( ';', "component1;component2" ) ); \endcode -The KSettings::Dialog object will be destructed automatically by the QObject +The KSettings::Dialog object will be destructed automatically by the TQObject mechanisms. @@ -47,9 +47,9 @@ Every page is a KCM. This is what you need for creating a page: \code class MyAppConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: - MyAppConfig( QWidget *parent, const char *name = 0, const QStringList &args = + MyAppConfig( TQWidget *parent, const char *name = 0, const QStringList &args = QStringList() ); ~MyAppConfig(); @@ -62,11 +62,11 @@ public: and in the cpp file: \code -typedef KGenericFactory<MyAppConfig, QWidget> MyAppConfigFactory; +typedef KGenericFactory<MyAppConfig, TQWidget> MyAppConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_myappconfig, MyAppConfigFactory( "kcm_myappconfig" ) ); -MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args ) +MyAppConfig::MyAppConfig( TQWidget *parent, const char *, const QStringList &args ) : TDECModule( MyAppConfigFactory::instance(), parent, args ) { // create the pages GUI @@ -191,10 +191,10 @@ for the first. To create a plugin page you need the following code: \code -typedef KGenericFactory<MyAppPluginConfig, QWidget> MyAppPluginConfigFactory; +typedef KGenericFactory<MyAppPluginConfig, TQWidget> MyAppPluginConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_myapppluginconfig, MyAppPluginConfigFactory( "kcm_myapppluginconfig" ) ); -MyAppPluginConfig( QWidget * parent, const char *, const QStringList & args ) +MyAppPluginConfig( TQWidget * parent, const char *, const QStringList & args ) : PluginPage( MyAppPluginConfigFactory::instance(), parent, args ) { pluginSelector()->addPlugins( ... ); diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp index ad3fa81cc..164ea19a5 100644 --- a/tdeutils/ksettings/componentsdialog.cpp +++ b/tdeutils/ksettings/componentsdialog.cpp @@ -71,14 +71,14 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name ) d->listview->setSelectionModeExt( TDEListView::Single ); d->listview->setAllColumnsShowFocus( true ); - connect( d->listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( pressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); } ComponentsDialog::~ComponentsDialog() diff --git a/tdeutils/ksettings/componentsdialog.h b/tdeutils/ksettings/componentsdialog.h index 49e5a26e9..ca6d029a9 100644 --- a/tdeutils/ksettings/componentsdialog.h +++ b/tdeutils/ksettings/componentsdialog.h @@ -39,7 +39,7 @@ namespace KSettings */ class TDEUTILS_EXPORT ComponentsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** Create Dialog. diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp index 83af48fcb..609d8cb16 100644 --- a/tdeutils/ksettings/dialog.cpp +++ b/tdeutils/ksettings/dialog.cpp @@ -588,14 +588,14 @@ void Dialog::createDialogFromServices() if( ! d->staticlistview ) d->dlg->addButtonBelowList( i18n( "Select Components..." ), this, - TQT_SLOT( configureTree() ) ); + TQ_SLOT( configureTree() ) ); - connect( d->dlg, TQT_SIGNAL( okClicked() ), Dispatcher::self(), - TQT_SLOT( syncConfiguration() ) ); - connect( d->dlg, TQT_SIGNAL( applyClicked() ), Dispatcher::self(), - TQT_SLOT( syncConfiguration() ) ); - connect( d->dlg, TQT_SIGNAL( configCommitted( const TQCString & ) ), - Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) ); + connect( d->dlg, TQ_SIGNAL( okClicked() ), Dispatcher::self(), + TQ_SLOT( syncConfiguration() ) ); + connect( d->dlg, TQ_SIGNAL( applyClicked() ), Dispatcher::self(), + TQ_SLOT( syncConfiguration() ) ); + connect( d->dlg, TQ_SIGNAL( configCommitted( const TQCString & ) ), + Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) ); d->pagetree.addToDialog( d->dlg ); @@ -609,13 +609,13 @@ void Dialog::configureTree() ComponentsDialog * subdlg = new ComponentsDialog( d->dlg ); subdlg->setPluginInfos( d->plugininfomap ); subdlg->show(); - connect( subdlg, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( updateTreeList() ) ); - connect( subdlg, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( updateTreeList() ) ); - connect( subdlg, TQT_SIGNAL( okClicked() ), this, - TQT_SIGNAL( pluginSelectionChanged() ) ); - connect( subdlg, TQT_SIGNAL( applyClicked() ), this, - TQT_SIGNAL( pluginSelectionChanged() ) ); - connect( subdlg, TQT_SIGNAL( finished() ), subdlg, TQT_SLOT( delayedDestruct() ) ); + connect( subdlg, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( updateTreeList() ) ); + connect( subdlg, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( updateTreeList() ) ); + connect( subdlg, TQ_SIGNAL( okClicked() ), this, + TQ_SIGNAL( pluginSelectionChanged() ) ); + connect( subdlg, TQ_SIGNAL( applyClicked() ), this, + TQ_SIGNAL( pluginSelectionChanged() ) ); + connect( subdlg, TQ_SIGNAL( finished() ), subdlg, TQ_SLOT( delayedDestruct() ) ); } void Dialog::updateTreeList() diff --git a/tdeutils/ksettings/dialog.h b/tdeutils/ksettings/dialog.h index f42558b26..619c05749 100644 --- a/tdeutils/ksettings/dialog.h +++ b/tdeutils/ksettings/dialog.h @@ -59,7 +59,7 @@ namespace KSettings * \endcode * and the action for the config dialog is connected to the show slot: * \code - * KStdAction::preferences( m_cfgdlg, TQT_SLOT( show() ), actionCollection() ); + * KStdAction::preferences( m_cfgdlg, TQ_SLOT( show() ), actionCollection() ); * \endcode * * If you need to be informed when the config was changed and applied in the @@ -73,7 +73,7 @@ namespace KSettings class TDEUTILS_EXPORT Dialog : public TQObject { friend class PageNode; - Q_OBJECT + TQ_OBJECT public: /** * Tells the dialog whether the entries in the listview are all static diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp index 6d87e4cde..5cd5a4208 100644 --- a/tdeutils/ksettings/dispatcher.cpp +++ b/tdeutils/ksettings/dispatcher.cpp @@ -80,7 +80,7 @@ void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, cons sig->connect( recv, slot ); ++m_instanceInfo[ instanceName ].count; - connect( recv, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( unregisterInstance( TQObject * ) ) ); + connect( recv, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( unregisterInstance( TQObject * ) ) ); } TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) diff --git a/tdeutils/ksettings/dispatcher.h b/tdeutils/ksettings/dispatcher.h index ec5a540b1..2cb0cdc2a 100644 --- a/tdeutils/ksettings/dispatcher.h +++ b/tdeutils/ksettings/dispatcher.h @@ -42,7 +42,7 @@ namespace KSettings * into the TDEConfigureDialog you need a way to get notified. This is what you * do: * \code - * Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( loadSettings() ) ); + * Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( loadSettings() ) ); * \endcode * * @author Matthias Kretz <kretz@kde.org> @@ -52,7 +52,7 @@ class TDEUTILS_EXPORT Dispatcher : public TQObject { friend class KStaticDeleter<Dispatcher>; - Q_OBJECT + TQ_OBJECT public: /** * Get a reference the the Dispatcher object. @@ -69,7 +69,7 @@ class TDEUTILS_EXPORT Dispatcher : public TQObject * * @param instance The TDEInstance object * @param recv The object that should receive the signal - * @param slot The slot to be called: TQT_SLOT( slotName() ) + * @param slot The slot to be called: TQ_SLOT( slotName() ) */ void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot ); diff --git a/tdeutils/ksettings/pluginpage.cpp b/tdeutils/ksettings/pluginpage.cpp index ddb58fb03..39af821e7 100644 --- a/tdeutils/ksettings/pluginpage.cpp +++ b/tdeutils/ksettings/pluginpage.cpp @@ -43,7 +43,7 @@ class PluginPage::PluginPagePrivate { ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); d->selwid = new KPluginSelector( this ); - connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); + connect( d->selwid, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); } PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args ) @@ -52,9 +52,9 @@ class PluginPage::PluginPagePrivate { ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); d->selwid = new KPluginSelector( this ); - connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); - connect( d->selwid, TQT_SIGNAL( configCommitted( const TQCString & ) ), - Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) ); + connect( d->selwid, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); + connect( d->selwid, TQ_SIGNAL( configCommitted( const TQCString & ) ), + Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) ); } PluginPage::~PluginPage() diff --git a/tdeutils/ksettings/pluginpage.h b/tdeutils/ksettings/pluginpage.h index e9a23fcd8..f3dc1c946 100644 --- a/tdeutils/ksettings/pluginpage.h +++ b/tdeutils/ksettings/pluginpage.h @@ -72,7 +72,7 @@ namespace KSettings */ class TDEUTILS_EXPORT PluginPage : public TDECModule { - Q_OBJECT + TQ_OBJECT public: /** * Standart TDECModule constructor. Automatically creates the the diff --git a/tdeutils/tdecmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp index 2df7a0421..7a0337615 100644 --- a/tdeutils/tdecmodulecontainer.cpp +++ b/tdeutils/tdecmodulecontainer.cpp @@ -91,7 +91,7 @@ void TDECModuleContainer::init() d->topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "topLayout" ); d->tabWidget = new TQTabWidget(this, "tabWidget"); d->tabWidget->setMargin(KDialog::marginHint()); - connect( d->tabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), TQT_SLOT( tabSwitched( TQWidget* ) )); + connect( d->tabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), TQ_SLOT( tabSwitched( TQWidget* ) )); d->topLayout->addWidget( d->tabWidget ); if ( !d->modules.isEmpty() ) @@ -152,7 +152,7 @@ void TDECModuleContainer::addModule( const TQString& module ) d->tabWidget->setTabToolTip( proxy, proxy->moduleInfo().comment() ); - connect( proxy, TQT_SIGNAL(changed(TDECModuleProxy *)), TQT_SLOT(moduleChanged(TDECModuleProxy *))); + connect( proxy, TQ_SIGNAL(changed(TDECModuleProxy *)), TQ_SLOT(moduleChanged(TDECModuleProxy *))); /* Collect our buttons - we go for the common deliminator */ d->buttons = d->buttons | proxy->realModule()->buttons(); @@ -178,10 +178,10 @@ void TDECModuleContainer::tabSwitched( TQWidget * module ) if ( mod->moduleInfo().needsRootPrivileges() && !mod->rootMode() ) { d->btnRootMode->setEnabled( true ); - connect( d->btnRootMode, TQT_SIGNAL( clicked() ), - TQT_SLOT( runAsRoot() )); - connect( mod, TQT_SIGNAL( childClosed() ), - TQT_SLOT ( rootExited() )); + connect( d->btnRootMode, TQ_SIGNAL( clicked() ), + TQ_SLOT( runAsRoot() )); + connect( mod, TQ_SIGNAL( childClosed() ), + TQ_SLOT ( rootExited() )); } else { d->btnRootMode->setEnabled( false ); @@ -205,7 +205,7 @@ void TDECModuleContainer::runAsRoot() void TDECModuleContainer::rootExited() { - connect( d->btnRootMode, TQT_SIGNAL( clicked() ), TQT_SLOT( runAsRoot() )); + connect( d->btnRootMode, TQ_SIGNAL( clicked() ), TQ_SLOT( runAsRoot() )); d->btnRootMode->setEnabled( true ); } diff --git a/tdeutils/tdecmodulecontainer.h b/tdeutils/tdecmodulecontainer.h index 31961ab7f..4cfb2ca03 100644 --- a/tdeutils/tdecmodulecontainer.h +++ b/tdeutils/tdecmodulecontainer.h @@ -52,7 +52,7 @@ class TDECModuleProxy; */ class TDEUTILS_EXPORT TDECModuleContainer : public TDECModule { - Q_OBJECT + TQ_OBJECT public: /** * Creates a TDECModuleContainer with tabs, each one containing one of the diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp index 174226ed2..907060ec7 100644 --- a/tdeutils/tdecmoduleloader.cpp +++ b/tdeutils/tdecmoduleloader.cpp @@ -72,7 +72,7 @@ TDECModule* TDECModuleLoader::load(const TDECModuleInfo &mod, const TQString &li KLibFactory *factory = lib->factory(); if ( factory ) { - TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args ); + TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, parent, name ? name : mod.handle().latin1(), args ); if (module) return module; } diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp index 487280e39..b79e774cd 100644 --- a/tdeutils/tdecmoduleproxy.cpp +++ b/tdeutils/tdecmoduleproxy.cpp @@ -155,7 +155,7 @@ TDECModule * TDECModuleProxy::realModule() const if( d->rootMode ) return 0; - TQApplication::setOverrideCursor( Qt::WaitCursor ); + TQApplication::setOverrideCursor( TQt::WaitCursor ); TDECModuleProxy * that = const_cast<TDECModuleProxy*>( this ); @@ -185,12 +185,12 @@ TDECModule * TDECModuleProxy::realModule() const d->kcm = TDECModuleLoader::loadModule( moduleInfo(), TDECModuleLoader::Inline, d->withFallback, that, name(), d->args ); - connect( d->kcm, TQT_SIGNAL( changed( bool ) ), - TQT_SLOT(moduleChanged(bool)) ); - connect( d->kcm, TQT_SIGNAL( destroyed() ), - TQT_SLOT( moduleDestroyed() ) ); - connect( d->kcm, TQT_SIGNAL(quickHelpChanged()), - TQT_SIGNAL(quickHelpChanged())); + connect( d->kcm, TQ_SIGNAL( changed( bool ) ), + TQ_SLOT(moduleChanged(bool)) ); + connect( d->kcm, TQ_SIGNAL( destroyed() ), + TQ_SLOT( moduleDestroyed() ) ); + connect( d->kcm, TQ_SIGNAL(quickHelpChanged()), + TQ_SIGNAL(quickHelpChanged())); TQWhatsThis::add( that, d->kcm->quickHelp() ); d->topLayout->addWidget( d->kcm ); @@ -234,8 +234,8 @@ TDECModule * TDECModuleProxy::realModule() const d->dcopClient->attach(); d->dcopClient->setNotifications( true ); - connect( d->dcopClient, TQT_SIGNAL( applicationRemoved( const TQCString& )), - TQT_SLOT( applicationRemoved( const TQCString& ))); + connect( d->dcopClient, TQ_SIGNAL( applicationRemoved( const TQCString& )), + TQ_SLOT( applicationRemoved( const TQCString& ))); /* Figure out the name of where the module is already loaded */ TQByteArray replyData, data; @@ -301,7 +301,7 @@ void TDECModuleProxy::runAsRoot() if ( !moduleInfo().needsRootPrivileges() ) return; - TQApplication::setOverrideCursor( Qt::WaitCursor ); + TQApplication::setOverrideCursor( TQt::WaitCursor ); delete d->rootProcess; delete d->embedWidget; @@ -367,7 +367,7 @@ void TDECModuleProxy::runAsRoot() *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell")) .arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language()); - connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited())); + connect(d->rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(rootExited())); if ( !d->rootProcess->start( TDEProcess::NotifyOnExit )) { diff --git a/tdeutils/tdecmoduleproxy.h b/tdeutils/tdecmoduleproxy.h index 11bbca987..1aa337a23 100644 --- a/tdeutils/tdecmoduleproxy.h +++ b/tdeutils/tdecmoduleproxy.h @@ -67,7 +67,7 @@ class TDEProcess; */ class TDEUTILS_EXPORT TDECModuleProxy : public TQWidget { -Q_OBJECT +TQ_OBJECT friend class TDECModuleProxyRootCommunicatorImpl; diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp index 5b1bcc339..6e6f1b286 100644 --- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp +++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp @@ -35,10 +35,10 @@ TDECModuleProxyIfaceImpl::TDECModuleProxyIfaceImpl( const TQCString& name, : DCOPObject( name ), TQObject( 0, name ), p( const_cast<TDECModuleProxy *>( client )) { - connect( p, TQT_SIGNAL( changed(bool)), - TQT_SLOT( changedRelay(bool))); - connect( p, TQT_SIGNAL( quickHelpChanged()), - TQT_SLOT( quickHelpRelay())); + connect( p, TQ_SIGNAL( changed(bool)), + TQ_SLOT( changedRelay(bool))); + connect( p, TQ_SIGNAL( quickHelpChanged()), + TQ_SLOT( quickHelpRelay())); } void TDECModuleProxyIfaceImpl::save() diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.h b/tdeutils/tdecmoduleproxyIfaceImpl.h index a8a80f23b..ca77a966e 100644 --- a/tdeutils/tdecmoduleproxyIfaceImpl.h +++ b/tdeutils/tdecmoduleproxyIfaceImpl.h @@ -33,7 +33,7 @@ class TDECModuleProxyIfaceImpl: public TQObject, virtual public TDECModuleProxyI * Update: This is probably not possible, since we don't want the DCOPObject when * we're running in root mode. */ - Q_OBJECT + TQ_OBJECT public: @@ -79,7 +79,7 @@ private: class TDECModuleProxyRootCommunicatorImpl: public TQObject, virtual public TDECModuleProxyRootDispatcher { - Q_OBJECT + TQ_OBJECT public: TDECModuleProxyRootCommunicatorImpl( const TQCString& name, TDECModuleProxy* const client ); diff --git a/tdeutils/tdemultitabbar.cpp b/tdeutils/tdemultitabbar.cpp index b2246e104..6ffb8e00a 100644 --- a/tdeutils/tdemultitabbar.cpp +++ b/tdeutils/tdemultitabbar.cpp @@ -74,8 +74,8 @@ KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMult addChild(box); setFrameStyle(NoFrame); viewport()->setBackgroundMode(TQt::PaletteBackground); -/* box->setPaletteBackgroundColor(Qt::red); - setPaletteBackgroundColor(Qt::green);*/ +/* box->setPaletteBackgroundColor(TQt::red); + setPaletteBackgroundColor(TQt::green);*/ } void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) @@ -394,7 +394,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, @@ -409,7 +409,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::~KMultiTabBarButton() { @@ -445,13 +445,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) void KMultiTabBarButton::hideEvent( TQHideEvent* he) { TQPushButton::hideEvent(he); - KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(parentWidget()); + KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } void KMultiTabBarButton::showEvent( TQShowEvent* he) { TQPushButton::showEvent(he); - KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(parentWidget()); + KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } @@ -491,7 +491,7 @@ TQSize KMultiTabBarButton::sizeHint() const h = TQMAX(h, sz.height()); } - return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/tdeutils/tdemultitabbar.h b/tdeutils/tdemultitabbar.h index eca4695ff..3d7785842 100644 --- a/tdeutils/tdemultitabbar.h +++ b/tdeutils/tdemultitabbar.h @@ -55,7 +55,7 @@ class KMultiTabBarInternal; */ class TDEUTILS_EXPORT KMultiTabBar: public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * The tab bar's orientation. Also constraints the bar's position. @@ -204,7 +204,7 @@ private: */ class TDEUTILS_EXPORT KMultiTabBarButton: public TQPushButton { - Q_OBJECT + TQ_OBJECT public: /** @internal */ KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup, @@ -267,7 +267,7 @@ protected slots: */ class TDEUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton { - Q_OBJECT + TQ_OBJECT public: /** @internal */ KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent, diff --git a/tdeutils/tdemultitabbar_p.h b/tdeutils/tdemultitabbar_p.h index 353a33260..61f8e82c7 100644 --- a/tdeutils/tdemultitabbar_p.h +++ b/tdeutils/tdemultitabbar_p.h @@ -29,7 +29,7 @@ class KMultiTabBarInternal: public TQScrollView { - Q_OBJECT + TQ_OBJECT public: KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm); int appendTab(const TQPixmap &,int=-1,const TQString& =TQString::null); diff --git a/tdeutils/tests/kfindtest.cpp b/tdeutils/tests/kfindtest.cpp index c913e5ec6..6a724d6a3 100644 --- a/tdeutils/tests/kfindtest.cpp +++ b/tdeutils/tests/kfindtest.cpp @@ -59,10 +59,10 @@ void KFindTest::find(const TQString &pattern, long options) delete m_find; m_find = new KFind(pattern, options, 0); - connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)), - TQT_SLOT(slotHighlight(const TQString &, int, int))); - connect(m_find, TQT_SIGNAL(highlight(int, int, int)), - TQT_SLOT(slotHighlight(int, int, int))); + connect(m_find, TQ_SIGNAL(highlight(const TQString &, int, int)), + TQ_SLOT(slotHighlight(const TQString &, int, int))); + connect(m_find, TQ_SIGNAL(highlight(int, int, int)), + TQ_SLOT(slotHighlight(int, int, int))); m_line = 0; KFind::Result result = KFind::NoMatch; diff --git a/tdeutils/tests/kfindtest.h b/tdeutils/tests/kfindtest.h index 847d9579c..09526c1b0 100644 --- a/tdeutils/tests/kfindtest.h +++ b/tdeutils/tests/kfindtest.h @@ -27,7 +27,7 @@ class KFind; class KFindTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: KFindTest(const TQStringList &text) : diff --git a/tdeutils/tests/kreplacetest.cpp b/tdeutils/tests/kreplacetest.cpp index 19ead8e77..df21d0c81 100644 --- a/tdeutils/tests/kreplacetest.cpp +++ b/tdeutils/tests/kreplacetest.cpp @@ -38,14 +38,14 @@ void KReplaceTest::replace( const TQString &pattern, const TQString &replacement // Connect highlight signal to code which handles highlighting // of found text. - connect(m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + connect(m_replace, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); // Connect findNext signal - called when pressing the button in the dialog - connect(m_replace, TQT_SIGNAL( findNext() ), - this, TQT_SLOT( slotReplaceNext() ) ); + connect(m_replace, TQ_SIGNAL( findNext() ), + this, TQ_SLOT( slotReplaceNext() ) ); // Connect replace signal - called when doing a replacement - connect(m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ), - this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) ); + connect(m_replace, TQ_SIGNAL( replace(const TQString &, int, int, int) ), + this, TQ_SLOT( slotReplace(const TQString &, int, int, int) ) ); // Go to initial position if ( (options & KReplaceDialog::FromCursor) == 0 ) diff --git a/tdeutils/tests/kreplacetest.h b/tdeutils/tests/kreplacetest.h index b8fb8120b..71aa8cebb 100644 --- a/tdeutils/tests/kreplacetest.h +++ b/tdeutils/tests/kreplacetest.h @@ -27,7 +27,7 @@ class KReplace; class KReplaceTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: KReplaceTest( const TQStringList& text, int button ) : TQObject( 0L ), m_text( text ), m_replace( 0 ), m_button( button ) {} diff --git a/tdewallet/client/tdewallet.cpp b/tdewallet/client/tdewallet.cpp index c730f10d4..9785472ed 100644 --- a/tdewallet/client/tdewallet.cpp +++ b/tdewallet/client/tdewallet.cpp @@ -79,9 +79,9 @@ Wallet::Wallet(int handle, const TQString& name) _dcopRef->dcopClient()->setNotifications(true); connect(_dcopRef->dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(slotAppUnregistered(const TQCString&))); + TQ_SLOT(slotAppUnregistered(const TQCString&))); connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "walletClosed(int)", "slotWalletClosed(int)", false); connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "folderListUpdated(TQString)", "slotFolderListUpdated(TQString)", false); @@ -179,7 +179,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) { } // avoid deadlock if the app has some popup open (#65978/#71048) - while( TQWidget* widget = TQT_TQWIDGET(tqApp->activePopupWidget())) + while( TQWidget* widget = tqApp->activePopupWidget()) widget->close(); bool isPath = ot == Path; diff --git a/tdewallet/client/tdewallet.h b/tdewallet/client/tdewallet.h index 613231908..d1dddba20 100644 --- a/tdewallet/client/tdewallet.h +++ b/tdewallet/client/tdewallet.h @@ -24,10 +24,6 @@ #include <tqglobal.h> -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX #include <tqstring.h> @@ -52,7 +48,7 @@ namespace TDEWallet { */ class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT protected: /** * Construct a TDEWallet object. diff --git a/tdewallet/tests/CMakeLists.txt b/tdewallet/tests/CMakeLists.txt index 9c64ac9af..5d75f8d70 100644 --- a/tdewallet/tests/CMakeLists.txt +++ b/tdewallet/tests/CMakeLists.txt @@ -26,7 +26,6 @@ link_directories( add_definitions ( -DKDE_NO_COMPAT - -DTQT_NO_COMPAT -DTQT_NO_ASCII_CAST ) diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am index 085c0630e..0f8ad9946 100644 --- a/tdewallet/tests/Makefile.am +++ b/tdewallet/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes) +AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes) METASOURCES = AUTO check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp index 57571bebb..54e618b70 100644 --- a/tdewallet/tests/tdewalletasync.cpp +++ b/tdewallet/tests/tdewalletasync.cpp @@ -22,11 +22,11 @@ void openWallet() TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous ); WalletReceiver r; - r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) ); + r.connect( wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( walletOpened(bool) ) ); _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) ); int ret = tqApp->exec(); if ( ret == 0 ) diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp index cc2819e0b..bdfc73f8f 100644 --- a/tdewallet/tests/tdewalletboth.cpp +++ b/tdewallet/tests/tdewalletboth.cpp @@ -22,7 +22,7 @@ void openWallet() TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous ); WalletReceiver r; - r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) ); + r.connect( wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( walletOpened(bool) ) ); _out << "About to ask for wallet sync" << endl; @@ -31,7 +31,7 @@ void openWallet() _out << "Got sync wallet: " << (wallet != 0) << endl; _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) ); int ret = tqApp->exec(); diff --git a/tdewallet/tests/tdewallettest.h b/tdewallet/tests/tdewallettest.h index a3ce51e48..426412864 100644 --- a/tdewallet/tests/tdewallettest.h +++ b/tdewallet/tests/tdewallettest.h @@ -7,7 +7,7 @@ namespace TDEWallet { class Wallet; } class WalletReceiver : public TQObject { - Q_OBJECT + TQ_OBJECT public slots: void walletOpened( bool ); }; diff --git a/tdewidgets/README b/tdewidgets/README index d0ce8fcab..72ab6ee46 100644 --- a/tdewidgets/README +++ b/tdewidgets/README @@ -11,7 +11,7 @@ $TDEDIR/lib/trinity/plugins . With the KDE build system nothing special (i.e. editing the plugin path) is needed, as uic will automatically be called with -L <path to the tdewidgets plugin> . -This plugin uses the QWidget plugin API of Qt >= 3.0 +This plugin uses the TQWidget plugin API of Qt >= 3.0 Don't expect it to work with any other versions of Qt. diff --git a/tdewidgets/kde.widgets b/tdewidgets/kde.widgets index 787b6f336..28e31c78a 100644 --- a/tdewidgets/kde.widgets +++ b/tdewidgets/kde.widgets @@ -281,7 +281,7 @@ ConstructorArgs=(TDEABC::LdapConfigWidget::W_ALL, parent, name) IncludeFile=karrowbutton.h ToolTip=Draws a button which shows an arrow pointing into a certain direction. Group=Buttons (KDE) -ConstructorArgs=(parent,Qt::UpArrow,name) +ConstructorArgs=(parent,TQt::UpArrow,name) [KAnimWidget] IncludeFile=kanimwidget.h diff --git a/tdewidgets/tests/test.widgets b/tdewidgets/tests/test.widgets index e428d0711..e8acdb945 100644 --- a/tdewidgets/tests/test.widgets +++ b/tdewidgets/tests/test.widgets @@ -173,7 +173,7 @@ Group=Input (KDE) [KURLLabel] ToolTip=URL Label (KDE) -ConstructorArgs=("KURLLabel", QString::null, parent, name) +ConstructorArgs=("KURLLabel", TQString::null, parent, name) Group=Display (KDE) [KURLComboRequester] diff --git a/translations/desktop_files/all_languages.desktop/ru.po b/translations/desktop_files/all_languages.desktop/ru.po index bbb091d71..5dfe5b403 100644 --- a/translations/desktop_files/all_languages.desktop/ru.po +++ b/translations/desktop_files/all_languages.desktop/ru.po @@ -1,22 +1,23 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Alexander Golubev <fatzer2@gmail.com>, 2021. +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-11-25 17:36+0100\n" -"PO-Revision-Date: 2021-01-12 18:00+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"PO-Revision-Date: 2023-12-02 20:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdelibs/all-languages/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.4\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 #: all_languages.desktop:2 @@ -501,7 +502,7 @@ msgstr "Молдавский" #. Name #: all_languages.desktop:194 msgid "Marathi" -msgstr "Марати" +msgstr "Маратхи" #. Name #: all_languages.desktop:196 @@ -581,7 +582,7 @@ msgstr "Чичева" #. Name #: all_languages.desktop:226 msgid "Occitan" -msgstr "Французский (диалект Occitan)" +msgstr "Окситанский" #. Name #: all_languages.desktop:228 @@ -701,12 +702,12 @@ msgstr "Словенский" #. Name #: all_languages.desktop:274 msgid "Samoan" -msgstr "Самоа" +msgstr "Самоанский" #. Name #: all_languages.desktop:276 msgid "Shona" -msgstr "Схона" +msgstr "Шона" #. Name #: all_languages.desktop:278 @@ -811,7 +812,7 @@ msgstr "Татарский" #. Name #: all_languages.desktop:318 msgid "Twi" -msgstr "Тви" +msgstr "Чви" #. Name #: all_languages.desktop:320 @@ -866,12 +867,12 @@ msgstr "Валлонский" #. Name #: all_languages.desktop:340 msgid "Wolof" -msgstr "Уолоф" +msgstr "Волоф" #. Name #: all_languages.desktop:342 msgid "Xhosa" -msgstr "Кшоса" +msgstr "Коса" #. Name #: all_languages.desktop:344 @@ -886,7 +887,7 @@ msgstr "Йоруба" #. Name #: all_languages.desktop:348 msgid "Zhuang" -msgstr "Чжуанг" +msgstr "Чжуанский" #. Name #: all_languages.desktop:350 @@ -911,4 +912,4 @@ msgstr "Китайский (Тайвань)" #. Name #: all_languages.desktop:358 msgid "Zulu" -msgstr "Зулусский" +msgstr "Зулу" diff --git a/translations/desktop_files/knotify.desktop/ru.po b/translations/desktop_files/knotify.desktop/ru.po index 3ee975529..23365d76a 100644 --- a/translations/desktop_files/knotify.desktop/ru.po +++ b/translations/desktop_files/knotify.desktop/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-02 13: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-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdelibs/knotify-knotifydesktop/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 #: knotify.desktop:3 @@ -24,4 +26,4 @@ msgstr "Системные сообщения" #. Comment #: knotify.desktop:4 msgid "TDE Notification Daemon" -msgstr "Системные сообщения TDE" +msgstr "Демон уведомлений TDE" diff --git a/translations/desktop_files/mimetypes/af.po b/translations/desktop_files/mimetypes/af.po index 316ec3698..e8528a20c 100644 --- a/translations/desktop_files/mimetypes/af.po +++ b/translations/desktop_files/mimetypes/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Gesinkroniseerde Multimedia Integrasie Taal" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL Lêer" diff --git a/translations/desktop_files/mimetypes/ar.po b/translations/desktop_files/mimetypes/ar.po index c2e42cac4..4799e24af 100644 --- a/translations/desktop_files/mimetypes/ar.po +++ b/translations/desktop_files/mimetypes/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -147,6 +147,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/az.po b/translations/desktop_files/mimetypes/az.po index 97fdfc601..fe86b9d74 100644 --- a/translations/desktop_files/mimetypes/az.po +++ b/translations/desktop_files/mimetypes/az.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Sinxron Multimediya Birləşdirmə Dili" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/be.po b/translations/desktop_files/mimetypes/be.po index a7706a1b4..1c3e4bd0a 100644 --- a/translations/desktop_files/mimetypes/be.po +++ b/translations/desktop_files/mimetypes/be.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Сінхранізаваная мова мультымедыйнай інтэграцыі SMIL" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Файл Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/bg.po b/translations/desktop_files/mimetypes/bg.po index 65efd2745..3c323e402 100644 --- a/translations/desktop_files/mimetypes/bg.po +++ b/translations/desktop_files/mimetypes/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Синхронизиран мултимедиен език за интеграция (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Файл XUL на Мозила" diff --git a/translations/desktop_files/mimetypes/bn.po b/translations/desktop_files/mimetypes/bn.po index da74289f2..33788a15d 100644 --- a/translations/desktop_files/mimetypes/bn.po +++ b/translations/desktop_files/mimetypes/bn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "মোজিলা এক্স-ইউ-এল ফাইল" diff --git a/translations/desktop_files/mimetypes/br.po b/translations/desktop_files/mimetypes/br.po index fb9ef77c9..70a66a577 100644 --- a/translations/desktop_files/mimetypes/br.po +++ b/translations/desktop_files/mimetypes/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Areg enframmañ liesvedia goubredet" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Restr Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/bs.po b/translations/desktop_files/mimetypes/bs.po index a06226fe0..eb84716c7 100644 --- a/translations/desktop_files/mimetypes/bs.po +++ b/translations/desktop_files/mimetypes/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL datoteka" diff --git a/translations/desktop_files/mimetypes/ca.po b/translations/desktop_files/mimetypes/ca.po index 5d5bed57c..f61886571 100644 --- a/translations/desktop_files/mimetypes/ca.po +++ b/translations/desktop_files/mimetypes/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Llenguatge d'integració multimèdia sincronitzada" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Fitxer XUL de Mozilla" diff --git a/translations/desktop_files/mimetypes/cs.po b/translations/desktop_files/mimetypes/cs.po index 9f6978fc9..d54838131 100644 --- a/translations/desktop_files/mimetypes/cs.po +++ b/translations/desktop_files/mimetypes/cs.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Slávek Banko <slavek.banko@axis.cz>, 2020, 2022. +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" -"PO-Revision-Date: 2022-04-19 23:20+0000\n" +"POT-Creation-Date: 2023-06-30 18:14+0000\n" +"PO-Revision-Date: 2023-07-02 17:55+0000\n" "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" "tdelibs/mimetypes/cs/>\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 4.11.2\n" +"X-Generator: Weblate 4.17\n" #. Comment #: all.desktop:4 @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Jazyk pro integraci synchronizovaných multimédií" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "Soubor ebuild pro Gentoo" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Soubor Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/csb.po b/translations/desktop_files/mimetypes/csb.po index 5f4808c9b..608198b70 100644 --- a/translations/desktop_files/mimetypes/csb.po +++ b/translations/desktop_files/mimetypes/csb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Zsynchronizowóny Jãzëk Integracëji Mùltimediów" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Lopk XUL Mozilli" diff --git a/translations/desktop_files/mimetypes/cy.po b/translations/desktop_files/mimetypes/cy.po index cbe85db13..31c830fc8 100644 --- a/translations/desktop_files/mimetypes/cy.po +++ b/translations/desktop_files/mimetypes/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Iaith Integreiddio Aml-gyfryngau wedi'i Chysoni (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/da.po b/translations/desktop_files/mimetypes/da.po index bd2d7d48b..ebcbe14ed 100644 --- a/translations/desktop_files/mimetypes/da.po +++ b/translations/desktop_files/mimetypes/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synkroniseret multimedie-integrationssprog" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-fil" diff --git a/translations/desktop_files/mimetypes/de.po b/translations/desktop_files/mimetypes/de.po index b9cabc946..1caf47844 100644 --- a/translations/desktop_files/mimetypes/de.po +++ b/translations/desktop_files/mimetypes/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synchronisierte Multimedia-Integrationssprache" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-Datei" diff --git a/translations/desktop_files/mimetypes/el.po b/translations/desktop_files/mimetypes/el.po index 97255a657..76a596be0 100644 --- a/translations/desktop_files/mimetypes/el.po +++ b/translations/desktop_files/mimetypes/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Συγχρονισμένη γλώσσα ενσωμάτωσης πολυμέσων" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Αρχείο Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/en_GB.po b/translations/desktop_files/mimetypes/en_GB.po index ee4bf8b25..8443a76d0 100644 --- a/translations/desktop_files/mimetypes/en_GB.po +++ b/translations/desktop_files/mimetypes/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synchronised Multimedia Integration Language" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/eo.po b/translations/desktop_files/mimetypes/eo.po index 06e27aa24..d2a279089 100644 --- a/translations/desktop_files/mimetypes/eo.po +++ b/translations/desktop_files/mimetypes/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "SMIL" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL Dosiero" diff --git a/translations/desktop_files/mimetypes/es.po b/translations/desktop_files/mimetypes/es.po index 9bbcc6a91..2e3e45796 100644 --- a/translations/desktop_files/mimetypes/es.po +++ b/translations/desktop_files/mimetypes/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Lenguaje de integración multimedia sincronizada" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Archivo XUL de Mozilla" diff --git a/translations/desktop_files/mimetypes/et.po b/translations/desktop_files/mimetypes/et.po index a091812b9..58561ff89 100644 --- a/translations/desktop_files/mimetypes/et.po +++ b/translations/desktop_files/mimetypes/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Sünkroniseeritud Multimeedia Integreerimise Keel" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-fail" diff --git a/translations/desktop_files/mimetypes/eu.po b/translations/desktop_files/mimetypes/eu.po index 78d262ff9..1f68a8455 100644 --- a/translations/desktop_files/mimetypes/eu.po +++ b/translations/desktop_files/mimetypes/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Sinkronizatutako Multimedia integrazioaren lengoaia" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL fitxategia" diff --git a/translations/desktop_files/mimetypes/fa.po b/translations/desktop_files/mimetypes/fa.po index cace1d69d..eb8bce5fd 100644 --- a/translations/desktop_files/mimetypes/fa.po +++ b/translations/desktop_files/mimetypes/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "زبان مجتمعسازی چند رسانهای همگامشده" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "پروندۀ Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/fi.po b/translations/desktop_files/mimetypes/fi.po index 411eee07a..d63d11ca6 100644 --- a/translations/desktop_files/mimetypes/fi.po +++ b/translations/desktop_files/mimetypes/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synkronoitu multimedianintergoimiskieli" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-tiedosto" diff --git a/translations/desktop_files/mimetypes/fr.po b/translations/desktop_files/mimetypes/fr.po index a8114fd52..e292b609b 100644 --- a/translations/desktop_files/mimetypes/fr.po +++ b/translations/desktop_files/mimetypes/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Langage d'intégration multimédia synchronisée" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Fichier XUL Mozilla" diff --git a/translations/desktop_files/mimetypes/fy.po b/translations/desktop_files/mimetypes/fy.po index 428372ea0..3ffeea6e4 100644 --- a/translations/desktop_files/mimetypes/fy.po +++ b/translations/desktop_files/mimetypes/fy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synchronized Multimedia Integration Language (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL Triem" diff --git a/translations/desktop_files/mimetypes/ga.po b/translations/desktop_files/mimetypes/ga.po index 5fbf522cc..55299d0be 100644 --- a/translations/desktop_files/mimetypes/ga.po +++ b/translations/desktop_files/mimetypes/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synchronized Multimedia Integration Language (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Comhad Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/gl.po b/translations/desktop_files/mimetypes/gl.po index 7e1b54175..8bc34313b 100644 --- a/translations/desktop_files/mimetypes/gl.po +++ b/translations/desktop_files/mimetypes/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Linguaxe de Integración de Multimedia Sincronizado" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Ficheiro XUL de Mozilla" diff --git a/translations/desktop_files/mimetypes/he.po b/translations/desktop_files/mimetypes/he.po index 2a48ef605..42a6a0675 100644 --- a/translations/desktop_files/mimetypes/he.po +++ b/translations/desktop_files/mimetypes/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "שפת שילוב מולטימדיה מסונכרנת" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "קובץ XUL של מוזילה" diff --git a/translations/desktop_files/mimetypes/hi.po b/translations/desktop_files/mimetypes/hi.po index 040bc1ec9..b995a7992 100644 --- a/translations/desktop_files/mimetypes/hi.po +++ b/translations/desktop_files/mimetypes/hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "सिंक्रोनाइज्ड मल्टीमीडिया इंटीग्रेशन भाषा" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "मोज़िला एक्सयूएल फ़ाइल" diff --git a/translations/desktop_files/mimetypes/hr.po b/translations/desktop_files/mimetypes/hr.po index 777dd2425..dc9b4c716 100644 --- a/translations/desktop_files/mimetypes/hr.po +++ b/translations/desktop_files/mimetypes/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL datoteka" diff --git a/translations/desktop_files/mimetypes/hu.po b/translations/desktop_files/mimetypes/hu.po index 759bbe81e..a028cf5df 100644 --- a/translations/desktop_files/mimetypes/hu.po +++ b/translations/desktop_files/mimetypes/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Szinkronizált multimédiaintegrációs nyelv" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-fájl" diff --git a/translations/desktop_files/mimetypes/id.po b/translations/desktop_files/mimetypes/id.po index c7c70e0cc..4724ef929 100644 --- a/translations/desktop_files/mimetypes/id.po +++ b/translations/desktop_files/mimetypes/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Bahasa Integrasi Sinkronisasi Multimedia" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Berkas XUL Mozilla" diff --git a/translations/desktop_files/mimetypes/is.po b/translations/desktop_files/mimetypes/is.po index 39cfafe76..689b05ab4 100644 --- a/translations/desktop_files/mimetypes/is.po +++ b/translations/desktop_files/mimetypes/is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "SMIL-skjal (Synchronized Multimedia Integration Language)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL skrá" diff --git a/translations/desktop_files/mimetypes/it.po b/translations/desktop_files/mimetypes/it.po index 0f5b628e2..c8c1f368d 100644 --- a/translations/desktop_files/mimetypes/it.po +++ b/translations/desktop_files/mimetypes/it.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Michele Calgaro <michele.calgaro@yahoo.it>, 2021, 2022. +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" -"PO-Revision-Date: 2022-04-21 11:20+0000\n" +"POT-Creation-Date: 2023-06-30 18:14+0000\n" +"PO-Revision-Date: 2023-08-23 07:29+0000\n" "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdelibs/mimetypes/it/>\n" @@ -15,7 +15,7 @@ msgstr "" "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.11.2\n" +"X-Generator: Weblate 4.17\n" #. Comment #: all.desktop:4 @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Linguaggio d'integrazione multimediale sincronizzata" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "File ebuild di Gentoo" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "File XUL Mozilla" diff --git a/translations/desktop_files/mimetypes/ja.po b/translations/desktop_files/mimetypes/ja.po index 8658e2ee3..c20304904 100644 --- a/translations/desktop_files/mimetypes/ja.po +++ b/translations/desktop_files/mimetypes/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "同期マルチメディア統合言語" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL ファイル" diff --git a/translations/desktop_files/mimetypes/ka.po b/translations/desktop_files/mimetypes/ka.po index 09b140f17..a11507057 100644 --- a/translations/desktop_files/mimetypes/ka.po +++ b/translations/desktop_files/mimetypes/ka.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "სინქრონიზებული მულტიმედია ინტეგრირების ენა" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL ფაილი" diff --git a/translations/desktop_files/mimetypes/kk.po b/translations/desktop_files/mimetypes/kk.po index d2e3766f9..06b478b52 100644 --- a/translations/desktop_files/mimetypes/kk.po +++ b/translations/desktop_files/mimetypes/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL файлы" diff --git a/translations/desktop_files/mimetypes/km.po b/translations/desktop_files/mimetypes/km.po index 7fe82820f..2f88717d5 100644 --- a/translations/desktop_files/mimetypes/km.po +++ b/translations/desktop_files/mimetypes/km.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "ភាសាសមាហរណកម្មពហុព័ត៌មានដែលបានធ្វើសមកាលកម្ម" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "ឯកសារ Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/ko.po b/translations/desktop_files/mimetypes/ko.po index 183dd85d3..fe9f9f2af 100644 --- a/translations/desktop_files/mimetypes/ko.po +++ b/translations/desktop_files/mimetypes/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "동기화된 멀티미디어 통합 언어" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/lb.po b/translations/desktop_files/mimetypes/lb.po index 578f11ea9..e8f2ab0f3 100644 --- a/translations/desktop_files/mimetypes/lb.po +++ b/translations/desktop_files/mimetypes/lb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synchroniséiert Multimedia-Integratiounssprooch" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla-XUL-Datei" diff --git a/translations/desktop_files/mimetypes/lt.po b/translations/desktop_files/mimetypes/lt.po index ae482cd99..a07f5082d 100644 --- a/translations/desktop_files/mimetypes/lt.po +++ b/translations/desktop_files/mimetypes/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Sinchronizuota daugialypės terpės integravimo kalba" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL byla" diff --git a/translations/desktop_files/mimetypes/lv.po b/translations/desktop_files/mimetypes/lv.po index dd598639b..9ae645ea6 100644 --- a/translations/desktop_files/mimetypes/lv.po +++ b/translations/desktop_files/mimetypes/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Sinhronizēta Multimēdiju Integrācijas Valoda" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL fails" diff --git a/translations/desktop_files/mimetypes/mi.po b/translations/desktop_files/mimetypes/mi.po index d3b4bf85c..600f4f66a 100644 --- a/translations/desktop_files/mimetypes/mi.po +++ b/translations/desktop_files/mimetypes/mi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -148,6 +148,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/mimetypes.pot b/translations/desktop_files/mimetypes/mimetypes.pot index 12ee8fb01..e2dc8755d 100644 --- a/translations/desktop_files/mimetypes/mimetypes.pot +++ b/translations/desktop_files/mimetypes/mimetypes.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/mk.po b/translations/desktop_files/mimetypes/mk.po index affc7ff11..995a0928a 100644 --- a/translations/desktop_files/mimetypes/mk.po +++ b/translations/desktop_files/mimetypes/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Јазик за синхронизирано интегрирање на мултимедија" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-датотека" diff --git a/translations/desktop_files/mimetypes/mn.po b/translations/desktop_files/mimetypes/mn.po index c01bb41ac..7ec820a1d 100644 --- a/translations/desktop_files/mimetypes/mn.po +++ b/translations/desktop_files/mimetypes/mn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Синхрончилсон Multimedia-интеграци хэл" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/ms.po b/translations/desktop_files/mimetypes/ms.po index d9125db3b..60103735e 100644 --- a/translations/desktop_files/mimetypes/ms.po +++ b/translations/desktop_files/mimetypes/ms.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Bahasa Multimedia Bersepadu Diseragamkan (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Fail Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/mt.po b/translations/desktop_files/mimetypes/mt.po index 066ab6b2d..1eabd4d66 100644 --- a/translations/desktop_files/mimetypes/mt.po +++ b/translations/desktop_files/mimetypes/mt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -149,6 +149,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Lingwa Multimedia Integrata Sinkronizzata (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/nb.po b/translations/desktop_files/mimetypes/nb.po index ff648b776..50f6bb3b0 100644 --- a/translations/desktop_files/mimetypes/nb.po +++ b/translations/desktop_files/mimetypes/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synkronisert integrasjonsspråk for multimedia" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-fil" diff --git a/translations/desktop_files/mimetypes/nds.po b/translations/desktop_files/mimetypes/nds.po index b01b55f39..264f2664e 100644 --- a/translations/desktop_files/mimetypes/nds.po +++ b/translations/desktop_files/mimetypes/nds.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "XUL-Datei vun Mozilla" diff --git a/translations/desktop_files/mimetypes/ne.po b/translations/desktop_files/mimetypes/ne.po index a7fe98d0e..e9cd1fd0c 100644 --- a/translations/desktop_files/mimetypes/ne.po +++ b/translations/desktop_files/mimetypes/ne.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "समक्रमण गरिएका मल्टिमेडिया अनुकूलन भाषा" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "मोजिला XUL फाइल" diff --git a/translations/desktop_files/mimetypes/nl.po b/translations/desktop_files/mimetypes/nl.po index e651bb937..644fe4ab9 100644 --- a/translations/desktop_files/mimetypes/nl.po +++ b/translations/desktop_files/mimetypes/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synchronized Multimedia Integration Language (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-bestand" diff --git a/translations/desktop_files/mimetypes/nn.po b/translations/desktop_files/mimetypes/nn.po index f38a71cd8..db7904818 100644 --- a/translations/desktop_files/mimetypes/nn.po +++ b/translations/desktop_files/mimetypes/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-fil" diff --git a/translations/desktop_files/mimetypes/nso.po b/translations/desktop_files/mimetypes/nso.po index c4c8e3b76..ff505fab7 100644 --- a/translations/desktop_files/mimetypes/nso.po +++ b/translations/desktop_files/mimetypes/nso.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -150,6 +150,11 @@ msgstr "" "Leleme leo le Sumiswago ka nako etee la Bokagare bja Media wa Bontshintshi" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/oc.po b/translations/desktop_files/mimetypes/oc.po index e45e00586..d18b18964 100644 --- a/translations/desktop_files/mimetypes/oc.po +++ b/translations/desktop_files/mimetypes/oc.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -148,6 +148,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Linguage d'integracion multimèdia sincronizat" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/pa.po b/translations/desktop_files/mimetypes/pa.po index 60dd99666..b14337f78 100644 --- a/translations/desktop_files/mimetypes/pa.po +++ b/translations/desktop_files/mimetypes/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "ਮੌਜੀਲਾ XUL ਫਾਇਲ" diff --git a/translations/desktop_files/mimetypes/pl.po b/translations/desktop_files/mimetypes/pl.po index a3c75c488..e17318a4c 100644 --- a/translations/desktop_files/mimetypes/pl.po +++ b/translations/desktop_files/mimetypes/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+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: 2023-06-30 18:14+0000\n" +"PO-Revision-Date: 2023-07-07 15:16+0000\n" +"Last-Translator: Marek W <coronzon88@gmail.com>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdelibs/mimetypes/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.17\n" #. Comment #: all.desktop:4 @@ -145,6 +147,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Zsynchronizowany Język Integracji Multimediów" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "Plik ebuild Gentoo" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Plik XUL Mozilli" @@ -212,9 +219,8 @@ msgstr "Dokument wykresu OASIS OpenDocument" #. Comment #: application/vnd.oasis.opendocument.database.desktop:6 -#, fuzzy msgid "OASIS OpenDocument Database" -msgstr "Dokument wykresu OASIS OpenDocument" +msgstr "Baza danych OASIS OpenDocument" #. Comment #: application/vnd.oasis.opendocument.formula.desktop:6 @@ -1398,10 +1404,8 @@ msgstr "Dokument HTML" #. Comment #: text/markdown.desktop:2 -#, fuzzy -#| msgid "Karbon14 Document" msgid "Markdown document" -msgstr "Dokument Karbon14" +msgstr "Dokument Markdown" #. Comment #: text/plain.desktop:3 diff --git a/translations/desktop_files/mimetypes/pt.po b/translations/desktop_files/mimetypes/pt.po index 4da4bb212..4d9b0913b 100644 --- a/translations/desktop_files/mimetypes/pt.po +++ b/translations/desktop_files/mimetypes/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Ficheiro XUL do Mozilla" diff --git a/translations/desktop_files/mimetypes/pt_BR.po b/translations/desktop_files/mimetypes/pt_BR.po index 6c274a740..00280f02e 100644 --- a/translations/desktop_files/mimetypes/pt_BR.po +++ b/translations/desktop_files/mimetypes/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Linguagem de integração de multimídia sincronizada" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Arquivo XUL do Mozilla" diff --git a/translations/desktop_files/mimetypes/ro.po b/translations/desktop_files/mimetypes/ro.po index c260b3d5a..67bd9a2f6 100644 --- a/translations/desktop_files/mimetypes/ro.po +++ b/translations/desktop_files/mimetypes/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Limbaj de integrare multimedia sincronizat (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Fişier XUL Mozilla" diff --git a/translations/desktop_files/mimetypes/ru.po b/translations/desktop_files/mimetypes/ru.po index 952e588ad..56ee833ad 100644 --- a/translations/desktop_files/mimetypes/ru.po +++ b/translations/desktop_files/mimetypes/ru.po @@ -1,22 +1,23 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Alexander Golubev <fatzer2@gmail.com>, 2021. +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" -"PO-Revision-Date: 2021-01-12 18:00+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"POT-Creation-Date: 2023-06-30 18:14+0000\n" +"PO-Revision-Date: 2023-07-23 18:16+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdelibs/mimetypes/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.4\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" #. Comment #: all.desktop:4 @@ -147,6 +148,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Синхронизированный язык интеграции мультимедиа (SMIL)" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "Файл Gentoo ebuild" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Файл Mozilla XUL" @@ -1399,10 +1405,8 @@ msgstr "Документ HTML" #. Comment #: text/markdown.desktop:2 -#, fuzzy -#| msgid "Karbon14 Document" msgid "Markdown document" -msgstr "Документ Karbon14" +msgstr "Документ Markdown" #. Comment #: text/plain.desktop:3 diff --git a/translations/desktop_files/mimetypes/rw.po b/translations/desktop_files/mimetypes/rw.po index aaf420d6d..cfe938941 100644 --- a/translations/desktop_files/mimetypes/rw.po +++ b/translations/desktop_files/mimetypes/rw.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Ururimi rw'Ikorana-bindi Mutwaramakuru Ruringaniye" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL Idosiye" diff --git a/translations/desktop_files/mimetypes/se.po b/translations/desktop_files/mimetypes/se.po index 0914c3abf..0ceaf73ed 100644 --- a/translations/desktop_files/mimetypes/se.po +++ b/translations/desktop_files/mimetypes/se.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synkroniserejuvvon multimedia integrerengiella" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-fiila" diff --git a/translations/desktop_files/mimetypes/sk.po b/translations/desktop_files/mimetypes/sk.po index 1a2a4add1..0f595d7a1 100644 --- a/translations/desktop_files/mimetypes/sk.po +++ b/translations/desktop_files/mimetypes/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synchronizovaný Multimediálny Integrujúci jazyk" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Súbor Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/sl.po b/translations/desktop_files/mimetypes/sl.po index 161c5c0f6..2479c96ad 100644 --- a/translations/desktop_files/mimetypes/sl.po +++ b/translations/desktop_files/mimetypes/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Jezik za usklajeno vključitev večpredstavnosti" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Datoteka Mozilla XUL" diff --git a/translations/desktop_files/mimetypes/sq.po b/translations/desktop_files/mimetypes/sq.po index b69bdfa45..3d2992095 100644 --- a/translations/desktop_files/mimetypes/sq.po +++ b/translations/desktop_files/mimetypes/sq.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Gjuhë për Integrimin e Multimediave të Sinkronizuara" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/sr.po b/translations/desktop_files/mimetypes/sr.po index 83398b1f6..fc10f039c 100644 --- a/translations/desktop_files/mimetypes/sr.po +++ b/translations/desktop_files/mimetypes/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Синхронизовани мултимедијални језик за интеграцију" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL фајл" diff --git a/translations/desktop_files/mimetypes/sr@Latn.po b/translations/desktop_files/mimetypes/sr@Latn.po index 9b90c89c8..0d4754650 100644 --- a/translations/desktop_files/mimetypes/sr@Latn.po +++ b/translations/desktop_files/mimetypes/sr@Latn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Sinhronizovani multimedijalni jezik za integraciju" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL fajl" diff --git a/translations/desktop_files/mimetypes/ss.po b/translations/desktop_files/mimetypes/ss.po index d50422b06..7fa44eb1c 100644 --- a/translations/desktop_files/mimetypes/ss.po +++ b/translations/desktop_files/mimetypes/ss.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -152,6 +152,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/sv.po b/translations/desktop_files/mimetypes/sv.po index 8ebde4ac2..db84470e8 100644 --- a/translations/desktop_files/mimetypes/sv.po +++ b/translations/desktop_files/mimetypes/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Synkroniserat integrationsspråk för multimedia" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-fil" diff --git a/translations/desktop_files/mimetypes/ta.po b/translations/desktop_files/mimetypes/ta.po index 63d259e69..e1f876a2c 100644 --- a/translations/desktop_files/mimetypes/ta.po +++ b/translations/desktop_files/mimetypes/ta.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "மோசில்லா XUL ஆவணம்" diff --git a/translations/desktop_files/mimetypes/te.po b/translations/desktop_files/mimetypes/te.po index 5ec252014..c8587d9c0 100644 --- a/translations/desktop_files/mimetypes/te.po +++ b/translations/desktop_files/mimetypes/te.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "సింక్రొనైజ్ చేయబడిన బహుళ మాద్యమ ఏకీకరణ భాష" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "మోజిల్ల XUL దస్త్రం" diff --git a/translations/desktop_files/mimetypes/tg.po b/translations/desktop_files/mimetypes/tg.po index 56616a61a..28f8a7a19 100644 --- a/translations/desktop_files/mimetypes/tg.po +++ b/translations/desktop_files/mimetypes/tg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Забони такмили Мултимедияи ҳамоҳанг" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Файли Mozilla XUL " diff --git a/translations/desktop_files/mimetypes/th.po b/translations/desktop_files/mimetypes/th.po index 735499dbb..add717679 100644 --- a/translations/desktop_files/mimetypes/th.po +++ b/translations/desktop_files/mimetypes/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "ภาษาSynchronized Multimedia Integration" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "แฟ้ม XULของมอซิลลา" diff --git a/translations/desktop_files/mimetypes/tr.po b/translations/desktop_files/mimetypes/tr.po index 9591b4606..eddab3b1b 100644 --- a/translations/desktop_files/mimetypes/tr.po +++ b/translations/desktop_files/mimetypes/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Senkronize Çoklu ortam Birleştirme Dili" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL Dosyası" diff --git a/translations/desktop_files/mimetypes/tt.po b/translations/desktop_files/mimetypes/tt.po index 4c4898654..e97e9bc82 100644 --- a/translations/desktop_files/mimetypes/tt.po +++ b/translations/desktop_files/mimetypes/tt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL Bireme" diff --git a/translations/desktop_files/mimetypes/uk.po b/translations/desktop_files/mimetypes/uk.po index 942dbc498..987f8fea3 100644 --- a/translations/desktop_files/mimetypes/uk.po +++ b/translations/desktop_files/mimetypes/uk.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# Roman Savochenko <roman@oscada.org>, 2020, 2022. +# Roman Savochenko <roman@oscada.org>, 2020, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" -"PO-Revision-Date: 2022-04-24 16:20+0000\n" +"POT-Creation-Date: 2023-06-30 18:14+0000\n" +"PO-Revision-Date: 2023-11-01 14:13+0000\n" "Last-Translator: Roman Savochenko <roman@oscada.org>\n" "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdelibs/mimetypes/uk/>\n" @@ -14,9 +14,9 @@ msgstr "" "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.11.2\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" #. Comment #: all.desktop:4 @@ -147,6 +147,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Мова для синхронного спілкування мультимедіа" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "Файл Gentoo ebuild" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Файл Mozilla XUL" @@ -890,7 +895,7 @@ msgstr "Архів Tar" #. Comment #: application/x-tarz.desktop:3 msgid "Compressed Tar Archive" -msgstr "Стиснутий архів tar" +msgstr "Стиснутий Tar Архів" #. Comment #: application/x-tbz.desktop:2 @@ -920,17 +925,17 @@ msgstr "Документ TGIF" #. Comment #: application/x-tgz.desktop:6 msgid "Gzipped Tar Archive" -msgstr "Архів tar стиснутий gzip" +msgstr "Архів Tar, стиснутий GZip" #. Comment #: application/x-tlz.desktop:7 msgid "LZIP Tar Archive" -msgstr "Архів tar стиснутий gzip" +msgstr "Архів Tar, стиснутий LZip" #. Comment #: application/x-tlzma.desktop:7 msgid "LZMA Tar Archive" -msgstr "Архів tar стиснутий gzip" +msgstr "Архів Tar, стиснутий LZMA" #. Comment #: application/x-trash.desktop:6 @@ -950,12 +955,12 @@ msgstr "Документ Troff" #. Comment #: application/x-txz.desktop:6 msgid "Xzipped Tar Archive" -msgstr "Архів tar стиснутий gzip" +msgstr "Архів Tar, стиснутий XZip" #. Comment #: application/x-tzo.desktop:3 msgid "Lzopped Tar Archive" -msgstr "Архів tar стиснутий lzop" +msgstr "Архів Tar, стиснутий LZop" #. Comment #: application/x-vnd.kde.kexi.desktop:7 diff --git a/translations/desktop_files/mimetypes/uz.po b/translations/desktop_files/mimetypes/uz.po index 56c97aa8e..994c6bbf9 100644 --- a/translations/desktop_files/mimetypes/uz.po +++ b/translations/desktop_files/mimetypes/uz.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "SMI tili" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-fayli" diff --git a/translations/desktop_files/mimetypes/uz@cyrillic.po b/translations/desktop_files/mimetypes/uz@cyrillic.po index b444660d9..67efbd13d 100644 --- a/translations/desktop_files/mimetypes/uz@cyrillic.po +++ b/translations/desktop_files/mimetypes/uz@cyrillic.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "SMI тили" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL-файли" diff --git a/translations/desktop_files/mimetypes/ven.po b/translations/desktop_files/mimetypes/ven.po index 065907d51..dcf082baf 100644 --- a/translations/desktop_files/mimetypes/ven.po +++ b/translations/desktop_files/mimetypes/ven.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -149,6 +149,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Luambo lwo tangananaho lwa zwishumiswa zwa vhudavhidzani" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/vi.po b/translations/desktop_files/mimetypes/vi.po index 883d5dc68..1c7a2daf6 100644 --- a/translations/desktop_files/mimetypes/vi.po +++ b/translations/desktop_files/mimetypes/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Ngôn ngữ hợp nhất đa phương tiện đã đồng bộ." #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Tài liệu XUL Mozilla." diff --git a/translations/desktop_files/mimetypes/wa.po b/translations/desktop_files/mimetypes/wa.po index 114475132..0549cc1e6 100644 --- a/translations/desktop_files/mimetypes/wa.po +++ b/translations/desktop_files/mimetypes/wa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/xh.po b/translations/desktop_files/mimetypes/xh.po index 7aeb8f6e0..08d42f981 100644 --- a/translations/desktop_files/mimetypes/xh.po +++ b/translations/desktop_files/mimetypes/xh.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -149,6 +149,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Ulwimi oluhamba ngendlela enye lodityaniso lwe Multimedia" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/mimetypes/zh_CN.po b/translations/desktop_files/mimetypes/zh_CN.po index 7900dc819..491f60403 100644 --- a/translations/desktop_files/mimetypes/zh_CN.po +++ b/translations/desktop_files/mimetypes/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "同步多媒体集成语言" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL 文件" diff --git a/translations/desktop_files/mimetypes/zh_HK.po b/translations/desktop_files/mimetypes/zh_HK.po index c0ec58e1e..172bbc0d7 100644 --- a/translations/desktop_files/mimetypes/zh_HK.po +++ b/translations/desktop_files/mimetypes/zh_HK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "同步多媒體整合式語言" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL 檔案" diff --git a/translations/desktop_files/mimetypes/zh_TW.po b/translations/desktop_files/mimetypes/zh_TW.po index 682438e7b..84b7994f5 100644 --- a/translations/desktop_files/mimetypes/zh_TW.po +++ b/translations/desktop_files/mimetypes/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "同步多媒體整合式語言" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "Mozilla XUL 檔案" diff --git a/translations/desktop_files/mimetypes/zu.po b/translations/desktop_files/mimetypes/zu.po index 38f39a3e4..08b4af3b9 100644 --- a/translations/desktop_files/mimetypes/zu.po +++ b/translations/desktop_files/mimetypes/zu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-15 19:59+0200\n" +"POT-Creation-Date: 2023-06-30 18:14+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" @@ -149,6 +149,11 @@ msgid "Synchronized Multimedia Integration Language" msgstr "Ukuqoqelwa ndawonye Kolimi Lwabasiki bebunda Abahambiswa ndawonye" #. Comment +#: application/vnd.gentoo.ebuild.desktop:3 +msgid "Gentoo ebuild file" +msgstr "" + +#. Comment #: application/vnd.mozilla.xul+xml.desktop:7 msgid "Mozilla XUL File" msgstr "" diff --git a/translations/desktop_files/tdeio-desktops/ru.po b/translations/desktop_files/tdeio-desktops/ru.po index 9744b9311..221e2cfa9 100644 --- a/translations/desktop_files/tdeio-desktops/ru.po +++ b/translations/desktop_files/tdeio-desktops/ru.po @@ -1,22 +1,23 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Alexander Golubev <fatzer2@gmail.com>, 2021. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-03 21:00+0200\n" -"PO-Revision-Date: 2021-01-12 18:00+0000\n" -"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"PO-Revision-Date: 2024-04-12 16:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdelibs/tdeio-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.4\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 #: application.desktop:4 @@ -86,12 +87,12 @@ msgstr "Сервер монитора передачи данных TDE" #. Name #: misc/tdewalletd/tdewalletd.desktop:9 msgid "TDEWallet Daemon Module" -msgstr "Служба бумажника" +msgstr "Модуль демона TDEWallet" #. Comment #: misc/tdewalletd/tdewalletd.desktop:10 msgid "TDEWallet daemon module for KDED" -msgstr "Управление бумажником TDE" +msgstr "Модуль демона TDEWallet для KDED" #. Comment #: renamedlgplugin.desktop:4 diff --git a/translations/desktop_files/tdemarkdown-desktops/ru.po b/translations/desktop_files/tdemarkdown-desktops/ru.po new file mode 100644 index 000000000..97412f683 --- /dev/null +++ b/translations/desktop_files/tdemarkdown-desktops/ru.po @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2023. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-04-15 14:26+0200\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdelibs/tdemarkdown-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 +#: markdown_part.desktop:2 +msgid "Markdown Viewer" +msgstr "Просмотрщик Markdown" + +#. Comment +#: markdown_part.desktop:4 +msgid "Embeddable lightweight markdown viewing component" +msgstr "Встраиваемый лёгкий компонент просмотра разметки" diff --git a/win/common.pro b/win/common.pro index 985c45268..41db8d906 100644 --- a/win/common.pro +++ b/win/common.pro @@ -3,7 +3,7 @@ # (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl # -# to avoid a need for using Q_WS_WIN in C source code +# to avoid a need for using TQ_WS_WIN in C source code DEFINES += _WINDOWS WIN32_LEAN_AND_MEAN # custom definitions, options on which KDElibs do not depend diff --git a/win/pro_files/tdemdi/test/test.pro b/win/pro_files/tdemdi/test/test.pro index 62b30c186..757be67fb 100644 --- a/win/pro_files/tdemdi/test/test.pro +++ b/win/pro_files/tdemdi/test/test.pro @@ -9,7 +9,7 @@ CONFIG -= windows CONFIG += debug CONFIG += console -unix:DEFINES = NO_INCLUDE_MOCFILES TQT_NO_COMPAT +unix:DEFINES = NO_INCLUDE_MOCFILES unix:LIBS += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts unix:INCLUDEPATH += . .. $(TDEDIR)/include diff --git a/win/qeventloopex.h b/win/qeventloopex.h index 648ddf228..2fed3ecf9 100644 --- a/win/qeventloopex.h +++ b/win/qeventloopex.h @@ -30,7 +30,7 @@ class QEventLoopExPrivate; class QEventLoopEx : public TQEventLoop { - Q_OBJECT + TQ_OBJECT public: QEventLoopEx( TQObject *parent = 0, const char *name = 0 ); diff --git a/win/tools/kmoc b/win/tools/kmoc index 2fef8ea60..8e79c8246 100755 --- a/win/tools/kmoc +++ b/win/tools/kmoc @@ -6,7 +6,7 @@ mkdir -p moc find . -maxdepth 1 -name \*.h | while read ; do - grep Q_OBJECT $REPLY > /dev/null || continue + grep TQ_OBJECT $REPLY > /dev/null || continue moc=moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"` if [ $moc -ot $REPLY ] ; then echo mocing $REPLY... ; moc $REPLY -o $moc ; fi done |