smoke's qt -> tqt renaming. This relates to bug 266.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
bug/266/move-to-usr
Michele Calgaro 4 years ago
parent b0768b8783
commit 1db9e19a98
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
  1. 4
      kalyptus/kalyptusCxxToJNI.pm
  2. 4
      kalyptus/kalyptusCxxToJava.pm
  3. 4
      kalyptus/kalyptusCxxToKimono.pm
  4. 6
      kalyptus/kalyptusCxxToSmoke.pm
  5. 2
      smoke/README
  6. 6
      smoke/tde/Makefile.am
  7. 4
      smoke/tde/configure.in.in
  8. 34
      smoke/tde/generate.pl.in
  9. 2
      smoke/tde/hint_header_list.pl
  10. 9
      smoke/tde/qt_smoke.h
  11. 9
      smoke/tde/tqt_smoke.h
  12. 86
      smoke/tde/tqtguess.pl.in
  13. 4
      smoke/tqt/Makefile.am
  14. 20
      smoke/tqt/configure.in.in
  15. 36
      smoke/tqt/generate.pl.in
  16. 2
      smoke/tqt/hint_header_list.pl
  17. 9
      smoke/tqt/qt_smoke.h
  18. 2
      smoke/tqt/smoketqt.pro
  19. 0
      smoke/tqt/tqscintilla_header_list
  20. 9
      smoke/tqt/tqt_smoke.h
  21. 86
      smoke/tqt/tqtguess.pl.in

@ -5405,11 +5405,11 @@ sub writeSmokeDataFile($) {
# print OUT " void init_${libname}_Smoke();\n";
# print OUT "}\n";
# print OUT "\n";
# print OUT "Smoke* qt_Smoke = 0L;\n";
# print OUT "Smoke* tqt_Smoke = 0L;\n";
# print OUT "\n";
# print OUT "// Create the Smoke instance encapsulating all the above.\n";
# print OUT "void init_${libname}_Smoke() {\n";
# print OUT " qt_Smoke = new Smoke(\n";
# print OUT " tqt_Smoke = new Smoke(\n";
# print OUT " ${libname}_classes, ".$#classlist.",\n";
# print OUT " ${libname}_methods, $methodCount,\n";
# print OUT " ${libname}_methodMaps, $methodMapCount,\n";

@ -3244,11 +3244,11 @@ sub writeSmokeDataFile($) {
# print OUT " void init_${libname}_Smoke();\n";
# print OUT "}\n";
# print OUT "\n";
# print OUT "Smoke* qt_Smoke = 0L;\n";
# print OUT "Smoke* tqt_Smoke = 0L;\n";
# print OUT "\n";
# print OUT "// Create the Smoke instance encapsulating all the above.\n";
# print OUT "void init_${libname}_Smoke() {\n";
# print OUT " qt_Smoke = new Smoke(\n";
# print OUT " tqt_Smoke = new Smoke(\n";
# print OUT " ${libname}_classes, ".$#classlist.",\n";
# print OUT " ${libname}_methods, $methodCount,\n";
# print OUT " ${libname}_methodMaps, $methodMapCount,\n";

@ -3438,11 +3438,11 @@ sub writeSmokeDataFile($) {
# print OUT " void init_${libname}_Smoke();\n";
# print OUT "}\n";
# print OUT "\n";
# print OUT "Smoke* qt_Smoke = 0L;\n";
# print OUT "Smoke* tqt_Smoke = 0L;\n";
# print OUT "\n";
# print OUT "// Create the Smoke instance encapsulating all the above.\n";
# print OUT "void init_${libname}_Smoke() {\n";
# print OUT " qt_Smoke = new Smoke(\n";
# print OUT " tqt_Smoke = new Smoke(\n";
# print OUT " ${libname}_classes, ".$#classlist.",\n";
# print OUT " ${libname}_methods, $methodCount,\n";
# print OUT " ${libname}_methodMaps, $methodMapCount,\n";

@ -2092,7 +2092,7 @@ sub writeSmokeDataFile($) {
print OUT "\n";
print OUT "#include <smoke.h>\n\n";
print OUT "#include <qt_smoke.h>\n\n";
print OUT "#include <tqt_smoke.h>\n\n";
# gcc optimizes this method like crazy. switch() is godly
print OUT "static void *${libname}_cast(void *xptr, Smoke::Index from, Smoke::Index to) {\n";
@ -2736,11 +2736,11 @@ sub writeSmokeDataFile($) {
# print OUT " void init_${libname}_Smoke();\n";
# print OUT "}\n";
print OUT "\n";
print OUT "Smoke* qt_Smoke = 0L;\n";
print OUT "Smoke* tqt_Smoke = 0L;\n";
print OUT "\n";
print OUT "// Create the Smoke instance encapsulating all the above.\n";
print OUT "void init_${libname}_Smoke() {\n";
print OUT " qt_Smoke = new Smoke(\n";
print OUT " tqt_Smoke = new Smoke(\n";
print OUT " ${libname}_classes, ".$#classlist.",\n";
print OUT " ${libname}_methods, $methodCount,\n";
print OUT " ${libname}_methodMaps, $methodMapCount,\n";

@ -15,7 +15,7 @@ Regenerating
For SmokeTQt:
cd tqt
./qtguess.pl
./tqtguess.pl
./generate.pl
make

@ -1,9 +1,9 @@
lib_LTLIBRARIES = libsmoketde.la
# set the include path for X, qt and KDE
# set the include path for X, tqt and KDE
INCLUDES = -I$(srcdir)/.. $(all_includes)
EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
EXTRA_DIST=generate.pl.in tqtguess.pl.in tqt_smoke.h Makefile.am
# the library search path.
libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
@ -15,7 +15,7 @@ x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
# which sources should be compiled for perlqttde
# which sources should be compiled for perltqttde
libsmoketde_la_SOURCES = $(x_sources) smokedata.cpp
$(x_sources) smokedata.cpp:

@ -12,9 +12,9 @@ AC_SUBST(KDE_PREFIX)
if test "X$kde_build_libsmoke" = "Xtde" -o "X$kde_build_libsmoke" = "Xtqt tde"; then
AC_CONFIG_FILES([ smoke/tde/qtguess.pl ], [
AC_CONFIG_FILES([ smoke/tde/tqtguess.pl ], [
cd smoke/tde
perl qtguess.pl
perl tqtguess.pl
cd ../..
])
AC_CONFIG_FILES([ smoke/tde/generate.pl ], [

@ -1,6 +1,6 @@
#!/usr/bin/perl -w
## Run this first, to generate the x_*.cpp files from the Qt headers
## Run this first, to generate the x_*.cpp files from the TQt headers
## using kalyptus
my $kalyptusdir = "@srcdir@/../../kalyptus";
@ -14,7 +14,7 @@ use Cwd;
my $here = getcwd;
my $outdir = $here . "/generate.pl.tmpdir";
my $finaloutdir = $here;
my $defines = "qtdefines";
my $defines = "tqtdefines";
my $headerlist = "@srcdir@/header_list";
my $kdeheaderlist = "@srcdir@/tde_header_list";
my $definespath = "$here/$defines";
@ -34,7 +34,7 @@ if (-d $outdir) { system "rm -f $outdir/x_*.cpp"; } else { mkdir $outdir; }
mkdir $finaloutdir unless (-d $finaloutdir);
# Load the TQT_NO_* macros found in "qtdefines". They'll be passed to kalyptus
# Load the TQT_NO_* macros found in "tqtdefines". They'll be passed to kalyptus
my $macros="";
if ( -e $definespath ){
print "Found '$defines'. Reading preprocessor symbols from there...\n";
@ -48,9 +48,9 @@ chdir "$kalyptusdir" or die "Couldn't go to $kalyptusdir (edit script to change
# We don't want all of them - e.g. not template-based stuff
my %excludes = (
'ntqaccessible.h' => 1, # Accessibility support is not compiled by defaut
'ntqassistantclient.h' => 1, # Not part of Qt (introduced in Qt-3.1)
'ntqassistantclient.h' => 1, # Not part of TQt (introduced in TQt-3.1)
'ntqmotif.h' => 1, #
'ntqmotifwidget.h' => 1, # Motif extension (introduced in Qt-3.1)
'ntqmotifwidget.h' => 1, # Motif extension (introduced in TQt-3.1)
'ntqmotifdialog.h' => 1, #
'ntqxt.h' => 1, # Xt
'ntqxtwidget.h' => 1, # Xt
@ -58,11 +58,11 @@ my %excludes = (
'ntqgl.h' => 1, # OpenGL
'ntqglcolormap.h' => 1, # OpenGL
'ntqnp.h' => 1, # NSPlugin
'ntqttableview.h' => 1, # Not in Qt anymore...
'ntqtmultilineedit.h' => 1, # Not in Qt anymore...
'ntqttableview.h' => 1, # Not in TQt anymore...
'ntqtmultilineedit.h' => 1, # Not in TQt anymore...
'ntqwidgetfactory.h' => 1, # Just an interface
'ntqsharedmemory.h' => 1, # "not part of the Qt API" they say
'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin
'ntqsharedmemory.h' => 1, # "not part of the TQt API" they say
'ntqwindowsstyle.h' => 1, # TQt windowsstyle, plugin
'ntqmotifstyle.h' => 1,
'ntqcompactstyle.h' => 1,
'ntqinterlacestyle.h' => 1,
@ -138,17 +138,17 @@ if("@KDE_HAVE_GL@" eq "yes")
}
else
{
print STDERR "Qt was not compiled with OpenGL support...\n Skipping TQGL Classes.\n";
print STDERR "TQt was not compiled with OpenGL support...\n Skipping TQGL Classes.\n";
}
}
# List Qt headers, and exclude the ones listed above
# List TQt headers, and exclude the ones listed above
my @headers = ();
$qtinc= '@tqt_includes@';
opendir (QT, $qtinc) or die "Couldn't find $qtinc";
foreach $filename (readdir(QT)) {
$entry = $qtinc."/".$filename;
$tqtinc= '@tqt_includes@';
opendir (TQT, $tqtinc) or die "Couldn't find $tqtinc";
foreach $filename (readdir(TQT)) {
$entry = $tqtinc."/".$filename;
if ( ( -e $entry or -l $entry ) # A real file or a symlink
&& ( ! -d _ ) ) # Not a symlink to a dir though
{
@ -159,7 +159,7 @@ foreach $filename (readdir(QT)) {
undef $includes{$filename}
}
}
closedir QT;
closedir TQT;
my @kdeheaders = ();
$kdeprefix = "@KDE_PREFIX@";
@ -185,7 +185,7 @@ find(
);
# Launch kalyptus
system "perl kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --allow_k_dcop_accessors --outputdir=$outdir @headers @kdeheaders";
system "perl kalyptus @ARGV --globspace -fsmoke --name=tqt $macros --no-cache --allow_k_dcop_accessors --outputdir=$outdir @headers @kdeheaders";
my $exit = $? >> 8;
exit $exit if ($exit);

@ -1,5 +1,5 @@
# CVS admin : run this script to compare the set of Qt headers to
# CVS admin : run this script to compare the set of TQt headers to
# the actual content of header_list
$l = "header_list";

@ -1,9 +0,0 @@
#ifndef QT_SMOKE_H
#define QT_SMOKE_H
// Defined in smokedata.cpp, initialized by init_qt_Smoke(), used by all .cpp files
extern Smoke* qt_Smoke;
class TQGlobalSpace { };
#endif

@ -0,0 +1,9 @@
#ifndef TQT_SMOKE_H
#define TQT_SMOKE_H
// Defined in smokedata.cpp, initialized by init_tqt_Smoke(), used by all .cpp files
extern Smoke* tqt_Smoke;
class TQGlobalSpace { };
#endif

@ -1,12 +1,12 @@
#!/usr/bin/perl
# qtguess.pl : check how Qt was compiled. Issue a list of all defined TQT_NO_* macros, one per line.
# tqtguess.pl : check how TQt was compiled. Issue a list of all defined TQT_NO_* macros, one per line.
#
# author: germain Garand <germain@ebooksfrance.com>
# licence: GPL v.2
# options: -q: be quieter
# -o file: redirect output to "file". (default: ./qtdefines)
# -o file: redirect output to "file". (default: ./tqtdefines)
# -t [0..15]: set the testing threshold (see below)
# -f "flags": additional compiler flags/parameters
@ -17,7 +17,7 @@ use vars qw/$opt_f $opt_o $opt_p/;
getopts('qo:f:t:');
# Threshold :
# 0 - test basic Qt types/classes
# 0 - test basic TQt types/classes
# 5 - test higher level, non-gui classes
# 8 - test options of the above (ex: TQT_NO_IMAGE_SMOOTHSCALE)
# 10 - test basic widgets
@ -25,20 +25,20 @@ getopts('qo:f:t:');
# 13 - test widgets inheriting composite widgets
# 15 - test goodies (default)
my $default_threshold = @qt_test_threshold@;
my $default_threshold = @tqt_test_threshold@;
my $cc = "@CXX@";
my $ccflags = $opt_f || "@CXXFLAGS@";
my $nspaces = 50;
my %qtdefs=();
my %qtundefs=();
my %tqtdefs=();
my %tqtundefs=();
my $tmp = gettmpfile();
my $qtinc = '@tqt_includes@';
my $tqtinc = '@tqt_includes@';
my $allinc = '@all_includes@';
my $alllib = '@all_libraries@';
my $qtflags ='@LIB_TQT@';
my $tqtflags ='@LIB_TQT@';
my %x;
$x{'LIBPNG'} = '@LIBPNG@';
$x{'LIBJPEG'} = '@LIBJPEG@';
@ -50,31 +50,31 @@ $x{'LIB_X11'} = '@LIB_X11@';
$x{'X_PRE_LIBS'} = '@X_PRE_LIBS@';
$x{'LIB_X11'} =~ s/\$\((.*?)\)/$x{$1}/g;
$qtflags =~ s/\$\((.*?)\)/$x{$1}/g;
$tqtflags =~ s/\$\((.*?)\)/$x{$1}/g;
-e "$qtinc/qglobal.h" or die "Invalid Qt directory.\n";
-e "$tqtinc/qglobal.h" or die "Invalid TQt directory.\n";
my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags";
my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $tqtflags";
my $threshold = defined($opt_t)?$opt_t : $default_threshold;
$threshold >= 0 or die "invalid testing threshold: $threshold\n";
print "Checking how Qt was built... \n";
print "Checking how TQt was built... \n";
print "Threshold is set to $threshold\n" unless $opt_q;
my($count, $used, $total);
map{ $tests{$_}->[2]>=$threshold ? ($used++, $total++):$total++ } keys %tests;
print "Number of defines to be tested : $used/$total\n\n" unless $opt_q;
open( TQTDEFS, ">".($opt_o || "qtdefines") ) or die "Can't open output file: $!\n";
open( TQTDEFS, ">".($opt_o || "tqtdefines") ) or die "Can't open output file: $!\n";
grab_qglobal_symbols();
preliminary_test();
perform_all_tests();
print +scalar(keys %qtdefs) . " defines found.\n";
print +scalar(keys %tqtdefs) . " defines found.\n";
print TQTDEFS join("\n", keys %qtdefs), "\n";
print TQTDEFS join("\n", keys %tqtdefs), "\n";
close;
#--------------------------------------------------------------#
@ -82,7 +82,7 @@ close;
sub gettmpfile
{
my $tmpdir = $ENV{'TMP'} || ".";
my $tmpname = $$."-qtguess";
my $tmpname = $$."-tqtguess";
while( -e "$tmpdir/$tmpname" || -e "$tmpdir/${tmpname}.cpp" )
{
$tmpname .= int (rand * 9);
@ -94,28 +94,28 @@ sub gettmpfile
sub grab_qglobal_symbols
{
my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null";
my $cmd = "$cc -E -D__cplusplus -dM -I$tqtinc $tqtinc/qglobal.h 2>/dev/null";
my $symbols = `$cmd`;
for(0..1)
{
if( check_exit_status($?) )
{
while( $symbols =~/^#\s*define\s*(QT_\S+)\s*$/gm )
while( $symbols =~/^#\s*define\s*(TQT_\S+)\s*$/gm )
{
$qtdefs{$1} = 1;
$tqtdefs{$1} = 1;
}
print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs));
print "Found ". scalar( keys %tqtdefs )." predefined symbol".((scalar( keys %tqtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %tqtdefs));
while( $symbols =~/^#\s*define\s*TQT_MODULE_(\S+)\s*$/gm )
{
$qtundefs{"TQT_NO_$1"} = 1;
$tqtundefs{"TQT_NO_$1"} = 1;
}
print "Found ". scalar( keys %qtundefs )." undefined symbol".((scalar( keys %qtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtundefs));
print "Found ". scalar( keys %tqtundefs )." undefined symbol".((scalar( keys %tqtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %tqtundefs));
last;
}
elsif(! $_) # first try
{
print "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n";
$cmd = "$cc -E -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null";
$cmd = "$cc -E -dM -I$tqtinc $tqtinc/qglobal.h 2>/dev/null";
$symbols = `$cmd`;
next;
}
@ -166,14 +166,14 @@ sub perform_all_tests
foreach ( sort { $tests{$a}->[2] <=> $tests{$b}->[2]} keys %tests)
{
$tests{$_}->[2] < $threshold and next;
($qtdefs{$_} || $qtundefs{$_}) and do
($tqtdefs{$_} || $tqtundefs{$_}) and do
{
print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($qtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n");
print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($tqtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n");
next
};
print "\rTesting $_".( " " x ($nspaces - length($_)) );
open( OUT, ">${tmp}.cpp" ) or die "Failed to open temp file ${tmp}.cpp: $!\n";
foreach $def(keys %qtdefs)
foreach $def(keys %tqtdefs)
{
print OUT "#define $def\n";
}
@ -198,7 +198,7 @@ sub perform_all_tests
my $ok = check_exit_status($?);
if( !$ok )
{
$qtdefs{$_} = 1;
$tqtdefs{$_} = 1;
}
print +$opt_q ? ++$count."/$used" : ( $ok ? "*Undefined*\n" : " [Defined]\n" );
}
@ -398,9 +398,9 @@ our %tests = (
"TQT_NO_PROGRESSDIALOG" => ["qprogressdialog.h", "TQProgressDialog foo;", 13],
"TQT_NO_PUSHBUTTON" => ["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12],
"TQT_NO_PROPERTIES" => ["qmetaobject.h", "TQMetaProperty foo;", 0],
# "TQT_NO_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15],
# "TQT_NO_QTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£
# class TQFoo: public QtTableView
# "TQT_NO_TQTMULTILINEEDIT" => ["tqtmultilineedit.h", "TQtMultiLineEdit foo;", 15],
# "TQT_NO_TQTTABLEVIEW" => ["tqttableview.h", "TQFoo foo;", 16, q£
# class TQFoo: public TQtTableView
# {
# public:
# TQFoo() {};
@ -458,13 +458,13 @@ our %tests = (
# "TQT_NO_STYLE_MOTIFPLUS" => ["qmotifplusstyle.h", "TQMotifPlusStyle foo;", 16],
# "TQT_NO_STYLE_SGI" => ["qsgistyle.h", "TQSGIStyle foo;", 16],
# "TQT_NO_STYLE_WINDOWS" => ["qwindowsstyle.h", "TQWindowsStyle foo;", 16],
"TQT_NO_TABBAR" => ["qtabbar.h", "TQTabBar foo;", 10],
"TQT_NO_TABDIALOG" => ["qtabdialog.h", "TQTabDialog foo;", 12],
"TQT_NO_TABLE" => ["qtable.h", "TQTable foo;", 10],
"TQT_NO_TABWIDGET" => ["qtabwidget.h", "TQTabWidget foo;", 10],
"TQT_NO_TEXTBROWSER" => ["qtextbrowser.h", "TQTextBrowser foo;", 14],
"TQT_NO_TEXTCODEC" => ["qtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
"TQT_NO_TEXTCODECPLUGIN" => ["qtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "TQFoo foo;", 6, q£
"TQT_NO_TABBAR" => ["tqtabbar.h", "TQTabBar foo;", 10],
"TQT_NO_TABDIALOG" => ["tqtabdialog.h", "TQTabDialog foo;", 12],
"TQT_NO_TABLE" => ["tqtable.h", "TQTable foo;", 10],
"TQT_NO_TABWIDGET" => ["tqtabwidget.h", "TQTabWidget foo;", 10],
"TQT_NO_TEXTBROWSER" => ["tqtextbrowser.h", "TQTextBrowser foo;", 14],
"TQT_NO_TEXTCODEC" => ["tqtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
"TQT_NO_TEXTCODECPLUGIN" => ["tqtextcodecplugin.h, qstringlist.h, qvaluelist.h, tqtextcodec.h", "TQFoo foo;", 6, q£
class TQFoo: public TQTextCodecPlugin
{
@ -478,12 +478,12 @@ our %tests = (
};
Q_EXPORT_PLUGIN( TQFoo )
£],
"TQT_NO_TEXTEDIT" => ["qtextedit.h", "TQTextEdit foo;", 13],
"TQT_NO_TEXTSTREAM" => ["qtextstream.h", "TQTextStream foo;", 5],
"TQT_NO_TEXTVIEW" => ["qtextview.h", "TQTextView foo;", 14], #Obsolete
"TQT_NO_TOOLBAR" => ["qtoolbar.h", "TQToolBar foo;", 10],
"TQT_NO_TOOLBUTTON" => ["qtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
"TQT_NO_TOOLTIP" => ["qtooltip.h", "TQToolTip::hide();", 10],
"TQT_NO_TEXTEDIT" => ["tqtextedit.h", "TQTextEdit foo;", 13],
"TQT_NO_TEXTSTREAM" => ["tqtextstream.h", "TQTextStream foo;", 5],
"TQT_NO_TEXTVIEW" => ["tqtextview.h", "TQTextView foo;", 14], #Obsolete
"TQT_NO_TOOLBAR" => ["tqtoolbar.h", "TQToolBar foo;", 10],
"TQT_NO_TOOLBUTTON" => ["tqtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
"TQT_NO_TOOLTIP" => ["tqtooltip.h", "TQToolTip::hide();", 10],
"TQT_NO_TRANSFORMATIONS" => ["qpainter.h", q£
TQPainter *foo= new TQPainter();

@ -3,7 +3,7 @@ lib_LTLIBRARIES = libsmoketqt.la
# set the include path for X, tqt and TDE
INCLUDES = -I$(srcdir)/.. $(all_includes)
EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
EXTRA_DIST=generate.pl.in tqtguess.pl.in tqt_smoke.h Makefile.am
# the library search path.
libsmoketqt_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC)
@ -15,7 +15,7 @@ x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp
# which sources should be compiled for perlqttde
# which sources should be compiled for perltqttde
libsmoketqt_la_SOURCES = $(x_sources) smokedata.cpp
$(x_sources) smokedata.cpp:

@ -10,16 +10,16 @@ AC_SUBST(KDE_HAVE_GL)
AC_ARG_WITH(
threshold,
[ --with-threshold@<:@=0..15@:>@ Smoke: TQt tests threshold Default:15 Lower=more tests],
[ qt_test_threshold="$withval" ],
[ qt_test_threshold=15 ]
[ tqt_test_threshold="$withval" ],
[ tqt_test_threshold=15 ]
)
AC_SUBST(qt_test_threshold)
AC_SUBST(tqt_test_threshold)
if test "X$kde_build_libsmoke" = "Xtqt" -o "X$kde_build_libsmoke" = "Xtqt tde"; then
AC_CONFIG_FILES([ smoke/tqt/qtguess.pl ], [
AC_CONFIG_FILES([ smoke/tqt/tqtguess.pl ], [
cd smoke/tqt
perl qtguess.pl
perl tqtguess.pl
cd ../..
])
AC_CONFIG_FILES([ smoke/tqt/generate.pl ], [
@ -32,11 +32,11 @@ dnl -------
AC_ARG_ENABLE(
qscintilla,
[ --enable-qscintilla@<:@=yes|no@:>@ Smoke: build Smoke with TQScintilla extention for qt @<:@default:no@:>@],
[ qtextscintilla="$enableval" ],
[ qtextscintilla="no" ]
[ --enable-qscintilla@<:@=yes|no@:>@ Smoke: build Smoke with TQScintilla extention for tqt @<:@default:no@:>@],
[ tqtextscintilla="$enableval" ],
[ tqtextscintilla="no" ]
)
AC_SUBST(qtextscintilla)
AC_SUBST(tqtextscintilla)
AC_DEFUN([AC_FIND_QSCINTILLA],
[
@ -77,6 +77,6 @@ fi
AC_SUBST(LIBTQSCINTILLA)
])
if test "X$qtextscintilla" = "Xyes" ; then
if test "X$tqtextscintilla" = "Xyes" ; then
AC_FIND_QSCINTILLA
fi

@ -13,14 +13,14 @@ use Cwd;
my $here = getcwd;
my $outdir = $here . "/generate.pl.tmpdir";
my $finaloutdir = $here;
my $defines = "qtdefines";
my $defines = "tqtdefines";
my $headerlist = "@srcdir@/header_list";
my $definespath = "$here/$defines";
my $headerlistpath = "$here/$headerlist";
my $qscintilla_headerlist = "";
my $qscintilla_headerlistpath = "";
if("@qtextscintilla@" eq "yes")
if("@tqtextscintilla@" eq "yes")
{
$qscintilla_headerlist = "./qscintilla_header_list";
$qscintilla_headerlistpath = "$here/$qscintilla_headerlist";
@ -28,7 +28,7 @@ if("@qtextscintilla@" eq "yes")
## If srcdir != builddir, use headerlist from src
$headerlistpath = $headerlist if ($headerlist =~ /^\//);
if("@qtextscintilla@" eq "yes")
if("@tqtextscintilla@" eq "yes")
{
$qscintilla_headerlistpath = $qscintilla_headerlist if ($qscintilla_headerlist =~ /^\//);
}
@ -39,7 +39,7 @@ if (-d $outdir) { system "rm -f $outdir/x_*.cpp"; } else { mkdir $outdir; }
mkdir $finaloutdir unless (-d $finaloutdir);
# Load the TQT_NO_* macros found in "qtdefines". They'll be passed to kalyptus
# Load the TQT_NO_* macros found in "tqtdefines". They'll be passed to kalyptus
my $macros="";
if ( -e $definespath ){
print "Found '$defines'. Reading preprocessor symbols from there...\n";
@ -54,9 +54,9 @@ chdir "$kalyptusdir" or die "Couldn't go to $kalyptusdir (edit script to change
# We don't want all of them - e.g. not template-based stuff
my %excludes = (
'ntqaccessible.h' => 1, # Accessibility support is not compiled by defaut
'ntqassistantclient.h' => 1, # Not part of Qt (introduced in Qt-3.1)
'ntqassistantclient.h' => 1, # Not part of TQt (introduced in TQt-3.1)
'ntqmotif.h' => 1, #
'ntqmotifwidget.h' => 1, # Motif extension (introduced in Qt-3.1)
'ntqmotifwidget.h' => 1, # Motif extension (introduced in TQt-3.1)
'ntqmotifdialog.h' => 1, #
'ntqxt.h' => 1, # Xt
'ntqxtwidget.h' => 1, # Xt
@ -64,11 +64,11 @@ my %excludes = (
'ntqgl.h' => 1, # OpenGL
'ntqglcolormap.h' => 1, # OpenGL
'ntqnp.h' => 1, # NSPlugin
'ntqttableview.h' => 1, # Not in Qt anymore...
'ntqtmultilineedit.h' => 1, # Not in Qt anymore...
'ntqttableview.h' => 1, # Not in TQt anymore...
'ntqtmultilineedit.h' => 1, # Not in TQt anymore...
'ntqwidgetfactory.h' => 1, # Just an interface
'ntqsharedmemory.h' => 1, # "not part of the Qt API" they say
'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin
'ntqsharedmemory.h' => 1, # "not part of the TQt API" they say
'ntqwindowsstyle.h' => 1, # TQt windowsstyle, plugin
'ntqmotifstyle.h' => 1,
'ntqcompactstyle.h' => 1,
'ntqinterlacestyle.h' => 1,
@ -88,7 +88,7 @@ open(HEADERS, $headerlistpath) or die "Couldn't open $headerlistpath: $!\n";
map { chomp ; $includes{$_} = 1 } <HEADERS>;
close HEADERS;
if("@qtextscintilla@" eq "yes")
if("@tqtextscintilla@" eq "yes")
{
open(HEADERS, $qscintilla_headerlistpath) or die "Couldn't open $qscintilla_headerlistpath: $!\n";
map { chomp ; $includes{$_} = 1 } <HEADERS>;
@ -112,13 +112,13 @@ if("@KDE_HAVE_GL@" eq "yes")
}
}
# List Qt headers, and exclude the ones listed above
# List TQt headers, and exclude the ones listed above
my @headers = ();
$qtinc= '@tqt_includes@';
opendir (QT, $qtinc) or die "Couldn't find $qtinc";
foreach $filename (readdir(QT)) {
$entry = $qtinc."/".$filename;
$tqtinc= '@tqt_includes@';
opendir (TQT, $tqtinc) or die "Couldn't find $tqtinc";
foreach $filename (readdir(TQT)) {
$entry = $tqtinc."/".$filename;
if ( ( -e $entry or -l $entry ) # A real file or a symlink
&& ( ! -d _ ) ) # Not a symlink to a dir though
{
@ -129,11 +129,11 @@ foreach $filename (readdir(QT)) {
undef $includes{$filename}
}
}
closedir QT;
closedir TQT;
# Launch kalyptus
chdir "../smoke/tqt";
system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers";
system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=tqt $macros --no-cache --outputdir=$outdir @headers";
my $exit = $? >> 8;
exit $exit if ($exit);
chdir "$kalyptusdir";

@ -1,5 +1,5 @@
# CVS admin : run this script to compare the set of Qt headers to
# CVS admin : run this script to compare the set of TQt headers to
# the actual content of header_list
$l = "header_list";

@ -1,9 +0,0 @@
#ifndef QT_SMOKE_H
#define QT_SMOKE_H
// Defined in smokedata.cpp, initialized by init_qt_Smoke(), used by all .cpp files
extern Smoke* qt_Smoke;
class TQGlobalSpace { };
#endif

@ -6,7 +6,7 @@ TEMPLATE = lib
INCLUDEPATH += . ..
# Input
HEADERS += qt_smoke.h
HEADERS += tqt_smoke.h
SOURCES += smokedata.cpp \
x_1.cpp \
x_10.cpp \

@ -0,0 +1,9 @@
#ifndef TQT_SMOKE_H
#define TQT_SMOKE_H
// Defined in smokedata.cpp, initialized by init_tqt_Smoke(), used by all .cpp files
extern Smoke* tqt_Smoke;
class TQGlobalSpace { };
#endif

@ -1,12 +1,12 @@
#!/usr/bin/perl
# qtguess.pl : check how Qt was compiled. Issue a list of all defined TQT_NO_* macros, one per line.
# tqtguess.pl : check how TQt was compiled. Issue a list of all defined TQT_NO_* macros, one per line.
#
# author: germain Garand <germain@ebooksfrance.com>
# licence: GPL v.2
# options: -q: be quieter
# -o file: redirect output to "file". (default: ./qtdefines)
# -o file: redirect output to "file". (default: ./tqtdefines)
# -t [0..15]: set the testing threshold (see below)
# -f "flags": additional compiler flags/parameters
@ -17,7 +17,7 @@ use vars qw/$opt_f $opt_o $opt_p/;
getopts('qo:f:t:');
# Threshold :
# 0 - test basic Qt types/classes
# 0 - test basic TQt types/classes
# 5 - test higher level, non-gui classes
# 8 - test options of the above (ex: TQT_NO_IMAGE_SMOOTHSCALE)
# 10 - test basic widgets
@ -25,20 +25,20 @@ getopts('qo:f:t:');
# 13 - test widgets inheriting composite widgets
# 15 - test goodies (default)
my $default_threshold = @qt_test_threshold@;
my $default_threshold = @tqt_test_threshold@;
my $cc = "@CXX@";
my $ccflags = $opt_f || "@CXXFLAGS@";
my $nspaces = 50;
my %qtdefs=();
my %qtundefs=();
my %tqtdefs=();
my %tqtundefs=();
my $tmp = gettmpfile();
my $qtinc = '@tqt_includes@';
my $tqtinc = '@tqt_includes@';
my $allinc = '@all_includes@';
my $alllib = '@all_libraries@';
my $qtflags ='@LIB_TQT@';
my $tqtflags ='@LIB_TQT@';
my %x;
$x{'LIBPNG'} = '@LIBPNG@';
$x{'LIBJPEG'} = '@LIBJPEG@';
@ -50,31 +50,31 @@ $x{'LIB_X11'} = '@LIB_X11@';
$x{'X_PRE_LIBS'} = '@X_PRE_LIBS@';
$x{'LIB_X11'} =~ s/\$\((.*?)\)/$x{$1}/g;
$qtflags =~ s/\$\((.*?)\)/$x{$1}/g;
$tqtflags =~ s/\$\((.*?)\)/$x{$1}/g;
-e "$qtinc/qglobal.h" or die "Invalid Qt directory.\n";
-e "$tqtinc/qglobal.h" or die "Invalid TQt directory.\n";
my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags";
my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $tqtflags";
my $threshold = defined($opt_t)?$opt_t : $default_threshold;
$threshold >= 0 or die "invalid testing threshold: $threshold\n";
print "Checking how Qt was built... \n";
print "Checking how TQt was built... \n";
print "Threshold is set to $threshold\n" unless $opt_q;
my($count, $used, $total);
map{ $tests{$_}->[2]>=$threshold ? ($used++, $total++):$total++ } keys %tests;
print "Number of defines to be tested : $used/$total\n\n" unless $opt_q;
open( TQTDEFS, ">".($opt_o || "qtdefines") ) or die "Can't open output file: $!\n";
open( TQTDEFS, ">".($opt_o || "tqtdefines") ) or die "Can't open output file: $!\n";
grab_qglobal_symbols();
preliminary_test();
perform_all_tests();
print +scalar(keys %qtdefs) . " defines found.\n";
print +scalar(keys %tqtdefs) . " defines found.\n";
print TQTDEFS join("\n", keys %qtdefs), "\n";
print TQTDEFS join("\n", keys %tqtdefs), "\n";
close;
#--------------------------------------------------------------#
@ -82,7 +82,7 @@ close;
sub gettmpfile
{
my $tmpdir = $ENV{'TMP'} || ".";
my $tmpname = $$."-qtguess";
my $tmpname = $$."-tqtguess";
while( -e "$tmpdir/$tmpname" || -e "$tmpdir/${tmpname}.cpp" )
{
$tmpname .= int (rand * 9);
@ -94,28 +94,28 @@ sub gettmpfile
sub grab_qglobal_symbols
{
my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null";
my $cmd = "$cc -E -D__cplusplus -dM -I$tqtinc $tqtinc/qglobal.h 2>/dev/null";
my $symbols = `$cmd`;
for(0..1)
{
if( check_exit_status($?) )
{
while( $symbols =~/^#\s*define\s*(QT_\S+)\s*$/gm )
while( $symbols =~/^#\s*define\s*(TQT_\S+)\s*$/gm )
{
$qtdefs{$1} = 1;
$tqtdefs{$1} = 1;
}
print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs));
print "Found ". scalar( keys %tqtdefs )." predefined symbol".((scalar( keys %tqtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %tqtdefs));
while( $symbols =~/^#\s*define\s*TQT_MODULE_(\S+)\s*$/gm )
{
$qtundefs{"TQT_NO_$1"} = 1;
$tqtundefs{"TQT_NO_$1"} = 1;
}
print "Found ". scalar( keys %qtundefs )." undefined symbol".((scalar( keys %qtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtundefs));
print "Found ". scalar( keys %tqtundefs )." undefined symbol".((scalar( keys %tqtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %tqtundefs));
last;
}
elsif(! $_) # first try
{
print "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n";
$cmd = "$cc -E -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null";
$cmd = "$cc -E -dM -I$tqtinc $tqtinc/qglobal.h 2>/dev/null";
$symbols = `$cmd`;
next;
}
@ -166,14 +166,14 @@ sub perform_all_tests
foreach ( sort { $tests{$a}->[2] <=> $tests{$b}->[2]} keys %tests)
{
$tests{$_}->[2] < $threshold and next;
($qtdefs{$_} || $qtundefs{$_}) and do
($tqtdefs{$_} || $tqtundefs{$_}) and do
{
print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($qtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n");
print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($tqtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n");
next
};
print "\rTesting $_".( " " x ($nspaces - length($_)) );
open( OUT, ">${tmp}.cpp" ) or die "Failed to open temp file ${tmp}.cpp: $!\n";
foreach $def(keys %qtdefs)
foreach $def(keys %tqtdefs)
{
print OUT "#define $def\n";
}
@ -198,7 +198,7 @@ sub perform_all_tests
my $ok = check_exit_status($?);
if( !$ok )
{
$qtdefs{$_} = 1;
$tqtdefs{$_} = 1;
}
print +$opt_q ? ++$count."/$used" : ( $ok ? "*Undefined*\n" : " [Defined]\n" );
}
@ -398,9 +398,9 @@ our %tests = (
"TQT_NO_PROGRESSDIALOG" => ["qprogressdialog.h", "TQProgressDialog foo;", 13],
"TQT_NO_PUSHBUTTON" => ["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12],
"TQT_NO_PROPERTIES" => ["qmetaobject.h", "TQMetaProperty foo;", 0],
# "TQT_NO_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15],
# "TQT_NO_QTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£
# class TQFoo: public QtTableView
# "TQT_NO_TQTMULTILINEEDIT" => ["tqtmultilineedit.h", "TQtMultiLineEdit foo;", 15],
# "TQT_NO_TQTTABLEVIEW" => ["tqttableview.h", "TQFoo foo;", 16, q£
# class TQFoo: public TQtTableView
# {
# public:
# TQFoo() {};
@ -458,13 +458,13 @@ our %tests = (
# "TQT_NO_STYLE_MOTIFPLUS" => ["qmotifplusstyle.h", "TQMotifPlusStyle foo;", 16],
# "TQT_NO_STYLE_SGI" => ["qsgistyle.h", "TQSGIStyle foo;", 16],
# "TQT_NO_STYLE_WINDOWS" => ["qwindowsstyle.h", "TQWindowsStyle foo;", 16],
"TQT_NO_TABBAR" => ["qtabbar.h", "TQTabBar foo;", 10],
"TQT_NO_TABDIALOG" => ["qtabdialog.h", "TQTabDialog foo;", 12],
"TQT_NO_TABLE" => ["qtable.h", "TQTable foo;", 10],
"TQT_NO_TABWIDGET" => ["qtabwidget.h", "TQTabWidget foo;", 10],
"TQT_NO_TEXTBROWSER" => ["qtextbrowser.h", "TQTextBrowser foo;", 14],
"TQT_NO_TEXTCODEC" => ["qtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
"TQT_NO_TEXTCODECPLUGIN" => ["qtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "TQFoo foo;", 6, q£
"TQT_NO_TABBAR" => ["tqtabbar.h", "TQTabBar foo;", 10],
"TQT_NO_TABDIALOG" => ["tqtabdialog.h", "TQTabDialog foo;", 12],
"TQT_NO_TABLE" => ["tqtable.h", "TQTable foo;", 10],
"TQT_NO_TABWIDGET" => ["tqtabwidget.h", "TQTabWidget foo;", 10],
"TQT_NO_TEXTBROWSER" => ["tqtextbrowser.h", "TQTextBrowser foo;", 14],
"TQT_NO_TEXTCODEC" => ["tqtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
"TQT_NO_TEXTCODECPLUGIN" => ["tqtextcodecplugin.h, qstringlist.h, qvaluelist.h, tqtextcodec.h", "TQFoo foo;", 6, q£
class TQFoo: public TQTextCodecPlugin
{
@ -478,12 +478,12 @@ our %tests = (
};
Q_EXPORT_PLUGIN( TQFoo )
£],
"TQT_NO_TEXTEDIT" => ["qtextedit.h", "TQTextEdit foo;", 13],
"TQT_NO_TEXTSTREAM" => ["qtextstream.h", "TQTextStream foo;", 5],
"TQT_NO_TEXTVIEW" => ["qtextview.h", "TQTextView foo;", 14], #Obsolete
"TQT_NO_TOOLBAR" => ["qtoolbar.h", "TQToolBar foo;", 10],
"TQT_NO_TOOLBUTTON" => ["qtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
"TQT_NO_TOOLTIP" => ["qtooltip.h", "TQToolTip::hide();", 10],
"TQT_NO_TEXTEDIT" => ["tqtextedit.h", "TQTextEdit foo;", 13],
"TQT_NO_TEXTSTREAM" => ["tqtextstream.h", "TQTextStream foo;", 5],
"TQT_NO_TEXTVIEW" => ["tqtextview.h", "TQTextView foo;", 14], #Obsolete
"TQT_NO_TOOLBAR" => ["tqtoolbar.h", "TQToolBar foo;", 10],
"TQT_NO_TOOLBUTTON" => ["tqtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
"TQT_NO_TOOLTIP" => ["tqtooltip.h", "TQToolTip::hide();", 10],
"TQT_NO_TRANSFORMATIONS" => ["qpainter.h", q£
TQPainter *foo= new TQPainter();
Loading…
Cancel
Save