summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-01-05 10:21:03 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-01-05 10:21:03 +0900
commit6df466c45ad202eea7d7401a2e5ff67ee783e272 (patch)
treec7eef2a16b5eda4152bb3445da2bf13408c6e9b3
parent487235a78de062d9f083ff4b4cb15167898890db (diff)
downloadkmyfirewall-6df466c45ad202eea7d7401a2e5ff67ee783e272.tar.gz
kmyfirewall-6df466c45ad202eea7d7401a2e5ff67ee783e272.zip
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--KMFSysTray/app.cpp8
-rw-r--r--KMFSysTray/details.cpp2
-rw-r--r--KMFSysTray/kmfiptwatcher.cpp2
-rw-r--r--KMFSysTray/kmfsystray.cpp20
-rw-r--r--KMFSysTray/mainwidget.cpp8
-rw-r--r--doc/kmyfirewall/index.docbook12
-rw-r--r--kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp4
-rw-r--r--kmyfirewall/compilers/pf/kmfpfcompiler.cpp2
-rw-r--r--kmyfirewall/core/kmfnethost.cpp8
-rw-r--r--kmyfirewall/core/kmfnetzone.cpp8
-rw-r--r--kmyfirewall/core/kmfprotocolusage.cpp8
-rw-r--r--kmyfirewall/core/kmftarget.cpp4
-rw-r--r--kmyfirewall/core/kprocesswrapper.cpp6
-rw-r--r--kmyfirewall/genericinterface/kmfgenericinterface.cpp54
-rw-r--r--kmyfirewall/genericinterface/kmfgenericinterface_part.cpp28
-rw-r--r--kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp60
-rw-r--r--kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp8
-rw-r--r--kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp12
-rw-r--r--kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp34
-rw-r--r--kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp52
-rw-r--r--kmyfirewall/installer/kmfinstallerplugin.cpp24
-rw-r--r--kmyfirewall/installer/linux/kmfiptinstaller.cpp4
-rw-r--r--kmyfirewall/installer/openbsd/kmfpfinstaller.cpp4
-rw-r--r--kmyfirewall/ipteditor/kmfchainedit.cpp2
-rw-r--r--kmyfirewall/ipteditor/kmfipteditorpart.cpp30
-rw-r--r--kmyfirewall/ipteditor/kmfruleedit.cpp208
-rw-r--r--kmyfirewall/kmfconfigdialog.cpp8
-rw-r--r--kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp6
-rw-r--r--kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp36
-rw-r--r--kmyfirewall/kmfwidgets/kmfhostwidget.cpp44
-rw-r--r--kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp4
-rw-r--r--kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp16
-rw-r--r--kmyfirewall/kmfwidgets/kmflistview.cpp4
-rw-r--r--kmyfirewall/kmfwidgets/kmfmultiportwidget.cpp6
-rw-r--r--kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp34
-rw-r--r--kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp32
-rw-r--r--kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp26
-rw-r--r--kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp12
-rw-r--r--kmyfirewall/kmfwidgets/kmfprocout.cpp8
-rw-r--r--kmyfirewall/kmfwidgets/kmfprotocollistview.cpp12
-rw-r--r--kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp22
-rw-r--r--kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp16
-rw-r--r--kmyfirewall/kmfwidgets/kmfselectinterface.cpp8
-rw-r--r--kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp20
-rw-r--r--kmyfirewall/kmfwidgets/kmftemplatechooser.cpp12
-rw-r--r--kmyfirewall/kmfwidgets/kmftransactionlog.cpp30
-rw-r--r--kmyfirewall/kmyfirewall.cpp66
-rw-r--r--kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp12
-rw-r--r--kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp12
-rw-r--r--kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp12
-rw-r--r--kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp4
-rw-r--r--kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp4
61 files changed, 556 insertions, 556 deletions
diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp
index 4ca7bf1..e1cb5d9 100644
--- a/KMFSysTray/app.cpp
+++ b/KMFSysTray/app.cpp
@@ -42,11 +42,11 @@ MainApp::MainApp() : TDEApplication() {
// TDEConfig *ksConfig = config();
// KMFIPTWatcher *watch = new KMFIPTWatcher( this, "KMFIPTWatcher" );
// MainWidget *mainWid = new MainWidget( 0 );
-// connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningStatus( bool ) ) );
-// connect( watch, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ),
-// mainWid, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) );
+// connect( watch, TQ_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQ_SLOT( slotSetRunningStatus( bool ) ) );
+// connect( watch, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ),
+// mainWid, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) );
-// connect( mainWid, TQT_SIGNAL( sigQueryDetails( bool ) ), watch, TQT_SLOT( slotQueryDetails( bool ) ) );
+// connect( mainWid, TQ_SIGNAL( sigQueryDetails( bool ) ), watch, TQ_SLOT( slotQueryDetails( bool ) ) );
/*
TQHBoxLayout *_layout = new TQHBoxLayout(this);
_layout->add(mainWid);*/
diff --git a/KMFSysTray/details.cpp b/KMFSysTray/details.cpp
index a213ebd..1d94bf1 100644
--- a/KMFSysTray/details.cpp
+++ b/KMFSysTray/details.cpp
@@ -31,7 +31,7 @@
Details::Details( TQWidget* parent, const char* name, WFlags fl )
: DetailsDesigner( parent, name, fl ) {
- TQObject::connect( m_cmd_close, TQT_SIGNAL( clicked() ), this, TQT_SLOT ( close() ) );
+ TQObject::connect( m_cmd_close, TQ_SIGNAL( clicked() ), this, TQ_SLOT ( close() ) );
}
diff --git a/KMFSysTray/kmfiptwatcher.cpp b/KMFSysTray/kmfiptwatcher.cpp
index 65c92ec..451dfaf 100644
--- a/KMFSysTray/kmfiptwatcher.cpp
+++ b/KMFSysTray/kmfiptwatcher.cpp
@@ -55,7 +55,7 @@ KMFIPTWatcher::~KMFIPTWatcher() {}
void KMFIPTWatcher::go() {
// KMessageBox::information( 0, i18n( "go()" ) );
m_timer = new TQTimer();
- TQObject::connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) );
+ TQObject::connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeout() ) );
m_timer->start( 3000, false );
}
diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp
index afd5914..880dd5d 100644
--- a/KMFSysTray/kmfsystray.cpp
+++ b/KMFSysTray/kmfsystray.cpp
@@ -54,19 +54,19 @@ KMFSysTray::KMFSysTray( TQWidget* w ) : KSystemTray ( w ) , DCOPObject( "KMFSys
setPixmap( baseIcon );
// Connect the watch deamon
- connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), this, TQT_SLOT( slotSetRunningStatus( bool ) ) );
- connect( watch, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ),
- this, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) );
+ connect( watch, TQ_SIGNAL( sigUpdateActive( bool ) ), this, TQ_SLOT( slotSetRunningStatus( bool ) ) );
+ connect( watch, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ),
+ this, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) );
- connect( watch, TQT_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ),
- this, TQT_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ) );
+ connect( watch, TQ_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ),
+ this, TQ_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ) );
- connect( this, TQT_SIGNAL( sigQueryDetails( bool ) ), watch, TQT_SLOT( slotQueryDetails( bool ) ) );
+ connect( this, TQ_SIGNAL( sigQueryDetails( bool ) ), watch, TQ_SLOT( slotQueryDetails( bool ) ) );
// Connect view
- connect( w, TQT_SIGNAL( closing() ), this, TQT_SLOT ( slotDetailsClosed() ) );
- connect( w, TQT_SIGNAL( showing() ), this, TQT_SLOT ( slotQueryDetails() ) );
- connect( this, TQT_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ), w, TQT_SLOT( slotLoadDoc( KMFIPTDoc* ) ) );
+ connect( w, TQ_SIGNAL( closing() ), this, TQ_SLOT ( slotDetailsClosed() ) );
+ connect( w, TQ_SIGNAL( showing() ), this, TQ_SLOT ( slotQueryDetails() ) );
+ connect( this, TQ_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ), w, TQ_SLOT( slotLoadDoc( KMFIPTDoc* ) ) );
initMenu();
@@ -82,7 +82,7 @@ KMFSysTray::~KMFSysTray() {}
void KMFSysTray::initMenu() {
TDEPopupMenu* menu = contextMenu ();
- menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", TDEIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K );
+ menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", TDEIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQ_SLOT( slotLaunchKMF() ), CTRL+Key_K );
}
diff --git a/KMFSysTray/mainwidget.cpp b/KMFSysTray/mainwidget.cpp
index 14387f5..dab8315 100644
--- a/KMFSysTray/mainwidget.cpp
+++ b/KMFSysTray/mainwidget.cpp
@@ -39,10 +39,10 @@ MainWidget::MainWidget(TQWidget* parent, const char* name, WFlags fl)
m_ledActive->off();
m_cmd_info->setEnabled( false );
m_wid_details = new Details( 0 );
- connect( m_wid_details, TQT_SIGNAL( closing() ), this, TQT_SLOT ( slotDetailsClosed() ) );
- connect( this, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ),
- m_wid_details, TQT_SLOT( slotUpdateRuleCount( const TQString&, const TQString&, int ) ) );
- connect( m_cmd_info, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowDetails() ) ) ;
+ connect( m_wid_details, TQ_SIGNAL( closing() ), this, TQ_SLOT ( slotDetailsClosed() ) );
+ connect( this, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ),
+ m_wid_details, TQ_SLOT( slotUpdateRuleCount( const TQString&, const TQString&, int ) ) );
+ connect( m_cmd_info, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowDetails() ) ) ;
}
MainWidget::~MainWidget()
diff --git a/doc/kmyfirewall/index.docbook b/doc/kmyfirewall/index.docbook
index cfe91e0..6741259 100644
--- a/doc/kmyfirewall/index.docbook
+++ b/doc/kmyfirewall/index.docbook
@@ -1073,13 +1073,13 @@ KMFRuleOptionEditMAC::KMFRuleOptionEditMAC(TQObject *parent, const char *name)
m_edit->hide();
// Connect the Signals for the editor class to our slots passing them to the app
- connect( m_edit,SIGNAL(sigAddRuleOpt(TQString*, QPtrList&lt; TQString &gt;* ) ),
- this,SLOT( slotAddRuleOption(TQString*, QPtrList&lt; TQString &gt;* ) ) );
+ connect( m_edit,TQ_SIGNAL(sigAddRuleOpt(TQString*, QPtrList&lt; TQString &gt;* ) ),
+ this,TQ_SLOT( slotAddRuleOption(TQString*, QPtrList&lt; TQString &gt;* ) ) );
//
- //connect( m_edit,SIGNAL(sigAddTargetOpt(TQString*, QPtrList&lt; TQString &gt;* ) ),
- // this,SLOT( slotAddTargetOption(TQString*, QPtrList&lt; TQString &gt;* ) ) );
- connect( m_edit,SIGNAL(sigHideMe() ),
- this,SLOT( slotShowOverview() ) );
+ //connect( m_edit,TQ_SIGNAL(sigAddTargetOpt(TQString*, QPtrList&lt; TQString &gt;* ) ),
+ // this,TQ_SLOT( slotAddTargetOption(TQString*, QPtrList&lt; TQString &gt;* ) ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditMAC::~KMFRuleOptionEditMAC() {}
diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
index 9fb21ae..c631526 100644
--- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
+++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
@@ -52,11 +52,11 @@ KMFIPTablesCompiler::KMFIPTablesCompiler( TQObject* parent, const char* name ) :
m_errorHandler = new KMFErrorHandler( "KMFIPTablesCompiler" );
m_iptWidget = 0;
new TDEAction( i18n( "&Export as IPTables (Linux) Script" ), "fileexport",
- 0, this, TQT_SLOT( slotExportIPT() ), actionCollection(), "compile_iptables" );
+ 0, this, TQ_SLOT( slotExportIPT() ), actionCollection(), "compile_iptables" );
if ( genericDoc() ) {
new TDEAction( i18n( "&Convert to IPTables Document and View" ), "fileexport",
- 0, this, TQT_SLOT( slotConvertToIPTDoc() ), actionCollection(), "convert_to_iptdoc" );
+ 0, this, TQ_SLOT( slotConvertToIPTDoc() ), actionCollection(), "convert_to_iptdoc" );
setXMLFile( "kmfiptablescompiler.rc" );
kdDebug() << "KMFIPTablesCompiler: Finished initialisation." << endl;
diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
index 4a854b1..9744fe8 100644
--- a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
+++ b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
@@ -45,7 +45,7 @@ KMFPFCompiler::KMFPFCompiler( TQObject* parent, const char* name ) : KMFPlugin(
if ( genericDoc() ) {
new TDEAction( i18n( "Export as &PF (OpenBSD) Script" ), "fileexport",
- 0, this, TQT_SLOT( slotExportPF() ), actionCollection(), "compile_pf" );
+ 0, this, TQ_SLOT( slotExportPF() ), actionCollection(), "compile_pf" );
setXMLFile( "kmfpfcompiler.rc" );
kdDebug() << "KMFPFCompiler: Finished initialisation." << endl;
diff --git a/kmyfirewall/core/kmfnethost.cpp b/kmyfirewall/core/kmfnethost.cpp
index 2c4580c..b955e37 100644
--- a/kmyfirewall/core/kmfnethost.cpp
+++ b/kmyfirewall/core/kmfnethost.cpp
@@ -175,10 +175,10 @@ KMFProtocolUsage* KMFNetHost::addProtocolUsage( const TQUuid& protocolUuid, cons
}
new_protocol->setProtocol( prot );
m_protocols.append( new_protocol );
- disconnect( new_protocol, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolUsageDeleted( TQObject* ) ) );
- connect( new_protocol, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolUsageDeleted( TQObject* ) ) );
+ disconnect( new_protocol, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolUsageDeleted( TQObject* ) ) );
+ connect( new_protocol, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolUsageDeleted( TQObject* ) ) );
changed();
return new_protocol;
}
diff --git a/kmyfirewall/core/kmfnetzone.cpp b/kmyfirewall/core/kmfnetzone.cpp
index 5a377d2..fd7a3d3 100644
--- a/kmyfirewall/core/kmfnetzone.cpp
+++ b/kmyfirewall/core/kmfnetzone.cpp
@@ -463,10 +463,10 @@ KMFProtocolUsage* KMFNetZone::addProtocolUsage( const TQUuid& protocolUuid, cons
}
new_protocol->setProtocol( prot );
m_protocols.append( new_protocol );
- disconnect( new_protocol, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolUsageDeleted( TQObject* ) ) );
- connect( new_protocol, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolUsageDeleted( TQObject* ) ) );
+ disconnect( new_protocol, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolUsageDeleted( TQObject* ) ) );
+ connect( new_protocol, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolUsageDeleted( TQObject* ) ) );
changed();
return new_protocol;
}
diff --git a/kmyfirewall/core/kmfprotocolusage.cpp b/kmyfirewall/core/kmfprotocolusage.cpp
index 647a213..46d55ee 100644
--- a/kmyfirewall/core/kmfprotocolusage.cpp
+++ b/kmyfirewall/core/kmfprotocolusage.cpp
@@ -87,10 +87,10 @@ void KMFProtocolUsage::setProtocol( KMFProtocol* p ) {
// kdDebug() << "KMFProtocolUsage::setProtocol( KMFProtocol* " << p->name() << " )" << endl;
m_protocol = p;
- disconnect( m_protocol, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolDeleted( TQObject* ) ) );
- connect( m_protocol, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolDeleted( TQObject* ) ) );
+ disconnect( m_protocol, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolDeleted( TQObject* ) ) );
+ connect( m_protocol, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolDeleted( TQObject* ) ) );
}
void KMFProtocolUsage::slotOnProtocolDeleted( TQObject* ) {
diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp
index b56eb41..ed026da 100644
--- a/kmyfirewall/core/kmftarget.cpp
+++ b/kmyfirewall/core/kmftarget.cpp
@@ -276,7 +276,7 @@ KMFError* KMFTarget::tryAutoConfiguration() {
//
// disconnect(
// TDEProcessWrapper::instance(),
-// TQT_SIGNAL( sigProcessFinished(
+// TQ_SIGNAL( sigProcessFinished(
// const TQString&,
// int,
// bool,
@@ -284,7 +284,7 @@ KMFError* KMFTarget::tryAutoConfiguration() {
// const TQString& ,
// const TQString& ) ),
// this,
-// TQT_SLOT( slotProcessFinished(
+// TQ_SLOT( slotProcessFinished(
// const TQString&,
// int,
// bool,
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index 6514a03..0ff0b99 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -51,9 +51,9 @@ TDEProcessWrapper::TDEProcessWrapper( TQObject* parent, const char* name ) : TQ
m_status = -1;
m_exitedNormal = false;
- connect( m_childproc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
- connect( m_childproc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );
- connect( m_childproc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
+ connect( m_childproc, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
+ connect( m_childproc, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );
+ connect( m_childproc, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
}
TDEProcessWrapper::~TDEProcessWrapper()
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface.cpp b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
index 1a062cf..85a0a18 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
@@ -49,19 +49,19 @@
namespace KMF {
KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) : KJanusWidget( parent, name, KJanusWidget::IconList ) {
- connect( this,TQT_SIGNAL( aboutToShowPage( TQWidget* ) ),
- this,TQT_SLOT( slotPageChanged( TQWidget* ) ) );
+ connect( this,TQ_SIGNAL( aboutToShowPage( TQWidget* ) ),
+ this,TQ_SLOT( slotPageChanged( TQWidget* ) ) );
loadIcons();
//###################### My Network Widget ###################################
myNetworkFrame = addPage(i18n("My Network"), i18n("Define and configure the firewall host you like to configure"), icon_zone_page );
m_myNetworkWidget = new KMFMyNetworkWidget( myNetworkFrame, "m_myNetworkWidget" );
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_myNetworkWidget, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_myNetworkWidget, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_myNetworkWidget, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_myNetworkWidget, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
- connect( m_myNetworkWidget, TQT_SIGNAL( sigActiveTargetChanged() ), this, TQT_SIGNAL( sigTargetChanged() ) );
+ connect( m_myNetworkWidget, TQ_SIGNAL( sigActiveTargetChanged() ), this, TQ_SIGNAL( sigTargetChanged() ) );
TQGridLayout *myNetworkLayout = new TQGridLayout( myNetworkFrame, 1, 1, 2, 2 );
myNetworkLayout->addWidget( m_myNetworkWidget,0,0 );
@@ -70,10 +70,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
protocolFrame = addPage(i18n("Access Control"), i18n("Access configuration for incoming and outgoing connections"), icon_protocol_page );
m_protocolPageZones = new KMFGenericInterfaceProtocol( protocolFrame, "m_protocolPageIncoming");
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_protocolPageZones, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_protocolPageZones, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_protocolPageZones, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_protocolPageZones, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
TQGridLayout *protocoLayout = new TQGridLayout( protocolFrame, 1, 1, 2, 2 );
protocoLayout->addWidget( m_protocolPageZones,0,0 );
@@ -81,10 +81,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
//###################### HOSTS PAGE ###################################
hostFrame = addPage(i18n("Special Hosts"), i18n("Define Hosts that should be treated specially."), icon_host_page );
m_hostPage = new KMFGenericInterfaceHost(hostFrame,"m_hostPageTrusted");
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_hostPage, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_hostPage, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_hostPage, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_hostPage, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
TQGridLayout *hostLayout = new TQGridLayout( hostFrame, 1, 1, 2, 2 );
hostLayout->addWidget( m_hostPage,0,0 );
@@ -93,10 +93,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
icmpFrame = addPage(i18n("ICMP Options"), i18n("Define how ICMP packets should be handled."), icon_icmp_page );
TQGridLayout *icmpLayout = new TQGridLayout( icmpFrame, 1, 1, 2, 2 );
m_icmpPage = new KMFGenericInterfaceIcmp(icmpFrame,"m_icmpPage");
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_icmpPage, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_icmpPage, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_icmpPage, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_icmpPage, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
icmpLayout->addWidget( m_icmpPage,0,0 );
@@ -105,10 +105,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
natFrame = addPage(i18n("NAT Configuration"), i18n("Configure NAT (Network Address Translation) here."), icon_nat_page );
TQGridLayout *natLayout = new TQGridLayout( natFrame, 1, 1, 2, 2 );
m_natPage = new KMFGenericInterfaceNat(natFrame,"m_natPage");
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_natPage, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_natPage, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_natPage, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_natPage, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
natLayout->addWidget( m_natPage,0,0 );
@@ -116,10 +116,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
logFrame = addPage(i18n("Logging"), i18n("Configure your firewall's logging behavior here."), icon_logging_page );
TQGridLayout *logLayout = new TQGridLayout( logFrame, 1, 1, 2, 2 );
m_loggingPage = new KMFGenericInterfaceLogging(logFrame,"m_loggingPage");
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_loggingPage, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_loggingPage, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_loggingPage, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_loggingPage, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
logLayout->addWidget( m_loggingPage,0,0 );
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
index 2d72826..7ebc013 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
@@ -49,39 +49,39 @@ KMFGenericInterfacePart::KMFGenericInterfacePart( TQWidget *parentWidget, const
}
m_genericinterface->loadDoc( m_app->network() );
- connect( m_genericinterface, TQT_SIGNAL( sigTargetChanged() ),
- this, TQT_SLOT( slotTargetChanged() ) );
+ connect( m_genericinterface, TQ_SIGNAL( sigTargetChanged() ),
+ this, TQ_SLOT( slotTargetChanged() ) );
- connect( m_app, TQT_SIGNAL( sigUpdateView() ),
- m_genericinterface, TQT_SIGNAL( sigUpdateView() ) );
+ connect( m_app, TQ_SIGNAL( sigUpdateView() ),
+ m_genericinterface, TQ_SIGNAL( sigUpdateView() ) );
- connect( m_app, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_genericinterface, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ) );
+ connect( m_app, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_genericinterface, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ) );
- connect( m_app, TQT_SIGNAL( sigEnableActions( bool ) ),
- this, TQT_SLOT( slotEnableActions( bool ) ) );
+ connect( m_app, TQ_SIGNAL( sigEnableActions( bool ) ),
+ this, TQ_SLOT( slotEnableActions( bool ) ) );
m_actionGoMyNetwork = new TDEAction( i18n( "&My Network" ), TQIconSet( BarIcon( "network", KMFGenericInterfacePartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotGoMyNetwork() ), actionCollection(), "my_network" );
+ 0 , this, TQ_SLOT( slotGoMyNetwork() ), actionCollection(), "my_network" );
m_actionGoAccessControl = new TDEAction( i18n( "&Access Control" ), TQIconSet( BarIcon( "services", KMFGenericInterfacePartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotGoAccessControl() ), actionCollection(), "access_control" );
+ 0 , this, TQ_SLOT( slotGoAccessControl() ), actionCollection(), "access_control" );
m_actionGoSpecialHosts = new TDEAction( i18n( "&Special Hosts Control" ), TQIconSet( BarIcon( "network_local", KMFGenericInterfacePartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotGoSpecialHosts() ), actionCollection(), "special_hosts" );
+ 0 , this, TQ_SLOT( slotGoSpecialHosts() ), actionCollection(), "special_hosts" );
m_actionGoICMPOptions = new TDEAction( i18n( "&ICMP Options" ), TQIconSet( BarIcon( "pipe", KMFGenericInterfacePartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotGoICMPOptions() ), actionCollection(), "icmp_options" );
+ 0 , this, TQ_SLOT( slotGoICMPOptions() ), actionCollection(), "icmp_options" );
m_actionGoNATConfiguration = new TDEAction( i18n( "&NAT Configuration" ), TQIconSet( BarIcon( "document-save-as", KMFGenericInterfacePartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotGoNATConfiguration() ), actionCollection(), "nat_configuration" );
+ 0 , this, TQ_SLOT( slotGoNATConfiguration() ), actionCollection(), "nat_configuration" );
m_actionGoLogging = new TDEAction( i18n( "&Logging" ), TQIconSet( BarIcon( "text-x-log", KMFGenericInterfacePartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotGoLogging() ), actionCollection(), "logging_options" );
+ 0 , this, TQ_SLOT( slotGoLogging() ), actionCollection(), "logging_options" );
setWidget( m_genericinterface );
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
index 7f21588..2ffb858 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
@@ -55,38 +55,38 @@ KMFGenericInterfaceHost::KMFGenericInterfaceHost( TQWidget *parent, const char *
m_contextMenu = new TDEPopupMenu( this, "Popup" );
m_contextMenu->hide();
loadIcons();
- connect( m_lv_zones, TQT_SIGNAL( pressed( TQListViewItem* ) ) ,
- this, TQT_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
- connect( m_lv_zones, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
- connect( m_lv_zones, TQT_SIGNAL( itemRenamed ( TQListViewItem *, int, const TQString & ) ) ,
- this, TQT_SLOT( slotHostRenamed( TQListViewItem*, int , const TQString & ) ) );
-
- connect( m_sb_host_1, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_host_2, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_host_3, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_host_4, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
-
- connect( m_host_desc, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( slotHostDescChanged() ) );
+ connect( m_lv_zones, TQ_SIGNAL( pressed( TQListViewItem* ) ) ,
+ this, TQ_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( itemRenamed ( TQListViewItem *, int, const TQString & ) ) ,
+ this, TQ_SLOT( slotHostRenamed( TQListViewItem*, int , const TQString & ) ) );
+
+ connect( m_sb_host_1, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_host_2, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_host_3, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_host_4, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+
+ connect( m_host_desc, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( slotHostDescChanged() ) );
- connect( c_log_in, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotLoggingChanged( bool ) ) );
- connect( c_log_out, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotLoggingChanged( bool ) ) );
+ connect( c_log_in, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotLoggingChanged( bool ) ) );
+ connect( c_log_out, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotLoggingChanged( bool ) ) );
b_newHost->setIconSet( icon_new );
b_delHost->setIconSet( icon_del );
- connect( b_newHost, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotNewHost() ) );
+ connect( b_newHost, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotNewHost() ) );
- connect( b_delHost, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotDelHost() ) );
+ connect( b_delHost, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotDelHost() ) );
}
@@ -383,7 +383,7 @@ void KMFGenericInterfaceHost::slotZoneRBM( TQListViewItem* item, const TQPoint&
TQString name = m_zone->name();
TQString lab_str = i18n("Special Host Type: %1").arg( m_zone->guiName() );
m_contextMenu->insertTitle( icon_chain, lab_str );
- m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQT_SLOT( slotNewHost() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQ_SLOT( slotNewHost() ) );
m_contextMenu->popup( point );
}
} else if ( kmfitem != 0 && kmfitem->type() == NetfilterObject::NETHOST ) {
@@ -396,10 +396,10 @@ void KMFGenericInterfaceHost::slotZoneRBM( TQListViewItem* item, const TQPoint&
TQString name = m_zone->name();
TQString lab_str = i18n("Special Host: %1").arg( m_host->guiName() );
m_contextMenu->insertTitle( icon_chain, lab_str );
- m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQT_SLOT( slotNewHost() ) );
- m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "New Host..." ), this, TQ_SLOT( slotNewHost() ) );
+ m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQ_SLOT( slotRenameHost() ) );
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_del, i18n( "Delete Host" ), this, TQT_SLOT( slotDelHost() ) );
+ m_contextMenu->insertItem( icon_del, i18n( "Delete Host" ), this, TQ_SLOT( slotDelHost() ) );
m_contextMenu->popup( point );
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp
index aa6341b..5080e15 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfaceicmp.cpp
@@ -37,10 +37,10 @@
namespace KMF {
KMFGenericInterfaceIcmp::KMFGenericInterfaceIcmp( TQWidget *parent, const char *name, WFlags f )
: KMyFirewallGenericInterfaceIcmp( parent, name, f ) {
-connect( c_allow_ping, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotEnablePingReplyToggled( bool ) ) );
-connect( c_limit_ping, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotEnablePingReplyLimitToggled( bool ) ) );
+connect( c_allow_ping, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotEnablePingReplyToggled( bool ) ) );
+connect( c_limit_ping, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotEnablePingReplyLimitToggled( bool ) ) );
}
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp
index fd2812f..ab55295 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacelogging.cpp
@@ -38,14 +38,14 @@
namespace KMF {
KMFGenericInterfaceLogging::KMFGenericInterfaceLogging( TQWidget *parent, const char *name, WFlags f )
: KMyFirewallGenericInterfaceLogging( parent, name, f ) {
- connect( m_c_log, TQT_SIGNAL( toggled( bool ) ),
- this,TQT_SLOT( slotLoggingChanged( bool ) ) );
+ connect( m_c_log, TQ_SIGNAL( toggled( bool ) ),
+ this,TQ_SLOT( slotLoggingChanged( bool ) ) );
- connect( m_c_limitLog, TQT_SIGNAL( toggled( bool ) ),
- this,TQT_SLOT( slotLimitChanged( bool ) ) );
+ connect( m_c_limitLog, TQ_SIGNAL( toggled( bool ) ),
+ this,TQ_SLOT( slotLimitChanged( bool ) ) );
- connect( m_le_logPrefix, TQT_SIGNAL( textChanged( const TQString & ) ),
- this,TQT_SLOT ( slotLogPrefixChanged( const TQString & ) ) );
+ connect( m_le_logPrefix, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this,TQ_SLOT ( slotLogPrefixChanged( const TQString & ) ) );
}
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp
index 59926b1..c9fb6e8 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp
@@ -46,23 +46,23 @@ namespace KMF {
KMFGenericInterfaceNat::KMFGenericInterfaceNat( TQWidget *parent, const char *name, WFlags f )
: KMyFirewallGenericInterfaceNATWidget( parent, name, f ) {
-connect( m_c_enable_nat, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotNatEnabled( bool ) ) );
-connect( m_c_use_masquerade, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotMasqueradeEnabled( bool ) ) );
-
-
-connect( m_sb_addr_1, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
-connect( m_sb_addr_2, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
-connect( m_sb_addr_3, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
-connect( m_sb_addr_4, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
-
-connect( m_cb_external_interface, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( slotExternalInterfaceChanged( const TQString& ) ) );
+connect( m_c_enable_nat, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotNatEnabled( bool ) ) );
+connect( m_c_use_masquerade, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotMasqueradeEnabled( bool ) ) );
+
+
+connect( m_sb_addr_1, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+connect( m_sb_addr_2, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+connect( m_sb_addr_3, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+connect( m_sb_addr_4, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+
+connect( m_cb_external_interface, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( slotExternalInterfaceChanged( const TQString& ) ) );
}
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
index 16acaa8..7d1c2c7 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
@@ -70,15 +70,15 @@ KMFGenericInterfaceProtocol::KMFGenericInterfaceProtocol( TQWidget *parent, cons
// Network Widget
m_network_widget = new KMFNetworkWidget( m_widgetStack, "m_network_widget" );
m_widgetStack->addWidget( m_network_widget );
- connect( m_network_widget,TQT_SIGNAL( sigZoneChanged( KMFNetZone* ) ),
- this,TQT_SLOT( slotZoneChanged( KMFNetZone* ) ) );
+ connect( m_network_widget,TQ_SIGNAL( sigZoneChanged( KMFNetZone* ) ),
+ this,TQ_SLOT( slotZoneChanged( KMFNetZone* ) ) );
// Host widget
m_nethostProperties_widget = new KMFNetHostPropertiesWidget( m_widgetStack, "m_nethostProperties_widget" );
m_widgetStack->addWidget( m_nethostProperties_widget );
- connect( m_nethostProperties_widget, TQT_SIGNAL( sigHostAddressChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_nethostProperties_widget, TQ_SIGNAL( sigHostAddressChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
// Protocol Widget
m_protocolProperties_widget = new KMFProtocolPropertiesWidget( m_widgetStack, "m_protocolProperties_widget" );
@@ -91,31 +91,31 @@ KMFGenericInterfaceProtocol::KMFGenericInterfaceProtocol( TQWidget *parent, cons
TQGridLayout *grid = new TQGridLayout( m_protocolsFrame, 1, 1 );
grid->addWidget( m_protocolLIstView, 0, 0 );
- connect( m_protocolLIstView,TQT_SIGNAL( sigProtocolClicked( KMFProtocolUsage*, bool ) ),
- this, TQT_SLOT( slotProtocolClicked( KMFProtocolUsage*, bool ) ) );
+ connect( m_protocolLIstView,TQ_SIGNAL( sigProtocolClicked( KMFProtocolUsage*, bool ) ),
+ this, TQ_SLOT( slotProtocolClicked( KMFProtocolUsage*, bool ) ) );
- connect( m_protocolLIstView,TQT_SIGNAL( sigProtocolCategoryClicked( KMFProtocolCategory* ) ),
- this, TQT_SLOT ( slotProtocolCategoryClicked( KMFProtocolCategory* ) ) );
+ connect( m_protocolLIstView,TQ_SIGNAL( sigProtocolCategoryClicked( KMFProtocolCategory* ) ),
+ this, TQ_SLOT ( slotProtocolCategoryClicked( KMFProtocolCategory* ) ) );
// Zone view
- connect( m_lv_zones, TQT_SIGNAL( pressed( TQListViewItem* ) ) ,
- this, TQT_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( pressed( TQListViewItem* ) ) ,
+ this, TQ_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
- connect( m_lv_zones, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
- connect( m_lv_zones, TQT_SIGNAL( itemRenamed ( TQListViewItem *, int, const TQString & ) ) ,
- this, TQT_SLOT( slotRenameItem( TQListViewItem *, int, const TQString & ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( itemRenamed ( TQListViewItem *, int, const TQString & ) ) ,
+ this, TQ_SLOT( slotRenameItem( TQListViewItem *, int, const TQString & ) ) );
// Main win
- connect( m_c_restrictOutgoing, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotRestrictionChanged() ) );
+ connect( m_c_restrictOutgoing, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotRestrictionChanged() ) );
- connect( m_c_allowIncoming, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotRestrictionChanged() ) );
+ connect( m_c_allowIncoming, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotRestrictionChanged() ) );
- connect( m_zoneSelect, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( slotCurrentZoneChanged( const TQString& ) ) );
+ connect( m_zoneSelect, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( slotCurrentZoneChanged( const TQString& ) ) );
m_zone = 0;
m_type = -1;
@@ -266,15 +266,15 @@ void KMFGenericInterfaceProtocol::slotZoneRBM( TQListViewItem* item, const TQPoi
TQString name = m_zone->name();
TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() );
m_contextMenu->insertTitle( icon_chain, lab_str );
- m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQ_SLOT( slotAddHost() ) );
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_new, i18n( "Add Zone..." ), this, TQT_SLOT( slotAddZone() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "Add Zone..." ), this, TQ_SLOT( slotAddZone() ) );
if ( m_zone->name() != "incoming_world" && m_zone->name() != "outgoing_world" ) {
- m_contextMenu->insertItem( icon_rename, i18n( "Rename Zone..." ), this, TQT_SLOT( slotRenameZone() ) );
+ m_contextMenu->insertItem( icon_rename, i18n( "Rename Zone..." ), this, TQ_SLOT( slotRenameZone() ) );
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_del, i18n( "Delete Zone" ), this, TQT_SLOT( slotDelZone() ) );
+ m_contextMenu->insertItem( icon_del, i18n( "Delete Zone" ), this, TQ_SLOT( slotDelZone() ) );
}
m_contextMenu->popup( point );
@@ -288,8 +288,8 @@ void KMFGenericInterfaceProtocol::slotZoneRBM( TQListViewItem* item, const TQPoi
TQString name = m_host->name();
TQString lab_str = i18n("Host: %1").arg( m_host->guiName() );
m_contextMenu->insertTitle( icon_chain, lab_str );
- m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) );
- m_contextMenu->insertItem( icon_rename, i18n( "Delete Host..." ), this, TQT_SLOT( slotDelHost() ) );
+ m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQ_SLOT( slotRenameHost() ) );
+ m_contextMenu->insertItem( icon_rename, i18n( "Delete Host..." ), this, TQ_SLOT( slotDelHost() ) );
m_contextMenu->popup( point );
}
}
diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp
index 8185c45..60c6492 100644
--- a/kmyfirewall/installer/kmfinstallerplugin.cpp
+++ b/kmyfirewall/installer/kmfinstallerplugin.cpp
@@ -74,28 +74,28 @@ KMFInstallerPlugin::KMFInstallerPlugin( TQObject *parent, const char *name )
// m_installerPlugin = 0;
m_execWidget = 0;
m_actionStopFw = new TDEAction( i18n( "&Reset IPTables" ), "decrypted",
- 0, this, TQT_SLOT( slotStopFirewall() ), actionCollection(), "reset_iptables" );
+ 0, this, TQ_SLOT( slotStopFirewall() ), actionCollection(), "reset_iptables" );
m_actionRunFw = new TDEAction( i18n( "Run Fir&ewall" ), "encrypted",
- 0, this, TQT_SLOT( slotStartFirewall() ), actionCollection(), "run_firewall" );
+ 0, this, TQ_SLOT( slotStartFirewall() ), actionCollection(), "run_firewall" );
m_actionPreviewScript = new TDEAction( i18n( "&Preview Script" ), "mime_txt",
- 0 , this, TQT_SLOT( slotShowScript() ), actionCollection(), "preview_script" );
+ 0 , this, TQ_SLOT( slotShowScript() ), actionCollection(), "preview_script" );
m_generateInstallPackage = new TDEAction( i18n( "&Generate Linux Installation Package" ), "fileexport",
- 0 , this, TQT_SLOT( slotGenerateInstallerPackage() ), actionCollection(), "generate_install_package" );
+ 0 , this, TQ_SLOT( slotGenerateInstallerPackage() ), actionCollection(), "generate_install_package" );
m_actionShowConfig = new TDEAction( i18n( "Show &All Tables" ), "messagebox_info",
- 0 , this, TQT_SLOT( slotShowConfig() ), actionCollection(), "show_ipt_config" );
+ 0 , this, TQ_SLOT( slotShowConfig() ), actionCollection(), "show_ipt_config" );
m_actionShowFilter = new TDEAction( i18n( "Show &Filter Table" ), "messagebox_info",
- 0 , this, TQT_SLOT( slotShowFilter() ), actionCollection(), "show_filter" );
+ 0 , this, TQ_SLOT( slotShowFilter() ), actionCollection(), "show_filter" );
m_actionShowNat = new TDEAction( i18n( "Show &Nat Table" ), "messagebox_info",
- 0 , this, TQT_SLOT( slotShowNat() ), actionCollection(), "show_nat" );
+ 0 , this, TQ_SLOT( slotShowNat() ), actionCollection(), "show_nat" );
m_actionShowMangle = new TDEAction( i18n( "Show &Mangle Table" ), "messagebox_info",
- 0 , this, TQT_SLOT( slotShowMangle() ), actionCollection(), "show_mangle" );
+ 0 , this, TQ_SLOT( slotShowMangle() ), actionCollection(), "show_mangle" );
m_actionMenu = new TDEActionMenu( i18n( "Show IPTables Configuration" ), "messagebox_info", this , "show_menu" );
@@ -108,15 +108,15 @@ KMFInstallerPlugin::KMFInstallerPlugin( TQObject *parent, const char *name )
actionCollection() ->insert( m_actionMenu );
m_actionInstallFW = new TDEAction( i18n( "&Install Firewall" ), "go-down",
- 0 , this, TQT_SLOT( slotInstallFW() ), actionCollection(), "install_firewall" );
+ 0 , this, TQ_SLOT( slotInstallFW() ), actionCollection(), "install_firewall" );
m_actionUninstallFW = new TDEAction( i18n( "&Uninstall Firewall" ), "go-up",
- 0 , this, TQT_SLOT( slotUninstallFW() ), actionCollection(), "uninstall_firewall" );
+ 0 , this, TQ_SLOT( slotUninstallFW() ), actionCollection(), "uninstall_firewall" );
setXMLFile( "kmfinstallerpluginui.rc" );
slotEnableActions( false );
- connect( app,TQT_SIGNAL( sigEnableActions( bool ) ),
- this, TQT_SLOT( slotEnableActions(bool ) ) );
+ connect( app,TQ_SIGNAL( sigEnableActions( bool ) ),
+ this, TQ_SLOT( slotEnableActions(bool ) ) );
kdDebug() << "KMFInstallerPlugin: Finished Initialisationn " << endl;
}
diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
index bed8920..c5c2acf 100644
--- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp
+++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp
@@ -114,8 +114,8 @@ KMFProcOut* KMFIPTInstaller::execWidget(){
}
kdDebug() << "Need to create new execWidget." << endl;
m_execWidget = new KMFProcOut( 0, "KMFProcOut" );
- connect( m_execWidget, TQT_SIGNAL( sigJobFinished( bool, const TQString& ) ),
- this, TQT_SLOT( slotJobFinished( bool, const TQString& ) ) );
+ connect( m_execWidget, TQ_SIGNAL( sigJobFinished( bool, const TQString& ) ),
+ this, TQ_SLOT( slotJobFinished( bool, const TQString& ) ) );
setOutputWidget( m_execWidget );
return m_execWidget;
}
diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
index 0320f31..491cf18 100644
--- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
+++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
@@ -128,8 +128,8 @@ KMFProcOut* KMFPFInstaller::execWidget(){
}
kdDebug() << "Need to create new execWidget." << endl;
m_execWidget = new KMFProcOut( 0, "KMFProcOut" );
- connect( m_execWidget, TQT_SIGNAL( sigJobFinished( bool, const TQString& ) ),
- this, TQT_SLOT( slotJobFinished( bool, const TQString& ) ) );
+ connect( m_execWidget, TQ_SIGNAL( sigJobFinished( bool, const TQString& ) ),
+ this, TQ_SLOT( slotJobFinished( bool, const TQString& ) ) );
setOutputWidget( m_execWidget );
return m_execWidget;
}
diff --git a/kmyfirewall/ipteditor/kmfchainedit.cpp b/kmyfirewall/ipteditor/kmfchainedit.cpp
index 4a129b2..100537e 100644
--- a/kmyfirewall/ipteditor/kmfchainedit.cpp
+++ b/kmyfirewall/ipteditor/kmfchainedit.cpp
@@ -118,7 +118,7 @@ void KMFChainEdit::loadChain( IPTChain* chain ) {
} else {
c_has_default_target->setEnabled( true );
c_has_default_target->setChecked( false );
- connect( c_has_default_target, TQT_SIGNAL( toggled( bool ) ), cb_target, TQT_SLOT( setEnabled( bool ) ) );
+ connect( c_has_default_target, TQ_SIGNAL( toggled( bool ) ), cb_target, TQ_SLOT( setEnabled( bool ) ) );
cb_target->clear();
cb_target->insertItem( "ACCEPT" );
cb_target->insertItem( "DROP" );
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
index 979a33e..b1df56d 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
@@ -65,44 +65,44 @@ KMFIPTEditorPart::KMFIPTEditorPart( TQWidget *parentWidget, const char *widgetNa
m_ruleedit->loadDoc( app->network() );
m_editdoc->loadDoc( app->network()->currentDocAsIPTDoc() );
- connect( app, TQT_SIGNAL( sigUpdateView() ),
- m_ruleedit, TQT_SLOT( slotUpdateView() ) );
+ connect( app, TQ_SIGNAL( sigUpdateView() ),
+ m_ruleedit, TQ_SLOT( slotUpdateView() ) );
- connect( app, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_ruleedit, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ) );
+ connect( app, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_ruleedit, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ) );
- connect( app, TQT_SIGNAL( sigEnableActions( bool ) ),
- this, TQT_SLOT( slotEnableActions( bool ) ) );
+ connect( app, TQ_SIGNAL( sigEnableActions( bool ) ),
+ this, TQ_SLOT( slotEnableActions( bool ) ) );
- connect ( m_editdoc, TQT_SIGNAL( sigConfigChanged() ),
- m_ruleedit, TQT_SLOT( slotUpdateView() ) );
+ connect ( m_editdoc, TQ_SIGNAL( sigConfigChanged() ),
+ m_ruleedit, TQ_SLOT( slotUpdateView() ) );
// notify the part that this is our internal widget
setWidget( m_ruleedit );
m_actionEditChain = new TDEAction( i18n( "&Edit Chain" ), TQIconSet( BarIcon( "configure_toolbars", KMFIPTEditorPartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotEditChain() ), actionCollection(), "edit_chain" );
+ 0 , this, TQ_SLOT( slotEditChain() ), actionCollection(), "edit_chain" );
m_actionNewChain = new TDEAction( i18n( "Add New Chain..." ), TQIconSet( BarIcon( "view_tree", KMFIPTEditorPartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotNewChain() ), actionCollection(), "new_chain" );
+ 0 , this, TQ_SLOT( slotNewChain() ), actionCollection(), "new_chain" );
m_actionDelChain = new TDEAction( i18n( "Delete Chain" ), TQIconSet( BarIcon( "edit-delete", KMFIPTEditorPartFactory::instance() ) ),
- 0 , this, TQT_SLOT( slotDelChain() ), actionCollection(), "del_chain" );
+ 0 , this, TQ_SLOT( slotDelChain() ), actionCollection(), "del_chain" );
m_actionNewRule = new TDEAction( i18n( "Add New Rule..." ), TQIconSet( TDEGlobal:: iconLoader()->loadIcon( "rule", TDEIcon::Toolbar ) ) ,
- TDEStdAccel::shortcut(TDEStdAccel::New) , this, TQT_SLOT( slotNewRule() ), actionCollection(), "new_rule" );
+ TDEStdAccel::shortcut(TDEStdAccel::New) , this, TQ_SLOT( slotNewRule() ), actionCollection(), "new_rule" );
// m_actionNewRule->setIconSet( TQIconSet( loader->loadIcon( "rule-22", TDEIcon::User ) ) );
m_actionDelRule = new TDEAction( i18n( "Delete Rule" ), TQIconSet( BarIcon( "edit-delete", KMFIPTEditorPartFactory::instance() ) ),
- TDEStdAccel::shortcut(TDEStdAccel::DeleteWordBack), this, TQT_SLOT( slotDelRule() ), actionCollection(), "del_rule" );
+ TDEStdAccel::shortcut(TDEStdAccel::DeleteWordBack), this, TQ_SLOT( slotDelRule() ), actionCollection(), "del_rule" );
- m_actionEditDocOptions = new TDEAction( i18n( "&Configure Firewall Options..." ), "configure", 0 , this, TQT_SLOT( slotEditDocOptions() ),
+ m_actionEditDocOptions = new TDEAction( i18n( "&Configure Firewall Options..." ), "configure", 0 , this, TQ_SLOT( slotEditDocOptions() ),
actionCollection(), "edit_doc_options" );
- m_actionEditNetwork = new TDEAction( i18n( "&Configure the Network" ), TQIconSet( BarIcon( "configure_toolbars", KMFIPTEditorPartFactory::instance() ) ), 0 , this, TQT_SLOT( slotEditNetwork() ),
+ m_actionEditNetwork = new TDEAction( i18n( "&Configure the Network" ), TQIconSet( BarIcon( "configure_toolbars", KMFIPTEditorPartFactory::instance() ) ), 0 , this, TQ_SLOT( slotEditNetwork() ),
actionCollection(), "edit_network" );
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index dbdc6ca..47b7054 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -92,22 +92,22 @@ KMFRuleEdit::KMFRuleEdit( TQWidget* parent, const char* name, WFlags fl )
m_err = new KMFError();
m_err_handler = new KMFErrorHandler( "KMFRuleEdit" );
kb_optSelect->clear();
- connect( kb_optSelect, TQT_SIGNAL( activated( int ) ) , this, TQT_SLOT( slotNewOptionType( int ) ) );
+ connect( kb_optSelect, TQ_SIGNAL( activated( int ) ) , this, TQ_SLOT( slotNewOptionType( int ) ) );
m_lv_table_filter = new KMFListView( m_widgetStack, "m_lv_table_filter" );
m_lv_table_filter->show();
- connect( m_lv_table_filter, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotRuleRBM( TQListViewItem*, const TQPoint&, int ) ) );
+ connect( m_lv_table_filter, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotRuleRBM( TQListViewItem*, const TQPoint&, int ) ) );
- connect( m_lv_table_filter, TQT_SIGNAL( itemRenamed ( TQListViewItem*, int, const TQString& ) ),
- this, TQT_SLOT( slotRenameRule( TQListViewItem*, int, const TQString& ) ) );
+ connect( m_lv_table_filter, TQ_SIGNAL( itemRenamed ( TQListViewItem*, int, const TQString& ) ),
+ this, TQ_SLOT( slotRenameRule( TQListViewItem*, int, const TQString& ) ) );
- connect( m_lv_table_filter, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- this, TQT_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
+ connect( m_lv_table_filter, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ this, TQ_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
-// connect( this, TQT_SIGNAL( sigUpdateView() ),
-// m_lv_table_filter, TQT_SLOT( slotUpdateView() ) );
+// connect( this, TQ_SIGNAL( sigUpdateView() ),
+// m_lv_table_filter, TQ_SLOT( slotUpdateView() ) );
m_widgetStack->addWidget( m_lv_table_filter );
@@ -115,28 +115,28 @@ KMFRuleEdit::KMFRuleEdit( TQWidget* parent, const char* name, WFlags fl )
m_lv_table_nat = new KMFListView( m_widgetStack, "m_lv_table_nat" );
m_lv_table_nat->show();
- connect( m_lv_table_nat, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotRuleRBM( TQListViewItem*, const TQPoint&, int ) ) );
+ connect( m_lv_table_nat, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotRuleRBM( TQListViewItem*, const TQPoint&, int ) ) );
- connect( m_lv_table_nat, TQT_SIGNAL( itemRenamed ( TQListViewItem*, int, const TQString& ) ),
- this, TQT_SLOT( slotRenameRule( TQListViewItem*, int, const TQString& ) ) );
+ connect( m_lv_table_nat, TQ_SIGNAL( itemRenamed ( TQListViewItem*, int, const TQString& ) ),
+ this, TQ_SLOT( slotRenameRule( TQListViewItem*, int, const TQString& ) ) );
- connect( m_lv_table_nat, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- this, TQT_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
+ connect( m_lv_table_nat, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ this, TQ_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
m_widgetStack->addWidget( m_lv_table_nat );
m_lv_table_mangle = new KMFListView( m_widgetStack, "m_lv_table_mangle" );
m_lv_table_mangle->show();
- connect( m_lv_table_mangle, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotRuleRBM( TQListViewItem*, const TQPoint&, int ) ) );
+ connect( m_lv_table_mangle, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotRuleRBM( TQListViewItem*, const TQPoint&, int ) ) );
- connect( m_lv_table_mangle, TQT_SIGNAL( itemRenamed ( TQListViewItem*, int, const TQString& ) ),
- this, TQT_SLOT( slotRenameRule( TQListViewItem*, int, const TQString& ) ) );
+ connect( m_lv_table_mangle, TQ_SIGNAL( itemRenamed ( TQListViewItem*, int, const TQString& ) ),
+ this, TQ_SLOT( slotRenameRule( TQListViewItem*, int, const TQString& ) ) );
- connect( m_lv_table_mangle, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- this, TQT_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
+ connect( m_lv_table_mangle, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ this, TQ_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
@@ -146,37 +146,37 @@ KMFRuleEdit::KMFRuleEdit( TQWidget* parent, const char* name, WFlags fl )
m_editchain = new KMFChainEdit( this, "chianditor", 0 );
kdDebug() << "CONNECTING CHAINEDITOR" << endl;
- connect( m_editchain, TQT_SIGNAL( sigHideMe() ),
- this, TQT_SLOT( slotShowOverview() ) );
+ connect( m_editchain, TQ_SIGNAL( sigHideMe() ),
+ this, TQ_SLOT( slotShowOverview() ) );
m_widgetStack->addWidget( m_editchain );
m_object_info = new KMFObjectInfo( this, "rule info" );
- connect( m_object_info, TQT_SIGNAL( sigHideMe() ),
- this, TQT_SLOT( slotShowOverview() ) );
+ connect( m_object_info, TQ_SIGNAL( sigHideMe() ),
+ this, TQ_SLOT( slotShowOverview() ) );
m_widgetStack->addWidget( m_object_info );
m_new_chain = new KMFNewChainDlg();
- connect( m_new_chain, TQT_SIGNAL( sigUpdateView() ),
- this, TQT_SIGNAL( sigUpdateView() ) );
+ connect( m_new_chain, TQ_SIGNAL( sigUpdateView() ),
+ this, TQ_SIGNAL( sigUpdateView() ) );
m_myNetworkWidget = new KMFMyNetworkWidget( this, "KMFMyNetworkWidget" );
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_myNetworkWidget, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_myNetworkWidget, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_myNetworkWidget, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_myNetworkWidget, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
- connect( m_myNetworkWidget, TQT_SIGNAL( sigActiveTargetChanged() ), this, TQT_SLOT( slotUpdateView() ) );
+ connect( m_myNetworkWidget, TQ_SIGNAL( sigActiveTargetChanged() ), this, TQ_SLOT( slotUpdateView() ) );
m_myNetworkWidget->hide(); //close( false );
m_check_input = new KMFCheckInput();
m_contextMenu = new TDEPopupMenu( this );
- connect( cb_log_rule, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotLogRuleChanged() ) );
- connect( cb_disable_rule, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotEnableRuleChanged() ) );
+ connect( cb_log_rule, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotLogRuleChanged() ) );
+ connect( cb_disable_rule, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotEnableRuleChanged() ) );
rb_filter->setChecked( true );
loadPlugins();
@@ -406,91 +406,91 @@ void KMFRuleEdit::setCurrTableView( KMFListView* lv ) {
setEnabled( true );
kdDebug() << "Enabling Filter View" << endl;
m_lv_table_filter->setEnabled( true );
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_filter, TQT_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_filter, TQ_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_filter, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_filter, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
kdDebug() << "Disabling Nat View" << endl;
m_lv_table_nat->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_nat, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_nat, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_nat, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_nat, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
kdDebug() << "Disabling Mangle View" << endl;
m_lv_table_mangle->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
} else if ( lv == m_lv_table_nat ) {
setEnabled( true );
kdDebug() << "Disabling Filter View" << endl;
m_lv_table_filter->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_filter, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_filter, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_filter, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_filter, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
kdDebug() << "Enabling Nat View" << endl;
m_lv_table_nat->setEnabled( true );
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_nat, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_nat, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_nat, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_nat, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
kdDebug() << "Disabling Mangle View" << endl;
m_lv_table_mangle->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
} else if ( lv == m_lv_table_mangle ) {
setEnabled( true );
kdDebug() << "Disabling Filter View" << endl;
m_lv_table_filter->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_filter, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_filter, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_filter, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_filter, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
kdDebug() << "Disabling Nat View" << endl;
m_lv_table_nat->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
kdDebug() << "Enabling Mangle View" << endl;
m_lv_table_mangle->setEnabled( true );
- connect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView() ) );
- connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView() ) );
+ connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
} else if ( ! lv ){
kdDebug() << "Disabling Filter View" << endl;
m_lv_table_filter->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_filter, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_filter, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_filter, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_filter, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
kdDebug() << "Disabling Nat View" << endl;
m_lv_table_nat->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
kdDebug() << "Disabling Mangle View" << endl;
m_lv_table_mangle->setEnabled( false );
- disconnect( this, TQT_SIGNAL( sigUpdateView() ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView() ) );
- disconnect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
- m_lv_table_mangle, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView() ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView() ) );
+ disconnect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+ m_lv_table_mangle, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
}
}
@@ -967,7 +967,7 @@ void KMFRuleEdit::slotEditNetwork() {
// KMFMyNetworkWidget *wid = new KMFMyNetworkWidget( this, "name" );
// wid->setNetwork( m_network );
// wid->slotUpdateView();
-/* connect( wid, TQT_SIGNAL( sigActiveTargetChanged() ), this, TQT_SLOT( slotUpdateView() ) );*/
+/* connect( wid, TQ_SIGNAL( sigActiveTargetChanged() ), this, TQ_SLOT( slotUpdateView() ) );*/
m_myNetworkWidget->slotUpdateView();
m_app->setOutputWidget( m_myNetworkWidget );
m_app->showOutput();
@@ -1156,7 +1156,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
TQString lab_str = i18n("Table: %1").arg( name );
m_contextMenu->insertTitle( lab_str );
- m_contextMenu->insertItem( icon_new, i18n( "Add Chain..." ), this, TQT_SLOT( slotAddChain() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "Add Chain..." ), this, TQ_SLOT( slotAddChain() ) );
}
break;
case NetfilterObject::CHAIN:
@@ -1166,14 +1166,14 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
TQString lab_str = i18n("Chain: %1").arg( name );
m_contextMenu->insertTitle( icon_chain, lab_str );
- m_contextMenu->insertItem( icon_new, i18n( "Add Rule..." ), this, TQT_SLOT( slotAddRule() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "Add Rule..." ), this, TQ_SLOT( slotAddRule() ) );
m_contextMenu->insertSeparator();
if ( ! chain->isBuildIn() )
- m_contextMenu->insertItem( icon_edit, i18n( "Chain Documentation" ), this, TQT_SLOT( slotEditChainInfo() ) );
- m_contextMenu->insertItem( icon_new, i18n( "Add Chain..." ), this, TQT_SLOT( slotAddChain() ) );
- m_contextMenu->insertItem( icon_edit, i18n( "Edit Chain" ), this, TQT_SLOT( slotEditChain() ) );
+ m_contextMenu->insertItem( icon_edit, i18n( "Chain Documentation" ), this, TQ_SLOT( slotEditChainInfo() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "Add Chain..." ), this, TQ_SLOT( slotAddChain() ) );
+ m_contextMenu->insertItem( icon_edit, i18n( "Edit Chain" ), this, TQ_SLOT( slotEditChain() ) );
if ( ! chain->isBuildIn() )
- m_contextMenu->insertItem( icon_del, i18n( "Delete Chain" ), this, TQT_SLOT( slotDelChain() ) );
+ m_contextMenu->insertItem( icon_del, i18n( "Delete Chain" ), this, TQ_SLOT( slotDelChain() ) );
}
case NetfilterObject::RULE:
if ( IPTRule* rule = dynamic_cast<IPTRule*> ( obj ) ) {
@@ -1187,26 +1187,26 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
for( uint i = 0; i < m_editPlugins.count(); i++ ) {
sub_edit->insertItem( icon_edit, i18n( "Edit %1" ).arg(m_editPlugins.at(i)->optionEditName() ), i );
}
- connect( sub_edit,TQT_SIGNAL(activated( int ) ),
- this,TQT_SLOT(slotNewOptionType( int ) ) );
+ connect( sub_edit,TQ_SIGNAL(activated( int ) ),
+ this,TQ_SLOT(slotNewOptionType( int ) ) );
m_contextMenu->insertItem( i18n( "Edit Rule Option" ), sub_edit );
- // m_contextMenu->insertItem( icon_new, i18n( "Add Rule..." ), this, TQT_SLOT( slotAddRule() ) );
- m_contextMenu->insertItem( icon_new, i18n( "Insert Rule..." ), this, TQT_SLOT( slotAddRule() ) );
+ // m_contextMenu->insertItem( icon_new, i18n( "Add Rule..." ), this, TQ_SLOT( slotAddRule() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "Insert Rule..." ), this, TQ_SLOT( slotAddRule() ) );
// m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_del, i18n( "Delete Rule" ), this, TQT_SLOT( slotDelRule() ) );
+ m_contextMenu->insertItem( icon_del, i18n( "Delete Rule" ), this, TQ_SLOT( slotDelRule() ) );
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_rename, i18n( "Rename Rule" ), this, TQT_SLOT( slotRenameRule() ) );
- m_contextMenu->insertItem( icon_edit, i18n( "Rule Documentation" ), this, TQT_SLOT( slotEditRuleInfo() ) );
- m_contextMenu->insertItem( icon_up, i18n( "Move Up" ), this, TQT_SLOT( slotMoveRuleUp() ) );
- m_contextMenu->insertItem( icon_down, i18n( "Move Down" ), this, TQT_SLOT( slotMoveRuleDown() ) );
+ m_contextMenu->insertItem( icon_rename, i18n( "Rename Rule" ), this, TQ_SLOT( slotRenameRule() ) );
+ m_contextMenu->insertItem( icon_edit, i18n( "Rule Documentation" ), this, TQ_SLOT( slotEditRuleInfo() ) );
+ m_contextMenu->insertItem( icon_up, i18n( "Move Up" ), this, TQ_SLOT( slotMoveRuleUp() ) );
+ m_contextMenu->insertItem( icon_down, i18n( "Move Down" ), this, TQ_SLOT( slotMoveRuleDown() ) );
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_edit, i18n( "Edit Chain" ), this, TQT_SLOT( slotEditChain() ) );
+ m_contextMenu->insertItem( icon_edit, i18n( "Edit Chain" ), this, TQ_SLOT( slotEditChain() ) );
if ( ! rule->chain()->isBuildIn() )
- m_contextMenu->insertItem( icon_del, i18n( "Delete Chain" ), this, TQT_SLOT( slotDelChain() ) );
+ m_contextMenu->insertItem( icon_del, i18n( "Delete Chain" ), this, TQ_SLOT( slotDelChain() ) );
m_contextMenu->insertSeparator();
TDEPopupMenu *sub_copy = new TDEPopupMenu( m_contextMenu );
- connect( sub_copy, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotCopyRule( int ) ) );
+ connect( sub_copy, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotCopyRule( int ) ) );
sub_copy->insertTitle( i18n( "Copy to Chain" ) );
TQPtrList<IPTChain> chains = m_table ->chains();
for ( uint i = 0; i < chains.count(); i++ ) {
@@ -1216,7 +1216,7 @@ void KMFRuleEdit::createRBM( NetfilterObject* obj ) {
m_contextMenu->insertItem( icon_copy, i18n( "Copy Rule" ), sub_copy );
TDEPopupMenu *sub_move = new TDEPopupMenu( m_contextMenu );
- connect( sub_move, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotMoveRule( int ) ) );
+ connect( sub_move, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotMoveRule( int ) ) );
sub_move->insertTitle( i18n( "Move to Chain" ) );
TQPtrList<IPTChain> chains2 = m_table->chains();
for ( uint i = 0; i < chains2.count(); i++ ) {
diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp
index 89db8ba..4dedaea 100644
--- a/kmyfirewall/kmfconfigdialog.cpp
+++ b/kmyfirewall/kmfconfigdialog.cpp
@@ -180,20 +180,20 @@ void KMFConfigDialog::setupGeneral() {
/*TQLabel *text1 = */new TQLabel( i18n( "<qt>By using the Generic Interface the creation of rulesets is much easier but it is not as flexible as the Normal Interface.</qt>" ), gb_generic );
m_cb_generic_interface = new TQCheckBox( i18n( "Use the Generic Interface" ), gb_generic );
m_cb_generic_interface->setChecked( KMFConfig::useGenericInterface() );
- connect( m_cb_generic_interface, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotEnableGenericInterface( bool ) ) );
+ connect( m_cb_generic_interface, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotEnableGenericInterface( bool ) ) );
TQLabel *text2 = new TQLabel( i18n( "<qt>Max. stored Undos:</qt>" ), page );
m_sb_max_undo = new KIntSpinBox( 0, 100, 1, 10, 10, page, "spin_box" );
m_sb_max_undo->setValue( 10 );
m_b_enable_warnings = new KPushButton( i18n( "Reenable All Messages" ), page );
m_b_enable_warnings->setFixedHeight( 30 );
- connect( m_b_enable_warnings, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEnableWarnings() ) );
+ connect( m_b_enable_warnings, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEnableWarnings() ) );
TQLabel *text3 = new TQLabel( i18n( "<qt>By enabling KMyFirewall will communicate with the local computer using SSH. This will enable password keeping (e.g. TDEWallet support).</qt>" ), page );
m_cb_useSSHForLocalhost = new TQCheckBox( i18n( "Use SSH for localhost communication" ), page );
m_cb_useSSHForLocalhost->setChecked( KMFConfig::useSSHForLocalhost() );
- // connect( m_cb_useSSHForLocalhost, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEnableLocalSSHUsage( bool ) ) );
+ // connect( m_cb_useSSHForLocalhost, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEnableLocalSSHUsage( bool ) ) );
lay->addMultiCellWidget( gb_generic, 0, 0, 0, 1 );
diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
index 295e4f2..b754965 100644
--- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
+++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp
@@ -50,7 +50,7 @@ KMFCheckListOutput::KMFCheckListOutput( TQWidget *parent, const char *name , boo
l_prog -> addMultiCellWidget( mlb_outputView, 1, 3, 0, 2 );
- connect( mpb_ok, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( hide() ) );
+ connect( mpb_ok, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( hide() ) );
m_currItem = new TQListViewItem( mlb_outputView );
m_currItem->setText( 0, i18n( "Starting system scan..." ) );
loadIcons();
diff --git a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
index d41c9fa..ea58e4d 100644
--- a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
+++ b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp
@@ -32,9 +32,9 @@
namespace KMF {
KMFDocumentInfo::KMFDocumentInfo(TQWidget* parent, const char* name, bool modal, WFlags fl)
: KMyFirewallDocumentInfo(parent,name, modal,fl) {
- connect( b_help, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotHelp() ) );
- connect( b_saveAsTemplate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveAsTemplate() ) );
+ connect( b_help, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotHelp() ) );
+ connect( b_saveAsTemplate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSaveAsTemplate() ) );
}
diff --git a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
index 12a6635..102aefc 100644
--- a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
+++ b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
@@ -74,27 +74,27 @@ KMFGenericInterfaceEditProtocol::KMFGenericInterfaceEditProtocol( TQWidget *pare
// m_protocolsLoaded = false;
// m_protocols.clear();
- connect( m_lv_protocols, TQT_SIGNAL( pressed( TQListViewItem* ) ) ,
- this, TQT_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
+ connect( m_lv_protocols, TQ_SIGNAL( pressed( TQListViewItem* ) ) ,
+ this, TQ_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
- connect( m_lb_tcpPorts, TQT_SIGNAL( currentChanged ( TQListBoxItem * ) ), this, TQT_SLOT( slotCurrentTCPPortChanged( TQListBoxItem * ) ) );
+ connect( m_lb_tcpPorts, TQ_SIGNAL( currentChanged ( TQListBoxItem * ) ), this, TQ_SLOT( slotCurrentTCPPortChanged( TQListBoxItem * ) ) );
- connect( m_lb_udpPorts, TQT_SIGNAL( currentChanged ( TQListBoxItem * ) ), this, TQT_SLOT( slotCurrentUDPPortChanged( TQListBoxItem * ) ) );
+ connect( m_lb_udpPorts, TQ_SIGNAL( currentChanged ( TQListBoxItem * ) ), this, TQ_SLOT( slotCurrentUDPPortChanged( TQListBoxItem * ) ) );
- // connect( m_sb_port_num, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotPortVauleChanged( int ) ) );
+ // connect( m_sb_port_num, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotPortVauleChanged( int ) ) );
- connect( m_te_desc, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotNameDescritionChanged() ) );
- connect( m_le_protocolName , TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotNameDescritionChanged() ) );
- connect( m_rb_tcp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotProtocolTypeChanged() ) );
- connect( m_rb_udp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotProtocolTypeChanged() ) );
+ connect( m_te_desc, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotNameDescritionChanged() ) );
+ connect( m_le_protocolName , TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotNameDescritionChanged() ) );
+ connect( m_rb_tcp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotProtocolTypeChanged() ) );
+ connect( m_rb_udp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotProtocolTypeChanged() ) );
- connect( m_b_add_port, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddPort() ) );
- connect( m_b_del_port, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelPort() ) );
+ connect( m_b_add_port, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddPort() ) );
+ connect( m_b_del_port, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelPort() ) );
- connect( m_b_new_protocol, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddProtocol() ) );
- connect( m_b_del_protocol, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelProtocol() ) );
+ connect( m_b_new_protocol, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddProtocol() ) );
+ connect( m_b_del_protocol, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelProtocol() ) );
- connect( m_cb_showAll,TQT_SIGNAL( toggled( bool ) ), this , TQT_SLOT( slotUpdateView() ) );
+ connect( m_cb_showAll,TQ_SIGNAL( toggled( bool ) ), this , TQ_SLOT( slotUpdateView() ) );
}
@@ -425,10 +425,10 @@ void KMFGenericInterfaceEditProtocol::slotUpdateView() {
TQValueList< KMFProtocol* >::iterator it;
for( it = prots.begin(); it != prots.end(); ++it ) {
KMFProtocol* p= *it;
- disconnect( p, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolDeleleted( TQObject* ) ) );
- connect( p, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolDeleleted( TQObject* ) ) );
+ disconnect( p, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolDeleleted( TQObject* ) ) );
+ connect( p, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolDeleleted( TQObject* ) ) );
}
setEnabled( true );
diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
index 44c54e4..3dfe735 100644
--- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
@@ -48,31 +48,31 @@ KMFHostWidget::KMFHostWidget(TQWidget* parent, const char* name, WFlags fl )
: KMyFirewallHostWidget(parent, name, fl )
{
kdDebug() << "KMFHostWidget::KMFHostWidget(TQWidget* parent, const char* name, WFlags fl)" << endl;
- connect( m_sb_host_0, TQT_SIGNAL( valueChanged ( int ) ),
- this, TQT_SLOT( slotAddressChanged( int ) ) );
- connect( m_sb_host_1, TQT_SIGNAL( valueChanged ( int ) ),
- this, TQT_SLOT( slotAddressChanged( int ) ) );
- connect( m_sb_host_2, TQT_SIGNAL( valueChanged ( int ) ),
- this, TQT_SLOT( slotAddressChanged( int ) ) );
- connect( m_sb_host_3, TQT_SIGNAL( valueChanged ( int ) ),
- this, TQT_SLOT( slotAddressChanged( int ) ) );
+ connect( m_sb_host_0, TQ_SIGNAL( valueChanged ( int ) ),
+ this, TQ_SLOT( slotAddressChanged( int ) ) );
+ connect( m_sb_host_1, TQ_SIGNAL( valueChanged ( int ) ),
+ this, TQ_SLOT( slotAddressChanged( int ) ) );
+ connect( m_sb_host_2, TQ_SIGNAL( valueChanged ( int ) ),
+ this, TQ_SLOT( slotAddressChanged( int ) ) );
+ connect( m_sb_host_3, TQ_SIGNAL( valueChanged ( int ) ),
+ this, TQ_SLOT( slotAddressChanged( int ) ) );
- connect( m_sb_host_sshPort, TQT_SIGNAL( valueChanged ( int ) ),
- this, TQT_SLOT( slotSSHPortChanged( int ) ) );
+ connect( m_sb_host_sshPort, TQ_SIGNAL( valueChanged ( int ) ),
+ this, TQ_SLOT( slotSSHPortChanged( int ) ) );
- connect( m_cb_backend, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( slotBackaendChanged( const TQString& ) ) );
- connect( m_cb_os, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( slotOSChanged( const TQString& ) ) );
+ connect( m_cb_backend, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( slotBackaendChanged( const TQString& ) ) );
+ connect( m_cb_os, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( slotOSChanged( const TQString& ) ) );
- connect( m_host_desc, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( slotDescriptionChanged() ) );
+ connect( m_host_desc, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( slotDescriptionChanged() ) );
- connect( m_cmd_testSSH, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotTestConnection() ) );
- connect( m_cmd_autoConf, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotTryAutoConfiguration() ) );
+ connect( m_cmd_testSSH, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotTestConnection() ) );
+ connect( m_cmd_autoConf, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotTryAutoConfiguration() ) );
}
KMFHostWidget::~KMFHostWidget()
@@ -267,8 +267,8 @@ void KMFHostWidget::slotTryAutoConfiguration(){
}
void KMFHostWidget::slotTryAutoConfiguration_Callback( KMFTarget* ) {
- disconnect( m_target, TQT_SIGNAL( sigTargetChanged( KMFTarget* ) ),
- this,TQT_SLOT( slotTryAutoConfiguration_Callback( KMFTarget* ) ) );
+ disconnect( m_target, TQ_SIGNAL( sigTargetChanged( KMFTarget* ) ),
+ this,TQ_SLOT( slotTryAutoConfiguration_Callback( KMFTarget* ) ) );
if ( ! m_target->config()->isValid() ) {
KMessageBox::error( 0, i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").arg( m_target->toFriendlyString() ) );
} else {
diff --git a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
index 6c30c26..7363cf7 100644
--- a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
@@ -40,8 +40,8 @@
namespace KMF {
KMFInterfaceWidget::KMFInterfaceWidget( TQWidget* parent, const char* name, WFlags fl )
: KMyFirewallInterfaceWidget( parent, name, fl ) {
- connect( m_b_add_int, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddInterface() ) );
- connect( m_b_del_int, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelInterface() ) );
+ connect( m_b_add_int, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddInterface() ) );
+ connect( m_b_del_int, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelInterface() ) );
m_cb_int_name->clear();
m_cb_int_name->insertItem( "eth" );
diff --git a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
index 6e70d11..083226b 100644
--- a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
@@ -43,14 +43,14 @@ KMFIPv4AddressWidget::KMFIPv4AddressWidget ( TQWidget* parent, const char* name,
: KMyFirewallIPv4AdddressWidget ( parent,name,fl ) {
// m_address = new IPAddress( 0,0,0,0 );
- connect( m_sb_from_1, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_from_2, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_from_3, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_from_4, TQT_SIGNAL( valueChanged( const TQString& ) ),
- this, TQT_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_from_1, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_from_2, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_from_3, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_from_4, TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this, TQ_SLOT( slotAddressChanged( const TQString& ) ) );
}
KMFIPv4AddressWidget::~KMFIPv4AddressWidget() {}
diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp
index 467b8b2..c11b2ae 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistview.cpp
@@ -41,8 +41,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
namespace KMF {
KMFListView::KMFListView( TQWidget *parent, const char *name ) : TDEListView( parent, name ) {
loadIcons();
- connect( this, TQT_SIGNAL( sigLoadNode( NetfilterObject* ) ),
- this, TQT_SLOT( slotLoadNode( NetfilterObject* ) ) );
+ connect( this, TQ_SIGNAL( sigLoadNode( NetfilterObject* ) ),
+ this, TQ_SLOT( slotLoadNode( NetfilterObject* ) ) );
cast_error = i18n( "ERROR: Wrong ListViewItem Class used!\nThis is no KMFListViewItem" );
setSorting(0,true);
m_show_desc = true;
diff --git a/kmyfirewall/kmfwidgets/kmfmultiportwidget.cpp b/kmyfirewall/kmfwidgets/kmfmultiportwidget.cpp
index 2fa5ff0..b46b1b1 100644
--- a/kmyfirewall/kmfwidgets/kmfmultiportwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmultiportwidget.cpp
@@ -30,9 +30,9 @@ KMFMultiPortWidget::KMFMultiPortWidget( TQWidget *parent, const char *name ) : K
m_err = new KMFError();
m_err->setErrType( KMFError::OK );
lb_ports->clear();
- connect( b_add, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addPort() ) );
- connect( b_remove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removePort() ) );
- connect( c_use_multiport, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( sigMultiPortChanged( bool ) ) );
+ connect( b_add, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addPort() ) );
+ connect( b_remove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removePort() ) );
+ connect( c_use_multiport, TQ_SIGNAL( toggled( bool ) ), this, TQ_SIGNAL( sigMultiPortChanged( bool ) ) );
}
KMFMultiPortWidget::~KMFMultiPortWidget() {}
diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
index 856609a..53f442b 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
@@ -54,14 +54,14 @@ KMFMyNetworkWidget::KMFMyNetworkWidget(TQWidget* parent, const char* name, WFlag
m_network = 0;
m_contextMenu = new TDEPopupMenu( this, "m_contextMenu" );
- connect( m_lv_zones, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
- connect( m_lv_zones, TQT_SIGNAL( pressed( TQListViewItem* ) ) ,
- this, TQT_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( pressed( TQListViewItem* ) ) ,
+ this, TQ_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
- connect( m_lv_zones, TQT_SIGNAL( itemRenamed ( TQListViewItem *, int, const TQString & ) ) ,
- this, TQT_SLOT( slotRenameItem( TQListViewItem *, int, const TQString & ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( itemRenamed ( TQListViewItem *, int, const TQString & ) ) ,
+ this, TQ_SLOT( slotRenameItem( TQListViewItem *, int, const TQString & ) ) );
@@ -94,8 +94,8 @@ void KMFMyNetworkWidget::setupPropertiesView() {
kdDebug() << "void KMFMyNetworkWidget::setupPropertiesView()" << endl;
m_hostProperties = new KMFHostWidget( this, "host widget" );
kt_hostProperties->addTab( m_hostProperties, i18n( "General" ) );
- connect( m_hostProperties, TQT_SIGNAL( sigTargetChanged() ),
- this, TQT_SLOT( slotTargetChanged() ) );
+ connect( m_hostProperties, TQ_SIGNAL( sigTargetChanged() ),
+ this, TQ_SLOT( slotTargetChanged() ) );
m_hostProperties->InitGUI();
@@ -119,8 +119,8 @@ void KMFMyNetworkWidget::setupPropertiesView() {
m_network_widget = new KMFNetworkWidget( this, "m_network_widget" );
- connect( m_network_widget,TQT_SIGNAL( sigZoneChanged( KMFNetZone* ) ),
- this,TQT_SLOT( slotZoneChanged( KMFNetZone* ) ) );
+ connect( m_network_widget,TQ_SIGNAL( sigZoneChanged( KMFNetZone* ) ),
+ this,TQ_SLOT( slotZoneChanged( KMFNetZone* ) ) );
// grid->addWidget( m_network_widget, 0,0 );
// grid->addWidget( m_network_widget, 1,0 );
@@ -236,15 +236,15 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
TQString name = m_zone->name();
TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() );
m_contextMenu->insertTitle( icon_chain, lab_str );
- m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQ_SLOT( slotAddHost() ) );
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_new, i18n( "Add Zone..." ), this, TQT_SLOT( slotAddZone() ) );
+ m_contextMenu->insertItem( icon_new, i18n( "Add Zone..." ), this, TQ_SLOT( slotAddZone() ) );
if ( m_zone->name() != "incoming_world" && m_zone->name() != "outgoing_world" && ! m_zone->readOnly() ) {
- m_contextMenu->insertItem( icon_rename, i18n( "Rename Zone..." ), this, TQT_SLOT( slotRenameZone() ) );
+ m_contextMenu->insertItem( icon_rename, i18n( "Rename Zone..." ), this, TQ_SLOT( slotRenameZone() ) );
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_del, i18n( "Delete Zone" ), this, TQT_SLOT( slotDelZone() ) );
+ m_contextMenu->insertItem( icon_del, i18n( "Delete Zone" ), this, TQ_SLOT( slotDelZone() ) );
}
m_contextMenu->popup( point );
@@ -259,13 +259,13 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
TQString lab_str = i18n("Host: %1").arg( m_target->guiName() );
m_contextMenu->insertTitle( icon_chain, lab_str );
if ( ! m_target->readOnly() ) {
- m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) );
+ m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQ_SLOT( slotRenameHost() ) );
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( icon_del, i18n( "Delete Host..." ), this, TQT_SLOT( slotDelHost() ) );
+ m_contextMenu->insertItem( icon_del, i18n( "Delete Host..." ), this, TQ_SLOT( slotDelHost() ) );
}
if ( ! m_target->isCurrentTarget() ) {
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", TDEIcon::Small ), i18n( "Make Active Target..." ), this, TQT_SLOT( slotSetActiveTarget() ) );
+ m_contextMenu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", TDEIcon::Small ), i18n( "Make Active Target..." ), this, TQ_SLOT( slotSetActiveTarget() ) );
}
m_contextMenu->popup( point );
diff --git a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
index e3cbeb9..8795b93 100644
--- a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
@@ -49,23 +49,23 @@ KMFNetHostPropertiesWidget::KMFNetHostPropertiesWidget ( TQWidget* parent, const
m_address_widget = new KMFIPv4AddressWidget( m_frameAddress, "m_address_widget" );
- connect( m_address_widget, TQT_SIGNAL( sigAddressChanged( int, int, int, int ) ),
- this,TQT_SLOT( slotAddressChanged( int, int, int, int ) ) );
+ connect( m_address_widget, TQ_SIGNAL( sigAddressChanged( int, int, int, int ) ),
+ this,TQ_SLOT( slotAddressChanged( int, int, int, int ) ) );
- connect( m_cb_host_limit, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotHostLimitToggled( bool ) ) );
+ connect( m_cb_host_limit, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotHostLimitToggled( bool ) ) );
- connect( m_sb_host_rate, TQT_SIGNAL( valueChanged( int ) ),
- this, TQT_SLOT( slotHostLimitValueChanged( int ) ) );
+ connect( m_sb_host_rate, TQ_SIGNAL( valueChanged( int ) ),
+ this, TQ_SLOT( slotHostLimitValueChanged( int ) ) );
- connect( m_cb_limit_host_interval, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( slotHostLimitScaleChanged( int ) ) );
+ connect( m_cb_limit_host_interval, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( slotHostLimitScaleChanged( int ) ) );
- connect( m_cb_host_log, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotHostLogToggled( bool ) ) );
+ connect( m_cb_host_log, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotHostLogToggled( bool ) ) );
- connect( m_host_desc, TQT_SIGNAL( textChanged() ),
- this, TQT_SLOT( slotDescriptionChanged() ) );
+ connect( m_host_desc, TQ_SIGNAL( textChanged() ),
+ this, TQ_SLOT( slotDescriptionChanged() ) );
TQGridLayout *grid = new TQGridLayout( m_frameAddress, 1, 1 );
grid->addWidget( m_address_widget, 0, 0 );
@@ -94,13 +94,13 @@ void KMFNetHostPropertiesWidget::loadHost( KMFNetHost* host ) {
}
if ( m_host ) {
- disconnect( m_host, TQT_SIGNAL( destroyed() ),
- this,TQT_SLOT( slotHostDeleted() ) );
+ disconnect( m_host, TQ_SIGNAL( destroyed() ),
+ this,TQ_SLOT( slotHostDeleted() ) );
}
m_host = host;
- connect( m_host, TQT_SIGNAL( destroyed() ),
- this,TQT_SLOT( slotHostDeleted() ) );
+ connect( m_host, TQ_SIGNAL( destroyed() ),
+ this,TQ_SLOT( slotHostDeleted() ) );
blockAllSignals( true );
setEnabled( true );
m_address_widget->loadIPAddress(
diff --git a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
index 12d002f..97bdd13 100644
--- a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
@@ -29,20 +29,20 @@ namespace KMF {
KMFNetworkWidget::KMFNetworkWidget(TQWidget *parent, const char *name)
: KMyFirewallNetworkWidget(parent, name) {
m_allowEdit = true;
- connect( m_sb_from_1,TQT_SIGNAL( valueChanged( const TQString& ) ),
- this,TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_from_2,TQT_SIGNAL( valueChanged( const TQString& ) ),
- this,TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_from_3,TQT_SIGNAL( valueChanged( const TQString& ) ),
- this,TQT_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_from_4,TQT_SIGNAL( valueChanged( const TQString& ) ),
- this,TQT_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_from_1,TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this,TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_from_2,TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this,TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_from_3,TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this,TQ_SLOT( slotAddressChanged( const TQString& ) ) );
+ connect( m_sb_from_4,TQ_SIGNAL( valueChanged( const TQString& ) ),
+ this,TQ_SLOT( slotAddressChanged( const TQString& ) ) );
- connect( m_sb_mask,TQT_SIGNAL( valueChanged( int ) ),
- this,TQT_SLOT( slotShortMaskChanged( int ) ) );
+ connect( m_sb_mask,TQ_SIGNAL( valueChanged( int ) ),
+ this,TQ_SLOT( slotShortMaskChanged( int ) ) );
- connect( m_txt_desc,TQT_SIGNAL( textChanged() ),
- this,TQT_SLOT( slotDescriptionChanged() ) );
+ connect( m_txt_desc,TQ_SIGNAL( textChanged() ),
+ this,TQ_SLOT( slotDescriptionChanged() ) );
}
@@ -57,7 +57,7 @@ void KMFNetworkWidget::loadZone( KMFNetZone* zone ) {
setEnabled( true );
blockAllSignals( true );
m_zone = zone;
- connect( m_zone, TQT_SIGNAL( destroyed() ), this, TQT_SLOT ( slotZoneDeleted() ) );
+ connect( m_zone, TQ_SIGNAL( destroyed() ), this, TQ_SLOT ( slotZoneDeleted() ) );
m_sb_from_1->setEnabled( true );
m_sb_from_2->setEnabled( true );
diff --git a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
index f6ad717..386a2e3 100644
--- a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp
@@ -49,12 +49,12 @@ KMFNewDocDlg::KMFNewDocDlg( TQWidget *parent, const char *name, WFlags fl ) : KM
if ( pic.isNull() )
return ;
l_pic->setPixmap( pic );
- connect( b_cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
- connect( b_close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
- connect( b_empty, TQT_SIGNAL( clicked() ), this, TQT_SLOT( loadEmpty() ) );
- connect( b_template, TQT_SIGNAL( clicked() ), this, TQT_SLOT( loadTemplate() ) );
- connect( b_load_saved, TQT_SIGNAL( clicked() ), this, TQT_SLOT( loadSaved() ) );
- connect( b_help, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotHelp() ) );
+ connect( b_cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
+ connect( b_close, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
+ connect( b_empty, TQ_SIGNAL( clicked() ), this, TQ_SLOT( loadEmpty() ) );
+ connect( b_template, TQ_SIGNAL( clicked() ), this, TQ_SLOT( loadTemplate() ) );
+ connect( b_load_saved, TQ_SIGNAL( clicked() ), this, TQ_SLOT( loadSaved() ) );
+ connect( b_help, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotHelp() ) );
TQRect screen = TQApplication::desktop() ->screenGeometry();
TQRect mainRect;
screen = TQApplication::desktop() ->screenGeometry( TQApplication::desktop() ->screenNumber( mainRect.center() ) );
diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp
index 9f09bd8..204c81a 100644
--- a/kmyfirewall/kmfwidgets/kmfprocout.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp
@@ -39,9 +39,9 @@ KMFProcOut::KMFProcOut( TQWidget *parent, const char *name, WFlags fl ) : TQWidg
m_job_name = XML::Undefined_Value;
childproc = new TDEProcess();
- connect( childproc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
- connect( childproc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );
- connect( childproc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
+ connect( childproc, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
+ connect( childproc, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );
+ connect( childproc, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
initGUI();
hide();
kdDebug() << "KMFProcOut: Finished initialisation." << endl;
@@ -79,7 +79,7 @@ void KMFProcOut::initGUI() {
m_bkill = new KPushButton( icon_stop, i18n( "Kill Process" ) , this, "m_bkill" );
m_bkill->setEnabled( false );
- connect( m_bkill, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotKillJob() ) );
+ connect( m_bkill, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotKillJob() ) );
m_layout->addMultiCellWidget( m_ljob_name, 0, 0, 0, 9 );
m_layout->addMultiCellWidget( m_bkill, 0, 0, 9, 10 );
diff --git a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
index beef134..cdeab96 100644
--- a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
@@ -50,8 +50,8 @@ KMFProtocolListView::KMFProtocolListView ( TQWidget* parent, const char* name, W
: KMyFirewallProtocolListView ( parent,name,fl ) {
m_reloading = false;
loadProtocols();
- connect( m_lv_protocols, TQT_SIGNAL( pressed( TQListViewItem* ) ),
- this, TQT_SLOT( slotNewProtocolSelected( TQListViewItem* ) ) );
+ connect( m_lv_protocols, TQ_SIGNAL( pressed( TQListViewItem* ) ),
+ this, TQ_SLOT( slotNewProtocolSelected( TQListViewItem* ) ) );
}
@@ -146,10 +146,10 @@ void KMFProtocolListView::loadProtocols() {
TQValueList<KMFProtocol*>::iterator it;
for( it = allProts.begin(); it != allProts.end(); ++it ) {
KMFProtocol * prot = *it;
-/* disconnect( prot, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolDeleted( TQObject* ) ) );
- connect( prot, TQT_SIGNAL( destroyed( TQObject* ) ),
- this, TQT_SLOT( slotOnProtocolDeleted( TQObject* ) ) );*/
+/* disconnect( prot, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolDeleted( TQObject* ) ) );
+ connect( prot, TQ_SIGNAL( destroyed( TQObject* ) ),
+ this, TQ_SLOT( slotOnProtocolDeleted( TQObject* ) ) );*/
KMFProtocolUsage *protUsage = prot->createUsage();
protUsage->setProtocol( prot );
diff --git a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
index 8aae0dc..7c02781 100644
--- a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
@@ -46,16 +46,16 @@ namespace KMF {
KMFProtocolPropertiesWidget::KMFProtocolPropertiesWidget ( TQWidget* parent, const char* name, WFlags fl )
: KMyFirewallProtocolPropertiesWidget ( parent,name,fl ) {
- connect( m_cb_limit, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotEnableProtocolLimit( bool ) ) );
+ connect( m_cb_limit, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotEnableProtocolLimit( bool ) ) );
- connect( m_sb_limit_rate, TQT_SIGNAL( valueChanged( int ) ),
- this, TQT_SLOT( slotSetProtocolLimitRate( int ) ) );
+ connect( m_sb_limit_rate, TQ_SIGNAL( valueChanged( int ) ),
+ this, TQ_SLOT( slotSetProtocolLimitRate( int ) ) );
- connect( m_cb_limit_interval, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( slotSetProtocolLimitInterval( const TQString& ) ) );
+ connect( m_cb_limit_interval, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( slotSetProtocolLimitInterval( const TQString& ) ) );
- connect( m_cb_log, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotEnableProtocolLogging( bool ) ) );
+ connect( m_cb_log, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotEnableProtocolLogging( bool ) ) );
}
@@ -120,13 +120,13 @@ void KMFProtocolPropertiesWidget::loadProtocolUsage( KMFProtocolUsage* prot ) {
}
if ( m_protocolUsage ) {
- disconnect( m_protocolUsage, TQT_SIGNAL( destroyed() ),
- this,TQT_SLOT( slotProtocolDeleted() ) );
+ disconnect( m_protocolUsage, TQ_SIGNAL( destroyed() ),
+ this,TQ_SLOT( slotProtocolDeleted() ) );
}
m_protocolUsage = prot;
- connect( m_protocolUsage, TQT_SIGNAL( destroyed() ),
- this,TQT_SLOT( slotProtocolDeleted() ) );
+ connect( m_protocolUsage, TQ_SIGNAL( destroyed() ),
+ this,TQ_SLOT( slotProtocolDeleted() ) );
setEnabled( true );
blockAllSignals( true );
diff --git a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
index 89bfec0..992d348 100644
--- a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
@@ -89,16 +89,16 @@ KMFSelectActiveTarget::KMFSelectActiveTarget ( TQWidget* parent, const char* nam
{
m_cmd_ok->setEnabled( false );
- connect( m_lv_zones, TQT_SIGNAL( pressed( TQListViewItem* ) ) ,
- this, TQT_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( pressed( TQListViewItem* ) ) ,
+ this, TQ_SLOT( slotNewItemSelected( TQListViewItem* ) ) );
- connect( m_lv_zones, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ) ,
- this, TQT_SLOT( slotNewItemDBLClicked( TQListViewItem*, const TQPoint &, int ) ) );
+ connect( m_lv_zones, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ) ,
+ this, TQ_SLOT( slotNewItemDBLClicked( TQListViewItem*, const TQPoint &, int ) ) );
- connect( m_cmd_cancel, TQT_SIGNAL( clicked() ) ,
- this, TQT_SLOT( slotCancel() ) );
- connect( m_cmd_ok, TQT_SIGNAL( clicked() ) ,
- this, TQT_SLOT( slotOk() ) );
+ connect( m_cmd_cancel, TQ_SIGNAL( clicked() ) ,
+ this, TQ_SLOT( slotCancel() ) );
+ connect( m_cmd_ok, TQ_SIGNAL( clicked() ) ,
+ this, TQ_SLOT( slotOk() ) );
adjustSize();
}
diff --git a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
index 4de51cf..aaf1d70 100644
--- a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
+++ b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp
@@ -51,10 +51,10 @@ KMFSelectInterface::KMFSelectInterface( TQWidget *parent, const char *name, bool
- connect( m_cob_interface, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotInterfaceChanged( int ) ) );
- connect( m_cmd_ok, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( accept() ) );
- connect( m_cmd_help, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( help() ) );
- connect( b_close, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( reject() ) );
+ connect( m_cob_interface, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotInterfaceChanged( int ) ) );
+ connect( m_cmd_ok, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( accept() ) );
+ connect( m_cmd_help, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( help() ) );
+ connect( b_close, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( reject() ) );
adjustSize();
}
diff --git a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
index bdce312..2369c43 100644
--- a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
+++ b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
@@ -47,16 +47,16 @@ KMFSystemSettingsLinux::KMFSystemSettingsLinux(TQWidget* parent, const char* nam
m_url_init_path->setMode( KFile::Directory | KFile::LocalOnly );
m_url_runlevel_path->setMode( KFile::Directory | KFile::LocalOnly );
- connect( m_url_ipt_path, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotSettingChanged() ) );
- connect( m_url_mod_path, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotSettingChanged() ) );
- connect( m_url_init_path, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotSettingChanged() ) );
- connect( m_url_runlevel_path, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( slotSettingChanged() ) );
- connect( m_cob_distribution, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( slotDistributionChanged() ) );
+ connect( m_url_ipt_path, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotSettingChanged() ) );
+ connect( m_url_mod_path, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotSettingChanged() ) );
+ connect( m_url_init_path, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotSettingChanged() ) );
+ connect( m_url_runlevel_path, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( slotSettingChanged() ) );
+ connect( m_cob_distribution, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( slotDistributionChanged() ) );
}
KMFSystemSettingsLinux::~KMFSystemSettingsLinux()
diff --git a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
index 9a5b477..1ce194a 100644
--- a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
+++ b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp
@@ -34,12 +34,12 @@
#include "kmftemplatechooser.h"
namespace KMF {
KMFTemplateChooser::KMFTemplateChooser(TQWidget* parent, const char* name, bool modal, WFlags fl) : KMyFirewallTemplateChooser(parent,name, modal,fl) {
- connect( lb_templates, TQT_SIGNAL( highlighted ( int ) ),
- this, TQT_SLOT( slotNewTemplateSelected( int ) ) );
- connect( lb_templates, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ),
- this, TQT_SLOT( slotNewTemplateSelected( TQListBoxItem* ) ) );
- connect( b_help, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotHelp() ) );
+ connect( lb_templates, TQ_SIGNAL( highlighted ( int ) ),
+ this, TQ_SLOT( slotNewTemplateSelected( int ) ) );
+ connect( lb_templates, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ),
+ this, TQ_SLOT( slotNewTemplateSelected( TQListBoxItem* ) ) );
+ connect( b_help, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotHelp() ) );
parseTemplates();
b_accept->setEnabled( false );
diff --git a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
index cd957c7..2123237 100644
--- a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
+++ b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
@@ -55,25 +55,25 @@ KMFTransactionLog::KMFTransactionLog ( TQWidget* parent, const char* name, WFlag
m_redoXMLFile = new KTempFile();
m_redoXMLFile->setAutoDelete( true );
- connect( m_cmd_clearStacks, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearStacks() ) );
- connect( m_cmd_clearLog, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotClearLog() ) );
+ connect( m_cmd_clearStacks, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearStacks() ) );
+ connect( m_cmd_clearLog, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotClearLog() ) );
- connect( KMFUndoEngine::instance(), TQT_SIGNAL( sigStackChanged() ),
- this, TQT_SLOT( slotUpdateView() ) );
+ connect( KMFUndoEngine::instance(), TQ_SIGNAL( sigStackChanged() ),
+ this, TQ_SLOT( slotUpdateView() ) );
- connect( KMFUndoEngine::instance(), TQT_SIGNAL( sigLog( const TQString& ) ),
- this, TQT_SLOT( slotLog( const TQString& ) ) );
+ connect( KMFUndoEngine::instance(), TQ_SIGNAL( sigLog( const TQString& ) ),
+ this, TQ_SLOT( slotLog( const TQString& ) ) );
- connect( m_lvUndoTransactions, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
+ connect( m_lvUndoTransactions, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
- connect( m_lvRedoTransactions, TQT_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
- this, TQT_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
+ connect( m_lvRedoTransactions, TQ_SIGNAL( contextMenuRequested ( TQListViewItem*, const TQPoint&, int ) ),
+ this, TQ_SLOT( slotZoneRBM( TQListViewItem*, const TQPoint&, int ) ) );
- connect( m_cmd_update, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotUpdateStatistics() ) );
+ connect( m_cmd_update, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotUpdateStatistics() ) );
m_lvUndoTransactions->setSorting(-1);
m_lvUndoTransactions->setSortColumn(-1);
@@ -131,7 +131,7 @@ void KMFTransactionLog::slotZoneRBM( TQListViewItem* item, const TQPoint& point,
TQString name = i18n("Transaction: %1").arg( m_currentTransaction->uuid().toString() );
// TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() );
m_contextMenu->insertTitle( name );
- m_contextMenu->insertItem( i18n( "Show XML diff using Kompare" ), this, TQT_SLOT( slotShowDiff() ) );
+ m_contextMenu->insertItem( i18n( "Show XML diff using Kompare" ), this, TQ_SLOT( slotShowDiff() ) );
m_contextMenu->popup( point );
if ( m_undoXMLFile ) {
diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp
index 726c308..c98d467 100644
--- a/kmyfirewall/kmyfirewall.cpp
+++ b/kmyfirewall/kmyfirewall.cpp
@@ -97,11 +97,11 @@ KMyFirewall::KMyFirewall( TQWidget* parent, const char *name ) : KMFMainWindow(
/* childproc = new TDEProcess();
- connect( childproc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
+ connect( childproc, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
- connect( childproc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
+ connect( childproc, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
- connect( childproc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );*/
+ connect( childproc, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );*/
@@ -110,8 +110,8 @@ KMyFirewall::KMyFirewall( TQWidget* parent, const char *name ) : KMFMainWindow(
// Initialize the settings dialog
m_configDlg = new KMFConfigDialog( this, "config" );
m_configDlg->setNetwork( network() );
- connect ( m_configDlg, TQT_SIGNAL( sigConfigChanged() ),
- this, TQT_SLOT( slotConfigChanged() ) );
+ connect ( m_configDlg, TQ_SIGNAL( sigConfigChanged() ),
+ this, TQ_SLOT( slotConfigChanged() ) );
// Initialize error object
m_err = new KMFError();
@@ -287,8 +287,8 @@ void KMyFirewall::setOutputWidget( TQWidget* wid ) {
kdDebug() << "Adding outputwidget: " << wid->className() << endl;
if ( strcmp(wid->className(), "KMFObjectInfo") ) {
KPushButton * close = new KPushButton( i18n( "Return to Editor View" ), widget );
- connect( close, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotShowEditor() ) );
+ connect( close, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotShowEditor() ) );
layout->addWidget( close, 1, 0 );
}
m_outputWidget = widget;
@@ -299,50 +299,50 @@ void KMyFirewall::initActions() {
kdDebug() << "Init Actions..." << endl;
// Custom Actions
- actionEditDocInfo = new TDEAction( i18n( "&Edit Document Information" ), "edit", 0 , this, TQT_SLOT( slotEditDocInfo() ), actionCollection(), "edit_doc_info" );
+ actionEditDocInfo = new TDEAction( i18n( "&Edit Document Information" ), "edit", 0 , this, TQ_SLOT( slotEditDocInfo() ), actionCollection(), "edit_doc_info" );
// KStdAction
- actionNew = KStdAction::openNew( this, TQT_SLOT( slotFileNew() ),
+ actionNew = KStdAction::openNew( this, TQ_SLOT( slotFileNew() ),
actionCollection(), "new" );
- actionClose = KStdAction::close( this, TQT_SLOT( slotFileClose() ),
+ actionClose = KStdAction::close( this, TQ_SLOT( slotFileClose() ),
actionCollection(), "close" );
- actionOpen = KStdAction::open( this, TQT_SLOT( slotFileOpen() ),
+ actionOpen = KStdAction::open( this, TQ_SLOT( slotFileOpen() ),
actionCollection(), "open" );
- actionSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ),
+ actionSave = KStdAction::save( this, TQ_SLOT( slotFileSave() ),
actionCollection(), "save" );
- actionSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ),
+ actionSaveAs = KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs() ),
actionCollection(), "save_as" );
actionSaveAs->setEnabled( false );
- actionQuit = KStdAction::quit( this, TQT_SLOT( slotQuitApp() ),
+ actionQuit = KStdAction::quit( this, TQ_SLOT( slotQuitApp() ),
actionCollection(), "quit" );
- actionUndo = KStdAction::undo( this, TQT_SLOT( slotUndo() ),
+ actionUndo = KStdAction::undo( this, TQ_SLOT( slotUndo() ),
actionCollection(), "undo" );
- actionRedo = KStdAction::redo( this, TQT_SLOT( slotRedo() ),
+ actionRedo = KStdAction::redo( this, TQ_SLOT( slotRedo() ),
actionCollection(), "redo" );
- actionExportTargetConfig = new TDEAction( i18n( "&Export Target Configuration..." ), "wizard", 0 , this, TQT_SLOT( slotExportTargetConfig() ),
+ actionExportTargetConfig = new TDEAction( i18n( "&Export Target Configuration..." ), "wizard", 0 , this, TQ_SLOT( slotExportTargetConfig() ),
actionCollection(), "export_tagret_config" );
- actionImportTargetConfig = new TDEAction( i18n( "&Import Target Configuration..." ), "wizard", 0 , this, TQT_SLOT( slotImportTargetConfig() ),
+ actionImportTargetConfig = new TDEAction( i18n( "&Import Target Configuration..." ), "wizard", 0 , this, TQ_SLOT( slotImportTargetConfig() ),
actionCollection(), "import_tagret_config" );
- actionShowTransactionLog = new TDEAction( i18n( "&Show Transaction Log..." ), "wizard", 0 , this, TQT_SLOT( slotShowTransactionLog() ),
+ actionShowTransactionLog = new TDEAction( i18n( "&Show Transaction Log..." ), "wizard", 0 , this, TQ_SLOT( slotShowTransactionLog() ),
actionCollection(), "show_transaction_log" );
- actionLoadTemplate = new TDEAction( i18n( "&Load Template..." ), "wizard", 0 , this, TQT_SLOT( slotLoadTemplate() ),
+ actionLoadTemplate = new TDEAction( i18n( "&Load Template..." ), "wizard", 0 , this, TQ_SLOT( slotLoadTemplate() ),
actionCollection(), "load_template" );
-// KStdAction::showToolbar( this, TQT_SLOT( toggleToolBar() ) , actionCollection() );
- KStdAction::showStatusbar( this, TQT_SLOT( toggleStatusBar() ), actionCollection() );
- KStdAction::preferences( this, TQT_SLOT( slotConfigureKMF() ), actionCollection() );
- KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+// KStdAction::showToolbar( this, TQ_SLOT( toggleToolBar() ) , actionCollection() );
+ KStdAction::showStatusbar( this, TQ_SLOT( toggleStatusBar() ), actionCollection() );
+ KStdAction::preferences( this, TQ_SLOT( slotConfigureKMF() ), actionCollection() );
+ KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() );
}
@@ -362,7 +362,7 @@ void KMyFirewall::slotExportTargetConfig() {
void KMyFirewall::slotConfigureToolbars() {
saveMainWindowSettings( TDEGlobal::config(), "KMyFirewall" );
KEditToolbar dlg( factory() );
- connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ) );
+ connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() ) );
dlg.exec();
}
@@ -491,7 +491,7 @@ void KMyFirewall::slotEnableSave() {
void KMyFirewall::slotEditDocInfo() {
KMFDocumentInfo * dlg = new KMFDocumentInfo( this, "KMFObjectInfo", true );
dlg->loadDoc( network()->currentDoc() );
- connect( dlg,TQT_SIGNAL( sigSaveAsTemplate() ) , this, TQT_SLOT( slotFileSaveAsTemplate() ) );
+ connect( dlg,TQ_SIGNAL( sigSaveAsTemplate() ) , this, TQ_SLOT( slotFileSaveAsTemplate() ) );
dlg->exec();
}
@@ -579,10 +579,10 @@ void KMyFirewall::slotLoadTemplate() {
KMFTemplateChooser * dlg = new KMFTemplateChooser( 0 , "KMyFirewall - Load Template", true, TQWidget::WDestructiveClose | TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder );
// dlg->parseTemplates();
- connect( dlg, TQT_SIGNAL( sigLoadTemplate( const TQString& ) ),
- this, TQT_SLOT( slotLoadFile( const TQString& ) ) );
-/* connect( dlg, TQT_SIGNAL( sigLoadEmptyDocument() ),
- this, TQT_SLOT( slotLoadFile( const TQString& ) ) );*/
+ connect( dlg, TQ_SIGNAL( sigLoadTemplate( const TQString& ) ),
+ this, TQ_SLOT( slotLoadFile( const TQString& ) ) );
+/* connect( dlg, TQ_SIGNAL( sigLoadEmptyDocument() ),
+ this, TQ_SLOT( slotLoadFile( const TQString& ) ) );*/
dlg->exec();
}
@@ -921,9 +921,9 @@ void KMyFirewall::slotFileNew() {
KMFNewDocDlg *dlg = new KMFNewDocDlg( 0, "KMyFirewall - New Document", TQWidget::WDestructiveClose | TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder );
dlg->show() ;
dlg->raise();
- connect( dlg, TQT_SIGNAL( sigNewDocLoadTemplate() ), this, TQT_SLOT( slotLoadTemplate() ) );
- connect( dlg, TQT_SIGNAL( sigNewDocLoadEmpty() ), this, TQT_SLOT( slotLoadEmptyRuleset() ) );
- connect( dlg, TQT_SIGNAL( sigNewDocLoadSaved() ), this, TQT_SLOT( slotFileOpen() ) );
+ connect( dlg, TQ_SIGNAL( sigNewDocLoadTemplate() ), this, TQ_SLOT( slotLoadTemplate() ) );
+ connect( dlg, TQ_SIGNAL( sigNewDocLoadEmpty() ), this, TQ_SLOT( slotLoadEmptyRuleset() ) );
+ connect( dlg, TQ_SIGNAL( sigNewDocLoadSaved() ), this, TQ_SLOT( slotFileOpen() ) );
}
void KMyFirewall::slotLoadEmptyRuleset() {
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
index d61a8a4..4e84c70 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
@@ -47,8 +47,8 @@ KMFRuleOptionEditCustom::KMFRuleOptionEditCustom(TQObject *parent, const char *n
m_edit = new KMFRuleEditCustomOpt( 0 , "Edit" );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditCustom::~KMFRuleOptionEditCustom() {}
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
index 65df851..9714827 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
@@ -33,12 +33,12 @@ KMFRuleOptionEditorInterface::KMFRuleOptionEditorInterface(TQObject *parent, con
m_edit = new KMFRuleEditorInterface( 0 , "Edit", 0 );
m_edit->hide();
-/* connect( m_edit,TQT_SIGNAL(sigAddRuleOpt(TQString*, TQPtrList< TQString >* ) ),
- this,TQT_SLOT( slotAddRuleOption(TQString*, TQPtrList< TQString >* ) ) );
- connect( m_edit,TQT_SIGNAL(sigAddTargetOpt(TQString*, TQPtrList< TQString >* ) ),
- this,TQT_SLOT( slotAddTargetOption(TQString*, TQPtrList< TQString >* ) ) );*/
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+/* connect( m_edit,TQ_SIGNAL(sigAddRuleOpt(TQString*, TQPtrList< TQString >* ) ),
+ this,TQ_SLOT( slotAddRuleOption(TQString*, TQPtrList< TQString >* ) ) );
+ connect( m_edit,TQ_SIGNAL(sigAddTargetOpt(TQString*, TQPtrList< TQString >* ) ),
+ this,TQ_SLOT( slotAddTargetOption(TQString*, TQPtrList< TQString >* ) ) );*/
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditorInterface::~KMFRuleOptionEditorInterface() {}
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
index f425cb8..70d247a 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
@@ -45,8 +45,8 @@ KMFRuleOptionEditIP::KMFRuleOptionEditIP(TQObject *parent, const char *name)
m_edit = new KMFRuleEditIP( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditIP::~KMFRuleOptionEditIP() {}
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
index 47b00a2..9bfc682 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
@@ -45,8 +45,8 @@ KMFRuleOptionEditLimit::KMFRuleOptionEditLimit(TQObject *parent, const char *nam
m_edit = new KMFRuleEditorLimit( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditLimit::~KMFRuleOptionEditLimit() {}
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
index cb67a68..8bd9d39 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
@@ -37,8 +37,8 @@ KMFRuleTargetOptionEditLog::KMFRuleTargetOptionEditLog(TQObject *parent, const c
m_edit = new KMFRuleEditTargetLog( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleTargetOptionEditLog::~KMFRuleTargetOptionEditLog() {}
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
index 2ce9bf1..ecd0613 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
@@ -34,8 +34,8 @@ KMFRuleOptionEditMAC::KMFRuleOptionEditMAC(TQObject *parent, const char *name)
m_edit = new KMFRuleEditMac( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditMAC::~KMFRuleOptionEditMAC() {}
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
index 2d55278..bda72e0 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
@@ -37,12 +37,12 @@ KMFRuleTargetOptionEditMark::KMFRuleTargetOptionEditMark(TQObject *parent, const
m_edit = new KMFRuleEditTargetMark( 0 , "Edit", 0 );
m_edit->hide();
-/* connect( m_edit,TQT_SIGNAL(sigAddRuleOpt(TQString*, TQPtrList< TQString >* ) ),
- this,TQT_SLOT( slotAddRuleOption(TQString*, TQPtrList< TQString >* ) ) );
- connect( m_edit,TQT_SIGNAL(sigAddTargetOpt(TQString*, TQPtrList< TQString >* ) ),
- this,TQT_SLOT( slotAddTargetOption(TQString*, TQPtrList< TQString >* ) ) );*/
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+/* connect( m_edit,TQ_SIGNAL(sigAddRuleOpt(TQString*, TQPtrList< TQString >* ) ),
+ this,TQ_SLOT( slotAddRuleOption(TQString*, TQPtrList< TQString >* ) ) );
+ connect( m_edit,TQ_SIGNAL(sigAddTargetOpt(TQString*, TQPtrList< TQString >* ) ),
+ this,TQ_SLOT( slotAddTargetOption(TQString*, TQPtrList< TQString >* ) ) );*/
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleTargetOptionEditMark::~KMFRuleTargetOptionEditMark() {}
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
index c6acd75..2105045 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
@@ -49,8 +49,8 @@ KMFRuleTargetOptionEditNat::KMFRuleTargetOptionEditNat(TQObject *parent, const c
m_edit = new KMFRuleEditorTargetNat( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleTargetOptionEditNat::~KMFRuleTargetOptionEditNat() {}
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
index e36a453..77cc063 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
@@ -84,23 +84,23 @@ KMFRuleEditorProtocol::KMFRuleEditorProtocol( TQWidget *parent, const char *name
cb_icmp_type->insertItem( "required-option-missing" );
mpwid = new KMFMultiPortWidget( tab_multiport, "mpwid" );
- connect( mpwid, TQT_SIGNAL( sigMultiPortChanged( bool ) ), this, TQT_SLOT( toggleMultiPort( bool ) ) );
+ connect( mpwid, TQ_SIGNAL( sigMultiPortChanged( bool ) ), this, TQ_SLOT( toggleMultiPort( bool ) ) );
pw_dest_port = new KMFPortWidget( tab_ports, "pw_dest_port" );
pw_dest_port->setEnabled( false );
- connect( c_dest_port, TQT_SIGNAL( toggled( bool ) ) , pw_dest_port, TQT_SLOT( setEnabled( bool ) ) );
+ connect( c_dest_port, TQ_SIGNAL( toggled( bool ) ) , pw_dest_port, TQ_SLOT( setEnabled( bool ) ) );
pw_src_port = new KMFPortWidget( tab_ports, "pw_src_port" );
pw_src_port->setEnabled( false );
- connect( c_src_port, TQT_SIGNAL( toggled( bool ) ) , pw_src_port, TQT_SLOT( setEnabled( bool ) ) );
+ connect( c_src_port, TQ_SIGNAL( toggled( bool ) ) , pw_src_port, TQ_SLOT( setEnabled( bool ) ) );
tab_multiportLayout->addMultiCellWidget( mpwid, 0, 0, 2, 2 );
tab_portsLayout->addWidget( pw_src_port, 1, 1 );
tab_portsLayout->addWidget( pw_dest_port, 2, 1 );
- connect( c_udp, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggleUdpRule( bool ) ) );
- connect( c_icmp, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggleIcmpRule( bool ) ) );
- connect( c_tcp, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggleTcpRule( bool ) ) );
+ connect( c_udp, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggleUdpRule( bool ) ) );
+ connect( c_icmp, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggleIcmpRule( bool ) ) );
+ connect( c_tcp, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggleTcpRule( bool ) ) );
tabWidget->setTabEnabled( tab_ports, false );
tabWidget->setTabEnabled( tab_multiport, false );
tabWidget->setTabEnabled( tab_icmp, false );
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
index c0f851a..ae58c0f 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
@@ -45,8 +45,8 @@ KMFRuleOptionEditProtocol::KMFRuleOptionEditProtocol(TQObject *parent, const cha
m_edit = new KMFRuleEditorProtocol( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditProtocol::~KMFRuleOptionEditProtocol() {}
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
index de383c9..d77432a 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
@@ -45,8 +45,8 @@ KMFRuleOptionEditState::KMFRuleOptionEditState(TQObject *parent, const char *nam
m_edit = new KMFRuleEditorState( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditState::~KMFRuleOptionEditState() {}
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
index fc083ab..8cbd15d 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
@@ -45,8 +45,8 @@ KMFRuleOptionEditTos::KMFRuleOptionEditTos(TQObject *parent, const char *name)
m_edit = new KMFRuleEditorTos( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleOptionEditTos::~KMFRuleOptionEditTos() {}
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
index fd8d318..a892dc7 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
@@ -37,8 +37,8 @@ KMFRuleTargetOptionEditTos::KMFRuleTargetOptionEditTos(TQObject *parent, const c
m_edit = new KMFRuleEditorTos( 0 , "Edit", 0 );
m_edit->hide();
- connect( m_edit,TQT_SIGNAL(sigHideMe() ),
- this,TQT_SLOT( slotShowOverview() ) );
+ connect( m_edit,TQ_SIGNAL(sigHideMe() ),
+ this,TQ_SLOT( slotShowOverview() ) );
}
KMFRuleTargetOptionEditTos::~KMFRuleTargetOptionEditTos() {}