diff options
| author | Mavridis Philippe <mavridisf@gmail.com> | 2021-03-30 14:11:34 +0300 |
|---|---|---|
| committer | Mavridis Philippe <mavridisf@gmail.com> | 2021-03-30 14:11:34 +0300 |
| commit | d991b7f387775dc1071fb0c0af78de1c613ca991 (patch) | |
| tree | eb7c978130acb1b2c93eeea98be2f647372c6fac | |
| parent | 1bd3c5b42f1570b2100a4986f638f2723ee37ec4 (diff) | |
| download | kompose-d991b7f387775dc1071fb0c0af78de1c613ca991.tar.gz kompose-d991b7f387775dc1071fb0c0af78de1c613ca991.zip | |
Qt3->TQt conversion.
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
46 files changed, 933 insertions, 933 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4f122d7..028f2b3 100644 --- a/acinclude.m4 +++ b/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) diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index fdbf6dd..77797b3 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -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=: ;; diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index fdbf6dd..77797b3 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -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=: ;; diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 index 5f3f46e..26d48ed 100644 --- a/autom4te.cache/traces.0 +++ b/autom4te.cache/traces.0 @@ -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) @@ -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=: ;; diff --git a/doc/en/index.docbook b/doc/en/index.docbook index f1190af..f07c052 100644 --- a/doc/en/index.docbook +++ b/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@sourceforge.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> @@ -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" @@ -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 diff --git a/src/komposedesktopwidget.cpp b/src/komposedesktopwidget.cpp index 952366c..f010f6d 100644 --- a/src/komposedesktopwidget.cpp +++ b/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); diff --git a/src/komposedesktopwidget.h b/src/komposedesktopwidget.h index 83db0ca..f00e8a6 100644 --- a/src/komposedesktopwidget.h +++ b/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; }; diff --git a/src/komposefullscreenwidget.cpp b/src/komposefullscreenwidget.cpp index 9c8f3e0..07229a7 100644 --- a/src/komposefullscreenwidget.cpp +++ b/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(); // } diff --git a/src/komposefullscreenwidget.h b/src/komposefullscreenwidget.h index 226736c..f509b81 100644 --- a/src/komposefullscreenwidget.h +++ b/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; diff --git a/src/komposegldesktopwidget.cpp b/src/komposegldesktopwidget.cpp index 2c33135..6b8d857 100644 --- a/src/komposegldesktopwidget.cpp +++ b/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> it( tl ); KomposeTask *task; while ( (task = it.current()) != 0 ) { ++it; - Q_CHECK_PTR(task); + TQ_CHECK_PTR(task); createTaskWidget( task ); } } @@ -58,26 +58,26 @@ void KomposeGLDesktopWidget::createTaskWidget( KomposeTask* task ) { if (deskNum == task->onDesktop()-1 ) { - qDebug("KomposeGLDesktopWidget::createTaskWidget()" ); + tqDebug("KomposeGLDesktopWidget::createTaskWidget()" ); KomposeGLTaskWidget *taskwidget = new KomposeGLTaskWidget( task, this, 0, "" ); } } int KomposeGLDesktopWidget::getHeightForWidth( int w ) const { - qDebug("KomposeGLDesktopWidget::getHeightForWidth()"); + tqDebug("KomposeGLDesktopWidget::getHeightForWidth()"); return ((double)w / (double)deskRect.width()) * deskRect.height(); } int KomposeGLDesktopWidget::getWidthForHeight( int h ) const { - qDebug("KomposeGLDesktopWidget::getWidthForHeight()"); + tqDebug("KomposeGLDesktopWidget::getWidthForHeight()"); return ((double)h / (double)deskRect.height()) * deskRect.width(); } double KomposeGLDesktopWidget::getAspectRatio() { - qDebug("KomposeGLDesktopWidget::getAspectRatio()"); + tqDebug("KomposeGLDesktopWidget::getAspectRatio()"); return (double)deskRect.width() / (double)deskRect.height(); } @@ -85,7 +85,7 @@ double KomposeGLDesktopWidget::getAspectRatio() void KomposeGLDesktopWidget::draw() { KomposeGLWidget::draw(); - qDebug("KomposeGLDesktopWidget::draw() - %d,%d %dx%d", getRect().x(), getRect().y(), getRect().width(), getRect().height()); + tqDebug("KomposeGLDesktopWidget::draw() - %d,%d %dx%d", getRect().x(), getRect().y(), getRect().width(), getRect().height()); glColor3f(0.0f, 0.0f, 1.0f); glBegin( GL_QUADS ); @@ -96,12 +96,12 @@ void KomposeGLDesktopWidget::draw() glEnd(); // Draw Task Widgets - QPtrListIterator<KomposeGLWidget> it( list ); + TQPtrListIterator<KomposeGLWidget> it( list ); // Check or empty list if (it.count() == 0) { - qDebug("KomposeGLDesktopWidget::draw() - empty list... skipping!"); + tqDebug("KomposeGLDesktopWidget::draw() - empty list... skipping!"); return; } diff --git a/src/komposeglfullscreenwidget.cpp b/src/komposeglfullscreenwidget.cpp index 095a1de..774b6ff 100644 --- a/src/komposeglfullscreenwidget.cpp +++ b/src/komposeglfullscreenwidget.cpp @@ -19,13 +19,13 @@ #include <GL/gl.h> #include <GL/glut.h> -KomposeGLFullscreenWidget::KomposeGLFullscreenWidget(QWidget *parent, const char *name) : - QGLWidget(parent, name) +KomposeGLFullscreenWidget::KomposeGLFullscreenWidget(TQWidget *parent, const char *name) : + TQGLWidget(parent, name) { - qDebug("KomposeGLFullscreenWidget::KomposeGLFullscreenWidget()"); + tqDebug("KomposeGLFullscreenWidget::KomposeGLFullscreenWidget()"); layout = new KomposeLayout( this ); - setWindowState(Qt::WindowMaximized | Qt::WindowActive); + setWindowState(TQt::WindowMaximized | TQt::WindowActive); showFullScreen(); createDesktopWidgets(); @@ -42,7 +42,7 @@ void KomposeGLFullscreenWidget::createDesktopWidgets() { int row = i / 2; int col = i % 2; - //qDebug("rc %d %d", row, col); + //tqDebug("rc %d %d", row, col); desktop[i] = new KomposeGLDesktopWidget(i, this); layout->add(dynamic_cast<KomposeWidgetInterface*>(desktop[i])); } @@ -53,13 +53,13 @@ void KomposeGLFullscreenWidget::initializeGL() // Set up the rendering context, define display lists etc.: if( !format().hasOpenGL() ) { - qWarning( "KomposeGLFullscreenWidget::initializeGL() - OpenGL not supported!" ); + tqWarning( "KomposeGLFullscreenWidget::initializeGL() - OpenGL not supported!" ); return; } if ( !format().doubleBuffer() ) { - qWarning( "KomposeGLFullscreenWidget::initializeGL() - Direct rendering enabled !" ); + tqWarning( "KomposeGLFullscreenWidget::initializeGL() - Direct rendering enabled !" ); } // glShadeModel(GL_SMOOTH); // @@ -106,10 +106,10 @@ void KomposeGLFullscreenWidget::resizeGL( int w, int h ) } -/*! draw OpenGL scene ( called from Qt ) */ +/*! draw OpenGL scene ( called from TQt ) */ void KomposeGLFullscreenWidget::paintGL() { - qDebug("KomposeGLFullscreenWidget::paintGL()"); + tqDebug("KomposeGLFullscreenWidget::paintGL()"); glPushMatrix(); @@ -130,7 +130,7 @@ void KomposeGLFullscreenWidget::paintGL() void KomposeGLFullscreenWidget::setOrthographicProjection() { - qDebug("KomposeGLFullscreenWidget::setOrthographicProjection() - %dx%d", width(), height()); + tqDebug("KomposeGLFullscreenWidget::setOrthographicProjection() - %dx%d", width(), height()); glViewport( 0, 0, (GLint)width(), (GLint)height() ); // switch to projection mode glMatrixMode(GL_PROJECTION); @@ -146,31 +146,31 @@ void KomposeGLFullscreenWidget::setOrthographicProjection() glMatrixMode(GL_MODELVIEW);; } -// Redirect these functions to QGLWidget +// Redirect these functions to TQGLWidget -void KomposeGLFullscreenWidget::setGeom ( const QRect &rect ) +void KomposeGLFullscreenWidget::setGeom ( const TQRect &rect ) { - QGLWidget::setGeometry( rect ); + TQGLWidget::setGeometry( rect ); } -void KomposeGLFullscreenWidget::setGeom ( const QSize &size ) +void KomposeGLFullscreenWidget::setGeom ( const TQSize &size ) { - QGLWidget::resize( size ); + TQGLWidget::resize( size ); } -QSize KomposeGLFullscreenWidget::getSize() const +TQSize KomposeGLFullscreenWidget::getSize() const { - return QGLWidget::size(); + return TQGLWidget::size(); } -QRect KomposeGLFullscreenWidget::getRect() const +TQRect KomposeGLFullscreenWidget::getRect() const { - return QGLWidget::rect(); + return TQGLWidget::rect(); } void KomposeGLFullscreenWidget::removeChildWidget( KomposeWidgetInterface* obj ) { - QGLWidget::removeChild((QObject *) obj); + TQGLWidget::removeChild((TQObject *) obj); } #include "komposeglfullscreenwidget.moc" diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp index a03b1d4..f2a1a35 100644 --- a/src/komposeglobal.cpp +++ b/src/komposeglobal.cpp @@ -17,7 +17,7 @@ #include "komposesettings.h" #include "komposesystray.h" -#include <qtimer.h> +#include <tqtimer.h> #include <kapplication.h> #include <kpopupmenu.h> @@ -36,7 +36,7 @@ #include <dcopclient.h> -// #include those AFTER Qt-includes! +// #include those AFTER TQt-includes! #include <X11/Xlib.h> #include <X11/Xutil.h> #include <Imlib2.h> @@ -51,7 +51,7 @@ static KomposeGlobal* globalInstance = 0; Display *disp; -static QString wallpaperForDesktop(int desktop) +static TQString wallpaperForDesktop(int desktop) { return DCOPRef("kdesktop", "KBackgroundIface").call("currentWallpaper", desktop); } @@ -69,8 +69,8 @@ KomposeGlobal* KomposeGlobal::instance() return globalInstance; } -KomposeGlobal::KomposeGlobal(QObject *parent, const char *name) - : QObject(parent, name), +KomposeGlobal::KomposeGlobal(TQObject *parent, const char *name) + : TQObject(parent, name), aboutDialogOpen(0), hideSystray( false ), singleShot( false ), @@ -151,7 +151,7 @@ void KomposeGlobal::initGui() */ void KomposeGlobal::initActions() { - actionCollection = new KActionCollection( (QWidget*)0 ); + actionCollection = new KActionCollection( (TQWidget*)0 ); // Actions actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection ); @@ -190,9 +190,9 @@ void KomposeGlobal::initSharedPixmaps() // When Kompose is started by session management the bg shared pixmap may not be available yet if (!desktopBgPixmap->isAvailable( pixmapName(1) )) { - qWarning("KomposeGlobal::initSharedPixmaps() - Pixmap not available"); + tqWarning("KomposeGlobal::initSharedPixmaps() - Pixmap not available"); //enablePixmapExports(); - QTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) ); + TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) ); //initSharedPixmaps(); //return; } @@ -229,14 +229,14 @@ void KomposeGlobal::refreshSharedPixmaps() desktopBgPixmap->loadFromShared( pixmapName(currentDesktop) ); } -QString KomposeGlobal::pixmapName(int desk) +TQString KomposeGlobal::pixmapName(int desk) { // To simplify things we take the background of the first desktop - QString pattern = QString("DESKTOP%1"); - int screen_number = DefaultScreen(qt_xdisplay()); + TQString pattern = TQString("DESKTOP%1"); + int screen_number = DefaultScreen(tqt_xdisplay()); if (screen_number) { - pattern = QString("SCREEN%1-DESKTOP").arg(screen_number) + "%1"; + pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1"; } return pattern.arg( desk ); } @@ -246,7 +246,7 @@ void KomposeGlobal::slotDone(bool success) if (!success) { kdDebug() << "KomposeGlobal::slotDone() - loading of desktop background failed.\n" << endl; - //QTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) ); + //TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) ); } } @@ -257,12 +257,12 @@ void KomposeGlobal::enablePixmapExports() DCOPClient *client = kapp->dcopClient(); if (!client->isAttached()) client->attach(); - QByteArray data; - QDataStream args( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream args( data, IO_WriteOnly ); args << 1; - QCString appname( "kdesktop" ); - int screen_number = DefaultScreen(qt_xdisplay()); + TQCString appname( "kdesktop" ); + int screen_number = DefaultScreen(tqt_xdisplay()); if ( screen_number ) appname.sprintf("kdesktop-screen-%d", screen_number ); @@ -301,7 +301,7 @@ void KomposeGlobal::initImlib() Visual *vis; Colormap cm; //int screen; - disp = QPaintDevice::x11AppDisplay(); + disp = TQPaintDevice::x11AppDisplay(); vis = DefaultVisual(disp, DefaultScreen(disp)); cm = DefaultColormap(disp, DefaultScreen(disp)); // context = imlib_context_new(); @@ -328,7 +328,7 @@ void KomposeGlobal::initCompositeExt() xcomposite = false; #ifdef COMPOSITE // Check for XComposite - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); int event_base, error_base; if ( XCompositeQueryExtension( dpy, &event_base, &error_base ) ) diff --git a/src/komposeglobal.h b/src/komposeglobal.h index de39dab..9e56ae0 100644 --- a/src/komposeglobal.h +++ b/src/komposeglobal.h @@ -14,8 +14,8 @@ class KomposeSysTray; -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> class KPopupMenu; class KActionCollection; @@ -27,18 +27,18 @@ class KWinModule; #include <config.h> #endif -#if defined(Q_WS_X11) && defined(HAVE_XCOMPOSITE) && defined(HAVE_XDAMAGE) && QT_VERSION >= 0x030300 +#if defined(Q_WS_X11) && defined(HAVE_XCOMPOSITE) && defined(HAVE_XDAMAGE) && TQT_VERSION >= 0x030300 # define COMPOSITE #endif /** @author Hans Oischinger */ -class KomposeGlobal : public QObject +class KomposeGlobal : public TQObject { Q_OBJECT protected: - KomposeGlobal(QObject *parent = 0, const char *name = 0); + KomposeGlobal(TQObject *parent = 0, const char *name = 0); ~KomposeGlobal(); @@ -71,7 +71,7 @@ protected: protected slots: void initSharedPixmaps(); - QString pixmapName(int desk); + TQString pixmapName(int desk); void slotDone(bool success); void enablePixmapExports(); void slotDesktopChanged(int desktop); diff --git a/src/komposegltaskwidget.cpp b/src/komposegltaskwidget.cpp index 69e1927..a2a7217 100644 --- a/src/komposegltaskwidget.cpp +++ b/src/komposegltaskwidget.cpp @@ -16,18 +16,18 @@ #include "komposelayout.h" #include <kdebug.h> -#include <qgl.h> -#include <qimage.h> +#include <tqgl.h> +#include <tqimage.h> -KomposeGLTaskWidget::KomposeGLTaskWidget(KomposeTask *t, QObject *parent, KomposeLayout *l, const char *name) +KomposeGLTaskWidget::KomposeGLTaskWidget(KomposeTask *t, TQObject *parent, KomposeLayout *l, const char *name) : KomposeGLWidget(parent, l), task(t) { - QImage img = task->getScreenshot().convertToImage(); - img = img.smoothScale( 256, 256, QImage::ScaleMin ); - tex = QGLWidget::convertToGLFormat( img ); + TQImage img = task->getScreenshot().convertToImage(); + img = img.smoothScale( 256, 256, TQImage::ScaleMin ); + tex = TQGLWidget::convertToGLFormat( img ); glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); /* glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); // cheap scaling when image bigger than texture @@ -65,26 +65,26 @@ void KomposeGLTaskWidget::slotTaskDestroyed() int KomposeGLTaskWidget::getHeightForWidth ( int w ) const { - qDebug("KomposeGLTaskWidget::getHeightForWidth()"); + tqDebug("KomposeGLTaskWidget::getHeightForWidth()"); return task->getHeightForWidth(w); } int KomposeGLTaskWidget::getWidthForHeight ( int h ) const { - qDebug("KomposeGLTaskWidget::getWidthForHeight()"); + tqDebug("KomposeGLTaskWidget::getWidthForHeight()"); return task->getWidthForHeight(h); } double KomposeGLTaskWidget::getAspectRatio() { - qDebug("KomposeGLTaskWidget::getAspectRatio()"); + tqDebug("KomposeGLTaskWidget::getAspectRatio()"); return task->getAspectRatio(); } void KomposeGLTaskWidget::draw() { KomposeGLWidget::draw(); - qDebug("KomposeGLTaskWidget::draw() - %d,%d %dx%d", getRect().x(), getRect().y(), getRect().width(), getRect().height()); + tqDebug("KomposeGLTaskWidget::draw() - %d,%d %dx%d", getRect().x(), getRect().y(), getRect().width(), getRect().height()); glColor3f(1.0f, 0.0f, 0.0f); glBindTexture(GL_TEXTURE_2D, texture); @@ -96,7 +96,7 @@ void KomposeGLTaskWidget::draw() // glTexImage2D( GL_TEXTURE_2D, 0, 3, tex.width(), tex.height(), 0, // GL_RGBA, GL_UNSIGNED_BYTE, tex.bits() ); - // qDebug("KomposeGLTaskWidget::draw() - tex: %dx%d", tex.width(), tex.height() ); + // tqDebug("KomposeGLTaskWidget::draw() - tex: %dx%d", tex.width(), tex.height() ); glBegin( GL_QUADS ); glTexCoord2f(0.0, 0.0); diff --git a/src/komposeglwidget.cpp b/src/komposeglwidget.cpp index 5ce4cff..14c6d5d 100644 --- a/src/komposeglwidget.cpp +++ b/src/komposeglwidget.cpp @@ -20,17 +20,17 @@ #include "komposeglwidget.h" #include "komposelayout.h" -#include <qtimer.h> +#include <tqtimer.h> #include <kdebug.h> /* * The constructor accepts a custom layout, if none is specified a defaultlayout is used */ -KomposeGLWidget::KomposeGLWidget(QObject *parent, KomposeLayout *l, const char *name) - : QObject(parent) +KomposeGLWidget::KomposeGLWidget(TQObject *parent, KomposeLayout *l, const char *name) + : TQObject(parent) { - geometry = QRect(0,0,1,1); + geometry = TQRect(0,0,1,1); if (!l) layout = new KomposeLayout( this ); else @@ -45,27 +45,27 @@ KomposeGLWidget::~KomposeGLWidget() /* * Whenever a child is added to the widget it's also added to the layout */ -void KomposeGLWidget::childEvent ( QChildEvent * ce ) +void KomposeGLWidget::childEvent ( TQChildEvent * ce ) { if ( !ce->child()->inherits("KomposeGLWidget") ) return; if ( ce->inserted() ) { - qDebug("KomposeGLWidget::childEvent : Added widget " << ce->child()->className() << " to " << className() << endl; + tqDebug("KomposeGLWidget::childEvent : Added widget " << ce->child()->className() << " to " << className() << endl; list.append( dynamic_cast<KomposeGLWidget*>(ce->child()) ); layout->add( dynamic_cast<KomposeWidgetInterface*>(ce->child()) ); } else if ( ce->removed() ) { - qDebug("KomposeGLWidget::childEvent : Removed widget %s from %s", ce->child()->className(), className() ); + tqDebug("KomposeGLWidget::childEvent : Removed widget %s from %s", ce->child()->className(), className() ); list.remove( dynamic_cast<KomposeGLWidget*>(ce->child()) ); layout->remove( dynamic_cast<KomposeWidgetInterface*>(ce->child()) ); } // Whenever a child is added/removed: rearrange layout // FIXME: sometimes widget's aren't added in time, so we have to add a short delay: - QTimer::singleShot( 200, layout, SLOT( arrangeLayout() ) ); + TQTimer::singleShot( 200, layout, SLOT( arrangeLayout() ) ); } /* @@ -73,47 +73,47 @@ void KomposeGLWidget::childEvent ( QChildEvent * ce ) */ void KomposeGLWidget::draw() { - qDebug("KomposeGLWidget::draw - Arranging layout"); + tqDebug("KomposeGLWidget::draw - Arranging layout"); layout->arrangeLayout(); } -// Redirect these functions to QWidget +// Redirect these functions to TQWidget -void KomposeGLWidget::setGeom ( const QRect &rect ) +void KomposeGLWidget::setGeom ( const TQRect &rect ) { geometry = rect; } -void KomposeGLWidget::setGeom ( const QSize &size ) +void KomposeGLWidget::setGeom ( const TQSize &size ) { geometry.setSize( size ); } -QSize KomposeGLWidget::getSize() const +TQSize KomposeGLWidget::getSize() const { return geometry.size(); } -QRect KomposeGLWidget::getRect() const +TQRect KomposeGLWidget::getRect() const { return geometry; } KomposeWidgetInterface* KomposeGLWidget::getParentWidget() const { - if ( QObject::parent()->inherits("KomposeWidgetInterface") ) - return (KomposeWidgetInterface*)QObject::parent(); + if ( TQObject::parent()->inherits("KomposeWidgetInterface") ) + return (KomposeWidgetInterface*)TQObject::parent(); else { - qDebug("KomposeGLWidget::getParentWidget() - QWidget::parent() does not inherit (KomposeWidgetInterface)"); + tqDebug("KomposeGLWidget::getParentWidget() - TQWidget::parent() does not inherit (KomposeWidgetInterface)"); return NULL; } } void KomposeGLWidget::removeChildWidget( KomposeWidgetInterface* obj ) { - QObject::removeChild((QObject *) obj); + TQObject::removeChild((TQObject *) obj); } #include "komposeglwidget.moc" diff --git a/src/komposeimage.cpp b/src/komposeimage.cpp index c542796..9713191 100644 --- a/src/komposeimage.cpp +++ b/src/komposeimage.cpp @@ -16,7 +16,7 @@ KomposeImage::KomposeImage( Imlib_Image& im ) - : QObject( 0L, 0L ), + : TQObject( 0L, 0L ), bhasImage(true), bhasSourcePixmap(false), lasteffect( IEFFECT_NONE ), @@ -34,7 +34,7 @@ KomposeImage::KomposeImage( Imlib_Image& im ) KomposeImage::KomposeImage() - : QObject( 0L, 0L ), + : TQObject( 0L, 0L ), bhasImage(false), bhasSourcePixmap(false), lasteffect( IEFFECT_NONE ), @@ -66,7 +66,7 @@ void KomposeImage::clearCached() if ( !KomposeSettings::instance()->getCacheScaledPixmaps() ) { - myQPixmap.resize(0,0); + myTQPixmap.resize(0,0); myIsDirty = true; } } @@ -76,7 +76,7 @@ void KomposeImage::init() myOrigWidth = myWidth; myOrigHeight = myHeight; - myQPixmap.setOptimization( QPixmap::BestOptim ); + myTQPixmap.setOptimization( TQPixmap::BestOptim ); // Create highlight color modifier cmHighlight = imlib_create_color_modifier(); @@ -103,16 +103,16 @@ void KomposeImage::setImage( Imlib_Image &im ) imlib_context_set_image( myIm ); myOrigWidth = imlib_image_get_width(); myOrigHeight = imlib_image_get_height(); - qDebug("KomposeTask::setImage() - Set Image: size:" << myWidth << "x" << myHeight << endl; + tqDebug("KomposeTask::setImage() - Set Image: size:" << myWidth << "x" << myHeight << endl; } myIsDirty = true; bhasImage = true; } -void KomposeImage::setImage( QPixmap &pm ) +void KomposeImage::setImage( TQPixmap &pm ) { - mySourceQPixmap = pm; + mySourceTQPixmap = pm; bhasSourcePixmap = true; myOrigWidth = pm.width(); @@ -126,23 +126,23 @@ void KomposeImage::createImageFromPixmap() if ( !bhasSourcePixmap ) return; - qDebug("KomposeImage::createImageFromPixmap()"); - imlib_context_set_drawable( mySourceQPixmap.handle() ); + tqDebug("KomposeImage::createImageFromPixmap()"); + imlib_context_set_drawable( mySourceTQPixmap.handle() ); if ( !KomposeSettings::instance()->getImageEffects() ) { - Imlib_Image img = imlib_create_image_from_drawable((Pixmap)0, 0, 0, mySourceQPixmap.width(), mySourceQPixmap.height(), 1); + Imlib_Image img = imlib_create_image_from_drawable((Pixmap)0, 0, 0, mySourceTQPixmap.width(), mySourceTQPixmap.height(), 1); setImage( img ); } else { - Imlib_Image imgOrig = imlib_create_image_from_drawable((Pixmap)0, 0, 0, mySourceQPixmap.width(), mySourceQPixmap.height(), 1); + Imlib_Image imgOrig = imlib_create_image_from_drawable((Pixmap)0, 0, 0, mySourceTQPixmap.width(), mySourceTQPixmap.height(), 1); imlib_context_set_anti_alias(1); imlib_context_set_image( imgOrig ); - Imlib_Image img = imlib_create_cropped_scaled_image(0, 0, mySourceQPixmap.width(), mySourceQPixmap.height(), myWidth, myHeight); + Imlib_Image img = imlib_create_cropped_scaled_image(0, 0, mySourceTQPixmap.width(), mySourceTQPixmap.height(), myWidth, myHeight); imlib_free_image(); setImage( img ); @@ -166,7 +166,7 @@ void KomposeImage::resize( int width, int height ) myIsDirty = true; } -QPixmap* KomposeImage::qpixmap( int effect ) +TQPixmap* KomposeImage::qpixmap( int effect ) { if ( KomposeSettings::instance()->getImageEffects() && (lasteffect != effect ) ) { @@ -177,7 +177,7 @@ QPixmap* KomposeImage::qpixmap( int effect ) if ( myIsDirty) renderPixmap(); - return &myQPixmap; + return &myTQPixmap; } @@ -194,7 +194,7 @@ void KomposeImage::renderPixmap() else if ( !bhasImage && !bhasSourcePixmap ) return; - qDebug("KomposeImage::renderPixmap() - Creating %dx%d pixmap", myWidth, myHeight); + tqDebug("KomposeImage::renderPixmap() - Creating %dx%d pixmap", myWidth, myHeight); imlib_context_set_image( myIm ); imlib_image_set_has_alpha(0); @@ -202,9 +202,9 @@ void KomposeImage::renderPixmap() if ( KomposeSettings::instance()->getImageEffects() ) applyEffect(); - myQPixmap.resize( myWidth, myHeight); + myTQPixmap.resize( myWidth, myHeight); - imlib_context_set_drawable(myQPixmap.handle()); + imlib_context_set_drawable(myTQPixmap.handle()); imlib_context_set_anti_alias(1); imlib_render_image_on_drawable_at_size(0, 0, myWidth, myHeight); diff --git a/src/komposeimage.h b/src/komposeimage.h index 3fa5c25..77c335c 100644 --- a/src/komposeimage.h +++ b/src/komposeimage.h @@ -12,11 +12,11 @@ #ifndef KOMPOSEIMAGE_H #define KOMPOSEIMAGE_H -#include <qobject.h> -#include <qstring.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqpixmap.h> -// #include those AFTER Qt-includes! +// #include those AFTER TQt-includes! #include <X11/Xlib.h> #include <X11/Xutil.h> #include <Imlib2.h> @@ -26,7 +26,7 @@ enum ImageEffect { IEFFECT_NONE, IEFFECT_TITLE, IEFFECT_MINIMIZED, IEFFECT_MINIM /** @author Hans Oischinger */ -class KomposeImage : public QObject +class KomposeImage : public TQObject { Q_OBJECT @@ -42,7 +42,7 @@ public: void resize( int width, int height ); - QPixmap* qpixmap( int effect ); + TQPixmap* qpixmap( int effect ); void renderPixmap(); void setDirty( bool d ) { myIsDirty = d; } @@ -50,7 +50,7 @@ public: bool isValid() { return bhasImage || bhasSourcePixmap; } bool hasImage() { return bhasImage; } void setImage( Imlib_Image &im ); - void setImage( QPixmap &pm ); + void setImage( TQPixmap &pm ); public slots: void clearCached(); @@ -65,8 +65,8 @@ private: int myHeight; Imlib_Image myIm; - QPixmap myQPixmap; - QPixmap mySourceQPixmap; + TQPixmap myTQPixmap; + TQPixmap mySourceTQPixmap; Imlib_Color_Modifier cmHighlight, cmMinimized; diff --git a/src/komposelayout.cpp b/src/komposelayout.cpp index 5dfd1a9..178ec2b 100644 --- a/src/komposelayout.cpp +++ b/src/komposelayout.cpp @@ -31,7 +31,7 @@ KomposeLayout::KomposeLayout( KomposeWidget *parent, int type, int dist, const char *name ) - : QObject(parent, name), + : TQObject(parent, name), spacing(dist), widgetsChanged(false), currentRows(0), @@ -39,7 +39,7 @@ KomposeLayout::KomposeLayout( KomposeWidget *parent, int type, int dist, const c parentWidget(parent) { setType( type ); - currentSize = QSize( 1, 1 ); + currentSize = TQSize( 1, 1 ); } KomposeLayout::~KomposeLayout() @@ -92,7 +92,7 @@ void KomposeLayout::rearrangeContents() emptyContainers.clear(); // Check for empty containers - QPtrListIterator<KomposeWidget> it( list ); + TQPtrListIterator<KomposeWidget> it( list ); KomposeWidget *task; while ( (task = it.current()) != 0 ) { @@ -110,7 +110,7 @@ void KomposeLayout::rearrangeContents() } // Arrange filled containers - QRect filledRect( 0, + TQRect filledRect( 0, 0, parentWidget->width(), parentWidget->height() - ( 40 + 2*spacing ) ); @@ -118,7 +118,7 @@ void KomposeLayout::rearrangeContents() rearrangeContents( filledRect, filledContainers ); // Arrange empty containers - QRect emptyRect( 0, + TQRect emptyRect( 0, parentWidget->height() - ( 40 + 2*spacing ), parentWidget->width(), ( 40 + 2*spacing ) ); @@ -129,7 +129,7 @@ void KomposeLayout::rearrangeContents() } else // default type (generic) { - QRect availRect( 0, + TQRect availRect( 0, 0, parentWidget->width(), parentWidget->height()); @@ -146,7 +146,7 @@ void KomposeLayout::rearrangeContents() * availRect specifies the size&pos of the contents * Specify either rows or cols to set a fixed number of those (setting both won't work correctly) */ -void KomposeLayout::rearrangeContents( const QRect& availRect, const QPtrList<KomposeWidget> widgets, int rows, int columns, bool setMemberRowsCols ) +void KomposeLayout::rearrangeContents( const TQRect& availRect, const TQPtrList<KomposeWidget> widgets, int rows, int columns, bool setMemberRowsCols ) { // Check or empty list if (widgets.count() == 0) @@ -155,7 +155,7 @@ void KomposeLayout::rearrangeContents( const QRect& availRect, const QPtrList<Ko return; } - QPtrListIterator<KomposeWidget> it( widgets ); + TQPtrListIterator<KomposeWidget> it( widgets ); // Calculate grid's rows & cols if ( rows != -1 ) // rows have been specified @@ -188,8 +188,8 @@ void KomposeLayout::rearrangeContents( const QRect& availRect, const QPtrList<Ko int w = (availRect.width() - (columns+1) * spacing ) / columns; int h = (availRect.height() - (rows+1) * spacing ) / rows; - QValueList<QRect> geometryRects; - QValueList<int> maxRowHeights; + TQValueList<TQRect> geometryRects; + TQValueList<int> maxRowHeights; // Process rows for ( int i=0; i<rows; ++i ) { @@ -259,7 +259,7 @@ void KomposeLayout::rearrangeContents( const QRect& availRect, const QPtrList<Ko alignmentYoffset = h - widgeth; if ( j==0 && w > widgetw ) alignmentXoffset = w - widgetw; - QRect geom( availRect.x() + j * (w + spacing) + spacing + alignmentXoffset + xOffsetFromLastCol, + TQRect geom( availRect.x() + j * (w + spacing) + spacing + alignmentXoffset + xOffsetFromLastCol, availRect.y() + i * (h + spacing) + spacing + alignmentYoffset, widgetw, widgeth ); geometryRects.append(geom); @@ -274,8 +274,8 @@ void KomposeLayout::rearrangeContents( const QRect& availRect, const QPtrList<Ko } it.toFirst(); - QValueList<QRect>::iterator geomIt = geometryRects.begin(); - QValueList<int>::iterator maxRowHeightIt = maxRowHeights.begin(); + TQValueList<TQRect>::iterator geomIt = geometryRects.begin(); + TQValueList<int>::iterator maxRowHeightIt = maxRowHeights.begin(); int topOffset = 0; for ( int i=0; i<rows; ++i ) { @@ -286,7 +286,7 @@ void KomposeLayout::rearrangeContents( const QRect& availRect, const QPtrList<Ko if ( (task = it.current()) == 0) break; - QRect geom = *geomIt; + TQRect geom = *geomIt; geom.setY( geom.y() + topOffset ); // geom.setHeight( geom.height() - topOffset ); task->setGeometry( geom ); @@ -345,12 +345,12 @@ KomposeWidget* KomposeLayout::getNeighbour( const KomposeWidget* widget, int dir * Search for neighbour in the given list (called from inside) */ KomposeWidget* KomposeLayout::getNeighbour( - QPtrList<KomposeWidget> listToSearch, + TQPtrList<KomposeWidget> listToSearch, const KomposeWidget* widget, int direction, int wrap ) { - QPtrListIterator<KomposeWidget> it( listToSearch ); + TQPtrListIterator<KomposeWidget> it( listToSearch ); KomposeWidget *task; KomposeWidget *neighbour; diff --git a/src/komposelayout.h b/src/komposelayout.h index ebb94bb..9bd088d 100644 --- a/src/komposelayout.h +++ b/src/komposelayout.h @@ -20,12 +20,12 @@ #ifndef KOMPOSELAYOUT_H #define KOMPOSELAYOUT_H -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> #include "komposewidget.h" -class QRect; +class TQRect; enum LayoutType { TLAYOUT_GENERIC, // layouts all KomposeWidget classes TLAYOUT_TASKCONTAINERS // layouts containers only @@ -37,11 +37,11 @@ enum WrapDirections { WLAYOUT_NONE, WLAYOUT_HORIZONTAL, WLAYOUT_VERTICAL, WLAYOU /** The main layout class. -QLayout just didn't fit :( +TQLayout just didn't fit :( @author Hans Oischinger */ -class KomposeLayout : public QObject +class KomposeLayout : public TQObject { Q_OBJECT public: @@ -54,7 +54,7 @@ public: void setType( int t ); int getType() { return layoutType; } - const QPtrList<KomposeWidget> *getManagedWidgets() { return &list; } + const TQPtrList<KomposeWidget> *getManagedWidgets() { return &list; } int getNumofChilds() { return list.count(); } KomposeWidget* getNeighbour( const KomposeWidget* widget, int direction = DLAYOUT_RIGHT, @@ -64,25 +64,25 @@ public slots: void arrangeLayout(); protected: - KomposeWidget* getNeighbour( QPtrList<KomposeWidget> listToSearch, + KomposeWidget* getNeighbour( TQPtrList<KomposeWidget> listToSearch, const KomposeWidget* widget, int direction = DLAYOUT_RIGHT, int wrap = WLAYOUT_NONE ); void rearrangeContents(); - void rearrangeContents( const QRect& availRect, - const QPtrList<KomposeWidget> widgets, + void rearrangeContents( const TQRect& availRect, + const TQPtrList<KomposeWidget> widgets, int rows = -1, int columns = -1, bool setMemberRowsCols = true ); private: // List of all managed childs - QPtrList<KomposeWidget> list; + TQPtrList<KomposeWidget> list; // List of container childs seperated by empty/full - QPtrList<KomposeWidget> filledContainers; - QPtrList<KomposeWidget> emptyContainers; + TQPtrList<KomposeWidget> filledContainers; + TQPtrList<KomposeWidget> emptyContainers; - QSize currentSize; + TQSize currentSize; int layoutType; int spacing; bool widgetsChanged; diff --git a/src/komposepreferences.cpp b/src/komposepreferences.cpp index 45dd7f0..91c4d7a 100644 --- a/src/komposepreferences.cpp +++ b/src/komposepreferences.cpp @@ -14,21 +14,21 @@ #include "komposesettings.h" #include "komposeglobal.h" -#include <qlayout.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <kapplication.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qspinbox.h> -#include <qgroupbox.h> -#include <qbuttongroup.h> -#include <qhbox.h> -#include <qslider.h> -#include <qpushbutton.h> -#include <qgrid.h> -#include <qvgroupbox.h> -#include <qradiobutton.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqspinbox.h> +#include <tqgroupbox.h> +#include <tqbuttongroup.h> +#include <tqhbox.h> +#include <tqslider.h> +#include <tqpushbutton.h> +#include <tqgrid.h> +#include <tqvgroupbox.h> +#include <tqradiobutton.h> #include <kiconloader.h> #include <kcolorbutton.h> @@ -38,120 +38,120 @@ KomposePreferences::KomposePreferences() : KDialogBase(IconList, i18n("Komposé Preferences"), Ok|Apply|Cancel, Ok) { // FIXME: this is the biggest constructor I've EVER written! - // How about Qt Designer?! - m_hasXinerama = QDesktopWidget().numScreens() > 1; + // How about TQt Designer?! + m_hasXinerama = TQDesktopWidget().numScreens() > 1; - QFrame *page1 = addPage( i18n("Behavior"), QString::null, DesktopIcon("winprops", KIcon::SizeMedium) ); - QFrame *page2 = addPage( i18n("Appearance"), QString::null, DesktopIcon("appearance", KIcon::SizeMedium) ); - QFrame *page3 = addPage( i18n("Layouts"), QString::null, DesktopIcon("window_list", KIcon::SizeMedium) ); + TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", KIcon::SizeMedium) ); + TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", KIcon::SizeMedium) ); + TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", KIcon::SizeMedium) ); - QVBoxLayout *page1Layout = new QVBoxLayout( page1, 0, KDialog::spacingHint() ); + TQVBoxLayout *page1Layout = new TQVBoxLayout( page1, 0, KDialog::spacingHint() ); - defaultViewBtnGroup = new QButtonGroup( 2, Horizontal, i18n("Default Layout"), page1 ); + defaultViewBtnGroup = new TQButtonGroup( 2, Horizontal, i18n("Default Layout"), page1 ); defaultViewBtnGroup->setExclusive( true ); - QString defaultViewBtnGroupHelp = i18n("Determines which view should be started by default (e.g. when you click on the systray icon)."); - QWhatsThis::add( defaultViewBtnGroup, defaultViewBtnGroupHelp ); - QToolTip::add( defaultViewBtnGroup, defaultViewBtnGroupHelp ); - defaultViewWorld = new QRadioButton(i18n("Ungrouped"), defaultViewBtnGroup ); - QString defaultViewWorldHelp = i18n("Fullscreen layout that shows all windows in no specific order"); - QWhatsThis::add( defaultViewWorld, defaultViewWorldHelp ); - QToolTip::add( defaultViewWorld, defaultViewWorldHelp ); - defaultViewVirtualDesks = new QRadioButton(i18n("Grouped by virtual desktops"), defaultViewBtnGroup ); - QString defaultViewVirtualDesksHelp = i18n("Fullscreen layout that shows a representation of your virtual desktops\n and places the windows inside."); - QWhatsThis::add( defaultViewVirtualDesks, defaultViewVirtualDesksHelp ); - QToolTip::add( defaultViewVirtualDesks, defaultViewVirtualDesksHelp ); - defaultViewCurrentDesk = new QRadioButton(i18n("Current virtual desktop"), defaultViewBtnGroup ); - QString defaultViewCurrentDeskHelp = i18n("Fullscreen layout that shows the windows of the desktop you're currently working on."); - QWhatsThis::add( defaultViewCurrentDesk, defaultViewCurrentDeskHelp ); - QToolTip::add( defaultViewCurrentDesk, defaultViewCurrentDeskHelp ); + TQString defaultViewBtnGroupHelp = i18n("Determines which view should be started by default (e.g. when you click on the systray icon)."); + TQWhatsThis::add( defaultViewBtnGroup, defaultViewBtnGroupHelp ); + TQToolTip::add( defaultViewBtnGroup, defaultViewBtnGroupHelp ); + defaultViewWorld = new TQRadioButton(i18n("Ungrouped"), defaultViewBtnGroup ); + TQString defaultViewWorldHelp = i18n("Fullscreen layout that shows all windows in no specific order"); + TQWhatsThis::add( defaultViewWorld, defaultViewWorldHelp ); + TQToolTip::add( defaultViewWorld, defaultViewWorldHelp ); + defaultViewVirtualDesks = new TQRadioButton(i18n("Grouped by virtual desktops"), defaultViewBtnGroup ); + TQString defaultViewVirtualDesksHelp = i18n("Fullscreen layout that shows a representation of your virtual desktops\n and places the windows inside."); + TQWhatsThis::add( defaultViewVirtualDesks, defaultViewVirtualDesksHelp ); + TQToolTip::add( defaultViewVirtualDesks, defaultViewVirtualDesksHelp ); + defaultViewCurrentDesk = new TQRadioButton(i18n("Current virtual desktop"), defaultViewBtnGroup ); + TQString defaultViewCurrentDeskHelp = i18n("Fullscreen layout that shows the windows of the desktop you're currently working on."); + TQWhatsThis::add( defaultViewCurrentDesk, defaultViewCurrentDeskHelp ); + TQToolTip::add( defaultViewCurrentDesk, defaultViewCurrentDeskHelp ); page1Layout->addWidget(defaultViewBtnGroup); if (m_hasXinerama) { - QGroupBox *xineramaGroupBox = new QGroupBox( 2, Vertical, i18n("Xinerama"), page1 ); + TQGroupBox *xineramaGroupBox = new TQGroupBox( 2, Vertical, i18n("Xinerama"), page1 ); - QDesktopWidget deskwidget; - m_viewScreenAll = new QCheckBox(i18n("Use the whole desktop for Komposé"), xineramaGroupBox); + TQDesktopWidget deskwidget; + m_viewScreenAll = new TQCheckBox(i18n("Use the whole desktop for Komposé"), xineramaGroupBox); - QHBox *hLayXineramaGrabDelay = new QHBox(xineramaGroupBox); - QLabel *xineramaLabel = new QLabel(i18n("Use screen:"), hLayXineramaGrabDelay); - m_viewScreen = new QSpinBox(0, deskwidget.numScreens()-1, 1, hLayXineramaGrabDelay); + TQHBox *hLayXineramaGrabDelay = new TQHBox(xineramaGroupBox); + TQLabel *xineramaLabel = new TQLabel(i18n("Use screen:"), hLayXineramaGrabDelay); + m_viewScreen = new TQSpinBox(0, deskwidget.numScreens()-1, 1, hLayXineramaGrabDelay); connect( m_viewScreenAll, SIGNAL(toggled(bool)), m_viewScreen, SLOT(setDisabled(bool)) ); xineramaLabel->setBuddy(m_viewScreen); - QString xineramaHelp = i18n("Specify the screen where Komposé should appear." ); - QWhatsThis::add( m_viewScreen, xineramaHelp ); - QToolTip::add( m_viewScreen, xineramaHelp ); - QWhatsThis::add( xineramaLabel, xineramaHelp ); - QToolTip::add( xineramaLabel, xineramaHelp ); + TQString xineramaHelp = i18n("Specify the screen where Komposé should appear." ); + TQWhatsThis::add( m_viewScreen, xineramaHelp ); + TQToolTip::add( m_viewScreen, xineramaHelp ); + TQWhatsThis::add( xineramaLabel, xineramaHelp ); + TQToolTip::add( xineramaLabel, xineramaHelp ); page1Layout->addWidget(xineramaGroupBox); } #ifdef COMPOSITE - QGroupBox *screenshotsGroupBox = new QGroupBox( 4, Vertical, i18n("Screenshots"), page1 ); + TQGroupBox *screenshotsGroupBox = new TQGroupBox( 4, Vertical, i18n("Screenshots"), page1 ); - useComposite = new QCheckBox(i18n("Use XComposite if available"), screenshotsGroupBox); - QString useCompositeHelp = i18n("Making use of the Composite extension of newer X Servers makes the grabbing of screenshots obsolete.\nThe contents of all windows are drawn in back buffers that will be accessed by Komposé\nNote that the Composite implementation of even modern graphic card drivers is still very slow and may make your system pretty unusable."); - QWhatsThis::add( useComposite, useCompositeHelp ); - QToolTip::add( useComposite, useCompositeHelp ); + useComposite = new TQCheckBox(i18n("Use XComposite if available"), screenshotsGroupBox); + TQString useCompositeHelp = i18n("Making use of the Composite extension of newer X Servers makes the grabbing of screenshots obsolete.\nThe contents of all windows are drawn in back buffers that will be accessed by Komposé\nNote that the Composite implementation of even modern graphic card drivers is still very slow and may make your system pretty unusable."); + TQWhatsThis::add( useComposite, useCompositeHelp ); + TQToolTip::add( useComposite, useCompositeHelp ); connect( useComposite, SIGNAL(toggled(bool)), SLOT(setUseCompositeToggled(bool)) ); #else - QGroupBox *screenshotsGroupBox = new QGroupBox( 3, Vertical, i18n("Screenshots"), page1 ); + TQGroupBox *screenshotsGroupBox = new TQGroupBox( 3, Vertical, i18n("Screenshots"), page1 ); #endif - passiveScreenshots = new QCheckBox(i18n("Passive screenshots"), screenshotsGroupBox); - QString passiveScreenshotsHelp = i18n("Create a screenshot whenever you raise or active a window.\nWhen selected the amount the annoying popup-effect before every Komposé activation will be minimized to nearly zero.\nThe drawback is that the screenshots are not so recent and may not display the actual content."); - QWhatsThis::add( passiveScreenshots, passiveScreenshotsHelp ); - QToolTip::add( passiveScreenshots, passiveScreenshotsHelp ); + passiveScreenshots = new TQCheckBox(i18n("Passive screenshots"), screenshotsGroupBox); + TQString passiveScreenshotsHelp = i18n("Create a screenshot whenever you raise or active a window.\nWhen selected the amount the annoying popup-effect before every Komposé activation will be minimized to nearly zero.\nThe drawback is that the screenshots are not so recent and may not display the actual content."); + TQWhatsThis::add( passiveScreenshots, passiveScreenshotsHelp ); + TQToolTip::add( passiveScreenshots, passiveScreenshotsHelp ); - QHBox *hLayScreenshotGrabDelay = new QHBox(screenshotsGroupBox); - QLabel *screenshotGrabDelayLabel = new QLabel(i18n("Delay between screenshots (ms):"), hLayScreenshotGrabDelay); - screenshotGrabDelay = new QSpinBox(0, 999, 10, hLayScreenshotGrabDelay); + TQHBox *hLayScreenshotGrabDelay = new TQHBox(screenshotsGroupBox); + TQLabel *screenshotGrabDelayLabel = new TQLabel(i18n("Delay between screenshots (ms):"), hLayScreenshotGrabDelay); + screenshotGrabDelay = new TQSpinBox(0, 999, 10, hLayScreenshotGrabDelay); screenshotGrabDelayLabel->setBuddy(screenshotGrabDelay); - QString screenshotGrabDelayHelp = i18n("Specifies the time to wait between the activation of a window and the screenshot taking.\nIncrease it when your windows need more time to draw themselves after activation.\nValues below 300ms are not recommended, but may work in some cases." ); - QWhatsThis::add( screenshotGrabDelay, screenshotGrabDelayHelp ); - QToolTip::add( screenshotGrabDelay, screenshotGrabDelayHelp ); - QWhatsThis::add( screenshotGrabDelayLabel, screenshotGrabDelayHelp ); - QToolTip::add( screenshotGrabDelayLabel, screenshotGrabDelayHelp ); + TQString screenshotGrabDelayHelp = i18n("Specifies the time to wait between the activation of a window and the screenshot taking.\nIncrease it when your windows need more time to draw themselves after activation.\nValues below 300ms are not recommended, but may work in some cases." ); + TQWhatsThis::add( screenshotGrabDelay, screenshotGrabDelayHelp ); + TQToolTip::add( screenshotGrabDelay, screenshotGrabDelayHelp ); + TQWhatsThis::add( screenshotGrabDelayLabel, screenshotGrabDelayHelp ); + TQToolTip::add( screenshotGrabDelayLabel, screenshotGrabDelayHelp ); - cacheScaledPixmaps = new QCheckBox(i18n("Cache scaled Screenshots"), screenshotsGroupBox); - QString cacheScaledPixmapsHelp = i18n("This may avoid some scaling operations to be called repeatedly when Komposé has been displayed before and the screenshot's size didn't change.\nIt will however increase memory usage quite a bit."); - QWhatsThis::add( cacheScaledPixmaps, cacheScaledPixmapsHelp ); - QToolTip::add( cacheScaledPixmaps, cacheScaledPixmapsHelp ); + cacheScaledPixmaps = new TQCheckBox(i18n("Cache scaled Screenshots"), screenshotsGroupBox); + TQString cacheScaledPixmapsHelp = i18n("This may avoid some scaling operations to be called repeatedly when Komposé has been displayed before and the screenshot's size didn't change.\nIt will however increase memory usage quite a bit."); + TQWhatsThis::add( cacheScaledPixmaps, cacheScaledPixmapsHelp ); + TQToolTip::add( cacheScaledPixmaps, cacheScaledPixmapsHelp ); page1Layout->addWidget(screenshotsGroupBox); // Autolock - QGroupBox* autoLockGroup = new QGroupBox( 0, Qt::Horizontal, i18n("Autoactivate when mouse moves into"), page1 ); - QGridLayout* autoLockLayout = new QGridLayout( autoLockGroup->layout(), 5, 2, KDialog::spacingHint() ); - m_topLeftCorner = new QCheckBox( i18n("Top-left corner"), autoLockGroup); + TQGroupBox* autoLockGroup = new TQGroupBox( 0, TQt::Horizontal, i18n("Autoactivate when mouse moves into"), page1 ); + TQGridLayout* autoLockLayout = new TQGridLayout( autoLockGroup->layout(), 5, 2, KDialog::spacingHint() ); + m_topLeftCorner = new TQCheckBox( i18n("Top-left corner"), autoLockGroup); autoLockLayout->addWidget( m_topLeftCorner, 0, 0 ); - m_topRightCorner = new QCheckBox( i18n("Top-right corner"), autoLockGroup ); + m_topRightCorner = new TQCheckBox( i18n("Top-right corner"), autoLockGroup ); autoLockLayout->addWidget( m_topRightCorner, 1, 0 ); - m_bottomLeftCorner = new QCheckBox( i18n("Bottom-left corner"), autoLockGroup ); + m_bottomLeftCorner = new TQCheckBox( i18n("Bottom-left corner"), autoLockGroup ); autoLockLayout->addWidget( m_bottomLeftCorner, 2, 0 ); - m_bottomRightCorner = new QCheckBox( i18n("Bottom-right corner"), autoLockGroup ); + m_bottomRightCorner = new TQCheckBox( i18n("Bottom-right corner"), autoLockGroup ); autoLockLayout->addWidget( m_bottomRightCorner, 3, 0 ); - m_topEdge = new QCheckBox( i18n("Top edge"), autoLockGroup); + m_topEdge = new TQCheckBox( i18n("Top edge"), autoLockGroup); autoLockLayout->addWidget( m_topEdge, 0, 1 ); - m_bottomEdge = new QCheckBox( i18n("Bottom edge"), autoLockGroup ); + m_bottomEdge = new TQCheckBox( i18n("Bottom edge"), autoLockGroup ); autoLockLayout->addWidget( m_bottomEdge, 1, 1 ); - m_leftEdge = new QCheckBox( i18n("Left edge"), autoLockGroup ); + m_leftEdge = new TQCheckBox( i18n("Left edge"), autoLockGroup ); autoLockLayout->addWidget( m_leftEdge, 2, 1 ); - m_rightEdge = new QCheckBox( i18n("Right edge"), autoLockGroup ); + m_rightEdge = new TQCheckBox( i18n("Right edge"), autoLockGroup ); autoLockLayout->addWidget( m_rightEdge, 3, 1 ); - QHBox *hLayAutoLockDelay = new QHBox(autoLockGroup); - QLabel *autoLockDelayLabel = new QLabel(i18n("Delay until activation (ms):"), hLayAutoLockDelay); - autoLockDelay = new QSpinBox(0, 5000, 10, hLayAutoLockDelay); + TQHBox *hLayAutoLockDelay = new TQHBox(autoLockGroup); + TQLabel *autoLockDelayLabel = new TQLabel(i18n("Delay until activation (ms):"), hLayAutoLockDelay); + autoLockDelay = new TQSpinBox(0, 5000, 10, hLayAutoLockDelay); autoLockDelayLabel->setBuddy(autoLockDelay); - QString autoLockDelayHelp = i18n("Specifies the time in ms for which the mouse pointer must rest in the corner until auto-activation." ); - QWhatsThis::add( autoLockDelay, autoLockDelayHelp ); - QToolTip::add( autoLockDelay, autoLockDelayHelp ); - QWhatsThis::add( autoLockDelayLabel, autoLockDelayHelp ); - QToolTip::add( autoLockDelayLabel, autoLockDelayHelp ); + TQString autoLockDelayHelp = i18n("Specifies the time in ms for which the mouse pointer must rest in the corner until auto-activation." ); + TQWhatsThis::add( autoLockDelay, autoLockDelayHelp ); + TQToolTip::add( autoLockDelay, autoLockDelayHelp ); + TQWhatsThis::add( autoLockDelayLabel, autoLockDelayHelp ); + TQToolTip::add( autoLockDelayLabel, autoLockDelayHelp ); autoLockLayout->addMultiCellWidget( hLayAutoLockDelay, 4, 4, 0, 1 ); page1Layout->addWidget(autoLockGroup); @@ -160,39 +160,39 @@ KomposePreferences::KomposePreferences() - QVBoxLayout *page2Layout = new QVBoxLayout( page2, 0, KDialog::spacingHint() ); + TQVBoxLayout *page2Layout = new TQVBoxLayout( page2, 0, KDialog::spacingHint() ); - imageEffects = new QCheckBox(i18n("Enable image effects"), page2); - QString imageEffectsHelp = i18n("Lighten windows when the mouse moves over it or gray out minimized windows.\nDepending on your system specs this can be a bit slower." ); - QWhatsThis::add( imageEffects, imageEffectsHelp ); - QToolTip::add( imageEffects, imageEffectsHelp ); + imageEffects = new TQCheckBox(i18n("Enable image effects"), page2); + TQString imageEffectsHelp = i18n("Lighten windows when the mouse moves over it or gray out minimized windows.\nDepending on your system specs this can be a bit slower." ); + TQWhatsThis::add( imageEffects, imageEffectsHelp ); + TQToolTip::add( imageEffects, imageEffectsHelp ); page2Layout->addWidget(imageEffects); - showDesktopNum = new QCheckBox(i18n("Show Desktop number on Systray icon"), page2); - QString showDesktopNumHelp = i18n("Displays the number of the currently active Desktop on the Komposé systray icon." ); - QWhatsThis::add( showDesktopNum, showDesktopNumHelp ); - QToolTip::add( showDesktopNum, showDesktopNumHelp ); + showDesktopNum = new TQCheckBox(i18n("Show Desktop number on Systray icon"), page2); + TQString showDesktopNumHelp = i18n("Displays the number of the currently active Desktop on the Komposé systray icon." ); + TQWhatsThis::add( showDesktopNum, showDesktopNumHelp ); + TQToolTip::add( showDesktopNum, showDesktopNumHelp ); page2Layout->addWidget(showDesktopNum); - QGroupBox *windowTitleGroupBox = new QGroupBox( 3, Vertical, i18n("Window Titles"), page2 ); + TQGroupBox *windowTitleGroupBox = new TQGroupBox( 3, Vertical, i18n("Window Titles"), page2 ); - QHBox *hBoxWindowTitles = new QHBox(windowTitleGroupBox); - showWindowTitles = new QCheckBox(i18n("Show window titles"), hBoxWindowTitles); - windowTitleFontBtn = new QPushButton(i18n("Select Font..."), hBoxWindowTitles); - QString showWindowTitlesHelp = i18n( "Display the name of every window in Komposé" ); - QWhatsThis::add( showWindowTitles, showWindowTitlesHelp ); - QToolTip::add( showWindowTitles, showWindowTitlesHelp ); + TQHBox *hBoxWindowTitles = new TQHBox(windowTitleGroupBox); + showWindowTitles = new TQCheckBox(i18n("Show window titles"), hBoxWindowTitles); + windowTitleFontBtn = new TQPushButton(i18n("Select Font..."), hBoxWindowTitles); + TQString showWindowTitlesHelp = i18n( "Display the name of every window in Komposé" ); + TQWhatsThis::add( showWindowTitles, showWindowTitlesHelp ); + TQToolTip::add( showWindowTitles, showWindowTitlesHelp ); connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontBtn, SLOT(setEnabled(bool)) ); connect( windowTitleFontBtn, SIGNAL(clicked()), this, SLOT(showWindowTitleFontDialog()) ); - QGrid *gridWindowTitlesColor = new QGrid(2, windowTitleGroupBox); - // windowTitleFontColorLabel = new QLabel(windowTitleFontColor, i18n("Text color: "), gridWindowTitlesColor); // FIXME: How to link to a buddy that doesn't yet exist? - windowTitleFontColorLabel = new QLabel(i18n("Text color:"), gridWindowTitlesColor); - windowTitleFontColor = new KColorButton(Qt::black, gridWindowTitlesColor); + TQGrid *gridWindowTitlesColor = new TQGrid(2, windowTitleGroupBox); + // windowTitleFontColorLabel = new TQLabel(windowTitleFontColor, i18n("Text color: "), gridWindowTitlesColor); // FIXME: How to link to a buddy that doesn't yet exist? + windowTitleFontColorLabel = new TQLabel(i18n("Text color:"), gridWindowTitlesColor); + windowTitleFontColor = new KColorButton(TQt::black, gridWindowTitlesColor); connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontColorLabel, SLOT(setEnabled(bool)) ); connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontColor, SLOT(setEnabled(bool)) ); - showWindowTitleShadow = new QCheckBox(i18n("Shadow color:"), gridWindowTitlesColor); - windowTitleFontShadowColor = new KColorButton(Qt::lightGray, gridWindowTitlesColor); + showWindowTitleShadow = new TQCheckBox(i18n("Shadow color:"), gridWindowTitlesColor); + windowTitleFontShadowColor = new KColorButton(TQt::lightGray, gridWindowTitlesColor); connect( showWindowTitles, SIGNAL(toggled(bool)), showWindowTitleShadow, SLOT(setEnabled(bool)) ); connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontShadowColor, SLOT(setEnabled(bool)) ); connect( showWindowTitleShadow, SIGNAL(toggled(bool)), windowTitleFontShadowColor, SLOT(setEnabled(bool)) ); @@ -201,10 +201,10 @@ KomposePreferences::KomposePreferences() - QGroupBox *iconGroupBox = new QGroupBox( 3, Vertical, i18n("Task Icons"), page2 ); - showIcons = new QCheckBox(i18n("Show icons"), iconGroupBox); - iconSize = new QSlider(0, 3, 1, 0, Qt::Horizontal, iconGroupBox); - iconSizeDescription = new QLabel( iconSize, "", iconGroupBox); + TQGroupBox *iconGroupBox = new TQGroupBox( 3, Vertical, i18n("Task Icons"), page2 ); + showIcons = new TQCheckBox(i18n("Show icons"), iconGroupBox); + iconSize = new TQSlider(0, 3, 1, 0, TQt::Horizontal, iconGroupBox); + iconSizeDescription = new TQLabel( iconSize, "", iconGroupBox); connect( iconSize, SIGNAL( sliderMoved(int) ), this, SLOT( updateIconSliderDesc(int) ) ); connect( iconSize, SIGNAL( valueChanged(int) ), this, SLOT( updateIconSliderDesc(int) ) ); connect( showIcons, SIGNAL( toggled(bool) ), iconSize, SLOT( setEnabled(bool) ) ); @@ -215,24 +215,24 @@ KomposePreferences::KomposePreferences() - QVBoxLayout *page3Layout = new QVBoxLayout( page3, 0, KDialog::spacingHint() ); + TQVBoxLayout *page3Layout = new TQVBoxLayout( page3, 0, KDialog::spacingHint() ); - QVGroupBox *virtDesksLayoutGroupBox = new QVGroupBox( i18n("Grouped by Virtual Desktops"), page3 ); - dynamicVirtDeskLayout = new QCheckBox(i18n("Layout empty virtual desktops minimized"), virtDesksLayoutGroupBox ); - QString dynamicVirtDeskLayoutHelp = i18n("Check this if you want empty virtual desktops to take less space on the screen.\nUncheck it if you want them to be arranged statically, each of the same size."); - QWhatsThis::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); - QToolTip::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); + TQVGroupBox *virtDesksLayoutGroupBox = new TQVGroupBox( i18n("Grouped by Virtual Desktops"), page3 ); + dynamicVirtDeskLayout = new TQCheckBox(i18n("Layout empty virtual desktops minimized"), virtDesksLayoutGroupBox ); + TQString dynamicVirtDeskLayoutHelp = i18n("Check this if you want empty virtual desktops to take less space on the screen.\nUncheck it if you want them to be arranged statically, each of the same size."); + TQWhatsThis::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); + TQToolTip::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); - QGrid *desktopColorsGroupBox = new QGrid( 2, virtDesksLayoutGroupBox ); + TQGrid *desktopColorsGroupBox = new TQGrid( 2, virtDesksLayoutGroupBox ); desktopColorsGroupBox->setSpacing( 4 ); - desktopTitleFontColorLabel = new QLabel(i18n("Desktop frame color:"), desktopColorsGroupBox); - desktopTitleFontColor = new KColorButton(Qt::black, desktopColorsGroupBox); - desktopTitleFontHighlightColorLabel = new QLabel(i18n("Desktop frame highlight color:"), desktopColorsGroupBox); - desktopTitleFontHighlightColor = new KColorButton(Qt::black, desktopColorsGroupBox); + desktopTitleFontColorLabel = new TQLabel(i18n("Desktop frame color:"), desktopColorsGroupBox); + desktopTitleFontColor = new KColorButton(TQt::black, desktopColorsGroupBox); + desktopTitleFontHighlightColorLabel = new TQLabel(i18n("Desktop frame highlight color:"), desktopColorsGroupBox); + desktopTitleFontHighlightColor = new KColorButton(TQt::black, desktopColorsGroupBox); page3Layout->addWidget(virtDesksLayoutGroupBox); - desktopTitleFontBtn = new QPushButton(i18n("Select Desktop Names Font..."), virtDesksLayoutGroupBox); + desktopTitleFontBtn = new TQPushButton(i18n("Select Desktop Names Font..."), virtDesksLayoutGroupBox); connect( desktopTitleFontBtn, SIGNAL(clicked()), this, SLOT(showDesktopTitleFontDialog()) ); page3Layout->insertStretch(-1); @@ -303,7 +303,7 @@ void KomposePreferences::fillPages() showDesktopNum->setChecked( KomposeSettings::instance()->getShowDesktopNum() ); showWindowTitles->setChecked( KomposeSettings::instance()->getShowWindowTitles() ); - windowTitleFont = new QFont(KomposeSettings::instance()->getWindowTitleFont()); + windowTitleFont = new TQFont(KomposeSettings::instance()->getWindowTitleFont()); windowTitleFontColor->setColor( KomposeSettings::instance()->getWindowTitleFontColor() ); windowTitleFontShadowColor->setColor( KomposeSettings::instance()->getWindowTitleFontShadowColor() ); showWindowTitleShadow->setChecked( KomposeSettings::instance()->getShowWindowTitleShadow() ); @@ -314,7 +314,7 @@ void KomposePreferences::fillPages() showWindowTitleShadow->setEnabled( KomposeSettings::instance()->getShowWindowTitles() ); windowTitleFontShadowColor->setEnabled( KomposeSettings::instance()->getShowWindowTitles() || KomposeSettings::instance()->getShowWindowTitleShadow() ); - desktopTitleFont = new QFont(KomposeSettings::instance()->getDesktopTitleFont()); + desktopTitleFont = new TQFont(KomposeSettings::instance()->getDesktopTitleFont()); desktopTitleFontColor->setColor( KomposeSettings::instance()->getDesktopTitleFontColor() ); desktopTitleFontHighlightColor->setColor( KomposeSettings::instance()->getDesktopTitleFontHighlightColor() ); diff --git a/src/komposepreferences.cpp.orig b/src/komposepreferences.cpp.orig index 11ef084..9bb8460 100644 --- a/src/komposepreferences.cpp.orig +++ b/src/komposepreferences.cpp.orig @@ -13,72 +13,72 @@ #include "komposesettings.h" -#include <qlayout.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <kapplication.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qspinbox.h> -#include <qgroupbox.h> -#include <qbuttongroup.h> -#include <qhbox.h> -#include <qslider.h> -#include <qpushbutton.h> -#include <qgrid.h> -#include <qvgroupbox.h> -#include <qradiobutton.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqspinbox.h> +#include <tqgroupbox.h> +#include <tqbuttongroup.h> +#include <tqhbox.h> +#include <tqslider.h> +#include <tqpushbutton.h> +#include <tqgrid.h> +#include <tqvgroupbox.h> +#include <tqradiobutton.h> #include <kiconloader.h> #include <kcolorbutton.h> #include <kfontdialog.h> KomposePreferences::KomposePreferences() - : KDialogBase(IconList, i18n(QString::fromUtf8("Komposé Preferences").utf8()), Ok|Apply|Cancel, Ok) + : KDialogBase(IconList, i18n(TQString::fromUtf8("Komposé Preferences").utf8()), Ok|Apply|Cancel, Ok) { - QFrame *page1 = addPage( i18n("Behavior"), QString::null, DesktopIcon("winprops", KIcon::SizeMedium) ); - QFrame *page2 = addPage( i18n("Appearance"), QString::null, DesktopIcon("appearance", KIcon::SizeMedium) ); - QFrame *page3 = addPage( i18n("Layouts"), QString::null, DesktopIcon("window_list", KIcon::SizeMedium) ); + TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", KIcon::SizeMedium) ); + TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", KIcon::SizeMedium) ); + TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", KIcon::SizeMedium) ); - QVBoxLayout *page1Layout = new QVBoxLayout( page1, 0, KDialog::spacingHint() ); + TQVBoxLayout *page1Layout = new TQVBoxLayout( page1, 0, KDialog::spacingHint() ); - defaultViewBtnGroup = new QButtonGroup( 2, Horizontal, i18n("Default Layout"), page1 ); + defaultViewBtnGroup = new TQButtonGroup( 2, Horizontal, i18n("Default Layout"), page1 ); defaultViewBtnGroup->setExclusive( true ); - QString defaultViewBtnGroupHelp = i18n("Determines which view should be started by default (e.g. when you click on the systray icon)."); - QWhatsThis::add( defaultViewBtnGroup, defaultViewBtnGroupHelp ); - QToolTip::add( defaultViewBtnGroup, defaultViewBtnGroupHelp ); - defaultViewWorld = new QRadioButton(i18n("Ungrouped"), defaultViewBtnGroup ); - QString defaultViewWorldHelp = i18n("Fullscreen layout that shows all windows in no specific order"); - QWhatsThis::add( defaultViewWorld, defaultViewWorldHelp ); - QToolTip::add( defaultViewWorld, defaultViewWorldHelp ); - defaultViewVirtualDesks = new QRadioButton(i18n("Grouped by virtual desktops"), defaultViewBtnGroup ); - QString defaultViewVirtualDesksHelp = i18n("Fullscreen layout that shows a representation of your virtual desktops\n and places the windows inside."); - QWhatsThis::add( defaultViewVirtualDesks, defaultViewVirtualDesksHelp ); - QToolTip::add( defaultViewVirtualDesks, defaultViewVirtualDesksHelp ); + TQString defaultViewBtnGroupHelp = i18n("Determines which view should be started by default (e.g. when you click on the systray icon)."); + TQWhatsThis::add( defaultViewBtnGroup, defaultViewBtnGroupHelp ); + TQToolTip::add( defaultViewBtnGroup, defaultViewBtnGroupHelp ); + defaultViewWorld = new TQRadioButton(i18n("Ungrouped"), defaultViewBtnGroup ); + TQString defaultViewWorldHelp = i18n("Fullscreen layout that shows all windows in no specific order"); + TQWhatsThis::add( defaultViewWorld, defaultViewWorldHelp ); + TQToolTip::add( defaultViewWorld, defaultViewWorldHelp ); + defaultViewVirtualDesks = new TQRadioButton(i18n("Grouped by virtual desktops"), defaultViewBtnGroup ); + TQString defaultViewVirtualDesksHelp = i18n("Fullscreen layout that shows a representation of your virtual desktops\n and places the windows inside."); + TQWhatsThis::add( defaultViewVirtualDesks, defaultViewVirtualDesksHelp ); + TQToolTip::add( defaultViewVirtualDesks, defaultViewVirtualDesksHelp ); page1Layout->addWidget(defaultViewBtnGroup); - QGroupBox *screenshotsGroupBox = new QGroupBox( 3, Vertical, i18n("Screenshots"), page1 ); + TQGroupBox *screenshotsGroupBox = new TQGroupBox( 3, Vertical, i18n("Screenshots"), page1 ); - passiveScreenshots = new QCheckBox(i18n("Passive screenshots"), screenshotsGroupBox); - QString passiveScreenshotsHelp = i18n(QString::fromUtf8("Create a screenshot whenever you raise or active a window.\nWhen selected the amount the annoying popup-effect before every Komposé activation will be minimized to nearly zero.\nThe drawback is that the screenshots are not so recent and may not display the actual content.").utf8()); - QWhatsThis::add( passiveScreenshots, passiveScreenshotsHelp ); - QToolTip::add( passiveScreenshots, passiveScreenshotsHelp ); + passiveScreenshots = new TQCheckBox(i18n("Passive screenshots"), screenshotsGroupBox); + TQString passiveScreenshotsHelp = i18n(TQString::fromUtf8("Create a screenshot whenever you raise or active a window.\nWhen selected the amount the annoying popup-effect before every Komposé activation will be minimized to nearly zero.\nThe drawback is that the screenshots are not so recent and may not display the actual content.").utf8()); + TQWhatsThis::add( passiveScreenshots, passiveScreenshotsHelp ); + TQToolTip::add( passiveScreenshots, passiveScreenshotsHelp ); - // onlyOneScreenshot = new QCheckBox(i18n("Only grab a screenshot when none exists"), screenshotsGroupBox); - // QString onlyOneScreenshotHelp = i18n("When disabled new screenshots will be taken whenever possible.\nEnabling will only create a screenshot once the application is first activated and will never update it."); - // QWhatsThis::add( onlyOneScreenshot, onlyOneScreenshotHelp ); - // QToolTip::add( onlyOneScreenshot, onlyOneScreenshotHelp ); + // onlyOneScreenshot = new TQCheckBox(i18n("Only grab a screenshot when none exists"), screenshotsGroupBox); + // TQString onlyOneScreenshotHelp = i18n("When disabled new screenshots will be taken whenever possible.\nEnabling will only create a screenshot once the application is first activated and will never update it."); + // TQWhatsThis::add( onlyOneScreenshot, onlyOneScreenshotHelp ); + // TQToolTip::add( onlyOneScreenshot, onlyOneScreenshotHelp ); - QHBox *hLayScreenshotGrabDelay = new QHBox(screenshotsGroupBox); - QLabel *screenshotGrabDelayLabel = new QLabel(i18n("Delay between screenshots (ms):"), hLayScreenshotGrabDelay); - screenshotGrabDelay = new QSpinBox(0, 2000, 1, hLayScreenshotGrabDelay); + TQHBox *hLayScreenshotGrabDelay = new TQHBox(screenshotsGroupBox); + TQLabel *screenshotGrabDelayLabel = new TQLabel(i18n("Delay between screenshots (ms):"), hLayScreenshotGrabDelay); + screenshotGrabDelay = new TQSpinBox(0, 2000, 1, hLayScreenshotGrabDelay); screenshotGrabDelayLabel->setBuddy(screenshotGrabDelay); - QString screenshotGrabDelayHelp = i18n("Specifies the time to wait between the activation of a window and the screenshot taking.\nIncrease it when your windows need more time to draw themselves after activation.\nValues below 300ms are not recommended, but may work in some cases." ); - QWhatsThis::add( screenshotGrabDelay, screenshotGrabDelayHelp ); - QToolTip::add( screenshotGrabDelay, screenshotGrabDelayHelp ); - QWhatsThis::add( screenshotGrabDelayLabel, screenshotGrabDelayHelp ); - QToolTip::add( screenshotGrabDelayLabel, screenshotGrabDelayHelp ); + TQString screenshotGrabDelayHelp = i18n("Specifies the time to wait between the activation of a window and the screenshot taking.\nIncrease it when your windows need more time to draw themselves after activation.\nValues below 300ms are not recommended, but may work in some cases." ); + TQWhatsThis::add( screenshotGrabDelay, screenshotGrabDelayHelp ); + TQToolTip::add( screenshotGrabDelay, screenshotGrabDelayHelp ); + TQWhatsThis::add( screenshotGrabDelayLabel, screenshotGrabDelayHelp ); + TQToolTip::add( screenshotGrabDelayLabel, screenshotGrabDelayHelp ); page1Layout->addWidget(screenshotsGroupBox); @@ -86,34 +86,34 @@ KomposePreferences::KomposePreferences() - QVBoxLayout *page2Layout = new QVBoxLayout( page2, 0, KDialog::spacingHint() ); + TQVBoxLayout *page2Layout = new TQVBoxLayout( page2, 0, KDialog::spacingHint() ); - imageEffects = new QCheckBox(i18n("Enable image effects"), page2); - QString imageEffectsHelp = i18n("Lighten windows when the mouse moves over it or gray out minimized windows.\nDepending on your system specs this can be a bit slower." ); - QWhatsThis::add( imageEffects, imageEffectsHelp ); - QToolTip::add( imageEffects, imageEffectsHelp ); + imageEffects = new TQCheckBox(i18n("Enable image effects"), page2); + TQString imageEffectsHelp = i18n("Lighten windows when the mouse moves over it or gray out minimized windows.\nDepending on your system specs this can be a bit slower." ); + TQWhatsThis::add( imageEffects, imageEffectsHelp ); + TQToolTip::add( imageEffects, imageEffectsHelp ); page2Layout->addWidget(imageEffects); - QGroupBox *windowTitleGroupBox = new QGroupBox( 3, Vertical, i18n("Window Titles"), page2 ); + TQGroupBox *windowTitleGroupBox = new TQGroupBox( 3, Vertical, i18n("Window Titles"), page2 ); - QHBox *hBoxWindowTitles = new QHBox(windowTitleGroupBox); - showWindowTitles = new QCheckBox(i18n("Show window titles"), hBoxWindowTitles); - windowTitleFontBtn = new QPushButton(i18n("Select Font..."), hBoxWindowTitles); - QString showWindowTitlesHelp = i18n( QString::fromUtf8("Display the name of every window in Komposé") ); - QWhatsThis::add( showWindowTitles, showWindowTitlesHelp ); - QToolTip::add( showWindowTitles, showWindowTitlesHelp ); + TQHBox *hBoxWindowTitles = new TQHBox(windowTitleGroupBox); + showWindowTitles = new TQCheckBox(i18n("Show window titles"), hBoxWindowTitles); + windowTitleFontBtn = new TQPushButton(i18n("Select Font..."), hBoxWindowTitles); + TQString showWindowTitlesHelp = i18n( TQString::fromUtf8("Display the name of every window in Komposé") ); + TQWhatsThis::add( showWindowTitles, showWindowTitlesHelp ); + TQToolTip::add( showWindowTitles, showWindowTitlesHelp ); connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontBtn, SLOT(setEnabled(bool)) ); connect( windowTitleFontBtn, SIGNAL(clicked()), this, SLOT(showWindowTitleFontDialog()) ); - QGrid *gridWindowTitlesColor = new QGrid(2, windowTitleGroupBox); - // windowTitleFontColorLabel = new QLabel(windowTitleFontColor, i18n("Text color: "), gridWindowTitlesColor); // FIXME: How to link to a buddy that doesn't yet exist? - windowTitleFontColorLabel = new QLabel(i18n("Text color:"), gridWindowTitlesColor); - windowTitleFontColor = new KColorButton(Qt::black, gridWindowTitlesColor); + TQGrid *gridWindowTitlesColor = new TQGrid(2, windowTitleGroupBox); + // windowTitleFontColorLabel = new TQLabel(windowTitleFontColor, i18n("Text color: "), gridWindowTitlesColor); // FIXME: How to link to a buddy that doesn't yet exist? + windowTitleFontColorLabel = new TQLabel(i18n("Text color:"), gridWindowTitlesColor); + windowTitleFontColor = new KColorButton(TQt::black, gridWindowTitlesColor); connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontColorLabel, SLOT(setEnabled(bool)) ); connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontColor, SLOT(setEnabled(bool)) ); - showWindowTitleShadow = new QCheckBox(i18n("Shadow color:"), gridWindowTitlesColor); - windowTitleFontShadowColor = new KColorButton(Qt::lightGray, gridWindowTitlesColor); + showWindowTitleShadow = new TQCheckBox(i18n("Shadow color:"), gridWindowTitlesColor); + windowTitleFontShadowColor = new KColorButton(TQt::lightGray, gridWindowTitlesColor); connect( showWindowTitles, SIGNAL(toggled(bool)), showWindowTitleShadow, SLOT(setEnabled(bool)) ); connect( showWindowTitles, SIGNAL(toggled(bool)), windowTitleFontShadowColor, SLOT(setEnabled(bool)) ); connect( showWindowTitleShadow, SIGNAL(toggled(bool)), windowTitleFontShadowColor, SLOT(setEnabled(bool)) ); @@ -122,10 +122,10 @@ KomposePreferences::KomposePreferences() - QGroupBox *iconGroupBox = new QGroupBox( 3, Vertical, i18n("Task Icons"), page2 ); - showIcons = new QCheckBox(i18n("Show icons"), iconGroupBox); - iconSize = new QSlider(0, 3, 1, 0, Qt::Horizontal, iconGroupBox); - iconSizeDescription = new QLabel( iconSize, "", iconGroupBox); + TQGroupBox *iconGroupBox = new TQGroupBox( 3, Vertical, i18n("Task Icons"), page2 ); + showIcons = new TQCheckBox(i18n("Show icons"), iconGroupBox); + iconSize = new TQSlider(0, 3, 1, 0, TQt::Horizontal, iconGroupBox); + iconSizeDescription = new TQLabel( iconSize, "", iconGroupBox); connect( iconSize, SIGNAL( sliderMoved(int) ), this, SLOT( updateIconSliderDesc(int) ) ); connect( iconSize, SIGNAL( valueChanged(int) ), this, SLOT( updateIconSliderDesc(int) ) ); connect( showIcons, SIGNAL( toggled(bool) ), iconSize, SLOT( setEnabled(bool) ) ); @@ -136,32 +136,32 @@ KomposePreferences::KomposePreferences() - QVBoxLayout *page3Layout = new QVBoxLayout( page3, 0, KDialog::spacingHint() ); + TQVBoxLayout *page3Layout = new TQVBoxLayout( page3, 0, KDialog::spacingHint() ); - QVGroupBox *virtDesksLayoutGroupBox = new QVGroupBox( i18n("Grouped by Virtual Desktops"), page3 ); - dynamicVirtDeskLayout = new QCheckBox(i18n("Layout empty virtual desktops minimized"), virtDesksLayoutGroupBox ); - QString dynamicVirtDeskLayoutHelp = i18n("Check this if you want empty virtual desktops to take less space on the screen.\nUncheck it if you want them to be arranged statically, each of the same size."); - QWhatsThis::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); - QToolTip::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); + TQVGroupBox *virtDesksLayoutGroupBox = new TQVGroupBox( i18n("Grouped by Virtual Desktops"), page3 ); + dynamicVirtDeskLayout = new TQCheckBox(i18n("Layout empty virtual desktops minimized"), virtDesksLayoutGroupBox ); + TQString dynamicVirtDeskLayoutHelp = i18n("Check this if you want empty virtual desktops to take less space on the screen.\nUncheck it if you want them to be arranged statically, each of the same size."); + TQWhatsThis::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); + TQToolTip::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); - QGrid *desktopColorsGroupBox = new QGrid( 2, virtDesksLayoutGroupBox ); + TQGrid *desktopColorsGroupBox = new TQGrid( 2, virtDesksLayoutGroupBox ); desktopColorsGroupBox->setSpacing( 4 ); - tintVirtDesks = new QCheckBox(i18n("Tint virtual desktop widgets:"), desktopColorsGroupBox); - tintVirtDesksColor = new KColorButton(Qt::blue, desktopColorsGroupBox); - QString tintVirtDesksHelp = i18n("Colorize the transparent background of the virtual desktop widgets" ); - QWhatsThis::add( tintVirtDesks, tintVirtDesksHelp ); - QToolTip::add( tintVirtDesks, tintVirtDesksHelp ); - QWhatsThis::add( tintVirtDesksColor, tintVirtDesksHelp ); - QToolTip::add( tintVirtDesksColor, tintVirtDesksHelp ); + tintVirtDesks = new TQCheckBox(i18n("Tint virtual desktop widgets:"), desktopColorsGroupBox); + tintVirtDesksColor = new KColorButton(TQt::blue, desktopColorsGroupBox); + TQString tintVirtDesksHelp = i18n("Colorize the transparent background of the virtual desktop widgets" ); + TQWhatsThis::add( tintVirtDesks, tintVirtDesksHelp ); + TQToolTip::add( tintVirtDesks, tintVirtDesksHelp ); + TQWhatsThis::add( tintVirtDesksColor, tintVirtDesksHelp ); + TQToolTip::add( tintVirtDesksColor, tintVirtDesksHelp ); connect( tintVirtDesks, SIGNAL(toggled(bool)), tintVirtDesksColor, SLOT(setEnabled(bool)) ); - desktopTitleFontColorLabel = new QLabel(i18n("Desktop frame color:"), desktopColorsGroupBox); - desktopTitleFontColor = new KColorButton(Qt::black, desktopColorsGroupBox); - desktopTitleFontHighlightColorLabel = new QLabel(i18n("Desktop frame highlight color:"), desktopColorsGroupBox); - desktopTitleFontHighlightColor = new KColorButton(Qt::black, desktopColorsGroupBox); + desktopTitleFontColorLabel = new TQLabel(i18n("Desktop frame color:"), desktopColorsGroupBox); + desktopTitleFontColor = new KColorButton(TQt::black, desktopColorsGroupBox); + desktopTitleFontHighlightColorLabel = new TQLabel(i18n("Desktop frame highlight color:"), desktopColorsGroupBox); + desktopTitleFontHighlightColor = new KColorButton(TQt::black, desktopColorsGroupBox); page3Layout->addWidget(virtDesksLayoutGroupBox); - desktopTitleFontBtn = new QPushButton(i18n("Select Desktop Names Font..."), virtDesksLayoutGroupBox); + desktopTitleFontBtn = new TQPushButton(i18n("Select Desktop Names Font..."), virtDesksLayoutGroupBox); connect( desktopTitleFontBtn, SIGNAL(clicked()), this, SLOT(showDesktopTitleFontDialog()) ); page3Layout->insertStretch(-1); @@ -227,7 +227,7 @@ void KomposePreferences::fillPages() tintVirtDesksColor->setEnabled( KomposeSettings::instance()->getTintVirtDesks() ); showWindowTitles->setChecked( KomposeSettings::instance()->getShowWindowTitles() ); - windowTitleFont = new QFont(KomposeSettings::instance()->getWindowTitleFont()); + windowTitleFont = new TQFont(KomposeSettings::instance()->getWindowTitleFont()); windowTitleFontColor->setColor( KomposeSettings::instance()->getWindowTitleFontColor() ); windowTitleFontShadowColor->setColor( KomposeSettings::instance()->getWindowTitleFontShadowColor() ); showWindowTitleShadow->setChecked( KomposeSettings::instance()->getShowWindowTitleShadow() ); @@ -238,7 +238,7 @@ void KomposePreferences::fillPages() showWindowTitleShadow->setEnabled( KomposeSettings::instance()->getShowWindowTitles() ); windowTitleFontShadowColor->setEnabled( KomposeSettings::instance()->getShowWindowTitles() || KomposeSettings::instance()->getShowWindowTitleShadow() ); - desktopTitleFont = new QFont(KomposeSettings::instance()->getDesktopTitleFont()); + desktopTitleFont = new TQFont(KomposeSettings::instance()->getDesktopTitleFont()); desktopTitleFontColor->setColor( KomposeSettings::instance()->getDesktopTitleFontColor() ); desktopTitleFontHighlightColor->setColor( KomposeSettings::instance()->getDesktopTitleFontHighlightColor() ); diff --git a/src/komposepreferences.h b/src/komposepreferences.h index f634bfc..3bde6a8 100644 --- a/src/komposepreferences.h +++ b/src/komposepreferences.h @@ -16,15 +16,15 @@ #include <klocale.h> -class QCheckBox; -class QFrame; -class QSpinBox; +class TQCheckBox; +class TQFrame; +class TQSpinBox; class KColorButton; -class QButtonGroup; -class QSlider; -class QPushButton; -class QFont; -class QRadioButton; +class TQButtonGroup; +class TQSlider; +class TQPushButton; +class TQFont; +class TQRadioButton; /** @author Hans Oischinger @@ -51,59 +51,59 @@ protected slots: private: bool m_hasXinerama; - QFrame *page1; - QFrame *page2; + TQFrame *page1; + TQFrame *page2; - QButtonGroup *defaultViewBtnGroup; - QRadioButton *defaultViewWorld; - QRadioButton *defaultViewVirtualDesks; - QRadioButton *defaultViewCurrentDesk; + TQButtonGroup *defaultViewBtnGroup; + TQRadioButton *defaultViewWorld; + TQRadioButton *defaultViewVirtualDesks; + TQRadioButton *defaultViewCurrentDesk; - QCheckBox *useComposite; + TQCheckBox *useComposite; - QCheckBox *passiveScreenshots; - QCheckBox *dynamicVirtDeskLayout; - QCheckBox *cacheScaledPixmaps; + TQCheckBox *passiveScreenshots; + TQCheckBox *dynamicVirtDeskLayout; + TQCheckBox *cacheScaledPixmaps; - QCheckBox *imageEffects; + TQCheckBox *imageEffects; - QSpinBox *screenshotGrabDelay; + TQSpinBox *screenshotGrabDelay; - QCheckBox *showIcons; - QSlider *iconSize; - QLabel *iconSizeDescription; + TQCheckBox *showIcons; + TQSlider *iconSize; + TQLabel *iconSizeDescription; - QCheckBox *showWindowTitles; - QPushButton *windowTitleFontBtn; - QFont *windowTitleFont; + TQCheckBox *showWindowTitles; + TQPushButton *windowTitleFontBtn; + TQFont *windowTitleFont; KColorButton *windowTitleFontColor; - QCheckBox *showWindowTitleShadow; + TQCheckBox *showWindowTitleShadow; KColorButton *windowTitleFontShadowColor; - QLabel *windowTitleFontColorLabel; + TQLabel *windowTitleFontColorLabel; - QPushButton *desktopTitleFontBtn; - QLabel *desktopTitleFontColorLabel; - QLabel *desktopTitleFontHighlightColorLabel; + TQPushButton *desktopTitleFontBtn; + TQLabel *desktopTitleFontColorLabel; + TQLabel *desktopTitleFontHighlightColorLabel; KColorButton *desktopTitleFontColor; KColorButton *desktopTitleFontHighlightColor; - QFont *desktopTitleFont; + TQFont *desktopTitleFont; - QCheckBox *m_topLeftCorner; - QCheckBox *m_bottomLeftCorner; - QCheckBox *m_topRightCorner; - QCheckBox *m_bottomRightCorner; + TQCheckBox *m_topLeftCorner; + TQCheckBox *m_bottomLeftCorner; + TQCheckBox *m_topRightCorner; + TQCheckBox *m_bottomRightCorner; - QCheckBox *m_topEdge; - QCheckBox *m_bottomEdge; - QCheckBox *m_rightEdge; - QCheckBox *m_leftEdge; - QSpinBox *autoLockDelay; + TQCheckBox *m_topEdge; + TQCheckBox *m_bottomEdge; + TQCheckBox *m_rightEdge; + TQCheckBox *m_leftEdge; + TQSpinBox *autoLockDelay; - QCheckBox *showDesktopNum; + TQCheckBox *showDesktopNum; - QSpinBox *m_viewScreen; - QCheckBox *m_viewScreenAll; + TQSpinBox *m_viewScreen; + TQCheckBox *m_viewScreenAll; }; #endif diff --git a/src/komposesettings.cpp b/src/komposesettings.cpp index d1bacc6..a221450 100644 --- a/src/komposesettings.cpp +++ b/src/komposesettings.cpp @@ -15,7 +15,7 @@ #include "komposetaskmanager.h" #include "komposepreferences.h" -#include <qcolor.h> +#include <tqcolor.h> #include <kglobalaccel.h> #include <kapplication.h> @@ -41,8 +41,8 @@ KomposeSettings* KomposeSettings::instance() } -KomposeSettings::KomposeSettings(QObject *parent, const char *name) - : QObject(parent, name), +KomposeSettings::KomposeSettings(TQObject *parent, const char *name) + : TQObject(parent, name), dialogOpen(0), windowTitleFontMetrics(0) { @@ -51,19 +51,19 @@ KomposeSettings::KomposeSettings(QObject *parent, const char *name) globalAccel = new KGlobalAccel( this ); globalAccel->insert( "showDefaultView", i18n("Show Komposé (default view)"), i18n("Displays the view you have configured as default"), - KKey::QtWIN+Key_Tab, KKey::QtWIN+CTRL+SHIFT+Key_Tab, + KKey::TQtWIN+Key_Tab, KKey::TQtWIN+CTRL+SHIFT+Key_Tab, KomposeViewManager::instance(), SLOT(createDefaultView()) ); globalAccel->insert( "showWorldView", i18n("Show Komposé (ungrouped)"), i18n("Displays all windows unsorted"), - CTRL+SHIFT+Key_J, KKey::QtWIN+CTRL+SHIFT+Key_J, + CTRL+SHIFT+Key_J, KKey::TQtWIN+CTRL+SHIFT+Key_J, KomposeViewManager::instance(), SLOT(createWorldView()) ); globalAccel->insert( "showVirtualDesktopView", i18n("Show Komposé (grouped by virtual desktops)"), i18n("Displays all windows sorted by virtual desktops"), - CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+SHIFT+Key_I, + CTRL+SHIFT+Key_I, KKey::TQtWIN+CTRL+SHIFT+Key_I, KomposeViewManager::instance(), SLOT(createVirtualDesktopView()) ); globalAccel->insert( "showCurrentDesktopView", i18n("Show Komposé (current virtual desktop)"), i18n("Displays all windows on the current desktop"), - CTRL+SHIFT+Key_K, KKey::QtWIN+CTRL+SHIFT+Key_K, + CTRL+SHIFT+Key_K, KKey::TQtWIN+CTRL+SHIFT+Key_K, KomposeViewManager::instance(), SLOT(createCurrentDesktopView()) ); // read Settings from cfg file @@ -104,14 +104,14 @@ void KomposeSettings::readConfig() iconSize = kapp->config()->readNumEntry("iconSize", 3); showWindowTitles = kapp->config()->readBoolEntry("showWindowTitles", true ); - windowTitleFont = kapp->config()->readFontEntry("windowTitleFont", new QFont( "arial", 11, QFont::Bold ) ); - windowTitleFontColor = kapp->config()->readColorEntry("windowTitleFontColor", new QColor(Qt::black) ); + windowTitleFont = kapp->config()->readFontEntry("windowTitleFont", new TQFont( "arial", 11, TQFont::Bold ) ); + windowTitleFontColor = kapp->config()->readColorEntry("windowTitleFontColor", new TQColor(TQt::black) ); showWindowTitleShadow = kapp->config()->readBoolEntry("showWindowTitleShadow", true ); - windowTitleFontShadowColor = kapp->config()->readColorEntry("windowTitleFontShadowColor", new QColor(Qt::lightGray) ); + windowTitleFontShadowColor = kapp->config()->readColorEntry("windowTitleFontShadowColor", new TQColor(TQt::lightGray) ); - desktopTitleFont = kapp->config()->readFontEntry("desktopTitleFont", new QFont( "arial", 10 ) ); - desktopTitleFontColor = kapp->config()->readColorEntry("desktopTitleFontColor", new QColor(Qt::gray) ); - desktopTitleFontHighlightColor = kapp->config()->readColorEntry("desktopTitleFontHighlightColor", new QColor(Qt::black) ); + desktopTitleFont = kapp->config()->readFontEntry("desktopTitleFont", new TQFont( "arial", 10 ) ); + desktopTitleFontColor = kapp->config()->readColorEntry("desktopTitleFontColor", new TQColor(TQt::gray) ); + desktopTitleFontHighlightColor = kapp->config()->readColorEntry("desktopTitleFontHighlightColor", new TQColor(TQt::black) ); cacheScaledPixmaps = kapp->config()->readBoolEntry("cacheScaledPixmaps", true); @@ -227,7 +227,7 @@ void KomposeSettings::calcFontMetrics() { if (windowTitleFontMetrics != 0) delete windowTitleFontMetrics; - windowTitleFontMetrics = new QFontMetrics( windowTitleFont ); + windowTitleFontMetrics = new TQFontMetrics( windowTitleFont ); windowTitleFontAscent = windowTitleFontMetrics->ascent(); windowTitleFontHeight = windowTitleFontMetrics->height(); } diff --git a/src/komposesettings.h b/src/komposesettings.h index 4056dd4..c6da44a 100644 --- a/src/komposesettings.h +++ b/src/komposesettings.h @@ -12,26 +12,26 @@ #ifndef KOMPOSESETTINGS_H #define KOMPOSESETTINGS_H -#include <qobject.h> -#include <qcolor.h> -#include <qfont.h> +#include <tqobject.h> +#include <tqcolor.h> +#include <tqfont.h> #define MAX_DESKTOPS 16 enum KomposeDisplay { KOMPOSEDISPLAY_WORLD, KOMPOSEDISPLAY_VIRTUALDESKS, KOMPOSEDISPLAY_CURRENTDESK }; class KGlobalAccel; -class QFontMetrics; +class TQFontMetrics; /** @author Hans Oischinger */ -class KomposeSettings : public QObject +class KomposeSettings : public TQObject { Q_OBJECT protected: - KomposeSettings(QObject *parent = 0, const char *name = 0); + KomposeSettings(TQObject *parent = 0, const char *name = 0); ~KomposeSettings(); @@ -63,27 +63,27 @@ public: void setShowIcons( bool b ) { showIcons = b; } int getIconSizePixels(); - void setWindowTitleFont( QFont f ) { windowTitleFont = f; } - const QFont& getWindowTitleFont() const { return windowTitleFont; } + void setWindowTitleFont( TQFont f ) { windowTitleFont = f; } + const TQFont& getWindowTitleFont() const { return windowTitleFont; } int getShowWindowTitles() { return showWindowTitles; } void setShowWindowTitles( bool b ) { showWindowTitles = b; } int getShowWindowTitleShadow() { return showWindowTitleShadow; } void setShowWindowTitleShadow( bool b ) { showWindowTitleShadow = b; } - const QColor& getWindowTitleFontColor() const { return windowTitleFontColor; } - void setWindowTitleFontColor( QColor c ) { windowTitleFontColor = c; } - const QColor& getWindowTitleFontShadowColor() const { return windowTitleFontShadowColor; } - void setWindowTitleFontShadowColor( QColor c ) { windowTitleFontShadowColor = c; } + const TQColor& getWindowTitleFontColor() const { return windowTitleFontColor; } + void setWindowTitleFontColor( TQColor c ) { windowTitleFontColor = c; } + const TQColor& getWindowTitleFontShadowColor() const { return windowTitleFontShadowColor; } + void setWindowTitleFontShadowColor( TQColor c ) { windowTitleFontShadowColor = c; } - const QFontMetrics* getWindowTitleFontMetrics() { return windowTitleFontMetrics; } + const TQFontMetrics* getWindowTitleFontMetrics() { return windowTitleFontMetrics; } int getWindowTitleFontAscent() { return windowTitleFontAscent; } int getWindowTitleFontHeight() { return windowTitleFontHeight; } - void setDesktopTitleFont( QFont f ) { desktopTitleFont = f; } - const QFont& getDesktopTitleFont() const { return desktopTitleFont; } - const QColor& getDesktopTitleFontColor() const { return desktopTitleFontColor; } - void setDesktopTitleFontColor( QColor c ) { desktopTitleFontColor = c; } - const QColor& getDesktopTitleFontHighlightColor() const { return desktopTitleFontHighlightColor; } - void setDesktopTitleFontHighlightColor( QColor c ) { desktopTitleFontHighlightColor = c; } + void setDesktopTitleFont( TQFont f ) { desktopTitleFont = f; } + const TQFont& getDesktopTitleFont() const { return desktopTitleFont; } + const TQColor& getDesktopTitleFontColor() const { return desktopTitleFontColor; } + void setDesktopTitleFontColor( TQColor c ) { desktopTitleFontColor = c; } + const TQColor& getDesktopTitleFontHighlightColor() const { return desktopTitleFontHighlightColor; } + void setDesktopTitleFontHighlightColor( TQColor c ) { desktopTitleFontHighlightColor = c; } bool getCacheScaledPixmaps() const { return cacheScaledPixmaps; } void setCacheScaledPixmaps( bool b ) { cacheScaledPixmaps = b; } @@ -141,17 +141,17 @@ private: bool showIcons; bool showWindowTitles; - QFont windowTitleFont; - QFontMetrics *windowTitleFontMetrics; + TQFont windowTitleFont; + TQFontMetrics *windowTitleFontMetrics; int windowTitleFontAscent; int windowTitleFontHeight; - QColor windowTitleFontColor; + TQColor windowTitleFontColor; bool showWindowTitleShadow; - QColor windowTitleFontShadowColor; + TQColor windowTitleFontShadowColor; - QFont desktopTitleFont; - QColor desktopTitleFontColor; - QColor desktopTitleFontHighlightColor; + TQFont desktopTitleFont; + TQColor desktopTitleFontColor; + TQColor desktopTitleFontHighlightColor; bool cacheScaledPixmaps; diff --git a/src/komposesystray.cpp b/src/komposesystray.cpp index 41df920..7b06a42 100644 --- a/src/komposesystray.cpp +++ b/src/komposesystray.cpp @@ -17,9 +17,9 @@ #include "komposeglobal.h" #include "komposetaskmanager.h" -#include <qpixmap.h> -#include <qbitmap.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqbitmap.h> +#include <tqpainter.h> #include <kapplication.h> #include <kaction.h> @@ -27,7 +27,7 @@ #include <kiconeffect.h> #include <kglobalsettings.h> -KomposeSysTray::KomposeSysTray(QWidget *parent, const char *name) +KomposeSysTray::KomposeSysTray(TQWidget *parent, const char *name) : KSystemTray(parent, name) { // Create Menu @@ -53,16 +53,16 @@ KomposeSysTray::~KomposeSysTray() void KomposeSysTray::slotConfigChanged( ) { // set the icon here - QPixmap iconPixmap = loadIcon("kompose"); + TQPixmap iconPixmap = loadIcon("kompose"); setPixmap(iconPixmap); icon = iconPixmap.convertToImage(); currentDesktopChanged(KomposeTaskManager::instance()->getCurrentDesktopNum()); } -void KomposeSysTray::mouseReleaseEvent (QMouseEvent * ) +void KomposeSysTray::mouseReleaseEvent (TQMouseEvent * ) {} -void KomposeSysTray::mousePressEvent ( QMouseEvent * e ) +void KomposeSysTray::mousePressEvent ( TQMouseEvent * e ) { if ( !rect().contains( e->pos() ) ) return; @@ -89,37 +89,37 @@ void KomposeSysTray::currentDesktopChanged(int desktop) if (!KomposeSettings::instance()->getShowDesktopNum()) return; // update the icon to display the current desktop number - // qDebug("Displaying current desktop number on the tray icon....\n"); + // tqDebug("Displaying current desktop number on the tray icon....\n"); // copying from aKregator/src/trayicon.cpp // from KMSystemTray int oldW = pixmap()->size().width(); int oldH = pixmap()->size().height(); - QString uStr=QString::number( desktop ); - QFont f=KGlobalSettings::generalFont(); + TQString uStr=TQString::number( desktop ); + TQFont f=KGlobalSettings::generalFont(); f.setBold(true); f.setItalic(true); float pointSize=f.pointSizeFloat(); - QFontMetrics fm(f); + TQFontMetrics fm(f); int w=fm.width(uStr); if( w > (oldW) ) { pointSize *= float(oldW) / float(w); f.setPointSizeFloat(pointSize); } - QPixmap pix(oldW, oldH); - pix.fill(Qt::white); - QPainter p(&pix); + TQPixmap pix(oldW, oldH); + pix.fill(TQt::white); + TQPainter p(&pix); p.setFont(f); - p.setPen(Qt::black); - p.drawText(pix.rect(), Qt::AlignCenter, uStr); + p.setPen(TQt::black); + p.drawText(pix.rect(), TQt::AlignCenter, uStr); pix.setMask(pix.createHeuristicMask()); - QImage img=pix.convertToImage(); + TQImage img=pix.convertToImage(); // overlay - QImage overlayImg=icon.copy(); + TQImage overlayImg=icon.copy(); KIconEffect::overlay(overlayImg, img); - QPixmap newIcon; + TQPixmap newIcon; newIcon.convertFromImage(overlayImg); setPixmap(newIcon); } diff --git a/src/komposesystray.h b/src/komposesystray.h index e649ee1..0fa6923 100644 --- a/src/komposesystray.h +++ b/src/komposesystray.h @@ -14,7 +14,7 @@ #include <ksystemtray.h> -#include <qimage.h> +#include <tqimage.h> class KAction; class KGlobalAccel; @@ -27,21 +27,21 @@ class KomposeSysTray : public KSystemTray { Q_OBJECT public: - KomposeSysTray(QWidget *parent = 0, const char *name = 0); + KomposeSysTray(TQWidget *parent = 0, const char *name = 0); ~KomposeSysTray(); void currentDesktopChanged(int desktop); protected: - void mouseReleaseEvent (QMouseEvent *); - void mousePressEvent (QMouseEvent *); + void mouseReleaseEvent (TQMouseEvent *); + void mousePressEvent (TQMouseEvent *); protected slots: void slotConfigChanged(); private: KPopupMenu *menu; - QImage icon; + TQImage icon; }; #endif diff --git a/src/komposetask.cpp b/src/komposetask.cpp index 54b3fd1..0d34c13 100644 --- a/src/komposetask.cpp +++ b/src/komposetask.cpp @@ -23,11 +23,11 @@ #include "komposesettings.h" #include "komposeglobal.h" -#include <qobject.h> -#include <qimage.h> -#include <qapplication.h> -#include <qtimer.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqimage.h> +#include <tqapplication.h> +#include <tqtimer.h> +#include <tqpixmap.h> #include <kpixmapio.h> #include <kwinmodule.h> @@ -41,8 +41,8 @@ #include "komposetaskvisualizer.h" #include <X11/Xlib.h> -KomposeTask::KomposeTask(WId win, KWinModule *kwinmod, QObject *parent, const char *name) - : QObject(parent, name), +KomposeTask::KomposeTask(WId win, KWinModule *kwinmod, TQObject *parent, const char *name) + : TQObject(parent, name), kwinmodule(kwinmod), windowID(win), blockDamageEvents(false) @@ -72,7 +72,7 @@ void KomposeTask::findWmFrame() target_win = windowID; for (;;) { - status = XQueryTree(QPaintDevice::x11AppDisplay(), target_win, &root, &parent, &children, &nchildren); + status = XQueryTree(TQPaintDevice::x11AppDisplay(), target_win, &root, &parent, &children, &nchildren); if (!status) break; if (children) @@ -150,7 +150,7 @@ bool KomposeTask::isOnAllDesktops() const bool KomposeTask::isModified() const { - static QString modStr = QString::fromUtf8("[") + i18n("modified") + QString::fromUtf8("]"); + static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"); int modStrPos = windowInfo.visibleName().find(modStr); return ( modStrPos != -1 ); @@ -159,7 +159,7 @@ bool KomposeTask::isModified() const void KomposeTask::maximize() { - NETWinInfo ni( qt_xdisplay(), windowID, qt_xrootwin(), NET::WMState); + NETWinInfo ni( tqt_xdisplay(), windowID, tqt_xrootwin(), NET::WMState); ni.setState( NET::Max, NET::Max ); if (windowInfo.mappingState() == NET::Iconic) @@ -169,7 +169,7 @@ void KomposeTask::maximize() void KomposeTask::restore() { KWin::deIconifyWindow( windowID, false ); - // NETWinInfo ni( qt_xdisplay(), windowID, qt_xrootwin(), NET::WMState); + // NETWinInfo ni( tqt_xdisplay(), windowID, tqt_xrootwin(), NET::WMState); // ni.setState( 0, NET::Max ); // // if (windowInfo.mappingState == NET::Iconic) @@ -178,26 +178,26 @@ void KomposeTask::restore() void KomposeTask::iconify() { - //XIconifyWindow( qt_xdisplay(), windowID, qt_xscreen() ); + //XIconifyWindow( tqt_xdisplay(), windowID, tqt_xscreen() ); KWin::iconifyWindow( windowID, false ); } void KomposeTask::close() { - NETRootInfo ri( qt_xdisplay(), NET::CloseWindow ); + NETRootInfo ri( tqt_xdisplay(), NET::CloseWindow ); ri.closeWindowRequest( windowID ); } void KomposeTask::raise() { // kdDebug(1210) << "Task::raise(): " << name() << endl; - XRaiseWindow( qt_xdisplay(), windowID ); + XRaiseWindow( tqt_xdisplay(), windowID ); } void KomposeTask::lower() { // kdDebug(1210) << "Task::lower(): " << name() << endl; - XLowerWindow( qt_xdisplay(), windowID ); + XLowerWindow( tqt_xdisplay(), windowID ); } @@ -232,7 +232,7 @@ void KomposeTask::minimizeOrRestore() void KomposeTask::toDesktop(int desk) { - NETWinInfo ni(qt_xdisplay(), windowID, qt_xrootwin(), NET::WMDesktop); + NETWinInfo ni(tqt_xdisplay(), windowID, tqt_xrootwin(), NET::WMDesktop); if (desk == 0) { ni.setDesktop(NETWinInfo::OnAllDesktops); @@ -249,7 +249,7 @@ void KomposeTask::toCurrentDesktop() void KomposeTask::setAlwaysOnTop(bool stay) { - NETWinInfo ni( qt_xdisplay(), windowID, qt_xrootwin(), NET::WMState); + NETWinInfo ni( tqt_xdisplay(), windowID, tqt_xrootwin(), NET::WMState); if(stay) ni.setState( NET::StaysOnTop, NET::StaysOnTop ); else @@ -263,7 +263,7 @@ void KomposeTask::toggleAlwaysOnTop() void KomposeTask::setShaded(bool shade) { - NETWinInfo ni( qt_xdisplay(), windowID, qt_xrootwin(), NET::WMState); + NETWinInfo ni( tqt_xdisplay(), windowID, tqt_xrootwin(), NET::WMState); if(shade) ni.setState( NET::Shaded, NET::Shaded ); else @@ -317,7 +317,7 @@ void KomposeTask::slotX11DamageNotify() blockDamageEvents = true; emit x11DamageNotify(); - QTimer::singleShot( 1000, this, SLOT( unBlockDamageEvents() ) ); + TQTimer::singleShot( 1000, this, SLOT( unBlockDamageEvents() ) ); } int KomposeTask::getHeightForWidth ( int w ) const @@ -335,7 +335,7 @@ double KomposeTask::getAspectRatio() return (double)(getGeometry().width()) / (double)(getGeometry().height()); } -QPixmap KomposeTask::getIcon( int size ) +TQPixmap KomposeTask::getIcon( int size ) { // Cache the icons??? // if ( pm_icon.isNull() || pm_icon.width() != size ) diff --git a/src/komposetask.h b/src/komposetask.h index 710ca83..a85d1a5 100644 --- a/src/komposetask.h +++ b/src/komposetask.h @@ -20,8 +20,8 @@ #ifndef KOMPOSETASK_H #define KOMPOSETASK_H -#include <qobject.h> -#include <qrect.h> +#include <tqobject.h> +#include <tqrect.h> #include <kwin.h> class KWinModule; @@ -30,11 +30,11 @@ class KomposeTaskVisualizer; /** @author Hans Oischinger */ -class KomposeTask : public QObject +class KomposeTask : public TQObject { Q_OBJECT public: - KomposeTask(WId win, KWinModule *kwinmod, QObject *parent = 0, const char *name = 0); + KomposeTask(WId win, KWinModule *kwinmod, TQObject *parent = 0, const char *name = 0); ~KomposeTask(); @@ -54,13 +54,13 @@ public: WId window() const { return windowID; } WId wmFrame() const { return wmframeID; } - QString name() const { return windowInfo.name(); } - QString visibleName() const { return windowInfo.visibleName(); } - QString visibleNameWithState() const { return windowInfo.visibleNameWithState(); } - QRect getGeometry() const { return windowInfo.geometry(); } - QRect getFrameGeometry() const { return windowInfo.frameGeometry(); } + TQString name() const { return windowInfo.name(); } + TQString visibleName() const { return windowInfo.visibleName(); } + TQString visibleNameWithState() const { return windowInfo.visibleNameWithState(); } + TQRect getGeometry() const { return windowInfo.geometry(); } + TQRect getFrameGeometry() const { return windowInfo.frameGeometry(); } - QPixmap getIcon( int size ); + TQPixmap getIcon( int size ); double getAspectRatio(); int getHeightForWidth( int w ) const; int getWidthForHeight( int h ) const; @@ -68,8 +68,8 @@ public: KomposeTaskVisualizer* getVisualizer() { return visualizer; } protected: - void paintEvent ( QPaintEvent * ); - void mouseReleaseEvent ( QMouseEvent * e ); + void paintEvent ( TQPaintEvent * ); + void mouseReleaseEvent ( TQMouseEvent * e ); void findWmFrame(); signals: diff --git a/src/komposetaskcontainerwidget.cpp b/src/komposetaskcontainerwidget.cpp index 2899b5b..d814ccc 100644 --- a/src/komposetaskcontainerwidget.cpp +++ b/src/komposetaskcontainerwidget.cpp @@ -16,14 +16,14 @@ #include "komposesettings.h" #include "komposetaskwidget.h" -#include <qobjectlist.h> -#include <qwidget.h> -#include <qtimer.h> +#include <tqobjectlist.h> +#include <tqwidget.h> +#include <tqtimer.h> #include <kdebug.h> static bool controlHold = false; // is the control key pressed -KomposeTaskContainerWidget::KomposeTaskContainerWidget( int desk, QWidget *parent, KomposeLayout *l, const char *name) +KomposeTaskContainerWidget::KomposeTaskContainerWidget( int desk, TQWidget *parent, KomposeLayout *l, const char *name) : KomposeWidget(parent, l, name), desktop( desk ) { @@ -47,7 +47,7 @@ void KomposeTaskContainerWidget::reparentTaskWidget( KomposeTask* task, int from if ( (toDesktop!= -1) && (desktop == fromDesktop-1 || fromDesktop==-1) ) { KomposeTaskWidget *child; - QPtrListIterator<KomposeWidget> it( *(layout->getManagedWidgets())); + TQPtrListIterator<KomposeWidget> it( *(layout->getManagedWidgets())); while ( (child = dynamic_cast<KomposeTaskWidget*>(it.current()) ) != 0 ) { ++it; @@ -66,33 +66,33 @@ void KomposeTaskContainerWidget::reparentTaskWidget( KomposeTask* task, int from if ( desktop == toDesktop -1 || (toDesktop == -1 && fromDesktop-1!=desktop) ) { createTaskWidget( task, true ); - //QTimer::singleShot( 200, layout, SLOT( arrangeLayout() ) ); + //TQTimer::singleShot( 200, layout, SLOT( arrangeLayout() ) ); // layout->arrangeLayout(); } } -void KomposeTaskContainerWidget::keyPressEvent ( QKeyEvent * e ) +void KomposeTaskContainerWidget::keyPressEvent ( TQKeyEvent * e ) { - if ( e->key() == Qt::Key_Control ) + if ( e->key() == TQt::Key_Control ) { controlHold = true; e->accept(); } } -void KomposeTaskContainerWidget::keyReleaseEvent ( QKeyEvent * e ) +void KomposeTaskContainerWidget::keyReleaseEvent ( TQKeyEvent * e ) { - if ( e->key() == Qt::Key_Control ) + if ( e->key() == TQt::Key_Control ) { controlHold = false; e->accept(); return; } - if ( e->key() == Qt::Key_Right || e->key() == Qt::Key_D || e->key() == Qt::Key_H || - e->key() == Qt::Key_Left || e->key() == Qt::Key_A || e->key() == Qt::Key_J || - e->key() == Qt::Key_Up || e->key() == Qt::Key_W || e->key() == Qt::Key_K || - e->key() == Qt::Key_Down || e->key() == Qt::Key_S || e->key() == Qt::Key_L ) + if ( e->key() == TQt::Key_Right || e->key() == TQt::Key_D || e->key() == TQt::Key_H || + e->key() == TQt::Key_Left || e->key() == TQt::Key_A || e->key() == TQt::Key_J || + e->key() == TQt::Key_Up || e->key() == TQt::Key_W || e->key() == TQt::Key_K || + e->key() == TQt::Key_Down || e->key() == TQt::Key_S || e->key() == TQt::Key_L ) { if ( controlHold && desktop != -1 ) { @@ -105,40 +105,40 @@ void KomposeTaskContainerWidget::keyReleaseEvent ( QKeyEvent * e ) int direction = DLAYOUT_RIGHT; switch( e->key() ) { - case Qt::Key_Right: + case TQt::Key_Right: direction = DLAYOUT_RIGHT; break; - case Qt::Key_D: + case TQt::Key_D: direction = DLAYOUT_RIGHT; break; - case Qt::Key_L: + case TQt::Key_L: direction = DLAYOUT_RIGHT; break; - case Qt::Key_Left: + case TQt::Key_Left: direction = DLAYOUT_LEFT; break; - case Qt::Key_A: + case TQt::Key_A: direction = DLAYOUT_LEFT; break; - case Qt::Key_H: + case TQt::Key_H: direction = DLAYOUT_LEFT; break; - case Qt::Key_Up: + case TQt::Key_Up: direction = DLAYOUT_TOP; break; - case Qt::Key_W: + case TQt::Key_W: direction = DLAYOUT_TOP; break; - case Qt::Key_K: + case TQt::Key_K: direction = DLAYOUT_TOP; break; - case Qt::Key_Down: + case TQt::Key_Down: direction = DLAYOUT_BOTTOM; break; - case Qt::Key_S: + case TQt::Key_S: direction = DLAYOUT_BOTTOM; break; - case Qt::Key_J: + case TQt::Key_J: direction = DLAYOUT_BOTTOM; break; } @@ -159,13 +159,13 @@ bool KomposeTaskContainerWidget::focusNeighbourChild( int direction ) if ( !children()->containsRef(focusWidget()) ) { kdDebug() << "KomposeTaskContainerWidget::keyReleaseEvent - No widget focussed. Focussing first" << endl; - const QObjectList *lst = children(); + const TQObjectList *lst = children(); if ( lst ) { - QObjectListIterator it( *lst ); - QWidget *widget; - while ( (widget = (QWidget*)it.current() ) ) + TQObjectListIterator it( *lst ); + TQWidget *widget; + while ( (widget = (TQWidget*)it.current() ) ) { if (widget->inherits("KomposeTaskWidget") || widget->inherits("KomposeDesktopWidget")) { @@ -196,12 +196,12 @@ bool KomposeTaskContainerWidget::focusNeighbourChild( int direction ) void KomposeTaskContainerWidget::createTaskWidgets() { TaskList tl = KomposeTaskManager::instance()->getTasks(); - QPtrListIterator<KomposeTask> it( tl ); + TQPtrListIterator<KomposeTask> it( tl ); KomposeTask *task; while ( (task = it.current()) != 0 ) { ++it; - Q_CHECK_PTR(task); + TQ_CHECK_PTR(task); createTaskWidget( task); } } @@ -243,7 +243,7 @@ void KomposeTaskContainerWidget::requestRemoval( KomposeWidget *obj ) layout->arrangeLayout(); } -void KomposeTaskContainerWidget::childEvent( QChildEvent * ce) +void KomposeTaskContainerWidget::childEvent( TQChildEvent * ce) { KomposeWidget::childEvent(ce); // ReLayout when we are in a active view and a new window appeared somewhere diff --git a/src/komposetaskcontainerwidget.h b/src/komposetaskcontainerwidget.h index 816d487..cb82fea 100644 --- a/src/komposetaskcontainerwidget.h +++ b/src/komposetaskcontainerwidget.h @@ -27,7 +27,7 @@ class KomposeTaskContainerWidget : public KomposeWidget { Q_OBJECT public: - KomposeTaskContainerWidget( int desk = 0, QWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); + KomposeTaskContainerWidget( int desk = 0, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); virtual ~KomposeTaskContainerWidget(); @@ -48,9 +48,9 @@ protected slots: bool focusNeighbourChild( int direction ); protected: - void keyReleaseEvent ( QKeyEvent * e ); - void keyPressEvent ( QKeyEvent * e ); - void childEvent( QChildEvent * ce); + void keyReleaseEvent ( TQKeyEvent * e ); + void keyPressEvent ( TQKeyEvent * e ); + void childEvent( TQChildEvent * ce); int desktop; }; diff --git a/src/komposetaskmanager.cpp b/src/komposetaskmanager.cpp index d33e1ae..93e79aa 100644 --- a/src/komposetaskmanager.cpp +++ b/src/komposetaskmanager.cpp @@ -27,10 +27,10 @@ #include "komposetask.h" #include "komposeviewmanager.h" -#include <qtimer.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qwidget.h> +#include <tqtimer.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqwidget.h> #include <kapplication.h> #include <kwinmodule.h> @@ -66,7 +66,7 @@ KomposeTaskManager* KomposeTaskManager::instance() KomposeTaskManager::KomposeTaskManager() - : QObject() + : TQObject() { taskManagerInstance = this; kwin_module = new KWinModule(); @@ -84,8 +84,8 @@ KomposeTaskManager::KomposeTaskManager() connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(callCompositeRedirect()) ); // register existing windows - const QValueList<WId> windows = kwin_module->windows(); - for (QValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it ) + const TQValueList<WId> windows = kwin_module->windows(); + for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it ) slotWindowAdded(*it); connect( kwin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) ); @@ -105,7 +105,7 @@ void KomposeTaskManager::callCompositeRedirect() #ifdef COMPOSITE if ( KomposeGlobal::instance()->hasXcomposite() ) { - Display *dpy = QPaintDevice::x11AppDisplay(); + Display *dpy = TQPaintDevice::x11AppDisplay(); if ( KomposeSettings::instance()->getUseComposite() ) { // Redirect @@ -148,7 +148,7 @@ void KomposeTaskManager::slotWindowChanged( WId w, unsigned int dirty) { if( dirty & NET::WMState ) { - NETWinInfo info ( qt_xdisplay(), w, qt_xrootwin(), NET::WMState ); + NETWinInfo info ( tqt_xdisplay(), w, tqt_xrootwin(), NET::WMState ); if ( (info.state() & NET::SkipTaskbar) != 0 ) { slotWindowRemoved( w ); @@ -194,7 +194,7 @@ void KomposeTaskManager::slotWindowRemoved(WId w ) void KomposeTaskManager::slotWindowAdded(WId w ) { // ignore myself - if ( QWidget::find(w) != 0 ) + if ( TQWidget::find(w) != 0 ) return; // if ( KomposeViewManager::instance()->hasActiveView() && w == KomposeViewManager::instance()->getViewWidget()->winId() ) // { @@ -234,7 +234,7 @@ void KomposeTaskManager::slotUpdateScreenshots( bool switchDesktops ) { kdDebug() << "KomposeTaskManager::slotUpdateScreenshots()" << endl; - QPtrListIterator<KomposeTask> it( tasklist ); + TQPtrListIterator<KomposeTask> it( tasklist ); KomposeTask *task; // Iterate through tasks sorted by desktops (this minimizes desktop switching if necessary) @@ -270,7 +270,7 @@ void KomposeTaskManager::simulatePasvScreenshotEvent() void KomposeTaskManager::slotTaskActivated(WId winId) { kdDebug() << "KomposeTaskManager::slotTaskActivated ( " << winId << " )" << endl; - QPtrListIterator<KomposeTask> it( tasklist ); + TQPtrListIterator<KomposeTask> it( tasklist ); KomposeTask *task; while ( (task = it.current()) != 0 ) { @@ -293,7 +293,7 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task) { if(!task) return false; - for (QValueList<WId>::ConstIterator it = kwin_module->stackingOrder().fromLast(); + for (TQValueList<WId>::ConstIterator it = kwin_module->stackingOrder().fromLast(); it != kwin_module->stackingOrder().end(); --it ) { for (KomposeTask* t = tasklist.first(); t != 0; t = tasklist.next() ) @@ -311,7 +311,7 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task) return false; } -QString KomposeTaskManager::getDesktopName(int desk) const +TQString KomposeTaskManager::getDesktopName(int desk) const { return kwin_module->desktopName(desk); } @@ -346,7 +346,7 @@ bool KomposeTaskManager::processX11Event( XEvent *event ) // e->damage is the damage handle returned by XDamageCreate() // Subtract all the damage, repairing the window. - XDamageSubtract( QPaintDevice::x11AppDisplay(), e->damage, None, None ); + XDamageSubtract( TQPaintDevice::x11AppDisplay(), e->damage, None, None ); if ( !KomposeViewManager::instance()->hasActiveView() ) return true; diff --git a/src/komposetaskmanager.h b/src/komposetaskmanager.h index 3b43a2a..f311ae7 100644 --- a/src/komposetaskmanager.h +++ b/src/komposetaskmanager.h @@ -20,21 +20,21 @@ #ifndef KOMPOSETASKMANAGER_H #define KOMPOSETASKMANAGER_H -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> class KWinModule; class KomposeTaskManager; class KomposeTask; -typedef QPtrList<KomposeTask> TaskList; +typedef TQPtrList<KomposeTask> TaskList; /** @author Hans Oischinger */ -class KomposeTaskManager : public QObject +class KomposeTaskManager : public TQObject { Q_OBJECT protected: @@ -48,7 +48,7 @@ public: bool isOnTop(const KomposeTask* task ); int getNumDesktops() const { return numDesks; } - QString getDesktopName(int desk) const; + TQString getDesktopName(int desk) const; int getCurrentDesktopNum(); TaskList getTasks() const { return tasklist; } diff --git a/src/komposetaskprefswidget.cpp b/src/komposetaskprefswidget.cpp index 9bb862b..bbc67f6 100644 --- a/src/komposetaskprefswidget.cpp +++ b/src/komposetaskprefswidget.cpp @@ -23,10 +23,10 @@ #include <kshortcut.h> #include <klocale.h> -#include <qiconset.h> +#include <tqiconset.h> KomposeTaskPrefsWidget::KomposeTaskPrefsWidget(KomposeTaskWidget *parent, const char *name) - : QDockArea(Qt::Horizontal , QDockArea::Normal, parent, name) + : TQDockArea(TQt::Horizontal , TQDockArea::Normal, parent, name) { KToolBar* pToolBar = new KToolBar( this, i18n("Task Actions") ); pToolBar->setLabel(i18n("Task")); diff --git a/src/komposetaskprefswidget.h b/src/komposetaskprefswidget.h index 558fe5e..f916145 100644 --- a/src/komposetaskprefswidget.h +++ b/src/komposetaskprefswidget.h @@ -12,14 +12,14 @@ #ifndef KOMPOSETASKPREFSWIDGET_H #define KOMPOSETASKPREFSWIDGET_H -#include <qdockarea.h> +#include <tqdockarea.h> class KomposeTaskWidget; /** @author Hans Oischinger */ -class KomposeTaskPrefsWidget : public QDockArea +class KomposeTaskPrefsWidget : public TQDockArea { Q_OBJECT public: diff --git a/src/komposetaskvisualizer.cpp b/src/komposetaskvisualizer.cpp index a3930aa..5348768 100644 --- a/src/komposetaskvisualizer.cpp +++ b/src/komposetaskvisualizer.cpp @@ -15,11 +15,11 @@ #include "komposeviewmanager.h" #include "komposetaskmanager.h" -#include <qpixmap.h> -#include <qtimer.h> +#include <tqpixmap.h> +#include <tqtimer.h> #include <kwin.h> #include <netwm.h> -#include <qapplication.h> +#include <tqapplication.h> #include <kdebug.h> #include <time.h> @@ -28,7 +28,7 @@ KomposeTaskVisualizer::KomposeTaskVisualizer(KomposeTask *parent, const char *name) - : QObject(parent, name), + : TQObject(parent, name), task(parent), scaledScreenshotDirty(false), screenshotSuspended(false), @@ -40,8 +40,8 @@ KomposeTaskVisualizer::KomposeTaskVisualizer(KomposeTask *parent, const char *na compositeInit = false; #endif - screenshot.setOptimization( QPixmap::BestOptim ); - scaledScreenshot.setOptimization( QPixmap::BestOptim ); + screenshot.setOptimization( TQPixmap::BestOptim ); + scaledScreenshot.setOptimization( TQPixmap::BestOptim ); // Create highlight color modifier cmHighlight = imlib_create_color_modifier(); @@ -78,7 +78,7 @@ KomposeTaskVisualizer::~KomposeTaskVisualizer() * Called from outside to retrieve a screenshot * @param pix The pixmap the screenshot will be rendered onto */ -void KomposeTaskVisualizer::renderOnPixmap(QPixmap* pix, int effect) +void KomposeTaskVisualizer::renderOnPixmap(TQPixmap* pix, int effect) { if ( scaledScreenshotDirty || scaledScreenshot.isNull() || scaledScreenshot.size() != pix->size() || KomposeSettings::instance()->getImageEffects() && (lasteffect != effect ) ) @@ -89,7 +89,7 @@ void KomposeTaskVisualizer::renderOnPixmap(QPixmap* pix, int effect) copyBlt ( pix, 0, 0, &scaledScreenshot, 0, 0, pix->width(), pix->height() ); - // QPainter p( pix ); + // TQPainter p( pix ); // p.drawPixmap(0 ,0 , *scaledScreenshot, 0, 0, pix->width(), pix->height() ); // p.end(); } @@ -99,7 +99,7 @@ void KomposeTaskVisualizer::renderOnPixmap(QPixmap* pix, int effect) * Renders a scaled version of screenshot and stores it as scaledScreenshot * @param newSize */ -void KomposeTaskVisualizer::renderScaledScreenshot( QSize newSize ) +void KomposeTaskVisualizer::renderScaledScreenshot( TQSize newSize ) { kdDebug() << "KomposeTaskVisualizer::renderScaledScreenshot() (" << task->window() << ") " << newSize.width() << "x" << newSize.height() << endl; @@ -140,7 +140,7 @@ void KomposeTaskVisualizer::renderScaledScreenshot( QSize newSize ) // The XComposite way #ifdef COMPOSITE Picture picture = XRenderCreatePicture( dpy, windowBackingPix, format, CPSubwindowMode, &pa ); - QRect geom = task->getGeometry(); + TQRect geom = task->getGeometry(); double scale = (double)pix->width() / (double)geom.width(); XRenderSetPictureFilter( dpy, picture, FilterBilinear, 0, 0 ); @@ -153,7 +153,7 @@ void KomposeTaskVisualizer::renderScaledScreenshot( QSize newSize ) XRenderSetPictureTransform( dpy, picture, &xform ); - XRenderComposite( QPaintDevice::x11AppDisplay(), + XRenderComposite( TQPaintDevice::x11AppDisplay(), hasAlpha ? PictOpOver : PictOpSrc, picture, None, @@ -197,7 +197,7 @@ void KomposeTaskVisualizer::slotTaskActivated() { // Retry 1 sec later screenshotSuspended = true; - QTimer::singleShot( 500, this, SLOT( slotTaskActivated() ) ); + TQTimer::singleShot( 500, this, SLOT( slotTaskActivated() ) ); } screenshotSuspended = false; @@ -208,7 +208,7 @@ void KomposeTaskVisualizer::slotTaskActivated() { kdDebug() << "KomposeTaskVisualizer::slotTaskActivated() (WId " << task->window() << ") - Screenshot already exists, but passive mode on - Grabbing new one." << endl; // Use a timer to make task switching feel more responsive - QTimer::singleShot( 300, this, SLOT( captureScreenshot_GrabWindow() ) ); + TQTimer::singleShot( 300, this, SLOT( captureScreenshot_GrabWindow() ) ); //captureScreenshot_GrabWindow(); } } @@ -247,8 +247,8 @@ void KomposeTaskVisualizer::slotUpdateScreenshot() kdDebug() << "KomposeTaskVisualizer::slotUpdateScreenshot() (WId " << task->window() << ") - Forcing activation (no screenshot exists)" << endl; task->activate(); - QApplication::flushX(); - QApplication::syncX(); + TQApplication::flushX(); + TQApplication::syncX(); // Wait until window is fully redrawn struct timespec req, rem; @@ -257,16 +257,16 @@ void KomposeTaskVisualizer::slotUpdateScreenshot() while(nanosleep(&req, &rem)) req = rem; - QApplication::flushX(); + TQApplication::flushX(); //task->refresh(); // Finally capture! - screenshot = QPixmap::grabWindow( task->window() ); + screenshot = TQPixmap::grabWindow( task->window() ); //captureScreenshot_GrabWindow(); // Restore if formerly iconified if ( iconifyLater ) - QTimer::singleShot( 1000, task, SLOT( iconify() ) ); + TQTimer::singleShot( 1000, task, SLOT( iconify() ) ); scaledScreenshotDirty = true; } @@ -310,7 +310,7 @@ void KomposeTaskVisualizer::initXComposite() #ifdef COMPOSITE if ( !compositeInit && KomposeGlobal::instance()->hasXcomposite() && KomposeSettings::instance()->getUseComposite()) { - dpy = QPaintDevice::x11AppDisplay(); + dpy = TQPaintDevice::x11AppDisplay(); connect( task, SIGNAL(x11ConfigureNotify()), this, SLOT(updateXCompositeNamedPixmap())); XSelectInput( dpy, task->wmFrame(), StructureNotifyMask ); @@ -360,21 +360,21 @@ void KomposeTaskVisualizer::captureScreenshot_GrabWindow() //task->activate(); - // QWidget *rootWin = qApp->desktop(); - // screenshot = QPixmap::grabWindow( rootWin->winId(), geom.x(), geom.y(), geom.width(), geom.height() ); + // TQWidget *rootWin = tqApp->desktop(); + // screenshot = TQPixmap::grabWindow( rootWin->winId(), geom.x(), geom.y(), geom.width(), geom.height() ); - screenshot = QPixmap::grabWindow( task->window() ); + screenshot = TQPixmap::grabWindow( task->window() ); scaledScreenshotDirty = true; // We've just grabbed a screenshot and don't want this to happen again in the next 3?! seconds screenshotBlocked = true; - QTimer::singleShot( 3000, this, SLOT( enablePasvScreenshots() ) ); + TQTimer::singleShot( 3000, this, SLOT( enablePasvScreenshots() ) ); kdDebug() << "KomposeTaskVisualizer::captureScreenshot_GrabWindow() (WId " << task->window() << ") - Grabbed screenshot." << endl; // Code to create a screenshot directly as an Imlib image - // QRect geom = windowInfo.geometry(); + // TQRect geom = windowInfo.geometry(); // Display *disp; // Visual *vis; // Colormap cm; diff --git a/src/komposetaskvisualizer.h b/src/komposetaskvisualizer.h index 73419f4..9323515 100644 --- a/src/komposetaskvisualizer.h +++ b/src/komposetaskvisualizer.h @@ -12,7 +12,7 @@ #ifndef KOMPOSETASKVISUALIZER_H #define KOMPOSETASKVISUALIZER_H -#include <qobject.h> +#include <tqobject.h> #include "komposetask.h" @@ -29,20 +29,20 @@ enum ImageEffect { IEFFECT_NONE, IEFFECT_TITLE, IEFFECT_MINIMIZED, IEFFECT_MINIMIZED_AND_TITLE, IEFFECT_HIGHLIGHT }; -class QPixmap; -class QSize; +class TQPixmap; +class TQSize; /** @author Hans Oischinger */ -class KomposeTaskVisualizer : public QObject +class KomposeTaskVisualizer : public TQObject { Q_OBJECT public: KomposeTaskVisualizer(KomposeTask *parent, const char *name = 0); ~KomposeTaskVisualizer(); - void renderOnPixmap( QPixmap* pix, int effect ); + void renderOnPixmap( TQPixmap* pix, int effect ); protected: void applyEffect(); @@ -51,7 +51,7 @@ protected slots: void initXComposite(); void captureScreenshot_GrabWindow(); void updateXCompositeNamedPixmap(); - void renderScaledScreenshot( QSize size ); + void renderScaledScreenshot( TQSize size ); void setScaledScreenshotDirty() { scaledScreenshotDirty = true; } void clearCached(); @@ -63,8 +63,8 @@ public slots: private: KomposeTask *task; - QPixmap screenshot; - QPixmap scaledScreenshot; + TQPixmap screenshot; + TQPixmap scaledScreenshot; bool scaledScreenshotDirty; bool screenshotSuspended; // suspend pasv screenshots for this task bool screenshotBlocked; // dis/enable pasv screenshots for this task diff --git a/src/komposetaskwidget.cpp b/src/komposetaskwidget.cpp index 3d4abfe..dfba330 100644 --- a/src/komposetaskwidget.cpp +++ b/src/komposetaskwidget.cpp @@ -28,16 +28,16 @@ #include "komposeglobal.h" #include "komposesettings.h" -#include <qpixmap.h> -#include <qimage.h> -#include <qpainter.h> -#include <qdragobject.h> -#include <qapplication.h> -#include <qtooltip.h> -#include <qiconset.h> -#include <qtimer.h> -#include <qcolor.h> -#include <qfont.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqdragobject.h> +#include <tqapplication.h> +#include <tqtooltip.h> +#include <tqiconset.h> +#include <tqtimer.h> +#include <tqcolor.h> +#include <tqfont.h> #include <kcursor.h> #include <klocale.h> @@ -50,18 +50,18 @@ #include "komposetaskvisualizer.h" -KomposeTaskWidget::KomposeTaskWidget(KomposeTask *t, QWidget *parent, KomposeLayout *l, const char *name) +KomposeTaskWidget::KomposeTaskWidget(KomposeTask *t, TQWidget *parent, KomposeLayout *l, const char *name) : KomposeWidget(parent, l, name), highlight(false), task(t) { setWFlags( WStaticContents | WRepaintNoErase | WResizeNoErase ); // avoid redraw errors - setBackgroundMode( Qt::NoBackground ); // avoid flickering + setBackgroundMode( TQt::NoBackground ); // avoid flickering - QToolTip::add( this, task->visibleNameWithState() ); + TQToolTip::add( this, task->visibleNameWithState() ); - pm_dbBackground.setOptimization( QPixmap::BestOptim ); - setBackgroundMode( Qt::NoBackground ); + pm_dbBackground.setOptimization( TQPixmap::BestOptim ); + setBackgroundMode( TQt::NoBackground ); //setBackgroundPixmap(pm_dbBackground); initActions(); @@ -81,8 +81,8 @@ KomposeTaskWidget::KomposeTaskWidget(KomposeTask *t, QWidget *parent, KomposeLay connect( t, SIGNAL( x11DamageNotify() ), this, SLOT( drawWidgetAndRepaint() ) ); } #endif - //setFocusPolicy(QWidget::ClickFocus); - setFocusPolicy(QWidget::StrongFocus); + //setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQWidget::StrongFocus); initFonts(); } @@ -117,7 +117,7 @@ void KomposeTaskWidget::slotTaskDestroyed() //if (KomposeViewManager::instance()->hasActiveView()) emit requestRemoval(this); } -void KomposeTaskWidget::resizeEvent ( QResizeEvent * e ) +void KomposeTaskWidget::resizeEvent ( TQResizeEvent * e ) { if ( e->oldSize() != e->size()) { @@ -128,7 +128,7 @@ void KomposeTaskWidget::resizeEvent ( QResizeEvent * e ) } -void KomposeTaskWidget::paintEvent ( QPaintEvent * ) +void KomposeTaskWidget::paintEvent ( TQPaintEvent * ) { if (size().height() < 40 ) // small hack that will prevent drawing on init return; @@ -155,7 +155,7 @@ void KomposeTaskWidget::drawWidget() pm_dbBackground.resize( width(), height() ); //pm_dbBackground.fill(white); - QPainter p( &pm_dbBackground ); + TQPainter p( &pm_dbBackground ); int effect = IEFFECT_NONE; @@ -171,22 +171,22 @@ void KomposeTaskWidget::drawWidget() task->getVisualizer()->renderOnPixmap(&pm_dbBackground, effect); // Icon - QPoint titleTextPos( 6, KomposeSettings::instance()->getWindowTitleFontHeight() + 1); + TQPoint titleTextPos( 6, KomposeSettings::instance()->getWindowTitleFontHeight() + 1); if ( KomposeSettings::instance()->getShowIcons() ) { - QPixmap icon = task->getIcon( KomposeSettings::instance()->getIconSizePixels() ); + TQPixmap icon = task->getIcon( KomposeSettings::instance()->getIconSizePixels() ); // Place the icon left or under the text, according to it's size if ( KomposeSettings::instance()->getIconSize() < 2 || icon.height() < 50 ) { // Medium sized or tiny Icon - p.drawPixmap( QPoint(5, 5), icon ); + p.drawPixmap( TQPoint(5, 5), icon ); titleTextPos.setX(icon.width() + 10); } else { // Big Icon - p.drawPixmap( QPoint(5, 5), icon ); + p.drawPixmap( TQPoint(5, 5), icon ); // titleTextPos.setX(icon.width()); } } @@ -201,62 +201,62 @@ void KomposeTaskWidget::drawWidget() p.drawText( titleTextPos, task->visibleNameWithState() ); } p.setPen( KomposeSettings::instance()->getWindowTitleFontColor() ); - p.drawText( QPoint( titleTextPos.x()-2, titleTextPos.y()-2 ), task->visibleNameWithState() ); + p.drawText( TQPoint( titleTextPos.x()-2, titleTextPos.y()-2 ), task->visibleNameWithState() ); } // Border if (!highlight) { - QPen pen( gray, 1, Qt::SolidLine ); + TQPen pen( gray, 1, TQt::SolidLine ); p.setPen( pen ); p.drawRect(rect()); } else { - QPen pen( black, 2, Qt::DotLine ); + TQPen pen( black, 2, TQt::DotLine ); p.setPen( pen ); - p.drawRect( QRect( 1, 1, rect().width()-1, rect().height()-1 ) ); + p.drawRect( TQRect( 1, 1, rect().width()-1, rect().height()-1 ) ); } p.end(); } -void KomposeTaskWidget::mouseReleaseEvent ( QMouseEvent * e ) +void KomposeTaskWidget::mouseReleaseEvent ( TQMouseEvent * e ) { if ( !rect().contains( e->pos() ) ) return; KomposeViewManager::instance()->activateTask( task ); } -void KomposeTaskWidget::mouseMoveEvent ( QMouseEvent * e ) +void KomposeTaskWidget::mouseMoveEvent ( TQMouseEvent * e ) { - if ( e->state() == Qt::LeftButton ) + if ( e->state() == TQt::LeftButton ) startDrag(); } -// void KomposeTaskWidget::mouseDoubleClickEvent ( QMouseEvent * e ) +// void KomposeTaskWidget::mouseDoubleClickEvent ( TQMouseEvent * e ) // { // if ( !rect().contains( e->pos() ) ) // return; // KomposeTaskManager::instance()->activateTask( task ); // } -void KomposeTaskWidget::keyReleaseEvent ( QKeyEvent * e ) +void KomposeTaskWidget::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() << "KomposeTaskWidget::keyReleaseEvent - activating Task!" << endl; e->accept(); KomposeViewManager::instance()->activateTask( task ); return; } - else if ( e->key() == Qt::Key_C ) + else if ( e->key() == TQt::Key_C ) { kdDebug() << "KomposeTaskWidget::keyReleaseEvent - closing Task!" << endl; task->close(); e->accept(); } - else if ( e->key() == Qt::Key_M ) + else if ( e->key() == TQt::Key_M ) { kdDebug() << "KomposeTaskWidget::keyReleaseEvent - toggling state!" << endl; task->minimizeOrRestore(); @@ -270,7 +270,7 @@ void KomposeTaskWidget::keyReleaseEvent ( QKeyEvent * e ) KomposeWidget::keyReleaseEvent(e); } -void KomposeTaskWidget::leaveEvent ( QEvent * ) +void KomposeTaskWidget::leaveEvent ( TQEvent * ) { highlight = false; unsetCursor(); @@ -281,7 +281,7 @@ void KomposeTaskWidget::leaveEvent ( QEvent * ) parentWidget()->setFocus(); } -void KomposeTaskWidget::enterEvent ( QEvent * ) +void KomposeTaskWidget::enterEvent ( TQEvent * ) { setFocus(); setCursor( KCursor::handCursor() ); @@ -291,13 +291,13 @@ void KomposeTaskWidget::enterEvent ( QEvent * ) prefWidget->show(); } -void KomposeTaskWidget::focusInEvent ( QFocusEvent * ) +void KomposeTaskWidget::focusInEvent ( TQFocusEvent * ) { highlight = true; drawWidgetAndRepaint(); } -void KomposeTaskWidget::focusOutEvent ( QFocusEvent * ) +void KomposeTaskWidget::focusOutEvent ( TQFocusEvent * ) { highlight = false; drawWidgetAndRepaint(); @@ -325,11 +325,11 @@ void KomposeTaskWidget::startDrag() { // The text is just a dummy // FIXME: Maybe we should us a "Task"-Mimetype - QDragObject *d = new QTextDrag( "toDesktop()", this ); + TQDragObject *d = new TQTextDrag( "toDesktop()", this ); d->dragCopy(); } -void KomposeTaskWidget::setGeometry( const QRect &rect ) +void KomposeTaskWidget::setGeometry( const TQRect &rect ) { int width = task->getGeometry().width(); int height = task->getGeometry().height(); @@ -337,10 +337,10 @@ void KomposeTaskWidget::setGeometry( const QRect &rect ) // Don't scale images bigger than they actually are if ( rect.width() > width || rect.height() > height ) { - QWidget::setGeometry( QRect( rect.left(), rect.top(), width, height ) ); + TQWidget::setGeometry( TQRect( rect.left(), rect.top(), width, height ) ); } else - QWidget::setGeometry( rect ); + TQWidget::setGeometry( rect ); } void KomposeTaskWidget::initActions() @@ -361,7 +361,7 @@ void KomposeTaskWidget::initMenu() actMinimizeRestoreTask->plug(menu); // toDesktop menu - QPopupMenu* m = new QPopupMenu( this ); + TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); int id = m->insertItem( i18n("&All Desktops"), task, SLOT( toDesktop(int) ) ); @@ -372,7 +372,7 @@ void KomposeTaskWidget::initMenu() for( int i = 1; i <= KomposeTaskManager::instance()->getNumDesktops(); i++ ) { - QString name = QString( "&%1 %2" ).arg( i ).arg( KomposeTaskManager::instance()->getDesktopName( i ).replace( '&', "&&" ) ); + TQString name = TQString( "&%1 %2" ).arg( i ).arg( KomposeTaskManager::instance()->getDesktopName( i ).replace( '&', "&&" ) ); id = m->insertItem( name, task, SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !task->isOnAllDesktops() && task->onDesktop() == i ); @@ -404,7 +404,7 @@ void KomposeTaskWidget::slotMinimizeRestoreToggled() task->minimizeOrRestore(); } -void KomposeTaskWidget::mousePressEvent ( QMouseEvent * e ) +void KomposeTaskWidget::mousePressEvent ( TQMouseEvent * e ) { if ( !rect().contains( e->pos() ) ) return; diff --git a/src/komposetaskwidget.h b/src/komposetaskwidget.h index ab1a1a9..d83818a 100644 --- a/src/komposetaskwidget.h +++ b/src/komposetaskwidget.h @@ -23,8 +23,8 @@ #include "komposewidget.h" #include "komposetaskprefswidget.h" -#include <qimage.h> -#include <qpixmap.h> +#include <tqimage.h> +#include <tqpixmap.h> class KomposeTask; @@ -40,7 +40,7 @@ class KomposeTaskWidget : public KomposeWidget { Q_OBJECT public: - KomposeTaskWidget(KomposeTask *t, QWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); + KomposeTaskWidget(KomposeTask *t, TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); ~KomposeTaskWidget(); @@ -56,16 +56,16 @@ signals: void requestRemoval(KomposeWidget*); protected: - void paintEvent ( QPaintEvent * ); - void mouseReleaseEvent ( QMouseEvent * e ); - void mousePressEvent ( QMouseEvent * e ); - void mouseMoveEvent ( QMouseEvent * e ); - void leaveEvent ( QEvent * ); - void enterEvent ( QEvent * ); - void resizeEvent ( QResizeEvent * ); - void focusInEvent ( QFocusEvent * ); - void focusOutEvent ( QFocusEvent * ); - void keyReleaseEvent ( QKeyEvent * e ); + void paintEvent ( TQPaintEvent * ); + void mouseReleaseEvent ( TQMouseEvent * e ); + void mousePressEvent ( TQMouseEvent * e ); + void mouseMoveEvent ( TQMouseEvent * e ); + void leaveEvent ( TQEvent * ); + void enterEvent ( TQEvent * ); + void resizeEvent ( TQResizeEvent * ); + void focusInEvent ( TQFocusEvent * ); + void focusOutEvent ( TQFocusEvent * ); + void keyReleaseEvent ( TQKeyEvent * e ); void startDrag(); void initActions(); @@ -76,17 +76,17 @@ protected slots: void drawWidget(); void drawWidgetAndRepaint(); void initFonts(); - void setGeometry( const QRect &rect ); + void setGeometry( const TQRect &rect ); void reInitMenu(); void slotMinimizeRestoreToggled(); void setActionIcons( bool inverse=false ); private: - QPixmap pm_dbBackground; + TQPixmap pm_dbBackground; bool highlight; // Highlight widget? - QFont titleFont; + TQFont titleFont; KomposeTask* task; KomposeTaskPrefsWidget *prefWidget; diff --git a/src/komposeviewmanager.cpp b/src/komposeviewmanager.cpp index 57359d3..0792a55 100644 --- a/src/komposeviewmanager.cpp +++ b/src/komposeviewmanager.cpp @@ -16,12 +16,12 @@ #include "komposesettings.h" #include "komposesystray.h" -#include <qtimer.h> -#include <qcursor.h> -#include <qapplication.h> -#include <qptrlist.h> -#include <qwidgetlist.h> -#include <qdesktopwidget.h> +#include <tqtimer.h> +#include <tqcursor.h> +#include <tqapplication.h> +#include <tqptrlist.h> +#include <tqwidgetlist.h> +#include <tqdesktopwidget.h> #include <kwin.h> #include <kapplication.h> @@ -45,7 +45,7 @@ KomposeViewManager* KomposeViewManager::instance() KomposeViewManager::KomposeViewManager(): DCOPObject( "KomposeDcopIface" ), - QObject(), + TQObject(), viewWidget(), activeView(0), blockScreenshots(0) @@ -53,11 +53,11 @@ KomposeViewManager::KomposeViewManager(): viewManagerInstance = this; // Setup cursorupdate timer to check for mouse moves into corner - cursorUpdateTimer = new QTimer(); + cursorUpdateTimer = new TQTimer(); slotStartCursorUpdateTimer(); - // dirty hack. see uglyQtHackInitFunction() - QTimer::singleShot( 500, this, SLOT( uglyQtHackInitFunction() ) ); + // dirty hack. see uglyTQtHackInitFunction() + TQTimer::singleShot( 500, this, SLOT( uglyTQtHackInitFunction() ) ); } @@ -70,13 +70,13 @@ KomposeViewManager::~KomposeViewManager() /** * This is a hack that should be called by a timer as this connect won't work in the constructor */ -void KomposeViewManager::uglyQtHackInitFunction() +void KomposeViewManager::uglyTQtHackInitFunction() { connect( KomposeSettings::instance(), SIGNAL( settingsChanged() ), SLOT( slotStartCursorUpdateTimer() ) ); } /** - * Starts the corner check timer which polls QCursor::pos() every second + * Starts the corner check timer which polls TQCursor::pos() every second @see checkCursorPos() */ void KomposeViewManager::slotStartCursorUpdateTimer() @@ -92,8 +92,8 @@ void KomposeViewManager::slotStartCursorUpdateTimer() KomposeSettings::instance()->getActivateOnLeftEdge() || KomposeSettings::instance()->getActivateOnRightEdge() ) { - kdDebug() << "KomposeViewManager::slotStartCursorUpdateTimer() - QCursor::pos() checks enabled" << endl; - QRect deskRect = QApplication::desktop()->screenGeometry(); + kdDebug() << "KomposeViewManager::slotStartCursorUpdateTimer() - TQCursor::pos() checks enabled" << endl; + TQRect deskRect = TQApplication::desktop()->screenGeometry(); topLeftCorner = deskRect.topLeft(); topRightCorner = deskRect.topRight(); @@ -113,25 +113,25 @@ void KomposeViewManager::checkCursorPos() { if ( ( KomposeSettings::instance()->getActivateOnTopLeftCorner() && - !activeView && QCursor::pos() == topLeftCorner ) || + !activeView && TQCursor::pos() == topLeftCorner ) || ( KomposeSettings::instance()->getActivateOnTopRightCorner() && - !activeView && QCursor::pos() == topRightCorner ) || + !activeView && TQCursor::pos() == topRightCorner ) || ( KomposeSettings::instance()->getActivateOnBottomLeftCorner() && - !activeView && QCursor::pos() == bottomLeftCorner ) || + !activeView && TQCursor::pos() == bottomLeftCorner ) || ( KomposeSettings::instance()->getActivateOnBottomRightCorner() && - !activeView && QCursor::pos() == bottomRightCorner ) || + !activeView && TQCursor::pos() == bottomRightCorner ) || ( KomposeSettings::instance()->getActivateOnTopEdge() && - !activeView && QCursor::pos().y() == topLeftCorner.y() ) || + !activeView && TQCursor::pos().y() == topLeftCorner.y() ) || ( KomposeSettings::instance()->getActivateOnBottomEdge() && - !activeView && QCursor::pos().y() == bottomLeftCorner.y() ) || + !activeView && TQCursor::pos().y() == bottomLeftCorner.y() ) || ( KomposeSettings::instance()->getActivateOnLeftEdge() && - !activeView && QCursor::pos().x() == topLeftCorner.x() ) || + !activeView && TQCursor::pos().x() == topLeftCorner.x() ) || ( KomposeSettings::instance()->getActivateOnRightEdge() && - !activeView && QCursor::pos().x() == topRightCorner.x() ) + !activeView && TQCursor::pos().x() == topRightCorner.x() ) ) { //cursorUpdateTimer->stop(); - QTimer::singleShot( KomposeSettings::instance()->getAutoLockDelay(), this, SLOT( reCheckCursorPos() ) ); + TQTimer::singleShot( KomposeSettings::instance()->getAutoLockDelay(), this, SLOT( reCheckCursorPos() ) ); } } @@ -142,21 +142,21 @@ void KomposeViewManager::reCheckCursorPos() { if ( ( KomposeSettings::instance()->getActivateOnTopLeftCorner() && - !activeView && QCursor::pos() == topLeftCorner ) || + !activeView && TQCursor::pos() == topLeftCorner ) || ( KomposeSettings::instance()->getActivateOnTopRightCorner() && - !activeView && QCursor::pos() == topRightCorner ) || + !activeView && TQCursor::pos() == topRightCorner ) || ( KomposeSettings::instance()->getActivateOnBottomLeftCorner() && - !activeView && QCursor::pos() == bottomLeftCorner ) || + !activeView && TQCursor::pos() == bottomLeftCorner ) || ( KomposeSettings::instance()->getActivateOnBottomRightCorner() && - !activeView && QCursor::pos() == bottomRightCorner ) || + !activeView && TQCursor::pos() == bottomRightCorner ) || ( KomposeSettings::instance()->getActivateOnTopEdge() && - !activeView && QCursor::pos().y() == topLeftCorner.y() ) || + !activeView && TQCursor::pos().y() == topLeftCorner.y() ) || ( KomposeSettings::instance()->getActivateOnBottomEdge() && - !activeView && QCursor::pos().y() == bottomLeftCorner.y() ) || + !activeView && TQCursor::pos().y() == bottomLeftCorner.y() ) || ( KomposeSettings::instance()->getActivateOnLeftEdge() && - !activeView && QCursor::pos().x() == topLeftCorner.x() ) || + !activeView && TQCursor::pos().x() == topLeftCorner.x() ) || ( KomposeSettings::instance()->getActivateOnRightEdge() && - !activeView && QCursor::pos().x() == topRightCorner.x() ) + !activeView && TQCursor::pos().x() == topRightCorner.x() ) ) { cursorUpdateTimer->stop(); @@ -230,7 +230,7 @@ void KomposeViewManager::closeCurrentView() KWin::setCurrentDesktop( deskBeforeSnaps ); // A short delay until we allow screenshots again (would cause overlapping else - QTimer::singleShot( 400, this, SLOT( toggleBlockScreenshots() ) ); + TQTimer::singleShot( 400, this, SLOT( toggleBlockScreenshots() ) ); // Restart Timer for corner checks slotStartCursorUpdateTimer(); diff --git a/src/komposeviewmanager.h b/src/komposeviewmanager.h index 8117f6d..a840f49 100644 --- a/src/komposeviewmanager.h +++ b/src/komposeviewmanager.h @@ -12,19 +12,19 @@ #ifndef KOMPOSEVIEWMANAGER_H #define KOMPOSEVIEWMANAGER_H -#include <qpoint.h> +#include <tqpoint.h> #include <dcopobject.h> #include "komposedcopiface.h" #include "komposefullscreenwidget.h" class KomposeTask; -class QTimer; +class TQTimer; /** @author Hans Oischinger */ -class KomposeViewManager : public QObject, virtual public KomposeDcopIface +class KomposeViewManager : public TQObject, virtual public KomposeDcopIface { Q_OBJECT protected: @@ -56,7 +56,7 @@ protected slots: void checkCursorPos(); void reCheckCursorPos(); - void uglyQtHackInitFunction(); + void uglyTQtHackInitFunction(); void slotStartCursorUpdateTimer(); signals: @@ -68,12 +68,12 @@ private: bool blockScreenshots; // no screenshots when true int deskBeforeSnaps; // the virtual desk we were on befor screenshots were taken - QTimer *cursorUpdateTimer; + TQTimer *cursorUpdateTimer; // The 4 corners - QPoint topLeftCorner; - QPoint topRightCorner; - QPoint bottomLeftCorner; - QPoint bottomRightCorner; + TQPoint topLeftCorner; + TQPoint topRightCorner; + TQPoint bottomLeftCorner; + TQPoint bottomRightCorner; }; #endif diff --git a/src/komposewidget.cpp b/src/komposewidget.cpp index 80d9ef4..be516cc 100644 --- a/src/komposewidget.cpp +++ b/src/komposewidget.cpp @@ -20,14 +20,14 @@ #include "komposewidget.h" #include "komposelayout.h" -#include <qtimer.h> +#include <tqtimer.h> #include <kdebug.h> /* * The constructor accepts a custom layout, if none is specified a defaultlayout is used */ -KomposeWidget::KomposeWidget(QWidget *parent, KomposeLayout *l, const char *name) - : QWidget(parent, name) +KomposeWidget::KomposeWidget(TQWidget *parent, KomposeLayout *l, const char *name) + : TQWidget(parent, name) { if (!l) layout = new KomposeLayout( this ); @@ -45,10 +45,10 @@ KomposeWidget::~KomposeWidget() /* * Whenever a child is added to the widget it's also added to the layout */ -void KomposeWidget::childEvent ( QChildEvent * ce) +void KomposeWidget::childEvent ( TQChildEvent * ce) { KomposeWidget* kwChild = 0; - kwChild = ::qt_cast<KomposeWidget*>(ce->child()); + kwChild = ::tqt_cast<KomposeWidget*>(ce->child()); if ( !kwChild ) return; @@ -68,7 +68,7 @@ void KomposeWidget::childEvent ( QChildEvent * ce) /* * Whenever a resize occurs rearrange the layout */ -void KomposeWidget::resizeEvent ( QResizeEvent * e ) +void KomposeWidget::resizeEvent ( TQResizeEvent * e ) { kdDebug() << "KomposeWidget(" << className() << ")::resizeEvent - Size:" << e->size().width() << "x"<< e->size().height() << endl; layout->arrangeLayout(); @@ -77,11 +77,11 @@ void KomposeWidget::resizeEvent ( QResizeEvent * e ) KomposeWidget* KomposeWidget::getParentWidget() const { - if ( QWidget::parent()->inherits("KomposeWidget") ) - return (KomposeWidget*)QWidget::parent(); + if ( TQWidget::parent()->inherits("KomposeWidget") ) + return (KomposeWidget*)TQWidget::parent(); else { - kdDebug() << "KomposeWidget::getParentWidget() - QWidget::parent() does not inherit (KomposeWidget)" << endl; + kdDebug() << "KomposeWidget::getParentWidget() - TQWidget::parent() does not inherit (KomposeWidget)" << endl; return NULL; } } diff --git a/src/komposewidget.h b/src/komposewidget.h index 7bb14d0..772256c 100644 --- a/src/komposewidget.h +++ b/src/komposewidget.h @@ -20,7 +20,7 @@ #ifndef KOMPOSEWIDGET_H #define KOMPOSEWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> class KomposeLayout; @@ -28,11 +28,11 @@ class KomposeLayout; This base class for all Kompose Widgets glues the Layout and the widget together: @author Hans Oischinger */ -class KomposeWidget : public QWidget +class KomposeWidget : public TQWidget { Q_OBJECT public: - KomposeWidget( QWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); + KomposeWidget( TQWidget *parent = 0, KomposeLayout *l = 0, const char *name = 0); virtual ~KomposeWidget(); @@ -46,8 +46,8 @@ public: int getNumofChilds(); protected: - void childEvent( QChildEvent * ce); - void resizeEvent ( QResizeEvent * e ); + void childEvent( TQChildEvent * ce); + void resizeEvent ( TQResizeEvent * e ); protected: KomposeLayout *layout; diff --git a/src/main.cpp b/src/main.cpp index 0af9472..7936adc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,18 +40,18 @@ static KCmdLineOptions options[] = KCmdLineLastOption }; -void myMessageOutput( QtMsgType type, const char *msg ) +void myMessageOutput( TQtMsgType type, const char *msg ) { return; switch ( type ) { - case QtDebugMsg: + case TQtDebugMsg: fprintf( stderr, "Debug: %s\n", msg ); break; - case QtWarningMsg: + case TQtWarningMsg: fprintf( stderr, "Warning: %s\n", msg ); break; - case QtFatalMsg: + case TQtFatalMsg: fprintf( stderr, "Fatal: %s\n", msg ); abort(); // deliberately core dump } |