summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:18:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:18:01 -0600
commitbd48df85ebd2f1604edcb231fdc4af4197f8bede (patch)
treee110a3b535bcc368a365fc8f9c7fe52e22ff3698
parent86d8364ac704bdc8ad2dfcf52307d9626cfac567 (diff)
downloadtdepim-bd48df85ebd2f1604edcb231fdc4af4197f8bede.tar.gz
tdepim-bd48df85ebd2f1604edcb231fdc4af4197f8bede.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
-rw-r--r--knotes/knotesapp.cpp2
-rw-r--r--knotes/knotesnetrecv.cpp2
-rw-r--r--knotes/knotesnetrecv.h6
-rw-r--r--knotes/knotesnetsend.cpp2
-rw-r--r--knotes/knotesnetsend.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index d53ac911c..718a35004 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -668,7 +668,7 @@ void KNotesApp::killNote( KCal::Journal *journal )
void KNotesApp::acceptConnection()
{
// Accept the connection and make KNotesNetworkReceiver do the job
- KBufferedSocket *s = static_cast<KBufferedSocket *>(m_listener->accept());
+ TDEBufferedSocket *s = static_cast<TDEBufferedSocket *>(m_listener->accept());
if ( s )
{
KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s );
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 5845812c7..94ff29526 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -57,7 +57,7 @@
using namespace KNetwork;
-KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s )
+KNotesNetworkReceiver::KNotesNetworkReceiver( TDEBufferedSocket *s )
: TQObject(),
m_buffer( new TQByteArray() ), m_sock( s )
{
diff --git a/knotes/knotesnetrecv.h b/knotes/knotesnetrecv.h
index e8fab803b..927abac8b 100644
--- a/knotes/knotesnetrecv.h
+++ b/knotes/knotesnetrecv.h
@@ -37,7 +37,7 @@
class TQTimer;
namespace KNetwork {
- class KBufferedSocket;
+ class TDEBufferedSocket;
}
@@ -46,7 +46,7 @@ class KNotesNetworkReceiver : public TQObject
Q_OBJECT
public:
- KNotesNetworkReceiver( KNetwork::KBufferedSocket * );
+ KNotesNetworkReceiver( KNetwork::TDEBufferedSocket * );
~KNotesNetworkReceiver();
signals:
@@ -62,7 +62,7 @@ private:
TQTimer *m_timer; // to avoid memory and connection floods
TQByteArray *m_buffer;
- KNetwork::KBufferedSocket *m_sock;
+ KNetwork::TDEBufferedSocket *m_sock;
TQString m_titleAddon;
};
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 20e2b07f1..001dcf9ff 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -39,7 +39,7 @@
KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port )
- : KBufferedSocket( hostname, TQString::number( port ) ),
+ : TDEBufferedSocket( hostname, TQString::number( port ) ),
m_note( 0 ), m_title( 0 ), m_sender( 0 ), m_index( 0 )
{
enableRead( false );
diff --git a/knotes/knotesnetsend.h b/knotes/knotesnetsend.h
index c8611e1cf..ba8679110 100644
--- a/knotes/knotesnetsend.h
+++ b/knotes/knotesnetsend.h
@@ -40,7 +40,7 @@
using namespace KNetwork;
-class KNotesNetworkSender : public KNetwork::KBufferedSocket
+class KNotesNetworkSender : public KNetwork::TDEBufferedSocket
{
Q_OBJECT