summaryrefslogtreecommitdiffstats
path: root/kalyptus/kalyptusCxxToJNI.pm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:59:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:59:24 -0600
commit1bf8fc7d8c4e6aeb97c0b4781f3620d399991c77 (patch)
tree7a7cc00e101efd042bbf2152f9ce2fb0fd73c72b /kalyptus/kalyptusCxxToJNI.pm
parentc488c0b88217514f774503738b3ec940e90222bb (diff)
downloadlibtqt-perl-1bf8fc7d8c4e6aeb97c0b4781f3620d399991c77.tar.gz
libtqt-perl-1bf8fc7d8c4e6aeb97c0b4781f3620d399991c77.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
-rw-r--r--kalyptus/kalyptusCxxToJNI.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index b153fb0..29a5dd2 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -3113,11 +3113,11 @@ sub writeClassDoc
if ($javaClassName eq 'KIO') {
# Hack: namespaces can be defined in several source files, which doesn't work, so this..
- print JNISOURCE "#include <kio/job.h>\n";
- print JNISOURCE "#include <kio/davjob.h>\n";
- print JNISOURCE "#include <kio/metainfojob.h>\n";
- print JNISOURCE "#include <kio/previewjob.h>\n";
- print JNISOURCE "#include <kio/paste.h>\n";
+ print JNISOURCE "#include <tdeio/job.h>\n";
+ print JNISOURCE "#include <tdeio/davjob.h>\n";
+ print JNISOURCE "#include <tdeio/metainfojob.h>\n";
+ print JNISOURCE "#include <tdeio/previewjob.h>\n";
+ print JNISOURCE "#include <tdeio/paste.h>\n";
}
print JNISOURCE "\n";
@@ -3355,7 +3355,7 @@ sub addIncludeForClass($$$)
{
my ( $node, $addInclude, $debugMe ) = @_;
my $sourcename = $node->{Source}->{astNodeName};
- if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+ if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
# die "Empty source name for $node->{astNodeName}" if ( $sourcename eq '' );
@@ -3624,7 +3624,7 @@ sub generateMethod($$$$$$$$$)
return;
}
- if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+ if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
if ( $sourcename eq '' ) {
@@ -4155,7 +4155,7 @@ sub generateAllMethods($$$$$$$$)
my $sourcename = $classNode->{Source}->{astNodeName};
- if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+ if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
# die "Empty source name for $classNode->{astNodeName} $classNode->{Source}->{astNodeName}" if ( $sourcename eq '' );
@@ -4164,7 +4164,7 @@ sub generateAllMethods($$$$$$$$)
$addInclude->{$sourcename} = 1;
# my $s;
# for my $sn( @{$classNode->{Sources}} ) {
-# if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
# $s =~ s!.*/(.*)!$1!m;
# }
# $addInclude->{$s} = 1;