diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
| commit | 8f7ac92d27834427c1fa2a4a350d70d05529bbf4 (patch) | |
| tree | fc53a45a5d9693bfe8a156579b921e960351e31c /kalyptus/kalyptusCxxToJava.pm | |
| parent | 427847240b11c1733dd9c259c613d68a6405fe68 (diff) | |
| download | tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.tar.gz tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.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 242553c9..3375d111 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') |