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 7 years ago
parent 7b08a96241
commit 7f3ad38727
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)
@ -1261,9 +1261,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
@ -1303,7 +1303,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
@ -1356,11 +1356,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
@ -1368,12 +1368,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 ------------------------------------------------------------
@ -1395,30 +1395,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=""
@ -1485,21 +1485,21 @@ if test "$PKG_CONFIG" != "no" ; then
qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`" qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`"
fi fi
fi fi
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
@ -1515,7 +1515,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
@ -1546,9 +1546,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
@ -2053,7 +2053,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"
@ -2614,7 +2614,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"
@ -4709,7 +4709,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
[ [
@ -5517,7 +5517,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"

@ -18,7 +18,7 @@ tables</em>. There is generally one type table per shared library.</p>
<p>KDbg's default type tables are located under <tt>$prefix/share/apps/kdbg/types</tt>. <p>KDbg's default type tables are located under <tt>$prefix/share/apps/kdbg/types</tt>.
User defined type tables can be placed in <tt>${TDEHOME}/share/apps/kdbg/types</tt>, where User defined type tables can be placed in <tt>${TDEHOME}/share/apps/kdbg/types</tt>, where
<tt>${TDEHOME}</tt> is <tt>~/.kde</tt> if it is not a defined environment variable. <tt>${TDEHOME}</tt> is <tt>~/.kde</tt> if it is not a defined environment variable.
The file names end with <tt>.kdbgtt</tt>. Example: The type table for <tt>libqt.so</tt> The file names end with <tt>.kdbgtt</tt>. Example: The type table for <tt>libtqt.so</tt>
is named <tt>qt.kdbgtt</tt>. is named <tt>qt.kdbgtt</tt>.
User defined type tables override the type tables provided by the system.</p> User defined type tables override the type tables provided by the system.</p>
<p>A type table file obeys the regular KDE configuration file syntax. The <p>A type table file obeys the regular KDE configuration file syntax. The
@ -147,7 +147,7 @@ whose name ends in <tt>libtqt-mt.so.3</tt>.</p>
<pre>[Type Table] <pre>[Type Table]
Types1=TQString,TQRect Types1=TQString,TQRect
Types2=TQValueVector Types2=TQValueVector
LibDisplayName=libqt 3.x LibDisplayName=libtqt 3.x
ShlibRE=libtqt-mt\.so\.3$ ShlibRE=libtqt-mt\.so\.3$
EnableBuiltin=TQString::Data,TQCharIsShort EnableBuiltin=TQString::Data,TQCharIsShort

@ -16,7 +16,7 @@ KDbg
существует одна таблица на разделяемую библиотеку. существует одна таблица на разделяемую библиотеку.
<p>Таблицы типов KDbg расположены в каталоге <p>Таблицы типов KDbg расположены в каталоге
<tt>$TDEDIR/share/apps/kdbg/types</tt>. Имена файло таблиц оканчиваются на <tt>$TDEDIR/share/apps/kdbg/types</tt>. Имена файло таблиц оканчиваются на
<tt>.kdbgtt</tt>. îÁÐÒÉÍÅÒ, ÔÁÂÌÉÃÁ ÔÉÐÏ× ÄÌÑ <tt>libqt.so</tt> ÎÁÚÙ×ÁÅÔÓÑ <tt>.kdbgtt</tt>. îÁÐÒÉÍÅÒ, ÔÁÂÌÉÃÁ ÔÉÐÏ× ÄÌÑ <tt>libtqt.so</tt> ÎÁÚÙ×ÁÅÔÓÑ
<tt>qt.kdbgtt</tt>. <tt>qt.kdbgtt</tt>.
<p>Файлы таблиц типов соответствуют стандартному синтаксису файлов конфигурации <p>Файлы таблиц типов соответствуют стандартному синтаксису файлов конфигурации
KDE. Файл содержит следующие группы: KDE. Файл содержит следующие группы:
@ -106,12 +106,12 @@ unicode,
Этот пример показывает, как <tt>TQString</tt> и <tt>TQObject</tt> описаны в Этот пример показывает, как <tt>TQString</tt> и <tt>TQObject</tt> описаны в
<tt>qt.kdbgtt</tt>. Дополнительно определен <tt>TQTableView</tt>, ссылающийся <tt>qt.kdbgtt</tt>. Дополнительно определен <tt>TQTableView</tt>, ссылающийся
на <tt>TQObject</tt>. Этот пример применим к TQt 1.x, который расположен в на <tt>TQObject</tt>. Этот пример применим к TQt 1.x, который расположен в
ÒÁÚÄÅÌÑÅÍÙÈ ÂÉÂÌÉÏÔÅËÁÈ, ÉÍÅÎÁ ËÏÔÏÒÙÈ ÏËÁÎÞÉ×ÁÀÔÓÑ ËÁË <tt>libqt.so.1</tt>. ÒÁÚÄÅÌÑÅÍÙÈ ÂÉÂÌÉÏÔÅËÁÈ, ÉÍÅÎÁ ËÏÔÏÒÙÈ ÏËÁÎÞÉ×ÁÀÔÓÑ ËÁË <tt>libtqt.so.1</tt>.
<pre>[Type Table] <pre>[Type Table]
Types1=TQString Types1=TQString
Types2=TQObject,TQTableView Types2=TQObject,TQTableView
LibDisplayName=libqt 1.x LibDisplayName=libtqt 1.x
ShlibRE=libqt\.so\.1$ ShlibRE=libtqt\.so\.1$
[TQString] [TQString]
Display={ % } Display={ % }
Expr1=(%s).shd->data Expr1=(%s).shd->data

@ -1,8 +1,8 @@
[Type Table] [Type Table]
Types1=QString,QDir,QFileInfo,QFile Types1=QString,QDir,QFileInfo,QFile
Types2=QObject,QTableView Types2=QObject,QTableView
LibDisplayName=libqt 1.x LibDisplayName=libtqt 1.x
ShlibRE=libqt\.so\.1$ ShlibRE=libtqt\.so\.1$
[QString] [QString]
Display={ % } Display={ % }
Expr1=(%s).shd->data Expr1=(%s).shd->data

@ -1,8 +1,8 @@
[Type Table] [Type Table]
Types1=QString,QCString,QDir,QFileInfo,QFile Types1=QString,QCString,QDir,QFileInfo,QFile
Types2=QObject,QTableView Types2=QObject,QTableView
LibDisplayName=libqt 2.x LibDisplayName=libtqt 2.x
ShlibRE=libqt\.so\.2$ ShlibRE=libtqt\.so\.2$
EnableBuiltin=QString::Data EnableBuiltin=QString::Data
PrintQStringCmd=print ($qstrunicode=($qstrdata=(%s))->unicode)?(*(unsigned short*)$qstrunicode)@(($qstrlen=(unsigned int)($qstrdata->len))>100?100:$qstrlen):1==0\n PrintQStringCmd=print ($qstrunicode=($qstrdata=(%s))->unicode)?(*(unsigned short*)$qstrunicode)@(($qstrlen=(unsigned int)($qstrdata->len))>100?100:$qstrlen):1==0\n
[QString] [QString]

@ -3,7 +3,7 @@ Types1=QString,QCString,QDir,QFileInfo,QFile
Types2=QObject Types2=QObject
Types3=QMap,QValueList,QValueVector Types3=QMap,QValueList,QValueVector
Types4=QPoint,QRect Types4=QPoint,QRect
LibDisplayName=libqt 3.x LibDisplayName=libtqt 3.x
ShlibRE=libtqt-mt\.so\.3$ ShlibRE=libtqt-mt\.so\.3$
EnableBuiltin=QString::Data,QCharIsShort EnableBuiltin=QString::Data,QCharIsShort
PrintQStringCmd=print ($qstrunicode=($qstrdata=(%s))->unicode)?(*(unsigned short*)$qstrunicode)@(($qstrlen=(unsigned int)($qstrdata->len))>100?100:$qstrlen):1==0\n PrintQStringCmd=print ($qstrunicode=($qstrdata=(%s))->unicode)?(*(unsigned short*)$qstrunicode)@(($qstrlen=(unsigned int)($qstrdata->len))>100?100:$qstrlen):1==0\n

Loading…
Cancel
Save