Browse Source

Qt3->TQt conversion.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/1/head
Mavridis Philippe 1 year ago
parent
commit
d991b7f387
No known key found for this signature in database
GPG Key ID: F8D2D7E2F989A494
  1. 46
      acinclude.m4
  2. 54
      autom4te.cache/output.0
  3. 54
      autom4te.cache/output.1
  4. 46
      autom4te.cache/traces.0
  5. 54
      configure
  6. 12
      doc/en/index.docbook
  7. 10
      po/es.po
  8. 10
      po/fr.po
  9. 74
      src/komposedesktopwidget.cpp
  10. 30
      src/komposedesktopwidget.h
  11. 34
      src/komposefullscreenwidget.cpp
  12. 10
      src/komposefullscreenwidget.h
  13. 28
      src/komposegldesktopwidget.cpp
  14. 40
      src/komposeglfullscreenwidget.cpp
  15. 38
      src/komposeglobal.cpp
  16. 12
      src/komposeglobal.h
  17. 22
      src/komposegltaskwidget.cpp
  18. 36
      src/komposeglwidget.cpp
  19. 34
      src/komposeimage.cpp
  20. 18
      src/komposeimage.h
  21. 32
      src/komposelayout.cpp
  22. 26
      src/komposelayout.h
  23. 254
      src/komposepreferences.cpp
  24. 182
      src/komposepreferences.cpp.orig
  25. 88
      src/komposepreferences.h
  26. 28
      src/komposesettings.cpp
  27. 52
      src/komposesettings.h
  28. 38
      src/komposesystray.cpp
  29. 10
      src/komposesystray.h
  30. 40
      src/komposetask.cpp
  31. 24
      src/komposetask.h
  32. 66
      src/komposetaskcontainerwidget.cpp
  33. 8
      src/komposetaskcontainerwidget.h
  34. 30
      src/komposetaskmanager.cpp
  35. 10
      src/komposetaskmanager.h
  36. 4
      src/komposetaskprefswidget.cpp
  37. 4
      src/komposetaskprefswidget.h
  38. 48
      src/komposetaskvisualizer.cpp
  39. 16
      src/komposetaskvisualizer.h
  40. 94
      src/komposetaskwidget.cpp
  41. 32
      src/komposetaskwidget.h
  42. 64
      src/komposeviewmanager.cpp
  43. 18
      src/komposeviewmanager.h
  44. 18
      src/komposewidget.cpp
  45. 10
      src/komposewidget.h
  46. 8
      src/main.cpp

46
acinclude.m4

@ -1033,7 +1033,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 QT/Mac (I use QT_MAC so that tqglobal.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"
@ -1065,19 +1065,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM],
AC_REQUIRE([KDE_USE_QT])
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <tqglobal.h>
#include <tqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <tqevent.h>
#include <tqstring.h>
#include <tqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -1086,8 +1086,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <tqcursor.h>
#include <tqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -1170,22 +1170,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
kde_qt_verstring="TQT_VERSION >= 0x03@VER@00"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
kde_qt_verstring="QT_VERSION >= 300"
kde_qt_verstring="TQT_VERSION >= 300"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222"
kde_qt_verstring="TQT_VERSION >= 222"
else
kde_qt_verstring="QT_VERSION >= 200"
kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring="$3"
@ -1291,7 +1291,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 @@ 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 Qt library name for the host.
dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then
@ -1425,9 +1425,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h
kde_qt_header=tqstyle.h
else
kde_qt_header=qglobal.h
kde_qt_header=tqglobal.h
fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@ -1979,7 +1979,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([
#include <qdom.h>
#include <tqdom.h>
],
[
QDomDocument doc;
@ -2498,7 +2498,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK(
[#include <qapplication.h>],
[#include <tqapplication.h>],
[
int argc;
char** argv;
@ -4205,7 +4205,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl
[
#include <qimageio.h>
#include <qstring.h>
#include <tqstring.h>
int main() {
QString t = "hallo";
t.fill('t');
@ -4989,7 +4989,7 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi
AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/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 ], QTDOCDIR)
AC_FIND_FILE(tqsql.html, [ $kde_qtdir/doc/html $QTDIR/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 ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)
@ -5010,7 +5010,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/tqsql.html; then
KDE_HAS_DOXYGEN=yes
fi
AC_SUBST(KDE_HAS_DOXYGEN)

54
autom4te.cache/output.0 vendored

@ -689,7 +689,7 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@ -1265,7 +1265,7 @@ do
do
case $ac_arg in
-no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
@ -21276,22 +21276,22 @@ fi
if test -z ""; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
kde_qt_verstring="TQT_VERSION >= 0x03@VER@00"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
kde_qt_verstring="QT_VERSION >= 300"
kde_qt_verstring="TQT_VERSION >= 300"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222"
kde_qt_verstring="TQT_VERSION >= 222"
else
kde_qt_verstring="QT_VERSION >= 200"
kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring=""
@ -28456,9 +28456,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h
kde_qt_header=tqstyle.h
else
kde_qt_header=qglobal.h
kde_qt_header=tqglobal.h
fi
@ -28527,19 +28527,19 @@ LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <tqglobal.h>
#include <tqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <tqevent.h>
#include <tqstring.h>
#include <tqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -28548,8 +28548,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <tqcursor.h>
#include <tqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -28696,19 +28696,19 @@ export LIBRARY_PATH
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <tqglobal.h>
#include <tqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <tqevent.h>
#include <tqstring.h>
#include <tqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -28717,8 +28717,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <tqcursor.h>
#include <tqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -29117,7 +29117,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <qapplication.h>
#include <tqapplication.h>
int
main ()
{
@ -32134,7 +32134,7 @@ Try \`$0 --help' for more information." >&2;}
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;

54
autom4te.cache/output.1 vendored

@ -689,7 +689,7 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@ -1265,7 +1265,7 @@ do
do
case $ac_arg in
-no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
@ -21276,22 +21276,22 @@ fi
if test -z ""; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
kde_qt_verstring="TQT_VERSION >= 0x03@VER@00"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
kde_qt_verstring="QT_VERSION >= 300"
kde_qt_verstring="TQT_VERSION >= 300"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222"
kde_qt_verstring="TQT_VERSION >= 222"
else
kde_qt_verstring="QT_VERSION >= 200"
kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring=""
@ -28456,9 +28456,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h
kde_qt_header=tqstyle.h
else
kde_qt_header=qglobal.h
kde_qt_header=tqglobal.h
fi
@ -28527,19 +28527,19 @@ LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <tqglobal.h>
#include <tqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <tqevent.h>
#include <tqstring.h>
#include <tqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -28548,8 +28548,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <tqcursor.h>
#include <tqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -28696,19 +28696,19 @@ export LIBRARY_PATH
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <tqglobal.h>
#include <tqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <tqevent.h>
#include <tqstring.h>
#include <tqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -28717,8 +28717,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <tqcursor.h>
#include <tqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -29117,7 +29117,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <qapplication.h>
#include <tqapplication.h>
int
main ()
{
@ -32134,7 +32134,7 @@ Try \`$0 --help' for more information." >&2;}
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;

46
autom4te.cache/traces.0 vendored

@ -1440,7 +1440,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 QT/Mac (I use QT_MAC so that tqglobal.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"
@ -1470,19 +1470,19 @@ m4trace:acinclude.m4:1124: -1- AC_DEFUN([KDE_PRINT_QT_PROGRAM], [
AC_REQUIRE([KDE_USE_QT])
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <tqglobal.h>
#include <tqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <tqevent.h>
#include <tqstring.h>
#include <tqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -1491,8 +1491,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <tqcursor.h>
#include <tqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -1573,22 +1573,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
kde_qt_verstring="TQT_VERSION >= 0x03@VER@00"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
kde_qt_verstring="QT_VERSION >= 300"
kde_qt_verstring="TQT_VERSION >= 300"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222"
kde_qt_verstring="TQT_VERSION >= 222"
else
kde_qt_verstring="QT_VERSION >= 200"
kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring="$3"
@ -1684,7 +1684,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=
@ -1747,7 +1747,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 Qt library name for the host.
dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then
@ -1818,9 +1818,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h
kde_qt_header=tqstyle.h
else
kde_qt_header=qglobal.h
kde_qt_header=tqglobal.h
fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@ -2347,7 +2347,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([
#include <qdom.h>
#include <tqdom.h>
],
[
QDomDocument doc;
@ -2825,7 +2825,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK(
[#include <qapplication.h>],
[#include <tqapplication.h>],
[
int argc;
char** argv;
@ -4393,7 +4393,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl
[
#include <qimageio.h>
#include <qstring.h>
#include <tqstring.h>
int main() {
QString t = "hallo";
t.fill('t');
@ -5040,7 +5040,7 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi
AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/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 ], QTDOCDIR)
AC_FIND_FILE(tqsql.html, [ $kde_qtdir/doc/html $QTDIR/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 ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)
@ -5061,7 +5061,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/tqsql.html; then
KDE_HAS_DOXYGEN=yes
fi
AC_SUBST(KDE_HAS_DOXYGEN)

54
configure vendored

@ -689,7 +689,7 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@ -1265,7 +1265,7 @@ do
do
case $ac_arg in
-no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
@ -21276,22 +21276,22 @@ fi
if test -z ""; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
kde_qt_verstring="TQT_VERSION >= 0x03@VER@00"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
kde_qt_verstring="QT_VERSION >= 300"
kde_qt_verstring="TQT_VERSION >= 300"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222"
kde_qt_verstring="TQT_VERSION >= 222"
else
kde_qt_verstring="QT_VERSION >= 200"
kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring=""
@ -28456,9 +28456,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h
kde_qt_header=tqstyle.h
else
kde_qt_header=qglobal.h
kde_qt_header=tqglobal.h
fi
@ -28527,19 +28527,19 @@ LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <tqglobal.h>
#include <tqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <tqevent.h>
#include <tqstring.h>
#include <tqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -28548,8 +28548,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <tqcursor.h>
#include <tqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -28696,19 +28696,19 @@ export LIBRARY_PATH
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <tqglobal.h>
#include <tqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <tqevent.h>
#include <tqstring.h>
#include <tqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -28717,8 +28717,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <tqcursor.h>
#include <tqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -29117,7 +29117,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <qapplication.h>
#include <tqapplication.h>
int
main ()
{
@ -32134,7 +32134,7 @@ Try \`$0 --help' for more information." >&2;}
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;

12
doc/en/index.docbook

@ -158,17 +158,17 @@ patent issues. -->
<para>It slices! It dices! and it comes with a free toaster!</para>
<para>
The Squiggle Tool <guiicon><inlinemediaobject>
The Stquiggle Tool <guiicon><inlinemediaobject>
<imageobject>
<imagedata fileref="squiggle.png" format="PNG"/>
<imagedata fileref="stquiggle.png" format="PNG"/>
</imageobject>
<imageobject>
<imagedata fileref="squiggle.eps" format="EPS"/>
<imagedata fileref="stquiggle.eps" format="EPS"/>
</imageobject>
<textobject>
<phrase>Squiggle</phrase>
<phrase>Stquiggle</phrase>
</textobject>
</inlinemediaobject></guiicon> is used to draw squiggly lines all over
</inlinemediaobject></guiicon> is used to draw stquiggly lines all over
the &kompose; main window. It's not a bug, it's a feature!
</para>
@ -441,7 +441,7 @@ Program copyright 2004 Hans Oischinger <email>oisch&#64;sourceforge&#46;net</ema
<para>
Contributors:
<itemizedlist>
<listitem><para>Konqui the KDE Dragon <email>konqui@kde.org</email></para>
<listitem><para>Kontqui the KDE Dragon <email>konqui@kde.org</email></para>
</listitem>
<listitem><para>Tux the Linux Penguin <email>tux@linux.org</email></para>
</listitem>

10
po/es.po

@ -212,19 +212,19 @@ msgstr "Activar automáticamente cuando el ratón sea colocado sobre"
#: komposepreferences.cpp:128
msgid "Top-left corner"
msgstr "Esquina superior izquierda"
msgstr "Estquina superior iztquierda"
#: komposepreferences.cpp:130
msgid "Top-right corner"
msgstr "Esquina superior derecha"
msgstr "Estquina superior derecha"
#: komposepreferences.cpp:132
msgid "Bottom-left corner"
msgstr "Esquina inferior izquierda"
msgstr "Estquina inferior iztquierda"
#: komposepreferences.cpp:134
msgid "Bottom-right corner"
msgstr "Esquina inferior derecha"
msgstr "Estquina inferior derecha"
#: komposepreferences.cpp:137
msgid "Top edge"
@ -252,7 +252,7 @@ msgid ""
"until auto-activation."
msgstr ""
"Indica el tiempo en ms que el puntero del ratón debe permanecer en la "
"esquina para la activación automática."
"estquina para la activación automática."
#: komposepreferences.cpp:165
msgid "Enable image effects"

10
po/fr.po

@ -82,7 +82,7 @@ msgstr "Dégroupée"
#: komposepreferences.cpp:56
msgid "Fullscreen layout that shows all windows in no specific order"
msgstr "Vue pleine écran qui montre toutes les fenêtres sans ordre précis"
msgstr "Vue pleine écran tqui montre toutes les fenêtres sans ordre précis"
#: komposepreferences.cpp:59
msgid "Grouped by virtual desktops"
@ -93,7 +93,7 @@ msgid ""
"Fullscreen layout that shows a representation of your virtual desktops\n"
" and places the windows inside."
msgstr ""
"Vue pleine écran qui montre une représentation des bureaux\n"
"Vue pleine écran tqui montre une représentation des bureaux\n"
"et y place les fenêtres."
#: komposepreferences.cpp:63
@ -105,7 +105,7 @@ msgid ""
"Fullscreen layout that shows the windows of the desktop you're currently "
"working on."
msgstr ""
"Vue pleine écran qui montre les fenêtres du bureau actuellement utilisé."
"Vue pleine écran tqui montre les fenêtres du bureau actuellement utilisé."
#: komposepreferences.cpp:71
msgid "Xinerama"
@ -144,7 +144,7 @@ msgstr ""
"L'utilisation de l'extention « Composite » des serveurs X récents rend "
"l'utilisation des captures d'écran inutile. \n"
"Le contenu de toutes les fenêtres est dessiné dans un tampon d'arrière plan "
"qui est accessible par Komposé.\n"
"tqui est accessible par Komposé.\n"
"Notez toutefois que l'implémentation du principe « Composite », même dans "
"les cartes graphiques modernes reste très peu performante et peu rendre "
"votre système quasiment inutilisable."
@ -198,7 +198,7 @@ msgid ""
"It will however increase memory usage quite a bit."
msgstr ""
"Ceci permet de limiter certaines opérations répétées de redimensionnement "
"quand Komposé a déjà traité une copie d'écran qui n'a pas été modifée.\n"
"quand Komposé a déjà traité une copie d'écran tqui n'a pas été modifée.\n"
"En contre partie, la consommation de mémoire est légèrement augmentée."
#: komposepreferences.cpp:126

74
src/komposedesktopwidget.cpp

@ -26,12 +26,12 @@
#include "komposesettings.h"
#include "komposeglobal.h"
#include <qdesktopwidget.h>
#include <qcolor.h>
#include <qpainter.h>
#include <qapplication.h>
#include <qdragobject.h>
#include <qtooltip.h>
#include <tqdesktopwidget.h>
#include <tqcolor.h>
#include <tqpainter.h>
#include <tqapplication.h>
#include <tqdragobject.h>
#include <tqtooltip.h>
#include <klocale.h>
#include <kwin.h>
@ -42,23 +42,23 @@
#include <kdebug.h>
KomposeDesktopWidget::KomposeDesktopWidget(int desktop, QWidget *parent, KomposeLayout *l, const char *name)
KomposeDesktopWidget::KomposeDesktopWidget(int desktop, TQWidget *parent, KomposeLayout *l, const char *name)
: KomposeTaskContainerWidget( desktop, parent, l, name ),
highlight(false)
{
// Retrieve geometry
// QDesktopWidget *deskwidget = new QDesktopWidget();
// TQDesktopWidget *deskwidget = new TQDesktopWidget();
// deskRect = deskwidget->screenGeometry();
// delete deskwidget;
initFonts();
// Set Desktop background as our background
setBackgroundMode( Qt::NoBackground );
setBackgroundMode( TQt::NoBackground );
KWinModule kwinmodule( this, 1 );
deskName = kwinmodule.desktopName(desktop+1);
QToolTip::add( this, i18n("Desktop %1 - %2").arg(desktop).arg(deskName) );
TQToolTip::add( this, i18n("Desktop %1 - %2").arg(desktop).arg(deskName) );
rootpix = new KRootPixmap (this);
rootpix->start();
@ -68,7 +68,7 @@ KomposeDesktopWidget::KomposeDesktopWidget(int desktop, QWidget *parent, Kompose
connect( KomposeTaskManager::instance(), SIGNAL( newTask( KomposeTask* ) ), this, SLOT( createTaskWidget( KomposeTask* ) ) );
setFocusPolicy(QWidget::ClickFocus);
setFocusPolicy(TQWidget::ClickFocus);
}
@ -103,22 +103,22 @@ void KomposeDesktopWidget::initFonts()
// }
void KomposeDesktopWidget::leaveEvent ( QEvent * )
void KomposeDesktopWidget::leaveEvent ( TQEvent * )
{
// Unset highlight if cursor moves out of our rect
// but not if it enters a child widget
QRect deskRect;
deskRect.setTopLeft(mapToGlobal( QPoint(0,0) ));
TQRect deskRect;
deskRect.setTopLeft(mapToGlobal( TQPoint(0,0) ));
deskRect.setWidth(width());
deskRect.setHeight(height());
if ( !deskRect.contains( QCursor::pos() ) )
if ( !deskRect.contains( TQCursor::pos() ) )
highlight = false;
unsetCursor();
repaint();
}
void KomposeDesktopWidget::enterEvent ( QEvent * )
void KomposeDesktopWidget::enterEvent ( TQEvent * )
{
setFocus();
setCursor( KCursor::handCursor() );
@ -126,27 +126,27 @@ void KomposeDesktopWidget::enterEvent ( QEvent * )
repaint();
}
void KomposeDesktopWidget::focusInEvent ( QFocusEvent * )
void KomposeDesktopWidget::focusInEvent ( TQFocusEvent * )
{
highlight = true;
repaint();
}
void KomposeDesktopWidget::focusOutEvent ( QFocusEvent * )
void KomposeDesktopWidget::focusOutEvent ( TQFocusEvent * )
{
// Unset highlight if cursor moves out of our rect
// but not if it enters a child widget
QRect deskRect;
deskRect.setTopLeft(mapToGlobal( QPoint(0,0) ));
TQRect deskRect;
deskRect.setTopLeft(mapToGlobal( TQPoint(0,0) ));
deskRect.setWidth(width());
deskRect.setHeight(height());
if ( !deskRect.contains( QCursor::pos() ) )
if ( !deskRect.contains( TQCursor::pos() ) )
highlight = false;
repaint();
}
void KomposeDesktopWidget::mouseReleaseEvent ( QMouseEvent * e )
void KomposeDesktopWidget::mouseReleaseEvent ( TQMouseEvent * e )
{
if ( !rect().contains( e->pos() ) )
return;
@ -154,7 +154,7 @@ void KomposeDesktopWidget::mouseReleaseEvent ( QMouseEvent * e )
}
void KomposeDesktopWidget::mouseDoubleClickEvent ( QMouseEvent * e )
void KomposeDesktopWidget::mouseDoubleClickEvent ( TQMouseEvent * e )
{
if ( !rect().contains( e->pos() ) )
return;
@ -162,12 +162,12 @@ void KomposeDesktopWidget::mouseDoubleClickEvent ( QMouseEvent * e )
}
void KomposeDesktopWidget::paintEvent ( QPaintEvent * )
void KomposeDesktopWidget::paintEvent ( TQPaintEvent * )
{
// KomposeWidget::paintEvent(e);
QPainter p;
TQPainter p;
p.begin( this );
// QPoint tl = mapToGlobal(QPoint(0,0));
// TQPoint tl = mapToGlobal(TQPoint(0,0));
// p.drawPixmap(0,0, *KomposeGlobal::instance()->getDesktopBgPixmap(),
// tl.x(), tl.y(), width(), height());
@ -183,45 +183,45 @@ void KomposeDesktopWidget::paintEvent ( QPaintEvent * )
// paint the Desktop num & name (centered if empty, bottom right if not)
if ( layout->getNumofChilds() == 0 )
p.drawText(QRect(QPoint(0,0), size()), Qt::AlignCenter, QString("Desktop %1 - %2").arg(desktop+1).arg(deskName));
p.drawText(TQRect(TQPoint(0,0), size()), TQt::AlignCenter, TQString("Desktop %1 - %2").arg(desktop+1).arg(deskName));
else
p.drawText(QRect(QPoint(0,0), size()), Qt::AlignRight | Qt::AlignBottom, QString("Desktop %1 - %2").arg(desktop+1).arg(deskName));
p.drawText(TQRect(TQPoint(0,0), size()), TQt::AlignRight | TQt::AlignBottom, TQString("Desktop %1 - %2").arg(desktop+1).arg(deskName));
p.end();
}
void KomposeDesktopWidget::dragEnterEvent( QDragEnterEvent* e )
void KomposeDesktopWidget::dragEnterEvent( TQDragEnterEvent* e )
{
kdDebug() << "KomposeDesktopWidget::dragEnterEvent" << endl;
e->accept( QTextDrag::canDecode(e) );
e->accept( TQTextDrag::canDecode(e) );
}
void KomposeDesktopWidget::dropEvent ( QDropEvent * e )
void KomposeDesktopWidget::dropEvent ( TQDropEvent * e )
{
QString text;
if ( QTextDrag::decode(e, text) )
TQString text;
if ( TQTextDrag::decode(e, text) )
{
kdDebug() << "KomposeDesktopWidget::dropEvent - Received Task drop" << endl;
KomposeTaskWidget* dropWidget = dynamic_cast<KomposeTaskWidget*>(e->source());
dropWidget->getTask()->toDesktop( desktop + 1);
//if ( dropWidget->parentWidget() != this)
// dropWidget->reparent( this, QPoint(0,0), true );
// dropWidget->reparent( this, TQPoint(0,0), true );
e->accept();
}
}
void KomposeDesktopWidget::childEvent ( QChildEvent * ce)
void KomposeDesktopWidget::childEvent ( TQChildEvent * ce)
{
KomposeWidget::childEvent( ce );
emit contentsChanged();
}
void KomposeDesktopWidget::keyReleaseEvent ( QKeyEvent * e )
void KomposeDesktopWidget::keyReleaseEvent ( TQKeyEvent * e )
{
if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Space )
if ( e->key() == TQt::Key_Return || e->key() == TQt::Key_Space )
{
kdDebug() << "KomposeDesktopWidget::keyReleaseEvent - Switching to Desktop!" << endl;
KomposeViewManager::instance()->setCurrentDesktop(desktop);

30
src/komposedesktopwidget.h

@ -32,7 +32,7 @@ class KomposeDesktopWidget : public KomposeTaskContainerWidget
{
Q_OBJECT
public:
KomposeDesktopWidget(int desktop, QWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0);
KomposeDesktopWidget(int desktop, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0);
~KomposeDesktopWidget();
@ -44,26 +44,26 @@ signals:
void contentsChanged();
protected:
void paintEvent ( QPaintEvent * );
void dragEnterEvent ( QDragEnterEvent * );
void dropEvent ( QDropEvent * );
void leaveEvent ( QEvent * );
void enterEvent ( QEvent * );
void mouseReleaseEvent ( QMouseEvent * e );
void mouseDoubleClickEvent ( QMouseEvent * e );
void childEvent( QChildEvent * ce);
void focusInEvent ( QFocusEvent * );
void focusOutEvent ( QFocusEvent * );
void keyReleaseEvent ( QKeyEvent * e );
void paintEvent ( TQPaintEvent * );
void dragEnterEvent ( TQDragEnterEvent * );
void dropEvent ( TQDropEvent * );
void leaveEvent ( TQEvent * );
void enterEvent ( TQEvent * );
void mouseReleaseEvent ( TQMouseEvent * e );
void mouseDoubleClickEvent ( TQMouseEvent * e );
void childEvent( TQChildEvent * ce);
void focusInEvent ( TQFocusEvent * );
void focusOutEvent ( TQFocusEvent * );
void keyReleaseEvent ( TQKeyEvent * e );
protected slots:
void initFonts();
private:
QRect deskRect;
QString deskName;
TQRect deskRect;
TQString deskName;
bool highlight; // Highlight widget?
QFont titleFont;
TQFont titleFont;
KRootPixmap *rootpix;
};

34
src/komposefullscreenwidget.cpp

@ -18,10 +18,10 @@
#include "komposeglobal.h"
#include "komposelayout.h"
#include <qobjectlist.h>
#include <qptrlist.h>
#include <qpainter.h>
#include <qdesktopwidget.h>
#include <tqobjectlist.h>
#include <tqptrlist.h>
#include <tqpainter.h>
#include <tqdesktopwidget.h>
#include <kwin.h>
#include <kapplication.h>
@ -38,14 +38,14 @@ KomposeFullscreenWidget::KomposeFullscreenWidget( int displayType, KomposeLayout
: KomposeTaskContainerWidget( -1, 0, l ),
type(displayType)
{
// if ( QT_VERSION < 0x030300 )
// if ( TQT_VERSION < 0x030300 )
/* use showMaximized instead of setWindowState to make it compile on qt 3.1 or whatever */
// showMaximized();
// KWin::setState( winId(), NET::KeepAbove );
// Set Desktop background as our background
setBackgroundMode( Qt::FixedPixmap );
setBackgroundMode( TQt::FixedPixmap );
// setBackgroundPixmap(*(KomposeGlobal::instance()->getDesktopBgPixmap()));
rootpix = new KRootPixmap (this);
rootpix->start();
@ -62,14 +62,14 @@ KomposeFullscreenWidget::KomposeFullscreenWidget( int displayType, KomposeLayout
setGeometry( KGlobalSettings::desktopGeometry( this ) );
else
{
QDesktopWidget deskwidget;
QRect deskRect = deskwidget.screenGeometry(KomposeSettings::instance()->getViewScreen());
TQDesktopWidget deskwidget;
TQRect deskRect = deskwidget.screenGeometry(KomposeSettings::instance()->getViewScreen());
setGeometry(deskRect);
kdDebug() << deskRect << endl;
}
if (!isTopLevel())
QApplication::sendPostedEvents(this, QEvent::ShowFullScreen);
TQApplication::sendPostedEvents(this, TQEvent::ShowFullScreen);
setActiveWindow();
KWin::setOnAllDesktops( winId(), true );
@ -101,12 +101,12 @@ void KomposeFullscreenWidget::destroyChildWidgets()
{
setUpdatesEnabled( false );
KomposeWidget *child;
QPtrListIterator<KomposeWidget> it( *(layout->getManagedWidgets()));
TQPtrListIterator<KomposeWidget> it( *(layout->getManagedWidgets()));
while ( (child = it.current()) != 0 )
{
++it;
layout->remove(child);
dynamic_cast<QWidget*>(child)->deleteLater();
dynamic_cast<TQWidget*>(child)->deleteLater();
}
setUpdatesEnabled( true );
kdDebug() << "KomposeFullscreenWidget::destroyChildWidgets() - all children destroyed" << endl;
@ -158,10 +158,10 @@ void KomposeFullscreenWidget::createDesktopWidgets()
}
}
void KomposeFullscreenWidget::mouseReleaseEvent (QMouseEvent * )
void KomposeFullscreenWidget::mouseReleaseEvent (TQMouseEvent * )
{}
void KomposeFullscreenWidget::mousePressEvent ( QMouseEvent * e )
void KomposeFullscreenWidget::mousePressEvent ( TQMouseEvent * e )
{
if ( !rect().contains( e->pos() ) )
return;
@ -181,9 +181,9 @@ void KomposeFullscreenWidget::mousePressEvent ( QMouseEvent * e )
}
}
void KomposeFullscreenWidget::keyReleaseEvent ( QKeyEvent * e )
void KomposeFullscreenWidget::keyReleaseEvent ( TQKeyEvent * e )
{
if ( e->key() == Qt::Key_Escape )
if ( e->key() == TQt::Key_Escape )
{
kdDebug() << "KomposeFullscreenWidget::keyReleaseEvent - Esc key pressed - Closing view" << endl;
KomposeViewManager::instance()->closeCurrentView();
@ -212,9 +212,9 @@ double KomposeFullscreenWidget::getAspectRatio()
return (double)width() / (double)height();
}
// void KomposeFullscreenWidget::paintEvent ( QPaintEvent * )
// void KomposeFullscreenWidget::paintEvent ( TQPaintEvent * )
// {
// QPainter p( this );
// TQPainter p( this );
// p.drawPixmap(rect(), *(KomposeGlobal::instance()->getDesktopBgPixmap()));
// p.end();
// }

10
src/komposefullscreenwidget.h

@ -44,13 +44,13 @@ protected:
void initMenu();
void createDesktopWidgets();
void mouseReleaseEvent (QMouseEvent *);
void mousePressEvent (QMouseEvent *);
void keyReleaseEvent ( QKeyEvent * e );
// void paintEvent ( QPaintEvent * );
void mouseReleaseEvent (TQMouseEvent *);
void mousePressEvent (TQMouseEvent *);
void keyReleaseEvent ( TQKeyEvent * e );
// void paintEvent ( TQPaintEvent * );
void destroyChildWidgets();
// virtual void closeEvent ( QCloseEvent * e );
// virtual void closeEvent ( TQCloseEvent * e );
private:
int type;

28
src/komposegldesktopwidget.cpp

@ -15,18 +15,18 @@
#include "komposegltaskwidget.h"
#include "komposetaskmanager.h"
#include <qdesktopwidget.h>
#include <qobjectlist.h>
#include <tqdesktopwidget.h>
#include <tqobjectlist.h>
#include <kdebug.h>
#include <GL/gl.h>
KomposeGLDesktopWidget::KomposeGLDesktopWidget(int desktop, QObject *parent, const char *name)
KomposeGLDesktopWidget::KomposeGLDesktopWidget(int desktop, TQObject *parent, const char *name)
: KomposeGLWidget( parent ),
deskNum( desktop )
{
// Retrieve geometry
QDesktopWidget *deskwidget = new QDesktopWidget();
TQDesktopWidget *deskwidget = new TQDesktopWidget();
deskRect = deskwidget->availableGeometry();
delete deskwidget;
@ -42,13 +42,13 @@ KomposeGLDesktopWidget::~KomposeGLDesktopWidget()
void KomposeGLDesktopWidget::createTaskWidgets()
{
TaskList tl = KomposeTaskManager::instance()->getTasks();
qDebug("KomposeGLDesktopWidget::createTaskWidgets() on %d tasks", tl.count());
QPtrListIterator<KomposeTask> it( tl );
tqDebug("KomposeGLDesktopWidget::createTaskWidgets() on %d tasks", tl.count());
TQPtrListIterator<KomposeTask</