qt -> tqt conversion:

qtlib -> tqtlib
libqt -> libtqt
QTLIB -> TQTLIB
LIBQT -> LIBTQT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 2035c06285
commit 5e34b23f30
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -1253,9 +1253,9 @@ ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$tqt_includes" CXXFLAGS="$CXXFLAGS -I$tqt_includes"
LDFLAGS="$LDFLAGS $X_LDFLAGS" LDFLAGS="$LDFLAGS $X_LDFLAGS"
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET"
else else
LIBS="$LIBQT $LIBSOCKET" LIBS="$LIBTQT $LIBSOCKET"
fi fi
LD_LIBRARY_PATH= LD_LIBRARY_PATH=
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
@ -1295,7 +1295,7 @@ fi
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl Try to find the Qt headers and libraries. dnl Try to find the Qt headers and libraries.
dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed)
dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl dnl
@ -1348,11 +1348,11 @@ kde_qt_was_given=yes
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl If we haven't been told how to link to Qt, we work it out for ourselves. dnl If we haven't been told how to link to Qt, we work it out for ourselves.
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
if test -z "$LIBQT_GLOB"; then if test -z "$LIBTQT_GLOB"; then
if test "x$kde_use_qt_emb" = "xyes"; then if test "x$kde_use_qt_emb" = "xyes"; then
LIBQT_GLOB="libqte.*" LIBTQT_GLOB="libtqte.*"
else else
LIBQT_GLOB="libqt.*" LIBTQT_GLOB="libtqt.*"
fi fi
fi fi
@ -1360,12 +1360,12 @@ dnl ------------------------------------------------------------
dnl If we got --enable-embedded then adjust the Qt library name. dnl If we got --enable-embedded then adjust the Qt library name.
dnl ------------------------------------------------------------ dnl ------------------------------------------------------------
if test "x$kde_use_qt_emb" = "xyes"; then if test "x$kde_use_qt_emb" = "xyes"; then
qtlib="qte" tqtlib="qte"
else else
qtlib="qt" tqtlib="qt"
fi fi
kde_int_qt="-l$qtlib" kde_int_qt="-l$tqtlib"
if test -z "$LIBQPE"; then if test -z "$LIBQPE"; then
dnl ------------------------------------------------------------ dnl ------------------------------------------------------------
@ -1387,30 +1387,30 @@ dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then if test "x$kde_use_qt_mt" = "xyes"; then
LIBQT="-l$qtlib-mt" LIBTQT="-l$tqtlib-mt"
kde_int_qt="-l$qtlib-mt" kde_int_qt="-l$tqtlib-mt"
LIBQT_GLOB="lib$qtlib-mt.*" LIBTQT_GLOB="lib$tqtlib-mt.*"
USING_QT_MT="using -mt" USING_QT_MT="using -mt"
else else
LIBQT="-l$qtlib" LIBTQT="-l$tqtlib"
fi fi
if test $kde_qtver != 1; then if test $kde_qtver != 1; then
AC_REQUIRE([AC_FIND_PNG]) AC_REQUIRE([AC_FIND_PNG])
AC_REQUIRE([AC_FIND_JPEG]) AC_REQUIRE([AC_FIND_JPEG])
LIBQT="$LIBQT $LIBPNG $LIBJPEG" LIBTQT="$LIBTQT $LIBPNG $LIBJPEG"
fi fi
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_REQUIRE([KDE_CHECK_LIBDL]) AC_REQUIRE([KDE_CHECK_LIBDL])
LIBQT="$LIBQT $LIBDL" LIBTQT="$LIBTQT $LIBDL"
fi fi
AC_MSG_CHECKING([for Qt]) AC_MSG_CHECKING([for Qt])
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
fi fi
ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
qt_libraries="" qt_libraries=""
@ -1461,21 +1461,21 @@ qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries qt_libdir=$ac_qt_libraries
else else
qt_libdirs="$ac_qt_libraries $qt_libdirs" qt_libdirs="$ac_qt_libraries $qt_libdirs"
# if the Qt was given, the chance is too big that libqt.* doesn't exist # if the Qt was given, the chance is too big that libtqt.* doesn't exist
qt_libdir=NONE qt_libdir=NONE
for dir in $qt_libdirs; do for dir in $qt_libdirs; do
try="ls -1 $dir/${LIBQT_GLOB}" try="ls -1 $dir/${LIBTQT_GLOB}"
if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
done done
fi fi
for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then if test -e "$a"; then
LIBQT="$LIBQT ${kde_int_qt}_incremental" LIBTQT="$LIBTQT ${kde_int_qt}_incremental"
break break
fi fi
done done
@ -1491,7 +1491,7 @@ ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
LIBS="$LIBS $LIBQT $KDE_MT_LIBS" LIBS="$LIBS $LIBTQT $KDE_MT_LIBS"
KDE_PRINT_QT_PROGRAM KDE_PRINT_QT_PROGRAM
@ -1522,9 +1522,9 @@ if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then
if test "x$kde_use_qt_mt" = "xyes"; then if test "x$kde_use_qt_mt" = "xyes"; then
missing_qt_mt=" missing_qt_mt="
Make sure that you have compiled Qt with thread support!" Make sure that you have compiled Qt with thread support!"
ac_qt_notfound="(library $qtlib-mt)"; ac_qt_notfound="(library $tqtlib-mt)";
else else
ac_qt_notfound="(library $qtlib)"; ac_qt_notfound="(library $tqtlib)";
fi fi
fi fi
@ -2029,7 +2029,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_libs_safe="$LIBS" kde_libs_safe="$LIBS"
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBTQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
@ -2590,7 +2590,7 @@ AC_CACHE_VAL(kde_cv_qt_jpeg,
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="$all_libraries $USER_LDFLAGS $LIBQT" LIBS="$all_libraries $USER_LDFLAGS $LIBTQT"
LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
@ -4682,7 +4682,7 @@ AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT" LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT"
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl AC_TRY_RUN(dnl
[ [
@ -5488,7 +5488,7 @@ is required.])
CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
LIBS="$LIBS $LIB_TQTOPIA $LIBQT" LIBS="$LIBS $LIB_TQTOPIA $LIBTQT"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"

@ -2507,7 +2507,7 @@ information here.
<listitem><para>zlib-devel</para></listitem> <listitem><para>zlib-devel</para></listitem>
<listitem><para>XFree86-devel eller xorg-x11-devel eller libxorg-x11-devel</para></listitem> <listitem><para>XFree86-devel eller xorg-x11-devel eller libxorg-x11-devel</para></listitem>
<listitem><para>tdelibs-devel</para></listitem> <listitem><para>tdelibs-devel</para></listitem>
<listitem><para>qt-devel eller libqt3-devel</para></listitem> <listitem><para>qt-devel eller libtqt3-devel</para></listitem>
</itemizedlist> </itemizedlist>
<para>&krecipes; har for øjeblikket understøttelse for at opbevare opskrifter med PostgreSQL-databasen, selvom det for øjeblikket anses for at være en betaversion. Ingen problemer er fundet med det, men indtil det er testet mere, er det markeret som om det ikke understøttes. </para> <para>&krecipes; har for øjeblikket understøttelse for at opbevare opskrifter med PostgreSQL-databasen, selvom det for øjeblikket anses for at være en betaversion. Ingen problemer er fundet med det, men indtil det er testet mere, er det markeret som om det ikke understøttes. </para>

@ -2507,7 +2507,7 @@ information here.
<listitem><para>zlib-devel.</para></listitem> <listitem><para>zlib-devel.</para></listitem>
<listitem><para>XFree86-devel, xorg-x11-devel o libxorg-x11-devel.</para></listitem> <listitem><para>XFree86-devel, xorg-x11-devel o libxorg-x11-devel.</para></listitem>
<listitem><para>tdelibs-devel.</para></listitem> <listitem><para>tdelibs-devel.</para></listitem>
<listitem><para>qt-devel o libqt3-devel.</para></listitem> <listitem><para>qt-devel o libtqt3-devel.</para></listitem>
</itemizedlist> </itemizedlist>
<para>&krecipes; en estos momentos tiene soporte para almacenar recetas en una base de datos PostgreSQL que se considera beta. No se han encontrado problemas en ella, pero hasta que no se pruebe más, estará marcada como no soportada. </para> <para>&krecipes; en estos momentos tiene soporte para almacenar recetas en una base de datos PostgreSQL que se considera beta. No se han encontrado problemas en ella, pero hasta que no se pruebe más, estará marcada como no soportada. </para>

@ -2091,7 +2091,7 @@ information here.
<listitem><para>zlib-devel</para></listitem> <listitem><para>zlib-devel</para></listitem>
<listitem><para>XFree86-devel või xorg-x11-devel või libxorg-x11-devel</para></listitem> <listitem><para>XFree86-devel või xorg-x11-devel või libxorg-x11-devel</para></listitem>
<listitem><para>tdelibs-devel</para></listitem> <listitem><para>tdelibs-devel</para></listitem>
<listitem><para>qt-devel või libqt3-devel</para></listitem> <listitem><para>qt-devel või libtqt3-devel</para></listitem>
</itemizedlist> </itemizedlist>
<para>&krecipes; toetab ka retseptide salvestamist PostgreSQL andmebaasi, kuigi toetus on veel arendusjärgus. Seni pole küll probleeme leitud, aga kuni teste pole põhjalikumalt läbi viidud, hindame seda mittetoetatuks. </para> <para>&krecipes; toetab ka retseptide salvestamist PostgreSQL andmebaasi, kuigi toetus on veel arendusjärgus. Seni pole küll probleeme leitud, aga kuni teste pole põhjalikumalt läbi viidud, hindame seda mittetoetatuks. </para>

@ -3075,7 +3075,7 @@ In order to successfully use &krecipes;, make sure you have at least one of the
<listitem><para>zlib-devel</para></listitem> <listitem><para>zlib-devel</para></listitem>
<listitem><para>XFree86-devel or xorg-x11-devel or libxorg-x11-devel</para></listitem> <listitem><para>XFree86-devel or xorg-x11-devel or libxorg-x11-devel</para></listitem>
<listitem><para>tdelibs-devel</para></listitem> <listitem><para>tdelibs-devel</para></listitem>
<listitem><para>qt-devel or libqt3-devel</para></listitem> <listitem><para>qt-devel or libtqt3-devel</para></listitem>
</itemizedlist> </itemizedlist>
<para> <para>

@ -2906,7 +2906,7 @@ information here.
<listitem><para>zlib-devel</para></listitem> <listitem><para>zlib-devel</para></listitem>
<listitem><para>XFree86-devel, xorg-x11-devel ou libxorg-x11-devel</para></listitem> <listitem><para>XFree86-devel, xorg-x11-devel ou libxorg-x11-devel</para></listitem>
<listitem><para>tdelibs-devel</para></listitem> <listitem><para>tdelibs-devel</para></listitem>
<listitem><para>qt-devel ou libqt3-devel</para></listitem> <listitem><para>qt-devel ou libtqt3-devel</para></listitem>
</itemizedlist> </itemizedlist>
<para>O &krecipes; tem suporte, de momento, para guardar as receitas numa base de dados PostgreSQL, ainda que seja considerado numa versão 'beta'. Ainda não foram encontrados problemas com ele, mas até que sejam feitos mais testes, será marcado como não suportado. </para> <para>O &krecipes; tem suporte, de momento, para guardar as receitas numa base de dados PostgreSQL, ainda que seja considerado numa versão 'beta'. Ainda não foram encontrados problemas com ele, mas até que sejam feitos mais testes, será marcado como não suportado. </para>

@ -2507,7 +2507,7 @@ information here.
<listitem><para>zlib-devel</para></listitem> <listitem><para>zlib-devel</para></listitem>
<listitem><para>XFree86-devel eller xorg-x11-devel eller libxorg-x11-devel</para></listitem> <listitem><para>XFree86-devel eller xorg-x11-devel eller libxorg-x11-devel</para></listitem>
<listitem><para>tdelibs-devel</para></listitem> <listitem><para>tdelibs-devel</para></listitem>
<listitem><para>qt-devel eller libqt3-devel</para></listitem> <listitem><para>qt-devel eller libtqt3-devel</para></listitem>
</itemizedlist> </itemizedlist>
<para>Krecept har för närvarande stöd för att lagra recept med PostgreSQL-databasen, även om det för närvarande anses vara en betaversion. Inga problem har hittats med det, men till det har testats mer, är det markerat som om det inte stöds. </para> <para>Krecept har för närvarande stöd för att lagra recept med PostgreSQL-databasen, även om det för närvarande anses vara en betaversion. Inga problem har hittats med det, men till det har testats mer, är det markerat som om det inte stöds. </para>

Loading…
Cancel
Save