diff options
Diffstat (limited to 'kdejava')
| -rw-r--r-- | kdejava/ChangeLog | 2 | ||||
| -rw-r--r-- | kdejava/TODO | 4 | ||||
| -rw-r--r-- | kdejava/koala/Makefile.am | 2 | ||||
| -rw-r--r-- | kdejava/koala/kdejava/KApplication.cpp | 40 | ||||
| -rw-r--r-- | kdejava/koala/kdejava/KApplication.h | 20 | ||||
| -rw-r--r-- | kdejava/koala/kdejava/KDESupport.cpp | 2 | ||||
| -rw-r--r-- | kdejava/koala/kdejava/KDESupport.h | 2 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/KApplication.java | 32 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/KPanelMenu.java | 2 | ||||
| -rw-r--r-- | kdejava/koala/test/kblend/KBlendTest.java | 2 | ||||
| -rw-r--r-- | kdejava/koala/test/kcharselect/KCharSelectTest.java | 2 | ||||
| -rw-r--r-- | kdejava/koala/test/kcombobox/KComboBoxTest.java | 2 | ||||
| -rw-r--r-- | kdejava/koala/test/kfontdialog/KFontDialogTest.java | 2 | ||||
| -rw-r--r-- | kdejava/koala/test/kprogress/KProgressTest.java | 2 |
14 files changed, 58 insertions, 58 deletions
diff --git a/kdejava/ChangeLog b/kdejava/ChangeLog index 58b6fd60..dc2e1c6b 100644 --- a/kdejava/ChangeLog +++ b/kdejava/ChangeLog @@ -259,7 +259,7 @@ * In KContainerLayout, fixed incorrect int literal for vertical value 2001-08-17 Richard Dale <duke@tipitina.demon.co.uk * Removed classes DwProtocolClient and DwObserver, which - used to be in kdesupport lib (now in kdenetwork). + used to be in tdesupport lib (now in kdenetwork). 2001-08-06 Richard Dale <duke@tipitina.demon.co.uk * Removed obsolete KDirectionButton and KTabButton classes. * Improved Java -> C++ slot type signature matching. diff --git a/kdejava/TODO b/kdejava/TODO index b179a6aa..4d3d6934 100644 --- a/kdejava/TODO +++ b/kdejava/TODO @@ -1,8 +1,8 @@ - Split up and group java classes into sub packages such as 'org.kde.koala.kparts', - and 'org.kde.koala.kdecore'. + and 'org.kde.koala.tdecore'. - Split up shared libs into smaller sub-libraries for faster loading, or write - a 'kdejavainit' process in the style of kdeinit (could be a child of kdeinit?). + a 'kdejavainit' process in the style of tdeinit (could be a child of tdeinit?). It would need to load all the shared libs, have a JVM ready to roll straight into the main() method of the main class, and then fork() on demand... diff --git a/kdejava/koala/Makefile.am b/kdejava/koala/Makefile.am index 30ff266d..80dfbe6d 100644 --- a/kdejava/koala/Makefile.am +++ b/kdejava/koala/Makefile.am @@ -36,7 +36,7 @@ INCLUDES= $(all_includes) koala_METASOURCES = AUTO # the library search path. -koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +koala_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor # them while "make clean", use CLEANFILES CLEANFILES = koala.jar diff --git a/kdejava/koala/kdejava/KApplication.cpp b/kdejava/koala/kdejava/KApplication.cpp index 4bc22d76..6b30200a 100644 --- a/kdejava/koala/kdejava/KApplication.cpp +++ b/kdejava/koala/kdejava/KApplication.cpp @@ -559,52 +559,52 @@ Java_org_kde_koala_KApplication_kApplication(JNIEnv* env, jclass cls) } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name) +Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name) { (void) cls; static TQString* _qstring_name = 0; - jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name)); + jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name)); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args) +Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args) { (void) cls; static TQString* _qstring_name = 0; static TQStringList* _qlist_args = 0; - jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args)); + jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args)); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error) +Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error) { (void) cls; static TQString* _qstring_name = 0; static TQStringList* _qlist_args = 0; static TQString* _qstring_error = 0; - jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error)); + jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error)); QtSupport::fromQStringToStringBuffer(env, _qstring_error, error); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid) +Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid) { (void) cls; static TQString* _qstring_name = 0; static TQStringList* _qlist_args = 0; static TQString* _qstring_error = 0; int* _int_pid = QtSupport::toIntPtr(env, pid); - jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error), (int*) _int_pid); + jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error), (int*) _int_pid); QtSupport::fromQStringToStringBuffer(env, _qstring_error, error); env->SetIntArrayRegion(pid, 0, 1, (jint *) _int_pid); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid, jstring startup_id) +Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid, jstring startup_id) { (void) cls; static TQString* _qstring_name = 0; @@ -612,59 +612,59 @@ static TQStringList* _qlist_args = 0; static TQString* _qstring_error = 0; int* _int_pid = QtSupport::toIntPtr(env, pid); static TQCString* _qcstring_startup_id = 0; - jint xret = (jint) KApplicationJBridge::kdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error), (int*) _int_pid, (const TQCString&)*(TQCString*) QtSupport::toQCString(env, startup_id, &_qcstring_startup_id)); + jint xret = (jint) KApplicationJBridge::tdeinitExecWait((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error), (int*) _int_pid, (const TQCString&)*(TQCString*) QtSupport::toQCString(env, startup_id, &_qcstring_startup_id)); QtSupport::fromQStringToStringBuffer(env, _qstring_error, error); env->SetIntArrayRegion(pid, 0, 1, (jint *) _int_pid); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name) +Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name) { (void) cls; static TQString* _qstring_name = 0; - jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name)); + jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name)); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args) +Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args) { (void) cls; static TQString* _qstring_name = 0; static TQStringList* _qlist_args = 0; - jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args)); + jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args)); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error) +Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error) { (void) cls; static TQString* _qstring_name = 0; static TQStringList* _qlist_args = 0; static TQString* _qstring_error = 0; - jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error)); + jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error)); QtSupport::fromQStringToStringBuffer(env, _qstring_error, error); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid) +Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid) { (void) cls; static TQString* _qstring_name = 0; static TQStringList* _qlist_args = 0; static TQString* _qstring_error = 0; int* _int_pid = QtSupport::toIntPtr(env, pid); - jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error), (int*) _int_pid); + jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error), (int*) _int_pid); QtSupport::fromQStringToStringBuffer(env, _qstring_error, error); env->SetIntArrayRegion(pid, 0, 1, (jint *) _int_pid); return xret; } JNIEXPORT jint JNICALL -Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid, jstring startup_id) +Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2(JNIEnv* env, jclass cls, jstring name, jobjectArray args, jobject error, jintArray pid, jstring startup_id) { (void) cls; static TQString* _qstring_name = 0; @@ -672,7 +672,7 @@ static TQStringList* _qlist_args = 0; static TQString* _qstring_error = 0; int* _int_pid = QtSupport::toIntPtr(env, pid); static TQCString* _qcstring_startup_id = 0; - jint xret = (jint) KApplicationJBridge::kdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error), (int*) _int_pid, (const TQCString&)*(TQCString*) QtSupport::toQCString(env, startup_id, &_qcstring_startup_id)); + jint xret = (jint) KApplicationJBridge::tdeinitExec((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (const TQStringList&)*(TQStringList*) QtSupport::toQStringList(env, args, &_qlist_args), (TQString*) QtSupport::toQStringFromStringBuffer(env, error, &_qstring_error), (int*) _int_pid, (const TQCString&)*(TQCString*) QtSupport::toQCString(env, startup_id, &_qcstring_startup_id)); QtSupport::fromQStringToStringBuffer(env, _qstring_error, error); env->SetIntArrayRegion(pid, 0, 1, (jint *) _int_pid); return xret; diff --git a/kdejava/koala/kdejava/KApplication.h b/kdejava/koala/kdejava/KApplication.h index 864ffcae..d55a4ac9 100644 --- a/kdejava/koala/kdejava/KApplication.h +++ b/kdejava/koala/kdejava/KApplication.h @@ -126,16 +126,16 @@ extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_startServiceByDesk extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_startServiceByDesktopName__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject); extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_startServiceByDesktopName__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray); extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_startServiceByDesktopName__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray, jstring); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExec__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray, jstring); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_kdeinitExecWait__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray, jstring); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExec__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3ILjava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray, jstring); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2_3I (JNIEnv *env, jclass, jstring, jobjectArray, jobject, jintArray); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2Ljava_lang_StringBuffer_2 (JNIEnv *env, jclass, jstring, jobjectArray, jobject); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2_3Ljava_lang_String_2 (JNIEnv *env, jclass, jstring, jobjectArray); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_tdeinitExecWait__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring); extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_random (JNIEnv *env, jclass); extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KApplication_randomString (JNIEnv *env, jclass, jint); extern JNIEXPORT jint JNICALL Java_org_kde_koala_KApplication_keyboardMouseState (JNIEnv *env, jclass); diff --git a/kdejava/koala/kdejava/KDESupport.cpp b/kdejava/koala/kdejava/KDESupport.cpp index f140d36c..1cf06aff 100644 --- a/kdejava/koala/kdejava/KDESupport.cpp +++ b/kdejava/koala/kdejava/KDESupport.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - kdesupport.cpp - description + tdesupport.cpp - description ------------------- copyright : (C) 2001 by Richard Dale email : Lost_Highway@tipitina.demon.co.uk diff --git a/kdejava/koala/kdejava/KDESupport.h b/kdejava/koala/kdejava/KDESupport.h index 4f0d564a..cf31f971 100644 --- a/kdejava/koala/kdejava/KDESupport.h +++ b/kdejava/koala/kdejava/KDESupport.h @@ -1,5 +1,5 @@ /*************************************************************************** - kdesupport.h - description + tdesupport.h - description ------------------- begin : Mon Feb 5 2001 copyright : (C) 2001 by Richard Dale diff --git a/kdejava/koala/org/kde/koala/KApplication.java b/kdejava/koala/org/kde/koala/KApplication.java index ba9e7e01..818256e3 100644 --- a/kdejava/koala/org/kde/koala/KApplication.java +++ b/kdejava/koala/org/kde/koala/KApplication.java @@ -876,9 +876,9 @@ public class KApplication extends QApplication implements KInstanceInterface { public static native int startServiceByDesktopName(String _name, String[] URLs); public static native int startServiceByDesktopName(String _name); /** - Starts a program via kdeinit. + Starts a program via tdeinit. program name and arguments are converted to according to the - local encoding and passed as is to kdeinit. + local encoding and passed as is to tdeinit. @param name Name of the program to start @param args Arguments to pass to the program @param error On failure, <code>error</code> contains a description of the error @@ -890,16 +890,16 @@ public class KApplication extends QApplication implements KInstanceInterface { "" ( empty string ) is the default @return an error code indicating success (== 0) or failure (> 0). - @short Starts a program via kdeinit. + @short Starts a program via tdeinit. */ - public static native int kdeinitExec(String name, String[] args, StringBuffer error, int[] pid, String startup_id); - public static native int kdeinitExec(String name, String[] args, StringBuffer error, int[] pid); - public static native int kdeinitExec(String name, String[] args, StringBuffer error); - public static native int kdeinitExec(String name, String[] args); - public static native int kdeinitExec(String name); + public static native int tdeinitExec(String name, String[] args, StringBuffer error, int[] pid, String startup_id); + public static native int tdeinitExec(String name, String[] args, StringBuffer error, int[] pid); + public static native int tdeinitExec(String name, String[] args, StringBuffer error); + public static native int tdeinitExec(String name, String[] args); + public static native int tdeinitExec(String name); /** - Starts a program via kdeinit and wait for it to finish. - Like kdeinitExec(), but it waits till the program is finished. + Starts a program via tdeinit and wait for it to finish. + Like tdeinitExec(), but it waits till the program is finished. As such it behaves similar to the system(...) function. @param name Name of the program to start @param args Arguments to pass to the program @@ -912,13 +912,13 @@ public class KApplication extends QApplication implements KInstanceInterface { "" ( empty string ) is the default @return an error code indicating success (== 0) or failure (> 0). - @short Starts a program via kdeinit and wait for it to finish. + @short Starts a program via tdeinit and wait for it to finish. */ - public static native int kdeinitExecWait(String name, String[] args, StringBuffer error, int[] pid, String startup_id); - public static native int kdeinitExecWait(String name, String[] args, StringBuffer error, int[] pid); - public static native int kdeinitExecWait(String name, String[] args, StringBuffer error); - public static native int kdeinitExecWait(String name, String[] args); - public static native int kdeinitExecWait(String name); + public static native int tdeinitExecWait(String name, String[] args, StringBuffer error, int[] pid, String startup_id); + public static native int tdeinitExecWait(String name, String[] args, StringBuffer error, int[] pid); + public static native int tdeinitExecWait(String name, String[] args, StringBuffer error); + public static native int tdeinitExecWait(String name, String[] args); + public static native int tdeinitExecWait(String name); /** Generates a uniform random number. @return A truly unpredictable number in the range [0, RAND_MAX) diff --git a/kdejava/koala/org/kde/koala/KPanelMenu.java b/kdejava/koala/org/kde/koala/KPanelMenu.java index 17d60ab2..4eeda34a 100644 --- a/kdejava/koala/org/kde/koala/KPanelMenu.java +++ b/kdejava/koala/org/kde/koala/KPanelMenu.java @@ -19,7 +19,7 @@ import org.kde.qt.QWidget; relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the library name without any extension). This desktop file has to be installed in $KDEDIR/share/apps/kicker/menuext/. - @author The kicker maintainers, Michael Goffioul <kdeprint@swing.be> + @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be> @short Base class to build dynamically loaded menu entries for the K-menu, or the panel. diff --git a/kdejava/koala/test/kblend/KBlendTest.java b/kdejava/koala/test/kblend/KBlendTest.java index 6e4e4109..67080049 100644 --- a/kdejava/koala/test/kblend/KBlendTest.java +++ b/kdejava/koala/test/kblend/KBlendTest.java @@ -11,7 +11,7 @@ import org.kde.koala.*; * Class to test KImageEffect blending effects. * * This is a translation to java from kblendtest.cpp in the tests library - * of kdeui source. + * of tdeui source. * * @see KApplication * @see KImageEffect diff --git a/kdejava/koala/test/kcharselect/KCharSelectTest.java b/kdejava/koala/test/kcharselect/KCharSelectTest.java index c994fb78..b07a1937 100644 --- a/kdejava/koala/test/kcharselect/KCharSelectTest.java +++ b/kdejava/koala/test/kcharselect/KCharSelectTest.java @@ -3,7 +3,7 @@ import org.kde.koala.*; /** * - * Taken from test program of the kdeui tests + * Taken from test program of the tdeui tests **/ public class KCharSelectTest { diff --git a/kdejava/koala/test/kcombobox/KComboBoxTest.java b/kdejava/koala/test/kcombobox/KComboBoxTest.java index b2dd9a2f..c0b8d5fd 100644 --- a/kdejava/koala/test/kcombobox/KComboBoxTest.java +++ b/kdejava/koala/test/kcombobox/KComboBoxTest.java @@ -7,7 +7,7 @@ import java.util.*; * Class to text KComboBox widgets. * * This is a translation to java from kcomboboxtest.cpp in the tests library - * of kdeui source. + * of tdeui source. * * Combo boxes tested * - Editable ComboBox diff --git a/kdejava/koala/test/kfontdialog/KFontDialogTest.java b/kdejava/koala/test/kfontdialog/KFontDialogTest.java index a210d90e..e1d4a19f 100644 --- a/kdejava/koala/test/kfontdialog/KFontDialogTest.java +++ b/kdejava/koala/test/kfontdialog/KFontDialogTest.java @@ -31,7 +31,7 @@ import org.kde.koala.*; * Class to test KFontDialog widgets. * * This is a translation to java from kfontdialogtest.cpp in the tests library - * of kdeui source. + * of tdeui source. * * @see KFontDialog * @see KApplication diff --git a/kdejava/koala/test/kprogress/KProgressTest.java b/kdejava/koala/test/kprogress/KProgressTest.java index 456fbc14..d2d13e40 100644 --- a/kdejava/koala/test/kprogress/KProgressTest.java +++ b/kdejava/koala/test/kprogress/KProgressTest.java @@ -5,7 +5,7 @@ import org.kde.koala.*; * Class to test KProgress widget. * * This is a translation to java from kprogresstest.cpp in the tests library - * of kdeui source. + * of tdeui source. * * @see KProgress * @see KApplication |