diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /karm/test | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
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
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.h | 2 | ||||
-rw-r--r-- | karm/test/runscripts.cpp | 4 | ||||
-rw-r--r-- | karm/test/script.cpp | 2 | ||||
-rw-r--r-- | karm/test/script.h | 3 |
6 files changed, 9 insertions, 8 deletions
diff --git a/karm/test/README b/karm/test/README index 31dbc8d2..c245b182 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 shape. +It's in very rough tqshape. How you start: diff --git a/karm/test/lifetest.php b/karm/test/lifetest.php index 7a24bd3d..afd423cc 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 keyboardlayout (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 keyboardtqlayout (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 --geometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); + $process=popen("karm --tqgeometry 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.h b/karm/test/lockerthread.h index 3aee4a6a..38b5b1f0 100644 --- a/karm/test/lockerthread.h +++ b/karm/test/lockerthread.h @@ -7,7 +7,7 @@ class TQString; * * Result of attempt returned by gotlock(). */ -class LockerThread : public QThread +class LockerThread : public TQThread { public: LockerThread( const TQString &filename ); diff --git a/karm/test/runscripts.cpp b/karm/test/runscripts.cpp index 1b44f482..e3a25a15 100644 --- a/karm/test/runscripts.cpp +++ b/karm/test/runscripts.cpp @@ -73,8 +73,8 @@ int runscripts dir.setNameFilter( extension ); dir.setFilter( TQDir::Files ); dir.setSorting( TQDir::Name | TQDir::IgnoreCase ); - const QFileInfoList *list = dir.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = dir.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( !rval && ( fi = it.current() ) != 0 ) { diff --git a/karm/test/script.cpp b/karm/test/script.cpp index 81631436..58e5af3b 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->exiStatus(); + m_status = m_proc->exitqStatus(); delete m_proc; m_proc = 0; } diff --git a/karm/test/script.h b/karm/test/script.h index 207d64b5..2f564750 100644 --- a/karm/test/script.h +++ b/karm/test/script.h @@ -28,9 +28,10 @@ class TQProcess; class TQString; class TQStringList; -class Script : public QObject +class Script : public TQObject { Q_OBJECT + TQ_OBJECT public: Script( const TQDir& workingDirectory ); virtual ~Script(); |