summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/Mainpage.dox2
-rw-r--r--tdehtml/Makefile.am4
-rw-r--r--tdehtml/ecma/xmlhttprequest.cpp2
-rw-r--r--tdehtml/java/Makefile.am4
-rw-r--r--tdehtml/java/TODO2
-rw-r--r--tdehtml/java/kjavaappletserver.cpp8
-rw-r--r--tdehtml/java/kjavadownloader.h2
-rw-r--r--tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java2
-rw-r--r--tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java58
-rw-r--r--tdehtml/misc/loader.h2
-rw-r--r--tdehtml/tdehtml_pagecache.h2
-rw-r--r--tdehtml/tdehtml_part.cpp8
-rw-r--r--tdehtml/tdehtml_part.h6
-rw-r--r--tdehtml/tdehtml_run.cpp2
-rw-r--r--tdehtml/tdemultipart/Makefile.am4
-rw-r--r--tdehtml/tdemultipart/tdemultipart.cpp2
16 files changed, 55 insertions, 55 deletions
diff --git a/tdehtml/Mainpage.dox b/tdehtml/Mainpage.dox
index 5de4d53a2..a3b96325a 100644
--- a/tdehtml/Mainpage.dox
+++ b/tdehtml/Mainpage.dox
@@ -40,7 +40,7 @@ Maksim Orlovich
@lgpl
*/
-// DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs
+// DOXYGEN_REFERENCES = tdecore tdeui tdeio tdeparts kjs
// DOXYGEN_EXCLUDE = test*.* html rendering xml misc ecma css imload pics test
// DOXYGEN_SET_PROJECT_NAME = TDEHTML
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 2143fd90a..fc8b80e16 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -53,7 +53,7 @@ libtdehtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libra
libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \
./rendering/libtdehtmlrender.la ./css/libtdehtmlcss.la \
./misc/libtdehtmlmisc.la ecma/libkjs_html.la ./dom/libtdehtmldom.la $(LIBKJAVA) \
- $(LIB_KPARTS) \
+ $(LIB_TDEPARTS) \
$(LIBTHAI) \
$(top_builddir)/tdeprint/libtdeprint.la \
$(top_builddir)/tdeutils/libtdeutils.la \
@@ -124,7 +124,7 @@ testtdehtml_static_LDFLAGS = -static
testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp
testregression_LDADD = libtdehtml.la
-DOXYGEN_REFERENCES = tdecore tdeui kio tdefx tdeparts
+DOXYGEN_REFERENCES = tdecore tdeui tdeio tdefx tdeparts
DOXYGEN_EXCLUDE = test*.* css ecma html java tdemultipart misc pics rendering test xml
include ../admin/Doxyfile.am
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index 38c0b3ed1..ed4db15b2 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -377,7 +377,7 @@ void XMLHttpRequest::send(const TQString& _body)
TQString key = i.key();
TQString value = i.data();
if (key == "accept") {
- // The HTTP KIO slave supports an override this way
+ // The HTTP TDEIO slave supports an override this way
job->addMetaData("accept", value);
} else {
if (i != begin)
diff --git a/tdehtml/java/Makefile.am b/tdehtml/java/Makefile.am
index 2ae3cec13..c1dd3136f 100644
--- a/tdehtml/java/Makefile.am
+++ b/tdehtml/java/Makefile.am
@@ -12,7 +12,7 @@ noinst_HEADERS = kjavaappletwidget.h kqeventutil.h kxeventutil.h \
METASOURCES = AUTO
libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
-libkjava_la_LIBADD = $(LIB_KPARTS)
+libkjava_la_LIBADD = $(LIB_TDEPARTS)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdehtml \
-I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
@@ -32,6 +32,6 @@ kjavaappletviewer_la_SOURCES= kjavaapplet.cpp kjavaappletcontext.cpp \
kjavadownloader.cpp kjavaappletviewer.cpp
kjavaappletviewer_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
-kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
+kjavaappletviewer_la_LIBADD= $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
kde_services_DATA= kjavaappletviewer.desktop
diff --git a/tdehtml/java/TODO b/tdehtml/java/TODO
index 3d707c898..4107c6726 100644
--- a/tdehtml/java/TODO
+++ b/tdehtml/java/TODO
@@ -19,4 +19,4 @@ both versions.
- Better support for Java 2
- Use a factory to create the classloader and security managers
- Use URLClassLoader- this is done
-- Support for KIO URLs
+- Support for TDEIO URLs
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 952fe143b..23e805577 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -484,7 +484,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
contextID += qb[ index++ ];
}
bool ok;
- const int ID_num = contextID.toInt( &ok ); // context id or kio job id
+ const int ID_num = contextID.toInt( &ok ); // context id or tdeio job id
/*if (d->locked_context > -1 &&
ID_num != d->locked_context &&
(cmd_code == KJAS_JAVASCRIPT_EVENT ||
@@ -500,7 +500,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
++index; //skip the sep
if (cmd_code == KJAS_PUT_DATA) {
- // rest of the data is for kio put
+ // rest of the data is for tdeio put
if (ok) {
TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
if (ok && it != d->kiojobs.end()) {
@@ -568,9 +568,9 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
if (ok && it != d->kiojobs.end())
it.data()->jobCommand( cmd );
- kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl;
+ kdDebug(6100) << "TDEIO Data command: " << ID_num << " " << args.first() << endl;
} else
- kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl;
+ kdError(6100) << "TDEIO Data command error " << ok << " args:" << args.size() << endl;
return;
case KJAS_JAVASCRIPT_EVENT:
cmd = TQString::fromLatin1( "JS_Event" );
diff --git a/tdehtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h
index 22690824c..4e3b893e8 100644
--- a/tdehtml/java/kjavadownloader.h
+++ b/tdehtml/java/kjavadownloader.h
@@ -25,7 +25,7 @@
#include <tqobject.h>
/**
- * @short A class for handling downloads from KIO
+ * @short A class for handling downloads from TDEIO
*
* This class handles a TDEIO::get job and passes the data
* back to the AppletServer.
diff --git a/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java b/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
index f8b50a91d..52e60ddc0 100644
--- a/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
@@ -238,7 +238,7 @@ public class KJASProtocolHandler
String id = getArg( command );
String code = getArg( command );
- Main.debug( "KIO URLData received(" + id + ") code:" + code );
+ Main.debug( "TDEIO URLData received(" + id + ") code:" + code );
//rest of the command should be the data...
byte[] data = null;
diff --git a/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java b/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
index 58c5ff518..e814fbea7 100644
--- a/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
@@ -50,7 +50,7 @@ class KIOConnection
static void setData(String jobid, int code, byte [] data) {
KIOConnection job = (KIOConnection) jobs.get(jobid);
if (job == null || !job.setData(code, data))
- Main.info("KIO KJASHttpURLConnection gone (timedout/closed)");
+ Main.info("TDEIO KJASHttpURLConnection gone (timedout/closed)");
else
Thread.yield();
}
@@ -119,11 +119,11 @@ class KIOConnection
protected URL url;
protected int connect_status = 0;
- protected String jobid = null; // connection id with KIO
+ protected String jobid = null; // connection id with TDEIO
protected LinkedList data = new LinkedList(); // not thread safe
protected int errorcode = 0;
protected boolean finished = false; // all data has arived
- protected boolean onhold = false; // KIO job is suspended
+ protected boolean onhold = false; // TDEIO job is suspended
protected boolean request_data = false; // need data for put job
private KJASOutputStream out = null;
private KJASInputStream in = null;
@@ -156,12 +156,12 @@ class KIOConnection
finished = true;
onhold = false;
jobs.remove(jobid);
- Main.debug ("KIO FINISHED (" + jobid + ") " + data.size());
+ Main.debug ("TDEIO FINISHED (" + jobid + ") " + data.size());
break;
case DATA:
if (d.length > 0)
data.addLast(d);
- // Main.debug ("KIO DATA (" + jobid + ") " + data.size());
+ // Main.debug ("TDEIO DATA (" + jobid + ") " + data.size());
if (!onhold && data.size() > HIGH_BUFFER_LIMIT) {
Main.protocol.sendDataCmd(jobid, HOLD);
onhold = true;
@@ -170,15 +170,15 @@ class KIOConnection
case ERRORCODE:
String codestr = new String(d);
errorcode = Integer.parseInt(codestr);
- Main.debug ("KIO ERRORECODE(" + jobid + ") " + errorcode);
+ Main.debug ("TDEIO ERRORECODE(" + jobid + ") " + errorcode);
break;
case CONNECT:
- Main.debug ("KIO CONNECT(" + jobid + ") ");
+ Main.debug ("TDEIO CONNECT(" + jobid + ") ");
request_data = true;
errorcode = 0;
break;
case REQUESTDATA:
- Main.debug ("KIO REQUESTDATA(" + jobid + ") ");
+ Main.debug ("TDEIO REQUESTDATA(" + jobid + ") ");
request_data = true;
break;
}
@@ -234,7 +234,7 @@ class KIOConnection
return total;
}
synchronized private void sendData(byte [] d, boolean force) throws IOException {
- Main.debug ("KIO sendData(" + jobid + ") force:" + force + " request_data:" + request_data);
+ Main.debug ("TDEIO sendData(" + jobid + ") force:" + force + " request_data:" + request_data);
if (d != null)
data.addLast(d);
if (!request_data && !force) return;
@@ -246,7 +246,7 @@ class KIOConnection
return;
}
if (!request_data) {
- Main.debug ("KIO sendData(" + jobid + ") timeout");
+ Main.debug ("TDEIO sendData(" + jobid + ") timeout");
data.clear();
disconnect();
throw new IOException("timeout");
@@ -273,7 +273,7 @@ class KIOConnection
if (connect_status == CONNECTED)
return; // javadocs: call is ignored
//(new Exception()).printStackTrace();
- Main.debug ("KIO connect " + url);
+ Main.debug ("TDEIO connect " + url);
errorcode = 0;
finished = in_eof = false;
jobid = String.valueOf(id++);
@@ -294,7 +294,7 @@ class KIOConnection
in = new KJASInputStream();
else
out = new KJASOutputStream();
- Main.debug ("KIO connect(" + jobid + ") " + url);
+ Main.debug ("TDEIO connect(" + jobid + ") " + url);
return;
}
connect_status = NOT_CONNECTED;
@@ -302,16 +302,16 @@ class KIOConnection
if (isconnected) {
if (!finished)
Main.protocol.sendDataCmd(jobid, STOP);
- Main.debug ("KIO connect error " + url);
+ Main.debug ("TDEIO connect error " + url);
throw new ConnectException("connection failed (not found)");
}
- Main.debug ("KIO connect timeout " + url);
+ Main.debug ("TDEIO connect timeout " + url);
throw new IOException("connection failed (timeout)");
}
synchronized void disconnect() {
if (connect_status == NOT_CONNECTED)
return;
- Main.debug ("KIO disconnect " + jobid);
+ Main.debug ("TDEIO disconnect " + jobid);
//(new Exception()).printStackTrace();
if (out != null) {
try {
@@ -328,11 +328,11 @@ class KIOConnection
notifyAll();
}
InputStream getInputStream() throws IOException {
- Main.debug ("KIO getInputStream(" + jobid + ") " + url);
+ Main.debug ("TDEIO getInputStream(" + jobid + ") " + url);
return in;
}
OutputStream getOutputStream() throws IOException {
- Main.debug ("KIO getOutputStream(" + jobid + ") " + url);
+ Main.debug ("TDEIO getOutputStream(" + jobid + ") " + url);
return out;
}
}
@@ -367,7 +367,7 @@ final class KIOHttpConnection extends KIOConnection
};
headers.add(entry);
headersmap.put(entry[0], entry[1]);
- // Main.debug ("KIO header " + entry[0] + "=" + entry[1]);
+ // Main.debug ("TDEIO header " + entry[0] + "=" + entry[1]);
}
responseCode = 0;
if (headersmap.size() > 0) {
@@ -379,7 +379,7 @@ final class KIOHttpConnection extends KIOConnection
if (epos < 0) break;
responseCode = Integer.parseInt(token.substring(spos+1, epos));
responseMessage = token.substring(epos+1);
- Main.debug ("KIO responsecode=" + responseCode);
+ Main.debug ("TDEIO responsecode=" + responseCode);
}
break;
}
@@ -408,7 +408,7 @@ final class KJASHttpURLConnection extends HttpURLConnection
} catch (IOException e) {
Main.debug ("Error on implicit connect()");
}
- Main.debug ("KIO getHeaderFields");
+ Main.debug ("TDEIO getHeaderFields");
return kioconnection.headersmap;
}
public String getHeaderField(String name) {
@@ -418,7 +418,7 @@ final class KJASHttpURLConnection extends HttpURLConnection
Main.debug ("Error on implicit connect()");
}
String field = (String) kioconnection.headersmap.get(name);
- Main.debug ("KIO getHeaderField:" + name + "=" + field);
+ Main.debug ("TDEIO getHeaderField:" + name + "=" + field);
//(new Exception()).printStackTrace();
return field;
}
@@ -428,14 +428,14 @@ final class KJASHttpURLConnection extends HttpURLConnection
} catch (IOException e) {
Main.debug ("Error on implicit connect()");
}
- Main.debug ("KIO getHeaderField(" + n + ") size=" + kioconnection.headersmap.size());
+ Main.debug ("TDEIO getHeaderField(" + n + ") size=" + kioconnection.headersmap.size());
if (n >= kioconnection.headersmap.size())
return null;
String [] entry = (String []) kioconnection.headers.get(n);
String line = entry[0];
if (entry[1].length() > 0)
line += ":" + entry[1];
- Main.debug ("KIO getHeaderField(" + n + ")=#" + line + "#");
+ Main.debug ("TDEIO getHeaderField(" + n + ")=#" + line + "#");
return line;
}
public String getHeaderFieldKey(int n) {
@@ -444,13 +444,13 @@ final class KJASHttpURLConnection extends HttpURLConnection
} catch (IOException e) {
Main.debug ("Error on implicit connect()");
}
- Main.debug ("KIO getHeaderFieldKey " + n);
+ Main.debug ("TDEIO getHeaderFieldKey " + n);
if (n >= kioconnection.headersmap.size())
return null;
return ((String []) kioconnection.headers.get(n))[0];
}
public int getResponseCode() throws IOException {
- Main.debug ("KIO getResponseCode");
+ Main.debug ("TDEIO getResponseCode");
if (kioconnection.responseCode == -1) {
try {
connect();
@@ -468,7 +468,7 @@ final class KJASHttpURLConnection extends HttpURLConnection
public void connect() throws IOException {
if (connected)
return;
- Main.debug ("KIO KJASHttpURLConnection.connect " + url);
+ Main.debug ("TDEIO KJASHttpURLConnection.connect " + url);
SecurityManager security = System.getSecurityManager();
if (security != null)
security.checkPermission(getPermission());
@@ -494,7 +494,7 @@ final class KJASHttpURLConnection extends HttpURLConnection
return kioconnection.getOutputStream();
}
public InputStream getErrorStream() {
- Main.debug("KIO KJASHttpURLConnection.getErrorStream" + url);
+ Main.debug("TDEIO KJASHttpURLConnection.getErrorStream" + url);
try {
if (connected && kioconnection.responseCode == 404)
return kioconnection.getInputStream();
@@ -524,7 +524,7 @@ final class KJASSimpleURLConnection extends URLConnection
public void connect() throws IOException {
if (kioconnection != null)
return;
- Main.debug ("KIO KJASSimpleURLConnection.connection " + url);
+ Main.debug ("TDEIO KJASSimpleURLConnection.connection " + url);
SecurityManager security = System.getSecurityManager();
if (security != null)
security.checkPermission(getPermission());
@@ -593,7 +593,7 @@ public final class KJASURLStreamHandlerFactory
if (protocol.equals("jar") || protocol.equals("file"))
return null;
//outputs to early: Main.debug ("createURLStreamHandler " + protocol);
- Main.debug ("KIO createURLStreamHandler " + protocol);
+ Main.debug ("TDEIO createURLStreamHandler " + protocol);
if (protocol.equals("http"))
return new KJASHttpURLStreamHandler(80);
else if (protocol.equals("https"))
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index f885ec33e..c60c13a98 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -80,7 +80,7 @@ namespace tdehtml
* A cached object. Classes who want to use this object should derive
* from CachedObjectClient, to get the function calls in case the requested data has arrived.
*
- * This class also does the actual communication with kio and loads the file.
+ * This class also does the actual communication with tdeio and loads the file.
*/
class CachedObject
{
diff --git a/tdehtml/tdehtml_pagecache.h b/tdehtml/tdehtml_pagecache.h
index 4865f9eac..f648bd548 100644
--- a/tdehtml/tdehtml_pagecache.h
+++ b/tdehtml/tdehtml_pagecache.h
@@ -29,7 +29,7 @@ class TDEHTMLPageCachePrivate;
/**
* Singleton Object that handles a binary cache on top of
- * the http cache management of kio.
+ * the http cache management of tdeio.
*
* A limited number of HTML pages are stored in this cache. This
* cache is used for the history and operations like "view source".
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index dd0238aad..7c70a3c99 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -580,7 +580,7 @@ bool TDEHTMLPart::openURL( const KURL &url )
/**
* The format of the error url is that two variables are passed in the query:
- * error = int kio error code, errText = TQString error text from kio
+ * error = int tdeio error code, errText = TQString error text from tdeio
* and the URL where the error happened is passed as a sub URL.
*/
KURL::List urls = KURL::split( url );
@@ -1576,7 +1576,7 @@ void TDEHTMLPart::slotData( TDEIO::Job* tdeio_job, const TQByteArray &data )
{
//kdDebug( 6050 ) << "begin!" << endl;
- // We must suspend KIO while we're inside begin() because it can cause
+ // We must suspend TDEIO while we're inside begin() because it can cause
// crashes if a window (such as kjsdebugger) goes back into the event loop,
// more data arrives, and begin() gets called again (re-entered).
d->m_job->suspend();
@@ -1827,7 +1827,7 @@ void TDEHTMLPart::slotFinished( TDEIO::Job * job )
// The following catches errors that occur as a result of HTTP
// to FTP redirections where the FTP URL is a directory. Since
- // KIO cannot change a redirection request from GET to LISTDIR,
+ // TDEIO cannot change a redirection request from GET to LISTDIR,
// we have to take care of it here once we know for sure it is
// a directory...
if (job->error() == TDEIO::ERR_IS_DIRECTORY)
@@ -2460,7 +2460,7 @@ void TDEHTMLPart::slotRedirect()
void TDEHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url)
{
// the slave told us that we got redirected
- //kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl;
+ //kdDebug( 6050 ) << "redirection by TDEIO to " << url.url() << endl;
emit d->m_extension->setLocationBarURL( url.prettyURL() );
d->m_workingURL = url;
}
diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h
index 38a54e18a..39d8baebd 100644
--- a/tdehtml/tdehtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -270,7 +270,7 @@ public:
/**
* Called when a certain error situation (i.e. connection timed out) occurred.
- * The default implementation either shows a KIO error dialog or loads a more
+ * The default implementation either shows a TDEIO error dialog or loads a more
* verbose error description a as page, depending on the users configuration.
* @p job is the job that signaled the error situation
*/
@@ -1118,8 +1118,8 @@ protected:
/**
* presents a detailed error message to the user.
- * @p errorCode kio error code, eg TDEIO::ERR_SERVER_TIMEOUT.
- * @p text kio additional information text.
+ * @p errorCode tdeio error code, eg TDEIO::ERR_SERVER_TIMEOUT.
+ * @p text tdeio additional information text.
* @p url the url that triggered the error.
*/
void htmlError( int errorCode, const TQString& text, const KURL& reqUrl );
diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp
index 499616cce..b04caa7d1 100644
--- a/tdehtml/tdehtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -47,7 +47,7 @@ TDEHTMLRun::TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KUR
void TDEHTMLRun::foundMimeType( const TQString &_type )
{
Q_ASSERT(!m_bFinished);
- TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
+ TQString mimeType = _type; // this ref comes from the job, we lose it when using TDEIO again
if ( static_cast<TDEHTMLPart *>(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) )
m_bFinished = true;
else {
diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am
index ae33efd01..440323119 100644
--- a/tdehtml/tdemultipart/Makefile.am
+++ b/tdehtml/tdemultipart/Makefile.am
@@ -5,8 +5,8 @@ INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcd
kde_module_LTLIBRARIES = libtdemultipart.la
libtdemultipart_la_SOURCES = tdemultipart.cpp
-libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ)
-libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS)
+libtdemultipart_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ)
+libtdemultipart_la_DEPENDENCIES = $(LIB_TDEPARTS)
libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
# Automatically generate moc files
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index 201f1ef60..15970bbaa 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -189,7 +189,7 @@ void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data )
if (m_boundary.isNull())
{
TQString tmp = job->queryMetaData("media-boundary");
- kdDebug() << "Got Boundary from kio-http '" << tmp << "'" << endl;
+ kdDebug() << "Got Boundary from tdeio-http '" << tmp << "'" << endl;
if ( !tmp.isEmpty() ) {
if (tmp.startsWith("--"))
m_boundary = tmp.latin1();