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

---
 kio/misc/ksendbugmail/smtp.cpp | 14 +++++++-------
 kio/misc/ksendbugmail/smtp.h   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kio/misc/ksendbugmail')

diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index 36a417b88..d282782fc 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -158,7 +158,7 @@ void SMTP::connectTimerTick(void)
     }
 
     kdDebug() << "connecting to " << serverHost << ":" << hostPort << " ..... " << endl;
-    sock = new KSocket(serverHost.ascii(), hostPort);
+    sock = new TDESocket(serverHost.ascii(), hostPort);
 
     if(sock == 0L || sock->socket() < 0) {
         timeOutTimer.stop();
@@ -173,8 +173,8 @@ void SMTP::connectTimerTick(void)
     state = INIT;
     serverState = NONE;
 
-    connect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *)));
-    connect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *)));
+    connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
+    connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
     //    sock->enableRead(true);
     timeOutTimer.stop();
     kdDebug() << "connected" << endl;
@@ -202,7 +202,7 @@ void SMTP::interactTimedOut(void)
     emit error(INTERACTTIMEOUT);
 }
 
-void SMTP::socketRead(KSocket *socket)
+void SMTP::socketRead(TDESocket *socket)
 {
     int n, nl;
 
@@ -228,11 +228,11 @@ void SMTP::socketRead(KSocket *socket)
         interactTimer.start(timeOut, true);
 }
 
-void SMTP::socketClose(KSocket *socket)
+void SMTP::socketClose(TDESocket *socket)
 {
     timeOutTimer.stop();
-    disconnect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *)));
-    disconnect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *)));
+    disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
+    disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
     socket->enableRead(false);
     kdDebug() << "connection terminated" << endl;
     connected = false;
diff --git a/kio/misc/ksendbugmail/smtp.h b/kio/misc/ksendbugmail/smtp.h
index 707d20ae4..acdb4a3c3 100644
--- a/kio/misc/ksendbugmail/smtp.h
+++ b/kio/misc/ksendbugmail/smtp.h
@@ -104,8 +104,8 @@ public slots:
     void connectTimedOut();
     void interactTimedOut();
 
-    void socketRead(KSocket *);
-    void socketClose(KSocket *);
+    void socketRead(TDESocket *);
+    void socketClose(TDESocket *);
 
 signals:
     void connectionClosed();
@@ -131,7 +131,7 @@ private:
 
     TQString domainName;
 
-    KSocket *sock;
+    TDESocket *sock;
     TQTimer connectTimer;
     TQTimer timeOutTimer;
     TQTimer interactTimer;
-- 
cgit v1.2.1