diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:59:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:59:24 -0600 |
| commit | 1bf8fc7d8c4e6aeb97c0b4781f3620d399991c77 (patch) | |
| tree | 7a7cc00e101efd042bbf2152f9ce2fb0fd73c72b /kalyptus/kalyptusCxxToJava.pm | |
| parent | c488c0b88217514f774503738b3ec940e90222bb (diff) | |
| download | libtqt-perl-1bf8fc7d8c4e6aeb97c0b4781f3620d399991c77.tar.gz libtqt-perl-1bf8fc7d8c4e6aeb97c0b4781f3620d399991c77.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJava.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index c187bb7..94f9a62 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -1732,7 +1732,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 '' ) { @@ -2124,7 +2124,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}" if ( $sourcename eq '' ); @@ -2148,7 +2148,7 @@ sub generateAllMethods($$$$$$) if ($classNode->{astNodeName} ne $main::globalSpaceClassName) { # 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; |