summaryrefslogtreecommitdiffstats
path: root/khtml
diff options
context:
space:
mode:
Diffstat (limited to 'khtml')
-rw-r--r--khtml/css/cssstyleselector.cpp4
-rw-r--r--khtml/ecma/kjs_debugwin.cpp4
-rw-r--r--khtml/ecma/kjs_navigator.cpp2
-rw-r--r--khtml/ecma/xmlhttprequest.cpp42
-rw-r--r--khtml/ecma/xmlhttprequest.h16
-rw-r--r--khtml/html/html_formimpl.cpp8
-rw-r--r--khtml/java/kjavaappletserver.cpp4
-rw-r--r--khtml/java/kjavaappletviewer.cpp8
-rw-r--r--khtml/java/kjavaappletviewer.h4
-rw-r--r--khtml/java/kjavadownloader.cpp54
-rw-r--r--khtml/java/kjavadownloader.h16
-rw-r--r--khtml/khtml_ext.cpp14
-rw-r--r--khtml/khtml_ext.h4
-rw-r--r--khtml/khtml_factory.cpp2
-rw-r--r--khtml/khtml_iface.cc4
-rw-r--r--khtml/khtml_part.cpp120
-rw-r--r--khtml/khtml_part.h22
-rw-r--r--khtml/khtml_run.cpp2
-rw-r--r--khtml/khtml_run.h2
-rw-r--r--khtml/khtml_settings.cc14
-rw-r--r--khtml/khtml_settings.h10
-rw-r--r--khtml/khtmlimage.cpp4
-rw-r--r--khtml/khtmlimage.h2
-rw-r--r--khtml/khtmlpart_p.h8
-rw-r--r--khtml/khtmlview.cpp6
-rw-r--r--khtml/kmultipart/kmultipart.cpp14
-rw-r--r--khtml/kmultipart/kmultipart.h6
-rw-r--r--khtml/misc/knsplugininstaller.cpp32
-rw-r--r--khtml/misc/knsplugininstaller.h12
-rw-r--r--khtml/misc/loader.cpp42
-rw-r--r--khtml/misc/loader.h26
-rw-r--r--khtml/test_regression.cpp2
-rw-r--r--khtml/testkhtml.cpp2
-rw-r--r--khtml/xml/dom_docimpl.cpp4
34 files changed, 258 insertions, 258 deletions
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index 6559a2b9e..3f4a8cd26 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -2076,7 +2076,7 @@ static TQColor colorForCSSValue( int css_value )
else if ( css_value == CSS_VAL_INFOTEXT )
return TQToolTip::palette().inactive().foreground();
else if ( css_value == CSS_VAL_BACKGROUND ) {
- KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
+ TDEConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
bckgrConfig.setGroup("Desktop0");
// Desktop background.
return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
@@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value )
TQColor c = pal.color( uicol->group, uicol->role );
#ifndef APPLE_CHANGES
if ( uicol->configEntry ) {
- KConfig *globalConfig = TDEGlobal::config();
+ TDEConfig *globalConfig = TDEGlobal::config();
globalConfig->setGroup( uicol->configGroup );
c = globalConfig->readColorEntry( uicol->configEntry, &c );
}
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index 674a3f3c6..73a55cf94 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -860,8 +860,8 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
}
if (dontShowAgain) {
- KConfig *config = kapp->config();
- KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
+ TDEConfig *config = kapp->config();
+ TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
config->sync();
TQByteArray data;
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index 426c68343..9bd99ada7 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -306,7 +306,7 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
continue;
}
// read configuration
- KConfig kc( locate ("data", pluginsinfo.toString()) );
+ TDEConfig kc( locate ("data", pluginsinfo.toString()) );
unsigned num = (unsigned int) kc.readNumEntry("number");
for ( unsigned n = 0; n < num; n++ ) {
kc.setGroup( TQString::number(n) );
diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
index 08ba07519..8a8a86c16 100644
--- a/khtml/ecma/xmlhttprequest.cpp
+++ b/khtml/ecma/xmlhttprequest.cpp
@@ -42,7 +42,7 @@
#include "KWQLoader.h"
#else
#include <kio/netaccess.h>
-using KIO::NetAccess;
+using TDEIO::NetAccess;
#endif
#define BANNED_HTTP_HEADERS "authorization,proxy-authorization,"\
@@ -81,23 +81,23 @@ XMLHttpRequestQObject::XMLHttpRequestQObject(XMLHttpRequest *_jsObject)
}
#ifdef APPLE_CHANGES
-void XMLHttpRequestQObject::slotData( KIO::Job* job, const char *data, int size )
+void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const char *data, int size )
{
jsObject->slotData(job, data, size);
}
#else
-void XMLHttpRequestQObject::slotData( KIO::Job* job, const TQByteArray &data )
+void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const TQByteArray &data )
{
jsObject->slotData(job, data);
}
#endif
-void XMLHttpRequestQObject::slotFinished( KIO::Job* job )
+void XMLHttpRequestQObject::slotFinished( TDEIO::Job* job )
{
jsObject->slotFinished(job);
}
-void XMLHttpRequestQObject::slotRedirection( KIO::Job* job, const KURL& url)
+void XMLHttpRequestQObject::slotRedirection( TDEIO::Job* job, const KURL& url)
{
jsObject->slotRedirection( job, url );
}
@@ -344,7 +344,7 @@ void XMLHttpRequest::send(const TQString& _body)
const TQString protocol = url.protocol().lower();
// Abandon the request when the protocol is other than "http",
- // instead of blindly doing a KIO::get on other protocols like file:/.
+ // instead of blindly doing a TDEIO::get on other protocols like file:/.
if (!protocol.startsWith("http") && !protocol.startsWith("webdav"))
{
abort();
@@ -359,14 +359,14 @@ void XMLHttpRequest::send(const TQString& _body)
TQCString str = _body.utf8();
buf.duplicate(str.data(), str.size() - 1);
- job = KIO::http_post( url, buf, false );
+ job = TDEIO::http_post( url, buf, false );
if(contentType.isNull())
job->addMetaData( "content-type", "Content-type: text/plain" );
else
job->addMetaData( "content-type", contentType );
}
else {
- job = KIO::get( url, false, false );
+ job = TDEIO::get( url, false, false );
}
if (!requestHeaders.isEmpty()) {
@@ -421,22 +421,22 @@ void XMLHttpRequest::send(const TQString& _body)
return;
}
- qObject->connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
- TQT_SLOT( slotFinished( KIO::Job* ) ) );
+ qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
#ifdef APPLE_CHANGES
- qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const char*, int ) ),
- TQT_SLOT( slotData( KIO::Job*, const char*, int ) ) );
+ qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
+ TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
#else
- qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
#endif
- qObject->connect( job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ),
- TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) );
+ qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+ TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
#ifdef APPLE_CHANGES
KWQServeRequest(khtml::Cache::loader(), doc->docLoader(), job);
#else
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::Scheduler::scheduleJob( job );
#endif
}
@@ -610,7 +610,7 @@ void XMLHttpRequest::processSyncLoadResults(const TQByteArray &data, const KURL
slotFinished(0);
}
-void XMLHttpRequest::slotFinished(KIO::Job *)
+void XMLHttpRequest::slotFinished(TDEIO::Job *)
{
if (decoder) {
response += decoder->flush();
@@ -625,7 +625,7 @@ void XMLHttpRequest::slotFinished(KIO::Job *)
decoder = 0;
}
-void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url)
+void XMLHttpRequest::slotRedirection(TDEIO::Job*, const KURL& url)
{
if (!urlMatchesDocumentDomain(url)) {
abort();
@@ -633,9 +633,9 @@ void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url)
}
#ifdef APPLE_CHANGES
-void XMLHttpRequest::slotData( KIO::Job*, const char *data, int len )
+void XMLHttpRequest::slotData( TDEIO::Job*, const char *data, int len )
#else
-void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data)
+void XMLHttpRequest::slotData(TDEIO::Job*, const TQByteArray &_data)
#endif
{
if (state < Loaded ) {
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;
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index 7477679bc..c7c232dc9 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -1615,16 +1615,16 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
fileurl = KURL::fromPathOrURL(val);
}
- KIO::UDSEntry filestat;
+ TDEIO::UDSEntry filestat;
// can't submit file in www-url-form encoded
TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget();
if (multipart) {
TQCString filearray( "" );
- if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {
+ if ( TDEIO::NetAccess::stat(fileurl, filestat, toplevel)) {
const KFileItem fileitem(filestat, fileurl, true, false);
if ( fileitem.isFile() &&
- KIO::NetAccess::download(fileurl, local, toplevel) ) {
+ TDEIO::NetAccess::download(fileurl, local, toplevel) ) {
TQFile file(local);
filearray.resize(file.size()+1);
if ( file.open( IO_ReadOnly ) ) {
@@ -1633,7 +1633,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
filearray[readbytes] = '\0';
file.close();
}
- KIO::NetAccess::removeTempFile( local );
+ TDEIO::NetAccess::removeTempFile( local );
}
}
encoding += filearray;
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 56e056a62..a82a80a0e 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -193,7 +193,7 @@ void KJavaAppletServer::freeJavaServer()
//instead of immediately quitting here, set a timer to kill us
//if there are still no servers- give us one minute
//this is to prevent repeated loading and unloading of the jvm
- KConfig config( "konquerorrc", true );
+ TDEConfig config( "konquerorrc", true );
config.setGroup( "Java/JavaScript Settings" );
if( config.readBoolEntry( "ShutdownAppletServer", true ) )
{
@@ -214,7 +214,7 @@ void KJavaAppletServer::checkShutdown()
void KJavaAppletServer::setupJava( KJavaProcess *p )
{
- KConfig config ( "konquerorrc", true );
+ TDEConfig config ( "konquerorrc", true );
config.setGroup( "Java/JavaScript Settings" );
TQString jvm_path = "java";
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index 05c2eb7d0..979403df4 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -315,12 +315,12 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
if (!server->usingKIO ()) {
/* if this page needs authentication */
- KIO::AuthInfo info;
+ TDEIO::AuthInfo info;
TQString errorMsg;
TQCString replyType;
TQByteArray params;
TQByteArray reply;
- KIO::AuthInfo authResult;
+ TDEIO::AuthInfo authResult;
//(void) dcopClient(); // Make sure to have a dcop client.
info.url = baseurl;
@@ -329,9 +329,9 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
TQDataStream stream(params, IO_WriteOnly);
stream << info << m_view->topLevelWidget()->winId();
- if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
+ if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
- } else if ( replyType == "KIO::AuthInfo" ) {
+ } else if ( replyType == "TDEIO::AuthInfo" ) {
TQDataStream stream2( reply, IO_ReadOnly );
stream2 >> authResult;
applet->setUser (authResult.username);
diff --git a/khtml/java/kjavaappletviewer.h b/khtml/java/kjavaappletviewer.h
index b76f20363..cf2c20721 100644
--- a/khtml/java/kjavaappletviewer.h
+++ b/khtml/java/kjavaappletviewer.h
@@ -41,7 +41,7 @@ class KJavaProcess;
class KJavaAppletViewer;
class TDEAboutData;
class TDEInstance;
-class KConfig;
+class TDEConfig;
class CoverWidget;
class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
@@ -107,7 +107,7 @@ private slots:
void delayedCreateTimeOut ();
private:
TQGuardedPtr <CoverWidget> m_view;
- KConfig * m_config;
+ TDEConfig * m_config;
KJavaProcess * process;
KJavaAppletViewerBrowserExtension * m_browserextension;
KJavaAppletViewerLiveConnectExtension * m_liveconnect;
diff --git a/khtml/java/kjavadownloader.cpp b/khtml/java/kjavadownloader.cpp
index 60334cbf0..a12b585b7 100644
--- a/khtml/java/kjavadownloader.cpp
+++ b/khtml/java/kjavadownloader.cpp
@@ -58,13 +58,13 @@ public:
~KJavaDownloaderPrivate()
{
delete url;
- if (job) job->kill(); // KIO::Job::kill deletes itself
+ if (job) job->kill(); // TDEIO::Job::kill deletes itself
}
private:
int loaderID;
KURL* url;
TQByteArray file;
- KIO::TransferJob* job;
+ TDEIO::TransferJob* job;
int responseCode;
bool isfirstdata;
};
@@ -79,16 +79,16 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url )
d->loaderID = ID;
d->url = new KURL( url );
- d->job = KIO::get( *d->url, false, false );
+ d->job = TDEIO::get( *d->url, false, false );
d->job->addMetaData("PropagateHttpHeader", "true");
- connect( d->job, TQT_SIGNAL(data( KIO::Job*, const TQByteArray& )),
- this, TQT_SLOT(slotData( KIO::Job*, const TQByteArray& )) );
- connect( d->job, TQT_SIGNAL(connected(KIO::Job*)),
- this, TQT_SLOT(slotConnected(KIO::Job*)));
- connect( d->job, TQT_SIGNAL(mimetype(KIO::Job*, const TQString&)),
- this, TQT_SLOT(slotMimetype(KIO::Job*, const TQString&)));
- connect( d->job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotResult(KIO::Job*)) );
+ connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
+ this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
+ connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)),
+ this, TQT_SLOT(slotConnected(TDEIO::Job*)));
+ connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
+ this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
+ connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotResult(TDEIO::Job*)) );
}
KJavaDownloader::~KJavaDownloader()
@@ -96,7 +96,7 @@ KJavaDownloader::~KJavaDownloader()
delete d;
}
-void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb )
+void KJavaDownloader::slotData( TDEIO::Job*, const TQByteArray& qb )
{
//kdDebug(6100) << "slotData(" << d->loaderID << ")" << endl;
@@ -116,17 +116,17 @@ void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb )
KJavaAppletServer::freeJavaServer();
}
-void KJavaDownloader::slotConnected(KIO::Job*)
+void KJavaDownloader::slotConnected(TDEIO::Job*)
{
kdDebug(6100) << "slave connected" << endl;
d->responseCode = d->job->error();
}
-void KJavaDownloader::slotMimetype(KIO::Job*, const TQString & type) {
+void KJavaDownloader::slotMimetype(TDEIO::Job*, const TQString & type) {
kdDebug(6100) << "slave mimetype " << type << endl;
}
-void KJavaDownloader::slotResult( KIO::Job* )
+void KJavaDownloader::slotResult( TDEIO::Job* )
{
kdDebug(6100) << "slotResult(" << d->loaderID << ")" << endl;
@@ -149,7 +149,7 @@ void KJavaDownloader::slotResult( KIO::Job* )
{
server->sendURLData( d->loaderID, FINISHED, d->file );
}
- d->job = 0L; // signal KIO::Job::result deletes itself
+ d->job = 0L; // signal TDEIO::Job::result deletes itself
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
}
@@ -161,7 +161,7 @@ void KJavaDownloader::jobCommand( int cmd )
case KJAS_STOP: {
kdDebug(6100) << "jobCommand(" << d->loaderID << ") stop" << endl;
d->job->kill();
- d->job = 0L; // KIO::Job::kill deletes itself
+ d->job = 0L; // TDEIO::Job::kill deletes itself
KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer();
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
@@ -187,12 +187,12 @@ public:
~KJavaUploaderPrivate()
{
delete url;
- if (job) job->kill(); // KIO::Job::kill deletes itself
+ if (job) job->kill(); // TDEIO::Job::kill deletes itself
}
int loaderID;
KURL* url;
TQByteArray file;
- KIO::TransferJob* job;
+ TDEIO::TransferJob* job;
bool finished;
};
@@ -213,12 +213,12 @@ void KJavaUploader::start()
kdDebug(6100) << "KJavaUploader::start(" << d->loaderID << ")" << endl;
KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer();
// create a suspended job
- d->job = KIO::put( *d->url, -1, false, false, false );
+ d->job = TDEIO::put( *d->url, -1, false, false, false );
d->job->suspend();
- connect( d->job, TQT_SIGNAL(dataReq( KIO::Job*, TQByteArray& )),
- this, TQT_SLOT(slotDataRequest( KIO::Job*, TQByteArray& )) );
- connect( d->job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotResult(KIO::Job*)) );
+ connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
+ this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
+ connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotResult(TDEIO::Job*)) );
server->sendURLData( d->loaderID, CONNECTED, d->file );
KJavaAppletServer::freeJavaServer();
}
@@ -228,7 +228,7 @@ KJavaUploader::~KJavaUploader()
delete d;
}
-void KJavaUploader::slotDataRequest( KIO::Job*, TQByteArray& qb )
+void KJavaUploader::slotDataRequest( TDEIO::Job*, TQByteArray& qb )
{
// send our data and suspend
kdDebug(6100) << "slotDataRequest(" << d->loaderID << ") finished:" << d->finished << endl;
@@ -256,7 +256,7 @@ void KJavaUploader::data( const TQByteArray& qb )
d->job->resume();
}
-void KJavaUploader::slotResult( KIO::Job* )
+void KJavaUploader::slotResult( TDEIO::Job* )
{
kdDebug(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl;
@@ -276,7 +276,7 @@ void KJavaUploader::slotResult( KIO::Job* )
}
else // shouldn't come here
kdError(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl;
- d->job = 0L; // signal KIO::Job::result deletes itself
+ d->job = 0L; // signal TDEIO::Job::result deletes itself
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
}
diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h
index f9514304c..ab6553398 100644
--- a/khtml/java/kjavadownloader.h
+++ b/khtml/java/kjavadownloader.h
@@ -27,13 +27,13 @@
/**
* @short A class for handling downloads from KIO
*
- * This class handles a KIO::get job and passes the data
+ * This class handles a TDEIO::get job and passes the data
* back to the AppletServer.
*
* @author Wynn Wilkes, wynnw@calderasystems.com
*/
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -59,10 +59,10 @@ public:
virtual void jobCommand( int cmd );
protected slots:
- void slotData( KIO::Job*, const TQByteArray& );
- void slotConnected( KIO::Job* );
- void slotMimetype( KIO::Job*, const TQString& );
- void slotResult( KIO::Job* );
+ void slotData( TDEIO::Job*, const TQByteArray& );
+ void slotConnected( TDEIO::Job* );
+ void slotMimetype( TDEIO::Job*, const TQString& );
+ void slotResult( TDEIO::Job* );
private:
KJavaDownloaderPrivate* d;
@@ -81,8 +81,8 @@ public:
virtual void data( const TQByteArray& qb );
void start();
protected slots:
- void slotDataRequest( KIO::Job*, TQByteArray& );
- void slotResult( KIO::Job* );
+ void slotDataRequest( TDEIO::Job*, TQByteArray& );
+ void slotResult( TDEIO::Job* );
private:
KJavaUploaderPrivate* d;
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 44c060b61..2e4660f2d 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -437,7 +437,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
// Fill search provider entries
- KConfig config("kuriikwsfilterrc");
+ TDEConfig config("kuriikwsfilterrc");
config.setGroup("General");
const TQString defaultEngine = config.readEntry("DefaultSearchEngine", "google");
const char keywordDelimiter = config.readNumEntry("KeywordDelimiter", ':');
@@ -648,7 +648,7 @@ KHTMLPopupGUIClient::~KHTMLPopupGUIClient()
void KHTMLPopupGUIClient::slotSaveLinkAs()
{
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = d->m_khtml->referrer();
saveURL( d->m_khtml->widget(), i18n( "Save Link As" ), d->m_url, metaData );
}
@@ -668,7 +668,7 @@ void KHTMLPopupGUIClient::slotSendImage()
void KHTMLPopupGUIClient::slotSaveImageAs()
{
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = d->m_khtml->referrer();
saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename );
}
@@ -824,7 +824,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
{
TQFileInfo info( destURL.path() );
if( info.exists() ) {
- // TODO: use KIO::RenameDlg (shows more information)
+ // TODO: use TDEIO::RenameDlg (shows more information)
query = KMessageBox::warningContinueCancel( parent, i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?" ).arg( info.fileName() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ) );
}
}
@@ -862,7 +862,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
destFile.close();
KURL url2 = KURL();
url2.setPath(destFile.name());
- KIO::file_move(url2, destURL, -1, true /*overwrite*/);
+ TDEIO::file_move(url2, destURL, -1, true /*overwrite*/);
saved = true;
}
}
@@ -876,7 +876,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
bool downloadViaKIO = true;
if ( !url.isLocalFile() )
{
- KConfig cfg("konquerorrc", false, false);
+ TDEConfig cfg("konquerorrc", false, false);
cfg.setGroup("HTML Settings");
TQString downloadManger = cfg.readPathEntry("DownloadManager");
if (!downloadManger.isEmpty())
@@ -907,7 +907,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
if ( downloadViaKIO )
{
- KIO::Job *job = KIO::file_copy( url, destURL, -1, true /*overwrite*/ );
+ TDEIO::Job *job = TDEIO::file_copy( url, destURL, -1, true /*overwrite*/ );
job->setMetaData(metadata);
job->addMetaData("MaxCacheSize", "0"); // Don't store in http cache.
job->addMetaData("cache", "cache"); // Use entry from cache if available.
diff --git a/khtml/khtml_ext.h b/khtml/khtml_ext.h
index 47ab97228..4878c0ac4 100644
--- a/khtml/khtml_ext.h
+++ b/khtml/khtml_ext.h
@@ -120,12 +120,12 @@ public:
virtual ~KHTMLPopupGUIClient();
static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url,
- const TQMap<TQString, TQString> &metaData = KIO::MetaData(),
+ const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
const TQString &filter = TQString::null, long cacheId = 0,
const TQString &suggestedFilename = TQString::null );
static void saveURL( const KURL &url, const KURL &destination,
- const TQMap<TQString, TQString> &metaData = KIO::MetaData(),
+ const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
long cacheId = 0 );
private slots:
void slotSaveLinkAs();
diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp
index 6b5662882..63e44025f 100644
--- a/khtml/khtml_factory.cpp
+++ b/khtml/khtml_factory.cpp
@@ -120,7 +120,7 @@ void KHTMLFactory::ref()
// that the factory gets deleted from within a qPostRoutine, called
// from the TQApplication destructor. That however is too late, because
// we want to destruct a TDEInstance object, which involves destructing
- // a KConfig object, which might call TDEGlobal::dirs() (in sync()) which
+ // a TDEConfig object, which might call TDEGlobal::dirs() (in sync()) which
// probably is not going to work ;-)
// well, perhaps I'm wrong here, but as I'm unsure I try to stay on the
// safe side ;-) -> let's use a simple reference counting scheme
diff --git a/khtml/khtml_iface.cc b/khtml/khtml_iface.cc
index 2746ba0d2..9576379ec 100644
--- a/khtml/khtml_iface.cc
+++ b/khtml/khtml_iface.cc
@@ -191,7 +191,7 @@ void KHTMLPartIface::saveBackground(const TQString &destination)
if (back.isEmpty())
return;
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = part->referrer();
KHTMLPopupGUIClient::saveURL( back, KURL( destination ), metaData );
}
@@ -203,7 +203,7 @@ void KHTMLPartIface::saveDocument(const TQString &destination)
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index.html" );
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
// Referrer unknown?
KHTMLPopupGUIClient::saveURL( srcURL, KURL( destination ), metaData, part->cacheId() );
}
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index bf4566c86..c0733c990 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -306,7 +306,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
d->m_paSetEncoding->insert( d->m_manualDetection );
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
if ( config->hasGroup( "HTML Settings" ) ) {
config->setGroup( "HTML Settings" );
khtml::Decoder::AutoDetectLanguage language;
@@ -434,7 +434,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
this, TQT_SLOT( updateActions() ) );
connect( this, TQT_SIGNAL( completed( bool ) ),
this, TQT_SLOT( updateActions() ) );
- connect( this, TQT_SIGNAL( started( KIO::Job * ) ),
+ connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ),
this, TQT_SLOT( updateActions() ) );
d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "khtml/khtml_popupmenu.rc", KHTMLFactory::instance() ) );
@@ -469,7 +469,7 @@ KHTMLPart::~KHTMLPart()
{
//kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "HTML Settings" );
config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage );
@@ -590,7 +590,7 @@ bool KHTMLPart::openURL( const KURL &url )
KURL mainURL = urls.first();
int error = mainURL.queryItem( "error" ).toInt();
// error=0 isn't a valid error code, so 0 means it's missing from the URL
- if ( error == 0 ) error = KIO::ERR_UNKNOWN;
+ if ( error == 0 ) error = TDEIO::ERR_UNKNOWN;
TQString errorText = mainURL.queryItem( "errText", HINT_UTF8 );
urls.pop_front();
d->m_workingURL = KURL::join( urls );
@@ -698,36 +698,36 @@ bool KHTMLPart::openURL( const KURL &url )
if (d->m_restored)
{
args.metaData().insert("referrer", d->m_pageReferrer);
- d->m_cachePolicy = KIO::CC_Cache;
+ d->m_cachePolicy = TDEIO::CC_Cache;
}
else if (args.reload)
- d->m_cachePolicy = KIO::CC_Reload;
+ d->m_cachePolicy = TDEIO::CC_Reload;
else
d->m_cachePolicy = KProtocolManager::cacheControl();
if ( args.doPost() && (m_url.protocol().startsWith("http")) )
{
- d->m_job = KIO::http_post( m_url, args.postData, false );
+ d->m_job = TDEIO::http_post( m_url, args.postData, false );
d->m_job->addMetaData("content-type", args.contentType() );
}
else
{
- d->m_job = KIO::get( m_url, false, false );
- d->m_job->addMetaData("cache", KIO::getCacheControlString(d->m_cachePolicy));
+ d->m_job = TDEIO::get( m_url, false, false );
+ d->m_job->addMetaData("cache", TDEIO::getCacheControlString(d->m_cachePolicy));
}
if (widget())
d->m_job->setWindow(widget()->topLevelWidget());
d->m_job->addMetaData(args.metaData());
- connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
- TQT_SLOT( slotFinished( KIO::Job* ) ) );
- connect( d->m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
- connect ( d->m_job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
- TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) );
- connect( d->m_job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ),
- TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) );
+ connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+ connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+ connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+ TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
@@ -743,14 +743,14 @@ bool KHTMLPart::openURL( const KURL &url )
d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
- connect( d->m_job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
- this, TQT_SLOT( slotJobSpeed( KIO::Job*, unsigned long ) ) );
+ connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+ this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) );
- connect( d->m_job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
- this, TQT_SLOT( slotJobPercent( KIO::Job*, unsigned long ) ) );
+ connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+ this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) );
- connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
- this, TQT_SLOT( slotJobDone( KIO::Job* ) ) );
+ connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) );
d->m_jobspeed = 0;
@@ -758,9 +758,9 @@ bool KHTMLPart::openURL( const KURL &url )
// do a stat to see whether the stylesheet was changed in the meanwhile.
if ( args.reload && !settings()->userStyleSheet().isEmpty() ) {
KURL url( settings()->userStyleSheet() );
- KIO::StatJob *job = KIO::stat( url, false /* don't show progress */ );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( slotUserSheetStatDone( KIO::Job * ) ) );
+ TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) );
}
emit started( 0L );
@@ -876,7 +876,7 @@ TQString KHTMLPart::documentSource() const
} else
{
TQString tmpFile;
- if( KIO::NetAccess::download( m_url, tmpFile, NULL ) )
+ if( TDEIO::NetAccess::download( m_url, tmpFile, NULL ) )
{
TQFile f( tmpFile );
if ( f.open( IO_ReadOnly ) )
@@ -886,7 +886,7 @@ TQString KHTMLPart::documentSource() const
sourceStr = stream.read();
f.close();
}
- KIO::NetAccess::removeTempFile( tmpFile );
+ TDEIO::NetAccess::removeTempFile( tmpFile );
}
}
@@ -1511,7 +1511,7 @@ DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
return 0;
}
-void KHTMLPart::slotInfoMessage(KIO::Job* kio_job, const TQString& msg)
+void KHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg)
{
assert(d->m_job == kio_job);
@@ -1562,7 +1562,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec )
d->m_statusBarIconLabel->setPixmap( SmallIcon( iconName, instance() ) );
}
-void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
+void KHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data )
{
assert ( d->m_job == kio_job );
@@ -1579,8 +1579,8 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
begin( d->m_workingURL, d->m_extension->urlArgs().xOffset, d->m_extension->urlArgs().yOffset );
d->m_job->resume();
- if (d->m_cachePolicy == KIO::CC_Refresh)
- d->m_doc->docLoader()->setCachePolicy(KIO::CC_Verify);
+ if (d->m_cachePolicy == TDEIO::CC_Refresh)
+ d->m_doc->docLoader()->setCachePolicy(TDEIO::CC_Verify);
else
d->m_doc->docLoader()->setCachePolicy(d->m_cachePolicy);
@@ -1696,12 +1696,12 @@ void KHTMLPart::slotRestoreData(const TQByteArray &data )
}
}
-void KHTMLPart::showError( KIO::Job* job )
+void KHTMLPart::showError( TDEIO::Job* job )
{
kdDebug(6050) << "KHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete
<< " d->m_bCleared=" << d->m_bCleared << endl;
- if (job->error() == KIO::ERR_NO_CONTENT)
+ if (job->error() == TDEIO::ERR_NO_CONTENT)
return;
if ( (d->m_doc && d->m_doc->parsing()) || d->m_workingURL.isEmpty() ) // if we got any data already
@@ -1728,7 +1728,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
errText += TQString::fromLatin1( "</P>" );
- errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) );
+ errText += TQStyleSheet::convertFromPlainText( TDEIO::buildErrorString( errorCode, text ) );
errText += TQString::fromLatin1( "</BODY></HTML>" );
write(errText);
end();
@@ -1749,7 +1749,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
TQString errorName, techName, description;
TQStringList causes, solutions;
- TQByteArray raw = KIO::rawErrorDetail( errorCode, text, &reqUrl );
+ TQByteArray raw = TDEIO::rawErrorDetail( errorCode, text, &reqUrl );
TQDataStream stream(raw, IO_ReadOnly);
stream >> errorName >> techName >> description >> causes >> solutions;
@@ -1812,7 +1812,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
end();
}
-void KHTMLPart::slotFinished( KIO::Job * job )
+void KHTMLPart::slotFinished( TDEIO::Job * job )
{
d->m_job = 0L;
d->m_jobspeed = 0L;
@@ -1826,7 +1826,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
// KIO 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() == KIO::ERR_IS_DIRECTORY)
+ if (job->error() == TDEIO::ERR_IS_DIRECTORY)
{
KParts::URLArgs args;
emit d->m_extension->openURLRequest( d->m_workingURL, args );
@@ -1841,7 +1841,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
return;
}
- KIO::TransferJob *tjob = ::tqqt_cast<KIO::TransferJob*>(job);
+ TDEIO::TransferJob *tjob = ::tqqt_cast<TDEIO::TransferJob*>(job);
if (tjob && tjob->isErrorPage()) {
khtml::RenderPart *renderPart = d->m_frame ? static_cast<khtml::RenderPart *>(d->m_frame->m_frame) : 0;
if (renderPart) {
@@ -1861,7 +1861,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
d->m_frame->m_jscript->dataReceived();
if ( d->m_doc && d->m_doc->docLoader()->expireDate() && m_url.protocol().lower().startsWith("http"))
- KIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
+ TDEIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
d->m_workingURL = KURL();
@@ -2140,14 +2140,14 @@ void KHTMLPart::slotProgressUpdate()
emit d->m_extension->loadingProgress( percent );
}
-void KHTMLPart::slotJobSpeed( KIO::Job* /*job*/, unsigned long speed )
+void KHTMLPart::slotJobSpeed( TDEIO::Job* /*job*/, unsigned long speed )
{
d->m_jobspeed = speed;
if (!parentPart())
setStatusBarText(jsStatusBarText(), BarOverrideText);
}
-void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent )
+void KHTMLPart::slotJobPercent( TDEIO::Job* /*job*/, unsigned long percent )
{
d->m_jobPercent = percent;
@@ -2155,7 +2155,7 @@ void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent )
d->m_progressUpdateTimer.start( 0, true );
}
-void KHTMLPart::slotJobDone( KIO::Job* /*job*/ )
+void KHTMLPart::slotJobDone( TDEIO::Job* /*job*/ )
{
d->m_jobPercent = 100;
@@ -2163,16 +2163,16 @@ void KHTMLPart::slotJobDone( KIO::Job* /*job*/ )
d->m_progressUpdateTimer.start( 0, true );
}
-void KHTMLPart::slotUserSheetStatDone( KIO::Job *_job )
+void KHTMLPart::slotUserSheetStatDone( TDEIO::Job *_job )
{
- using namespace KIO;
+ using namespace TDEIO;
if ( _job->error() ) {
showError( _job );
return;
}
- const UDSEntry entry = dynamic_cast<KIO::StatJob *>( _job )->statResult();
+ const UDSEntry entry = dynamic_cast<TDEIO::StatJob *>( _job )->statResult();
UDSEntry::ConstIterator it = entry.begin();
const UDSEntry::ConstIterator end = entry.end();
for ( ; it != end; ++it ) {
@@ -2453,7 +2453,7 @@ void KHTMLPart::slotRedirect()
emit completed();
}
-void KHTMLPart::slotRedirection(KIO::Job*, const KURL& url)
+void KHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url)
{
// the slave told us that we got redirected
//kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl;
@@ -3757,7 +3757,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
if ( u.isLocalFile() )
{
- // TODO : use KIO::stat() and create a KFileItem out of its result,
+ // TODO : use TDEIO::stat() and create a KFileItem out of its result,
// to use KFileItem::statusBarText()
TQCString path = TQFile::encodeName( u.path() );
@@ -3932,7 +3932,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
if ( button == Qt::LeftButton && ( state & ShiftButton ) )
{
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = d->m_referrer;
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), cURL, metaData );
return false;
@@ -4124,7 +4124,7 @@ KURL KHTMLPart::backgroundURL() const
void KHTMLPart::slotSaveBackground()
{
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
metaData["referrer"] = d->m_referrer;
KHTMLPopupGUIClient::saveURL( d->m_view, i18n("Save Background Image As"), backgroundURL(), metaData );
}
@@ -4136,7 +4136,7 @@ void KHTMLPart::slotSaveDocument()
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index" + defaultExtension() );
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
// Referre unknown?
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), srcURL, metaData, "text/html", d->m_cacheId );
}
@@ -4211,7 +4211,7 @@ void KHTMLPart::slotSaveFrame()
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index" + defaultExtension() );
- KIO::MetaData metaData;
+ TDEIO::MetaData metaData;
// Referrer unknown?
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save Frame As" ), srcURL, metaData, "text/html" );
}
@@ -4391,7 +4391,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
args.serviceType = child->m_serviceType;
child->m_args = args;
- child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
+ child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload);
child->m_serviceName = TQString();
if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" ))
child->m_args.metaData()["referrer"] = d->m_referrer;
@@ -4518,8 +4518,8 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
if (sb)
sb->setStatusBar( d->m_statusBarExtension->statusBar() );
- connect( part, TQT_SIGNAL( started( KIO::Job *) ),
- this, TQT_SLOT( slotChildStarted( KIO::Job *) ) );
+ connect( part, TQT_SIGNAL( started( TDEIO::Job *) ),
+ this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) );
connect( part, TQT_SIGNAL( completed() ),
this, TQT_SLOT( slotChildCompleted() ) );
connect( part, TQT_SIGNAL( completed(bool) ),
@@ -4594,7 +4594,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
return true;
}
- child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
+ child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload);
// make sure the part has a way to find out about the mimetype.
// we actually set it in child->m_args in requestObject already,
@@ -4776,9 +4776,9 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
KGuiItem(i18n("&Send Unencrypted")),
"WarnOnUnencryptedForm");
// Move this setting into KSSL instead
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
- KConfigGroupSaver saver( config, grpNotifMsgs );
+ TDEConfigGroupSaver saver( config, grpNotifMsgs );
if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) {
config->deleteEntry("WarnOnUnencryptedForm");
@@ -5028,7 +5028,7 @@ void KHTMLPart::slotParentCompleted()
}
}
-void KHTMLPart::slotChildStarted( KIO::Job *job )
+void KHTMLPart::slotChildStarted( TDEIO::Job *job )
{
khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
@@ -5773,7 +5773,7 @@ void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p)
if (!tobe.isEmpty() && d->m_jobspeed)
tobe += " ";
if (d->m_jobspeed)
- tobe += i18n( "(%1/s)" ).arg( KIO::convertSize( d->m_jobspeed ) );
+ tobe += i18n( "(%1/s)" ).arg( TDEIO::convertSize( d->m_jobspeed ) );
}
tobe = "<qt>"+tobe;
diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h
index e65a41c11..d84296f04 100644
--- a/khtml/khtml_part.h
+++ b/khtml/khtml_part.h
@@ -274,7 +274,7 @@ public:
* verbose error description a as page, depending on the users configuration.
* @p job is the job that signaled the error situation
*/
- virtual void showError( KIO::Job* job );
+ virtual void showError( TDEIO::Job* job );
/**
* Returns a reference to the DOM HTML document (for non-HTML documents, returns null)
@@ -1118,7 +1118,7 @@ protected:
/**
* presents a detailed error message to the user.
- * @p errorCode kio error code, eg KIO::ERR_SERVER_TIMEOUT.
+ * @p errorCode kio error code, eg TDEIO::ERR_SERVER_TIMEOUT.
* @p text kio additional information text.
* @p url the url that triggered the error.
*/
@@ -1288,11 +1288,11 @@ private slots:
/**
* @internal
*/
- void slotData( KIO::Job*, const TQByteArray &data );
+ void slotData( TDEIO::Job*, const TQByteArray &data );
/**
* @internal
*/
- void slotInfoMessage( KIO::Job*, const TQString& msg );
+ void slotInfoMessage( TDEIO::Job*, const TQString& msg );
/**
* @internal
*/
@@ -1300,7 +1300,7 @@ private slots:
/**
* @internal
*/
- void slotFinished( KIO::Job* );
+ void slotFinished( TDEIO::Job* );
/**
* @internal
*/
@@ -1312,7 +1312,7 @@ private slots:
/**
* @internal
*/
- void slotRedirection( KIO::Job*, const KURL& );
+ void slotRedirection( TDEIO::Job*, const KURL& );
/**
* @internal
*/
@@ -1405,7 +1405,7 @@ private slots:
/**
* @internal
*/
- void slotChildStarted( KIO::Job *job );
+ void slotChildStarted( TDEIO::Job *job );
/**
* @internal
*/
@@ -1451,22 +1451,22 @@ private slots:
/*
* @internal
*/
- void slotJobPercent( KIO::Job*, unsigned long );
+ void slotJobPercent( TDEIO::Job*, unsigned long );
/*
* @internal
*/
- void slotJobDone( KIO::Job* );
+ void slotJobDone( TDEIO::Job* );
/*
* @internal
*/
- void slotUserSheetStatDone( KIO::Job* );
+ void slotUserSheetStatDone( TDEIO::Job* );
/*
* @internal
*/
- void slotJobSpeed( KIO::Job*, unsigned long );
+ void slotJobSpeed( TDEIO::Job*, unsigned long );
/**
* @internal
diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp
index 90770d38f..c999562b4 100644
--- a/khtml/khtml_run.cpp
+++ b/khtml/khtml_run.cpp
@@ -84,7 +84,7 @@ void KHTMLRun::save( const KURL & url, const TQString & suggestedFilename )
}
// KDE4: remove
-void KHTMLRun::handleError( KIO::Job *job )
+void KHTMLRun::handleError( TDEIO::Job *job )
{
KParts::BrowserRun::handleError( job );
}
diff --git a/khtml/khtml_run.h b/khtml/khtml_run.h
index e1be45fd1..0420e91af 100644
--- a/khtml/khtml_run.h
+++ b/khtml/khtml_run.h
@@ -47,7 +47,7 @@ public:
//KHTMLPart *htmlPart() const;
protected:
- virtual void handleError( KIO::Job * job );
+ virtual void handleError( TDEIO::Job * job );
virtual void save( const KURL & url, const TQString & suggestedFilename );
bool askSave( const KURL & url, KService::Ptr offer, const TQString & mimeType, const TQString & suggestedFilename );
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index 5c5db7341..430271877 100644
--- a/khtml/khtml_settings.cc
+++ b/khtml/khtml_settings.cc
@@ -186,7 +186,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai
}
}
-void KHTMLSettings::readDomainSettings(KConfig *config, bool reset,
+void KHTMLSettings::readDomainSettings(TDEConfig *config, bool reset,
bool global, KPerDomainSettings &pd_settings) {
TQString jsPrefix = global ? TQString::null
: TQString::fromLatin1("javascript.");
@@ -289,17 +289,17 @@ bool KHTMLSettings::hoverLink() const
void KHTMLSettings::init()
{
- KConfig global( "khtmlrc", true, false );
+ TDEConfig global( "khtmlrc", true, false );
init( &global, true );
- KConfig *local = TDEGlobal::config();
+ TDEConfig *local = TDEGlobal::config();
if ( !local )
return;
init( local, false );
}
-void KHTMLSettings::init( KConfig * config, bool reset )
+void KHTMLSettings::init( TDEConfig * config, bool reset )
{
TQString group_save = config->group();
if (reset || config->hasGroup("MainView Settings"))
@@ -741,7 +741,7 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const
void KHTMLSettings::addAdFilter( const TQString &url )
{
- KConfig config( "khtmlrc", false, false );
+ TDEConfig config( "khtmlrc", false, false );
config.setGroup( "Filter Settings" );
TQRegExp rx;
@@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled)
{
d->m_jsErrorsEnabled = enabled;
// save it
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("HTML Settings");
config->writeEntry("ReportJSErrors", enabled);
config->sync();
@@ -1052,7 +1052,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled)
{
d->m_jsPopupBlockerPassivePopup = enabled;
// save it
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Java/JavaScript Settings");
config->writeEntry("PopupBlockerPassivePopup", enabled);
config->sync();
diff --git a/khtml/khtml_settings.h b/khtml/khtml_settings.h
index bb089e5a8..4d68845f7 100644
--- a/khtml/khtml_settings.h
+++ b/khtml/khtml_settings.h
@@ -20,7 +20,7 @@
#ifndef __konq_htmlsettings_h__
#define __konq_htmlsettings_h__
-class KConfig;
+class TDEConfig;
#include <tqcolor.h>
#include <tqstring.h>
#include <tqstringlist.h>
@@ -108,11 +108,11 @@ public:
void init();
/** Read settings from @p config.
- * @param config is a pointer to KConfig object.
+ * @param config is a pointer to TDEConfig object.
* @param reset if true, settings are always set; if false,
* settings are only set if the config file has a corresponding key.
*/
- void init( KConfig * config, bool reset = true );
+ void init( TDEConfig * config, bool reset = true );
/**
* Destructor. Don't delete any instance by yourself.
@@ -193,13 +193,13 @@ public:
/** reads from @p config's current group, forcing initialization
* if @p reset is true.
- * @param config is a pointer to KConfig object.
+ * @param config is a pointer to TDEConfig object.
* @param reset true if initialization is to be forced.
* @param global true if the global domain is to be read.
* @param pd_settings will be initialised with the computed (inherited)
* settings.
*/
- void readDomainSettings(KConfig *config, bool reset,
+ void readDomainSettings(TDEConfig *config, bool reset,
bool global, KPerDomainSettings &pd_settings);
TQString settingsToCSS() const;
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index 4cb4bb3f1..f9593e504 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -158,7 +158,7 @@ bool KHTMLImage::openURL( const KURL &url )
DOM::DocumentImpl *impl = dynamic_cast<DOM::DocumentImpl *>( m_khtml->document().handle() ); // ### hack ;-)
if (!impl) return false;
if ( m_ext->urlArgs().reload )
- impl->docLoader()->setCachePolicy( KIO::CC_Reload );
+ impl->docLoader()->setCachePolicy( TDEIO::CC_Reload );
khtml::DocLoader *dl = impl->docLoader();
m_image = dl->requestImage( m_url.url() );
@@ -232,7 +232,7 @@ void KHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e )
}
/*
-void KHTMLImage::slotImageJobFinished( KIO::Job *job )
+void KHTMLImage::slotImageJobFinished( TDEIO::Job *job )
{
if ( job->error() )
{
diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h
index 6db0cbf5f..5f165bd8d 100644
--- a/khtml/khtmlimage.h
+++ b/khtml/khtmlimage.h
@@ -81,7 +81,7 @@ protected:
private slots:
void restoreScrollPosition();
-// void slotImageJobFinished( KIO::Job *job );
+// void slotImageJobFinished( TDEIO::Job *job );
// void updateWindowCaption();
diff --git a/khtml/khtmlpart_p.h b/khtml/khtmlpart_p.h
index cebee9455..f914ef296 100644
--- a/khtml/khtmlpart_p.h
+++ b/khtml/khtmlpart_p.h
@@ -60,7 +60,7 @@ class KURLLabel;
class KJavaAppletContext;
class KJSErrorDlg;
-namespace KIO
+namespace TDEIO
{
class Job;
class TransferJob;
@@ -198,7 +198,7 @@ public:
m_job = 0L;
m_bComplete = true;
m_bLoadEventEmitted = true;
- m_cachePolicy = KIO::CC_Verify;
+ m_cachePolicy = TDEIO::CC_Verify;
m_manager = 0L;
m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
m_bClearing = false;
@@ -356,7 +356,7 @@ public:
KHTMLSettings *m_settings;
- KIO::TransferJob * m_job;
+ TDEIO::TransferJob * m_job;
TQString m_statusBarText[3];
unsigned long m_jobspeed;
@@ -387,7 +387,7 @@ public:
KURL m_workingURL;
- KIO::CacheControl m_cachePolicy;
+ TDEIO::CacheControl m_cachePolicy;
TQTimer m_redirectionTimer;
TQTime m_parsetime;
int m_delayRedirect;
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 411d03f2e..4a5c7cf2d 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -994,8 +994,8 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
bool hasHorBar = visibleWidth() < contentsWidth();
bool hasVerBar = visibleHeight() < contentsHeight();
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver saver( config, "HTML Settings" );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver saver( config, "HTML Settings" );
if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) {
d->m_mouseScrollIndicator->show();
d->m_mouseScrollIndicator->unsetCursor();
@@ -4517,7 +4517,7 @@ static const int SCROLL_TICK = 20;
void KHTMLView::scrollBy(int dx, int dy)
{
- KConfigGroup cfg( TDEGlobal::config(), "KDE" );
+ TDEConfigGroup cfg( TDEGlobal::config(), "KDE" );
if( !cfg.readBoolEntry( "SmoothScrolling", false )) {
TQScrollView::scrollBy( dx, dy );
return;
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 65be07e83..32c514f1b 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -163,14 +163,14 @@ bool KMultiPart::openURL( const KURL &url )
// Hmm, args.reload is set to true when reloading, but this doesn't seem to be enough...
// I get "HOLD: Reusing held slave for <url>", and the old data
- m_job = KIO::get( url, args.reload, false );
+ m_job = TDEIO::get( url, args.reload, false );
emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage
- connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( slotJobFinished( KIO::Job * ) ) );
- connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
+ connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) );
+ connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
m_numberOfFrames = 0;
m_numberOfFramesSkipped = 0;
@@ -184,7 +184,7 @@ bool KMultiPart::openURL( const KURL &url )
// Yes, libtdenetwork's has such a parser already (MultiPart),
// but it works on the complete string, expecting the whole data to be available....
// The version here is asynchronous.
-void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
+void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data )
{
if (m_boundary.isNull())
{
@@ -533,7 +533,7 @@ void KMultiPart::guiActivateEvent( KParts::GUIActivateEvent * )
// m_part->guiActivateEvent( e );
}
-void KMultiPart::slotJobFinished( KIO::Job *job )
+void KMultiPart::slotJobFinished( TDEIO::Job *job )
{
if ( job->error() )
{
diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h
index 7ba5ba2fe..1e6f83620 100644
--- a/khtml/kmultipart/kmultipart.h
+++ b/khtml/kmultipart/kmultipart.h
@@ -62,8 +62,8 @@ protected:
private slots:
void reallySendData( const TQByteArray& line );
//void slotPopupMenu( KXMLGUIClient *cl, const TQPoint &pos, const KURL &u, const TQString &mime, mode_t mode );
- void slotJobFinished( KIO::Job *job );
- void slotData( KIO::Job *, const TQByteArray & );
+ void slotJobFinished( TDEIO::Job *job );
+ void slotData( TDEIO::Job *, const TQByteArray & );
//void updateWindowCaption();
void slotPartCompleted();
@@ -77,7 +77,7 @@ private:
TQGuardedPtr<KParts::ReadOnlyPart> m_part;
bool m_isHTMLPart;
bool m_partIsLoading;
- KIO::Job* m_job;
+ TDEIO::Job* m_job;
TQCString m_boundary;
int m_boundaryLength;
TQString m_mimeType; // the one handled by m_part - store the kservice instead?
diff --git a/khtml/misc/knsplugininstaller.cpp b/khtml/misc/knsplugininstaller.cpp
index f155008ee..b953f34fb 100644
--- a/khtml/misc/knsplugininstaller.cpp
+++ b/khtml/misc/knsplugininstaller.cpp
@@ -102,7 +102,7 @@ bool KNSPluginInstallEngine::isActive()
{
// check if we have a configuration key in the kde registry
TQString pluginsListFile;
- KConfig cfg("kcmnspluginrc", true);
+ TDEConfig cfg("kcmnspluginrc", true);
cfg.setGroup("Misc");
pluginsListFile = cfg.readPathEntry("PluginsListFile");
return !pluginsListFile.isEmpty();
@@ -117,7 +117,7 @@ const TQValueList<KNSPluginInfo>& KNSPluginInstallEngine::pluginList() const
bool KNSPluginInstallEngine::loadConfig()
{
TQString pluginsListFile;
- KConfig cfg("kcmnspluginrc", true);
+ TDEConfig cfg("kcmnspluginrc", true);
cfg.setGroup("Misc");
pluginsListFile = cfg.readPathEntry("PluginsListFile");
if(!pluginsListFile.isEmpty())
@@ -136,7 +136,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
if(m_pluginsXmlConfig.isEmpty())
{
TQString tmpFile;
- if(KIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
+ if(TDEIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
TQFile f(tmpFile);
if(!f.open(IO_ReadOnly))
return false;
@@ -144,7 +144,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
stream.setEncoding(TQTextStream::UnicodeUTF8);
m_pluginsXmlConfig = stream.read();
f.close();
- KIO::NetAccess::removeTempFile(tmpFile);
+ TDEIO::NetAccess::removeTempFile(tmpFile);
} else
return false;
}
@@ -232,20 +232,20 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info)
tempFile.unlink();
tempFile.close();
// start the download job
- m_downloadJob = KIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
+ m_downloadJob = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
// connect signals
- connect(m_downloadJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(KIO::Job *, unsigned long)));
- connect(m_downloadJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDownloadResult(KIO::Job *)) );
+ connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long)));
+ connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) );
kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl;
}
-void KNSPluginInstallEngine::slotDownLoadProgress(KIO::Job *, unsigned long percent)
+void KNSPluginInstallEngine::slotDownLoadProgress(TDEIO::Job *, unsigned long percent)
{
// propagate the download progression
emit installProgress( ((int)percent)/3 );
}
-void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
+void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job)
{
// test if the download job suceed
if(job->error()) {
@@ -279,9 +279,9 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
for( it = pluginFileList.begin(); it != pluginFileList.end(); ++it ) {
urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) );
}
- m_installFileJob = KIO::copy(urlList , destURL, false );
- connect(m_installFileJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(KIO::Job *, unsigned long)));
- connect(m_installFileJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotCopyResult(KIO::Job *)) );
+ m_installFileJob = TDEIO::copy(urlList , destURL, false );
+ connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long)));
+ connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) );
}
kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl;
@@ -289,13 +289,13 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
m_downloadJob = NULL;
}
-void KNSPluginInstallEngine::slotCopyProgress(KIO::Job *, unsigned long percent)
+void KNSPluginInstallEngine::slotCopyProgress(TDEIO::Job *, unsigned long percent)
{
// propagate the download progression
emit installProgress( ((int)percent)/3 + 33 );
}
-void KNSPluginInstallEngine::slotCopyResult(KIO::Job *job)
+void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job)
{
// test if the download job suceed
if(job->error()) {
@@ -501,14 +501,14 @@ void KNSPluginWizard::showPage(TQWidget *page)
TQString tmpFile;
if(info.licenceURL().isValid())
// retrieve the licence if we have an url
- if(KIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
+ if(TDEIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
TQFile f(tmpFile);
if(f.open(IO_ReadOnly)) {
TQTextStream stream(&f);
stream.setEncoding(TQTextStream::UnicodeUTF8);
licence = stream.read();
f.close();
- KIO::NetAccess::removeTempFile(tmpFile);
+ TDEIO::NetAccess::removeTempFile(tmpFile);
}
}
// else display the licence found in the xml config
diff --git a/khtml/misc/knsplugininstaller.h b/khtml/misc/knsplugininstaller.h
index 0910a685b..240202468 100644
--- a/khtml/misc/knsplugininstaller.h
+++ b/khtml/misc/knsplugininstaller.h
@@ -138,8 +138,8 @@ private:
KMimeType::Ptr m_mime;
KURL m_pluginsListFileURL;
TQString m_tmpPluginFileName;
- KIO::CopyJob *m_downloadJob;
- KIO::CopyJob *m_installFileJob;
+ TDEIO::CopyJob *m_downloadJob;
+ TDEIO::CopyJob *m_installFileJob;
KNSPluginInfo m_toInstallPluginInfo;
TQProcess *m_scanProc;
@@ -151,12 +151,12 @@ signals:
private slots:
// Used to monitor the plugin downloading
- void slotDownLoadProgress(KIO::Job *job, unsigned long percent);
- void slotDownloadResult(KIO::Job *job);
+ void slotDownLoadProgress(TDEIO::Job *job, unsigned long percent);
+ void slotDownloadResult(TDEIO::Job *job);
// Used to monitor the plugin installation
- void slotCopyProgress(KIO::Job *job, unsigned long percent);
- void slotCopyResult(KIO::Job *job);
+ void slotCopyProgress(TDEIO::Job *job, unsigned long percent);
+ void slotCopyResult(TDEIO::Job *job);
// Used to monitor the plugins scan
void readScanProcFromStdout();
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index b9400f229..79a8c2148 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -208,7 +208,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte
// -------------------------------------------------------------------------------------------
-CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy,
+CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy,
const char *accept)
: CachedObject(url, CSSStyleSheet, _cachePolicy, 0)
{
@@ -227,7 +227,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI
}
CachedCSSStyleSheet::CachedCSSStyleSheet(const DOMString &url, const TQString &stylesheet_data)
- : CachedObject(url, CSSStyleSheet, KIO::CC_Verify, stylesheet_data.length())
+ : CachedObject(url, CSSStyleSheet, TDEIO::CC_Verify, stylesheet_data.length())
{
m_loading = false;
m_status = Persistent;
@@ -321,7 +321,7 @@ TQString CachedCSSStyleSheet::checkCharset(const TQByteArray& buffer ) const
// -------------------------------------------------------------------------------------------
-CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
+CachedScript::CachedScript(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*)
: CachedObject(url, Script, _cachePolicy, 0)
{
// It's javascript we want.
@@ -334,7 +334,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro
}
CachedScript::CachedScript(const DOMString &url, const TQString &script_data)
- : CachedObject(url, Script, KIO::CC_Verify, script_data.length())
+ : CachedObject(url, Script, TDEIO::CC_Verify, script_data.length())
{
m_loading = false;
m_status = Persistent;
@@ -466,7 +466,7 @@ static TQString buildAcceptHeader()
// -------------------------------------------------------------------------------------
-CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
+CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*)
: TQObject(), CachedObject(url, Image, _cachePolicy, 0)
{
static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() );
@@ -943,7 +943,7 @@ Request::~Request()
DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc)
{
- m_cachePolicy = KIO::CC_Verify;
+ m_cachePolicy = TDEIO::CC_Verify;
m_expireDate = 0;
m_creationDate = time(0);
m_bautoloadImages = true;
@@ -991,7 +991,7 @@ void DocLoader::insertCachedObject( CachedObject* o ) const
bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
{
bool reload = false;
- if (m_cachePolicy == KIO::CC_Verify)
+ if (m_cachePolicy == TDEIO::CC_Verify)
{
if (!m_reloadedURLs.contains(fullURL))
{
@@ -1003,7 +1003,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
}
}
}
- else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh))
+ else if ((m_cachePolicy == TDEIO::CC_Reload) || (m_cachePolicy == TDEIO::CC_Refresh))
{
if (!m_reloadedURLs.contains(fullURL))
{
@@ -1153,9 +1153,9 @@ void Loader::servePendingRequests()
#endif
KURL u(req->object->url().string());
- KIO::TransferJob* job = KIO::get( u, false, false /*no GUI*/);
+ TDEIO::TransferJob* job = TDEIO::get( u, false, false /*no GUI*/);
- job->addMetaData("cache", KIO::getCacheControlString(req->object->cachePolicy()));
+ job->addMetaData("cache", TDEIO::getCacheControlString(req->object->cachePolicy()));
if (!req->object->accept().isEmpty())
job->addMetaData("accept", req->object->accept());
if ( req->m_docLoader )
@@ -1171,21 +1171,21 @@ void Loader::servePendingRequests()
}
}
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished( KIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)),
- TQT_SLOT( slotData( KIO::Job*, const TQByteArray &)));
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+ TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
if ( req->object->schedule() )
- KIO::Scheduler::scheduleJob( job );
+ TDEIO::Scheduler::scheduleJob( job );
m_requestsLoading.insert(job, req);
}
}
-void Loader::slotFinished( KIO::Job* job )
+void Loader::slotFinished( TDEIO::Job* job )
{
Request *r = m_requestsLoading.take( job );
- KIO::TransferJob* j = static_cast<KIO::TransferJob*>(job);
+ TDEIO::TransferJob* j = static_cast<TDEIO::TransferJob*>(job);
if ( !r )
return;
@@ -1247,7 +1247,7 @@ void Loader::slotFinished( KIO::Job* job )
m_timer.start(0, true);
}
-void Loader::slotData( KIO::Job*job, const TQByteArray &data )
+void Loader::slotData( TDEIO::Job*job, const TQByteArray &data )
{
Request *r = m_requestsLoading[job];
if(!r) {
@@ -1303,7 +1303,7 @@ void Loader::cancelRequests( DocLoader* dl )
if ( lIt.current()->m_docLoader == dl )
{
//kdDebug( 6060 ) << "canceling loading request for " << lIt.current()->object->url().string() << endl;
- KIO::Job *job = static_cast<KIO::Job *>( lIt.currentKey() );
+ TDEIO::Job *job = static_cast<TDEIO::Job *>( lIt.currentKey() );
Cache::removeCacheEntry( lIt.current()->object );
m_requestsLoading.remove( lIt.currentKey() );
job->kill();
@@ -1314,7 +1314,7 @@ void Loader::cancelRequests( DocLoader* dl )
}
}
-KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
+TDEIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
{
TQPtrDictIterator<Request> it( m_requestsLoading );
@@ -1323,7 +1323,7 @@ KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
CachedObject *obj = it.current()->object;
if ( obj && obj->url() == url )
- return static_cast<KIO::Job *>( it.currentKey() );
+ return static_cast<TDEIO::Job *>( it.currentKey() );
}
return 0;
@@ -1424,7 +1424,7 @@ void Cache::clear()
template<typename CachedObjectType, enum CachedObject::Type CachedType>
CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const char* accept )
{
- KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify;
+ TDEIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : TDEIO::CC_Verify;
TQString url = kurl.url();
CachedObject* o = cache->find(url);
diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h
index e950f1767..833b98b84 100644
--- a/khtml/misc/loader.h
+++ b/khtml/misc/loader.h
@@ -57,7 +57,7 @@
class TQMovie;
class KHTMLPart;
-namespace KIO {
+namespace TDEIO {
class Job;
class TransferJob;
}
@@ -99,7 +99,7 @@ namespace khtml
Cached // regular case
};
- CachedObject(const DOM::DOMString &url, Type type, KIO::CacheControl _cachePolicy, int size)
+ CachedObject(const DOM::DOMString &url, Type type, TDEIO::CacheControl _cachePolicy, int size)
: m_url(url), m_type(type), m_cachePolicy(_cachePolicy),
m_expireDate(0), m_size(size)
{
@@ -140,7 +140,7 @@ namespace khtml
bool free() const { return m_free; }
- KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
+ TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
void setRequest(Request *_request);
@@ -169,7 +169,7 @@ namespace khtml
Type m_type;
Status m_status;
int m_accessCount;
- KIO::CacheControl m_cachePolicy;
+ TDEIO::CacheControl m_cachePolicy;
time_t m_expireDate;
int m_size;
bool m_deleted : 1;
@@ -195,7 +195,7 @@ namespace khtml
class CachedCSSStyleSheet : public CachedObject
{
public:
- CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy,
+ CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy,
const char *accept);
CachedCSSStyleSheet(const DOM::DOMString &url, const TQString &stylesheet_data);
@@ -226,7 +226,7 @@ namespace khtml
class CachedScript : public CachedObject
{
public:
- CachedScript(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept );
+ CachedScript(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept );
CachedScript(const DOM::DOMString &url, const TQString &script_data);
const DOM::DOMString &script() const { return m_script; }
@@ -257,7 +257,7 @@ namespace khtml
{
Q_OBJECT
public:
- CachedImage(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept);
+ CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept);
virtual ~CachedImage();
const TQPixmap &pixmap() const;
@@ -354,7 +354,7 @@ namespace khtml
CachedScript *requestScript( const DOM::DOMString &url, const TQString& charset);
bool autoloadImages() const { return m_bautoloadImages; }
- KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
+ TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
time_t expireDate() const { return m_expireDate; }
KHTMLPart* part() const { return m_part; }
@@ -363,7 +363,7 @@ namespace khtml
void setCacheCreationDate( time_t );
void setExpireDate( time_t, bool relative );
void setAutoloadImages( bool );
- void setCachePolicy( KIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
+ void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
void setShowAnimations( KHTMLSettings::KAnimationAdvice );
void pauseAnimations();
void resumeAnimations();
@@ -381,7 +381,7 @@ namespace khtml
mutable TQPtrDict<CachedObject> m_docObjects;
time_t m_expireDate;
time_t m_creationDate;
- KIO::CacheControl m_cachePolicy;
+ TDEIO::CacheControl m_cachePolicy;
bool m_bautoloadImages : 1;
KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
KHTMLPart* m_part;
@@ -418,7 +418,7 @@ namespace khtml
void cancelRequests( DocLoader* dl );
// may return 0L
- KIO::Job *jobForRequest( const DOM::DOMString &url ) const;
+ TDEIO::Job *jobForRequest( const DOM::DOMString &url ) const;
signals:
void requestStarted( khtml::DocLoader* dl, khtml::CachedObject* obj );
@@ -426,8 +426,8 @@ namespace khtml
void requestFailed( khtml::DocLoader* dl, khtml::CachedObject *obj );
protected slots:
- void slotFinished( KIO::Job * );
- void slotData( KIO::Job *, const TQByteArray & );
+ void slotFinished( TDEIO::Job * );
+ void slotData( TDEIO::Job *, const TQByteArray & );
void servePendingRequests();
protected:
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 62785e204..172e63e4a 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
a.config()->writeEntry( "kjscupguard_alarmhandler", true );
a.config()->setGroup("HTML Settings");
a.config()->writeEntry("ReportJSErrors", false);
- KConfig cfg( "khtmlrc" );
+ TDEConfig cfg( "khtmlrc" );
cfg.setGroup("HTML Settings");
cfg.writeEntry( "StandardFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT );
cfg.writeEntry( "FixedFont", HTML_DEFAULT_VIEW_FIXED_FONT );
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index ba5bf063f..e0135d091 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
void Dummy::doBenchmark()
{
- KConfigGroup settings(TDEGlobal::config(), "bench");
+ TDEConfigGroup settings(TDEGlobal::config(), "bench");
results.clear();
TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(),
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 3a277ecf5..ff206a1cc 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -1718,7 +1718,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
KURL url = v->part()->url();
if ((str == "no-cache") && url.protocol().startsWith("http"))
{
- KIO::http_update_cache(url, true, 0);
+ TDEIO::http_update_cache(url, true, 0);
}
}
else if( (strcasecmp(equiv, "set-cookie") == 0))
@@ -2491,7 +2491,7 @@ void DocumentImpl::error(int err, const TQString &text)
int exceptioncode = 0;
EventImpl *evt = new EventImpl(EventImpl::ERROR_EVENT,false,false);
if (err != 0)
- evt->setMessage(KIO::buildErrorString(err,text));
+ evt->setMessage(TDEIO::buildErrorString(err,text));
else
evt->setMessage(text);
evt->ref();