summaryrefslogtreecommitdiffstats
path: root/kmail/xfaceconfigurator.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/xfaceconfigurator.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmail/xfaceconfigurator.cpp')
-rw-r--r--kmail/xfaceconfigurator.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 5279b78b2..5a279b92f 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -45,7 +45,7 @@
#include <kmessagebox.h>
#include <kurl.h>
#include <kio/netaccess.h>
-using namespace KIO;
+using namespace TDEIO;
#include <kxface.h>
using namespace KPIM;
#include <kabc/stdaddressbook.h>
@@ -211,13 +211,13 @@ namespace KMail {
void XFaceConfigurator::setXfaceFromFile( const KURL &url )
{
TQString tmpFile;
- if( KIO::NetAccess::download( url, tmpFile, this ) )
+ if( TDEIO::NetAccess::download( url, tmpFile, this ) )
{
KXFace xf;
mTextEdit->setText( xf.fromImage( TQImage( tmpFile ) ) );
- KIO::NetAccess::removeTempFile( tmpFile );
+ TDEIO::NetAccess::removeTempFile( tmpFile );
} else {
- KMessageBox::error(this, KIO::NetAccess::lastErrorString() );
+ KMessageBox::error(this, TDEIO::NetAccess::lastErrorString() );
}
}