diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:15:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:15:51 -0600 |
| commit | d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e (patch) | |
| tree | ecd8c94dc36cb35dd4810a2b05d1b78bb969e143 /khtml/java/kjavadownloader.cpp | |
| parent | 703fb0c89c2eee56a1e613e67a446db9d4287929 (diff) | |
| download | tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.tar.gz tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.zip | |
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'khtml/java/kjavadownloader.cpp')
| -rw-r--r-- | khtml/java/kjavadownloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |