diff --git a/KMFIPTInterface/iptchecker.cpp b/KMFIPTInterface/iptchecker.cpp index e69e8b5..9781c4c 100644 --- a/KMFIPTInterface/iptchecker.cpp +++ b/KMFIPTInterface/iptchecker.cpp @@ -138,7 +138,7 @@ TQStringList IPTChecker::getRuleProperties( char * table, char *chain, int ruleI target_name = iptc_get_target( my_rule, &h ); if ( target_name && (*target_name != '\0') ) { - list << TQString("%1").tqarg(target_name); + list << TQString("%1").arg(target_name); } @@ -151,7 +151,7 @@ TQStringList IPTChecker::getRuleProperties( char * table, char *chain, int ruleI } if ( t->u.user.name ) { - list << TQString("TARGET2:%1").tqarg(t->u.user.name); + list << TQString("TARGET2:%1").arg(t->u.user.name); struct iptables_target *target = find_target( target_name, TRY_LOAD ); 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 diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp index 09c5b22..891ba37 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp +++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp @@ -107,7 +107,7 @@ void KMFIPTablesCompiler::slotExportIPT() { return ; } else { answer = KMessageBox::warningYesNo( 0, i18n( "File %1 already exists!

" - "

Overwrite the existing file?

" ).tqarg( url.url() ) ); + "

Overwrite the existing file?

" ).arg( url.url() ) ); } } else { answer = 3; @@ -129,7 +129,7 @@ void KMFIPTablesCompiler::slotExportIPT() { // statusBar() ->message( i18n( "Wrote file: " ) + url.fileName() , 5000 ); } else { kdDebug() << "Couldn't upload file!!!" << tempfile.name() << endl; - KMessageBox::detailedError( 0, i18n( "

Saving file: %1 Failed.

" ).tqarg( url.url() ), + KMessageBox::detailedError( 0, i18n( "

Saving file: %1 Failed.

" ).arg( url.url() ), i18n( "

If you are working with remotely stored files " "make sure that the target host and the directory is reachable. " "

" ) ); diff --git a/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp b/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp index c4b79c7..d60adbe 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp +++ b/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp @@ -175,8 +175,8 @@ void KMFIPTablesDocumentConverter::setupPolicies( KMFGenericDoc* gendoc, KMFIPTD } void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc, IPTChain* chain, const TQString& root_chain ) { - TQPtrList& tqchildren = zone->zones(); - TQPtrListIterator it( tqchildren ); + TQPtrList& children = zone->zones(); + TQPtrListIterator it( children ); static int i = 0; while( it.current() ) { addToChains( it.current(), doc, chain, root_chain ); @@ -210,7 +210,7 @@ void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc return; rule->setDescription( i18n( "This rule forwards all traffic to\n" "chain: %1 which handles traffic for\n" - "zone: %2.").tqarg( name ).tqarg( zone->guiName() ) ); + "zone: %2.").arg( name ).arg( zone->guiName() ) ); i++; if ( ! rule ) { kdDebug() << "KMFIPTablesCompiler: WARNING Couldn't create rule: Feed in chain: " << chain->name() << endl; @@ -221,7 +221,7 @@ void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc kdDebug() << "KMFIPTablesCompiler: WARNING Couldn't find chain: " << name << endl; return; } - ch->setDescription( i18n("The Chain created to handle\nrules defined in zone %1.").tqarg( zone->guiName() ) ); + ch->setDescription( i18n("The Chain created to handle\nrules defined in zone %1.").arg( zone->guiName() ) ); TQPtrList args; if ( root_chain == Constants::InputChain_Name ) { @@ -309,7 +309,7 @@ void KMFIPTablesDocumentConverter::createZoneProtocol( IPTChain* chain, KMFProto rule->addRuleOption( s , args ); rule->setDescription( i18n( "Allow Protocol: %1\n" - "Protocol Description: %2" ).tqarg( prot->protocol()->name( ) ).tqarg( prot->protocol()->description() ) ); + "Protocol Description: %2" ).arg( prot->protocol()->name( ) ).arg( prot->protocol()->description() ) ); rule->setDescription( prot->protocol()->description() ); @@ -369,7 +369,7 @@ void KMFIPTablesDocumentConverter::createHostProtocol( IPTChain* chain, KMFNetHo } rule->setDescription( i18n( "Rule created to apply filters for host: %1\n" "Allow Protocol: %2\n" - "Protocol Description: %3" ).tqarg( host->guiName() ).tqarg( prot->protocol()->name( ) ).tqarg( prot->protocol()->description() ) ); + "Protocol Description: %3" ).arg( host->guiName() ).arg( prot->protocol()->name( ) ).arg( prot->protocol()->description() ) ); if ( ! m_errorHandler->showError( m_err ) ) return; @@ -431,9 +431,9 @@ void KMFIPTablesDocumentConverter::setupInAndOutHosts( KMFIPTDoc* iptdoc, KMFNet args.append( new TQString( host->address()->toString() ) ); rule->addRuleOption( opt, args ); if ( target == "ACCEPT" ) { - rule->setDescription( i18n("This rule allows incoming packets from trusted host: %1.").tqarg( host->guiName() ) ); + rule->setDescription( i18n("This rule allows incoming packets from trusted host: %1.").arg( host->guiName() ) ); } else { - rule->setDescription( i18n("This rule drops incoming packets from malicious host: %1.").tqarg( host->guiName() ) ); + rule->setDescription( i18n("This rule drops incoming packets from malicious host: %1.").arg( host->guiName() ) ); } rule->setTarget( target ); @@ -452,9 +452,9 @@ void KMFIPTablesDocumentConverter::setupInAndOutHosts( KMFIPTDoc* iptdoc, KMFNet return; if ( target == "ACCEPT" ) { - rule->setDescription( i18n("This rule allows outgoing packets to trusted host: %1.").tqarg( host->guiName() ) ); + rule->setDescription( i18n("This rule allows outgoing packets to trusted host: %1.").arg( host->guiName() ) ); } else { - rule->setDescription( i18n("This rule drops outgoing packets to malicious host: %1.").tqarg( host->guiName() ) ); + rule->setDescription( i18n("This rule drops outgoing packets to malicious host: %1.").arg( host->guiName() ) ); } rule->setTarget( target ); @@ -499,9 +499,9 @@ void KMFIPTablesDocumentConverter::setupForbiddenHosts( KMFIPTDoc* iptdoc , KMFN args.append( new TQString( host->address()->toString() ) ); rule->addRuleOption( opt, args ); if ( inOut =="in" ) { - rule->setDescription( i18n("This rule drops packets from forbidden client: %1.").tqarg( host->guiName() ) ); + rule->setDescription( i18n("This rule drops packets from forbidden client: %1.").arg( host->guiName() ) ); } else { - rule->setDescription( i18n("This rule drops packets to forbidden server: %1.").tqarg( host->guiName() ) ); + rule->setDescription( i18n("This rule drops packets to forbidden server: %1.").arg( host->guiName() ) ); } rule->setTarget( "DROP" ); if ( inOut =="in" ) { diff --git a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h index 9c11c4c..a67ccad 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h +++ b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h @@ -18,7 +18,7 @@ // QT includes #include #include -#include +#include // KDE includes #include diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp index 0bd0374..48c4e0d 100644 --- a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp +++ b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp @@ -186,8 +186,8 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc* zone = doc->incomingZone(); } - TQPtrList& tqchildren = zone->zones(); - TQPtrListIterator it( tqchildren ); + TQPtrList& children = zone->zones(); + TQPtrListIterator it( children ); while( it.current() ) { createIncommingACCESSRules( it.current(), doc ); ++it; @@ -198,7 +198,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc* while ( itZoneHosts.current() ) { KMFNetHost* host = dynamic_cast ( itZoneHosts.current() ); ++itZoneHosts; - m_compiledScript.append( TQString("\n# Settup rules for host %1 [%2]\n").tqarg( host->guiName() ).tqarg( zone->address()->toString() ) ); + m_compiledScript.append( TQString("\n# Settup rules for host %1 [%2]\n").arg( host->guiName() ).arg( zone->address()->toString() ) ); TQPtrList& hostProts = host->protocols(); TQPtrListIterator itHostProtocols ( hostProts ); @@ -206,7 +206,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc* KMFProtocolUsage* prot = itHostProtocols.current(); ++itHostProtocols; if ( ! host->protocolInherited( prot->protocol()->uuid() ) ) { - m_compiledScript.append( TQString("# Settup rules for protocol %1\n").tqarg( prot->protocol()->name() ) ); + m_compiledScript.append( TQString("# Settup rules for protocol %1\n").arg( prot->protocol()->name() ) ); if ( prot->protocol()->tcpPorts().count() > 0 ) { m_compiledScript.append( "pass in " ); if ( prot->logging() || host->logIncoming() ) { @@ -239,14 +239,14 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc* } } - m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").tqarg( zone->guiName() ).tqarg( zone->address()->toString() ).tqarg( zone->maskLength() ) ); + m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").arg( zone->guiName() ).arg( zone->address()->toString() ).arg( zone->maskLength() ) ); TQPtrList& zoneProts = zone->protocols(); TQPtrListIterator itZoneProtocols ( zoneProts ); while ( itZoneProtocols.current() ) { KMFProtocolUsage* prot = itZoneProtocols.current(); ++itZoneProtocols; if ( ! zone->protocolInherited( prot->protocol()->uuid() ) ) { - m_compiledScript.append( TQString("# Settup rules for protocol %1\n").tqarg( prot->protocol()->name() ) ); + m_compiledScript.append( TQString("# Settup rules for protocol %1\n").arg( prot->protocol()->name() ) ); if ( prot->protocol()->tcpPorts().count() > 0 ) { m_compiledScript.append( "pass in " ); if ( prot->logging() ) { @@ -291,8 +291,8 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc* zone = doc->outgoingZone(); } - TQPtrList& tqchildren = zone->zones(); - TQPtrListIterator it( tqchildren ); + TQPtrList& children = zone->zones(); + TQPtrListIterator it( children ); while( it.current() ) { createIncommingACCESSRules( it.current(), doc ); ++it; @@ -303,7 +303,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc* while ( itZoneHosts.current() ) { KMFNetHost* host = dynamic_cast ( itZoneHosts.current() ); ++itZoneHosts; - m_compiledScript.append( TQString("\n# Settup rules for host %1 [%2]\n").tqarg( host->guiName() ).tqarg( zone->address()->toString() ) ); + m_compiledScript.append( TQString("\n# Settup rules for host %1 [%2]\n").arg( host->guiName() ).arg( zone->address()->toString() ) ); TQPtrList& hostProts = host->protocols(); TQPtrListIterator itHostProtocols ( hostProts ); @@ -311,7 +311,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc* KMFProtocolUsage* prot = itHostProtocols.current(); ++itHostProtocols; if ( ! host->protocolInherited( prot->protocol()->uuid() ) ) { - m_compiledScript.append( TQString("# Settup rules for protocol %1\n").tqarg( prot->protocol()->name() ) ); + m_compiledScript.append( TQString("# Settup rules for protocol %1\n").arg( prot->protocol()->name() ) ); if ( prot->protocol()->tcpPorts().count() > 0 ) { m_compiledScript.append( "pass out " ); if ( prot->logging() || host->logIncoming() ) { @@ -344,14 +344,14 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc* } } - m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").tqarg( zone->guiName() ).tqarg( zone->address()->toString() ).tqarg( zone->maskLength() ) ); + m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").arg( zone->guiName() ).arg( zone->address()->toString() ).arg( zone->maskLength() ) ); TQPtrList& zoneProts = zone->protocols(); TQPtrListIterator itZoneProtocols ( zoneProts ); while ( itZoneProtocols.current() ) { KMFProtocolUsage* prot = itZoneProtocols.current(); ++itZoneProtocols; if ( ! zone->protocolInherited( prot->protocol()->uuid() ) ) { - m_compiledScript.append( TQString("# Settup rules for protocol %1\n").tqarg( prot->protocol()->name() ) ); + m_compiledScript.append( TQString("# Settup rules for protocol %1\n").arg( prot->protocol()->name() ) ); if ( prot->protocol()->tcpPorts().count() > 0 ) { m_compiledScript.append( "pass out " ); if ( prot->logging() ) { @@ -422,9 +422,9 @@ void KMFPFCompiler::setupNatRules( KMFGenericDoc* doc ) { m_compiledScript.append( "\n# Setup NAT\n" ); if ( doc->useMasquerade() ) { - m_compiledScript.append( TQString("nat on %1 from any to any -> (%2)\n").tqarg( doc->outgoingInterface() ).tqarg( doc->outgoingInterface() ) ); + m_compiledScript.append( TQString("nat on %1 from any to any -> (%2)\n").arg( doc->outgoingInterface() ).arg( doc->outgoingInterface() ) ); } else { - m_compiledScript.append( TQString("nat on %1 from any to any -> %2\n").tqarg( doc->outgoingInterface() ).tqarg( doc->natAddress()->toString() ) ); + m_compiledScript.append( TQString("nat on %1 from any to any -> %2\n").arg( doc->outgoingInterface() ).arg( doc->natAddress()->toString() ) ); } diff --git a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h index eeae699..a05e27e 100644 --- a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h +++ b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h @@ -18,7 +18,7 @@ // QT includes #include #include -#include +#include // KDE includes #include diff --git a/kmyfirewall/core/iptable.cpp b/kmyfirewall/core/iptable.cpp index 72eca1d..695981d 100644 --- a/kmyfirewall/core/iptable.cpp +++ b/kmyfirewall/core/iptable.cpp @@ -189,7 +189,7 @@ IPTChain* IPTable::addChain( const TQString& chain_name, const TQString& chain_t TQString found_name = tmp_chain->name(); if ( found_name == chain_name ) { const TQString msg = i18n( "

Chain: %1 already exists in table: %2.
" - "Please try again with another name. A chain name must be unique in a table.

" ).tqarg( found_name ).tqarg( name() ); + "Please try again with another name. A chain name must be unique in a table.

" ).arg( found_name ).arg( name() ); err->setErrType( KMFError::NORMAL ); err->setErrMsg( msg ); kdDebug() << "\n\nWARNING: Couldn't add chain because of dupilcate name\n\n" << endl; @@ -212,7 +212,7 @@ KMFError* IPTable::delChain( IPTChain *chain ) { m_err = new KMFError(); TQString name = chain->name(); if ( chain->isBuildIn() ) { - const TQString msg = i18n( "Cannot delete built-in chain: %1" ).tqarg( name ); + const TQString msg = i18n( "Cannot delete built-in chain: %1" ).arg( name ); m_err->setErrMsg( msg ); m_err->setErrType( KMFError::NORMAL ); return m_err; @@ -255,7 +255,7 @@ KMFError* IPTable::moveRuleToChain( IPTRule* rule, IPTChain *target_chain ) { } // kdDebug() << "Move Rule: " << rule->name() <<" from Chain: " << rule->chain() ->name() << "to chain" << target_chain->name() << endl; - IPTRule* new_rule = target_chain->addRule( i18n( "%1_Copy" ).tqarg( rule->name() ), m_err ); + IPTRule* new_rule = target_chain->addRule( i18n( "%1_Copy" ).arg( rule->name() ), m_err ); if ( m_err->errNum() == 0 ) { rule->createRuleClone( new_rule ); IPTRule* ru = rule; @@ -282,7 +282,7 @@ KMFError* IPTable::copyRuleToChain( IPTRule* rule, IPTChain *target_chain ) { } // kdDebug() << "Copy Rule: " << rule->name() << " from Chain: " << rule->chain() ->name() << "to chain" << target_chain->name() << endl; - IPTRule* new_rule = target_chain->addRule( i18n( "%1_Copy" ).tqarg( rule->name() ), m_err ); + IPTRule* new_rule = target_chain->addRule( i18n( "%1_Copy" ).arg( rule->name() ), m_err ); if ( m_err->errNum() == 0 ) { rule->createRuleClone( new_rule ); } diff --git a/kmyfirewall/core/iptchain.cpp b/kmyfirewall/core/iptchain.cpp index 14c4f1c..f5dfd0c 100644 --- a/kmyfirewall/core/iptchain.cpp +++ b/kmyfirewall/core/iptchain.cpp @@ -140,7 +140,7 @@ IPTRule* IPTChain::addRule( const TQString& rule_name, KMFError *err, int index TQString tmp_name = m_ruleset.at( i ) ->name(); if ( tmp_name == name ) { err->setErrType(KMFError::NORMAL); - err->setErrMsg( i18n( "

Unable to add rule: %1 into chain: %2.
There is already a rule defined with that name. Please try again with another name (must be unique in that chain).

" ).tqarg( tmp_name ).tqarg( NetfilterObject::name() ) ); + err->setErrMsg( i18n( "

Unable to add rule: %1 into chain: %2.
There is already a rule defined with that name. Please try again with another name (must be unique in that chain).

" ).arg( tmp_name ).arg( NetfilterObject::name() ) ); return 0; } } @@ -158,7 +158,7 @@ IPTRule* IPTChain::addRule( const TQString& rule_name, KMFError *err, int index } else { if ( index < 0 || index > (int) chainRuleset().count() - -1 ) { err->setErrType(KMFError::FATAL); - err->setErrMsg( i18n("Cannot insert rule at %1 This is a bug ;-(").tqarg( index ) ); + err->setErrMsg( i18n("Cannot insert rule at %1 This is a bug ;-(").arg( index ) ); return 0; } kdDebug() << "IPTChain::addRule: inserting rule at: " << index << endl; @@ -182,7 +182,7 @@ KMFError* IPTChain::delRule( IPTRule* rule ) { rule->deleteLater(); rule = 0; m_err->setErrType( KMFError::FATAL ); - const TQString& msg = i18n( "Sorry, can't find Rule: %1 in the Ruleset of this chain." ).tqarg( rule->name() ); + const TQString& msg = i18n( "Sorry, can't find Rule: %1 in the Ruleset of this chain." ).arg( rule->name() ); m_err->setErrMsg( msg ); return m_err; } @@ -192,7 +192,7 @@ KMFError* IPTChain::delRule( IPTRule* rule ) { return m_err; } else { m_err->setErrType( KMFError::FATAL ); - const TQString& msg = i18n( "Sorry, can't find Rule: %1 in the Ruleset of this chain." ).tqarg( rule->name() ); + const TQString& msg = i18n( "Sorry, can't find Rule: %1 in the Ruleset of this chain." ).arg( rule->name() ); m_err->setErrMsg( msg ); return m_err; } @@ -539,7 +539,7 @@ TQPtrList& IPTChain::createIPTablesChainRules() { } kdDebug() << chain_log << endl; TQStringList* chainDefs = new TQStringList(); - TQString rule_name = i18n( "Chain: %1 Drop Logging" ).tqarg( name() ); + TQString rule_name = i18n( "Chain: %1 Drop Logging" ).arg( name() ); chainDefs->append( rule_name ); chainDefs->append( chain_log ); all_rules->append( chainDefs ); @@ -548,7 +548,7 @@ TQPtrList& IPTChain::createIPTablesChainRules() { if ( has_default_target && !m_cmd_default_target.isEmpty() ) { TQString deftg = createIPTablesChainDefaultTarget(); TQStringList* chainDefs = new TQStringList(); - TQString rule_name = i18n( "Chain: %1 Default Target" ).tqarg( name() ); + TQString rule_name = i18n( "Chain: %1 Default Target" ).arg( name() ); chainDefs->append( rule_name ); chainDefs->append( deftg ); all_rules->append( chainDefs ); diff --git a/kmyfirewall/core/iptruleoption.cpp b/kmyfirewall/core/iptruleoption.cpp index e795766..b356d7d 100644 --- a/kmyfirewall/core/iptruleoption.cpp +++ b/kmyfirewall/core/iptruleoption.cpp @@ -132,7 +132,7 @@ void IPTRuleOption::loadXML( TQDomNode root, TQStringList& errors ) { if ( curr.nodeName() == XML::RuleOptionValue_Element ) { for ( int i = 0; i < MAXOPTNUM;i++ ) { TQDomText textChild = curr.firstChild().toText(); - TQString attrib = TQString( "value%1" ).tqarg( i ); + TQString attrib = TQString( "value%1" ).arg( i ); TQString val = curr.toElement().attribute( attrib ); if ( !val.isEmpty() && val != XML::Undefined_Value ) { @@ -199,7 +199,7 @@ const TQDomDocument& IPTRuleOption::getDOMTree() { TQDomElement tag = doc.createElement( XML::RuleOptionValue_Element ); tag.setTagName( XML::RuleOptionValue_Element ); // kdDebug() << "Writing Attribute: value" << i << " val: " << val << endl; - TQString attrib = TQString( "value%1" ).tqarg( i ); + TQString attrib = TQString( "value%1" ).arg( i ); tag.setAttribute( attrib, val ); root.appendChild( tag ); } diff --git a/kmyfirewall/core/kmfapp.cpp b/kmyfirewall/core/kmfapp.cpp index f94931a..f948b77 100644 --- a/kmyfirewall/core/kmfapp.cpp +++ b/kmyfirewall/core/kmfapp.cpp @@ -41,7 +41,7 @@ static TQLabel *splash = 0; void set_splash_status( const TQString& msg ) { if ( !splash ) return ; - splash->tqrepaint( FALSE ); + splash->repaint( FALSE ); TQPainter p( splash ); TQFont f( KGlobalSettings::generalFont().family(), 8, TQFont::Bold ); p.setFont( f ); @@ -68,14 +68,14 @@ void showSplash() { TQPainter p( &pic ); p.setFont( f ); p.setPen( TQt::white ); - p.drawText( 280, 93, TQString( "Version %1" ).tqarg( KMYFIREWALL_VERSION ) ); + p.drawText( 280, 93, TQString( "Version %1" ).arg( KMYFIREWALL_VERSION ) ); splash = new TQLabel( 0, "splash", TQWidget::WDestructiveClose | TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder | TQWidget::WX11BypassWM | TQWidget::WStyle_StaysOnTop ); splash->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); splash->setPixmap( pic ); splash->adjustSize(); - splash->setFixedSize( splash->tqsizeHint() ); + splash->setFixedSize( splash->sizeHint() ); splash->move( screen.center() - TQPoint( splash->width() / 2, splash->height() / 2 ) ); - splash->tqrepaint( FALSE ); + splash->repaint( FALSE ); splash->show(); set_splash_status( "Initializing..." ); TQApplication::flush(); diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp index 15e08f5..619fef4 100644 --- a/kmyfirewall/core/kmfdoc.cpp +++ b/kmyfirewall/core/kmfdoc.cpp @@ -22,7 +22,7 @@ #include // QT includes -#include "tqtextstream.h" +#include "textstream.h" #include "tqfile.h" #include "tqxml.h" #include "tqregexp.h" @@ -151,7 +151,7 @@ KMFError* KMFDoc::exportXMLRuleset( bool promptFile, bool asTemplate ) { return exportXMLRuleset( promptFile, asTemplate ); } else { answer = KMessageBox::questionYesNo( 0, i18n( "File %1 already exists!

" - "

Overwrite the existing file?

" ).tqarg( saveUrl.url() ) ); + "

Overwrite the existing file?

" ).arg( saveUrl.url() ) ); } } else { answer = 3; @@ -184,7 +184,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) { "

Please make sure that you have the permissions to write to this Directory.
" "If you are working with remotely stored files " "make sure that the target host and the directory is reachable. " - "

" ).tqarg( url.url() ) ); + "

" ).arg( url.url() ) ); file.unlink(); return m_err; } @@ -201,7 +201,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) { // generate retrun error object m_err -> setErrType( KMFError::NORMAL ); const TQString& msg = i18n( "Opening file %1 for writing failed.\n" - "Please make sure that you are logged in as root" ).tqarg( file.name() ); + "Please make sure that you are logged in as root" ).arg( file.name() ); m_err -> setErrMsg( msg ); file.unlink(); return m_err; @@ -211,7 +211,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) { // generate retrun error object m_err -> setErrType( KMFError::NORMAL ); const TQString& msg = i18n( "Opening file %1 for writing failed.\n" - "Please make sure that you are logged in as root" ).tqarg( file.name() ); + "Please make sure that you are logged in as root" ).arg( file.name() ); m_err -> setErrMsg( msg ); file.unlink(); return m_err; diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp index a97cf12..9454a9a 100644 --- a/kmyfirewall/core/kmfgenericdoc.cpp +++ b/kmyfirewall/core/kmfgenericdoc.cpp @@ -230,7 +230,7 @@ KMFNetZone* KMFGenericDoc::addZone( const TQString& name, KMFError* err ) { err->setErrType( KMFError::NORMAL ); err->setErrMsg( i18n( "Sorry, cannot create Zone with name '%1':
" "there already exists a zone with that name. Please try again" - " with another name that is unique within your configuration." ).tqarg(name) ); + " with another name that is unique within your configuration." ).arg(name) ); return 0; } @@ -258,7 +258,7 @@ KMFError* KMFGenericDoc::delZone( KMFNetZone* zone ) { m_err->setErrType( KMFError::NORMAL ); m_err->setErrMsg( i18n( "Sorry, cannot create Zone with name: %1.
" "There already exists a zone with that name; please try again" - " with another name that is unique within your configuration." ).tqarg( zone->name() ) ); + " with another name that is unique within your configuration." ).arg( zone->name() ) ); } return m_err; } @@ -410,7 +410,7 @@ void KMFGenericDoc::loadXML( const TQDomDocument& doc, TQStringList& errors ) { TQDomElement root = doc.documentElement(); if ( root.nodeName() != XML::GenericDoc_DocumentElement ) { kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl; - errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format %1 found! Expected kmfgrs").tqarg( root.nodeName() ) ) ); + errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format %1 found! Expected kmfgrs").arg( root.nodeName() ) ) ); return; } loadXML( root, errors ); diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp index a566dd2..1c1792a 100644 --- a/kmyfirewall/core/kmfiptdoc.cpp +++ b/kmyfirewall/core/kmfiptdoc.cpp @@ -31,7 +31,7 @@ #include // QT includes -#include +#include #include #include #include @@ -281,7 +281,7 @@ void KMFIPTDoc::loadXML( const TQDomDocument& doc, TQStringList& errors ) { TQDomElement root = doc.documentElement(); if ( root.nodeName() != XML::IPTDoc_DocumentElement ) { kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl; - errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format %1 found! Expected kmfrs").tqarg( root.nodeName() ) ) ); + errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format %1 found! Expected kmfrs").arg( root.nodeName() ) ) ); return; } loadXML( root, errors ); @@ -290,7 +290,7 @@ void KMFIPTDoc::loadXML( TQDomNode root, TQStringList& errors ) { kdDebug() << "void KMFIPTDoc::loadXML( TQDomNode root, TQStringList& errors )" << endl; if ( root.nodeName() != XML::IPTDoc_DocumentElement ) { kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl; - errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format %1 found! Expected kmfrs").tqarg( root.nodeName() ) ) ); + errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format %1 found! Expected kmfrs").arg( root.nodeName() ) ) ); return; } NetfilterObject::loadUuid( root, errors ); diff --git a/kmyfirewall/core/kmfnethost.cpp b/kmyfirewall/core/kmfnethost.cpp index 1b5cac3..d925db6 100644 --- a/kmyfirewall/core/kmfnethost.cpp +++ b/kmyfirewall/core/kmfnethost.cpp @@ -341,7 +341,7 @@ void KMFNetHost::loadXML( TQDomNode root, TQStringList& errors ) { protocol_doc.appendChild( curr.cloneNode(true) ); KMFProtocol *protocol = KMFProtocolLibrary::instance()->findProtocolByName( name ); if ( ! protocol ) { - KMFUndoEngine::instance()->log( i18n("No Protocol Found by name: %1").tqarg( name ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("No Protocol Found by name: %1").arg( name ), KMFError::OK, this ); continue; } @@ -380,7 +380,7 @@ void KMFNetHost::loadXML( TQDomNode root, TQStringList& errors ) { } if ( ! found ) { - KMFUndoEngine::instance()->log( i18n("Removing unused oldProtocolUsage: %1").tqarg( oldProtocolUsage->name() ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("Removing unused oldProtocolUsage: %1").arg( oldProtocolUsage->name() ), KMFError::OK, this ); delProtocolUsage( oldProtocolUsage, true ); } } diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp index 3a15ab6..3699920 100644 --- a/kmyfirewall/core/kmfnetwork.cpp +++ b/kmyfirewall/core/kmfnetwork.cpp @@ -286,7 +286,7 @@ void KMFNetwork::loadXML( const TQDomDocument& doc, TQStringList& errors ) { TQDomElement root = doc.documentElement(); if ( root.nodeName() != XML::KMFNetwork_DocumentElement ) { kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl; - errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format %1 found! Expected kmfnet").tqarg( root.nodeName() ) ) ); + errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format %1 found! Expected kmfnet").arg( root.nodeName() ) ) ); return; } diff --git a/kmyfirewall/core/kmfnetzone.cpp b/kmyfirewall/core/kmfnetzone.cpp index 9b4a974..0736df0 100644 --- a/kmyfirewall/core/kmfnetzone.cpp +++ b/kmyfirewall/core/kmfnetzone.cpp @@ -216,7 +216,7 @@ void KMFNetZone::setGuiName( const TQString& name ) { } TQString KMFNetZone::zoneInfo() { - return TQString("Zone: guiName: %1 name: %2 objectUuid: %3" ).tqarg( guiName() ).tqarg( name() ).tqarg( uuid() ); + return TQString("Zone: guiName: %1 name: %2 objectUuid: %3" ).arg( guiName() ).arg( name() ).arg( uuid() ); } void KMFNetZone::setMaskLength( int len ){ @@ -406,7 +406,7 @@ KMFNetZone* KMFNetZone::addZone( const TQString& name, KMFError* err ) { ++it; if ( z->name() == name ) { err->setErrType( KMFError::NORMAL ); - err->setErrMsg( i18n( "Zone %1 already exists, please try again with another name" ).tqarg( name ) ); + err->setErrMsg( i18n( "Zone %1 already exists, please try again with another name" ).arg( name ) ); return 0; } } @@ -532,7 +532,7 @@ TQString KMFNetZone::toString() { "Zone: " + address()->toString() + "/%1" + " name: " + NetfilterObject::name() + - " GUIName: " + guiName() ).tqarg(maskLength()) ; + " GUIName: " + guiName() ).arg(maskLength()) ; return ret; } @@ -901,7 +901,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) { KMFProtocol *p = KMFProtocolLibrary::instance()->findProtocolByName( name ); if ( ! p ) { - KMFUndoEngine::instance()->log( i18n("No Protocol Found by name: %1").tqarg( name ), KMFError::NORMAL, this ); + KMFUndoEngine::instance()->log( i18n("No Protocol Found by name: %1").arg( name ), KMFError::NORMAL, this ); continue; } @@ -910,7 +910,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) { if ( ! pu ) { pu = findProtocolUsageByProtocolUuid( p->uuid() ); } - KMFUndoEngine::instance()->log( i18n("Adding xml protocol: %1").tqarg( pu->name() ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("Adding xml protocol: %1").arg( pu->name() ), KMFError::OK, this ); xmlDefinedProtocols.append( pu ); } if ( curr.isElement() && ( curr.nodeName() == XML::ProtocolUsage_Element ) ) { @@ -922,7 +922,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) { if ( ! pu ) { pu = findProtocolUsageByProtocolUuid( protocolUuid ); } - KMFUndoEngine::instance()->log( i18n("Adding xml protocol: %1").tqarg( pu->name() ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("Adding xml protocol: %1").arg( pu->name() ), KMFError::OK, this ); xmlDefinedProtocols.append( pu ); } @@ -981,7 +981,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) { } if ( ! found ) { - KMFUndoEngine::instance()->log( i18n("Removing unused Zone: %1").tqarg( oldZone->guiName() ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("Removing unused Zone: %1").arg( oldZone->guiName() ), KMFError::OK, this ); delZone( oldZone, true ); } } @@ -1003,7 +1003,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) { } if ( ! found ) { - KMFUndoEngine::instance()->log( i18n("Removing unused target: %1").tqarg( oldTarget->guiName() ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("Removing unused target: %1").arg( oldTarget->guiName() ), KMFError::OK, this ); delHost( oldTarget, true ); } } @@ -1017,21 +1017,21 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) { while( itAllProtocols.current() ) { KMFProtocolUsage *oldProtocoUsagel = itAllProtocols.current(); ++itAllProtocols; - KMFUndoEngine::instance()->log( i18n("Existing protocol: %1").tqarg( oldProtocoUsagel->name() ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("Existing protocol: %1").arg( oldProtocoUsagel->name() ), KMFError::OK, this ); bool found = false; TQValueList< KMFProtocolUsage* >::iterator itProtocols; for( itProtocols = xmlDefinedProtocols.begin(); itProtocols != xmlDefinedProtocols.end() && ! found; ++itProtocols ) { KMFProtocolUsage* protocolUsage = *itProtocols; - KMFUndoEngine::instance()->log( i18n("Compare with xml protocol: %1").tqarg( protocolUsage->name() ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("Compare with xml protocol: %1").arg( protocolUsage->name() ), KMFError::OK, this ); if ( protocolUsage == oldProtocoUsagel ) { found = true; } } if ( ! found ) { - KMFUndoEngine::instance()->log( i18n("Removing unused protocol: %1").tqarg( oldProtocoUsagel->name() ), KMFError::OK, this ); + KMFUndoEngine::instance()->log( i18n("Removing unused protocol: %1").arg( oldProtocoUsagel->name() ), KMFError::OK, this ); delProtocolUsage( oldProtocoUsagel, true ); // delHost( oldTarget, true ); } diff --git a/kmyfirewall/core/kmfplugin.cpp b/kmyfirewall/core/kmfplugin.cpp index 1780bf4..1a9bcfc 100644 --- a/kmyfirewall/core/kmfplugin.cpp +++ b/kmyfirewall/core/kmfplugin.cpp @@ -85,8 +85,8 @@ void KMFPlugin::showOutput() { KMyFirewallInterface::instance()->showOutput(); } -void KMFPlugin::checktqStatus() { - KMyFirewallInterface::instance()->checktqStatus(); +void KMFPlugin::checkStatus() { + KMyFirewallInterface::instance()->checkStatus(); } } diff --git a/kmyfirewall/core/kmfplugin.h b/kmyfirewall/core/kmfplugin.h index ac2e74a..c689246 100644 --- a/kmyfirewall/core/kmfplugin.h +++ b/kmyfirewall/core/kmfplugin.h @@ -42,7 +42,7 @@ public: void setOutputWidget( TQWidget* wid ); void showEditor(); void showOutput(); - void checktqStatus(); + void checkStatus(); protected: KMFRulesetDoc* rulesetDoc(); diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp index 8d12e05..987b207 100644 --- a/kmyfirewall/core/kmfpluginfactory.cpp +++ b/kmyfirewall/core/kmfpluginfactory.cpp @@ -66,7 +66,7 @@ KParts::ReadWritePart* KMFPluginFactory::KMFMainView( KParts::MainWindow* parent return 0; } else { err->setErrType( KMFError::FATAL ); - err->setErrMsg( i18n( "Could not find %1 in the library search path." ).tqarg( libName ) ); + err->setErrMsg( i18n( "Could not find %1 in the library search path." ).arg( libName ) ); return 0; } err->setErrType( KMFError::FATAL ); diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp index 2b4e5c8..3d9c7c0 100644 --- a/kmyfirewall/core/kmfprotocollibrary.cpp +++ b/kmyfirewall/core/kmfprotocollibrary.cpp @@ -152,7 +152,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr const TQString msg = i18n( "

The file %1 could not be loaded.

" "

If you are working with files stored on remote computers " - "make sure that the network is up and the fileserver running." ).tqarg( url.url() ); + "make sure that the network is up and the fileserver running." ).arg( url.url() ); err->setErrType( KMFError::NORMAL ); err->setErrMsg( msg ); return; @@ -161,7 +161,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr KFileItem *props = new KFileItem( f_props, url ); kdDebug() << "Found file permissions: " << props->permissionsString() << endl; if ( !props->isReadable() ) { - const TQString msg = i18n( "

You don't have the permissions to read file: %1

" ).tqarg( url.url() ); + const TQString msg = i18n( "

You don't have the permissions to read file: %1

" ).arg( url.url() ); err->setErrType( KMFError::NORMAL ); err->setErrMsg( msg ); return; @@ -169,14 +169,14 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr TQString xmlfile; if ( ! KIO::NetAccess::download( url, xmlfile, KApplication::kApplication()->mainWidget() ) ) { - const TQString msg = i18n( "

Could not download file: %1

" ).tqarg( url.url() ); + const TQString msg = i18n( "

Could not download file: %1

" ).arg( url.url() ); err->setErrType( KMFError::NORMAL ); err->setErrMsg( msg ); return; } if ( xmlfile.isEmpty() ) { - const TQString msg = i18n( "

No File found at URL: %1

" ).tqarg( url.url() ); + const TQString msg = i18n( "

No File found at URL: %1

" ).arg( url.url() ); err->setErrType( KMFError::NORMAL ); err->setErrMsg( msg ); return; @@ -285,7 +285,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() { "

Please make sure that you have the permissions to write to this Directory.
" "If you are working with remotely stored files " "make sure that the target host and the directory is reachable." - "

" ).tqarg( url.url() ) ); + "

" ).arg( url.url() ) ); file.unlink(); // errH->showError( err ); return err; @@ -304,7 +304,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() { // generate retrun error object err -> setErrType( KMFError::NORMAL ); const TQString& msg = i18n( "Opening file %1 for writing failed.\n" - "Please make sure that you are logged in as root" ).tqarg( file.name() ); + "Please make sure that you are logged in as root" ).arg( file.name() ); err -> setErrMsg( msg ); file.unlink(); // errH->showError( err ); @@ -315,7 +315,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() { // generate retrun error object err -> setErrType( KMFError::NORMAL ); const TQString& msg = i18n( "Opening file %1 for writing failed.\n" - "Please make sure that you are logged in as root" ).tqarg( file.name() ); + "Please make sure that you are logged in as root" ).arg( file.name() ); err -> setErrMsg( msg ); file.unlink(); // errH->showError( err ); diff --git a/kmyfirewall/core/kmfprotocolusage.cpp b/kmyfirewall/core/kmfprotocolusage.cpp index 90e68a1..e621828 100644 --- a/kmyfirewall/core/kmfprotocolusage.cpp +++ b/kmyfirewall/core/kmfprotocolusage.cpp @@ -200,7 +200,7 @@ void KMFProtocolUsage::loadXML( TQDomNode root, TQStringList& errors ) { // kdDebug() << "Using Protocol Uuid!" << endl; KMFProtocol* prot = KMFProtocolLibrary::instance()->findProtocolByUuid( *( new TQUuid( protocolUuid ) ) ); if ( ! prot ) { - errors.append( KMFError::getAsString( KMFError::NORMAL, i18n( "Could not find Protocol: %1 in protocol Library" ).tqarg( protocolUuid ) ) ); + errors.append( KMFError::getAsString( KMFError::NORMAL, i18n( "Could not find Protocol: %1 in protocol Library" ).arg( protocolUuid ) ) ); kdDebug() << "ERROR: Could not find Protocol: " << protocolUuid << " in protocol Library" << endl; return; } @@ -211,7 +211,7 @@ void KMFProtocolUsage::loadXML( TQDomNode root, TQStringList& errors ) { KMFProtocol* prot = KMFProtocolLibrary::instance()->findProtocolByName( protocolName ); if ( ! prot ) { - errors.append( KMFError::getAsString( KMFError::NORMAL, i18n( "Could not find Protocol: %1 in protocol Library" ).tqarg( protocolName ) ) ); + errors.append( KMFError::getAsString( KMFError::NORMAL, i18n( "Could not find Protocol: %1 in protocol Library" ).arg( protocolName ) ) ); kdDebug() << "ERROR: Could not find Protocol: " << protocolName << " in protocol Library" << endl; return; } diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp index 7ea64d1..d774e19 100644 --- a/kmyfirewall/core/kmftarget.cpp +++ b/kmyfirewall/core/kmftarget.cpp @@ -233,7 +233,7 @@ KMFError* KMFTarget::tryAutoConfiguration() { kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl; emit sigTargetChanged( this ); err->setErrType( KMFError::NORMAL ); - err->setErrMsg( i18n("No autoconfigure script found for os: %1").tqarg( config()->oS() ) ); + err->setErrMsg( i18n("No autoconfigure script found for os: %1").arg( config()->oS() ) ); return err; } diff --git a/kmyfirewall/core/kmftransaction.cpp b/kmyfirewall/core/kmftransaction.cpp index f4005f5..e8d8c6d 100644 --- a/kmyfirewall/core/kmftransaction.cpp +++ b/kmyfirewall/core/kmftransaction.cpp @@ -42,7 +42,7 @@ void KMFTransaction::commit() { NetfilterObject* KMFTransaction::undo() { NetfilterObject* obj = NetfilterObject::findObject( m_objectUuid ); if ( ! obj ) { - KMFUndoEngine::instance()->log( i18n("KMFTransaction::undo() No object found with uuid: %1").tqarg( m_objectUuid ), KMFError::WARNING, 0 ); + KMFUndoEngine::instance()->log( i18n("KMFTransaction::undo() No object found with uuid: %1").arg( m_objectUuid ), KMFError::WARNING, 0 ); return 0; } if( m_undoXML.isNull() ) { @@ -58,7 +58,7 @@ NetfilterObject* KMFTransaction::undo() { NetfilterObject* KMFTransaction::redo() { NetfilterObject* obj = NetfilterObject::findObject( m_objectUuid ); if ( ! obj ) { - KMFUndoEngine::instance()->log( i18n("KMFTransaction::redo() No object found with uuid: %1").tqarg( m_objectUuid ), KMFError::WARNING, 0 ); + KMFUndoEngine::instance()->log( i18n("KMFTransaction::redo() No object found with uuid: %1").arg( m_objectUuid ), KMFError::WARNING, 0 ); return 0; } if ( m_redoXML.isNull() ) { @@ -73,8 +73,8 @@ NetfilterObject* KMFTransaction::redo() { const TQString& KMFTransaction::toString() { TQString s = ""; - s.append( i18n("Transaction: %1 uuid: %2\n" ).tqarg( name() ).tqarg( uuid().toString() ) ); - s.append( i18n("-- Changed ObjectUuid: %1").tqarg( m_objectUuid.toString() ) ); + s.append( i18n("Transaction: %1 uuid: %2\n" ).arg( name() ).arg( uuid().toString() ) ); + s.append( i18n("-- Changed ObjectUuid: %1").arg( m_objectUuid.toString() ) ); return *( new TQString( s ) ); } diff --git a/kmyfirewall/core/kmfundoengine.cpp b/kmyfirewall/core/kmfundoengine.cpp index 972eced..584f0e2 100644 --- a/kmyfirewall/core/kmfundoengine.cpp +++ b/kmyfirewall/core/kmfundoengine.cpp @@ -101,7 +101,7 @@ void KMFUndoEngine::log( const TQString& msg, int kmfErrorType = KMFError::NORMA TQString m = msg; TQString s = ""; if ( obj ) { - m.prepend( i18n("%1: ").tqarg( obj->name() ) ); + m.prepend( i18n("%1: ").arg( obj->name() ) ); } s.append( KMFError::getAsString( kmfErrorType, m ) ); emit sigLog( *( new TQString(s) ) ); @@ -110,7 +110,7 @@ void KMFUndoEngine::log( const TQString& msg, int kmfErrorType = KMFError::NORMA void KMFUndoEngine::changed ( const TQUuid& id ) { NetfilterObject* obj = NetfilterObject::findObject ( id ); if ( ! obj ) { - log( i18n("Change non exiting object id: %1.").tqarg( id ), KMFError::FATAL ); + log( i18n("Change non exiting object id: %1.").arg( id ), KMFError::FATAL ); return; } is_saved = false; @@ -118,13 +118,13 @@ void KMFUndoEngine::changed ( const TQUuid& id ) { m_app->updateCaption(); } if ( ! m_in_transaction ) { - // log( i18n("Change object: %1 without transaction.").tqarg( obj->name() ), KMFError::WARNING ); + // log( i18n("Change object: %1 without transaction.").arg( obj->name() ), KMFError::WARNING ); return; } NetfilterObject *highestAffected = NetfilterObject::findObject( m_currentTransaction->objectUuid() ); if ( ! highestAffected || obj != highestAffected && ! obj->isChildOf( highestAffected->uuid() ) ) { - log( i18n("Change object: %1 outside of declared highestAffectedObject: %2 in transaction: %3.").tqarg( obj->name() ).tqarg( highestAffected->name() ).tqarg( m_currentTransaction->name() ), KMFError::WARNING ); + log( i18n("Change object: %1 outside of declared highestAffectedObject: %2 in transaction: %3.").arg( obj->name() ).arg( highestAffected->name() ).arg( m_currentTransaction->name() ), KMFError::WARNING ); } } diff --git a/kmyfirewall/core/kmyfirewallinterface.h b/kmyfirewall/core/kmyfirewallinterface.h index 1aa2773..2cd091e 100644 --- a/kmyfirewall/core/kmyfirewallinterface.h +++ b/kmyfirewall/core/kmyfirewallinterface.h @@ -47,7 +47,7 @@ public: virtual void showEditor() = 0; virtual void showOutput() = 0; virtual void setOutputWidget( TQWidget* wid ) = 0; - virtual void checktqStatus() = 0; + virtual void checkStatus() = 0; virtual void updateCaption() = 0; virtual void enableUndo( bool ) = 0; virtual void enableRedo( bool ) = 0; diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp index 104b398..c267f4c 100644 --- a/kmyfirewall/core/kprocesswrapper.cpp +++ b/kmyfirewall/core/kprocesswrapper.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include // KDE includes #include @@ -187,7 +187,7 @@ void KProcessWrapper::slotReceivedOutput( KProcess *, char *buffer, int buflen ) *m_stderrbuf = ""; } - *m_stdoutbuf += TQString::tqfromLatin1( buffer, buflen ); + *m_stdoutbuf += TQString::fromLatin1( buffer, buflen ); m_allOut.append( *m_stdoutbuf ); m_stdOut.append( *m_stdoutbuf ); @@ -214,7 +214,7 @@ void KProcessWrapper::slotReceivedError( KProcess *, char *buffer, int buflen ) *m_stdoutbuf = ""; } - *m_stderrbuf += TQString::tqfromLatin1( buffer, buflen ); + *m_stderrbuf += TQString::fromLatin1( buffer, buflen ); m_allOut.append( *m_stderrbuf ); m_stdErr.append( *m_stderrbuf ); *m_stderrbuf = ""; diff --git a/kmyfirewall/core/netfilterobject.cpp b/kmyfirewall/core/netfilterobject.cpp index b975ee0..b7b4310 100644 --- a/kmyfirewall/core/netfilterobject.cpp +++ b/kmyfirewall/core/netfilterobject.cpp @@ -179,16 +179,16 @@ const TQString& NetfilterObject::getXMLSniplet() { void NetfilterObject::loadUuid( TQDomNode& node, TQStringList& errors ) { if ( ! node.toElement().hasAttribute( XML::Uuid_Attribute ) ) { - errors.append( KMFError::getAsString( KMFError::WARNING, i18n( "No uuid saved in node %1" ).tqarg( node.nodeName () ) ) ); + errors.append( KMFError::getAsString( KMFError::WARNING, i18n( "No uuid saved in node %1" ).arg( node.nodeName () ) ) ); return; } // if ( KMFUndoEngine::instance()->preserveObjectUuid() ) { const TQString& newUuid = node.toElement().attribute( XML::Uuid_Attribute ); if ( newUuid.isEmpty() ) { - errors.append( KMFError::getAsString( KMFError::WARNING, i18n( "No uuid saved in node %1" ).tqarg( node.nodeName () ) ) ); + errors.append( KMFError::getAsString( KMFError::WARNING, i18n( "No uuid saved in node %1" ).arg( node.nodeName () ) ) ); return; } - // KMFUndoEngine::instance()->log( i18n( "Overwrite my uuid: %1 with %2" ).tqarg( uuid().toString() ).tqarg( newUuid ), KMFError::OK, this ); + // KMFUndoEngine::instance()->log( i18n( "Overwrite my uuid: %1 with %2" ).arg( uuid().toString() ).arg( newUuid ), KMFError::OK, this ); setUuid( newUuid ); // } diff --git a/kmyfirewall/genericinterface/kmfgenericinterface.cpp b/kmyfirewall/genericinterface/kmfgenericinterface.cpp index b63ae03..19272a4 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterface.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterface.cpp @@ -24,7 +24,7 @@ // qt includes #include -#include +#include #include // kde includes diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp index ca400b6..7ed6225 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp @@ -25,7 +25,7 @@ // QT includes #include #include -#include +#include #include #include @@ -159,7 +159,7 @@ void KMFGenericInterfaceHost::slotNewHost() { KMFUndoEngine::instance()->startTransaction( m_zone, - i18n( "Add new host to zone: %1." ).tqarg( m_zone->guiName() ) + i18n( "Add new host to zone: %1." ).arg( m_zone->guiName() ) ); KMFNetHost * host = m_zone->addNetHost( i18n("New Host"), *(new TQDomDocument() ) ); if ( host ) { @@ -187,12 +187,12 @@ void KMFGenericInterfaceHost::slotDelHost() { if ( ! m_host || ! m_zone ) return; if ( KMessageBox::questionYesNo(this, i18n("Are you sure that you want to delete host " - "%1 from %2?").tqarg(m_host->guiName() ).tqarg( m_zone->guiName() ), + "%1 from %2?").arg(m_host->guiName() ).arg( m_zone->guiName() ), i18n("Are you sure?"), KStdGuiItem::yes(), KStdGuiItem::cancel(), "genericgui_hostpage_hostdelete") == KMessageBox::Yes ) { KMFUndoEngine::instance()->startTransaction( m_zone, - i18n( "Delete host: %1 from zone: %2." ).tqarg( m_host->guiName() ).tqarg( m_zone->guiName() ) + i18n( "Delete host: %1 from zone: %2." ).arg( m_host->guiName() ).arg( m_zone->guiName() ) ); m_zone->delHost( m_host ); m_host = 0; @@ -247,7 +247,7 @@ void KMFGenericInterfaceHost::slotNewItemSelected( TQListViewItem* item ){ c_log_out->setEnabled(true); c_log_in->setChecked( m_host->logIncoming() ); c_log_out->setChecked( m_host->logOutgoing() ); - l_currHost->setText( i18n( "Host: %1").tqarg( m_host->guiName() ) ); + l_currHost->setText( i18n( "Host: %1").arg( m_host->guiName() ) ); } else { kdDebug() << "KMFGenericInterfaceHost::slotNewItemSelected( TQListViewItem* item ): WARNING unknown ListView Type!!!" << endl; @@ -286,7 +286,7 @@ void KMFGenericInterfaceHost::slotHostRenamed( TQListViewItem* item, int , const } KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Rename host: %1 to %2." ).tqarg( m_host->guiName() ).tqarg( newName ) + i18n( "Rename host: %1 to %2." ).arg( m_host->guiName() ).arg( newName ) ); m_host->setGuiName( newName ); KMFUndoEngine::instance()->endTransaction(); @@ -310,7 +310,7 @@ void KMFGenericInterfaceHost::slotAddressChanged( const TQString& ) { } KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Change address of host: %1." ).tqarg( m_host->guiName() ) + i18n( "Change address of host: %1." ).arg( m_host->guiName() ) ); m_host->address()->setAddress( m_sb_host_1->text() +"."+ m_sb_host_2->text()+"."+ @@ -334,7 +334,7 @@ void KMFGenericInterfaceHost::slotHostDescChanged() { } KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Edit documentation of host: %1" ).tqarg( m_host->guiName() ) + i18n( "Edit documentation of host: %1" ).arg( m_host->guiName() ) ); m_host->setDescription( m_host_desc->text().simplifyWhiteSpace() ); KMFUndoEngine::instance()->endTransaction(); @@ -349,7 +349,7 @@ void KMFGenericInterfaceHost::slotLoggingChanged( bool ) { if ( c_log_in->isChecked() != m_host->logIncoming() ) { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Edit logging option of host: %1" ).tqarg( m_host->guiName() ) + i18n( "Edit logging option of host: %1" ).arg( m_host->guiName() ) ); m_host->setLogIncoming( c_log_in->isChecked() ); KMFUndoEngine::instance()->endTransaction(); @@ -357,7 +357,7 @@ void KMFGenericInterfaceHost::slotLoggingChanged( bool ) { if ( m_host->logOutgoing() != c_log_out->isChecked() ) { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Edit logging option of host: %1" ).tqarg( m_host->guiName() ) + i18n( "Edit logging option of host: %1" ).arg( m_host->guiName() ) ); m_host->setLogOutgoing( c_log_out->isChecked() ); KMFUndoEngine::instance()->endTransaction(); @@ -381,7 +381,7 @@ void KMFGenericInterfaceHost::slotZoneRBM( TQListViewItem* item, const TQPoint& if ( m_zone ) { m_contextMenu->clear(); TQString name = m_zone->name(); - TQString lab_str = i18n("Special Host Type: %1").tqarg( m_zone->guiName() ); + TQString lab_str = i18n("Special Host Type: %1").arg( m_zone->guiName() ); m_contextMenu->insertTitle( icon_chain, lab_str ); m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQT_SLOT( slotNewHost() ) ); m_contextMenu->popup( point ); @@ -394,7 +394,7 @@ void KMFGenericInterfaceHost::slotZoneRBM( TQListViewItem* item, const TQPoint& if ( m_host ) { m_contextMenu->clear(); TQString name = m_zone->name(); - TQString lab_str = i18n("Special Host: %1").tqarg( m_host->guiName() ); + TQString lab_str = i18n("Special Host: %1").arg( m_host->guiName() ); m_contextMenu->insertTitle( icon_chain, lab_str ); m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQT_SLOT( slotNewHost() ) ); m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) ); diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp index 3909e7c..dc75341 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp @@ -78,7 +78,7 @@ void KMFGenericInterfaceIcmp::slotEnablePingReplyToggled( bool onoff ) { } KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "%1 ping reply." ).tqarg( onoff ? i18n( "Allow" ) : i18n( "Supress" ) ) + i18n( "%1 ping reply." ).arg( onoff ? i18n( "Allow" ) : i18n( "Supress" ) ) ); if ( onoff ) { m_doc->currentDocAsGenericDoc()->setAllowPingReply( onoff ); @@ -99,7 +99,7 @@ void KMFGenericInterfaceIcmp::slotEnablePingReplyLimitToggled( bool onoff ) { KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "%1 limit ping reply." ).tqarg( onoff ? i18n( "Enable") : i18n( "Disable" ) ) + i18n( "%1 limit ping reply." ).arg( onoff ? i18n( "Enable") : i18n( "Disable" ) ) ); m_doc->currentDocAsGenericDoc()->setLimitPingReply( onoff ); KMFUndoEngine::instance()->endTransaction(); diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp index e1ec820..09c9fa2 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp @@ -90,7 +90,7 @@ void KMFGenericInterfaceLogging::slotLoggingChanged( bool onoff ) { KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "%1 logging of dropped packets." ).tqarg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) + i18n( "%1 logging of dropped packets." ).arg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) ); m_doc->currentDocAsGenericDoc()->setLogDropped( onoff ); KMFUndoEngine::instance()->endTransaction(); @@ -102,7 +102,7 @@ void KMFGenericInterfaceLogging::slotLimitChanged( bool onoff ) { } KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "%1 logging limit." ).tqarg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) + i18n( "%1 logging limit." ).arg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) ); m_doc->currentDocAsGenericDoc()->setLimitLog( onoff ); KMFUndoEngine::instance()->endTransaction(); @@ -114,7 +114,7 @@ void KMFGenericInterfaceLogging::slotLogPrefixChanged( const TQString & ) { } KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "Change logging prefix to %1." ).tqarg( m_le_logPrefix->text().simplifyWhiteSpace() ) + i18n( "Change logging prefix to %1." ).arg( m_le_logPrefix->text().simplifyWhiteSpace() ) ); m_doc->currentDocAsGenericDoc()->setLogPrefix( m_le_logPrefix->text().simplifyWhiteSpace() ); KMFUndoEngine::instance()->endTransaction(); diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp index 61b979f..f4a6946 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp @@ -135,7 +135,7 @@ void KMFGenericInterfaceNat::loadDoc( KMFNetwork* doc ) { void KMFGenericInterfaceNat::slotNatEnabled( bool onoff ) { KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "%1 NAT." ).tqarg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) + i18n( "%1 NAT." ).arg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) ); m_doc->currentDocAsGenericDoc()->setUseNat( onoff ); @@ -152,7 +152,7 @@ void KMFGenericInterfaceNat::slotMasqueradeEnabled( bool onoff ) { } KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "%1 MASTQUERADE target for NAT." ).tqarg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) + i18n( "%1 MASTQUERADE target for NAT." ).arg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) ); m_doc->currentDocAsGenericDoc()->setUseMasquerade( onoff ); KMFUndoEngine::instance()->endTransaction(); @@ -171,7 +171,7 @@ void KMFGenericInterfaceNat::slotAddressChanged( const TQString& ) { kdDebug() << "Updating NAT external address to: " << address << endl; KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "Set NAT adddress to %1." ).tqarg( address ) + i18n( "Set NAT adddress to %1." ).arg( address ) ); m_doc->currentDocAsGenericDoc()->natAddress()->setAddress( m_sb_addr_1->value(), m_sb_addr_2->value(), @@ -189,7 +189,7 @@ void KMFGenericInterfaceNat::slotExternalInterfaceChanged( const TQString& str ) KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "Change NAT outgoing interface to %1." ).tqarg( str ) + i18n( "Change NAT outgoing interface to %1." ).arg( str ) ); m_doc->currentDocAsGenericDoc()->setOutgoingInterface( str ); KMFUndoEngine::instance()->endTransaction(); diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp index c8ffeec..fbdcb31 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp @@ -28,10 +28,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include @@ -223,7 +223,7 @@ void KMFGenericInterfaceProtocol::slotNewItemSelected( TQListViewItem* item ) { if ( m_zone ) { kdDebug() << "kmfitem->zone() pointer is valid" << endl; kmfitem->setText( 0,m_zone->guiName() ); - kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) ); + kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").arg( m_zone->maskLength() ) ); m_protocolLIstView->setZone( m_zone ); m_protocolLIstView->setEnabled( true ); m_network_widget->loadZone( m_zone ); @@ -264,7 +264,7 @@ void KMFGenericInterfaceProtocol::slotZoneRBM( TQListViewItem* item, const TQPoi if ( m_zone ) { m_contextMenu->clear(); TQString name = m_zone->name(); - TQString lab_str = i18n("Zone: %1").tqarg( m_zone->guiName() ); + TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() ); m_contextMenu->insertTitle( icon_chain, lab_str ); m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQT_SLOT( slotAddHost() ) ); @@ -286,7 +286,7 @@ void KMFGenericInterfaceProtocol::slotZoneRBM( TQListViewItem* item, const TQPoi if ( m_host ) { m_contextMenu->clear(); TQString name = m_host->name(); - TQString lab_str = i18n("Host: %1").tqarg( m_host->guiName() ); + TQString lab_str = i18n("Host: %1").arg( m_host->guiName() ); m_contextMenu->insertTitle( icon_chain, lab_str ); m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) ); m_contextMenu->insertItem( icon_rename, i18n( "Delete Host..." ), this, TQT_SLOT( slotDelHost() ) ); @@ -310,7 +310,7 @@ void KMFGenericInterfaceProtocol::slotProtocolClicked( KMFProtocolUsage* protUsa } else { KMFUndoEngine::instance()->startTransaction( m_zone, - i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() ) + i18n("Add protocol %1 to zone %2.").arg( protUsage->protocol()->name() ).arg( m_zone->guiName() ) ); KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() ); @@ -331,7 +331,7 @@ void KMFGenericInterfaceProtocol::slotProtocolClicked( KMFProtocolUsage* protUsa if ( m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { KMFUndoEngine::instance()->startTransaction( m_zone, - i18n("Delete protocol %1 from zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() ) + i18n("Delete protocol %1 from zone %2.").arg( protUsage->protocol()->name() ).arg( m_zone->guiName() ) ); m_zone->delProtocolUsage( protUsage ); KMFUndoEngine::instance()->endTransaction(); @@ -347,7 +347,7 @@ void KMFGenericInterfaceProtocol::slotProtocolClicked( KMFProtocolUsage* protUsa } else { KMFUndoEngine::instance()->startTransaction( m_host, - i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() ) + i18n("Add protocol %1 to host %2.").arg( protUsage->protocol()->name() ).arg( m_host->guiName() ) ); KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() ); @@ -367,7 +367,7 @@ void KMFGenericInterfaceProtocol::slotProtocolClicked( KMFProtocolUsage* protUsa if ( m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { KMFUndoEngine::instance()->startTransaction( m_host, - i18n("Delete protocol %1 from host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() ) + i18n("Delete protocol %1 from host %2.").arg( protUsage->protocol()->name() ).arg( m_host->guiName() ) ); m_host->delProtocolUsage( protUsage ); KMFUndoEngine::instance()->endTransaction(); @@ -402,7 +402,7 @@ void KMFGenericInterfaceProtocol::slotAddZone() { s = s.setNum( m_doc->currentDocAsGenericDoc()->incomingZone()->zones().count() ); KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc()->incomingZone(), - i18n("Add Zone %1 to Incoming Zone").tqarg( name ) + i18n("Add Zone %1 to Incoming Zone").arg( name ) ); KMFNetZone * zone = m_doc->currentDocAsGenericDoc()->incomingZone()->addZone( "" + m_doc->currentDocAsGenericDoc()->incomingZone()->name() + "_z_" + s, new KMFError() ); if ( zone ) { @@ -419,7 +419,7 @@ void KMFGenericInterfaceProtocol::slotAddZone() { s = s.setNum( m_doc->currentDocAsGenericDoc()->outgoingZone()->zones().count() ); KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc()->outgoingZone(), - i18n("Add Zone %1 to Outgoing Zone.").tqarg( name ) + i18n("Add Zone %1 to Outgoing Zone.").arg( name ) ); KMFNetZone * zone = m_doc->currentDocAsGenericDoc()->outgoingZone()->addZone( "" + m_doc->currentDocAsGenericDoc()->outgoingZone()->name() + "_z_" + s, new KMFError() ); @@ -443,7 +443,7 @@ void KMFGenericInterfaceProtocol::slotDelZone() { if ( m_zone->name() != "incoming_world" || m_zone->name() != "outgoing_world" ) { KMFUndoEngine::instance()->startTransaction( m_zone->zone(), - i18n("Delete zone %1 from zone %2.").tqarg( m_zone->guiName() ).tqarg( m_zone->zone()->guiName() ) + i18n("Delete zone %1 from zone %2.").arg( m_zone->guiName() ).arg( m_zone->zone()->guiName() ) ); m_zone->zone()->delZone( m_zone ); m_zone = 0; @@ -466,7 +466,7 @@ void KMFGenericInterfaceProtocol::slotAddHost() { s = s.setNum( m_zone->hosts().count() ); KMFUndoEngine::instance()->startTransaction( m_zone, - i18n("Add Host %1 to Zone: %2").tqarg( name ).tqarg( m_zone->guiName() ) + i18n("Add Host %1 to Zone: %2").arg( name ).arg( m_zone->guiName() ) ); KMFNetHost * host = m_zone->addNetHost( "" + m_zone->name() + "_h_" + s, * (new TQDomDocument() ) ); if ( host ) { @@ -486,7 +486,7 @@ void KMFGenericInterfaceProtocol::slotDelHost() { return; KMFUndoEngine::instance()->startTransaction( m_zone, - i18n("Delete host %1 from zone: %2").tqarg( m_host->guiName() ).tqarg( m_zone->guiName() ) + i18n("Delete host %1 from zone: %2").arg( m_host->guiName() ).arg( m_zone->guiName() ) ); m_zone->delHost( m_host ); m_host = 0; @@ -539,7 +539,7 @@ void KMFGenericInterfaceProtocol::slotZoneChanged( KMFNetZone* z ) { kdDebug() << "void KMFGenericInterfaceProtocol::slotZoneChanged( KMFNetZone* z )" << endl; if ( KMFListViewItem *item = findItem( z->uuid() ) ) { kdDebug() << "Updating item" << endl; - item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").tqarg( z->maskLength() ) ); + item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").arg( z->maskLength() ) ); } m_doc->currentDocAsGenericDoc()->incomingZone()->refreshNetworkTree(); m_doc->currentDocAsGenericDoc()->outgoingZone()->refreshNetworkTree(); @@ -582,7 +582,7 @@ void KMFGenericInterfaceProtocol::slotRenameItem( TQListViewItem* item, int, con if ( kmfitem->type() == NetfilterObject::NETZONE ) { KMFUndoEngine::instance()->startTransaction( kmfitem->zone(), - i18n("Rename zone %1 to %2.").tqarg( kmfitem->zone()->guiName() ).tqarg( name ) + i18n("Rename zone %1 to %2.").arg( kmfitem->zone()->guiName() ).arg( name ) ); kmfitem->zone()->setGuiName( name ); @@ -597,7 +597,7 @@ void KMFGenericInterfaceProtocol::slotRenameItem( TQListViewItem* item, int, con if ( kmfitem->type() == NetfilterObject::NETHOST ) { KMFUndoEngine::instance()->startTransaction( kmfitem->host(), - i18n("Rename host %1 to %2.").tqarg( kmfitem->host()->guiName() ).tqarg( name ) + i18n("Rename host %1 to %2.").arg( kmfitem->host()->guiName() ).arg( name ) ); kmfitem->host()->setGuiName( name ); kdDebug() << "Renaming Host: " << kmfitem->host()->name() << endl; diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui index 2c244ad..6f0eded 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui @@ -27,7 +27,7 @@ - tqlayout2 + layout2 @@ -103,7 +103,7 @@ - tqlayout19 + layout19 @@ -151,7 +151,7 @@ . - + AlignBottom @@ -181,7 +181,7 @@ . - + AlignBottom @@ -211,7 +211,7 @@ . - + AlignBottom diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui index 5906c0e..87f78bf 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui @@ -35,7 +35,7 @@ Preferred - + 20 80 @@ -69,7 +69,7 @@ Preferred - + 401 20 @@ -85,7 +85,7 @@ Those attacks are based on the fact that every computer can only handle a limited number of open connections. A DoS attack is mostly performed by a lot of hosts connecting to the victim host until it gives up.</p> - + WordBreak|AlignVCenter|AlignLeft @@ -131,7 +131,7 @@ A DoS attack is mostly performed by a lot of hosts connecting to the victim host Preferred - + 381 20 @@ -150,7 +150,7 @@ However, there are a lot of network programs that use ping requests to find and RichText - + WordBreak|AlignVCenter|AlignLeft diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui index d73f627..8a54f3a 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui @@ -35,7 +35,7 @@ Preferred - + 20 81 @@ -75,7 +75,7 @@ The entries are written to the system's main log file RichText - + WordBreak|AlignVCenter @@ -89,7 +89,7 @@ The entries are written to the system's main log file Preferred - + 381 20 @@ -114,7 +114,7 @@ The entries are written to the system's main log file <p>The logprefix is a string that is prepended to the lines written to your log file to help you find the lines you need.</p> - + WordBreak|AlignTop|AlignLeft @@ -151,7 +151,7 @@ The entries are written to the system's main log file <p>Avoid "Denial of Service" attacks by limiting logging.</p> - + WordBreak|AlignVCenter|AlignLeft diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui index 6bc0e8b..28871b0 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui @@ -33,7 +33,7 @@ By enabling NAT you can provide your Internet connection to other hosts that are using your computer a their default gateway.</p> - + WordBreak|AlignTop @@ -97,7 +97,7 @@ are using your computer a their default gateway.</p> - tqlayout19 + layout19 @@ -129,7 +129,7 @@ are using your computer a their default gateway.</p> . - + AlignBottom @@ -159,7 +159,7 @@ are using your computer a their default gateway.</p> . - + AlignBottom @@ -189,7 +189,7 @@ are using your computer a their default gateway.</p> . - + AlignBottom diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp index a6a69ee..b80c47d 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.cpp +++ b/kmyfirewall/installer/kmfinstallerplugin.cpp @@ -16,7 +16,7 @@ Author: Christian Hubinger , (C) 2001 // QT includes #include -#include +#include #include #include #include @@ -130,16 +130,16 @@ bool KMFInstallerPlugin::isConfigValid() { if ( ! configValid ) { if( KMessageBox::questionYesNo ( 0, - i18n( "

Do you want KMyFirewall to try to auto configure %1 settings

" ).tqarg( rulesetDoc()->target()->toFriendlyString() ), + i18n( "

Do you want KMyFirewall to try to auto configure %1 settings

" ).arg( rulesetDoc()->target()->toFriendlyString() ), i18n( "Auto Configure Target" ), KStdGuiItem::yes(), KStdGuiItem::no() ) == KMessageBox::Yes ) { KMFError* err = rulesetDoc()->target()->tryAutoConfiguration(); KMFErrorHandler* errH = new KMFErrorHandler( "Target Autoconfiguration" ); errH->showError( err ); if ( ! rulesetDoc()->target()->config()->isValid() ) { - KMessageBox::error( KApplication::kApplication()->mainWidget(), i18n("

Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.

").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + KMessageBox::error( KApplication::kApplication()->mainWidget(), i18n("

Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.

").arg( rulesetDoc()->target()->toFriendlyString() ) ); } else { - KMessageBox::information( KApplication::kApplication()->mainWidget(), i18n("

Auto Confguration of: %1 finished successfully.

").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + KMessageBox::information( KApplication::kApplication()->mainWidget(), i18n("

Auto Confguration of: %1 finished successfully.

").arg( rulesetDoc()->target()->toFriendlyString() ) ); } configValid = rulesetDoc()->target()->config()->isValid(); @@ -187,7 +187,7 @@ void KMFInstallerPlugin::generateInstallerPackage( KMFTarget* tg ) { return; if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); TQString backUp; backUp.append( url.url() ); @@ -368,7 +368,7 @@ void KMFInstallerPlugin::slotGenerateInstallerPackage() { if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) { answer = KMessageBox::warningYesNo( 0, i18n( "File %1 already exists!

" - "

Overwrite the existing file?

" ).tqarg( url.url() ) ); + "

Overwrite the existing file?

" ).arg( url.url() ) ); if ( answer == KMessageBox::No ) { return; } diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp index c84dd52..e0ddb3a 100644 --- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp +++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp @@ -15,13 +15,13 @@ email : chubinger@irrsinnig.org // QT includes #include #include -#include +#include #include #include #include #include #include -#include +#include #include //KDE includes #include @@ -148,7 +148,7 @@ void KMFIPTInstaller::slotJobFinished( bool ok, const TQString& cmd_name ) { KMessageBox::error( 0, msg, cap ); } /*else if ( !ok ) { const TQString & msg = i18n( "

Execution of %1 failed" - "

Click OK to check your configuration and make sure you are logged in as root" ).tqarg( cmd_name ); + "

Click OK to check your configuration and make sure you are logged in as root" ).arg( cmd_name ); const TQString& cap = "KMFIPTInstaller"; KMessageBox::error( 0, msg, cap ); }*/ @@ -207,9 +207,9 @@ void KMFIPTInstaller::cmdRunFW() { TQString cmd = "bash " + temp_file->name() + " -v start"; // KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true ); setOutputWidget( execWidget() ); - execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); + execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); - checktqStatus(); + checkStatus(); } else { if( KMessageBox::questionYesNo ( 0 , i18n( "

Are you sure you want to execute the generated firewall script on %1?" "

A wrongly configured firewall script may make your computer unusable! PLease make sure that you have left the SSH port open, otherwise you will no longer be able to remote control the comuter using KMyFirewall or any other SSH client!

" @@ -233,7 +233,7 @@ void KMFIPTInstaller::cmdRunFW() { "
  • iptables -t mangle -P OUTPUT ACCEPT
    • " "
  • iptables -t mangle -P FORWARD ACCEPT
    • " "
  • iptables -t mangle -P PREROUTING ACCEPT
    • " - "
  • iptables -t mangle -P POSTROUTING ACCEPT
    • " ).tqarg(rulesetDoc()->target()->toFriendlyString() ), + "
  • iptables -t mangle -P POSTROUTING ACCEPT
    • " ).arg(rulesetDoc()->target()->toFriendlyString() ), i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_run_fw_remote" ) != KMessageBox::Yes ) { return; @@ -241,7 +241,7 @@ void KMFIPTInstaller::cmdRunFW() { setOutputWidget( execWidget() ); - execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); generateInstallerPackage( rulesetDoc()->target() ); @@ -255,9 +255,9 @@ void KMFIPTInstaller::cmdRunFW() { } setOutputWidget( execWidget() ); - execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); - checktqStatus(); + checkStatus(); } } @@ -272,7 +272,7 @@ void KMFIPTInstaller::cmdStopFW() { } if( KMessageBox::questionYesNo ( 0 , i18n( "

    Are you sure you want to stop the firewall on %1?" - "

    This will leave the computer unprotected!

    " ).tqarg(rulesetDoc()->target()->toFriendlyString() ), + "

    This will leave the computer unprotected!

    " ).arg(rulesetDoc()->target()->toFriendlyString() ), i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_stop_fw_remote" ) != KMessageBox::Yes ) { return; @@ -283,13 +283,13 @@ void KMFIPTInstaller::cmdStopFW() { TQString cmd = "bash " + file + " -v stop"; setOutputWidget( execWidget() ); - execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); + execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); - checktqStatus(); + checkStatus(); } else { setOutputWidget( execWidget() ); - execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); generateInstallerPackage( rulesetDoc()->target() ); @@ -303,9 +303,9 @@ void KMFIPTInstaller::cmdStopFW() { } setOutputWidget( execWidget() ); - execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); - checktqStatus(); + checkStatus(); } } @@ -324,12 +324,12 @@ void KMFIPTInstaller::cmdShowRunningConfig( const TQString& para ) { if( rulesetDoc()->target()->isLocalExecuteTarget() ) { // KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true ); setOutputWidget( execWidget() ); - execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name, i18n("Show Table %1 on %2").tqarg( para ).tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); + execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name, i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); } else { setOutputWidget( execWidget() ); - execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() ); @@ -340,7 +340,7 @@ void KMFIPTInstaller::cmdShowRunningConfig( const TQString& para ) { } setOutputWidget( execWidget() ); - execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").tqarg( para ).tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); } } @@ -354,7 +354,7 @@ void KMFIPTInstaller::cmdInstallFW() { if( KMessageBox::questionYesNo ( 0 , i18n( "

    Are you sure you want to install the firewall on %1?" "

    This will add the scripts to your init system that are required to " "start your firewall during bootup." - "

    Please make sure that the firewall runs properly before you install it." ).tqarg( rulesetDoc()->target()->toFriendlyString() ), + "

    Please make sure that the firewall runs properly before you install it." ).arg( rulesetDoc()->target()->toFriendlyString() ), i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_install_fw" ) != KMessageBox::Yes ) { return; } @@ -379,11 +379,11 @@ void KMFIPTInstaller::cmdInstallFW() { "

  • File: %2
    • " "
  • File: %3
    • " "
  • Link: %4 -> %5
    • " ) - .tqarg( "/etc/kmyfirewall" ) - .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) - .tqarg( conf->IPTPath() + "/kmyfirewall" ) - .tqarg( conf->rcDefaultPath() + "/kmyfirewall" ) - .tqarg( conf->initPath() + "/kmyfirewall" ); + .arg( "/etc/kmyfirewall" ) + .arg( "/etc/kmyfirewall/kmyfirewall.sh" ) + .arg( conf->IPTPath() + "/kmyfirewall" ) + .arg( conf->rcDefaultPath() + "/kmyfirewall" ) + .arg( conf->initPath() + "/kmyfirewall" ); TQString cap = i18n( "Install Firewall" ); KMessageBox::information( 0, msg, cap, "created_install_files", 0 ); } else if ( conf->oS() == "linux" ) { @@ -393,13 +393,13 @@ void KMFIPTInstaller::cmdInstallFW() { "
  • File: %3
    • " "
  • Link: %4 -> %5
    • " "
  • Link: %6 -> %7
    • " ) - .tqarg( "/etc/kmyfirewall" ) - .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) - .tqarg( conf->initPath() + "/kmyfirewall" ) - .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" ) - .tqarg( conf->initPath() + "/kmyfirewall" ) - .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" ) - .tqarg( conf->initPath() + "/kmyfirewall" ); + .arg( "/etc/kmyfirewall" ) + .arg( "/etc/kmyfirewall/kmyfirewall.sh" ) + .arg( conf->initPath() + "/kmyfirewall" ) + .arg( conf->rcDefaultPath() + "/S99kmyfirewall" ) + .arg( conf->initPath() + "/kmyfirewall" ) + .arg( conf->rcDefaultPath() + "/K01kmyfirewall" ) + .arg( conf->initPath() + "/kmyfirewall" ); TQString cap = i18n( "Install Firewall" ); KMessageBox::information( 0, msg, cap, "created_install_files", 0 ); } @@ -424,12 +424,12 @@ void KMFIPTInstaller::cmdInstallFW() { TQString cmd = "bash " + installscript + " install " + systemtype + " " + conf->initPath() + " " + conf->rcDefaultPath() + " " + initscript + " " + fwscript; setOutputWidget( execWidget() ); - execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); + execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); - checktqStatus(); + checkStatus(); } else { setOutputWidget( execWidget() ); - execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); generateInstallerPackage( rulesetDoc()->target() ); @@ -443,9 +443,9 @@ void KMFIPTInstaller::cmdInstallFW() { } setOutputWidget( execWidget() ); - execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); - checktqStatus(); + checkStatus(); } } @@ -456,7 +456,7 @@ void KMFIPTInstaller::cmdUninstallFW() { KMFTargetConfig *conf = rulesetDoc()->target()->config(); if ( KMessageBox::questionYesNo ( 0 , i18n( "

    Are you sure you want to uninstall the firewall from %1?
    " - "The firewall will no longer start up during boot." ).tqarg( rulesetDoc()->target()->toFriendlyString() ), + "The firewall will no longer start up during boot." ).arg( rulesetDoc()->target()->toFriendlyString() ), i18n( "Uninstall Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_uninstall_fw" ) != KMessageBox::Yes ) { return; } @@ -482,11 +482,11 @@ void KMFIPTInstaller::cmdUninstallFW() { "

  • File: %2
    • " "
  • File: %3
    • " "
  • Link: %4 -> %5
    • " ) - .tqarg( "/etc/kmyfirewall" ) - .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) - .tqarg( conf->initPath() + "/kmyfirewall" ) - .tqarg( conf->rcDefaultPath() + "/kmyfirewall" ) - .tqarg( conf->initPath() + "/kmyfirewall" ); + .arg( "/etc/kmyfirewall" ) + .arg( "/etc/kmyfirewall/kmyfirewall.sh" ) + .arg( conf->initPath() + "/kmyfirewall" ) + .arg( conf->rcDefaultPath() + "/kmyfirewall" ) + .arg( conf->initPath() + "/kmyfirewall" ); TQString cap = i18n( "Uninstall Firewall" ); KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 ); } else if ( conf->oS() == "linux" ) { @@ -496,13 +496,13 @@ void KMFIPTInstaller::cmdUninstallFW() { "
  • File: %3
    • " "
  • Link: %4 -> %5
    • " "
  • Link: %6 -> %7
    • " ) - .tqarg( "/etc/kmyfirewall" ) - .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) - .tqarg( conf->initPath() + "/kmyfirewall" ) - .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" ) - .tqarg( conf->initPath() + "/kmyfirewall" ) - .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" ) - .tqarg( conf->initPath() + "/kmyfirewall" ); + .arg( "/etc/kmyfirewall" ) + .arg( "/etc/kmyfirewall/kmyfirewall.sh" ) + .arg( conf->initPath() + "/kmyfirewall" ) + .arg( conf->rcDefaultPath() + "/S99kmyfirewall" ) + .arg( conf->initPath() + "/kmyfirewall" ) + .arg( conf->rcDefaultPath() + "/K01kmyfirewall" ) + .arg( conf->initPath() + "/kmyfirewall" ); TQString cap = i18n( "Uninstall Firewall" ); KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 ); } @@ -519,13 +519,13 @@ void KMFIPTInstaller::cmdUninstallFW() { // KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true ); setOutputWidget( execWidget() ); - execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); + execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); - checktqStatus(); + checkStatus(); } else { setOutputWidget( execWidget() ); - execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); generateInstallerPackage( rulesetDoc()->target() ); @@ -539,9 +539,9 @@ void KMFIPTInstaller::cmdUninstallFW() { } setOutputWidget( execWidget() ); - execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); + execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); - checktqStatus(); + checkStatus(); } @@ -571,7 +571,7 @@ void KMFIPTInstaller::cmdUninstallFW() { // // return; // } else { -// KMessageBox::sorry( 0, i18n( "Input file %1 could not be opened." ).tqarg( file ), i18n( "Output Viewer" ) ); +// KMessageBox::sorry( 0, i18n( "Input file %1 could not be opened." ).arg( file ), i18n( "Output Viewer" ) ); // } // } else { // KMessageBox::sorry( 0, i18n( "Unable to find input file" ), i18n( "Output Viewer" ) ); @@ -772,7 +772,7 @@ TQStringList lines; source_file.close(); } else { m_err->setErrType( KMFError::NORMAL ); - const TQString& msg = i18n( "

    Opening file for %1 reading failed." ).tqarg( source_file_path ); + const TQString& msg = i18n( "

    Opening file for %1 reading failed." ).arg( source_file_path ); m_err->setErrMsg( msg ); } @@ -794,7 +794,7 @@ TQStringList lines; target_file.close(); } else { m_err->setErrType( KMFError::NORMAL ); - const TQString& msg = i18n( "

    Opening file for %1 writing failed." ).tqarg( target_file_path ); + const TQString& msg = i18n( "

    Opening file for %1 writing failed." ).arg( target_file_path ); m_err->setErrMsg( msg ); } } @@ -823,7 +823,7 @@ void KMFIPTInstaller::parseFileHeaders( const TQString& source_file_path, const source_file.close(); } else { m_err->setErrType( KMFError::NORMAL ); - const TQString& msg = i18n( "

    Opening file for %1 reading failed." ).tqarg( source_file_path ); + const TQString& msg = i18n( "

    Opening file for %1 reading failed." ).arg( source_file_path ); m_err->setErrMsg( msg ); } @@ -847,7 +847,7 @@ void KMFIPTInstaller::parseFileHeaders( const TQString& source_file_path, const target_file.close(); } else { m_err->setErrType( KMFError::NORMAL ); - const TQString& msg = i18n( "

    Opening file for %1 writing failed." ).tqarg( target_file_path ); + const TQString& msg = i18n( "

    Opening file for %1 writing failed." ).arg( target_file_path ); m_err->setErrMsg( msg ); } } @@ -871,7 +871,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* tg ) { return; if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); TQString backUp; backUp.append( url.url() ); @@ -927,7 +927,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p "

    Please check your installation. Usually this script is installed in " "$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1" "

    Unable to install the firewall without this script." - ).tqarg(target->config()->oS()); + ).arg(target->config()->oS()); TQString cap = "KMFIPTInstaller"; KMessageBox::error( 0, msg, cap ); return; @@ -944,7 +944,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p "

    Please check your installation. Usually this script is installed in " "$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1" "

    Unable to install the firewall without this script." - ).tqarg(target->config()->oS()); + ).arg(target->config()->oS()); TQString cap = "KMFIPTInstaller"; KMessageBox::error( 0, msg, cap ); return; @@ -960,7 +960,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p "

    Please check your installation. Usually this script is installed in " "$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1" "

    Unable to install the firewall without this script." - ).tqarg(target->config()->oS()); + ).arg(target->config()->oS()); TQString cap = "KMFIPTInstaller"; KMessageBox::error( 0, msg, cap ); return; diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp index 6223c9b..13eb503 100644 --- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp +++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp @@ -18,13 +18,13 @@ email : chubinger@irrsinnig.org // QT includes #include #include -#include +#include #include #include #include #include #include -#include +#include #include //KDE includes #include @@ -162,7 +162,7 @@ KMFProcOut* KMFPFInstaller::execWidget(){ // KMessageBox::error( 0, msg, cap ); // } /*else if ( !ok ) { // const TQString & msg = i18n( "

    Execution of %1 failed" -// "

    Click OK to check your configuration and make sure you are logged in as root" ).tqarg( cmd_name ); +// "

    Click OK to check your configuration and make sure you are logged in as root" ).arg( cmd_name ); // const TQString& cap = "KMFPFInstaller"; // KMessageBox::error( 0, msg, cap ); // }*/ @@ -218,9 +218,9 @@ void KMFPFInstaller::cmdRunFW() { // TQString cmd = "bash " + file + " -v start"; // // KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true ); // setOutputWidget( execWidget() ); -// execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); +// execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } else { // if( KMessageBox::questionYesNo ( 0 , i18n( "

    Are you sure you want to execute the generated firewall script on %1?" // "

    A wrongly configured firewall script may make your computer unusable! PLease make sure that you have left the SSH port open, otherwise you will no longer be able to remote control the comuter using KMyFirewall or any other SSH client!

    " @@ -244,7 +244,7 @@ void KMFPFInstaller::cmdRunFW() { // "
  • iptables -t mangle -P OUTPUT ACCEPT
    • " // "
  • iptables -t mangle -P FORWARD ACCEPT
    • " // "
  • iptables -t mangle -P PREROUTING ACCEPT
    • " -// "
  • iptables -t mangle -P POSTROUTING ACCEPT
    • " ).tqarg(rulesetDoc()->target()->toFriendlyString() ), +// "
  • iptables -t mangle -P POSTROUTING ACCEPT
    • " ).arg(rulesetDoc()->target()->toFriendlyString() ), // i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_run_fw_remote" ) != KMessageBox::Yes // ) { // return; @@ -252,7 +252,7 @@ void KMFPFInstaller::cmdRunFW() { // // // setOutputWidget( execWidget() ); -// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); // // generateInstallerPackage( rulesetDoc()->target() ); @@ -266,9 +266,9 @@ void KMFPFInstaller::cmdRunFW() { // } // // setOutputWidget( execWidget() ); -// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } // } @@ -283,7 +283,7 @@ void KMFPFInstaller::cmdStopFW() { // } // // if( KMessageBox::questionYesNo ( 0 , i18n( "

    Are you sure you want to stop the firewall on %1?" -// "

    This will leave the computer unprotected!

    " ).tqarg(rulesetDoc()->target()->toFriendlyString() ), +// "

    This will leave the computer unprotected!

    " ).arg(rulesetDoc()->target()->toFriendlyString() ), // i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_stop_fw_remote" ) != KMessageBox::Yes // ) { // return; @@ -294,13 +294,13 @@ void KMFPFInstaller::cmdStopFW() { // // TQString cmd = "bash " + file + " -v stop"; // setOutputWidget( execWidget() ); -// execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); +// execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); -// checktqStatus(); +// checkStatus(); // // } else { // setOutputWidget( execWidget() ); -// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); // // generateInstallerPackage( rulesetDoc()->target() ); @@ -314,9 +314,9 @@ void KMFPFInstaller::cmdStopFW() { // } // // setOutputWidget( execWidget() ); -// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } } @@ -335,12 +335,12 @@ void KMFPFInstaller::cmdShowRunningConfig( const TQString& para ) { // if( rulesetDoc()->target()->isLocalExecuteTarget() ) { // // KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true ); // setOutputWidget( execWidget() ); -// execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name, i18n("Show Table %1 on %2").tqarg( para ).tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); +// execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name, i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); // // } else { // setOutputWidget( execWidget() ); -// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); // KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() ); // @@ -351,7 +351,7 @@ void KMFPFInstaller::cmdShowRunningConfig( const TQString& para ) { // } // // setOutputWidget( execWidget() ); -// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").tqarg( para ).tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); // } } @@ -365,7 +365,7 @@ void KMFPFInstaller::cmdInstallFW() { // if( KMessageBox::questionYesNo ( 0 , i18n( "

    Are you sure you want to install the firewall on %1?" // "

    This will add the scripts to your init system that are required to " // "start your firewall during bootup." -// "

    Please make sure that the firewall runs properly before you install it." ).tqarg( rulesetDoc()->target()->toFriendlyString() ), +// "

    Please make sure that the firewall runs properly before you install it." ).arg( rulesetDoc()->target()->toFriendlyString() ), // i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_install_fw" ) != KMessageBox::Yes ) { // return; // } @@ -390,11 +390,11 @@ void KMFPFInstaller::cmdInstallFW() { // "

  • File: %2
    • " // "
  • File: %3
    • " // "
  • Link: %4 -> %5
    • " ) -// .tqarg( "/etc/kmyfirewall" ) -// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) -// .tqarg( conf->IPTPath() + "/kmyfirewall" ) -// .tqarg( conf->rcDefaultPath() + "/kmyfirewall" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ); +// .arg( "/etc/kmyfirewall" ) +// .arg( "/etc/kmyfirewall/kmyfirewall.sh" ) +// .arg( conf->IPTPath() + "/kmyfirewall" ) +// .arg( conf->rcDefaultPath() + "/kmyfirewall" ) +// .arg( conf->initPath() + "/kmyfirewall" ); // TQString cap = i18n( "Install Firewall" ); // KMessageBox::information( 0, msg, cap, "created_install_files", 0 ); // } else if ( conf->oS() == "linux" ) { @@ -404,13 +404,13 @@ void KMFPFInstaller::cmdInstallFW() { // "
  • File: %3
    • " // "
  • Link: %4 -> %5
    • " // "
  • Link: %6 -> %7
    • " ) -// .tqarg( "/etc/kmyfirewall" ) -// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ) -// .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ) -// .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ); +// .arg( "/etc/kmyfirewall" ) +// .arg( "/etc/kmyfirewall/kmyfirewall.sh" ) +// .arg( conf->initPath() + "/kmyfirewall" ) +// .arg( conf->rcDefaultPath() + "/S99kmyfirewall" ) +// .arg( conf->initPath() + "/kmyfirewall" ) +// .arg( conf->rcDefaultPath() + "/K01kmyfirewall" ) +// .arg( conf->initPath() + "/kmyfirewall" ); // TQString cap = i18n( "Install Firewall" ); // KMessageBox::information( 0, msg, cap, "created_install_files", 0 ); // } @@ -437,12 +437,12 @@ void KMFPFInstaller::cmdInstallFW() { // // KProcessWrapper::instance()->slotStartLocalJob( "installfirewall", cmd, true, true ); // // setOutputWidget( execWidget() ); -// execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); +// execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } else { // setOutputWidget( execWidget() ); -// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); // // generateInstallerPackage( rulesetDoc()->target() ); @@ -456,9 +456,9 @@ void KMFPFInstaller::cmdInstallFW() { // } // // setOutputWidget( execWidget() ); -// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } // } @@ -469,7 +469,7 @@ void KMFPFInstaller::cmdUninstallFW() { // KMFTargetConfig *conf = rulesetDoc()->target()->config(); // // if ( KMessageBox::questionYesNo ( 0 , i18n( "

    Are you sure you want to uninstall the firewall from %1?
    " -// "The firewall will no longer start up during boot." ).tqarg( rulesetDoc()->target()->toFriendlyString() ), +// "The firewall will no longer start up during boot." ).arg( rulesetDoc()->target()->toFriendlyString() ), // i18n( "Uninstall Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_uninstall_fw" ) != KMessageBox::Yes ) { // return; // } @@ -495,11 +495,11 @@ void KMFPFInstaller::cmdUninstallFW() { // "

  • File: %2
    • " // "
  • File: %3
    • " // "
  • Link: %4 -> %5
    • " ) -// .tqarg( "/etc/kmyfirewall" ) -// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ) -// .tqarg( conf->rcDefaultPath() + "/kmyfirewall" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ); +// .arg( "/etc/kmyfirewall" ) +// .arg( "/etc/kmyfirewall/kmyfirewall.sh" ) +// .arg( conf->initPath() + "/kmyfirewall" ) +// .arg( conf->rcDefaultPath() + "/kmyfirewall" ) +// .arg( conf->initPath() + "/kmyfirewall" ); // TQString cap = i18n( "Uninstall Firewall" ); // KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 ); // } else if ( conf->oS() == "linux" ) { @@ -509,13 +509,13 @@ void KMFPFInstaller::cmdUninstallFW() { // "
  • File: %3
    • " // "
  • Link: %4 -> %5
    • " // "
  • Link: %6 -> %7
    • " ) -// .tqarg( "/etc/kmyfirewall" ) -// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ) -// .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ) -// .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" ) -// .tqarg( conf->initPath() + "/kmyfirewall" ); +// .arg( "/etc/kmyfirewall" ) +// .arg( "/etc/kmyfirewall/kmyfirewall.sh" ) +// .arg( conf->initPath() + "/kmyfirewall" ) +// .arg( conf->rcDefaultPath() + "/S99kmyfirewall" ) +// .arg( conf->initPath() + "/kmyfirewall" ) +// .arg( conf->rcDefaultPath() + "/K01kmyfirewall" ) +// .arg( conf->initPath() + "/kmyfirewall" ); // TQString cap = i18n( "Uninstall Firewall" ); // KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 ); // } @@ -532,13 +532,13 @@ void KMFPFInstaller::cmdUninstallFW() { // // KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true ); // // setOutputWidget( execWidget() ); -// execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); +// execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); -// checktqStatus(); +// checkStatus(); // // } else { // setOutputWidget( execWidget() ); -// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); // // generateInstallerPackage( rulesetDoc()->target() ); @@ -552,9 +552,9 @@ void KMFPFInstaller::cmdUninstallFW() { // } // // setOutputWidget( execWidget() ); -// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); +// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } // // @@ -727,7 +727,7 @@ void KMFPFInstaller::cmdUninstallFW() { // source_file.close(); // } else { // m_err->setErrType( KMFError::NORMAL ); -// const TQString& msg = i18n( "

    Opening file for %1 reading failed." ).tqarg( source_file_path ); +// const TQString& msg = i18n( "

    Opening file for %1 reading failed." ).arg( source_file_path ); // m_err->setErrMsg( msg ); // } // @@ -749,7 +749,7 @@ void KMFPFInstaller::cmdUninstallFW() { // target_file.close(); // } else { // m_err->setErrType( KMFError::NORMAL ); -// const TQString& msg = i18n( "

    Opening file for %1 writing failed." ).tqarg( target_file_path ); +// const TQString& msg = i18n( "

    Opening file for %1 writing failed." ).arg( target_file_path ); // m_err->setErrMsg( msg ); // } // } @@ -778,7 +778,7 @@ void KMFPFInstaller::cmdUninstallFW() { // source_file.close(); // } else { // m_err->setErrType( KMFError::NORMAL ); -// const TQString& msg = i18n( "

    Opening file for %1 reading failed." ).tqarg( source_file_path ); +// const TQString& msg = i18n( "

    Opening file for %1 reading failed." ).arg( source_file_path ); // m_err->setErrMsg( msg ); // } // @@ -802,7 +802,7 @@ void KMFPFInstaller::cmdUninstallFW() { // target_file.close(); // } else { // m_err->setErrType( KMFError::NORMAL ); -// const TQString& msg = i18n( "

    Opening file for %1 writing failed." ).tqarg( target_file_path ); +// const TQString& msg = i18n( "

    Opening file for %1 writing failed." ).arg( target_file_path ); // m_err->setErrMsg( msg ); // } // } @@ -829,7 +829,7 @@ void KMFPFInstaller::cmdUninstallFW() { // return; // // if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) { -// TQDateTime now = TQDateTime::tqcurrentDateTime(); +// TQDateTime now = TQDateTime::currentDateTime(); // // TQString backUp; // backUp.append( url.url() ); diff --git a/kmyfirewall/ipteditor/kmfchainedit.cpp b/kmyfirewall/ipteditor/kmfchainedit.cpp index 1730f43..bcc085a 100644 --- a/kmyfirewall/ipteditor/kmfchainedit.cpp +++ b/kmyfirewall/ipteditor/kmfchainedit.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -184,7 +184,7 @@ void KMFChainEdit::accept() { kdDebug() << "KMyFirewallChainEditor::slotSaveChainChanges()" << endl; KMFUndoEngine::instance()->startTransaction( m_chain, - i18n( "Edit Chain: %1 properties" ).tqarg( m_chain->name() ) + i18n( "Edit Chain: %1 properties" ).arg( m_chain->name() ) ); bool log = c_enable_log->isChecked(); bool log_limit = c_log_limit->isChecked(); diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp index 2fb2366..007712d 100644 --- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp +++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp @@ -15,7 +15,7 @@ Author: Christian Hubinger , (C) 2001 // QT includes #include -#include +#include #include diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp index 8c90bc2..760d484 100644 --- a/kmyfirewall/ipteditor/kmfruleedit.cpp +++ b/kmyfirewall/ipteditor/kmfruleedit.cpp @@ -329,7 +329,7 @@ void KMFRuleEdit::loadPlugins() { void KMFRuleEdit::registerRuleOptionPlugin( KMFRuleOptionEditInterface* edit ) { m_widgetStack->addWidget( edit->editWidget() ); m_editPlugins.append( edit ); - kb_optSelect->insertItem( i18n("Edit %1").tqarg( edit->optionEditName() ) ); + kb_optSelect->insertItem( i18n("Edit %1").arg( edit->optionEditName() ) ); } void KMFRuleEdit::registerRuleTargetOptionPlugin( KMFRuleTargetOptionEditInterface* edit ) { @@ -561,7 +561,7 @@ void KMFRuleEdit::slotAddRule() { if ( m_err_handler->showError( m_err ) ) { KMFUndoEngine::instance()->startTransaction( m_chain, - i18n( "Add Rule: %1 to Chain: %2" ).tqarg( text ).tqarg( m_chain->name() ) + i18n( "Add Rule: %1 to Chain: %2" ).arg( text ).arg( m_chain->name() ) ); IPTRule *inserted = m_chain->addRule( text, m_err ); @@ -603,21 +603,21 @@ void KMFRuleEdit::slotDelChain() { if ( m_chain->isBuildIn() ) { KMessageBox::sorry( this, i18n( "Cannot delete built-in chain: %1
    " "Built-in chains cannot be deleted; you can only delete chains " - "that you have defined yourself." ).tqarg( m_chain->name() ), + "that you have defined yourself." ).arg( m_chain->name() ), i18n( "Sorry" ) ); return ; } int doit = KMessageBox::questionYesNo ( this , i18n( "

    Are you sure that you want to delete " "chain: %1 from table: %2?
    " "Note: By deleting the chain all rules that belong " - "to the chain will be deleted too." ).tqarg( m_chain ->name() ).tqarg( m_chain ->table() ->name() ), + "to the chain will be deleted too." ).arg( m_chain ->name() ).arg( m_chain ->table() ->name() ), i18n( "Delete Chain" ), KStdGuiItem::yes(), KStdGuiItem::no(), "main_view_delete_chain" ); kdDebug() << "Message Box returned: " << doit << endl; if ( doit == 3 ) { kdDebug() << "Try to delete Chain" << endl; KMFUndoEngine::instance()->startTransaction( m_table, - i18n( "Delete Chain: %1 from Table: %2").tqarg( m_chain->name() ).tqarg( m_chain->table()->name() ) + i18n( "Delete Chain: %1 from Table: %2").arg( m_chain->name() ).arg( m_chain->table()->name() ) ); m_err = m_network->currentDocAsIPTDoc()->table( m_chain->table()->name() )->delChain( m_chain ); if ( m_err_handler ->showError( m_err ) ) { @@ -732,7 +732,7 @@ void KMFRuleEdit::slotMoveRuleDown() { // if ( m_rule && kb_optSelect->isEnabled() ) { // KMFUndoEngine::instance()->startTransaction( // m_chain, -// i18n("Move Rule: %1 down").tqarg( m_rule->name() ) +// i18n("Move Rule: %1 down").arg( m_rule->name() ) // ); // m_chain->saveState(); // if ( m_chain->moveRule( m_rule, 1 ) ) { @@ -759,7 +759,7 @@ void KMFRuleEdit::slotMoveRuleUp() { // if ( item ) { // KMFUndoEngine::instance()->startTransaction( // m_chain, -// i18n("Move Rule: %1 up").tqarg( m_rule->name() ) +// i18n("Move Rule: %1 up").arg( m_rule->name() ) // ); // m_chain->saveState(); // if ( m_chain->moveRule( m_rule, -1 ) ) { @@ -775,12 +775,12 @@ void KMFRuleEdit::slotMoveRuleUp() { void KMFRuleEdit::moveRuleInChain( int amount ) { if ( m_rule && kb_optSelect->isEnabled() ) { - const TQString& transMsg = i18n("Move Rule: %1 %2").tqarg( m_rule->name() ).tqarg( amount > 0 ? "down" : "up" ); + const TQString& transMsg = i18n("Move Rule: %1 %2").arg( m_rule->name() ).arg( amount > 0 ? "down" : "up" ); KMFListViewItem* item = currTableView()->findKMFItem( m_rule->name(),2, m_rule->uuid() ); if ( item ) { KMFUndoEngine::instance()->startTransaction( m_chain, - transMsg.tqarg( m_rule->name() ) + transMsg.arg( m_rule->name() ) ); if ( m_chain->moveRule( m_rule, -1 ) ) { m_rule->chain()->changed(); @@ -805,14 +805,14 @@ void KMFRuleEdit::slotDelRule() { return ; } else { int doit = KMessageBox::questionYesNo ( this , i18n( "

    Are you sure that you want to delete " - "rule: %1 from chain: %2?

    ").tqarg( m_rule->name() ).tqarg( m_rule->chain() ->name() ), + "rule: %1 from chain: %2?

    ").arg( m_rule->name() ).arg( m_rule->chain() ->name() ), i18n( "Delete Rule" ), KStdGuiItem::yes(), KStdGuiItem::no(), "rule_edit_delete_rule" ); kdDebug() << "Message Box returned: " << doit << endl; if ( doit == 3 ) { // OK clicked kdDebug() << "clicked ok" << endl; KMFUndoEngine::instance()->startTransaction( m_chain, - i18n("Delete Rule: %1 from Chain: %2").tqarg( m_rule->name() ).tqarg( m_chain->name() ) + i18n("Delete Rule: %1 from Chain: %2").arg( m_rule->name() ).arg( m_chain->name() ) ); m_err = m_chain->delRule( m_rule ); if ( m_err_handler->showError( m_err ) ) { @@ -997,7 +997,7 @@ void KMFRuleEdit::slotFragChanged() { } KMFUndoEngine::instance()->startTransaction( m_rule, - i18n( "Edit Rule: %1 Fragment option" ).tqarg( m_rule->name() ) + i18n( "Edit Rule: %1 Fragment option" ).arg( m_rule->name() ) ); m_rule->addRuleOption( *cmd, *vals ); KMFUndoEngine::instance()->endTransaction(); @@ -1009,7 +1009,7 @@ void KMFRuleEdit::slotLogRuleChanged() { return ; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n( "Edit Rule: %1 Log option" ).tqarg( m_rule->name() ) + i18n( "Edit Rule: %1 Log option" ).arg( m_rule->name() ) ); if ( cb_log_rule->isChecked() ) { m_rule->setLogging( true ); @@ -1026,7 +1026,7 @@ void KMFRuleEdit::slotEnableRuleChanged() { return ; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n( "Edit Rule: %1 enabled state" ).tqarg( m_rule->name() ) + i18n( "Edit Rule: %1 enabled state" ).arg( m_rule->name() ) ); if ( cb_disable_rule->isChecked() ) { m_rule->setEnabled( false ); @@ -1065,7 +1065,7 @@ void KMFRuleEdit::slotTargetChanged( const TQString & tg ) { if ( m_rule->target() != tg ) { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n( "Change Rule: %1 target from: %2 to: %3" ).tqarg( m_rule->name() ).tqarg( m_rule->target() ).tqarg( tg ) + i18n( "Change Rule: %1 target from: %2 to: %3" ).arg( m_rule->name() ).arg( m_rule->target() ).arg( tg ) ); m_rule->setTarget( tg ); emit sigUpdateView( m_rule->chain()->table() ); @@ -1083,7 +1083,7 @@ void KMFRuleEdit::slotTargetChanged( const TQString & tg ) { if ( m_rule->target() != tg ) { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n( "Change Rule: %1 target from: %2 to: %3" ).tqarg( m_rule->name() ).tqarg( m_rule->target() ).tqarg( tg ) + i18n( "Change Rule: %1 target from: %2 to: %3" ).arg( m_rule->name() ).arg( m_rule->target() ).arg( tg ) ); m_rule->setTarget( tg ); emit sigUpdateView( m_rule->chain()->table() ); @@ -1153,7 +1153,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) { if ( IPTable* table = dynamic_cast ( obj ) ) { m_contextMenu->clear(); TQString name = table->name(); - TQString lab_str = i18n("Table: %1").tqarg( name ); + TQString lab_str = i18n("Table: %1").arg( name ); m_contextMenu->insertTitle( lab_str ); m_contextMenu->insertItem( icon_new, i18n( "Add Chain..." ), this, TQT_SLOT( slotAddChain() ) ); @@ -1163,7 +1163,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) { if ( IPTChain* chain = dynamic_cast ( obj ) ) { m_contextMenu->clear(); TQString name = chain->name(); - TQString lab_str = i18n("Chain: %1").tqarg( name ); + TQString lab_str = i18n("Chain: %1").arg( name ); m_contextMenu->insertTitle( icon_chain, lab_str ); m_contextMenu->insertItem( icon_new, i18n( "Add Rule..." ), this, TQT_SLOT( slotAddRule() ) ); @@ -1179,13 +1179,13 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) { if ( IPTRule* rule = dynamic_cast ( obj ) ) { m_contextMenu->clear(); TQString name = rule->name(); - TQString lab_str = i18n("Rule: %1").tqarg( name ); + TQString lab_str = i18n("Rule: %1").arg( name ); m_contextMenu->insertTitle( icon_rule, lab_str ); KPopupMenu *sub_edit = new KPopupMenu( m_contextMenu ); sub_edit->insertTitle( i18n( "Edit Rule Option" ) ); for( uint i = 0; i < m_editPlugins.count(); i++ ) { - sub_edit->insertItem( icon_edit, i18n( "Edit %1" ).tqarg(m_editPlugins.at(i)->optionEditName() ), i ); + sub_edit->insertItem( icon_edit, i18n( "Edit %1" ).arg(m_editPlugins.at(i)->optionEditName() ), i ); } connect( sub_edit,TQT_SIGNAL(activated( int ) ), this,TQT_SLOT(slotNewOptionType( int ) ) ); @@ -1237,7 +1237,7 @@ void KMFRuleEdit::slotMoveRule( int index ) { if ( chain_target ) { KMFUndoEngine::instance()->startTransaction( m_rule->chain()->table(), - i18n( "Move Rule: %1 from Chain: %2 to Chain: %3" ).tqarg( m_rule->name() ).tqarg( m_rule->chain()->name() ).tqarg( chain_target->name() ) + i18n( "Move Rule: %1 from Chain: %2 to Chain: %3" ).arg( m_rule->name() ).arg( m_rule->chain()->name() ).arg( chain_target->name() ) ); m_err = m_rule->chain()->table()->moveRuleToChain( m_rule, chain_target ); if ( m_err_handler->showError( m_err ) ) { @@ -1257,7 +1257,7 @@ void KMFRuleEdit::slotCopyRule( int index ) { if ( chain_target ) { KMFUndoEngine::instance()->startTransaction( m_rule->chain() ->table(), - i18n( "Copy Rule: %1 from Chain: %2 to Chain: %3" ).tqarg( m_rule->name() ).tqarg( m_rule->chain()->name() ).tqarg( chain_target->name() ) + i18n( "Copy Rule: %1 from Chain: %2 to Chain: %3" ).arg( m_rule->name() ).arg( m_rule->chain()->name() ).arg( chain_target->name() ) ); m_err = m_rule->chain() ->table() ->copyRuleToChain( m_rule, chain_target ); if ( m_err_handler->showError( m_err ) ) { @@ -1297,7 +1297,7 @@ void KMFRuleEdit::slotRenameRule( TQListViewItem* , int, const TQString& name ) for ( rule = rules.first(); rule; rule = rules.next() ) { if ( rule->name() == name ) { KMessageBox::sorry( this, i18n( "

    Sorry, there is already a rule named: %1 in the chain.
    " - "Please make sure that the new rule name is unique in its chain." ).tqarg( name ) ); + "Please make sure that the new rule name is unique in its chain." ).arg( name ) ); rule_item->setText( 2, rule_item->rule()->name() ); emit sigUpdateView( rule_item->rule()->chain() ); return ; @@ -1305,7 +1305,7 @@ void KMFRuleEdit::slotRenameRule( TQListViewItem* , int, const TQString& name ) } KMFUndoEngine::instance()->startTransaction( rule_item->rule(), - i18n( "Rename Rule: %1 to %2").tqarg( rule_item->rule()->name() ).tqarg( name ) + i18n( "Rename Rule: %1 to %2").arg( rule_item->rule()->name() ).arg( name ) ); TQString origName = rule_item->rule()->name(); diff --git a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui index 2f5f011..12d10b5 100644 --- a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui +++ b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui @@ -264,7 +264,7 @@ - tqlayout36 + layout36 @@ -288,7 +288,7 @@ Expanding - + 110 20 @@ -324,7 +324,7 @@ Expanding - + 110 20 @@ -388,7 +388,7 @@ - tqlayout12 + layout12 @@ -396,7 +396,7 @@ - tqlayout11 + layout11 @@ -452,7 +452,7 @@ Please set the default policy for your chain: - + WordBreak|AlignVCenter|AlignLeft @@ -475,7 +475,7 @@ User defined chains do not have any "Default Policy" set because the packets return to the chain from which this chain is fed, right after the rule that fed the chain. If you want your user defined chains to act like built-in chains, enable the option "Define Default Policy" and set the policy to your needs. - + WordBreak|AlignVCenter|AlignLeft @@ -496,7 +496,7 @@ The Default Policy decides what to do with Packets that do not match any of the rules defined for the Chain. - + WordBreak|AlignVCenter|AlignLeft @@ -537,7 +537,7 @@ Logging - + AlignVCenter|AlignBottom|AlignTop|AlignLeft @@ -569,7 +569,7 @@ Here you can decide whether you would like to log all packets that did not match any rule at the end of the chain. - + WordBreak|AlignTop|AlignLeft @@ -694,7 +694,7 @@ - tqlayout8 + layout8 @@ -740,7 +740,7 @@ / - + AlignCenter diff --git a/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui b/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui index 5c6cf0d..fcf0435 100644 --- a/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui +++ b/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui @@ -52,7 +52,7 @@ Please define a unique (in the table) name and decide which table this chain should be added to. - + WordBreak|AlignVCenter @@ -206,7 +206,7 @@ Expanding - + 79 0 @@ -233,7 +233,7 @@ Preferred - + 16 16 diff --git a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui index 05b62f9..e1bac64 100644 --- a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui +++ b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui @@ -70,7 +70,7 @@ Editing Rule - + AlignVCenter|AlignLeft @@ -176,7 +176,7 @@ - tqlayout14 + layout14 @@ -186,13 +186,13 @@ m_led_modules - + 16 16 - + 16 16 @@ -228,13 +228,13 @@ m_led_rp - + 16 16 - + 16 16 @@ -254,13 +254,13 @@ m_led_fwd - + 16 16 - + 16 16 @@ -288,13 +288,13 @@ 0 - + 16 16 - + 16 16 @@ -314,13 +314,13 @@ m_led_syn - + 16 16 - + 16 16 @@ -463,7 +463,7 @@ - tqlayout12 + layout12 @@ -527,7 +527,7 @@ - tqlayout20 + layout20 diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp index afb8ecf..bb9b05e 100644 --- a/kmyfirewall/kmfconfigdialog.cpp +++ b/kmyfirewall/kmfconfigdialog.cpp @@ -17,7 +17,7 @@ Author: Christian Hubinger , (C) 2001-2004 #include #include #include -#include +#include #include #include #include diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp index 8395a1a..9322cad 100644 --- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp +++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include // kde includes @@ -67,7 +67,7 @@ void KMFCheckListOutput::appendLine( const TQString &txt ) { kdDebug() << "void KMFCheckListOutput::appendLine(TQString txt)" << endl; } -void KMFCheckListOutput::settqStatus( bool ok, const TQString &err_msg ) { +void KMFCheckListOutput::setStatus( bool ok, const TQString &err_msg ) { kdDebug() << "void KMFCheckListOutput::setStatus(bool ok,TQString &err_msg)" << endl; if ( ok ) { m_currItem->setPixmap( 1, icon_ok ); diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.h b/kmyfirewall/kmfwidgets/kmfchecklistoutput.h index cfe72f8..79ec49e 100644 --- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.h +++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.h @@ -42,9 +42,9 @@ public: void appendLine( const TQString &txt ); /** - Sets the tqStatus of the last created ListItem + Sets the Status of the last created ListItem */ - void settqStatus( bool ok, const TQString &err_msg ); + void setStatus( bool ok, const TQString &err_msg ); void clearList(); diff --git a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp index f9f5646..f82f03e 100644 --- a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp +++ b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp @@ -16,7 +16,7 @@ // QT includes #include -#include +#include #include #include diff --git a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp index f7b77d1..3f8562a 100644 --- a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp +++ b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -262,7 +262,7 @@ void KMFGenericInterfaceEditProtocol::slotDelProtocol() { kdDebug() << "\n\nWARNING: No Protocol Object to save Changes in Memory!!\n\n" << endl; } int doit = KMessageBox::questionYesNo ( this , i18n( "

    Are you sure that you want to delete " - "the protocol: %1?

    ").tqarg( m_protocol->name() ), + "the protocol: %1?

    ").arg( m_protocol->name() ), i18n( "Delete Protocol" ), KStdGuiItem::yes(), KStdGuiItem::no() /*, "protocol_edit_delete_protocol"*/ ); // kdDebug() << "Got Answer: " << doit << endl; diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp index fb99875..5aa2019 100644 --- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp @@ -14,7 +14,7 @@ #include "kmfhostwidget.h" // QT includes -#include +#include #include #include #include @@ -135,15 +135,15 @@ void KMFHostWidget::updateView() { m_cb_os->blockSignals( true ); m_host_desc->blockSignals( true ); m_cmd_testSSH->blockSignals( true ); - m_led_configtqStatus->off(); + m_led_configStatus->off(); if ( m_target ) { - m_led_configtqStatus->on(); + m_led_configStatus->on(); if ( m_target->config()->isValid() ) { - m_led_configtqStatus->setColor( TQt::green ); - m_lbl_configtqStatus->setText( i18n( "Config Ok" ) ); + m_led_configStatus->setColor( TQt::green ); + m_lbl_configStatus->setText( i18n( "Config Ok" ) ); } else { - m_led_configtqStatus->setColor( TQt::red ); - m_lbl_configtqStatus->setText( i18n( "Invalid Config!" ) ); + m_led_configStatus->setColor( TQt::red ); + m_lbl_configStatus->setText( i18n( "Invalid Config!" ) ); } @@ -243,9 +243,9 @@ void KMFHostWidget::slotTestConnection() { } if ( KIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /", KApplication::kApplication()->mainWidget() ) != 0) { - KMessageBox::information( this, i18n("Conneted successfully to: %1").tqarg( m_target->toFriendlyString() ) ); + KMessageBox::information( this, i18n("Conneted successfully to: %1").arg( m_target->toFriendlyString() ) ); } else { - KMessageBox::error( this, i18n("Connetion to: %1 failed!").tqarg( m_target->toFriendlyString() ) ); + KMessageBox::error( this, i18n("Connetion to: %1 failed!").arg( m_target->toFriendlyString() ) ); } } void KMFHostWidget::slotTryAutoConfiguration(){ @@ -254,14 +254,14 @@ void KMFHostWidget::slotTryAutoConfiguration(){ return; } KMFError* err = m_target->tryAutoConfiguration(); - KMFErrorHandler* errH = new KMFErrorHandler( i18n("Auto Confguration of: %1").tqarg( m_target->toFriendlyString() ) ); + KMFErrorHandler* errH = new KMFErrorHandler( i18n("Auto Confguration of: %1").arg( m_target->toFriendlyString() ) ); if ( ! errH->showError( err ) ) { return; } if ( ! m_target->config()->isValid() ) { - KMessageBox::error( this, i18n("

    Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.

    ").tqarg( m_target->toFriendlyString() ) ); + KMessageBox::error( this, i18n("

    Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.

    ").arg( m_target->toFriendlyString() ) ); } else { - KMessageBox::information( this, i18n("

    Auto Confguration of: %1 finished successfully.

    ").tqarg( m_target->toFriendlyString() ) ); + KMessageBox::information( this, i18n("

    Auto Confguration of: %1 finished successfully.

    ").arg( m_target->toFriendlyString() ) ); } emit sigTargetChanged(); } @@ -270,9 +270,9 @@ void KMFHostWidget::slotTryAutoConfiguration_Callback( KMFTarget* ) { disconnect( m_target, TQT_SIGNAL( sigTargetChanged( KMFTarget* ) ), this,TQT_SLOT( slotTryAutoConfiguration_Callback( KMFTarget* ) ) ); if ( ! m_target->config()->isValid() ) { - KMessageBox::error( 0, i18n("

    Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.

    ").tqarg( m_target->toFriendlyString() ) ); + KMessageBox::error( 0, i18n("

    Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.

    ").arg( m_target->toFriendlyString() ) ); } else { - KMessageBox::information( this, i18n("

    Auto Confguration of: %1 finished successfully.

    ").tqarg( m_target->toFriendlyString() ) ); + KMessageBox::information( this, i18n("

    Auto Confguration of: %1 finished successfully.

    ").arg( m_target->toFriendlyString() ) ); } emit sigTargetChanged(); } @@ -281,7 +281,7 @@ void KMFHostWidget::slotAddressChanged( int val ) { kdDebug() << "KMFHostWidget::slotAddressChanged( int " << val << " )" << endl; KMFUndoEngine::instance()->startTransaction( m_target, - i18n( "Edit address of target: %1.").tqarg( m_target->guiName() ) + i18n( "Edit address of target: %1.").arg( m_target->guiName() ) ); m_target->address()->setAddress( m_sb_host_0->value(), @@ -297,7 +297,7 @@ void KMFHostWidget::slotSSHPortChanged( int val ) { kdDebug() << "KMFHostWidget:::slotSSHPortChanged( int " << val << " )" << endl; KMFUndoEngine::instance()->startTransaction( m_target, - i18n( "Edit SSH port of target: %1.").tqarg( m_target->guiName() ) + i18n( "Edit SSH port of target: %1.").arg( m_target->guiName() ) ); m_target->setSSHPort( val ); KMFUndoEngine::instance()->endTransaction(); @@ -313,7 +313,7 @@ void KMFHostWidget::slotOSChanged( const TQString& val ) { } KMFUndoEngine::instance()->startTransaction( m_target->config(), - i18n( "Edit operation system setting of target: %1.").tqarg( m_target->guiName() ) + i18n( "Edit operation system setting of target: %1.").arg( m_target->guiName() ) ); m_target->config()->setOS( val.lower() ); @@ -337,7 +337,7 @@ void KMFHostWidget::slotBackaendChanged( const TQString& val ) { kdDebug() << "KMFHostWidget::slotBackaendChanged( const TQString& " << val << " )" << endl; KMFUndoEngine::instance()->startTransaction( m_target->config(), - i18n( "Edit backend setting of target: %1.").tqarg( m_target->guiName() ) + i18n( "Edit backend setting of target: %1.").arg( m_target->guiName() ) ); m_target->config()->setBackend( val.lower() ); @@ -355,7 +355,7 @@ void KMFHostWidget::slotDescriptionChanged() { } KMFUndoEngine::instance()->startTransaction( m_target, - i18n( "Edit documentation of target: %1.").tqarg( m_target->guiName() ) + i18n( "Edit documentation of target: %1.").arg( m_target->guiName() ) ); m_target->setDescription( m_host_desc->text().simplifyWhiteSpace() ); KMFUndoEngine::instance()->endTransaction(); diff --git a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp index 47b5622..72ee3a5 100644 --- a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp @@ -101,7 +101,7 @@ void KMFInterfaceWidget::slotAddInterface() { KMFUndoEngine::instance()->startTransaction( m_target->config(), - i18n( "Edit interfaces for target: %1.").tqarg( m_target->guiName() ) + i18n( "Edit interfaces for target: %1.").arg( m_target->guiName() ) ); m_target->config()->setInterfaces( interfaces() ); KMFUndoEngine::instance()->endTransaction(); @@ -137,7 +137,7 @@ void KMFInterfaceWidget::slotDelInterface() { m_lb_int->removeItem( index ); KMFUndoEngine::instance()->startTransaction( m_target->config(), - i18n( "Edit interfaces for target: %1.").tqarg( m_target->guiName() ) + i18n( "Edit interfaces for target: %1.").arg( m_target->guiName() ) ); m_target->config()->setInterfaces( interfaces() ); KMFUndoEngine::instance()->endTransaction(); diff --git a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp index 6023d3f..b61f577 100644 --- a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp +++ b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp @@ -57,7 +57,7 @@ void KMFIPTDocOptions::accept() { KMFUndoEngine::instance()->startTransaction( kmfdoc, - i18n( "Edit document settings for target: %1.").tqarg( kmfdoc->target()->guiName() ) + i18n( "Edit document settings for target: %1.").arg( kmfdoc->target()->guiName() ) ); kmfdoc->setUseFilter( c_use_filter->isChecked() ); kmfdoc->setUseNat( c_use_nat->isChecked() ); diff --git a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp index cdfcb96..1004b70 100644 --- a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp @@ -19,10 +19,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp index f29f88a..05c5e8d 100644 --- a/kmyfirewall/kmfwidgets/kmflistview.cpp +++ b/kmyfirewall/kmfwidgets/kmflistview.cpp @@ -54,7 +54,7 @@ KMFListView::KMFListView( TQWidget *parent, const char *name ) : KListView( pare addColumn( i18n( "Rule No." ) ); addColumn( TQString() ); addColumn( i18n( "Value" ) ); - tqsetSizePolicy( TQSizePolicy( ( TQSizePolicy::SizeType ) 2, ( TQSizePolicy::SizeType ) 2, 0, 0, + setSizePolicy( TQSizePolicy( ( TQSizePolicy::SizeType ) 2, ( TQSizePolicy::SizeType ) 2, 0, 0, sizePolicy().hasHeightForWidth() ) ); setFrameShape( KListView::StyledPanel ); setFrameShadow( KListView::Sunken ); @@ -493,7 +493,7 @@ void KMFListView::setupChainView( IPTChain* chain, KMFListViewItem* parent ) { ++it; KMFListViewItem * item_feeds = new KMFListViewItem( i_chain_feeds, chain ); item_feeds->setInUse( true ); - item_feeds->setText( 0, i18n( "From chain: %1" ).tqarg( curr_rule->chain() ->name() ) ); + item_feeds->setText( 0, i18n( "From chain: %1" ).arg( curr_rule->chain() ->name() ) ); item_feeds->setPixmap( 2, icon_rule ); item_feeds->setText( 2, curr_rule->name() ); } @@ -528,7 +528,7 @@ void KMFListView::setupChainView( IPTChain* chain, KMFListViewItem* parent ) { KMFListViewItem * item_fwds = new KMFListViewItem( i_chain_fwds, chain ); item_fwds->setInUse( true ); item_fwds->setPixmap( 0, icon_rule ); - item_fwds->setText( 0, i18n( "Rule: %1" ).tqarg( curr_rule->name() ) ); + item_fwds->setText( 0, i18n( "Rule: %1" ).arg( curr_rule->name() ) ); item_fwds->setPixmap( 1, icon_fwd ); item_fwds->setText( 2, curr_rule->target() ); } diff --git a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp index bf1999e..3ed6968 100644 --- a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp +++ b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp @@ -226,10 +226,10 @@ void KMFListViewItem::setupNetHostView() { setText( 1,"[" + host()->address()->toString() + "]" ); if ( host()->name().startsWith("incoming_world") ) { - setText( 2,"" + i18n("%1 -> Localhost").tqarg( host()->guiName() ) ); + setText( 2,"" + i18n("%1 -> Localhost").arg( host()->guiName() ) ); } if ( host()->name().startsWith("outgoing_world") ) { - setText( 2, i18n("Localhost -> %1").tqarg( host()->guiName() ) ); + setText( 2, i18n("Localhost -> %1").arg( host()->guiName() ) ); } } @@ -250,17 +250,17 @@ void KMFListViewItem::setupZoneView() { } // if ( m_zone->name().startsWith("incoming_world") || m_zone->name().startsWith("outgoing_world") ) - setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) ); + setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").arg( m_zone->maskLength() ) ); -/* setText( 2,"" + i18n("%1 -> Localhost").tqarg( m_zone->guiName() ) );*/ +/* setText( 2,"" + i18n("%1 -> Localhost").arg( m_zone->guiName() ) );*/ setText( 4,"" + m_zone->description() ); if ( m_zone->name().startsWith("incoming_world") ) { - setText( 2,"" + i18n("%1 -> Localhost").tqarg( m_zone->guiName() ) ); + setText( 2,"" + i18n("%1 -> Localhost").arg( m_zone->guiName() ) ); } if ( m_zone->name().startsWith("outgoing_world") ) { - setText( 2, i18n("Localhost -> %1").tqarg( m_zone->guiName() ) ); + setText( 2, i18n("Localhost -> %1").arg( m_zone->guiName() ) ); } @@ -314,10 +314,10 @@ void KMFListViewItem::setupZoneView() { item->setText( 1,"[" + host->address()->toString() + "]" ); if ( host->name().startsWith("incoming_world") ) { - item->setText( 2,"" + i18n("%1 -> Localhost").tqarg( host->guiName() ) ); + item->setText( 2,"" + i18n("%1 -> Localhost").arg( host->guiName() ) ); } if ( host->name().startsWith("outgoing_world") ) { - item->setText( 2, i18n("Localhost -> %1").tqarg( host->guiName() ) ); + item->setText( 2, i18n("Localhost -> %1").arg( host->guiName() ) ); }*/ // setOpen(true); // // ++it2; @@ -334,10 +334,10 @@ void KMFListViewItem::setupZoneView() { // item->setText( 1,"[" + it2.current()->address()->toString() + "]" ); // // if ( it2.current()->name().startsWith("incoming_world") ) { -// item->setText( 2,"" + i18n("%1 -> Localhost").tqarg( it2.current()->guiName() ) ); +// item->setText( 2,"" + i18n("%1 -> Localhost").arg( it2.current()->guiName() ) ); // } // if ( it2.current()->name().startsWith("outgoing_world") ) { -// item->setText( 2, i18n("Localhost -> %1").tqarg( it2.current()->guiName() ) ); +// item->setText( 2, i18n("Localhost -> %1").arg( it2.current()->guiName() ) ); // } // setOpen(true); ++it2; diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp index c42fb12..a748ecb 100644 --- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp @@ -18,9 +18,9 @@ #include #include #include -#include +#include #include -#include +#include // KDe Includes #include @@ -164,7 +164,7 @@ void KMFMyNetworkWidget::slotNewItemSelected( TQListViewItem* item ) { if ( m_zone ) { // kdDebug() << "kmfitem->zone() pointer is valid" << endl; kmfitem->setText( 0,m_zone->guiName() ); - kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) ); + kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").arg( m_zone->maskLength() ) ); m_network_widget->loadZone( m_zone ); if ( m_zone->readOnly() ) { @@ -206,7 +206,7 @@ void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z ) { kdDebug() << "void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z )" << endl; if ( KMFListViewItem *item = findItem( z->uuid() ) ) { kdDebug() << "Updating item" << endl; - item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").tqarg( z->maskLength() ) ); + item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").arg( z->maskLength() ) ); item->setText( 4, z->description() ); } @@ -234,7 +234,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point if ( m_zone ) { m_contextMenu->clear(); TQString name = m_zone->name(); - TQString lab_str = i18n("Zone: %1").tqarg( m_zone->guiName() ); + TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() ); m_contextMenu->insertTitle( icon_chain, lab_str ); m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQT_SLOT( slotAddHost() ) ); @@ -256,7 +256,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point if ( m_target ) { m_contextMenu->clear(); TQString name = m_target->name(); - TQString lab_str = i18n("Host: %1").tqarg( m_target->guiName() ); + TQString lab_str = i18n("Host: %1").arg( m_target->guiName() ); m_contextMenu->insertTitle( icon_chain, lab_str ); if ( ! m_target->readOnly() ) { m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) ); @@ -292,7 +292,7 @@ void KMFMyNetworkWidget::slotAddHost() { if ( m_zone ) { KMFUndoEngine::instance()->startTransaction( m_network->netzone(), - i18n("Add Target: %1 to Zone: %2").tqarg( name ).tqarg( m_zone->guiName() ) + i18n("Add Target: %1 to Zone: %2").arg( name ).arg( m_zone->guiName() ) ); TQString s = ""; s = s.setNum( m_zone->hosts().count() ); @@ -317,7 +317,7 @@ void KMFMyNetworkWidget::slotDelHost() { return; KMFUndoEngine::instance()->startTransaction( m_zone, - i18n("Delete Target: %1 from Zone: %2").tqarg( m_target->guiName() ).tqarg( m_zone->guiName() ) + i18n("Delete Target: %1 from Zone: %2").arg( m_target->guiName() ).arg( m_zone->guiName() ) ); m_zone->delHost( m_target ); KMFUndoEngine::instance()->endTransaction(); @@ -338,7 +338,7 @@ void KMFMyNetworkWidget::slotAddZone() { KMFUndoEngine::instance()->startTransaction( m_network->netzone(), - i18n("Add Zone: %1 to Zone: %2").tqarg( name ).tqarg( m_network->netzone()->guiName() ) + i18n("Add Zone: %1 to Zone: %2").arg( name ).arg( m_network->netzone()->guiName() ) ); KMFNetZone * zone = m_network->netzone()->addZone( "", new KMFError() ); @@ -362,7 +362,7 @@ void KMFMyNetworkWidget::slotDelZone() { if ( m_zone->name() != i18n("world") ) { KMFUndoEngine::instance()->startTransaction( m_zone->zone(), - i18n("Delete Zone: %1 from Zone: %2").tqarg( m_zone->guiName() ).tqarg( m_zone->zone()->guiName() ) + i18n("Delete Zone: %1 from Zone: %2").arg( m_zone->guiName() ).arg( m_zone->zone()->guiName() ) ); m_zone->zone()->delZone( m_zone ); m_zone = 0; @@ -385,7 +385,7 @@ void KMFMyNetworkWidget::slotRenameItem( TQListViewItem* item, int, const TQStri if ( kmfitem->type() == NetfilterObject::NETZONE ) { KMFUndoEngine::instance()->startTransaction( kmfitem->zone(), - i18n("Rename Zone: %1 to %3").tqarg( m_zone->guiName() ).tqarg( name ) + i18n("Rename Zone: %1 to %3").arg( m_zone->guiName() ).arg( name ) ); kmfitem->zone()->setGuiName( name ); @@ -397,7 +397,7 @@ void KMFMyNetworkWidget::slotRenameItem( TQListViewItem* item, int, const TQStri if ( kmfitem->type() == NetfilterObject::KMFTARGET ) { KMFUndoEngine::instance()->startTransaction( kmfitem->target(), - i18n("Rename Host: %1 to %3").tqarg( m_zone->guiName() ).tqarg( name ) + i18n("Rename Host: %1 to %3").arg( m_zone->guiName() ).arg( name ) ); kmfitem->target()->setGuiName( name ); kdDebug() << "Renaming Host: " << kmfitem->target()->name() << endl; diff --git a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp index 6e50797..d311981 100644 --- a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp @@ -19,10 +19,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include // KDE includes @@ -158,7 +158,7 @@ void KMFNetHostPropertiesWidget::slotAddressChanged( int d0, int d1, int d2, int << d3 << ")" << endl; KMFUndoEngine::instance()->startTransaction( m_host, - i18n("Change address of Host: %1.").tqarg( m_host->guiName() ) + i18n("Change address of Host: %1.").arg( m_host->guiName() ) ); m_host->address()->setAddress( d0, d1, d2, d3 ); m_host->zone()->rootZone()->placeHostInZone( m_host ); @@ -183,7 +183,7 @@ void KMFNetHostPropertiesWidget::slotHostLogToggled( bool ) { } KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "%1 logging of incoming packets for host %2." ).tqarg( m_cb_host_log->isChecked() ? i18n( "Enable" ) : i18n( "Disable" ) ).tqarg( m_host->guiName() ) + i18n( "%1 logging of incoming packets for host %2." ).arg( m_cb_host_log->isChecked() ? i18n( "Enable" ) : i18n( "Disable" ) ).arg( m_host->guiName() ) ); m_host->setLogIncoming( m_cb_host_log->isChecked() ); KMFUndoEngine::instance()->endTransaction(); @@ -193,7 +193,7 @@ void KMFNetHostPropertiesWidget::slotHostLogToggled( bool ) { } KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "%1 logging of outgoing packets for host %2." ).tqarg( m_cb_host_log->isChecked() ? i18n( "Enable" ) : i18n( "Disable" ) ).tqarg( m_host->guiName() ) + i18n( "%1 logging of outgoing packets for host %2." ).arg( m_cb_host_log->isChecked() ? i18n( "Enable" ) : i18n( "Disable" ) ).arg( m_host->guiName() ) ); m_host->setLogOutgoing( m_cb_host_log->isChecked() ); KMFUndoEngine::instance()->endTransaction(); @@ -209,14 +209,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitToggled( bool on ){ if ( on ) { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Enable package limit for host %1." ).tqarg( m_host->guiName() ) + i18n( "Enable package limit for host %1." ).arg( m_host->guiName() ) ); m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() ); KMFUndoEngine::instance()->endTransaction(); } else { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Disable package limit for host %1." ).tqarg( m_host->guiName() ) + i18n( "Disable package limit for host %1." ).arg( m_host->guiName() ) ); m_host->setLimit( -1, m_cb_limit_host_interval->currentText() ); KMFUndoEngine::instance()->endTransaction(); @@ -232,14 +232,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitValueChanged( int ) { if ( m_cb_host_limit->isChecked() ) { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Change package limit for host %1 to %2/%3." ).tqarg( m_host->guiName() ).tqarg( m_sb_host_rate->value() ).tqarg( m_cb_limit_host_interval->currentText() ) + i18n( "Change package limit for host %1 to %2/%3." ).arg( m_host->guiName() ).arg( m_sb_host_rate->value() ).arg( m_cb_limit_host_interval->currentText() ) ); m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() ); KMFUndoEngine::instance()->endTransaction(); } else { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Disable package limit for host %1." ).tqarg( m_host->guiName() ) + i18n( "Disable package limit for host %1." ).arg( m_host->guiName() ) ); m_host->setLimit( -1, m_cb_limit_host_interval->currentText() ); KMFUndoEngine::instance()->endTransaction(); @@ -255,14 +255,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitScaleChanged( int ) { if ( m_cb_host_limit->isChecked() ) { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Change package limit for host %1 to %2/%3." ).tqarg( m_host->guiName() ).tqarg( m_sb_host_rate->value() ).tqarg( m_cb_limit_host_interval->currentText() ) + i18n( "Change package limit for host %1 to %2/%3." ).arg( m_host->guiName() ).arg( m_sb_host_rate->value() ).arg( m_cb_limit_host_interval->currentText() ) ); m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() ); KMFUndoEngine::instance()->endTransaction(); } else { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Disable package limit for host %1." ).tqarg( m_host->guiName() ) + i18n( "Disable package limit for host %1." ).arg( m_host->guiName() ) ); m_host->setLimit( -1, "" ); KMFUndoEngine::instance()->endTransaction(); @@ -279,7 +279,7 @@ void KMFNetHostPropertiesWidget::slotDescriptionChanged() { if ( newTxt != m_host->description() ) { KMFUndoEngine::instance()->startTransaction( m_host, - i18n( "Change documentation of host: %1" ).tqarg( m_host->guiName() ) + i18n( "Change documentation of host: %1" ).arg( m_host->guiName() ) ); m_host->setDescription( newTxt ); KMFUndoEngine::instance()->endTransaction(); diff --git a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp index be43b03..acd737d 100644 --- a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp @@ -13,7 +13,7 @@ // QT includes #include -#include +#include #include // KDE includes @@ -97,7 +97,7 @@ void KMFNetworkWidget::slotAddressChanged( const TQString& ) { } KMFUndoEngine::instance()->startTransaction( m_zone->rootZone(), - i18n( "Change address of Zone: %1" ).tqarg( m_zone->guiName() ) + i18n( "Change address of Zone: %1" ).arg( m_zone->guiName() ) ); m_zone->address()->setAddress( m_sb_from_1->value(), m_sb_from_2->value(), m_sb_from_3->value(), m_sb_from_4->value() ); @@ -117,7 +117,7 @@ void KMFNetworkWidget::slotShortMaskChanged( int len ) { if ( m_allowEdit && m_zone->maskLength() != len ) { KMFUndoEngine::instance()->startTransaction( m_zone->rootZone(), - i18n( "Change mask length of Zone: %1" ).tqarg( m_zone->guiName() ) + i18n( "Change mask length of Zone: %1" ).arg( m_zone->guiName() ) ); m_zone->setMaskLength( len ); m_zone->rootZone()->refreshNetworkTree(); @@ -137,7 +137,7 @@ void KMFNetworkWidget::slotDescriptionChanged() { blockAllSignals( true ); KMFUndoEngine::instance()->startTransaction( m_zone, - i18n( "Change documentation of Zone: %1" ).tqarg( m_zone->guiName() ) + i18n( "Change documentation of Zone: %1" ).arg( m_zone->guiName() ) ); m_zone->setDescription( newTxt ); KMFUndoEngine::instance()->endTransaction(); diff --git a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp index 581323d..f3b8cae 100644 --- a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp +++ b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp @@ -43,9 +43,9 @@ KMFNewDocDlg::KMFNewDocDlg( TQWidget *parent, const char *name, WFlags fl ) : KM TQPainter p( &pic ); p.setFont( f ); p.setPen( TQt::white ); - p.drawText( 165, 45, TQString( "Version %1" ).tqarg( KMYFIREWALL_VERSION ) ); - p.drawText( 93, 215, TQString( "%1" ).tqarg( COPYRIGHT_DATE ) ); - p.drawText( 70, 230, TQString( "%1" ).tqarg( COPYRIGHT_OWNER ) ); + p.drawText( 165, 45, TQString( "Version %1" ).arg( KMYFIREWALL_VERSION ) ); + p.drawText( 93, 215, TQString( "%1" ).arg( COPYRIGHT_DATE ) ); + p.drawText( 70, 230, TQString( "%1" ).arg( COPYRIGHT_OWNER ) ); if ( pic.isNull() ) return ; l_pic->setPixmap( pic ); diff --git a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp index 1c76d49..8c544b3 100644 --- a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp +++ b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include // Project includes #include "../core/iptrule.h" @@ -74,7 +74,7 @@ void KMFObjectInfo::accept() { if ( m_netfilter_object->description() != te_desc->text() ) { KMFUndoEngine::instance()->startTransaction( m_netfilter_object, - i18n("Edit Documentaion for: %1").tqarg( m_netfilter_object->name() ) + i18n("Edit Documentaion for: %1").arg( m_netfilter_object->name() ) ); m_netfilter_object->setDescription( te_desc->text() ); kdDebug() << "Description Changed: " << te_desc->text() << endl; @@ -84,7 +84,7 @@ void KMFObjectInfo::accept() { if ( m_doc->description() != te_desc->text() ) { KMFUndoEngine::instance()->startTransaction( m_doc, - i18n("Edit Documentaion for: %1").tqarg( m_netfilter_object->name() ) + i18n("Edit Documentaion for: %1").arg( m_netfilter_object->name() ) ); m_doc->setDescription( te_desc->text() ); KMFUndoEngine::instance()->endTransaction(); diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp index 46635a2..5023bed 100644 --- a/kmyfirewall/kmfwidgets/kmfprocout.cpp +++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp @@ -24,8 +24,8 @@ // QT includes -#include -#include +#include +#include #include #include #include @@ -61,7 +61,7 @@ void KMFProcOut::initGUI() { icon_name = "quit"; icon_close = loader->loadIcon( icon_name, KIcon::Small ); - m_layout = new TQGridLayout( this, 0, 0, 2, 2, "tqlayout" ); + m_layout = new TQGridLayout( this, 0, 0, 2, 2, "layout" ); m_lbview = new TQTextBrowser( this, "m_lbview" ); m_lbview->setTextFormat( RichText ); @@ -126,7 +126,7 @@ void KMFProcOut::slotReceivedOutput( KProcess *, char *buffer, int buflen ) { stderrbuf = new TQString( "" ); } - *stdoutbuf += TQString::tqfromLatin1( buffer, buflen ); + *stdoutbuf += TQString::fromLatin1( buffer, buflen ); int pos; while ( ( pos = stdoutbuf->find( '\n' ) ) != -1 ) { TQString line = stdoutbuf->left( pos ); @@ -143,7 +143,7 @@ void KMFProcOut::slotReceivedError( KProcess *, char *buffer, int buflen ) { stdoutbuf = new TQString( "" ); } - *stderrbuf += TQString::tqfromLatin1( buffer, buflen ); + *stderrbuf += TQString::fromLatin1( buffer, buflen ); int pos; while ( ( pos = stderrbuf->find( '\n' ) ) != -1 ) { TQString line = stderrbuf->left( pos ); @@ -165,7 +165,7 @@ void KMFProcOut::insertStdoutLine( const TQString &line ) { } void KMFProcOut::insertStderrLine( const TQString &line ) { - const TQString & line2 = i18n( "Error: %1" ).tqarg( line ); + const TQString & line2 = i18n( "Error: %1" ).arg( line ); m_lbview->append( "" + line2 + "" ); } @@ -175,7 +175,7 @@ void KMFProcOut::childFinished( bool , int status ) { const TQString& job_name = m_job_name; if ( status != 0 ) { m_lbview->append( i18n( "
    Execution failed" ) ); - m_lbview->append( i18n( "Exit(Code): %1" ).tqarg( stat ) ); + m_lbview->append( i18n( "Exit(Code): %1" ).arg( stat ) ); emit sigJobFinished( false, job_name ); } else { m_lbview->append( i18n( "
    Finished successfully" ) ); diff --git a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp index 48e14d1..3d0ab9a 100644 --- a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp +++ b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp @@ -19,10 +19,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include diff --git a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp index 8de1b62..f3ae2f4 100644 --- a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp @@ -19,10 +19,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include // KDE includes @@ -81,7 +81,7 @@ void KMFProtocolPropertiesWidget::loadProtocolCategory( KMFProtocolCategory* pro m_gb_protocol_option->setEnabled( false ); m_gb_protocol_description->setEnabled( true ); m_l_protocol_desc->setEnabled( true ); - TQString text = i18n( "Description: %1
    " ).tqarg( protCat ->description() ); + TQString text = i18n( "Description: %1
    " ).arg( protCat ->description() ); text += "    "; m_l_protocol_desc->setText( text ); @@ -93,7 +93,7 @@ void KMFProtocolPropertiesWidget::loadProtocol( KMFProtocol* prot ) { m_gb_protocol_option->setEnabled( false ); m_gb_protocol_description->setEnabled( true ); m_l_protocol_desc->setEnabled( true ); - TQString text = i18n( "Description: %1
    " ).tqarg( prot ->description() ); + TQString text = i18n( "Description: %1
    " ).arg( prot ->description() ); const TQString& tcpports = prot->tcpPortsList(); if ( ! tcpports.isEmpty() ) { @@ -160,7 +160,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLimit( bool onoff ) { if ( onoff ) { KMFUndoEngine::instance()->startTransaction( m_protocolUsage, - i18n("Enable package limit for protocol %1.").tqarg( m_protocolUsage->name() ) + i18n("Enable package limit for protocol %1.").arg( m_protocolUsage->name() ) ); m_protocolUsage->setLimit( m_sb_limit_rate->value() ); m_protocolUsage->setLimitInterval( m_cb_limit_interval->currentText() ); @@ -168,7 +168,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLimit( bool onoff ) { } else { KMFUndoEngine::instance()->startTransaction( m_protocolUsage, - i18n("Sisable package limit for protocol %1.").tqarg( m_protocolUsage->name() ) + i18n("Sisable package limit for protocol %1.").arg( m_protocolUsage->name() ) ); m_protocolUsage->setLimit( -1 ); KMFUndoEngine::instance()->endTransaction(); @@ -184,7 +184,7 @@ void KMFProtocolPropertiesWidget::slotSetProtocolLimitRate( int rate ){ KMFUndoEngine::instance()->startTransaction( m_protocolUsage, - i18n("Set package limit for protocol %1 to %2/%3.").tqarg( m_protocolUsage->name() ).tqarg( rate ).tqarg( m_protocolUsage->limitInterval() ) + i18n("Set package limit for protocol %1 to %2/%3.").arg( m_protocolUsage->name() ).arg( rate ).arg( m_protocolUsage->limitInterval() ) ); m_protocolUsage->setLimit( rate ); KMFUndoEngine::instance()->endTransaction(); @@ -202,7 +202,7 @@ void KMFProtocolPropertiesWidget::slotSetProtocolLimitInterval( const TQString& KMFUndoEngine::instance()->startTransaction( m_protocolUsage, - i18n("Set package limit for protocol %1 to %2/%3.").tqarg( m_protocolUsage->name() ).tqarg( m_protocolUsage->limit() ).tqarg( interval ) + i18n("Set package limit for protocol %1 to %2/%3.").arg( m_protocolUsage->name() ).arg( m_protocolUsage->limit() ).arg( interval ) ); m_protocolUsage->setLimitInterval( interval ); KMFUndoEngine::instance()->endTransaction(); @@ -217,7 +217,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLogging( bool onoff ){ KMFUndoEngine::instance()->startTransaction( m_protocolUsage, - i18n( "%1 logging of dropped packets for protocol %2." ).tqarg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ).tqarg( m_protocolUsage->name() ) + i18n( "%1 logging of dropped packets for protocol %2." ).arg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ).arg( m_protocolUsage->name() ) ); m_protocolUsage->setLogging( onoff ); diff --git a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp index bd9514b..37d4db4 100644 --- a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp +++ b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp index 993a99f..5165e38 100644 --- a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp +++ b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp @@ -147,7 +147,7 @@ void KMFSystemSettingsLinux::slotDistributionChanged() { } KMFUndoEngine::instance()->startTransaction( conf, - i18n( "Change system settings of target: %1" ).tqarg( conf->target()->guiName() ) + i18n( "Change system settings of target: %1" ).arg( conf->target()->guiName() ) ); conf->setIPTPath( m_url_ipt_path->url() ); conf->setModprobePath( m_url_mod_path->url() ); @@ -174,7 +174,7 @@ void KMFSystemSettingsLinux::slotSettingChanged() { } KMFUndoEngine::instance()->startTransaction( conf, - i18n( "Change system settings of target: %1" ).tqarg( conf->target()->guiName() ) + i18n( "Change system settings of target: %1" ).arg( conf->target()->guiName() ) ); conf->setIPTPath( m_url_ipt_path->url() ); conf->setModprobePath( m_url_mod_path->url() ); diff --git a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp index c1e4c27..d82ba5c 100644 --- a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp +++ b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp @@ -110,7 +110,7 @@ void KMFTemplateChooser::parseTemplates(){ } TQStringList templates = dir.entryList( type ); if ( templates.isEmpty() ) { - KMessageBox::information( this, i18n("No templates (%1) could be found; please check your installation.").tqarg( type ) ); + KMessageBox::information( this, i18n("No templates (%1) could be found; please check your installation.").arg( type ) ); return; } for ( TQStringList::Iterator it = templates.begin(); it != templates.end(); ++it ) { @@ -123,21 +123,21 @@ void KMFTemplateChooser::parseFile( const TQString& file ) { TQFile f( file ); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::information( this, i18n("Template %1 could not be opened.").tqarg( file ) ); + KMessageBox::information( this, i18n("Template %1 could not be opened.").arg( file ) ); return; } TQDomDocument doc; if ( !doc.setContent( &f ) ) { f.close(); - KMessageBox::information( this, i18n("Template %1 is not a valid XML document.").tqarg( file ) ); + KMessageBox::information( this, i18n("Template %1 is not a valid XML document.").arg( file ) ); return; } TQDomElement root = doc.documentElement(); TQDomNodeList list = root.elementsByTagName ( XML::Abstract_Element ); if ( list.count() == 0 ) { - KMessageBox::information( this, i18n("Template %1 does not contain the \"abstract\" tag.").tqarg( file ) ); + KMessageBox::information( this, i18n("Template %1 does not contain the \"abstract\" tag.").arg( file ) ); return; } TQDomNode node = list.item( 0 ); diff --git a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp index 7d1e85f..bc66325 100644 --- a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp +++ b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp @@ -19,9 +19,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include // KDE includes #include @@ -128,8 +128,8 @@ void KMFTransactionLog::slotZoneRBM( TQListViewItem* item, const TQPoint& point, m_currentTransaction = t; m_contextMenu->clear(); - TQString name = i18n("Transaction: %1").tqarg( m_currentTransaction->uuid().toString() ); - // TQString lab_str = i18n("Zone: %1").tqarg( m_zone->guiName() ); + TQString name = i18n("Transaction: %1").arg( m_currentTransaction->uuid().toString() ); + // TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() ); m_contextMenu->insertTitle( name ); m_contextMenu->insertItem( i18n( "Show XML diff using Kompare" ), this, TQT_SLOT( slotShowDiff() ) ); m_contextMenu->popup( point ); @@ -264,7 +264,7 @@ KListViewItem* KMFTransactionLog::setupListItem( KMFTransaction* trans, KListVie NetfilterObject *obj = 0; obj = NetfilterObject::findObject ( obj_uuid ); if ( obj ) { - itemID->setText( 0, i18n("Object: %1").tqarg( obj->name() ) ); + itemID->setText( 0, i18n("Object: %1").arg( obj->name() ) ); // itemID->setText( 2, obj->name() ); // itemID->setText( 3, obj->getXMLSniplet() ); } diff --git a/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui b/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui index d4c54da..e76ab81 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui @@ -37,7 +37,7 @@ <b>Ruleset&nbsp;Description:</b> - + WordBreak|AlignTop @@ -83,7 +83,7 @@ - tqlayout2 + layout2 @@ -113,7 +113,7 @@ Expanding - + 300 20 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui index 3e6f069..2327266 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui @@ -40,7 +40,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout13 + layout13 @@ -111,7 +111,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout15 + layout15 @@ -119,7 +119,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout14 + layout14 @@ -165,7 +165,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout33 + layout33 @@ -204,7 +204,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa m_lb_tcpPorts - + 0 80 @@ -215,7 +215,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa m_te_desc - + 32767 150 @@ -267,7 +267,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout27 + layout27 @@ -290,7 +290,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout37 + layout37 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui index 9cf1608..c6a1882 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui @@ -27,7 +27,7 @@ - tqlayout19_3 + layout19_3 @@ -59,7 +59,7 @@ . - + AlignBottom @@ -89,7 +89,7 @@ . - + AlignBottom @@ -119,7 +119,7 @@ . - + AlignBottom @@ -154,7 +154,7 @@ - tqlayout2 + layout2 @@ -320,7 +320,7 @@ Expanding - + 20 71 @@ -329,7 +329,7 @@ - m_lbl_configtqStatus + m_lbl_configStatus @@ -372,7 +372,7 @@ Expanding - + 241 20 @@ -381,7 +381,7 @@ - m_led_configtqStatus + m_led_configStatus diff --git a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui index 274413d..b637295 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui @@ -32,7 +32,7 @@ Please add your available network Interfaces here: - + WordBreak|AlignVCenter @@ -40,7 +40,7 @@ - tqlayout10 + layout10 @@ -56,7 +56,7 @@ Expanding - + 20 41 diff --git a/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui b/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui index b1454cf..0c62584 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui @@ -23,13 +23,13 @@ TextLabel7 - + 0 40 - + 32767 40 @@ -49,7 +49,7 @@ Here you can configure several general options that your firewall has. - + WordBreak|AlignCenter @@ -85,7 +85,7 @@ Enable the iptables you like to use in your firewall. - + WordBreak|AlignVCenter @@ -171,7 +171,7 @@ Expanding - + 51 0 @@ -199,7 +199,7 @@ Expanding - + 21 0 @@ -264,7 +264,7 @@ <b>Enable this if you compiled iptables as modules</b>. For details about the required modules, take a look at the iptables man page. - + WordBreak|AlignVCenter @@ -283,7 +283,7 @@ <b>Enable this if your host should act as a router</b>. - + WordBreak|AlignVCenter @@ -294,7 +294,7 @@ <b>Enable if you like to use Syn Cookies.</b> (needs support compiled in the kernel) - + WordBreak|AlignVCenter @@ -313,7 +313,7 @@ <b>Enable</b> if you like to use <b>Reverse Parse Filtering</b>. - + WordBreak|AlignVCenter diff --git a/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui index 2413e25..e41e933 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui @@ -24,7 +24,7 @@ - tqlayout19 + layout19 @@ -56,7 +56,7 @@ . - + AlignBottom @@ -86,7 +86,7 @@ . - + AlignBottom @@ -116,7 +116,7 @@ . - + AlignBottom diff --git a/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui index f6e42bc..5f134f6 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui @@ -167,7 +167,7 @@ <p>You may filter for up to 15 ports within one rule if you are using the multiport extention.<br> Use this to avoid too large (slow) rulesets. - + WordBreak|AlignTop diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui b/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui index fff8137..185e674 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui @@ -24,7 +24,7 @@ - tqlayout16 + layout16 @@ -69,7 +69,7 @@ - tqlayout10 + layout10 @@ -126,7 +126,7 @@ - tqlayout9_2 + layout9_2 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui index 43e3800..cfa45fd 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui @@ -24,7 +24,7 @@ - tqlayout7 + layout7 @@ -32,7 +32,7 @@ - tqlayout27 + layout27 @@ -74,7 +74,7 @@ - tqlayout22 + layout22 @@ -82,7 +82,7 @@ - tqlayout19 + layout19 @@ -114,7 +114,7 @@ . - + AlignBottom @@ -144,7 +144,7 @@ . - + AlignBottom @@ -174,7 +174,7 @@ . - + AlignBottom @@ -193,7 +193,7 @@ - tqlayout21 + layout21 @@ -228,7 +228,7 @@ Expanding - + 19 2 @@ -250,7 +250,7 @@ Mask: - + AlignVCenter @@ -286,7 +286,7 @@ Expanding - + 20 45 @@ -313,7 +313,7 @@ Zone Properties: - + AlignVCenter diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui b/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui index 0797cf9..84e76f9 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui @@ -12,13 +12,13 @@ 330 - + 580 330 - + 580 330 @@ -95,7 +95,7 @@ - tqlayout20 + layout20 @@ -129,7 +129,7 @@ <h3>New/Open Document</h3> - + WordBreak|AlignTop @@ -145,7 +145,7 @@ 0 - + 25 25 @@ -190,7 +190,7 @@ Please choose how you would like to start your new firewall configuration. - + WordBreak|AlignTop @@ -204,7 +204,7 @@ Minimum - + 20 50 @@ -320,7 +320,7 @@ Minimum - + 20 20 @@ -329,7 +329,7 @@ - tqlayout6 + layout6 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui b/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui index 5bae513..ad02c00 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui @@ -23,13 +23,13 @@ m_header - + 0 40 - + 32767 40 @@ -49,7 +49,7 @@ Rule Documentation - + AlignCenter @@ -69,7 +69,7 @@ - tqlayout3 + layout3 @@ -93,7 +93,7 @@ Expanding - + 21 20 @@ -118,7 +118,7 @@ Expanding - + 21 20 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui index f2f2f60..c9299c2 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui @@ -48,7 +48,7 @@ 1 - + 150 0 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui index 8083d06..7017d5a 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui @@ -46,7 +46,7 @@ - tqlayout9 + layout9 @@ -141,7 +141,7 @@ m_l_protocol_desc - + WordBreak|AlignTop diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui index 5e97ca8..285c8f9 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui @@ -29,7 +29,7 @@ Preferred - + 339 20 @@ -87,7 +87,7 @@ Preferred - + 178 20 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui index 4bee50a..9adcd5b 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui @@ -67,13 +67,13 @@ m_pic_screenshot - + 400 300 - + 400 300 @@ -88,7 +88,7 @@ - tqlayout6 + layout6 @@ -130,13 +130,13 @@ Description - + AlignTop - tqlayout2 + layout2 @@ -179,7 +179,7 @@ Expanding - + 101 20 @@ -192,7 +192,7 @@ - tqlayout9 + layout9 @@ -220,13 +220,13 @@ <p>KMyFirewall provides two different inerfaces for setting up your firewall. Please select the Interface you like to use.</p> - + WordBreak|AlignTop - tqlayout8 + layout8 @@ -244,7 +244,7 @@ 0 - + 25 25 @@ -283,7 +283,7 @@ Expanding - + 0 0 @@ -304,7 +304,7 @@ Expanding - + 0 0 @@ -313,7 +313,7 @@ - tqlayout1 + layout1 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui b/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui index 399fc82..0fb4ed1 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui @@ -60,7 +60,7 @@ As Gentoo and Slackware are using non-standard SysV init system it is required to select your distibution in order to make the firewall install properly into your boot setup. - + WordBreak|AlignVCenter @@ -71,7 +71,7 @@ Path to the defaul <b> runlevel</b> directoy: - + AlignVCenter @@ -82,7 +82,7 @@ Path to the <b>init</b> directory: - + AlignVCenter @@ -93,7 +93,7 @@ Path to the <b>modprobe</b> program: - + AlignVCenter @@ -112,7 +112,7 @@ Path to the <b>iptables</b> binary: - + AlignVCenter @@ -157,7 +157,7 @@ Preferred - + 20 51 @@ -174,7 +174,7 @@ Expanding - + 20 41 diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui b/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui index 54660bd..6283909 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui @@ -12,7 +12,7 @@ 401 - + 580 400 @@ -131,7 +131,7 @@ Expanding - + 20 20 @@ -208,7 +208,7 @@ - tqlayout8 + layout8 @@ -248,7 +248,7 @@ AutoText - + WordBreak|AlignTop @@ -259,7 +259,7 @@ - tqlayout10 + layout10 @@ -297,13 +297,13 @@ <h3>Template Chooser</h3> <p>Select a ruleset template you like to use as the starting point for your firewall setup.</p> - + WordBreak|AlignTop - tqlayout9 + layout9 @@ -321,13 +321,13 @@ 0 - + 25 25 - + 25 25 @@ -366,7 +366,7 @@ Preferred - + 20 31 @@ -379,7 +379,7 @@ - tqlayout14 + layout14 @@ -400,7 +400,7 @@ <h3>Available&nbsp;Templates</h3> - + AlignVCenter diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui index 6180bf8..6465669 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui @@ -64,7 +64,7 @@ - tqlayout3 + layout3 @@ -118,7 +118,7 @@ - tqlayout2 + layout2 @@ -189,7 +189,7 @@ Expanding - + 225 20 @@ -217,7 +217,7 @@ - tqlayout4 + layout4 @@ -262,7 +262,7 @@ Expanding - + 201 20 diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp index d39d4b3..1ca5d3c 100644 --- a/kmyfirewall/kmyfirewall.cpp +++ b/kmyfirewall/kmyfirewall.cpp @@ -14,13 +14,13 @@ Author: Christian Hubinger , (C) 2001-2004 // QT includes #include -#include +#include #include #include #include #include #include -#include +#include // KDE includes #include @@ -152,7 +152,7 @@ KMyFirewall::KMyFirewall( TQWidget* parent, const char *name ) : KMFMainWindow( setActiveWindow(); // Make sure this window gets keyboard focus raise(); // Make sure the window is now on top of other windows statusBar() ->changeItem( "Ready", 0 ); - checktqStatus(); + checkStatus(); } else { close(); // User indicated an abort is needed, so close the main window } @@ -185,7 +185,7 @@ void KMyFirewall::parseCommandLineArgs() { } else { closeSplash(); const TQString & msg = i18n( "

    Open File %1 failed

    " - "    " ).tqarg( curr ) ; + "    " ).arg( curr ) ; KMessageBox::error( this, msg, i18n( "Error" ) ); // Show interface select if open file failed when requested if ( KMFConfig::showSelInterface() ) { @@ -281,15 +281,15 @@ void KMyFirewall::slotShowTransactionLog() { void KMyFirewall::setOutputWidget( TQWidget* wid ) { m_widgetStack->removeWidget( m_outputWidget ); TQWidget* widget = new TQWidget( this , "output" ); - TQGridLayout *tqlayout = new TQGridLayout( widget, 1, 1 ); + TQGridLayout *layout = new TQGridLayout( widget, 1, 1 ); wid->reparent( widget, ( unsigned int ) 0 , *( new TQPoint( 0, 0 ) ) ); - tqlayout->addWidget( wid, 0, 0 ); + layout->addWidget( wid, 0, 0 ); kdDebug() << "Adding outputwidget: " << wid->className() << endl; if ( strcmp(wid->className(), "KMFObjectInfo") ) { KPushButton * close = new KPushButton( i18n( "Return to Editor View" ), widget ); connect( close, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotShowEditor() ) ); - tqlayout->addWidget( close, 1, 0 ); + layout->addWidget( close, 1, 0 ); } m_outputWidget = widget; m_widgetStack->addWidget( widget ); @@ -476,7 +476,7 @@ void KMyFirewall::updateCaption(){ if ( ! network() || ! network()->currentTarget() ) { return; } - TQString s = network()->url().fileName() + i18n(" Configuring Target %1").tqarg( network()->currentTarget()->toFriendlyString() ); + TQString s = network()->url().fileName() + i18n(" Configuring Target %1").arg( network()->currentTarget()->toFriendlyString() ); if ( ! KMFUndoEngine::instance()->isSaved() ) { s += i18n( "[modified]" ); } @@ -531,7 +531,7 @@ void KMyFirewall::slotRedo() { void KMyFirewall::slotFileOpen() { kdDebug() << "KMyFirewall::slotFileOpen()" << endl; KURL url; - url = KFileDialog::getOpenURL( ":", TQString( "%1" ).tqarg( network()->getFileDialogFilter() ) ); + url = KFileDialog::getOpenURL( ":", TQString( "%1" ).arg( network()->getFileDialogFilter() ) ); TQString xmlfile = url.path(); if ( url.path().isEmpty() ) { @@ -561,7 +561,7 @@ void KMyFirewall::slotLoadFile( const TQString& file ) { void KMyFirewall::slotImportTargetConfig() { kdDebug() << "KMyFirewall::slotImportTragetConfig()" << endl; KURL url; - url = KFileDialog::getOpenURL( ":", TQString( "%1" ).tqarg( network()->currentDoc()->getFileDialogFilter() ) ); + url = KFileDialog::getOpenURL( ":", TQString( "%1" ).arg( network()->currentDoc()->getFileDialogFilter() ) ); TQString xmlfile = url.path(); if ( url.path().isEmpty() ) { @@ -711,7 +711,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { if ( ! KIO::NetAccess::download( url, xmlfile, KApplication::kApplication()->mainWidget() ) ) { kdDebug() << "Could not download file." << endl; err->setErrType( KMFError::NORMAL ); - err->setErrMsg( i18n( "Could not download file %1" ).tqarg( url.url() ) ); + err->setErrMsg( i18n( "Could not download file %1" ).arg( url.url() ) ); return 0; } @@ -720,7 +720,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { if ( !kmfrsFile.open( IO_ReadOnly ) ) { err->setErrType( KMFError::NORMAL ); - err->setErrMsg( i18n( "Could not read file %1." ).tqarg( url.url() ) ); + err->setErrMsg( i18n( "Could not read file %1." ).arg( url.url() ) ); return 0; } @@ -728,7 +728,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { if ( !doc.setContent( &kmfrsFile ) ) { kmfrsFile.close(); err->setErrType( KMFError::NORMAL ); - err->setErrMsg( i18n( "File %1 in not a vaild XML file." ).tqarg( url.url() ) ); + err->setErrMsg( i18n( "File %1 in not a vaild XML file." ).arg( url.url() ) ); return 0; } kmfrsFile.close(); @@ -813,7 +813,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { } KIO::NetAccess::removeTempFile( xmlfile ); err->setErrType( KMFError::NORMAL ); - err->setErrMsg( i18n( "Could not download file %1." ).tqarg( url.url() ) ); + err->setErrMsg( i18n( "Could not download file %1." ).arg( url.url() ) ); return 0; } @@ -825,7 +825,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) { closeSplash(); const TQString msg = i18n( "

    The file %1 could not be loaded.

    " "

    If you are working with files stored on remote computers " - "make sure that the network is up and the fileserver running." ).tqarg( url.url() ); + "make sure that the network is up and the fileserver running." ).arg( url.url() ); m_err->setErrType( KMFError::NORMAL ); m_err->setErrMsg( msg ); return m_err; @@ -833,7 +833,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) { KFileItem *props = new KFileItem( f_props, url ); kdDebug() << "Found file permissions: " << props->permissionsString() << endl; if ( !props->isReadable() ) { - const TQString msg = i18n( "

    You don't have the permissions to read file: %1

    " ).tqarg( url.url() ); + const TQString msg = i18n( "

    You don't have the permissions to read file: %1

    " ).arg( url.url() ); m_err->setErrType( KMFError::NORMAL ); m_err->setErrMsg( msg ); return m_err; @@ -845,7 +845,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) { } if ( ! loader ) { - const TQString msg = i18n( "

    No loader found for file: %1

    " ).tqarg( url.url() ); + const TQString msg = i18n( "

    No loader found for file: %1

    " ).arg( url.url() ); m_err->setErrType( KMFError::NORMAL ); m_err->setErrMsg( msg ); return m_err; @@ -873,7 +873,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) { KMFConfig::setCurrentConfiguration( "" ); network()->currentDoc()->clear(); m_err->setErrType( KMFError::NORMAL ); - const TQString msg = i18n( "Unable to load file %1." ).tqarg( url.url() ); + const TQString msg = i18n( "Unable to load file %1." ).arg( url.url() ); m_err->setErrMsg( msg ); return m_err; } @@ -883,7 +883,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) { toggleActions( true ); actionSave->setEnabled( true ); - checktqStatus(); + checkStatus(); updateCaption(); m_err->setErrType( KMFError::OK ); const TQString msg = ""; @@ -906,7 +906,7 @@ void KMyFirewall::slotRestoreSession() { worked = false; } - checktqStatus(); + checkStatus(); if ( ! worked ) { KMFConfig::setCurrentConfiguration( "" ); } @@ -932,7 +932,7 @@ void KMyFirewall::slotLoadEmptyRuleset() { // slotLoadDocument( network() ); toggleActions( true ); actionSave->setEnabled( true ); - checktqStatus(); + checkStatus(); toggleActions( true ); // m_configDlg->slotAutoConf(); @@ -1002,10 +1002,10 @@ void KMyFirewall::slotConfigureKMF() { m_configDlg->exec(); } -//################ Check tqStatus #############// +//################ Check Status #############// // FIXME: Implement iptables active check -void KMyFirewall::checktqStatus() { +void KMyFirewall::checkStatus() { kdDebug() << "checkStatus()" << endl; bool isInstalled = false; @@ -1027,9 +1027,9 @@ void KMyFirewall::checktqStatus() { if ( isInstalled ) { - statusBar() ->changeItem( i18n( "Firewall is installed on %1" ).tqarg( network()->currentTarget() ->toFriendlyString() ), 1 ); + statusBar() ->changeItem( i18n( "Firewall is installed on %1" ).arg( network()->currentTarget() ->toFriendlyString() ), 1 ); } else { - statusBar() ->changeItem( i18n( "Firewall is not installed on %1" ).tqarg( network()->currentTarget() ->toFriendlyString() ), 1 ); + statusBar() ->changeItem( i18n( "Firewall is not installed on %1" ).arg( network()->currentTarget() ->toFriendlyString() ), 1 ); } diff --git a/kmyfirewall/kmyfirewall.h b/kmyfirewall/kmyfirewall.h index c09b6dc..362a2dc 100644 --- a/kmyfirewall/kmyfirewall.h +++ b/kmyfirewall/kmyfirewall.h @@ -77,7 +77,7 @@ public: virtual void showEditor(); virtual void showOutput(); virtual void setOutputWidget( TQWidget* ); - virtual void checktqStatus(); + virtual void checkStatus(); virtual void updateCaption(); public slots: // Public slots diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp index 66641a5..cb3d0f2 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp @@ -84,7 +84,7 @@ void KMFRuleEditCustomOpt::loadRule( IPTRule * rule ) { void KMFRuleEditCustomOpt::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Custom Rule: %1 Option").tqarg( m_rule->name() ) + i18n("Edit Custom Rule: %1 Option").arg( m_rule->name() ) ); TQString target = ""; target = t_target->text(); diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui index dd225ea..f46d1a5 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui @@ -34,13 +34,13 @@ 0     - + 0 40 - + 32767 40 @@ -60,7 +60,7 @@ Custom Options - + WordBreak|AlignCenter @@ -234,7 +234,7 @@ Here you may define the target option for the rule. Please keep in mind that not all targets have options to set. - + WordBreak|AlignTop @@ -242,7 +242,7 @@ - tqlayout61 + layout61 @@ -266,7 +266,7 @@ Expanding - + 80 20 @@ -291,7 +291,7 @@ Expanding - + 141 20 diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp index 27ef89d..ebaf39b 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp @@ -96,7 +96,7 @@ void KMFRuleEditorInterface::slotOk() { // KMyFirewallRuleEditor* ed = (KMyFirewallRuleEditor*)parentWidget(); KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Interface Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Interface Option").arg( m_rule->name() ) ); TQString out = cb_out_int->currentText(); diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui index 1270ef6..954d3eb 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui @@ -29,13 +29,13 @@ TextLabel1 - + 0 40 - + 32767 40 @@ -59,7 +59,7 @@ Interface Options - + WordBreak|AlignCenter @@ -72,7 +72,7 @@ <b>ATTENTION: </b>Not All options are not always allowed! The program will attempt to check your settings, but as usual options may be accepted even if the configuration is not valid. If you get error messages at firewall startup, make sure that your configuration is valid. Have a look at the help or the "iptables" man page for more details. - + WordBreak|AlignVCenter|AlignLeft @@ -117,7 +117,7 @@ The incoming interface is only valid in the INPUT and FORWARD chains, and chains that are fed only by them. - + WordBreak|AlignVCenter|AlignLeft @@ -185,7 +185,7 @@ Expanding - + 20 0 @@ -231,7 +231,7 @@ Checking for the outgoing interface is only possible in the OUTPUT and FORWARD chains, and chains that are fed only by them. - + WordBreak|AlignVCenter|AlignLeft @@ -283,7 +283,7 @@ Expanding - + 20 0 @@ -313,7 +313,7 @@ - tqlayout5 + layout5 @@ -337,7 +337,7 @@ Expanding - + 80 20 @@ -362,7 +362,7 @@ Expanding - + 130 20 diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp index b63ab42..485924c 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp @@ -18,7 +18,7 @@ Author: Christian Hubinger , (C) 2001-2004 #include #include #include -#include +#include #include #include #include @@ -120,7 +120,7 @@ void KMFRuleEditIP::accept() { kdDebug() << "KMFRuleEditIP::slotOk()" << endl; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 IP Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 IP Option").arg( m_rule->name() ) ); TQString* src_ip = new TQString( t_src_ip->text() ); TQString* dest_ip = new TQString( t_dest_ip->text() ); diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui index 49096b8..7269736 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui @@ -37,13 +37,13 @@ 0 - + 0 40 - + 32767 40 @@ -67,7 +67,7 @@ IP Options - + WordBreak|AlignCenter @@ -100,7 +100,7 @@ NOTE: By checking the "Invert" checkbox the rule will only match if the specified address is not one of the values you defined. - + WordBreak|AlignVCenter @@ -170,7 +170,7 @@ Preferred - + 20 21 @@ -179,7 +179,7 @@ - tqlayout3 + layout3 @@ -203,7 +203,7 @@ Preferred - + 60 20 @@ -228,7 +228,7 @@ Preferred - + 100 20 diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp index 39dd5fd..206587b 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp @@ -92,7 +92,7 @@ void KMFRuleEditorLimit::readRuleConfig() { void KMFRuleEditorLimit::slotOk() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Limit Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Limit Option").arg( m_rule->name() ) ); TQPtrList* options = new TQPtrList; TQString* name = new TQString( "limit_opt" ); diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui index 20cf8c2..084a88c 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui @@ -37,13 +37,13 @@ 0 - + 0 40 - + 32767 40 @@ -67,7 +67,7 @@ Limit Options - + WordBreak|AlignCenter @@ -157,7 +157,7 @@ Expanding - + 20 0 @@ -268,7 +268,7 @@ Expanding - + 20 0 @@ -303,7 +303,7 @@ Preferred - + 20 21 @@ -312,7 +312,7 @@ - tqlayout10 + layout10 @@ -336,7 +336,7 @@ Expanding - + 60 20 @@ -361,7 +361,7 @@ Expanding - + 60 20 diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp index b03242a..8bb5650 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp @@ -101,7 +101,7 @@ void KMFRuleEditTargetLog::loadRule( IPTRule* rule ) { void KMFRuleEditTargetLog::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Target Log Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Target Log Option").arg( m_rule->name() ) ); TQPtrList* args = new TQPtrList; TQString* name = new TQString( "target_log_opt" ); diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui b/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui index c4c961b..944e042 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui @@ -191,7 +191,7 @@ - tqlayout22 + layout22 diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp index 876c92c..c69fa90 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp @@ -17,7 +17,7 @@ Author: Christian Hubinger , (C) 2001-2004 #include #include #include -#include +#include #include #include #include @@ -162,7 +162,7 @@ void KMFRuleEditMac::accept() { kdDebug() << "KMFRuleEditMac::accept()" << endl; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 MAC Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 MAC Option").arg( m_rule->name() ) ); TQString tok1 = t_src_mac1->text().upper(); TQString tok2 = t_src_mac2->text().upper(); diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui index e54139a..41b9215 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui @@ -37,13 +37,13 @@ 0 - + 0 40 - + 32767 40 @@ -67,7 +67,7 @@ MAC Options - + WordBreak|AlignCenter @@ -100,13 +100,13 @@ false - + 40 0 - + 40 32767 @@ -120,7 +120,7 @@ TextLabel1_2_6 - + 5 32767 @@ -137,13 +137,13 @@ false - + 40 0 - + 40 32767 @@ -157,7 +157,7 @@ TextLabel1_2_5 - + 5 32767 @@ -174,13 +174,13 @@ false - + 40 0 - + 40 32767 @@ -194,7 +194,7 @@ TextLabel1_2_4 - + 5 32767 @@ -211,13 +211,13 @@ false - + 40 0 - + 40 32767 @@ -231,7 +231,7 @@ TextLabel1_2_3 - + 5 32767 @@ -248,13 +248,13 @@ false - + 40 0 - + 40 32767 @@ -268,7 +268,7 @@ TextLabel1_2_2 - + 5 32767 @@ -285,13 +285,13 @@ false - + 40 0 - + 40 32767 @@ -337,7 +337,7 @@ NOTE: By checking the "Invert" checkbox the rule will only match if the address found in the packet header is not one you defined. - + WordBreak|AlignVCenter @@ -351,7 +351,7 @@ Preferred - + 16 22 @@ -360,7 +360,7 @@ - tqlayout13 + layout13 @@ -384,7 +384,7 @@ Expanding - + 80 20 @@ -409,7 +409,7 @@ Expanding - + 80 20 diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp index 0ba0e49..4ceff96 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp @@ -61,7 +61,7 @@ void KMFRuleEditTargetMark::loadRule( IPTRule* rule ) { void KMFRuleEditTargetMark::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Mark Target Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Mark Target Option").arg( m_rule->name() ) ); kdDebug() << "void KMFRuleEditTargetMark::accept()" << endl; TQPtrList* options = new TQPtrList; diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui index 324a4c2..f333f30 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui @@ -54,7 +54,7 @@ - tqlayout24 + layout24 @@ -96,7 +96,7 @@ Expanding - + 20 21 diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp index 7435dd9..7563bac 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp @@ -178,7 +178,7 @@ void KMFRuleEditorTargetNat::accept() { kdDebug() << "KMFRuleEditorTargetNat::accept()"; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Target NAT Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Target NAT Option").arg( m_rule->name() ) ); bool ip_range = c_ip_range->isChecked(); diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui b/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui index 4b0656d..d2065cb 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui @@ -122,7 +122,7 @@ Translate to IP: - + AlignVCenter @@ -234,7 +234,7 @@ - tqlayout27 + layout27 diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp index 84897a3..c21a662 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp @@ -22,7 +22,7 @@ #include // qt includes -#include +#include #include #include #include @@ -468,7 +468,7 @@ void KMFRuleEditorProtocol::accept() { kdDebug() << "void KMFRuleEditorProtocol::accept()" << endl; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Protocol Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Protocol Option").arg( m_rule->name() ) ); /////////////////////////////////////////////////////// diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui index 647f256..f424b63 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui @@ -34,13 +34,13 @@ 0 - + 0 40 - + 32767 40 @@ -64,7 +64,7 @@ Protocol Options - + WordBreak|AlignCenter @@ -88,7 +88,7 @@ Match Protocol - + WordBreak|AlignLeft @@ -268,7 +268,7 @@ <p>Specifie the ports that should match you rule here.<br> You may use a portnumber an inclusive portrange or a service name from <i>/etc/sevices</i> to specifie the port. - + WordBreak|AlignTop @@ -609,13 +609,13 @@ You may use a portnumber an inclusive portrange or a service name from <i> A misuse of this functionality may result in a hard to detect bug in the firewall.</p> - + WordBreak|AlignTop - tqlayout21 + layout21 @@ -720,7 +720,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Preferred - + 48 20 @@ -772,7 +772,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Preferred - + 48 16 @@ -870,7 +870,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Here you can decide which ICMP Type your rulr should Match. - + WordBreak|AlignTop @@ -879,7 +879,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal - tqlayout16 + layout16 @@ -903,7 +903,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Preferred - + 140 20 @@ -928,7 +928,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Preferred - + 140 20 diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp index cb04caf..f551baa 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp +++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp @@ -55,7 +55,7 @@ void KMFRuleEditorState::loadRule( IPTRule *rule ) { void KMFRuleEditorState::slotOk() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 State Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 State Option").arg( m_rule->name() ) ); bool s_new = c_new->isChecked(); bool s_related = c_related->isChecked(); diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui index ec6adf3..fd4ceaa 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui +++ b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui @@ -37,13 +37,13 @@ 0 - + 0 40 - + 32767 40 @@ -66,7 +66,7 @@ Connection Tracking Options - + WordBreak|AlignCenter @@ -205,7 +205,7 @@ Packets that are associated with a connection that has packets sent in both directions. - + WordBreak|AlignVCenter|AlignLeft @@ -221,7 +221,7 @@ Packets that are not associated with any known connection. - + WordBreak|AlignVCenter|AlignLeft @@ -237,7 +237,7 @@ Packets that are associated with an existing bi-directional connection and start a new connection (e.g. FTP). - + WordBreak|AlignVCenter|AlignLeft @@ -261,7 +261,7 @@ Packets that start new connections and are not associated with any known connection. - + WordBreak|AlignVCenter|AlignLeft @@ -277,7 +277,7 @@ Match packets with state: - + AlignVCenter|AlignLeft @@ -287,7 +287,7 @@ - tqlayout18 + layout18 @@ -311,7 +311,7 @@ MinimumExpanding - + 90 20 @@ -336,7 +336,7 @@ MinimumExpanding - + 90 20 diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp index a6744a1..9f51885 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp @@ -123,7 +123,7 @@ void KMFRuleEditorTos::loadRule( IPTRule* rule ) { void KMFRuleEditorTos::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 TOS Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 TOS Option").arg( m_rule->name() ) ); if ( m_option_type == "SETTOS" ) { bool use_tos = c_use_tos->isChecked(); diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui index 756998a..abb654a 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui @@ -85,7 +85,7 @@ - tqlayout30 + layout30 @@ -127,7 +127,7 @@ Expanding - + 20 21 diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp index 48bb63b..0cba2b0 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp @@ -123,7 +123,7 @@ void KMFRuleEditorTos::loadRule( IPTRule* rule ) { void KMFRuleEditorTos::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 TOS Target Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 TOS Target Option").arg( m_rule->name() ) ); if ( m_option_type == "SETTOS" ) { bool use_tos = c_use_tos->isChecked(); diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui index 756998a..abb654a 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui @@ -85,7 +85,7 @@ - tqlayout30 + layout30 @@ -127,7 +127,7 @@ Expanding - + 20 21