diff --git a/ChangeLog b/ChangeLog index 49af012..b9d755d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,7 +81,7 @@ * KMFConfigDialog: platform and backend values are now set by the plugins properties * KMFSelectInterface: added new dialog that lets you chooss the interface at startup, not finished yet * KMFSelectInterface: added screenshot loading, smaller fixes -* Switching to KConfig XT framework: replaces kmfconfiguration class +* Switching to TDEConfig XT framework: replaces kmfconfiguration class * Several cosmetical changes * New Class KMFAppState: Holds some static variables giving information about the app's state * Some minor Fixes diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp index 31c192b..97cdd91 100644 --- a/KMFSysTray/app.cpp +++ b/KMFSysTray/app.cpp @@ -39,7 +39,7 @@ MainApp::MainApp() : TDEApplication() { // Get the current application configuration handle // KMessageBox::information( 0, i18n( "Starting Deamon" ) ); -// KConfig *ksConfig = config(); +// 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 ) ) ); diff --git a/KMFSysTray/kmfsystray.h b/KMFSysTray/kmfsystray.h index e292f08..7529daa 100644 --- a/KMFSysTray/kmfsystray.h +++ b/KMFSysTray/kmfsystray.h @@ -68,7 +68,7 @@ private: // Methods private: TDEAboutData *_aboutData; - KConfig *ksConfig; + TDEConfig *ksConfig; TQWidget *mainView; TQPixmap baseIcon; diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp index 6905513..efad73d 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 ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { if ( answer == 4 ) { slotExportIPT(); return ; @@ -125,7 +125,7 @@ void KMFIPTablesCompiler::slotExportIPT() { if ( m_errorHandler->showError( m_err ) ) { - if ( KIO::NetAccess::upload( tempfile.name(), url, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::upload( tempfile.name(), url, TDEApplication::kApplication()->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 45b974f..0d826f4 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 ( KIO::NetAccess::exists( saveUrl, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( saveUrl, false, TDEApplication::kApplication()->mainWidget() ) ) { if ( answer == 4 ) { return exportXMLRuleset( promptFile, asTemplate ); } else { @@ -177,7 +177,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) { f.flush(); f.close(); - if ( ! KIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) { kdDebug() << "Coudn't save File: " << url.url() << endl; m_err->setErrType( KMFError::NORMAL ); m_err->setErrMsg( i18n( "

Saving %1 Failed.

" diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp index 2ea592f..1de7bcc 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 ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { clear(); m_url.setFileName( i18n( "Untitled" ) ); return; @@ -318,11 +318,11 @@ void KMFGenericDoc::parseDocument( const KURL& url, TQStringList& errors ) { m_url = url; // setUrl( url ); emit documentChanged(); - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); return; // return this; } - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); // return this; } diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp index b1a86e5..6002ec0 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 ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { clear(); m_url.setFileName( i18n( "Untitled" ) ); return; @@ -447,11 +447,11 @@ void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) { // setUrl( url ); m_url = url; emit documentChanged(); - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); return; // return this; } - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); // return this; } diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp index e5ce904..24b2af7 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 ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { clear(); m_url.setFileName( i18n( "Untitled" ) ); return; @@ -256,10 +256,10 @@ void KMFNetwork::parseDocument( const KURL& url, TQStringList& errors ) { m_url = url; m_newSavePathNeeded = false; emit documentChanged(); - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); return; } - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); return; } diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp index f9634da..51b12c4 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 ( ! KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { kdDebug() << "KMFGenericDoc::loadProtocolLibrary() - no custom protocols found." << endl; return; } @@ -146,9 +146,9 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr kdDebug() << "KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& " << url.fileName() << " )" << endl; // TQPtrList *prots = new TQPtrList(); - KIO::UDSEntry f_props; + TDEIO::UDSEntry f_props; - if ( ! KIO::NetAccess::stat( url , f_props, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::stat( url , f_props, TDEApplication::kApplication()->mainWidget() ) ) { const TQString msg = i18n( "

The file %1 could not be loaded.

" "

If you are working with files stored on remote computers " @@ -168,7 +168,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr } TQString xmlfile; - if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { const TQString msg = i18n( "

Could not download file: %1

" ).arg( url.url() ); err->setErrType( KMFError::NORMAL ); err->setErrMsg( msg ); @@ -278,7 +278,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() { f.close(); - if ( ! KIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::upload( file.name(), url, TDEApplication::kApplication()->mainWidget() ) ) { kdDebug() << "Coudn't save File: " << url.url() << endl; err->setErrType( KMFError::NORMAL ); err->setErrMsg( i18n( "

Saving %1 Failed.

" diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp index b6c69ef..0dbdbb9 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 ( ! KIO::NetAccess::exists( localFile, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::exists( localFile, false, TDEApplication::kApplication()->mainWidget() ) ) { kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl; emit sigTargetChanged( this ); err->setErrType( KMFError::NORMAL ); diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp index 0f13cc0..09d2cd7 100644 --- a/kmyfirewall/core/kprocesswrapper.cpp +++ b/kmyfirewall/core/kprocesswrapper.cpp @@ -71,7 +71,7 @@ void TDEProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQStri m_stdErr = ""; TQString localScriptFile = command; KTempFile *f = new KTempFile(); - if ( ! KIO::NetAccess::exists( localScriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::exists( localScriptFile, false, TDEApplication::kApplication()->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 ( ! KIO::NetAccess::exists( scriptFile, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::exists( scriptFile, false, TDEApplication::kApplication()->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 ( ! KIO::NetAccess::upload( localScriptFile, remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::upload( localScriptFile, remFileUrl, TDEApplication::kApplication()->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 = KIO::NetAccess::fish_execute( execHost->getFishUrl(), cmd, TDEApplication::kApplication()->mainWidget() ); - if ( ! KIO::NetAccess::del( remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) { + const TQString& ret = TDEIO::NetAccess::fish_execute( execHost->getFishUrl(), cmd, TDEApplication::kApplication()->mainWidget() ); + if ( ! TDEIO::NetAccess::del( remFileUrl, TDEApplication::kApplication()->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 69e6788..f29e309 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.cpp +++ b/kmyfirewall/installer/kmfinstallerplugin.cpp @@ -186,7 +186,7 @@ void KMFInstallerPlugin::generateInstallerPackage( KMFTarget* tg ) { if ( url.fileName().isEmpty() ) return; - if ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->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" ) ); - KIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); - KIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); } inst2->generateInstallerPackage( tg, url ); - KIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); } } @@ -366,7 +366,7 @@ void KMFInstallerPlugin::slotGenerateInstallerPackage() { int answer = 0; - if ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { answer = KMessageBox::warningYesNo( 0, i18n( "File %1 already exists!

" "

Overwrite the existing file?

" ).arg( url.url() ) ); if ( answer == KMessageBox::No ) { diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp index 3b1da48..1139603 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 ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->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" ) ); - KIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); - KIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); } inst2->generateInstallerPackage( tg, url ); - KIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); } } @@ -1094,8 +1094,8 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* target, const KURL& p - // KIO::NetAccess::upload( packageArch->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); - KIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); + // TDEIO::NetAccess::upload( packageArch->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); + TDEIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); kdDebug() << "Wrote package: " << packageURL.prettyURL() << endl; diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp index cf4c68d..1a743be 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 ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { +// if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { // TQDateTime now = TQDateTime::currentDateTime(); // // TQString backUp; @@ -843,12 +843,12 @@ void KMFPFInstaller::cmdUninstallFW() { // backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) ); // // -// KIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); -// KIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); +// TDEIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); +// TDEIO::NetAccess::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() ); // } // // inst2->generateInstallerPackage( tg, url ); -// KIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); +// TDEIO::NetAccess::fish_execute( remDir, "chmod 700 /tmp/kmfpackage.kmfpkg", TDEApplication::kApplication()->mainWidget() ); // } // } @@ -1053,8 +1053,8 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa // // // -// // KIO::NetAccess::upload( packageArch->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); -// KIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); +// // TDEIO::NetAccess::upload( packageArch->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); +// TDEIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); // // kdDebug() << "Wrote package: " << packageURL.prettyURL() << endl; // diff --git a/kmyfirewall/kmfdisclaimer.cpp b/kmyfirewall/kmfdisclaimer.cpp index ee55feb..ac3982a 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() { - KConfig * _config = kapp->config(); + TDEConfig * _config = kapp->config(); _config->setGroup( "STARTUP" ); if ( c_show->isChecked() ) { _config->writeEntry( "show_disclaimer", "false" ); diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp index 979d653..a39ce88 100644 --- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp @@ -241,7 +241,7 @@ void KMFHostWidget::slotTestConnection() { if ( ! m_target ) { return; } - if ( KIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /", + if ( TDEIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /", TDEApplication::kApplication()->mainWidget() ) != 0) { KMessageBox::information( this, i18n("Conneted successfully to: %1").arg( m_target->toFriendlyString() ) ); } else { diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp index f35ded7..3fa3b72 100644 --- a/kmyfirewall/kmyfirewall.cpp +++ b/kmyfirewall/kmyfirewall.cpp @@ -395,7 +395,7 @@ bool KMyFirewall::checkRoot() { "As the file format used to save the rulesets has changed, " "rulesets created with KMyFirewall < 1.0beta1 WILL NOT work, don't even try it!" "

" ); - KConfig* _config = kapp->config(); + TDEConfig* _config = kapp->config(); _config->setGroup( "Notification Messages" ); TQString warn = ""; warn = _config->readEntry( "compatibility_warning" ); @@ -632,7 +632,7 @@ bool KMyFirewall::prepareForFileOpen( const KURL& url ) { return false; } - if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->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 ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { kdDebug() << "Could not download file." << endl; err->setErrType( KMFError::NORMAL ); err->setErrMsg( i18n( "Could not download file %1" ).arg( url.url() ) ); @@ -768,7 +768,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { network()->setCurrentTarget( tg ); updateCaption(); kdDebug() << "Returned IPT Doc for target: " << network()->currentTarget()->guiName() << endl; - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); return network()->currentDocAsIPTDoc(); } } else if ( root.nodeName() == XML::GenericDoc_DocumentElement ) { @@ -782,7 +782,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { network()->setCurrentTarget( tg ); updateCaption(); kdDebug() << "Returned GEneric Doc for target: " << network()->currentTarget()->guiName() << endl; - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); return network()->currentDocAsGenericDoc(); } } else if ( root.nodeName() == XML::KMFNetwork_DocumentElement ) { @@ -802,16 +802,16 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { kdDebug() << "Returned KMFNetwork " << network()->currentTarget()->guiName() << endl; - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); return network(); } - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); kdDebug() << "ERROR: No Loader Found!" << endl; err->setErrType( KMFError::NORMAL ); err->setErrMsg( i18n( "The document is not a valid KMyFirewall document." ) ); return 0; } - KIO::NetAccess::removeTempFile( xmlfile ); + TDEIO::NetAccess::removeTempFile( xmlfile ); err->setErrType( KMFError::NORMAL ); err->setErrMsg( i18n( "Could not download file %1." ).arg( url.url() ) ); return 0; @@ -819,9 +819,9 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) { KMFError* KMyFirewall::parseDocument( const KURL& url ) { kdDebug() << "void KMyFirewall::parseDocument(TQString& file)" << endl; - KIO::UDSEntry f_props; + TDEIO::UDSEntry f_props; - if ( ! KIO::NetAccess::stat( url , f_props, TDEApplication::kApplication()->mainWidget() ) ) { + if ( ! TDEIO::NetAccess::stat( url , f_props, TDEApplication::kApplication()->mainWidget() ) ) { closeSplash(); const TQString msg = i18n( "

The file %1 could not be loaded.

" "

If you are working with files stored on remote computers " @@ -1018,7 +1018,7 @@ void KMyFirewall::checkStatus() { fclose( sbin1 ); } } else { - if ( KIO::NetAccess::exists( network()->currentTarget()->getFishUrl() + "/etc/kmyfirewall", true, TDEApplication::kApplication()->mainWidget() ) ) { + if ( TDEIO::NetAccess::exists( network()->currentTarget()->getFishUrl() + "/etc/kmyfirewall", true, TDEApplication::kApplication()->mainWidget() ) ) { kdDebug() << "Firewall is installed" << endl; isInstalled = true; }