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

Rename a number of classes to enhance compatibility with KDE4

Browse Source
bug/266/move-to-usr
Timothy Pearson 12 years ago
parent ea4d7d39f7
commit e2b9f0fee4
6 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File

6
kalyptus/ChangeLog
Unescape View File

@ -105,10 +105,10 @@
* Added patch from Michal Ceresna to fix code generation for TQImage.bits() and * Added patch from Michal Ceresna to fix code generation for TQImage.bits() and
TQImage.colorTable() TQImage.colorTable()
* Fixed bug reported by Maik Schulz caused by unwanted KListViewItem copy constructor. * Fixed bug reported by Maik Schulz caused by unwanted TDEListViewItem copy constructor.
An 'enhancement' was added for KDE 3.2 - for any class which didn't have a copy An 'enhancement' was added for KDE 3.2 - for any class which didn't have a copy
constructor, but which could still be copied, a copy constructor was generated. constructor, but which could still be copied, a copy constructor was generated.
Unfortunately this had unforseen consequences, such as messing up KListView logic, Unfortunately this had unforseen consequences, such as messing up TDEListView logic,
hence they're no longer generated. hence they're no longer generated.
2004-05-27 Richard Dale <Richard_Dale@tipitina.demon.co.uk> 2004-05-27 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
@ -141,7 +141,7 @@
2004-05-20 Richard Dale <Richard_Dale@tipitina.demon.co.uk> 2004-05-20 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* The java '-fjni' option now generates correct java code with Qt/E 2.3.4 * The java '-fjni' option now generates correct java code with Qt/E 2.3.4
* KMainWindow.toolBar() and KMainWindow.menuBar() rename ktoolBar() and * TDEMainWindow.toolBar() and TDEMainWindow.menuBar() rename ktoolBar() and
kmenuBar(). This is because java doesn't have covariant return types kmenuBar(). This is because java doesn't have covariant return types
and the methods with the same names in TQMainWindow return a TQToolBar and the methods with the same names in TQMainWindow return a TQToolBar
and TQMenuBar, rather than their KDE equivalent subclasses. and TQMenuBar, rather than their KDE equivalent subclasses.

30
kalyptus/kalyptusCxxToJNI.pm
Unescape View File

@ -301,7 +301,7 @@ BEGIN
'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_TDEApplication_setJavaSlotFactory' => 1, 'Java_org_kde_koala_TDEApplication_setJavaSlotFactory' => 1,
'Java_org_kde_koala_KMainWindow_memberList' => 1, 'Java_org_kde_koala_TDEMainWindow_memberList' => 1,
'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1, 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2' => 1, 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2' => 1,
'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z' => 1, 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z' => 1,
@ -1651,7 +1651,7 @@ EOF
$kmainwindowExtras = <<EOF; $kmainwindowExtras = <<EOF;
/** /**
List of members of KMainWindow class. List of members of TDEMainWindow class.
*/ */
public native ArrayList memberList(); public native ArrayList memberList();
@ -1661,8 +1661,8 @@ EOF
try { try {
savedClass = Class.forName(typeName); savedClass = Class.forName(typeName);
int n = 1; int n = 1;
while (KMainWindow.canBeRestored(n)){ while (TDEMainWindow.canBeRestored(n)){
((KMainWindow) savedClass.newInstance()).restore(n); ((TDEMainWindow) savedClass.newInstance()).restore(n);
n++; n++;
} }
} catch(Exception e) { } catch(Exception e) {
@ -1676,9 +1676,9 @@ EOF
$kmainwindowjniExtras = <<EOF; $kmainwindowjniExtras = <<EOF;
JNIEXPORT jobject JNICALL JNIEXPORT jobject JNICALL
Java_org_kde_koala_KMainWindow_memberList(JNIEnv* env, jobject obj) Java_org_kde_koala_TDEMainWindow_memberList(JNIEnv* env, jobject obj)
{ {
return (jobject) KDESupport::arrayWithKMainWindowList(env, KMainWindow::memberList); return (jobject) KDESupport::arrayWithTDEMainWindowList(env, TDEMainWindow::memberList);
} }
EOF EOF
@ -1828,7 +1828,7 @@ sub cplusplusToJava
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KMainWindow\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_TDEMainWindow\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileItemList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileItemList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileViewItemList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileViewItemList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_DOMNodeList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_DOMNodeList\s*\*/
@ -2559,11 +2559,11 @@ sub preParseClass
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
|| ($classNode->{astNodeName} eq 'KToolBar' and $name eq 'enable') || ($classNode->{astNodeName} eq 'TDEToolBar' and $name eq 'enable')
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2) || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2)
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'autoupdate') || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'autoupdate')
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'getAutoUpdate') || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'getAutoUpdate')
|| ($classNode->{astNodeName} eq 'KStdAccel' and $name eq 'insert') || ($classNode->{astNodeName} eq 'TDEStdAccel' and $name eq 'insert')
|| ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid') || ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid')
|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages') || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions') || ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
@ -3084,7 +3084,7 @@ sub writeClassDoc
} elsif ( $className eq 'TDEApplication' ) { } elsif ( $className eq 'TDEApplication' ) {
print CLASS $kapplicationExtras; print CLASS $kapplicationExtras;
$jniCode .= $kapplicationjniExtras; $jniCode .= $kapplicationjniExtras;
} elsif ( $className eq 'KMainWindow' ) { } elsif ( $className eq 'TDEMainWindow' ) {
print CLASS $kmainwindowExtras; print CLASS $kmainwindowExtras;
$jniCode .= $kmainwindowjniExtras; $jniCode .= $kmainwindowjniExtras;
} }
@ -3811,7 +3811,7 @@ sub generateMethod($$$$$$$$$)
$name = "iconId"; $name = "iconId";
} elsif ( $name eq 'icon' and $javaClassName eq 'KURLBarItemDialog' ) { } elsif ( $name eq 'icon' and $javaClassName eq 'KURLBarItemDialog' ) {
$name = "iconName"; $name = "iconName";
} elsif ( $name eq 'iconText' and $javaClassName eq 'KToolBar' ) { } elsif ( $name eq 'iconText' and $javaClassName eq 'TDEToolBar' ) {
$name = "iconTextId"; $name = "iconTextId";
} elsif ( $name eq 'reset' and $javaClassName eq 'KExtendedSocket' ) { } elsif ( $name eq 'reset' and $javaClassName eq 'KExtendedSocket' ) {
$name = "resetSocket"; $name = "resetSocket";
@ -3819,7 +3819,7 @@ sub generateMethod($$$$$$$$$)
$name = "paletteName"; $name = "paletteName";
} elsif ( $name eq 'size' and $javaClassName eq 'KAnimWidget' ) { } elsif ( $name eq 'size' and $javaClassName eq 'KAnimWidget' ) {
$name = "iconSize"; $name = "iconSize";
} elsif ( $name eq 'size' and $javaClassName eq 'KFontCombo' ) { } elsif ( $name eq 'size' and $javaClassName eq 'TDEFontCombo' ) {
$name = "pointSize"; $name = "pointSize";
} elsif ($javaSignature eq "icon()" and $javaClassName eq 'KIconButton') { } elsif ($javaSignature eq "icon()" and $javaClassName eq 'KIconButton') {
$name = "iconName"; $name = "iconName";

24
kalyptus/kalyptusCxxToJava.pm
Unescape View File

@ -468,7 +468,7 @@ EOF
$kmainwindowExtras = <<EOF; $kmainwindowExtras = <<EOF;
/** /**
List of members of KMainWindow class. List of members of TDEMainWindow class.
*/ */
// public native ArrayList memberList(); // public native ArrayList memberList();
@ -478,8 +478,8 @@ EOF
try { try {
savedClass = Class.forName(typeName); savedClass = Class.forName(typeName);
int n = 1; int n = 1;
while (KMainWindow.canBeRestored(n)){ while (TDEMainWindow.canBeRestored(n)){
((KMainWindow) savedClass.newInstance()).restore(n); ((TDEMainWindow) savedClass.newInstance()).restore(n);
n++; n++;
} }
} catch(Exception e) { } catch(Exception e) {
@ -562,7 +562,7 @@ sub cplusplusToJava
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KMainWindow\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_TDEMainWindow\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileItemList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileItemList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileViewItemList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileViewItemList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_DOMNodeList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_DOMNodeList\s*\*/
@ -865,11 +865,11 @@ sub preParseClass
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
|| ($classNode->{astNodeName} eq 'KToolBar' and $name eq 'enable') || ($classNode->{astNodeName} eq 'TDEToolBar' and $name eq 'enable')
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2) || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2)
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'autoupdate') || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'autoupdate')
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'getAutoUpdate') || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'getAutoUpdate')
|| ($classNode->{astNodeName} eq 'KStdAccel' and $name eq 'insert') || ($classNode->{astNodeName} eq 'TDEStdAccel' and $name eq 'insert')
|| ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid') || ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid')
|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages') || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions') || ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
@ -1320,7 +1320,7 @@ sub writeClassDoc
print CLASS $quridragExtras; print CLASS $quridragExtras;
} elsif ( $className eq 'TDEApplication' ) { } elsif ( $className eq 'TDEApplication' ) {
print CLASS $kapplicationExtras; print CLASS $kapplicationExtras;
} elsif ( $className eq 'KMainWindow' ) { } elsif ( $className eq 'TDEMainWindow' ) {
print CLASS $kmainwindowExtras; print CLASS $kmainwindowExtras;
} }
@ -1892,13 +1892,13 @@ sub generateMethod($$$$$$$)
$name = "iconId"; $name = "iconId";
} elsif ( $name eq 'icon' and $javaClassName eq 'KURLBarItemDialog' ) { } elsif ( $name eq 'icon' and $javaClassName eq 'KURLBarItemDialog' ) {
$name = "iconName"; $name = "iconName";
} elsif ( $name eq 'iconText' and $javaClassName eq 'KToolBar' ) { } elsif ( $name eq 'iconText' and $javaClassName eq 'TDEToolBar' ) {
$name = "iconTextId"; $name = "iconTextId";
} elsif ( $name eq 'reset' and $javaClassName eq 'KExtendedSocket' ) { } elsif ( $name eq 'reset' and $javaClassName eq 'KExtendedSocket' ) {
$name = "resetSocket"; $name = "resetSocket";
} elsif ( $name eq 'palette' and $javaClassName eq 'KPaletteTable' ) { } elsif ( $name eq 'palette' and $javaClassName eq 'KPaletteTable' ) {
$name = "paletteName"; $name = "paletteName";
} elsif ( $name eq 'size' and $javaClassName eq 'KFontCombo' ) { } elsif ( $name eq 'size' and $javaClassName eq 'TDEFontCombo' ) {
$name = "pointSize"; $name = "pointSize";
} elsif ($javaSignature eq "icon()" and $javaClassName eq 'KIconButton') { } elsif ($javaSignature eq "icon()" and $javaClassName eq 'KIconButton') {
$name = "iconName"; $name = "iconName";

18
kalyptus/kalyptusCxxToKimono.pm
Unescape View File

@ -558,7 +558,7 @@ sub cplusplusToCSharp
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KMainWindow\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_TDEMainWindow\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileItemList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileItemList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileViewItemList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileViewItemList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_DOMNodeList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_DOMNodeList\s*\*/
@ -911,11 +911,11 @@ sub preParseClass
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
|| ($classNode->{astNodeName} eq 'KToolBar' and $name eq 'enable') || ($classNode->{astNodeName} eq 'TDEToolBar' and $name eq 'enable')
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2) || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2)
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'autoupdate') || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'autoupdate')
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'getAutoUpdate') || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'getAutoUpdate')
|| ($classNode->{astNodeName} eq 'KStdAccel' and $name eq 'insert') || ($classNode->{astNodeName} eq 'TDEStdAccel' and $name eq 'insert')
|| ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid') || ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid')
|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages') || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions') || ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
@ -1347,7 +1347,7 @@ sub writeClassDoc
print CLASS $quridragExtras; print CLASS $quridragExtras;
} elsif ( $className eq 'TDEApplication' ) { } elsif ( $className eq 'TDEApplication' ) {
print CLASS $kapplicationExtras; print CLASS $kapplicationExtras;
} elsif ( $className eq 'KMainWindow' ) { } elsif ( $className eq 'TDEMainWindow' ) {
print CLASS $kmainwindowExtras; print CLASS $kmainwindowExtras;
} }
@ -1940,13 +1940,13 @@ sub generateMethod($$$$$$$)
$name = "iconId"; $name = "iconId";
} elsif ( $name eq 'icon' and $csharpClassName eq 'KURLBarItemDialog' ) { } elsif ( $name eq 'icon' and $csharpClassName eq 'KURLBarItemDialog' ) {
$name = "iconName"; $name = "iconName";
} elsif ( $name eq 'iconText' and $csharpClassName eq 'KToolBar' ) { } elsif ( $name eq 'iconText' and $csharpClassName eq 'TDEToolBar' ) {
$name = "iconTextId"; $name = "iconTextId";
} elsif ( $name eq 'reset' and $csharpClassName eq 'KExtendedSocket' ) { } elsif ( $name eq 'reset' and $csharpClassName eq 'KExtendedSocket' ) {
$name = "resetSocket"; $name = "resetSocket";
} elsif ( $name eq 'palette' and $csharpClassName eq 'KPaletteTable' ) { } elsif ( $name eq 'palette' and $csharpClassName eq 'KPaletteTable' ) {
$name = "paletteName"; $name = "paletteName";
} elsif ( $name eq 'size' and $csharpClassName eq 'KFontCombo' ) { } elsif ( $name eq 'size' and $csharpClassName eq 'TDEFontCombo' ) {
$name = "pointSize"; $name = "pointSize";
} elsif ($csharpSignature eq "icon()" and $csharpClassName eq 'KIconButton') { } elsif ($csharpSignature eq "icon()" and $csharpClassName eq 'KIconButton') {
$name = "iconName"; $name = "iconName";

14
kalyptus/kalyptusCxxToSmoke.pm
Unescape View File

@ -348,7 +348,7 @@ sub preParseClass
($className eq 'TQWSEvent' and $main::qt_embedded) || ($className eq 'TQWSEvent' and $main::qt_embedded) ||
($className eq 'TQMetaObjectInit' and $main::qt_embedded) || ($className eq 'TQMetaObjectInit' and $main::qt_embedded) ||
($className eq 'TQKoi8Codec' and $main::qt_embedded) || ($className eq 'TQKoi8Codec' and $main::qt_embedded) ||
$className eq 'KAccelGen' || $className eq 'TDEAccelGen' ||
($className eq 'TQAbstractUndoItem' and $main::qt4) || ($className eq 'TQAbstractUndoItem' and $main::qt4) ||
($className eq 'TQAbstractItemDelegate' and $main::qt4) || ($className eq 'TQAbstractItemDelegate' and $main::qt4) ||
($className eq 'TQDebug' and $main::qt4) || ($className eq 'TQDebug' and $main::qt4) ||
@ -560,11 +560,11 @@ sub preParseClass
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
|| ($classNode->{astNodeName} eq 'KToolBar' and $name eq 'enable') || ($classNode->{astNodeName} eq 'TDEToolBar' and $name eq 'enable')
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2) || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2)
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'autoupdate') || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'autoupdate')
|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'getAutoUpdate') || ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'getAutoUpdate')
|| ($classNode->{astNodeName} eq 'KStdAccel' and $name eq 'insert') || ($classNode->{astNodeName} eq 'TDEStdAccel' and $name eq 'insert')
|| ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid') || ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid')
|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages') || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions') || ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
@ -1589,7 +1589,7 @@ sub generateEnumCast($)
# Hack - this shouldn't be needed here - deprecated enums # Hack - this shouldn't be needed here - deprecated enums
next if ($enum eq 'KStatusBar::BarStatus' next if ($enum eq 'KStatusBar::BarStatus'
or $enum eq 'KMdi::AddWindowFlags' or $enum eq 'KMdi::AddWindowFlags'
or $enum eq 'KToolBar::BarStatus' or $enum eq 'TDEToolBar::BarStatus'
or $enum eq 'KMimeType::Format:: compression : 4'); or $enum eq 'KMimeType::Format:: compression : 4');
my $type = findTypeEntry($enum); my $type = findTypeEntry($enum);

118
kalyptus/kalyptusDataDict.pm
Unescape View File

@ -705,28 +705,28 @@ BEGIN
'KAboutPerson*' => 'kde_KAboutPerson*', 'KAboutPerson*' => 'kde_KAboutPerson*',
'KAboutTranslator*' => 'kde_KAboutTranslator*', 'KAboutTranslator*' => 'kde_KAboutTranslator*',
'KAboutWidget*' => 'kde_KAboutWidget*', 'KAboutWidget*' => 'kde_KAboutWidget*',
'KAccel*' => 'kde_KAccel*' , 'TDEAccel*' => 'kde_TDEAccel*' ,
'KAccelAction&' => 'kde_KAccelAction*', 'TDEAccelAction&' => 'kde_TDEAccelAction*',
'KAccelAction*' => 'kde_KAccelAction*', 'TDEAccelAction*' => 'kde_TDEAccelAction*',
'KAccelActions&' => 'kde_KAccelActions*', 'TDEAccelActions&' => 'kde_TDEAccelActions*',
'KAccelActions*' => 'kde_KAccelActions*', 'TDEAccelActions*' => 'kde_TDEAccelActions*',
'KAccelBase*' => 'kde_KAccelBase*', 'TDEAccelBase*' => 'kde_TDEAccelBase*',
'KAccelGen*' => 'kde_KAccelGen*', 'TDEAccelGen*' => 'kde_TDEAccelGen*',
'KAccelMenu*' => 'kde_KAccelMenu*', 'TDEAccelMenu*' => 'kde_TDEAccelMenu*',
'KAccelSequence&' => 'kde_KAccelSequence*', 'TDEAccelSequence&' => 'kde_TDEAccelSequence*',
'KAccelSequence' => 'kde_KAccelSequence*', 'TDEAccelSequence' => 'kde_TDEAccelSequence*',
'KAccelSequence*' => 'kde_KAccelSequence*', 'TDEAccelSequence*' => 'kde_TDEAccelSequence*',
'KAccelShortcut&' => 'kde_KAccelShortcut*', 'TDEAccelShortcut&' => 'kde_TDEAccelShortcut*',
'KAccelShortcut' => 'kde_KAccelShortcut*', 'TDEAccelShortcut' => 'kde_TDEAccelShortcut*',
'KAccelShortcut*' => 'kde_KAccelShortcut*', 'TDEAccelShortcut*' => 'kde_TDEAccelShortcut*',
'KAccelShortcuts&' => 'kde_KAccelShortcuts*', 'TDEAccelShortcuts&' => 'kde_TDEAccelShortcuts*',
'KAccelShortcuts*' => 'kde_KAccelShortcuts*', 'TDEAccelShortcuts*' => 'kde_TDEAccelShortcuts*',
'KAction*' => 'kde_KAction*' , 'TDEAction*' => 'kde_TDEAction*' ,
'KActionCollection&' => 'kde_KActionCollection*' , 'TDEActionCollection&' => 'kde_TDEActionCollection*' ,
'KActionCollection' => 'kde_KActionCollection*' , 'TDEActionCollection' => 'kde_TDEActionCollection*' ,
'KActionCollection*' => 'kde_KActionCollection*' , 'TDEActionCollection*' => 'kde_TDEActionCollection*' ,
'KActionMenu*' => 'kde_KActionMenu*', 'TDEActionMenu*' => 'kde_TDEActionMenu*',
'KActionSeparator*' => 'kde_KActionSeparator*', 'TDEActionSeparator*' => 'kde_TDEActionSeparator*',
'KAddressInfo*' => 'kde_KAddressInfo*', 'KAddressInfo*' => 'kde_KAddressInfo*',
'KAlphaPainter*' => 'kde_KAlphaPainter*', 'KAlphaPainter*' => 'kde_KAlphaPainter*',
'KAnimWidget*' => 'kde_KAnimWidget*' , 'KAnimWidget*' => 'kde_KAnimWidget*' ,
@ -906,11 +906,11 @@ BEGIN
'KFloatWatchProxy' => 'kde_KFloatWatchProxy*', 'KFloatWatchProxy' => 'kde_KFloatWatchProxy*',
'KFloatWatchProxy*' => 'kde_KFloatWatchProxy*', 'KFloatWatchProxy*' => 'kde_KFloatWatchProxy*',
'KFolderType*' => 'kde_KFolderType*', 'KFolderType*' => 'kde_KFolderType*',
'KFontAction*' => 'kde_KFontAction*', 'TDEFontAction*' => 'kde_TDEFontAction*',
'KFontChooser*' => 'kde_KFontChooser*', 'TDEFontChooser*' => 'kde_TDEFontChooser*',
'KFontCombo*' => 'kde_KFontCombo*', 'TDEFontCombo*' => 'kde_TDEFontCombo*',
'KFontDialog*' => 'kde_KFontDialog*', 'TDEFontDialog*' => 'kde_TDEFontDialog*',
'KFontSizeAction*' => 'kde_KFontSizeAction*', 'TDEFontSizeAction*' => 'kde_TDEFontSizeAction*',
'KGenericFactory*' => 'kde_KGenericFactory*', 'KGenericFactory*' => 'kde_KGenericFactory*',
'KGenericFactoryBase*' => 'kde_KGenericFactoryBase*', 'KGenericFactoryBase*' => 'kde_KGenericFactoryBase*',
'TDEGlobal*' => 'kde_TDEGlobal*', 'TDEGlobal*' => 'kde_TDEGlobal*',
@ -990,9 +990,9 @@ BEGIN
'KLibLoader*' => 'kde_KLibLoader*' , 'KLibLoader*' => 'kde_KLibLoader*' ,
'KLineEdit*' => 'kde_KLineEdit*' , 'KLineEdit*' => 'kde_KLineEdit*' ,
'KLineEditDlg*' => 'kde_KLineEditDlg*', 'KLineEditDlg*' => 'kde_KLineEditDlg*',
'KListBox*' => 'kde_KListBox*', 'TDEListBox*' => 'kde_TDEListBox*',
'KListView*' => 'kde_KListView*' , 'TDEListView*' => 'kde_TDEListView*' ,
'KListViewItem*' => 'kde_KListViewItem*', 'TDEListViewItem*' => 'kde_TDEListViewItem*',
'TDELocale&' => 'kde_TDELocale*' , 'TDELocale&' => 'kde_TDELocale*' ,
'TDELocale*' => 'kde_TDELocale*' , 'TDELocale*' => 'kde_TDELocale*' ,
'KMJobViewer*' => 'kde_KMJobViewer*', 'KMJobViewer*' => 'kde_KMJobViewer*',
@ -1003,8 +1003,8 @@ BEGIN
'KMPrinter*' => 'kde_KMPrinter*', 'KMPrinter*' => 'kde_KMPrinter*',
'KMPrinterList*' => 'kde_KMPrinterList*', 'KMPrinterList*' => 'kde_KMPrinterList*',
'KMPrinterPage*' => 'kde_KMPrinterPage*', 'KMPrinterPage*' => 'kde_KMPrinterPage*',
'KMainWindow*' => 'kde_KMainWindow*', 'TDEMainWindow*' => 'kde_TDEMainWindow*',
'KMainWindowInterface*' => 'kde_KMainWindowInterface*', 'TDEMainWindowInterface*' => 'kde_TDEMainWindowInterface*',
'KMenuBar*' => 'kde_KMenuBar*' , 'KMenuBar*' => 'kde_KMenuBar*' ,
'KMessageBox*' => 'kde_KMessageBox*', 'KMessageBox*' => 'kde_KMessageBox*',
'KMidSimpleAPI*' => 'kde_KMidSimpleAPI*', 'KMidSimpleAPI*' => 'kde_KMidSimpleAPI*',
@ -1047,9 +1047,9 @@ BEGIN
'KPixmapSplitter*' => 'kde_KPixmapSplitter*', 'KPixmapSplitter*' => 'kde_KPixmapSplitter*',
'KPlayObject*' => 'kde_KPlayObject*', 'KPlayObject*' => 'kde_KPlayObject*',
'KPlayObjectFactory*' => 'kde_KPlayObjectFactory*', 'KPlayObjectFactory*' => 'kde_KPlayObjectFactory*',
'KPopupFrame*' => 'kde_KPopupFrame*', 'TDEPopupFrame*' => 'kde_TDEPopupFrame*',
'KPopupMenu*' => 'kde_KPopupMenu*' , 'TDEPopupMenu*' => 'kde_TDEPopupMenu*' ,
'KPopupTitle*' => 'kde_KPopupTitle*', 'TDEPopupTitle*' => 'kde_TDEPopupTitle*',
'KPreviewWidgetBase*' => 'kde_KPreviewWidgetBase*', 'KPreviewWidgetBase*' => 'kde_KPreviewWidgetBase*',
'KPrintAction*' => 'kde_KPrintAction*', 'KPrintAction*' => 'kde_KPrintAction*',
'KPrintDialogPage*' => 'kde_KPrintDialogPage*', 'KPrintDialogPage*' => 'kde_KPrintDialogPage*',
@ -1067,9 +1067,9 @@ BEGIN
'KProtocolManager*' => 'kde_KProtocolManager*', 'KProtocolManager*' => 'kde_KProtocolManager*',
'KPushButton*' => 'kde_KPushButton*', 'KPushButton*' => 'kde_KPushButton*',
'KRFCDate*' => 'kde_KRFCDate*', 'KRFCDate*' => 'kde_KRFCDate*',
'KRadioAction*' => 'kde_KRadioAction*', 'TDERadioAction*' => 'kde_TDERadioAction*',
'KRandomSequence*' => 'kde_KRandomSequence*', 'KRandomSequence*' => 'kde_KRandomSequence*',
'KRecentDocument*' => 'kde_KRecentDocument*', 'TDERecentDocument*' => 'kde_TDERecentDocument*',
'KRegExp*' => 'kde_KRegExp*', 'KRegExp*' => 'kde_KRegExp*',
'KRegExpEditor*' => 'kde_KRegExpEditor*', 'KRegExpEditor*' => 'kde_KRegExpEditor*',
'KRegExpEditorInterface*' => 'kde_KRegExpEditorInterface*', 'KRegExpEditorInterface*' => 'kde_KRegExpEditorInterface*',
@ -1116,8 +1116,8 @@ BEGIN
'KScriptClientInterface::Result' => 'int', 'KScriptClientInterface::Result' => 'int',
'KScriptInterface*' => 'kde_KScriptInterface*', 'KScriptInterface*' => 'kde_KScriptInterface*',
'KScriptManager*' => 'kde_KScriptManager*', 'KScriptManager*' => 'kde_KScriptManager*',
'KSelectAction*' => 'kde_KSelectAction*', 'TDESelectAction*' => 'kde_TDESelectAction*',
'KSelector*' => 'kde_KSelector*', 'TDESelector*' => 'kde_TDESelector*',
'KSeparator*' => 'kde_KSeparator*', 'KSeparator*' => 'kde_KSeparator*',
'KService&' => 'kde_KService*' , 'KService&' => 'kde_KService*' ,
'KService*' => 'kde_KService*', 'KService*' => 'kde_KService*',
@ -1133,9 +1133,9 @@ BEGIN
'TDESharedPtr*' => 'kde_TDESharedPtr*', 'TDESharedPtr*' => 'kde_TDESharedPtr*',
'KShellCompletion*' => 'kde_KShellCompletion*', 'KShellCompletion*' => 'kde_KShellCompletion*',
'KShellProcess*' => 'kde_KShellProcess*', 'KShellProcess*' => 'kde_KShellProcess*',
'KShortcuts&' => 'kde_KShortcuts*', 'TDEShortcuts&' => 'kde_TDEShortcuts*',
'KShortcuts' => 'kde_KShortcuts*', 'TDEShortcuts' => 'kde_TDEShortcuts*',
'KShortcuts*' => 'kde_KShortcuts*', 'TDEShortcuts*' => 'kde_TDEShortcuts*',
'KShred*' => 'kde_KShred*', 'KShred*' => 'kde_KShred*',
'KSimpleConfig&' => 'kde_KSimpleConfig*' , 'KSimpleConfig&' => 'kde_KSimpleConfig*' ,
'KSimpleConfig*' => 'kde_KSimpleConfig*', 'KSimpleConfig*' => 'kde_KSimpleConfig*',
@ -1158,8 +1158,8 @@ BEGIN
'KStatusBar*' => 'kde_KStatusBar*' , 'KStatusBar*' => 'kde_KStatusBar*' ,
'KStatusBar::BarStatusstat::Toggle' => 'int' , 'KStatusBar::BarStatusstat::Toggle' => 'int' ,
'KStatusBarLabel*' => 'kde_KStatusBarLabel*', 'KStatusBarLabel*' => 'kde_KStatusBarLabel*',
'KStdAccel*' => 'kde_KStdAccel*', 'TDEStdAccel*' => 'kde_TDEStdAccel*',
'KStdAccel::StdAccel' => 'int' , 'TDEStdAccel::StdAccel' => 'int' ,
'KStdAction*' => 'kde_KStdAction*', 'KStdAction*' => 'kde_KStdAction*',
'KStdGuiItem*' => 'kde_KStdGuiItem*', 'KStdGuiItem*' => 'kde_KStdGuiItem*',
'KStringHandler*' => 'kde_KStringHandler*', 'KStringHandler*' => 'kde_KStringHandler*',
@ -1193,17 +1193,17 @@ BEGIN
'KThemeStyle*' => 'kde_KThemeStyle*', 'KThemeStyle*' => 'kde_KThemeStyle*',
'KTipDatabase*' => 'kde_KTipDatabase*', 'KTipDatabase*' => 'kde_KTipDatabase*',
'KTipDialog*' => 'kde_KTipDialog*', 'KTipDialog*' => 'kde_KTipDialog*',
'KToggleAction*' => 'kde_KToggleAction*' , 'TDEToggleAction*' => 'kde_TDEToggleAction*' ,
'KToolBar*' => 'kde_KToolBar*' , 'TDEToolBar*' => 'kde_TDEToolBar*' ,
'KToolBar::BarStatus' => 'int', 'TDEToolBar::BarStatus' => 'int',
'KToolBar::BarStatusstat::Toggle' => 'int' , 'TDEToolBar::BarStatusstat::Toggle' => 'int' ,
'KToolBarButton*' => 'kde_KToolBarButton*' , 'TDEToolBarButton*' => 'kde_TDEToolBarButton*' ,
'KToolBarButtonList*' => 'kde_KToolBarButtonList*', 'TDEToolBarButtonList*' => 'kde_TDEToolBarButtonList*',
'KToolBarPopupAction*' => 'kde_KToolBarPopupAction*', 'TDEToolBarPopupAction*' => 'kde_TDEToolBarPopupAction*',
'KToolBarPos' => 'int' , 'TDEToolBarPos' => 'int' ,
'KToolBarRadioGroup*' => 'kde_KToolBarRadioGroup*', 'TDEToolBarRadioGroup*' => 'kde_TDEToolBarRadioGroup*',
'KToolBarSeparator*' => 'kde_KToolBarSeparator*', 'TDEToolBarSeparator*' => 'kde_TDEToolBarSeparator*',
'KToolButtonType' => 'int' , 'TDEToolButtonType' => 'int' ,
'TDETrader*' => 'kde_TDETrader*' , 'TDETrader*' => 'kde_TDETrader*' ,
'KTypeList*' => 'kde_KTypeList*', 'KTypeList*' => 'kde_KTypeList*',
'KURIFilter*' => 'kde_KURIFilter*' , 'KURIFilter*' => 'kde_KURIFilter*' ,
@ -2788,9 +2788,9 @@ BEGIN
'TQValueList<CompletionEntry>' => 'kde_CompletionEntryValueList*', 'TQValueList<CompletionEntry>' => 'kde_CompletionEntryValueList*',
'StatusDocumentIface*' => 'kde_StatusDocumentIface*', 'StatusDocumentIface*' => 'kde_StatusDocumentIface*',
'UndoDocumentIface*' => 'kde_UndoDocumentIface*', 'UndoDocumentIface*' => 'kde_UndoDocumentIface*',
'KShortcut&' => 'kde_KShortcut*', 'TDEShortcut&' => 'kde_TDEShortcut*',
'KShortcut' => 'kde_KShortcut*', 'TDEShortcut' => 'kde_TDEShortcut*',
'KShortcut*' => 'kde_KShortcut*', 'TDEShortcut*' => 'kde_TDEShortcut*',
'KKey&' => 'kde_KKey*', 'KKey&' => 'kde_KKey*',
'KKey*' => 'kde_KKey*', 'KKey*' => 'kde_KKey*',
'KKeyNative&' => 'kde_KKeyNative*', 'KKeyNative&' => 'kde_KKeyNative*',
@ -2800,7 +2800,7 @@ BEGIN
'KKeyX11&' => 'kde_KKeyX11*', 'KKeyX11&' => 'kde_KKeyX11*',
'KKeyX11' => 'kde_KKeyX11*', 'KKeyX11' => 'kde_KKeyX11*',
'KKeyX11*' => 'kde_KKeyX11*', 'KKeyX11*' => 'kde_KKeyX11*',
'KAccelActions' => 'kde_KAccelActions*', 'TDEAccelActions' => 'kde_TDEAccelActions*',
'KRandomSequence&' => 'kde_KRandomSequence*', 'KRandomSequence&' => 'kde_KRandomSequence*',
'KIcon::Context' => 'int', 'KIcon::Context' => 'int',
'KIcon::Group' => 'int', 'KIcon::Group' => 'int',

Write Preview
Loading…
Cancel
Save