Fix inadvertent tq changes.

(cherry picked from commit ccb576aa67)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent b2a3c86f43
commit 71482a8fc7

@ -23,7 +23,7 @@ ${APP_NAME_LC}_SOURCES = ${EXISTING_SOURCE}
# these are the headers for your project that won't be installed
noinst_HEADERS = ${EXISTING_HEADER}
# let autotqmoc handle all of the meta source files (tqmoc)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
messages: rc.cpp

@ -31,7 +31,7 @@ ${APP_NAME_LC}_client_LDFLAGS = \$(KDE_RPATH) \$(all_libraries)
${APP_NAME_LC}_client_LDADD = \$(LIB_KDECORE)
${APP_NAME_LC}_client_SOURCES = ${APP_NAME_LC}_client.cpp
# let autotqmoc handle all of the meta source files (tqmoc)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
messages: rc.cpp

@ -10,7 +10,7 @@ INCLUDES = \$(all_includes)
# these are the headers for your project
noinst_HEADERS = ${APP_NAME_LC}.h ${APP_NAME_LC}_part.h
# let autotqmoc handle all of the meta source files (tqmoc)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
messages: rc.cpp

@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.desktop
[Desktop Entry]
Encoding=UTF-8
Name=${APP_NAME}Part
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-KDE-Library=lib${APP_NAME_LC}part
Type=Service

@ -26,7 +26,7 @@ sub nameok()
and $f !~ /_stub\.cpp/
and $f !~ /_skel.cpp/
and $f !~ /_closure\.cpp/
and $f !~ /tqmoc\.cpp/
and $f !~ /moc\.cpp/
)
{
return 1;

@ -42,7 +42,7 @@ handledir() {
done
fi
grep -q LIBRARIES Makefile.am && addignore ".libs"
grep -q METASOURCES Makefile.am && addignore "*.tqmoc"
grep -q METASOURCES Makefile.am && addignore "*.moc"
fgrep -q .skel Makefile.am && addignore "*.kidl"
fgrep -q .skel Makefile.am && addignore "*_skel.c*"
fgrep -q .stub Makefile.am && addignore "*_stub.cpp"

@ -16,7 +16,7 @@ cmdline="$@"
returndir=`pwd`
override="README ChangeLog INSTALL AUTHORS AUTHOR COPYING COPYING.LIB TODO"
remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 config.h config.h.bot config.h.in configure.files libtool stamp-h stamp-h.in stamp-h1 subdirs *.tqmoc *.la .libs .deps .cvsignore autom4te.cache {arch} .arch-ids"
remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 config.h config.h.bot config.h.in configure.files libtool stamp-h stamp-h.in stamp-h1 subdirs *.moc *.la .libs .deps .cvsignore autom4te.cache {arch} .arch-ids"
toplevelremove="configure.in.bot"
# whitespace seperated list of languages to never include.
always_skip_languages="xx"

@ -144,9 +144,9 @@ sub processEntries
next if ($e eq "Makefile.calls");
next if ($e eq "Makefile.rules.in");
next if ($e eq "Makefile.calls.in");
next if ($e =~ /^.*\.tqmoc$/);
next if ($e =~ /^.*\.moc$/);
next if ($e =~ /^.+\.gmo$/);
next if ($e =~ /^.+\.tqmoc\.[^\.]+$/);
next if ($e =~ /^.+\.moc\.[^\.]+$/);
next if ($e =~ /^.+\.lo$/);
next if ($e =~ /^.+\.la$/);
next if ($e =~ /^.+\.rpo$/);
@ -160,7 +160,7 @@ sub processEntries
# Qt specific entries
next if ($e eq ".ui");
next if ($e eq ".tqmoc");
next if ($e eq ".moc");
next if ($e eq ".obj");
$dirunknown{$e} = 1;

@ -32,7 +32,7 @@ sub checkdir($)
my $srcs=$dir2files{$dir}->{sources};
foreach my $h (keys %$hdrs) {
(my $name=$h) =~ s/\.[^.]+$//;
my @answer = `grep -l "^#include[ ]*.$name\.tqmoc." $cppFiles 2> /dev/null`;
my @answer = `grep -l "^#include[ ]*.$name\.moc." $cppFiles 2> /dev/null`;
if (@answer == 0) {
my $s;
foreach my $e (split(/\s+/, $cppExt)) {
@ -42,7 +42,7 @@ sub checkdir($)
}
if ($s) {
print "echo >> $s ;\n";
print "echo '#include \"$name.tqmoc\"' >> $s ;\n";
print "echo '#include \"$name.moc\"' >> $s ;\n";
} else {
print "echo \"can't guess a C++ file for $dir/$h\" ;\n";
}
@ -63,23 +63,23 @@ foreach my $k (keys %dir2files) {
=head1 NAME
includetqmocs -- handle tqmocifyable headers, whose .tqmoc file is nowhere included.
includemocs -- handle mocifyable headers, whose .moc file is nowhere included.
=head1 SYNOPSIS
includetqmocs
includemocs
=head1 DESCRIPTION
Header files declaring a QObject descendant have to be run through tqmoc to
produce a .tqmoc file. This .tqmoc file has to be compiled, for which two
Header files declaring a QObject descendant have to be run through moc to
produce a .moc file. This .moc file has to be compiled, for which two
possibilities exists: compile it separately, or #include it in the C++ file
implementing that above mentioned class. The latter is more efficient in term
of compilation speed.
This script searches in the current directory and its subdirs for header files
declaring a QObject descendant class. If it finds some, it looks, if there is
a C++ file containing an '#include' for the generated .tqmoc file. If thats not
a C++ file containing an '#include' for the generated .moc file. If thats not
the case, it tries to guess into which C++ file that '#include' is placed best
(based on the filename). If it fails to guess a proper place, it mentions
that.
@ -91,8 +91,8 @@ On stderr some informational messages are printed.
=head1 EXAMPLES
cd kdebase ; includetqmocs
cd kdebase ; `eval includetqmocs 2> /dev/null`
cd kdebase ; includemocs
cd kdebase ; `eval includemocs 2> /dev/null`
=head1 AUTHOR

@ -9,7 +9,7 @@
" should do the trick.
" Don't include these in filename completions
set suffixes+=.lo,.o,.tqmoc,.la,.closure,.loT
set suffixes+=.lo,.o,.moc,.la,.closure,.loT
" Search for headers here
set path=.,/usr/include,/usr/local/include,
@ -314,7 +314,7 @@ function! AddHeader()
let incomment = 1
elseif s =~ '^' . include
break
elseif s =~ '^#include' && s !~ '\.tqmoc"'
elseif s =~ '^#include' && s !~ '\.moc"'
let appendpos = line
elseif codestart == 0 && s !~ '^$'
let codestart = line
@ -411,7 +411,7 @@ function! UpdateMocFiles()
while i < 80
let s = getline( i )
if s =~ '^#include ".*\.moc"'
let s = substitute( s, '.*"\(.*\)\.tqmoc"', '\1.h', '' )
let s = substitute( s, '.*"\(.*\)\.moc"', '\1.h', '' )
if stridx( &complete, s ) == -1
let &complete = &complete . ',k' . s
endif

@ -312,7 +312,7 @@ This function does not do any hidden buffer changes."
(kde-comments-begin)
(kde-skip-blank-lines)
(setq msubstr (buffer-substring (point-at-bol) (point-at-eol)))
(if (string-match "^#include.*tqmoc.*" msubstr)
(if (string-match "^#include.*moc.*" msubstr)
(progn
(forward-line -1)
(end-of-line)

@ -43,7 +43,7 @@ CAUTION IS NEEDED WHEN USING THIS SCRIPT - changes are made to the original
file and are not programming language syntax aware - this is why the script
only suggests the changes to be made unless --make-changes is specified.
Hidden files, CVS directories, .desktop, and .tqmoc files are excluded
Hidden files, CVS directories, .desktop, and .moc files are excluded
from checking.
--check-dictionary : Checks the internal dictionary for potential
@ -195,7 +195,7 @@ sub process_directory
{
if ( $entry =~ /^\./ or
$entry =~ /\.desktop$/ or
$entry =~ /\.tqmoc$/ or
$entry =~ /\.moc$/ or
$entry eq "CVS" )
{
info "Skipping excluded file or directory: $entry\n";

@ -20,7 +20,7 @@ files=`find . -type d | grep -v CVS\$ | grep -v admin\$ | grep -v .libs\$ | fgre
toremove="rm -rf";
for i in $files; do if test -d $i; then
# List their contents and filter out generated files
realfiles=`find $i -type f | egrep -v '.svn|CVS/|Makefile$|Makefile.in$|Makefile.rules.in$|Makefile.calls.in$|\.o$|\.lo$|\.rpo$|\.la$|\.tqmoc|/\.#' `
realfiles=`find $i -type f | egrep -v '.svn|CVS/|Makefile$|Makefile.in$|Makefile.rules.in$|Makefile.calls.in$|\.o$|\.lo$|\.rpo$|\.la$|\.moc|/\.#' `
if [ -z "$realfiles" ]; then
toremove="$toremove '$i'"
fi

@ -17,7 +17,7 @@ cmdline="$@"
returndir=`pwd`
override="README ChangeLog INSTALL AUTHORS AUTHOR COPYING COPYING.LIB TODO COPYING-DOCS"
remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 libtool subdirs *.tqmoc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb"
remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 libtool subdirs *.moc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb"
toplevelremove="configure.in.bot config.h config.h.bot config.h.in config.status config.log stamp-h stamp-h.in stamp-h1 subdirs configure.files "
# whitespace seperated list of languages to never include.
always_skip_languages="xx"

Loading…
Cancel
Save