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

pull/21/head
Timothy Pearson 11 年前
父节点 86d8364ac7
当前提交 bd48df85eb

@ -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 );

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

@ -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;
};

@ -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 );

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

正在加载...
取消
保存