From d737fa5621adb2f9504b4119a151615eeacba574 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:30:51 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- KMFSysTray/app.cpp | 4 ++-- KMFSysTray/details_designer.ui | 4 ++-- KMFSysTray/kmfiptwatcher.cpp | 8 ++++---- KMFSysTray/kmfsystray.cpp | 6 +++--- KMFSysTray/kmfsystray.h | 2 +- KMFSysTray/mainwidget.cpp | 2 +- KMFSysTray/mainwidget.h | 2 +- KMFSysTray/mainwidget_designer.ui | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'KMFSysTray') diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp index 1e3d906..e565526 100644 --- a/KMFSysTray/app.cpp +++ b/KMFSysTray/app.cpp @@ -12,7 +12,7 @@ #include "app.h" // #include -// #include +// #include // // // KDE includes // #include @@ -42,7 +42,7 @@ MainApp::MainApp() : KApplication() { // KConfig *ksConfig = config(); // KMFIPTWatcher *watch = new KMFIPTWatcher( this, "KMFIPTWatcher" ); // MainWidget *mainWid = new MainWidget( 0 ); -// connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningtqStatus( bool ) ) ); +// connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningStatus( bool ) ) ); // connect( watch, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ), // mainWid, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) ); diff --git a/KMFSysTray/details_designer.ui b/KMFSysTray/details_designer.ui index a221336..2c6a80c 100644 --- a/KMFSysTray/details_designer.ui +++ b/KMFSysTray/details_designer.ui @@ -424,7 +424,7 @@ Table: - + AlignVCenter @@ -458,7 +458,7 @@ Expanding - + 51 20 diff --git a/KMFSysTray/kmfiptwatcher.cpp b/KMFSysTray/kmfiptwatcher.cpp index 1ff7024..ae472c5 100644 --- a/KMFSysTray/kmfiptwatcher.cpp +++ b/KMFSysTray/kmfiptwatcher.cpp @@ -76,14 +76,14 @@ void KMFIPTWatcher::timeout() { *( new TQCString( "numChainsInTable(TQString)" ) ), params, reply_type, reply_data, false, 10000 ) ) { - // KMessageBox::information( 0, i18n( "Error with DCOP: %1" ).tqarg( kapp->dcopClient() ->appId() ) ); + // KMessageBox::information( 0, i18n( "Error with DCOP: %1" ).arg( kapp->dcopClient() ->appId() ) ); emit sigUpdateActive( false ); } else { TQDataStream answer( reply_data, IO_ReadOnly ); if ( reply_type == "int" ) { int result; answer >> result; - // KMessageBox::information( 0, i18n( "Got answer %1" ).tqarg(result) ); + // KMessageBox::information( 0, i18n( "Got answer %1" ).arg(result) ); emit sigUpdateActive( result > 0 ); } else KMessageBox::information( 0, i18n( "Calling over DCOP succeeded, but the answer had wrong type!" ) ); @@ -205,7 +205,7 @@ void KMFIPTWatcher::fetchRulesInChain( IPTChain* chain ) { answer >> result; TQPtrList *used = new TQPtrList; for ( int i = 0; i < result; i++ ) { - TQString rn = TQString("rule_%1").tqarg( i ); + TQString rn = TQString("rule_%1").arg( i ); IPTRule *rule = 0; rule = chain->ruleForName( rn ); if ( ! rule ) { @@ -221,7 +221,7 @@ void KMFIPTWatcher::fetchRulesInChain( IPTChain* chain ) { found_rule = it_rules.current(); bool found = false; for ( int i = 0; i < result; i++ ) { - TQString rn = TQString("rule_%1").tqarg( i ); + TQString rn = TQString("rule_%1").arg( i ); if ( rn == found_rule->name() ) { found = true; } diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp index 28454d7..4d18c9b 100644 --- a/KMFSysTray/kmfsystray.cpp +++ b/KMFSysTray/kmfsystray.cpp @@ -21,7 +21,7 @@ // QT includes #include -#include +#include // KDE includes #include @@ -54,7 +54,7 @@ KMFSysTray::KMFSysTray( TQWidget* w ) : KSystemTray ( w ) , DCOPObject( "KMFSys setPixmap( baseIcon ); // Connect the watch deamon - connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), this, TQT_SLOT( slotSetRunningtqStatus( bool ) ) ); + connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), this, TQT_SLOT( slotSetRunningStatus( bool ) ) ); connect( watch, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ), this, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) ); @@ -86,7 +86,7 @@ void KMFSysTray::initMenu() { } -void KMFSysTray::slotSetRunningtqStatus( bool on ) { +void KMFSysTray::slotSetRunningStatus( bool on ) { if ( on ) { baseIcon = KSystemTray::loadIcon( "kmyfirewall" ); } else { diff --git a/KMFSysTray/kmfsystray.h b/KMFSysTray/kmfsystray.h index e9b6f92..7130a8e 100644 --- a/KMFSysTray/kmfsystray.h +++ b/KMFSysTray/kmfsystray.h @@ -54,7 +54,7 @@ public: virtual void preferences(); public slots: - void slotSetRunningtqStatus( bool on ); + void slotSetRunningStatus( bool on ); void slotLaunchKMF(); void slotShowDetails(); void slotQueryDetails(); diff --git a/KMFSysTray/mainwidget.cpp b/KMFSysTray/mainwidget.cpp index f3f214f..14387f5 100644 --- a/KMFSysTray/mainwidget.cpp +++ b/KMFSysTray/mainwidget.cpp @@ -49,7 +49,7 @@ MainWidget::~MainWidget() { } -void MainWidget::slotSetRunningtqStatus( bool on ) { +void MainWidget::slotSetRunningStatus( bool on ) { m_ledActive->on(); m_cmd_info->setEnabled( on ); if ( on ) { diff --git a/KMFSysTray/mainwidget.h b/KMFSysTray/mainwidget.h index 1e9b371..92329ef 100644 --- a/KMFSysTray/mainwidget.h +++ b/KMFSysTray/mainwidget.h @@ -37,7 +37,7 @@ public: /*$PUBLIC_FUNCTIONS$*/ public slots: - void slotSetRunningtqStatus( bool ); + void slotSetRunningStatus( bool ); void slotDetailsClosed(); protected: diff --git a/KMFSysTray/mainwidget_designer.ui b/KMFSysTray/mainwidget_designer.ui index 06cd24c..bc32b8a 100644 --- a/KMFSysTray/mainwidget_designer.ui +++ b/KMFSysTray/mainwidget_designer.ui @@ -37,13 +37,13 @@ 0 - + 30 30 - + 30 30 @@ -52,7 +52,7 @@ On - + Circular -- cgit v1.2.1