diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
tree | 30834aa632d442019e14f88685001d94657d060b /kdecore/tests | |
parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/tests')
-rw-r--r-- | kdecore/tests/kcalendartest.cpp | 2 | ||||
-rw-r--r-- | kdecore/tests/kconfigtestgui.cpp | 2 | ||||
-rw-r--r-- | kdecore/tests/kconfigtestgui.h | 2 | ||||
-rw-r--r-- | kdecore/tests/kipctest.h | 2 | ||||
-rw-r--r-- | kdecore/tests/klocaletest.cpp | 28 | ||||
-rw-r--r-- | kdecore/tests/klocaletest.h | 2 | ||||
-rw-r--r-- | kdecore/tests/kmdcodectest.cpp | 6 | ||||
-rw-r--r-- | kdecore/tests/kprocesstest.h | 2 | ||||
-rw-r--r-- | kdecore/tests/kprociotest.h | 2 | ||||
-rw-r--r-- | kdecore/tests/kresolvertest.cpp | 8 | ||||
-rw-r--r-- | kdecore/tests/ktimezonestest.cpp | 2 |
11 files changed, 29 insertions, 29 deletions
diff --git a/kdecore/tests/kcalendartest.cpp b/kdecore/tests/kcalendartest.cpp index 51a40b892..8b6e8eea4 100644 --- a/kdecore/tests/kcalendartest.cpp +++ b/kdecore/tests/kcalendartest.cpp @@ -67,7 +67,7 @@ int main(int argc, char **argv) { option = args->getOption("date"); date = KGlobal::locale()->readDate(option); } else - date = TQDate::currentDate(); + date = TQDate::tqcurrentDate(); args->clear(); // Free up some memory. diff --git a/kdecore/tests/kconfigtestgui.cpp b/kdecore/tests/kconfigtestgui.cpp index abd476396..af560b496 100644 --- a/kdecore/tests/kconfigtestgui.cpp +++ b/kdecore/tests/kconfigtestgui.cpp @@ -121,7 +121,7 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name ) pQuitButton = new TQPushButton( this, "quitbutton" ); pQuitButton->setText( "Quit" ); pQuitButton->setGeometry( 340, 60, 60, 60 ); - connect( pQuitButton, TQT_SIGNAL(clicked()), qApp, TQT_SLOT(quit()) ); + connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) ); // create a default KConfig object in order to be able to start right away pConfig = new KConfig( TQString::null ); diff --git a/kdecore/tests/kconfigtestgui.h b/kdecore/tests/kconfigtestgui.h index 8311952b5..7655c8142 100644 --- a/kdecore/tests/kconfigtestgui.h +++ b/kdecore/tests/kconfigtestgui.h @@ -39,7 +39,7 @@ // KConfigTestView contains lots of Qt widgets. // -class KConfigTestView : public QDialog +class KConfigTestView : public TQDialog { Q_OBJECT public: diff --git a/kdecore/tests/kipctest.h b/kdecore/tests/kipctest.h index a8abd2e76..17122fbd8 100644 --- a/kdecore/tests/kipctest.h +++ b/kdecore/tests/kipctest.h @@ -3,7 +3,7 @@ #include <tqobject.h> -class MyObject: public QObject +class MyObject: public TQObject { Q_OBJECT public: diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp index a980359b0..a81d867b1 100644 --- a/kdecore/tests/klocaletest.cpp +++ b/kdecore/tests/klocaletest.cpp @@ -53,7 +53,7 @@ Test::Test( TQWidget *parent, const char *name ) { setCaption("Testing KLocale"); - TQWidget *d = qApp->desktop(); + TQWidget *d = tqApp->desktop(); setGeometry((d->width()-320)>>1, (d->height()-160)>>1, 420, 420); createFields(); @@ -77,19 +77,19 @@ void Test::createFields() string+="Used language: "; string+=KGlobal::locale()->language()+"\n"; string+="Locale encoding: "; - string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n"; + string+=TQString::tqfromLatin1(KGlobal::locale()->encoding())+"\n"; string+="Localized date and time: "; - string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + string+=KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); string+="\nLocalized monetary numbers: "; string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89); // This will not work // but you can copy other *.mo file string+="\nSome localized strings:\n"; - string+=TQString::fromLatin1("Yes = ")+i18n("Yes")+"\n"; - string+=TQString::fromLatin1("No = ")+i18n("No")+"\n"; - string+=TQString::fromLatin1("Help = ")+i18n("Help")+"\n"; - string+=TQString::fromLatin1("Cancel = ")+i18n("Cancel")+"\n"; + string+=TQString::tqfromLatin1("Yes = ")+i18n("Yes")+"\n"; + string+=TQString::tqfromLatin1("No = ")+i18n("No")+"\n"; + string+=TQString::tqfromLatin1("Help = ")+i18n("Help")+"\n"; + string+=TQString::tqfromLatin1("Cancel = ")+i18n("Cancel")+"\n"; label=new TQLabel(string,this,"Label"); label->setGeometry(10,10,400,400); @@ -102,9 +102,9 @@ int main( int argc, char ** argv ) KLocale::setMainCatalogue("kdelibs"); KApplication a( argc, argv, "klocaletest" ); - KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); - KGlobal::locale()->setCountry(TQString::fromLatin1("C")); - KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(",")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("en_US")); + KGlobal::locale()->setCountry(TQString::tqfromLatin1("C")); + KGlobal::locale()->setThousandsSeparator(TQString::tqfromLatin1(",")); TQString formatted; formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00"); @@ -152,8 +152,8 @@ int main( int argc, char ** argv ) TQDate date; date.setYMD( 2002, 5, 3 ); checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); - date = TQDate::currentDate(); - checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); + date = TQDate::tqcurrentDate(); + checkDate("readDate( TQDate::tqcurrentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); TQTime time; time = KGlobal::locale()->readTime( "11:22:33", &ok ); @@ -181,11 +181,11 @@ int main( int argc, char ** argv ) check("formatTime(\"0:22\", as duration)", timeStr, "00:22" ); kdDebug() << "setLanguage C\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("C")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("C")); kdDebug() << "C: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl; kdDebug() << "setLanguage de\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("de")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de")); kdDebug() << "de: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl; diff --git a/kdecore/tests/klocaletest.h b/kdecore/tests/klocaletest.h index f88cfc901..83f4f5cef 100644 --- a/kdecore/tests/klocaletest.h +++ b/kdecore/tests/klocaletest.h @@ -9,7 +9,7 @@ class TQLabel; /** test: a small test program for KLocale */ -class Test : public QWidget +class Test : public TQWidget { Q_OBJECT diff --git a/kdecore/tests/kmdcodectest.cpp b/kdecore/tests/kmdcodectest.cpp index 243d0d289..e74d6f4b4 100644 --- a/kdecore/tests/kmdcodectest.cpp +++ b/kdecore/tests/kmdcodectest.cpp @@ -192,15 +192,15 @@ void MD5_timeTrial () time_t endTime; time_t startTime; - Q_UINT8 block[TEST_BLOCK_LEN]; - Q_UINT32 i; + TQ_UINT8 block[TEST_BLOCK_LEN]; + TQ_UINT32 i; cout << "Timing test. Digesting " << TEST_BLOCK_COUNT << " blocks of " << TEST_BLOCK_LEN << "-byte..." << endl; // Initialize block for (i = 0; i < TEST_BLOCK_LEN; i++) - block[i] = (Q_UINT8)(i & 0xff); + block[i] = (TQ_UINT8)(i & 0xff); // Start timer time (&startTime); diff --git a/kdecore/tests/kprocesstest.h b/kdecore/tests/kprocesstest.h index 3e5d989ec..23ac443dd 100644 --- a/kdecore/tests/kprocesstest.h +++ b/kdecore/tests/kprocesstest.h @@ -15,7 +15,7 @@ #include <tqobject.h> #include "kprocess.h" -class Dummy : public QObject +class Dummy : public TQObject { Q_OBJECT diff --git a/kdecore/tests/kprociotest.h b/kdecore/tests/kprociotest.h index 6392fc708..9f948e644 100644 --- a/kdecore/tests/kprociotest.h +++ b/kdecore/tests/kprociotest.h @@ -15,7 +15,7 @@ #include <tqobject.h> #include "kprocio.h" -class Dummy : public QObject +class Dummy : public TQObject { Q_OBJECT diff --git a/kdecore/tests/kresolvertest.cpp b/kdecore/tests/kresolvertest.cpp index f1d3c11f9..1b2f5148d 100644 --- a/kdecore/tests/kresolvertest.cpp +++ b/kdecore/tests/kresolvertest.cpp @@ -75,8 +75,8 @@ public: bool tryLookup(const char* node, const char *serv) { int error; - TQString _node = TQString::fromLatin1(node); - TQString _serv = TQString::fromLatin1(serv); + TQString _node = TQString::tqfromLatin1(node); + TQString _serv = TQString::tqfromLatin1(serv); printf("\tTrying to lookup %s|%s... ", node, serv); TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, 0, &error); @@ -138,8 +138,8 @@ bool try_pton() bool tryLookup6(const char *node, const char *serv) { int error; - TQString _node = TQString::fromLatin1(node); - TQString _serv = TQString::fromLatin1(serv); + TQString _node = TQString::tqfromLatin1(node); + TQString _serv = TQString::tqfromLatin1(serv); printf("\tTrying to lookup IPv6 of %s|%s... ", node, serv); TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, KExtendedSocket::ipv6Socket, &error); diff --git a/kdecore/tests/ktimezonestest.cpp b/kdecore/tests/ktimezonestest.cpp index 650cc0512..69ea7c8a1 100644 --- a/kdecore/tests/ktimezonestest.cpp +++ b/kdecore/tests/ktimezonestest.cpp @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) // Find the current offset of the UTC timezone. timezone = timezones.zone("UTC"); - printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::currentDateTime()) ); + printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::tqcurrentDateTime()) ); // Find some offsets for Europe/London. char *london = "Europe/London"; |