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

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
bug/266/move-to-usr
Timothy Pearson 11 years ago
parent 2407db5f82
commit 9778efc390
10 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File

16
acinclude.m4
Unescape View File

@ -1966,9 +1966,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
@ -1977,13 +1977,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@ -2396,7 +2396,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml)
dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then

16
aclocal.m4 vendored
Unescape View File

@ -1978,9 +1978,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
@ -1989,13 +1989,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@ -2408,7 +2408,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml)
dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then

2
kalyptus/ChangeLog
Unescape View File

@ -273,7 +273,7 @@
* Fixed parsing default argument values cast to a numeric literal, eg:
mode_t mode = (mode_t)-1
* Excluded a couple of structs from kparts/browserextension
* Excluded a couple of structs from tdeparts/browserextension
2003-11-04 Richard Dale <Richard_Dale@tipitina.demon.co.uk>

2
kalyptus/README
Unescape View File

@ -52,7 +52,7 @@ KDE headers
# Generate Java and C++ sources. Copy all the target headers to directory 'test/tmp'
kalyptus -fjava test/tmp/*.h test/tmp/dom/*.h test/tmp/kio/*.h test/tmp/tdeprint/*.h \
test/tmp/kjs/*.h test/tmp/kparts/*.h test/tmp/tdesu/*.h test/ktextedit/*.h test/tmp/libkmid/*.h
test/tmp/kjs/*.h test/tmp/tdeparts/*.h test/tmp/tdesu/*.h test/ktextedit/*.h test/tmp/libtdemid/*.h
# Shorten generated filenames
mv DOM__Node.cpp DOMNode.cpp

20
kalyptus/kalyptusCxxToJNI.pm
Unescape View File

@ -2449,12 +2449,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' ||
@ -3355,7 +3355,7 @@ sub addIncludeForClass($$$)
{
my ( $node, $addInclude, $debugMe ) = @_;
my $sourcename = $node->{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 $node->{astNodeName}" if ( $sourcename eq '' );
@ -3624,7 +3624,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 '' ) {
@ -4155,7 +4155,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} $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/|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;

18
kalyptus/kalyptusCxxToJava.pm
Unescape View File

@ -756,12 +756,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' ||
@ -1732,7 +1732,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 '' ) {
@ -2124,7 +2124,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 '' );
@ -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/|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;

18
kalyptus/kalyptusCxxToKimono.pm
Unescape View File

@ -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;

16
kalyptus/kalyptusCxxToSmoke.pm
Unescape View File

@ -230,7 +230,7 @@ BEGIN
'TQStyle::SubControls' => 'int',
);
$headerSubdirectories = "kio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/|knewstuff/"
$headerSubdirectories = "kio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
}
@ -406,13 +406,13 @@ sub preParseClass
$className eq 'KPropertiesDialog' ||
$className eq 'ProgressItem' ||
$className eq 'TDEIO::ChmodInfo' ||
$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 'khtml' ||
$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 'tdehtml' ||
$className eq 'KURL::List' ||
$className eq 'KWin::Info' ||
$className eq 'TerminalInterface' ||

2
kalyptus/kalyptusCxxToSwig.pm
Unescape View File

@ -838,7 +838,7 @@ sub writeClassDoc
my $sourcename = $node->{Source}->{astNodeName};
if ( $sourcename =~ m!.*(dom|kabc|tdeprint|tdesu|kio|kjs|kparts|ktexteditor|libkmid)/([^/]*$)! ) {
if ( $sourcename =~ m!.*(dom|kabc|tdeprint|tdesu|kio|kjs|tdeparts|tdetexteditor|libtdemid)/([^/]*$)! ) {
$sourcename = $1."/".$2;
} else {
$sourcename =~ s!.*/([^/]*$)!$1!;

2
kalyptus/kalyptusDataDict.pm
Unescape View File

@ -2862,7 +2862,7 @@ sub addNamespace
if ( $className =~ /^(DrawContentsEvent|MouseDoubleClickEvent|MouseEvent|MouseMoveEvent|MousePressEvent|MouseReleaseEvent)/ )
{
return "khtml::".$className;
return "tdehtml::".$className;
}
if ( $className =~ /^(OfferList)/ )

Write Preview
Loading…
Cancel
Save