diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:53 -0600 |
| commit | 545706afdcf29b8f584e78275452cca715e284db (patch) | |
| tree | fdbfaa34f2d633372ba4ab3e46d22cf10f38b40b /kalyptus/kalyptusCxxToJNI.pm | |
| parent | 9d4971a2ffb5be9c6fc1b6d6bc74020c37fb2169 (diff) | |
| download | tdebindings-545706afdcf29b8f584e78275452cca715e284db.tar.gz tdebindings-545706afdcf29b8f584e78275452cca715e284db.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index ec89863e..2c39d401 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; |