Browse Source

Conversion qt -> tqt

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 1 year ago
parent
commit
7ed4760de4
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
8 changed files with 480 additions and 868 deletions
  1. 15
    15
      Doxyfile.global
  2. 415
    803
      acinclude.m4.in
  3. 4
    4
      am_edit
  4. 4
    4
      configure.in.bot.end
  5. 1
    1
      configure.in.min
  6. 4
    4
      cvs.sh
  7. 3
    3
      debianrules
  8. 34
    34
      doxygen.sh

+ 15
- 15
Doxyfile.global View File

@@ -134,18 +134,18 @@ SHORT_NAMES = NO
# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
# will interpret the first line (until the first dot) of a JavaDoc-style
# comment as the brief description. If set to NO, the JavaDoc
# comments will behave just like regular Qt-style comments
# comments will behave just like regular TQt-style comments
# (thus requiring an explicit @brief command for a brief description.)

JAVADOC_AUTOBRIEF = YES

# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
# interpret the first line (until the first dot) of a Qt-style
# If the TQT_AUTOBRIEF tag is set to YES then Doxygen will
# interpret the first line (until the first dot) of a TQt-style
# comment as the brief description. If set to NO, the comments
# will behave just like regular Qt-style comments (thus requiring
# will behave just like regular TQt-style comments (thus requiring
# an explicit \brief command for a brief description.)

QT_AUTOBRIEF = NO
TQT_AUTOBRIEF = NO

# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
# treat a multi-line C++ special comment block (i.e. a block of //! or ///
@@ -905,7 +905,7 @@ TOC_EXPAND = NO

# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
# are set, an additional index file will be generated that can be used as input for
# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
# TQt's qhelpgenerator to generate a TQt Compressed Help (.qch) of the generated
# HTML documentation.

GENERATE_QHP = NO
@@ -917,36 +917,36 @@ GENERATE_QHP = NO
QCH_FILE =

# The QHP_NAMESPACE tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
# http://doc.trolltech.com/qthelpproject.html#namespace
# TQt Help Project output. For more information please see
# http://doc.qt.io/qt-5/tqthelpproject.html#namespace

QHP_NAMESPACE =

# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
# http://doc.trolltech.com/qthelpproject.html#virtual-folders
# TQt Help Project output. For more information please see
# http://doc.qt.io/qt-5/tqthelpproject.html#virtual-folders

QHP_VIRTUAL_FOLDER = doc

# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
# For more information please see
# http://doc.trolltech.com/qthelpproject.html#custom-filters
# http://doc.qt.io/qt-5/tqthelpproject.html#custom-filters

QHP_CUST_FILTER_NAME =

# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
# <a href="http://doc.qt.io/qt-5/tqthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.

QHP_CUST_FILTER_ATTRS =

# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
# filter section matches.
# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
# <a href="http://doc.qt.io/qt-5/tqthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.

QHP_SECT_FILTER_ATTRS =

# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
# be used to specify the location of Qt's qhelpgenerator.
# be used to specify the location of TQt's qhelpgenerator.
# If non-empty doxygen will try to run qhelpgenerator on the generated
# .qhp file.

@@ -993,7 +993,7 @@ TREEVIEW_WIDTH = 250
FORMULA_FONTSIZE = 10

# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or TQt help (GENERATE_QHP)
# there is already a search function so this one should typically
# be disabled.


+ 415
- 803
acinclude.m4.in
File diff suppressed because it is too large
View File


+ 4
- 4
am_edit View File

@@ -566,7 +566,7 @@ sub initialise ()

%kdeopts = ();
$kdeopts{"foreign"} = 0;
$kdeopts{"qtonly"} = 0;
$kdeopts{"tqtonly"} = 0;
$kdeopts{"noautodist"} = 0;
$kdeopts{"foreign-libtool"} = $foreign_libtool;
$kdeopts{"nofinal"} = !$use_final; # default
@@ -1361,7 +1361,7 @@ sub tag_UIFILES ()

my $dep_lines = "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n";
$dep_lines .= "\trm -f $source.$cxxsuffix\n";
if (!$kdeopts{"qtonly"}) {
if (!$kdeopts{"tqtonly"}) {
$dep_lines .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n";
$dep_lines .= "\techo '#include <tdelocale.h>' >> $source.$cxxsuffix\n";
my ($mangled_source) = $source;
@@ -1375,7 +1375,7 @@ sub tag_UIFILES ()
$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
$dep_lines .= "$source.h: $sourcedir$source.ui\n";
$dep_lines .= "\trm -rf $source.h;\n";
if (!$kdeopts{"qtonly"}) {
if (!$kdeopts{"tqtonly"}) {
$dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public TQWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
} else {
$dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
@@ -2301,7 +2301,7 @@ sub make_bcheck_target()

sub make_meta_classes ()
{
return if ($kdeopts{"qtonly"});
return if ($kdeopts{"tqtonly"});

my $cppFile;
my $hFile;

+ 4
- 4
configure.in.bot.end View File

@@ -16,17 +16,17 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
fi
fi

if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_tqt_gcc_visibility_patched = "xno"; then
echo ""
echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
echo "Your GCC supports symbol visibility, but the patch for TQt supporting visibility"
echo "was not included. Therefore, GCC symbol visibility support remains disabled."
echo ""
echo "For better performance, consider including the Qt visibility supporting patch"
echo "For better performance, consider including the TQt visibility supporting patch"
echo "located at:"
echo ""
echo "http://bugs.kde.org/show_bug.cgi?id=109386"
echo ""
echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
echo "and recompile all of TQt and KDE. Note, this is entirely optional and"
echo "everything will continue to work just fine without it."
echo ""
fi

+ 1
- 1
configure.in.min View File

@@ -55,5 +55,5 @@ dnl for NLS support. Call them in this order!
dnl WITH_NLS is for the po files
AM_KDE_WITH_NLS

dnl KDE_USE_QT
dnl KDE_USE_TQT
AC_PATH_KDE

+ 4
- 4
cvs.sh View File

@@ -225,7 +225,7 @@ touch stamp-h.in
configure_in()
{
rm -f configure.in configure.in.new
kde_use_qt_param=
kde_use_tqt_param=
test -f configure.files || { echo "need configure.files for configure.in"; exit 1; }
list=`fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"`
: > configure.in.new
@@ -291,7 +291,7 @@ echo "AC_OUTPUT" >> configure.in.new
modulename=
if test -f configure.in.in; then
if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
kde_use_tqt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
fi
if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
@@ -313,8 +313,8 @@ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"`

fi
if test -n "$kde_use_qt_param"; then
sed -e "s#^dnl KDE_USE_QT#KDE_USE_QT($kde_use_qt_param)#" \
if test -n "$kde_use_tqt_param"; then
sed -e "s#^dnl KDE_USE_TQT#KDE_USE_TQT($kde_use_tqt_param)#" \
configure.in.new > configure.in && mv configure.in configure.in.new
fi
sed -e "s#@MODULENAME@#$modulename#" configure.in.new |

+ 3
- 3
debianrules View File

@@ -12,7 +12,7 @@ $sysconfdir = "/etc";
$kde_includedir = "$kde_prefix/include/tde";
$infodir = "$kde_prefix/share/info";
$mandir = "$kde_prefix/share/man";
$qtdir = "/usr/share/tqt3";
$tqtdir = "/usr/share/tqt3";

$kde_cgidir = "$kde_prefix/lib/cgi-bin";
$kde_confdir = "$sysconfdir/trinity";
@@ -31,13 +31,13 @@ if (@ARGV && $ARGV[0] eq 'echodirs') {
print STDOUT "export kde_includedir=$kde_includedir\n";
print STDOUT "export infodir=$infodir\n";
print STDOUT "export mandir=$mandir\n";
print STDOUT "export qtdir=$qtdir\n";
print STDOUT "export tqtdir=$tqtdir\n";

print STDOUT "export kde_cgidir=$kde_cgidir\n";
print STDOUT "export kde_confdir=$kde_confdir\n";
print STDOUT "export kde_htmldir=$kde_htmldir\n";

print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-qt-dir=\$(qtdir)\n";
print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-tqt-dir=\$(tqtdir)\n";

exit
}

+ 34
- 34
doxygen.sh View File

@@ -82,33 +82,33 @@ fi



### Sanity check and guess QTDOCDIR.
if test -z "$QTDOCDIR" ; then
if test -z "$QTDIR" ; then
for i in /usr/X11R6/share/doc/qt/html
### Sanity check and guess TQTDOCDIR.
if test -z "$TQTDOCDIR" ; then
if test -z "$TQTDIR" ; then
for i in /usr/X11R6/share/doc/tqt/html
do
QTDOCDIR="$i"
test -d "$QTDOCDIR" && break
TQTDOCDIR="$i"
test -d "$TQTDOCDIR" && break
done
else
for i in share/doc/qt/html doc/html
for i in share/doc/tqt/html doc/html
do
QTDOCDIR="$QTDIR/$i"
test -d "$QTDOCDIR" && break
TQTDOCDIR="$TQTDIR/$i"
test -d "$TQTDOCDIR" && break
done
fi
fi
if test -z "$QTDOCDIR" || test ! -d "$QTDOCDIR" ; then
if test -z "$QTDOCDIR" ; then
echo "* QTDOCDIR could not be guessed."
if test -z "$TQTDOCDIR" || test ! -d "$TQTDOCDIR" ; then
if test -z "$TQTDOCDIR" ; then
echo "* TQTDOCDIR could not be guessed."
else
echo "* QTDOCDIR does not name a directory."
echo "* TQTDOCDIR does not name a directory."
fi
if test -z "$QTDOCTAG" ; then
echo "* QTDOCDIR set to \"\""
QTDOCDIR=""
if test -z "$TQTDOCTAG" ; then
echo "* TQTDOCDIR set to \"\""
TQTDOCDIR=""
else
echo "* But I'll use $QTDOCDIR anyway because of QTDOCTAG."
echo "* But I'll use $TQTDOCDIR anyway because of TQTDOCTAG."
fi
fi

@@ -562,7 +562,7 @@ apidox_subdir()
echo "TAGFILES = \\" >> "$subdir/Doxyfile"
## For now, don't support \ continued references lines
tags=`extract_line DOXYGEN_REFERENCES`
for i in $tags qt ; do
for i in $tags tqt ; do
tagsubdir=`dirname $i` ; tag=`basename $i`
tagpath=""
not_found=""
@@ -609,15 +609,15 @@ apidox_subdir()
fi
fi
fi
if test "$tag" = "qt" ; then
if test -z "$QTDOCDIR" ; then
if test "$tag" = "tqt" ; then
if test -z "$TQTDOCDIR" ; then
echo " $file" >> "$subdir/Doxyfile"
else
if test -z "$file" ; then
# Really no Qt tags
# Really no TQt tags
echo "" >> "$subdir/Doxyfile"
else
echo " $file=$QTDOCDIR" >> "$subdir/Doxyfile"
echo " $file=$TQTDOCDIR" >> "$subdir/Doxyfile"
fi
fi
else
@@ -845,18 +845,18 @@ if test "x." = "x$top_builddir" ; then
create_installdox > installdox-slow
if test "x$recurse" = "x1" ; then
if test "x$module_name" = "xtdelibs" ; then
if test -z "$QTDOCTAG" && test -d "$QTDOCDIR" && \
test ! -f "qt/qt.tag" ; then
# Special case: create a qt tag file.
echo "*** Creating a tag file for the Qt library:"
mkdir qt
doxytag -t qt/qt.tag "$QTDOCDIR" > /dev/null 2>&1
if test -z "$TQTDOCTAG" && test -d "$TQTDOCDIR" && \
test ! -f "tqt/tqt.tag" ; then
# Special case: create a tqt tag file.
echo "*** Creating a tag file for the TQt library:"
mkdir tqt
doxytag -t tqt/tqt.tag "$TQTDOCDIR" > /dev/null 2>&1
fi
fi
if test -n "$QTDOCTAG" && test -r "$QTDOCTAG" ; then
echo "*** Copying tag file for the Qt library:"
mkdir qt
cp "$QTDOCTAG" qt/qt.tag
if test -n "$TQTDOCTAG" && test -r "$TQTDOCTAG" ; then
echo "*** Copying tag file for the TQt library:"
mkdir tqt
cp "$TQTDOCTAG" tqt/tqt.tag
fi

do_subdirs_re "."
@@ -875,8 +875,8 @@ fi
if test "YES" = "$cleanup" ; then
rm -f subdirs.in subdirs.later subdirs.sort subdirs.top Doxyfile.in
rm -f `find . -name Doxyfile`
rm -f qt/qt.tag
rmdir qt > /dev/null 2>&1
rm -f tqt/tqt.tag
rmdir tqt > /dev/null 2>&1
fi



Loading…
Cancel
Save