Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

pull/21/head
Timothy Pearson 11 years ago
parent 86d8364ac7
commit bd48df85eb

@ -668,7 +668,7 @@ void KNotesApp::killNote( KCal::Journal *journal )
void KNotesApp::acceptConnection() void KNotesApp::acceptConnection()
{ {
// Accept the connection and make KNotesNetworkReceiver do the job // 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 ) if ( s )
{ {
KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s ); KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s );

@ -57,7 +57,7 @@
using namespace KNetwork; using namespace KNetwork;
KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s ) KNotesNetworkReceiver::KNotesNetworkReceiver( TDEBufferedSocket *s )
: TQObject(), : TQObject(),
m_buffer( new TQByteArray() ), m_sock( s ) m_buffer( new TQByteArray() ), m_sock( s )
{ {

@ -37,7 +37,7 @@
class TQTimer; class TQTimer;
namespace KNetwork { namespace KNetwork {
class KBufferedSocket; class TDEBufferedSocket;
} }
@ -46,7 +46,7 @@ class KNotesNetworkReceiver : public TQObject
Q_OBJECT Q_OBJECT
public: public:
KNotesNetworkReceiver( KNetwork::KBufferedSocket * ); KNotesNetworkReceiver( KNetwork::TDEBufferedSocket * );
~KNotesNetworkReceiver(); ~KNotesNetworkReceiver();
signals: signals:
@ -62,7 +62,7 @@ private:
TQTimer *m_timer; // to avoid memory and connection floods TQTimer *m_timer; // to avoid memory and connection floods
TQByteArray *m_buffer; TQByteArray *m_buffer;
KNetwork::KBufferedSocket *m_sock; KNetwork::TDEBufferedSocket *m_sock;
TQString m_titleAddon; TQString m_titleAddon;
}; };

@ -39,7 +39,7 @@
KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port ) 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 ) m_note( 0 ), m_title( 0 ), m_sender( 0 ), m_index( 0 )
{ {
enableRead( false ); enableRead( false );

@ -40,7 +40,7 @@
using namespace KNetwork; using namespace KNetwork;
class KNotesNetworkSender : public KNetwork::KBufferedSocket class KNotesNetworkSender : public KNetwork::TDEBufferedSocket
{ {
Q_OBJECT Q_OBJECT

Loading…
Cancel
Save