TDE
/
libtqt-perl
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libtqt-perl
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename many classes and header files to avoid conflicts with KDE4

Browse Source
bug/266/move-to-usr
Timothy Pearson 12 years ago
parent e2b9f0fee4
commit f9d30ac535
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

16
cvs2cl.pl
Unescape View File

@ -822,17 +822,17 @@ sub derive_change_log ()
foreach my $time (sort {$main::a <=> $main::b} (keys %$timehash))
{
my $msghash = $timehash->{$time};
while (my ($msg,$qunklist) = each %$msghash)
while (my ($msg,$quntdelist) = each %$msghash)
{
my $stamptime = $stamptime{$msg};
if ((defined $stamptime)
and (($time - $stamptime) < $Max_Checkin_Duration)
and (defined $changelog{$stamptime}{$author}{$msg}))
{
push(@{$changelog{$stamptime}{$author}{$msg}}, @$qunklist);
push(@{$changelog{$stamptime}{$author}{$msg}}, @$quntdelist);
}
else {
$changelog{$time}{$author}{$msg} = $qunklist;
$changelog{$time}{$author}{$msg} = $quntdelist;
$stamptime{$msg} = $time;
}
}
@ -941,14 +941,14 @@ sub derive_change_log ()
# We sort here to enable predictable ordering for the testing porpoises
for my $msg (sort keys %$mesghash)
{
my $qunklist = $mesghash->{$msg};
my $quntdelist = $mesghash->{$msg};
## MJP: 19.xii.01 : Exclude @ignore_tags
for my $ignore_tag (keys %ignore_tags) {
next FOOBIE
if grep($_ eq $ignore_tag, map(@{$_->{tags}},
grep(defined $_->{tags},
@$qunklist)));
@$quntdelist)));
}
## MJP: 19.xii.01 : End exclude @ignore_tags
@ -957,10 +957,10 @@ sub derive_change_log ()
next FOOBIE
if !grep(exists $show_tags{$_}, map(@{$_->{tags}},
grep(defined $_->{tags},
@$qunklist)));
@$quntdelist)));
}
my $files = &pretty_file_list ($qunklist);
my $files = &pretty_file_list ($quntdelist);
my $header_line; # date and author
my $body; # see below
my $wholething; # $header_line + $body
@ -1014,7 +1014,7 @@ sub derive_change_log ()
# performed. Files which were added have no line change
# indicator, whereas deleted files have state dead.
#
foreach $qunk ( @$qunklist )
foreach $qunk ( @$quntdelist )
{
if ( "dead" eq $qunk->{'state'})
{

2
kalyptus/ChangeLog
Unescape View File

@ -141,7 +141,7 @@
2004-05-20 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* The java '-fjni' option now generates correct java code with Qt/E 2.3.4
* TDEMainWindow.toolBar() and TDEMainWindow.menuBar() rename ktoolBar() and
* TDEMainWindow.toolBar() and TDEMainWindow.menuBar() rename tdetoolBar() and
kmenuBar(). This is because java doesn't have covariant return types
and the methods with the same names in TQMainWindow return a TQToolBar
and TQMenuBar, rather than their KDE equivalent subclasses.

10
kalyptus/kalyptusCxxToJNI.pm
Unescape View File

@ -43,7 +43,7 @@ use vars qw/
$qpixmapExtras $qpixmapjniExtras $qpaintdeviceExtras $qpaintdevicejniExtras
$qdragobjectExtras $qdragobjectjniExtras $qiodeviceExtras $qpointarrayExtras $qpointarrayjniExtras
$qtextcodecExtras $qtextcodecjniExtras $quridragExtras $quridragjniExtras
$kapplicationExtras $kapplicationjniExtras $kmainwindowExtras $kmainwindowjniExtras
$kapplicationExtras $kapplicationjniExtras $tdemainwindowExtras $tdemainwindowjniExtras
$kcmdlineargsjniExtras $schedulerjniExtras
$methodNumber
%builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %mungedTypeMap %javaImports
@ -1649,7 +1649,7 @@ Java_org_kde_koala_TDEApplication_setJavaSlotFactory(JNIEnv* env, jclass cls)
EOF
$kmainwindowExtras = <<EOF;
$tdemainwindowExtras = <<EOF;
/**
List of members of TDEMainWindow class.
*/
@ -1674,7 +1674,7 @@ EOF
EOF
$kmainwindowjniExtras = <<EOF;
$tdemainwindowjniExtras = <<EOF;
JNIEXPORT jobject JNICALL
Java_org_kde_koala_TDEMainWindow_memberList(JNIEnv* env, jobject obj)
{
@ -3085,8 +3085,8 @@ sub writeClassDoc
print CLASS $kapplicationExtras;
$jniCode .= $kapplicationjniExtras;
} elsif ( $className eq 'TDEMainWindow' ) {
print CLASS $kmainwindowExtras;
$jniCode .= $kmainwindowjniExtras;
print CLASS $tdemainwindowExtras;
$jniCode .= $tdemainwindowjniExtras;
}
print CLASS "}\n";

6
kalyptus/kalyptusCxxToJava.pm
Unescape View File

@ -42,7 +42,7 @@ use vars qw/
$qpixmapExtras $qpaintdeviceExtras
$qdragobjectExtras $qiodeviceExtras $qpointarrayExtras
$qtextcodecExtras $quridragExtras
$kapplicationExtras $kmainwindowExtras
$kapplicationExtras $tdemainwindowExtras
$methodNumber
%builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %mungedTypeMap %javaImports
%skippedClasses %operatorNames /;
@ -466,7 +466,7 @@ EOF
EOF
$kmainwindowExtras = <<EOF;
$tdemainwindowExtras = <<EOF;
/**
List of members of TDEMainWindow class.
*/
@ -1321,7 +1321,7 @@ sub writeClassDoc
} elsif ( $className eq 'TDEApplication' ) {
print CLASS $kapplicationExtras;
} elsif ( $className eq 'TDEMainWindow' ) {
print CLASS $kmainwindowExtras;
print CLASS $tdemainwindowExtras;
}
print CLASS "}\n";

6
kalyptus/kalyptusCxxToKimono.pm
Unescape View File

@ -41,7 +41,7 @@ use vars qw/
$qpixmapExtras $qpaintdeviceExtras
$qdragobjectExtras $qiodeviceExtras $qpointarrayExtras
$qtextcodecExtras $qsizepolicyExtras $quridragExtras
$kapplicationExtras $kmainwindowExtras
$kapplicationExtras $tdemainwindowExtras
$methodNumber
%builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %mungedTypeMap %csharpImports
%skippedClasses %operatorNames /;
@ -484,7 +484,7 @@ EOF
EOF
$kmainwindowExtras = <<EOF;
$tdemainwindowExtras = <<EOF;
EOF
@ -1348,7 +1348,7 @@ sub writeClassDoc
} elsif ( $className eq 'TDEApplication' ) {
print CLASS $kapplicationExtras;
} elsif ( $className eq 'TDEMainWindow' ) {
print CLASS $kmainwindowExtras;
print CLASS $tdemainwindowExtras;
}

18
kalyptus/kalyptusCxxToSmoke.pm
Unescape View File

@ -927,19 +927,19 @@ my $fhn =1; # static
print $fh "#include <ntqurl.h>\n";
delete $includes{"ntqurl.h"};
}
if (defined $includes{"kshortcut.h"}) {
print $fh "#include <kshortcut.h>\n";
delete $includes{"kshortcut.h"};
if (defined $includes{"tdeshortcut.h"}) {
print $fh "#include <tdeshortcut.h>\n";
delete $includes{"tdeshortcut.h"};
}
if (defined $includes{"kshortcutlist.h"}) {
if (defined $includes{"tdeshortcutlist.h"}) {
print $fh "#include <tdeconfigbase.h>\n";
print $fh "#include <kshortcutlist.h>\n";
print $fh "#include <tdeshortcutlist.h>\n";
delete $includes{"tdeconfigbase.h"};
delete $includes{"kshortcutlist.h"};
delete $includes{"tdeshortcutlist.h"};
}
if (defined $includes{"kaction.h"}) {
print $fh "#include <kaction.h>\n";
delete $includes{"kaction.h"};
if (defined $includes{"tdeaction.h"}) {
print $fh "#include <tdeaction.h>\n";
delete $includes{"tdeaction.h"};
}
foreach my $incl (keys %includes) {
die if $incl eq '';

Write Preview
Loading…
Cancel
Save