Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

3 files changed, 11 insertions, 11 deletions

diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index a82a80a0e..9d8b0ac4f 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -87,7 +87,7 @@
 
 class JSStackFrame;
 
-typedef TQMap< int, KJavaKIOJob* > KIOJobMap;
+typedef TQMap< int, KJavaTDEIOJob* > TDEIOJobMap;
 typedef TQMap< int, JSStackFrame* > JSStack;
 
 class JSStackFrame {
@@ -121,7 +121,7 @@ private:
    TQMap< int, TQGuardedPtr<KJavaAppletContext> > contexts;
    TQString appletLabel;
    JSStack jsstack;
-   KIOJobMap kiojobs;
+   TDEIOJobMap kiojobs;
    bool javaProcessFailed;
    bool useKIO;
    KSSL * kssl;
@@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray&
 
 void KJavaAppletServer::removeDataJob( int loaderID )
 {
-    const KIOJobMap::iterator it = d->kiojobs.find( loaderID );
+    const TDEIOJobMap::iterator it = d->kiojobs.find( loaderID );
     if (it != d->kiojobs.end()) {
         it.data()->deleteLater();
         d->kiojobs.erase( it );
@@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     if (cmd_code == KJAS_PUT_DATA) {
         // rest of the data is for kio put
         if (ok) {
-            KIOJobMap::iterator it = d->kiojobs.find( ID_num );
+            TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
             if (ok && it != d->kiojobs.end()) {
                 TQByteArray qba;
                 qba.setRawData(qb.data() + index, qb.size() - index - 1);
@@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
         case KJAS_DATA_COMMAND:
             if (ok && !args.empty()) {
                 const int cmd = args.first().toInt( &ok );
-                KIOJobMap::iterator it = d->kiojobs.find( ID_num );
+                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;
diff --git a/khtml/java/kjavadownloader.cpp b/khtml/java/kjavadownloader.cpp
index a12b585b7..a0a8abdd2 100644
--- a/khtml/java/kjavadownloader.cpp
+++ b/khtml/java/kjavadownloader.cpp
@@ -41,9 +41,9 @@ static const int KJAS_STOP = 0;
 static const int KJAS_HOLD = 1;
 static const int KJAS_RESUME = 2;
 
-KJavaKIOJob::~KJavaKIOJob() {}
+KJavaTDEIOJob::~KJavaTDEIOJob() {}
 
-void KJavaKIOJob::data( const TQByteArray& )
+void KJavaTDEIOJob::data( const TQByteArray& )
 {
     kdError(6100) << "Job id mixup" << endl;
 }
diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h
index ab6553398..22690824c 100644
--- a/khtml/java/kjavadownloader.h
+++ b/khtml/java/kjavadownloader.h
@@ -40,16 +40,16 @@ namespace TDEIO {
 class KJavaDownloaderPrivate;
 class KJavaUploaderPrivate;
 
-class KJavaKIOJob : public TQObject
+class KJavaTDEIOJob : public TQObject
 {
 Q_OBJECT
 public:
-    virtual ~KJavaKIOJob();
+    virtual ~KJavaTDEIOJob();
     virtual void jobCommand( int cmd ) = 0;
     virtual void data( const TQByteArray& qb );
 };
 
-class KJavaDownloader : public KJavaKIOJob
+class KJavaDownloader : public KJavaTDEIOJob
 {
 Q_OBJECT
 
@@ -69,7 +69,7 @@ private:
 
 };
 
-class KJavaUploader : public KJavaKIOJob
+class KJavaUploader : public KJavaTDEIOJob
 {
 Q_OBJECT