summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--HACKING2
-rw-r--r--acinclude.m4106
-rw-r--r--configure.in6
-rw-r--r--digikam/imageplugins/inserttext/fontchooserwidget.cpp2
-rw-r--r--digikam/libs/dimg/README6
-rw-r--r--digikam/project/project.tdevelop2
6 files changed, 62 insertions, 62 deletions
diff --git a/HACKING b/HACKING
index 19e2629..82772af 100644
--- a/HACKING
+++ b/HACKING
@@ -114,7 +114,7 @@ Class, file and Variable names:
- Captilize logically so that it becomes easy to read it. Do not capitalize
the first letter after _ (Use m_varName not m_VarName)
- variable names should be indicative of their functionality and also of
- the type they belong too if they are instances of qt widgets.
+ the type they belong too if they are instances of tqt widgets.
for eg, QCheckBox* m_autoRotateCheckBox;
-------------------------------------------------------------------------
diff --git a/acinclude.m4 b/acinclude.m4
index d789b14..5ce7ee4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -241,8 +241,8 @@ AC_DEFUN([KDE_FIND_PATH],
AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
[
- AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
+ AC_MSG_ERROR([No TQt meta object compiler (moc) found!
+Please check whether you installed TQt correctly.
You need to have a running moc binary.
configure tried to run $ac_cv_path_moc and the test didn't
succeed. If configure shouldn't have tried this one, set
@@ -253,8 +253,8 @@ configure.
AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
[
- AC_MSG_WARN([No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
+ AC_MSG_WARN([No TQt ui compiler (uic) found!
+Please check whether you installed TQt correctly.
You need to have a running uic binary.
configure tried to run $ac_cv_path_uic and the test didn't
succeed. If configure shouldn't have tried this one, set
@@ -306,7 +306,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC],
for dir in $kde_qt_dirs; do
qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
done
- qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
+ qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/tqt/bin"
if test ! "$ac_qt_bindir" = "NO"; then
qt_bindirs="$ac_qt_bindir $qt_bindirs"
fi
@@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and tdelibs as you did use now.
+same compiler to compile TQt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi
@@ -874,21 +874,21 @@ AC_REQUIRE([KDE_CHECK_LIB64])
AC_ARG_ENABLE(
embedded,
- AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
+ AC_HELP_STRING([--enable-embedded],[link to TQt-embedded, don't use X]),
kde_use_qt_emb=$enableval,
kde_use_qt_emb=no
)
AC_ARG_ENABLE(
qtopia,
- AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
+ AC_HELP_STRING([--enable-qtopia],[link to TQt-embedded, link to the Qtopia Environment]),
kde_use_qt_emb_palm=$enableval,
kde_use_qt_emb_palm=no
)
AC_ARG_ENABLE(
mac,
- AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
+ AC_HELP_STRING([--enable-mac],[link to TQt/Mac (don't use X)]),
kde_use_qt_mac=$enableval,
kde_use_qt_mac=no
)
@@ -1046,7 +1046,7 @@ LIB_XEXT="-lXext"
QTE_NORTTI=""
elif test "$kde_use_qt_emb" = "yes"; then
- dnl We're using QT Embedded
+ dnl We're using TQT Embedded
CPPFLAGS=-DQWS
CXXFLAGS="$CXXFLAGS -fno-rtti"
QTE_NORTTI="-fno-rtti -DQWS"
@@ -1060,7 +1060,7 @@ elif test "$kde_use_qt_emb" = "yes"; then
x_includes=""
x_libraries=""
elif test "$kde_use_qt_mac" = "yes"; then
- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
+ dnl We're using TQT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
dnl be included to get the information) --Sam
CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
@@ -1231,8 +1231,8 @@ if test $kde_qtver = 3; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`"
fi
fi
fi
@@ -1247,7 +1247,7 @@ fi
AC_DEFUN([KDE_CHECK_QT_DIRECT],
[
AC_REQUIRE([KDE_USE_TQT])
-AC_MSG_CHECKING([if Qt compiles without flags])
+AC_MSG_CHECKING([if TQt compiles without flags])
AC_CACHE_VAL(kde_cv_qt_direct,
[
AC_LANG_SAVE
@@ -1302,7 +1302,7 @@ fi
])
dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
+dnl Try to find the TQt headers and libraries.
dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed)
dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
dnl ------------------------------------------------------------------------
@@ -1314,12 +1314,12 @@ AC_REQUIRE([KDE_USE_TQT])
AC_REQUIRE([KDE_CHECK_LIB64])
dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
+dnl Add configure flag to enable linking to MT version of TQt library.
dnl ------------------------------------------------------------------------
AC_ARG_ENABLE(
mt,
- AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
+ AC_HELP_STRING([--disable-mt],[link to non-threaded TQt (deprecated)]),
kde_use_qt_mt=$enableval,
[
if test $kde_qtver = 3; then
@@ -1333,7 +1333,7 @@ AC_ARG_ENABLE(
USING_QT_MT=""
dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
+dnl If we not get --disable-tqt-mt then adjust some vars for the host.
dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS=
@@ -1354,7 +1354,7 @@ AC_SUBST(KDE_MT_LIBS)
kde_qt_was_given=yes
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 TQt, we work it out for ourselves.
dnl ------------------------------------------------------------------------
if test -z "$LIBTQT_GLOB"; then
if test "x$kde_use_qt_emb" = "xyes"; then
@@ -1365,12 +1365,12 @@ if test -z "$LIBTQT_GLOB"; then
fi
dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
+dnl If we got --enable-embedded then adjust the TQt library name.
dnl ------------------------------------------------------------
if test "x$kde_use_qt_emb" = "xyes"; then
tqtlib="qte"
else
- tqtlib="qt"
+ tqtlib="tqt"
fi
kde_int_qt="-l$tqtlib"
@@ -1391,7 +1391,7 @@ dnl ------------------------------------------------------------
fi
dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
+dnl If we got --enable-tqt-mt then adjust the TQt library name for the host.
dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then
@@ -1415,7 +1415,7 @@ if test $kde_qtver = 3; then
LIBTQT="$LIBTQT $LIBDL"
fi
-AC_MSG_CHECKING([for Qt])
+AC_MSG_CHECKING([for TQt])
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
@@ -1423,29 +1423,29 @@ fi
ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
qt_libraries=""
tqt_includes=""
-AC_ARG_WITH(qt-dir,
- AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
+AC_ARG_WITH(tqt-dir,
+ AC_HELP_STRING([--with-tqt-dir=DIR],[where the root of TQt is installed ]),
[ ac_tqt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin
])
-AC_ARG_WITH(qt-includes,
- AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
+AC_ARG_WITH(tqt-includes,
+ AC_HELP_STRING([--with-tqt-includes=DIR],[where the TQt includes are. ]),
[
ac_tqt_includes="$withval"
])
kde_qt_libs_given=no
-AC_ARG_WITH(qt-libraries,
- AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
+AC_ARG_WITH(tqt-libraries,
+ AC_HELP_STRING([--with-tqt-libraries=DIR],[where the TQt library is installed.]),
[ ac_qt_libraries="$withval"
kde_qt_libs_given=yes
])
AC_CACHE_VAL(ac_cv_have_qt,
-[#try to guess Qt locations
+[#try to guess TQt locations
qt_incdirs=""
for dir in $kde_qt_dirs; do
@@ -1455,11 +1455,11 @@ if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
fi
fi
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
+qt_incdirs="$QTINC $qt_incdirs /usr/local/tqt/include /usr/include/tqt /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_tqt_includes" = "NO"; then
qt_incdirs="$ac_tqt_includes $qt_incdirs"
fi
@@ -1481,16 +1481,16 @@ if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`"
fi
fi
-qt_libdirs="$TQTLIB $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/tqt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
else
qt_libdirs="$ac_qt_libraries $qt_libdirs"
- # if the Qt was given, the chance is too big that libtqt.* doesn't exist
+ # if the TQt was given, the chance is too big that libtqt.* doesn't exist
qt_libdir=NONE
for dir in $qt_libdirs; do
try="ls -1 $dir/${LIBTQT_GLOB}"
@@ -1545,14 +1545,14 @@ if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then
else
if test "x$kde_use_qt_mt" = "xyes"; then
missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
+Make sure that you have compiled TQt with thread support!"
ac_qt_notfound="(library $tqtlib-mt)";
else
ac_qt_notfound="(library $tqtlib)";
fi
fi
- AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
+ AC_MSG_ERROR([TQt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
For more details about this problem, look at the end of config.log.$missing_qt_mt])
else
have_qt="yes"
@@ -1670,10 +1670,10 @@ if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([
you need to install tdelibs first.
-If you did install tdelibs, then the Qt version that is picked up by
+If you did install tdelibs, then the TQt version that is picked up by
this configure is not the same version you used to compile tdelibs.
-The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
-_same Qt version_, compiled with the _same compiler_ and the same Qt
+The TQt Plugin installed by tdelibs is *ONLY* loadable if it is the
+_same TQt version_, compiled with the _same compiler_ and the same TQt
configuration settings.
])
fi
@@ -2046,14 +2046,14 @@ For more details about this problem, look at the end of config.log.])
AC_DEFUN([KDE_CHECK_KDEQTADDON],
[
-AC_MSG_CHECKING(for kde-qt-addon)
+AC_MSG_CHECKING(for kde-tqt-addon)
AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
[
kde_ldflags_safe="$LDFLAGS"
kde_libs_safe="$LIBS"
kde_cxxflags_safe="$CXXFLAGS"
- LIBS="-lkde-qt-addon $LIBTQT $LIBS"
+ LIBS="-lkde-tqt-addon $LIBTQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
@@ -2075,8 +2075,8 @@ AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
if test "$kde_cv_have_kdetqtaddon" = "no"; then
- AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-It is a separate package (and CVS module) named kde-qt-addon.])
+ AC_MSG_ERROR([Can't find libkde-tqt-addon. You need to install it first.
+It is a separate package (and CVS module) named kde-tqt-addon.])
fi
])
@@ -2608,7 +2608,7 @@ AH_VERBATIM(_AC_CHECK_JPEG,
AC_DEFUN([KDE_CHECK_QT_JPEG],
[
if test -n "$LIBJPEG"; then
-AC_MSG_CHECKING([if Qt needs $LIBJPEG])
+AC_MSG_CHECKING([if TQt needs $LIBJPEG])
AC_CACHE_VAL(kde_cv_qt_jpeg,
[
AC_LANG_SAVE
@@ -3265,7 +3265,7 @@ AC_DEFUN([AC_CHECK_COMPILERS],
AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
if test "$CXX" = "KCC"; then
dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
+ dnl because doing so is binary incompatible and TQt by default links with exceptions :-(
dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= )
@@ -3426,7 +3426,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
[kde_have_gcc_visibility=$enableval],
[kde_have_gcc_visibility=no])
- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+ AC_CACHE_CHECK([if TQt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -4012,7 +4012,7 @@ AC_DEFUN([AC_HAVE_GL],
AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
gl_test=$withval, gl_test="yes")
if test "x$kde_use_qt_emb" = "xyes"; then
- # GL and Qt Embedded is a no-go for now.
+ # GL and TQt Embedded is a no-go for now.
ac_cv_have_gl=no
elif test "x$gl_test" = xno; then
ac_cv_have_gl=no
@@ -4705,7 +4705,7 @@ AC_LANG_RESTORE
if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
+ AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the TQt extension qimgio available])
AC_SUBST(LIBQIMGIO)
else
AC_MSG_RESULT(not found)
@@ -5527,13 +5527,13 @@ the end of config.log])
AC_DEFUN([KDE_INIT_DOXYGEN],
[
-AC_MSG_CHECKING([for Qt docs])
+AC_MSG_CHECKING([for TQt docs])
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], TQTDOCDIR)
+AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/tqt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR)
AC_MSG_RESULT($TQTDOCDIR)
AC_SUBST(TQTDOCDIR)
diff --git a/configure.in b/configure.in
index a6e5026..1d2fcd7 100644
--- a/configure.in
+++ b/configure.in
@@ -757,15 +757,15 @@ fi
if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_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
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
index 4fcce08..aa76ea8 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp
+++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
@@ -546,7 +546,7 @@ void FontChooserWidget::style_chosen_slot(const TQString& style)
sizeListBox->insertItem(TQString::number(*it));
}
}
- else // there are times QT does not provide the list..
+ else // there are times TQT does not provide the list..
fillSizeList();
}
sizeListBox->blockSignals(true);
diff --git a/digikam/libs/dimg/README b/digikam/libs/dimg/README
index 47e4a4c..4b13f3f 100644
--- a/digikam/libs/dimg/README
+++ b/digikam/libs/dimg/README
@@ -16,7 +16,7 @@ some imlib2 bugreports I reported to upstream have gone unfixed for long
time now.
Also, we need to think about 16bit imaging support. this won't come from
-imlib2 and neither from qt. with qt4 there was hope of 16bit image
+imlib2 and neither from tqt. with qt4 there was hope of 16bit image
support, but trolltech has made it clear that imaging apps forms only 0.1%
of their customer base and they are not interested in providing custom
support for them. so the only solution I see (without depending on
@@ -29,7 +29,7 @@ some of the working/planned features:
* Native Image Loaders, for some imageformats which are of interest to
us: JPEG (complete), TIFF (a rudimentary one currently), PNG (planned), PPM
-(planned). for the rest qt's qimage is used.
+(planned). for the rest tqt's qimage is used.
* Metadata preservation: when a file is loaded, its metadata like XMP,
IPTC, EXIF, JFIF are read and held in memory. now when you save back the
@@ -39,7 +39,7 @@ imlib2 is on saving a file: we save the file to a temporary file, reread
the exif info from the original file and then write to a second temporary
file.)
-* Explicitly Shared Container format (see qt docs): this is necessary for
+* Explicitly Shared Container format (see tqt docs): this is necessary for
performance reasons.
* 8bit and 16bit support: if the file format is 16 bit, it will load up
diff --git a/digikam/project/project.tdevelop b/digikam/project/project.tdevelop
index c8bb52d..bdea137 100644
--- a/digikam/project/project.tdevelop
+++ b/digikam/project/project.tdevelop
@@ -7,7 +7,7 @@
<projectmanagement>KDevKDEAutoProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
<keywords>
- <keyword>Qt</keyword>
+ <keyword>TQt</keyword>
<keyword>KDE</keyword>
</keywords>
<projectdirectory>./</projectdirectory>