From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- khtml/ecma/xmlhttprequest.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'khtml/ecma/xmlhttprequest.h') diff --git a/khtml/ecma/xmlhttprequest.h b/khtml/ecma/xmlhttprequest.h index 2c646708e..93420453e 100644 --- a/khtml/ecma/xmlhttprequest.h +++ b/khtml/ecma/xmlhttprequest.h @@ -75,12 +75,12 @@ namespace KJS { XMLHttpRequestQObject *qObject; #ifdef APPLE_CHANGES - void slotData( KIO::Job* job, const char *data, int size ); + void slotData( TDEIO::Job* job, const char *data, int size ); #else - void slotData( KIO::Job* job, const TQByteArray &data ); + void slotData( TDEIO::Job* job, const TQByteArray &data ); #endif - void slotFinished( KIO::Job* ); - void slotRedirection( KIO::Job*, const KURL& ); + void slotFinished( TDEIO::Job* ); + void slotRedirection( TDEIO::Job*, const KURL& ); void processSyncLoadResults(const TQByteArray &data, const KURL &finalURL, const TQString &headers); @@ -103,7 +103,7 @@ namespace KJS { TQString m_mimeTypeOverride; TQString contentType; - KIO::TransferJob * job; + TDEIO::TransferJob * job; XMLHttpRequestState state; JSEventListener *onReadyStateChangeListener; @@ -129,9 +129,9 @@ namespace KJS { XMLHttpRequestQObject(XMLHttpRequest *_jsObject); public slots: - void slotData( KIO::Job* job, const TQByteArray &data ); - void slotFinished( KIO::Job* job ); - void slotRedirection( KIO::Job* job, const KURL& url); + void slotData( TDEIO::Job* job, const TQByteArray &data ); + void slotFinished( TDEIO::Job* job ); + void slotRedirection( TDEIO::Job* job, const KURL& url); private: XMLHttpRequest *jsObject; -- cgit v1.2.3