diff options
Diffstat (limited to 'karm/test')
| -rw-r--r-- | karm/test/Makefile.am | 8 | ||||
| -rw-r--r-- | karm/test/script.cpp | 16 | ||||
| -rw-r--r-- | karm/test/script.h | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am index b8da6ca6..5397d57b 100644 --- a/karm/test/Makefile.am +++ b/karm/test/Makefile.am @@ -3,12 +3,12 @@ METASOURCES = AUTO check_PROGRAMS = runscripts locking runscripts_SOURCES = script.cpp runscripts.cpp -runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE) +runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +runscripts_LDADD = $(LIB_TQT) $(LIB_TDECORE) locking_SOURCES = locking.cpp lockerthread.cpp -locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la +locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +locking_LDADD = $(LIB_TQT) $(top_builddir)/libkcal/libkcal.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) diff --git a/karm/test/script.cpp b/karm/test/script.cpp index f9fa9d9e..ab6f7579 100644 --- a/karm/test/script.cpp +++ b/karm/test/script.cpp @@ -47,14 +47,14 @@ Script::Script( const TQDir& workingDirectory ) m_proc = new TQProcess( this ); m_proc->setWorkingDirectory( workingDirectory ); - connect ( m_proc, TQT_SIGNAL( readyReadStdout() ), - this , TQT_SLOT ( stdout() ) + connect ( m_proc, TQ_SIGNAL( readyReadStdout() ), + this , TQ_SLOT ( stdout() ) ); - connect ( m_proc, TQT_SIGNAL( readyReadStderr() ), - this , TQT_SLOT ( stderr() ) + connect ( m_proc, TQ_SIGNAL( readyReadStderr() ), + this , TQ_SLOT ( stderr() ) ); - connect ( m_proc, TQT_SIGNAL( processExited() ), - this , TQT_SLOT ( exit() ) + connect ( m_proc, TQ_SIGNAL( processExited() ), + this , TQ_SLOT ( exit() ) ); } @@ -79,7 +79,7 @@ int Script::run() { m_proc->start(); // This didn't work. But Ctrl-C does. :P - //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQT_SLOT( kill() ) ); + //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQ_SLOT( kill() ) ); //while ( ! m_proc->normalExit() ); while ( m_proc->isRunning() ); return m_status; @@ -89,7 +89,7 @@ void Script::terminate() { // These both trigger processExited, so exit() will run. m_proc->tryTerminate(); - TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQT_SLOT( kill() ) ); + TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQ_SLOT( kill() ) ); } void Script::exit() diff --git a/karm/test/script.h b/karm/test/script.h index 3aad9c87..89d2d3f7 100644 --- a/karm/test/script.h +++ b/karm/test/script.h @@ -30,7 +30,7 @@ class TQStringList; class Script : public TQObject { - Q_OBJECT + TQ_OBJECT public: Script( const TQDir& workingDirectory ); |