From 67e97e92622b5f6bab7ad6aa2e188bdcf6e4428d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:20:12 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- dcoppython/test/dcopserver/kdedcoptest.cpp | 2 +- dcoppython/test/dcopserver/kdedcoptest.h | 2 +- kalyptus/ChangeLog | 2 +- kalyptus/kalyptusCxxToJNI.pm | 10 ++--- kalyptus/kalyptusCxxToJava.pm | 6 +-- kalyptus/kalyptusCxxToKimono.pm | 6 +-- kalyptus/kalyptusCxxToSmoke.pm | 18 ++++---- kdejava/koala/kdejava/KComboBox.cpp | 2 +- kdejava/koala/kdejava/KCompletionBase.cpp | 2 +- kdejava/koala/kdejava/KDEJavaSlot.h | 6 +-- kdejava/koala/kdejava/KDESupport.h | 2 +- kdejava/koala/kdejava/KDirOperator.cpp | 2 +- kdejava/koala/kdejava/KGradientSelector.cpp | 2 +- kdejava/koala/kdejava/KKey.cpp | 2 +- kdejava/koala/kdejava/KKeyButton.cpp | 2 +- kdejava/koala/kdejava/KKeyChooser.cpp | 2 +- kdejava/koala/kdejava/KKeyNative.cpp | 2 +- kdejava/koala/kdejava/KKeySequence.cpp | 2 +- kdejava/koala/kdejava/KLineEdit.cpp | 2 +- kdejava/koala/kdejava/KWidgetAction.cpp | 4 +- kdejava/koala/kdejava/KXYSelector.cpp | 2 +- kdejava/koala/kdejava/TDEAccel.cpp | 6 +-- kdejava/koala/kdejava/TDEAccelShortcutList.cpp | 4 +- kdejava/koala/kdejava/TDEAction.cpp | 8 ++-- kdejava/koala/kdejava/TDEAction.h | 2 +- kdejava/koala/kdejava/TDEActionCollection.cpp | 6 +-- kdejava/koala/kdejava/TDEActionCollection.h | 2 +- kdejava/koala/kdejava/TDEActionMenu.cpp | 2 +- kdejava/koala/kdejava/TDEActionSeparator.cpp | 2 +- kdejava/koala/kdejava/TDEActionShortcutList.cpp | 6 +-- kdejava/koala/kdejava/TDEFontAction.cpp | 4 +- kdejava/koala/kdejava/TDEFontChooser.cpp | 2 +- kdejava/koala/kdejava/TDEFontCombo.cpp | 2 +- kdejava/koala/kdejava/TDEFontDialog.cpp | 2 +- kdejava/koala/kdejava/TDEFontRequester.cpp | 2 +- kdejava/koala/kdejava/TDEFontSizeAction.cpp | 4 +- kdejava/koala/kdejava/TDEGlobalAccel.cpp | 2 +- kdejava/koala/kdejava/TDEListAction.cpp | 4 +- kdejava/koala/kdejava/TDEListBox.cpp | 2 +- kdejava/koala/kdejava/TDEListView.cpp | 2 +- kdejava/koala/kdejava/TDEListViewItem.cpp | 2 +- kdejava/koala/kdejava/TDEMainWindow.cpp | 2 +- kdejava/koala/kdejava/TDEPasteTextAction.cpp | 4 +- kdejava/koala/kdejava/TDEPopupMenu.cpp | 2 +- kdejava/koala/kdejava/TDEPopupTitle.cpp | 2 +- kdejava/koala/kdejava/TDERadioAction.cpp | 4 +- kdejava/koala/kdejava/TDERecentDocument.cpp | 2 +- kdejava/koala/kdejava/TDERecentFilesAction.cpp | 4 +- kdejava/koala/kdejava/TDESelectAction.cpp | 4 +- kdejava/koala/kdejava/TDESelector.cpp | 2 +- kdejava/koala/kdejava/TDEShortcut.cpp | 2 +- kdejava/koala/kdejava/TDEShortcutList.cpp | 4 +- kdejava/koala/kdejava/TDEStdAccel.cpp | 4 +- kdejava/koala/kdejava/TDEToggleAction.cpp | 4 +- .../koala/kdejava/TDEToggleFullScreenAction.cpp | 4 +- kdejava/koala/kdejava/TDEToggleToolBarAction.cpp | 2 +- kdejava/koala/kdejava/TDEToolBar.cpp | 2 +- kdejava/koala/kdejava/TDEToolBarButton.cpp | 2 +- kdejava/koala/kdejava/TDEToolBarPopupAction.cpp | 4 +- kdejava/koala/kdejava/TDEToolBarRadioGroup.cpp | 2 +- kdejava/koala/kdejava/TDEToolBarSeparator.cpp | 2 +- kdejava/koala/org/kde/koala/KURIFilter.java | 6 +-- kdejava/koala/org/kde/koala/TDEAction.java | 2 +- .../koala/org/kde/koala/TDEActionCollection.java | 4 +- kdejava/koala/org/kde/koala/TDEFontChooser.java | 2 +- kdejava/koala/org/kde/koala/TDEFontDialog.java | 2 +- kdejava/koala/org/kde/koala/TDEFontRequester.java | 2 +- kdejava/koala/org/kde/koala/TDEMainWindow.java | 4 +- kdejava/koala/org/kde/koala/TDEStdAccel.java | 2 +- .../test/tdefontdialog/TDEFontDialogTest.java | 4 +- kjsembed/bindwizard/binding_wizard.ui | 4 +- kjsembed/builtins/stdaction_imp.cpp | 2 +- kjsembed/customobject_imp.cpp | 8 ++-- .../docs/examples/buttonmaker/ButtonMakerUI.ui | 2 +- kjsembed/docs/examples/docviewer/docviewer.ui | 2 +- .../docs/examples/envelopemaker/EnvelopeMakerUI.ui | 2 +- kjsembed/docs/examples/imunge/effectbrowser.ui | 2 +- kjsembed/jsconsolewidget.cpp | 2 +- kjsembed/jsfactory.cpp | 4 +- kjsembed/kjscmd.cpp | 2 +- kjsembed/kjsembedpart.cpp | 2 +- kjsembed/plugin/jsconsoleplugin.cpp | 2 +- kjsembed/slotutils.cpp | 2 +- kjsembed/tools/create_bindings.sh | 2 +- kjsembed/xmlactionclient.cpp | 2 +- korundum/rubylib/examples/xmlmenudemo.rb | 2 +- korundum/rubylib/korundum/kdehandlers.cpp | 4 +- korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl | 6 +-- smoke/kde/kde_header_list | 48 +++++++++++----------- xparts/mozilla/kmozillapart.cpp | 4 +- xparts/mozilla/kshell.cpp | 4 +- xparts/src/kde/xparthost_kpart.cpp | 2 +- xparts/xpart_notepad/shell_xparthost.cpp | 4 +- xparts/xpart_notepad/shell_xparthost.h | 2 +- xparts/xpart_notepad/xp_notepad_factory.cpp | 4 +- 95 files changed, 176 insertions(+), 176 deletions(-) diff --git a/dcoppython/test/dcopserver/kdedcoptest.cpp b/dcoppython/test/dcopserver/kdedcoptest.cpp index f7a0bdf5..106e0a18 100644 --- a/dcoppython/test/dcopserver/kdedcoptest.cpp +++ b/dcoppython/test/dcopserver/kdedcoptest.cpp @@ -6,7 +6,7 @@ #include -#include +#include #include KDEDcopTest::KDEDcopTest() diff --git a/dcoppython/test/dcopserver/kdedcoptest.h b/dcoppython/test/dcopserver/kdedcoptest.h index 54009e02..84a4db01 100644 --- a/dcoppython/test/dcopserver/kdedcoptest.h +++ b/dcoppython/test/dcopserver/kdedcoptest.h @@ -9,7 +9,7 @@ #include #endif -#include +#include #include "mainclass.h" diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index 51595d3f..f1729b0d 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -141,7 +141,7 @@ 2004-05-20 Richard Dale * The java '-fjni' option now generates correct java code with Qt/E 2.3.4 - * TDEMainWindow.toolBar() and TDEMainWindow.menuBar() rename ktoolBar() and + * TDEMainWindow.toolBar() and TDEMainWindow.menuBar() rename tdetoolBar() and kmenuBar(). This is because java doesn't have covariant return types and the methods with the same names in TQMainWindow return a TQToolBar and TQMenuBar, rather than their KDE equivalent subclasses. diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 3878c84b..cbae3cac 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -43,7 +43,7 @@ use vars qw/ $qpixmapExtras $qpixmapjniExtras $qpaintdeviceExtras $qpaintdevicejniExtras $qdragobjectExtras $qdragobjectjniExtras $qiodeviceExtras $qpointarrayExtras $qpointarrayjniExtras $qtextcodecExtras $qtextcodecjniExtras $quridragExtras $quridragjniExtras - $kapplicationExtras $kapplicationjniExtras $kmainwindowExtras $kmainwindowjniExtras + $kapplicationExtras $kapplicationjniExtras $tdemainwindowExtras $tdemainwindowjniExtras $kcmdlineargsjniExtras $schedulerjniExtras $methodNumber %builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %mungedTypeMap %javaImports @@ -1649,7 +1649,7 @@ Java_org_kde_koala_TDEApplication_setJavaSlotFactory(JNIEnv* env, jclass cls) EOF - $kmainwindowExtras = <\n"; delete $includes{"qurl.h"}; } - if (defined $includes{"kshortcut.h"}) { - print $fh "#include \n"; - delete $includes{"kshortcut.h"}; + if (defined $includes{"tdeshortcut.h"}) { + print $fh "#include \n"; + delete $includes{"tdeshortcut.h"}; } - if (defined $includes{"kshortcutlist.h"}) { + if (defined $includes{"tdeshortcutlist.h"}) { print $fh "#include \n"; - print $fh "#include \n"; + print $fh "#include \n"; delete $includes{"tdeconfigbase.h"}; - delete $includes{"kshortcutlist.h"}; + delete $includes{"tdeshortcutlist.h"}; } - if (defined $includes{"kaction.h"}) { - print $fh "#include \n"; - delete $includes{"kaction.h"}; + if (defined $includes{"tdeaction.h"}) { + print $fh "#include \n"; + delete $includes{"tdeaction.h"}; } foreach my $incl (keys %includes) { die if $incl eq ''; diff --git a/kdejava/koala/kdejava/KComboBox.cpp b/kdejava/koala/kdejava/KComboBox.cpp index 265f166f..7e04553f 100644 --- a/kdejava/koala/kdejava/KComboBox.cpp +++ b/kdejava/koala/kdejava/KComboBox.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KCompletionBase.cpp b/kdejava/koala/kdejava/KCompletionBase.cpp index 25dcf447..c1b534f2 100644 --- a/kdejava/koala/kdejava/KCompletionBase.cpp +++ b/kdejava/koala/kdejava/KCompletionBase.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KDEJavaSlot.h b/kdejava/koala/kdejava/KDEJavaSlot.h index d73dc370..e4a98be6 100644 --- a/kdejava/koala/kdejava/KDEJavaSlot.h +++ b/kdejava/koala/kdejava/KDEJavaSlot.h @@ -26,14 +26,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KDESupport.h b/kdejava/koala/kdejava/KDESupport.h index 5a899dd8..8ecb47f0 100644 --- a/kdejava/koala/kdejava/KDESupport.h +++ b/kdejava/koala/kdejava/KDESupport.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KDirOperator.cpp b/kdejava/koala/kdejava/KDirOperator.cpp index 4309e6ac..2f11f16f 100644 --- a/kdejava/koala/kdejava/KDirOperator.cpp +++ b/kdejava/koala/kdejava/KDirOperator.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KGradientSelector.cpp b/kdejava/koala/kdejava/KGradientSelector.cpp index 23a10692..e07f02e8 100644 --- a/kdejava/koala/kdejava/KGradientSelector.cpp +++ b/kdejava/koala/kdejava/KGradientSelector.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/KKey.cpp b/kdejava/koala/kdejava/KKey.cpp index acc91ab7..19e507ec 100644 --- a/kdejava/koala/kdejava/KKey.cpp +++ b/kdejava/koala/kdejava/KKey.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KKeyButton.cpp b/kdejava/koala/kdejava/KKeyButton.cpp index d8723983..dfd8471d 100644 --- a/kdejava/koala/kdejava/KKeyButton.cpp +++ b/kdejava/koala/kdejava/KKeyButton.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KKeyChooser.cpp b/kdejava/koala/kdejava/KKeyChooser.cpp index 1e8ae34b..8d72afb4 100644 --- a/kdejava/koala/kdejava/KKeyChooser.cpp +++ b/kdejava/koala/kdejava/KKeyChooser.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KKeyNative.cpp b/kdejava/koala/kdejava/KKeyNative.cpp index 306f3ba7..7e3d1f12 100644 --- a/kdejava/koala/kdejava/KKeyNative.cpp +++ b/kdejava/koala/kdejava/KKeyNative.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KKeySequence.cpp b/kdejava/koala/kdejava/KKeySequence.cpp index c2ae64d4..925114eb 100644 --- a/kdejava/koala/kdejava/KKeySequence.cpp +++ b/kdejava/koala/kdejava/KKeySequence.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KLineEdit.cpp b/kdejava/koala/kdejava/KLineEdit.cpp index 1e44f6d0..f9287ec0 100644 --- a/kdejava/koala/kdejava/KLineEdit.cpp +++ b/kdejava/koala/kdejava/KLineEdit.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KWidgetAction.cpp b/kdejava/koala/kdejava/KWidgetAction.cpp index cb38a5eb..d5a9b2b2 100644 --- a/kdejava/koala/kdejava/KWidgetAction.cpp +++ b/kdejava/koala/kdejava/KWidgetAction.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/KXYSelector.cpp b/kdejava/koala/kdejava/KXYSelector.cpp index 56dcf055..845988f3 100644 --- a/kdejava/koala/kdejava/KXYSelector.cpp +++ b/kdejava/koala/kdejava/KXYSelector.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEAccel.cpp b/kdejava/koala/kdejava/TDEAccel.cpp index 80c87a61..67c66611 100644 --- a/kdejava/koala/kdejava/TDEAccel.cpp +++ b/kdejava/koala/kdejava/TDEAccel.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEAccelShortcutList.cpp b/kdejava/koala/kdejava/TDEAccelShortcutList.cpp index 7264b747..82c80160 100644 --- a/kdejava/koala/kdejava/TDEAccelShortcutList.cpp +++ b/kdejava/koala/kdejava/TDEAccelShortcutList.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEAction.cpp b/kdejava/koala/kdejava/TDEAction.cpp index da89d3ac..3be285ac 100644 --- a/kdejava/koala/kdejava/TDEAction.cpp +++ b/kdejava/koala/kdejava/TDEAction.cpp @@ -1,10 +1,10 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include #include -#include +#include #include #include @@ -394,9 +394,9 @@ Java_org_kde_koala_TDEAction_itemId(JNIEnv* env, jobject obj, jint index) } JNIEXPORT jint JNICALL -Java_org_kde_koala_TDEAction_kaccelCount(JNIEnv* env, jobject obj) +Java_org_kde_koala_TDEAction_tdeaccelCount(JNIEnv* env, jobject obj) { - jint xret = (jint) ((TDEAction*) QtSupport::getQt(env, obj))->kaccelCount(); + jint xret = (jint) ((TDEAction*) QtSupport::getQt(env, obj))->tdeaccelCount(); return xret; } diff --git a/kdejava/koala/kdejava/TDEAction.h b/kdejava/koala/kdejava/TDEAction.h index b6ce35c5..0c77b831 100644 --- a/kdejava/koala/kdejava/TDEAction.h +++ b/kdejava/koala/kdejava/TDEAction.h @@ -27,7 +27,7 @@ extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEAction_container (JNIEnv extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEAction_itemId (JNIEnv *env, jobject, jint); extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEAction_representative (JNIEnv *env, jobject, jint); extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEAction_containerCount (JNIEnv *env, jobject); -extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEAction_kaccelCount (JNIEnv *env, jobject); +extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEAction_tdeaccelCount (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEAction_hasIcon (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEAction_hasIconSet (JNIEnv *env, jobject); extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDEAction_plainText (JNIEnv *env, jobject); diff --git a/kdejava/koala/kdejava/TDEActionCollection.cpp b/kdejava/koala/kdejava/TDEActionCollection.cpp index 82d9c288..38055ffa 100644 --- a/kdejava/koala/kdejava/TDEActionCollection.cpp +++ b/kdejava/koala/kdejava/TDEActionCollection.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include @@ -207,9 +207,9 @@ Java_org_kde_koala_TDEActionCollection_isEmpty(JNIEnv* env, jobject obj) } JNIEXPORT jobject JNICALL -Java_org_kde_koala_TDEActionCollection_kaccel(JNIEnv* env, jobject obj) +Java_org_kde_koala_TDEActionCollection_tdeaccel(JNIEnv* env, jobject obj) { - jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEActionCollection*) QtSupport::getQt(env, obj))->kaccel(), "org.kde.koala.TDEAccel"); + jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEActionCollection*) QtSupport::getQt(env, obj))->tdeaccel(), "org.kde.koala.TDEAccel"); return xret; } diff --git a/kdejava/koala/kdejava/TDEActionCollection.h b/kdejava/koala/kdejava/TDEActionCollection.h index 967038ad..ffbcdf57 100644 --- a/kdejava/koala/kdejava/TDEActionCollection.h +++ b/kdejava/koala/kdejava/TDEActionCollection.h @@ -23,7 +23,7 @@ extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEActionCollection_setWidget ( extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEActionCollection_setAutoConnectShortcuts (JNIEnv *env, jobject, jboolean); extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEActionCollection_isAutoConnectShortcuts (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEActionCollection_addDocCollection (JNIEnv *env, jobject, jobject); -extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEActionCollection_kaccel (JNIEnv *env, jobject); +extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEActionCollection_tdeaccel (JNIEnv *env, jobject); extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDEActionCollection_builderTDEAccel (JNIEnv *env, jobject); extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDEActionCollection_count (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDEActionCollection_isEmpty (JNIEnv *env, jobject); diff --git a/kdejava/koala/kdejava/TDEActionMenu.cpp b/kdejava/koala/kdejava/TDEActionMenu.cpp index e26e475a..5ee4bd99 100644 --- a/kdejava/koala/kdejava/TDEActionMenu.cpp +++ b/kdejava/koala/kdejava/TDEActionMenu.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEActionSeparator.cpp b/kdejava/koala/kdejava/TDEActionSeparator.cpp index 25cd830c..0e65699a 100644 --- a/kdejava/koala/kdejava/TDEActionSeparator.cpp +++ b/kdejava/koala/kdejava/TDEActionSeparator.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEActionShortcutList.cpp b/kdejava/koala/kdejava/TDEActionShortcutList.cpp index dc1fb783..586e5ab1 100644 --- a/kdejava/koala/kdejava/TDEActionShortcutList.cpp +++ b/kdejava/koala/kdejava/TDEActionShortcutList.cpp @@ -1,9 +1,9 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEFontAction.cpp b/kdejava/koala/kdejava/TDEFontAction.cpp index f528a0ca..93a1eca0 100644 --- a/kdejava/koala/kdejava/TDEFontAction.cpp +++ b/kdejava/koala/kdejava/TDEFontAction.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEFontChooser.cpp b/kdejava/koala/kdejava/TDEFontChooser.cpp index dc695495..c710c368 100644 --- a/kdejava/koala/kdejava/TDEFontChooser.cpp +++ b/kdejava/koala/kdejava/TDEFontChooser.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/TDEFontCombo.cpp b/kdejava/koala/kdejava/TDEFontCombo.cpp index 54de157e..0b5e46dd 100644 --- a/kdejava/koala/kdejava/TDEFontCombo.cpp +++ b/kdejava/koala/kdejava/TDEFontCombo.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEFontDialog.cpp b/kdejava/koala/kdejava/TDEFontDialog.cpp index ac4cb392..823cacec 100644 --- a/kdejava/koala/kdejava/TDEFontDialog.cpp +++ b/kdejava/koala/kdejava/TDEFontDialog.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/TDEFontRequester.cpp b/kdejava/koala/kdejava/TDEFontRequester.cpp index 2b6a7282..1b2d6214 100644 --- a/kdejava/koala/kdejava/TDEFontRequester.cpp +++ b/kdejava/koala/kdejava/TDEFontRequester.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEFontSizeAction.cpp b/kdejava/koala/kdejava/TDEFontSizeAction.cpp index c5791ff2..13f978de 100644 --- a/kdejava/koala/kdejava/TDEFontSizeAction.cpp +++ b/kdejava/koala/kdejava/TDEFontSizeAction.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEGlobalAccel.cpp b/kdejava/koala/kdejava/TDEGlobalAccel.cpp index d150ea6c..38d55158 100644 --- a/kdejava/koala/kdejava/TDEGlobalAccel.cpp +++ b/kdejava/koala/kdejava/TDEGlobalAccel.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEListAction.cpp b/kdejava/koala/kdejava/TDEListAction.cpp index 8cc4c6ce..fbce565d 100644 --- a/kdejava/koala/kdejava/TDEListAction.cpp +++ b/kdejava/koala/kdejava/TDEListAction.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEListBox.cpp b/kdejava/koala/kdejava/TDEListBox.cpp index 41326d6f..bacb2636 100644 --- a/kdejava/koala/kdejava/TDEListBox.cpp +++ b/kdejava/koala/kdejava/TDEListBox.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEListView.cpp b/kdejava/koala/kdejava/TDEListView.cpp index f6647c44..54faf678 100644 --- a/kdejava/koala/kdejava/TDEListView.cpp +++ b/kdejava/koala/kdejava/TDEListView.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEListViewItem.cpp b/kdejava/koala/kdejava/TDEListViewItem.cpp index 05ca3d1a..ec497c5c 100644 --- a/kdejava/koala/kdejava/TDEListViewItem.cpp +++ b/kdejava/koala/kdejava/TDEListViewItem.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEMainWindow.cpp b/kdejava/koala/kdejava/TDEMainWindow.cpp index 16c5bf4f..fef51460 100644 --- a/kdejava/koala/kdejava/TDEMainWindow.cpp +++ b/kdejava/koala/kdejava/TDEMainWindow.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/TDEPasteTextAction.cpp b/kdejava/koala/kdejava/TDEPasteTextAction.cpp index b2d0db99..bfe1bfe6 100644 --- a/kdejava/koala/kdejava/TDEPasteTextAction.cpp +++ b/kdejava/koala/kdejava/TDEPasteTextAction.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEPopupMenu.cpp b/kdejava/koala/kdejava/TDEPopupMenu.cpp index 3e0d5109..a1e14731 100644 --- a/kdejava/koala/kdejava/TDEPopupMenu.cpp +++ b/kdejava/koala/kdejava/TDEPopupMenu.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEPopupTitle.cpp b/kdejava/koala/kdejava/TDEPopupTitle.cpp index bdc9a3ec..9a902317 100644 --- a/kdejava/koala/kdejava/TDEPopupTitle.cpp +++ b/kdejava/koala/kdejava/TDEPopupTitle.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDERadioAction.cpp b/kdejava/koala/kdejava/TDERadioAction.cpp index 8baae927..47afe76f 100644 --- a/kdejava/koala/kdejava/TDERadioAction.cpp +++ b/kdejava/koala/kdejava/TDERadioAction.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDERecentDocument.cpp b/kdejava/koala/kdejava/TDERecentDocument.cpp index fb2732fd..85c8ec7b 100644 --- a/kdejava/koala/kdejava/TDERecentDocument.cpp +++ b/kdejava/koala/kdejava/TDERecentDocument.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/TDERecentFilesAction.cpp b/kdejava/koala/kdejava/TDERecentFilesAction.cpp index 009343b8..750e17a7 100644 --- a/kdejava/koala/kdejava/TDERecentFilesAction.cpp +++ b/kdejava/koala/kdejava/TDERecentFilesAction.cpp @@ -1,9 +1,9 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDESelectAction.cpp b/kdejava/koala/kdejava/TDESelectAction.cpp index 6dc51bfc..c6d843ab 100644 --- a/kdejava/koala/kdejava/TDESelectAction.cpp +++ b/kdejava/koala/kdejava/TDESelectAction.cpp @@ -1,9 +1,9 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDESelector.cpp b/kdejava/koala/kdejava/TDESelector.cpp index 1894e64b..4bf84340 100644 --- a/kdejava/koala/kdejava/TDESelector.cpp +++ b/kdejava/koala/kdejava/TDESelector.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/TDEShortcut.cpp b/kdejava/koala/kdejava/TDEShortcut.cpp index 84f035a3..7cfeacc8 100644 --- a/kdejava/koala/kdejava/TDEShortcut.cpp +++ b/kdejava/koala/kdejava/TDEShortcut.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEShortcutList.cpp b/kdejava/koala/kdejava/TDEShortcutList.cpp index 82f5e204..ff29c471 100644 --- a/kdejava/koala/kdejava/TDEShortcutList.cpp +++ b/kdejava/koala/kdejava/TDEShortcutList.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEStdAccel.cpp b/kdejava/koala/kdejava/TDEStdAccel.cpp index 432425bc..ec9702a3 100644 --- a/kdejava/koala/kdejava/TDEStdAccel.cpp +++ b/kdejava/koala/kdejava/TDEStdAccel.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEToggleAction.cpp b/kdejava/koala/kdejava/TDEToggleAction.cpp index af9dfd8a..ff5de65d 100644 --- a/kdejava/koala/kdejava/TDEToggleAction.cpp +++ b/kdejava/koala/kdejava/TDEToggleAction.cpp @@ -1,9 +1,9 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEToggleFullScreenAction.cpp b/kdejava/koala/kdejava/TDEToggleFullScreenAction.cpp index 47a25f28..193579a2 100644 --- a/kdejava/koala/kdejava/TDEToggleFullScreenAction.cpp +++ b/kdejava/koala/kdejava/TDEToggleFullScreenAction.cpp @@ -1,6 +1,6 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include -#include +#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEToggleToolBarAction.cpp b/kdejava/koala/kdejava/TDEToggleToolBarAction.cpp index 492e10e9..355543ce 100644 --- a/kdejava/koala/kdejava/TDEToggleToolBarAction.cpp +++ b/kdejava/koala/kdejava/TDEToggleToolBarAction.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEToolBar.cpp b/kdejava/koala/kdejava/TDEToolBar.cpp index e0badf68..18f327bf 100644 --- a/kdejava/koala/kdejava/TDEToolBar.cpp +++ b/kdejava/koala/kdejava/TDEToolBar.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include #include diff --git a/kdejava/koala/kdejava/TDEToolBarButton.cpp b/kdejava/koala/kdejava/TDEToolBarButton.cpp index ffc43c32..fc3c44fd 100644 --- a/kdejava/koala/kdejava/TDEToolBarButton.cpp +++ b/kdejava/koala/kdejava/TDEToolBarButton.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEToolBarPopupAction.cpp b/kdejava/koala/kdejava/TDEToolBarPopupAction.cpp index c838e709..2173ada4 100644 --- a/kdejava/koala/kdejava/TDEToolBarPopupAction.cpp +++ b/kdejava/koala/kdejava/TDEToolBarPopupAction.cpp @@ -1,8 +1,8 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEToolBarRadioGroup.cpp b/kdejava/koala/kdejava/TDEToolBarRadioGroup.cpp index df990a41..9ca39dce 100644 --- a/kdejava/koala/kdejava/TDEToolBarRadioGroup.cpp +++ b/kdejava/koala/kdejava/TDEToolBarRadioGroup.cpp @@ -1,5 +1,5 @@ //Auto-generated by kalyptus. DO NOT EDIT. -#include +#include #include #include diff --git a/kdejava/koala/kdejava/TDEToolBarSeparator.cpp b/kdejava/koala/kdejava/TDEToolBarSeparator.cpp index bc3f1078..cda1cb0b 100644 --- a/kdejava/koala/kdejava/TDEToolBarSeparator.cpp +++ b/kdejava/koala/kdejava/TDEToolBarSeparator.cpp @@ -1,7 +1,7 @@ //Auto-generated by kalyptus. DO NOT EDIT. #include #include -#include +#include #include #include diff --git a/kdejava/koala/org/kde/koala/KURIFilter.java b/kdejava/koala/org/kde/koala/KURIFilter.java index 0cbad9d8..a3aa5ce1 100644 --- a/kdejava/koala/org/kde/koala/KURIFilter.java +++ b/kdejava/koala/org/kde/koala/KURIFilter.java @@ -44,15 +44,15 @@ import java.util.ArrayList; of the filters you want to use to an ArrayList and invoke the appropriate filtering function. The examples below show the use of specific filters. The first one uses a single - filter called kshorturifilter while the second example uses + filter called tdeshorturifilter while the second example uses multiple filters: 
  String text = "kde.org";
- boolean filtered = KURIFilter.self().filterURI( text, "kshorturifilter" );
+ boolean filtered = KURIFilter.self().filterURI( text, "tdeshorturifilter" );
  
  ArrayList list;
- list << "kshorturifilter" << "localdomainfilter";
+ list << "tdeshorturifilter" << "localdomainfilter";
  boolean filtered = KURIFilter.self().filterURI( text, list );
KURIFilter also allows richer data exchange through a simple diff --git a/kdejava/koala/org/kde/koala/TDEAction.java b/kdejava/koala/org/kde/koala/TDEAction.java index caec1930..5703cedd 100644 --- a/kdejava/koala/org/kde/koala/TDEAction.java +++ b/kdejava/koala/org/kde/koala/TDEAction.java @@ -291,7 +291,7 @@ public class TDEAction extends TQObject { public native int itemId(int index); public native TQWidget representative(int index); public native int containerCount(); - public native int kaccelCount(); + public native int tdeaccelCount(); public native boolean hasIcon(); public native boolean hasIconSet(); public native String plainText(); diff --git a/kdejava/koala/org/kde/koala/TDEActionCollection.java b/kdejava/koala/org/kde/koala/TDEActionCollection.java index 6cf636bd..245790c7 100644 --- a/kdejava/koala/org/kde/koala/TDEActionCollection.java +++ b/kdejava/koala/org/kde/koala/TDEActionCollection.java @@ -104,8 +104,8 @@ public class TDEActionCollection extends TQObject { public native boolean addDocCollection(TDEActionCollection pDoc); /** Returns the TDEAccel object of the most recently set widget. @short Returns the TDEAccel object of the most recently set widget. */ - public native TDEAccel kaccel(); - /** @internal, for TDEAction.kaccelCurrent() @short @internal, for TDEAction.kaccelCurrent() + public native TDEAccel tdeaccel(); + /** @internal, for TDEAction.tdeaccelCurrent() @short @internal, for TDEAction.tdeaccelCurrent() */ public native TDEAccel builderTDEAccel(); /** Returns the number of actions in the collection @short Returns the number of actions in the collection diff --git a/kdejava/koala/org/kde/koala/TDEFontChooser.java b/kdejava/koala/org/kde/koala/TDEFontChooser.java index 9504b868..cdffaa4f 100644 --- a/kdejava/koala/org/kde/koala/TDEFontChooser.java +++ b/kdejava/koala/org/kde/koala/TDEFontChooser.java @@ -16,7 +16,7 @@ import org.kde.qt.TQWidget; custom dialogs and therefore is very flexible, in most cases it is preferable to use the convenience functions in TDEFontDialog. - \image html kfontchooser.png "KDE Font Chooser" + \image html tdefontchooser.png "KDE Font Chooser" See {@link TDEFontChooserSignals} for signals emitted by TDEFontChooser @author Preston Brown , Bernd Wuebben diff --git a/kdejava/koala/org/kde/koala/TDEFontDialog.java b/kdejava/koala/org/kde/koala/TDEFontDialog.java index 2b057cb8..7d451036 100644 --- a/kdejava/koala/org/kde/koala/TDEFontDialog.java +++ b/kdejava/koala/org/kde/koala/TDEFontDialog.java @@ -22,7 +22,7 @@ import org.kde.qt.TQWidget; if ( result == TDEFontDialog.Accepted ) ... - \image html kfontdialog.png "KDE Font Dialog" + \image html tdefontdialog.png "KDE Font Dialog" See {@link TDEFontDialogSignals} for signals emitted by TDEFontDialog @author Preston Brown , Bernd Wuebben diff --git a/kdejava/koala/org/kde/koala/TDEFontRequester.java b/kdejava/koala/org/kde/koala/TDEFontRequester.java index 83a2c64c..85beb7a5 100644 --- a/kdejava/koala/org/kde/koala/TDEFontRequester.java +++ b/kdejava/koala/org/kde/koala/TDEFontRequester.java @@ -16,7 +16,7 @@ import org.kde.qt.TQWidget; a font dialog (TDEFontDialog). The lineedit provides a preview of the selected font. The preview text can be customized. You can also have the font dialog show only the fixed fonts. - \image html kfontrequester.png "KDE Font Requester" + \image html tdefontrequester.png "KDE Font Requester" See {@link TDEFontRequesterSignals} for signals emitted by TDEFontRequester @author Nadeem Hasan diff --git a/kdejava/koala/org/kde/koala/TDEMainWindow.java b/kdejava/koala/org/kde/koala/TDEMainWindow.java index f7e132e1..0d426bfe 100644 --- a/kdejava/koala/org/kde/koala/TDEMainWindow.java +++ b/kdejava/koala/org/kde/koala/TDEMainWindow.java @@ -269,7 +269,7 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa /** Returns a pointer to the status bar. If there is no status bar yet, one will be created. - Note that tooltips for kactions in actionCollection() are not + Note that tooltips for tdeactions in actionCollection() are not automatically connected to this statusBar. See the TDEActionCollection documentation for more details. @short Returns a pointer to the status bar. @@ -406,7 +406,7 @@ public class TDEMainWindow extends TQMainWindow implements KXMLGUIBuilderInterfa know when that status (hidden/shown) of the statusbar has changed. For example: connect(action, SIGNAL("activated()"), - kmainwindow, SLOT("setSettingsDirty()")); + tdemainwindow, SLOT("setSettingsDirty()")); Otherwise the status (hidden/show) of the statusbar might not be saved by TDEMainWindow. @short Sets whether TDEMainWindow should provide a menu that allows showing/hiding of the statusbar ( using TDEToggleStatusBarAction ). diff --git a/kdejava/koala/org/kde/koala/TDEStdAccel.java b/kdejava/koala/org/kde/koala/TDEStdAccel.java index adb67f6b..e9b71329 100644 --- a/kdejava/koala/org/kde/koala/TDEStdAccel.java +++ b/kdejava/koala/org/kde/koala/TDEStdAccel.java @@ -12,7 +12,7 @@ import org.kde.qt.QtSupport; be used in all KDE applications. They will be configurable, so do not hardcode the default behavior. If you want real configurable keybindings in your applications, - please checkout the class TDEAccel in kaccel.h + please checkout the class TDEAccel in tdeaccel.h @short \namespace TDEStdAccel Convenient methods for access to the common accelerator keys in the key configuration. @see TDEAccelShortcutList diff --git a/kdejava/koala/test/tdefontdialog/TDEFontDialogTest.java b/kdejava/koala/test/tdefontdialog/TDEFontDialogTest.java index c758b9e9..22585369 100644 --- a/kdejava/koala/test/tdefontdialog/TDEFontDialogTest.java +++ b/kdejava/koala/test/tdefontdialog/TDEFontDialogTest.java @@ -30,7 +30,7 @@ import org.kde.koala.*; /** * Class to test TDEFontDialog widgets. * - * This is a translation to java from kfontdialogtest.cpp in the tests library + * This is a translation to java from tdefontdialogtest.cpp in the tests library * of tdeui source. * * @see TDEFontDialog @@ -48,7 +48,7 @@ public class TDEFontDialogTest { public static void main(String[] cmdLineArgs) { - TDEAboutData aboutData = new TDEAboutData( "kfontdialogtest", "TDEFontDialogTest", + TDEAboutData aboutData = new TDEAboutData( "tdefontdialogtest", "TDEFontDialogTest", VERSION, description, TDEAboutData.License_GPL, "(c) 2002, Kenneth J. Pouncey"); aboutData.addAuthor("Kenneth J. Pouncey",null, "kjpou@hotmail.com"); diff --git a/kjsembed/bindwizard/binding_wizard.ui b/kjsembed/bindwizard/binding_wizard.ui index c20455b8..baacdca5 100644 --- a/kjsembed/bindwizard/binding_wizard.ui +++ b/kjsembed/bindwizard/binding_wizard.ui @@ -484,7 +484,7 @@ files of the C++ classes you want to make available to Javascript are located.klineedit.h kled.h kpushbutton.h - klistview.h - klistview.h + tdelistview.h + tdelistview.h diff --git a/kjsembed/builtins/stdaction_imp.cpp b/kjsembed/builtins/stdaction_imp.cpp index ce471158..7950161e 100644 --- a/kjsembed/builtins/stdaction_imp.cpp +++ b/kjsembed/builtins/stdaction_imp.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp index 6d06d774..5092c27f 100644 --- a/kjsembed/customobject_imp.cpp +++ b/kjsembed/customobject_imp.cpp @@ -46,15 +46,15 @@ #ifndef QT_ONLY #include -#include +#include -#include +#include #include -#include +#include #include #include #include -#include +#include #endif // QT_ONLY diff --git a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui index f11b08ee..3af30e5e 100644 --- a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui +++ b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui @@ -580,7 +580,7 @@ knuminput.h knuminput.h kcolorbutton.h - kfontrequester.h + tdefontrequester.h knuminput.h knuminput.h knuminput.h diff --git a/kjsembed/docs/examples/docviewer/docviewer.ui b/kjsembed/docs/examples/docviewer/docviewer.ui index f27e3559..b27ac94b 100644 --- a/kjsembed/docs/examples/docviewer/docviewer.ui +++ b/kjsembed/docs/examples/docviewer/docviewer.ui @@ -63,7 +63,7 @@ - klistbox.h + tdelistbox.h klineedit.h diff --git a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui index 5a63fc94..14bf9f99 100644 --- a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui +++ b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui @@ -560,7 +560,7 @@ klineedit.h klineedit.h klineedit.h - kfontrequester.h + tdefontrequester.h kpushbutton.h kpushbutton.h kpushbutton.h diff --git a/kjsembed/docs/examples/imunge/effectbrowser.ui b/kjsembed/docs/examples/imunge/effectbrowser.ui index 10eb2d79..09dcac7b 100644 --- a/kjsembed/docs/examples/imunge/effectbrowser.ui +++ b/kjsembed/docs/examples/imunge/effectbrowser.ui @@ -146,6 +146,6 @@ - klistview.h + tdelistview.h diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp index c95f346e..fc898716 100644 --- a/kjsembed/jsconsolewidget.cpp +++ b/kjsembed/jsconsolewidget.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp index c2606430..81c10ae1 100644 --- a/kjsembed/jsfactory.cpp +++ b/kjsembed/jsfactory.cpp @@ -46,10 +46,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp index c54efa15..6161cad1 100644 --- a/kjsembed/kjscmd.cpp +++ b/kjsembed/kjscmd.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp index b39b8813..8d1f4d0c 100644 --- a/kjsembed/kjsembedpart.cpp +++ b/kjsembed/kjsembedpart.cpp @@ -29,7 +29,7 @@ #include #ifndef QT_ONLY -#include +#include #endif // QT_ONLY #include diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp index aa5e4f73..8ea4a8d1 100644 --- a/kjsembed/plugin/jsconsoleplugin.cpp +++ b/kjsembed/plugin/jsconsoleplugin.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp index 83af6474..0a73c43f 100644 --- a/kjsembed/slotutils.cpp +++ b/kjsembed/slotutils.cpp @@ -35,7 +35,7 @@ #include #ifndef QT_ONLY -#include +#include #include #else // QT_ONLY #include "qtstubs.h" diff --git a/kjsembed/tools/create_bindings.sh b/kjsembed/tools/create_bindings.sh index 51ba061c..2371efcd 100755 --- a/kjsembed/tools/create_bindings.sh +++ b/kjsembed/tools/create_bindings.sh @@ -12,7 +12,7 @@ doxygen bind_class TQComboBox qcombobox bind_class Qt qnamespace -bind_class TDEPopupTitle kpopupmenu +bind_class TDEPopupTitle tdepopupmenu #bind_class TQDir qdir #bind_class TQListViewItem qlistview diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp index 982061b8..88bfab97 100644 --- a/kjsembed/xmlactionclient.cpp +++ b/kjsembed/xmlactionclient.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/korundum/rubylib/examples/xmlmenudemo.rb b/korundum/rubylib/examples/xmlmenudemo.rb index fbdb51fb..8d9d5c94 100644 --- a/korundum/rubylib/examples/xmlmenudemo.rb +++ b/korundum/rubylib/examples/xmlmenudemo.rb @@ -173,7 +173,7 @@ class MainWin < KDE::MainWindow # in the rc file # Just fake some filenames for now - fakeFiles = ["kaction.sip", "kxmlguiclient.sip"] + fakeFiles = ["tdeaction.sip", "kxmlguiclient.sip"] # Clear the old entries, so we don't end up accumulating entries in the menu unplugActionList("recent"); diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp index bf2107ce..7236fc9b 100644 --- a/korundum/rubylib/korundum/kdehandlers.cpp +++ b/korundum/rubylib/korundum/kdehandlers.cpp @@ -27,12 +27,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl b/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl index 26b12bad..8d066b81 100755 --- a/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl +++ b/korundum/rubylib/rbtdeconfig_compiler/checkkcfg.pl @@ -24,12 +24,12 @@ if ( system( $cmd ) != 0 ) { exit 1; } -chectdefile( $file_h ); -chectdefile( $file_cpp ); +checkfile( $file_h ); +checkfile( $file_cpp ); exit 0; -sub chectdefile() +sub checkfile() { my $file = shift; diff --git a/smoke/kde/kde_header_list b/smoke/kde/kde_header_list index 9f78c9c3..a1f54f02 100644 --- a/smoke/kde/kde_header_list +++ b/smoke/kde/kde_header_list @@ -34,13 +34,13 @@ kaboutapplication.h kaboutdata.h kaboutdialog.h kaboutkde.h -kaccelgen.h -kaccel.h -kaccelmanager.h -kactionclasses.h -kactioncollection.h -kaction.h -kactionshortcutlist.h +tdeaccelgen.h +tdeaccel.h +tdeaccelmanager.h +tdeactionclasses.h +tdeactioncollection.h +tdeaction.h +tdeactionshortcutlist.h kactivelabel.h kallocator.h kanimwidget.h @@ -159,9 +159,9 @@ kfilterbase.h kfilterdev.h kfinddialog.h kfind.h -kfontcombo.h -kfontdialog.h -kfontrequester.h +tdefontcombo.h +tdefontdialog.h +tdefontrequester.h kgenericfactory.h kglobalaccel.h kglobal.h @@ -195,13 +195,13 @@ kled.h klibloader.h klineeditdlg.h klineedit.h -klistbox.h -klistview.h -klistviewsearchline.h +tdelistbox.h +tdelistview.h +tdelistviewsearchline.h klocale.h kmacroexpander.h -kmainwindow.h -kmainwindowiface.h +tdemainwindow.h +tdemainwindowiface.h kmanagerselection.h kmdcodec.h tdemdichildarea.h @@ -244,7 +244,7 @@ kpixmapprovider.h kpixmapsplitter.h kpluginselector.h kplugininfo.h -kpopupmenu.h +tdepopupmenu.h kpreferencesdialog.h kpreferencesmodule.h kpreviewwidgetbase.h @@ -262,7 +262,7 @@ kprotocolmanager.h kpty.h kpushbutton.h krandomsequence.h -krecentdocument.h +tderecentdocument.h kregexpeditorinterface.h kregexp.h kreplacedialog.h @@ -278,7 +278,7 @@ kscan.h ksconfig.h tdescreensaver.h tdescreensaver_vroot.h -kselect.h +tdeselect.h kseparator.h kservicegroup.h kservice.h @@ -287,8 +287,8 @@ ksharedpixmap.h ksharedptr.h kshellcompletion.h kshell.h -kshortcut.h -kshortcutlist.h +tdeshortcut.h +tdeshortcutlist.h kshred.h ksimpleconfig.h ksmimecrypto.h @@ -325,7 +325,7 @@ kstandarddirs.h kstartupinfo.h kstaticdeleter.h kstatusbar.h -kstdaccel.h +tdestdaccel.h kstdaction.h kstddirs.h kstdguiitem.h @@ -347,9 +347,9 @@ ktextbrowser.h ktextedit.h ktimewidget.h ktip.h -ktoolbarbutton.h -ktoolbar.h -ktoolbarradiogroup.h +tdetoolbarbutton.h +tdetoolbar.h +tdetoolbarradiogroup.h ktrader.h ktypelist.h kuniqueapp.h diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp index 625de5ad..7116a4d3 100644 --- a/xparts/mozilla/kmozillapart.cpp +++ b/xparts/mozilla/kmozillapart.cpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index 31103418..2770b95f 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp index 9195a278..0ed7181e 100644 --- a/xparts/src/kde/xparthost_kpart.cpp +++ b/xparts/src/kde/xparthost_kpart.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp index 16f23b62..95d744a4 100644 --- a/xparts/xpart_notepad/shell_xparthost.cpp +++ b/xparts/xpart_notepad/shell_xparthost.cpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/xparts/xpart_notepad/shell_xparthost.h b/xparts/xpart_notepad/shell_xparthost.h index 590a6293..4e329822 100644 --- a/xparts/xpart_notepad/shell_xparthost.h +++ b/xparts/xpart_notepad/shell_xparthost.h @@ -1,7 +1,7 @@ #ifndef shell_xparthost_h #define shell_xparthost_h -#include +#include #include #include diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp index f815fd4d..f81ea334 100644 --- a/xparts/xpart_notepad/xp_notepad_factory.cpp +++ b/xparts/xpart_notepad/xp_notepad_factory.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include -- cgit v1.2.3