diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus index ccf2cad97..8c53af8b9 100644 --- a/dcop/dcopidlng/kalyptus +++ b/dcop/dcopidlng/kalyptus @@ -111,7 +111,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); QT_NO_REMOTE => 'QT_NO_REMOTE', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', Q_WS_X11 => 'Q_WS_X11', - Q_DISABLE_COPY => 'Q_DISABLE_COPY', + TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', Q_WS_QWS => 'undef', Q_WS_MAC => 'undef', Q_OBJECT => <<'CODE', @@ -713,7 +713,7 @@ sub identifyDecl elsif ( $decl =~ /^\s*((?:template\s*<.*>)?) # 1 template \s*(class|struct|union|namespace) # 2 struct type \s*([A-Z_]*EXPORT[A-Z_]*)? # 3 export - (?:\s*Q_PACKED)? + (?:\s*TQ_PACKED)? (?:\s*Q_REFCOUNT)? \s+([\w_]+ # 4 name (?:<[\w_ :,]+?>)? # maybe explicit template diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h index 6551295f6..4a135b9d9 100644 --- a/dcop/kdatastream.h +++ b/dcop/kdatastream.h @@ -19,7 +19,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b) } #endif // USE_QT3 -#if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) +#if TQT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) inline TQDataStream & operator << (TQDataStream & str, long long int ll) { TQ_UINT32 l1,l2; diff --git a/kab/addressbook.cc b/kab/addressbook.cc index 9795c42a7..ec5f97244 100644 --- a/kab/addressbook.cc +++ b/kab/addressbook.cc @@ -162,7 +162,7 @@ bool AddressBook::Entry::Address::nameOfField(const char* key, TQString& value) // as fields is static int counter=0; fields=new KeyNameMap; - Q_CHECK_PTR(fields); + TQ_CHECK_PTR(fields); if(!fields->insert (map >::value_type (Fields[counter++], i18n("Headline"))).second @@ -257,7 +257,7 @@ bool AddressBook::Entry::nameOfField(const char* key, TQString& value) // as fields is static int counter=0; fields=new KeyNameMap; - Q_CHECK_PTR(fields); + TQ_CHECK_PTR(fields); if(!fields->insert (map >::value_type (Fields[counter++], i18n("person","Title"))).second @@ -2003,7 +2003,7 @@ AddressBook::ErrorCode AddressBook::categories(CategoriesMap& cat) StringStringMap::iterator pos; // ----- query categories section: section=categoriesSection(); - Q_CHECK_PTR(section); + TQ_CHECK_PTR(section); // ----- if(!section->find(KAB_CATEGORY_KEY, categories)) { diff --git a/kab/kabapi.cc b/kab/kabapi.cc index 0cf97905c..a6b6da682 100644 --- a/kab/kabapi.cc +++ b/kab/kabapi.cc @@ -39,7 +39,7 @@ KabAPI::KabAPI(TQWidget* parent, const char* name) listbox(new KListBox(this)), selection(-1) { - Q_CHECK_PTR(listbox); + TQ_CHECK_PTR(listbox); setMainWidget(listbox); showButtonApply(false); enableButtonSeparator(true); @@ -141,7 +141,7 @@ AddressBook::ErrorCode KabAPI::add(const AddressBook::Entry& entry, KabKey& key, AddressBook::ErrorCode KabAPI::remove(const KabKey& key) { - Q_CHECK_PTR(book); + TQ_CHECK_PTR(book); // ############################################################################ if(book->AddressBook::remove(key)==AddressBook::NoError) { diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml index 4b27772dd..e1ba132d3 100644 --- a/kate/data/cpp.xml +++ b/kate/data/cpp.xml @@ -87,7 +87,7 @@ Q_ARG Q_ASSERT Q_ASSERT_X - Q_CHECK_PTR + TQ_CHECK_PTR Q_CLASSINFO Q_CLEANUP_RESOURCE Q_D @@ -100,7 +100,7 @@ Q_DECLARE_PUBLIC Q_DECLARE_SHARED Q_DECLARE_TYPEINFO - Q_DISABLE_COPY + TQ_DISABLE_COPY Q_ENUMS Q_EXPORT Q_FLAGS diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml index bf038d4a2..1552d264a 100644 --- a/kate/data/objectivecpp.xml +++ b/kate/data/objectivecpp.xml @@ -109,7 +109,7 @@ Q_DECLARE_PUBLIC Q_D Q_Q - Q_DISABLE_COPY + TQ_DISABLE_COPY Q_INTERFACES Q_FLAGS Q_SCRIPTABLE diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp index 2e0d86b98..b42feefee 100644 --- a/khtml/test_regression_fontoverload.cpp +++ b/khtml/test_regression_fontoverload.cpp @@ -245,7 +245,7 @@ TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp, // fe->setScale( scale ); QFontCache::Key key( request, script, fp->screen -#if QT_VERSION >= 0x030308 +#if TQT_VERSION >= 0x030308 , fp->paintdevice #endif ); diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 179b69f72..1e9d3a130 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -46,7 +46,7 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) : TQObject(parent,name) { - dfProc = new KProcess(); Q_CHECK_PTR(dfProc); + dfProc = new KProcess(); TQ_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ), this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) ); diff --git a/kstyles/klegacy/klegacystyle.h b/kstyles/klegacy/klegacystyle.h index ebe08e8db..18c073f9a 100644 --- a/kstyles/klegacy/klegacystyle.h +++ b/kstyles/klegacy/klegacystyle.h @@ -137,7 +137,7 @@ protected: private: KLegacyStylePrivate *priv; -#if defined(Q_DISABLE_COPY) +#if defined(TQ_DISABLE_COPY) KLegacyStyle( const KLegacyStyle & ); KLegacyStyle& operator=( const KLegacyStyle & ); #endif diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp index 8fa37ebcf..54df04e60 100644 --- a/tdecore/kkeyserver_x11.cpp +++ b/tdecore/kkeyserver_x11.cpp @@ -234,7 +234,7 @@ static const TransKey g_rgQtToSymX[] = { '-', XK_KP_Subtract }, { '+', XK_KP_Add }, { Qt::Key_Return, XK_KP_Enter } -#if QT_VERSION >= 0x030100 +#if TQT_VERSION >= 0x030100 // the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special // multimedia keys. They are included here as not every system has them. diff --git a/tdecore/kprocess.cpp b/tdecore/kprocess.cpp index f13813d15..3658116ab 100644 --- a/tdecore/kprocess.cpp +++ b/tdecore/kprocess.cpp @@ -957,7 +957,7 @@ int KProcess::commSetupDoneP() if (communication & Stdin) { fcntl(in[1], F_SETFL, O_NONBLOCK | fcntl(in[1], F_GETFL)); innot = new TQSocketNotifier(in[1], TQSocketNotifier::Write, this); - Q_CHECK_PTR(innot); + 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))); @@ -965,7 +965,7 @@ int KProcess::commSetupDoneP() if (communication & Stdout) { outnot = new TQSocketNotifier(out[0], TQSocketNotifier::Read, this); - Q_CHECK_PTR(outnot); + TQ_CHECK_PTR(outnot); TQObject::connect(outnot, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChildOutput(int))); if (communication & NoRead) @@ -974,7 +974,7 @@ int KProcess::commSetupDoneP() if (communication & Stderr) { errnot = new TQSocketNotifier(err[0], TQSocketNotifier::Read, this ); - Q_CHECK_PTR(errnot); + TQ_CHECK_PTR(errnot); TQObject::connect(errnot, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChildError(int))); } diff --git a/tdecore/libqt-mt.nmcheck b/tdecore/libqt-mt.nmcheck index 77b200029..d50a46eb8 100644 --- a/tdecore/libqt-mt.nmcheck +++ b/tdecore/libqt-mt.nmcheck @@ -9,7 +9,7 @@ qDebug qFatal qWarning qApp -qAppName +tqAppName qVersion qSysInfo qObsolete diff --git a/tdecore/libqt-mt_weak.nmcheck b/tdecore/libqt-mt_weak.nmcheck index d0b00eee4..86aa52e3f 100644 --- a/tdecore/libqt-mt_weak.nmcheck +++ b/tdecore/libqt-mt_weak.nmcheck @@ -5,7 +5,7 @@ Q*::* qstrcmp qstrcpy -qstrlen +tqstrlen qAlpha qRed qGreen @@ -13,8 +13,8 @@ qBlue qGray qRgba qRgb -qSwap -qCopy +tqSwap +tqCopy qHeapSort qHeapSortHelper qHeapSortPushDown diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp index e5176aa9a..57ef996e1 100644 --- a/tdecore/tests/kurltest.cpp +++ b/tdecore/tests/kurltest.cpp @@ -816,7 +816,7 @@ int main(int argc, char *argv[]) check("host",ulong.host(),"swww.gad.de"); check("path",ulong.path(),"/servlet/CookieAccepted"); -#if QT_VERSION < 300 +#if TQT_VERSION < 300 qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); #else TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); @@ -861,7 +861,7 @@ int main(int argc, char *argv[]) testAdjustPath(); -#if QT_VERSION < 300 +#if TQT_VERSION < 300 qt_set_locale_codec( KGlobal::charsets()->codecForName( "koi8-r" ) ); #else TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) ); diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp index 89d558496..ce84e2f50 100644 --- a/tdefx/kstyle.cpp +++ b/tdefx/kstyle.cpp @@ -597,7 +597,7 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, else // General handle, probably a kicker applet handle. drawKStylePrimitive( KPE_GeneralHandle, p, widget, r, cg, flags, opt ); -#if QT_VERSION >= 0x030300 +#if TQT_VERSION >= 0x030300 #ifdef HAVE_XRENDER } else if ( d->semiTransparentRubberband && pe == TQStyle::PE_RubberBand ) { TQRect rect = r.normalize(); diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index b79c76240..67fbd98ca 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -96,7 +96,7 @@ KMFactory::KMFactory() m_implementation = 0; m_factory = 0; m_printconfig = 0; -#if QT_VERSION >= 230 +#if TQT_VERSION >= 230 // Qt's default behavior, to generate EPS in some cases and not in others, sucks. // This is fixed in Qt 3.0, but for Qt 2.x we need to disable it explicitly. // If this is a problem for anyone, we can add a public method to set this flag. @@ -134,7 +134,7 @@ KMManager* KMFactory::manager() { if (!m_manager) createManager(); - Q_CHECK_PTR(m_manager); + TQ_CHECK_PTR(m_manager); return m_manager; } @@ -142,7 +142,7 @@ KMJobManager* KMFactory::jobManager() { if (!m_jobmanager) createJobManager(); - Q_CHECK_PTR(m_jobmanager); + TQ_CHECK_PTR(m_jobmanager); return m_jobmanager; } @@ -150,7 +150,7 @@ KMUiManager* KMFactory::uiManager() { if (!m_uimanager) createUiManager(); - Q_CHECK_PTR(m_uimanager); + TQ_CHECK_PTR(m_uimanager); return m_uimanager; } @@ -158,7 +158,7 @@ KPrinterImpl* KMFactory::printerImplementation() { if (!m_implementation) createPrinterImpl(); - Q_CHECK_PTR(m_implementation); + TQ_CHECK_PTR(m_implementation); return m_implementation; } @@ -229,7 +229,7 @@ KConfig* KMFactory::printConfig(const TQString& group) if (!m_printconfig) { m_printconfig = new KConfig("tdeprintrc"); - Q_CHECK_PTR(m_printconfig); + TQ_CHECK_PTR(m_printconfig); } if (!group.isEmpty()) m_printconfig->setGroup(group); diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index 3316244de..c0c65bd02 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -47,9 +47,9 @@ KMManager::KMManager(TQObject *parent, const char *name) m_printerfilter = new PrinterFilter(this); m_specialmgr = new KMSpecialManager(this); - Q_CHECK_PTR(m_specialmgr); + TQ_CHECK_PTR(m_specialmgr); m_virtualmgr = new KMVirtualManager(this); - Q_CHECK_PTR(m_virtualmgr); + TQ_CHECK_PTR(m_virtualmgr); // set default to true to not disturb code that // hasn't been adapted yet. Otherwise, should be false diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index 81dc5d3d5..2091fea08 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -555,7 +555,7 @@ KXmlCommandManager* KXmlCommandManager::self() if (!m_self) { m_self = new KXmlCommandManager; - Q_CHECK_PTR(m_self); + TQ_CHECK_PTR(m_self); } return m_self; } diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index 67bd25966..a7d14fe92 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -38,7 +38,7 @@ KMDriverDB* KMDriverDB::self() if (!m_self) { m_self = new KMDriverDB(); - Q_CHECK_PTR(m_self); + TQ_CHECK_PTR(m_self); } return m_self; } diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp index 1525dd875..4a7f611d8 100644 --- a/tdeprint/management/kmtimer.cpp +++ b/tdeprint/management/kmtimer.cpp @@ -29,7 +29,7 @@ KMTimer* KMTimer::self() if (!m_self) { m_self = new KMTimer(KMFactory::self(), "InternalTimer"); - Q_CHECK_PTR(m_self); + TQ_CHECK_PTR(m_self); } return m_self; } diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 094e581be..1458f88dc 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -78,7 +78,7 @@ TQCursor KCursor::handCursor() hand_cursor = new TQCursor(PointingHandCursor); } - Q_CHECK_PTR(hand_cursor); + TQ_CHECK_PTR(hand_cursor); return *hand_cursor; } @@ -135,7 +135,7 @@ TQCursor KCursor::workingCursor() working_cursor->handle(); } - Q_CHECK_PTR(working_cursor); + TQ_CHECK_PTR(working_cursor); return *working_cursor; } diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index a8c437571..7aa427937 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -125,7 +125,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu return TQString::null; } -#if QT_VERSION <= 0x030302 +#if TQT_VERSION <= 0x030302 // Work around bug in TQString::fromUtf8 (which calls strlen). TQByteArray buffer(file.size() + 1); buffer = file.readAll(); diff --git a/win/qeventloopex.cpp b/win/qeventloopex.cpp index da5eba60c..0914665db 100644 --- a/win/qeventloopex.cpp +++ b/win/qeventloopex.cpp @@ -186,13 +186,13 @@ void QEventLoopEx::registerSocketNotifier( TQSocketNotifier *notifier ) if ( ! list ) { // create new list, the QSockNotType destructor will delete it for us list = new TQPtrList; - Q_CHECK_PTR( list ); + TQ_CHECK_PTR( list ); list->setAutoDelete( TRUE ); d->sn_vec[type].list = list; } sn = new QSockNotEx; - Q_CHECK_PTR( sn ); + TQ_CHECK_PTR( sn ); sn->obj = notifier; sn->fd = sockfd; sn->queue = &d->sn_vec[type].pending_fds;