diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:14:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:14:29 -0600 |
| commit | 9778efc3900bdc23e8894337dfa122c75f7cbc54 (patch) | |
| tree | 137d03cc5381000184472e07229a9f4d7b27563e /kalyptus/kalyptusCxxToKimono.pm | |
| parent | 2407db5f826af170cd6e28cb49d18930309c5518 (diff) | |
| download | libtqt-perl-9778efc3900bdc23e8894337dfa122c75f7cbc54.tar.gz libtqt-perl-9778efc3900bdc23e8894337dfa122c75f7cbc54.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToKimono.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToKimono.pm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 871bf54..3b4c20d 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -776,12 +776,12 @@ sub preParseClass $className eq 'TDEIO::MetaData' || $className eq 'KFileMimeTypeInfo::ItemInfo' || $className eq 'TDEIO::UDSAtom' || - $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link - $className eq 'khtml::MouseDoubleClickEvent' || - $className eq 'khtml::MouseMoveEvent' || - $className eq 'khtml::MousePressEvent' || - $className eq 'khtml::MouseReleaseEvent' || - $className eq 'khtml::MouseEvent' || + $className eq 'tdehtml::DrawContentsEvent' || # the tdehtml:: classes build, but don't link + $className eq 'tdehtml::MouseDoubleClickEvent' || + $className eq 'tdehtml::MouseMoveEvent' || + $className eq 'tdehtml::MousePressEvent' || + $className eq 'tdehtml::MouseReleaseEvent' || + $className eq 'tdehtml::MouseEvent' || $className eq 'KURL::List' || $className eq 'KWin::Info' || $className eq 'TerminalInterface' || @@ -1777,7 +1777,7 @@ sub generateMethod($$$$$$$) return; } - if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { $sourcename =~ s!.*/(.*)!$1!m; } if ( $sourcename eq '' ) { @@ -2317,7 +2317,7 @@ sub generateAllMethods($$$$$$) my $sourcename = $classNode->{Source}->{astNodeName}; - if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { + if ( $sourcename !~ s!.*(kio/|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 '' ); @@ -2339,7 +2339,7 @@ sub generateAllMethods($$$$$$) if ($classNode->{astNodeName} ne $main::globalSpaceClassName) { # my $s; # for my $sn( @{$classNode->{Sources}} ) { -# if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { +# if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) { # $s =~ s!.*/(.*)!$1!m; # } # $addInclude->{$s} = 1; |