TDE
/
kmyfirewall
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 161cc76d48
commit b8b2c2b828
91 changed files with 437 additions and 437 deletions
Show Stats Download Patch File Download Diff File

4
KMFIPTInterface/iptchecker.cpp
Unescape View File

@ -138,7 +138,7 @@ TQStringList IPTChecker::getRuleProperties( char * table, char *chain, int ruleI
target_name = iptc_get_target( my_rule, &h ); target_name = iptc_get_target( my_rule, &h );
if ( target_name && (*target_name != '\0') ) { 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 ) { 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 ); struct iptables_target *target = find_target( target_name, TRY_LOAD );

2
KMFSysTray/details_designer.ui
Unescape View File

@ -424,7 +424,7 @@
<property name="text"> <property name="text">
<string>Table:</string> <string>Table:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

8
KMFSysTray/kmfiptwatcher.cpp
Unescape View File

@ -76,14 +76,14 @@ void KMFIPTWatcher::timeout() {
*( new TQCString( "numChainsInTable(TQString)" ) ), params, *( new TQCString( "numChainsInTable(TQString)" ) ), params,
reply_type, reply_data, false, 10000 ) ) { 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 ); emit sigUpdateActive( false );
} else { } else {
TQDataStream answer( reply_data, IO_ReadOnly ); TQDataStream answer( reply_data, IO_ReadOnly );
if ( reply_type == "int" ) { if ( reply_type == "int" ) {
int result; int result;
answer >> 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 ); emit sigUpdateActive( result > 0 );
} else } else
KMessageBox::information( 0, i18n( "Calling over DCOP succeeded, but the answer had wrong type!" ) ); 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; answer >> result;
TQPtrList<IPTRule> *used = new TQPtrList<IPTRule>; TQPtrList<IPTRule> *used = new TQPtrList<IPTRule>;
for ( int i = 0; i < result; i++ ) { for ( int i = 0; i < result; i++ ) {
TQString rn = TQString("rule_%1").tqarg( i ); TQString rn = TQString("rule_%1").arg( i );
IPTRule *rule = 0; IPTRule *rule = 0;
rule = chain->ruleForName( rn ); rule = chain->ruleForName( rn );
if ( ! rule ) { if ( ! rule ) {
@ -221,7 +221,7 @@ void KMFIPTWatcher::fetchRulesInChain( IPTChain* chain ) {
found_rule = it_rules.current(); found_rule = it_rules.current();
bool found = false; bool found = false;
for ( int i = 0; i < result; i++ ) { 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() ) { if ( rn == found_rule->name() ) {
found = true; found = true;
} }

2
KMFSysTray/mainwidget_designer.ui
Unescape View File

@ -52,7 +52,7 @@
<property name="state"> <property name="state">
<enum>On</enum> <enum>On</enum>
</property> </property>
<property name="tqshape"> <property name="shape">
<enum>Circular</enum> <enum>Circular</enum>
</property> </property>
<property name="look"> <property name="look">

4
kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
Unescape View File

@ -107,7 +107,7 @@ void KMFIPTablesCompiler::slotExportIPT() {
return ; return ;
} else { } else {
answer = KMessageBox::warningYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>" answer = KMessageBox::warningYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>"
"<p><b>Overwrite the existing file?</b></p></qt>" ).tqarg( url.url() ) ); "<p><b>Overwrite the existing file?</b></p></qt>" ).arg( url.url() ) );
} }
} else { } else {
answer = 3; answer = 3;
@ -129,7 +129,7 @@ void KMFIPTablesCompiler::slotExportIPT() {
// statusBar() ->message( i18n( "Wrote file: " ) + url.fileName() , 5000 ); // statusBar() ->message( i18n( "Wrote file: " ) + url.fileName() , 5000 );
} else { } else {
kdDebug() << "Couldn't upload file!!!" << tempfile.name() << endl; kdDebug() << "Couldn't upload file!!!" << tempfile.name() << endl;
KMessageBox::detailedError( 0, i18n( "<qt><p>Saving file: <b>%1</b> Failed.</p></qt>" ).tqarg( url.url() ), KMessageBox::detailedError( 0, i18n( "<qt><p>Saving file: <b>%1</b> Failed.</p></qt>" ).arg( url.url() ),
i18n( "<qt><p>If you are working with remotely stored files " i18n( "<qt><p>If you are working with remotely stored files "
"make sure that the target host and the directory is reachable. " "make sure that the target host and the directory is reachable. "
"</p></qt>" ) ); "</p></qt>" ) );

24
kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp
Unescape View File

@ -175,8 +175,8 @@ void KMFIPTablesDocumentConverter::setupPolicies( KMFGenericDoc* gendoc, KMFIPTD
} }
void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc, IPTChain* chain, const TQString& root_chain ) { void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc, IPTChain* chain, const TQString& root_chain ) {
TQPtrList<KMFNetZone>& tqchildren = zone->zones(); TQPtrList<KMFNetZone>& children = zone->zones();
TQPtrListIterator<KMFNetZone> it( tqchildren ); TQPtrListIterator<KMFNetZone> it( children );
static int i = 0; static int i = 0;
while( it.current() ) { while( it.current() ) {
addToChains( it.current(), doc, chain, root_chain ); addToChains( it.current(), doc, chain, root_chain );
@ -210,7 +210,7 @@ void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc
return; return;
rule->setDescription( i18n( "This rule forwards all traffic to\n" rule->setDescription( i18n( "This rule forwards all traffic to\n"
"chain: %1 which handles traffic for\n" "chain: %1 which handles traffic for\n"
"zone: %2.").tqarg( name ).tqarg( zone->guiName() ) ); "zone: %2.").arg( name ).arg( zone->guiName() ) );
i++; i++;
if ( ! rule ) { if ( ! rule ) {
kdDebug() << "KMFIPTablesCompiler: WARNING Couldn't create rule: Feed in chain: " << chain->name() << endl; 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; kdDebug() << "KMFIPTablesCompiler: WARNING Couldn't find chain: " << name << endl;
return; 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<TQString> args; TQPtrList<TQString> args;
if ( root_chain == Constants::InputChain_Name ) { if ( root_chain == Constants::InputChain_Name ) {
@ -309,7 +309,7 @@ void KMFIPTablesDocumentConverter::createZoneProtocol( IPTChain* chain, KMFProto
rule->addRuleOption( s , args ); rule->addRuleOption( s , args );
rule->setDescription( i18n( "Allow Protocol: %1\n" 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() ); 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" rule->setDescription( i18n( "Rule created to apply filters for host: %1\n"
"Allow Protocol: %2\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 ) ) if ( ! m_errorHandler->showError( m_err ) )
return; return;
@ -431,9 +431,9 @@ void KMFIPTablesDocumentConverter::setupInAndOutHosts( KMFIPTDoc* iptdoc, KMFNet
args.append( new TQString( host->address()->toString() ) ); args.append( new TQString( host->address()->toString() ) );
rule->addRuleOption( opt, args ); rule->addRuleOption( opt, args );
if ( target == "ACCEPT" ) { 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 { } 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 ); rule->setTarget( target );
@ -452,9 +452,9 @@ void KMFIPTablesDocumentConverter::setupInAndOutHosts( KMFIPTDoc* iptdoc, KMFNet
return; return;
if ( target == "ACCEPT" ) { 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 { } 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 ); rule->setTarget( target );
@ -499,9 +499,9 @@ void KMFIPTablesDocumentConverter::setupForbiddenHosts( KMFIPTDoc* iptdoc , KMFN
args.append( new TQString( host->address()->toString() ) ); args.append( new TQString( host->address()->toString() ) );
rule->addRuleOption( opt, args ); rule->addRuleOption( opt, args );
if ( inOut =="in" ) { 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 { } 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" ); rule->setTarget( "DROP" );
if ( inOut =="in" ) { if ( inOut =="in" ) {

28
kmyfirewall/compilers/pf/kmfpfcompiler.cpp
Unescape View File

@ -186,8 +186,8 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
zone = doc->incomingZone(); zone = doc->incomingZone();
} }
TQPtrList<KMFNetZone>& tqchildren = zone->zones(); TQPtrList<KMFNetZone>& children = zone->zones();
TQPtrListIterator<KMFNetZone> it( tqchildren ); TQPtrListIterator<KMFNetZone> it( children );
while( it.current() ) { while( it.current() ) {
createIncommingACCESSRules( it.current(), doc ); createIncommingACCESSRules( it.current(), doc );
++it; ++it;
@ -198,7 +198,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
while ( itZoneHosts.current() ) { while ( itZoneHosts.current() ) {
KMFNetHost* host = dynamic_cast<KMFNetHost*> ( itZoneHosts.current() ); KMFNetHost* host = dynamic_cast<KMFNetHost*> ( itZoneHosts.current() );
++itZoneHosts; ++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<KMFProtocolUsage>& hostProts = host->protocols(); TQPtrList<KMFProtocolUsage>& hostProts = host->protocols();
TQPtrListIterator<KMFProtocolUsage> itHostProtocols ( hostProts ); TQPtrListIterator<KMFProtocolUsage> itHostProtocols ( hostProts );
@ -206,7 +206,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
KMFProtocolUsage* prot = itHostProtocols.current(); KMFProtocolUsage* prot = itHostProtocols.current();
++itHostProtocols; ++itHostProtocols;
if ( ! host->protocolInherited( prot->protocol()->uuid() ) ) { 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 ) { if ( prot->protocol()->tcpPorts().count() > 0 ) {
m_compiledScript.append( "pass in " ); m_compiledScript.append( "pass in " );
if ( prot->logging() || host->logIncoming() ) { 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<KMFProtocolUsage>& zoneProts = zone->protocols(); TQPtrList<KMFProtocolUsage>& zoneProts = zone->protocols();
TQPtrListIterator<KMFProtocolUsage> itZoneProtocols ( zoneProts ); TQPtrListIterator<KMFProtocolUsage> itZoneProtocols ( zoneProts );
while ( itZoneProtocols.current() ) { while ( itZoneProtocols.current() ) {
KMFProtocolUsage* prot = itZoneProtocols.current(); KMFProtocolUsage* prot = itZoneProtocols.current();
++itZoneProtocols; ++itZoneProtocols;
if ( ! zone->protocolInherited( prot->protocol()->uuid() ) ) { 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 ) { if ( prot->protocol()->tcpPorts().count() > 0 ) {
m_compiledScript.append( "pass in " ); m_compiledScript.append( "pass in " );
if ( prot->logging() ) { if ( prot->logging() ) {
@ -291,8 +291,8 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
zone = doc->outgoingZone(); zone = doc->outgoingZone();
} }
TQPtrList<KMFNetZone>& tqchildren = zone->zones(); TQPtrList<KMFNetZone>& children = zone->zones();
TQPtrListIterator<KMFNetZone> it( tqchildren ); TQPtrListIterator<KMFNetZone> it( children );
while( it.current() ) { while( it.current() ) {
createIncommingACCESSRules( it.current(), doc ); createIncommingACCESSRules( it.current(), doc );
++it; ++it;
@ -303,7 +303,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
while ( itZoneHosts.current() ) { while ( itZoneHosts.current() ) {
KMFNetHost* host = dynamic_cast<KMFNetHost*> ( itZoneHosts.current() ); KMFNetHost* host = dynamic_cast<KMFNetHost*> ( itZoneHosts.current() );
++itZoneHosts; ++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<KMFProtocolUsage>& hostProts = host->protocols(); TQPtrList<KMFProtocolUsage>& hostProts = host->protocols();
TQPtrListIterator<KMFProtocolUsage> itHostProtocols ( hostProts ); TQPtrListIterator<KMFProtocolUsage> itHostProtocols ( hostProts );
@ -311,7 +311,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
KMFProtocolUsage* prot = itHostProtocols.current(); KMFProtocolUsage* prot = itHostProtocols.current();
++itHostProtocols; ++itHostProtocols;
if ( ! host->protocolInherited( prot->protocol()->uuid() ) ) { 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 ) { if ( prot->protocol()->tcpPorts().count() > 0 ) {
m_compiledScript.append( "pass out " ); m_compiledScript.append( "pass out " );
if ( prot->logging() || host->logIncoming() ) { 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<KMFProtocolUsage>& zoneProts = zone->protocols(); TQPtrList<KMFProtocolUsage>& zoneProts = zone->protocols();
TQPtrListIterator<KMFProtocolUsage> itZoneProtocols ( zoneProts ); TQPtrListIterator<KMFProtocolUsage> itZoneProtocols ( zoneProts );
while ( itZoneProtocols.current() ) { while ( itZoneProtocols.current() ) {
KMFProtocolUsage* prot = itZoneProtocols.current(); KMFProtocolUsage* prot = itZoneProtocols.current();
++itZoneProtocols; ++itZoneProtocols;
if ( ! zone->protocolInherited( prot->protocol()->uuid() ) ) { 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 ) { if ( prot->protocol()->tcpPorts().count() > 0 ) {
m_compiledScript.append( "pass out " ); m_compiledScript.append( "pass out " );
if ( prot->logging() ) { if ( prot->logging() ) {
@ -422,9 +422,9 @@ void KMFPFCompiler::setupNatRules( KMFGenericDoc* doc ) {
m_compiledScript.append( "\n# Setup NAT\n" ); m_compiledScript.append( "\n# Setup NAT\n" );
if ( doc->useMasquerade() ) { 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 { } 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() ) );
} }

8
kmyfirewall/core/iptable.cpp
Unescape View File

@ -189,7 +189,7 @@ IPTChain* IPTable::addChain( const TQString& chain_name, const TQString& chain_t
TQString found_name = tmp_chain->name(); TQString found_name = tmp_chain->name();
if ( found_name == chain_name ) { if ( found_name == chain_name ) {
const TQString msg = i18n( "<qt><p>Chain: <b>%1</b> already exists in table: <b>%2</b>.<br>" const TQString msg = i18n( "<qt><p>Chain: <b>%1</b> already exists in table: <b>%2</b>.<br>"
"Please try again with another name. A chain name must be unique in a table.</p></qt>" ).tqarg( found_name ).tqarg( name() ); "Please try again with another name. A chain name must be unique in a table.</p></qt>" ).arg( found_name ).arg( name() );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( msg ); err->setErrMsg( msg );
kdDebug() << "\n\nWARNING: Couldn't add chain because of dupilcate name\n\n" << endl; 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(); m_err = new KMFError();
TQString name = chain->name(); TQString name = chain->name();
if ( chain->isBuildIn() ) { 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->setErrMsg( msg );
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
return m_err; 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; // 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 ) { if ( m_err->errNum() == 0 ) {
rule->createRuleClone( new_rule ); rule->createRuleClone( new_rule );
IPTRule* ru = 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; // 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 ) { if ( m_err->errNum() == 0 ) {
rule->createRuleClone( new_rule ); rule->createRuleClone( new_rule );
} }

12
kmyfirewall/core/iptchain.cpp
Unescape View File

@ -140,7 +140,7 @@ IPTRule* IPTChain::addRule( const TQString& rule_name, KMFError *err, int index
TQString tmp_name = m_ruleset.at( i ) ->name(); TQString tmp_name = m_ruleset.at( i ) ->name();
if ( tmp_name == name ) { if ( tmp_name == name ) {
err->setErrType(KMFError::NORMAL); err->setErrType(KMFError::NORMAL);
err->setErrMsg( i18n( "<qt><p>Unable to add rule: <b>%1</b> into chain: <b>%2</b>.<br>There is already a rule defined with that name. Please try again with another name (must be unique in that chain).</p></qt>" ).tqarg( tmp_name ).tqarg( NetfilterObject::name() ) ); err->setErrMsg( i18n( "<qt><p>Unable to add rule: <b>%1</b> into chain: <b>%2</b>.<br>There is already a rule defined with that name. Please try again with another name (must be unique in that chain).</p></qt>" ).arg( tmp_name ).arg( NetfilterObject::name() ) );
return 0; return 0;
} }
} }
@ -158,7 +158,7 @@ IPTRule* IPTChain::addRule( const TQString& rule_name, KMFError *err, int index
} else { } else {
if ( index < 0 || index > (int) chainRuleset().count() - -1 ) { if ( index < 0 || index > (int) chainRuleset().count() - -1 ) {
err->setErrType(KMFError::FATAL); 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; return 0;
} }
kdDebug() << "IPTChain::addRule: inserting rule at: " << index << endl; kdDebug() << "IPTChain::addRule: inserting rule at: " << index << endl;
@ -182,7 +182,7 @@ KMFError* IPTChain::delRule( IPTRule* rule ) {
rule->deleteLater(); rule->deleteLater();
rule = 0; rule = 0;
m_err->setErrType( KMFError::FATAL ); 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 ); m_err->setErrMsg( msg );
return m_err; return m_err;
} }
@ -192,7 +192,7 @@ KMFError* IPTChain::delRule( IPTRule* rule ) {
return m_err; return m_err;
} else { } else {
m_err->setErrType( KMFError::FATAL ); 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 ); m_err->setErrMsg( msg );
return m_err; return m_err;
} }
@ -539,7 +539,7 @@ TQPtrList<TQStringList>& IPTChain::createIPTablesChainRules() {
} }
kdDebug() << chain_log << endl; kdDebug() << chain_log << endl;
TQStringList* chainDefs = new TQStringList(); 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( rule_name );
chainDefs->append( chain_log ); chainDefs->append( chain_log );
all_rules->append( chainDefs ); all_rules->append( chainDefs );
@ -548,7 +548,7 @@ TQPtrList<TQStringList>& IPTChain::createIPTablesChainRules() {
if ( has_default_target && !m_cmd_default_target.isEmpty() ) { if ( has_default_target && !m_cmd_default_target.isEmpty() ) {
TQString deftg = createIPTablesChainDefaultTarget(); TQString deftg = createIPTablesChainDefaultTarget();
TQStringList* chainDefs = new TQStringList(); 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( rule_name );
chainDefs->append( deftg ); chainDefs->append( deftg );
all_rules->append( chainDefs ); all_rules->append( chainDefs );

4
kmyfirewall/core/iptruleoption.cpp
Unescape View File

@ -132,7 +132,7 @@ void IPTRuleOption::loadXML( TQDomNode root, TQStringList& errors ) {
if ( curr.nodeName() == XML::RuleOptionValue_Element ) { if ( curr.nodeName() == XML::RuleOptionValue_Element ) {
for ( int i = 0; i < MAXOPTNUM;i++ ) { for ( int i = 0; i < MAXOPTNUM;i++ ) {
TQDomText textChild = curr.firstChild().toText(); 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 ); TQString val = curr.toElement().attribute( attrib );
if ( !val.isEmpty() && val != XML::Undefined_Value ) { if ( !val.isEmpty() && val != XML::Undefined_Value ) {
@ -199,7 +199,7 @@ const TQDomDocument& IPTRuleOption::getDOMTree() {
TQDomElement tag = doc.createElement( XML::RuleOptionValue_Element ); TQDomElement tag = doc.createElement( XML::RuleOptionValue_Element );
tag.setTagName( XML::RuleOptionValue_Element ); tag.setTagName( XML::RuleOptionValue_Element );
// kdDebug() << "Writing Attribute: value" << i << " val: " << val << endl; // 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 ); tag.setAttribute( attrib, val );
root.appendChild( tag ); root.appendChild( tag );
} }

6
kmyfirewall/core/kmfapp.cpp
Unescape View File

@ -41,7 +41,7 @@ static TQLabel *splash = 0;
void set_splash_status( const TQString& msg ) { void set_splash_status( const TQString& msg ) {
if ( !splash ) if ( !splash )
return ; return ;
splash->tqrepaint( FALSE ); splash->repaint( FALSE );
TQPainter p( splash ); TQPainter p( splash );
TQFont f( KGlobalSettings::generalFont().family(), 8, TQFont::Bold ); TQFont f( KGlobalSettings::generalFont().family(), 8, TQFont::Bold );
p.setFont( f ); p.setFont( f );
@ -68,14 +68,14 @@ void showSplash() {
TQPainter p( &pic ); TQPainter p( &pic );
p.setFont( f ); p.setFont( f );
p.setPen( TQt::white ); 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 = new TQLabel( 0, "splash", TQWidget::WDestructiveClose | TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder | TQWidget::WX11BypassWM | TQWidget::WStyle_StaysOnTop );
splash->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); splash->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
splash->setPixmap( pic ); splash->setPixmap( pic );
splash->adjustSize(); splash->adjustSize();
splash->setFixedSize( splash->sizeHint() ); splash->setFixedSize( splash->sizeHint() );
splash->move( screen.center() - TQPoint( splash->width() / 2, splash->height() / 2 ) ); splash->move( screen.center() - TQPoint( splash->width() / 2, splash->height() / 2 ) );
splash->tqrepaint( FALSE ); splash->repaint( FALSE );
splash->show(); splash->show();
set_splash_status( "Initializing..." ); set_splash_status( "Initializing..." );
TQApplication::flush(); TQApplication::flush();

8
kmyfirewall/core/kmfdoc.cpp
Unescape View File

@ -151,7 +151,7 @@ KMFError* KMFDoc::exportXMLRuleset( bool promptFile, bool asTemplate ) {
return exportXMLRuleset( promptFile, asTemplate ); return exportXMLRuleset( promptFile, asTemplate );
} else { } else {
answer = KMessageBox::questionYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>" answer = KMessageBox::questionYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>"
"<p><b>Overwrite the existing file?</b></p></qt>" ).tqarg( saveUrl.url() ) ); "<p><b>Overwrite the existing file?</b></p></qt>" ).arg( saveUrl.url() ) );
} }
} else { } else {
answer = 3; answer = 3;
@ -184,7 +184,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) {
"<p>Please make sure that you have the permissions to write to this Directory.<br>" "<p>Please make sure that you have the permissions to write to this Directory.<br>"
"If you are working with remotely stored files " "If you are working with remotely stored files "
"make sure that the target host and the directory is reachable. " "make sure that the target host and the directory is reachable. "
"</p></qt>" ).tqarg( url.url() ) ); "</p></qt>" ).arg( url.url() ) );
file.unlink(); file.unlink();
return m_err; return m_err;
} }
@ -201,7 +201,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) {
// generate retrun error object // generate retrun error object
m_err -> setErrType( KMFError::NORMAL ); m_err -> setErrType( KMFError::NORMAL );
const TQString& msg = i18n( "Opening file %1 for writing failed.\n" 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 ); m_err -> setErrMsg( msg );
file.unlink(); file.unlink();
return m_err; return m_err;
@ -211,7 +211,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) {
// generate retrun error object // generate retrun error object
m_err -> setErrType( KMFError::NORMAL ); m_err -> setErrType( KMFError::NORMAL );
const TQString& msg = i18n( "Opening file %1 for writing failed.\n" 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 ); m_err -> setErrMsg( msg );
file.unlink(); file.unlink();
return m_err; return m_err;

6
kmyfirewall/core/kmfgenericdoc.cpp
Unescape View File

@ -230,7 +230,7 @@ KMFNetZone* KMFGenericDoc::addZone( const TQString& name, KMFError* err ) {
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt>Sorry, cannot create Zone with name '<b>%1</b>':<br>" err->setErrMsg( i18n( "<qt>Sorry, cannot create Zone with name '<b>%1</b>':<br>"
"there already exists a zone with that name. Please try again" "there already exists a zone with that name. Please try again"
" with another name that is unique within your configuration.</qt>" ).tqarg(name) ); " with another name that is unique within your configuration.</qt>" ).arg(name) );
return 0; return 0;
} }
@ -258,7 +258,7 @@ KMFError* KMFGenericDoc::delZone( KMFNetZone* zone ) {
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
m_err->setErrMsg( i18n( "<qt>Sorry, cannot create Zone with name: <b>%1</b>.<br>" m_err->setErrMsg( i18n( "<qt>Sorry, cannot create Zone with name: <b>%1</b>.<br>"
"There already exists a zone with that name; please try again" "There already exists a zone with that name; please try again"
" with another name that is unique within your configuration.</qt>" ).tqarg( zone->name() ) ); " with another name that is unique within your configuration.</qt>" ).arg( zone->name() ) );
} }
return m_err; return m_err;
} }
@ -410,7 +410,7 @@ void KMFGenericDoc::loadXML( const TQDomDocument& doc, TQStringList& errors ) {
TQDomElement root = doc.documentElement(); TQDomElement root = doc.documentElement();
if ( root.nodeName() != XML::GenericDoc_DocumentElement ) { if ( root.nodeName() != XML::GenericDoc_DocumentElement ) {
kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl; kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl;
errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfgrs").tqarg( root.nodeName() ) ) ); errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfgrs").arg( root.nodeName() ) ) );
return; return;
} }
loadXML( root, errors ); loadXML( root, errors );

4
kmyfirewall/core/kmfiptdoc.cpp
Unescape View File

@ -281,7 +281,7 @@ void KMFIPTDoc::loadXML( const TQDomDocument& doc, TQStringList& errors ) {
TQDomElement root = doc.documentElement(); TQDomElement root = doc.documentElement();
if ( root.nodeName() != XML::IPTDoc_DocumentElement ) { if ( root.nodeName() != XML::IPTDoc_DocumentElement ) {
kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl; kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl;
errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfrs").tqarg( root.nodeName() ) ) ); errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfrs").arg( root.nodeName() ) ) );
return; return;
} }
loadXML( root, errors ); loadXML( root, errors );
@ -290,7 +290,7 @@ void KMFIPTDoc::loadXML( TQDomNode root, TQStringList& errors ) {
kdDebug() << "void KMFIPTDoc::loadXML( TQDomNode root, TQStringList& errors )" << endl; kdDebug() << "void KMFIPTDoc::loadXML( TQDomNode root, TQStringList& errors )" << endl;
if ( root.nodeName() != XML::IPTDoc_DocumentElement ) { if ( root.nodeName() != XML::IPTDoc_DocumentElement ) {
kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl; kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl;
errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfrs").tqarg( root.nodeName() ) ) ); errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfrs").arg( root.nodeName() ) ) );
return; return;
} }
NetfilterObject::loadUuid( root, errors ); NetfilterObject::loadUuid( root, errors );

4
kmyfirewall/core/kmfnethost.cpp
Unescape View File

@ -341,7 +341,7 @@ void KMFNetHost::loadXML( TQDomNode root, TQStringList& errors ) {
protocol_doc.appendChild( curr.cloneNode(true) ); protocol_doc.appendChild( curr.cloneNode(true) );
KMFProtocol *protocol = KMFProtocolLibrary::instance()->findProtocolByName( name ); KMFProtocol *protocol = KMFProtocolLibrary::instance()->findProtocolByName( name );
if ( ! protocol ) { 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; continue;
} }
@ -380,7 +380,7 @@ void KMFNetHost::loadXML( TQDomNode root, TQStringList& errors ) {
} }
if ( ! found ) { 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 ); delProtocolUsage( oldProtocolUsage, true );
} }
} }

2
kmyfirewall/core/kmfnetwork.cpp
Unescape View File

@ -286,7 +286,7 @@ void KMFNetwork::loadXML( const TQDomDocument& doc, TQStringList& errors ) {
TQDomElement root = doc.documentElement(); TQDomElement root = doc.documentElement();
if ( root.nodeName() != XML::KMFNetwork_DocumentElement ) { if ( root.nodeName() != XML::KMFNetwork_DocumentElement ) {
kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl; kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl;
errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfnet").tqarg( root.nodeName() ) ) ); errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfnet").arg( root.nodeName() ) ) );
return; return;
} }

22
kmyfirewall/core/kmfnetzone.cpp
Unescape View File

@ -216,7 +216,7 @@ void KMFNetZone::setGuiName( const TQString& name ) {
} }
TQString KMFNetZone::zoneInfo() { 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 ){ void KMFNetZone::setMaskLength( int len ){
@ -406,7 +406,7 @@ KMFNetZone* KMFNetZone::addZone( const TQString& name, KMFError* err ) {
++it; ++it;
if ( z->name() == name ) { if ( z->name() == name ) {
err->setErrType( KMFError::NORMAL ); 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; return 0;
} }
} }
@ -532,7 +532,7 @@ TQString KMFNetZone::toString() {
"Zone: " + address()->toString() + "Zone: " + address()->toString() +
"/%1" + "/%1" +
" name: " + NetfilterObject::name() + " name: " + NetfilterObject::name() +
" GUIName: " + guiName() ).tqarg(maskLength()) ; " GUIName: " + guiName() ).arg(maskLength()) ;
return ret; return ret;
} }
@ -901,7 +901,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
KMFProtocol *p = KMFProtocolLibrary::instance()->findProtocolByName( name ); KMFProtocol *p = KMFProtocolLibrary::instance()->findProtocolByName( name );
if ( ! p ) { 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; continue;
} }
@ -910,7 +910,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
if ( ! pu ) { if ( ! pu ) {
pu = findProtocolUsageByProtocolUuid( p->uuid() ); 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 ); xmlDefinedProtocols.append( pu );
} }
if ( curr.isElement() && ( curr.nodeName() == XML::ProtocolUsage_Element ) ) { if ( curr.isElement() && ( curr.nodeName() == XML::ProtocolUsage_Element ) ) {
@ -922,7 +922,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
if ( ! pu ) { if ( ! pu ) {
pu = findProtocolUsageByProtocolUuid( protocolUuid ); 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 ); xmlDefinedProtocols.append( pu );
} }
@ -981,7 +981,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
} }
if ( ! found ) { 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 ); delZone( oldZone, true );
} }
} }
@ -1003,7 +1003,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
} }
if ( ! found ) { 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 ); delHost( oldTarget, true );
} }
} }
@ -1017,21 +1017,21 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
while( itAllProtocols.current() ) { while( itAllProtocols.current() ) {
KMFProtocolUsage *oldProtocoUsagel = itAllProtocols.current(); KMFProtocolUsage *oldProtocoUsagel = itAllProtocols.current();
++itAllProtocols; ++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; bool found = false;
TQValueList< KMFProtocolUsage* >::iterator itProtocols; TQValueList< KMFProtocolUsage* >::iterator itProtocols;
for( itProtocols = xmlDefinedProtocols.begin(); itProtocols != xmlDefinedProtocols.end() && ! found; ++itProtocols ) { for( itProtocols = xmlDefinedProtocols.begin(); itProtocols != xmlDefinedProtocols.end() && ! found; ++itProtocols ) {
KMFProtocolUsage* protocolUsage = *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 ) { if ( protocolUsage == oldProtocoUsagel ) {
found = true; found = true;
} }
} }
if ( ! found ) { 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 ); delProtocolUsage( oldProtocoUsagel, true );
// delHost( oldTarget, true ); // delHost( oldTarget, true );
} }

2
kmyfirewall/core/kmfpluginfactory.cpp
Unescape View File

@ -66,7 +66,7 @@ KParts::ReadWritePart* KMFPluginFactory::KMFMainView( KParts::MainWindow* parent
return 0; return 0;
} else { } else {
err->setErrType( KMFError::FATAL ); 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; return 0;
} }
err->setErrType( KMFError::FATAL ); err->setErrType( KMFError::FATAL );

14
kmyfirewall/core/kmfprotocollibrary.cpp
Unescape View File

@ -152,7 +152,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr
const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>" const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>"
"<p>If you are working with files stored on remote computers " "<p>If you are working with files stored on remote computers "
"make sure that the network is up and the fileserver running.</qt>" ).tqarg( url.url() ); "make sure that the network is up and the fileserver running.</qt>" ).arg( url.url() );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( msg ); err->setErrMsg( msg );
return; return;
@ -161,7 +161,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr
KFileItem *props = new KFileItem( f_props, url ); KFileItem *props = new KFileItem( f_props, url );
kdDebug() << "Found file permissions: " << props->permissionsString() << endl; kdDebug() << "Found file permissions: " << props->permissionsString() << endl;
if ( !props->isReadable() ) { if ( !props->isReadable() ) {
const TQString msg = i18n( "<qt><p>You don't have the permissions to read file: <b>%1</b></p></qt>" ).tqarg( url.url() ); const TQString msg = i18n( "<qt><p>You don't have the permissions to read file: <b>%1</b></p></qt>" ).arg( url.url() );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( msg ); err->setErrMsg( msg );
return; return;
@ -169,14 +169,14 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr
TQString xmlfile; TQString xmlfile;
if ( ! KIO::NetAccess::download( url, xmlfile, KApplication::kApplication()->mainWidget() ) ) { if ( ! KIO::NetAccess::download( url, xmlfile, KApplication::kApplication()->mainWidget() ) ) {
const TQString msg = i18n( "<qt><p>Could not download file: <b>%1</b></p></qt>" ).tqarg( url.url() ); const TQString msg = i18n( "<qt><p>Could not download file: <b>%1</b></p></qt>" ).arg( url.url() );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( msg ); err->setErrMsg( msg );
return; return;
} }
if ( xmlfile.isEmpty() ) { if ( xmlfile.isEmpty() ) {
const TQString msg = i18n( "<qt><p>No File found at URL: <b>%1</b></p></qt>" ).tqarg( url.url() ); const TQString msg = i18n( "<qt><p>No File found at URL: <b>%1</b></p></qt>" ).arg( url.url() );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( msg ); err->setErrMsg( msg );
return; return;
@ -285,7 +285,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
"<p>Please make sure that you have the permissions to write to this Directory.<br>" "<p>Please make sure that you have the permissions to write to this Directory.<br>"
"If you are working with remotely stored files " "If you are working with remotely stored files "
"make sure that the target host and the directory is reachable." "make sure that the target host and the directory is reachable."
"</p></qt>" ).tqarg( url.url() ) ); "</p></qt>" ).arg( url.url() ) );
file.unlink(); file.unlink();
// errH->showError( err ); // errH->showError( err );
return err; return err;
@ -304,7 +304,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
// generate retrun error object // generate retrun error object
err -> setErrType( KMFError::NORMAL ); err -> setErrType( KMFError::NORMAL );
const TQString& msg = i18n( "Opening file %1 for writing failed.\n" 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 ); err -> setErrMsg( msg );
file.unlink(); file.unlink();
// errH->showError( err ); // errH->showError( err );
@ -315,7 +315,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
// generate retrun error object // generate retrun error object
err -> setErrType( KMFError::NORMAL ); err -> setErrType( KMFError::NORMAL );
const TQString& msg = i18n( "Opening file %1 for writing failed.\n" 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 ); err -> setErrMsg( msg );
file.unlink(); file.unlink();
// errH->showError( err ); // errH->showError( err );

4
kmyfirewall/core/kmfprotocolusage.cpp
Unescape View File

@ -200,7 +200,7 @@ void KMFProtocolUsage::loadXML( TQDomNode root, TQStringList& errors ) {
// kdDebug() << "Using Protocol Uuid!" << endl; // kdDebug() << "Using Protocol Uuid!" << endl;
KMFProtocol* prot = KMFProtocolLibrary::instance()->findProtocolByUuid( *( new TQUuid( protocolUuid ) ) ); KMFProtocol* prot = KMFProtocolLibrary::instance()->findProtocolByUuid( *( new TQUuid( protocolUuid ) ) );
if ( ! prot ) { 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; kdDebug() << "ERROR: Could not find Protocol: " << protocolUuid << " in protocol Library" << endl;
return; return;
} }
@ -211,7 +211,7 @@ void KMFProtocolUsage::loadXML( TQDomNode root, TQStringList& errors ) {
KMFProtocol* prot = KMFProtocolLibrary::instance()->findProtocolByName( protocolName ); KMFProtocol* prot = KMFProtocolLibrary::instance()->findProtocolByName( protocolName );
if ( ! prot ) { 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; kdDebug() << "ERROR: Could not find Protocol: " << protocolName << " in protocol Library" << endl;
return; return;
} }

2
kmyfirewall/core/kmftarget.cpp
Unescape View File

@ -233,7 +233,7 @@ KMFError* KMFTarget::tryAutoConfiguration() {
kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl; kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl;
emit sigTargetChanged( this ); emit sigTargetChanged( this );
err->setErrType( KMFError::NORMAL ); 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; return err;
} }

8
kmyfirewall/core/kmftransaction.cpp
Unescape View File

@ -42,7 +42,7 @@ void KMFTransaction::commit() {
NetfilterObject* KMFTransaction::undo() { NetfilterObject* KMFTransaction::undo() {
NetfilterObject* obj = NetfilterObject::findObject( m_objectUuid ); NetfilterObject* obj = NetfilterObject::findObject( m_objectUuid );
if ( ! obj ) { 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; return 0;
} }
if( m_undoXML.isNull() ) { if( m_undoXML.isNull() ) {
@ -58,7 +58,7 @@ NetfilterObject* KMFTransaction::undo() {
NetfilterObject* KMFTransaction::redo() { NetfilterObject* KMFTransaction::redo() {
NetfilterObject* obj = NetfilterObject::findObject( m_objectUuid ); NetfilterObject* obj = NetfilterObject::findObject( m_objectUuid );
if ( ! obj ) { 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; return 0;
} }
if ( m_redoXML.isNull() ) { if ( m_redoXML.isNull() ) {
@ -73,8 +73,8 @@ NetfilterObject* KMFTransaction::redo() {
const TQString& KMFTransaction::toString() { const TQString& KMFTransaction::toString() {
TQString s = ""; TQString s = "";
s.append( i18n("Transaction: %1 uuid: %2\n" ).tqarg( name() ).tqarg( uuid().toString() ) ); s.append( i18n("Transaction: %1 uuid: %2\n" ).arg( name() ).arg( uuid().toString() ) );
s.append( i18n("-- Changed ObjectUuid: %1").tqarg( m_objectUuid.toString() ) ); s.append( i18n("-- Changed ObjectUuid: %1").arg( m_objectUuid.toString() ) );
return *( new TQString( s ) ); return *( new TQString( s ) );
} }

8
kmyfirewall/core/kmfundoengine.cpp
Unescape View File

@ -101,7 +101,7 @@ void KMFUndoEngine::log( const TQString& msg, int kmfErrorType = KMFError::NORMA
TQString m = msg; TQString m = msg;
TQString s = ""; TQString s = "";
if ( obj ) { if ( obj ) {
m.prepend( i18n("<i>%1:</i> ").tqarg( obj->name() ) ); m.prepend( i18n("<i>%1:</i> ").arg( obj->name() ) );
} }
s.append( KMFError::getAsString( kmfErrorType, m ) ); s.append( KMFError::getAsString( kmfErrorType, m ) );
emit sigLog( *( new TQString(s) ) ); 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 ) { void KMFUndoEngine::changed ( const TQUuid& id ) {
NetfilterObject* obj = NetfilterObject::findObject ( id ); NetfilterObject* obj = NetfilterObject::findObject ( id );
if ( ! obj ) { 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; return;
} }
is_saved = false; is_saved = false;
@ -118,13 +118,13 @@ void KMFUndoEngine::changed ( const TQUuid& id ) {
m_app->updateCaption(); m_app->updateCaption();
} }
if ( ! m_in_transaction ) { 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; return;
} }
NetfilterObject *highestAffected = NetfilterObject::findObject( m_currentTransaction->objectUuid() ); NetfilterObject *highestAffected = NetfilterObject::findObject( m_currentTransaction->objectUuid() );
if ( ! highestAffected || obj != highestAffected && ! obj->isChildOf( highestAffected->uuid() ) ) { 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 );
} }
} }

6
kmyfirewall/core/netfilterobject.cpp
Unescape View File

@ -179,16 +179,16 @@ const TQString& NetfilterObject::getXMLSniplet() {
void NetfilterObject::loadUuid( TQDomNode& node, TQStringList& errors ) { void NetfilterObject::loadUuid( TQDomNode& node, TQStringList& errors ) {
if ( ! node.toElement().hasAttribute( XML::Uuid_Attribute ) ) { 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; return;
} }
// if ( KMFUndoEngine::instance()->preserveObjectUuid() ) { // if ( KMFUndoEngine::instance()->preserveObjectUuid() ) {
const TQString& newUuid = node.toElement().attribute( XML::Uuid_Attribute ); const TQString& newUuid = node.toElement().attribute( XML::Uuid_Attribute );
if ( newUuid.isEmpty() ) { 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; 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 ); setUuid( newUuid );
// } // }

22
kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
Unescape View File

@ -159,7 +159,7 @@ void KMFGenericInterfaceHost::slotNewHost() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone, 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() ) ); KMFNetHost * host = m_zone->addNetHost( i18n("New Host"), *(new TQDomDocument() ) );
if ( host ) { if ( host ) {
@ -187,12 +187,12 @@ void KMFGenericInterfaceHost::slotDelHost() {
if ( ! m_host || ! m_zone ) if ( ! m_host || ! m_zone )
return; return;
if ( KMessageBox::questionYesNo(this, i18n("<qt>Are you sure that you want to delete host " if ( KMessageBox::questionYesNo(this, i18n("<qt>Are you sure that you want to delete host "
"<b>%1</b> from <b>%2</b>?</qt>").tqarg(m_host->guiName() ).tqarg( m_zone->guiName() ), "<b>%1</b> from <b>%2</b>?</qt>").arg(m_host->guiName() ).arg( m_zone->guiName() ),
i18n("Are you sure?"), KStdGuiItem::yes(), KStdGuiItem::cancel(), i18n("Are you sure?"), KStdGuiItem::yes(), KStdGuiItem::cancel(),
"genericgui_hostpage_hostdelete") == KMessageBox::Yes ) { "genericgui_hostpage_hostdelete") == KMessageBox::Yes ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone, 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_zone->delHost( m_host );
m_host = 0; m_host = 0;
@ -247,7 +247,7 @@ void KMFGenericInterfaceHost::slotNewItemSelected( TQListViewItem* item ){
c_log_out->setEnabled(true); c_log_out->setEnabled(true);
c_log_in->setChecked( m_host->logIncoming() ); c_log_in->setChecked( m_host->logIncoming() );
c_log_out->setChecked( m_host->logOutgoing() ); 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 { } else {
kdDebug() << "KMFGenericInterfaceHost::slotNewItemSelected( TQListViewItem* item ): WARNING unknown ListView Type!!!" << endl; kdDebug() << "KMFGenericInterfaceHost::slotNewItemSelected( TQListViewItem* item ): WARNING unknown ListView Type!!!" << endl;
@ -286,7 +286,7 @@ void KMFGenericInterfaceHost::slotHostRenamed( TQListViewItem* item, int , const
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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 ); m_host->setGuiName( newName );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -310,7 +310,7 @@ void KMFGenericInterfaceHost::slotAddressChanged( const TQString& ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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_host->address()->setAddress( m_sb_host_1->text() +"."+
m_sb_host_2->text()+"."+ m_sb_host_2->text()+"."+
@ -334,7 +334,7 @@ void KMFGenericInterfaceHost::slotHostDescChanged() {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setDescription( m_host_desc->text().simplifyWhiteSpace() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -349,7 +349,7 @@ void KMFGenericInterfaceHost::slotLoggingChanged( bool ) {
if ( c_log_in->isChecked() != m_host->logIncoming() ) { if ( c_log_in->isChecked() != m_host->logIncoming() ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLogIncoming( c_log_in->isChecked() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -357,7 +357,7 @@ void KMFGenericInterfaceHost::slotLoggingChanged( bool ) {
if ( m_host->logOutgoing() != c_log_out->isChecked() ) { if ( m_host->logOutgoing() != c_log_out->isChecked() ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLogOutgoing( c_log_out->isChecked() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -381,7 +381,7 @@ void KMFGenericInterfaceHost::slotZoneRBM( TQListViewItem* item, const TQPoint&
if ( m_zone ) { if ( m_zone ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = m_zone->name(); 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->insertTitle( icon_chain, lab_str );
m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQT_SLOT( slotNewHost() ) ); m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQT_SLOT( slotNewHost() ) );
m_contextMenu->popup( point ); m_contextMenu->popup( point );
@ -394,7 +394,7 @@ void KMFGenericInterfaceHost::slotZoneRBM( TQListViewItem* item, const TQPoint&
if ( m_host ) { if ( m_host ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = m_zone->name(); 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->insertTitle( icon_chain, lab_str );
m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQT_SLOT( slotNewHost() ) ); m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQT_SLOT( slotNewHost() ) );
m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) ); m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) );

4
kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp
Unescape View File

@ -78,7 +78,7 @@ void KMFGenericInterfaceIcmp::slotEnablePingReplyToggled( bool onoff ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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 ) { if ( onoff ) {
m_doc->currentDocAsGenericDoc()->setAllowPingReply( onoff ); m_doc->currentDocAsGenericDoc()->setAllowPingReply( onoff );
@ -99,7 +99,7 @@ void KMFGenericInterfaceIcmp::slotEnablePingReplyLimitToggled( bool onoff ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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 ); m_doc->currentDocAsGenericDoc()->setLimitPingReply( onoff );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();

6
kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp
Unescape View File

@ -90,7 +90,7 @@ void KMFGenericInterfaceLogging::slotLoggingChanged( bool onoff ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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 ); m_doc->currentDocAsGenericDoc()->setLogDropped( onoff );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -102,7 +102,7 @@ void KMFGenericInterfaceLogging::slotLimitChanged( bool onoff ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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 ); m_doc->currentDocAsGenericDoc()->setLimitLog( onoff );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -114,7 +114,7 @@ void KMFGenericInterfaceLogging::slotLogPrefixChanged( const TQString & ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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() ); m_doc->currentDocAsGenericDoc()->setLogPrefix( m_le_logPrefix->text().simplifyWhiteSpace() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();

8
kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp
Unescape View File

@ -135,7 +135,7 @@ void KMFGenericInterfaceNat::loadDoc( KMFNetwork* doc ) {
void KMFGenericInterfaceNat::slotNatEnabled( bool onoff ) { void KMFGenericInterfaceNat::slotNatEnabled( bool onoff ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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 ); m_doc->currentDocAsGenericDoc()->setUseNat( onoff );
@ -152,7 +152,7 @@ void KMFGenericInterfaceNat::slotMasqueradeEnabled( bool onoff ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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 ); m_doc->currentDocAsGenericDoc()->setUseMasquerade( onoff );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -171,7 +171,7 @@ void KMFGenericInterfaceNat::slotAddressChanged( const TQString& ) {
kdDebug() << "Updating NAT external address to: " << address << endl; kdDebug() << "Updating NAT external address to: " << address << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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_doc->currentDocAsGenericDoc()->natAddress()->setAddress( m_sb_addr_1->value(),
m_sb_addr_2->value(), m_sb_addr_2->value(),
@ -189,7 +189,7 @@ void KMFGenericInterfaceNat::slotExternalInterfaceChanged( const TQString& str )
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc(), 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 ); m_doc->currentDocAsGenericDoc()->setOutgoingInterface( str );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();

30
kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
Unescape View File

@ -223,7 +223,7 @@ void KMFGenericInterfaceProtocol::slotNewItemSelected( TQListViewItem* item ) {
if ( m_zone ) { if ( m_zone ) {
kdDebug() << "kmfitem->zone() pointer is valid" << endl; kdDebug() << "kmfitem->zone() pointer is valid" << endl;
kmfitem->setText( 0,m_zone->guiName() ); 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->setZone( m_zone );
m_protocolLIstView->setEnabled( true ); m_protocolLIstView->setEnabled( true );
m_network_widget->loadZone( m_zone ); m_network_widget->loadZone( m_zone );
@ -264,7 +264,7 @@ void KMFGenericInterfaceProtocol::slotZoneRBM( TQListViewItem* item, const TQPoi
if ( m_zone ) { if ( m_zone ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = m_zone->name(); 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->insertTitle( icon_chain, lab_str );
m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQT_SLOT( slotAddHost() ) ); 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 ) { if ( m_host ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = m_host->name(); 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->insertTitle( icon_chain, lab_str );
m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) ); m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) );
m_contextMenu->insertItem( icon_rename, i18n( "Delete Host..." ), this, TQT_SLOT( slotDelHost() ) ); m_contextMenu->insertItem( icon_rename, i18n( "Delete Host..." ), this, TQT_SLOT( slotDelHost() ) );
@ -310,7 +310,7 @@ void KMFGenericInterfaceProtocol::slotProtocolClicked( KMFProtocolUsage* protUsa
} else { } else {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone, 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() ); 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() ) ) { if ( m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone, 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 ); m_zone->delProtocolUsage( protUsage );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -347,7 +347,7 @@ void KMFGenericInterfaceProtocol::slotProtocolClicked( KMFProtocolUsage* protUsa
} else { } else {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); 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() ) ) { if ( m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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 ); m_host->delProtocolUsage( protUsage );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -402,7 +402,7 @@ void KMFGenericInterfaceProtocol::slotAddZone() {
s = s.setNum( m_doc->currentDocAsGenericDoc()->incomingZone()->zones().count() ); s = s.setNum( m_doc->currentDocAsGenericDoc()->incomingZone()->zones().count() );
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc()->incomingZone(), 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() ); KMFNetZone * zone = m_doc->currentDocAsGenericDoc()->incomingZone()->addZone( "" + m_doc->currentDocAsGenericDoc()->incomingZone()->name() + "_z_" + s, new KMFError() );
if ( zone ) { if ( zone ) {
@ -419,7 +419,7 @@ void KMFGenericInterfaceProtocol::slotAddZone() {
s = s.setNum( m_doc->currentDocAsGenericDoc()->outgoingZone()->zones().count() ); s = s.setNum( m_doc->currentDocAsGenericDoc()->outgoingZone()->zones().count() );
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc->currentDocAsGenericDoc()->outgoingZone(), 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() ); 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" ) { if ( m_zone->name() != "incoming_world" || m_zone->name() != "outgoing_world" ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone->zone(), 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->zone()->delZone( m_zone );
m_zone = 0; m_zone = 0;
@ -466,7 +466,7 @@ void KMFGenericInterfaceProtocol::slotAddHost() {
s = s.setNum( m_zone->hosts().count() ); s = s.setNum( m_zone->hosts().count() );
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone, 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() ) ); KMFNetHost * host = m_zone->addNetHost( "" + m_zone->name() + "_h_" + s, * (new TQDomDocument() ) );
if ( host ) { if ( host ) {
@ -486,7 +486,7 @@ void KMFGenericInterfaceProtocol::slotDelHost() {
return; return;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone, 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_zone->delHost( m_host );
m_host = 0; m_host = 0;
@ -539,7 +539,7 @@ void KMFGenericInterfaceProtocol::slotZoneChanged( KMFNetZone* z ) {
kdDebug() << "void KMFGenericInterfaceProtocol::slotZoneChanged( KMFNetZone* z )" << endl; kdDebug() << "void KMFGenericInterfaceProtocol::slotZoneChanged( KMFNetZone* z )" << endl;
if ( KMFListViewItem *item = findItem( z->uuid() ) ) { if ( KMFListViewItem *item = findItem( z->uuid() ) ) {
kdDebug() << "Updating item" << endl; 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()->incomingZone()->refreshNetworkTree();
m_doc->currentDocAsGenericDoc()->outgoingZone()->refreshNetworkTree(); m_doc->currentDocAsGenericDoc()->outgoingZone()->refreshNetworkTree();
@ -582,7 +582,7 @@ void KMFGenericInterfaceProtocol::slotRenameItem( TQListViewItem* item, int, con
if ( kmfitem->type() == NetfilterObject::NETZONE ) { if ( kmfitem->type() == NetfilterObject::NETZONE ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
kmfitem->zone(), 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 ); kmfitem->zone()->setGuiName( name );
@ -597,7 +597,7 @@ void KMFGenericInterfaceProtocol::slotRenameItem( TQListViewItem* item, int, con
if ( kmfitem->type() == NetfilterObject::NETHOST ) { if ( kmfitem->type() == NetfilterObject::NETHOST ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
kmfitem->host(), 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 ); kmfitem->host()->setGuiName( name );
kdDebug() << "Renaming Host: " << kmfitem->host()->name() << endl; kdDebug() << "Renaming Host: " << kmfitem->host()->name() << endl;

6
kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui
Unescape View File

@ -151,7 +151,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -181,7 +181,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -211,7 +211,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>

4
kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui
Unescape View File

@ -85,7 +85,7 @@
Those attacks are based on the fact that every computer can only handle a limited number of open connections. 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.&lt;/p&gt;</string> A DoS attack is mostly performed by a lot of hosts connecting to the victim host until it gives up.&lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -150,7 +150,7 @@ However, there are a lot of network programs that use ping requests to find and
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">

6
kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui
Unescape View File

@ -75,7 +75,7 @@ The entries are written to the system's main log file
<property name="textFormat"> <property name="textFormat">
<enum>RichText</enum> <enum>RichText</enum>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -114,7 +114,7 @@ The entries are written to the system's main log file
<property name="text"> <property name="text">
<string>&lt;p&gt;The logprefix is a string that is prepended to the lines written to your log file to help you find the lines you need.&lt;/p&gt;</string> <string>&lt;p&gt;The logprefix is a string that is prepended to the lines written to your log file to help you find the lines you need.&lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop|AlignLeft</set> <set>WordBreak|AlignTop|AlignLeft</set>
</property> </property>
<property name="vAlign" stdset="0"> <property name="vAlign" stdset="0">
@ -151,7 +151,7 @@ The entries are written to the system's main log file
<property name="text"> <property name="text">
<string>&lt;p&gt;Avoid "Denial of Service" attacks by limiting logging.&lt;/p&gt;</string> <string>&lt;p&gt;Avoid "Denial of Service" attacks by limiting logging.&lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">

8
kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui
Unescape View File

@ -33,7 +33,7 @@
By enabling NAT you can provide your Internet connection to other hosts that By enabling NAT you can provide your Internet connection to other hosts that
are using your computer a their default gateway.&lt;/p&gt;</string> are using your computer a their default gateway.&lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -129,7 +129,7 @@ are using your computer a their default gateway.&lt;/p&gt;</string>
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -159,7 +159,7 @@ are using your computer a their default gateway.&lt;/p&gt;</string>
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -189,7 +189,7 @@ are using your computer a their default gateway.&lt;/p&gt;</string>
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>

8
kmyfirewall/installer/kmfinstallerplugin.cpp
Unescape View File

@ -130,16 +130,16 @@ bool KMFInstallerPlugin::isConfigValid() {
if ( ! configValid ) { if ( ! configValid ) {
if( KMessageBox::questionYesNo ( 0, if( KMessageBox::questionYesNo ( 0,
i18n( "<qt><p>Do you want KMyFirewall to try to auto configure %1 settings</p></qt>" ).tqarg( rulesetDoc()->target()->toFriendlyString() ), i18n( "<qt><p>Do you want KMyFirewall to try to auto configure %1 settings</p></qt>" ).arg( rulesetDoc()->target()->toFriendlyString() ),
i18n( "Auto Configure Target" ), KStdGuiItem::yes(), KStdGuiItem::no() ) == KMessageBox::Yes ) { i18n( "Auto Configure Target" ), KStdGuiItem::yes(), KStdGuiItem::no() ) == KMessageBox::Yes ) {
KMFError* err = rulesetDoc()->target()->tryAutoConfiguration(); KMFError* err = rulesetDoc()->target()->tryAutoConfiguration();
KMFErrorHandler* errH = new KMFErrorHandler( "Target Autoconfiguration" ); KMFErrorHandler* errH = new KMFErrorHandler( "Target Autoconfiguration" );
errH->showError( err ); errH->showError( err );
if ( ! rulesetDoc()->target()->config()->isValid() ) { if ( ! rulesetDoc()->target()->config()->isValid() ) {
KMessageBox::error( KApplication::kApplication()->mainWidget(), i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); KMessageBox::error( KApplication::kApplication()->mainWidget(), i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").arg( rulesetDoc()->target()->toFriendlyString() ) );
} else { } else {
KMessageBox::information( KApplication::kApplication()->mainWidget(), i18n("<qt><p>Auto Confguration of: %1 finished successfully.</p></qt>").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); KMessageBox::information( KApplication::kApplication()->mainWidget(), i18n("<qt><p>Auto Confguration of: %1 finished successfully.</p></qt>").arg( rulesetDoc()->target()->toFriendlyString() ) );
} }
configValid = rulesetDoc()->target()->config()->isValid(); configValid = rulesetDoc()->target()->config()->isValid();
@ -368,7 +368,7 @@ void KMFInstallerPlugin::slotGenerateInstallerPackage() {
if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) { if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) {
answer = KMessageBox::warningYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>" answer = KMessageBox::warningYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>"
"<p><b>Overwrite the existing file?</b></p></qt>" ).tqarg( url.url() ) ); "<p><b>Overwrite the existing file?</b></p></qt>" ).arg( url.url() ) );
if ( answer == KMessageBox::No ) { if ( answer == KMessageBox::No ) {
return; return;
} }

104
kmyfirewall/installer/linux/kmfiptinstaller.cpp
Unescape View File

@ -148,7 +148,7 @@ void KMFIPTInstaller::slotJobFinished( bool ok, const TQString& cmd_name ) {
KMessageBox::error( 0, msg, cap ); KMessageBox::error( 0, msg, cap );
} /*else if ( !ok ) { } /*else if ( !ok ) {
const TQString & msg = i18n( "<p>Execution of <b>%1</b> failed" const TQString & msg = i18n( "<p>Execution of <b>%1</b> failed"
"<p>Click <b>OK</b> to check your configuration and make sure you are logged in as <b>root</b>" ).tqarg( cmd_name ); "<p>Click <b>OK</b> to check your configuration and make sure you are logged in as <b>root</b>" ).arg( cmd_name );
const TQString& cap = "KMFIPTInstaller"; const TQString& cap = "KMFIPTInstaller";
KMessageBox::error( 0, msg, cap ); KMessageBox::error( 0, msg, cap );
}*/ }*/
@ -207,7 +207,7 @@ void KMFIPTInstaller::cmdRunFW() {
TQString cmd = "bash " + temp_file->name() + " -v start"; TQString cmd = "bash " + temp_file->name() + " -v start";
// KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true ); // KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true );
setOutputWidget( execWidget() ); 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(); showOutput();
checkStatus(); checkStatus();
} else { } else {
@ -233,7 +233,7 @@ void KMFIPTInstaller::cmdRunFW() {
"<li>iptables -t mangle -P OUTPUT ACCEPT </li>" "<li>iptables -t mangle -P OUTPUT ACCEPT </li>"
"<li>iptables -t mangle -P FORWARD ACCEPT </li>" "<li>iptables -t mangle -P FORWARD ACCEPT </li>"
"<li>iptables -t mangle -P PREROUTING ACCEPT </li>" "<li>iptables -t mangle -P PREROUTING ACCEPT </li>"
"<li>iptables -t mangle -P POSTROUTING ACCEPT </li></ul>" ).tqarg(rulesetDoc()->target()->toFriendlyString() ), "<li>iptables -t mangle -P POSTROUTING ACCEPT </li></ul>" ).arg(rulesetDoc()->target()->toFriendlyString() ),
i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_run_fw_remote" ) != KMessageBox::Yes i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_run_fw_remote" ) != KMessageBox::Yes
) { ) {
return; return;
@ -241,7 +241,7 @@ void KMFIPTInstaller::cmdRunFW() {
setOutputWidget( execWidget() ); 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(); showOutput();
generateInstallerPackage( rulesetDoc()->target() ); generateInstallerPackage( rulesetDoc()->target() );
@ -255,7 +255,7 @@ void KMFIPTInstaller::cmdRunFW() {
} }
setOutputWidget( execWidget() ); 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(); showOutput();
checkStatus(); checkStatus();
} }
@ -272,7 +272,7 @@ void KMFIPTInstaller::cmdStopFW() {
} }
if( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to stop the firewall on %1?</b>" if( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to stop the firewall on %1?</b>"
"<p><b>This will leave the computer unprotected!</b></p>" ).tqarg(rulesetDoc()->target()->toFriendlyString() ), "<p><b>This will leave the computer unprotected!</b></p>" ).arg(rulesetDoc()->target()->toFriendlyString() ),
i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_stop_fw_remote" ) != KMessageBox::Yes i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_stop_fw_remote" ) != KMessageBox::Yes
) { ) {
return; return;
@ -283,13 +283,13 @@ void KMFIPTInstaller::cmdStopFW() {
TQString cmd = "bash " + file + " -v stop"; TQString cmd = "bash " + file + " -v stop";
setOutputWidget( execWidget() ); 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(); showOutput();
checkStatus(); checkStatus();
} else { } else {
setOutputWidget( execWidget() ); 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(); showOutput();
generateInstallerPackage( rulesetDoc()->target() ); generateInstallerPackage( rulesetDoc()->target() );
@ -303,7 +303,7 @@ void KMFIPTInstaller::cmdStopFW() {
} }
setOutputWidget( execWidget() ); 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(); showOutput();
checkStatus(); checkStatus();
} }
@ -324,12 +324,12 @@ void KMFIPTInstaller::cmdShowRunningConfig( const TQString& para ) {
if( rulesetDoc()->target()->isLocalExecuteTarget() ) { if( rulesetDoc()->target()->isLocalExecuteTarget() ) {
// KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true ); // KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true );
setOutputWidget( execWidget() ); 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(); showOutput();
} else { } else {
setOutputWidget( execWidget() ); 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(); showOutput();
KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() ); KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() );
@ -340,7 +340,7 @@ void KMFIPTInstaller::cmdShowRunningConfig( const TQString& para ) {
} }
setOutputWidget( execWidget() ); 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(); showOutput();
} }
} }
@ -354,7 +354,7 @@ void KMFIPTInstaller::cmdInstallFW() {
if( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to install the firewall on %1?</b>" if( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to install the firewall on %1?</b>"
"<p>This will add the scripts to your init system that are required to " "<p>This will add the scripts to your init system that are required to "
"start your firewall during bootup." "start your firewall during bootup."
"<p><b>Please make sure that the firewall runs properly before you install it.</b>" ).tqarg( rulesetDoc()->target()->toFriendlyString() ), "<p><b>Please make sure that the firewall runs properly before you install it.</b>" ).arg( rulesetDoc()->target()->toFriendlyString() ),
i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_install_fw" ) != KMessageBox::Yes ) { i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_install_fw" ) != KMessageBox::Yes ) {
return; return;
} }
@ -379,11 +379,11 @@ void KMFIPTInstaller::cmdInstallFW() {
"<li>File: %2</li>" "<li>File: %2</li>"
"<li>File: %3</li>" "<li>File: %3</li>"
"<li>Link: %4 -&gt; %5</li></ul></ul>" ) "<li>Link: %4 -&gt; %5</li></ul></ul>" )
.tqarg( "/etc/kmyfirewall" ) .arg( "/etc/kmyfirewall" )
.tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
.tqarg( conf->IPTPath() + "/kmyfirewall" ) .arg( conf->IPTPath() + "/kmyfirewall" )
.tqarg( conf->rcDefaultPath() + "/kmyfirewall" ) .arg( conf->rcDefaultPath() + "/kmyfirewall" )
.tqarg( conf->initPath() + "/kmyfirewall" ); .arg( conf->initPath() + "/kmyfirewall" );
TQString cap = i18n( "Install Firewall" ); TQString cap = i18n( "Install Firewall" );
KMessageBox::information( 0, msg, cap, "created_install_files", 0 ); KMessageBox::information( 0, msg, cap, "created_install_files", 0 );
} else if ( conf->oS() == "linux" ) { } else if ( conf->oS() == "linux" ) {
@ -393,13 +393,13 @@ void KMFIPTInstaller::cmdInstallFW() {
"<li>File: %3</li>" "<li>File: %3</li>"
"<li>Link: %4 -&gt; %5</li>" "<li>Link: %4 -&gt; %5</li>"
"<li>Link: %6 -&gt; %7</li></ul></ul>" ) "<li>Link: %6 -&gt; %7</li></ul></ul>" )
.tqarg( "/etc/kmyfirewall" ) .arg( "/etc/kmyfirewall" )
.tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
.tqarg( conf->initPath() + "/kmyfirewall" ) .arg( conf->initPath() + "/kmyfirewall" )
.tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" ) .arg( conf->rcDefaultPath() + "/S99kmyfirewall" )
.tqarg( conf->initPath() + "/kmyfirewall" ) .arg( conf->initPath() + "/kmyfirewall" )
.tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" ) .arg( conf->rcDefaultPath() + "/K01kmyfirewall" )
.tqarg( conf->initPath() + "/kmyfirewall" ); .arg( conf->initPath() + "/kmyfirewall" );
TQString cap = i18n( "Install Firewall" ); TQString cap = i18n( "Install Firewall" );
KMessageBox::information( 0, msg, cap, "created_install_files", 0 ); 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; TQString cmd = "bash " + installscript + " install " + systemtype + " " + conf->initPath() + " " + conf->rcDefaultPath() + " " + initscript + " " + fwscript;
setOutputWidget( execWidget() ); 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(); showOutput();
checkStatus(); checkStatus();
} else { } else {
setOutputWidget( execWidget() ); 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(); showOutput();
generateInstallerPackage( rulesetDoc()->target() ); generateInstallerPackage( rulesetDoc()->target() );
@ -443,7 +443,7 @@ void KMFIPTInstaller::cmdInstallFW() {
} }
setOutputWidget( execWidget() ); 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(); showOutput();
checkStatus(); checkStatus();
} }
@ -456,7 +456,7 @@ void KMFIPTInstaller::cmdUninstallFW() {
KMFTargetConfig *conf = rulesetDoc()->target()->config(); KMFTargetConfig *conf = rulesetDoc()->target()->config();
if ( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to uninstall the firewall from %1?</b><br>" if ( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to uninstall the firewall from %1?</b><br>"
"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 ) { i18n( "Uninstall Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_uninstall_fw" ) != KMessageBox::Yes ) {
return; return;
} }
@ -482,11 +482,11 @@ void KMFIPTInstaller::cmdUninstallFW() {
"<li>File: %2</li>" "<li>File: %2</li>"
"<li>File: %3</li>" "<li>File: %3</li>"
"<li>Link: %4 -&gt; %5</li></ul></ul>" ) "<li>Link: %4 -&gt; %5</li></ul></ul>" )
.tqarg( "/etc/kmyfirewall" ) .arg( "/etc/kmyfirewall" )
.tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
.tqarg( conf->initPath() + "/kmyfirewall" ) .arg( conf->initPath() + "/kmyfirewall" )
.tqarg( conf->rcDefaultPath() + "/kmyfirewall" ) .arg( conf->rcDefaultPath() + "/kmyfirewall" )
.tqarg( conf->initPath() + "/kmyfirewall" ); .arg( conf->initPath() + "/kmyfirewall" );
TQString cap = i18n( "Uninstall Firewall" ); TQString cap = i18n( "Uninstall Firewall" );
KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 ); KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 );
} else if ( conf->oS() == "linux" ) { } else if ( conf->oS() == "linux" ) {
@ -496,13 +496,13 @@ void KMFIPTInstaller::cmdUninstallFW() {
"<li>File: %3</li>" "<li>File: %3</li>"
"<li>Link: %4 -&gt; %5</li>" "<li>Link: %4 -&gt; %5</li>"
"<li>Link: %6 -&gt; %7</li></ul></ul>" ) "<li>Link: %6 -&gt; %7</li></ul></ul>" )
.tqarg( "/etc/kmyfirewall" ) .arg( "/etc/kmyfirewall" )
.tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
.tqarg( conf->initPath() + "/kmyfirewall" ) .arg( conf->initPath() + "/kmyfirewall" )
.tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" ) .arg( conf->rcDefaultPath() + "/S99kmyfirewall" )
.tqarg( conf->initPath() + "/kmyfirewall" ) .arg( conf->initPath() + "/kmyfirewall" )
.tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" ) .arg( conf->rcDefaultPath() + "/K01kmyfirewall" )
.tqarg( conf->initPath() + "/kmyfirewall" ); .arg( conf->initPath() + "/kmyfirewall" );
TQString cap = i18n( "Uninstall Firewall" ); TQString cap = i18n( "Uninstall Firewall" );
KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 ); KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 );
} }
@ -519,13 +519,13 @@ void KMFIPTInstaller::cmdUninstallFW() {
// KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true ); // KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true );
setOutputWidget( execWidget() ); 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(); showOutput();
checkStatus(); checkStatus();
} else { } else {
setOutputWidget( execWidget() ); 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(); showOutput();
generateInstallerPackage( rulesetDoc()->target() ); generateInstallerPackage( rulesetDoc()->target() );
@ -539,7 +539,7 @@ void KMFIPTInstaller::cmdUninstallFW() {
} }
setOutputWidget( execWidget() ); 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(); showOutput();
checkStatus(); checkStatus();
} }
@ -571,7 +571,7 @@ void KMFIPTInstaller::cmdUninstallFW() {
// //
// return; // return;
// } else { // } 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 { // } else {
// KMessageBox::sorry( 0, i18n( "Unable to find input file" ), i18n( "Output Viewer" ) ); // KMessageBox::sorry( 0, i18n( "Unable to find input file" ), i18n( "Output Viewer" ) );
@ -772,7 +772,7 @@ TQStringList lines;
source_file.close(); source_file.close();
} else { } else {
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
const TQString& msg = i18n( "<p>Opening file for %1 reading <b>failed</b>." ).tqarg( source_file_path ); const TQString& msg = i18n( "<p>Opening file for %1 reading <b>failed</b>." ).arg( source_file_path );
m_err->setErrMsg( msg ); m_err->setErrMsg( msg );
} }
@ -794,7 +794,7 @@ TQStringList lines;
target_file.close(); target_file.close();
} else { } else {
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
const TQString& msg = i18n( "<p>Opening file for %1 writing <b>failed</b>." ).tqarg( target_file_path ); const TQString& msg = i18n( "<p>Opening file for %1 writing <b>failed</b>." ).arg( target_file_path );
m_err->setErrMsg( msg ); m_err->setErrMsg( msg );
} }
} }
@ -823,7 +823,7 @@ void KMFIPTInstaller::parseFileHeaders( const TQString& source_file_path, const
source_file.close(); source_file.close();
} else { } else {
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
const TQString& msg = i18n( "<p>Opening file for %1 reading <b>failed</b>." ).tqarg( source_file_path ); const TQString& msg = i18n( "<p>Opening file for %1 reading <b>failed</b>." ).arg( source_file_path );
m_err->setErrMsg( msg ); m_err->setErrMsg( msg );
} }
@ -847,7 +847,7 @@ void KMFIPTInstaller::parseFileHeaders( const TQString& source_file_path, const
target_file.close(); target_file.close();
} else { } else {
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
const TQString& msg = i18n( "<p>Opening file for %1 writing <b>failed</b>." ).tqarg( target_file_path ); const TQString& msg = i18n( "<p>Opening file for %1 writing <b>failed</b>." ).arg( target_file_path );
m_err->setErrMsg( msg ); m_err->setErrMsg( msg );
} }
} }
@ -927,7 +927,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
"<p>Please check your installation. Usually this script is installed in " "<p>Please check your installation. Usually this script is installed in "
"$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1" "$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1"
"<p>Unable to install the firewall without this script." "<p>Unable to install the firewall without this script."
).tqarg(target->config()->oS()); ).arg(target->config()->oS());
TQString cap = "KMFIPTInstaller"; TQString cap = "KMFIPTInstaller";
KMessageBox::error( 0, msg, cap ); KMessageBox::error( 0, msg, cap );
return; return;
@ -944,7 +944,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
"<p>Please check your installation. Usually this script is installed in " "<p>Please check your installation. Usually this script is installed in "
"$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1" "$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1"
"<p>Unable to install the firewall without this script." "<p>Unable to install the firewall without this script."
).tqarg(target->config()->oS()); ).arg(target->config()->oS());
TQString cap = "KMFIPTInstaller"; TQString cap = "KMFIPTInstaller";
KMessageBox::error( 0, msg, cap ); KMessageBox::error( 0, msg, cap );
return; return;
@ -960,7 +960,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
"<p>Please check your installation. Usually this script is installed in " "<p>Please check your installation. Usually this script is installed in "
"$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1" "$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1"
"<p>Unable to install the firewall without this script." "<p>Unable to install the firewall without this script."
).tqarg(target->config()->oS()); ).arg(target->config()->oS());
TQString cap = "KMFIPTInstaller"; TQString cap = "KMFIPTInstaller";
KMessageBox::error( 0, msg, cap ); KMessageBox::error( 0, msg, cap );
return; return;

96
kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
Unescape View File

@ -162,7 +162,7 @@ KMFProcOut* KMFPFInstaller::execWidget(){
// KMessageBox::error( 0, msg, cap ); // KMessageBox::error( 0, msg, cap );
// } /*else if ( !ok ) { // } /*else if ( !ok ) {
// const TQString & msg = i18n( "<p>Execution of <b>%1</b> failed" // const TQString & msg = i18n( "<p>Execution of <b>%1</b> failed"
// "<p>Click <b>OK</b> to check your configuration and make sure you are logged in as <b>root</b>" ).tqarg( cmd_name ); // "<p>Click <b>OK</b> to check your configuration and make sure you are logged in as <b>root</b>" ).arg( cmd_name );
// const TQString& cap = "KMFPFInstaller"; // const TQString& cap = "KMFPFInstaller";
// KMessageBox::error( 0, msg, cap ); // KMessageBox::error( 0, msg, cap );
// }*/ // }*/
@ -218,7 +218,7 @@ void KMFPFInstaller::cmdRunFW() {
// TQString cmd = "bash " + file + " -v start"; // TQString cmd = "bash " + file + " -v start";
// // KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true ); // // KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true );
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// checkStatus(); // checkStatus();
// } else { // } else {
@ -244,7 +244,7 @@ void KMFPFInstaller::cmdRunFW() {
// "<li>iptables -t mangle -P OUTPUT ACCEPT </li>" // "<li>iptables -t mangle -P OUTPUT ACCEPT </li>"
// "<li>iptables -t mangle -P FORWARD ACCEPT </li>" // "<li>iptables -t mangle -P FORWARD ACCEPT </li>"
// "<li>iptables -t mangle -P PREROUTING ACCEPT </li>" // "<li>iptables -t mangle -P PREROUTING ACCEPT </li>"
// "<li>iptables -t mangle -P POSTROUTING ACCEPT </li></ul>" ).tqarg(rulesetDoc()->target()->toFriendlyString() ), // "<li>iptables -t mangle -P POSTROUTING ACCEPT </li></ul>" ).arg(rulesetDoc()->target()->toFriendlyString() ),
// i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_run_fw_remote" ) != KMessageBox::Yes // i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_run_fw_remote" ) != KMessageBox::Yes
// ) { // ) {
// return; // return;
@ -252,7 +252,7 @@ void KMFPFInstaller::cmdRunFW() {
// //
// //
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// //
// generateInstallerPackage( rulesetDoc()->target() ); // generateInstallerPackage( rulesetDoc()->target() );
@ -266,7 +266,7 @@ void KMFPFInstaller::cmdRunFW() {
// } // }
// //
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// checkStatus(); // checkStatus();
// } // }
@ -283,7 +283,7 @@ void KMFPFInstaller::cmdStopFW() {
// } // }
// //
// if( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to stop the firewall on %1?</b>" // if( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to stop the firewall on %1?</b>"
// "<p><b>This will leave the computer unprotected!</b></p>" ).tqarg(rulesetDoc()->target()->toFriendlyString() ), // "<p><b>This will leave the computer unprotected!</b></p>" ).arg(rulesetDoc()->target()->toFriendlyString() ),
// i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_stop_fw_remote" ) != KMessageBox::Yes // i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_stop_fw_remote" ) != KMessageBox::Yes
// ) { // ) {
// return; // return;
@ -294,13 +294,13 @@ void KMFPFInstaller::cmdStopFW() {
// //
// TQString cmd = "bash " + file + " -v stop"; // TQString cmd = "bash " + file + " -v stop";
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// checkStatus(); // checkStatus();
// //
// } else { // } else {
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// //
// generateInstallerPackage( rulesetDoc()->target() ); // generateInstallerPackage( rulesetDoc()->target() );
@ -314,7 +314,7 @@ void KMFPFInstaller::cmdStopFW() {
// } // }
// //
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// checkStatus(); // checkStatus();
// } // }
@ -335,12 +335,12 @@ void KMFPFInstaller::cmdShowRunningConfig( const TQString& para ) {
// if( rulesetDoc()->target()->isLocalExecuteTarget() ) { // if( rulesetDoc()->target()->isLocalExecuteTarget() ) {
// // KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true ); // // KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true );
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// //
// } else { // } else {
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() ); // KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() );
// //
@ -351,7 +351,7 @@ void KMFPFInstaller::cmdShowRunningConfig( const TQString& para ) {
// } // }
// //
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// } // }
} }
@ -365,7 +365,7 @@ void KMFPFInstaller::cmdInstallFW() {
// if( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to install the firewall on %1?</b>" // if( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to install the firewall on %1?</b>"
// "<p>This will add the scripts to your init system that are required to " // "<p>This will add the scripts to your init system that are required to "
// "start your firewall during bootup." // "start your firewall during bootup."
// "<p><b>Please make sure that the firewall runs properly before you install it.</b>" ).tqarg( rulesetDoc()->target()->toFriendlyString() ), // "<p><b>Please make sure that the firewall runs properly before you install it.</b>" ).arg( rulesetDoc()->target()->toFriendlyString() ),
// i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_install_fw" ) != KMessageBox::Yes ) { // i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_install_fw" ) != KMessageBox::Yes ) {
// return; // return;
// } // }
@ -390,11 +390,11 @@ void KMFPFInstaller::cmdInstallFW() {
// "<li>File: %2</li>" // "<li>File: %2</li>"
// "<li>File: %3</li>" // "<li>File: %3</li>"
// "<li>Link: %4 -&gt; %5</li></ul></ul>" ) // "<li>Link: %4 -&gt; %5</li></ul></ul>" )
// .tqarg( "/etc/kmyfirewall" ) // .arg( "/etc/kmyfirewall" )
// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) // .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
// .tqarg( conf->IPTPath() + "/kmyfirewall" ) // .arg( conf->IPTPath() + "/kmyfirewall" )
// .tqarg( conf->rcDefaultPath() + "/kmyfirewall" ) // .arg( conf->rcDefaultPath() + "/kmyfirewall" )
// .tqarg( conf->initPath() + "/kmyfirewall" ); // .arg( conf->initPath() + "/kmyfirewall" );
// TQString cap = i18n( "Install Firewall" ); // TQString cap = i18n( "Install Firewall" );
// KMessageBox::information( 0, msg, cap, "created_install_files", 0 ); // KMessageBox::information( 0, msg, cap, "created_install_files", 0 );
// } else if ( conf->oS() == "linux" ) { // } else if ( conf->oS() == "linux" ) {
@ -404,13 +404,13 @@ void KMFPFInstaller::cmdInstallFW() {
// "<li>File: %3</li>" // "<li>File: %3</li>"
// "<li>Link: %4 -&gt; %5</li>" // "<li>Link: %4 -&gt; %5</li>"
// "<li>Link: %6 -&gt; %7</li></ul></ul>" ) // "<li>Link: %6 -&gt; %7</li></ul></ul>" )
// .tqarg( "/etc/kmyfirewall" ) // .arg( "/etc/kmyfirewall" )
// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) // .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
// .tqarg( conf->initPath() + "/kmyfirewall" ) // .arg( conf->initPath() + "/kmyfirewall" )
// .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" ) // .arg( conf->rcDefaultPath() + "/S99kmyfirewall" )
// .tqarg( conf->initPath() + "/kmyfirewall" ) // .arg( conf->initPath() + "/kmyfirewall" )
// .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" ) // .arg( conf->rcDefaultPath() + "/K01kmyfirewall" )
// .tqarg( conf->initPath() + "/kmyfirewall" ); // .arg( conf->initPath() + "/kmyfirewall" );
// TQString cap = i18n( "Install Firewall" ); // TQString cap = i18n( "Install Firewall" );
// KMessageBox::information( 0, msg, cap, "created_install_files", 0 ); // KMessageBox::information( 0, msg, cap, "created_install_files", 0 );
// } // }
@ -437,12 +437,12 @@ void KMFPFInstaller::cmdInstallFW() {
// // KProcessWrapper::instance()->slotStartLocalJob( "installfirewall", cmd, true, true ); // // KProcessWrapper::instance()->slotStartLocalJob( "installfirewall", cmd, true, true );
// //
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// checkStatus(); // checkStatus();
// } else { // } else {
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// //
// generateInstallerPackage( rulesetDoc()->target() ); // generateInstallerPackage( rulesetDoc()->target() );
@ -456,7 +456,7 @@ void KMFPFInstaller::cmdInstallFW() {
// } // }
// //
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// checkStatus(); // checkStatus();
// } // }
@ -469,7 +469,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// KMFTargetConfig *conf = rulesetDoc()->target()->config(); // KMFTargetConfig *conf = rulesetDoc()->target()->config();
// //
// if ( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to uninstall the firewall from %1?</b><br>" // if ( KMessageBox::questionYesNo ( 0 , i18n( "<p><b>Are you sure you want to uninstall the firewall from %1?</b><br>"
// "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 ) { // i18n( "Uninstall Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_uninstall_fw" ) != KMessageBox::Yes ) {
// return; // return;
// } // }
@ -495,11 +495,11 @@ void KMFPFInstaller::cmdUninstallFW() {
// "<li>File: %2</li>" // "<li>File: %2</li>"
// "<li>File: %3</li>" // "<li>File: %3</li>"
// "<li>Link: %4 -&gt; %5</li></ul></ul>" ) // "<li>Link: %4 -&gt; %5</li></ul></ul>" )
// .tqarg( "/etc/kmyfirewall" ) // .arg( "/etc/kmyfirewall" )
// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) // .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
// .tqarg( conf->initPath() + "/kmyfirewall" ) // .arg( conf->initPath() + "/kmyfirewall" )
// .tqarg( conf->rcDefaultPath() + "/kmyfirewall" ) // .arg( conf->rcDefaultPath() + "/kmyfirewall" )
// .tqarg( conf->initPath() + "/kmyfirewall" ); // .arg( conf->initPath() + "/kmyfirewall" );
// TQString cap = i18n( "Uninstall Firewall" ); // TQString cap = i18n( "Uninstall Firewall" );
// KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 ); // KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 );
// } else if ( conf->oS() == "linux" ) { // } else if ( conf->oS() == "linux" ) {
@ -509,13 +509,13 @@ void KMFPFInstaller::cmdUninstallFW() {
// "<li>File: %3</li>" // "<li>File: %3</li>"
// "<li>Link: %4 -&gt; %5</li>" // "<li>Link: %4 -&gt; %5</li>"
// "<li>Link: %6 -&gt; %7</li></ul></ul>" ) // "<li>Link: %6 -&gt; %7</li></ul></ul>" )
// .tqarg( "/etc/kmyfirewall" ) // .arg( "/etc/kmyfirewall" )
// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" ) // .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
// .tqarg( conf->initPath() + "/kmyfirewall" ) // .arg( conf->initPath() + "/kmyfirewall" )
// .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" ) // .arg( conf->rcDefaultPath() + "/S99kmyfirewall" )
// .tqarg( conf->initPath() + "/kmyfirewall" ) // .arg( conf->initPath() + "/kmyfirewall" )
// .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" ) // .arg( conf->rcDefaultPath() + "/K01kmyfirewall" )
// .tqarg( conf->initPath() + "/kmyfirewall" ); // .arg( conf->initPath() + "/kmyfirewall" );
// TQString cap = i18n( "Uninstall Firewall" ); // TQString cap = i18n( "Uninstall Firewall" );
// KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 ); // KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 );
// } // }
@ -532,13 +532,13 @@ void KMFPFInstaller::cmdUninstallFW() {
// // KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true ); // // KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true );
// //
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// checkStatus(); // checkStatus();
// //
// } else { // } else {
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// //
// generateInstallerPackage( rulesetDoc()->target() ); // generateInstallerPackage( rulesetDoc()->target() );
@ -552,7 +552,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// } // }
// //
// setOutputWidget( execWidget() ); // 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(); // showOutput();
// checkStatus(); // checkStatus();
// } // }
@ -727,7 +727,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// source_file.close(); // source_file.close();
// } else { // } else {
// m_err->setErrType( KMFError::NORMAL ); // m_err->setErrType( KMFError::NORMAL );
// const TQString& msg = i18n( "<p>Opening file for %1 reading <b>failed</b>." ).tqarg( source_file_path ); // const TQString& msg = i18n( "<p>Opening file for %1 reading <b>failed</b>." ).arg( source_file_path );
// m_err->setErrMsg( msg ); // m_err->setErrMsg( msg );
// } // }
// //
@ -749,7 +749,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// target_file.close(); // target_file.close();
// } else { // } else {
// m_err->setErrType( KMFError::NORMAL ); // m_err->setErrType( KMFError::NORMAL );
// const TQString& msg = i18n( "<p>Opening file for %1 writing <b>failed</b>." ).tqarg( target_file_path ); // const TQString& msg = i18n( "<p>Opening file for %1 writing <b>failed</b>." ).arg( target_file_path );
// m_err->setErrMsg( msg ); // m_err->setErrMsg( msg );
// } // }
// } // }
@ -778,7 +778,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// source_file.close(); // source_file.close();
// } else { // } else {
// m_err->setErrType( KMFError::NORMAL ); // m_err->setErrType( KMFError::NORMAL );
// const TQString& msg = i18n( "<p>Opening file for %1 reading <b>failed</b>." ).tqarg( source_file_path ); // const TQString& msg = i18n( "<p>Opening file for %1 reading <b>failed</b>." ).arg( source_file_path );
// m_err->setErrMsg( msg ); // m_err->setErrMsg( msg );
// } // }
// //
@ -802,7 +802,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// target_file.close(); // target_file.close();
// } else { // } else {
// m_err->setErrType( KMFError::NORMAL ); // m_err->setErrType( KMFError::NORMAL );
// const TQString& msg = i18n( "<p>Opening file for %1 writing <b>failed</b>." ).tqarg( target_file_path ); // const TQString& msg = i18n( "<p>Opening file for %1 writing <b>failed</b>." ).arg( target_file_path );
// m_err->setErrMsg( msg ); // m_err->setErrMsg( msg );
// } // }
// } // }

2
kmyfirewall/ipteditor/kmfchainedit.cpp
Unescape View File

@ -184,7 +184,7 @@ void KMFChainEdit::accept() {
kdDebug() << "KMyFirewallChainEditor::slotSaveChainChanges()" << endl; kdDebug() << "KMyFirewallChainEditor::slotSaveChainChanges()" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_chain, 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 = c_enable_log->isChecked();
bool log_limit = c_log_limit->isChecked(); bool log_limit = c_log_limit->isChecked();

48
kmyfirewall/ipteditor/kmfruleedit.cpp
Unescape View File

@ -329,7 +329,7 @@ void KMFRuleEdit::loadPlugins() {
void KMFRuleEdit::registerRuleOptionPlugin( KMFRuleOptionEditInterface* edit ) { void KMFRuleEdit::registerRuleOptionPlugin( KMFRuleOptionEditInterface* edit ) {
m_widgetStack->addWidget( edit->editWidget() ); m_widgetStack->addWidget( edit->editWidget() );
m_editPlugins.append( edit ); 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 ) { void KMFRuleEdit::registerRuleTargetOptionPlugin( KMFRuleTargetOptionEditInterface* edit ) {
@ -561,7 +561,7 @@ void KMFRuleEdit::slotAddRule() {
if ( m_err_handler->showError( m_err ) ) { if ( m_err_handler->showError( m_err ) ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_chain, 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 ); IPTRule *inserted = m_chain->addRule( text, m_err );
@ -603,21 +603,21 @@ void KMFRuleEdit::slotDelChain() {
if ( m_chain->isBuildIn() ) { if ( m_chain->isBuildIn() ) {
KMessageBox::sorry( this, i18n( "<qt><b>Cannot delete built-in chain: %1</b><br>" KMessageBox::sorry( this, i18n( "<qt><b>Cannot delete built-in chain: %1</b><br>"
"Built-in chains cannot be deleted; you can only delete chains " "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" ) ); i18n( "Sorry" ) );
return ; return ;
} }
int doit = KMessageBox::questionYesNo ( this , i18n( "<p>Are you sure that you want to delete " int doit = KMessageBox::questionYesNo ( this , i18n( "<p>Are you sure that you want to delete "
"chain: <b>%1</b> from table: <b>%2</b>?<br>" "chain: <b>%1</b> from table: <b>%2</b>?<br>"
"<b>Note:</b> By deleting the chain all rules that belong " "<b>Note:</b> 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" ); i18n( "Delete Chain" ), KStdGuiItem::yes(), KStdGuiItem::no(), "main_view_delete_chain" );
kdDebug() << "Message Box returned: " << doit << endl; kdDebug() << "Message Box returned: " << doit << endl;
if ( doit == 3 ) { if ( doit == 3 ) {
kdDebug() << "Try to delete Chain" << endl; kdDebug() << "Try to delete Chain" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_table, 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 ); m_err = m_network->currentDocAsIPTDoc()->table( m_chain->table()->name() )->delChain( m_chain );
if ( m_err_handler ->showError( m_err ) ) { if ( m_err_handler ->showError( m_err ) ) {
@ -732,7 +732,7 @@ void KMFRuleEdit::slotMoveRuleDown() {
// if ( m_rule && kb_optSelect->isEnabled() ) { // if ( m_rule && kb_optSelect->isEnabled() ) {
// KMFUndoEngine::instance()->startTransaction( // KMFUndoEngine::instance()->startTransaction(
// m_chain, // m_chain,
// i18n("Move Rule: %1 down").tqarg( m_rule->name() ) // i18n("Move Rule: %1 down").arg( m_rule->name() )
// ); // );
// m_chain->saveState(); // m_chain->saveState();
// if ( m_chain->moveRule( m_rule, 1 ) ) { // if ( m_chain->moveRule( m_rule, 1 ) ) {
@ -759,7 +759,7 @@ void KMFRuleEdit::slotMoveRuleUp() {
// if ( item ) { // if ( item ) {
// KMFUndoEngine::instance()->startTransaction( // KMFUndoEngine::instance()->startTransaction(
// m_chain, // m_chain,
// i18n("Move Rule: %1 up").tqarg( m_rule->name() ) // i18n("Move Rule: %1 up").arg( m_rule->name() )
// ); // );
// m_chain->saveState(); // m_chain->saveState();
// if ( m_chain->moveRule( m_rule, -1 ) ) { // if ( m_chain->moveRule( m_rule, -1 ) ) {
@ -775,12 +775,12 @@ void KMFRuleEdit::slotMoveRuleUp() {
void KMFRuleEdit::moveRuleInChain( int amount ) { void KMFRuleEdit::moveRuleInChain( int amount ) {
if ( m_rule && kb_optSelect->isEnabled() ) { 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() ); KMFListViewItem* item = currTableView()->findKMFItem( m_rule->name(),2, m_rule->uuid() );
if ( item ) { if ( item ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_chain, m_chain,
transMsg.tqarg( m_rule->name() ) transMsg.arg( m_rule->name() )
); );
if ( m_chain->moveRule( m_rule, -1 ) ) { if ( m_chain->moveRule( m_rule, -1 ) ) {
m_rule->chain()->changed(); m_rule->chain()->changed();
@ -805,14 +805,14 @@ void KMFRuleEdit::slotDelRule() {
return ; return ;
} else { } else {
int doit = KMessageBox::questionYesNo ( this , i18n( "<p>Are you sure that you want to delete " int doit = KMessageBox::questionYesNo ( this , i18n( "<p>Are you sure that you want to delete "
"rule: <b>%1</b> from chain: <b>%2</b>?</p>").tqarg( m_rule->name() ).tqarg( m_rule->chain() ->name() ), "rule: <b>%1</b> from chain: <b>%2</b>?</p>").arg( m_rule->name() ).arg( m_rule->chain() ->name() ),
i18n( "Delete Rule" ), KStdGuiItem::yes(), KStdGuiItem::no(), "rule_edit_delete_rule" ); i18n( "Delete Rule" ), KStdGuiItem::yes(), KStdGuiItem::no(), "rule_edit_delete_rule" );
kdDebug() << "Message Box returned: " << doit << endl; kdDebug() << "Message Box returned: " << doit << endl;
if ( doit == 3 ) { // OK clicked if ( doit == 3 ) { // OK clicked
kdDebug() << "clicked ok" << endl; kdDebug() << "clicked ok" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_chain, 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 ); m_err = m_chain->delRule( m_rule );
if ( m_err_handler->showError( m_err ) ) { if ( m_err_handler->showError( m_err ) ) {
@ -997,7 +997,7 @@ void KMFRuleEdit::slotFragChanged() {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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 ); m_rule->addRuleOption( *cmd, *vals );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -1009,7 +1009,7 @@ void KMFRuleEdit::slotLogRuleChanged() {
return ; return ;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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() ) { if ( cb_log_rule->isChecked() ) {
m_rule->setLogging( true ); m_rule->setLogging( true );
@ -1026,7 +1026,7 @@ void KMFRuleEdit::slotEnableRuleChanged() {
return ; return ;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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() ) { if ( cb_disable_rule->isChecked() ) {
m_rule->setEnabled( false ); m_rule->setEnabled( false );
@ -1065,7 +1065,7 @@ void KMFRuleEdit::slotTargetChanged( const TQString & tg ) {
if ( m_rule->target() != tg ) { if ( m_rule->target() != tg ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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 ); m_rule->setTarget( tg );
emit sigUpdateView( m_rule->chain()->table() ); emit sigUpdateView( m_rule->chain()->table() );
@ -1083,7 +1083,7 @@ void KMFRuleEdit::slotTargetChanged( const TQString & tg ) {
if ( m_rule->target() != tg ) { if ( m_rule->target() != tg ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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 ); m_rule->setTarget( tg );
emit sigUpdateView( m_rule->chain()->table() ); emit sigUpdateView( m_rule->chain()->table() );
@ -1153,7 +1153,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
if ( IPTable* table = dynamic_cast<IPTable*> ( obj ) ) { if ( IPTable* table = dynamic_cast<IPTable*> ( obj ) ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = table->name(); 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->insertTitle( lab_str );
m_contextMenu->insertItem( icon_new, i18n( "Add Chain..." ), this, TQT_SLOT( slotAddChain() ) ); 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<IPTChain*> ( obj ) ) { if ( IPTChain* chain = dynamic_cast<IPTChain*> ( obj ) ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = chain->name(); 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->insertTitle( icon_chain, lab_str );
m_contextMenu->insertItem( icon_new, i18n( "Add Rule..." ), this, TQT_SLOT( slotAddRule() ) ); 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<IPTRule*> ( obj ) ) { if ( IPTRule* rule = dynamic_cast<IPTRule*> ( obj ) ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = rule->name(); 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 ); m_contextMenu->insertTitle( icon_rule, lab_str );
KPopupMenu *sub_edit = new KPopupMenu( m_contextMenu ); KPopupMenu *sub_edit = new KPopupMenu( m_contextMenu );
sub_edit->insertTitle( i18n( "Edit Rule Option" ) ); sub_edit->insertTitle( i18n( "Edit Rule Option" ) );
for( uint i = 0; i < m_editPlugins.count(); i++ ) { 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 ) ), connect( sub_edit,TQT_SIGNAL(activated( int ) ),
this,TQT_SLOT(slotNewOptionType( int ) ) ); this,TQT_SLOT(slotNewOptionType( int ) ) );
@ -1237,7 +1237,7 @@ void KMFRuleEdit::slotMoveRule( int index ) {
if ( chain_target ) { if ( chain_target ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule->chain()->table(), 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 ); m_err = m_rule->chain()->table()->moveRuleToChain( m_rule, chain_target );
if ( m_err_handler->showError( m_err ) ) { if ( m_err_handler->showError( m_err ) ) {
@ -1257,7 +1257,7 @@ void KMFRuleEdit::slotCopyRule( int index ) {
if ( chain_target ) { if ( chain_target ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule->chain() ->table(), 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 ); m_err = m_rule->chain() ->table() ->copyRuleToChain( m_rule, chain_target );
if ( m_err_handler->showError( m_err ) ) { 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() ) { for ( rule = rules.first(); rule; rule = rules.next() ) {
if ( rule->name() == name ) { if ( rule->name() == name ) {
KMessageBox::sorry( this, i18n( "<qt><p>Sorry, there is already a rule named: <b>%1</b> in the chain.<br>" KMessageBox::sorry( this, i18n( "<qt><p>Sorry, there is already a rule named: <b>%1</b> in the chain.<br>"
"Please make sure that the new rule name is unique in its chain.</qt>" ).tqarg( name ) ); "Please make sure that the new rule name is unique in its chain.</qt>" ).arg( name ) );
rule_item->setText( 2, rule_item->rule()->name() ); rule_item->setText( 2, rule_item->rule()->name() );
emit sigUpdateView( rule_item->rule()->chain() ); emit sigUpdateView( rule_item->rule()->chain() );
return ; return ;
@ -1305,7 +1305,7 @@ void KMFRuleEdit::slotRenameRule( TQListViewItem* , int, const TQString& name )
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
rule_item->rule(), 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(); TQString origName = rule_item->rule()->name();

12
kmyfirewall/ipteditor/kmyfirewallchaineditor.ui
Unescape View File

@ -452,7 +452,7 @@
<property name="text"> <property name="text">
<string>Please set the default policy for your chain:</string> <string>Please set the default policy for your chain:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -475,7 +475,7 @@
<property name="text"> <property name="text">
<string>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.</string> <string>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.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -496,7 +496,7 @@
<property name="text"> <property name="text">
<string>The Default Policy decides what to do with Packets that do not match any of the rules defined for the Chain.</string> <string>The Default Policy decides what to do with Packets that do not match any of the rules defined for the Chain.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -537,7 +537,7 @@
<property name="title"> <property name="title">
<string>Logging</string> <string>Logging</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignBottom|AlignTop|AlignLeft</set> <set>AlignVCenter|AlignBottom|AlignTop|AlignLeft</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">
@ -569,7 +569,7 @@
<property name="text"> <property name="text">
<string>Here you can decide whether you would like to log all packets that did not match any rule at the end of the chain.</string> <string>Here you can decide whether you would like to log all packets that did not match any rule at the end of the chain.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop|AlignLeft</set> <set>WordBreak|AlignTop|AlignLeft</set>
</property> </property>
<property name="vAlign" stdset="0"> <property name="vAlign" stdset="0">
@ -740,7 +740,7 @@
<property name="text"> <property name="text">
<string>/</string> <string>/</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="hAlign" stdset="0"> <property name="hAlign" stdset="0">

2
kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui
Unescape View File

@ -52,7 +52,7 @@
<property name="text"> <property name="text">
<string>Please define a unique (in the table) name and decide which table this chain should be added to.</string> <string>Please define a unique (in the table) name and decide which table this chain should be added to.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">

2
kmyfirewall/ipteditor/kmyfirewallruleeditor.ui
Unescape View File

@ -70,7 +70,7 @@
<property name="text"> <property name="text">
<string>Editing Rule</string> <string>Editing Rule</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignLeft</set> <set>AlignVCenter|AlignLeft</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
Unescape View File

@ -262,7 +262,7 @@ void KMFGenericInterfaceEditProtocol::slotDelProtocol() {
kdDebug() << "\n\nWARNING: No Protocol Object to save Changes in Memory!!\n\n" << endl; kdDebug() << "\n\nWARNING: No Protocol Object to save Changes in Memory!!\n\n" << endl;
} }
int doit = KMessageBox::questionYesNo ( this , i18n( "<p>Are you sure that you want to delete " int doit = KMessageBox::questionYesNo ( this , i18n( "<p>Are you sure that you want to delete "
"the protocol: <b>%1</b>?</p>").tqarg( m_protocol->name() ), "the protocol: <b>%1</b>?</p>").arg( m_protocol->name() ),
i18n( "Delete Protocol" ), KStdGuiItem::yes(), KStdGuiItem::no() /*, "protocol_edit_delete_protocol"*/ ); i18n( "Delete Protocol" ), KStdGuiItem::yes(), KStdGuiItem::no() /*, "protocol_edit_delete_protocol"*/ );
// kdDebug() << "Got Answer: " << doit << endl; // kdDebug() << "Got Answer: " << doit << endl;

24
kmyfirewall/kmfwidgets/kmfhostwidget.cpp
Unescape View File

@ -243,9 +243,9 @@ void KMFHostWidget::slotTestConnection() {
} }
if ( KIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /", if ( KIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /",
KApplication::kApplication()->mainWidget() ) != 0) { 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 { } 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(){ void KMFHostWidget::slotTryAutoConfiguration(){
@ -254,14 +254,14 @@ void KMFHostWidget::slotTryAutoConfiguration(){
return; return;
} }
KMFError* err = m_target->tryAutoConfiguration(); 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 ) ) { if ( ! errH->showError( err ) ) {
return; return;
} }
if ( ! m_target->config()->isValid() ) { if ( ! m_target->config()->isValid() ) {
KMessageBox::error( this, i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").tqarg( m_target->toFriendlyString() ) ); KMessageBox::error( this, i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").arg( m_target->toFriendlyString() ) );
} else { } else {
KMessageBox::information( this, i18n("<qt><p>Auto Confguration of: %1 finished successfully.</p></qt>").tqarg( m_target->toFriendlyString() ) ); KMessageBox::information( this, i18n("<qt><p>Auto Confguration of: %1 finished successfully.</p></qt>").arg( m_target->toFriendlyString() ) );
} }
emit sigTargetChanged(); emit sigTargetChanged();
} }
@ -270,9 +270,9 @@ void KMFHostWidget::slotTryAutoConfiguration_Callback( KMFTarget* ) {
disconnect( m_target, TQT_SIGNAL( sigTargetChanged( KMFTarget* ) ), disconnect( m_target, TQT_SIGNAL( sigTargetChanged( KMFTarget* ) ),
this,TQT_SLOT( slotTryAutoConfiguration_Callback( KMFTarget* ) ) ); this,TQT_SLOT( slotTryAutoConfiguration_Callback( KMFTarget* ) ) );
if ( ! m_target->config()->isValid() ) { if ( ! m_target->config()->isValid() ) {
KMessageBox::error( 0, i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").tqarg( m_target->toFriendlyString() ) ); KMessageBox::error( 0, i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").arg( m_target->toFriendlyString() ) );
} else { } else {
KMessageBox::information( this, i18n("<qt><p>Auto Confguration of: %1 finished successfully.</p></qt>").tqarg( m_target->toFriendlyString() ) ); KMessageBox::information( this, i18n("<qt><p>Auto Confguration of: %1 finished successfully.</p></qt>").arg( m_target->toFriendlyString() ) );
} }
emit sigTargetChanged(); emit sigTargetChanged();
} }
@ -281,7 +281,7 @@ void KMFHostWidget::slotAddressChanged( int val ) {
kdDebug() << "KMFHostWidget::slotAddressChanged( int " << val << " )" << endl; kdDebug() << "KMFHostWidget::slotAddressChanged( int " << val << " )" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_target, 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_target->address()->setAddress(
m_sb_host_0->value(), m_sb_host_0->value(),
@ -297,7 +297,7 @@ void KMFHostWidget::slotSSHPortChanged( int val ) {
kdDebug() << "KMFHostWidget:::slotSSHPortChanged( int " << val << " )" << endl; kdDebug() << "KMFHostWidget:::slotSSHPortChanged( int " << val << " )" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_target, 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 ); m_target->setSSHPort( val );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -313,7 +313,7 @@ void KMFHostWidget::slotOSChanged( const TQString& val ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_target->config(), 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() ); m_target->config()->setOS( val.lower() );
@ -337,7 +337,7 @@ void KMFHostWidget::slotBackaendChanged( const TQString& val ) {
kdDebug() << "KMFHostWidget::slotBackaendChanged( const TQString& " << val << " )" << endl; kdDebug() << "KMFHostWidget::slotBackaendChanged( const TQString& " << val << " )" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_target->config(), 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() ); m_target->config()->setBackend( val.lower() );
@ -355,7 +355,7 @@ void KMFHostWidget::slotDescriptionChanged() {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_target, 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() ); m_target->setDescription( m_host_desc->text().simplifyWhiteSpace() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();

4
kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
Unescape View File

@ -101,7 +101,7 @@ void KMFInterfaceWidget::slotAddInterface() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_target->config(), 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() ); m_target->config()->setInterfaces( interfaces() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -137,7 +137,7 @@ void KMFInterfaceWidget::slotDelInterface() {
m_lb_int->removeItem( index ); m_lb_int->removeItem( index );
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_target->config(), 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() ); m_target->config()->setInterfaces( interfaces() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();

2
kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp
Unescape View File

@ -57,7 +57,7 @@ void KMFIPTDocOptions::accept() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
kmfdoc, 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->setUseFilter( c_use_filter->isChecked() );
kmfdoc->setUseNat( c_use_nat->isChecked() ); kmfdoc->setUseNat( c_use_nat->isChecked() );

4
kmyfirewall/kmfwidgets/kmflistview.cpp
Unescape View File

@ -493,7 +493,7 @@ void KMFListView::setupChainView( IPTChain* chain, KMFListViewItem* parent ) {
++it; ++it;
KMFListViewItem * item_feeds = new KMFListViewItem( i_chain_feeds, chain ); KMFListViewItem * item_feeds = new KMFListViewItem( i_chain_feeds, chain );
item_feeds->setInUse( true ); 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->setPixmap( 2, icon_rule );
item_feeds->setText( 2, curr_rule->name() ); 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 ); KMFListViewItem * item_fwds = new KMFListViewItem( i_chain_fwds, chain );
item_fwds->setInUse( true ); item_fwds->setInUse( true );
item_fwds->setPixmap( 0, icon_rule ); 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->setPixmap( 1, icon_fwd );
item_fwds->setText( 2, curr_rule->target() ); item_fwds->setText( 2, curr_rule->target() );
} }

20
kmyfirewall/kmfwidgets/kmflistviewitem.cpp
Unescape View File

@ -226,10 +226,10 @@ void KMFListViewItem::setupNetHostView() {
setText( 1,"[" + host()->address()->toString() + "]" ); setText( 1,"[" + host()->address()->toString() + "]" );
if ( host()->name().startsWith("incoming_world") ) { 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") ) { 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") ) // 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() ); setText( 4,"" + m_zone->description() );
if ( m_zone->name().startsWith("incoming_world") ) { 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") ) { 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() + "]" ); item->setText( 1,"[" + host->address()->toString() + "]" );
if ( host->name().startsWith("incoming_world") ) { 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") ) { 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); // setOpen(true);
// // ++it2; // // ++it2;
@ -334,10 +334,10 @@ void KMFListViewItem::setupZoneView() {
// item->setText( 1,"[" + it2.current()->address()->toString() + "]" ); // item->setText( 1,"[" + it2.current()->address()->toString() + "]" );
// //
// if ( it2.current()->name().startsWith("incoming_world") ) { // 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") ) { // 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); // setOpen(true);
++it2; ++it2;

20
kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
Unescape View File

@ -164,7 +164,7 @@ void KMFMyNetworkWidget::slotNewItemSelected( TQListViewItem* item ) {
if ( m_zone ) { if ( m_zone ) {
// kdDebug() << "kmfitem->zone() pointer is valid" << endl; // kdDebug() << "kmfitem->zone() pointer is valid" << endl;
kmfitem->setText( 0,m_zone->guiName() ); 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 ); m_network_widget->loadZone( m_zone );
if ( m_zone->readOnly() ) { if ( m_zone->readOnly() ) {
@ -206,7 +206,7 @@ void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z ) {
kdDebug() << "void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z )" << endl; kdDebug() << "void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z )" << endl;
if ( KMFListViewItem *item = findItem( z->uuid() ) ) { if ( KMFListViewItem *item = findItem( z->uuid() ) ) {
kdDebug() << "Updating item" << endl; 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() ); item->setText( 4, z->description() );
} }
@ -234,7 +234,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
if ( m_zone ) { if ( m_zone ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = m_zone->name(); 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->insertTitle( icon_chain, lab_str );
m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQT_SLOT( slotAddHost() ) ); 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 ) { if ( m_target ) {
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = m_target->name(); 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 ); m_contextMenu->insertTitle( icon_chain, lab_str );
if ( ! m_target->readOnly() ) { if ( ! m_target->readOnly() ) {
m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) ); m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) );
@ -292,7 +292,7 @@ void KMFMyNetworkWidget::slotAddHost() {
if ( m_zone ) { if ( m_zone ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_network->netzone(), 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 = ""; TQString s = "";
s = s.setNum( m_zone->hosts().count() ); s = s.setNum( m_zone->hosts().count() );
@ -317,7 +317,7 @@ void KMFMyNetworkWidget::slotDelHost() {
return; return;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone, 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 ); m_zone->delHost( m_target );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -338,7 +338,7 @@ void KMFMyNetworkWidget::slotAddZone() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_network->netzone(), 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() ); KMFNetZone * zone = m_network->netzone()->addZone( "", new KMFError() );
@ -362,7 +362,7 @@ void KMFMyNetworkWidget::slotDelZone() {
if ( m_zone->name() != i18n("world") ) { if ( m_zone->name() != i18n("world") ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone->zone(), 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->zone()->delZone( m_zone );
m_zone = 0; m_zone = 0;
@ -385,7 +385,7 @@ void KMFMyNetworkWidget::slotRenameItem( TQListViewItem* item, int, const TQStri
if ( kmfitem->type() == NetfilterObject::NETZONE ) { if ( kmfitem->type() == NetfilterObject::NETZONE ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
kmfitem->zone(), 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 ); kmfitem->zone()->setGuiName( name );
@ -397,7 +397,7 @@ void KMFMyNetworkWidget::slotRenameItem( TQListViewItem* item, int, const TQStri
if ( kmfitem->type() == NetfilterObject::KMFTARGET ) { if ( kmfitem->type() == NetfilterObject::KMFTARGET ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
kmfitem->target(), 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 ); kmfitem->target()->setGuiName( name );
kdDebug() << "Renaming Host: " << kmfitem->target()->name() << endl; kdDebug() << "Renaming Host: " << kmfitem->target()->name() << endl;

20
kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
Unescape View File

@ -158,7 +158,7 @@ void KMFNetHostPropertiesWidget::slotAddressChanged( int d0, int d1, int d2, int
<< d3 << ")" << endl; << d3 << ")" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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->address()->setAddress( d0, d1, d2, d3 );
m_host->zone()->rootZone()->placeHostInZone( m_host ); m_host->zone()->rootZone()->placeHostInZone( m_host );
@ -183,7 +183,7 @@ void KMFNetHostPropertiesWidget::slotHostLogToggled( bool ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLogIncoming( m_cb_host_log->isChecked() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -193,7 +193,7 @@ void KMFNetHostPropertiesWidget::slotHostLogToggled( bool ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLogOutgoing( m_cb_host_log->isChecked() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -209,14 +209,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitToggled( bool on ){
if ( on ) { if ( on ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
} else { } else {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLimit( -1, m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -232,14 +232,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitValueChanged( int ) {
if ( m_cb_host_limit->isChecked() ) { if ( m_cb_host_limit->isChecked() ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
} else { } else {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLimit( -1, m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -255,14 +255,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitScaleChanged( int ) {
if ( m_cb_host_limit->isChecked() ) { if ( m_cb_host_limit->isChecked() ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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() ); m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
} else { } else {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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_host->setLimit( -1, "" );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -279,7 +279,7 @@ void KMFNetHostPropertiesWidget::slotDescriptionChanged() {
if ( newTxt != m_host->description() ) { if ( newTxt != m_host->description() ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_host, 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 ); m_host->setDescription( newTxt );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();

6
kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
Unescape View File

@ -97,7 +97,7 @@ void KMFNetworkWidget::slotAddressChanged( const TQString& ) {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone->rootZone(), 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() ); 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 ) { if ( m_allowEdit && m_zone->maskLength() != len ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone->rootZone(), 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->setMaskLength( len );
m_zone->rootZone()->refreshNetworkTree(); m_zone->rootZone()->refreshNetworkTree();
@ -137,7 +137,7 @@ void KMFNetworkWidget::slotDescriptionChanged() {
blockAllSignals( true ); blockAllSignals( true );
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_zone, 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 ); m_zone->setDescription( newTxt );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();

6
kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
Unescape View File

@ -43,9 +43,9 @@ KMFNewDocDlg::KMFNewDocDlg( TQWidget *parent, const char *name, WFlags fl ) : KM
TQPainter p( &pic ); TQPainter p( &pic );
p.setFont( f ); p.setFont( f );
p.setPen( TQt::white ); p.setPen( TQt::white );
p.drawText( 165, 45, TQString( "Version %1" ).tqarg( KMYFIREWALL_VERSION ) ); p.drawText( 165, 45, TQString( "Version %1" ).arg( KMYFIREWALL_VERSION ) );
p.drawText( 93, 215, TQString( "%1" ).tqarg( COPYRIGHT_DATE ) ); p.drawText( 93, 215, TQString( "%1" ).arg( COPYRIGHT_DATE ) );
p.drawText( 70, 230, TQString( "%1" ).tqarg( COPYRIGHT_OWNER ) ); p.drawText( 70, 230, TQString( "%1" ).arg( COPYRIGHT_OWNER ) );
if ( pic.isNull() ) if ( pic.isNull() )
return ; return ;
l_pic->setPixmap( pic ); l_pic->setPixmap( pic );

4
kmyfirewall/kmfwidgets/kmfobjectinfo.cpp
Unescape View File

@ -74,7 +74,7 @@ void KMFObjectInfo::accept() {
if ( m_netfilter_object->description() != te_desc->text() ) { if ( m_netfilter_object->description() != te_desc->text() ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_netfilter_object, 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() ); m_netfilter_object->setDescription( te_desc->text() );
kdDebug() << "Description Changed: " << te_desc->text() << endl; kdDebug() << "Description Changed: " << te_desc->text() << endl;
@ -84,7 +84,7 @@ void KMFObjectInfo::accept() {
if ( m_doc->description() != te_desc->text() ) { if ( m_doc->description() != te_desc->text() ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_doc, 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() ); m_doc->setDescription( te_desc->text() );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();

4
kmyfirewall/kmfwidgets/kmfprocout.cpp
Unescape View File

@ -165,7 +165,7 @@ void KMFProcOut::insertStdoutLine( const TQString &line ) {
} }
void KMFProcOut::insertStderrLine( const TQString &line ) { void KMFProcOut::insertStderrLine( const TQString &line ) {
const TQString & line2 = i18n( "<b>Error:</b> %1" ).tqarg( line ); const TQString & line2 = i18n( "<b>Error:</b> %1" ).arg( line );
m_lbview->append( "<font color=\"red\">" + line2 + "</font>" ); m_lbview->append( "<font color=\"red\">" + line2 + "</font>" );
} }
@ -175,7 +175,7 @@ void KMFProcOut::childFinished( bool , int status ) {
const TQString& job_name = m_job_name; const TQString& job_name = m_job_name;
if ( status != 0 ) { if ( status != 0 ) {
m_lbview->append( i18n( "<br><font color=\"red\"><b>Execution failed</b></font>" ) ); m_lbview->append( i18n( "<br><font color=\"red\"><b>Execution failed</b></font>" ) );
m_lbview->append( i18n( "<font color=\"red\"><b>Exit(Code): %1</b></font>" ).tqarg( stat ) ); m_lbview->append( i18n( "<font color=\"red\"><b>Exit(Code): %1</b></font>" ).arg( stat ) );
emit sigJobFinished( false, job_name ); emit sigJobFinished( false, job_name );
} else { } else {
m_lbview->append( i18n( "<br><b>Finished successfully</b>" ) ); m_lbview->append( i18n( "<br><b>Finished successfully</b>" ) );

14
kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
Unescape View File

@ -81,7 +81,7 @@ void KMFProtocolPropertiesWidget::loadProtocolCategory( KMFProtocolCategory* pro
m_gb_protocol_option->setEnabled( false ); m_gb_protocol_option->setEnabled( false );
m_gb_protocol_description->setEnabled( true ); m_gb_protocol_description->setEnabled( true );
m_l_protocol_desc->setEnabled( true ); m_l_protocol_desc->setEnabled( true );
TQString text = i18n( "<qt><b>Description: </b>%1<br>" ).tqarg( protCat ->description() ); TQString text = i18n( "<qt><b>Description: </b>%1<br>" ).arg( protCat ->description() );
text += "</qt>"; text += "</qt>";
m_l_protocol_desc->setText( 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_option->setEnabled( false );
m_gb_protocol_description->setEnabled( true ); m_gb_protocol_description->setEnabled( true );
m_l_protocol_desc->setEnabled( true ); m_l_protocol_desc->setEnabled( true );
TQString text = i18n( "<qt><b>Description: </b>%1<br>" ).tqarg( prot ->description() ); TQString text = i18n( "<qt><b>Description: </b>%1<br>" ).arg( prot ->description() );
const TQString& tcpports = prot->tcpPortsList(); const TQString& tcpports = prot->tcpPortsList();
if ( ! tcpports.isEmpty() ) { if ( ! tcpports.isEmpty() ) {
@ -160,7 +160,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLimit( bool onoff ) {
if ( onoff ) { if ( onoff ) {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_protocolUsage, 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->setLimit( m_sb_limit_rate->value() );
m_protocolUsage->setLimitInterval( m_cb_limit_interval->currentText() ); m_protocolUsage->setLimitInterval( m_cb_limit_interval->currentText() );
@ -168,7 +168,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLimit( bool onoff ) {
} else { } else {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_protocolUsage, 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 ); m_protocolUsage->setLimit( -1 );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -184,7 +184,7 @@ void KMFProtocolPropertiesWidget::slotSetProtocolLimitRate( int rate ){
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_protocolUsage, 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 ); m_protocolUsage->setLimit( rate );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -202,7 +202,7 @@ void KMFProtocolPropertiesWidget::slotSetProtocolLimitInterval( const TQString&
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_protocolUsage, 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 ); m_protocolUsage->setLimitInterval( interval );
KMFUndoEngine::instance()->endTransaction(); KMFUndoEngine::instance()->endTransaction();
@ -217,7 +217,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLogging( bool onoff ){
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_protocolUsage, 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 ); m_protocolUsage->setLogging( onoff );

4
kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
Unescape View File

@ -147,7 +147,7 @@ void KMFSystemSettingsLinux::slotDistributionChanged() {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
conf, 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->setIPTPath( m_url_ipt_path->url() );
conf->setModprobePath( m_url_mod_path->url() ); conf->setModprobePath( m_url_mod_path->url() );
@ -174,7 +174,7 @@ void KMFSystemSettingsLinux::slotSettingChanged() {
} }
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
conf, 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->setIPTPath( m_url_ipt_path->url() );
conf->setModprobePath( m_url_mod_path->url() ); conf->setModprobePath( m_url_mod_path->url() );

8
kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
Unescape View File

@ -110,7 +110,7 @@ void KMFTemplateChooser::parseTemplates(){
} }
TQStringList templates = dir.entryList( type ); TQStringList templates = dir.entryList( type );
if ( templates.isEmpty() ) { 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; return;
} }
for ( TQStringList::Iterator it = templates.begin(); it != templates.end(); ++it ) { for ( TQStringList::Iterator it = templates.begin(); it != templates.end(); ++it ) {
@ -123,21 +123,21 @@ void KMFTemplateChooser::parseFile( const TQString& file ) {
TQFile f( file ); TQFile f( file );
if ( !f.open( IO_ReadOnly ) ) { 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; return;
} }
TQDomDocument doc; TQDomDocument doc;
if ( !doc.setContent( &f ) ) { if ( !doc.setContent( &f ) ) {
f.close(); 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; return;
} }
TQDomElement root = doc.documentElement(); TQDomElement root = doc.documentElement();
TQDomNodeList list = root.elementsByTagName ( XML::Abstract_Element ); TQDomNodeList list = root.elementsByTagName ( XML::Abstract_Element );
if ( list.count() == 0 ) { 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; return;
} }
TQDomNode node = list.item( 0 ); TQDomNode node = list.item( 0 );

6
kmyfirewall/kmfwidgets/kmftransactionlog.cpp
Unescape View File

@ -128,8 +128,8 @@ void KMFTransactionLog::slotZoneRBM( TQListViewItem* item, const TQPoint& point,
m_currentTransaction = t; m_currentTransaction = t;
m_contextMenu->clear(); m_contextMenu->clear();
TQString name = i18n("Transaction: %1").tqarg( m_currentTransaction->uuid().toString() ); TQString name = i18n("Transaction: %1").arg( m_currentTransaction->uuid().toString() );
// TQString lab_str = i18n("Zone: %1").tqarg( m_zone->guiName() ); // TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() );
m_contextMenu->insertTitle( name ); m_contextMenu->insertTitle( name );
m_contextMenu->insertItem( i18n( "Show XML diff using Kompare" ), this, TQT_SLOT( slotShowDiff() ) ); m_contextMenu->insertItem( i18n( "Show XML diff using Kompare" ), this, TQT_SLOT( slotShowDiff() ) );
m_contextMenu->popup( point ); m_contextMenu->popup( point );
@ -264,7 +264,7 @@ KListViewItem* KMFTransactionLog::setupListItem( KMFTransaction* trans, KListVie
NetfilterObject *obj = 0; NetfilterObject *obj = 0;
obj = NetfilterObject::findObject ( obj_uuid ); obj = NetfilterObject::findObject ( obj_uuid );
if ( obj ) { 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( 2, obj->name() );
// itemID->setText( 3, obj->getXMLSniplet() ); // itemID->setText( 3, obj->getXMLSniplet() );
} }

2
kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui
Unescape View File

@ -37,7 +37,7 @@
<property name="text"> <property name="text">
<string>&lt;b&gt;Ruleset&amp;nbsp;Description:&lt;/b&gt;</string> <string>&lt;b&gt;Ruleset&amp;nbsp;Description:&lt;/b&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

6
kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui
Unescape View File

@ -59,7 +59,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -89,7 +89,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -119,7 +119,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui
Unescape View File

@ -32,7 +32,7 @@
<property name="text"> <property name="text">
<string>Please add your available network Interfaces here:</string> <string>Please add your available network Interfaces here:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">

12
kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui
Unescape View File

@ -49,7 +49,7 @@
<property name="text"> <property name="text">
<string>Here you can configure several general options that your firewall has.</string> <string>Here you can configure several general options that your firewall has.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
</widget> </widget>
@ -85,7 +85,7 @@
<property name="text"> <property name="text">
<string>Enable the iptables you like to use in your firewall.</string> <string>Enable the iptables you like to use in your firewall.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -264,7 +264,7 @@
<property name="text"> <property name="text">
<string>&lt;b&gt;Enable this if you compiled iptables as modules&lt;/b&gt;. For details about the required modules, take a look at the iptables man page.</string> <string>&lt;b&gt;Enable this if you compiled iptables as modules&lt;/b&gt;. For details about the required modules, take a look at the iptables man page.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -283,7 +283,7 @@
<property name="text"> <property name="text">
<string>&lt;b&gt;Enable this if your host should act as a router&lt;/b&gt;.</string> <string>&lt;b&gt;Enable this if your host should act as a router&lt;/b&gt;.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -294,7 +294,7 @@
<property name="text"> <property name="text">
<string>&lt;b&gt;Enable if you like to use Syn Cookies.&lt;/b&gt; (needs support compiled in the kernel)</string> <string>&lt;b&gt;Enable if you like to use Syn Cookies.&lt;/b&gt; (needs support compiled in the kernel)</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -313,7 +313,7 @@
<property name="text"> <property name="text">
<string>&lt;b&gt;Enable&lt;/b&gt; if you like to use &lt;b&gt;Reverse Parse Filtering&lt;/b&gt;.</string> <string>&lt;b&gt;Enable&lt;/b&gt; if you like to use &lt;b&gt;Reverse Parse Filtering&lt;/b&gt;.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

6
kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui
Unescape View File

@ -56,7 +56,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -86,7 +86,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -116,7 +116,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui
Unescape View File

@ -167,7 +167,7 @@
<string>&lt;p&gt;You may filter for up to 15 ports within one rule if you are using the multiport extention.&lt;br&gt; <string>&lt;p&gt;You may filter for up to 15 ports within one rule if you are using the multiport extention.&lt;br&gt;
Use this to avoid too large (slow) rulesets.</string> Use this to avoid too large (slow) rulesets.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

10
kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui
Unescape View File

@ -114,7 +114,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -144,7 +144,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -174,7 +174,7 @@
<property name="text"> <property name="text">
<string>.</string> <string>.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>
@ -250,7 +250,7 @@
<property name="text"> <property name="text">
<string>Mask:</string> <string>Mask:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -313,7 +313,7 @@
<property name="text"> <property name="text">
<string>Zone Properties:</string> <string>Zone Properties:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

4
kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui
Unescape View File

@ -129,7 +129,7 @@
<property name="text"> <property name="text">
<string>&lt;h3&gt;New/Open Document&lt;/h3&gt;</string> <string>&lt;h3&gt;New/Open Document&lt;/h3&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -190,7 +190,7 @@
<string>Please choose how you would like to start your new firewall configuration. <string>Please choose how you would like to start your new firewall configuration.
</string> </string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui
Unescape View File

@ -49,7 +49,7 @@
<property name="text"> <property name="text">
<string>Rule Documentation</string> <string>Rule Documentation</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui
Unescape View File

@ -141,7 +141,7 @@
<property name="name"> <property name="name">
<cstring>m_l_protocol_desc</cstring> <cstring>m_l_protocol_desc</cstring>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

4
kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui
Unescape View File

@ -130,7 +130,7 @@
<property name="text"> <property name="text">
<string>Description</string> <string>Description</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>
@ -220,7 +220,7 @@
&lt;p&gt;KMyFirewall provides two different inerfaces for setting up your firewall. Please select the Interface you like to use.&lt;/p&gt;</string> &lt;p&gt;KMyFirewall provides two different inerfaces for setting up your firewall. Please select the Interface you like to use.&lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

10
kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui
Unescape View File

@ -60,7 +60,7 @@
<property name="text"> <property name="text">
<string>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.</string> <string>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.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -71,7 +71,7 @@
<property name="text"> <property name="text">
<string>Path to the defaul &lt;b&gt; runlevel&lt;/b&gt; directoy:</string> <string>Path to the defaul &lt;b&gt; runlevel&lt;/b&gt; directoy:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -82,7 +82,7 @@
<property name="text"> <property name="text">
<string>Path to the &lt;b&gt;init&lt;/b&gt; directory:</string> <string>Path to the &lt;b&gt;init&lt;/b&gt; directory:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -93,7 +93,7 @@
<property name="text"> <property name="text">
<string>Path to the &lt;b&gt;modprobe&lt;/b&gt; program:</string> <string>Path to the &lt;b&gt;modprobe&lt;/b&gt; program:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -112,7 +112,7 @@
<property name="text"> <property name="text">
<string>Path to the &lt;b&gt;iptables&lt;/b&gt; binary:</string> <string>Path to the &lt;b&gt;iptables&lt;/b&gt; binary:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

6
kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui
Unescape View File

@ -248,7 +248,7 @@
<property name="textFormat"> <property name="textFormat">
<enum>AutoText</enum> <enum>AutoText</enum>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
<property name="indent"> <property name="indent">
@ -297,7 +297,7 @@
<string>&lt;h3&gt;Template Chooser&lt;/h3&gt; <string>&lt;h3&gt;Template Chooser&lt;/h3&gt;
&lt;p&gt;Select a ruleset template you like to use as the starting point for your firewall setup.&lt;/p&gt;</string> &lt;p&gt;Select a ruleset template you like to use as the starting point for your firewall setup.&lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -400,7 +400,7 @@
<property name="text"> <property name="text">
<string>&lt;h3&gt;Available&amp;nbsp;Templates&lt;/h3&gt;</string> <string>&lt;h3&gt;Available&amp;nbsp;Templates&lt;/h3&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

28
kmyfirewall/kmyfirewall.cpp
Unescape View File

@ -185,7 +185,7 @@ void KMyFirewall::parseCommandLineArgs() {
} else { } else {
closeSplash(); closeSplash();
const TQString & msg = i18n( "<qt><p>Open File %1 failed</p>" const TQString & msg = i18n( "<qt><p>Open File %1 failed</p>"
"</qt>" ).tqarg( curr ) ; "</qt>" ).arg( curr ) ;
KMessageBox::error( this, msg, i18n( "Error" ) ); KMessageBox::error( this, msg, i18n( "Error" ) );
// Show interface select if open file failed when requested // Show interface select if open file failed when requested
if ( KMFConfig::showSelInterface() ) { if ( KMFConfig::showSelInterface() ) {
@ -476,7 +476,7 @@ void KMyFirewall::updateCaption(){
if ( ! network() || ! network()->currentTarget() ) { if ( ! network() || ! network()->currentTarget() ) {
return; 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() ) { if ( ! KMFUndoEngine::instance()->isSaved() ) {
s += i18n( "[modified]" ); s += i18n( "[modified]" );
} }
@ -531,7 +531,7 @@ void KMyFirewall::slotRedo() {
void KMyFirewall::slotFileOpen() { void KMyFirewall::slotFileOpen() {
kdDebug() << "KMyFirewall::slotFileOpen()" << endl; kdDebug() << "KMyFirewall::slotFileOpen()" << endl;
KURL url; KURL url;
url = KFileDialog::getOpenURL( ":", TQString( "%1" ).tqarg( network()->getFileDialogFilter() ) ); url = KFileDialog::getOpenURL( ":", TQString( "%1" ).arg( network()->getFileDialogFilter() ) );
TQString xmlfile = url.path(); TQString xmlfile = url.path();
if ( url.path().isEmpty() ) { if ( url.path().isEmpty() ) {
@ -561,7 +561,7 @@ void KMyFirewall::slotLoadFile( const TQString& file ) {
void KMyFirewall::slotImportTargetConfig() { void KMyFirewall::slotImportTargetConfig() {
kdDebug() << "KMyFirewall::slotImportTragetConfig()" << endl; kdDebug() << "KMyFirewall::slotImportTragetConfig()" << endl;
KURL url; KURL url;
url = KFileDialog::getOpenURL( ":", TQString( "%1" ).tqarg( network()->currentDoc()->getFileDialogFilter() ) ); url = KFileDialog::getOpenURL( ":", TQString( "%1" ).arg( network()->currentDoc()->getFileDialogFilter() ) );
TQString xmlfile = url.path(); TQString xmlfile = url.path();
if ( url.path().isEmpty() ) { 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() ) ) { if ( ! KIO::NetAccess::download( url, xmlfile, KApplication::kApplication()->mainWidget() ) ) {
kdDebug() << "Could not download file." << endl; kdDebug() << "Could not download file." << endl;
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt>Could not download file %1</qt>" ).tqarg( url.url() ) ); err->setErrMsg( i18n( "<qt>Could not download file %1</qt>" ).arg( url.url() ) );
return 0; return 0;
} }
@ -720,7 +720,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) {
if ( !kmfrsFile.open( IO_ReadOnly ) ) { if ( !kmfrsFile.open( IO_ReadOnly ) ) {
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt>Could not read file %1.</qt>" ).tqarg( url.url() ) ); err->setErrMsg( i18n( "<qt>Could not read file %1.</qt>" ).arg( url.url() ) );
return 0; return 0;
} }
@ -728,7 +728,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) {
if ( !doc.setContent( &kmfrsFile ) ) { if ( !doc.setContent( &kmfrsFile ) ) {
kmfrsFile.close(); kmfrsFile.close();
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt>File %1 in not a vaild XML file.</qt>" ).tqarg( url.url() ) ); err->setErrMsg( i18n( "<qt>File %1 in not a vaild XML file.</qt>" ).arg( url.url() ) );
return 0; return 0;
} }
kmfrsFile.close(); kmfrsFile.close();
@ -813,7 +813,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) {
} }
KIO::NetAccess::removeTempFile( xmlfile ); KIO::NetAccess::removeTempFile( xmlfile );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt>Could not download file %1.</qt>" ).tqarg( url.url() ) ); err->setErrMsg( i18n( "<qt>Could not download file %1.</qt>" ).arg( url.url() ) );
return 0; return 0;
} }
@ -825,7 +825,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) {
closeSplash(); closeSplash();
const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>" const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>"
"<p>If you are working with files stored on remote computers " "<p>If you are working with files stored on remote computers "
"make sure that the network is up and the fileserver running.</qt>" ).tqarg( url.url() ); "make sure that the network is up and the fileserver running.</qt>" ).arg( url.url() );
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
m_err->setErrMsg( msg ); m_err->setErrMsg( msg );
return m_err; return m_err;
@ -833,7 +833,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) {
KFileItem *props = new KFileItem( f_props, url ); KFileItem *props = new KFileItem( f_props, url );
kdDebug() << "Found file permissions: " << props->permissionsString() << endl; kdDebug() << "Found file permissions: " << props->permissionsString() << endl;
if ( !props->isReadable() ) { if ( !props->isReadable() ) {
const TQString msg = i18n( "<qt><p>You don't have the permissions to read file: <b>%1</b></p></qt>" ).tqarg( url.url() ); const TQString msg = i18n( "<qt><p>You don't have the permissions to read file: <b>%1</b></p></qt>" ).arg( url.url() );
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
m_err->setErrMsg( msg ); m_err->setErrMsg( msg );
return m_err; return m_err;
@ -845,7 +845,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) {
} }
if ( ! loader ) { if ( ! loader ) {
const TQString msg = i18n( "<qt><p>No loader found for file: <b>%1</b></p></qt>" ).tqarg( url.url() ); const TQString msg = i18n( "<qt><p>No loader found for file: <b>%1</b></p></qt>" ).arg( url.url() );
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
m_err->setErrMsg( msg ); m_err->setErrMsg( msg );
return m_err; return m_err;
@ -873,7 +873,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) {
KMFConfig::setCurrentConfiguration( "" ); KMFConfig::setCurrentConfiguration( "" );
network()->currentDoc()->clear(); network()->currentDoc()->clear();
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
const TQString msg = i18n( "<qt>Unable to load file %1.</qt>" ).tqarg( url.url() ); const TQString msg = i18n( "<qt>Unable to load file %1.</qt>" ).arg( url.url() );
m_err->setErrMsg( msg ); m_err->setErrMsg( msg );
return m_err; return m_err;
} }
@ -1027,9 +1027,9 @@ void KMyFirewall::checkStatus() {
if ( isInstalled ) { 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 { } 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 );
} }

2
kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp
Unescape View File

@ -84,7 +84,7 @@ void KMFRuleEditCustomOpt::loadRule( IPTRule * rule ) {
void KMFRuleEditCustomOpt::accept() { void KMFRuleEditCustomOpt::accept() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, m_rule,
i18n("Edit Custom Rule: %1 Option").tqarg( m_rule->name() ) i18n("Edit Custom Rule: %1 Option").arg( m_rule->name() )
); );
TQString target = ""; TQString target = "";
target = t_target->text(); target = t_target->text();

4
kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui
Unescape View File

@ -60,7 +60,7 @@
<property name="text"> <property name="text">
<string>Custom Options</string> <string>Custom Options</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
</widget> </widget>
@ -234,7 +234,7 @@
<property name="text"> <property name="text">
<string>Here you may define the target option for the rule. Please keep in mind that not all targets have options to set. </string> <string>Here you may define the target option for the rule. Please keep in mind that not all targets have options to set. </string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
Unescape View File

@ -96,7 +96,7 @@ void KMFRuleEditorInterface::slotOk() {
// KMyFirewallRuleEditor* ed = (KMyFirewallRuleEditor*)parentWidget(); // KMyFirewallRuleEditor* ed = (KMyFirewallRuleEditor*)parentWidget();
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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(); TQString out = cb_out_int->currentText();

8
kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui
Unescape View File

@ -59,7 +59,7 @@
<property name="text"> <property name="text">
<string>Interface Options</string> <string>Interface Options</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -72,7 +72,7 @@
<property name="text"> <property name="text">
<string>&lt;b&gt;ATTENTION: &lt;/b&gt;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.</string> <string>&lt;b&gt;ATTENTION: &lt;/b&gt;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.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -117,7 +117,7 @@
<property name="text"> <property name="text">
<string>The incoming interface is only valid in the INPUT and FORWARD chains, and chains that are fed only by them.</string> <string>The incoming interface is only valid in the INPUT and FORWARD chains, and chains that are fed only by them.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -231,7 +231,7 @@
<property name="text"> <property name="text">
<string>Checking for the outgoing interface is only possible in the OUTPUT and FORWARD chains, and chains that are fed only by them.</string> <string>Checking for the outgoing interface is only possible in the OUTPUT and FORWARD chains, and chains that are fed only by them.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">

2
kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp
Unescape View File

@ -120,7 +120,7 @@ void KMFRuleEditIP::accept() {
kdDebug() << "KMFRuleEditIP::slotOk()" << endl; kdDebug() << "KMFRuleEditIP::slotOk()" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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* src_ip = new TQString( t_src_ip->text() );
TQString* dest_ip = new TQString( t_dest_ip->text() ); TQString* dest_ip = new TQString( t_dest_ip->text() );

4
kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui
Unescape View File

@ -67,7 +67,7 @@
<property name="text"> <property name="text">
<string>IP Options</string> <string>IP Options</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
</widget> </widget>
@ -100,7 +100,7 @@
<property name="text"> <property name="text">
<string>NOTE: By checking the "Invert" checkbox the rule will only match if the specified address is not one of the values you defined.</string> <string>NOTE: By checking the "Invert" checkbox the rule will only match if the specified address is not one of the values you defined.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp
Unescape View File

@ -92,7 +92,7 @@ void KMFRuleEditorLimit::readRuleConfig() {
void KMFRuleEditorLimit::slotOk() { void KMFRuleEditorLimit::slotOk() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, m_rule,
i18n("Edit Rule: %1 Limit Option").tqarg( m_rule->name() ) i18n("Edit Rule: %1 Limit Option").arg( m_rule->name() )
); );
TQPtrList<TQString>* options = new TQPtrList<TQString>; TQPtrList<TQString>* options = new TQPtrList<TQString>;
TQString* name = new TQString( "limit_opt" ); TQString* name = new TQString( "limit_opt" );

2
kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui
Unescape View File

@ -67,7 +67,7 @@
<property name="text"> <property name="text">
<string>Limit Options</string> <string>Limit Options</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">

2
kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp
Unescape View File

@ -101,7 +101,7 @@ void KMFRuleEditTargetLog::loadRule( IPTRule* rule ) {
void KMFRuleEditTargetLog::accept() { void KMFRuleEditTargetLog::accept() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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<TQString>* args = new TQPtrList<TQString>; TQPtrList<TQString>* args = new TQPtrList<TQString>;
TQString* name = new TQString( "target_log_opt" ); TQString* name = new TQString( "target_log_opt" );

2
kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp
Unescape View File

@ -162,7 +162,7 @@ void KMFRuleEditMac::accept() {
kdDebug() << "KMFRuleEditMac::accept()" << endl; kdDebug() << "KMFRuleEditMac::accept()" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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 tok1 = t_src_mac1->text().upper();
TQString tok2 = t_src_mac2->text().upper(); TQString tok2 = t_src_mac2->text().upper();

4
kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui
Unescape View File

@ -67,7 +67,7 @@
<property name="text"> <property name="text">
<string>MAC Options</string> <string>MAC Options</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
</widget> </widget>
@ -337,7 +337,7 @@
<property name="text"> <property name="text">
<string>NOTE: By checking the "Invert" checkbox the rule will only match if the address found in the packet header is not one you defined.</string> <string>NOTE: By checking the "Invert" checkbox the rule will only match if the address found in the packet header is not one you defined.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp
Unescape View File

@ -61,7 +61,7 @@ void KMFRuleEditTargetMark::loadRule( IPTRule* rule ) {
void KMFRuleEditTargetMark::accept() { void KMFRuleEditTargetMark::accept() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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; kdDebug() << "void KMFRuleEditTargetMark::accept()" << endl;
TQPtrList<TQString>* options = new TQPtrList<TQString>; TQPtrList<TQString>* options = new TQPtrList<TQString>;

2
kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp
Unescape View File

@ -178,7 +178,7 @@ void KMFRuleEditorTargetNat::accept() {
kdDebug() << "KMFRuleEditorTargetNat::accept()"; kdDebug() << "KMFRuleEditorTargetNat::accept()";
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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(); bool ip_range = c_ip_range->isChecked();

2
kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui
Unescape View File

@ -122,7 +122,7 @@
<property name="text"> <property name="text">
<string>Translate to IP:</string> <string>Translate to IP:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
Unescape View File

@ -468,7 +468,7 @@ void KMFRuleEditorProtocol::accept() {
kdDebug() << "void KMFRuleEditorProtocol::accept()" << endl; kdDebug() << "void KMFRuleEditorProtocol::accept()" << endl;
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, m_rule,
i18n("Edit Rule: %1 Protocol Option").tqarg( m_rule->name() ) i18n("Edit Rule: %1 Protocol Option").arg( m_rule->name() )
); );
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////

10
kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
Unescape View File

@ -64,7 +64,7 @@
<property name="text"> <property name="text">
<string>Protocol Options</string> <string>Protocol Options</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -88,7 +88,7 @@
<property name="title"> <property name="title">
<string>Match Protocol</string> <string>Match Protocol</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignLeft</set> <set>WordBreak|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -268,7 +268,7 @@
<string>&lt;p&gt;Specifie the ports that should match you rule here.&lt;br&gt; <string>&lt;p&gt;Specifie the ports that should match you rule here.&lt;br&gt;
You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;/etc/sevices&lt;/i&gt; to specifie the port.</string> You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;/etc/sevices&lt;/i&gt; to specifie the port.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -609,7 +609,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
A misuse of this functionality may result in a hard to detect bug in the firewall.&lt;/p&gt; A misuse of this functionality may result in a hard to detect bug in the firewall.&lt;/p&gt;
</string> </string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -870,7 +870,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal
<property name="text"> <property name="text">
<string>Here you can decide which ICMP Type your rulr should Match.</string> <string>Here you can decide which ICMP Type your rulr should Match.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

2
kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp
Unescape View File

@ -55,7 +55,7 @@ void KMFRuleEditorState::loadRule( IPTRule *rule ) {
void KMFRuleEditorState::slotOk() { void KMFRuleEditorState::slotOk() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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_new = c_new->isChecked();
bool s_related = c_related->isChecked(); bool s_related = c_related->isChecked();

12
kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui
Unescape View File

@ -66,7 +66,7 @@
<property name="text"> <property name="text">
<string>Connection Tracking Options</string> <string>Connection Tracking Options</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -205,7 +205,7 @@
<property name="text"> <property name="text">
<string>Packets that are associated with a connection that has packets sent in both directions.</string> <string>Packets that are associated with a connection that has packets sent in both directions.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -221,7 +221,7 @@
<property name="text"> <property name="text">
<string>Packets that are not associated with any known connection.</string> <string>Packets that are not associated with any known connection.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -237,7 +237,7 @@
<property name="text"> <property name="text">
<string>Packets that are associated with an existing bi-directional connection and start a new connection (e.g. FTP).</string> <string>Packets that are associated with an existing bi-directional connection and start a new connection (e.g. FTP).</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -261,7 +261,7 @@
<property name="text"> <property name="text">
<string>Packets that start new connections and are not associated with any known connection.</string> <string>Packets that start new connections and are not associated with any known connection.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">
@ -277,7 +277,7 @@
<property name="text"> <property name="text">
<string>Match packets with state:</string> <string>Match packets with state:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignLeft</set> <set>AlignVCenter|AlignLeft</set>
</property> </property>
<property name="wordwrap" stdset="0"> <property name="wordwrap" stdset="0">

2
kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp
Unescape View File

@ -123,7 +123,7 @@ void KMFRuleEditorTos::loadRule( IPTRule* rule ) {
void KMFRuleEditorTos::accept() { void KMFRuleEditorTos::accept() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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" ) { if ( m_option_type == "SETTOS" ) {
bool use_tos = c_use_tos->isChecked(); bool use_tos = c_use_tos->isChecked();

2
kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp
Unescape View File

@ -123,7 +123,7 @@ void KMFRuleEditorTos::loadRule( IPTRule* rule ) {
void KMFRuleEditorTos::accept() { void KMFRuleEditorTos::accept() {
KMFUndoEngine::instance()->startTransaction( KMFUndoEngine::instance()->startTransaction(
m_rule, 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" ) { if ( m_option_type == "SETTOS" ) {
bool use_tos = c_use_tos->isChecked(); bool use_tos = c_use_tos->isChecked();

Write Preview
Loading…
Cancel
Save