@@ -148,7 +148,7 @@ void KMFIPTInstaller::slotJobFinished( bool ok, const TQString& cmd_name ) {
KMessageBox::error( 0, msg, cap );
} /*else if ( !ok ) {
const TQString & msg = i18n( "Execution of %1 failed"
- "
Click OK to check your configuration and make sure you are logged in as root" ).arg( cmd_name );
+ "
Click OK to check your configuration and make sure you are logged in as root" ).tqarg( cmd_name );
const TQString& cap = "KMFIPTInstaller";
KMessageBox::error( 0, msg, cap );
}*/
@@ -207,9 +207,9 @@ void KMFIPTInstaller::cmdRunFW() {
TQString cmd = "bash " + temp_file->name() + " -v start";
// KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true );
setOutputWidget( execWidget() );
- execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
+ execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
showOutput();
- checkStatus();
+ checktqStatus();
} else {
if( KMessageBox::questionYesNo ( 0 , i18n( "
Are you sure you want to execute the generated firewall script on %1?"
"
A wrongly configured firewall script may make your computer unusable! PLease make sure that you have left the SSH port open, otherwise you will no longer be able to remote control the comuter using KMyFirewall or any other SSH client!
"
@@ -233,7 +233,7 @@ void KMFIPTInstaller::cmdRunFW() {
"iptables -t mangle -P OUTPUT ACCEPT "
"iptables -t mangle -P FORWARD ACCEPT "
"iptables -t mangle -P PREROUTING ACCEPT "
- "iptables -t mangle -P POSTROUTING ACCEPT " ).arg(rulesetDoc()->target()->toFriendlyString() ),
+ "iptables -t mangle -P POSTROUTING ACCEPT " ).tqarg(rulesetDoc()->target()->toFriendlyString() ),
i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_run_fw_remote" ) != KMessageBox::Yes
) {
return;
@@ -241,7 +241,7 @@ void KMFIPTInstaller::cmdRunFW() {
setOutputWidget( execWidget() );
- execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
generateInstallerPackage( rulesetDoc()->target() );
@@ -255,9 +255,9 @@ void KMFIPTInstaller::cmdRunFW() {
}
setOutputWidget( execWidget() );
- execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
- checkStatus();
+ checktqStatus();
}
}
@@ -272,7 +272,7 @@ void KMFIPTInstaller::cmdStopFW() {
}
if( KMessageBox::questionYesNo ( 0 , i18n( "Are you sure you want to stop the firewall on %1?"
- "
This will leave the computer unprotected!
" ).arg(rulesetDoc()->target()->toFriendlyString() ),
+ "This will leave the computer unprotected!
" ).tqarg(rulesetDoc()->target()->toFriendlyString() ),
i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_stop_fw_remote" ) != KMessageBox::Yes
) {
return;
@@ -283,13 +283,13 @@ void KMFIPTInstaller::cmdStopFW() {
TQString cmd = "bash " + file + " -v stop";
setOutputWidget( execWidget() );
- execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
+ execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
showOutput();
- checkStatus();
+ checktqStatus();
} else {
setOutputWidget( execWidget() );
- execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
generateInstallerPackage( rulesetDoc()->target() );
@@ -303,9 +303,9 @@ void KMFIPTInstaller::cmdStopFW() {
}
setOutputWidget( execWidget() );
- execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
- checkStatus();
+ checktqStatus();
}
}
@@ -324,12 +324,12 @@ void KMFIPTInstaller::cmdShowRunningConfig( const TQString& para ) {
if( rulesetDoc()->target()->isLocalExecuteTarget() ) {
// KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true );
setOutputWidget( execWidget() );
- execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name, i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ), true );
+ execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name, i18n("Show Table %1 on %2").tqarg( para ).tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
showOutput();
} else {
setOutputWidget( execWidget() );
- execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() );
@@ -340,7 +340,7 @@ void KMFIPTInstaller::cmdShowRunningConfig( const TQString& para ) {
}
setOutputWidget( execWidget() );
- execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").tqarg( para ).tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
}
}
@@ -354,7 +354,7 @@ void KMFIPTInstaller::cmdInstallFW() {
if( KMessageBox::questionYesNo ( 0 , i18n( "Are you sure you want to install the firewall on %1?"
"
This will add the scripts to your init system that are required to "
"start your firewall during bootup."
- "
Please make sure that the firewall runs properly before you install it." ).arg( rulesetDoc()->target()->toFriendlyString() ),
+ "
Please make sure that the firewall runs properly before you install it." ).tqarg( rulesetDoc()->target()->toFriendlyString() ),
i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_install_fw" ) != KMessageBox::Yes ) {
return;
}
@@ -379,11 +379,11 @@ void KMFIPTInstaller::cmdInstallFW() {
"
File: %2"
"File: %3"
"Link: %4 -> %5" )
- .arg( "/etc/kmyfirewall" )
- .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
- .arg( conf->IPTPath() + "/kmyfirewall" )
- .arg( conf->rcDefaultPath() + "/kmyfirewall" )
- .arg( conf->initPath() + "/kmyfirewall" );
+ .tqarg( "/etc/kmyfirewall" )
+ .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" )
+ .tqarg( conf->IPTPath() + "/kmyfirewall" )
+ .tqarg( conf->rcDefaultPath() + "/kmyfirewall" )
+ .tqarg( conf->initPath() + "/kmyfirewall" );
TQString cap = i18n( "Install Firewall" );
KMessageBox::information( 0, msg, cap, "created_install_files", 0 );
} else if ( conf->oS() == "linux" ) {
@@ -393,13 +393,13 @@ void KMFIPTInstaller::cmdInstallFW() {
"File: %3"
"Link: %4 -> %5"
"Link: %6 -> %7" )
- .arg( "/etc/kmyfirewall" )
- .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
- .arg( conf->initPath() + "/kmyfirewall" )
- .arg( conf->rcDefaultPath() + "/S99kmyfirewall" )
- .arg( conf->initPath() + "/kmyfirewall" )
- .arg( conf->rcDefaultPath() + "/K01kmyfirewall" )
- .arg( conf->initPath() + "/kmyfirewall" );
+ .tqarg( "/etc/kmyfirewall" )
+ .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" )
+ .tqarg( conf->initPath() + "/kmyfirewall" )
+ .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" )
+ .tqarg( conf->initPath() + "/kmyfirewall" )
+ .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" )
+ .tqarg( conf->initPath() + "/kmyfirewall" );
TQString cap = i18n( "Install Firewall" );
KMessageBox::information( 0, msg, cap, "created_install_files", 0 );
}
@@ -424,12 +424,12 @@ void KMFIPTInstaller::cmdInstallFW() {
TQString cmd = "bash " + installscript + " install " + systemtype + " " + conf->initPath() + " " + conf->rcDefaultPath() + " " + initscript + " " + fwscript;
setOutputWidget( execWidget() );
- execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
+ execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
showOutput();
- checkStatus();
+ checktqStatus();
} else {
setOutputWidget( execWidget() );
- execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
generateInstallerPackage( rulesetDoc()->target() );
@@ -443,9 +443,9 @@ void KMFIPTInstaller::cmdInstallFW() {
}
setOutputWidget( execWidget() );
- execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
- checkStatus();
+ checktqStatus();
}
}
@@ -456,7 +456,7 @@ void KMFIPTInstaller::cmdUninstallFW() {
KMFTargetConfig *conf = rulesetDoc()->target()->config();
if ( KMessageBox::questionYesNo ( 0 , i18n( "Are you sure you want to uninstall the firewall from %1?
"
- "The firewall will no longer start up during boot." ).arg( rulesetDoc()->target()->toFriendlyString() ),
+ "The firewall will no longer start up during boot." ).tqarg( rulesetDoc()->target()->toFriendlyString() ),
i18n( "Uninstall Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_uninstall_fw" ) != KMessageBox::Yes ) {
return;
}
@@ -482,11 +482,11 @@ void KMFIPTInstaller::cmdUninstallFW() {
"
File: %2"
"File: %3"
"Link: %4 -> %5" )
- .arg( "/etc/kmyfirewall" )
- .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
- .arg( conf->initPath() + "/kmyfirewall" )
- .arg( conf->rcDefaultPath() + "/kmyfirewall" )
- .arg( conf->initPath() + "/kmyfirewall" );
+ .tqarg( "/etc/kmyfirewall" )
+ .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" )
+ .tqarg( conf->initPath() + "/kmyfirewall" )
+ .tqarg( conf->rcDefaultPath() + "/kmyfirewall" )
+ .tqarg( conf->initPath() + "/kmyfirewall" );
TQString cap = i18n( "Uninstall Firewall" );
KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 );
} else if ( conf->oS() == "linux" ) {
@@ -496,13 +496,13 @@ void KMFIPTInstaller::cmdUninstallFW() {
"File: %3"
"Link: %4 -> %5"
"Link: %6 -> %7" )
- .arg( "/etc/kmyfirewall" )
- .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
- .arg( conf->initPath() + "/kmyfirewall" )
- .arg( conf->rcDefaultPath() + "/S99kmyfirewall" )
- .arg( conf->initPath() + "/kmyfirewall" )
- .arg( conf->rcDefaultPath() + "/K01kmyfirewall" )
- .arg( conf->initPath() + "/kmyfirewall" );
+ .tqarg( "/etc/kmyfirewall" )
+ .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" )
+ .tqarg( conf->initPath() + "/kmyfirewall" )
+ .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" )
+ .tqarg( conf->initPath() + "/kmyfirewall" )
+ .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" )
+ .tqarg( conf->initPath() + "/kmyfirewall" );
TQString cap = i18n( "Uninstall Firewall" );
KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 );
}
@@ -519,13 +519,13 @@ void KMFIPTInstaller::cmdUninstallFW() {
// KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true );
setOutputWidget( execWidget() );
- execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
+ execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
showOutput();
- checkStatus();
+ checktqStatus();
} else {
setOutputWidget( execWidget() );
- execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
generateInstallerPackage( rulesetDoc()->target() );
@@ -539,9 +539,9 @@ void KMFIPTInstaller::cmdUninstallFW() {
}
setOutputWidget( execWidget() );
- execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+ execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
showOutput();
- checkStatus();
+ checktqStatus();
}
@@ -571,7 +571,7 @@ void KMFIPTInstaller::cmdUninstallFW() {
//
// return;
// } else {
-// KMessageBox::sorry( 0, i18n( "Input file %1 could not be opened." ).arg( file ), i18n( "Output Viewer" ) );
+// KMessageBox::sorry( 0, i18n( "Input file %1 could not be opened." ).tqarg( file ), i18n( "Output Viewer" ) );
// }
// } else {
// KMessageBox::sorry( 0, i18n( "Unable to find input file" ), i18n( "Output Viewer" ) );
@@ -772,7 +772,7 @@ TQStringList lines;
source_file.close();
} else {
m_err->setErrType( KMFError::NORMAL );
- const TQString& msg = i18n( "Opening file for %1 reading failed." ).arg( source_file_path );
+ const TQString& msg = i18n( "
Opening file for %1 reading failed." ).tqarg( source_file_path );
m_err->setErrMsg( msg );
}
@@ -794,7 +794,7 @@ TQStringList lines;
target_file.close();
} else {
m_err->setErrType( KMFError::NORMAL );
- const TQString& msg = i18n( "
Opening file for %1 writing failed." ).arg( target_file_path );
+ const TQString& msg = i18n( "
Opening file for %1 writing failed." ).tqarg( target_file_path );
m_err->setErrMsg( msg );
}
}
@@ -823,7 +823,7 @@ void KMFIPTInstaller::parseFileHeaders( const TQString& source_file_path, const
source_file.close();
} else {
m_err->setErrType( KMFError::NORMAL );
- const TQString& msg = i18n( "
Opening file for %1 reading failed." ).arg( source_file_path );
+ const TQString& msg = i18n( "
Opening file for %1 reading failed." ).tqarg( source_file_path );
m_err->setErrMsg( msg );
}
@@ -847,7 +847,7 @@ void KMFIPTInstaller::parseFileHeaders( const TQString& source_file_path, const
target_file.close();
} else {
m_err->setErrType( KMFError::NORMAL );
- const TQString& msg = i18n( "
Opening file for %1 writing failed." ).arg( target_file_path );
+ const TQString& msg = i18n( "
Opening file for %1 writing failed." ).tqarg( target_file_path );
m_err->setErrMsg( msg );
}
}
@@ -871,7 +871,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* tg ) {
return;
if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) {
- TQDateTime now = TQDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::tqcurrentDateTime();
TQString backUp;
backUp.append( url.url() );
@@ -927,7 +927,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
"
Please check your installation. Usually this script is installed in "
"$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1"
"
Unable to install the firewall without this script."
- ).arg(target->config()->oS());
+ ).tqarg(target->config()->oS());
TQString cap = "KMFIPTInstaller";
KMessageBox::error( 0, msg, cap );
return;
@@ -944,7 +944,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
"
Please check your installation. Usually this script is installed in "
"$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1"
"
Unable to install the firewall without this script."
- ).arg(target->config()->oS());
+ ).tqarg(target->config()->oS());
TQString cap = "KMFIPTInstaller";
KMessageBox::error( 0, msg, cap );
return;
@@ -960,7 +960,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p
"
Please check your installation. Usually this script is installed in "
"$TDEDIR/share/apps/kmyfirewall/scripts/installer/%1"
"
Unable to install the firewall without this script."
- ).arg(target->config()->oS());
+ ).tqarg(target->config()->oS());
TQString cap = "KMFIPTInstaller";
KMessageBox::error( 0, msg, cap );
return;
diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
index 13eb503..6223c9b 100644
--- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
+++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
@@ -18,13 +18,13 @@ email : chubinger@irrsinnig.org
// QT includes
#include
#include
-#include
+#include
#include
#include
#include
#include
#include
-#include
+#include
#include
//KDE includes
#include
@@ -162,7 +162,7 @@ KMFProcOut* KMFPFInstaller::execWidget(){
// KMessageBox::error( 0, msg, cap );
// } /*else if ( !ok ) {
// const TQString & msg = i18n( "Execution of %1 failed"
-// "
Click OK to check your configuration and make sure you are logged in as root" ).arg( cmd_name );
+// "
Click OK to check your configuration and make sure you are logged in as root" ).tqarg( cmd_name );
// const TQString& cap = "KMFPFInstaller";
// KMessageBox::error( 0, msg, cap );
// }*/
@@ -218,9 +218,9 @@ void KMFPFInstaller::cmdRunFW() {
// TQString cmd = "bash " + file + " -v start";
// // KProcessWrapper::instance()->slotStartLocalJob( "startfirewall", cmd, true, true );
// setOutputWidget( execWidget() );
-// execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
+// execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
// showOutput();
-// checkStatus();
+// checktqStatus();
// } else {
// if( KMessageBox::questionYesNo ( 0 , i18n( "
Are you sure you want to execute the generated firewall script on %1?"
// "
A wrongly configured firewall script may make your computer unusable! PLease make sure that you have left the SSH port open, otherwise you will no longer be able to remote control the comuter using KMyFirewall or any other SSH client!
"
@@ -244,7 +244,7 @@ void KMFPFInstaller::cmdRunFW() {
// "iptables -t mangle -P OUTPUT ACCEPT "
// "iptables -t mangle -P FORWARD ACCEPT "
// "iptables -t mangle -P PREROUTING ACCEPT "
-// "iptables -t mangle -P POSTROUTING ACCEPT " ).arg(rulesetDoc()->target()->toFriendlyString() ),
+// "iptables -t mangle -P POSTROUTING ACCEPT " ).tqarg(rulesetDoc()->target()->toFriendlyString() ),
// i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_run_fw_remote" ) != KMessageBox::Yes
// ) {
// return;
@@ -252,7 +252,7 @@ void KMFPFInstaller::cmdRunFW() {
//
//
// setOutputWidget( execWidget() );
-// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
//
// generateInstallerPackage( rulesetDoc()->target() );
@@ -266,9 +266,9 @@ void KMFPFInstaller::cmdRunFW() {
// }
//
// setOutputWidget( execWidget() );
-// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
-// checkStatus();
+// checktqStatus();
// }
//
}
@@ -283,7 +283,7 @@ void KMFPFInstaller::cmdStopFW() {
// }
//
// if( KMessageBox::questionYesNo ( 0 , i18n( "Are you sure you want to stop the firewall on %1?"
-// "
This will leave the computer unprotected!
" ).arg(rulesetDoc()->target()->toFriendlyString() ),
+// "This will leave the computer unprotected!
" ).tqarg(rulesetDoc()->target()->toFriendlyString() ),
// i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_stop_fw_remote" ) != KMessageBox::Yes
// ) {
// return;
@@ -294,13 +294,13 @@ void KMFPFInstaller::cmdStopFW() {
//
// TQString cmd = "bash " + file + " -v stop";
// setOutputWidget( execWidget() );
-// execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
+// execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
// showOutput();
-// checkStatus();
+// checktqStatus();
//
// } else {
// setOutputWidget( execWidget() );
-// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
//
// generateInstallerPackage( rulesetDoc()->target() );
@@ -314,9 +314,9 @@ void KMFPFInstaller::cmdStopFW() {
// }
//
// setOutputWidget( execWidget() );
-// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
-// checkStatus();
+// checktqStatus();
// }
}
@@ -335,12 +335,12 @@ void KMFPFInstaller::cmdShowRunningConfig( const TQString& para ) {
// if( rulesetDoc()->target()->isLocalExecuteTarget() ) {
// // KProcessWrapper::instance()->slotStartLocalJob( "show_config", cmd, true, true );
// setOutputWidget( execWidget() );
-// execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name, i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ), true );
+// execWidget()->runCmd( cmd,Constants::ShowConfigJob_Name, i18n("Show Table %1 on %2").tqarg( para ).tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
// showOutput();
//
// } else {
// setOutputWidget( execWidget() );
-// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
// KProcessWrapper::instance()->slotStartRemoteJob( Constants::ShowConfigJob_Name, cmd, rulesetDoc()->target() );
//
@@ -351,7 +351,7 @@ void KMFPFInstaller::cmdShowRunningConfig( const TQString& para ) {
// }
//
// setOutputWidget( execWidget() );
-// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").arg( para ).arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Show Table %1 on %2").tqarg( para ).tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
// }
}
@@ -365,7 +365,7 @@ void KMFPFInstaller::cmdInstallFW() {
// if( KMessageBox::questionYesNo ( 0 , i18n( "Are you sure you want to install the firewall on %1?"
// "
This will add the scripts to your init system that are required to "
// "start your firewall during bootup."
-// "
Please make sure that the firewall runs properly before you install it." ).arg( rulesetDoc()->target()->toFriendlyString() ),
+// "
Please make sure that the firewall runs properly before you install it." ).tqarg( rulesetDoc()->target()->toFriendlyString() ),
// i18n( "Install Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_install_fw" ) != KMessageBox::Yes ) {
// return;
// }
@@ -390,11 +390,11 @@ void KMFPFInstaller::cmdInstallFW() {
// "
File: %2"
// "File: %3"
// "Link: %4 -> %5" )
-// .arg( "/etc/kmyfirewall" )
-// .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
-// .arg( conf->IPTPath() + "/kmyfirewall" )
-// .arg( conf->rcDefaultPath() + "/kmyfirewall" )
-// .arg( conf->initPath() + "/kmyfirewall" );
+// .tqarg( "/etc/kmyfirewall" )
+// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" )
+// .tqarg( conf->IPTPath() + "/kmyfirewall" )
+// .tqarg( conf->rcDefaultPath() + "/kmyfirewall" )
+// .tqarg( conf->initPath() + "/kmyfirewall" );
// TQString cap = i18n( "Install Firewall" );
// KMessageBox::information( 0, msg, cap, "created_install_files", 0 );
// } else if ( conf->oS() == "linux" ) {
@@ -404,13 +404,13 @@ void KMFPFInstaller::cmdInstallFW() {
// "File: %3"
// "Link: %4 -> %5"
// "Link: %6 -> %7" )
-// .arg( "/etc/kmyfirewall" )
-// .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
-// .arg( conf->initPath() + "/kmyfirewall" )
-// .arg( conf->rcDefaultPath() + "/S99kmyfirewall" )
-// .arg( conf->initPath() + "/kmyfirewall" )
-// .arg( conf->rcDefaultPath() + "/K01kmyfirewall" )
-// .arg( conf->initPath() + "/kmyfirewall" );
+// .tqarg( "/etc/kmyfirewall" )
+// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" )
+// .tqarg( conf->initPath() + "/kmyfirewall" )
+// .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" )
+// .tqarg( conf->initPath() + "/kmyfirewall" )
+// .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" )
+// .tqarg( conf->initPath() + "/kmyfirewall" );
// TQString cap = i18n( "Install Firewall" );
// KMessageBox::information( 0, msg, cap, "created_install_files", 0 );
// }
@@ -437,12 +437,12 @@ void KMFPFInstaller::cmdInstallFW() {
// // KProcessWrapper::instance()->slotStartLocalJob( "installfirewall", cmd, true, true );
//
// setOutputWidget( execWidget() );
-// execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
+// execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
// showOutput();
-// checkStatus();
+// checktqStatus();
// } else {
// setOutputWidget( execWidget() );
-// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
//
// generateInstallerPackage( rulesetDoc()->target() );
@@ -456,9 +456,9 @@ void KMFPFInstaller::cmdInstallFW() {
// }
//
// setOutputWidget( execWidget() );
-// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
-// checkStatus();
+// checktqStatus();
// }
//
}
@@ -469,7 +469,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// KMFTargetConfig *conf = rulesetDoc()->target()->config();
//
// if ( KMessageBox::questionYesNo ( 0 , i18n( "Are you sure you want to uninstall the firewall from %1?
"
-// "The firewall will no longer start up during boot." ).arg( rulesetDoc()->target()->toFriendlyString() ),
+// "The firewall will no longer start up during boot." ).tqarg( rulesetDoc()->target()->toFriendlyString() ),
// i18n( "Uninstall Firewall" ), KStdGuiItem::yes(), KStdGuiItem::no(), "output_view_uninstall_fw" ) != KMessageBox::Yes ) {
// return;
// }
@@ -495,11 +495,11 @@ void KMFPFInstaller::cmdUninstallFW() {
// "
File: %2"
// "File: %3"
// "Link: %4 -> %5" )
-// .arg( "/etc/kmyfirewall" )
-// .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
-// .arg( conf->initPath() + "/kmyfirewall" )
-// .arg( conf->rcDefaultPath() + "/kmyfirewall" )
-// .arg( conf->initPath() + "/kmyfirewall" );
+// .tqarg( "/etc/kmyfirewall" )
+// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" )
+// .tqarg( conf->initPath() + "/kmyfirewall" )
+// .tqarg( conf->rcDefaultPath() + "/kmyfirewall" )
+// .tqarg( conf->initPath() + "/kmyfirewall" );
// TQString cap = i18n( "Uninstall Firewall" );
// KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 );
// } else if ( conf->oS() == "linux" ) {
@@ -509,13 +509,13 @@ void KMFPFInstaller::cmdUninstallFW() {
// "File: %3"
// "Link: %4 -> %5"
// "Link: %6 -> %7" )
-// .arg( "/etc/kmyfirewall" )
-// .arg( "/etc/kmyfirewall/kmyfirewall.sh" )
-// .arg( conf->initPath() + "/kmyfirewall" )
-// .arg( conf->rcDefaultPath() + "/S99kmyfirewall" )
-// .arg( conf->initPath() + "/kmyfirewall" )
-// .arg( conf->rcDefaultPath() + "/K01kmyfirewall" )
-// .arg( conf->initPath() + "/kmyfirewall" );
+// .tqarg( "/etc/kmyfirewall" )
+// .tqarg( "/etc/kmyfirewall/kmyfirewall.sh" )
+// .tqarg( conf->initPath() + "/kmyfirewall" )
+// .tqarg( conf->rcDefaultPath() + "/S99kmyfirewall" )
+// .tqarg( conf->initPath() + "/kmyfirewall" )
+// .tqarg( conf->rcDefaultPath() + "/K01kmyfirewall" )
+// .tqarg( conf->initPath() + "/kmyfirewall" );
// TQString cap = i18n( "Uninstall Firewall" );
// KMessageBox::information( 0, msg, cap, "removed_uninstall_files", 0 );
// }
@@ -532,13 +532,13 @@ void KMFPFInstaller::cmdUninstallFW() {
// // KProcessWrapper::instance()->slotStartLocalJob( "uninstallfirewall", cmd, true, true );
//
// setOutputWidget( execWidget() );
-// execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ), true );
+// execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true );
// showOutput();
-// checkStatus();
+// checktqStatus();
//
// } else {
// setOutputWidget( execWidget() );
-// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
//
// generateInstallerPackage( rulesetDoc()->target() );
@@ -552,9 +552,9 @@ void KMFPFInstaller::cmdUninstallFW() {
// }
//
// setOutputWidget( execWidget() );
-// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").arg( rulesetDoc()->target()->toFriendlyString() ) );
+// execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) );
// showOutput();
-// checkStatus();
+// checktqStatus();
// }
//
//
@@ -727,7 +727,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// source_file.close();
// } else {
// m_err->setErrType( KMFError::NORMAL );
-// const TQString& msg = i18n( "Opening file for %1 reading failed." ).arg( source_file_path );
+// const TQString& msg = i18n( "
Opening file for %1 reading failed." ).tqarg( source_file_path );
// m_err->setErrMsg( msg );
// }
//
@@ -749,7 +749,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// target_file.close();
// } else {
// m_err->setErrType( KMFError::NORMAL );
-// const TQString& msg = i18n( "
Opening file for %1 writing failed." ).arg( target_file_path );
+// const TQString& msg = i18n( "
Opening file for %1 writing failed." ).tqarg( target_file_path );
// m_err->setErrMsg( msg );
// }
// }
@@ -778,7 +778,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// source_file.close();
// } else {
// m_err->setErrType( KMFError::NORMAL );
-// const TQString& msg = i18n( "
Opening file for %1 reading failed." ).arg( source_file_path );
+// const TQString& msg = i18n( "
Opening file for %1 reading failed." ).tqarg( source_file_path );
// m_err->setErrMsg( msg );
// }
//
@@ -802,7 +802,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// target_file.close();
// } else {
// m_err->setErrType( KMFError::NORMAL );
-// const TQString& msg = i18n( "
Opening file for %1 writing failed." ).arg( target_file_path );
+// const TQString& msg = i18n( "
Opening file for %1 writing failed." ).tqarg( target_file_path );
// m_err->setErrMsg( msg );
// }
// }
@@ -829,7 +829,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// return;
//
// if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) {
-// TQDateTime now = TQDateTime::currentDateTime();
+// TQDateTime now = TQDateTime::tqcurrentDateTime();
//
// TQString backUp;
// backUp.append( url.url() );
diff --git a/kmyfirewall/ipteditor/kmfchainedit.cpp b/kmyfirewall/ipteditor/kmfchainedit.cpp
index bcc085a..1730f43 100644
--- a/kmyfirewall/ipteditor/kmfchainedit.cpp
+++ b/kmyfirewall/ipteditor/kmfchainedit.cpp
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -184,7 +184,7 @@ void KMFChainEdit::accept() {
kdDebug() << "KMyFirewallChainEditor::slotSaveChainChanges()" << endl;
KMFUndoEngine::instance()->startTransaction(
m_chain,
- i18n( "Edit Chain: %1 properties" ).arg( m_chain->name() )
+ i18n( "Edit Chain: %1 properties" ).tqarg( m_chain->name() )
);
bool log = c_enable_log->isChecked();
bool log_limit = c_log_limit->isChecked();
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
index 007712d..2fb2366 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
@@ -15,7 +15,7 @@ Author: Christian Hubinger , (C) 2001
// QT includes
#include
-#include
+#include
#include
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index 760d484..8c90bc2 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -329,7 +329,7 @@ void KMFRuleEdit::loadPlugins() {
void KMFRuleEdit::registerRuleOptionPlugin( KMFRuleOptionEditInterface* edit ) {
m_widgetStack->addWidget( edit->editWidget() );
m_editPlugins.append( edit );
- kb_optSelect->insertItem( i18n("Edit %1").arg( edit->optionEditName() ) );
+ kb_optSelect->insertItem( i18n("Edit %1").tqarg( edit->optionEditName() ) );
}
void KMFRuleEdit::registerRuleTargetOptionPlugin( KMFRuleTargetOptionEditInterface* edit ) {
@@ -561,7 +561,7 @@ void KMFRuleEdit::slotAddRule() {
if ( m_err_handler->showError( m_err ) ) {
KMFUndoEngine::instance()->startTransaction(
m_chain,
- i18n( "Add Rule: %1 to Chain: %2" ).arg( text ).arg( m_chain->name() )
+ i18n( "Add Rule: %1 to Chain: %2" ).tqarg( text ).tqarg( m_chain->name() )
);
IPTRule *inserted = m_chain->addRule( text, m_err );
@@ -603,21 +603,21 @@ void KMFRuleEdit::slotDelChain() {
if ( m_chain->isBuildIn() ) {
KMessageBox::sorry( this, i18n( "Cannot delete built-in chain: %1
"
"Built-in chains cannot be deleted; you can only delete chains "
- "that you have defined yourself." ).arg( m_chain->name() ),
+ "that you have defined yourself." ).tqarg( m_chain->name() ),
i18n( "Sorry" ) );
return ;
}
int doit = KMessageBox::questionYesNo ( this , i18n( "Are you sure that you want to delete "
"chain: %1 from table: %2?
"
"Note: By deleting the chain all rules that belong "
- "to the chain will be deleted too." ).arg( m_chain ->name() ).arg( m_chain ->table() ->name() ),
+ "to the chain will be deleted too." ).tqarg( m_chain ->name() ).tqarg( m_chain ->table() ->name() ),
i18n( "Delete Chain" ), KStdGuiItem::yes(), KStdGuiItem::no(), "main_view_delete_chain" );
kdDebug() << "Message Box returned: " << doit << endl;
if ( doit == 3 ) {
kdDebug() << "Try to delete Chain" << endl;
KMFUndoEngine::instance()->startTransaction(
m_table,
- i18n( "Delete Chain: %1 from Table: %2").arg( m_chain->name() ).arg( m_chain->table()->name() )
+ i18n( "Delete Chain: %1 from Table: %2").tqarg( m_chain->name() ).tqarg( m_chain->table()->name() )
);
m_err = m_network->currentDocAsIPTDoc()->table( m_chain->table()->name() )->delChain( m_chain );
if ( m_err_handler ->showError( m_err ) ) {
@@ -732,7 +732,7 @@ void KMFRuleEdit::slotMoveRuleDown() {
// if ( m_rule && kb_optSelect->isEnabled() ) {
// KMFUndoEngine::instance()->startTransaction(
// m_chain,
-// i18n("Move Rule: %1 down").arg( m_rule->name() )
+// i18n("Move Rule: %1 down").tqarg( m_rule->name() )
// );
// m_chain->saveState();
// if ( m_chain->moveRule( m_rule, 1 ) ) {
@@ -759,7 +759,7 @@ void KMFRuleEdit::slotMoveRuleUp() {
// if ( item ) {
// KMFUndoEngine::instance()->startTransaction(
// m_chain,
-// i18n("Move Rule: %1 up").arg( m_rule->name() )
+// i18n("Move Rule: %1 up").tqarg( m_rule->name() )
// );
// m_chain->saveState();
// if ( m_chain->moveRule( m_rule, -1 ) ) {
@@ -775,12 +775,12 @@ void KMFRuleEdit::slotMoveRuleUp() {
void KMFRuleEdit::moveRuleInChain( int amount ) {
if ( m_rule && kb_optSelect->isEnabled() ) {
- const TQString& transMsg = i18n("Move Rule: %1 %2").arg( m_rule->name() ).arg( amount > 0 ? "down" : "up" );
+ const TQString& transMsg = i18n("Move Rule: %1 %2").tqarg( m_rule->name() ).tqarg( amount > 0 ? "down" : "up" );
KMFListViewItem* item = currTableView()->findKMFItem( m_rule->name(),2, m_rule->uuid() );
if ( item ) {
KMFUndoEngine::instance()->startTransaction(
m_chain,
- transMsg.arg( m_rule->name() )
+ transMsg.tqarg( m_rule->name() )
);
if ( m_chain->moveRule( m_rule, -1 ) ) {
m_rule->chain()->changed();
@@ -805,14 +805,14 @@ void KMFRuleEdit::slotDelRule() {
return ;
} else {
int doit = KMessageBox::questionYesNo ( this , i18n( "
Are you sure that you want to delete "
- "rule: %1 from chain: %2?
").arg( m_rule->name() ).arg( m_rule->chain() ->name() ),
+ "rule: %1 from chain: %2?
").tqarg( m_rule->name() ).tqarg( m_rule->chain() ->name() ),
i18n( "Delete Rule" ), KStdGuiItem::yes(), KStdGuiItem::no(), "rule_edit_delete_rule" );
kdDebug() << "Message Box returned: " << doit << endl;
if ( doit == 3 ) { // OK clicked
kdDebug() << "clicked ok" << endl;
KMFUndoEngine::instance()->startTransaction(
m_chain,
- i18n("Delete Rule: %1 from Chain: %2").arg( m_rule->name() ).arg( m_chain->name() )
+ i18n("Delete Rule: %1 from Chain: %2").tqarg( m_rule->name() ).tqarg( m_chain->name() )
);
m_err = m_chain->delRule( m_rule );
if ( m_err_handler->showError( m_err ) ) {
@@ -997,7 +997,7 @@ void KMFRuleEdit::slotFragChanged() {
}
KMFUndoEngine::instance()->startTransaction(
m_rule,
- i18n( "Edit Rule: %1 Fragment option" ).arg( m_rule->name() )
+ i18n( "Edit Rule: %1 Fragment option" ).tqarg( m_rule->name() )
);
m_rule->addRuleOption( *cmd, *vals );
KMFUndoEngine::instance()->endTransaction();
@@ -1009,7 +1009,7 @@ void KMFRuleEdit::slotLogRuleChanged() {
return ;
KMFUndoEngine::instance()->startTransaction(
m_rule,
- i18n( "Edit Rule: %1 Log option" ).arg( m_rule->name() )
+ i18n( "Edit Rule: %1 Log option" ).tqarg( m_rule->name() )
);
if ( cb_log_rule->isChecked() ) {
m_rule->setLogging( true );
@@ -1026,7 +1026,7 @@ void KMFRuleEdit::slotEnableRuleChanged() {
return ;
KMFUndoEngine::instance()->startTransaction(
m_rule,
- i18n( "Edit Rule: %1 enabled state" ).arg( m_rule->name() )
+ i18n( "Edit Rule: %1 enabled state" ).tqarg( m_rule->name() )
);
if ( cb_disable_rule->isChecked() ) {
m_rule->setEnabled( false );
@@ -1065,7 +1065,7 @@ void KMFRuleEdit::slotTargetChanged( const TQString & tg ) {
if ( m_rule->target() != tg ) {
KMFUndoEngine::instance()->startTransaction(
m_rule,
- i18n( "Change Rule: %1 target from: %2 to: %3" ).arg( m_rule->name() ).arg( m_rule->target() ).arg( tg )
+ i18n( "Change Rule: %1 target from: %2 to: %3" ).tqarg( m_rule->name() ).tqarg( m_rule->target() ).tqarg( tg )
);
m_rule->setTarget( tg );
emit sigUpdateView( m_rule->chain()->table() );
@@ -1083,7 +1083,7 @@ void KMFRuleEdit::slotTargetChanged( const TQString & tg ) {
if ( m_rule->target() != tg ) {
KMFUndoEngine::instance()->startTransaction(
m_rule,
- i18n( "Change Rule: %1 target from: %2 to: %3" ).arg( m_rule->name() ).arg( m_rule->target() ).arg( tg )
+ i18n( "Change Rule: %1 target from: %2 to: %3" ).tqarg( m_rule->name() ).tqarg( m_rule->target() ).tqarg( tg )
);
m_rule->setTarget( tg );
emit sigUpdateView( m_rule->chain()->table() );
@@ -1153,7 +1153,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
if ( IPTable* table = dynamic_cast ( obj ) ) {
m_contextMenu->clear();
TQString name = table->name();
- TQString lab_str = i18n("Table: %1").arg( name );
+ TQString lab_str = i18n("Table: %1").tqarg( name );
m_contextMenu->insertTitle( lab_str );
m_contextMenu->insertItem( icon_new, i18n( "Add Chain..." ), this, TQT_SLOT( slotAddChain() ) );
@@ -1163,7 +1163,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
if ( IPTChain* chain = dynamic_cast ( obj ) ) {
m_contextMenu->clear();
TQString name = chain->name();
- TQString lab_str = i18n("Chain: %1").arg( name );
+ TQString lab_str = i18n("Chain: %1").tqarg( name );
m_contextMenu->insertTitle( icon_chain, lab_str );
m_contextMenu->insertItem( icon_new, i18n( "Add Rule..." ), this, TQT_SLOT( slotAddRule() ) );
@@ -1179,13 +1179,13 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
if ( IPTRule* rule = dynamic_cast ( obj ) ) {
m_contextMenu->clear();
TQString name = rule->name();
- TQString lab_str = i18n("Rule: %1").arg( name );
+ TQString lab_str = i18n("Rule: %1").tqarg( name );
m_contextMenu->insertTitle( icon_rule, lab_str );
KPopupMenu *sub_edit = new KPopupMenu( m_contextMenu );
sub_edit->insertTitle( i18n( "Edit Rule Option" ) );
for( uint i = 0; i < m_editPlugins.count(); i++ ) {
- sub_edit->insertItem( icon_edit, i18n( "Edit %1" ).arg(m_editPlugins.at(i)->optionEditName() ), i );
+ sub_edit->insertItem( icon_edit, i18n( "Edit %1" ).tqarg(m_editPlugins.at(i)->optionEditName() ), i );
}
connect( sub_edit,TQT_SIGNAL(activated( int ) ),
this,TQT_SLOT(slotNewOptionType( int ) ) );
@@ -1237,7 +1237,7 @@ void KMFRuleEdit::slotMoveRule( int index ) {
if ( chain_target ) {
KMFUndoEngine::instance()->startTransaction(
m_rule->chain()->table(),
- i18n( "Move Rule: %1 from Chain: %2 to Chain: %3" ).arg( m_rule->name() ).arg( m_rule->chain()->name() ).arg( chain_target->name() )
+ i18n( "Move Rule: %1 from Chain: %2 to Chain: %3" ).tqarg( m_rule->name() ).tqarg( m_rule->chain()->name() ).tqarg( chain_target->name() )
);
m_err = m_rule->chain()->table()->moveRuleToChain( m_rule, chain_target );
if ( m_err_handler->showError( m_err ) ) {
@@ -1257,7 +1257,7 @@ void KMFRuleEdit::slotCopyRule( int index ) {
if ( chain_target ) {
KMFUndoEngine::instance()->startTransaction(
m_rule->chain() ->table(),
- i18n( "Copy Rule: %1 from Chain: %2 to Chain: %3" ).arg( m_rule->name() ).arg( m_rule->chain()->name() ).arg( chain_target->name() )
+ i18n( "Copy Rule: %1 from Chain: %2 to Chain: %3" ).tqarg( m_rule->name() ).tqarg( m_rule->chain()->name() ).tqarg( chain_target->name() )
);
m_err = m_rule->chain() ->table() ->copyRuleToChain( m_rule, chain_target );
if ( m_err_handler->showError( m_err ) ) {
@@ -1297,7 +1297,7 @@ void KMFRuleEdit::slotRenameRule( TQListViewItem* , int, const TQString& name )
for ( rule = rules.first(); rule; rule = rules.next() ) {
if ( rule->name() == name ) {
KMessageBox::sorry( this, i18n( "Sorry, there is already a rule named: %1 in the chain.
"
- "Please make sure that the new rule name is unique in its chain.
" ).arg( name ) );
+ "Please make sure that the new rule name is unique in its chain." ).tqarg( name ) );
rule_item->setText( 2, rule_item->rule()->name() );
emit sigUpdateView( rule_item->rule()->chain() );
return ;
@@ -1305,7 +1305,7 @@ void KMFRuleEdit::slotRenameRule( TQListViewItem* , int, const TQString& name )
}
KMFUndoEngine::instance()->startTransaction(
rule_item->rule(),
- i18n( "Rename Rule: %1 to %2").arg( rule_item->rule()->name() ).arg( name )
+ i18n( "Rename Rule: %1 to %2").tqarg( rule_item->rule()->name() ).tqarg( name )
);
TQString origName = rule_item->rule()->name();
diff --git a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui
index 12d10b5..2f5f011 100644
--- a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui
+++ b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui
@@ -264,7 +264,7 @@
- layout36
+ tqlayout36
@@ -288,7 +288,7 @@
Expanding
-
+
110
20
@@ -324,7 +324,7 @@
Expanding
-
+
110
20
@@ -388,7 +388,7 @@
- layout12
+ tqlayout12
@@ -396,7 +396,7 @@
- layout11
+ tqlayout11
@@ -452,7 +452,7 @@
Please set the default policy for your chain:
-
+
WordBreak|AlignVCenter|AlignLeft
@@ -475,7 +475,7 @@
User defined chains do not have any "Default Policy" set because the packets return to the chain from which this chain is fed, right after the rule that fed the chain. If you want your user defined chains to act like built-in chains, enable the option "Define Default Policy" and set the policy to your needs.
-
+
WordBreak|AlignVCenter|AlignLeft
@@ -496,7 +496,7 @@
The Default Policy decides what to do with Packets that do not match any of the rules defined for the Chain.
-
+
WordBreak|AlignVCenter|AlignLeft
@@ -537,7 +537,7 @@
Logging
-
+
AlignVCenter|AlignBottom|AlignTop|AlignLeft
@@ -569,7 +569,7 @@
Here you can decide whether you would like to log all packets that did not match any rule at the end of the chain.
-
+
WordBreak|AlignTop|AlignLeft
@@ -694,7 +694,7 @@
- layout8
+ tqlayout8
@@ -740,7 +740,7 @@
/
-
+
AlignCenter
diff --git a/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui b/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui
index fcf0435..5c6cf0d 100644
--- a/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui
+++ b/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui
@@ -52,7 +52,7 @@
Please define a unique (in the table) name and decide which table this chain should be added to.
-
+
WordBreak|AlignVCenter
@@ -206,7 +206,7 @@
Expanding
-
+
79
0
@@ -233,7 +233,7 @@
Preferred
-
+
16
16
diff --git a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui
index e1bac64..05b62f9 100644
--- a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui
+++ b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui
@@ -70,7 +70,7 @@
Editing Rule
-
+
AlignVCenter|AlignLeft
@@ -176,7 +176,7 @@
- layout14
+ tqlayout14
@@ -186,13 +186,13 @@
m_led_modules
-
+
16
16
-
+
16
16
@@ -228,13 +228,13 @@
m_led_rp
-
+
16
16
-
+
16
16
@@ -254,13 +254,13 @@
m_led_fwd
-
+
16
16
-
+
16
16
@@ -288,13 +288,13 @@
0
-
+
16
16
-
+
16
16
@@ -314,13 +314,13 @@
m_led_syn
-
+
16
16
-
+
16
16
@@ -463,7 +463,7 @@
- layout12
+ tqlayout12
@@ -527,7 +527,7 @@
- layout20
+ tqlayout20
diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp
index bb9b05e..afb8ecf 100644
--- a/kmyfirewall/kmfconfigdialog.cpp
+++ b/kmyfirewall/kmfconfigdialog.cpp
@@ -17,7 +17,7 @@ Author: Christian Hubinger , (C) 2001-2004
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
index 9322cad..8395a1a 100644
--- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
+++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
@@ -20,7 +20,7 @@
#include
#include
#include
-#include
+#include
#include
// kde includes
@@ -67,7 +67,7 @@ void KMFCheckListOutput::appendLine( const TQString &txt ) {
kdDebug() << "void KMFCheckListOutput::appendLine(TQString txt)" << endl;
}
-void KMFCheckListOutput::setStatus( bool ok, const TQString &err_msg ) {
+void KMFCheckListOutput::settqStatus( bool ok, const TQString &err_msg ) {
kdDebug() << "void KMFCheckListOutput::setStatus(bool ok,TQString &err_msg)" << endl;
if ( ok ) {
m_currItem->setPixmap( 1, icon_ok );
diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.h b/kmyfirewall/kmfwidgets/kmfchecklistoutput.h
index 79ec49e..cfe72f8 100644
--- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.h
+++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.h
@@ -42,9 +42,9 @@ public:
void appendLine( const TQString &txt );
/**
- Sets the Status of the last created ListItem
+ Sets the tqStatus of the last created ListItem
*/
- void setStatus( bool ok, const TQString &err_msg );
+ void settqStatus( bool ok, const TQString &err_msg );
void clearList();
diff --git a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
index f82f03e..f9f5646 100644
--- a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
+++ b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
@@ -16,7 +16,7 @@
// QT includes
#include
-#include
+#include
#include
#include
diff --git a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
index 3f8562a..f7b77d1 100644
--- a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
+++ b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
@@ -33,7 +33,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -262,7 +262,7 @@ void KMFGenericInterfaceEditProtocol::slotDelProtocol() {
kdDebug() << "\n\nWARNING: No Protocol Object to save Changes in Memory!!\n\n" << endl;
}
int doit = KMessageBox::questionYesNo ( this , i18n( "Are you sure that you want to delete "
- "the protocol: %1?
").arg( m_protocol->name() ),
+ "the protocol: %1?
").tqarg( m_protocol->name() ),
i18n( "Delete Protocol" ), KStdGuiItem::yes(), KStdGuiItem::no() /*, "protocol_edit_delete_protocol"*/ );
// kdDebug() << "Got Answer: " << doit << endl;
diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
index 5aa2019..fb99875 100644
--- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
@@ -14,7 +14,7 @@
#include "kmfhostwidget.h"
// QT includes
-#include
+#include
#include
#include
#include
@@ -135,15 +135,15 @@ void KMFHostWidget::updateView() {
m_cb_os->blockSignals( true );
m_host_desc->blockSignals( true );
m_cmd_testSSH->blockSignals( true );
- m_led_configStatus->off();
+ m_led_configtqStatus->off();
if ( m_target ) {
- m_led_configStatus->on();
+ m_led_configtqStatus->on();
if ( m_target->config()->isValid() ) {
- m_led_configStatus->setColor( TQt::green );
- m_lbl_configStatus->setText( i18n( "Config Ok" ) );
+ m_led_configtqStatus->setColor( TQt::green );
+ m_lbl_configtqStatus->setText( i18n( "Config Ok" ) );
} else {
- m_led_configStatus->setColor( TQt::red );
- m_lbl_configStatus->setText( i18n( "Invalid Config!" ) );
+ m_led_configtqStatus->setColor( TQt::red );
+ m_lbl_configtqStatus->setText( i18n( "Invalid Config!" ) );
}
@@ -243,9 +243,9 @@ void KMFHostWidget::slotTestConnection() {
}
if ( KIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /",
KApplication::kApplication()->mainWidget() ) != 0) {
- KMessageBox::information( this, i18n("Conneted successfully to: %1").arg( m_target->toFriendlyString() ) );
+ KMessageBox::information( this, i18n("Conneted successfully to: %1").tqarg( m_target->toFriendlyString() ) );
} else {
- KMessageBox::error( this, i18n("Connetion to: %1 failed!").arg( m_target->toFriendlyString() ) );
+ KMessageBox::error( this, i18n("Connetion to: %1 failed!").tqarg( m_target->toFriendlyString() ) );
}
}
void KMFHostWidget::slotTryAutoConfiguration(){
@@ -254,14 +254,14 @@ void KMFHostWidget::slotTryAutoConfiguration(){
return;
}
KMFError* err = m_target->tryAutoConfiguration();
- KMFErrorHandler* errH = new KMFErrorHandler( i18n("Auto Confguration of: %1").arg( m_target->toFriendlyString() ) );
+ KMFErrorHandler* errH = new KMFErrorHandler( i18n("Auto Confguration of: %1").tqarg( m_target->toFriendlyString() ) );
if ( ! errH->showError( err ) ) {
return;
}
if ( ! m_target->config()->isValid() ) {
- KMessageBox::error( this, i18n("Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.
").arg( m_target->toFriendlyString() ) );
+ KMessageBox::error( this, i18n("Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.
").tqarg( m_target->toFriendlyString() ) );
} else {
- KMessageBox::information( this, i18n("Auto Confguration of: %1 finished successfully.
").arg( m_target->toFriendlyString() ) );
+ KMessageBox::information( this, i18n("Auto Confguration of: %1 finished successfully.
").tqarg( m_target->toFriendlyString() ) );
}
emit sigTargetChanged();
}
@@ -270,9 +270,9 @@ void KMFHostWidget::slotTryAutoConfiguration_Callback( KMFTarget* ) {
disconnect( m_target, TQT_SIGNAL( sigTargetChanged( KMFTarget* ) ),
this,TQT_SLOT( slotTryAutoConfiguration_Callback( KMFTarget* ) ) );
if ( ! m_target->config()->isValid() ) {
- KMessageBox::error( 0, i18n("Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.
").arg( m_target->toFriendlyString() ) );
+ KMessageBox::error( 0, i18n("Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.
").tqarg( m_target->toFriendlyString() ) );
} else {
- KMessageBox::information( this, i18n("Auto Confguration of: %1 finished successfully.
").arg( m_target->toFriendlyString() ) );
+ KMessageBox::information( this, i18n("Auto Confguration of: %1 finished successfully.
").tqarg( m_target->toFriendlyString() ) );
}
emit sigTargetChanged();
}
@@ -281,7 +281,7 @@ void KMFHostWidget::slotAddressChanged( int val ) {
kdDebug() << "KMFHostWidget::slotAddressChanged( int " << val << " )" << endl;
KMFUndoEngine::instance()->startTransaction(
m_target,
- i18n( "Edit address of target: %1.").arg( m_target->guiName() )
+ i18n( "Edit address of target: %1.").tqarg( m_target->guiName() )
);
m_target->address()->setAddress(
m_sb_host_0->value(),
@@ -297,7 +297,7 @@ void KMFHostWidget::slotSSHPortChanged( int val ) {
kdDebug() << "KMFHostWidget:::slotSSHPortChanged( int " << val << " )" << endl;
KMFUndoEngine::instance()->startTransaction(
m_target,
- i18n( "Edit SSH port of target: %1.").arg( m_target->guiName() )
+ i18n( "Edit SSH port of target: %1.").tqarg( m_target->guiName() )
);
m_target->setSSHPort( val );
KMFUndoEngine::instance()->endTransaction();
@@ -313,7 +313,7 @@ void KMFHostWidget::slotOSChanged( const TQString& val ) {
}
KMFUndoEngine::instance()->startTransaction(
m_target->config(),
- i18n( "Edit operation system setting of target: %1.").arg( m_target->guiName() )
+ i18n( "Edit operation system setting of target: %1.").tqarg( m_target->guiName() )
);
m_target->config()->setOS( val.lower() );
@@ -337,7 +337,7 @@ void KMFHostWidget::slotBackaendChanged( const TQString& val ) {
kdDebug() << "KMFHostWidget::slotBackaendChanged( const TQString& " << val << " )" << endl;
KMFUndoEngine::instance()->startTransaction(
m_target->config(),
- i18n( "Edit backend setting of target: %1.").arg( m_target->guiName() )
+ i18n( "Edit backend setting of target: %1.").tqarg( m_target->guiName() )
);
m_target->config()->setBackend( val.lower() );
@@ -355,7 +355,7 @@ void KMFHostWidget::slotDescriptionChanged() {
}
KMFUndoEngine::instance()->startTransaction(
m_target,
- i18n( "Edit documentation of target: %1.").arg( m_target->guiName() )
+ i18n( "Edit documentation of target: %1.").tqarg( m_target->guiName() )
);
m_target->setDescription( m_host_desc->text().simplifyWhiteSpace() );
KMFUndoEngine::instance()->endTransaction();
diff --git a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
index 72ee3a5..47b5622 100644
--- a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
@@ -101,7 +101,7 @@ void KMFInterfaceWidget::slotAddInterface() {
KMFUndoEngine::instance()->startTransaction(
m_target->config(),
- i18n( "Edit interfaces for target: %1.").arg( m_target->guiName() )
+ i18n( "Edit interfaces for target: %1.").tqarg( m_target->guiName() )
);
m_target->config()->setInterfaces( interfaces() );
KMFUndoEngine::instance()->endTransaction();
@@ -137,7 +137,7 @@ void KMFInterfaceWidget::slotDelInterface() {
m_lb_int->removeItem( index );
KMFUndoEngine::instance()->startTransaction(
m_target->config(),
- i18n( "Edit interfaces for target: %1.").arg( m_target->guiName() )
+ i18n( "Edit interfaces for target: %1.").tqarg( m_target->guiName() )
);
m_target->config()->setInterfaces( interfaces() );
KMFUndoEngine::instance()->endTransaction();
diff --git a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp
index b61f577..6023d3f 100644
--- a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp
+++ b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp
@@ -57,7 +57,7 @@ void KMFIPTDocOptions::accept() {
KMFUndoEngine::instance()->startTransaction(
kmfdoc,
- i18n( "Edit document settings for target: %1.").arg( kmfdoc->target()->guiName() )
+ i18n( "Edit document settings for target: %1.").tqarg( kmfdoc->target()->guiName() )
);
kmfdoc->setUseFilter( c_use_filter->isChecked() );
kmfdoc->setUseNat( c_use_nat->isChecked() );
diff --git a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
index 1004b70..cdfcb96 100644
--- a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
@@ -19,10 +19,10 @@
#include
#include
#include
-#include
+#include
#include
#include
-#include
+#include
#include
diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp
index 05c5e8d..f29f88a 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistview.cpp
@@ -54,7 +54,7 @@ KMFListView::KMFListView( TQWidget *parent, const char *name ) : KListView( pare
addColumn( i18n( "Rule No." ) );
addColumn( TQString() );
addColumn( i18n( "Value" ) );
- setSizePolicy( TQSizePolicy( ( TQSizePolicy::SizeType ) 2, ( TQSizePolicy::SizeType ) 2, 0, 0,
+ tqsetSizePolicy( TQSizePolicy( ( TQSizePolicy::SizeType ) 2, ( TQSizePolicy::SizeType ) 2, 0, 0,
sizePolicy().hasHeightForWidth() ) );
setFrameShape( KListView::StyledPanel );
setFrameShadow( KListView::Sunken );
@@ -493,7 +493,7 @@ void KMFListView::setupChainView( IPTChain* chain, KMFListViewItem* parent ) {
++it;
KMFListViewItem * item_feeds = new KMFListViewItem( i_chain_feeds, chain );
item_feeds->setInUse( true );
- item_feeds->setText( 0, i18n( "From chain: %1" ).arg( curr_rule->chain() ->name() ) );
+ item_feeds->setText( 0, i18n( "From chain: %1" ).tqarg( curr_rule->chain() ->name() ) );
item_feeds->setPixmap( 2, icon_rule );
item_feeds->setText( 2, curr_rule->name() );
}
@@ -528,7 +528,7 @@ void KMFListView::setupChainView( IPTChain* chain, KMFListViewItem* parent ) {
KMFListViewItem * item_fwds = new KMFListViewItem( i_chain_fwds, chain );
item_fwds->setInUse( true );
item_fwds->setPixmap( 0, icon_rule );
- item_fwds->setText( 0, i18n( "Rule: %1" ).arg( curr_rule->name() ) );
+ item_fwds->setText( 0, i18n( "Rule: %1" ).tqarg( curr_rule->name() ) );
item_fwds->setPixmap( 1, icon_fwd );
item_fwds->setText( 2, curr_rule->target() );
}
diff --git a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
index 3ed6968..bf1999e 100644
--- a/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistviewitem.cpp
@@ -226,10 +226,10 @@ void KMFListViewItem::setupNetHostView() {
setText( 1,"[" + host()->address()->toString() + "]" );
if ( host()->name().startsWith("incoming_world") ) {
- setText( 2,"" + i18n("%1 -> Localhost").arg( host()->guiName() ) );
+ setText( 2,"" + i18n("%1 -> Localhost").tqarg( host()->guiName() ) );
}
if ( host()->name().startsWith("outgoing_world") ) {
- setText( 2, i18n("Localhost -> %1").arg( host()->guiName() ) );
+ setText( 2, i18n("Localhost -> %1").tqarg( host()->guiName() ) );
}
}
@@ -250,17 +250,17 @@ void KMFListViewItem::setupZoneView() {
}
// if ( m_zone->name().startsWith("incoming_world") || m_zone->name().startsWith("outgoing_world") )
- setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").arg( m_zone->maskLength() ) );
+ setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) );
-/* setText( 2,"" + i18n("%1 -> Localhost").arg( m_zone->guiName() ) );*/
+/* setText( 2,"" + i18n("%1 -> Localhost").tqarg( m_zone->guiName() ) );*/
setText( 4,"" + m_zone->description() );
if ( m_zone->name().startsWith("incoming_world") ) {
- setText( 2,"" + i18n("%1 -> Localhost").arg( m_zone->guiName() ) );
+ setText( 2,"" + i18n("%1 -> Localhost").tqarg( m_zone->guiName() ) );
}
if ( m_zone->name().startsWith("outgoing_world") ) {
- setText( 2, i18n("Localhost -> %1").arg( m_zone->guiName() ) );
+ setText( 2, i18n("Localhost -> %1").tqarg( m_zone->guiName() ) );
}
@@ -314,10 +314,10 @@ void KMFListViewItem::setupZoneView() {
item->setText( 1,"[" + host->address()->toString() + "]" );
if ( host->name().startsWith("incoming_world") ) {
- item->setText( 2,"" + i18n("%1 -> Localhost").arg( host->guiName() ) );
+ item->setText( 2,"" + i18n("%1 -> Localhost").tqarg( host->guiName() ) );
}
if ( host->name().startsWith("outgoing_world") ) {
- item->setText( 2, i18n("Localhost -> %1").arg( host->guiName() ) );
+ item->setText( 2, i18n("Localhost -> %1").tqarg( host->guiName() ) );
}*/
// setOpen(true);
// // ++it2;
@@ -334,10 +334,10 @@ void KMFListViewItem::setupZoneView() {
// item->setText( 1,"[" + it2.current()->address()->toString() + "]" );
//
// if ( it2.current()->name().startsWith("incoming_world") ) {
-// item->setText( 2,"" + i18n("%1 -> Localhost").arg( it2.current()->guiName() ) );
+// item->setText( 2,"" + i18n("%1 -> Localhost").tqarg( it2.current()->guiName() ) );
// }
// if ( it2.current()->name().startsWith("outgoing_world") ) {
-// item->setText( 2, i18n("Localhost -> %1").arg( it2.current()->guiName() ) );
+// item->setText( 2, i18n("Localhost -> %1").tqarg( it2.current()->guiName() ) );
// }
// setOpen(true);
++it2;
diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
index a748ecb..c42fb12 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
@@ -18,9 +18,9 @@
#include
#include
#include
-#include
+#include
#include
-#include
+#include
// KDe Includes
#include
@@ -164,7 +164,7 @@ void KMFMyNetworkWidget::slotNewItemSelected( TQListViewItem* item ) {
if ( m_zone ) {
// kdDebug() << "kmfitem->zone() pointer is valid" << endl;
kmfitem->setText( 0,m_zone->guiName() );
- kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").arg( m_zone->maskLength() ) );
+ kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) );
m_network_widget->loadZone( m_zone );
if ( m_zone->readOnly() ) {
@@ -206,7 +206,7 @@ void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z ) {
kdDebug() << "void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z )" << endl;
if ( KMFListViewItem *item = findItem( z->uuid() ) ) {
kdDebug() << "Updating item" << endl;
- item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").arg( z->maskLength() ) );
+ item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").tqarg( z->maskLength() ) );
item->setText( 4, z->description() );
}
@@ -234,7 +234,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
if ( m_zone ) {
m_contextMenu->clear();
TQString name = m_zone->name();
- TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() );
+ TQString lab_str = i18n("Zone: %1").tqarg( m_zone->guiName() );
m_contextMenu->insertTitle( icon_chain, lab_str );
m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
@@ -256,7 +256,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
if ( m_target ) {
m_contextMenu->clear();
TQString name = m_target->name();
- TQString lab_str = i18n("Host: %1").arg( m_target->guiName() );
+ TQString lab_str = i18n("Host: %1").tqarg( m_target->guiName() );
m_contextMenu->insertTitle( icon_chain, lab_str );
if ( ! m_target->readOnly() ) {
m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) );
@@ -292,7 +292,7 @@ void KMFMyNetworkWidget::slotAddHost() {
if ( m_zone ) {
KMFUndoEngine::instance()->startTransaction(
m_network->netzone(),
- i18n("Add Target: %1 to Zone: %2").arg( name ).arg( m_zone->guiName() )
+ i18n("Add Target: %1 to Zone: %2").tqarg( name ).tqarg( m_zone->guiName() )
);
TQString s = "";
s = s.setNum( m_zone->hosts().count() );
@@ -317,7 +317,7 @@ void KMFMyNetworkWidget::slotDelHost() {
return;
KMFUndoEngine::instance()->startTransaction(
m_zone,
- i18n("Delete Target: %1 from Zone: %2").arg( m_target->guiName() ).arg( m_zone->guiName() )
+ i18n("Delete Target: %1 from Zone: %2").tqarg( m_target->guiName() ).tqarg( m_zone->guiName() )
);
m_zone->delHost( m_target );
KMFUndoEngine::instance()->endTransaction();
@@ -338,7 +338,7 @@ void KMFMyNetworkWidget::slotAddZone() {
KMFUndoEngine::instance()->startTransaction(
m_network->netzone(),
- i18n("Add Zone: %1 to Zone: %2").arg( name ).arg( m_network->netzone()->guiName() )
+ i18n("Add Zone: %1 to Zone: %2").tqarg( name ).tqarg( m_network->netzone()->guiName() )
);
KMFNetZone * zone = m_network->netzone()->addZone( "", new KMFError() );
@@ -362,7 +362,7 @@ void KMFMyNetworkWidget::slotDelZone() {
if ( m_zone->name() != i18n("world") ) {
KMFUndoEngine::instance()->startTransaction(
m_zone->zone(),
- i18n("Delete Zone: %1 from Zone: %2").arg( m_zone->guiName() ).arg( m_zone->zone()->guiName() )
+ i18n("Delete Zone: %1 from Zone: %2").tqarg( m_zone->guiName() ).tqarg( m_zone->zone()->guiName() )
);
m_zone->zone()->delZone( m_zone );
m_zone = 0;
@@ -385,7 +385,7 @@ void KMFMyNetworkWidget::slotRenameItem( TQListViewItem* item, int, const TQStri
if ( kmfitem->type() == NetfilterObject::NETZONE ) {
KMFUndoEngine::instance()->startTransaction(
kmfitem->zone(),
- i18n("Rename Zone: %1 to %3").arg( m_zone->guiName() ).arg( name )
+ i18n("Rename Zone: %1 to %3").tqarg( m_zone->guiName() ).tqarg( name )
);
kmfitem->zone()->setGuiName( name );
@@ -397,7 +397,7 @@ void KMFMyNetworkWidget::slotRenameItem( TQListViewItem* item, int, const TQStri
if ( kmfitem->type() == NetfilterObject::KMFTARGET ) {
KMFUndoEngine::instance()->startTransaction(
kmfitem->target(),
- i18n("Rename Host: %1 to %3").arg( m_zone->guiName() ).arg( name )
+ i18n("Rename Host: %1 to %3").tqarg( m_zone->guiName() ).tqarg( name )
);
kmfitem->target()->setGuiName( name );
kdDebug() << "Renaming Host: " << kmfitem->target()->name() << endl;
diff --git a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
index d311981..6e50797 100644
--- a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
@@ -19,10 +19,10 @@
#include
#include
#include
-#include
+#include
#include
#include
-#include
+#include
#include
// KDE includes
@@ -158,7 +158,7 @@ void KMFNetHostPropertiesWidget::slotAddressChanged( int d0, int d1, int d2, int
<< d3 << ")" << endl;
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n("Change address of Host: %1.").arg( m_host->guiName() )
+ i18n("Change address of Host: %1.").tqarg( m_host->guiName() )
);
m_host->address()->setAddress( d0, d1, d2, d3 );
m_host->zone()->rootZone()->placeHostInZone( m_host );
@@ -183,7 +183,7 @@ void KMFNetHostPropertiesWidget::slotHostLogToggled( bool ) {
}
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "%1 logging of incoming packets for host %2." ).arg( m_cb_host_log->isChecked() ? i18n( "Enable" ) : i18n( "Disable" ) ).arg( m_host->guiName() )
+ i18n( "%1 logging of incoming packets for host %2." ).tqarg( m_cb_host_log->isChecked() ? i18n( "Enable" ) : i18n( "Disable" ) ).tqarg( m_host->guiName() )
);
m_host->setLogIncoming( m_cb_host_log->isChecked() );
KMFUndoEngine::instance()->endTransaction();
@@ -193,7 +193,7 @@ void KMFNetHostPropertiesWidget::slotHostLogToggled( bool ) {
}
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "%1 logging of outgoing packets for host %2." ).arg( m_cb_host_log->isChecked() ? i18n( "Enable" ) : i18n( "Disable" ) ).arg( m_host->guiName() )
+ i18n( "%1 logging of outgoing packets for host %2." ).tqarg( m_cb_host_log->isChecked() ? i18n( "Enable" ) : i18n( "Disable" ) ).tqarg( m_host->guiName() )
);
m_host->setLogOutgoing( m_cb_host_log->isChecked() );
KMFUndoEngine::instance()->endTransaction();
@@ -209,14 +209,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitToggled( bool on ){
if ( on ) {
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "Enable package limit for host %1." ).arg( m_host->guiName() )
+ i18n( "Enable package limit for host %1." ).tqarg( m_host->guiName() )
);
m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction();
} else {
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "Disable package limit for host %1." ).arg( m_host->guiName() )
+ i18n( "Disable package limit for host %1." ).tqarg( m_host->guiName() )
);
m_host->setLimit( -1, m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction();
@@ -232,14 +232,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitValueChanged( int ) {
if ( m_cb_host_limit->isChecked() ) {
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "Change package limit for host %1 to %2/%3." ).arg( m_host->guiName() ).arg( m_sb_host_rate->value() ).arg( m_cb_limit_host_interval->currentText() )
+ 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() )
);
m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction();
} else {
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "Disable package limit for host %1." ).arg( m_host->guiName() )
+ i18n( "Disable package limit for host %1." ).tqarg( m_host->guiName() )
);
m_host->setLimit( -1, m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction();
@@ -255,14 +255,14 @@ void KMFNetHostPropertiesWidget::slotHostLimitScaleChanged( int ) {
if ( m_cb_host_limit->isChecked() ) {
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "Change package limit for host %1 to %2/%3." ).arg( m_host->guiName() ).arg( m_sb_host_rate->value() ).arg( m_cb_limit_host_interval->currentText() )
+ 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() )
);
m_host->setLimit( m_sb_host_rate->value(), m_cb_limit_host_interval->currentText() );
KMFUndoEngine::instance()->endTransaction();
} else {
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "Disable package limit for host %1." ).arg( m_host->guiName() )
+ i18n( "Disable package limit for host %1." ).tqarg( m_host->guiName() )
);
m_host->setLimit( -1, "" );
KMFUndoEngine::instance()->endTransaction();
@@ -279,7 +279,7 @@ void KMFNetHostPropertiesWidget::slotDescriptionChanged() {
if ( newTxt != m_host->description() ) {
KMFUndoEngine::instance()->startTransaction(
m_host,
- i18n( "Change documentation of host: %1" ).arg( m_host->guiName() )
+ i18n( "Change documentation of host: %1" ).tqarg( m_host->guiName() )
);
m_host->setDescription( newTxt );
KMFUndoEngine::instance()->endTransaction();
diff --git a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
index acd737d..be43b03 100644
--- a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
@@ -13,7 +13,7 @@
// QT includes
#include
-#include
+#include
#include
// KDE includes
@@ -97,7 +97,7 @@ void KMFNetworkWidget::slotAddressChanged( const TQString& ) {
}
KMFUndoEngine::instance()->startTransaction(
m_zone->rootZone(),
- i18n( "Change address of Zone: %1" ).arg( m_zone->guiName() )
+ i18n( "Change address of Zone: %1" ).tqarg( m_zone->guiName() )
);
m_zone->address()->setAddress( m_sb_from_1->value(), m_sb_from_2->value(), m_sb_from_3->value(), m_sb_from_4->value() );
@@ -117,7 +117,7 @@ void KMFNetworkWidget::slotShortMaskChanged( int len ) {
if ( m_allowEdit && m_zone->maskLength() != len ) {
KMFUndoEngine::instance()->startTransaction(
m_zone->rootZone(),
- i18n( "Change mask length of Zone: %1" ).arg( m_zone->guiName() )
+ i18n( "Change mask length of Zone: %1" ).tqarg( m_zone->guiName() )
);
m_zone->setMaskLength( len );
m_zone->rootZone()->refreshNetworkTree();
@@ -137,7 +137,7 @@ void KMFNetworkWidget::slotDescriptionChanged() {
blockAllSignals( true );
KMFUndoEngine::instance()->startTransaction(
m_zone,
- i18n( "Change documentation of Zone: %1" ).arg( m_zone->guiName() )
+ i18n( "Change documentation of Zone: %1" ).tqarg( m_zone->guiName() )
);
m_zone->setDescription( newTxt );
KMFUndoEngine::instance()->endTransaction();
diff --git a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
index f3b8cae..581323d 100644
--- a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
@@ -43,9 +43,9 @@ KMFNewDocDlg::KMFNewDocDlg( TQWidget *parent, const char *name, WFlags fl ) : KM
TQPainter p( &pic );
p.setFont( f );
p.setPen( TQt::white );
- p.drawText( 165, 45, TQString( "Version %1" ).arg( KMYFIREWALL_VERSION ) );
- p.drawText( 93, 215, TQString( "%1" ).arg( COPYRIGHT_DATE ) );
- p.drawText( 70, 230, TQString( "%1" ).arg( COPYRIGHT_OWNER ) );
+ p.drawText( 165, 45, TQString( "Version %1" ).tqarg( KMYFIREWALL_VERSION ) );
+ p.drawText( 93, 215, TQString( "%1" ).tqarg( COPYRIGHT_DATE ) );
+ p.drawText( 70, 230, TQString( "%1" ).tqarg( COPYRIGHT_OWNER ) );
if ( pic.isNull() )
return ;
l_pic->setPixmap( pic );
diff --git a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp
index 8c544b3..1c76d49 100644
--- a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp
+++ b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
// Project includes
#include "../core/iptrule.h"
@@ -74,7 +74,7 @@ void KMFObjectInfo::accept() {
if ( m_netfilter_object->description() != te_desc->text() ) {
KMFUndoEngine::instance()->startTransaction(
m_netfilter_object,
- i18n("Edit Documentaion for: %1").arg( m_netfilter_object->name() )
+ i18n("Edit Documentaion for: %1").tqarg( m_netfilter_object->name() )
);
m_netfilter_object->setDescription( te_desc->text() );
kdDebug() << "Description Changed: " << te_desc->text() << endl;
@@ -84,7 +84,7 @@ void KMFObjectInfo::accept() {
if ( m_doc->description() != te_desc->text() ) {
KMFUndoEngine::instance()->startTransaction(
m_doc,
- i18n("Edit Documentaion for: %1").arg( m_netfilter_object->name() )
+ i18n("Edit Documentaion for: %1").tqarg( m_netfilter_object->name() )
);
m_doc->setDescription( te_desc->text() );
KMFUndoEngine::instance()->endTransaction();
diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp
index 5023bed..46635a2 100644
--- a/kmyfirewall/kmfwidgets/kmfprocout.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp
@@ -24,8 +24,8 @@
// QT includes
-#include
-#include
+#include
+#include
#include
#include
#include
@@ -61,7 +61,7 @@ void KMFProcOut::initGUI() {
icon_name = "quit";
icon_close = loader->loadIcon( icon_name, KIcon::Small );
- m_layout = new TQGridLayout( this, 0, 0, 2, 2, "layout" );
+ m_layout = new TQGridLayout( this, 0, 0, 2, 2, "tqlayout" );
m_lbview = new TQTextBrowser( this, "m_lbview" );
m_lbview->setTextFormat( RichText );
@@ -126,7 +126,7 @@ void KMFProcOut::slotReceivedOutput( KProcess *, char *buffer, int buflen ) {
stderrbuf = new TQString( "" );
}
- *stdoutbuf += TQString::fromLatin1( buffer, buflen );
+ *stdoutbuf += TQString::tqfromLatin1( buffer, buflen );
int pos;
while ( ( pos = stdoutbuf->find( '\n' ) ) != -1 ) {
TQString line = stdoutbuf->left( pos );
@@ -143,7 +143,7 @@ void KMFProcOut::slotReceivedError( KProcess *, char *buffer, int buflen ) {
stdoutbuf = new TQString( "" );
}
- *stderrbuf += TQString::fromLatin1( buffer, buflen );
+ *stderrbuf += TQString::tqfromLatin1( buffer, buflen );
int pos;
while ( ( pos = stderrbuf->find( '\n' ) ) != -1 ) {
TQString line = stderrbuf->left( pos );
@@ -165,7 +165,7 @@ void KMFProcOut::insertStdoutLine( const TQString &line ) {
}
void KMFProcOut::insertStderrLine( const TQString &line ) {
- const TQString & line2 = i18n( "Error: %1" ).arg( line );
+ const TQString & line2 = i18n( "Error: %1" ).tqarg( line );
m_lbview->append( "" + line2 + "" );
}
@@ -175,7 +175,7 @@ void KMFProcOut::childFinished( bool , int status ) {
const TQString& job_name = m_job_name;
if ( status != 0 ) {
m_lbview->append( i18n( "
Execution failed" ) );
- m_lbview->append( i18n( "Exit(Code): %1" ).arg( stat ) );
+ m_lbview->append( i18n( "Exit(Code): %1" ).tqarg( stat ) );
emit sigJobFinished( false, job_name );
} else {
m_lbview->append( i18n( "
Finished successfully" ) );
diff --git a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
index 3d0ab9a..48e14d1 100644
--- a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
@@ -19,10 +19,10 @@
#include
#include
#include
-#include
+#include
#include
#include
-#include
+#include
#include
diff --git a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
index f3ae2f4..8de1b62 100644
--- a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
@@ -19,10 +19,10 @@
#include
#include
#include
-#include
+#include
#include
#include
-#include
+#include
#include
// KDE includes
@@ -81,7 +81,7 @@ void KMFProtocolPropertiesWidget::loadProtocolCategory( KMFProtocolCategory* pro
m_gb_protocol_option->setEnabled( false );
m_gb_protocol_description->setEnabled( true );
m_l_protocol_desc->setEnabled( true );
- TQString text = i18n( "Description: %1
" ).arg( protCat ->description() );
+ TQString text = i18n( "Description: %1
" ).tqarg( protCat ->description() );
text += "";
m_l_protocol_desc->setText( text );
@@ -93,7 +93,7 @@ void KMFProtocolPropertiesWidget::loadProtocol( KMFProtocol* prot ) {
m_gb_protocol_option->setEnabled( false );
m_gb_protocol_description->setEnabled( true );
m_l_protocol_desc->setEnabled( true );
- TQString text = i18n( "Description: %1
" ).arg( prot ->description() );
+ TQString text = i18n( "Description: %1
" ).tqarg( prot ->description() );
const TQString& tcpports = prot->tcpPortsList();
if ( ! tcpports.isEmpty() ) {
@@ -160,7 +160,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLimit( bool onoff ) {
if ( onoff ) {
KMFUndoEngine::instance()->startTransaction(
m_protocolUsage,
- i18n("Enable package limit for protocol %1.").arg( m_protocolUsage->name() )
+ i18n("Enable package limit for protocol %1.").tqarg( m_protocolUsage->name() )
);
m_protocolUsage->setLimit( m_sb_limit_rate->value() );
m_protocolUsage->setLimitInterval( m_cb_limit_interval->currentText() );
@@ -168,7 +168,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLimit( bool onoff ) {
} else {
KMFUndoEngine::instance()->startTransaction(
m_protocolUsage,
- i18n("Sisable package limit for protocol %1.").arg( m_protocolUsage->name() )
+ i18n("Sisable package limit for protocol %1.").tqarg( m_protocolUsage->name() )
);
m_protocolUsage->setLimit( -1 );
KMFUndoEngine::instance()->endTransaction();
@@ -184,7 +184,7 @@ void KMFProtocolPropertiesWidget::slotSetProtocolLimitRate( int rate ){
KMFUndoEngine::instance()->startTransaction(
m_protocolUsage,
- i18n("Set package limit for protocol %1 to %2/%3.").arg( m_protocolUsage->name() ).arg( rate ).arg( m_protocolUsage->limitInterval() )
+ i18n("Set package limit for protocol %1 to %2/%3.").tqarg( m_protocolUsage->name() ).tqarg( rate ).tqarg( m_protocolUsage->limitInterval() )
);
m_protocolUsage->setLimit( rate );
KMFUndoEngine::instance()->endTransaction();
@@ -202,7 +202,7 @@ void KMFProtocolPropertiesWidget::slotSetProtocolLimitInterval( const TQString&
KMFUndoEngine::instance()->startTransaction(
m_protocolUsage,
- i18n("Set package limit for protocol %1 to %2/%3.").arg( m_protocolUsage->name() ).arg( m_protocolUsage->limit() ).arg( interval )
+ i18n("Set package limit for protocol %1 to %2/%3.").tqarg( m_protocolUsage->name() ).tqarg( m_protocolUsage->limit() ).tqarg( interval )
);
m_protocolUsage->setLimitInterval( interval );
KMFUndoEngine::instance()->endTransaction();
@@ -217,7 +217,7 @@ void KMFProtocolPropertiesWidget::slotEnableProtocolLogging( bool onoff ){
KMFUndoEngine::instance()->startTransaction(
m_protocolUsage,
- i18n( "%1 logging of dropped packets for protocol %2." ).arg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ).arg( m_protocolUsage->name() )
+ i18n( "%1 logging of dropped packets for protocol %2." ).tqarg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ).tqarg( m_protocolUsage->name() )
);
m_protocolUsage->setLogging( onoff );
diff --git a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
index 37d4db4..bd9514b 100644
--- a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
@@ -25,7 +25,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
index 5165e38..993a99f 100644
--- a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
+++ b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
@@ -147,7 +147,7 @@ void KMFSystemSettingsLinux::slotDistributionChanged() {
}
KMFUndoEngine::instance()->startTransaction(
conf,
- i18n( "Change system settings of target: %1" ).arg( conf->target()->guiName() )
+ i18n( "Change system settings of target: %1" ).tqarg( conf->target()->guiName() )
);
conf->setIPTPath( m_url_ipt_path->url() );
conf->setModprobePath( m_url_mod_path->url() );
@@ -174,7 +174,7 @@ void KMFSystemSettingsLinux::slotSettingChanged() {
}
KMFUndoEngine::instance()->startTransaction(
conf,
- i18n( "Change system settings of target: %1" ).arg( conf->target()->guiName() )
+ i18n( "Change system settings of target: %1" ).tqarg( conf->target()->guiName() )
);
conf->setIPTPath( m_url_ipt_path->url() );
conf->setModprobePath( m_url_mod_path->url() );
diff --git a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
index d82ba5c..c1e4c27 100644
--- a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
+++ b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
@@ -110,7 +110,7 @@ void KMFTemplateChooser::parseTemplates(){
}
TQStringList templates = dir.entryList( type );
if ( templates.isEmpty() ) {
- KMessageBox::information( this, i18n("No templates (%1) could be found; please check your installation.").arg( type ) );
+ KMessageBox::information( this, i18n("No templates (%1) could be found; please check your installation.").tqarg( type ) );
return;
}
for ( TQStringList::Iterator it = templates.begin(); it != templates.end(); ++it ) {
@@ -123,21 +123,21 @@ void KMFTemplateChooser::parseFile( const TQString& file ) {
TQFile f( file );
if ( !f.open( IO_ReadOnly ) ) {
- KMessageBox::information( this, i18n("Template %1 could not be opened.").arg( file ) );
+ KMessageBox::information( this, i18n("Template %1 could not be opened.").tqarg( file ) );
return;
}
TQDomDocument doc;
if ( !doc.setContent( &f ) ) {
f.close();
- KMessageBox::information( this, i18n("Template %1 is not a valid XML document.").arg( file ) );
+ KMessageBox::information( this, i18n("Template %1 is not a valid XML document.").tqarg( file ) );
return;
}
TQDomElement root = doc.documentElement();
TQDomNodeList list = root.elementsByTagName ( XML::Abstract_Element );
if ( list.count() == 0 ) {
- KMessageBox::information( this, i18n("Template %1 does not contain the \"abstract\" tag.").arg( file ) );
+ KMessageBox::information( this, i18n("Template %1 does not contain the \"abstract\" tag.").tqarg( file ) );
return;
}
TQDomNode node = list.item( 0 );
diff --git a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
index bc66325..7d1e85f 100644
--- a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
+++ b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
@@ -19,9 +19,9 @@
#include
#include
#include
-#include
-#include
-#include
+#include
+#include
+#include
// KDE includes
#include
@@ -128,8 +128,8 @@ void KMFTransactionLog::slotZoneRBM( TQListViewItem* item, const TQPoint& point,
m_currentTransaction = t;
m_contextMenu->clear();
- TQString name = i18n("Transaction: %1").arg( m_currentTransaction->uuid().toString() );
- // TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() );
+ TQString name = i18n("Transaction: %1").tqarg( m_currentTransaction->uuid().toString() );
+ // TQString lab_str = i18n("Zone: %1").tqarg( m_zone->guiName() );
m_contextMenu->insertTitle( name );
m_contextMenu->insertItem( i18n( "Show XML diff using Kompare" ), this, TQT_SLOT( slotShowDiff() ) );
m_contextMenu->popup( point );
@@ -264,7 +264,7 @@ KListViewItem* KMFTransactionLog::setupListItem( KMFTransaction* trans, KListVie
NetfilterObject *obj = 0;
obj = NetfilterObject::findObject ( obj_uuid );
if ( obj ) {
- itemID->setText( 0, i18n("Object: %1").arg( obj->name() ) );
+ itemID->setText( 0, i18n("Object: %1").tqarg( obj->name() ) );
// itemID->setText( 2, obj->name() );
// itemID->setText( 3, obj->getXMLSniplet() );
}
diff --git a/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui b/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui
index e76ab81..d4c54da 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui
@@ -37,7 +37,7 @@
<b>Ruleset Description:</b>
-
+
WordBreak|AlignTop
@@ -83,7 +83,7 @@
- layout2
+ tqlayout2
@@ -113,7 +113,7 @@
Expanding
-
+
300
20
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
index 2327266..3e6f069 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
@@ -40,7 +40,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
- layout13
+ tqlayout13
@@ -111,7 +111,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
- layout15
+ tqlayout15
@@ -119,7 +119,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
- layout14
+ tqlayout14
@@ -165,7 +165,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
- layout33
+ tqlayout33
@@ -204,7 +204,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
m_lb_tcpPorts
-
+
0
80
@@ -215,7 +215,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
m_te_desc
-
+
32767
150
@@ -267,7 +267,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
- layout27
+ tqlayout27
@@ -290,7 +290,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
- layout37
+ tqlayout37
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui
index c6a1882..9cf1608 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui
@@ -27,7 +27,7 @@
- layout19_3
+ tqlayout19_3
@@ -59,7 +59,7 @@
.
-
+
AlignBottom
@@ -89,7 +89,7 @@
.
-
+
AlignBottom
@@ -119,7 +119,7 @@
.
-
+
AlignBottom
@@ -154,7 +154,7 @@
- layout2
+ tqlayout2
@@ -320,7 +320,7 @@
Expanding
-
+
20
71
@@ -329,7 +329,7 @@
- m_lbl_configStatus
+ m_lbl_configtqStatus
@@ -372,7 +372,7 @@
Expanding
-
+
241
20
@@ -381,7 +381,7 @@
- m_led_configStatus
+ m_led_configtqStatus
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui
index b637295..274413d 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui
@@ -32,7 +32,7 @@
Please add your available network Interfaces here:
-
+
WordBreak|AlignVCenter
@@ -40,7 +40,7 @@
- layout10
+ tqlayout10
@@ -56,7 +56,7 @@
Expanding
-
+
20
41
diff --git a/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui b/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui
index 0c62584..b1454cf 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui
@@ -23,13 +23,13 @@
TextLabel7
-
+
0
40
-
+
32767
40
@@ -49,7 +49,7 @@
Here you can configure several general options that your firewall has.
-
+
WordBreak|AlignCenter
@@ -85,7 +85,7 @@
Enable the iptables you like to use in your firewall.
-
+
WordBreak|AlignVCenter
@@ -171,7 +171,7 @@
Expanding
-
+
51
0
@@ -199,7 +199,7 @@
Expanding
-
+
21
0
@@ -264,7 +264,7 @@
<b>Enable this if you compiled iptables as modules</b>. For details about the required modules, take a look at the iptables man page.
-
+
WordBreak|AlignVCenter
@@ -283,7 +283,7 @@
<b>Enable this if your host should act as a router</b>.
-
+
WordBreak|AlignVCenter
@@ -294,7 +294,7 @@
<b>Enable if you like to use Syn Cookies.</b> (needs support compiled in the kernel)
-
+
WordBreak|AlignVCenter
@@ -313,7 +313,7 @@
<b>Enable</b> if you like to use <b>Reverse Parse Filtering</b>.
-
+
WordBreak|AlignVCenter
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui
index e41e933..2413e25 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui
@@ -24,7 +24,7 @@
- layout19
+ tqlayout19
@@ -56,7 +56,7 @@
.
-
+
AlignBottom
@@ -86,7 +86,7 @@
.
-
+
AlignBottom
@@ -116,7 +116,7 @@
.
-
+
AlignBottom
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui
index 5f134f6..f6e42bc 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui
@@ -167,7 +167,7 @@
<p>You may filter for up to 15 ports within one rule if you are using the multiport extention.<br>
Use this to avoid too large (slow) rulesets.
-
+
WordBreak|AlignTop
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui b/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui
index 185e674..fff8137 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui
@@ -24,7 +24,7 @@
- layout16
+ tqlayout16
@@ -69,7 +69,7 @@
- layout10
+ tqlayout10
@@ -126,7 +126,7 @@
- layout9_2
+ tqlayout9_2
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui
index cfa45fd..43e3800 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui
@@ -24,7 +24,7 @@
- layout7
+ tqlayout7
@@ -32,7 +32,7 @@
- layout27
+ tqlayout27
@@ -74,7 +74,7 @@
- layout22
+ tqlayout22
@@ -82,7 +82,7 @@
- layout19
+ tqlayout19
@@ -114,7 +114,7 @@
.
-
+
AlignBottom
@@ -144,7 +144,7 @@
.
-
+
AlignBottom
@@ -174,7 +174,7 @@
.
-
+
AlignBottom
@@ -193,7 +193,7 @@
- layout21
+ tqlayout21
@@ -228,7 +228,7 @@
Expanding
-
+
19
2
@@ -250,7 +250,7 @@
Mask:
-
+
AlignVCenter
@@ -286,7 +286,7 @@
Expanding
-
+
20
45
@@ -313,7 +313,7 @@
Zone Properties:
-
+
AlignVCenter
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui b/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui
index 84e76f9..0797cf9 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui
@@ -12,13 +12,13 @@
330
-
+
580
330
-
+
580
330
@@ -95,7 +95,7 @@
- layout20
+ tqlayout20
@@ -129,7 +129,7 @@
<h3>New/Open Document</h3>
-
+
WordBreak|AlignTop
@@ -145,7 +145,7 @@
0
-
+
25
25
@@ -190,7 +190,7 @@
Please choose how you would like to start your new firewall configuration.
-
+
WordBreak|AlignTop
@@ -204,7 +204,7 @@
Minimum
-
+
20
50
@@ -320,7 +320,7 @@
Minimum
-
+
20
20
@@ -329,7 +329,7 @@
- layout6
+ tqlayout6
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui b/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui
index ad02c00..5bae513 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui
@@ -23,13 +23,13 @@
m_header
-
+
0
40
-
+
32767
40
@@ -49,7 +49,7 @@
Rule Documentation
-
+
AlignCenter
@@ -69,7 +69,7 @@
- layout3
+ tqlayout3
@@ -93,7 +93,7 @@
Expanding
-
+
21
20
@@ -118,7 +118,7 @@
Expanding
-
+
21
20
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui
index c9299c2..f2f2f60 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui
@@ -48,7 +48,7 @@
1
-
+
150
0
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui
index 7017d5a..8083d06 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui
@@ -46,7 +46,7 @@
- layout9
+ tqlayout9
@@ -141,7 +141,7 @@
m_l_protocol_desc
-
+
WordBreak|AlignTop
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui
index 285c8f9..5e97ca8 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui
@@ -29,7 +29,7 @@
Preferred
-
+
339
20
@@ -87,7 +87,7 @@
Preferred
-
+
178
20
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui
index 9adcd5b..4bee50a 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui
@@ -67,13 +67,13 @@
m_pic_screenshot
-
+
400
300
-
+
400
300
@@ -88,7 +88,7 @@
- layout6
+ tqlayout6
@@ -130,13 +130,13 @@
Description
-
+
AlignTop
- layout2
+ tqlayout2
@@ -179,7 +179,7 @@
Expanding
-
+
101
20
@@ -192,7 +192,7 @@
- layout9
+ tqlayout9
@@ -220,13 +220,13 @@
<p>KMyFirewall provides two different inerfaces for setting up your firewall. Please select the Interface you like to use.</p>
-
+
WordBreak|AlignTop
- layout8
+ tqlayout8
@@ -244,7 +244,7 @@
0
-
+
25
25
@@ -283,7 +283,7 @@
Expanding
-
+
0
0
@@ -304,7 +304,7 @@
Expanding
-
+
0
0
@@ -313,7 +313,7 @@
- layout1
+ tqlayout1
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui b/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui
index 0fb4ed1..399fc82 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui
@@ -60,7 +60,7 @@
As Gentoo and Slackware are using non-standard SysV init system it is required to select your distibution in order to make the firewall install properly into your boot setup.
-
+
WordBreak|AlignVCenter
@@ -71,7 +71,7 @@
Path to the defaul <b> runlevel</b> directoy:
-
+
AlignVCenter
@@ -82,7 +82,7 @@
Path to the <b>init</b> directory:
-
+
AlignVCenter
@@ -93,7 +93,7 @@
Path to the <b>modprobe</b> program:
-
+
AlignVCenter
@@ -112,7 +112,7 @@
Path to the <b>iptables</b> binary:
-
+
AlignVCenter
@@ -157,7 +157,7 @@
Preferred
-
+
20
51
@@ -174,7 +174,7 @@
Expanding
-
+
20
41
diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui b/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui
index 6283909..54660bd 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui
@@ -12,7 +12,7 @@
401
-
+
580
400
@@ -131,7 +131,7 @@
Expanding
-
+
20
20
@@ -208,7 +208,7 @@
- layout8
+ tqlayout8
@@ -248,7 +248,7 @@
AutoText
-
+
WordBreak|AlignTop
@@ -259,7 +259,7 @@
- layout10
+ tqlayout10
@@ -297,13 +297,13 @@
<h3>Template Chooser</h3>
<p>Select a ruleset template you like to use as the starting point for your firewall setup.</p>
-
+
WordBreak|AlignTop
- layout9
+ tqlayout9
@@ -321,13 +321,13 @@
0
-
+
25
25
-
+
25
25
@@ -366,7 +366,7 @@
Preferred
-
+
20
31
@@ -379,7 +379,7 @@
- layout14
+ tqlayout14
@@ -400,7 +400,7 @@
<h3>Available Templates</h3>
-
+
AlignVCenter
diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
index 6465669..6180bf8 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
@@ -64,7 +64,7 @@
- layout3
+ tqlayout3
@@ -118,7 +118,7 @@
- layout2
+ tqlayout2
@@ -189,7 +189,7 @@
Expanding
-
+
225
20
@@ -217,7 +217,7 @@
- layout4
+ tqlayout4
@@ -262,7 +262,7 @@
Expanding
-
+
201
20
diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp
index 1ca5d3c..d39d4b3 100644
--- a/kmyfirewall/kmyfirewall.cpp
+++ b/kmyfirewall/kmyfirewall.cpp
@@ -14,13 +14,13 @@ Author: Christian Hubinger , (C) 2001-2004
// QT includes
#include
-#include
+#include