summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/ecma/xmlhttprequest.cpp4
-rw-r--r--tdehtml/tdehtml_pagecache.h2
-rw-r--r--tdehtml/tdehtml_part.cpp8
-rw-r--r--tdehtml/tdemultipart/tdemultipart.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index d95fe5e58..38c0b3ed1 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -393,7 +393,7 @@ void XMLHttpRequest::send(const TQString& _body)
// Set the default referrer if one is not already supplied
// through setRequestHeader. NOTE: the user can still disable
- // this feature at the protocol level (kio_http).
+ // this feature at the protocol level (tdeio_http).
// ### does find() ever succeed? the headers are stored in lower case!
if (requestHeaders.find("Referer") == requestHeaders.end()) {
KURL documentURL(doc->URL());
@@ -476,7 +476,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val
// Sanitize the request headers below and handle them as if they are
// calls to open. Otherwise, we will end up ignoring them all together!
- // TODO: Do something about "put" which kio_http sort of supports and
+ // TODO: Do something about "put" which tdeio_http sort of supports and
// the webDAV headers such as PROPFIND etc...
if (name == "get" || name == "post") {
KURL reqURL (doc->URL(), value.stripWhiteSpace());
diff --git a/tdehtml/tdehtml_pagecache.h b/tdehtml/tdehtml_pagecache.h
index fbafa171d..4865f9eac 100644
--- a/tdehtml/tdehtml_pagecache.h
+++ b/tdehtml/tdehtml_pagecache.h
@@ -36,7 +36,7 @@ class TDEHTMLPageCachePrivate;
* These operations always want to use the original document and
* don't want to fetch the data from the network again.
*
- * It operates completely independent from the kio_http cache.
+ * It operates completely independent from the tdeio_http cache.
*/
class TDEHTMLPageCache : public TQObject
{
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 47d9de509..b74984aaf 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -1511,9 +1511,9 @@ DOM::DocumentImpl *TDEHTMLPart::xmlDocImpl() const
return 0;
}
-void TDEHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg)
+void TDEHTMLPart::slotInfoMessage(TDEIO::Job* tdeio_job, const TQString& msg)
{
- assert(d->m_job == kio_job);
+ assert(d->m_job == tdeio_job);
if (!parentPart())
setStatusBarText(msg, BarDefaultText);
@@ -1562,9 +1562,9 @@ void TDEHTMLPart::setPageSecurity( PageSecurity sec )
d->m_statusBarIconLabel->setPixmap( SmallIcon( iconName, instance() ) );
}
-void TDEHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data )
+void TDEHTMLPart::slotData( TDEIO::Job* tdeio_job, const TQByteArray &data )
{
- assert ( d->m_job == kio_job );
+ assert ( d->m_job == tdeio_job );
//kdDebug( 6050 ) << "slotData: " << data.size() << endl;
// The first data ?
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index ac0c67b53..dd864d65b 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -260,7 +260,7 @@ void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data )
#endif
startOfData();
}
- // First header (when we know it from kio_http)
+ // First header (when we know it from tdeio_http)
else if ( line == m_boundary )
; // nothing to do
else if ( !line.isEmpty() ) // this happens with e.g. Set-Cookie: