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

---
 kioslave/pop3/pop3.cc | 12 ++++++------
 kioslave/pop3/pop3.h  | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kioslave/pop3')

diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc
index f4a061521..e950f79c1 100644
--- a/kioslave/pop3/pop3.cc
+++ b/kioslave/pop3/pop3.cc
@@ -73,7 +73,7 @@ extern "C" {
   int KDE_EXPORT kdemain(int argc, char **argv);
 }
 
-using namespace KIO;
+using namespace TDEIO;
 
 #ifdef HAVE_LIBSASL2
 static sasl_callback_t callbacks[] = {
@@ -349,7 +349,7 @@ void POP3Protocol::closeConnection()
   opened = false;
 }
 
-int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai )
+int POP3Protocol::loginAPOP( char *challenge, TDEIO::AuthInfo &ai )
 {
   char buf[512];
 
@@ -457,7 +457,7 @@ bool POP3Protocol::saslInteract( void *in, AuthInfo &ai )
 error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occured during authentication: %1").arg \
 ( TQString::fromUtf8( sasl_errdetail( conn ) ))); \
 
-int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
+int POP3Protocol::loginSASL( TDEIO::AuthInfo &ai )
 {
 #ifdef HAVE_LIBSASL2
   char buf[512];
@@ -606,7 +606,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
 #endif
 }
 
-bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
+bool POP3Protocol::loginPASS( TDEIO::AuthInfo &ai )
 {
   char buf[512];
 
@@ -749,7 +749,7 @@ bool POP3Protocol::pop3_open()
       return false;
     }
 
-    KIO::AuthInfo authInfo;
+    TDEIO::AuthInfo authInfo;
     authInfo.username = m_sUser;
     authInfo.password = m_sPass;
     authInfo.prompt = i18n("Username and password for your POP3 account:");
@@ -1191,7 +1191,7 @@ void POP3Protocol::listDir(const KURL &)
     atom.m_long = realGetSize(i + 1);
     entry.append(atom);
 
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = S_IRUSR | S_IXUSR | S_IWUSR;
     entry.append (atom);
 
diff --git a/kioslave/pop3/pop3.h b/kioslave/pop3/pop3.h
index 9c6ca9185..60b23c3e8 100644
--- a/kioslave/pop3/pop3.h
+++ b/kioslave/pop3/pop3.h
@@ -39,7 +39,7 @@
 
 #define MAX_PACKET_LEN 4096
 
-class POP3Protocol:public KIO::TCPSlaveBase {
+class POP3Protocol:public TDEIO::TCPSlaveBase {
 public:
   POP3Protocol(const TQCString & pool, const TQCString & app, bool SSL);
   virtual ~ POP3Protocol();
@@ -107,17 +107,17 @@ protected:
   /**
    * Authenticate via APOP
    */  
-  int loginAPOP( char *challenge, KIO::AuthInfo &ai );
+  int loginAPOP( char *challenge, TDEIO::AuthInfo &ai );
 
-  bool saslInteract( void *in, KIO::AuthInfo &ai );
+  bool saslInteract( void *in, TDEIO::AuthInfo &ai );
   /**
    * Authenticate via SASL
    */  
-  int loginSASL( KIO::AuthInfo &ai );
+  int loginSASL( TDEIO::AuthInfo &ai );
   /**
    * Authenticate via traditional USER/PASS
    */  
-  bool loginPASS( KIO::AuthInfo &ai );
+  bool loginPASS( TDEIO::AuthInfo &ai );
 
   int m_cmd;
   unsigned short int m_iOldPort;
-- 
cgit v1.2.1