From 3f7ea5f74f514fa9081949a4ee62485782ade4f1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 10 Feb 2013 13:25:19 -0600 Subject: [PATCH] Fix FTBFS --- kalyptus/kalyptusCxxToJNI.pm | 6 +++--- kalyptus/kalyptusCxxToJava.pm | 2 +- kalyptus/kalyptusCxxToKimono.pm | 2 +- kalyptus/kalyptusCxxToSmoke.pm | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index c8afcc3..65f1db6 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -2554,8 +2554,8 @@ sub preParseClass || ($classNode->{astNodeName} eq 'TDEGlobalAccel' and $name eq 'setEnabled') || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'encodingsForLanguage') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'calculateRemainingSeconds') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'buildHTMLErrorString') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'calculateRemainingSeconds') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble') @@ -3111,7 +3111,7 @@ sub writeClassDoc print JNISOURCE "#include \n"; } - if ($javaClassName eq 'KIO') { + if ($javaClassName eq 'TDEIO') { # Hack: namespaces can be defined in several source files, which doesn't work, so this.. print JNISOURCE "#include \n"; print JNISOURCE "#include \n"; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 324e6be..ed60e8c 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -861,7 +861,7 @@ sub preParseClass || ($classNode->{astNodeName} eq 'TDEGlobalAccel' and $name eq 'setEnabled') || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'encodingsForLanguage') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'buildHTMLErrorString') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble') diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 3887482..03ea904 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -907,7 +907,7 @@ sub preParseClass || ($classNode->{astNodeName} eq 'TDEGlobalAccel' and $name eq 'setEnabled') || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'encodingsForLanguage') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'buildHTMLErrorString') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble') diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index b76f2fd..47f862a 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -589,11 +589,11 @@ sub preParseClass || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButton') || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButtonDelayed') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteClipboard') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteData') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteDataAsync') - || ($classNode->{astNodeName} eq 'KIO' and $name eq 'isClipboardEmpty') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'buildHTMLErrorString') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'pasteClipboard') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'pasteData') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'pasteDataAsync') + || ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'isClipboardEmpty') || ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'callExt') || ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'call') || ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'send')