TDE
/
libtqt-perl
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libtqt-perl
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
bug/266/move-to-usr
Timothy Pearson 12 years ago
parent ffd65d9155
commit 544dbe8589
9 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -1849,20 +1849,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

26
aclocal.m4 vendored
Unescape View File

@ -1861,20 +1861,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

2
kalyptus/ChangeLog
Unescape View File

@ -208,7 +208,7 @@
- In Invoke() the method call will be looked up dynamically from the Smoke runtime - In Invoke() the method call will be looked up dynamically from the Smoke runtime
- The arguments are marsalled from C# to C++ on the Smoke::Stack, and the method - The arguments are marsalled from C# to C++ on the Smoke::Stack, and the method
invoked. invoked.
* The KDE doc comments are converted to C# xml style tags (eg KApplication.cs) * The KDE doc comments are converted to C# xml style tags (eg TDEApplication.cs)
* Problems * Problems
- A small fix was need for RealProxies with Mono 0.30. DotGnu doesn't have - A small fix was need for RealProxies with Mono 0.30. DotGnu doesn't have
RealProxies/remoting yet. RealProxies/remoting yet.

8
kalyptus/kalyptusCxxToJNI.pm
Unescape View File

@ -300,7 +300,7 @@ BEGIN
'Java_org_kde_qt_QUriDrag_decode__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1, 'Java_org_kde_qt_QUriDrag_decode__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
'Java_org_kde_qt_QUriDrag_decodeToUnicodeUris__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1, 'Java_org_kde_qt_QUriDrag_decodeToUnicodeUris__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
'Java_org_kde_qt_QUriDrag_decodeLocalFiles__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1, 'Java_org_kde_qt_QUriDrag_decodeLocalFiles__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
'Java_org_kde_koala_KApplication_setJavaSlotFactory' => 1, 'Java_org_kde_koala_TDEApplication_setJavaSlotFactory' => 1,
'Java_org_kde_koala_KMainWindow_memberList' => 1, 'Java_org_kde_koala_KMainWindow_memberList' => 1,
'Java_org_kde_koala_KCmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1, 'Java_org_kde_koala_KCmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
'Java_org_kde_koala_KCmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2' => 1, 'Java_org_kde_koala_KCmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2' => 1,
@ -1639,7 +1639,7 @@ EOF
#include <kdejava/KDEJavaSlot.h> #include <kdejava/KDEJavaSlot.h>
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_kde_koala_KApplication_setJavaSlotFactory(JNIEnv* env, jclass cls) Java_org_kde_koala_TDEApplication_setJavaSlotFactory(JNIEnv* env, jclass cls)
{ {
(void) env; (void) env;
(void) cls; (void) cls;
@ -2417,7 +2417,7 @@ sub preParseClass
$className eq 'KEditListBox::CustomEditor' || $className eq 'KEditListBox::CustomEditor' ||
$className eq 'KIO::KBookmarkMenuNSImporter' || $className eq 'KIO::KBookmarkMenuNSImporter' ||
$className eq 'KPerDomainSettings' || $className eq 'KPerDomainSettings' ||
$className eq 'KApplicationPropsPlugin' || $className eq 'TDEApplicationPropsPlugin' ||
$className eq 'KPrinter' || $className eq 'KPrinter' ||
$className eq 'KPty' || $className eq 'KPty' ||
$className eq 'KOpenWithHandler' || $className eq 'KOpenWithHandler' ||
@ -3081,7 +3081,7 @@ sub writeClassDoc
$jniCode .= $kcmdlineargsjniExtras; $jniCode .= $kcmdlineargsjniExtras;
} elsif ( $className eq 'KIO::Scheduler' ) { } elsif ( $className eq 'KIO::Scheduler' ) {
$jniCode .= $schedulerjniExtras; $jniCode .= $schedulerjniExtras;
} elsif ( $className eq 'KApplication' ) { } elsif ( $className eq 'TDEApplication' ) {
print CLASS $kapplicationExtras; print CLASS $kapplicationExtras;
$jniCode .= $kapplicationjniExtras; $jniCode .= $kapplicationjniExtras;
} elsif ( $className eq 'KMainWindow' ) { } elsif ( $className eq 'KMainWindow' ) {

4
kalyptus/kalyptusCxxToJava.pm
Unescape View File

@ -724,7 +724,7 @@ sub preParseClass
$className eq 'KEditListBox::CustomEditor' || $className eq 'KEditListBox::CustomEditor' ||
$className eq 'KIO::KBookmarkMenuNSImporter' || $className eq 'KIO::KBookmarkMenuNSImporter' ||
$className eq 'KPerDomainSettings' || $className eq 'KPerDomainSettings' ||
$className eq 'KApplicationPropsPlugin' || $className eq 'TDEApplicationPropsPlugin' ||
$className eq 'KPrinter' || $className eq 'KPrinter' ||
$className eq 'KPty' || $className eq 'KPty' ||
$className eq 'KOpenWithHandler' || $className eq 'KOpenWithHandler' ||
@ -1318,7 +1318,7 @@ sub writeClassDoc
print CLASS $qpointarrayExtras; print CLASS $qpointarrayExtras;
} elsif ( $className eq 'TQUriDrag' ) { } elsif ( $className eq 'TQUriDrag' ) {
print CLASS $quridragExtras; print CLASS $quridragExtras;
} elsif ( $className eq 'KApplication' ) { } elsif ( $className eq 'TDEApplication' ) {
print CLASS $kapplicationExtras; print CLASS $kapplicationExtras;
} elsif ( $className eq 'KMainWindow' ) { } elsif ( $className eq 'KMainWindow' ) {
print CLASS $kmainwindowExtras; print CLASS $kmainwindowExtras;

4
kalyptus/kalyptusCxxToKimono.pm
Unescape View File

@ -744,7 +744,7 @@ sub preParseClass
$className eq 'KEditListBox::CustomEditor' || $className eq 'KEditListBox::CustomEditor' ||
$className eq 'KIO::KBookmarkMenuNSImporter' || $className eq 'KIO::KBookmarkMenuNSImporter' ||
$className eq 'KPerDomainSettings' || $className eq 'KPerDomainSettings' ||
$className eq 'KApplicationPropsPlugin' || $className eq 'TDEApplicationPropsPlugin' ||
$className eq 'KPrinter' || $className eq 'KPrinter' ||
$className eq 'KPty' || $className eq 'KPty' ||
$className eq 'KOpenWithHandler' || $className eq 'KOpenWithHandler' ||
@ -1345,7 +1345,7 @@ sub writeClassDoc
print CLASS $qsizepolicyExtras; print CLASS $qsizepolicyExtras;
} elsif ( $className eq 'TQUriDrag' ) { } elsif ( $className eq 'TQUriDrag' ) {
print CLASS $quridragExtras; print CLASS $quridragExtras;
} elsif ( $className eq 'KApplication' ) { } elsif ( $className eq 'TDEApplication' ) {
print CLASS $kapplicationExtras; print CLASS $kapplicationExtras;
} elsif ( $className eq 'KMainWindow' ) { } elsif ( $className eq 'KMainWindow' ) {
print CLASS $kmainwindowExtras; print CLASS $kmainwindowExtras;

2
kalyptus/kalyptusCxxToSmoke.pm
Unescape View File

@ -380,7 +380,7 @@ sub preParseClass
$className eq 'KExtendedSocket' || $className eq 'KExtendedSocket' ||
$className eq 'KSocket' || $className eq 'KSocket' ||
$className eq 'KPerDomainSettings' || $className eq 'KPerDomainSettings' ||
$className eq 'KApplicationPropsPlugin' || $className eq 'TDEApplicationPropsPlugin' ||
$className eq 'KOpenWithHandler' || $className eq 'KOpenWithHandler' ||
$className eq 'KFileOpenWithHandler' || $className eq 'KFileOpenWithHandler' ||
$className eq 'KBindingPropsPlugin' || $className eq 'KBindingPropsPlugin' ||

6
kalyptus/kalyptusDataDict.pm
Unescape View File

@ -731,9 +731,9 @@ BEGIN
'KAlphaPainter*' => 'kde_KAlphaPainter*', 'KAlphaPainter*' => 'kde_KAlphaPainter*',
'KAnimWidget*' => 'kde_KAnimWidget*' , 'KAnimWidget*' => 'kde_KAnimWidget*' ,
'KAppTreeListItem*' => 'kde_KAppTreeListItem*' , 'KAppTreeListItem*' => 'kde_KAppTreeListItem*' ,
'KApplication*' => 'kde_KApplication*' , 'TDEApplication*' => 'kde_TDEApplication*' ,
'KApplicationPropsPlugin*' => 'kde_KApplicationPropsPlugin*', 'TDEApplicationPropsPlugin*' => 'kde_TDEApplicationPropsPlugin*',
'KApplicationTree*' => 'kde_KApplicationTree*', 'TDEApplicationTree*' => 'kde_TDEApplicationTree*',
'KArchive*' => 'kde_KArchive*', 'KArchive*' => 'kde_KArchive*',
'KArchiveDirectory*' => 'kde_KArchiveDirectory*', 'KArchiveDirectory*' => 'kde_KArchiveDirectory*',
'KArchiveEntry*' => 'kde_KArchiveEntry*', 'KArchiveEntry*' => 'kde_KArchiveEntry*',

4
kalyptus/kdocLib.pm
Unescape View File

@ -31,9 +31,9 @@ NOTES ON THE NEW FORMAT
<VERSION="2.0"> <VERSION="2.0">
<BASE URL="http://www.kde.org/API/tdecore/"> <BASE URL="http://www.kde.org/API/tdecore/">
<C NAME="KApplication" REF="KApplication.html"> <C NAME="TDEApplication" REF="TDEApplication.html">
<IN NAME="TQObject"> <IN NAME="TQObject">
<ME NAME="getConfig" REF="KApplication.html#getConfig"> <ME NAME="getConfig" REF="TDEApplication.html#getConfig">
<M NAME="" REF=""> <M NAME="" REF="">
</C> </C>

Write Preview
Loading…
Cancel
Save