diff options
Diffstat (limited to 'karm/test')
| -rw-r--r-- | karm/test/README | 2 | ||||
| -rw-r--r-- | karm/test/lifetest.php | 4 | ||||
| -rw-r--r-- | karm/test/lockerthread.cpp | 2 | ||||
| -rw-r--r-- | karm/test/locking.cpp | 6 | ||||
| -rw-r--r-- | karm/test/runscripts.cpp | 2 | ||||
| -rw-r--r-- | karm/test/script.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/karm/test/README b/karm/test/README index a5307e6ee..32a32f6e2 100644 --- a/karm/test/README +++ b/karm/test/README @@ -1,6 +1,6 @@ This directory holds automated tests for karm. -It's in very rough tqshape. +It's in very rough shape. How you start: diff --git a/karm/test/lifetest.php b/karm/test/lifetest.php index afd423ccb..7a24bd3d7 100644 --- a/karm/test/lifetest.php +++ b/karm/test/lifetest.php @@ -96,7 +96,7 @@ if ($argv[1]!="--batch") echo "(b) make sure the code still builds (make)\n"; echo "(c) run automated test routines like this (make check)\n\n"; - echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardtqlayout (setxkbmap us). This must be run in X environment.\n + echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardlayout (setxkbmap us). This must be run in X environment.\n You must have XAutomation installed to run this."; system("xte -h 2&>/dev/null",$rc); if ($rc==0) echo " You have.\n"; @@ -132,7 +132,7 @@ else // the mouse can be in the way, so, move it out. This here even works with "focus strictly under mouse". system("xte 'mousemove 1 1'"); echo "\nStarting karm"; - $process=popen("karm --tqgeometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); + $process=popen("karm --geometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); $rc=1; while ($rc==1) system("dcop `dcop 2>/dev/null | grep karm` KarmDCOPIface version",$rc); echo "mainwindow is ready"; diff --git a/karm/test/lockerthread.cpp b/karm/test/lockerthread.cpp index aeff6cc76..914682210 100644 --- a/karm/test/lockerthread.cpp +++ b/karm/test/lockerthread.cpp @@ -26,7 +26,7 @@ void LockerThread::run() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( m_icsfile ); lock = calendars->requestSaveTicket( calendar ); if ( lock ) diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp index cdf5e41a5..71113f79b 100644 --- a/karm/test/locking.cpp +++ b/karm/test/locking.cpp @@ -23,7 +23,7 @@ short test1() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); lock = calendars->requestSaveTicket( calendar ); @@ -62,7 +62,7 @@ short test2() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); LockerThread thread( icalfilename ); @@ -88,7 +88,7 @@ short test3() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); // lock then unlock diff --git a/karm/test/runscripts.cpp b/karm/test/runscripts.cpp index e3a25a15f..1d9be75c1 100644 --- a/karm/test/runscripts.cpp +++ b/karm/test/runscripts.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include "script.h" diff --git a/karm/test/script.cpp b/karm/test/script.cpp index 58e5af3bc..816314368 100644 --- a/karm/test/script.cpp +++ b/karm/test/script.cpp @@ -94,7 +94,7 @@ void Script::terminate() void Script::exit() { - m_status = m_proc->exitqStatus(); + m_status = m_proc->exiStatus(); delete m_proc; m_proc = 0; } |