From d46a1fe34693137bbc38a0a79593af420ea0914b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:12:44 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- plugins/ipfilter/convertdialog.cpp | 4 ++-- plugins/ipfilter/ipblockingprefpage.cpp | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'plugins/ipfilter') diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp index 5812453..a6cf3c7 100644 --- a/plugins/ipfilter/convertdialog.cpp +++ b/plugins/ipfilter/convertdialog.cpp @@ -94,7 +94,7 @@ namespace kt if(target.exists()) { //make backup - KIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", -1, true); + TDEIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", -1, true); } /* READ INPUT FILE */ @@ -245,7 +245,7 @@ namespace kt TQFile temp( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp"); if(temp.exists()) { - KIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", -1, true); + TDEIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", -1, true); temp.remove(); } diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp index 6c9b46f..fb1cd9d 100644 --- a/plugins/ipfilter/ipblockingprefpage.cpp +++ b/plugins/ipfilter/ipblockingprefpage.cpp @@ -107,8 +107,8 @@ namespace kt KURL url(m_url->url()); KURL dest(target); KURL temp(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.tmp"); - if(KIO::NetAccess::exists(temp,false, this)) - KIO::NetAccess::del(temp,this); + if(TDEIO::NetAccess::exists(temp,false, this)) + TDEIO::NetAccess::del(temp,this); bool download = true; @@ -117,26 +117,26 @@ namespace kt if((KMessageBox::questionYesNo(this, i18n("Selected file already exists, do you want to download it again?"),i18n("File Exists")) == 4)) download = false; else - KIO::NetAccess::move(target, temp); + TDEIO::NetAccess::move(target, temp); } if(download) { if(!url.isLocalFile()) { - if (KIO::NetAccess::download(url,target,NULL)) + if (TDEIO::NetAccess::download(url,target,NULL)) { //Level1 list successfully downloaded, remove temporary file - KIO::NetAccess::removeTempFile(target); - KIO::NetAccess::del(temp, this); + TDEIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::del(temp, this); } else { - TQString err = KIO::NetAccess::lastErrorString(); + TQString err = TDEIO::NetAccess::lastErrorString(); if(err != TQString()) - KMessageBox::error(0,KIO::NetAccess::lastErrorString(),i18n("Error")); + KMessageBox::error(0,TDEIO::NetAccess::lastErrorString(),i18n("Error")); else - KIO::NetAccess::move(temp, target); + TDEIO::NetAccess::move(temp, target); //we don't want to convert since download failed @@ -145,9 +145,9 @@ namespace kt } else { - if (!KIO::NetAccess::file_copy(url,dest, -1, true)) + if (!TDEIO::NetAccess::file_copy(url,dest, -1, true)) { - KMessageBox::error(0,KIO::NetAccess::lastErrorString(),i18n("Error")); + KMessageBox::error(0,TDEIO::NetAccess::lastErrorString(),i18n("Error")); return; } } @@ -158,13 +158,13 @@ namespace kt { KURL zipfile("zip:" + target + "/splist.txt"); KURL destinationfile(target + ".txt"); - KIO::NetAccess::file_copy(zipfile,destinationfile, -1, true); + TDEIO::NetAccess::file_copy(zipfile,destinationfile, -1, true); } else { KURL zipfile(target); KURL destinationfile(target + ".txt"); - KIO::NetAccess::file_copy(zipfile,destinationfile, -1, true); + TDEIO::NetAccess::file_copy(zipfile,destinationfile, -1, true); } } @@ -194,7 +194,7 @@ namespace kt if((KMessageBox::questionYesNo(this,i18n("Filter file (level1.dat) already exists, do you want to convert it again?"),i18n("File Exists")) == 4)) return; // else -// KIO::NetAccess::del(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat", NULL); +// TDEIO::NetAccess::del(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat", NULL); } ConvertDialog dlg(m_plugin); dlg.exec(); -- cgit v1.2.1