diff options
Diffstat (limited to 'ktimer')
-rw-r--r-- | ktimer/ktimer.cpp | 94 | ||||
-rw-r--r-- | ktimer/ktimer.h | 6 | ||||
-rw-r--r-- | ktimer/prefwidget.ui | 6 |
3 files changed, 52 insertions, 54 deletions
diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp index 3a3cef8..9d11c4c 100644 --- a/ktimer/ktimer.cpp +++ b/ktimer/ktimer.cpp @@ -115,12 +115,12 @@ KTimerPref::KTimerPref( TQWidget *parent, const char *name ) tray->setPixmap( SmallIcon( "ktimer" ) ); // connect - connect( m_add, TQT_SIGNAL(clicked()), TQT_SLOT(add()) ); - connect( m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove()) ); - connect( m_help, TQT_SIGNAL(clicked()), TQT_SLOT(help()) ); - connect( m_list, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(currentChanged(TQListViewItem*)) ); - loadJobs( kapp->config() ); + connect( m_add, TQ_SIGNAL(clicked()), TQ_SLOT(add()) ); + connect( m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove()) ); + connect( m_help, TQ_SIGNAL(clicked()), TQ_SLOT(help()) ); + connect( m_list, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(currentChanged(TQListViewItem*)) ); + loadJobs( tdeApp->config() ); show(); } @@ -128,7 +128,7 @@ KTimerPref::KTimerPref( TQWidget *parent, const char *name ) KTimerPref::~KTimerPref() { - saveJobs( kapp->config() ); + saveJobs( tdeApp->config() ); delete d; } @@ -138,16 +138,16 @@ void KTimerPref::add() KTimerJob *job = new KTimerJob; KTimerJobItem *item = new KTimerJobItem( job, m_list ); - connect( job, TQT_SIGNAL(delayChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(valueChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(stateChanged(KTimerJob*,States)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(commandChanged(KTimerJob*,const TQString&)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)), - TQT_SLOT(jobFinished(KTimerJob*,bool)) ); + connect( job, TQ_SIGNAL(delayChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(valueChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(stateChanged(KTimerJob*,States)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(commandChanged(KTimerJob*,const TQString&)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(finished(KTimerJob*,bool)), + TQ_SLOT(jobFinished(KTimerJob*,bool)) ); job->setUser( item ); @@ -169,7 +169,7 @@ void KTimerPref::remove() void KTimerPref::help() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } @@ -192,22 +192,22 @@ void KTimerPref::currentChanged( TQListViewItem *i ) m_counter->disconnect(); m_slider->disconnect(); - connect( m_commandLine->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), - job, TQT_SLOT(setCommand(const TQString &)) ); - connect( m_delay, TQT_SIGNAL(valueChanged(int)), - job, TQT_SLOT(setDelay(int)) ); - connect( m_loop, TQT_SIGNAL(toggled(bool)), - job, TQT_SLOT(setLoop(bool)) ); - connect( m_one, TQT_SIGNAL(toggled(bool)), - job, TQT_SLOT(setOneInstance(bool)) ); - connect( m_stop, TQT_SIGNAL(clicked()), - job, TQT_SLOT(stop()) ); - connect( m_pause, TQT_SIGNAL(clicked()), - job, TQT_SLOT(pause()) ); - connect( m_start, TQT_SIGNAL(clicked()), - job, TQT_SLOT(start()) ); - connect( m_slider, TQT_SIGNAL(valueChanged(int)), - job, TQT_SLOT(setValue(int)) ); + connect( m_commandLine->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), + job, TQ_SLOT(setCommand(const TQString &)) ); + connect( m_delay, TQ_SIGNAL(valueChanged(int)), + job, TQ_SLOT(setDelay(int)) ); + connect( m_loop, TQ_SIGNAL(toggled(bool)), + job, TQ_SLOT(setLoop(bool)) ); + connect( m_one, TQ_SIGNAL(toggled(bool)), + job, TQ_SLOT(setOneInstance(bool)) ); + connect( m_stop, TQ_SIGNAL(clicked()), + job, TQ_SLOT(stop()) ); + connect( m_pause, TQ_SIGNAL(clicked()), + job, TQ_SLOT(pause()) ); + connect( m_start, TQ_SIGNAL(clicked()), + job, TQ_SLOT(start()) ); + connect( m_slider, TQ_SIGNAL(valueChanged(int)), + job, TQ_SLOT(setValue(int)) ); m_commandLine->lineEdit()->setText( job->command() ); m_delay->setValue( job->delay() ); @@ -276,16 +276,16 @@ void KTimerPref::loadJobs( TDEConfig *cfg ) KTimerJob *job = new KTimerJob; KTimerJobItem *item = new KTimerJobItem( job, m_list ); - connect( job, TQT_SIGNAL(delayChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(valueChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(stateChanged(KTimerJob*,States)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(commandChanged(KTimerJob*,const TQString&)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)), - TQT_SLOT(jobFinished(KTimerJob*,bool)) ); + connect( job, TQ_SIGNAL(delayChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(valueChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(stateChanged(KTimerJob*,States)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(commandChanged(KTimerJob*,const TQString&)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(finished(KTimerJob*,bool)), + TQ_SLOT(jobFinished(KTimerJob*,bool)) ); job->load( cfg, TQString( "Job%1" ).arg(n) ); @@ -327,7 +327,7 @@ KTimerJob::KTimerJob( TQObject *parent, const char *name ) d->user = 0; d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); + connect( d->timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); } @@ -509,8 +509,8 @@ void KTimerJob::fire() KShellProcess *proc = new KShellProcess; (*proc) << d->command; d->processes.append( proc ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(processExited(TDEProcess*)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(processExited(TDEProcess*)) ); bool ok = proc->start( TDEProcess::NotifyOnExit ); emit fired( this ); if( !ok ) { diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h index b331007..00acd6d 100644 --- a/ktimer/ktimer.h +++ b/ktimer/ktimer.h @@ -21,14 +21,14 @@ #include <tqdialog.h> #include <tqwidget.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include "prefwidget.h" class KTimerJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -90,7 +90,7 @@ class KTimerJob : public TQObject { class KTimerPref : public PrefWidget { - Q_OBJECT + TQ_OBJECT public: KTimerPref( TQWidget *parent=0, const char *name = 0 ); diff --git a/ktimer/prefwidget.ui b/ktimer/prefwidget.ui index cd5715e..eefc336 100644 --- a/ktimer/prefwidget.ui +++ b/ktimer/prefwidget.ui @@ -277,10 +277,8 @@ <includes> <include location="global" impldecl="in declaration">kseparator.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> |