From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:37:21 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kmail/xfaceconfigurator.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kmail/xfaceconfigurator.cpp')

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() );
     }
   }
 
-- 
cgit v1.2.1