summaryrefslogtreecommitdiffstats
path: root/khtml/java
diff options
context:
space:
mode:
Diffstat (limited to 'khtml/java')
-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
5 files changed, 43 insertions, 43 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 17:04:37 +0000