diff options
Diffstat (limited to 'tdecore')
193 files changed, 1653 insertions, 1956 deletions
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..4db1fd5db 100644 --- a/tdecore/kdemacros.h.cmake +++ b/tdecore/kdemacros.h.cmake @@ -25,7 +25,7 @@ #cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 /** - * The KDE_NO_EXPORT macro marks the symbol of the given variable + * The TDE_NO_EXPORT macro marks the symbol of the given variable * to be hidden. A hidden symbol is stripped during the linking step, * so it can't be used from outside the resulting library, which is similar * to static. However, static limits the visibility to the current @@ -33,135 +33,104 @@ * units. * * \code - * int KDE_NO_EXPORT foo; - * int KDE_EXPORT bar; + * int TDE_NO_EXPORT foo; + * int TDE_EXPORT bar; * \end */ #ifdef __KDE_HAVE_GCC_VISIBILITY -#define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) -#define KDE_EXPORT __attribute__ ((visibility("default"))) -#elif defined(Q_WS_WIN) -#define KDE_NO_EXPORT -#define KDE_EXPORT __declspec(dllexport) +#define TDE_NO_EXPORT __attribute__ ((visibility("hidden"))) +#define TDE_EXPORT __attribute__ ((visibility("default"))) +#elif defined(TQ_WS_WIN) +#define TDE_NO_EXPORT +#define TDE_EXPORT __declspec(dllexport) #else -#define KDE_NO_EXPORT -#define KDE_EXPORT +#define TDE_NO_EXPORT +#define TDE_EXPORT #endif /** - * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to + * TDE_EXPORT_PLUGIN is a workaround for Qt not being able to * 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 TQUnknownInterface* ucm_instantiate(); \ +#define TDE_EXPORT_PLUGIN(PLUGIN) \ + TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) +#define KDE_Q_EXPORT_PLUGIN TDE_EXPORT_PLUGIN + /** - * The KDE_PACKED can be used to hint the compiler that a particular + * The TDE_PACKED can be used to hint the compiler that a particular * structure or class should not contain unnecessary paddings. */ #ifdef __GNUC__ -#define KDE_PACKED __attribute__((__packed__)) +#define TDE_PACKED __attribute__((__packed__)) #else -#define KDE_PACKED +#define TDE_PACKED #endif +#define KDE_PACKED TDE_PACKED + /** - * The KDE_DEPRECATED macro can be used to trigger compile-time warnings + * The TDE_DEPRECATED macro can be used to trigger compile-time warnings * with newer compilers when deprecated functions are used. * * For non-inline functions, the macro gets inserted at the very end of the * function declaration, right before the semicolon: * * \code - * DeprecatedConstructor() KDE_DEPRECATED; - * void deprecatedFunctionA() KDE_DEPRECATED; - * int deprecatedFunctionB() const KDE_DEPRECATED; + * DeprecatedConstructor() TDE_DEPRECATED; + * void deprecatedFunctionA() TDE_DEPRECATED; + * int deprecatedFunctionB() const TDE_DEPRECATED; * \endcode * * Functions which are implemented inline are handled differently: for them, - * the KDE_DEPRECATED macro is inserted at the front, right before the return + * the TDE_DEPRECATED macro is inserted at the front, right before the return * type, but after "static" or "virtual": * * \code - * KDE_DEPRECATED void deprecatedInlineFunctionA() { .. } - * virtual KDE_DEPRECATED int deprecatedInlineFunctionB() { .. } - * static KDE_DEPRECATED bool deprecatedInlineFunctionC() { .. } + * TDE_DEPRECATED void deprecatedInlineFunctionA() { .. } + * virtual TDE_DEPRECATED int deprecatedInlineFunctionB() { .. } + * static TDE_DEPRECATED bool deprecatedInlineFunctionC() { .. } * \end * * You can also mark whole structs or classes as deprecated, by inserting the - * KDE_DEPRECATED macro after the struct/class keyword, but before the + * TDE_DEPRECATED macro after the struct/class keyword, but before the * name of the struct/class: * * \code - * class KDE_DEPRECATED DeprecatedClass { }; - * struct KDE_DEPRECATED DeprecatedStruct { }; + * class TDE_DEPRECATED DeprecatedClass { }; + * struct TDE_DEPRECATED DeprecatedStruct { }; * \endcode * * \note - * It does not make much sense to use the KDE_DEPRECATED keyword for a Qt signal; + * It does not make much sense to use the TDE_DEPRECATED keyword for a TQt signal; * this is because usually get called by the class which they belong to, * and one'd assume that a class author doesn't use deprecated methods of his * own class. The only exception to this are signals which are connected to * other signals; they get invoked from moc-generated code. In any case, * printing a warning message in either case is not useful. * For slots, it can make sense (since slots can be invoked directly) but be - * aware that if the slots get triggered by a signal, the will get called from + * aware that if the slots get triggered by a signal, it will get called from * moc code as well and thus the warnings are useless. * * \par - * Also note that it is not possible to use KDE_DEPRECATED for classes which + * Also note that it is not possible to use TDE_DEPRECATED for classes which * use the k_dcop keyword (to indicate a DCOP interface declaration); this is * because the dcopidl program would choke on the unexpected declaration * syntax. */ -#ifndef KDE_DEPRECATED -#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2) - /* gcc >= 3.2 */ -# define KDE_DEPRECATED __attribute__ ((deprecated)) -#elif defined(_MSC_VER) && (_MSC_VER >= 1300) - /* msvc >= 7 */ -# define KDE_DEPRECATED __declspec(deprecated) -#else -# define KDE_DEPRECATED -#endif -#endif - -/** - * The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate to - * 'true'. When used in an if ( ) statement, it gives a hint to the compiler - * that the following codeblock is likely to get executed. Providing this - * information helps the compiler to optimize the code for better performance. - * Using the macro has an insignificant code size or runtime memory footprint impact. - * The code semantics is not affected. - * - * \note - * Providing wrong information ( like marking a condition that almost never - * passes as 'likely' ) will cause a significant runtime slowdown. Therefore only - * use it for cases where you can be sure about the odds of the expression to pass - * in all cases ( independent from e.g. user configuration ). - * - * \par - * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. - * - * \note - * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY ! - * - * \code - * if ( KDE_ISUNLIKELY( testsomething() ) ) - * abort(); // assume its unlikely that the application aborts - * \endcode - */ -#if __GNUC__ - 0 >= 3 -# define KDE_ISLIKELY( x ) __builtin_expect(!!(x),1) -# define KDE_ISUNLIKELY( x ) __builtin_expect(!!(x),0) -#else -# define KDE_ISLIKELY( x ) ( x ) -# define KDE_ISUNLIKELY( x ) ( x ) +#ifndef TDE_DEPRECATED + #ifdef __GNUC__ + #define TDE_DEPRECATED __attribute__ ((deprecated)) + #elif defined(_MSC_VER) + #define TDE_DEPRECATED __declspec(deprecated) + #else + #define TDE_DEPRECATED + #endif #endif /** @@ -207,15 +176,17 @@ RESERVE_VIRTUAL_9 /** - * The KDE_WEAK_SYMBOL macro can be used to tell the compiler that + * The TDE_WEAK_SYMBOL macro can be used to tell the compiler that * a particular function should be a weak symbol (that e.g. may be overriden * in another library, -Bdirect will not bind this symbol directly) */ #ifdef __GNUC__ -#define KDE_WEAK_SYMBOL __attribute__((__weak__)) +#define TDE_WEAK_SYMBOL __attribute__((__weak__)) #else -#define KDE_WEAK_SYMBOL +#define TDE_WEAK_SYMBOL #endif +#define KDE_WEAK_SYMBOL TDE_WEAK_SYMBOL + #endif /* _KDE_MACROS_H_ */ diff --git a/tdecore/kdemacros.h.in b/tdecore/kdemacros.h.in index 9566c386b..b572ca212 100644 --- a/tdecore/kdemacros.h.in +++ b/tdecore/kdemacros.h.in @@ -24,7 +24,7 @@ #undef __KDE_HAVE_GCC_VISIBILITY /** - * The KDE_NO_EXPORT macro marks the symbol of the given variable + * The TDE_NO_EXPORT macro marks the symbol of the given variable * to be hidden. A hidden symbol is stripped during the linking step, * so it can't be used from outside the resulting library, which is similar * to static. However, static limits the visibility to the current @@ -32,135 +32,104 @@ * units. * * \code - * int KDE_NO_EXPORT foo; - * int KDE_EXPORT bar; + * int TDE_NO_EXPORT foo; + * int TDE_EXPORT bar; * \end */ #ifdef __KDE_HAVE_GCC_VISIBILITY -#define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) -#define KDE_EXPORT __attribute__ ((visibility("default"))) -#elif defined(Q_WS_WIN) -#define KDE_NO_EXPORT -#define KDE_EXPORT __declspec(dllexport) +#define TDE_NO_EXPORT __attribute__ ((visibility("hidden"))) +#define TDE_EXPORT __attribute__ ((visibility("default"))) +#elif defined(TQ_WS_WIN) +#define TDE_NO_EXPORT +#define TDE_EXPORT __declspec(dllexport) #else -#define KDE_NO_EXPORT -#define KDE_EXPORT +#define TDE_NO_EXPORT +#define TDE_EXPORT #endif /** - * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to + * TDE_EXPORT_PLUGIN is a workaround for Qt not being able to * 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 TQUnknownInterface* ucm_instantiate(); \ +#define TDE_EXPORT_PLUGIN(PLUGIN) \ + TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) +#define KDE_Q_EXPORT_PLUGIN TDE_EXPORT_PLUGIN + /** - * The KDE_PACKED can be used to hint the compiler that a particular + * The TDE_PACKED can be used to hint the compiler that a particular * structure or class should not contain unnecessary paddings. */ #ifdef __GNUC__ -#define KDE_PACKED __attribute__((__packed__)) +#define TDE_PACKED __attribute__((__packed__)) #else -#define KDE_PACKED +#define TDE_PACKED #endif +#define KDE_PACKED TDE_PACKED + /** - * The KDE_DEPRECATED macro can be used to trigger compile-time warnings + * The TDE_DEPRECATED macro can be used to trigger compile-time warnings * with newer compilers when deprecated functions are used. * * For non-inline functions, the macro gets inserted at the very end of the * function declaration, right before the semicolon: * * \code - * DeprecatedConstructor() KDE_DEPRECATED; - * void deprecatedFunctionA() KDE_DEPRECATED; - * int deprecatedFunctionB() const KDE_DEPRECATED; + * DeprecatedConstructor() TDE_DEPRECATED; + * void deprecatedFunctionA() TDE_DEPRECATED; + * int deprecatedFunctionB() const TDE_DEPRECATED; * \endcode * * Functions which are implemented inline are handled differently: for them, - * the KDE_DEPRECATED macro is inserted at the front, right before the return + * the TDE_DEPRECATED macro is inserted at the front, right before the return * type, but after "static" or "virtual": * * \code - * KDE_DEPRECATED void deprecatedInlineFunctionA() { .. } - * virtual KDE_DEPRECATED int deprecatedInlineFunctionB() { .. } - * static KDE_DEPRECATED bool deprecatedInlineFunctionC() { .. } + * TDE_DEPRECATED void deprecatedInlineFunctionA() { .. } + * virtual TDE_DEPRECATED int deprecatedInlineFunctionB() { .. } + * static TDE_DEPRECATED bool deprecatedInlineFunctionC() { .. } * \end * * You can also mark whole structs or classes as deprecated, by inserting the - * KDE_DEPRECATED macro after the struct/class keyword, but before the + * TDE_DEPRECATED macro after the struct/class keyword, but before the * name of the struct/class: * * \code - * class KDE_DEPRECATED DeprecatedClass { }; - * struct KDE_DEPRECATED DeprecatedStruct { }; + * class TDE_DEPRECATED DeprecatedClass { }; + * struct TDE_DEPRECATED DeprecatedStruct { }; * \endcode * * \note - * It does not make much sense to use the KDE_DEPRECATED keyword for a Qt signal; + * It does not make much sense to use the TDE_DEPRECATED keyword for a TQt signal; * this is because usually get called by the class which they belong to, * and one'd assume that a class author doesn't use deprecated methods of his * own class. The only exception to this are signals which are connected to * other signals; they get invoked from moc-generated code. In any case, * printing a warning message in either case is not useful. * For slots, it can make sense (since slots can be invoked directly) but be - * aware that if the slots get triggered by a signal, the will get called from + * aware that if the slots get triggered by a signal, it will get called from * moc code as well and thus the warnings are useless. * * \par - * Also note that it is not possible to use KDE_DEPRECATED for classes which + * Also note that it is not possible to use TDE_DEPRECATED for classes which * use the k_dcop keyword (to indicate a DCOP interface declaration); this is * because the dcopidl program would choke on the unexpected declaration * syntax. */ -#ifndef KDE_DEPRECATED -#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2) - /* gcc >= 3.2 */ -# define KDE_DEPRECATED __attribute__ ((deprecated)) -#elif defined(_MSC_VER) && (_MSC_VER >= 1300) - /* msvc >= 7 */ -# define KDE_DEPRECATED __declspec(deprecated) -#else -# define KDE_DEPRECATED -#endif -#endif - -/** - * The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate to - * 'true'. When used in an if ( ) statement, it gives a hint to the compiler - * that the following codeblock is likely to get executed. Providing this - * information helps the compiler to optimize the code for better performance. - * Using the macro has an insignificant code size or runtime memory footprint impact. - * The code semantics is not affected. - * - * \note - * Providing wrong information ( like marking a condition that almost never - * passes as 'likely' ) will cause a significant runtime slowdown. Therefore only - * use it for cases where you can be sure about the odds of the expression to pass - * in all cases ( independent from e.g. user configuration ). - * - * \par - * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. - * - * \note - * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY ! - * - * \code - * if ( KDE_ISUNLIKELY( testsomething() ) ) - * abort(); // assume its unlikely that the application aborts - * \endcode - */ -#if __GNUC__ - 0 >= 3 -# define KDE_ISLIKELY( x ) __builtin_expect(!!(x),1) -# define KDE_ISUNLIKELY( x ) __builtin_expect(!!(x),0) -#else -# define KDE_ISLIKELY( x ) ( x ) -# define KDE_ISUNLIKELY( x ) ( x ) +#ifndef TDE_DEPRECATED + #ifdef __GNUC__ + #define TDE_DEPRECATED __attribute__ ((deprecated)) + #elif defined(_MSC_VER) + #define TDE_DEPRECATED __declspec(deprecated) + #else + #define TDE_DEPRECATED + #endif #endif /** @@ -206,15 +175,17 @@ RESERVE_VIRTUAL_9 /** - * The KDE_WEAK_SYMBOL macro can be used to tell the compiler that + * The TDE_WEAK_SYMBOL macro can be used to tell the compiler that * a particular function should be a weak symbol (that e.g. may be overriden * in another library, -Bdirect will not bind this symbol directly) */ #ifdef __GNUC__ -#define KDE_WEAK_SYMBOL __attribute__((__weak__)) +#define TDE_WEAK_SYMBOL __attribute__((__weak__)) #else -#define KDE_WEAK_SYMBOL +#define TDE_WEAK_SYMBOL #endif +#define KDE_WEAK_SYMBOL TDE_WEAK_SYMBOL + #endif /* _KDE_MACROS_H_ */ diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h index cfdc5488c..b4f59085a 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: /** @@ -230,7 +230,7 @@ private: /** * @deprecated Use fileName() instead. */ - KDE_DEPRECATED TQString filename() const { return fileName(); }; + TDE_DEPRECATED TQString filename() const { return fileName(); }; private: 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..3b3018b59 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 @@ -950,7 +931,7 @@ public: * @param flags the same flags as getnameinfo() * @returns 0 on success, nonzero otherwise. */ - static int resolve(sockaddr* sock, ksocklen_t len, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED; + static int resolve(sockaddr* sock, ksocklen_t len, TQString& host, TQString& port, int flags = 0) TDE_DEPRECATED; /** * Performs resolution on the given socket address. @@ -964,7 +945,7 @@ public: * @param flags the same flags as getnameinfo() * @returns 0 on success, nonzero otherwise. */ - static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED; + static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) TDE_DEPRECATED; /** @deprecated * This function is now deprecated. Please use @ref KNetwork::KResolver::resolve. @@ -986,7 +967,7 @@ public: * @param error pointer to a variable holding the error code * @return a list of KAddressInfos */ - static TQPtrList<KAddressInfo> lookup(const TQString& host, const TQString& port, int flags = 0, int *error = 0) KDE_DEPRECATED; + static TQPtrList<KAddressInfo> lookup(const TQString& host, const TQString& port, int flags = 0, int *error = 0) TDE_DEPRECATED; /** * Returns the local socket address @@ -994,7 +975,7 @@ public: * @param fd the file descriptor * @return the local socket address or 0 if an error occurred. Delete after use. */ - static ::TDESocketAddress *localAddress(int fd) KDE_DEPRECATED; + static ::TDESocketAddress *localAddress(int fd) TDE_DEPRECATED; /** * Returns the peer socket address. Use KExtendedSocket::resolve() to @@ -1003,7 +984,7 @@ public: * @param fd the file descriptor * @return the peer socket address or 0 if an error occurred. Delete after use. */ - static ::TDESocketAddress *peerAddress(int fd) KDE_DEPRECATED; + static ::TDESocketAddress *peerAddress(int fd) TDE_DEPRECATED; /** * Returns the representing text of this error code @@ -1022,7 +1003,7 @@ public: * @param enable if true, set address reusable * @return true on success, false on failure. */ - static bool setAddressReusable(int fd, bool enable) KDE_DEPRECATED; + static bool setAddressReusable(int fd, bool enable) TDE_DEPRECATED; protected: virtual void virtual_hook( int id, void* data ); @@ -1059,20 +1040,20 @@ public: * Returns the KAddressInfo's TDESocketAddress. * Only valid as long as the KAddressInfo exists. */ - inline KDE_DEPRECATED operator const ::TDESocketAddress*() const + inline TDE_DEPRECATED operator const ::TDESocketAddress*() const { return addr; } /** * Returns the KAddressInfo's addrinfo. */ - inline KDE_DEPRECATED operator const addrinfo&() const + inline TDE_DEPRECATED operator const addrinfo&() const { return *ai; } /** * Returns a pointer to KAddressInfo's addrinfo. * Only valid as long as the KAddressInfo exists. */ - inline KDE_DEPRECATED operator const addrinfo*() const + inline TDE_DEPRECATED operator const addrinfo*() const { return ai; } /** @@ -1080,32 +1061,32 @@ public: * Only valid as long as the KAddressInfo exists. * @return the KAddressInfo's TDESocketAddress. */ - inline KDE_DEPRECATED const ::TDESocketAddress* address() const + inline TDE_DEPRECATED const ::TDESocketAddress* address() const { return addr; } /** * Returns the flags of the address info (see getaddrinfo(3)). * @return the flags of the addres info. */ - int flags() const KDE_DEPRECATED; + int flags() const TDE_DEPRECATED; /** * Returns the family of the address info (see getaddrinfo(3)). * @return the family of the addres info. */ - int family() const KDE_DEPRECATED; + int family() const TDE_DEPRECATED; /** * Returns the socket type of the address info (see getaddrinfo(3)). * @return the socket type of the addres info. */ - int socktype() const KDE_DEPRECATED; + int socktype() const TDE_DEPRECATED; /** * Returns the protocol of the address info (see getaddrinfo(3)). * @return the protocol of the addres info. */ - int protocol() const KDE_DEPRECATED; + int protocol() const TDE_DEPRECATED; /** @@ -1113,7 +1094,7 @@ public: * Only valid as long as the KAddressInfo exists. * @return the official name of the host */ - const char* canonname() const KDE_DEPRECATED; + const char* canonname() const TDE_DEPRECATED; /** * Returns the length of the TDESocketAddress. 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..813106164 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -36,7 +36,7 @@ class KLibLoaderPrivate; class KLibraryPrivate; # define K_EXPORT_COMPONENT_FACTORY( libname, factory ) \ - extern "C" { KDE_EXPORT void *init_##libname() { return new factory; } } + extern "C" { TDE_EXPORT void *init_##libname() { return new factory; } } /** * @short Represents a dynamically loaded library. @@ -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/knotifyclient.h b/tdecore/knotifyclient.h index a824d5a37..723c4bb45 100644 --- a/tdecore/knotifyclient.h +++ b/tdecore/knotifyclient.h @@ -185,7 +185,7 @@ namespace KNotifyClient * the user connected the event to sound, only. Can be TQString::null. * @return a value > 0, unique for this event if successful, 0 otherwise */ - TDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) KDE_DEPRECATED; + TDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) TDE_DEPRECATED; /** * @deprecated @@ -194,7 +194,7 @@ namespace KNotifyClient * @param text The text explaining the event you raise. Can be TQString::null. * @return a value > 0, unique for this event if successful, 0 otherwise */ - TDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) KDE_DEPRECATED; + TDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) TDE_DEPRECATED; /** * @deprecated @@ -207,7 +207,7 @@ namespace KNotifyClient * @return a value > 0, unique for this event if successful, 0 otherwise */ TDECORE_EXPORT int userEvent(const TQString &text=TQString::null, int present=Default, int level=Default, - const TQString &sound=TQString::null, const TQString &file=TQString::null) KDE_DEPRECATED; + const TQString &sound=TQString::null, const TQString &file=TQString::null) TDE_DEPRECATED; //#endif 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..211e3cc7f 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: @@ -219,7 +219,7 @@ public: @see operator<<() */ - bool setExecutable(const TQString& proc) KDE_DEPRECATED; + bool setExecutable(const TQString& proc) TDE_DEPRECATED; /** @@ -320,7 +320,7 @@ public: * @deprecated * Use pid() instead. */ - KDE_DEPRECATED pid_t getPid() const { return pid(); } + TDE_DEPRECATED pid_t getPid() const { return pid(); } /** * Suspend processing of data from stdout of the child process. @@ -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..eda8c6eab 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: /** @@ -120,7 +120,7 @@ public: * @return true if successful, false otherwise * @deprecated **/ - KDE_DEPRECATED bool fputs (const TQString &line, bool AppendNewLine=true) + TDE_DEPRECATED bool fputs (const TQString &line, bool AppendNewLine=true) { return writeStdin(line, AppendNewLine); } /** @@ -159,7 +159,7 @@ public: * @deprecated use readln. Note that it has an inverted autoAck default, * though. **/ - KDE_DEPRECATED int fgets (TQString &line, bool autoAck=false) + TDE_DEPRECATED int fgets (TQString &line, bool autoAck=false) { return readln (line, autoAck); } /** diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 4377ec9ce..af48a5386 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -18,7 +18,7 @@ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) #undef TDEIO_EXPORT -#define TDEIO_EXPORT KDE_EXPORT +#define TDEIO_EXPORT TDE_EXPORT #endif #define KPROTOCOLINFO_TDECORE 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/kregexp.h b/tdecore/kregexp.h index cc5ff0ea6..0bb2b04ca 100644 --- a/tdecore/kregexp.h +++ b/tdecore/kregexp.h @@ -57,7 +57,7 @@ class KRegExpPrivate; * * @author Torben Weis <weis@kde.org> */ -class TDECORE_EXPORT KDE_DEPRECATED KRegExp +class TDECORE_EXPORT TDE_DEPRECATED KRegExp { public: 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..f562ece8f 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,26 +86,26 @@ class TDEServerSocketPrivate; */ class TDECORE_EXPORT TDESocket : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a TDESocket with the provided file descriptor. * @param _sock The file descriptor to use. */ - TDESocket( int _sock ) KDE_DEPRECATED; + TDESocket( int _sock ) TDE_DEPRECATED; /** * Creates a socket and connects to a host. * @param _host The remote host to which to connect. * @param _port The port on the remote host. * @param timeOut The number of seconds waiting for connect (default 30). */ - TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED; + TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) TDE_DEPRECATED; /** * Connects to a UNIX domain socket. * @param _path The filename of the socket. */ - TDESocket( const char * _path ) KDE_DEPRECATED; + TDESocket( const char * _path ) TDE_DEPRECATED; /** * Destructor. Closes the socket if it is still open. @@ -154,7 +150,7 @@ public: * instead * @deprecated */ - unsigned long ipv4_addr() KDE_DEPRECATED; + unsigned long ipv4_addr() TDE_DEPRECATED; // BCI: remove in libtdecore.so.4 /** @@ -162,7 +158,7 @@ public: * Don't use this in new programs. Use KExtendedSocket::lookup * @deprecated */ - static bool initSockaddr(ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain = PF_INET) KDE_DEPRECATED; + static bool initSockaddr(ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain = PF_INET) TDE_DEPRECATED; #endif signals: @@ -253,7 +249,7 @@ private: */ class TDECORE_EXPORT TDEServerSocket : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. @@ -344,7 +340,7 @@ protected: private: // HACK #ifdef TDESOCKET_BINARY_COMPAT_HACK - KDE_EXPORT bool bindAndListen(); + TDE_EXPORT bool bindAndListen(); #endif // TDESOCKET_BINARY_COMPAT_HACK TDEServerSocket(const TDEServerSocket&); 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/kstaticdeleter.h b/tdecore/kstaticdeleter.h index b6967268c..28c2d89e2 100644 --- a/tdecore/kstaticdeleter.h +++ b/tdecore/kstaticdeleter.h @@ -82,7 +82,7 @@ public: * @param isArray tells the destructor to delete an array instead of an object * @deprecated See the other setObject variant. **/ - KDE_DEPRECATED type *setObject( type *obj, bool isArray = false) { + TDE_DEPRECATED type *setObject( type *obj, bool isArray = false) { deleteit = obj; globalReference = 0; array = isArray; 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/kstringhandler.h b/tdecore/kstringhandler.h index f20963d63..2a75a2f7b 100644 --- a/tdecore/kstringhandler.h +++ b/tdecore/kstringhandler.h @@ -77,7 +77,7 @@ public: * @return the word, or an empty string if not found * @deprecated use TQString::section instead */ - static TQString word( const TQString &text , uint pos ) KDE_DEPRECATED; + static TQString word( const TQString &text , uint pos ) TDE_DEPRECATED; /** Returns a range of words from that string. * Ie: @@ -183,7 +183,7 @@ public: * @return the resulting string * @deprecated use TQString::leftJustify instead */ - static TQString ljust( const TQString &text , uint width ) KDE_DEPRECATED; + static TQString ljust( const TQString &text , uint width ) TDE_DEPRECATED; /** Right-justifies a string and returns a string at least 'width' characters * wide. @@ -194,7 +194,7 @@ public: * @return the resulting string * @deprecated use TQString::rightJustify instead */ - static TQString rjust( const TQString &text , uint width ) KDE_DEPRECATED; + static TQString rjust( const TQString &text , uint width ) TDE_DEPRECATED; /** Centers a string and returns a string at least 'width' characters * wide. @@ -432,7 +432,7 @@ private: /** * @deprecated Use matchFileName () instead. */ - static KDE_DEPRECATED bool matchFilename( const TQString& filename, const TQString& pattern ) + static TDE_DEPRECATED bool matchFilename( const TQString& filename, const TQString& pattern ) { return matchFileName (filename, pattern); } 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..ca30a3b0a 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() @@ -834,7 +834,7 @@ public: * * @see isValid() */ - KDE_DEPRECATED bool isMalformed() const { return !isValid(); } + TDE_DEPRECATED bool isMalformed() const { return !isValid(); } /** * @brief Tests if the file is local @@ -1468,7 +1468,7 @@ public: * * @deprecated Use equals() instead. */ - bool cmp( const KURL &u, bool ignore_trailing = false ) const KDE_DEPRECATED; + bool cmp( const KURL &u, bool ignore_trailing = false ) const TDE_DEPRECATED; /** * @brief Compares this URL with another one 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..a578ff74c 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, @@ -82,13 +82,13 @@ public: /** * @deprecated Is equivalent with "new KURLDrag(urls, dragSource, name)". */ - static KURLDrag * newDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 ) KDE_DEPRECATED; + static KURLDrag * newDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 ) TDE_DEPRECATED; /** * @deprecated Is equivalent with "new KURLDrag(urls, metaData, dragSource, name)". */ static KURLDrag * newDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData, - TQWidget* dragSource = 0, const char * name = 0 ) KDE_DEPRECATED; + TQWidget* dragSource = 0, const char * name = 0 ) TDE_DEPRECATED; /** * Meta-data to associate with those URLs. @@ -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. @@ -152,7 +152,7 @@ protected: * @deprecated Use a KURLDrag constructor with a KURL::List */ KURLDrag( const TQStrList & urls, const TQMap<TQString,TQString>& metaData, - TQWidget * dragSource, const char* name ) KDE_DEPRECATED; + TQWidget * dragSource, const char* name ) TDE_DEPRECATED; private: void init(const KURL::List &urls); diff --git a/tdecore/kvmallocator.h b/tdecore/kvmallocator.h index e85e03446..677293443 100644 --- a/tdecore/kvmallocator.h +++ b/tdecore/kvmallocator.h @@ -80,7 +80,7 @@ public: * @deprecated * @see copyBlock */ - void copy(void *dest, Block *src, int _offset = 0, size_t length = 0) KDE_DEPRECATED; + void copy(void *dest, Block *src, int _offset = 0, size_t length = 0) TDE_DEPRECATED; /** * Copy @p length bytes from normal memory at address @p src to @@ -98,7 +98,7 @@ public: * @deprecated * @see copyBlock */ - void copy(Block *dest, void *src, int _offset = 0, size_t length = 0) KDE_DEPRECATED; + void copy(Block *dest, void *src, int _offset = 0, size_t length = 0) TDE_DEPRECATED; /** * Map a virtual memory block in memory 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/netsupp.cpp b/tdecore/netsupp.cpp index 0c072752c..397005183 100644 --- a/tdecore/netsupp.cpp +++ b/tdecore/netsupp.cpp @@ -1233,5 +1233,5 @@ int inet_pton(int af, const char *cp, void *buf) namespace KDE { /** @internal */ - extern const int KDE_EXPORT resolverFlags = KRF_getaddrinfo | KRF_resolver | KRF_afinet6 | KRF_inet_ntop | KRF_inet_pton; + extern const int TDE_EXPORT resolverFlags = KRF_getaddrinfo | KRF_resolver | KRF_afinet6 | KRF_inet_ntop | KRF_inet_pton; } 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..bdfa67a20 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> @@ -109,7 +109,7 @@ public: to the first element of the properties array in the above constructor. **/ NETRootInfo(Display *display, Window supportWindow, const char *wmName, - unsigned long properties, int screen = -1, bool doActivate = true) KDE_DEPRECATED; + unsigned long properties, int screen = -1, bool doActivate = true) TDE_DEPRECATED; /** Clients should use this constructor to create a NETRootInfo object, which @@ -258,7 +258,7 @@ public: @see NET::Property **/ - unsigned long supported() const KDE_DEPRECATED; + unsigned long supported() const TDE_DEPRECATED; /** Returns an array of Window id's, which contain all managed windows. @@ -727,7 +727,7 @@ protected: @param window the id of the window to activate **/ - virtual KDE_DEPRECATED void changeActiveWindow(Window window) { Q_UNUSED(window); } + virtual TDE_DEPRECATED void changeActiveWindow(Window window) { Q_UNUSED(window); } /** A Window Manager should subclass NETRootInfo and reimplement this function @@ -1029,7 +1029,7 @@ public: @see NET::Property **/ - unsigned long properties() const KDE_DEPRECATED; + unsigned long properties() const TDE_DEPRECATED; /** Returns the icon geometry. @@ -1083,7 +1083,7 @@ public: @return the type of the window **/ - WindowType windowType() const KDE_DEPRECATED; + WindowType windowType() const TDE_DEPRECATED; /** Returns the name of the window in UTF-8 format. 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/kresolver_p.h b/tdecore/network/kresolver_p.h index c9d64e4bc..896fe536f 100644 --- a/tdecore/network/kresolver_p.h +++ b/tdecore/network/kresolver_p.h @@ -206,7 +206,7 @@ namespace KNetwork KResolverManager(); public: - static KResolverManager* manager() KDE_NO_EXPORT; // creates and returns the global manager + static KResolverManager* manager() TDE_NO_EXPORT; // creates and returns the global manager // destructor ~KResolverManager(); diff --git a/tdecore/network/kresolverstandardworkers_p.h b/tdecore/network/kresolverstandardworkers_p.h index 05d0d5b26..92d15892a 100644 --- a/tdecore/network/kresolverstandardworkers_p.h +++ b/tdecore/network/kresolverstandardworkers_p.h @@ -39,7 +39,7 @@ namespace KNetwork { namespace Internal { - extern void initStandardWorkers() KDE_NO_EXPORT; + extern void initStandardWorkers() TDE_NO_EXPORT; /** * @internal 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..732de02a4 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() @@ -242,7 +242,7 @@ namespace KNetwork namespace Internal { - void initSrvWorker() KDE_NO_EXPORT; + void initSrvWorker() TDE_NO_EXPORT; void initSrvWorker() { if (getenv("TDE_NO_SRV") != NULL) 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..c8114059d 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. @@ -319,47 +319,47 @@ class TDECORE_EXPORT TDEAccel : public TQAccel */ bool insertItem( const TQString& sLabel, const TQString& sAction, const char* psKey, - int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) KDE_DEPRECATED; + int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) TDE_DEPRECATED; /** * @deprecated use insert */ bool insertItem( const TQString& sLabel, const TQString& sAction, int key, - int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) KDE_DEPRECATED; + int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) TDE_DEPRECATED; /** * @deprecated use insert */ - bool insertStdItem( TDEStdAccel::StdAccel id, const TQString& descr = TQString::null ) KDE_DEPRECATED; + bool insertStdItem( TDEStdAccel::StdAccel id, const TQString& descr = TQString::null ) TDE_DEPRECATED; /** * @deprecated use insert */ - bool connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate = true ) KDE_DEPRECATED; + bool connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate = true ) TDE_DEPRECATED; /** * @deprecated use insert( accel, pObjSlot, psMethodSlot ); * */ - KDE_DEPRECATED bool connectItem( TDEStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot ) + TDE_DEPRECATED bool connectItem( TDEStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot ) { return insert( accel, pObjSlot, psMethodSlot ); } /** * @deprecated use remove */ - bool removeItem( const TQString& sAction ) KDE_DEPRECATED; + bool removeItem( const TQString& sAction ) TDE_DEPRECATED; /** * @deprecated */ - bool setItemEnabled( const TQString& sAction, bool bEnable ) KDE_DEPRECATED; + bool setItemEnabled( const TQString& sAction, bool bEnable ) TDE_DEPRECATED; /** * @deprecated see KDE3PORTING.html */ - void changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action ) KDE_DEPRECATED; + void changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action ) TDE_DEPRECATED; /** * @deprecated see KDE3PORTING.html */ - void changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel ) KDE_DEPRECATED; + void changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel ) TDE_DEPRECATED; /** * @deprecated */ - static int stringToKey( const TQString& ) KDE_DEPRECATED; + static int stringToKey( const TQString& ) TDE_DEPRECATED; /** * @deprecated Use shortcut(). @@ -368,7 +368,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * @p action, or zero if either the action name cannot be * found or the current key is set to no key. */ - int currentKey( const TQString& action ) const KDE_DEPRECATED; + int currentKey( const TQString& action ) const TDE_DEPRECATED; /** * @deprecated Use actions().actionPtr(). @@ -376,7 +376,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * Return the name of the accelerator item with the keycode @p key, * or TQString::null if the item cannot be found. */ - TQString findKey( int key ) const KDE_DEPRECATED; + TQString findKey( int key ) const TDE_DEPRECATED; #endif // !KDE_NO_COMPAT protected: 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..d089f24f6 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> @@ -188,7 +188,7 @@ extern int getfd(const char *fnam); #include "kappdcopiface.h" // exported for tdm kfrontend -KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm +TDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm bool kde_kiosk_exception = false; // flag to disable kiosk restrictions bool kde_kiosk_admin = false; @@ -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..f90e8a42b 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); /** @@ -268,7 +268,7 @@ public: // REMOVE FOR KDE 4.0 - using it only gives crashing applications because // TDECmdLineArgs::init isn't called TDEApplication(int& argc, char** argv, - const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) KDE_DEPRECATED; + const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) TDE_DEPRECATED; #ifdef Q_QDOC #else // Q_QDOC @@ -277,7 +277,7 @@ public: // FOR BINARY COMPATIBILITY ONLY // REMOVE WHEN PRACTICAL! TDEApplication(int& argc, char** argv, - const TQCString& rAppName, bool allowStyles, bool GUIenabled) KDE_DEPRECATED; + const TQCString& rAppName, bool allowStyles, bool GUIenabled) TDE_DEPRECATED; #endif // TDEAPPLICATION_BINARY_COMPAT_HACK #endif // Q_QDOC @@ -545,7 +545,7 @@ public: * value will be appended to the filename, * prefixed with a "#" (hash) character. */ - void invokeHTMLHelp( const TQString& aFilename, const TQString& aTopic = TQString::null ) const KDE_DEPRECATED; + void invokeHTMLHelp( const TQString& aFilename, const TQString& aTopic = TQString::null ) const TDE_DEPRECATED; /** * Convenience method; invokes the standard email application. @@ -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(); @@ -893,7 +893,7 @@ public: /** * @deprecated */ - KDE_DEPRECATED TDEStyle* tdestyle() const { return 0; } + TDE_DEPRECATED TDEStyle* tdestyle() const { return 0; } /** * Builds a caption that contains the application name along with the @@ -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 @@ -1219,7 +1219,7 @@ public: * @deprecated Use keyboardMouseState() * @since 3.1 */ - static uint keyboardModifiers() KDE_DEPRECATED; + static uint keyboardModifiers() TDE_DEPRECATED; /** @deprecated Same values as Button1Mask etc. in X.h */ enum { Button1Pressed = 1<<8, @@ -1231,7 +1231,7 @@ public: * @deprecated Use keyboardMouseState() * @since 3.1 */ - static uint mouseState() KDE_DEPRECATED; + static uint mouseState() TDE_DEPRECATED; /** * Returns the VT that the current X server is running on, or -1 if this information is unavailable. @@ -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/tdecmdlineargs.h b/tdecore/tdecmdlineargs.h index 8705b4d35..013def801 100644 --- a/tdecore/tdecmdlineargs.h +++ b/tdecore/tdecmdlineargs.h @@ -257,7 +257,7 @@ public: */ static void init(int _argc, char **_argv, const char *_appname, const char *_description, - const char *_version, bool noKApp = false) KDE_DEPRECATED; + const char *_version, bool noKApp = false) TDE_DEPRECATED; /** * Initialize class. 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..ad02f29b3 100644 --- a/tdecore/tdeconfig_compiler/README.dox +++ b/tdecore/tdeconfig_compiler/README.dox @@ -104,7 +104,7 @@ The following options are read from the kcfgc file: <td><b>Visibility</b></td> <td>string</td> <td>-</td> - <td>Inserts visibility directive (for example KDE_EXPORT) between "class" keyword and class + <td>Inserts visibility directive (for example TDE_EXPORT) between "class" keyword and class name in header file</td> </tr> <tr> @@ -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/tdeconfigbackend.h b/tdecore/tdeconfigbackend.h index c4149a69c..ab74f927f 100644 --- a/tdecore/tdeconfigbackend.h +++ b/tdecore/tdeconfigbackend.h @@ -159,7 +159,7 @@ private: /** * @deprecated Use fileName() instead */ - KDE_DEPRECATED TQString filename() const { return mfileName; } + TDE_DEPRECATED TQString filename() const { return mfileName; } protected: TDEConfigBase *pConfig; 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..59db6d0ae 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,11 +107,24 @@ 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); extern "C" { - KDE_EXPORT TDEHardwareDevices* create_tdeHardwareDevices() + TDE_EXPORT TDEHardwareDevices* create_tdeHardwareDevices() { return new TDEHardwareDevices(); } @@ -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..9a273cebb 100644 --- a/tdecore/tdehw/tdenetworkconnections.cpp +++ b/tdecore/tdehw/tdenetworkconnections.cpp @@ -41,7 +41,7 @@ /*================================================================================================*/ extern "C" { - KDE_EXPORT TDEGlobalNetworkManager* create_tdeGlobalNetworkManager() + TDE_EXPORT TDEGlobalNetworkManager* create_tdeGlobalNetworkManager() { return new TDEGlobalNetworkManager(); } @@ -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..bfe07b0e3 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -20,42 +20,42 @@ #ifndef _TDELIBS_EXPORT_H #define _TDELIBS_EXPORT_H -/* needed for KDE_EXPORT macros */ +/* needed for TDE_EXPORT macros */ #include <kdemacros.h> /* 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 */ /* export statements for unix */ -#define TDECORE_EXPORT KDE_EXPORT -#define TDEUI_EXPORT KDE_EXPORT -#define TDEFX_EXPORT KDE_EXPORT -#define TDEPRINT_EXPORT KDE_EXPORT -#define TDEDNSSD_EXPORT KDE_EXPORT -#define TDEIO_EXPORT KDE_EXPORT -#define DCOP_EXPORT KDE_EXPORT -#define TDEPARTS_EXPORT KDE_EXPORT -#define KTEXTEDITOR_EXPORT KDE_EXPORT -#define KABC_EXPORT KDE_EXPORT -#define TDESU_EXPORT KDE_EXPORT -#define KVCARD_EXPORT KDE_EXPORT -#define TDERESOURCES_EXPORT KDE_EXPORT -#define TDESTYLE_EXPORT KDE_EXPORT -#define TDEHTML_EXPORT KDE_EXPORT -#define KMDI_EXPORT KDE_EXPORT -#define TDEUTILS_EXPORT KDE_EXPORT -#define KATEPARTINTERFACES_EXPORT KDE_EXPORT -#define KATEPART_EXPORT KDE_EXPORT -#define KMID_EXPORT KDE_EXPORT -#define TDERANDR_EXPORT KDE_EXPORT -#define TDEIMPROXY_EXPORT KDE_EXPORT -#define KDE_ARTS_EXPORT KDE_EXPORT -#define TDEUNITTEST_EXPORT KDE_EXPORT +#define TDECORE_EXPORT TDE_EXPORT +#define TDEUI_EXPORT TDE_EXPORT +#define TDEFX_EXPORT TDE_EXPORT +#define TDEPRINT_EXPORT TDE_EXPORT +#define TDEDNSSD_EXPORT TDE_EXPORT +#define TDEIO_EXPORT TDE_EXPORT +#define DCOP_EXPORT TDE_EXPORT +#define TDEPARTS_EXPORT TDE_EXPORT +#define KTEXTEDITOR_EXPORT TDE_EXPORT +#define KABC_EXPORT TDE_EXPORT +#define TDESU_EXPORT TDE_EXPORT +#define KVCARD_EXPORT TDE_EXPORT +#define TDERESOURCES_EXPORT TDE_EXPORT +#define TDESTYLE_EXPORT TDE_EXPORT +#define TDEHTML_EXPORT TDE_EXPORT +#define KMDI_EXPORT TDE_EXPORT +#define TDEUTILS_EXPORT TDE_EXPORT +#define KATEPARTINTERFACES_EXPORT TDE_EXPORT +#define KATEPART_EXPORT TDE_EXPORT +#define KMID_EXPORT TDE_EXPORT +#define TDERANDR_EXPORT TDE_EXPORT +#define TDEIMPROXY_EXPORT TDE_EXPORT +#define KDE_ARTS_EXPORT TDE_EXPORT +#define TDEUNITTEST_EXPORT TDE_EXPORT #define KPATH_SEPARATOR ':' @@ -69,18 +69,18 @@ /* workaround for tdecore: stupid moc's grammar doesn't accept two macros between 'class' keyword and <classname>: */ -#ifdef KDE_DEPRECATED +#ifdef TDE_DEPRECATED # ifndef TDECORE_EXPORT_DEPRECATED -# define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT +# define TDECORE_EXPORT_DEPRECATED TDE_DEPRECATED TDECORE_EXPORT # endif # ifndef TDEIO_EXPORT_DEPRECATED -# define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT +# define TDEIO_EXPORT_DEPRECATED TDE_DEPRECATED TDEIO_EXPORT # endif # ifndef TDEUI_EXPORT_DEPRECATED -# define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT +# define TDEUI_EXPORT_DEPRECATED TDE_DEPRECATED TDEUI_EXPORT # endif # ifndef KABC_EXPORT_DEPRECATED -# define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT +# define KABC_EXPORT_DEPRECATED TDE_DEPRECATED KABC_EXPORT # endif #endif /* (let's add KDE****_EXPORT_DEPRECATED for other libraries if it's needed) */ 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..395344890 100644 --- a/tdecore/tdelocale.h +++ b/tdecore/tdelocale.h @@ -410,7 +410,7 @@ public: * * calls formatNumber(numStr, 2) */ - TQString formatNumber(const TQString &numStr) const KDE_DEPRECATED; + TQString formatNumber(const TQString &numStr) const TDE_DEPRECATED; /** * Given a string representing a number, converts that to a numeric @@ -512,7 +512,7 @@ public: * * @return true if the week starts on Monday */ - bool weekStartsMonday() const KDE_DEPRECATED; //### remove for KDE 4.0 + bool weekStartsMonday() const TDE_DEPRECATED; //### remove for KDE 4.0 /** * Use this to determine which day is the first day of the week. @@ -542,7 +542,7 @@ public: * \endcode * to the applicable file. */ - TQString monthName(int i, bool shortName = false) const KDE_DEPRECATED; + TQString monthName(int i, bool shortName = false) const TDE_DEPRECATED; /** * @deprecated @@ -567,7 +567,7 @@ public: * \endcode * to the applicable file. */ - TQString monthNamePossessive(int i, bool shortName = false) const KDE_DEPRECATED; + TQString monthNamePossessive(int i, bool shortName = false) const TDE_DEPRECATED; /** * @deprecated use calendar()->weekDayName @@ -579,7 +579,7 @@ public: * * @return The name of the day */ - TQString weekDayName(int i, bool shortName = false) const KDE_DEPRECATED; + TQString weekDayName(int i, bool shortName = false) const TDE_DEPRECATED; /** * Returns a pointer to the calendar system object. @@ -880,7 +880,7 @@ public: * * @param start True if Monday is the first day in the week */ - void setWeekStartsMonday(bool start) KDE_DEPRECATED; //### remove for KDE 4.0 + void setWeekStartsMonday(bool start) TDE_DEPRECATED; //### remove for KDE 4.0 /** * Changes how TDELocale defines the first day in week. @@ -1148,7 +1148,7 @@ private: * @deprecated * use formatMoney(double) */ - TQString formatMoney(const TQString &numStr) const KDE_DEPRECATED; + TQString formatMoney(const TQString &numStr) const TDE_DEPRECATED; /** * @deprecated @@ -1156,19 +1156,19 @@ private: * * @return String containing language codes separated by colons */ - TQString languages() const KDE_DEPRECATED; + TQString languages() const TDE_DEPRECATED; /** * @deprecated * @return True */ - bool setCharset(const TQString & charset) KDE_DEPRECATED; + bool setCharset(const TQString & charset) TDE_DEPRECATED; /** * @deprecated * @see encoding */ - TQString charset() const KDE_DEPRECATED; + TQString charset() const TDE_DEPRECATED; protected: /** @@ -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/tdestdaccel.h b/tdecore/tdestdaccel.h index e39b090b9..735c11dd0 100644 --- a/tdecore/tdestdaccel.h +++ b/tdecore/tdestdaccel.h @@ -452,22 +452,22 @@ namespace TDEStdAccel * @deprecated * Obsolete. Use name(). Returns a string representation for @p accel. */ - TDECORE_EXPORT TQString action(StdAccel id) KDE_DEPRECATED; + TDECORE_EXPORT TQString action(StdAccel id) TDE_DEPRECATED; /** * @deprecated * Obsolete. Use desc(). Returns a localized description of @p accel. */ - TDECORE_EXPORT TQString description(StdAccel id) KDE_DEPRECATED; + TDECORE_EXPORT TQString description(StdAccel id) TDE_DEPRECATED; /** * @deprecated * Obsolete. Use shortcut(). Returns the keybinding for @p accel. */ - TDECORE_EXPORT int key(StdAccel) KDE_DEPRECATED; + TDECORE_EXPORT int key(StdAccel) TDE_DEPRECATED; /** * @deprecated * Obsolete. Use shortcutDefault(). */ - TDECORE_EXPORT int defaultKey(StdAccel accel) KDE_DEPRECATED; + TDECORE_EXPORT int defaultKey(StdAccel accel) TDE_DEPRECATED; /** * @deprecated. Use KKey(const TQKeyEvent*) == KKey(int). @@ -484,7 +484,7 @@ namespace TDEStdAccel * * @return true if the int value matches the integer representation of the QKeyEvent */ - TDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) KDE_DEPRECATED; + TDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) TDE_DEPRECATED; #endif // !KDE_NO_COMPAT } 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/twin.h b/tdecore/twin.h index 141edeffc..53d697131 100644 --- a/tdecore/twin.h +++ b/tdecore/twin.h @@ -110,7 +110,7 @@ public: * @deprecated Consider using activateWindow(), use forceActiveWindow() * only if necessary. */ - static void setActiveWindow( WId win ) KDE_DEPRECATED; + static void setActiveWindow( WId win ) TDE_DEPRECATED; /** * When application finishes some operation and wants to notify @@ -502,7 +502,7 @@ public: * @deprecated * Use windowInfo() . */ - static Info info( WId win ) KDE_DEPRECATED; + static Info info( WId win ) TDE_DEPRECATED; #ifdef KDE_NO_COMPAT private: @@ -511,7 +511,7 @@ private: * @deprecated * Use TDEStartupInfo::appStarted */ - static void appStarted() KDE_DEPRECATED; + static void appStarted() TDE_DEPRECATED; }; 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 ); |