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

kalyptus/kalyptusCxxToSmoke.pm

@@ -401,7 +401,7 @@ sub preParseClass
 	    $className eq 'KSharedPixmap' ||
 	    $className eq 'KLibrary' ||
 	    $className eq 'KScanDialogFactory' ||
-	    $className eq 'KBufferedIO' ||
+	    $className eq 'TDEBufferedIO' ||
 	    $className eq 'KDictSpellingHighlighter' ||
 		$className eq 'KPropertiesDialog' ||
 	    $className eq 'ProgressItem' ||

kalyptus/kalyptusDataDict.pm

@@ -748,7 +748,7 @@ BEGIN
 'KAutoUnmount*' => 'kde_KAutoUnmount*',
 'KBindingPropsPlugin*' => 'kde_KBindingPropsPlugin*',
 'KBlankEffect*' => 'kde_KBlankEffect*',
-'KBufferedIO*' => 'kde_KBufferedIO*',
+'TDEBufferedIO*' => 'kde_TDEBufferedIO*',
 'KBugReport*' => 'kde_KBugReport*',
 'KButtonBox*' => 'kde_KButtonBox*',
 'TDECModule*'  =>  'kde_TDECModule*' ,
@@ -938,8 +938,8 @@ BEGIN
 'TDEIO::SimpleJob*' => 'kde_SimpleJob*',
 'TDEIO::SkipDlg_Result' => 'int',
 'TDEIO::Slave*' => 'kde_Slave*',
-'KIOInputStream&' => 'kde_KIOInputStream*',
-'KIOInputStream*' => 'kde_KIOInputStream*',
+'TDEIOInputStream&' => 'kde_TDEIOInputStream*',
+'TDEIOInputStream*' => 'kde_TDEIOInputStream*',
 'KIOTestSlow&' => 'kde_KIOTestSlow*',
 'KIOTestSlow' => 'kde_KIOTestSlow*',
 'KIOTestSlow*' => 'kde_KIOTestSlow*',

kdejava/ChangeLog

@@ -70,7 +70,7 @@
 	* Removed -lkjs, -lkscipt and -lkmid libs from the link options
 	* Removed KDockWindow, KLineEditDlg, KPrinter, KNamedCommand, TDESocket and KRegExpr
 	  classes
-	* Added KInputDialog, KExtendedSocket, KBufferedIO, KAsyncIO, KDirLister, RenameDlg,
+	* Added KInputDialog, KExtendedSocket, TDEBufferedIO, KAsyncIO, KDirLister, RenameDlg,
 	  AuthInfo and Observer classes
 	* Converted '\c' tags in comments to pairs <code> tags
 	* Improved conversion of C++ code snippets to java

kdejava/koala/kdejava/KBufferedIO.cpp

@@ -3,85 +3,85 @@
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
-#include <kdejava/KBufferedIO.h>
+#include <kdejava/TDEBufferedIO.h>
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KBufferedIO_bytesAvailable(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEBufferedIO_bytesAvailable(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((KBufferedIO*) QtSupport::getQt(env, obj))->bytesAvailable();
+	jint xret = (jint) ((TDEBufferedIO*) QtSupport::getQt(env, obj))->bytesAvailable();
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KBufferedIO_bytesToWrite(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEBufferedIO_bytesToWrite(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((KBufferedIO*) QtSupport::getQt(env, obj))->bytesToWrite();
+	jint xret = (jint) ((TDEBufferedIO*) QtSupport::getQt(env, obj))->bytesToWrite();
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KBufferedIO_canReadLine(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEBufferedIO_canReadLine(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((KBufferedIO*) QtSupport::getQt(env, obj))->canReadLine();
+	jboolean xret = (jboolean) ((TDEBufferedIO*) QtSupport::getQt(env, obj))->canReadLine();
 	return xret;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KBufferedIO_className(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEBufferedIO_className(JNIEnv* env, jobject obj)
 {
 	const char* _qstring;
-	_qstring = ((KBufferedIO*) QtSupport::getQt(env, obj))->className();
+	_qstring = ((TDEBufferedIO*) QtSupport::getQt(env, obj))->className();
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KBufferedIO_closeNow(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEBufferedIO_closeNow(JNIEnv* env, jobject obj)
 {
-	((KBufferedIO*) QtSupport::getQt(env, obj))->closeNow();
+	((TDEBufferedIO*) QtSupport::getQt(env, obj))->closeNow();
 	return;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KBufferedIO_metaObject(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEBufferedIO_metaObject(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((KBufferedIO*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.TQMetaObject");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEBufferedIO*) QtSupport::getQt(env, obj))->metaObject(), "org.kde.qt.TQMetaObject");
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KBufferedIO_peekBlock(JNIEnv* env, jobject obj, jstring data, jint maxlen)
+Java_org_kde_koala_TDEBufferedIO_peekBlock(JNIEnv* env, jobject obj, jstring data, jint maxlen)
 {
 static TQCString* _qstring_data = 0;
-	jint xret = (jint) ((KBufferedIO*) QtSupport::getQt(env, obj))->peekBlock((char*) QtSupport::toCharString(env, data, &_qstring_data), (uint) maxlen);
+	jint xret = (jint) ((TDEBufferedIO*) QtSupport::getQt(env, obj))->peekBlock((char*) QtSupport::toCharString(env, data, &_qstring_data), (uint) maxlen);
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KBufferedIO_setBufferSize__I(JNIEnv* env, jobject obj, jint rsize)
+Java_org_kde_koala_TDEBufferedIO_setBufferSize__I(JNIEnv* env, jobject obj, jint rsize)
 {
-	jboolean xret = (jboolean) ((KBufferedIO*) QtSupport::getQt(env, obj))->setBufferSize((int) rsize);
+	jboolean xret = (jboolean) ((TDEBufferedIO*) QtSupport::getQt(env, obj))->setBufferSize((int) rsize);
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KBufferedIO_setBufferSize__II(JNIEnv* env, jobject obj, jint rsize, jint wsize)
+Java_org_kde_koala_TDEBufferedIO_setBufferSize__II(JNIEnv* env, jobject obj, jint rsize, jint wsize)
 {
-	jboolean xret = (jboolean) ((KBufferedIO*) QtSupport::getQt(env, obj))->setBufferSize((int) rsize, (int) wsize);
+	jboolean xret = (jboolean) ((TDEBufferedIO*) QtSupport::getQt(env, obj))->setBufferSize((int) rsize, (int) wsize);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KBufferedIO_unreadBlock(JNIEnv* env, jobject obj, jstring data, jint len)
+Java_org_kde_koala_TDEBufferedIO_unreadBlock(JNIEnv* env, jobject obj, jstring data, jint len)
 {
 static TQCString* _qstring_data = 0;
-	jint xret = (jint) ((KBufferedIO*) QtSupport::getQt(env, obj))->unreadBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (uint) len);
+	jint xret = (jint) ((TDEBufferedIO*) QtSupport::getQt(env, obj))->unreadBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (uint) len);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KBufferedIO_waitForMore(JNIEnv* env, jobject obj, jint msec)
+Java_org_kde_koala_TDEBufferedIO_waitForMore(JNIEnv* env, jobject obj, jint msec)
 {
-	jint xret = (jint) ((KBufferedIO*) QtSupport::getQt(env, obj))->waitForMore((int) msec);
+	jint xret = (jint) ((TDEBufferedIO*) QtSupport::getQt(env, obj))->waitForMore((int) msec);
 	return xret;
 }
 

kdejava/koala/kdejava/KBufferedIO.h

@@ -1,7 +1,7 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 
-#ifndef __org_kde_koala_KBufferedIO__
-#define __org_kde_koala_KBufferedIO__
+#ifndef __org_kde_koala_TDEBufferedIO__
+#define __org_kde_koala_TDEBufferedIO__
 
 #include <jni.h>
 
@@ -10,20 +10,20 @@ extern "C"
 {
 #endif
 
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KBufferedIO_metaObject (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KBufferedIO_className (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KBufferedIO_closeNow (JNIEnv *env, jobject);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KBufferedIO_setBufferSize__II (JNIEnv *env, jobject, jint, jint);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KBufferedIO_setBufferSize__I (JNIEnv *env, jobject, jint);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KBufferedIO_bytesAvailable (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KBufferedIO_waitForMore (JNIEnv *env, jobject, jint);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KBufferedIO_bytesToWrite (JNIEnv *env, jobject);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KBufferedIO_canReadLine (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KBufferedIO_peekBlock (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KBufferedIO_unreadBlock (JNIEnv *env, jobject, jstring, jint);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEBufferedIO_metaObject (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEBufferedIO_className (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEBufferedIO_closeNow (JNIEnv *env, jobject);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEBufferedIO_setBufferSize__II (JNIEnv *env, jobject, jint, jint);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEBufferedIO_setBufferSize__I (JNIEnv *env, jobject, jint);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEBufferedIO_bytesAvailable (JNIEnv *env, jobject);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEBufferedIO_waitForMore (JNIEnv *env, jobject, jint);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEBufferedIO_bytesToWrite (JNIEnv *env, jobject);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEBufferedIO_canReadLine (JNIEnv *env, jobject);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEBufferedIO_peekBlock (JNIEnv *env, jobject, jstring, jint);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEBufferedIO_unreadBlock (JNIEnv *env, jobject, jstring, jint);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __org_kde_koala_KBufferedIO__ */
+#endif /* __org_kde_koala_TDEBufferedIO__ */

kdejava/koala/org/kde/koala/KBufferedIO.java

@@ -16,7 +16,7 @@ import org.kde.qt.QtSupport;
  KExtendedSocket is a subclass of this one. This is so that applications
  written using TQSocket's buffering characteristics will be more easily
  ported to the more powerful KExtendedSocket class.
- KBufferedIO already provides a powerful internal buffering algorithm. However,
+ TDEBufferedIO already provides a powerful internal buffering algorithm. However,
  this does not include the I/O itself, which must be implemented in
  derived classes. Thus, to implement a class that does some I/O, you must
  override, in addition to the pure TQIODevice methods, these two:
@@ -31,14 +31,14 @@ import org.kde.qt.QtSupport;
 	 If your derived class reimplements the buffering algorithm, you must then
  decide which buffering functions to override. For instance, you may want to
  change the protected functions like feedReadBuffer() and consumeReadBuffer().
- See {@link KBufferedIOSignals} for signals emitted by KBufferedIO
+ See {@link TDEBufferedIOSignals} for signals emitted by TDEBufferedIO
 		@author Thiago Macieira <thiagom@mail.com>
 
 		@short Buffered I/O.
 
 */
-public class KBufferedIO extends KAsyncIO  {
-	protected KBufferedIO(Class dummy){super((Class) null);}
+public class TDEBufferedIO extends KAsyncIO  {
+	protected TDEBufferedIO(Class dummy){super((Class) null);}
 	/**	
 		 The modes for closed() signal
 		   		@short    The modes for closed() signal

kdejava/koala/org/kde/koala/KBufferedIOSignals.java

@@ -4,7 +4,7 @@ package org.kde.koala;
 import org.kde.qt.TQMetaObject;
 import org.kde.qt.QtSupport;
 
-public interface KBufferedIOSignals {
+public interface TDEBufferedIOSignals {
 	/**	
 		 This signal gets sent whenever bytes are written from the buffer.
 			@param nbytes the number of bytes sent.