diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:03:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:03:24 -0600 |
| commit | c425993c3d6efc68a20e6c3fd1ed2b60be2dcf69 (patch) | |
| tree | ce313ab1114ff66fa6ead38f3b3928eb2ef5f62c /kalyptus/kalyptusCxxToJava.pm | |
| parent | 7c430d16633233bcece961f08ef41034f076a3f2 (diff) | |
| download | libtqt-perl-c425993c3d6efc68a20e6c3fd1ed2b60be2dcf69.tar.gz libtqt-perl-c425993c3d6efc68a20e6c3fd1ed2b60be2dcf69.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJava.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 1e7d4d4..6537e5f 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -874,8 +874,8 @@ sub preParseClass || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages') || ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions') || ($classNode->{astNodeName} eq 'KFileMetaInfoItem' and $name eq 'unit') - || ($classNode->{astNodeName} eq 'KInstance' and $name eq 'charsets') - || ($classNode->{astNodeName} eq 'KInstance' and $name eq 'KInstance' and $m->{Access} =~ /protected/) + || ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'charsets') + || ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'TDEInstance' and $m->{Access} =~ /protected/) || ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidQt') || ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidNative') || ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'init') |