summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:15:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:15:51 -0600
commitd1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e (patch)
treeecd8c94dc36cb35dd4810a2b05d1b78bb969e143 /kioslave
parent703fb0c89c2eee56a1e613e67a446db9d4287929 (diff)
downloadtdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.tar.gz
tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/http/http.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index cbff13fdf..0973b0b3b 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -2152,7 +2152,7 @@ bool HTTPProtocol::httpOpenConnection()
* data to be sent in addition to the header (POST requests) and there is no
* way for this function to get that data. This function is called in the
* slotPut() or slotGet() functions which, in turn, are called (indirectly) as
- * a result of a KIOJob::put() or KIOJob::get(). It is those latter functions
+ * a result of a TDEIOJob::put() or TDEIOJob::get(). It is those latter functions
* which are responsible for starting up this ioslave in the first place.
* This means that 'httpOpen' is called (essentially) as soon as the ioslave
* is created -- BEFORE any data gets to this slave.
@@ -4317,7 +4317,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d)
/**
* This function is our "receive" function. It is responsible for
* downloading the message (not the header) from the HTTP server. It
- * is called either as a response to a client's KIOJob::dataEnd()
+ * is called either as a response to a client's TDEIOJob::dataEnd()
* (meaning that the client is done sending data) or by 'httpOpen()'
* (if we are in the process of a PUT/POST request). It can also be
* called by a webDAV function, to receive stat/list/property/etc.