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 c488c0b882
commit 1bf8fc7d8c
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

6
acinclude.m4
Unescape View File

@ -1659,7 +1659,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libkdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@ -1979,7 +1979,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -1989,7 +1989,7 @@ else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
fi
])

6
aclocal.m4 vendored
Unescape View File

@ -1671,7 +1671,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libkdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@ -1991,7 +1991,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2001,7 +2001,7 @@ else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
fi
])

2
kalyptus/ChangeLog
Unescape View File

@ -261,7 +261,7 @@
2003-11-29 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* Fixed parsing of casts inside enums in kfileitem.h:
* Fixed parsing of casts inside enums in tdefileitem.h:
enum { Unknown = (mode_t) - 1 };
Hmm, not sure what that's up to anyway..
* Added a special Source property to method nodes in TQGlobalSpace.

2
kalyptus/README
Unescape View File

@ -51,7 +51,7 @@ Remove any TQ_OVERRIDE macros from the Qt headers, and remove EXPORT_DOCKCLASS f
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 \
kalyptus -fjava test/tmp/*.h test/tmp/dom/*.h test/tmp/tdeio/*.h test/tmp/tdeprint/*.h \
test/tmp/kjs/*.h test/tmp/tdeparts/*.h test/tmp/tdesu/*.h test/ktextedit/*.h test/tmp/libtdemid/*.h
# Shorten generated filenames

2
kalyptus/kalyptus
Unescape View File

@ -1697,7 +1697,7 @@ sub makeParamList($$$)
}
if (defined $defaultparam && $isEnum) {
# Remove any casts in enum values, for example this in kfileitem.h:
# Remove any casts in enum values, for example this in tdefileitem.h:
# 'enum { Unknown = (mode_t) - 1 };'
$defaultparam =~ s/\([^\)]+\)(.*[0-9].*)/$1/;
}

18
kalyptus/kalyptusCxxToJNI.pm
Unescape View File

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

6
kalyptus/kalyptusCxxToJava.pm
Unescape View File

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

6
kalyptus/kalyptusCxxToKimono.pm
Unescape View File

@ -1777,7 +1777,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 '' ) {
@ -2317,7 +2317,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 '' );
@ -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/|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;

6
kalyptus/kalyptusCxxToSmoke.pm
Unescape View File

@ -230,7 +230,7 @@ BEGIN
'TQStyle::SubControls' => 'int',
);
$headerSubdirectories = "kio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
$headerSubdirectories = "tdeio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
}
@ -932,9 +932,9 @@ my $fhn =1; # static
delete $includes{"kshortcut.h"};
}
if (defined $includes{"kshortcutlist.h"}) {
print $fh "#include <kconfigbase.h>\n";
print $fh "#include <tdeconfigbase.h>\n";
print $fh "#include <kshortcutlist.h>\n";
delete $includes{"kconfigbase.h"};
delete $includes{"tdeconfigbase.h"};
delete $includes{"kshortcutlist.h"};
}
if (defined $includes{"kaction.h"}) {

Write Preview
Loading…
Cancel
Save