From 45505b78efcaf13c9741899b47a471270aeabd97 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 18 Oct 2018 22:58:56 +0900 Subject: [PATCH] smoke's qt -> tqt renaming. This relates to bug 266. Signed-off-by: Michele Calgaro --- ChangeLog.CVS | 24 ++++++++++----------- ChangeLog.CVS.delta | 6 +++--- Makefile.am | 2 +- Makefile.in | 2 +- PerlTQt/INSTALL | 2 +- configure.in | 2 +- kalyptus/kalyptusCxxToSmoke.pm | 2 +- smoke/tqt/Makefile.am | 2 +- smoke/tqt/Makefile.in | 8 +++---- smoke/tqt/{qt_smoke.h => tqt_smoke.h} | 0 smoke/tqt/{qtguess.pl.in => tqtguess.pl.in} | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) rename smoke/tqt/{qt_smoke.h => tqt_smoke.h} (100%) rename smoke/tqt/{qtguess.pl.in => tqtguess.pl.in} (99%) diff --git a/ChangeLog.CVS b/ChangeLog.CVS index 14d18d0..5a89c3b 100644 --- a/ChangeLog.CVS +++ b/ChangeLog.CVS @@ -234,7 +234,7 @@ 2003-08-28 02:10 germaingarand - * smoke/qt/generate.pl.in, smoke/qt/qt_smoke.h, kalyptus/kalyptus, + * smoke/qt/generate.pl.in, smoke/qt/tqt_smoke.h, kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm, kalyptus/kalyptusDataDict.pm, kalyptus/kdocAstUtil.pm: @@ -284,7 +284,7 @@ 2003-08-14 18:44 germaingarand * PerlTQt/Makefile.PL.in, admin/acinclude.m4.in, - smoke/qt/qtguess.pl.in: + smoke/qt/tqtguess.pl.in: - nice patch by Marek Rouchal. Improves Solaris compatibility and static builds. Many thanks to him! @@ -689,7 +689,7 @@ 2003-02-19 13:44 germaingarand * smoke/qt/Makefile.am, smoke/qt/generate.pl.in, - smoke/qt/qtguess.pl.in, kalyptus/kalyptus, + smoke/qt/tqtguess.pl.in, kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm: getting rid of GNU toolchain dependancy at last :) @@ -985,7 +985,7 @@ 2002-12-16 16:57 germaingarand * configure.in, doc/en/PerlTQt.pod, doc/en/index.html, - smoke/qt/qtguess.pl.in: + smoke/qt/tqtguess.pl.in: typo: treshold <-> threshold (configure option) @@ -1050,10 +1050,10 @@ 2002-12-09 18:09 germaingarand - * Makefile.am, smoke/qt/qtguess.pl.in: + * Makefile.am, smoke/qt/tqtguess.pl.in: - add Makefile.cvs to make dist - - correct qtguess.pl : retry grabbing symbols without __cplusplus if it fails (e.g. for Sun Forte) + - correct tqtguess.pl : retry grabbing symbols without __cplusplus if it fails (e.g. for Sun Forte) 2002-12-09 17:32 germaingarand @@ -1147,7 +1147,7 @@ 2002-12-03 15:20 germaingarand - * smoke/qt/qtguess.pl.in: + * smoke/qt/tqtguess.pl.in: fixed a quotation error -$qtflags =~ s/\$\((.*?)\)/$x{'$1'}/g; @@ -1395,7 +1395,7 @@ 2002-09-13 12:29 germaingarand * kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm, - smoke/qt/qtguess.pl.in: + smoke/qt/tqtguess.pl.in: TQt 3.1 fixes @@ -1584,8 +1584,8 @@ admin/libtool.m4.in, admin/ylwrap, admin/ChangeLog, admin/old-ltcf-c.sh, smoke/Makefile.am, smoke/README, smoke/smoke.h, smoke/qt/Makefile.am, smoke/qt/generate.pl.in, - smoke/qt/generate_makefile_am.pl, smoke/qt/qt_smoke.h, - smoke/qt/qtguess.pl.in, PerlTQt/MANIFEST, PerlTQt/Makefile.PL.in, + smoke/qt/generate_makefile_am.pl, smoke/qt/tqt_smoke.h, + smoke/qt/tqtguess.pl.in, PerlTQt/MANIFEST, PerlTQt/Makefile.PL.in, PerlTQt/examples/richedit/imageCollection.pm, PerlTQt/examples/richedit/richedit.pl, kalyptus/Ast.pm, kalyptus/README, kalyptus/TODO, kalyptus/Version, kalyptus/Iter.pm, @@ -1617,8 +1617,8 @@ admin/libtool.m4.in, admin/ylwrap, admin/ChangeLog, admin/old-ltcf-c.sh, smoke/Makefile.am, smoke/README, smoke/smoke.h, smoke/qt/Makefile.am, smoke/qt/generate.pl.in, - smoke/qt/generate_makefile_am.pl, smoke/qt/qt_smoke.h, - smoke/qt/qtguess.pl.in, PerlTQt/MANIFEST, PerlTQt/Makefile.PL.in, + smoke/qt/generate_makefile_am.pl, smoke/qt/tqt_smoke.h, + smoke/qt/tqtguess.pl.in, PerlTQt/MANIFEST, PerlTQt/Makefile.PL.in, PerlTQt/examples/richedit/imageCollection.pm, PerlTQt/examples/richedit/richedit.pl, kalyptus/Ast.pm, kalyptus/README, kalyptus/TODO, kalyptus/Version, kalyptus/Iter.pm, diff --git a/ChangeLog.CVS.delta b/ChangeLog.CVS.delta index 655108b..fb19954 100644 --- a/ChangeLog.CVS.delta +++ b/ChangeLog.CVS.delta @@ -234,7 +234,7 @@ 2003-08-28 02:10 germaingarand - * smoke/qt/generate.pl.in, smoke/qt/qt_smoke.h, kalyptus/kalyptus, + * smoke/qt/generate.pl.in, smoke/qt/tqt_smoke.h, kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm, kalyptus/kalyptusDataDict.pm, kalyptus/kdocAstUtil.pm: @@ -284,7 +284,7 @@ 2003-08-14 18:44 germaingarand * PerlTQt/Makefile.PL.in, admin/acinclude.m4.in, - smoke/qt/qtguess.pl.in: + smoke/qt/tqtguess.pl.in: - nice patch by Marek Rouchal. Improves Solaris compatibility and static builds. Many thanks to him! @@ -689,7 +689,7 @@ 2003-02-19 13:44 germaingarand * smoke/qt/Makefile.am, smoke/qt/generate.pl.in, - smoke/qt/qtguess.pl.in, kalyptus/kalyptus, + smoke/qt/tqtguess.pl.in, kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm: getting rid of GNU toolchain dependancy at last :) diff --git a/Makefile.am b/Makefile.am index 3c36633..dcd194e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = $(TOPSUBDIRS) -EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/tqt/qtguess.pl.in smoke/tqt/generate.pl.in smoke/tqt/qt_smoke.h smoke/tqt/generate_makefile_am.pl smoke/tqt/Makefile.am smoke/tqt/Makefile.in smoke/tqt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/ptqtsh.png +EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/tqt/tqtguess.pl.in smoke/tqt/generate.pl.in smoke/tqt/tqt_smoke.h smoke/tqt/generate_makefile_am.pl smoke/tqt/Makefile.am smoke/tqt/Makefile.in smoke/tqt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/ptqtsh.png # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs diff --git a/Makefile.in b/Makefile.in index 8c41bcf..f5fe3ab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -196,7 +196,7 @@ x_libraries = @x_libraries@ SUBDIRS = $(TOPSUBDIRS) -EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/tqt/qtguess.pl.in smoke/tqt/generate.pl.in smoke/tqt/qt_smoke.h smoke/tqt/generate_makefile_am.pl smoke/tqt/Makefile.am smoke/tqt/Makefile.in smoke/tqt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/ptqtsh.png +EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/tqt/tqtguess.pl.in smoke/tqt/generate.pl.in smoke/tqt/tqt_smoke.h smoke/tqt/generate_makefile_am.pl smoke/tqt/Makefile.am smoke/tqt/Makefile.in smoke/tqt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/ptqtsh.png # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs diff --git a/PerlTQt/INSTALL b/PerlTQt/INSTALL index 056a10a..ab2c525 100644 --- a/PerlTQt/INSTALL +++ b/PerlTQt/INSTALL @@ -38,7 +38,7 @@ TQt-3.0.1, so I have to re-generate the files to match my installed version of TQt. Here's how to do it. $ cd smoke/tqt # tdebindings/smoke/tqt/ -$ perl ./qtguess.pl # simple script to find disabled TQt features +$ perl ./tqtguess.pl # simple script to find disabled TQt features $ perl ./generate.pl # calls kalyptus which generates code Now you have the SmokeTQt source-code generated for your personal TQt diff --git a/configure.in b/configure.in index 0aa33d3..a93f3a4 100644 --- a/configure.in +++ b/configure.in @@ -505,7 +505,7 @@ AC_SUBST(qt_test_threshold) if test "$HAVE_SMOKE" = "no" || test "$kde_force_smoke" != "no"; then - AC_CONFIG_FILES(smoke/tqt/qtguess.pl, [cd smoke/tqt && perl qtguess.pl && cd ../..] ) + AC_CONFIG_FILES(smoke/tqt/tqtguess.pl, [cd smoke/tqt && perl tqtguess.pl && cd ../..] ) AC_CONFIG_FILES(smoke/tqt/generate.pl, [cd smoke/tqt && perl generate.pl && cd ../..]) AC_CONFIG_FILES([smoke/Makefile]) AC_CONFIG_FILES([smoke/tqt/Makefile]) diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index fa3722d..c3f2ac5 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -2092,7 +2092,7 @@ sub writeSmokeDataFile($) { print OUT "\n"; print OUT "#include \n\n"; - print OUT "#include \n\n"; + print OUT "#include \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"; diff --git a/smoke/tqt/Makefile.am b/smoke/tqt/Makefile.am index 7454a91..df5d151 100644 --- a/smoke/tqt/Makefile.am +++ b/smoke/tqt/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libsmoketqt.la # set the include path for X, qt and KDE INCLUDES = -I$(srcdir)/.. $(all_includes) -EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in +EXTRA_DIST=generate.pl.in tqtguess.pl.in tqt_smoke.h Makefile.am Makefile.in # the library search path. libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH) diff --git a/smoke/tqt/Makefile.in b/smoke/tqt/Makefile.in index 7e318af..9250157 100644 --- a/smoke/tqt/Makefile.in +++ b/smoke/tqt/Makefile.in @@ -198,7 +198,7 @@ lib_LTLIBRARIES = libsmoketqt.la # set the include path for X, qt and KDE INCLUDES = -I$(srcdir)/.. $(all_includes) -EXTRA_DIST = generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in +EXTRA_DIST = generate.pl.in tqtguess.pl.in tqt_smoke.h Makefile.am Makefile.in # the library search path. #>- libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH) @@ -216,7 +216,7 @@ libsmoketqt_la_SOURCES = smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x subdir = smoke/tqt mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = qtguess.pl generate.pl +CONFIG_CLEAN_FILES = tqtguess.pl generate.pl LTLIBRARIES = $(lib_LTLIBRARIES) libsmoketqt_la_DEPENDENCIES = @@ -289,7 +289,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libsmoketqt_la_SOURCES) -DIST_COMMON = Makefile.am Makefile.in generate.pl.in qtguess.pl.in +DIST_COMMON = Makefile.am Makefile.in generate.pl.in tqtguess.pl.in SOURCES = $(libsmoketqt_la_SOURCES) #>- all: all-am @@ -307,7 +307,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/tqt/Makefile.in Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -qtguess.pl: $(top_builddir)/config.status qtguess.pl.in +tqtguess.pl: $(top_builddir)/config.status tqtguess.pl.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ generate.pl: $(top_builddir)/config.status generate.pl.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ diff --git a/smoke/tqt/qt_smoke.h b/smoke/tqt/tqt_smoke.h similarity index 100% rename from smoke/tqt/qt_smoke.h rename to smoke/tqt/tqt_smoke.h diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/tqtguess.pl.in similarity index 99% rename from smoke/tqt/qtguess.pl.in rename to smoke/tqt/tqtguess.pl.in index 1ebe87b..c4758c1 100644 --- a/smoke/tqt/qtguess.pl.in +++ b/smoke/tqt/tqtguess.pl.in @@ -1,6 +1,6 @@ #!/usr/bin/perl -# qtguess.pl : check how TQt 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 # licence: GPL v.2