diff options
39 files changed, 97 insertions, 97 deletions
diff --git a/KMFIPTInterface/kmfiptinterface.cpp b/KMFIPTInterface/kmfiptinterface.cpp index 02c0cea..fce08a1 100644 --- a/KMFIPTInterface/kmfiptinterface.cpp +++ b/KMFIPTInterface/kmfiptinterface.cpp @@ -72,7 +72,7 @@ bool KMFIPTInterface::remove(TQString arg) bool KMFIPTInterface::exit() { - kapp->quit(); + tdeApp->quit(); return 0; } diff --git a/KMFSysTray/kmfiptwatcher.cpp b/KMFSysTray/kmfiptwatcher.cpp index d09731c..067191f 100644 --- a/KMFSysTray/kmfiptwatcher.cpp +++ b/KMFSysTray/kmfiptwatcher.cpp @@ -62,7 +62,7 @@ void KMFIPTWatcher::timeout() { // kdDebug() << "timeout()" << endl; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQCString reply_type; TQByteArray params; TQDataStream stream( params, IO_WriteOnly ); @@ -75,7 +75,7 @@ void KMFIPTWatcher::timeout() { *( new TQCString( "numChainsInTable(TQString)" ) ), params, reply_type, reply_data, false, 10000 ) ) { - // KMessageBox::information( 0, i18n( "Error with DCOP: %1" ).arg( kapp->dcopClient() ->appId() ) ); + // KMessageBox::information( 0, i18n( "Error with DCOP: %1" ).arg( tdeApp->dcopClient() ->appId() ) ); emit sigUpdateActive( false ); } else { TQDataStream answer( reply_data, IO_ReadOnly ); @@ -103,7 +103,7 @@ void KMFIPTWatcher::queryExtendedInfo() { void KMFIPTWatcher::queryChainsInTable( const TQString& table, KMFIPTDoc* iptdoc ) { kdDebug() << "queryNumRulesInChain( const TQString& table, const TQString& chain )" << endl; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQCString reply_type; TQByteArray params; TQDataStream stream( params, IO_WriteOnly ); @@ -160,7 +160,7 @@ void KMFIPTWatcher::queryChainsInTable( const TQString& table, KMFIPTDoc* iptdoc } void KMFIPTWatcher::fetchChainPolicy( IPTChain* chain ) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQCString reply_type; TQByteArray params; TQDataStream stream( params, IO_WriteOnly ); @@ -185,7 +185,7 @@ void KMFIPTWatcher::fetchChainPolicy( IPTChain* chain ) { void KMFIPTWatcher::fetchRulesInChain( IPTChain* chain ) { kdDebug() << "fetchRulesInChain( const TQString& table, const TQString& chain )" << endl; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQCString reply_type; TQByteArray params; TQDataStream stream( params, IO_WriteOnly ); @@ -238,7 +238,7 @@ void KMFIPTWatcher::fetchRulesInChain( IPTChain* chain ) { void KMFIPTWatcher::fetchRulesProperties( IPTRule* rule, int index ) { kdDebug() << "queryNumRulesInChain( const TQString& table, const TQString& chain )" << endl; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQCString reply_type; TQByteArray params; TQDataStream stream( params, IO_WriteOnly ); @@ -271,7 +271,7 @@ void KMFIPTWatcher::fetchRulesProperties( IPTRule* rule, int index ) { void KMFIPTWatcher::queryNumRulesInChain( const TQString& table, const TQString& chain, KMFIPTDoc* doc ) { kdDebug() << "queryNumRulesInChain( const TQString& table, const TQString& chain )" << endl; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQCString reply_type; TQByteArray params; TQDataStream stream( params, IO_WriteOnly ); diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp index 5ed1e0c..90e39fd 100644 --- a/KMFSysTray/kmfsystray.cpp +++ b/KMFSysTray/kmfsystray.cpp @@ -47,7 +47,7 @@ KMFSysTray::KMFSysTray( TQWidget* w ) : KSystemTray ( w ) , DCOPObject( "KMFSysTray" ) { mainView = w; - ksConfig = kapp->config(); + ksConfig = tdeApp->config(); KMFIPTWatcher *watch = new KMFIPTWatcher( this, "KMFIPTWatcher" ); baseIcon = KSystemTray::loadIcon( "kmyfirewall" ); diff --git a/doc/en/index.docbook b/doc/en/index.docbook index b8de907..79eb15f 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kmyfirewall '<application>KMyFirewall</application>'> - <!ENTITY kapp "&kmyfirewall;"><!-- replace kmyfirewall here --> + <!ENTITY tdeApp "&kmyfirewall;"><!-- replace kmyfirewall here --> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> @@ -473,7 +473,7 @@ The option <quote>-A INPUT</quote> tells the program to add the rule at the end options <quote>-I chain [rulenum] </quote> for inserting a rule, <quote>-R chain [rulenum]</quote> for replacing a rule and <quote>-D chain rulenum</quote> for deleting a rule from a chain. </para> -<para>&kapp; only uses the -A option in the generated script.</para> +<para>&tdeApp; only uses the -A option in the generated script.</para> </sect1> <sect1 id="options"> @@ -758,24 +758,24 @@ to see the list of allowed names). </chapter> -<chapter id="using-kapp"> -<title>Using &kapp;</title> +<chapter id="using-tdeApp"> +<title>Using &tdeApp;</title> <!-- This chapter should tell the user how to use your app. You should use as many sections (Chapter, Sect1, Sect3, etc...) as is necessary to fully document your application. --> -<sect1 id="kapp-overview"> +<sect1 id="tdeApp-overview"> <title>Overview - GUI Interfaces</title> -<para>&kapp; ships with two different GUI interfaces.</para> +<para>&tdeApp; ships with two different GUI interfaces.</para> -<sect2 id="kapp-interfaces-generic"> +<sect2 id="tdeApp-interfaces-generic"> <title>Generic Interface</title> <para>The Generic Interface is an abstract view on what kind of netwok traffic may or may not pass yout computer. The rules are generated by a compiler plugin so that it is possible to generate scripts for other plattforms p.e. OpenBSD/pf then GNU/Linux/iptables (well currently just the iptables compiler is implemented. Let me know if you are interrested in implementing that :)).</para> </sect2> -<sect2 id="kapp-interfaces-ipt"> +<sect2 id="tdeApp-interfaces-ipt"> <title>IPTables Interface</title> <para>The IPTables interfaces tries to represent a 1-1 look at the iptables rule set your configuration will create. Therefore it is ment to be used by experienced system administrators in order to setup very fine graduaded rulesets. Becaus of the tight relation this GUI has to the netfilter/iptables framework it can only be used on GNU/Linux workstations as the document can not be compiled into any other rule description language.</para> @@ -819,7 +819,7 @@ are no rules defined to filter any kind of packets. <chapter id="commands"> <title>Command Reference</title> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>The main KMyFirewall window</title> <para></para> @@ -855,7 +855,7 @@ are no rules defined to filter any kind of packets. <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice></term> -<listitem><para><action>Quits</action> &kapp;</para></listitem> +<listitem><para><action>Quits</action> &tdeApp;</para></listitem> </varlistentry> </variablelist> </para> @@ -868,7 +868,7 @@ are no rules defined to filter any kind of packets. --> <chapter id="developers"> -<title>Developer's Guide to &kapp;</title> +<title>Developer's Guide to &tdeApp;</title> <para> As you can see this thing gets quiet big so every kind of help (coding,docs,translations) @@ -877,9 +877,9 @@ if you have some ideas, patches, wishes or whatever. </para> <sect1 id="developers-plugins"> -<title>&kapp; Plugin framework</title> +<title>&tdeApp; Plugin framework</title> <para> -&kapp; extensively uses KDE's KParts/XMLGUI technology to provide an easy to and robust plugin infrastructure. Allmost every function is performed by dynamicaly loaded plugins in order to make it easy manage the code and write extentions. Especially the IPTables interface uses plugins to embeed the different iptables rule options edit dialogs. +&tdeApp; extensively uses KDE's KParts/XMLGUI technology to provide an easy to and robust plugin infrastructure. Allmost every function is performed by dynamicaly loaded plugins in order to make it easy manage the code and write extentions. Especially the IPTables interface uses plugins to embeed the different iptables rule options edit dialogs. </para> </sect1> @@ -1417,7 +1417,7 @@ void KMFRuleEditMac::accept() { void KMFRuleEditMac::slotHelp() { kdDebug() << "void KMFRuleEditMac::slotHelp()" << endl; - kapp->invokeHelp( "src_mac" ); + tdeApp->invokeHelp( "src_mac" ); } void KMFRuleEditMac::reject() { kdDebug() << "void KMFRuleEditMac::reject()" << endl; @@ -1454,7 +1454,7 @@ application work. --> <qandaset id="faqlist"> <qandaentry> <question> -<para>My Mouse doesn't work. How do I quit &kapp;?</para> +<para>My Mouse doesn't work. How do I quit &tdeApp;?</para> </question> <answer> <para>You silly goose! Check out the <link linkend="commands">Commands diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp index bebdc02..aea20d6 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp +++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp @@ -101,7 +101,7 @@ void KMFIPTablesCompiler::slotExportIPT() { return ; int answer = 0; while ( answer != 3 ) { - if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( url, false, tdeApp->mainWidget() ) ) { if ( answer == 4 ) { slotExportIPT(); return ; @@ -125,7 +125,7 @@ void KMFIPTablesCompiler::slotExportIPT() { if ( m_errorHandler->showError( m_err ) ) { - if ( TDEIO::NetAccess::upload( tempfile.name(), url, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::upload( tempfile.name(), url, tdeApp->mainWidget() ) ) { // statusBar() ->message( i18n( "Wrote file: " ) + url.fileName() , 5000 ); } else { kdDebug() << "Couldn't upload file!!!" << tempfile.name() << endl; diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp index f06bb7a..479e4ad 100644 --- a/kmyfirewall/core/kmfdoc.cpp +++ b/kmyfirewall/core/kmfdoc.cpp @@ -146,7 +146,7 @@ KMFError* KMFDoc::exportXMLRuleset( bool promptFile, bool asTemplate ) { } int answer = 0; while ( answer != KMessageBox::Yes ) { - if ( TDEIO::NetAccess::exists( saveUrl, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( saveUrl, false, tdeApp->mainWidget() ) ) { if ( answer == 4 ) { return exportXMLRuleset( promptFile, asTemplate ); } else { @@ -177,7 +177,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) { f.flush(); f.close(); - if ( ! TDEIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::upload( file.name(), url, tdeApp->mainWidget() ) ) { kdDebug() << "Coudn't save File: " << url.url() << endl; m_err->setErrType( KMFError::NORMAL ); m_err->setErrMsg( i18n( "<qt><p><b>Saving <i>%1</i> Failed.</b></p>" diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp index 9b1a319..03922b0 100644 --- a/kmyfirewall/core/kmfgenericdoc.cpp +++ b/kmyfirewall/core/kmfgenericdoc.cpp @@ -287,7 +287,7 @@ const TQString& KMFGenericDoc::compile() { void KMFGenericDoc::parseDocument( const KURL& url, TQStringList& errors ) { // kdDebug() << "KMFDoc* KMFGenericDoc::parseDocument( const KURL& )" << endl; TQString xmlfile; - if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, tdeApp->mainWidget() ) ) { clear(); m_url.setFileName( i18n( "Untitled" ) ); return; diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp index a48aa3e..3dbdd7a 100644 --- a/kmyfirewall/core/kmfiptdoc.cpp +++ b/kmyfirewall/core/kmfiptdoc.cpp @@ -408,7 +408,7 @@ const TQString& KMFIPTDoc::compile() { void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) { // kdDebug() << "KMFIPTDoc::parseDocument()" << endl; TQString xmlfile; - if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, tdeApp->mainWidget() ) ) { clear(); m_url.setFileName( i18n( "Untitled" ) ); return; diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp index 4ef46c6..15aa457 100644 --- a/kmyfirewall/core/kmfnetwork.cpp +++ b/kmyfirewall/core/kmfnetwork.cpp @@ -216,7 +216,7 @@ bool KMFNetwork::isEmpty() { void KMFNetwork::parseDocument( const KURL& url, TQStringList& errors ) { kdDebug() << "KMFDoc* KMFNetwork::parseDocument( const KURL& url )" << endl; TQString xmlfile; - if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, tdeApp->mainWidget() ) ) { clear(); m_url.setFileName( i18n( "Untitled" ) ); return; diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp index 1c54aac..a7c2f1e 100644 --- a/kmyfirewall/core/kmfpluginfactory.cpp +++ b/kmyfirewall/core/kmfpluginfactory.cpp @@ -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( TDEApplication::kApplication() , "KMFInstallerInterface") ) + if ( KMFInstallerInterface *part = dynamic_cast<KMFInstallerInterface*> ( factory->create( tdeApp , "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( TDEApplication::kApplication() , "KMFCompilerInterface" ) ) ) { + if ( KMFCompilerInterface *part = dynamic_cast<KMFCompilerInterface*> ( factory->create( tdeApp , "KMFCompilerInterface" ) ) ) { kdDebug() << "Returning Compiler Plugin." << endl; return part; } diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp index 6afef55..7ca291d 100644 --- a/kmyfirewall/core/kmfprotocollibrary.cpp +++ b/kmyfirewall/core/kmfprotocollibrary.cpp @@ -126,7 +126,7 @@ void KMFProtocolLibrary::forceProtocolLibraryReload() { url.setPath( file ); kdDebug() << "CUSTOM lib at: " << file << endl; // KURL tmpurl = KURL( dir + "protocols/kmfcustomprotocollibrary.xml" ); - if ( ! TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::exists( url, false, tdeApp->mainWidget() ) ) { kdDebug() << "KMFGenericDoc::loadProtocolLibrary() - no custom protocols found." << endl; return; } @@ -148,7 +148,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr TDEIO::UDSEntry f_props; - if ( ! TDEIO::NetAccess::stat( url , f_props, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::stat( url , f_props, tdeApp->mainWidget() ) ) { const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>" "<p>If you are working with files stored on remote computers " @@ -168,7 +168,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr } TQString xmlfile; - if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, tdeApp->mainWidget() ) ) { const TQString msg = i18n( "<qt><p>Could not download file: <b>%1</b></p></qt>" ).arg( url.url() ); err->setErrType( KMFError::NORMAL ); err->setErrMsg( msg ); @@ -278,7 +278,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() { f.close(); - if ( ! TDEIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::upload( file.name(), url, tdeApp->mainWidget() ) ) { kdDebug() << "Coudn't save File: " << url.url() << endl; err->setErrType( KMFError::NORMAL ); err->setErrMsg( i18n( "<qt><p><b>Saving <i>%1</i> Failed.</b></p>" diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp index ad6adca..3f1ddd7 100644 --- a/kmyfirewall/core/kmftarget.cpp +++ b/kmyfirewall/core/kmftarget.cpp @@ -229,7 +229,7 @@ KMFError* KMFTarget::tryAutoConfiguration() { kdDebug() << "Search Path: " << path << endl; TQString localFile = TDEGlobal::dirs() ->findResource( "data", path ); - if ( ! TDEIO::NetAccess::exists( localFile, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::exists( localFile, false, tdeApp->mainWidget() ) ) { kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl; emit sigTargetChanged( this ); err->setErrType( KMFError::NORMAL ); diff --git a/kmyfirewall/core/tdeprocesswrapper.cpp b/kmyfirewall/core/tdeprocesswrapper.cpp index 0719abb..7892aad 100644 --- a/kmyfirewall/core/tdeprocesswrapper.cpp +++ b/kmyfirewall/core/tdeprocesswrapper.cpp @@ -36,7 +36,7 @@ namespace KMF { TDEProcessWrapper* TDEProcessWrapper::m_instance = 0; TDEProcessWrapper* TDEProcessWrapper::instance() { if ( ! m_instance ) { - m_instance = new TDEProcessWrapper( TDEApplication::kApplication()->mainWidget() , "TDEProcessWrapper" ); + m_instance = new TDEProcessWrapper( tdeApp->mainWidget() , "TDEProcessWrapper" ); } return m_instance; } @@ -71,7 +71,7 @@ void TDEProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQStri m_stdErr = ""; TQString localScriptFile = command; KTempFile *f = new KTempFile(); - if ( ! TDEIO::NetAccess::exists( localScriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::exists( localScriptFile, false, tdeApp->mainWidget() ) ) { kdDebug() << "TDEProcessWrapper::slotStartLocalJob(...) - creating temporary script file." << endl; TQTextStream *ts = f->textStream(); *ts << command << endl; @@ -105,7 +105,7 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr m_stdOut = ""; m_stdErr = ""; KTempFile *f = new KTempFile(); - if ( ! TDEIO::NetAccess::exists( scriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::exists( scriptFile, false, tdeApp->mainWidget() ) ) { kdDebug() << "TDEProcessWrapper::slotStartRemoteJob(...) - creating temporary script file." << endl; TQTextStream *ts = f->textStream(); *ts << scriptFile << endl; @@ -119,7 +119,7 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr KURL remFileUrl( execHost->getFishUrl() + "/tmp/" + uuid.toString() ); kdDebug() << "UPLOADING: Temporary script file: " << localScriptFile << " to: " << remFileUrl.url() << endl; - if ( ! TDEIO::NetAccess::upload( localScriptFile, remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::upload( localScriptFile, remFileUrl, tdeApp->mainWidget() ) ) { kdDebug() << "ERROR: Could not upload temp file." << endl; m_exitedNormal = false; m_status = 1; @@ -136,8 +136,8 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr TQString cmd = "bash /tmp/" + uuid.toString(); kdDebug() << "Execute: " << cmd << " at: " << execHost->getFishUrl() << endl; - const TQString& ret = TDEIO::NetAccess::fish_execute( execHost->getFishUrl(), cmd, TDEApplication::kApplication()->mainWidget() ); - if ( ! TDEIO::NetAccess::del( remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) { + const TQString& ret = TDEIO::NetAccess::fish_execute( execHost->getFishUrl(), cmd, tdeApp->mainWidget() ); + if ( ! TDEIO::NetAccess::del( remFileUrl, tdeApp->mainWidget() ) ) { m_exitedNormal = false; m_status = 1; m_stdErr = i18n( "Could not delete the temporary comand script file." ); diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp index 5fc4edf..5d5e0b2 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.cpp +++ b/kmyfirewall/installer/kmfinstallerplugin.cpp @@ -137,9 +137,9 @@ bool KMFInstallerPlugin::isConfigValid() { errH->showError( err ); if ( ! rulesetDoc()->target()->config()->isValid() ) { - KMessageBox::error( TDEApplication::kApplication()->mainWidget(), i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").arg( rulesetDoc()->target()->toFriendlyString() ) ); + KMessageBox::error( tdeApp->mainWidget(), i18n("<qt><p>Auto Confguration of: %1 could not determinate all needed setting. You'll need to configure the mmissing settings.</p></qt>").arg( rulesetDoc()->target()->toFriendlyString() ) ); } else { - KMessageBox::information( TDEApplication::kApplication()->mainWidget(), i18n("<qt><p>Auto Confguration of: %1 finished successfully.</p></qt>").arg( rulesetDoc()->target()->toFriendlyString() ) ); + KMessageBox::information( tdeApp->mainWidget(), i18n("<qt><p>Auto Confguration of: %1 finished successfully.</p></qt>").arg( rulesetDoc()->target()->toFriendlyString() ) ); } configValid = rulesetDoc()->target()->config()->isValid(); @@ -186,7 +186,7 @@ void KMFInstallerPlugin::generateInstallerPackage( KMFTarget* tg ) { if ( url.fileName().isEmpty() ) return; - if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( url, false, tdeApp->mainWidget() ) ) { TQDateTime now = TQDateTime::currentDateTime(); TQString backUp; @@ -201,12 +201,12 @@ void KMFInstallerPlugin::generateInstallerPackage( KMFTarget* tg ) { backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) ); - TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); - TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, tdeApp->mainWidget() ); + TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, tdeApp->mainWidget() ); } inst2->generateInstallerPackage( tg, url ); - TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", tdeApp->mainWidget() ); } } @@ -366,7 +366,7 @@ void KMFInstallerPlugin::slotGenerateInstallerPackage() { int answer = 0; - if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( url, false, tdeApp->mainWidget() ) ) { answer = KMessageBox::warningYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>" "<p><b>Overwrite the existing file?</b></p></qt>" ).arg( url.url() ) ); if ( answer == KMessageBox::No ) { diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp index fe5b661..33799c4 100644 --- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp +++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp @@ -870,7 +870,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* tg ) { if ( url.fileName().isEmpty() ) return; - if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( url, false, tdeApp->mainWidget() ) ) { TQDateTime now = TQDateTime::currentDateTime(); TQString backUp; @@ -885,12 +885,12 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* tg ) { backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) ); - TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); - TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, tdeApp->mainWidget() ); + TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, tdeApp->mainWidget() ); } inst2->generateInstallerPackage( tg, url ); - TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", tdeApp->mainWidget() ); } } @@ -1094,8 +1094,8 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p - // TDEIO::NetAccess::upload( packageArch->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); - TDEIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); + // TDEIO::NetAccess::upload( packageArch->name(), packageURL, tdeApp->mainWidget() ); + TDEIO::NetAccess::upload( kmf_install_package->name(), packageURL, tdeApp->mainWidget() ); kdDebug() << "Wrote package: " << packageURL.prettyURL() << endl; diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp index 1072569..1d713d7 100644 --- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp +++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp @@ -828,7 +828,7 @@ void KMFPFInstaller::cmdUninstallFW() { // if ( url.fileName().isEmpty() ) // return; // -// if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { +// if ( TDEIO::NetAccess::exists( url, false, tdeApp->mainWidget() ) ) { // TQDateTime now = TQDateTime::currentDateTime(); // // TQString backUp; @@ -843,12 +843,12 @@ void KMFPFInstaller::cmdUninstallFW() { // backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) ); // // -// TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); -// TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); +// TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, tdeApp->mainWidget() ); +// TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, tdeApp->mainWidget() ); // } // // inst2->generateInstallerPackage( tg, url ); -// TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); +// TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", tdeApp->mainWidget() ); // } // } @@ -1053,8 +1053,8 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa // // // -// // TDEIO::NetAccess::upload( packageArch->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); -// TDEIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); +// // TDEIO::NetAccess::upload( packageArch->name(), packageURL, tdeApp->mainWidget() ); +// TDEIO::NetAccess::upload( kmf_install_package->name(), packageURL, tdeApp->mainWidget() ); // // kdDebug() << "Wrote package: " << packageURL.prettyURL() << endl; // diff --git a/kmyfirewall/ipteditor/kmfchainedit.cpp b/kmyfirewall/ipteditor/kmfchainedit.cpp index 449d643..0a4a649 100644 --- a/kmyfirewall/ipteditor/kmfchainedit.cpp +++ b/kmyfirewall/ipteditor/kmfchainedit.cpp @@ -242,7 +242,7 @@ void KMFChainEdit::accept() { void KMFChainEdit::slotHelp() { kdDebug() << "void KMFChainEdit::slotHelp()" << endl; - kapp->invokeHelp( "chains" ); + tdeApp->invokeHelp( "chains" ); } void KMFChainEdit::reject() { kdDebug() << "void KMFChainEdit::reject()" << endl; diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp index fee9aa5..e2b9b83 100644 --- a/kmyfirewall/ipteditor/kmfruleedit.cpp +++ b/kmyfirewall/ipteditor/kmfruleedit.cpp @@ -1442,7 +1442,7 @@ bool KMFRuleEdit::event( TQEvent* ev ) { void KMFRuleEdit::slotHelp() { kdDebug() << "void KMFRuleEdit::slotHelp()" << endl; - kapp->invokeHelp( "rules" ); + tdeApp->invokeHelp( "rules" ); } void KMFRuleEdit::loadIcons() { kdDebug() << "void KMFRuleEdit::loadIcons()" << endl; diff --git a/kmyfirewall/kmfdisclaimer.cpp b/kmyfirewall/kmfdisclaimer.cpp index dff1be1..449d323 100644 --- a/kmyfirewall/kmfdisclaimer.cpp +++ b/kmyfirewall/kmfdisclaimer.cpp @@ -33,7 +33,7 @@ KMFDisclaimer::KMFDisclaimer( TQWidget *parent, const char *name, bool modal, WF KMFDisclaimer::~KMFDisclaimer() {} void KMFDisclaimer::accept() { - TDEConfig * _config = kapp->config(); + TDEConfig * _config = tdeApp->config(); _config->setGroup( "STARTUP" ); if ( c_show->isChecked() ) { _config->writeEntry( "show_disclaimer", "false" ); diff --git a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp index 7166923..ed9932c 100644 --- a/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp +++ b/kmyfirewall/kmfwidgets/kmfdocumentinfo.cpp @@ -70,7 +70,7 @@ void KMFDocumentInfo::loadDoc( KMFDoc* doc ) { void KMFDocumentInfo::slotHelp() { kdDebug() << "void KMFDocumentInfo::slotHelp()" << endl; - kapp->invokeHelp(); + tdeApp->invokeHelp(); } diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp index 8211468..e7d2f70 100644 --- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp @@ -242,7 +242,7 @@ void KMFHostWidget::slotTestConnection() { return; } if ( TDEIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /", - TDEApplication::kApplication()->mainWidget() ) != 0) { + tdeApp->mainWidget() ) != 0) { KMessageBox::information( this, i18n("Conneted successfully to: %1").arg( m_target->toFriendlyString() ) ); } else { KMessageBox::error( this, i18n("Connetion to: %1 failed!").arg( m_target->toFriendlyString() ) ); diff --git a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp index fa0667d..cf081cb 100644 --- a/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp +++ b/kmyfirewall/kmfwidgets/kmfiptdocoptions.cpp @@ -80,7 +80,7 @@ void KMFIPTDocOptions::accept() { void KMFIPTDocOptions::slotHelp() { kdDebug() << "void KMFIPTDocOptions::slotHelp() {" << endl; - kapp->invokeHelp(); + tdeApp->invokeHelp(); } } diff --git a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp index ae49f7f..215a9ba 100644 --- a/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp +++ b/kmyfirewall/kmfwidgets/kmfnewdocdlg.cpp @@ -90,7 +90,7 @@ void KMFNewDocDlg::loadSaved() { close(); } void KMFNewDocDlg::slotHelp() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } } diff --git a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp index 43ff1af..2ba5820 100644 --- a/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp +++ b/kmyfirewall/kmfwidgets/kmfobjectinfo.cpp @@ -101,7 +101,7 @@ void KMFObjectInfo::reject() { } void KMFObjectInfo::slotHelp() { - kapp->invokeHelp( "rule_documentation" ); + tdeApp->invokeHelp( "rule_documentation" ); } } diff --git a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp index 43b3916..19cd0ef 100644 --- a/kmyfirewall/kmfwidgets/kmfselectinterface.cpp +++ b/kmyfirewall/kmfwidgets/kmfselectinterface.cpp @@ -104,7 +104,7 @@ void KMFSelectInterface::accept() { } void KMFSelectInterface::help() { - kapp->invokeHelp( "gui_interfaces" ); + tdeApp->invokeHelp( "gui_interfaces" ); } void KMFSelectInterface::reject(){ diff --git a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp index 1ce194a..cb9aefb 100644 --- a/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp +++ b/kmyfirewall/kmfwidgets/kmftemplatechooser.cpp @@ -67,7 +67,7 @@ void KMFTemplateChooser::accept() { void KMFTemplateChooser::slotHelp() { // kdDebug() << "void KMFTemplateChooser::slotHelp()" << endl; - kapp->invokeHelp(); + tdeApp->invokeHelp(); } void KMFTemplateChooser::slotNewTemplateSelected( TQListBoxItem* i ){ diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp index 1f67036..d63109d 100644 --- a/kmyfirewall/kmyfirewall.cpp +++ b/kmyfirewall/kmyfirewall.cpp @@ -223,11 +223,11 @@ void KMyFirewall::initView() { // Load the main editor widget KParts::ReadWritePart* mainView = KMFPluginFactory::KMFMainView( this, m_err ); if ( ! m_err_handler->showError( m_err ) ) { - kapp->quit(); + tdeApp->quit(); } if ( ! mainView ) { KMessageBox::error( this, i18n( "KMFPluginFactory::KMFMainView( this, m_err ): returned a NULL pointer" ) ); - kapp->quit(); + tdeApp->quit(); } m_editorWidget = mainView->widget(); m_widgetStack->addWidget( m_editorWidget ); @@ -243,11 +243,11 @@ void KMyFirewall::updateView() { KParts::ReadWritePart* mainView = KMFPluginFactory::KMFMainView( this, m_err ); if ( ! m_err_handler->showError( m_err ) ) { - kapp->quit(); + tdeApp->quit(); } if ( ! mainView ) { KMessageBox::error( this, i18n( "KMFPluginFactory::KMFMainView( this, m_err ): returned a NULL pointer" ) ); - kapp->quit(); + tdeApp->quit(); } m_editorWidget = mainView->widget(); TQWidget* wid = m_widgetStack->widget( m_widgetStack->id( m_editorWidget ) ); @@ -395,7 +395,7 @@ bool KMyFirewall::checkRoot() { "As the file format used to save the rulesets has changed, " "rulesets created with KMyFirewall < 1.0beta1 <b>WILL NOT</b> work, don't even try it!" "</p></qt>" ); - TDEConfig* _config = kapp->config(); + TDEConfig* _config = tdeApp->config(); _config->setGroup( "Notification Messages" ); TQString warn = ""; warn = _config->readEntry( "compatibility_warning" ); @@ -430,7 +430,7 @@ void KMyFirewall::slotQuitApp() { bool quit = saveQuit(); if ( quit ) { KMFConfig::self() ->writeConfig(); - kapp->quit(); + tdeApp->quit(); } } @@ -500,8 +500,8 @@ void KMyFirewall::slotSelectInterface() { closeSplash(); if ( m_sel->exec() == TQDialog::Rejected ) { kdDebug() << "Wante to exit now..." << endl; - kapp->quit(); - ; // FIXME: Doe not work - kapp->quit(); + tdeApp->quit(); + ; // FIXME: Doe not work - tdeApp->quit(); } showSplash(); } @@ -632,7 +632,7 @@ bool KMyFirewall::prepareForFileOpen( const KURL& url ) { return false; } - if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, tdeApp->mainWidget() ) ) { kdDebug() << "Could not download file." << endl; return false; } @@ -708,7 +708,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { kdDebug() << "void KMyFirewall::getDocumentLoaderForUrl( const KURL&" << url.fileName() << " )" << endl; err->setErrType( KMFError::OK ); TQString xmlfile; - if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, tdeApp->mainWidget() ) ) { kdDebug() << "Could not download file." << endl; err->setErrType( KMFError::NORMAL ); err->setErrMsg( i18n( "<qt>Could not download file %1</qt>" ).arg( url.url() ) ); @@ -821,7 +821,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) { kdDebug() << "void KMyFirewall::parseDocument(TQString& file)" << endl; TDEIO::UDSEntry f_props; - if ( ! TDEIO::NetAccess::stat( url , f_props, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::stat( url , f_props, tdeApp->mainWidget() ) ) { closeSplash(); const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>" "<p>If you are working with files stored on remote computers " @@ -1018,7 +1018,7 @@ void KMyFirewall::checkStatus() { fclose( sbin1 ); } } else { - if ( TDEIO::NetAccess::exists( network()->currentTarget()->getFishUrl() + "/etc/kmyfirewall", true, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( network()->currentTarget()->getFishUrl() + "/etc/kmyfirewall", true, tdeApp->mainWidget() ) ) { kdDebug() << "Firewall is installed" << endl; isInstalled = true; } diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp index 2b22820..2166c87 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp @@ -135,7 +135,7 @@ void KMFRuleEditCustomOpt::accept() { void KMFRuleEditCustomOpt::slotHelp() { kdDebug() << "void KMFRuleEditIP::slotHelp()" << endl; - kapp->invokeHelp( "custom_rules" ); + tdeApp->invokeHelp( "custom_rules" ); } void KMFRuleEditCustomOpt::reject() { diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp index 9a6bb36..9ea2e5d 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp @@ -143,7 +143,7 @@ void KMFRuleEditorInterface::slotReadConfig() { void KMFRuleEditorInterface::slotHelp() { kdDebug() << "void KMFRuleEditorInterface::slotHelp()" << endl; - kapp->invokeHelp( "interfaces" ); + tdeApp->invokeHelp( "interfaces" ); } void KMFRuleEditorInterface::reject() { kdDebug() << "void KMFRuleEditorInterface::reject()" << endl; diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp index d7f7a38..e228e19 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp @@ -186,7 +186,7 @@ void KMFRuleEditIP::reject() { void KMFRuleEditIP::slotHelp() { kdDebug() << "void KMFRuleEditIP::slotHelp()" << endl; - kapp->invokeHelp( "src_dest_ip" ); + tdeApp->invokeHelp( "src_dest_ip" ); } diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp index 54ac584..f2dbd35 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp @@ -131,7 +131,7 @@ void KMFRuleEditorLimit::slotOk() { void KMFRuleEditorLimit::slotHelp() { kdDebug() << "void KMFRuleEditorLimit::slotHelp()" << endl; - kapp->invokeHelp( "limit" ); + tdeApp->invokeHelp( "limit" ); } void KMFRuleEditorLimit::reject() { diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp index 376d549..2f03191 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp @@ -152,7 +152,7 @@ void KMFRuleEditTargetLog::accept() { void KMFRuleEditTargetLog::slotHelp() { kdDebug() << "void KMFRuleEditTargetLog::slotHelp()" << endl; - kapp->invokeHelp( "targets" ); + tdeApp->invokeHelp( "targets" ); } void KMFRuleEditTargetLog::reject() { kdDebug() << "void KMFRuleEditTargetLog::slotreject()" << endl; diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp index 471fe1b..ca1da41 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp @@ -210,7 +210,7 @@ void KMFRuleEditMac::accept() { void KMFRuleEditMac::slotHelp() { kdDebug() << "void KMFRuleEditMac::slotHelp()" << endl; - kapp->invokeHelp( "src_mac" ); + tdeApp->invokeHelp( "src_mac" ); } void KMFRuleEditMac::reject() { kdDebug() << "void KMFRuleEditMac::reject()" << endl; diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp index b62de6c..6aa69c5 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp @@ -83,7 +83,7 @@ void KMFRuleEditTargetMark::accept() { void KMFRuleEditTargetMark::slotHelp() { kdDebug() << "void KMFRuleEditTargetMark::slotHelp()" << endl; - kapp->invokeHelp( "targets" ); + tdeApp->invokeHelp( "targets" ); } void KMFRuleEditTargetMark::reject() { kdDebug() << "void KMFRuleEditTargetMark::reject()" << endl; diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp index 3cb4dfa..e83d7a5 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp @@ -314,7 +314,7 @@ void KMFRuleEditorTargetNat::accept() { } void KMFRuleEditorTargetNat::slotHelp() { kdDebug() << "void KMFRuleEditorTargetNat::slotHelp()" << endl; - kapp->invokeHelp( "targets" ); + tdeApp->invokeHelp( "targets" ); } void KMFRuleEditorTargetNat::reject() { kdDebug() << "void KMFRuleEditorTargetNat::reject()" << endl; diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp index a40ad20..cf38691 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp @@ -714,7 +714,7 @@ void KMFRuleEditorProtocol::accept() { } void KMFRuleEditorProtocol::slotHelp() { - kapp->invokeHelp( "protocol" ); + tdeApp->invokeHelp( "protocol" ); } void KMFRuleEditorProtocol::reject() { emit sigHideMe(); diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp index 838e5c2..b2c815c 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp +++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp @@ -116,7 +116,7 @@ void KMFRuleEditorState::readRuleConfig() { } void KMFRuleEditorState::slotHelp() { kdDebug() << "void KMFRuleEditorState::slotHelp()" << endl; - kapp->invokeHelp( "state" ); + tdeApp->invokeHelp( "state" ); } void KMFRuleEditorState::reject() { kdDebug() << "void KMFRuleEditorState::reject()" << endl; diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp index 6e311f1..dde2e29 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp @@ -206,7 +206,7 @@ int KMFRuleEditorTos::getItemNum( const TQString& option ) { void KMFRuleEditorTos::slotHelp() { kdDebug() << "void KMFRuleEditorTos::slotHelp()" << endl; - kapp->invokeHelp( "tos" ); + tdeApp->invokeHelp( "tos" ); } void KMFRuleEditorTos::reject() { diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp index 43f4753..6e0ae32 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp @@ -204,7 +204,7 @@ int KMFRuleEditorTos::getItemNum( const TQString& option ) { void KMFRuleEditorTos::slotHelp() { kdDebug() << "void KMFRuleEditorTos::slotHelp()" << endl; - kapp->invokeHelp( "tos" ); + tdeApp->invokeHelp( "tos" ); } void KMFRuleEditorTos::reject() { |