From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 13:15:51 -0600
Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig,
 KIOBuffer, and KBuffer to avoid conflicts with KDE4

---
 khtml/java/kjavadownloader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'khtml/java/kjavadownloader.cpp')

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;
 }
-- 
cgit v1.2.3