diff options
Diffstat (limited to 'kpilot/tests')
-rw-r--r-- | kpilot/tests/conduits/vcalconduit/exampletest.cc | 2 | ||||
-rw-r--r-- | kpilot/tests/conduits/vcalconduit/exampletest.h | 4 | ||||
-rw-r--r-- | kpilot/tests/exportdatebook.cc | 8 | ||||
-rw-r--r-- | kpilot/tests/importaddresses.cc | 4 | ||||
-rw-r--r-- | kpilot/tests/importdatebook.cc | 6 | ||||
-rw-r--r-- | kpilot/tests/mergecalendars.cc | 18 | ||||
-rw-r--r-- | kpilot/tests/testaddress.cc | 2 | ||||
-rw-r--r-- | kpilot/tests/testcategories.cc | 20 | ||||
-rw-r--r-- | kpilot/tests/testdatabase.cc | 16 | ||||
-rw-r--r-- | kpilot/tests/testdatebook.cc | 2 | ||||
-rw-r--r-- | kpilot/tests/testidmapper.cc | 14 |
11 files changed, 48 insertions, 48 deletions
diff --git a/kpilot/tests/conduits/vcalconduit/exampletest.cc b/kpilot/tests/conduits/vcalconduit/exampletest.cc index 5d6ba40d5..b16a6c3e5 100644 --- a/kpilot/tests/conduits/vcalconduit/exampletest.cc +++ b/kpilot/tests/conduits/vcalconduit/exampletest.cc @@ -8,7 +8,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( VCalConduitTest ); void VCalConduitTest::setUp() { - device = QString("testdevice"); + device = TQString("testdevice"); link = new KPilotLocalLink(0, "localLink"); syncMode = SyncAction::SyncMode::eHotSync; } diff --git a/kpilot/tests/conduits/vcalconduit/exampletest.h b/kpilot/tests/conduits/vcalconduit/exampletest.h index 137c31326..f98c14c58 100644 --- a/kpilot/tests/conduits/vcalconduit/exampletest.h +++ b/kpilot/tests/conduits/vcalconduit/exampletest.h @@ -2,7 +2,7 @@ #define EXAMPLETEST_H #include <cppunit/extensions/HelperMacros.h> -#include <qstring.h> +#include <tqstring.h> #include "kpilotlocallink.h" #include "syncAction.h" @@ -14,7 +14,7 @@ class VCalConduitTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE_END(); private: - QString device; + TQString device; KPilotLocalLink *link; SyncAction::SyncMode::Mode syncMode; diff --git a/kpilot/tests/exportdatebook.cc b/kpilot/tests/exportdatebook.cc index fcc236cca..d4cf8c53e 100644 --- a/kpilot/tests/exportdatebook.cc +++ b/kpilot/tests/exportdatebook.cc @@ -70,8 +70,8 @@ int main(int argc, char **argv) debug_level= (args->isSet("verbose")) ? 4 : 0; - QString datadir = args->getOption("data-dir"); - QString vcalfile = args->getOption("vcal-file"); + TQString datadir = args->getOption("data-dir"); + TQString vcalfile = args->getOption("vcal-file"); if (datadir.isEmpty()) { @@ -91,13 +91,13 @@ int main(int argc, char **argv) // this part taken from adcalendarbase.cpp: korgcfg.setGroup( "Time & Date" ); - QString tz(korgcfg.readEntry( "TimeZoneId" ) ); + TQString tz(korgcfg.readEntry( "TimeZoneId" ) ); DEBUGKPILOT << fname << ": KOrganizer's time zone = " << tz << endl; KCal::CalendarLocal *calendar = new KCal::CalendarLocal( tz ); */ - KCal::CalendarLocal *calendar = new KCal::CalendarLocal( QString() ); + KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString() ); if (!calendar) { diff --git a/kpilot/tests/importaddresses.cc b/kpilot/tests/importaddresses.cc index 34250b2c1..61cc513a3 100644 --- a/kpilot/tests/importaddresses.cc +++ b/kpilot/tests/importaddresses.cc @@ -67,8 +67,8 @@ int main(int argc, char **argv) #ifdef DEBUG debug_level= (args->isSet("verbose")) ? 4 : 0; #endif - QString datadir = args->getOption("data-dir"); - QString addressfile = args->getOption("address-file"); + TQString datadir = args->getOption("data-dir"); + TQString addressfile = args->getOption("address-file"); if (datadir.isEmpty()) { diff --git a/kpilot/tests/importdatebook.cc b/kpilot/tests/importdatebook.cc index b7a66080d..ebbb70122 100644 --- a/kpilot/tests/importdatebook.cc +++ b/kpilot/tests/importdatebook.cc @@ -67,8 +67,8 @@ int main(int argc, char **argv) debug_level= (args->isSet("verbose")) ? 4 : 0; - QString datadir = args->getOption("data-dir"); - QString vcalfile = args->getOption("vcal-file"); + TQString datadir = args->getOption("data-dir"); + TQString vcalfile = args->getOption("vcal-file"); if (datadir.isEmpty()) { @@ -87,7 +87,7 @@ int main(int argc, char **argv) << "], creating DatebookDB in: [" << datadir << "]" << endl; - KCal::CalendarLocal *calendar = new KCal::CalendarLocal( QString::fromLatin1("UTC") ); + KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); if (!calendar || !calendar->load( vcalfile )) { return 1; diff --git a/kpilot/tests/mergecalendars.cc b/kpilot/tests/mergecalendars.cc index 221da26b0..898eb8c06 100644 --- a/kpilot/tests/mergecalendars.cc +++ b/kpilot/tests/mergecalendars.cc @@ -63,9 +63,9 @@ int main(int argc, char **argv) int debug_level= (args->isSet("verbose")) ? 4 : 0; - QString korgfile = args->getOption("korgfile"); - QString newfile = args->getOption("newfile"); - QString category = args->getOption("category"); + TQString korgfile = args->getOption("korgfile"); + TQString newfile = args->getOption("newfile"); + TQString category = args->getOption("category"); if (korgfile.isEmpty()) { @@ -84,8 +84,8 @@ int main(int argc, char **argv) return 1; } - QString korgsave = QString("%1.updated").arg(korgfile); - QString newfilesave = QString("%1.updated").arg(newfile); + TQString korgsave = TQString("%1.updated").arg(korgfile); + TQString newfilesave = TQString("%1.updated").arg(newfile); DEBUGKPILOT << "Using korgfile: [" << korgfile << "]" << endl; @@ -96,8 +96,8 @@ int main(int argc, char **argv) DEBUGKPILOT << "Will save newfile to: [" << newfilesave << "]" << endl << endl; - KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( QString::fromLatin1("UTC") ); - KCal::CalendarLocal *calnew = new KCal::CalendarLocal( QString::fromLatin1("UTC") ); + KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); + KCal::CalendarLocal *calnew = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); if (!calkorg || !calnew) { WARNINGKPILOT << "Unable to create base calendar objects." << endl; @@ -137,7 +137,7 @@ int main(int argc, char **argv) for (newIt = newEvents.begin(); newIt != newEvents.end(); ++newIt ) { ev = *newIt; - QString uid = ev->uid(); + TQString uid = ev->uid(); if (debug_level) DEBUGKPILOT << " - Looking at event: [" << ev->summary() << "], uid: [" @@ -168,7 +168,7 @@ int main(int argc, char **argv) // that matches up with this external event's UID unsigned int numkorgremoved = 0; - QString categoryToken = category; + TQString categoryToken = category; // careful iterating and removing... KCal::Event *next = 0; diff --git a/kpilot/tests/testaddress.cc b/kpilot/tests/testaddress.cc index 0919b8c0e..5da0c4474 100644 --- a/kpilot/tests/testaddress.cc +++ b/kpilot/tests/testaddress.cc @@ -62,7 +62,7 @@ int main(int argc, char **argv) #ifdef DEBUG debug_level= (args->isSet("verbose")) ? 4 : 0; #endif - QString datadir = args->getOption("data-dir"); + TQString datadir = args->getOption("data-dir"); DEBUGKPILOT << "### testaddresses\n#\n#" << endl; diff --git a/kpilot/tests/testcategories.cc b/kpilot/tests/testcategories.cc index 1ecfebf66..aefb8b944 100644 --- a/kpilot/tests/testcategories.cc +++ b/kpilot/tests/testcategories.cc @@ -44,16 +44,16 @@ // Name of an actual DB #define MEMO_NAME "MemoDB" -QStringList categories( const PilotAppInfoBase *appinfo ) +TQStringList categories( const PilotAppInfoBase *appinfo ) { - QStringList cats; + TQStringList cats; for (unsigned int i=0; i<Pilot::CATEGORY_COUNT; i++) { - QString cat = appinfo->categoryName(i); + TQString cat = appinfo->categoryName(i); if (!cat.isEmpty()) { - QString s = CSL1("(%1:%2)").arg(i).arg(cat); + TQString s = CSL1("(%1:%2)").arg(i).arg(cat); cats.append(s); } } @@ -61,9 +61,9 @@ QStringList categories( const PilotAppInfoBase *appinfo ) return cats; } -QStringList listCategories( const QString &dir, const char *dbname ) +TQStringList listCategories( const TQString &dir, const char *dbname ) { - QStringList cats; + TQStringList cats; PilotLocalDatabase *database = new PilotLocalDatabase( dir, dbname ); if (!database->isOpen()) return cats; @@ -90,7 +90,7 @@ void badAppInfoCreation() KPILOT_DELETE( appinfo ); } -void categoryNames( const QString &dir ) +void categoryNames( const TQString &dir ) { PilotLocalDatabase *database = new PilotLocalDatabase( dir, MEMO_NAME ); if (!database->isOpen()) @@ -123,14 +123,14 @@ void categoryNames( const QString &dir ) DEBUGKPILOT << "# Expect three truncation errors and two bad category numbers." << endl; for (unsigned int i=0; i<Pilot::CATEGORY_COUNT+2; i++) { - QString name = QString::fromLatin1(funnyname+funnyname_length-i-3); + TQString name = TQString::fromLatin1(funnyname+funnyname_length-i-3); if (!appinfo->setCategoryName(i,name)) { WARNINGKPILOT << "Failed to set category " << i << " name to <" << name << ">" << endl; } else { - QString categoryname = appinfo->categoryName(i); + TQString categoryname = appinfo->categoryName(i); if (categoryname != name) { WARNINGKPILOT << "Category name " << i @@ -179,7 +179,7 @@ int main(int argc, char **argv) 0L }; - QString datadir = args->getOption("data-dir"); + TQString datadir = args->getOption("data-dir"); DEBUGKPILOT << "### testcategories\n#\n#" << endl; DEBUGKPILOT << "# Listing categories from database files.\n#" << endl; diff --git a/kpilot/tests/testdatabase.cc b/kpilot/tests/testdatabase.cc index b1a4ddbe0..02b43c6be 100644 --- a/kpilot/tests/testdatabase.cc +++ b/kpilot/tests/testdatabase.cc @@ -105,7 +105,7 @@ int checkDatabase(const char *path, recordInfo *info) { FUNCTIONSETUP; - PilotLocalDatabase db(QString::fromLatin1(path)); + PilotLocalDatabase db(TQString::fromLatin1(path)); if (!db.isOpen()) { kdDebug() << "No database " << path << endl; @@ -166,9 +166,9 @@ const char *categoryNames[4] = "impersonal" } ; -QStringList listCategories() +TQStringList listCategories() { - QStringList cats; + TQStringList cats; PilotLocalDatabase *l = new PilotLocalDatabase("./data/MemoDB"); PilotMemoInfo *m = new PilotMemoInfo(l); @@ -186,12 +186,12 @@ QStringList listCategories() for (int i=0; i<4; i++) { - QString s = m->category(i); + TQString s = m->category(i); kdDebug() << "Category " << i << ": " << (s.isEmpty() ? CSL1("<empty>") : s) << endl; cats.append(s); /* if (i<((sizeof(categoryNames) / sizeof(categoryNames[0])))) - m->setCategoryName(i,QString::fromLatin1(categoryNames[i])); + m->setCategoryName(i,TQString::fromLatin1(categoryNames[i])); */ } @@ -205,8 +205,8 @@ QStringList listCategories() int checkCategories() { - QStringList l = listCategories(); - QStringList m = listCategories(); + TQStringList l = listCategories(); + TQStringList m = listCategories(); if (l.isEmpty() || m.isEmpty()) return ERR; if (l!=m) return ERR; @@ -221,7 +221,7 @@ int checkMemo() PilotMemoInfo *m = new PilotMemoInfo(l); m->dump(); - QString c = m->category(1); + TQString c = m->category(1); if (c != CSL1("Business")) { kdDebug() << "* Category 1 is not 'Business' but " << c << endl; diff --git a/kpilot/tests/testdatebook.cc b/kpilot/tests/testdatebook.cc index 5c1da9d21..8e6cc5569 100644 --- a/kpilot/tests/testdatebook.cc +++ b/kpilot/tests/testdatebook.cc @@ -62,7 +62,7 @@ int main(int argc, char **argv) #ifdef DEBUG debug_level= (args->isSet("verbose")) ? 4 : 0; #endif - QString datadir = args->getOption("data-dir"); + TQString datadir = args->getOption("data-dir"); DEBUGKPILOT << "### testdatebook\n#\n#" << endl; diff --git a/kpilot/tests/testidmapper.cc b/kpilot/tests/testidmapper.cc index a694a4c38..8d60afc5b 100644 --- a/kpilot/tests/testidmapper.cc +++ b/kpilot/tests/testidmapper.cc @@ -33,8 +33,8 @@ #include <kapplication.h> #include <kcmdlineargs.h> -#include <qdir.h> -#include <qfile.h> +#include <tqdir.h> +#include <tqfile.h> #define TESTFILE "Testing/mapping.xml" #define CONDUIT CSL1("knotes") @@ -51,7 +51,7 @@ bool test1() delete mapper; mapper = 0l; - QFile f( TESTFILE ); + TQFile f( TESTFILE ); bool result = f.exists(); if( result ) @@ -293,15 +293,15 @@ int main(int argc, char **argv) KApplication app( false, false ); // Remove file from previous test run - QDir test( "Testing" ); + TQDir test( "Testing" ); if( !test.exists() ) { - QDir current; + TQDir current; current.mkdir( "Testing" ); } - QFile f( TESTFILE ); + TQFile f( TESTFILE ); if( f.exists() ) - QFile::remove( TESTFILE ); + TQFile::remove( TESTFILE ); if( test1() && test2() && test3() && test4() && test5() && test6() && |