diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:18:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:18:11 -0600 |
| commit | fc3c9d3c5ff6ed64cdaeaf2e9c050aa3037fe335 (patch) | |
| tree | f1e7de165d9a038aed66481b047cd32b4e1091df /tdecore | |
| parent | 00894908e7b9359d8432a615380bf3db1d4745a0 (diff) | |
| download | tdelibs-fc3c9d3c5ff6ed64cdaeaf2e9c050aa3037fe335.tar.gz tdelibs-fc3c9d3c5ff6ed64cdaeaf2e9c050aa3037fe335.zip | |
Update various qt function definitions and static methods for tqt3
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/kkeyserver_x11.cpp | 2 | ||||
| -rw-r--r-- | tdecore/kprocess.cpp | 6 | ||||
| -rw-r--r-- | tdecore/libqt-mt.nmcheck | 2 | ||||
| -rw-r--r-- | tdecore/libqt-mt_weak.nmcheck | 6 | ||||
| -rw-r--r-- | tdecore/tests/kurltest.cpp | 4 |
5 files changed, 10 insertions, 10 deletions
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" ) ); |