From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkcal/tests/testfields.cpp | 18 +++++++++--------- libkcal/tests/testrecurprevious.cpp | 2 +- libkcal/tests/testrecurrence.cpp | 2 +- libkcal/tests/testrecurrencetype.cpp | 2 +- libkcal/tests/testrecurson.cpp | 4 ++-- libkcal/tests/testresource.cpp | 6 +++--- libkcal/tests/testresource.h | 3 ++- 7 files changed, 19 insertions(+), 18 deletions(-) (limited to 'libkcal/tests') diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp index a61170888..bb95d1f32 100644 --- a/libkcal/tests/testfields.cpp +++ b/libkcal/tests/testfields.cpp @@ -58,8 +58,8 @@ int main(int argc,char **argv) return 1; } - // 2 tests... first uid should result in a syncStatus of 0. second uid - // should have a new summary and a 1 for syncStatus. + // 2 tests... first uid should result in a synctqStatus of 0. second uid + // should have a new summary and a 1 for synctqStatus. TQString uid1 = TQString::tqfromLatin1("KOrganizer-1345486115.965"); TQString uid2 = TQString::tqfromLatin1("KOrganizer-1345486115.967"); @@ -78,7 +78,7 @@ int main(int argc,char **argv) if (e->pilotId()) { kdDebug() << "Pilot ID = " << e->pilotId() << endl; - kdDebug() << "Pilot Sync Status = " << e->syncStatus() << endl; + kdDebug() << "Pilot Sync tqStatus = " << e->synctqStatus() << endl; } else { kdError() << "No Pilot ID" << endl; return 1; @@ -86,7 +86,7 @@ int main(int argc,char **argv) kdDebug() << "First test passed. Able to read fields." << endl; - e->setSyncStatus(KCal::Incidence::SYNCNONE); + e->setSynctqStatus(KCal::Incidence::SYNCNONE); TQString newSummary = TQString::tqfromLatin1("Mooo summary"); @@ -120,7 +120,7 @@ int main(int argc,char **argv) TQFile::remove( filew ); - // check for uid1--should have syncStatus of 0 + // check for uid1--should have synctqStatus of 0 e = cal2.event( uid1 ); if (!e) { kdError() << "No event for first read test" << uid1 << endl; @@ -131,13 +131,13 @@ int main(int argc,char **argv) if (e->pilotId()) { kdDebug() << "First Pilot ID = " << e->pilotId() << endl; - kdDebug() << "First Pilot Sync Status = " << e->syncStatus() << endl; + kdDebug() << "First Pilot Sync tqStatus = " << e->synctqStatus() << endl; } else { kdError() << "No Pilot ID for first test" << endl; return 1; } - if (e->syncStatus() != KCal::Incidence::SYNCNONE) { + if (e->synctqStatus() != KCal::Incidence::SYNCNONE) { kdError() << "Wrong Pilot sync status." << endl; return 1; } @@ -154,13 +154,13 @@ int main(int argc,char **argv) if (f->pilotId()) { kdDebug() << "Second Pilot ID = " << f->pilotId() << endl; - kdDebug() << "Second Pilot Sync Status = " << f->syncStatus() << endl; + kdDebug() << "Second Pilot Sync tqStatus = " << f->synctqStatus() << endl; } else { kdError() << "No Pilot ID for second read test" << endl; return 1; } - if (f->syncStatus() != KCal::Incidence::SYNCMOD) { + if (f->synctqStatus() != KCal::Incidence::SYNCMOD) { kdError() << "Wrong Pilot sync status for second read test." << endl; return 1; } diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp index ef9d62c8b..ca65dbfd2 100644 --- a/libkcal/tests/testrecurprevious.cpp +++ b/libkcal/tests/testrecurprevious.cpp @@ -109,7 +109,7 @@ int main( int argc, char **argv ) dt = dt.addSecs( -1 ); ++i; dt = incidence->recurrence()->getPreviousDateTime( dt ); - (*outstream) << dt.toString( Qt::ISODate ) << endl; + (*outstream) << dt.toString( TQt::ISODate ) << endl; } } else { if ( !dt.isValid() ) dt = TQDateTime( TQDate( 2005, 7, 31 ), TQTime( 23, 59, 59 ) ); diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp index 4d0a2faec..bc1c0d37f 100644 --- a/libkcal/tests/testrecurrence.cpp +++ b/libkcal/tests/testrecurrence.cpp @@ -105,7 +105,7 @@ int main( int argc, char **argv ) ++i; dt = dt.addSecs( 1 ); dt = incidence->recurrence()->getNextDateTime( dt ); - (*outstream) << dt.toString( Qt::ISODate ) << endl; + (*outstream) << dt.toString( TQt::ISODate ) << endl; } } else { incidence->recurrence()->dump(); diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp index 4d0a2faec..bc1c0d37f 100644 --- a/libkcal/tests/testrecurrencetype.cpp +++ b/libkcal/tests/testrecurrencetype.cpp @@ -105,7 +105,7 @@ int main( int argc, char **argv ) ++i; dt = dt.addSecs( 1 ); dt = incidence->recurrence()->getNextDateTime( dt ); - (*outstream) << dt.toString( Qt::ISODate ) << endl; + (*outstream) << dt.toString( TQt::ISODate ) << endl; } } else { incidence->recurrence()->dump(); diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp index 343bad459..fe949f6dd 100644 --- a/libkcal/tests/testrecurson.cpp +++ b/libkcal/tests/testrecurson.cpp @@ -102,14 +102,14 @@ int main( int argc, char **argv ) // Output to file for testing purposes while ( dt.year() <= 2010 ) { if ( incidence->recursOn( dt ) ) - (*outstream) << dt.toString( Qt::ISODate ) << endl; + (*outstream) << dt.toString( TQt::ISODate ) << endl; dt = dt.addDays( 1 ); } } else { dt = TQDate( 2005, 1, 1 ); while ( dt.year() < 2007 ) { if ( incidence->recursOn( dt ) ) - kdDebug(5800) << dt.toString( Qt::ISODate ) << endl; + kdDebug(5800) << dt.toString( TQt::ISODate ) << endl; dt = dt.addDays( 1 ); } } diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index cd5174e2c..682518692 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) KApplication app; KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - TQString type = TQString::null; + TQString type = TQString(); if ( args->getOption( "resource" ) ) type = TQString::fromLocal8Bit( args->getOption( "resource" ) ); KConfig *config = 0; @@ -133,9 +133,9 @@ void TestResource::runAll() bool TestResource::check(const TQString& txt, TQString a, TQString b) { if (a.isEmpty()) - a = TQString::null; + a = TQString(); if (b.isEmpty()) - b = TQString::null; + b = TQString(); if (a == b) { kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl; } diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h index 30e61aeb5..848d79886 100644 --- a/libkcal/tests/testresource.h +++ b/libkcal/tests/testresource.h @@ -26,9 +26,10 @@ namespace KCal { class ResourceCalendar; -class TestResource : public QObject +class TestResource : public TQObject { Q_OBJECT + TQ_OBJECT public: TestResource( const TQString& type, KConfig *config ); -- cgit v1.2.1