diff options
Diffstat (limited to 'KMFSysTray')
-rw-r--r-- | KMFSysTray/app.cpp | 4 | ||||
-rw-r--r-- | KMFSysTray/details_designer.ui | 4 | ||||
-rw-r--r-- | KMFSysTray/kmfiptwatcher.cpp | 8 | ||||
-rw-r--r-- | KMFSysTray/kmfsystray.cpp | 6 | ||||
-rw-r--r-- | KMFSysTray/kmfsystray.h | 2 | ||||
-rw-r--r-- | KMFSysTray/mainwidget.cpp | 2 | ||||
-rw-r--r-- | KMFSysTray/mainwidget.h | 2 | ||||
-rw-r--r-- | KMFSysTray/mainwidget_designer.ui | 6 |
8 files changed, 17 insertions, 17 deletions
diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp index e565526..1e3d906 100644 --- a/KMFSysTray/app.cpp +++ b/KMFSysTray/app.cpp @@ -12,7 +12,7 @@ #include "app.h" // #include <tqlcdnumber.h> -// #include <layout.h> +// #include <tqlayout.h> // // // KDE includes // #include <kglobal.h> @@ -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( slotSetRunningStatus( bool ) ) ); +// connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningtqStatus( 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 2c6a80c..a221336 100644 --- a/KMFSysTray/details_designer.ui +++ b/KMFSysTray/details_designer.ui @@ -424,7 +424,7 @@ <property name="text"> <string>Table:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -458,7 +458,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> diff --git a/KMFSysTray/kmfiptwatcher.cpp b/KMFSysTray/kmfiptwatcher.cpp index ae472c5..1ff7024 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" ).arg( kapp->dcopClient() ->appId() ) ); + // KMessageBox::information( 0, i18n( "Error with DCOP: %1" ).tqarg( 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" ).arg(result) ); + // KMessageBox::information( 0, i18n( "Got answer %1" ).tqarg(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<IPTRule> *used = new TQPtrList<IPTRule>; for ( int i = 0; i < result; i++ ) { - TQString rn = TQString("rule_%1").arg( i ); + TQString rn = TQString("rule_%1").tqarg( 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").arg( i ); + TQString rn = TQString("rule_%1").tqarg( i ); if ( rn == found_rule->name() ) { found = true; } diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp index 4d18c9b..28454d7 100644 --- a/KMFSysTray/kmfsystray.cpp +++ b/KMFSysTray/kmfsystray.cpp @@ -21,7 +21,7 @@ // QT includes #include <tqlcdnumber.h> -#include <layout.h> +#include <tqlayout.h> // KDE includes #include <kglobal.h> @@ -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( slotSetRunningStatus( bool ) ) ); + connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), this, TQT_SLOT( slotSetRunningtqStatus( 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::slotSetRunningStatus( bool on ) { +void KMFSysTray::slotSetRunningtqStatus( bool on ) { if ( on ) { baseIcon = KSystemTray::loadIcon( "kmyfirewall" ); } else { diff --git a/KMFSysTray/kmfsystray.h b/KMFSysTray/kmfsystray.h index 7130a8e..e9b6f92 100644 --- a/KMFSysTray/kmfsystray.h +++ b/KMFSysTray/kmfsystray.h @@ -54,7 +54,7 @@ public: virtual void preferences(); public slots: - void slotSetRunningStatus( bool on ); + void slotSetRunningtqStatus( bool on ); void slotLaunchKMF(); void slotShowDetails(); void slotQueryDetails(); diff --git a/KMFSysTray/mainwidget.cpp b/KMFSysTray/mainwidget.cpp index 14387f5..f3f214f 100644 --- a/KMFSysTray/mainwidget.cpp +++ b/KMFSysTray/mainwidget.cpp @@ -49,7 +49,7 @@ MainWidget::~MainWidget() { } -void MainWidget::slotSetRunningStatus( bool on ) { +void MainWidget::slotSetRunningtqStatus( bool on ) { m_ledActive->on(); m_cmd_info->setEnabled( on ); if ( on ) { diff --git a/KMFSysTray/mainwidget.h b/KMFSysTray/mainwidget.h index 92329ef..1e9b371 100644 --- a/KMFSysTray/mainwidget.h +++ b/KMFSysTray/mainwidget.h @@ -37,7 +37,7 @@ public: /*$PUBLIC_FUNCTIONS$*/ public slots: - void slotSetRunningStatus( bool ); + void slotSetRunningtqStatus( bool ); void slotDetailsClosed(); protected: diff --git a/KMFSysTray/mainwidget_designer.ui b/KMFSysTray/mainwidget_designer.ui index bc32b8a..06cd24c 100644 --- a/KMFSysTray/mainwidget_designer.ui +++ b/KMFSysTray/mainwidget_designer.ui @@ -37,13 +37,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>30</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>30</height> @@ -52,7 +52,7 @@ <property name="state"> <enum>On</enum> </property> - <property name="shape"> + <property name="tqshape"> <enum>Circular</enum> </property> <property name="look"> |