TDE
/
kmyfirewall
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 3b543760cb
commit c624bc4eb9
17 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File

2
ChangeLog
Unescape View File

@ -81,7 +81,7 @@
* KMFConfigDialog: platform and backend values are now set by the plugins properties * 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 new dialog that lets you chooss the interface at startup, not finished yet
* KMFSelectInterface: added screenshot loading, smaller fixes * 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 * Several cosmetical changes
* New Class KMFAppState: Holds some static variables giving information about the app's state * New Class KMFAppState: Holds some static variables giving information about the app's state
* Some minor Fixes * Some minor Fixes

2
KMFSysTray/app.cpp
Unescape View File

@ -39,7 +39,7 @@ MainApp::MainApp() : TDEApplication() {
// Get the current application configuration handle // Get the current application configuration handle
// KMessageBox::information( 0, i18n( "Starting Deamon" ) ); // KMessageBox::information( 0, i18n( "Starting Deamon" ) );
// KConfig *ksConfig = config(); // TDEConfig *ksConfig = config();
// KMFIPTWatcher *watch = new KMFIPTWatcher( this, "KMFIPTWatcher" ); // KMFIPTWatcher *watch = new KMFIPTWatcher( this, "KMFIPTWatcher" );
// MainWidget *mainWid = new MainWidget( 0 ); // MainWidget *mainWid = new MainWidget( 0 );
// connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningStatus( bool ) ) ); // connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningStatus( bool ) ) );

2
KMFSysTray/kmfsystray.h
Unescape View File

@ -68,7 +68,7 @@ private: // Methods
private: private:
TDEAboutData *_aboutData; TDEAboutData *_aboutData;
KConfig *ksConfig; TDEConfig *ksConfig;
TQWidget *mainView; TQWidget *mainView;
TQPixmap baseIcon; TQPixmap baseIcon;

4
kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
Unescape View File

@ -101,7 +101,7 @@ void KMFIPTablesCompiler::slotExportIPT() {
return ; return ;
int answer = 0; int answer = 0;
while ( answer != 3 ) { while ( answer != 3 ) {
if ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) {
if ( answer == 4 ) { if ( answer == 4 ) {
slotExportIPT(); slotExportIPT();
return ; return ;
@ -125,7 +125,7 @@ void KMFIPTablesCompiler::slotExportIPT() {
if ( m_errorHandler->showError( m_err ) ) { 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 ); // statusBar() ->message( i18n( "Wrote file: " ) + url.fileName() , 5000 );
} else { } else {
kdDebug() << "Couldn't upload file!!!" << tempfile.name() << endl; kdDebug() << "Couldn't upload file!!!" << tempfile.name() << endl;

4
kmyfirewall/core/kmfdoc.cpp
Unescape View File

@ -146,7 +146,7 @@ KMFError* KMFDoc::exportXMLRuleset( bool promptFile, bool asTemplate ) {
} }
int answer = 0; int answer = 0;
while ( answer != KMessageBox::Yes ) { 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 ) { if ( answer == 4 ) {
return exportXMLRuleset( promptFile, asTemplate ); return exportXMLRuleset( promptFile, asTemplate );
} else { } else {
@ -177,7 +177,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) {
f.flush(); f.flush();
f.close(); 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; kdDebug() << "Coudn't save File: " << url.url() << endl;
m_err->setErrType( KMFError::NORMAL ); m_err->setErrType( KMFError::NORMAL );
m_err->setErrMsg( i18n( "<qt><p><b>Saving <i>%1</i> Failed.</b></p>" m_err->setErrMsg( i18n( "<qt><p><b>Saving <i>%1</i> Failed.</b></p>"

6
kmyfirewall/core/kmfgenericdoc.cpp
Unescape View File

@ -287,7 +287,7 @@ const TQString& KMFGenericDoc::compile() {
void KMFGenericDoc::parseDocument( const KURL& url, TQStringList& errors ) { void KMFGenericDoc::parseDocument( const KURL& url, TQStringList& errors ) {
// kdDebug() << "KMFDoc* KMFGenericDoc::parseDocument( const KURL& )" << endl; // kdDebug() << "KMFDoc* KMFGenericDoc::parseDocument( const KURL& )" << endl;
TQString xmlfile; TQString xmlfile;
if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
clear(); clear();
m_url.setFileName( i18n( "Untitled" ) ); m_url.setFileName( i18n( "Untitled" ) );
return; return;
@ -318,11 +318,11 @@ void KMFGenericDoc::parseDocument( const KURL& url, TQStringList& errors ) {
m_url = url; m_url = url;
// setUrl( url ); // setUrl( url );
emit documentChanged(); emit documentChanged();
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
return; return;
// return this; // return this;
} }
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
// return this; // return this;
} }

6
kmyfirewall/core/kmfiptdoc.cpp
Unescape View File

@ -408,7 +408,7 @@ const TQString& KMFIPTDoc::compile() {
void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) { void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) {
// kdDebug() << "KMFIPTDoc::parseDocument()" << endl; // kdDebug() << "KMFIPTDoc::parseDocument()" << endl;
TQString xmlfile; TQString xmlfile;
if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
clear(); clear();
m_url.setFileName( i18n( "Untitled" ) ); m_url.setFileName( i18n( "Untitled" ) );
return; return;
@ -447,11 +447,11 @@ void KMFIPTDoc::parseDocument( const KURL& url, TQStringList& errors ) {
// setUrl( url ); // setUrl( url );
m_url = url; m_url = url;
emit documentChanged(); emit documentChanged();
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
return; return;
// return this; // return this;
} }
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
// return this; // return this;
} }

6
kmyfirewall/core/kmfnetwork.cpp
Unescape View File

@ -216,7 +216,7 @@ bool KMFNetwork::isEmpty() {
void KMFNetwork::parseDocument( const KURL& url, TQStringList& errors ) { void KMFNetwork::parseDocument( const KURL& url, TQStringList& errors ) {
kdDebug() << "KMFDoc* KMFNetwork::parseDocument( const KURL& url )" << endl; kdDebug() << "KMFDoc* KMFNetwork::parseDocument( const KURL& url )" << endl;
TQString xmlfile; TQString xmlfile;
if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
clear(); clear();
m_url.setFileName( i18n( "Untitled" ) ); m_url.setFileName( i18n( "Untitled" ) );
return; return;
@ -256,10 +256,10 @@ void KMFNetwork::parseDocument( const KURL& url, TQStringList& errors ) {
m_url = url; m_url = url;
m_newSavePathNeeded = false; m_newSavePathNeeded = false;
emit documentChanged(); emit documentChanged();
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
return; return;
} }
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
return; return;
} }

10
kmyfirewall/core/kmfprotocollibrary.cpp
Unescape View File

@ -126,7 +126,7 @@ void KMFProtocolLibrary::forceProtocolLibraryReload() {
url.setPath( file ); url.setPath( file );
kdDebug() << "CUSTOM lib at: " << file << endl; kdDebug() << "CUSTOM lib at: " << file << endl;
// KURL tmpurl = KURL( dir + "protocols/kmfcustomprotocollibrary.xml" ); // 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; kdDebug() << "KMFGenericDoc::loadProtocolLibrary() - no custom protocols found." << endl;
return; return;
} }
@ -146,9 +146,9 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr
kdDebug() << "KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& " << url.fileName() << " )" << endl; kdDebug() << "KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& " << url.fileName() << " )" << endl;
// TQPtrList<KMFProtocol> *prots = new TQPtrList<KMFProtocol>(); // TQPtrList<KMFProtocol> *prots = new TQPtrList<KMFProtocol>();
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( "<qt><p>The file <b>%1</b> could not be loaded.</p>" 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 " "<p>If you are working with files stored on remote computers "
@ -168,7 +168,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url, KMFEr
} }
TQString xmlfile; TQString xmlfile;
if ( ! KIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) { if ( ! TDEIO::NetAccess::download( url, xmlfile, TDEApplication::kApplication()->mainWidget() ) ) {
const TQString msg = i18n( "<qt><p>Could not download file: <b>%1</b></p></qt>" ).arg( url.url() ); const TQString msg = i18n( "<qt><p>Could not download file: <b>%1</b></p></qt>" ).arg( url.url() );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( msg ); err->setErrMsg( msg );
@ -278,7 +278,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
f.close(); 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; kdDebug() << "Coudn't save File: " << url.url() << endl;
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt><p><b>Saving <i>%1</i> Failed.</b></p>" err->setErrMsg( i18n( "<qt><p><b>Saving <i>%1</i> Failed.</b></p>"

2
kmyfirewall/core/kmftarget.cpp
Unescape View File

@ -229,7 +229,7 @@ KMFError* KMFTarget::tryAutoConfiguration() {
kdDebug() << "Search Path: " << path << endl; kdDebug() << "Search Path: " << path << endl;
TQString localFile = TDEGlobal::dirs() ->findResource( "data", path ); 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; kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl;
emit sigTargetChanged( this ); emit sigTargetChanged( this );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );

10
kmyfirewall/core/kprocesswrapper.cpp
Unescape View File

@ -71,7 +71,7 @@ void TDEProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQStri
m_stdErr = ""; m_stdErr = "";
TQString localScriptFile = command; TQString localScriptFile = command;
KTempFile *f = new KTempFile(); 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; kdDebug() << "TDEProcessWrapper::slotStartLocalJob(...) - creating temporary script file." << endl;
TQTextStream *ts = f->textStream(); TQTextStream *ts = f->textStream();
*ts << command << endl; *ts << command << endl;
@ -105,7 +105,7 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr
m_stdOut = ""; m_stdOut = "";
m_stdErr = ""; m_stdErr = "";
KTempFile *f = new KTempFile(); 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; kdDebug() << "TDEProcessWrapper::slotStartRemoteJob(...) - creating temporary script file." << endl;
TQTextStream *ts = f->textStream(); TQTextStream *ts = f->textStream();
*ts << scriptFile << endl; *ts << scriptFile << endl;
@ -119,7 +119,7 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr
KURL remFileUrl( execHost->getFishUrl() + "/tmp/" + uuid.toString() ); KURL remFileUrl( execHost->getFishUrl() + "/tmp/" + uuid.toString() );
kdDebug() << "UPLOADING: Temporary script file: " << localScriptFile << " to: " << remFileUrl.url() << endl; 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; kdDebug() << "ERROR: Could not upload temp file." << endl;
m_exitedNormal = false; m_exitedNormal = false;
m_status = 1; m_status = 1;
@ -136,8 +136,8 @@ void TDEProcessWrapper::slotStartRemoteJob( const TQString& jobName, const TQStr
TQString cmd = "bash /tmp/" + uuid.toString(); TQString cmd = "bash /tmp/" + uuid.toString();
kdDebug() << "Execute: " << cmd << " at: " << execHost->getFishUrl() << endl; kdDebug() << "Execute: " << cmd << " at: " << execHost->getFishUrl() << endl;
const TQString& ret = KIO::NetAccess::fish_execute( execHost->getFishUrl(), cmd, TDEApplication::kApplication()->mainWidget() ); const TQString& ret = TDEIO::NetAccess::fish_execute( execHost->getFishUrl(), cmd, TDEApplication::kApplication()->mainWidget() );
if ( ! KIO::NetAccess::del( remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) { if ( ! TDEIO::NetAccess::del( remFileUrl, TDEApplication::kApplication()->mainWidget() ) ) {
m_exitedNormal = false; m_exitedNormal = false;
m_status = 1; m_status = 1;
m_stdErr = i18n( "Could not delete the temporary comand script file." ); m_stdErr = i18n( "Could not delete the temporary comand script file." );

10
kmyfirewall/installer/kmfinstallerplugin.cpp
Unescape View File

@ -186,7 +186,7 @@ void KMFInstallerPlugin::generateInstallerPackage( KMFTarget* tg ) {
if ( url.fileName().isEmpty() ) if ( url.fileName().isEmpty() )
return; return;
if ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) {
TQDateTime now = TQDateTime::currentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
TQString backUp; TQString backUp;
@ -201,12 +201,12 @@ void KMFInstallerPlugin::generateInstallerPackage( KMFTarget* tg ) {
backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) ); backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) );
KIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); TDEIO::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::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() );
} }
inst2->generateInstallerPackage( tg, url ); 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; 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( "<qt>File <b>%1</b> already exists!</p>" 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() ) ); "<p><b>Overwrite the existing file?</b></p></qt>" ).arg( url.url() ) );
if ( answer == KMessageBox::No ) { if ( answer == KMessageBox::No ) {

12
kmyfirewall/installer/linux/kmfiptinstaller.cpp
Unescape View File

@ -870,7 +870,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* tg ) {
if ( url.fileName().isEmpty() ) if ( url.fileName().isEmpty() )
return; return;
if ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) {
TQDateTime now = TQDateTime::currentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
TQString backUp; TQString backUp;
@ -885,12 +885,12 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* tg ) {
backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) ); backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) );
KIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); TDEIO::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::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() );
} }
inst2->generateInstallerPackage( tg, url ); 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() ); // TDEIO::NetAccess::upload( packageArch->name(), packageURL, TDEApplication::kApplication()->mainWidget() );
KIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); TDEIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() );
kdDebug() << "Wrote package: " << packageURL.prettyURL() << endl; kdDebug() << "Wrote package: " << packageURL.prettyURL() << endl;

12
kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
Unescape View File

@ -828,7 +828,7 @@ void KMFPFInstaller::cmdUninstallFW() {
// if ( url.fileName().isEmpty() ) // if ( url.fileName().isEmpty() )
// return; // return;
// //
// if ( KIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) { // if ( TDEIO::NetAccess::exists( url, false, TDEApplication::kApplication()->mainWidget() ) ) {
// TQDateTime now = TQDateTime::currentDateTime(); // TQDateTime now = TQDateTime::currentDateTime();
// //
// TQString backUp; // TQString backUp;
@ -843,12 +843,12 @@ void KMFPFInstaller::cmdUninstallFW() {
// backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) ); // backUp.append( now.toString( "dd.MM.yyyy.hh:mm:ss" ) );
// //
// //
// KIO::NetAccess::file_move( url, newUrl, 700, true, true, TDEApplication::kApplication()->mainWidget() ); // TDEIO::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::fish_execute( remDir, "chmod 400 /tmp/" + backFileName, TDEApplication::kApplication()->mainWidget() );
// } // }
// //
// inst2->generateInstallerPackage( tg, url ); // 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() ); // // TDEIO::NetAccess::upload( packageArch->name(), packageURL, TDEApplication::kApplication()->mainWidget() );
// KIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() ); // TDEIO::NetAccess::upload( kmf_install_package->name(), packageURL, TDEApplication::kApplication()->mainWidget() );
// //
// kdDebug() << "Wrote package: " << packageURL.prettyURL() << endl; // kdDebug() << "Wrote package: " << packageURL.prettyURL() << endl;
// //

2
kmyfirewall/kmfdisclaimer.cpp
Unescape View File

@ -33,7 +33,7 @@ KMFDisclaimer::KMFDisclaimer( TQWidget *parent, const char *name, bool modal, WF
KMFDisclaimer::~KMFDisclaimer() {} KMFDisclaimer::~KMFDisclaimer() {}
void KMFDisclaimer::accept() { void KMFDisclaimer::accept() {
KConfig * _config = kapp->config(); TDEConfig * _config = kapp->config();
_config->setGroup( "STARTUP" ); _config->setGroup( "STARTUP" );
if ( c_show->isChecked() ) { if ( c_show->isChecked() ) {
_config->writeEntry( "show_disclaimer", "false" ); _config->writeEntry( "show_disclaimer", "false" );

2
kmyfirewall/kmfwidgets/kmfhostwidget.cpp
Unescape View File

@ -241,7 +241,7 @@ void KMFHostWidget::slotTestConnection() {
if ( ! m_target ) { if ( ! m_target ) {
return; return;
} }
if ( KIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /", if ( TDEIO::NetAccess::fish_execute( m_target->getFishUrl(), "ls /",
TDEApplication::kApplication()->mainWidget() ) != 0) { TDEApplication::kApplication()->mainWidget() ) != 0) {
KMessageBox::information( this, i18n("Conneted successfully to: %1").arg( m_target->toFriendlyString() ) ); KMessageBox::information( this, i18n("Conneted successfully to: %1").arg( m_target->toFriendlyString() ) );
} else { } else {

22
kmyfirewall/kmyfirewall.cpp
Unescape View File

@ -395,7 +395,7 @@ bool KMyFirewall::checkRoot() {
"As the file format used to save the rulesets has changed, " "As the file format used to save the rulesets has changed, "
"rulesets created with KMyFirewall &lt; 1.0beta1 <b>WILL NOT</b> work, don't even try it!" "rulesets created with KMyFirewall &lt; 1.0beta1 <b>WILL NOT</b> work, don't even try it!"
"</p></qt>" ); "</p></qt>" );
KConfig* _config = kapp->config(); TDEConfig* _config = kapp->config();
_config->setGroup( "Notification Messages" ); _config->setGroup( "Notification Messages" );
TQString warn = ""; TQString warn = "";
warn = _config->readEntry( "compatibility_warning" ); warn = _config->readEntry( "compatibility_warning" );
@ -632,7 +632,7 @@ bool KMyFirewall::prepareForFileOpen( const KURL& url ) {
return false; 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; kdDebug() << "Could not download file." << endl;
return false; return false;
} }
@ -708,7 +708,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) {
kdDebug() << "void KMyFirewall::getDocumentLoaderForUrl( const KURL&" << url.fileName() << " )" << endl; kdDebug() << "void KMyFirewall::getDocumentLoaderForUrl( const KURL&" << url.fileName() << " )" << endl;
err->setErrType( KMFError::OK ); err->setErrType( KMFError::OK );
TQString xmlfile; 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; kdDebug() << "Could not download file." << endl;
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt>Could not download file %1</qt>" ).arg( url.url() ) ); err->setErrMsg( i18n( "<qt>Could not download file %1</qt>" ).arg( url.url() ) );
@ -768,7 +768,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) {
network()->setCurrentTarget( tg ); network()->setCurrentTarget( tg );
updateCaption(); updateCaption();
kdDebug() << "Returned IPT Doc for target: " << network()->currentTarget()->guiName() << endl; kdDebug() << "Returned IPT Doc for target: " << network()->currentTarget()->guiName() << endl;
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
return network()->currentDocAsIPTDoc(); return network()->currentDocAsIPTDoc();
} }
} else if ( root.nodeName() == XML::GenericDoc_DocumentElement ) { } else if ( root.nodeName() == XML::GenericDoc_DocumentElement ) {
@ -782,7 +782,7 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) {
network()->setCurrentTarget( tg ); network()->setCurrentTarget( tg );
updateCaption(); updateCaption();
kdDebug() << "Returned GEneric Doc for target: " << network()->currentTarget()->guiName() << endl; kdDebug() << "Returned GEneric Doc for target: " << network()->currentTarget()->guiName() << endl;
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
return network()->currentDocAsGenericDoc(); return network()->currentDocAsGenericDoc();
} }
} else if ( root.nodeName() == XML::KMFNetwork_DocumentElement ) { } 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; kdDebug() << "Returned KMFNetwork " << network()->currentTarget()->guiName() << endl;
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
return network(); return network();
} }
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
kdDebug() << "ERROR: No Loader Found!" << endl; kdDebug() << "ERROR: No Loader Found!" << endl;
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt>The document is not a valid KMyFirewall document.</qt>" ) ); err->setErrMsg( i18n( "<qt>The document is not a valid KMyFirewall document.</qt>" ) );
return 0; return 0;
} }
KIO::NetAccess::removeTempFile( xmlfile ); TDEIO::NetAccess::removeTempFile( xmlfile );
err->setErrType( KMFError::NORMAL ); err->setErrType( KMFError::NORMAL );
err->setErrMsg( i18n( "<qt>Could not download file %1.</qt>" ).arg( url.url() ) ); err->setErrMsg( i18n( "<qt>Could not download file %1.</qt>" ).arg( url.url() ) );
return 0; return 0;
@ -819,9 +819,9 @@ KMFDoc* KMyFirewall::getDocumentLoaderForUrl( const KURL& url, KMFError* err ) {
KMFError* KMyFirewall::parseDocument( const KURL& url ) { KMFError* KMyFirewall::parseDocument( const KURL& url ) {
kdDebug() << "void KMyFirewall::parseDocument(TQString& file)" << endl; 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(); closeSplash();
const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>" 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 " "<p>If you are working with files stored on remote computers "
@ -1018,7 +1018,7 @@ void KMyFirewall::checkStatus() {
fclose( sbin1 ); fclose( sbin1 );
} }
} else { } 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; kdDebug() << "Firewall is installed" << endl;
isInstalled = true; isInstalled = true;
} }

Write Preview
Loading…
Cancel
Save