summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-12-15 12:42:29 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-17 20:07:53 +0900
commit53fde0832b7578910c13581431d1ca31efed5698 (patch)
tree73ea9dd5a08ae4aee9cee174d517331864990073
parent6913f86b9fc8b35611ec95d85258f55d4fc29f70 (diff)
downloadkmyfirewall-53fde0832b7578910c13581431d1ca31efed5698.tar.gz
kmyfirewall-53fde0832b7578910c13581431d1ca31efed5698.zip
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 679b0b183c46b5e65887e0ae1fed11f37a54cd3c)
-rw-r--r--kmyfirewall/core/kmfpluginfactory.cpp6
-rw-r--r--kmyfirewall/core/kprocesswrapper.cpp2
-rw-r--r--kmyfirewall/ipteditor/kmfruleedit.cpp4
-rw-r--r--kmyfirewall/kmfconfigdialog.cpp2
-rw-r--r--kmyfirewall/kmfwidgets/kmfhostwidget.cpp2
-rw-r--r--kmyfirewall/kmyfirewall.cpp58
6 files changed, 37 insertions, 37 deletions
diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp
index 0e43509..6816bef 100644
--- a/kmyfirewall/core/kmfpluginfactory.cpp
+++ b/kmyfirewall/core/kmfpluginfactory.cpp
@@ -55,7 +55,7 @@ KParts::ReadWritePart* KMFPluginFactory::KMFMainView( KParts::MainWindow* parent
KLibFactory * factory = KLibLoader::self() ->factory( libName.latin1() );
if ( factory ) {
- KParts::ReadWritePart * m_ruleeditpart = static_cast<KParts::ReadWritePart *>( factory->create( TQT_TQOBJECT(parent),
+ KParts::ReadWritePart * m_ruleeditpart = static_cast<KParts::ReadWritePart *>( factory->create( parent,
libName.latin1() , "KParts::ReadWritePart" ) );
if ( m_ruleeditpart ) {
@@ -173,7 +173,7 @@ KMFInstallerInterface* KMFPluginFactory::KMFInstaller( KMFTarget* target ) {
kdDebug() << "Couldn't load plugin: " << ptr->name() << endl;
return 0;
}
- if ( KMFInstallerInterface *part = dynamic_cast<KMFInstallerInterface*> ( factory->create( TQT_TQOBJECT(TDEApplication::kApplication()) , "KMFInstallerInterface") )
+ if ( KMFInstallerInterface *part = dynamic_cast<KMFInstallerInterface*> ( factory->create( TDEApplication::kApplication() , "KMFInstallerInterface") )
) {
if ( ! part ) {
KMessageBox::error(0, "Couldn't load plugin");
@@ -208,7 +208,7 @@ KMFCompilerInterface* KMFPluginFactory::KMFCompiler( KMFTarget* target ) {
return 0;
}
- if ( KMFCompilerInterface *part = dynamic_cast<KMFCompilerInterface*> ( factory->create( TQT_TQOBJECT(TDEApplication::kApplication()) , "KMFCompilerInterface" ) ) ) {
+ if ( KMFCompilerInterface *part = dynamic_cast<KMFCompilerInterface*> ( factory->create( TDEApplication::kApplication() , "KMFCompilerInterface" ) ) ) {
kdDebug() << "Returning Compiler Plugin." << endl;
return part;
}
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index fc9fddc..6514a03 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -36,7 +36,7 @@ namespace KMF {
TDEProcessWrapper* TDEProcessWrapper::m_instance = 0;
TDEProcessWrapper* TDEProcessWrapper::instance() {
if ( ! m_instance ) {
- m_instance = new TDEProcessWrapper( TQT_TQOBJECT(TDEApplication::kApplication()->mainWidget()) , "TDEProcessWrapper" );
+ m_instance = new TDEProcessWrapper( TDEApplication::kApplication()->mainWidget() , "TDEProcessWrapper" );
}
return m_instance;
}
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index 69b696f..dbdc6ca 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -312,13 +312,13 @@ void KMFRuleEdit::slotLoadDocument( KMFNetwork* network ) {
void KMFRuleEdit::loadPlugins() {
kdDebug() << "KMFRuleEdit::loadPlugins()" << endl;
- TQPtrListIterator<KMFRuleOptionEditInterface> it( *KMFPluginFactory::KMFRuleOptionEditors( TQT_TQOBJECT(this) ) );
+ TQPtrListIterator<KMFRuleOptionEditInterface> it( *KMFPluginFactory::KMFRuleOptionEditors( this ) );
while( it.current() ) {
registerRuleOptionPlugin( it.current() );
++it;
}
- TQPtrListIterator<KMFRuleTargetOptionEditInterface> it2( *KMFPluginFactory::KMFRuleTargetOptionEditors( TQT_TQOBJECT(this) ) );
+ TQPtrListIterator<KMFRuleTargetOptionEditInterface> it2( *KMFPluginFactory::KMFRuleTargetOptionEditors( this ) );
while( it2.current() ) {
registerRuleTargetOptionPlugin( it2.current() );
++it2;
diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp
index 4fa0701..89db8ba 100644
--- a/kmyfirewall/kmfconfigdialog.cpp
+++ b/kmyfirewall/kmfconfigdialog.cpp
@@ -333,7 +333,7 @@ void KMFConfigDialog::checkPlugins() {
kdDebug() << "Couldn't load plugin: " << ptr->name() << endl;
}
- if ( KMFCompilerInterface *part = dynamic_cast<KMFCompilerInterface*> ( factory->create( TQT_TQOBJECT(this) , "KMFCompilerInterface") ) ) {
+ if ( KMFCompilerInterface *part = dynamic_cast<KMFCompilerInterface*> ( factory->create( this , "KMFCompilerInterface") ) ) {
// kdDebug() << "Returning Compiler Plugin." << endl;
registerCompiler( part );
}
diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
index 54a9bf4..44c54e4 100644
--- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp
@@ -105,7 +105,7 @@ void KMFHostWidget::InitGUI() {
kdDebug() << "Couldn't load plugin: " << ptr->name() << endl;
}
- if ( KMFCompilerInterface *compiler = dynamic_cast<KMFCompilerInterface*> ( factory->create( TQT_TQOBJECT(this) , "KMFCompilerInterface") ) ) {
+ if ( KMFCompilerInterface *compiler = dynamic_cast<KMFCompilerInterface*> ( factory->create( this , "KMFCompilerInterface") ) ) {
m_cb_os->insertItem( compiler->osGUIName() );
}
}
diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp
index abf7266..726c308 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* ) ), TQT_TQOBJECT(this), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
+ connect( childproc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ) ;
- connect( childproc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
+ connect( childproc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedOutput( TDEProcess*, char*, int ) ) );
- connect( childproc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );*/
+ connect( childproc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotReceivedError( TDEProcess*, char*, int ) ) );*/
@@ -111,7 +111,7 @@ KMyFirewall::KMyFirewall( TQWidget* parent, const char *name ) : KMFMainWindow(
m_configDlg = new KMFConfigDialog( this, "config" );
m_configDlg->setNetwork( network() );
connect ( m_configDlg, TQT_SIGNAL( sigConfigChanged() ),
- TQT_TQOBJECT(this), TQT_SLOT( slotConfigChanged() ) );
+ this, TQT_SLOT( slotConfigChanged() ) );
// Initialize error object
m_err = new KMFError();
@@ -288,7 +288,7 @@ void KMyFirewall::setOutputWidget( TQWidget* wid ) {
if ( strcmp(wid->className(), "KMFObjectInfo") ) {
KPushButton * close = new KPushButton( i18n( "Return to Editor View" ), widget );
connect( close, TQT_SIGNAL( clicked() ),
- TQT_TQOBJECT(this), TQT_SLOT( slotShowEditor() ) );
+ this, TQT_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 , TQT_TQOBJECT(this), TQT_SLOT( slotEditDocInfo() ), actionCollection(), "edit_doc_info" );
+ actionEditDocInfo = new TDEAction( i18n( "&Edit Document Information" ), "edit", 0 , this, TQT_SLOT( slotEditDocInfo() ), actionCollection(), "edit_doc_info" );
// KStdAction
- actionNew = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ),
+ actionNew = KStdAction::openNew( this, TQT_SLOT( slotFileNew() ),
actionCollection(), "new" );
- actionClose = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ),
+ actionClose = KStdAction::close( this, TQT_SLOT( slotFileClose() ),
actionCollection(), "close" );
- actionOpen = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ),
+ actionOpen = KStdAction::open( this, TQT_SLOT( slotFileOpen() ),
actionCollection(), "open" );
- actionSave = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ),
+ actionSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ),
actionCollection(), "save" );
- actionSaveAs = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ),
+ actionSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ),
actionCollection(), "save_as" );
actionSaveAs->setEnabled( false );
- actionQuit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuitApp() ),
+ actionQuit = KStdAction::quit( this, TQT_SLOT( slotQuitApp() ),
actionCollection(), "quit" );
- actionUndo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( slotUndo() ),
+ actionUndo = KStdAction::undo( this, TQT_SLOT( slotUndo() ),
actionCollection(), "undo" );
- actionRedo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ),
+ actionRedo = KStdAction::redo( this, TQT_SLOT( slotRedo() ),
actionCollection(), "redo" );
- actionExportTargetConfig = new TDEAction( i18n( "&Export Target Configuration..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotExportTargetConfig() ),
+ actionExportTargetConfig = new TDEAction( i18n( "&Export Target Configuration..." ), "wizard", 0 , this, TQT_SLOT( slotExportTargetConfig() ),
actionCollection(), "export_tagret_config" );
- actionImportTargetConfig = new TDEAction( i18n( "&Import Target Configuration..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotImportTargetConfig() ),
+ actionImportTargetConfig = new TDEAction( i18n( "&Import Target Configuration..." ), "wizard", 0 , this, TQT_SLOT( slotImportTargetConfig() ),
actionCollection(), "import_tagret_config" );
- actionShowTransactionLog = new TDEAction( i18n( "&Show Transaction Log..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotShowTransactionLog() ),
+ actionShowTransactionLog = new TDEAction( i18n( "&Show Transaction Log..." ), "wizard", 0 , this, TQT_SLOT( slotShowTransactionLog() ),
actionCollection(), "show_transaction_log" );
- actionLoadTemplate = new TDEAction( i18n( "&Load Template..." ), "wizard", 0 , TQT_TQOBJECT(this), TQT_SLOT( slotLoadTemplate() ),
+ actionLoadTemplate = new TDEAction( i18n( "&Load Template..." ), "wizard", 0 , this, TQT_SLOT( slotLoadTemplate() ),
actionCollection(), "load_template" );
-// KStdAction::showToolbar( TQT_TQOBJECT(this), TQT_SLOT( toggleToolBar() ) , actionCollection() );
- KStdAction::showStatusbar( TQT_TQOBJECT(this), TQT_SLOT( toggleStatusBar() ), actionCollection() );
- KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKMF() ), actionCollection() );
- KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+// 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() );
}
@@ -362,7 +362,7 @@ void KMyFirewall::slotExportTargetConfig() {
void KMyFirewall::slotConfigureToolbars() {
saveMainWindowSettings( TDEGlobal::config(), "KMyFirewall" );
KEditToolbar dlg( factory() );
- connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_TQOBJECT(this), TQT_SLOT( slotNewToolbarConfig() ) );
+ connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_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() ) , TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAsTemplate() ) );
+ connect( dlg,TQT_SIGNAL( sigSaveAsTemplate() ) , this, TQT_SLOT( slotFileSaveAsTemplate() ) );
dlg->exec();
}
@@ -580,9 +580,9 @@ void KMyFirewall::slotLoadTemplate() {
// dlg->parseTemplates();
connect( dlg, TQT_SIGNAL( sigLoadTemplate( const TQString& ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotLoadFile( const TQString& ) ) );
+ this, TQT_SLOT( slotLoadFile( const TQString& ) ) );
/* connect( dlg, TQT_SIGNAL( sigLoadEmptyDocument() ),
- TQT_TQOBJECT(this), TQT_SLOT( slotLoadFile( const TQString& ) ) );*/
+ this, TQT_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() ), TQT_TQOBJECT(this), TQT_SLOT( slotLoadTemplate() ) );
- connect( dlg, TQT_SIGNAL( sigNewDocLoadEmpty() ), TQT_TQOBJECT(this), TQT_SLOT( slotLoadEmptyRuleset() ) );
- connect( dlg, TQT_SIGNAL( sigNewDocLoadSaved() ), TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ) );
+ 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() ) );
}
void KMyFirewall::slotLoadEmptyRuleset() {