diff --git a/Makefile b/Makefile index ab1b11d..b85480f 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ LIB_KSPELL = -lkspell LIB_KSYCOCA = -lkio LIB_POLL = LIB_QPE = -LIB_QT = -lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread +LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread LIB_QTOPIA = @LIB_QTOPIA@ LIB_SMB = -lsmb LIB_X11 = -lX11 $(LIBSOCKET) diff --git a/acinclude.m4 b/acinclude.m4 index 846e4e0..a272479 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1014,19 +1014,19 @@ AC_DEFUN(KDE_PRINT_QT_PROGRAM, AC_REQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext < -#include +#include +#include EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext < -#include -#include +#include +#include +#include EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <> conftest.$ac_ext < -#include +#include +#include #include EOF fi @@ -1115,20 +1115,20 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x030100" + kde_qt_verstring="TQT_VERSION >= 0x030100" 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 @@ -1234,7 +1234,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= @@ -1297,7 +1297,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 @@ -1368,9 +1368,9 @@ if test ! "$ac_qt_includes" = "NO"; then fi if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h else - kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h fi AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) @@ -1896,7 +1896,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include + #include ], [ QDomDocument doc; @@ -2440,7 +2440,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include ], +[#include ], [ int argc; char** argv; @@ -4319,7 +4319,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include -#include +#include int main() { QString t = "hallo"; t.fill('t'); @@ -5087,7 +5087,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(ntqsql.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) @@ -5108,7 +5108,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/ntqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) diff --git a/aclocal.m4 b/aclocal.m4 index 78cccf0..0b33180 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1026,19 +1026,19 @@ AC_DEFUN(KDE_PRINT_QT_PROGRAM, AC_REQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext < -#include +#include +#include EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext < -#include -#include +#include +#include +#include EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <> conftest.$ac_ext < -#include +#include +#include #include EOF fi @@ -1127,20 +1127,20 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x030100" + kde_qt_verstring="TQT_VERSION >= 0x030100" 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 @@ -1246,7 +1246,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= @@ -1309,7 +1309,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 @@ -1380,9 +1380,9 @@ if test ! "$ac_qt_includes" = "NO"; then fi if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h else - kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h fi AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) @@ -1908,7 +1908,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include + #include ], [ QDomDocument doc; @@ -2452,7 +2452,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include ], +[#include ], [ int argc; char** argv; @@ -4331,7 +4331,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include -#include +#include int main() { QString t = "hallo"; t.fill('t'); @@ -5099,7 +5099,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(ntqsql.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) @@ -5120,7 +5120,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/ntqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) diff --git a/admin/Doxyfile.global b/admin/Doxyfile.global index 30dc1bc..50a237b 100644 --- a/admin/Doxyfile.global +++ b/admin/Doxyfile.global @@ -755,7 +755,7 @@ INCLUDE_FILE_PATTERNS = # or name=definition (no spaces). If the definition and the = are # omitted =1 is assumed. -PREDEFINED = QT_VERSION=305 +PREDEFINED = TQT_VERSION=305 # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index f37cbae..61e38f5 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -1014,19 +1014,19 @@ AC_DEFUN(KDE_PRINT_QT_PROGRAM, AC_REQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext < -#include +#include +#include EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext < -#include -#include +#include +#include +#include EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <> conftest.$ac_ext < -#include +#include +#include #include EOF fi @@ -1115,20 +1115,20 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x030100" + kde_qt_verstring="TQT_VERSION >= 0x030100" 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 @@ -1234,7 +1234,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= @@ -1297,7 +1297,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 @@ -1368,9 +1368,9 @@ if test ! "$ac_qt_includes" = "NO"; then fi if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h else - kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h fi AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) @@ -1896,7 +1896,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include + #include ], [ QDomDocument doc; @@ -2440,7 +2440,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include ], +[#include ], [ int argc; char** argv; @@ -4319,7 +4319,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include -#include +#include int main() { QString t = "hallo"; t.fill('t'); @@ -5087,7 +5087,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(ntqsql.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) @@ -5108,7 +5108,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/ntqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) diff --git a/colorscheme/Makefile b/colorscheme/Makefile index 4fc0dad..7e7e578 100644 --- a/colorscheme/Makefile +++ b/colorscheme/Makefile @@ -165,7 +165,7 @@ LIB_KSPELL = -lkspell LIB_KSYCOCA = -lkio LIB_POLL = LIB_QPE = -LIB_QT = -lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread +LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread LIB_QTOPIA = @LIB_QTOPIA@ LIB_SMB = -lsmb LIB_X11 = -lX11 $(LIBSOCKET) diff --git a/config.log b/config.log index 2742533..f9f1bb7 100644 --- a/config.log +++ b/config.log @@ -1708,25 +1708,25 @@ configure: 24202: ${prefix}/include/jpeglib.h configure: 24202: /usr/include/jpeglib.h taking that configure:24375: checking for Qt -configure: 24440: /usr/lib/qt3/include/qstyle.h +configure: 24440: /usr/lib/qt3/include/ntqstyle.h taking that tried NO -configure:24552: rm -rf SunWS_cache; g++ -o conftest -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -L/usr/lib/qt3/lib -L/usr/X11R6/lib conftest.cc -lqt-mt -lpng -lz -lm -ljpeg -ldl -lXext -lX11 -lSM -lICE -lpthread 1>&5 +configure:24552: rm -rf SunWS_cache; g++ -o conftest -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -L/usr/lib/qt3/lib -L/usr/X11R6/lib conftest.cc -ltqt-mt -lpng -lz -lm -ljpeg -ldl -lXext -lX11 -lSM -lICE -lpthread 1>&5 configure:24555: $? = 0 configure:24614: result: libraries /usr/lib/qt3/lib, headers /usr/lib/qt3/include using -mt configure:24624: checking if Qt compiles without flags -configure:24721: rm -rf SunWS_cache; g++ -o conftest -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -I/usr/lib/qt3/include -DQT_THREAD_SUPPORT -D_REENTRANT -L/usr/X11R6/lib conftest.cc -lqt-mt -lpng -lz -lm -ljpeg -ldl -lXext -lX11 -lSM -lICE -lXext -lX11 1>&5 -/usr/lib/gcc-lib/i586-suse-linux/3.3.4/../../../../i586-suse-linux/bin/ld: cannot find -lqt-mt +configure:24721: rm -rf SunWS_cache; g++ -o conftest -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -I/usr/lib/qt3/include -DQT_THREAD_SUPPORT -D_REENTRANT -L/usr/X11R6/lib conftest.cc -ltqt-mt -lpng -lz -lm -ljpeg -ldl -lXext -lX11 -lSM -lICE -lXext -lX11 1>&5 +/usr/lib/gcc-lib/i586-suse-linux/3.3.4/../../../../i586-suse-linux/bin/ld: cannot find -ltqt-mt collect2: ld returned 1 exit status configure:24724: $? = 1 configure: failed program was: #include "confdefs.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#if ! (QT_VERSION >= 0x030100) +#if ! (TQT_VERSION >= 0x030100) #error 1 #endif @@ -1749,7 +1749,7 @@ configure:25000: /usr/lib/qt3/bin/uic -nounload conftest.ui >/dev/null configure:25003: $? = 0 configure:25015: result: yes configure:25052: checking if Qt needs -ljpeg -configure:25093: rm -rf SunWS_cache; g++ -o conftest -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT conftest.cc -L/usr/X11R6/lib -L/usr/lib/qt3/lib -lqt-mt -lpng -lz -lm -ldl -lXext -lX11 -lSM -lICE 1>&5 +configure:25093: rm -rf SunWS_cache; g++ -o conftest -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT conftest.cc -L/usr/X11R6/lib -L/usr/lib/qt3/lib -ltqt-mt -lpng -lz -lm -ldl -lXext -lX11 -lSM -lICE 1>&5 conftest.cc: In function `int main()': conftest.cc:49: warning: `char**argv' might be used uninitialized in this function @@ -2064,7 +2064,7 @@ LIB_KSPELL='-lkspell' LIB_KSYCOCA='-lkio' LIB_POLL='' LIB_QPE='' -LIB_QT='-lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread' +LIB_QT='-ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread' LIB_SMB='-lsmb' LIB_X11='-lX11 $(LIBSOCKET)' LIB_XEXT='-lXext' diff --git a/config.status b/config.status index 2b3ff6e..02bda46 100755 --- a/config.status +++ b/config.status @@ -358,7 +358,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=: ;; @@ -592,7 +592,7 @@ s,@QT_LDFLAGS@,-L/usr/lib/qt3/lib,;t t s,@MOC@,/usr/lib/qt3/bin/moc,;t t s,@UIC@,/usr/lib/qt3/bin/uic -L $(kde_widgetdir) -nounload,;t t s,@UIC_TR@,tr2i18n,;t t -s,@LIB_QT@,-lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread,;t t +s,@LIB_QT@,-ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread,;t t s,@LIB_QPE@,,;t t s,@kde_qtver@,3,;t t s,@KDE_EXTRA_RPATH@,,;t t diff --git a/configure b/configure index cfed0de..5cff6b5 100755 --- a/configure +++ b/configure @@ -684,7 +684,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 ;; @@ -1245,7 +1245,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 ;; *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) @@ -17649,20 +17649,20 @@ fi if test -z ""; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x030100" + kde_qt_verstring="TQT_VERSION >= 0x030100" 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= @@ -24426,9 +24426,9 @@ if test ! "$ac_qt_includes" = "NO"; then fi if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h else - kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h fi @@ -24491,19 +24491,19 @@ LIBS="$LIBS $LIBQT $KDE_MT_LIBS" cat > conftest.$ac_ext < -#include +#include +#include EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext < -#include -#include +#include +#include +#include EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <> conftest.$ac_ext < -#include +#include +#include #include EOF fi @@ -24660,19 +24660,19 @@ export LIBRARY_PATH cat > conftest.$ac_ext < -#include +#include +#include EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext < -#include -#include +#include +#include +#include EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <> conftest.$ac_ext < -#include +#include +#include #include EOF fi @@ -25077,7 +25077,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { @@ -27321,7 +27321,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/malloryclient.cpp b/malloryclient.cpp index f9a3b63..d6c5db2 100644 --- a/malloryclient.cpp +++ b/malloryclient.cpp @@ -11,7 +11,7 @@ // #include "malloryclient.h" -MalloryClient::MalloryClient(QObject *parent, const char *name) +MalloryClient::MalloryClient(TQObject *parent, const char *name) : KDecoration(parent, name) { } diff --git a/malloryclient/.deps/embeddata.Plo b/malloryclient/.deps/embeddata.Plo index d11ea93..fd76da6 100644 --- a/malloryclient/.deps/embeddata.Plo +++ b/malloryclient/.deps/embeddata.Plo @@ -1,12 +1,12 @@ embeddata.lo .libs/embeddata.o: embeddata.cpp embeddata.h \ - /usr/lib/qt3/include/qimage.h /usr/lib/qt3/include/qpixmap.h \ - /usr/lib/qt3/include/qpaintdevice.h /usr/lib/qt3/include/qwindowdefs.h \ - /usr/lib/qt3/include/qobjectdefs.h /usr/lib/qt3/include/qglobal.h \ - /usr/lib/qt3/include/qconfig.h /usr/lib/qt3/include/qmodules.h \ - /usr/lib/qt3/include/qfeatures.h /usr/lib/qt3/include/qstring.h \ - /usr/lib/qt3/include/qcstring.h /usr/lib/qt3/include/qmemarray.h \ - /usr/lib/qt3/include/qgarray.h /usr/lib/qt3/include/qshared.h \ - /usr/lib/qt3/include/qwinexport.h /usr/include/string.h \ + /usr/lib/qt3/include/ntqimage.h /usr/lib/qt3/include/ntqpixmap.h \ + /usr/lib/qt3/include/ntqpaintdevice.h /usr/lib/qt3/include/ntqwindowdefs.h \ + /usr/lib/qt3/include/ntqobjectdefs.h /usr/lib/qt3/include/ntqglobal.h \ + /usr/lib/qt3/include/ntqconfig.h /usr/lib/qt3/include/ntqmodules.h \ + /usr/lib/qt3/include/ntqfeatures.h /usr/lib/qt3/include/ntqstring.h \ + /usr/lib/qt3/include/ntqcstring.h /usr/lib/qt3/include/ntqmemarray.h \ + /usr/lib/qt3/include/ntqgarray.h /usr/lib/qt3/include/ntqshared.h \ + /usr/lib/qt3/include/ntqwinexport.h /usr/include/string.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \ @@ -69,12 +69,12 @@ embeddata.lo .libs/embeddata.o: embeddata.cpp embeddata.h \ /usr/include/g++/bits/stl_algo.h /usr/include/g++/bits/stl_heap.h \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ - /usr/lib/qt3/include/qnamespace.h /usr/lib/qt3/include/qrect.h \ - /usr/lib/qt3/include/qsize.h /usr/lib/qt3/include/qpoint.h \ - /usr/lib/qt3/include/qcolor.h /usr/lib/qt3/include/qstringlist.h \ - /usr/lib/qt3/include/qvaluelist.h /usr/lib/qt3/include/qtl.h \ - /usr/lib/qt3/include/qtextstream.h /usr/lib/qt3/include/qiodevice.h \ - /usr/lib/qt3/include/qdatastream.h /usr/include/g++/iterator \ + /usr/lib/qt3/include/ntqnamespace.h /usr/lib/qt3/include/ntqrect.h \ + /usr/lib/qt3/include/ntqsize.h /usr/lib/qt3/include/ntqpoint.h \ + /usr/lib/qt3/include/ntqcolor.h /usr/lib/qt3/include/ntqstringlist.h \ + /usr/lib/qt3/include/ntqvaluelist.h /usr/lib/qt3/include/ntqtl.h \ + /usr/lib/qt3/include/ntqtextstream.h /usr/lib/qt3/include/ntqiodevice.h \ + /usr/lib/qt3/include/ntqdatastream.h /usr/include/g++/iterator \ /usr/include/g++/ostream /usr/include/g++/ios \ /usr/include/g++/bits/localefwd.h /usr/include/g++/bits/ios_base.h \ /usr/include/g++/bits/locale_classes.h /usr/include/g++/streambuf \ @@ -102,47 +102,47 @@ embeddata.lo .libs/embeddata.o: embeddata.cpp embeddata.h \ /usr/include/g++/istream /usr/include/g++/bits/istream.tcc \ /usr/include/g++/bits/stream_iterator.h /usr/include/g++/list \ /usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \ - /usr/lib/qt3/include/qstrlist.h /usr/lib/qt3/include/qptrlist.h \ - /usr/lib/qt3/include/qglist.h /usr/lib/qt3/include/qptrcollection.h \ - /usr/lib/qt3/include/qdict.h /usr/lib/qt3/include/qgdict.h \ - /usr/lib/qt3/include/qmime.h /usr/lib/qt3/include/qmap.h \ - /usr/lib/qt3/include/qpair.h /usr/include/g++/map \ + /usr/lib/qt3/include/ntqstrlist.h /usr/lib/qt3/include/ntqptrlist.h \ + /usr/lib/qt3/include/ntqglist.h /usr/lib/qt3/include/ntqptrcollection.h \ + /usr/lib/qt3/include/ntqdict.h /usr/lib/qt3/include/ntqgdict.h \ + /usr/lib/qt3/include/ntqmime.h /usr/lib/qt3/include/ntqmap.h \ + /usr/lib/qt3/include/ntqpair.h /usr/include/g++/map \ /usr/include/g++/bits/stl_tree.h /usr/include/g++/bits/stl_map.h \ - /usr/include/g++/bits/stl_multimap.h /usr/lib/qt3/include/qdragobject.h \ - /usr/lib/qt3/include/qobject.h /usr/lib/qt3/include/qevent.h \ - /usr/lib/qt3/include/qregion.h + /usr/include/g++/bits/stl_multimap.h /usr/lib/qt3/include/ntqdragobject.h \ + /usr/lib/qt3/include/ntqobject.h /usr/lib/qt3/include/ntqevent.h \ + /usr/lib/qt3/include/ntqregion.h embeddata.h: -/usr/lib/qt3/include/qimage.h: +/usr/lib/qt3/include/ntqimage.h: -/usr/lib/qt3/include/qpixmap.h: +/usr/lib/qt3/include/ntqpixmap.h: -/usr/lib/qt3/include/qpaintdevice.h: +/usr/lib/qt3/include/ntqpaintdevice.h: -/usr/lib/qt3/include/qwindowdefs.h: +/usr/lib/qt3/include/ntqwindowdefs.h: -/usr/lib/qt3/include/qobjectdefs.h: +/usr/lib/qt3/include/ntqobjectdefs.h: -/usr/lib/qt3/include/qglobal.h: +/usr/lib/qt3/include/ntqglobal.h: -/usr/lib/qt3/include/qconfig.h: +/usr/lib/qt3/include/ntqconfig.h: -/usr/lib/qt3/include/qmodules.h: +/usr/lib/qt3/include/ntqmodules.h: -/usr/lib/qt3/include/qfeatures.h: +/usr/lib/qt3/include/ntqfeatures.h: -/usr/lib/qt3/include/qstring.h: +/usr/lib/qt3/include/ntqstring.h: -/usr/lib/qt3/include/qcstring.h: +/usr/lib/qt3/include/ntqcstring.h: -/usr/lib/qt3/include/qmemarray.h: +/usr/lib/qt3/include/ntqmemarray.h: -/usr/lib/qt3/include/qgarray.h: +/usr/lib/qt3/include/ntqgarray.h: -/usr/lib/qt3/include/qshared.h: +/usr/lib/qt3/include/ntqshared.h: -/usr/lib/qt3/include/qwinexport.h: +/usr/lib/qt3/include/ntqwinexport.h: /usr/include/string.h: @@ -352,27 +352,27 @@ embeddata.h: /usr/include/g++/bits/basic_string.tcc: -/usr/lib/qt3/include/qnamespace.h: +/usr/lib/qt3/include/ntqnamespace.h: -/usr/lib/qt3/include/qrect.h: +/usr/lib/qt3/include/ntqrect.h: -/usr/lib/qt3/include/qsize.h: +/usr/lib/qt3/include/ntqsize.h: -/usr/lib/qt3/include/qpoint.h: +/usr/lib/qt3/include/ntqpoint.h: -/usr/lib/qt3/include/qcolor.h: +/usr/lib/qt3/include/ntqcolor.h: -/usr/lib/qt3/include/qstringlist.h: +/usr/lib/qt3/include/ntqstringlist.h: -/usr/lib/qt3/include/qvaluelist.h: +/usr/lib/qt3/include/ntqvaluelist.h: -/usr/lib/qt3/include/qtl.h: +/usr/lib/qt3/include/ntqtl.h: -/usr/lib/qt3/include/qtextstream.h: +/usr/lib/qt3/include/ntqtextstream.h: -/usr/lib/qt3/include/qiodevice.h: +/usr/lib/qt3/include/ntqiodevice.h: -/usr/lib/qt3/include/qdatastream.h: +/usr/lib/qt3/include/ntqdatastream.h: /usr/include/g++/iterator: @@ -472,23 +472,23 @@ embeddata.h: /usr/include/g++/bits/list.tcc: -/usr/lib/qt3/include/qstrlist.h: +/usr/lib/qt3/include/ntqstrlist.h: -/usr/lib/qt3/include/qptrlist.h: +/usr/lib/qt3/include/ntqptrlist.h: -/usr/lib/qt3/include/qglist.h: +/usr/lib/qt3/include/ntqglist.h: -/usr/lib/qt3/include/qptrcollection.h: +/usr/lib/qt3/include/ntqptrcollection.h: -/usr/lib/qt3/include/qdict.h: +/usr/lib/qt3/include/ntqdict.h: -/usr/lib/qt3/include/qgdict.h: +/usr/lib/qt3/include/ntqgdict.h: -/usr/lib/qt3/include/qmime.h: +/usr/lib/qt3/include/ntqmime.h: -/usr/lib/qt3/include/qmap.h: +/usr/lib/qt3/include/ntqmap.h: -/usr/lib/qt3/include/qpair.h: +/usr/lib/qt3/include/ntqpair.h: /usr/include/g++/map: @@ -498,10 +498,10 @@ embeddata.h: /usr/include/g++/bits/stl_multimap.h: -/usr/lib/qt3/include/qdragobject.h: +/usr/lib/qt3/include/ntqdragobject.h: -/usr/lib/qt3/include/qobject.h: +/usr/lib/qt3/include/ntqobject.h: -/usr/lib/qt3/include/qevent.h: +/usr/lib/qt3/include/ntqevent.h: -/usr/lib/qt3/include/qregion.h: +/usr/lib/qt3/include/ntqregion.h: diff --git a/malloryclient/.deps/mallorybutton.Plo b/malloryclient/.deps/mallorybutton.Plo index 0d71e42..412d6b5 100644 --- a/malloryclient/.deps/mallorybutton.Plo +++ b/malloryclient/.deps/mallorybutton.Plo @@ -1,11 +1,11 @@ mallorybutton.lo .libs/mallorybutton.o: mallorybutton.cpp \ - /usr/lib/qt3/include/qtooltip.h /usr/lib/qt3/include/qwidget.h \ - /usr/lib/qt3/include/qwindowdefs.h /usr/lib/qt3/include/qobjectdefs.h \ - /usr/lib/qt3/include/qglobal.h /usr/lib/qt3/include/qconfig.h \ - /usr/lib/qt3/include/qmodules.h /usr/lib/qt3/include/qfeatures.h \ - /usr/lib/qt3/include/qstring.h /usr/lib/qt3/include/qcstring.h \ - /usr/lib/qt3/include/qmemarray.h /usr/lib/qt3/include/qgarray.h \ - /usr/lib/qt3/include/qshared.h /usr/lib/qt3/include/qwinexport.h \ + /usr/lib/qt3/include/ntqtooltip.h /usr/lib/qt3/include/ntqwidget.h \ + /usr/lib/qt3/include/ntqwindowdefs.h /usr/lib/qt3/include/ntqobjectdefs.h \ + /usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \ + /usr/lib/qt3/include/ntqmodules.h /usr/lib/qt3/include/ntqfeatures.h \ + /usr/lib/qt3/include/ntqstring.h /usr/lib/qt3/include/ntqcstring.h \ + /usr/lib/qt3/include/ntqmemarray.h /usr/lib/qt3/include/ntqgarray.h \ + /usr/lib/qt3/include/ntqshared.h /usr/lib/qt3/include/ntqwinexport.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \ @@ -68,14 +68,14 @@ mallorybutton.lo .libs/mallorybutton.o: mallorybutton.cpp \ /usr/include/g++/bits/stl_algo.h /usr/include/g++/bits/stl_heap.h \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ - /usr/lib/qt3/include/qnamespace.h /usr/lib/qt3/include/qobject.h \ - /usr/lib/qt3/include/qevent.h /usr/lib/qt3/include/qregion.h \ - /usr/lib/qt3/include/qrect.h /usr/lib/qt3/include/qsize.h \ - /usr/lib/qt3/include/qpoint.h /usr/lib/qt3/include/qmime.h \ - /usr/lib/qt3/include/qmap.h /usr/lib/qt3/include/qdatastream.h \ - /usr/lib/qt3/include/qiodevice.h /usr/lib/qt3/include/qpair.h \ - /usr/lib/qt3/include/qvaluelist.h /usr/lib/qt3/include/qtl.h \ - /usr/lib/qt3/include/qtextstream.h /usr/include/g++/iterator \ + /usr/lib/qt3/include/ntqnamespace.h /usr/lib/qt3/include/ntqobject.h \ + /usr/lib/qt3/include/ntqevent.h /usr/lib/qt3/include/ntqregion.h \ + /usr/lib/qt3/include/ntqrect.h /usr/lib/qt3/include/ntqsize.h \ + /usr/lib/qt3/include/ntqpoint.h /usr/lib/qt3/include/ntqmime.h \ + /usr/lib/qt3/include/ntqmap.h /usr/lib/qt3/include/ntqdatastream.h \ + /usr/lib/qt3/include/ntqiodevice.h /usr/lib/qt3/include/ntqpair.h \ + /usr/lib/qt3/include/ntqvaluelist.h /usr/lib/qt3/include/ntqtl.h \ + /usr/lib/qt3/include/ntqtextstream.h /usr/include/g++/iterator \ /usr/include/g++/ostream /usr/include/g++/ios \ /usr/include/g++/bits/localefwd.h /usr/include/g++/bits/ios_base.h \ /usr/include/g++/bits/locale_classes.h /usr/include/g++/streambuf \ @@ -105,61 +105,61 @@ mallorybutton.lo .libs/mallorybutton.o: mallorybutton.cpp \ /usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \ /usr/include/g++/map /usr/include/g++/bits/stl_tree.h \ /usr/include/g++/bits/stl_map.h /usr/include/g++/bits/stl_multimap.h \ - /usr/lib/qt3/include/qpaintdevice.h /usr/lib/qt3/include/qpalette.h \ - /usr/lib/qt3/include/qcolor.h /usr/lib/qt3/include/qstringlist.h \ - /usr/lib/qt3/include/qstrlist.h /usr/lib/qt3/include/qptrlist.h \ - /usr/lib/qt3/include/qglist.h /usr/lib/qt3/include/qptrcollection.h \ - /usr/lib/qt3/include/qbrush.h /usr/lib/qt3/include/qfont.h \ - /usr/lib/qt3/include/qfontmetrics.h /usr/lib/qt3/include/qfontinfo.h \ - /usr/lib/qt3/include/qsizepolicy.h /usr/lib/qt3/include/qpainter.h \ - /usr/lib/qt3/include/qpen.h /usr/lib/qt3/include/qpointarray.h \ - /usr/lib/qt3/include/qwmatrix.h /usr/lib/qt3/include/qpixmap.h enums.h \ - mallorybutton.h /usr/lib/qt3/include/qbutton.h \ - /usr/lib/qt3/include/qkeysequence.h malloryclient.h \ - /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/qiconset.h \ + /usr/lib/qt3/include/ntqpaintdevice.h /usr/lib/qt3/include/ntqpalette.h \ + /usr/lib/qt3/include/ntqcolor.h /usr/lib/qt3/include/ntqstringlist.h \ + /usr/lib/qt3/include/ntqstrlist.h /usr/lib/qt3/include/ntqptrlist.h \ + /usr/lib/qt3/include/ntqglist.h /usr/lib/qt3/include/ntqptrcollection.h \ + /usr/lib/qt3/include/ntqbrush.h /usr/lib/qt3/include/ntqfont.h \ + /usr/lib/qt3/include/ntqfontmetrics.h /usr/lib/qt3/include/ntqfontinfo.h \ + /usr/lib/qt3/include/ntqsizepolicy.h /usr/lib/qt3/include/ntqpainter.h \ + /usr/lib/qt3/include/ntqpen.h /usr/lib/qt3/include/ntqpointarray.h \ + /usr/lib/qt3/include/ntqwmatrix.h /usr/lib/qt3/include/ntqpixmap.h enums.h \ + mallorybutton.h /usr/lib/qt3/include/ntqbutton.h \ + /usr/lib/qt3/include/ntqkeysequence.h malloryclient.h \ + /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/ntqiconset.h \ /opt/kde3/include/netwm_def.h /opt/kde3/include/kdelibs_export.h \ /opt/kde3/include/kdemacros.h /opt/kde3/include/kdeversion.h \ - /opt/kde3/include/kdecorationfactory.h /usr/lib/qt3/include/qlayout.h \ + /opt/kde3/include/kdecorationfactory.h /usr/lib/qt3/include/ntqlayout.h \ malloryhandler.h /opt/kde3/include/kconfig.h \ - /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/qdatetime.h \ - /usr/lib/qt3/include/qvariant.h /opt/kde3/include/kconfigdata.h \ + /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ + /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/kconfigdata.h \ /opt/kde3/include/klockfile.h /opt/kde3/include/ksharedptr.h pixmaps.h \ - /usr/lib/qt3/include/qimage.h embeddata.h /usr/lib/qt3/include/qdict.h \ - /usr/lib/qt3/include/qgdict.h /usr/lib/qt3/include/qdragobject.h \ - mallorybutton.moc /usr/lib/qt3/include/qmetaobject.h \ - /usr/lib/qt3/include/qconnection.h /usr/lib/qt3/include/qapplication.h \ - /usr/lib/qt3/include/qdesktopwidget.h /usr/lib/qt3/include/qasciidict.h \ - /usr/lib/qt3/include/qtranslator.h \ + /usr/lib/qt3/include/ntqimage.h embeddata.h /usr/lib/qt3/include/ntqdict.h \ + /usr/lib/qt3/include/ntqgdict.h /usr/lib/qt3/include/ntqdragobject.h \ + mallorybutton.moc /usr/lib/qt3/include/ntqmetaobject.h \ + /usr/lib/qt3/include/ntqconnection.h /usr/lib/qt3/include/ntqapplication.h \ + /usr/lib/qt3/include/ntqdesktopwidget.h /usr/lib/qt3/include/ntqasciidict.h \ + /usr/lib/qt3/include/ntqtranslator.h \ /usr/lib/qt3/include/private/qucomextra_p.h \ - /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/quuid.h + /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h -/usr/lib/qt3/include/qtooltip.h: +/usr/lib/qt3/include/ntqtooltip.h: -/usr/lib/qt3/include/qwidget.h: +/usr/lib/qt3/include/ntqwidget.h: -/usr/lib/qt3/include/qwindowdefs.h: +/usr/lib/qt3/include/ntqwindowdefs.h: -/usr/lib/qt3/include/qobjectdefs.h: +/usr/lib/qt3/include/ntqobjectdefs.h: -/usr/lib/qt3/include/qglobal.h: +/usr/lib/qt3/include/ntqglobal.h: -/usr/lib/qt3/include/qconfig.h: +/usr/lib/qt3/include/ntqconfig.h: -/usr/lib/qt3/include/qmodules.h: +/usr/lib/qt3/include/ntqmodules.h: -/usr/lib/qt3/include/qfeatures.h: +/usr/lib/qt3/include/ntqfeatures.h: -/usr/lib/qt3/include/qstring.h: +/usr/lib/qt3/include/ntqstring.h: -/usr/lib/qt3/include/qcstring.h: +/usr/lib/qt3/include/ntqcstring.h: -/usr/lib/qt3/include/qmemarray.h: +/usr/lib/qt3/include/ntqmemarray.h: -/usr/lib/qt3/include/qgarray.h: +/usr/lib/qt3/include/ntqgarray.h: -/usr/lib/qt3/include/qshared.h: +/usr/lib/qt3/include/ntqshared.h: -/usr/lib/qt3/include/qwinexport.h: +/usr/lib/qt3/include/ntqwinexport.h: /usr/include/string.h: @@ -369,35 +369,35 @@ mallorybutton.lo .libs/mallorybutton.o: mallorybutton.cpp \ /usr/include/g++/bits/basic_string.tcc: -/usr/lib/qt3/include/qnamespace.h: +/usr/lib/qt3/include/ntqnamespace.h: -/usr/lib/qt3/include/qobject.h: +/usr/lib/qt3/include/ntqobject.h: -/usr/lib/qt3/include/qevent.h: +/usr/lib/qt3/include/ntqevent.h: -/usr/lib/qt3/include/qregion.h: +/usr/lib/qt3/include/ntqregion.h: -/usr/lib/qt3/include/qrect.h: +/usr/lib/qt3/include/ntqrect.h: -/usr/lib/qt3/include/qsize.h: +/usr/lib/qt3/include/ntqsize.h: -/usr/lib/qt3/include/qpoint.h: +/usr/lib/qt3/include/ntqpoint.h: -/usr/lib/qt3/include/qmime.h: +/usr/lib/qt3/include/ntqmime.h: -/usr/lib/qt3/include/qmap.h: +/usr/lib/qt3/include/ntqmap.h: -/usr/lib/qt3/include/qdatastream.h: +/usr/lib/qt3/include/ntqdatastream.h: -/usr/lib/qt3/include/qiodevice.h: +/usr/lib/qt3/include/ntqiodevice.h: -/usr/lib/qt3/include/qpair.h: +/usr/lib/qt3/include/ntqpair.h: -/usr/lib/qt3/include/qvaluelist.h: +/usr/lib/qt3/include/ntqvaluelist.h: -/usr/lib/qt3/include/qtl.h: +/usr/lib/qt3/include/ntqtl.h: -/usr/lib/qt3/include/qtextstream.h: +/usr/lib/qt3/include/ntqtextstream.h: /usr/include/g++/iterator: @@ -505,55 +505,55 @@ mallorybutton.lo .libs/mallorybutton.o: mallorybutton.cpp \ /usr/include/g++/bits/stl_multimap.h: -/usr/lib/qt3/include/qpaintdevice.h: +/usr/lib/qt3/include/ntqpaintdevice.h: -/usr/lib/qt3/include/qpalette.h: +/usr/lib/qt3/include/ntqpalette.h: -/usr/lib/qt3/include/qcolor.h: +/usr/lib/qt3/include/ntqcolor.h: -/usr/lib/qt3/include/qstringlist.h: +/usr/lib/qt3/include/ntqstringlist.h: -/usr/lib/qt3/include/qstrlist.h: +/usr/lib/qt3/include/ntqstrlist.h: -/usr/lib/qt3/include/qptrlist.h: +/usr/lib/qt3/include/ntqptrlist.h: -/usr/lib/qt3/include/qglist.h: +/usr/lib/qt3/include/ntqglist.h: -/usr/lib/qt3/include/qptrcollection.h: +/usr/lib/qt3/include/ntqptrcollection.h: -/usr/lib/qt3/include/qbrush.h: +/usr/lib/qt3/include/ntqbrush.h: -/usr/lib/qt3/include/qfont.h: +/usr/lib/qt3/include/ntqfont.h: -/usr/lib/qt3/include/qfontmetrics.h: +/usr/lib/qt3/include/ntqfontmetrics.h: -/usr/lib/qt3/include/qfontinfo.h: +/usr/lib/qt3/include/ntqfontinfo.h: -/usr/lib/qt3/include/qsizepolicy.h: +/usr/lib/qt3/include/ntqsizepolicy.h: -/usr/lib/qt3/include/qpainter.h: +/usr/lib/qt3/include/ntqpainter.h: -/usr/lib/qt3/include/qpen.h: +/usr/lib/qt3/include/ntqpen.h: -/usr/lib/qt3/include/qpointarray.h: +/usr/lib/qt3/include/ntqpointarray.h: -/usr/lib/qt3/include/qwmatrix.h: +/usr/lib/qt3/include/ntqwmatrix.h: -/usr/lib/qt3/include/qpixmap.h: +/usr/lib/qt3/include/ntqpixmap.h: enums.h: mallorybutton.h: -/usr/lib/qt3/include/qbutton.h: +/usr/lib/qt3/include/ntqbutton.h: -/usr/lib/qt3/include/qkeysequence.h: +/usr/lib/qt3/include/ntqkeysequence.h: malloryclient.h: /opt/kde3/include/kdecoration.h: -/usr/lib/qt3/include/qiconset.h: +/usr/lib/qt3/include/ntqiconset.h: /opt/kde3/include/netwm_def.h: @@ -565,7 +565,7 @@ malloryclient.h: /opt/kde3/include/kdecorationfactory.h: -/usr/lib/qt3/include/qlayout.h: +/usr/lib/qt3/include/ntqlayout.h: malloryhandler.h: @@ -573,9 +573,9 @@ malloryhandler.h: /opt/kde3/include/kconfigbase.h: -/usr/lib/qt3/include/qdatetime.h: +/usr/lib/qt3/include/ntqdatetime.h: -/usr/lib/qt3/include/qvariant.h: +/usr/lib/qt3/include/ntqvariant.h: /opt/kde3/include/kconfigdata.h: @@ -585,32 +585,32 @@ malloryhandler.h: pixmaps.h: -/usr/lib/qt3/include/qimage.h: +/usr/lib/qt3/include/ntqimage.h: embeddata.h: -/usr/lib/qt3/include/qdict.h: +/usr/lib/qt3/include/ntqdict.h: -/usr/lib/qt3/include/qgdict.h: +/usr/lib/qt3/include/ntqgdict.h: -/usr/lib/qt3/include/qdragobject.h: +/usr/lib/qt3/include/ntqdragobject.h: mallorybutton.moc: -/usr/lib/qt3/include/qmetaobject.h: +/usr/lib/qt3/include/ntqmetaobject.h: -/usr/lib/qt3/include/qconnection.h: +/usr/lib/qt3/include/ntqconnection.h: -/usr/lib/qt3/include/qapplication.h: +/usr/lib/qt3/include/ntqapplication.h: -/usr/lib/qt3/include/qdesktopwidget.h: +/usr/lib/qt3/include/ntqdesktopwidget.h: -/usr/lib/qt3/include/qasciidict.h: +/usr/lib/qt3/include/ntqasciidict.h: -/usr/lib/qt3/include/qtranslator.h: +/usr/lib/qt3/include/ntqtranslator.h: /usr/lib/qt3/include/private/qucomextra_p.h: /usr/lib/qt3/include/private/qucom_p.h: -/usr/lib/qt3/include/quuid.h: +/usr/lib/qt3/include/ntquuid.h: diff --git a/malloryclient/.deps/malloryclient.Plo b/malloryclient/.deps/malloryclient.Plo index 784c7ed..38a8a6f 100644 --- a/malloryclient/.deps/malloryclient.Plo +++ b/malloryclient/.deps/malloryclient.Plo @@ -1,10 +1,10 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ - /opt/kde3/include/klocale.h /usr/lib/qt3/include/qstring.h \ - /usr/lib/qt3/include/qcstring.h /usr/lib/qt3/include/qmemarray.h \ - /usr/lib/qt3/include/qgarray.h /usr/lib/qt3/include/qshared.h \ - /usr/lib/qt3/include/qglobal.h /usr/lib/qt3/include/qconfig.h \ - /usr/lib/qt3/include/qmodules.h /usr/lib/qt3/include/qfeatures.h \ - /usr/lib/qt3/include/qwinexport.h /usr/include/string.h \ + /opt/kde3/include/klocale.h /usr/lib/qt3/include/ntqstring.h \ + /usr/lib/qt3/include/ntqcstring.h /usr/lib/qt3/include/ntqmemarray.h \ + /usr/lib/qt3/include/ntqgarray.h /usr/lib/qt3/include/ntqshared.h \ + /usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \ + /usr/lib/qt3/include/ntqmodules.h /usr/lib/qt3/include/ntqfeatures.h \ + /usr/lib/qt3/include/ntqwinexport.h /usr/include/string.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \ @@ -68,14 +68,14 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \ - /opt/kde3/include/kpixmap.h /usr/lib/qt3/include/qpixmap.h \ - /usr/lib/qt3/include/qpaintdevice.h /usr/lib/qt3/include/qwindowdefs.h \ - /usr/lib/qt3/include/qobjectdefs.h /usr/lib/qt3/include/qnamespace.h \ - /usr/lib/qt3/include/qrect.h /usr/lib/qt3/include/qsize.h \ - /usr/lib/qt3/include/qpoint.h /usr/lib/qt3/include/qcolor.h \ - /usr/lib/qt3/include/qstringlist.h /usr/lib/qt3/include/qvaluelist.h \ - /usr/lib/qt3/include/qtl.h /usr/lib/qt3/include/qtextstream.h \ - /usr/lib/qt3/include/qiodevice.h /usr/lib/qt3/include/qdatastream.h \ + /opt/kde3/include/kpixmap.h /usr/lib/qt3/include/ntqpixmap.h \ + /usr/lib/qt3/include/ntqpaintdevice.h /usr/lib/qt3/include/ntqwindowdefs.h \ + /usr/lib/qt3/include/ntqobjectdefs.h /usr/lib/qt3/include/ntqnamespace.h \ + /usr/lib/qt3/include/ntqrect.h /usr/lib/qt3/include/ntqsize.h \ + /usr/lib/qt3/include/ntqpoint.h /usr/lib/qt3/include/ntqcolor.h \ + /usr/lib/qt3/include/ntqstringlist.h /usr/lib/qt3/include/ntqvaluelist.h \ + /usr/lib/qt3/include/ntqtl.h /usr/lib/qt3/include/ntqtextstream.h \ + /usr/lib/qt3/include/ntqiodevice.h /usr/lib/qt3/include/ntqdatastream.h \ /usr/include/g++/iterator /usr/include/g++/ostream /usr/include/g++/ios \ /usr/include/g++/bits/localefwd.h /usr/include/g++/bits/ios_base.h \ /usr/include/g++/bits/locale_classes.h /usr/include/g++/streambuf \ @@ -103,59 +103,59 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /usr/include/g++/istream /usr/include/g++/bits/istream.tcc \ /usr/include/g++/bits/stream_iterator.h /usr/include/g++/list \ /usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \ - /usr/lib/qt3/include/qstrlist.h /usr/lib/qt3/include/qptrlist.h \ - /usr/lib/qt3/include/qglist.h /usr/lib/qt3/include/qptrcollection.h \ - /opt/kde3/include/kpixmapeffect.h /usr/lib/qt3/include/qcursor.h \ - /usr/lib/qt3/include/qfontmetrics.h /usr/lib/qt3/include/qfont.h \ - /usr/lib/qt3/include/qlabel.h /usr/lib/qt3/include/qframe.h \ - /usr/lib/qt3/include/qwidget.h /usr/lib/qt3/include/qobject.h \ - /usr/lib/qt3/include/qevent.h /usr/lib/qt3/include/qregion.h \ - /usr/lib/qt3/include/qmime.h /usr/lib/qt3/include/qmap.h \ - /usr/lib/qt3/include/qpair.h /usr/include/g++/map \ + /usr/lib/qt3/include/ntqstrlist.h /usr/lib/qt3/include/ntqptrlist.h \ + /usr/lib/qt3/include/ntqglist.h /usr/lib/qt3/include/ntqptrcollection.h \ + /opt/kde3/include/kpixmapeffect.h /usr/lib/qt3/include/ntqcursor.h \ + /usr/lib/qt3/include/ntqfontmetrics.h /usr/lib/qt3/include/ntqfont.h \ + /usr/lib/qt3/include/ntqlabel.h /usr/lib/qt3/include/ntqframe.h \ + /usr/lib/qt3/include/ntqwidget.h /usr/lib/qt3/include/ntqobject.h \ + /usr/lib/qt3/include/ntqevent.h /usr/lib/qt3/include/ntqregion.h \ + /usr/lib/qt3/include/ntqmime.h /usr/lib/qt3/include/ntqmap.h \ + /usr/lib/qt3/include/ntqpair.h /usr/include/g++/map \ /usr/include/g++/bits/stl_tree.h /usr/include/g++/bits/stl_map.h \ - /usr/include/g++/bits/stl_multimap.h /usr/lib/qt3/include/qpalette.h \ - /usr/lib/qt3/include/qbrush.h /usr/lib/qt3/include/qfontinfo.h \ - /usr/lib/qt3/include/qsizepolicy.h /usr/lib/qt3/include/qlayout.h \ - /usr/lib/qt3/include/qpainter.h /usr/lib/qt3/include/qpen.h \ - /usr/lib/qt3/include/qpointarray.h /usr/lib/qt3/include/qwmatrix.h \ - /usr/lib/qt3/include/qimage.h /usr/lib/qt3/include/qtooltip.h \ + /usr/include/g++/bits/stl_multimap.h /usr/lib/qt3/include/ntqpalette.h \ + /usr/lib/qt3/include/ntqbrush.h /usr/lib/qt3/include/ntqfontinfo.h \ + /usr/lib/qt3/include/ntqsizepolicy.h /usr/lib/qt3/include/ntqlayout.h \ + /usr/lib/qt3/include/ntqpainter.h /usr/lib/qt3/include/ntqpen.h \ + /usr/lib/qt3/include/ntqpointarray.h /usr/lib/qt3/include/ntqwmatrix.h \ + /usr/lib/qt3/include/ntqimage.h /usr/lib/qt3/include/ntqtooltip.h \ malloryclient.h /opt/kde3/include/kdecoration.h \ - /usr/lib/qt3/include/qiconset.h /opt/kde3/include/netwm_def.h \ + /usr/lib/qt3/include/ntqiconset.h /opt/kde3/include/netwm_def.h \ /opt/kde3/include/kdeversion.h /opt/kde3/include/kdecorationfactory.h \ - mallorybutton.h /usr/lib/qt3/include/qbutton.h \ - /usr/lib/qt3/include/qkeysequence.h enums.h malloryhandler.h \ + mallorybutton.h /usr/lib/qt3/include/ntqbutton.h \ + /usr/lib/qt3/include/ntqkeysequence.h enums.h malloryhandler.h \ /opt/kde3/include/kconfig.h /opt/kde3/include/kconfigbase.h \ - /usr/lib/qt3/include/qdatetime.h /usr/lib/qt3/include/qvariant.h \ + /usr/lib/qt3/include/ntqdatetime.h /usr/lib/qt3/include/ntqvariant.h \ /opt/kde3/include/kconfigdata.h /opt/kde3/include/klockfile.h \ /opt/kde3/include/ksharedptr.h pixmaps.h malloryclient.moc \ - /usr/lib/qt3/include/qmetaobject.h /usr/lib/qt3/include/qconnection.h \ - /usr/lib/qt3/include/qapplication.h \ - /usr/lib/qt3/include/qdesktopwidget.h /usr/lib/qt3/include/qasciidict.h \ - /usr/lib/qt3/include/qgdict.h /usr/lib/qt3/include/qtranslator.h \ + /usr/lib/qt3/include/ntqmetaobject.h /usr/lib/qt3/include/ntqconnection.h \ + /usr/lib/qt3/include/ntqapplication.h \ + /usr/lib/qt3/include/ntqdesktopwidget.h /usr/lib/qt3/include/ntqasciidict.h \ + /usr/lib/qt3/include/ntqgdict.h /usr/lib/qt3/include/ntqtranslator.h \ /usr/lib/qt3/include/private/qucomextra_p.h \ - /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/quuid.h + /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h /opt/kde3/include/klocale.h: -/usr/lib/qt3/include/qstring.h: +/usr/lib/qt3/include/ntqstring.h: -/usr/lib/qt3/include/qcstring.h: +/usr/lib/qt3/include/ntqcstring.h: -/usr/lib/qt3/include/qmemarray.h: +/usr/lib/qt3/include/ntqmemarray.h: -/usr/lib/qt3/include/qgarray.h: +/usr/lib/qt3/include/ntqgarray.h: -/usr/lib/qt3/include/qshared.h: +/usr/lib/qt3/include/ntqshared.h: -/usr/lib/qt3/include/qglobal.h: +/usr/lib/qt3/include/ntqglobal.h: -/usr/lib/qt3/include/qconfig.h: +/usr/lib/qt3/include/ntqconfig.h: -/usr/lib/qt3/include/qmodules.h: +/usr/lib/qt3/include/ntqmodules.h: -/usr/lib/qt3/include/qfeatures.h: +/usr/lib/qt3/include/ntqfeatures.h: -/usr/lib/qt3/include/qwinexport.h: +/usr/lib/qt3/include/ntqwinexport.h: /usr/include/string.h: @@ -371,35 +371,35 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /opt/kde3/include/kpixmap.h: -/usr/lib/qt3/include/qpixmap.h: +/usr/lib/qt3/include/ntqpixmap.h: -/usr/lib/qt3/include/qpaintdevice.h: +/usr/lib/qt3/include/ntqpaintdevice.h: -/usr/lib/qt3/include/qwindowdefs.h: +/usr/lib/qt3/include/ntqwindowdefs.h: -/usr/lib/qt3/include/qobjectdefs.h: +/usr/lib/qt3/include/ntqobjectdefs.h: -/usr/lib/qt3/include/qnamespace.h: +/usr/lib/qt3/include/ntqnamespace.h: -/usr/lib/qt3/include/qrect.h: +/usr/lib/qt3/include/ntqrect.h: -/usr/lib/qt3/include/qsize.h: +/usr/lib/qt3/include/ntqsize.h: -/usr/lib/qt3/include/qpoint.h: +/usr/lib/qt3/include/ntqpoint.h: -/usr/lib/qt3/include/qcolor.h: +/usr/lib/qt3/include/ntqcolor.h: -/usr/lib/qt3/include/qstringlist.h: +/usr/lib/qt3/include/ntqstringlist.h: -/usr/lib/qt3/include/qvaluelist.h: +/usr/lib/qt3/include/ntqvaluelist.h: -/usr/lib/qt3/include/qtl.h: +/usr/lib/qt3/include/ntqtl.h: -/usr/lib/qt3/include/qtextstream.h: +/usr/lib/qt3/include/ntqtextstream.h: -/usr/lib/qt3/include/qiodevice.h: +/usr/lib/qt3/include/ntqiodevice.h: -/usr/lib/qt3/include/qdatastream.h: +/usr/lib/qt3/include/ntqdatastream.h: /usr/include/g++/iterator: @@ -499,39 +499,39 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /usr/include/g++/bits/list.tcc: -/usr/lib/qt3/include/qstrlist.h: +/usr/lib/qt3/include/ntqstrlist.h: -/usr/lib/qt3/include/qptrlist.h: +/usr/lib/qt3/include/ntqptrlist.h: -/usr/lib/qt3/include/qglist.h: +/usr/lib/qt3/include/ntqglist.h: -/usr/lib/qt3/include/qptrcollection.h: +/usr/lib/qt3/include/ntqptrcollection.h: /opt/kde3/include/kpixmapeffect.h: -/usr/lib/qt3/include/qcursor.h: +/usr/lib/qt3/include/ntqcursor.h: -/usr/lib/qt3/include/qfontmetrics.h: +/usr/lib/qt3/include/ntqfontmetrics.h: -/usr/lib/qt3/include/qfont.h: +/usr/lib/qt3/include/ntqfont.h: -/usr/lib/qt3/include/qlabel.h: +/usr/lib/qt3/include/ntqlabel.h: -/usr/lib/qt3/include/qframe.h: +/usr/lib/qt3/include/ntqframe.h: -/usr/lib/qt3/include/qwidget.h: +/usr/lib/qt3/include/ntqwidget.h: -/usr/lib/qt3/include/qobject.h: +/usr/lib/qt3/include/ntqobject.h: -/usr/lib/qt3/include/qevent.h: +/usr/lib/qt3/include/ntqevent.h: -/usr/lib/qt3/include/qregion.h: +/usr/lib/qt3/include/ntqregion.h: -/usr/lib/qt3/include/qmime.h: +/usr/lib/qt3/include/ntqmime.h: -/usr/lib/qt3/include/qmap.h: +/usr/lib/qt3/include/ntqmap.h: -/usr/lib/qt3/include/qpair.h: +/usr/lib/qt3/include/ntqpair.h: /usr/include/g++/map: @@ -541,33 +541,33 @@ malloryclient.lo .libs/malloryclient.o: malloryclient.cpp \ /usr/include/g++/bits/stl_multimap.h: -/usr/lib/qt3/include/qpalette.h: +/usr/lib/qt3/include/ntqpalette.h: -/usr/lib/qt3/include/qbrush.h: +/usr/lib/qt3/include/ntqbrush.h: -/usr/lib/qt3/include/qfontinfo.h: +/usr/lib/qt3/include/ntqfontinfo.h: -/usr/lib/qt3/include/qsizepolicy.h: +/usr/lib/qt3/include/ntqsizepolicy.h: -/usr/lib/qt3/include/qlayout.h: +/usr/lib/qt3/include/ntqlayout.h: -/usr/lib/qt3/include/qpainter.h: +/usr/lib/qt3/include/ntqpainter.h: -/usr/lib/qt3/include/qpen.h: +/usr/lib/qt3/include/ntqpen.h: -/usr/lib/qt3/include/qpointarray.h: +/usr/lib/qt3/include/ntqpointarray.h: -/usr/lib/qt3/include/qwmatrix.h: +/usr/lib/qt3/include/ntqwmatrix.h: -/usr/lib/qt3/include/qimage.h: +/usr/lib/qt3/include/ntqimage.h: -/usr/lib/qt3/include/qtooltip.h: +/usr/lib/qt3/include/ntqtooltip.h: malloryclient.h: /opt/kde3/include/kdecoration.h: -/usr/lib/qt3/include/qiconset.h: +/usr/lib/qt3/include/ntqiconset.h: /opt/kde3/include/netwm_def.h: @@ -577,9 +577,9 @@ malloryclient.h: mallorybutton.h: -/usr/lib/qt3/include/qbutton.h: +/usr/lib/qt3/include/ntqbutton.h: -/usr/lib/qt3/include/qkeysequence.h: +/usr/lib/qt3/include/ntqkeysequence.h: enums.h: @@ -589,9 +589,9 @@ malloryhandler.h: /opt/kde3/include/kconfigbase.h: -/usr/lib/qt3/include/qdatetime.h: +/usr/lib/qt3/include/ntqdatetime.h: -/usr/lib/qt3/include/qvariant.h: +/usr/lib/qt3/include/ntqvariant.h: /opt/kde3/include/kconfigdata.h: @@ -603,22 +603,22 @@ pixmaps.h: malloryclient.moc: -/usr/lib/qt3/include/qmetaobject.h: +/usr/lib/qt3/include/ntqmetaobject.h: -/usr/lib/qt3/include/qconnection.h: +/usr/lib/qt3/include/ntqconnection.h: -/usr/lib/qt3/include/qapplication.h: +/usr/lib/qt3/include/ntqapplication.h: -/usr/lib/qt3/include/qdesktopwidget.h: +/usr/lib/qt3/include/ntqdesktopwidget.h: -/usr/lib/qt3/include/qasciidict.h: +/usr/lib/qt3/include/ntqasciidict.h: -/usr/lib/qt3/include/qgdict.h: +/usr/lib/qt3/include/ntqgdict.h: -/usr/lib/qt3/include/qtranslator.h: +/usr/lib/qt3/include/ntqtranslator.h: /usr/lib/qt3/include/private/qucomextra_p.h: /usr/lib/qt3/include/private/qucom_p.h: -/usr/lib/qt3/include/quuid.h: +/usr/lib/qt3/include/ntquuid.h: diff --git a/malloryclient/.deps/malloryhandler.Plo b/malloryclient/.deps/malloryhandler.Plo index 01b5c3d..6882289 100644 --- a/malloryclient/.deps/malloryhandler.Plo +++ b/malloryclient/.deps/malloryhandler.Plo @@ -1,12 +1,12 @@ malloryhandler.lo .libs/malloryhandler.o: malloryhandler.cpp \ malloryhandler.h /opt/kde3/include/kdecorationfactory.h \ - /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/qcolor.h \ - /usr/lib/qt3/include/qwindowdefs.h /usr/lib/qt3/include/qobjectdefs.h \ - /usr/lib/qt3/include/qglobal.h /usr/lib/qt3/include/qconfig.h \ - /usr/lib/qt3/include/qmodules.h /usr/lib/qt3/include/qfeatures.h \ - /usr/lib/qt3/include/qstring.h /usr/lib/qt3/include/qcstring.h \ - /usr/lib/qt3/include/qmemarray.h /usr/lib/qt3/include/qgarray.h \ - /usr/lib/qt3/include/qshared.h /usr/lib/qt3/include/qwinexport.h \ + /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/ntqcolor.h \ + /usr/lib/qt3/include/ntqwindowdefs.h /usr/lib/qt3/include/ntqobjectdefs.h \ + /usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \ + /usr/lib/qt3/include/ntqmodules.h /usr/lib/qt3/include/ntqfeatures.h \ + /usr/lib/qt3/include/ntqstring.h /usr/lib/qt3/include/ntqcstring.h \ + /usr/lib/qt3/include/ntqmemarray.h /usr/lib/qt3/include/ntqgarray.h \ + /usr/lib/qt3/include/ntqshared.h /usr/lib/qt3/include/ntqwinexport.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \ @@ -69,10 +69,10 @@ malloryhandler.lo .libs/malloryhandler.o: malloryhandler.cpp \ /usr/include/g++/bits/stl_algo.h /usr/include/g++/bits/stl_heap.h \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ - /usr/lib/qt3/include/qnamespace.h /usr/lib/qt3/include/qstringlist.h \ - /usr/lib/qt3/include/qvaluelist.h /usr/lib/qt3/include/qtl.h \ - /usr/lib/qt3/include/qtextstream.h /usr/lib/qt3/include/qiodevice.h \ - /usr/lib/qt3/include/qdatastream.h /usr/include/g++/iterator \ + /usr/lib/qt3/include/ntqnamespace.h /usr/lib/qt3/include/ntqstringlist.h \ + /usr/lib/qt3/include/ntqvaluelist.h /usr/lib/qt3/include/ntqtl.h \ + /usr/lib/qt3/include/ntqtextstream.h /usr/lib/qt3/include/ntqiodevice.h \ + /usr/lib/qt3/include/ntqdatastream.h /usr/include/g++/iterator \ /usr/include/g++/ostream /usr/include/g++/ios \ /usr/include/g++/bits/localefwd.h /usr/include/g++/bits/ios_base.h \ /usr/include/g++/bits/locale_classes.h /usr/include/g++/streambuf \ @@ -100,38 +100,38 @@ malloryhandler.lo .libs/malloryhandler.o: malloryhandler.cpp \ /usr/include/g++/istream /usr/include/g++/bits/istream.tcc \ /usr/include/g++/bits/stream_iterator.h /usr/include/g++/list \ /usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \ - /usr/lib/qt3/include/qstrlist.h /usr/lib/qt3/include/qptrlist.h \ - /usr/lib/qt3/include/qglist.h /usr/lib/qt3/include/qptrcollection.h \ - /usr/lib/qt3/include/qfont.h /usr/lib/qt3/include/qobject.h \ - /usr/lib/qt3/include/qevent.h /usr/lib/qt3/include/qregion.h \ - /usr/lib/qt3/include/qrect.h /usr/lib/qt3/include/qsize.h \ - /usr/lib/qt3/include/qpoint.h /usr/lib/qt3/include/qmime.h \ - /usr/lib/qt3/include/qmap.h /usr/lib/qt3/include/qpair.h \ + /usr/lib/qt3/include/ntqstrlist.h /usr/lib/qt3/include/ntqptrlist.h \ + /usr/lib/qt3/include/ntqglist.h /usr/lib/qt3/include/ntqptrcollection.h \ + /usr/lib/qt3/include/ntqfont.h /usr/lib/qt3/include/ntqobject.h \ + /usr/lib/qt3/include/ntqevent.h /usr/lib/qt3/include/ntqregion.h \ + /usr/lib/qt3/include/ntqrect.h /usr/lib/qt3/include/ntqsize.h \ + /usr/lib/qt3/include/ntqpoint.h /usr/lib/qt3/include/ntqmime.h \ + /usr/lib/qt3/include/ntqmap.h /usr/lib/qt3/include/ntqpair.h \ /usr/include/g++/map /usr/include/g++/bits/stl_tree.h \ /usr/include/g++/bits/stl_map.h /usr/include/g++/bits/stl_multimap.h \ - /usr/lib/qt3/include/qiconset.h /usr/lib/qt3/include/qpixmap.h \ - /usr/lib/qt3/include/qpaintdevice.h /opt/kde3/include/netwm_def.h \ + /usr/lib/qt3/include/ntqiconset.h /usr/lib/qt3/include/ntqpixmap.h \ + /usr/lib/qt3/include/ntqpaintdevice.h /opt/kde3/include/netwm_def.h \ /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \ /opt/kde3/include/kdeversion.h /opt/kde3/include/kconfig.h \ - /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/qdatetime.h \ - /usr/lib/qt3/include/qvariant.h /opt/kde3/include/kconfigdata.h \ + /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ + /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/kconfigdata.h \ /opt/kde3/include/klockfile.h /opt/kde3/include/ksharedptr.h \ - malloryclient.h /usr/lib/qt3/include/qlayout.h \ - /usr/lib/qt3/include/qsizepolicy.h /usr/lib/qt3/include/qwidget.h \ - /usr/lib/qt3/include/qpalette.h /usr/lib/qt3/include/qbrush.h \ - /usr/lib/qt3/include/qfontmetrics.h /usr/lib/qt3/include/qfontinfo.h \ - mallorybutton.h /usr/lib/qt3/include/qbutton.h \ - /usr/lib/qt3/include/qkeysequence.h enums.h pixmaps.h \ - /usr/lib/qt3/include/qpainter.h /usr/lib/qt3/include/qpen.h \ - /usr/lib/qt3/include/qpointarray.h /usr/lib/qt3/include/qwmatrix.h \ - /usr/lib/qt3/include/qimage.h embeddata.h /usr/lib/qt3/include/qdict.h \ - /usr/lib/qt3/include/qgdict.h /usr/lib/qt3/include/qdragobject.h \ - malloryhandler.moc /usr/lib/qt3/include/qmetaobject.h \ - /usr/lib/qt3/include/qconnection.h /usr/lib/qt3/include/qapplication.h \ - /usr/lib/qt3/include/qdesktopwidget.h /usr/lib/qt3/include/qasciidict.h \ - /usr/lib/qt3/include/qtranslator.h \ + malloryclient.h /usr/lib/qt3/include/ntqlayout.h \ + /usr/lib/qt3/include/ntqsizepolicy.h /usr/lib/qt3/include/ntqwidget.h \ + /usr/lib/qt3/include/ntqpalette.h /usr/lib/qt3/include/ntqbrush.h \ + /usr/lib/qt3/include/ntqfontmetrics.h /usr/lib/qt3/include/ntqfontinfo.h \ + mallorybutton.h /usr/lib/qt3/include/ntqbutton.h \ + /usr/lib/qt3/include/ntqkeysequence.h enums.h pixmaps.h \ + /usr/lib/qt3/include/ntqpainter.h /usr/lib/qt3/include/ntqpen.h \ + /usr/lib/qt3/include/ntqpointarray.h /usr/lib/qt3/include/ntqwmatrix.h \ + /usr/lib/qt3/include/ntqimage.h embeddata.h /usr/lib/qt3/include/ntqdict.h \ + /usr/lib/qt3/include/ntqgdict.h /usr/lib/qt3/include/ntqdragobject.h \ + malloryhandler.moc /usr/lib/qt3/include/ntqmetaobject.h \ + /usr/lib/qt3/include/ntqconnection.h /usr/lib/qt3/include/ntqapplication.h \ + /usr/lib/qt3/include/ntqdesktopwidget.h /usr/lib/qt3/include/ntqasciidict.h \ + /usr/lib/qt3/include/ntqtranslator.h \ /usr/lib/qt3/include/private/qucomextra_p.h \ - /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/quuid.h + /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h malloryhandler.h: @@ -139,31 +139,31 @@ malloryhandler.h: /opt/kde3/include/kdecoration.h: -/usr/lib/qt3/include/qcolor.h: +/usr/lib/qt3/include/ntqcolor.h: -/usr/lib/qt3/include/qwindowdefs.h: +/usr/lib/qt3/include/ntqwindowdefs.h: -/usr/lib/qt3/include/qobjectdefs.h: +/usr/lib/qt3/include/ntqobjectdefs.h: -/usr/lib/qt3/include/qglobal.h: +/usr/lib/qt3/include/ntqglobal.h: -/usr/lib/qt3/include/qconfig.h: +/usr/lib/qt3/include/ntqconfig.h: -/usr/lib/qt3/include/qmodules.h: +/usr/lib/qt3/include/ntqmodules.h: -/usr/lib/qt3/include/qfeatures.h: +/usr/lib/qt3/include/ntqfeatures.h: -/usr/lib/qt3/include/qstring.h: +/usr/lib/qt3/include/ntqstring.h: -/usr/lib/qt3/include/qcstring.h: +/usr/lib/qt3/include/ntqcstring.h: -/usr/lib/qt3/include/qmemarray.h: +/usr/lib/qt3/include/ntqmemarray.h: -/usr/lib/qt3/include/qgarray.h: +/usr/lib/qt3/include/ntqgarray.h: -/usr/lib/qt3/include/qshared.h: +/usr/lib/qt3/include/ntqshared.h: -/usr/lib/qt3/include/qwinexport.h: +/usr/lib/qt3/include/ntqwinexport.h: /usr/include/string.h: @@ -373,19 +373,19 @@ malloryhandler.h: /usr/include/g++/bits/basic_string.tcc: -/usr/lib/qt3/include/qnamespace.h: +/usr/lib/qt3/include/ntqnamespace.h: -/usr/lib/qt3/include/qstringlist.h: +/usr/lib/qt3/include/ntqstringlist.h: -/usr/lib/qt3/include/qvaluelist.h: +/usr/lib/qt3/include/ntqvaluelist.h: -/usr/lib/qt3/include/qtl.h: +/usr/lib/qt3/include/ntqtl.h: -/usr/lib/qt3/include/qtextstream.h: +/usr/lib/qt3/include/ntqtextstream.h: -/usr/lib/qt3/include/qiodevice.h: +/usr/lib/qt3/include/ntqiodevice.h: -/usr/lib/qt3/include/qdatastream.h: +/usr/lib/qt3/include/ntqdatastream.h: /usr/include/g++/iterator: @@ -485,33 +485,33 @@ malloryhandler.h: /usr/include/g++/bits/list.tcc: -/usr/lib/qt3/include/qstrlist.h: +/usr/lib/qt3/include/ntqstrlist.h: -/usr/lib/qt3/include/qptrlist.h: +/usr/lib/qt3/include/ntqptrlist.h: -/usr/lib/qt3/include/qglist.h: +/usr/lib/qt3/include/ntqglist.h: -/usr/lib/qt3/include/qptrcollection.h: +/usr/lib/qt3/include/ntqptrcollection.h: -/usr/lib/qt3/include/qfont.h: +/usr/lib/qt3/include/ntqfont.h: -/usr/lib/qt3/include/qobject.h: +/usr/lib/qt3/include/ntqobject.h: -/usr/lib/qt3/include/qevent.h: +/usr/lib/qt3/include/ntqevent.h: -/usr/lib/qt3/include/qregion.h: +/usr/lib/qt3/include/ntqregion.h: -/usr/lib/qt3/include/qrect.h: +/usr/lib/qt3/include/ntqrect.h: -/usr/lib/qt3/include/qsize.h: +/usr/lib/qt3/include/ntqsize.h: -/usr/lib/qt3/include/qpoint.h: +/usr/lib/qt3/include/ntqpoint.h: -/usr/lib/qt3/include/qmime.h: +/usr/lib/qt3/include/ntqmime.h: -/usr/lib/qt3/include/qmap.h: +/usr/lib/qt3/include/ntqmap.h: -/usr/lib/qt3/include/qpair.h: +/usr/lib/qt3/include/ntqpair.h: /usr/include/g++/map: @@ -521,11 +521,11 @@ malloryhandler.h: /usr/include/g++/bits/stl_multimap.h: -/usr/lib/qt3/include/qiconset.h: +/usr/lib/qt3/include/ntqiconset.h: -/usr/lib/qt3/include/qpixmap.h: +/usr/lib/qt3/include/ntqpixmap.h: -/usr/lib/qt3/include/qpaintdevice.h: +/usr/lib/qt3/include/ntqpaintdevice.h: /opt/kde3/include/netwm_def.h: @@ -539,9 +539,9 @@ malloryhandler.h: /opt/kde3/include/kconfigbase.h: -/usr/lib/qt3/include/qdatetime.h: +/usr/lib/qt3/include/ntqdatetime.h: -/usr/lib/qt3/include/qvariant.h: +/usr/lib/qt3/include/ntqvariant.h: /opt/kde3/include/kconfigdata.h: @@ -551,64 +551,64 @@ malloryhandler.h: malloryclient.h: -/usr/lib/qt3/include/qlayout.h: +/usr/lib/qt3/include/ntqlayout.h: -/usr/lib/qt3/include/qsizepolicy.h: +/usr/lib/qt3/include/ntqsizepolicy.h: -/usr/lib/qt3/include/qwidget.h: +/usr/lib/qt3/include/ntqwidget.h: -/usr/lib/qt3/include/qpalette.h: +/usr/lib/qt3/include/ntqpalette.h: -/usr/lib/qt3/include/qbrush.h: +/usr/lib/qt3/include/ntqbrush.h: -/usr/lib/qt3/include/qfontmetrics.h: +/usr/lib/qt3/include/ntqfontmetrics.h: -/usr/lib/qt3/include/qfontinfo.h: +/usr/lib/qt3/include/ntqfontinfo.h: mallorybutton.h: -/usr/lib/qt3/include/qbutton.h: +/usr/lib/qt3/include/ntqbutton.h: -/usr/lib/qt3/include/qkeysequence.h: +/usr/lib/qt3/include/ntqkeysequence.h: enums.h: pixmaps.h: -/usr/lib/qt3/include/qpainter.h: +/usr/lib/qt3/include/ntqpainter.h: -/usr/lib/qt3/include/qpen.h: +/usr/lib/qt3/include/ntqpen.h: -/usr/lib/qt3/include/qpointarray.h: +/usr/lib/qt3/include/ntqpointarray.h: -/usr/lib/qt3/include/qwmatrix.h: +/usr/lib/qt3/include/ntqwmatrix.h: -/usr/lib/qt3/include/qimage.h: +/usr/lib/qt3/include/ntqimage.h: embeddata.h: -/usr/lib/qt3/include/qdict.h: +/usr/lib/qt3/include/ntqdict.h: -/usr/lib/qt3/include/qgdict.h: +/usr/lib/qt3/include/ntqgdict.h: -/usr/lib/qt3/include/qdragobject.h: +/usr/lib/qt3/include/ntqdragobject.h: malloryhandler.moc: -/usr/lib/qt3/include/qmetaobject.h: +/usr/lib/qt3/include/ntqmetaobject.h: -/usr/lib/qt3/include/qconnection.h: +/usr/lib/qt3/include/ntqconnection.h: -/usr/lib/qt3/include/qapplication.h: +/usr/lib/qt3/include/ntqapplication.h: -/usr/lib/qt3/include/qdesktopwidget.h: +/usr/lib/qt3/include/ntqdesktopwidget.h: -/usr/lib/qt3/include/qasciidict.h: +/usr/lib/qt3/include/ntqasciidict.h: -/usr/lib/qt3/include/qtranslator.h: +/usr/lib/qt3/include/ntqtranslator.h: /usr/lib/qt3/include/private/qucomextra_p.h: /usr/lib/qt3/include/private/qucom_p.h: -/usr/lib/qt3/include/quuid.h: +/usr/lib/qt3/include/ntquuid.h: diff --git a/malloryclient/.deps/pixmaps.Plo b/malloryclient/.deps/pixmaps.Plo index db9cfb6..182b4c5 100644 --- a/malloryclient/.deps/pixmaps.Plo +++ b/malloryclient/.deps/pixmaps.Plo @@ -1,11 +1,11 @@ pixmaps.lo .libs/pixmaps.o: pixmaps.cpp pixmaps.h \ - /usr/lib/qt3/include/qpixmap.h /usr/lib/qt3/include/qpaintdevice.h \ - /usr/lib/qt3/include/qwindowdefs.h /usr/lib/qt3/include/qobjectdefs.h \ - /usr/lib/qt3/include/qglobal.h /usr/lib/qt3/include/qconfig.h \ - /usr/lib/qt3/include/qmodules.h /usr/lib/qt3/include/qfeatures.h \ - /usr/lib/qt3/include/qstring.h /usr/lib/qt3/include/qcstring.h \ - /usr/lib/qt3/include/qmemarray.h /usr/lib/qt3/include/qgarray.h \ - /usr/lib/qt3/include/qshared.h /usr/lib/qt3/include/qwinexport.h \ + /usr/lib/qt3/include/ntqpixmap.h /usr/lib/qt3/include/ntqpaintdevice.h \ + /usr/lib/qt3/include/ntqwindowdefs.h /usr/lib/qt3/include/ntqobjectdefs.h \ + /usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \ + /usr/lib/qt3/include/ntqmodules.h /usr/lib/qt3/include/ntqfeatures.h \ + /usr/lib/qt3/include/ntqstring.h /usr/lib/qt3/include/ntqcstring.h \ + /usr/lib/qt3/include/ntqmemarray.h /usr/lib/qt3/include/ntqgarray.h \ + /usr/lib/qt3/include/ntqshared.h /usr/lib/qt3/include/ntqwinexport.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \ @@ -68,12 +68,12 @@ pixmaps.lo .libs/pixmaps.o: pixmaps.cpp pixmaps.h \ /usr/include/g++/bits/stl_algo.h /usr/include/g++/bits/stl_heap.h \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ - /usr/lib/qt3/include/qnamespace.h /usr/lib/qt3/include/qrect.h \ - /usr/lib/qt3/include/qsize.h /usr/lib/qt3/include/qpoint.h \ - /usr/lib/qt3/include/qcolor.h /usr/lib/qt3/include/qstringlist.h \ - /usr/lib/qt3/include/qvaluelist.h /usr/lib/qt3/include/qtl.h \ - /usr/lib/qt3/include/qtextstream.h /usr/lib/qt3/include/qiodevice.h \ - /usr/lib/qt3/include/qdatastream.h /usr/include/g++/iterator \ + /usr/lib/qt3/include/ntqnamespace.h /usr/lib/qt3/include/ntqrect.h \ + /usr/lib/qt3/include/ntqsize.h /usr/lib/qt3/include/ntqpoint.h \ + /usr/lib/qt3/include/ntqcolor.h /usr/lib/qt3/include/ntqstringlist.h \ + /usr/lib/qt3/include/ntqvaluelist.h /usr/lib/qt3/include/ntqtl.h \ + /usr/lib/qt3/include/ntqtextstream.h /usr/lib/qt3/include/ntqiodevice.h \ + /usr/lib/qt3/include/ntqdatastream.h /usr/include/g++/iterator \ /usr/include/g++/ostream /usr/include/g++/ios \ /usr/include/g++/bits/localefwd.h /usr/include/g++/bits/ios_base.h \ /usr/include/g++/bits/locale_classes.h /usr/include/g++/streambuf \ @@ -101,57 +101,57 @@ pixmaps.lo .libs/pixmaps.o: pixmaps.cpp pixmaps.h \ /usr/include/g++/istream /usr/include/g++/bits/istream.tcc \ /usr/include/g++/bits/stream_iterator.h /usr/include/g++/list \ /usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \ - /usr/lib/qt3/include/qstrlist.h /usr/lib/qt3/include/qptrlist.h \ - /usr/lib/qt3/include/qglist.h /usr/lib/qt3/include/qptrcollection.h \ - /usr/lib/qt3/include/qpainter.h /usr/lib/qt3/include/qfontmetrics.h \ - /usr/lib/qt3/include/qfont.h /usr/lib/qt3/include/qfontinfo.h \ - /usr/lib/qt3/include/qregion.h /usr/lib/qt3/include/qpen.h \ - /usr/lib/qt3/include/qbrush.h /usr/lib/qt3/include/qpointarray.h \ - /usr/lib/qt3/include/qwmatrix.h /usr/lib/qt3/include/qimage.h \ + /usr/lib/qt3/include/ntqstrlist.h /usr/lib/qt3/include/ntqptrlist.h \ + /usr/lib/qt3/include/ntqglist.h /usr/lib/qt3/include/ntqptrcollection.h \ + /usr/lib/qt3/include/ntqpainter.h /usr/lib/qt3/include/ntqfontmetrics.h \ + /usr/lib/qt3/include/ntqfont.h /usr/lib/qt3/include/ntqfontinfo.h \ + /usr/lib/qt3/include/ntqregion.h /usr/lib/qt3/include/ntqpen.h \ + /usr/lib/qt3/include/ntqbrush.h /usr/lib/qt3/include/ntqpointarray.h \ + /usr/lib/qt3/include/ntqwmatrix.h /usr/lib/qt3/include/ntqimage.h \ malloryhandler.h /opt/kde3/include/kdecorationfactory.h \ - /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/qobject.h \ - /usr/lib/qt3/include/qevent.h /usr/lib/qt3/include/qmime.h \ - /usr/lib/qt3/include/qmap.h /usr/lib/qt3/include/qpair.h \ + /opt/kde3/include/kdecoration.h /usr/lib/qt3/include/ntqobject.h \ + /usr/lib/qt3/include/ntqevent.h /usr/lib/qt3/include/ntqmime.h \ + /usr/lib/qt3/include/ntqmap.h /usr/lib/qt3/include/ntqpair.h \ /usr/include/g++/map /usr/include/g++/bits/stl_tree.h \ /usr/include/g++/bits/stl_map.h /usr/include/g++/bits/stl_multimap.h \ - /usr/lib/qt3/include/qiconset.h /opt/kde3/include/netwm_def.h \ + /usr/lib/qt3/include/ntqiconset.h /opt/kde3/include/netwm_def.h \ /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \ /opt/kde3/include/kdeversion.h /opt/kde3/include/kconfig.h \ - /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/qdatetime.h \ - /usr/lib/qt3/include/qvariant.h /opt/kde3/include/kconfigdata.h \ + /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqdatetime.h \ + /usr/lib/qt3/include/ntqvariant.h /opt/kde3/include/kconfigdata.h \ /opt/kde3/include/klockfile.h /opt/kde3/include/ksharedptr.h \ /opt/kde3/include/kpixmapeffect.h /opt/kde3/include/kpixmap.h \ /opt/kde3/include/kpixmapio.h pixmaps.h: -/usr/lib/qt3/include/qpixmap.h: +/usr/lib/qt3/include/ntqpixmap.h: -/usr/lib/qt3/include/qpaintdevice.h: +/usr/lib/qt3/include/ntqpaintdevice.h: -/usr/lib/qt3/include/qwindowdefs.h: +/usr/lib/qt3/include/ntqwindowdefs.h: -/usr/lib/qt3/include/qobjectdefs.h: +/usr/lib/qt3/include/ntqobjectdefs.h: -/usr/lib/qt3/include/qglobal.h: +/usr/lib/qt3/include/ntqglobal.h: -/usr/lib/qt3/include/qconfig.h: +/usr/lib/qt3/include/ntqconfig.h: -/usr/lib/qt3/include/qmodules.h: +/usr/lib/qt3/include/ntqmodules.h: -/usr/lib/qt3/include/qfeatures.h: +/usr/lib/qt3/include/ntqfeatures.h: -/usr/lib/qt3/include/qstring.h: +/usr/lib/qt3/include/ntqstring.h: -/usr/lib/qt3/include/qcstring.h: +/usr/lib/qt3/include/ntqcstring.h: -/usr/lib/qt3/include/qmemarray.h: +/usr/lib/qt3/include/ntqmemarray.h: -/usr/lib/qt3/include/qgarray.h: +/usr/lib/qt3/include/ntqgarray.h: -/usr/lib/qt3/include/qshared.h: +/usr/lib/qt3/include/ntqshared.h: -/usr/lib/qt3/include/qwinexport.h: +/usr/lib/qt3/include/ntqwinexport.h: /usr/include/string.h: @@ -361,27 +361,27 @@ pixmaps.h: /usr/include/g++/bits/basic_string.tcc: -/usr/lib/qt3/include/qnamespace.h: +/usr/lib/qt3/include/ntqnamespace.h: -/usr/lib/qt3/include/qrect.h: +/usr/lib/qt3/include/ntqrect.h: -/usr/lib/qt3/include/qsize.h: +/usr/lib/qt3/include/ntqsize.h: -/usr/lib/qt3/include/qpoint.h: +/usr/lib/qt3/include/ntqpoint.h: -/usr/lib/qt3/include/qcolor.h: +/usr/lib/qt3/include/ntqcolor.h: -/usr/lib/qt3/include/qstringlist.h: +/usr/lib/qt3/include/ntqstringlist.h: -/usr/lib/qt3/include/qvaluelist.h: +/usr/lib/qt3/include/ntqvaluelist.h: -/usr/lib/qt3/include/qtl.h: +/usr/lib/qt3/include/ntqtl.h: -/usr/lib/qt3/include/qtextstream.h: +/usr/lib/qt3/include/ntqtextstream.h: -/usr/lib/qt3/include/qiodevice.h: +/usr/lib/qt3/include/ntqiodevice.h: -/usr/lib/qt3/include/qdatastream.h: +/usr/lib/qt3/include/ntqdatastream.h: /usr/include/g++/iterator: @@ -481,33 +481,33 @@ pixmaps.h: /usr/include/g++/bits/list.tcc: -/usr/lib/qt3/include/qstrlist.h: +/usr/lib/qt3/include/ntqstrlist.h: -/usr/lib/qt3/include/qptrlist.h: +/usr/lib/qt3/include/ntqptrlist.h: -/usr/lib/qt3/include/qglist.h: +/usr/lib/qt3/include/ntqglist.h: -/usr/lib/qt3/include/qptrcollection.h: +/usr/lib/qt3/include/ntqptrcollection.h: -/usr/lib/qt3/include/qpainter.h: +/usr/lib/qt3/include/ntqpainter.h: -/usr/lib/qt3/include/qfontmetrics.h: +/usr/lib/qt3/include/ntqfontmetrics.h: -/usr/lib/qt3/include/qfont.h: +/usr/lib/qt3/include/ntqfont.h: -/usr/lib/qt3/include/qfontinfo.h: +/usr/lib/qt3/include/ntqfontinfo.h: -/usr/lib/qt3/include/qregion.h: +/usr/lib/qt3/include/ntqregion.h: -/usr/lib/qt3/include/qpen.h: +/usr/lib/qt3/include/ntqpen.h: -/usr/lib/qt3/include/qbrush.h: +/usr/lib/qt3/include/ntqbrush.h: -/usr/lib/qt3/include/qpointarray.h: +/usr/lib/qt3/include/ntqpointarray.h: -/usr/lib/qt3/include/qwmatrix.h: +/usr/lib/qt3/include/ntqwmatrix.h: -/usr/lib/qt3/include/qimage.h: +/usr/lib/qt3/include/ntqimage.h: malloryhandler.h: @@ -515,15 +515,15 @@ malloryhandler.h: /opt/kde3/include/kdecoration.h: -/usr/lib/qt3/include/qobject.h: +/usr/lib/qt3/include/ntqobject.h: -/usr/lib/qt3/include/qevent.h: +/usr/lib/qt3/include/ntqevent.h: -/usr/lib/qt3/include/qmime.h: +/usr/lib/qt3/include/ntqmime.h: -/usr/lib/qt3/include/qmap.h: +/usr/lib/qt3/include/ntqmap.h: -/usr/lib/qt3/include/qpair.h: +/usr/lib/qt3/include/ntqpair.h: /usr/include/g++/map: @@ -533,7 +533,7 @@ malloryhandler.h: /usr/include/g++/bits/stl_multimap.h: -/usr/lib/qt3/include/qiconset.h: +/usr/lib/qt3/include/ntqiconset.h: /opt/kde3/include/netwm_def.h: @@ -547,9 +547,9 @@ malloryhandler.h: /opt/kde3/include/kconfigbase.h: -/usr/lib/qt3/include/qdatetime.h: +/usr/lib/qt3/include/ntqdatetime.h: -/usr/lib/qt3/include/qvariant.h: +/usr/lib/qt3/include/ntqvariant.h: /opt/kde3/include/kconfigdata.h: diff --git a/malloryclient/Makefile b/malloryclient/Makefile index ebd0d84..5175967 100644 --- a/malloryclient/Makefile +++ b/malloryclient/Makefile @@ -165,7 +165,7 @@ LIB_KSPELL = -lkspell LIB_KSYCOCA = -lkio LIB_POLL = LIB_QPE = -LIB_QT = -lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread +LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread LIB_QTOPIA = @LIB_QTOPIA@ LIB_SMB = -lsmb LIB_X11 = -lX11 $(LIBSOCKET) diff --git a/malloryclient/config/.deps/configdialog.Plo b/malloryclient/config/.deps/configdialog.Plo index 6590bb5..613c17c 100644 --- a/malloryclient/config/.deps/configdialog.Plo +++ b/malloryclient/config/.deps/configdialog.Plo @@ -1,10 +1,10 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \ - /opt/kde3/include/klocale.h /usr/lib/qt3/include/qstring.h \ - /usr/lib/qt3/include/qcstring.h /usr/lib/qt3/include/qmemarray.h \ - /usr/lib/qt3/include/qgarray.h /usr/lib/qt3/include/qshared.h \ - /usr/lib/qt3/include/qglobal.h /usr/lib/qt3/include/qconfig.h \ - /usr/lib/qt3/include/qmodules.h /usr/lib/qt3/include/qfeatures.h \ - /usr/lib/qt3/include/qwinexport.h /usr/include/string.h \ + /opt/kde3/include/klocale.h /usr/lib/qt3/include/ntqstring.h \ + /usr/lib/qt3/include/ntqcstring.h /usr/lib/qt3/include/ntqmemarray.h \ + /usr/lib/qt3/include/ntqgarray.h /usr/lib/qt3/include/ntqshared.h \ + /usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \ + /usr/lib/qt3/include/ntqmodules.h /usr/lib/qt3/include/ntqfeatures.h \ + /usr/lib/qt3/include/ntqwinexport.h /usr/include/string.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \ @@ -68,10 +68,10 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \ - configdialog.h /usr/lib/qt3/include/qvariant.h \ - /usr/lib/qt3/include/qvaluelist.h /usr/lib/qt3/include/qtl.h \ - /usr/lib/qt3/include/qtextstream.h /usr/lib/qt3/include/qiodevice.h \ - /usr/lib/qt3/include/qdatastream.h /usr/include/g++/iterator \ + configdialog.h /usr/lib/qt3/include/ntqvariant.h \ + /usr/lib/qt3/include/ntqvaluelist.h /usr/lib/qt3/include/ntqtl.h \ + /usr/lib/qt3/include/ntqtextstream.h /usr/lib/qt3/include/ntqiodevice.h \ + /usr/lib/qt3/include/ntqdatastream.h /usr/include/g++/iterator \ /usr/include/g++/ostream /usr/include/g++/ios \ /usr/include/g++/bits/localefwd.h /usr/include/g++/bits/ios_base.h \ /usr/include/g++/bits/locale_classes.h /usr/include/g++/streambuf \ @@ -99,57 +99,57 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \ /usr/include/g++/istream /usr/include/g++/bits/istream.tcc \ /usr/include/g++/bits/stream_iterator.h /usr/include/g++/list \ /usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \ - /usr/lib/qt3/include/qstringlist.h /usr/lib/qt3/include/qstrlist.h \ - /usr/lib/qt3/include/qptrlist.h /usr/lib/qt3/include/qglist.h \ - /usr/lib/qt3/include/qptrcollection.h /usr/lib/qt3/include/qmap.h \ - /usr/lib/qt3/include/qpair.h /usr/include/g++/map \ + /usr/lib/qt3/include/ntqstringlist.h /usr/lib/qt3/include/ntqstrlist.h \ + /usr/lib/qt3/include/ntqptrlist.h /usr/lib/qt3/include/ntqglist.h \ + /usr/lib/qt3/include/ntqptrcollection.h /usr/lib/qt3/include/ntqmap.h \ + /usr/lib/qt3/include/ntqpair.h /usr/include/g++/map \ /usr/include/g++/bits/stl_tree.h /usr/include/g++/bits/stl_map.h \ - /usr/include/g++/bits/stl_multimap.h /usr/lib/qt3/include/qwidget.h \ - /usr/lib/qt3/include/qwindowdefs.h /usr/lib/qt3/include/qobjectdefs.h \ - /usr/lib/qt3/include/qnamespace.h /usr/lib/qt3/include/qobject.h \ - /usr/lib/qt3/include/qevent.h /usr/lib/qt3/include/qregion.h \ - /usr/lib/qt3/include/qrect.h /usr/lib/qt3/include/qsize.h \ - /usr/lib/qt3/include/qpoint.h /usr/lib/qt3/include/qmime.h \ - /usr/lib/qt3/include/qpaintdevice.h /usr/lib/qt3/include/qpalette.h \ - /usr/lib/qt3/include/qcolor.h /usr/lib/qt3/include/qbrush.h \ - /usr/lib/qt3/include/qfont.h /usr/lib/qt3/include/qfontmetrics.h \ - /usr/lib/qt3/include/qfontinfo.h /usr/lib/qt3/include/qsizepolicy.h \ - /usr/lib/qt3/include/qpushbutton.h /usr/lib/qt3/include/qbutton.h \ - /usr/lib/qt3/include/qkeysequence.h /usr/lib/qt3/include/qiconset.h \ - /usr/lib/qt3/include/qpixmap.h /usr/lib/qt3/include/qlabel.h \ - /usr/lib/qt3/include/qframe.h /usr/lib/qt3/include/qslider.h \ - /usr/lib/qt3/include/qrangecontrol.h /usr/lib/qt3/include/qcheckbox.h \ - /usr/lib/qt3/include/qcombobox.h /usr/lib/qt3/include/qspinbox.h \ - /usr/lib/qt3/include/qlayout.h /usr/lib/qt3/include/qtooltip.h \ - /usr/lib/qt3/include/qwhatsthis.h /usr/lib/qt3/include/qcursor.h \ - configdialog.moc /usr/lib/qt3/include/qmetaobject.h \ - /usr/lib/qt3/include/qconnection.h /usr/lib/qt3/include/qapplication.h \ - /usr/lib/qt3/include/qdesktopwidget.h /usr/lib/qt3/include/qasciidict.h \ - /usr/lib/qt3/include/qgdict.h /usr/lib/qt3/include/qtranslator.h \ + /usr/include/g++/bits/stl_multimap.h /usr/lib/qt3/include/ntqwidget.h \ + /usr/lib/qt3/include/ntqwindowdefs.h /usr/lib/qt3/include/ntqobjectdefs.h \ + /usr/lib/qt3/include/ntqnamespace.h /usr/lib/qt3/include/ntqobject.h \ + /usr/lib/qt3/include/ntqevent.h /usr/lib/qt3/include/ntqregion.h \ + /usr/lib/qt3/include/ntqrect.h /usr/lib/qt3/include/ntqsize.h \ + /usr/lib/qt3/include/ntqpoint.h /usr/lib/qt3/include/ntqmime.h \ + /usr/lib/qt3/include/ntqpaintdevice.h /usr/lib/qt3/include/ntqpalette.h \ + /usr/lib/qt3/include/ntqcolor.h /usr/lib/qt3/include/ntqbrush.h \ + /usr/lib/qt3/include/ntqfont.h /usr/lib/qt3/include/ntqfontmetrics.h \ + /usr/lib/qt3/include/ntqfontinfo.h /usr/lib/qt3/include/ntqsizepolicy.h \ + /usr/lib/qt3/include/ntqpushbutton.h /usr/lib/qt3/include/ntqbutton.h \ + /usr/lib/qt3/include/ntqkeysequence.h /usr/lib/qt3/include/ntqiconset.h \ + /usr/lib/qt3/include/ntqpixmap.h /usr/lib/qt3/include/ntqlabel.h \ + /usr/lib/qt3/include/ntqframe.h /usr/lib/qt3/include/ntqslider.h \ + /usr/lib/qt3/include/ntqrangecontrol.h /usr/lib/qt3/include/ntqcheckbox.h \ + /usr/lib/qt3/include/ntqcombobox.h /usr/lib/qt3/include/ntqspinbox.h \ + /usr/lib/qt3/include/ntqlayout.h /usr/lib/qt3/include/ntqtooltip.h \ + /usr/lib/qt3/include/ntqwhatsthis.h /usr/lib/qt3/include/ntqcursor.h \ + configdialog.moc /usr/lib/qt3/include/ntqmetaobject.h \ + /usr/lib/qt3/include/ntqconnection.h /usr/lib/qt3/include/ntqapplication.h \ + /usr/lib/qt3/include/ntqdesktopwidget.h /usr/lib/qt3/include/ntqasciidict.h \ + /usr/lib/qt3/include/ntqgdict.h /usr/lib/qt3/include/ntqtranslator.h \ /usr/lib/qt3/include/private/qucomextra_p.h \ - /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/quuid.h + /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h /opt/kde3/include/klocale.h: -/usr/lib/qt3/include/qstring.h: +/usr/lib/qt3/include/ntqstring.h: -/usr/lib/qt3/include/qcstring.h: +/usr/lib/qt3/include/ntqcstring.h: -/usr/lib/qt3/include/qmemarray.h: +/usr/lib/qt3/include/ntqmemarray.h: -/usr/lib/qt3/include/qgarray.h: +/usr/lib/qt3/include/ntqgarray.h: -/usr/lib/qt3/include/qshared.h: +/usr/lib/qt3/include/ntqshared.h: -/usr/lib/qt3/include/qglobal.h: +/usr/lib/qt3/include/ntqglobal.h: -/usr/lib/qt3/include/qconfig.h: +/usr/lib/qt3/include/ntqconfig.h: -/usr/lib/qt3/include/qmodules.h: +/usr/lib/qt3/include/ntqmodules.h: -/usr/lib/qt3/include/qfeatures.h: +/usr/lib/qt3/include/ntqfeatures.h: -/usr/lib/qt3/include/qwinexport.h: +/usr/lib/qt3/include/ntqwinexport.h: /usr/include/string.h: @@ -365,17 +365,17 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \ configdialog.h: -/usr/lib/qt3/include/qvariant.h: +/usr/lib/qt3/include/ntqvariant.h: -/usr/lib/qt3/include/qvaluelist.h: +/usr/lib/qt3/include/ntqvaluelist.h: -/usr/lib/qt3/include/qtl.h: +/usr/lib/qt3/include/ntqtl.h: -/usr/lib/qt3/include/qtextstream.h: +/usr/lib/qt3/include/ntqtextstream.h: -/usr/lib/qt3/include/qiodevice.h: +/usr/lib/qt3/include/ntqiodevice.h: -/usr/lib/qt3/include/qdatastream.h: +/usr/lib/qt3/include/ntqdatastream.h: /usr/include/g++/iterator: @@ -475,19 +475,19 @@ configdialog.h: /usr/include/g++/bits/list.tcc: -/usr/lib/qt3/include/qstringlist.h: +/usr/lib/qt3/include/ntqstringlist.h: -/usr/lib/qt3/include/qstrlist.h: +/usr/lib/qt3/include/ntqstrlist.h: -/usr/lib/qt3/include/qptrlist.h: +/usr/lib/qt3/include/ntqptrlist.h: -/usr/lib/qt3/include/qglist.h: +/usr/lib/qt3/include/ntqglist.h: -/usr/lib/qt3/include/qptrcollection.h: +/usr/lib/qt3/include/ntqptrcollection.h: -/usr/lib/qt3/include/qmap.h: +/usr/lib/qt3/include/ntqmap.h: -/usr/lib/qt3/include/qpair.h: +/usr/lib/qt3/include/ntqpair.h: /usr/include/g++/map: @@ -497,94 +497,94 @@ configdialog.h: /usr/include/g++/bits/stl_multimap.h: -/usr/lib/qt3/include/qwidget.h: +/usr/lib/qt3/include/ntqwidget.h: -/usr/lib/qt3/include/qwindowdefs.h: +/usr/lib/qt3/include/ntqwindowdefs.h: -/usr/lib/qt3/include/qobjectdefs.h: +/usr/lib/qt3/include/ntqobjectdefs.h: -/usr/lib/qt3/include/qnamespace.h: +/usr/lib/qt3/include/ntqnamespace.h: -/usr/lib/qt3/include/qobject.h: +/usr/lib/qt3/include/ntqobject.h: -/usr/lib/qt3/include/qevent.h: +/usr/lib/qt3/include/ntqevent.h: -/usr/lib/qt3/include/qregion.h: +/usr/lib/qt3/include/ntqregion.h: -/usr/lib/qt3/include/qrect.h: +/usr/lib/qt3/include/ntqrect.h: -/usr/lib/qt3/include/qsize.h: +/usr/lib/qt3/include/ntqsize.h: -/usr/lib/qt3/include/qpoint.h: +/usr/lib/qt3/include/ntqpoint.h: -/usr/lib/qt3/include/qmime.h: +/usr/lib/qt3/include/ntqmime.h: -/usr/lib/qt3/include/qpaintdevice.h: +/usr/lib/qt3/include/ntqpaintdevice.h: -/usr/lib/qt3/include/qpalette.h: +/usr/lib/qt3/include/ntqpalette.h: -/usr/lib/qt3/include/qcolor.h: +/usr/lib/qt3/include/ntqcolor.h: -/usr/lib/qt3/include/qbrush.h: +/usr/lib/qt3/include/ntqbrush.h: -/usr/lib/qt3/include/qfont.h: +/usr/lib/qt3/include/ntqfont.h: -/usr/lib/qt3/include/qfontmetrics.h: +/usr/lib/qt3/include/ntqfontmetrics.h: -/usr/lib/qt3/include/qfontinfo.h: +/usr/lib/qt3/include/ntqfontinfo.h: -/usr/lib/qt3/include/qsizepolicy.h: +/usr/lib/qt3/include/ntqsizepolicy.h: -/usr/lib/qt3/include/qpushbutton.h: +/usr/lib/qt3/include/ntqpushbutton.h: -/usr/lib/qt3/include/qbutton.h: +/usr/lib/qt3/include/ntqbutton.h: -/usr/lib/qt3/include/qkeysequence.h: +/usr/lib/qt3/include/ntqkeysequence.h: -/usr/lib/qt3/include/qiconset.h: +/usr/lib/qt3/include/ntqiconset.h: -/usr/lib/qt3/include/qpixmap.h: +/usr/lib/qt3/include/ntqpixmap.h: -/usr/lib/qt3/include/qlabel.h: +/usr/lib/qt3/include/ntqlabel.h: -/usr/lib/qt3/include/qframe.h: +/usr/lib/qt3/include/ntqframe.h: -/usr/lib/qt3/include/qslider.h: +/usr/lib/qt3/include/ntqslider.h: -/usr/lib/qt3/include/qrangecontrol.h: +/usr/lib/qt3/include/ntqrangecontrol.h: -/usr/lib/qt3/include/qcheckbox.h: +/usr/lib/qt3/include/ntqcheckbox.h: -/usr/lib/qt3/include/qcombobox.h: +/usr/lib/qt3/include/ntqcombobox.h: -/usr/lib/qt3/include/qspinbox.h: +/usr/lib/qt3/include/ntqspinbox.h: -/usr/lib/qt3/include/qlayout.h: +/usr/lib/qt3/include/ntqlayout.h: -/usr/lib/qt3/include/qtooltip.h: +/usr/lib/qt3/include/ntqtooltip.h: -/usr/lib/qt3/include/qwhatsthis.h: +/usr/lib/qt3/include/ntqwhatsthis.h: -/usr/lib/qt3/include/qcursor.h: +/usr/lib/qt3/include/ntqcursor.h: configdialog.moc: -/usr/lib/qt3/include/qmetaobject.h: +/usr/lib/qt3/include/ntqmetaobject.h: -/usr/lib/qt3/include/qconnection.h: +/usr/lib/qt3/include/ntqconnection.h: -/usr/lib/qt3/include/qapplication.h: +/usr/lib/qt3/include/ntqapplication.h: -/usr/lib/qt3/include/qdesktopwidget.h: +/usr/lib/qt3/include/ntqdesktopwidget.h: -/usr/lib/qt3/include/qasciidict.h: +/usr/lib/qt3/include/ntqasciidict.h: -/usr/lib/qt3/include/qgdict.h: +/usr/lib/qt3/include/ntqgdict.h: -/usr/lib/qt3/include/qtranslator.h: +/usr/lib/qt3/include/ntqtranslator.h: /usr/lib/qt3/include/private/qucomextra_p.h: /usr/lib/qt3/include/private/qucom_p.h: -/usr/lib/qt3/include/quuid.h: +/usr/lib/qt3/include/ntquuid.h: diff --git a/malloryclient/config/.deps/malloryconfig.Plo b/malloryclient/config/.deps/malloryconfig.Plo index 94303ae..c127acc 100644 --- a/malloryclient/config/.deps/malloryconfig.Plo +++ b/malloryclient/config/.deps/malloryconfig.Plo @@ -1,15 +1,15 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ - /opt/kde3/include/kconfig.h /usr/lib/qt3/include/qvaluelist.h \ - /usr/lib/qt3/include/qtl.h /usr/lib/qt3/include/qglobal.h \ - /usr/lib/qt3/include/qconfig.h /usr/lib/qt3/include/qmodules.h \ - /usr/lib/qt3/include/qfeatures.h /usr/lib/qt3/include/qtextstream.h \ - /usr/lib/qt3/include/qiodevice.h /usr/lib/qt3/include/qcstring.h \ - /usr/lib/qt3/include/qmemarray.h /usr/lib/qt3/include/qgarray.h \ - /usr/lib/qt3/include/qshared.h /usr/lib/qt3/include/qwinexport.h \ + /opt/kde3/include/kconfig.h /usr/lib/qt3/include/ntqvaluelist.h \ + /usr/lib/qt3/include/ntqtl.h /usr/lib/qt3/include/ntqglobal.h \ + /usr/lib/qt3/include/ntqconfig.h /usr/lib/qt3/include/ntqmodules.h \ + /usr/lib/qt3/include/ntqfeatures.h /usr/lib/qt3/include/ntqtextstream.h \ + /usr/lib/qt3/include/ntqiodevice.h /usr/lib/qt3/include/ntqcstring.h \ + /usr/lib/qt3/include/ntqmemarray.h /usr/lib/qt3/include/ntqgarray.h \ + /usr/lib/qt3/include/ntqshared.h /usr/lib/qt3/include/ntqwinexport.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \ - /usr/include/xlocale.h /usr/lib/qt3/include/qstring.h \ + /usr/include/xlocale.h /usr/lib/qt3/include/ntqstring.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/limits.h \ /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ @@ -68,7 +68,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/include/g++/bits/stl_algo.h /usr/include/g++/bits/stl_heap.h \ /usr/include/g++/bits/stl_tempbuf.h \ /usr/include/g++/bits/basic_string.tcc \ - /usr/lib/qt3/include/qdatastream.h /usr/include/g++/iterator \ + /usr/lib/qt3/include/ntqdatastream.h /usr/include/g++/iterator \ /usr/include/g++/ostream /usr/include/g++/ios \ /usr/include/g++/bits/localefwd.h /usr/include/g++/bits/ios_base.h \ /usr/include/g++/bits/locale_classes.h /usr/include/g++/streambuf \ @@ -96,66 +96,66 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/include/g++/istream /usr/include/g++/bits/istream.tcc \ /usr/include/g++/bits/stream_iterator.h /usr/include/g++/list \ /usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \ - /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/qobject.h \ - /usr/lib/qt3/include/qobjectdefs.h /usr/lib/qt3/include/qwindowdefs.h \ - /usr/lib/qt3/include/qnamespace.h /usr/lib/qt3/include/qevent.h \ - /usr/lib/qt3/include/qregion.h /usr/lib/qt3/include/qrect.h \ - /usr/lib/qt3/include/qsize.h /usr/lib/qt3/include/qpoint.h \ - /usr/lib/qt3/include/qmime.h /usr/lib/qt3/include/qmap.h \ - /usr/lib/qt3/include/qpair.h /usr/include/g++/map \ + /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqobject.h \ + /usr/lib/qt3/include/ntqobjectdefs.h /usr/lib/qt3/include/ntqwindowdefs.h \ + /usr/lib/qt3/include/ntqnamespace.h /usr/lib/qt3/include/ntqevent.h \ + /usr/lib/qt3/include/ntqregion.h /usr/lib/qt3/include/ntqrect.h \ + /usr/lib/qt3/include/ntqsize.h /usr/lib/qt3/include/ntqpoint.h \ + /usr/lib/qt3/include/ntqmime.h /usr/lib/qt3/include/ntqmap.h \ + /usr/lib/qt3/include/ntqpair.h /usr/include/g++/map \ /usr/include/g++/bits/stl_tree.h /usr/include/g++/bits/stl_map.h \ - /usr/include/g++/bits/stl_multimap.h /usr/lib/qt3/include/qcolor.h \ - /usr/lib/qt3/include/qstringlist.h /usr/lib/qt3/include/qstrlist.h \ - /usr/lib/qt3/include/qptrlist.h /usr/lib/qt3/include/qglist.h \ - /usr/lib/qt3/include/qptrcollection.h /usr/lib/qt3/include/qfont.h \ - /usr/lib/qt3/include/qdatetime.h /usr/lib/qt3/include/qvariant.h \ + /usr/include/g++/bits/stl_multimap.h /usr/lib/qt3/include/ntqcolor.h \ + /usr/lib/qt3/include/ntqstringlist.h /usr/lib/qt3/include/ntqstrlist.h \ + /usr/lib/qt3/include/ntqptrlist.h /usr/lib/qt3/include/ntqglist.h \ + /usr/lib/qt3/include/ntqptrcollection.h /usr/lib/qt3/include/ntqfont.h \ + /usr/lib/qt3/include/ntqdatetime.h /usr/lib/qt3/include/ntqvariant.h \ /opt/kde3/include/kconfigdata.h /opt/kde3/include/kdelibs_export.h \ /opt/kde3/include/kdemacros.h /opt/kde3/include/klockfile.h \ /opt/kde3/include/ksharedptr.h /opt/kde3/include/klocale.h \ /opt/kde3/include/kglobal.h /opt/kde3/include/kinstance.h \ - /usr/lib/qt3/include/qcheckbox.h /usr/lib/qt3/include/qbutton.h \ - /usr/lib/qt3/include/qwidget.h /usr/lib/qt3/include/qpaintdevice.h \ - /usr/lib/qt3/include/qpalette.h /usr/lib/qt3/include/qbrush.h \ - /usr/lib/qt3/include/qfontmetrics.h /usr/lib/qt3/include/qfontinfo.h \ - /usr/lib/qt3/include/qsizepolicy.h /usr/lib/qt3/include/qkeysequence.h \ - /usr/lib/qt3/include/qslider.h /usr/lib/qt3/include/qrangecontrol.h \ - /usr/lib/qt3/include/qframe.h /usr/lib/qt3/include/qspinbox.h \ - /usr/lib/qt3/include/qcombobox.h /usr/lib/qt3/include/qwhatsthis.h \ - /usr/lib/qt3/include/qcursor.h malloryconfig.h configdialog.h \ - malloryconfig.moc /usr/lib/qt3/include/qmetaobject.h \ - /usr/lib/qt3/include/qconnection.h /usr/lib/qt3/include/qapplication.h \ - /usr/lib/qt3/include/qdesktopwidget.h /usr/lib/qt3/include/qasciidict.h \ - /usr/lib/qt3/include/qgdict.h /usr/lib/qt3/include/qtranslator.h \ + /usr/lib/qt3/include/ntqcheckbox.h /usr/lib/qt3/include/ntqbutton.h \ + /usr/lib/qt3/include/ntqwidget.h /usr/lib/qt3/include/ntqpaintdevice.h \ + /usr/lib/qt3/include/ntqpalette.h /usr/lib/qt3/include/ntqbrush.h \ + /usr/lib/qt3/include/ntqfontmetrics.h /usr/lib/qt3/include/ntqfontinfo.h \ + /usr/lib/qt3/include/ntqsizepolicy.h /usr/lib/qt3/include/ntqkeysequence.h \ + /usr/lib/qt3/include/ntqslider.h /usr/lib/qt3/include/ntqrangecontrol.h \ + /usr/lib/qt3/include/ntqframe.h /usr/lib/qt3/include/ntqspinbox.h \ + /usr/lib/qt3/include/ntqcombobox.h /usr/lib/qt3/include/ntqwhatsthis.h \ + /usr/lib/qt3/include/ntqcursor.h malloryconfig.h configdialog.h \ + malloryconfig.moc /usr/lib/qt3/include/ntqmetaobject.h \ + /usr/lib/qt3/include/ntqconnection.h /usr/lib/qt3/include/ntqapplication.h \ + /usr/lib/qt3/include/ntqdesktopwidget.h /usr/lib/qt3/include/ntqasciidict.h \ + /usr/lib/qt3/include/ntqgdict.h /usr/lib/qt3/include/ntqtranslator.h \ /usr/lib/qt3/include/private/qucomextra_p.h \ - /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/quuid.h + /usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h /opt/kde3/include/kconfig.h: -/usr/lib/qt3/include/qvaluelist.h: +/usr/lib/qt3/include/ntqvaluelist.h: -/usr/lib/qt3/include/qtl.h: +/usr/lib/qt3/include/ntqtl.h: -/usr/lib/qt3/include/qglobal.h: +/usr/lib/qt3/include/ntqglobal.h: -/usr/lib/qt3/include/qconfig.h: +/usr/lib/qt3/include/ntqconfig.h: -/usr/lib/qt3/include/qmodules.h: +/usr/lib/qt3/include/ntqmodules.h: -/usr/lib/qt3/include/qfeatures.h: +/usr/lib/qt3/include/ntqfeatures.h: -/usr/lib/qt3/include/qtextstream.h: +/usr/lib/qt3/include/ntqtextstream.h: -/usr/lib/qt3/include/qiodevice.h: +/usr/lib/qt3/include/ntqiodevice.h: -/usr/lib/qt3/include/qcstring.h: +/usr/lib/qt3/include/ntqcstring.h: -/usr/lib/qt3/include/qmemarray.h: +/usr/lib/qt3/include/ntqmemarray.h: -/usr/lib/qt3/include/qgarray.h: +/usr/lib/qt3/include/ntqgarray.h: -/usr/lib/qt3/include/qshared.h: +/usr/lib/qt3/include/ntqshared.h: -/usr/lib/qt3/include/qwinexport.h: +/usr/lib/qt3/include/ntqwinexport.h: /usr/include/string.h: @@ -169,7 +169,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/include/xlocale.h: -/usr/lib/qt3/include/qstring.h: +/usr/lib/qt3/include/ntqstring.h: /usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/limits.h: @@ -367,7 +367,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/include/g++/bits/basic_string.tcc: -/usr/lib/qt3/include/qdatastream.h: +/usr/lib/qt3/include/ntqdatastream.h: /usr/include/g++/iterator: @@ -469,29 +469,29 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /opt/kde3/include/kconfigbase.h: -/usr/lib/qt3/include/qobject.h: +/usr/lib/qt3/include/ntqobject.h: -/usr/lib/qt3/include/qobjectdefs.h: +/usr/lib/qt3/include/ntqobjectdefs.h: -/usr/lib/qt3/include/qwindowdefs.h: +/usr/lib/qt3/include/ntqwindowdefs.h: -/usr/lib/qt3/include/qnamespace.h: +/usr/lib/qt3/include/ntqnamespace.h: -/usr/lib/qt3/include/qevent.h: +/usr/lib/qt3/include/ntqevent.h: -/usr/lib/qt3/include/qregion.h: +/usr/lib/qt3/include/ntqregion.h: -/usr/lib/qt3/include/qrect.h: +/usr/lib/qt3/include/ntqrect.h: -/usr/lib/qt3/include/qsize.h: +/usr/lib/qt3/include/ntqsize.h: -/usr/lib/qt3/include/qpoint.h: +/usr/lib/qt3/include/ntqpoint.h: -/usr/lib/qt3/include/qmime.h: +/usr/lib/qt3/include/ntqmime.h: -/usr/lib/qt3/include/qmap.h: +/usr/lib/qt3/include/ntqmap.h: -/usr/lib/qt3/include/qpair.h: +/usr/lib/qt3/include/ntqpair.h: /usr/include/g++/map: @@ -501,23 +501,23 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /usr/include/g++/bits/stl_multimap.h: -/usr/lib/qt3/include/qcolor.h: +/usr/lib/qt3/include/ntqcolor.h: -/usr/lib/qt3/include/qstringlist.h: +/usr/lib/qt3/include/ntqstringlist.h: -/usr/lib/qt3/include/qstrlist.h: +/usr/lib/qt3/include/ntqstrlist.h: -/usr/lib/qt3/include/qptrlist.h: +/usr/lib/qt3/include/ntqptrlist.h: -/usr/lib/qt3/include/qglist.h: +/usr/lib/qt3/include/ntqglist.h: -/usr/lib/qt3/include/qptrcollection.h: +/usr/lib/qt3/include/ntqptrcollection.h: -/usr/lib/qt3/include/qfont.h: +/usr/lib/qt3/include/ntqfont.h: -/usr/lib/qt3/include/qdatetime.h: +/usr/lib/qt3/include/ntqdatetime.h: -/usr/lib/qt3/include/qvariant.h: +/usr/lib/qt3/include/ntqvariant.h: /opt/kde3/include/kconfigdata.h: @@ -535,39 +535,39 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \ /opt/kde3/include/kinstance.h: -/usr/lib/qt3/include/qcheckbox.h: +/usr/lib/qt3/include/ntqcheckbox.h: -/usr/lib/qt3/include/qbutton.h: +/usr/lib/qt3/include/ntqbutton.h: -/usr/lib/qt3/include/qwidget.h: +/usr/lib/qt3/include/ntqwidget.h: -/usr/lib/qt3/include/qpaintdevice.h: +/usr/lib/qt3/include/ntqpaintdevice.h: -/usr/lib/qt3/include/qpalette.h: +/usr/lib/qt3/include/ntqpalette.h: -/usr/lib/qt3/include/qbrush.h: +/usr/lib/qt3/include/ntqbrush.h: -/usr/lib/qt3/include/qfontmetrics.h: +/usr/lib/qt3/include/ntqfontmetrics.h: -/usr/lib/qt3/include/qfontinfo.h: +/usr/lib/qt3/include/ntqfontinfo.h: -/usr/lib/qt3/include/qsizepolicy.h: +/usr/lib/qt3/include/ntqsizepolicy.h: -/usr/lib/qt3/include/qkeysequence.h: +/usr/lib/qt3/include/ntqkeysequence.h: -/usr/lib/qt3/include/qslider.h: +/usr/lib/qt3/include/ntqslider.h: -/usr/lib/qt3/include/qrangecontrol.h: +/usr/lib/qt3/include/ntqrangecontrol.h: -/usr/lib/qt3/include/qframe.h: +/usr/lib/qt3/include/ntqframe.h: -/usr/lib/qt3/include/qspinbox.h: +/usr/lib/qt3/include/ntqspinbox.h: -/usr/lib/qt3/include/qcombobox.h: +/usr/lib/qt3/include/ntqcombobox.h: -/usr/lib/qt3/include/qwhatsthis.h: +/usr/lib/qt3/include/ntqwhatsthis.h: -/usr/lib/qt3/include/qcursor.h: +/usr/lib/qt3/include/ntqcursor.h: malloryconfig.h: @@ -575,22 +575,22 @@ configdialog.h: malloryconfig.moc: -/usr/lib/qt3/include/qmetaobject.h: +/usr/lib/qt3/include/ntqmetaobject.h: -/usr/lib/qt3/include/qconnection.h: +/usr/lib/qt3/include/ntqconnection.h: -/usr/lib/qt3/include/qapplication.h: +/usr/lib/qt3/include/ntqapplication.h: -/usr/lib/qt3/include/qdesktopwidget.h: +/usr/lib/qt3/include/ntqdesktopwidget.h: -/usr/lib/qt3/include/qasciidict.h: +/usr/lib/qt3/include/ntqasciidict.h: -/usr/lib/qt3/include/qgdict.h: +/usr/lib/qt3/include/ntqgdict.h: -/usr/lib/qt3/include/qtranslator.h: +/usr/lib/qt3/include/ntqtranslator.h: /usr/lib/qt3/include/private/qucomextra_p.h: /usr/lib/qt3/include/private/qucom_p.h: -/usr/lib/qt3/include/quuid.h: +/usr/lib/qt3/include/ntquuid.h: diff --git a/malloryclient/config/Makefile b/malloryclient/config/Makefile index 977b6a3..27dbc4c 100644 --- a/malloryclient/config/Makefile +++ b/malloryclient/config/Makefile @@ -165,7 +165,7 @@ LIB_KSPELL = -lkspell LIB_KSYCOCA = -lkio LIB_POLL = LIB_QPE = -LIB_QT = -lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread +LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread LIB_QTOPIA = @LIB_QTOPIA@ LIB_SMB = -lsmb LIB_X11 = -lX11 $(LIBSOCKET) diff --git a/malloryclient/config/configdialog.ui b/malloryclient/config/configdialog.ui index 7705d3a..8aa6533 100644 --- a/malloryclient/config/configdialog.ui +++ b/malloryclient/config/configdialog.ui @@ -1,6 +1,6 @@ ConfigDialog - + ConfigDialog @@ -19,7 +19,7 @@ unnamed - + layout11 @@ -27,7 +27,7 @@ unnamed - + layout4 @@ -35,7 +35,7 @@ unnamed - + layout1 @@ -43,7 +43,7 @@ unnamed - + textLabel1_2 @@ -57,7 +57,7 @@ Alt+T - + m_titleSize @@ -85,7 +85,7 @@ - + layout2 @@ -93,7 +93,7 @@ unnamed - + textLabel2 @@ -107,7 +107,7 @@ Alt+B - + m_buttonSize @@ -135,7 +135,7 @@ - + layout3 @@ -143,7 +143,7 @@ unnamed - + textLabel1 @@ -157,7 +157,7 @@ Alt+O - + m_borderSize @@ -185,7 +185,7 @@ - + unnamed @@ -193,7 +193,7 @@ unnamed - + m_lessRounded @@ -221,7 +221,7 @@ - + textLabel99 @@ -235,7 +235,7 @@ Alt+U - + Round @@ -262,7 +262,7 @@ - + layout10 @@ -273,7 +273,7 @@ 16 - + layout9 @@ -281,7 +281,7 @@ unnamed - + m_resizeHandle @@ -292,7 +292,7 @@ Alt+H - + m_superSize @@ -305,7 +305,7 @@ - + layout6 @@ -313,7 +313,7 @@ unnamed - + m_titleShadow @@ -327,7 +327,7 @@ Check this option if you want the buttons and title to have a 3D look with a shadow behind them. - + layout99 @@ -335,7 +335,7 @@ unnamed - + textLabel3 @@ -354,7 +354,7 @@ m_titleShadowSize - + m_titleShadowSize diff --git a/malloryclient/config/malloryconfig.cpp b/malloryclient/config/malloryconfig.cpp index a22f7eb..8626ec4 100644 --- a/malloryclient/config/malloryconfig.cpp +++ b/malloryclient/config/malloryconfig.cpp @@ -10,17 +10,17 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "malloryconfig.h" #include "configdialog.h" -MalloryConfig::MalloryConfig(KConfig* config, QWidget* parent) - : QObject(parent), m_config(0), m_dialog(0) +MalloryConfig::MalloryConfig(KConfig* config, TQWidget* parent) + : TQObject(parent), m_config(0), m_dialog(0) { // Create the configuration object. m_config = new KConfig("kwinmalloryrc"); @@ -111,7 +111,7 @@ void MalloryConfig::defaults() extern "C" { - QObject* allocate_config(KConfig* config, QWidget* parent) { + TQObject* allocate_config(KConfig* config, TQWidget* parent) { return (new MalloryConfig(config, parent)); } } diff --git a/malloryclient/config/malloryconfig.h b/malloryclient/config/malloryconfig.h index aaa4cba..fee108f 100644 --- a/malloryclient/config/malloryconfig.h +++ b/malloryclient/config/malloryconfig.h @@ -10,19 +10,19 @@ #ifndef MALLORYCONFIG_H #define MALLORYCONFIG_H -#include +#include -class QButtonGroup; -class QGroupBox; -class QComboBox; +class TQButtonGroup; +class TQGroupBox; +class TQComboBox; class KConfig; class ConfigDialog; -class MalloryConfig : public QObject +class MalloryConfig : public TQObject { Q_OBJECT public: - MalloryConfig(KConfig* config, QWidget* parent); ///< Constructor + MalloryConfig(KConfig* config, TQWidget* parent); ///< Constructor ~MalloryConfig(); ///< Destructor signals: diff --git a/malloryclient/embeddata.cpp b/malloryclient/embeddata.cpp index ec84f4e..3ae94d9 100644 --- a/malloryclient/embeddata.cpp +++ b/malloryclient/embeddata.cpp @@ -16,14 +16,14 @@ void qInitImages_KWinMallory() { if ( !factory ) { factory = new MimeSourceFactory_KWinMallory; - QMimeSourceFactory::defaultFactory()->addFactory( factory ); + TQMimeSourceFactory::defaultFactory()->addFactory( factory ); } } void qCleanupImages_KWinMallory() { if ( factory ) { - QMimeSourceFactory::defaultFactory()->removeFactory( factory ); + TQMimeSourceFactory::defaultFactory()->removeFactory( factory ); delete factory; factory = 0; } diff --git a/malloryclient/embeddata.h b/malloryclient/embeddata.h index 0f9ed56..a586d0a 100644 --- a/malloryclient/embeddata.h +++ b/malloryclient/embeddata.h @@ -2,30 +2,30 @@ #ifndef EMBEDDATA_H #define EMBEDDATA_H -#include -#include -#include -#include +#include +#include +#include +#include // MXLS: I dunno what I'm doin'! -// QImage uic_findImage(const QString& name); +// TQImage uic_findImage(const TQString& name); -class MimeSourceFactory_KWinMallory : public QMimeSourceFactory +class MimeSourceFactory_KWinMallory : public TQMimeSourceFactory { public: MimeSourceFactory_KWinMallory() {} ~MimeSourceFactory_KWinMallory() {} - const QMimeSource* data( const QString& abs_name ) const { - const QMimeSource* d = QMimeSourceFactory::data( abs_name ); + const TQMimeSource* data( const TQString& abs_name ) const { + const TQMimeSource* d = TQMimeSourceFactory::data( abs_name ); if ( d || abs_name.isNull() ) return d; - // QImage img = uic_findImage( abs_name ); + // TQImage img = uic_findImage( abs_name ); // if ( !img.isNull() ) - // ((QMimeSourceFactory*)this)->setImage( abs_name, img ); - return QMimeSourceFactory::data( abs_name ); + // ((TQMimeSourceFactory*)this)->setImage( abs_name, img ); + return TQMimeSourceFactory::data( abs_name ); }; }; -static QMimeSourceFactory* factory = 0; +static TQMimeSourceFactory* factory = 0; void qInitImages_KWinMallory(); diff --git a/malloryclient/mallorybutton.cpp b/malloryclient/mallorybutton.cpp index ede2e7b..225bae3 100644 --- a/malloryclient/mallorybutton.cpp +++ b/malloryclient/mallorybutton.cpp @@ -10,9 +10,9 @@ // // -#include -#include -#include +#include +#include +#include #include "enums.h" #include "mallorybutton.h" @@ -21,9 +21,9 @@ #include "embeddata.h" -MalloryButton::MalloryButton(MalloryClient *parent, const char *name, const QString& tip, ButtonType type) : QButton(parent->widget(), name), m_client(parent), m_lastMouse(0), m_type(type), hover(false), isOnAllDesktops(false), isMaximized(false) +MalloryButton::MalloryButton(MalloryClient *parent, const char *name, const TQString& tip, ButtonType type) : TQButton(parent->widget(), name), m_client(parent), m_lastMouse(0), m_type(type), hover(false), isOnAllDesktops(false), isMaximized(false) { - QToolTip::add(this, tip); + TQToolTip::add(this, tip); setCursor(arrowCursor); setBackgroundMode(NoBackground); setFixedSize(MalloryHandler::buttonSize(), MalloryHandler::buttonSize()); @@ -34,46 +34,46 @@ MalloryButton::~MalloryButton() { } -void MalloryButton::setTipText(const QString &tip) +void MalloryButton::setTipText(const TQString &tip) { - QToolTip::remove(this); - QToolTip::add(this, tip); + TQToolTip::remove(this); + TQToolTip::add(this, tip); } -QSize MalloryButton::sizeHint() const // MXLS +TQSize MalloryButton::sizeHint() const // MXLS { - return QSize(MalloryHandler::buttonSize(), MalloryHandler::buttonSize()); + return TQSize(MalloryHandler::buttonSize(), MalloryHandler::buttonSize()); } -void MalloryButton::enterEvent(QEvent *e) +void MalloryButton::enterEvent(TQEvent *e) { hover = true; repaint(false); - QButton::enterEvent(e); + TQButton::enterEvent(e); } -void MalloryButton::leaveEvent(QEvent *e) +void MalloryButton::leaveEvent(TQEvent *e) { hover = false; repaint(false); - QButton::enterEvent(e); + TQButton::enterEvent(e); } -void MalloryButton::mousePressEvent(QMouseEvent *e) +void MalloryButton::mousePressEvent(TQMouseEvent *e) { m_lastMouse = e->button(); - QMouseEvent me(e->type(), e->pos(), e->globalPos(), LeftButton, e->state()); - QButton::mousePressEvent(&me); + TQMouseEvent me(e->type(), e->pos(), e->globalPos(), LeftButton, e->state()); + TQButton::mousePressEvent(&me); } -void MalloryButton::mouseReleaseEvent(QMouseEvent *e) +void MalloryButton::mouseReleaseEvent(TQMouseEvent *e) { m_lastMouse = e->button(); - QMouseEvent me(e->type(), e->pos(), e->globalPos(), LeftButton, e->state()); - QButton::mouseReleaseEvent(&me); + TQMouseEvent me(e->type(), e->pos(), e->globalPos(), LeftButton, e->state()); + TQButton::mouseReleaseEvent(&me); } -void MalloryButton::drawButton(QPainter *painter) +void MalloryButton::drawButton(TQPainter *painter) { if (!MalloryHandler::initialized()) return; @@ -86,17 +86,17 @@ void MalloryButton::drawButton(QPainter *painter) // Crush the bug the hard way! if (ofy < 2) - ofy = 2; + ofy = 2; - QPixmap pufferPixmap; + TQPixmap pufferPixmap; pufferPixmap.resize(buttonSize, buttonSize); - QPainter pufferPainter(&pufferPixmap); + TQPainter pufferPainter(&pufferPixmap); pufferPainter.drawPixmap(0, 0, active ? *Pixmaps::active_button_ground : *Pixmaps::inactive_button_ground); if (m_type == ButtonMenu) { - QPixmap menu_icon = m_client->icon().pixmap(QIconSet::Small, QIconSet::Normal); + TQPixmap menu_icon = m_client->icon().pixmap(TQIconSet::Small, TQIconSet::Normal); pufferPainter.drawPixmap(ofx, ofy, menu_icon); } else diff --git a/malloryclient/mallorybutton.h b/malloryclient/mallorybutton.h index e4e430b..351f5aa 100644 --- a/malloryclient/mallorybutton.h +++ b/malloryclient/mallorybutton.h @@ -12,35 +12,35 @@ #ifndef MALLORYBUTTON_H #define MALLORYBUTTON_H -#include +#include #include "malloryclient.h" #include "enums.h" class MalloryClient; -class MalloryButton : public QButton +class MalloryButton : public TQButton { Q_OBJECT public: - MalloryButton(MalloryClient *parent = 0, const char *name = 0, const QString &tip=NULL, ButtonType type = (ButtonType)0); + MalloryButton(MalloryClient *parent = 0, const char *name = 0, const TQString &tip=NULL, ButtonType type = (ButtonType)0); ~MalloryButton(); - void setTipText(const QString &tip); + void setTipText(const TQString &tip); void setOnAllDesktops(bool oad) { isOnAllDesktops = oad; repaint(false); } void setMaximized(bool max) { isMaximized = max; repaint(false); } - QSize sizeHint() const; + TQSize sizeHint() const; int lastMousePress() const { return m_lastMouse; } void reset() { repaint(false); } MalloryClient* client() { return m_client; } private: - void enterEvent(QEvent *e); - void leaveEvent(QEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void drawButton(QPainter *painter); + void enterEvent(TQEvent *e); + void leaveEvent(TQEvent *e); + void mousePressEvent(TQMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); + void drawButton(TQPainter *painter); MalloryClient *m_client; int m_lastMouse; diff --git a/malloryclient/malloryclient.cpp b/malloryclient/malloryclient.cpp index cd6028c..9c3ab25 100644 --- a/malloryclient/malloryclient.cpp +++ b/malloryclient/malloryclient.cpp @@ -14,14 +14,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "malloryclient.h" #include "malloryhandler.h" @@ -50,26 +50,26 @@ void MalloryClient::init() widget()->setBackgroundMode(NoBackground); // to avoid flicker // Set up layout - QGridLayout *mainLayout = new QGridLayout(widget(), 4, 3); // 4 x 3 grid - QHBoxLayout *titleLayout = new QHBoxLayout(); - QVBoxLayout *leftButtonLayout = new QVBoxLayout(); - QHBoxLayout *leftButtonLayout2 = new QHBoxLayout(); + TQGridLayout *mainLayout = new TQGridLayout(widget(), 4, 3); // 4 x 3 grid + TQHBoxLayout *titleLayout = new TQHBoxLayout(); + TQVBoxLayout *leftButtonLayout = new TQVBoxLayout(); + TQHBoxLayout *leftButtonLayout2 = new TQHBoxLayout(); leftButtonLayout->setSpacing(2); - QVBoxLayout *rightButtonLayout = new QVBoxLayout(); - QHBoxLayout *rightButtonLayout2 = new QHBoxLayout(); + TQVBoxLayout *rightButtonLayout = new TQVBoxLayout(); + TQHBoxLayout *rightButtonLayout2 = new TQHBoxLayout(); rightButtonLayout->setSpacing(2); - mainLayout->setResizeMode(QLayout::FreeResize); + mainLayout->setResizeMode(TQLayout::FreeResize); - m_titleBar = new QSpacerItem(1, MalloryHandler::titleSize(), QSizePolicy::Expanding, QSizePolicy::Fixed); - m_leftSpacer = new QSpacerItem(1, 1); - m_rightSpacer = new QSpacerItem(1, 1); - m_topSpacer = new QSpacerItem(1, 1); // 2nd argument is the top margin. - m_bottomSpacer = new QSpacerItem(1, MalloryHandler::borderSize()); - m_leftButtonSpacer = new QSpacerItem(MalloryHandler::buttonSpacing(), MalloryHandler::titleSize()); - m_rightButtonSpacer = new QSpacerItem(MalloryHandler::buttonSpacing(), MalloryHandler::titleSize()); - m_leftButtonSpacer2 = new QSpacerItem(1, (MalloryHandler::titleSize()-MalloryHandler::buttonSize())/2, QSizePolicy::Minimum, QSizePolicy::Fixed); - m_rightButtonSpacer2 = new QSpacerItem(1, (MalloryHandler::titleSize()-MalloryHandler::buttonSize())/2, QSizePolicy::Minimum, QSizePolicy::Fixed); + m_titleBar = new TQSpacerItem(1, MalloryHandler::titleSize(), TQSizePolicy::Expanding, TQSizePolicy::Fixed); + m_leftSpacer = new TQSpacerItem(1, 1); + m_rightSpacer = new TQSpacerItem(1, 1); + m_topSpacer = new TQSpacerItem(1, 1); // 2nd argument is the top margin. + m_bottomSpacer = new TQSpacerItem(1, MalloryHandler::borderSize()); + m_leftButtonSpacer = new TQSpacerItem(MalloryHandler::buttonSpacing(), MalloryHandler::titleSize()); + m_rightButtonSpacer = new TQSpacerItem(MalloryHandler::buttonSpacing(), MalloryHandler::titleSize()); + m_leftButtonSpacer2 = new TQSpacerItem(1, (MalloryHandler::titleSize()-MalloryHandler::buttonSize())/2, TQSizePolicy::Minimum, TQSizePolicy::Fixed); + m_rightButtonSpacer2 = new TQSpacerItem(1, (MalloryHandler::titleSize()-MalloryHandler::buttonSize())/2, TQSizePolicy::Minimum, TQSizePolicy::Fixed); mainLayout->addItem(m_topSpacer, 0, 1); mainLayout->addItem(m_bottomSpacer, 3, 1); @@ -79,11 +79,11 @@ void MalloryClient::init() mainLayout->addLayout(titleLayout, 1, 1); if (isPreview()) { - mainLayout->addWidget(new QLabel(i18n("
Mallory
"), widget()), 2, 1); + mainLayout->addWidget(new TQLabel(i18n("
Mallory
"), widget()), 2, 1); } else { - mainLayout->addItem(new QSpacerItem(0, 0), 2, 1); + mainLayout->addItem(new TQSpacerItem(0, 0), 2, 1); } // Make the window stretch @@ -101,35 +101,35 @@ void MalloryClient::init() // Add the left buttons leftButtonLayout->addItem(m_leftButtonSpacer2); leftButtonLayout->addLayout(leftButtonLayout2); - addButtons(leftButtonLayout2, options()->customButtonPositions() ? options()->titleButtonsLeft() : QString(default_left)); + addButtons(leftButtonLayout2, options()->customButtonPositions() ? options()->titleButtonsLeft() : TQString(default_left)); // Add the right buttons rightButtonLayout->addItem(m_rightButtonSpacer2); rightButtonLayout->addLayout(rightButtonLayout2); - addButtons(rightButtonLayout2, options()->customButtonPositions() ? options()->titleButtonsRight() : QString(default_right)); + addButtons(rightButtonLayout2, options()->customButtonPositions() ? options()->titleButtonsRight() : TQString(default_right)); } -bool MalloryClient::eventFilter(QObject *o, QEvent *e) +bool MalloryClient::eventFilter(TQObject *o, TQEvent *e) { if (o != widget()) return false; switch (e->type()) { - case QEvent::Resize: - resizeEvent(static_cast(e)); + case TQEvent::Resize: + resizeEvent(static_cast(e)); return true; - case QEvent::Paint: - paintEvent(static_cast(e)); + case TQEvent::Paint: + paintEvent(static_cast(e)); return true; - case QEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast(e)); + case TQEvent::MouseButtonDblClick: + mouseDoubleClickEvent(static_cast(e)); return true; - case QEvent::MouseButtonPress: - processMousePressEvent(static_cast(e)); + case TQEvent::MouseButtonPress: + processMousePressEvent(static_cast(e)); return true; - case QEvent::Show: - showEvent(static_cast(e)); + case TQEvent::Show: + showEvent(static_cast(e)); return true; default: @@ -137,7 +137,7 @@ bool MalloryClient::eventFilter(QObject *o, QEvent *e) } } -void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) +void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s) { if (s.length() > 0) { @@ -150,7 +150,7 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) { m_button[ButtonMenu] = new MalloryButton(this, "menu", i18n("Menu"), ButtonMenu); connect(m_button[ButtonMenu], SIGNAL(pressed()), this, SLOT(menuButtonPressed())); - layout->addWidget(m_button[ButtonMenu], 0, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(m_button[ButtonMenu], 0, TQt::AlignHCenter | TQt::AlignTop); } break; case 'H': // Help @@ -158,7 +158,7 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) { m_button[ButtonHelp] = new MalloryButton(this, "help", i18n("Help"), ButtonHelp); connect(m_button[ButtonHelp], SIGNAL(clicked()), this, SLOT(showContextHelp())); - layout->addWidget(m_button[ButtonHelp], 0, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(m_button[ButtonHelp], 0, TQt::AlignHCenter | TQt::AlignTop); } break; case 'I': // Minimize @@ -166,7 +166,7 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) { m_button[ButtonMin] = new MalloryButton(this, "minimize", i18n("Minimize"), ButtonMin); connect(m_button[ButtonMin], SIGNAL(clicked()), this, SLOT(minimize())); - layout->addWidget(m_button[ButtonMin], 0, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(m_button[ButtonMin], 0, TQt::AlignHCenter | TQt::AlignTop); } break; case 'A': // Maximize @@ -174,7 +174,7 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) { m_button[ButtonMax] = new MalloryButton(this, "maximize", (maximizeMode()!=MaximizeRestore)?i18n("Minimize"):i18n("Maximize"), ButtonMax); connect(m_button[ButtonMax], SIGNAL(clicked()), this, SLOT(maxButtonPressed())); - layout->addWidget(m_button[ButtonMax], 0, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(m_button[ButtonMax], 0, TQt::AlignHCenter | TQt::AlignTop); } break; case 'X': // Close @@ -182,7 +182,7 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) { m_button[ButtonClose] = new MalloryButton(this, "close", i18n("Close"), ButtonClose); connect(m_button[ButtonClose], SIGNAL(clicked()), this, SLOT(closeWindow())); - layout->addWidget(m_button[ButtonClose], 0, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(m_button[ButtonClose], 0, TQt::AlignHCenter | TQt::AlignTop); } break; case 'S': // OnAllDesktops @@ -191,7 +191,7 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) m_button[ButtonOnAllDesktops] = new MalloryButton(this, "onAllDesktops", isOnAllDesktops() ? i18n("Not On All Desktops") : i18n("On All Desktops"), ButtonOnAllDesktops); m_button[ButtonOnAllDesktops]->setOnAllDesktops(isOnAllDesktops()); connect(m_button[ButtonOnAllDesktops], SIGNAL(clicked()), this, SLOT(toggleOnAllDesktops())); - layout->addWidget(m_button[ButtonOnAllDesktops], 0, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(m_button[ButtonOnAllDesktops], 0, TQt::AlignHCenter | TQt::AlignTop); } break; case 'F': // Above all others @@ -199,7 +199,7 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) { m_button[ButtonAbove] = new MalloryButton(this, "above", i18n("Keep Above Others"), ButtonAbove); connect(m_button[ButtonAbove], SIGNAL(clicked()), this, SLOT(slotKeepAbove())); - layout->addWidget(m_button[ButtonAbove], 0, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(m_button[ButtonAbove], 0, TQt::AlignHCenter | TQt::AlignTop); } break; case 'B': // Below all others @@ -207,7 +207,7 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) { m_button[ButtonBelow] = new MalloryButton(this, "below", i18n("Keep Below Others"), ButtonBelow); connect(m_button[ButtonBelow], SIGNAL(clicked()), this, SLOT(slotKeepBelow())); - layout->addWidget(m_button[ButtonBelow], 0, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(m_button[ButtonBelow], 0, TQt::AlignHCenter | TQt::AlignTop); } break; case '_': // Spacer @@ -217,88 +217,88 @@ void MalloryClient::addButtons(QBoxLayout *layout, const QString &s) } } -void MalloryClient::paintEvent(QPaintEvent*) +void MalloryClient::paintEvent(TQPaintEvent*) { if (!MalloryHandler::initialized()) return; bool active = isActive(); - QPainter painter(widget()); + TQPainter painter(widget()); - QColor cottl = options()->color(ColorTitleBar, active); - QColor coblnd = options()->color(ColorTitleBlend, active); - QColor cofrm = options()->color(ColorFrame, active); - QColor cobttn = options()->color(ColorButtonBg, active); + TQColor cottl = options()->color(ColorTitleBar, active); + TQColor coblnd = options()->color(ColorTitleBlend, active); + TQColor cofrm = options()->color(ColorFrame, active); + TQColor cobttn = options()->color(ColorButtonBg, active); - QColorGroup widgetGroup; + TQColorGroup widgetGroup; widgetGroup = widget()->colorGroup(); - QColor coground = widgetGroup.background(); + TQColor coground = widgetGroup.background(); int cfr, cfg, cfb, alr, alg, alb; cofrm.getRgb(&cfr, &cfg, &cfb); coground.getRgb(&alr, &alg, &alb); - QColor aliasing = qRgb((cfr+alr)/2, (cfg+alg)/2, (cfb+alb)/2); + TQColor aliasing = tqRgb((cfr+alr)/2, (cfg+alg)/2, (cfb+alb)/2); - QRect titleRect(m_titleBar->geometry()); - QRect topRect(m_topSpacer->geometry()); - QRect leftRect(m_leftSpacer->geometry()); - QRect rightRect(m_rightSpacer->geometry()); - QRect bottomRect(m_bottomSpacer->geometry()); + TQRect titleRect(m_titleBar->geometry()); + TQRect topRect(m_topSpacer->geometry()); + TQRect leftRect(m_leftSpacer->geometry()); + TQRect rightRect(m_rightSpacer->geometry()); + TQRect bottomRect(m_bottomSpacer->geometry()); - QFontMetrics fm(options()->font(active, false)); + TQFontMetrics fm(options()->font(active, false)); int rr = rightRect.right(); int bb = bottomRect.bottom(); - QRegion mask; - + TQRegion mask; + if(maximizeMode() != MaximizeFull) { - mask = QRegion(0, 0, rr+1, bb+1); + mask = TQRegion(0, 0, rr+1, bb+1); if (MalloryHandler::lessRounded()) { // Remove top left corner - mask -= QRegion(0, 0, 2, 1); - mask -= QRegion(0, 1, 1, 1); + mask -= TQRegion(0, 0, 2, 1); + mask -= TQRegion(0, 1, 1, 1); // Remove top right corner - mask -= QRegion(rr-1, 0, 2, 1); - mask -= QRegion(rr, 1, 1, 1); + mask -= TQRegion(rr-1, 0, 2, 1); + mask -= TQRegion(rr, 1, 1, 1); // Remove bottom left corner - mask -= QRegion(0, bb, 2, 1); - mask -= QRegion(0, bb-1, 1, 1); + mask -= TQRegion(0, bb, 2, 1); + mask -= TQRegion(0, bb-1, 1, 1); // Remove bottom right corner - mask -= QRegion(rr-1, bb, 2, 1); - mask -= QRegion(rr, bb-1, 1, 1); + mask -= TQRegion(rr-1, bb, 2, 1); + mask -= TQRegion(rr, bb-1, 1, 1); } else { // Remove top left corner - mask -= QRegion(0, 0, 5, 1); - mask -= QRegion(0, 1, 3, 1); - mask -= QRegion(0, 2, 2, 1); - mask -= QRegion(0, 3, 1, 2); + mask -= TQRegion(0, 0, 5, 1); + mask -= TQRegion(0, 1, 3, 1); + mask -= TQRegion(0, 2, 2, 1); + mask -= TQRegion(0, 3, 1, 2); // Remove top right corner - mask -= QRegion(rr-4, 0, 5, 1); - mask -= QRegion(rr-2, 1, 3, 1); - mask -= QRegion(rr-1, 2, 2, 1); - mask -= QRegion(rr, 3, 1, 2); + mask -= TQRegion(rr-4, 0, 5, 1); + mask -= TQRegion(rr-2, 1, 3, 1); + mask -= TQRegion(rr-1, 2, 2, 1); + mask -= TQRegion(rr, 3, 1, 2); // Remove bottom left corner - mask -= QRegion(0, bb, 5, 1); - mask -= QRegion(0, bb-1, 3, 1); - mask -= QRegion(0, bb-2, 2, 1); - mask -= QRegion(0, bb-4, 1, 2); + mask -= TQRegion(0, bb, 5, 1); + mask -= TQRegion(0, bb-1, 3, 1); + mask -= TQRegion(0, bb-2, 2, 1); + mask -= TQRegion(0, bb-4, 1, 2); // Remove bottom right corner - mask -= QRegion(rr-4, bb, 5, 1); - mask -= QRegion(rr-2, bb-1, 3, 1); - mask -= QRegion(rr-1, bb-2, 2, 1); - mask -= QRegion(rr, bb-4, 1, 2); + mask -= TQRegion(rr-4, bb, 5, 1); + mask -= TQRegion(rr-2, bb-1, 3, 1); + mask -= TQRegion(rr-1, bb-2, 2, 1); + mask -= TQRegion(rr, bb-4, 1, 2); } } else { - mask = QRegion(0, 0, rightRect.right()+1, bottomRect.bottom()+1); + mask = TQRegion(0, 0, rightRect.right()+1, bottomRect.bottom()+1); } setMask(mask); @@ -306,12 +306,12 @@ void MalloryClient::paintEvent(QPaintEvent*) if (titleRect.width() > 0) // Do we even have to paint the title? { - QPixmap pufferPixmap; + TQPixmap pufferPixmap; pufferPixmap.resize(titleRect.width(), titleRect.height()-1); int flags = AlignAuto | AlignVCenter; - QPainter pufferPainter(&pufferPixmap); + TQPainter pufferPainter(&pufferPixmap); pufferPainter.drawTiledPixmap(pufferPixmap.rect(), active ? *Pixmaps::active_titlebar : *Pixmaps::inactive_titlebar); pufferPainter.setFont(options()->font(active, false)); @@ -341,7 +341,7 @@ void MalloryClient::paintEvent(QPaintEvent*) painter.setPen(coground); painter.drawLine(leftRect.left()+1, titleRect.bottom(), rightRect.right()-1, titleRect.bottom()); - QRect frame; + TQRect frame; // Left frame.setCoords(leftRect.left()+1, titleRect.bottom(), leftRect.right(), bottomRect.bottom()-1); painter.fillRect(frame, coground); @@ -484,16 +484,16 @@ void MalloryClient::paintEvent(QPaintEvent*) } } -void MalloryClient::showEvent(QShowEvent*) +void MalloryClient::showEvent(TQShowEvent*) { widget()->update(); } -void MalloryClient::resizeEvent(QResizeEvent*) +void MalloryClient::resizeEvent(TQResizeEvent*) { if ((widget()->isVisibleToTLW()) && (!widget()->testWFlags(WStaticContents))) { - QRegion region = widget()->rect(); + TQRegion region = widget()->rect(); region.subtract(m_titleBar->geometry()); widget()->erase(region); } @@ -504,7 +504,7 @@ void MalloryClient::captionChange() widget()->repaint(m_titleBar->geometry(), false); } -void MalloryClient::mouseDoubleClickEvent(QMouseEvent *e) +void MalloryClient::mouseDoubleClickEvent(TQMouseEvent *e) { if (m_titleBar->geometry().contains(e->pos())) { @@ -512,17 +512,17 @@ void MalloryClient::mouseDoubleClickEvent(QMouseEvent *e) } } -MalloryClient::Position MalloryClient::mousePosition(const QPoint &point) const +MalloryClient::Position MalloryClient::mousePosition(const TQPoint &point) const { const int corner = 24; MalloryClient::Position pos = PositionCenter; // Often needed coordinates... - QRect titleRect(m_titleBar->geometry()); - QRect topRect(m_topSpacer->geometry()); - QRect leftRect(m_leftSpacer->geometry()); - QRect rightRect(m_rightSpacer->geometry()); - QRect bottomRect(m_bottomSpacer->geometry()); + TQRect titleRect(m_titleBar->geometry()); + TQRect topRect(m_topSpacer->geometry()); + TQRect leftRect(m_leftSpacer->geometry()); + TQRect rightRect(m_rightSpacer->geometry()); + TQRect bottomRect(m_bottomSpacer->geometry()); if ((m_leftButtonSpacer2->geometry().height() > 0) ? (point.y() <= (m_leftButtonSpacer2->geometry().bottom())) : (point.y() <= topRect.bottom())) @@ -641,28 +641,28 @@ void MalloryClient::menuButtonPressed() { if (m_button[ButtonMenu]) { - QPoint pt(m_button[ButtonMenu]->rect().bottomLeft().x(), m_button[ButtonMenu]->rect().bottomLeft().y()); + TQPoint pt(m_button[ButtonMenu]->rect().bottomLeft().x(), m_button[ButtonMenu]->rect().bottomLeft().y()); showWindowMenu(m_button[ButtonMenu]->mapToGlobal(pt)); m_button[ButtonMenu]->setDown(false); } } -QSize MalloryClient::minimumSize() const +TQSize MalloryClient::minimumSize() const { - return QSize(112, 40); + return TQSize(112, 40); } void MalloryClient::borders(int& left, int& right, int& top, int& bottom) const { - m_leftSpacer->changeSize(MalloryHandler::borderSize(), 1, QSizePolicy::Expanding, QSizePolicy::Minimum ); - m_rightSpacer->changeSize(MalloryHandler::borderSize(), 1, QSizePolicy::Expanding, QSizePolicy::Minimum ); + m_leftSpacer->changeSize(MalloryHandler::borderSize(), 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_rightSpacer->changeSize(MalloryHandler::borderSize(), 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_topSpacer->changeSize(1, 1); m_bottomSpacer->changeSize(1, MalloryHandler::borderSize()); m_leftButtonSpacer->changeSize( 3, 1); m_rightButtonSpacer->changeSize( 3, 1); - m_titleBar->changeSize(1, MalloryHandler::titleSize(), QSizePolicy::Expanding, QSizePolicy::Fixed); - m_leftButtonSpacer2->changeSize(1, (MalloryHandler::titleSize()-MalloryHandler::buttonSize())/2, QSizePolicy::Minimum, QSizePolicy::Fixed); - m_rightButtonSpacer2->changeSize(1, (MalloryHandler::titleSize()-MalloryHandler::buttonSize())/2, QSizePolicy::Minimum, QSizePolicy::Fixed); + m_titleBar->changeSize(1, MalloryHandler::titleSize(), TQSizePolicy::Expanding, TQSizePolicy::Fixed); + m_leftButtonSpacer2->changeSize(1, (MalloryHandler::titleSize()-MalloryHandler::buttonSize())/2, TQSizePolicy::Minimum, TQSizePolicy::Fixed); + m_rightButtonSpacer2->changeSize(1, (MalloryHandler::titleSize()-MalloryHandler::buttonSize())/2, TQSizePolicy::Minimum, TQSizePolicy::Fixed); left = right = bottom = MalloryHandler::borderSize(); top = 1 + MalloryHandler::titleSize(); @@ -676,7 +676,7 @@ void MalloryClient::reset(unsigned long) // unsigned long changed // TODO: Implementation } -void MalloryClient::resize(const QSize& s) +void MalloryClient::resize(const TQSize& s) { widget()->resize(s); } diff --git a/malloryclient/malloryclient.h b/malloryclient/malloryclient.h index 9bb62b9..d952987 100644 --- a/malloryclient/malloryclient.h +++ b/malloryclient/malloryclient.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include "mallorybutton.h" #include "enums.h" @@ -29,9 +29,9 @@ public: ~MalloryClient(); virtual void init(); - virtual bool eventFilter(QObject* o, QEvent* e); + virtual bool eventFilter(TQObject* o, TQEvent* e); - virtual QSize minimumSize() const; + virtual TQSize minimumSize() const; virtual void borders(int& left, int& right, int& top, int& bottom) const; protected: @@ -42,20 +42,20 @@ protected: virtual void iconChange(); virtual void shadeChange() {}; - virtual void paintEvent(QPaintEvent *e); - virtual void showEvent(QShowEvent*); + virtual void paintEvent(TQPaintEvent *e); + virtual void showEvent(TQShowEvent*); - virtual void resize(const QSize&); + virtual void resize(const TQSize&); virtual void reset(unsigned long changed); private: - void addButtons(QBoxLayout *layout, const QString &buttons); - void resizeEvent(QResizeEvent *e); - void mouseDoubleClickEvent(QMouseEvent *e); - Position mousePosition(const QPoint &point) const; + void addButtons(TQBoxLayout *layout, const TQString &buttons); + void resizeEvent(TQResizeEvent *e); + void mouseDoubleClickEvent(TQMouseEvent *e); + Position mousePosition(const TQPoint &point) const; MalloryButton *m_button[ButtonTypeCount]; - QSpacerItem *m_titleBar, *m_leftSpacer, *m_rightSpacer, *m_topSpacer, *m_bottomSpacer, *m_leftButtonSpacer, *m_leftButtonSpacer2, *m_rightButtonSpacer, *m_rightButtonSpacer2; + TQSpacerItem *m_titleBar, *m_leftSpacer, *m_rightSpacer, *m_topSpacer, *m_bottomSpacer, *m_leftButtonSpacer, *m_leftButtonSpacer2, *m_rightButtonSpacer, *m_rightButtonSpacer2; private slots: void maxButtonPressed(); diff --git a/malloryclient/malloryhandler.h b/malloryclient/malloryhandler.h index 92036ac..c14bf26 100644 --- a/malloryclient/malloryhandler.h +++ b/malloryclient/malloryhandler.h @@ -14,14 +14,14 @@ #include #include -#include +#include #include // Default button layout const char default_left[] = "M"; const char default_right[] = "HIAX"; -class MalloryHandler : public QObject, public KDecorationFactory +class MalloryHandler : public TQObject, public KDecorationFactory { Q_OBJECT public: diff --git a/malloryclient/pixmaps.cpp b/malloryclient/pixmaps.cpp index f32e45c..fc10df1 100644 --- a/malloryclient/pixmaps.cpp +++ b/malloryclient/pixmaps.cpp @@ -14,83 +14,83 @@ #include "malloryhandler.h" #include -#include +#include #include #include #include -#include -#include +#include +#include // Static declarations for linking. -QPixmap *Pixmaps::active_button_ground = 0; -QPixmap *Pixmaps::inactive_button_ground = 0; - -QImage *Pixmaps::active_help_normal = 0; -QImage *Pixmaps::active_max_normal = 0; -QImage *Pixmaps::active_restore_normal = 0; -QImage *Pixmaps::active_min_normal = 0; -QImage *Pixmaps::active_close_normal = 0; -QImage *Pixmaps::active_sticky_normal = 0; -QImage *Pixmaps::active_unsticky_normal = 0; -QImage *Pixmaps::active_above_normal = 0; -QImage *Pixmaps::active_below_normal = 0; - -QImage *Pixmaps::active_help_hover = 0; -QImage *Pixmaps::active_max_hover = 0; -QImage *Pixmaps::active_restore_hover = 0; -QImage *Pixmaps::active_min_hover = 0; -QImage *Pixmaps::active_close_hover = 0; -QImage *Pixmaps::active_sticky_hover = 0; -QImage *Pixmaps::active_unsticky_hover = 0; -QImage *Pixmaps::active_above_hover = 0; -QImage *Pixmaps::active_below_hover = 0; - -QImage *Pixmaps::active_help_sunken = 0; -QImage *Pixmaps::active_max_sunken = 0; -QImage *Pixmaps::active_restore_sunken = 0; -QImage *Pixmaps::active_min_sunken = 0; -QImage *Pixmaps::active_close_sunken = 0; -QImage *Pixmaps::active_sticky_sunken = 0; -QImage *Pixmaps::active_unsticky_sunken = 0; -QImage *Pixmaps::active_above_sunken = 0; -QImage *Pixmaps::active_below_sunken = 0; - -QImage *Pixmaps::inactive_help_normal = 0; -QImage *Pixmaps::inactive_max_normal = 0; -QImage *Pixmaps::inactive_restore_normal = 0; -QImage *Pixmaps::inactive_min_normal = 0; -QImage *Pixmaps::inactive_close_normal = 0; -QImage *Pixmaps::inactive_sticky_normal = 0; -QImage *Pixmaps::inactive_unsticky_normal = 0; -QImage *Pixmaps::inactive_above_normal = 0; -QImage *Pixmaps::inactive_below_normal = 0; - -QImage *Pixmaps::inactive_help_hover = 0; -QImage *Pixmaps::inactive_max_hover = 0; -QImage *Pixmaps::inactive_restore_hover = 0; -QImage *Pixmaps::inactive_min_hover = 0; -QImage *Pixmaps::inactive_close_hover = 0; -QImage *Pixmaps::inactive_sticky_hover = 0; -QImage *Pixmaps::inactive_unsticky_hover = 0; -QImage *Pixmaps::inactive_above_hover = 0; -QImage *Pixmaps::inactive_below_hover = 0; - -QImage *Pixmaps::inactive_help_sunken = 0; -QImage *Pixmaps::inactive_max_sunken = 0; -QImage *Pixmaps::inactive_restore_sunken = 0; -QImage *Pixmaps::inactive_min_sunken = 0; -QImage *Pixmaps::inactive_close_sunken = 0; -QImage *Pixmaps::inactive_sticky_sunken = 0; -QImage *Pixmaps::inactive_unsticky_sunken = 0; -QImage *Pixmaps::inactive_above_sunken = 0; -QImage *Pixmaps::inactive_below_sunken = 0; - -QPixmap *Pixmaps::active_titlebar = 0; -QPixmap *Pixmaps::active_titlebar_left = 0; -QPixmap *Pixmaps::active_titlebar_right = 0; -QPixmap *Pixmaps::inactive_titlebar = 0; -QPixmap *Pixmaps::inactive_titlebar_left = 0; -QPixmap *Pixmaps::inactive_titlebar_right = 0; +TQPixmap *Pixmaps::active_button_ground = 0; +TQPixmap *Pixmaps::inactive_button_ground = 0; + +TQImage *Pixmaps::active_help_normal = 0; +TQImage *Pixmaps::active_max_normal = 0; +TQImage *Pixmaps::active_restore_normal = 0; +TQImage *Pixmaps::active_min_normal = 0; +TQImage *Pixmaps::active_close_normal = 0; +TQImage *Pixmaps::active_sticky_normal = 0; +TQImage *Pixmaps::active_unsticky_normal = 0; +TQImage *Pixmaps::active_above_normal = 0; +TQImage *Pixmaps::active_below_normal = 0; + +TQImage *Pixmaps::active_help_hover = 0; +TQImage *Pixmaps::active_max_hover = 0; +TQImage *Pixmaps::active_restore_hover = 0; +TQImage *Pixmaps::active_min_hover = 0; +TQImage *Pixmaps::active_close_hover = 0; +TQImage *Pixmaps::active_sticky_hover = 0; +TQImage *Pixmaps::active_unsticky_hover = 0; +TQImage *Pixmaps::active_above_hover = 0; +TQImage *Pixmaps::active_below_hover = 0; + +TQImage *Pixmaps::active_help_sunken = 0; +TQImage *Pixmaps::active_max_sunken = 0; +TQImage *Pixmaps::active_restore_sunken = 0; +TQImage *Pixmaps::active_min_sunken = 0; +TQImage *Pixmaps::active_close_sunken = 0; +TQImage *Pixmaps::active_sticky_sunken = 0; +TQImage *Pixmaps::active_unsticky_sunken = 0; +TQImage *Pixmaps::active_above_sunken = 0; +TQImage *Pixmaps::active_below_sunken = 0; + +TQImage *Pixmaps::inactive_help_normal = 0; +TQImage *Pixmaps::inactive_max_normal = 0; +TQImage *Pixmaps::inactive_restore_normal = 0; +TQImage *Pixmaps::inactive_min_normal = 0; +TQImage *Pixmaps::inactive_close_normal = 0; +TQImage *Pixmaps::inactive_sticky_normal = 0; +TQImage *Pixmaps::inactive_unsticky_normal = 0; +TQImage *Pixmaps::inactive_above_normal = 0; +TQImage *Pixmaps::inactive_below_normal = 0; + +TQImage *Pixmaps::inactive_help_hover = 0; +TQImage *Pixmaps::inactive_max_hover = 0; +TQImage *Pixmaps::inactive_restore_hover = 0; +TQImage *Pixmaps::inactive_min_hover = 0; +TQImage *Pixmaps::inactive_close_hover = 0; +TQImage *Pixmaps::inactive_sticky_hover = 0; +TQImage *Pixmaps::inactive_unsticky_hover = 0; +TQImage *Pixmaps::inactive_above_hover = 0; +TQImage *Pixmaps::inactive_below_hover = 0; + +TQImage *Pixmaps::inactive_help_sunken = 0; +TQImage *Pixmaps::inactive_max_sunken = 0; +TQImage *Pixmaps::inactive_restore_sunken = 0; +TQImage *Pixmaps::inactive_min_sunken = 0; +TQImage *Pixmaps::inactive_close_sunken = 0; +TQImage *Pixmaps::inactive_sticky_sunken = 0; +TQImage *Pixmaps::inactive_unsticky_sunken = 0; +TQImage *Pixmaps::inactive_above_sunken = 0; +TQImage *Pixmaps::inactive_below_sunken = 0; + +TQPixmap *Pixmaps::active_titlebar = 0; +TQPixmap *Pixmaps::active_titlebar_left = 0; +TQPixmap *Pixmaps::active_titlebar_right = 0; +TQPixmap *Pixmaps::inactive_titlebar = 0; +TQPixmap *Pixmaps::inactive_titlebar_left = 0; +TQPixmap *Pixmaps::inactive_titlebar_right = 0; bool Pixmaps::pixmapsCreated = false; @@ -406,21 +406,21 @@ void Pixmaps::createPixmaps() alias_below = round_below; } - QColor aColor = KDecoration::options()->color(KDecoration::ColorTitleBar, true); - QColor aColorBlend = KDecoration::options()->color(KDecoration::ColorTitleBlend, true); - QColor iColor = KDecoration::options()->color(KDecoration::ColorTitleBar, false); - QColor iColorBlend = KDecoration::options()->color(KDecoration::ColorTitleBlend, false); + TQColor aColor = KDecoration::options()->color(KDecoration::ColorTitleBar, true); + TQColor aColorBlend = KDecoration::options()->color(KDecoration::ColorTitleBlend, true); + TQColor iColor = KDecoration::options()->color(KDecoration::ColorTitleBar, false); + TQColor iColorBlend = KDecoration::options()->color(KDecoration::ColorTitleBlend, false); - QColor aBrite = KDecoration::options()->color(KDecoration::ColorFont, true); - QColor aShade = KDecoration::options()->color(KDecoration::ColorButtonBg, true); - QColor iBrite = KDecoration::options()->color(KDecoration::ColorFont, false); - QColor iShade = KDecoration::options()->color(KDecoration::ColorButtonBg, false); + TQColor aBrite = KDecoration::options()->color(KDecoration::ColorFont, true); + TQColor aShade = KDecoration::options()->color(KDecoration::ColorButtonBg, true); + TQColor iBrite = KDecoration::options()->color(KDecoration::ColorFont, false); + TQColor iShade = KDecoration::options()->color(KDecoration::ColorButtonBg, false); - QColor aHandle = KDecoration::options()->color(KDecoration::ColorHandle, true); - QColor iHandle = KDecoration::options()->color(KDecoration::ColorHandle, false); + TQColor aHandle = KDecoration::options()->color(KDecoration::ColorHandle, true); + TQColor iHandle = KDecoration::options()->color(KDecoration::ColorHandle, false); - QColor aFrame = KDecoration::options()->color(KDecoration::ColorFrame, true); - QColor iFrame = KDecoration::options()->color(KDecoration::ColorFrame, false); + TQColor aFrame = KDecoration::options()->color(KDecoration::ColorFrame, true); + TQColor iFrame = KDecoration::options()->color(KDecoration::ColorFrame, false); int buttonSize = MalloryHandler::buttonSize(); int titleSize = MalloryHandler::titleSize(); @@ -429,46 +429,46 @@ void Pixmaps::createPixmaps() if (!MalloryHandler::titleShadow()) // If shadow is disabled, titleShadow = 0; // do something special! - QPainter painter; + TQPainter painter; KPixmap tempPixmap; // Let's begin with the title bar. - active_titlebar = new QPixmap(1, titleSize); + active_titlebar = new TQPixmap(1, titleSize); painter.begin(active_titlebar); tempPixmap.resize(1, titleSize); KPixmapEffect::gradient(tempPixmap, aColor, aColorBlend, KPixmapEffect::VerticalGradient); painter.drawPixmap(0, 0, tempPixmap); painter.end(); - inactive_titlebar = new QPixmap(1, titleSize); + inactive_titlebar = new TQPixmap(1, titleSize); painter.begin(inactive_titlebar); tempPixmap.resize(1, titleSize); KPixmapEffect::gradient(tempPixmap, iColor, iColorBlend, KPixmapEffect::VerticalGradient); painter.drawPixmap(0, 0, tempPixmap); painter.end(); - active_titlebar_left = new QPixmap(1, titleSize); + active_titlebar_left = new TQPixmap(1, titleSize); painter.begin(active_titlebar_left); tempPixmap.resize(1, titleSize); KPixmapEffect::gradient(tempPixmap, aColor, aColorBlend, KPixmapEffect::VerticalGradient); painter.drawPixmap(0, 0, tempPixmap); painter.end(); - inactive_titlebar_left = new QPixmap(1, titleSize); + inactive_titlebar_left = new TQPixmap(1, titleSize); painter.begin(inactive_titlebar_left); tempPixmap.resize(1, titleSize); KPixmapEffect::gradient(tempPixmap, iColor, iColorBlend, KPixmapEffect::VerticalGradient); painter.drawPixmap(0, 0, tempPixmap); painter.end(); - active_titlebar_right = new QPixmap(1, titleSize); + active_titlebar_right = new TQPixmap(1, titleSize); painter.begin(active_titlebar_right); tempPixmap.resize(1, titleSize); KPixmapEffect::gradient(tempPixmap, aColor, aColorBlend, KPixmapEffect::VerticalGradient); painter.drawPixmap(0, 0, tempPixmap); painter.end(); - inactive_titlebar_right = new QPixmap(1, titleSize); + inactive_titlebar_right = new TQPixmap(1, titleSize); painter.begin(inactive_titlebar_right); tempPixmap.resize(1, titleSize); KPixmapEffect::gradient(tempPixmap, iColor, iColorBlend, KPixmapEffect::VerticalGradient); @@ -476,21 +476,21 @@ void Pixmaps::createPixmaps() painter.end(); // Let's create the button background. - active_button_ground = new QPixmap(buttonSize, buttonSize); + active_button_ground = new TQPixmap(buttonSize, buttonSize); painter.begin(active_button_ground); drawGround(&painter, true); painter.end(); - inactive_button_ground = new QPixmap(buttonSize, buttonSize); + inactive_button_ground = new TQPixmap(buttonSize, buttonSize); painter.begin(inactive_button_ground); drawGround(&painter, false); painter.end(); // Now, let's create the button icons! int off = (buttonSize-16)/2; - QPainter ikon; - QImage *aGround = new QImage(); - QImage *iGround = new QImage(); - QPixmap *tempGround = new QPixmap(16, 16); + TQPainter ikon; + TQImage *aGround = new TQImage(); + TQImage *iGround = new TQImage(); + TQPixmap *tempGround = new TQPixmap(16, 16); ikon.begin(tempGround); ikon.drawPixmap(0, 0, *active_button_ground, off, off, 16, 16); *aGround = tempGround->convertToImage(); @@ -507,228 +507,228 @@ void Pixmaps::createPixmaps() iShade.getRgb(&isr, &isg, &isb); // Lotsa work to do. // Zero... - active_help_normal = new QImage(16, 16, 32); + active_help_normal = new TQImage(16, 16, 32); bitBlt(active_help_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_help, *active_help_normal, asr, asg, asb, titleShadow+1); unicity(alias_help, *active_help_normal, abr, abg, abb, 1); - active_help_hover = new QImage(16, 16, 32); + active_help_hover = new TQImage(16, 16, 32); bitBlt(active_help_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_help, *active_help_hover, asr, asg, asb, titleShadow+1); unicity(alias_help, *active_help_hover, abr, abg, abb, 0); - active_help_sunken = new QImage(16, 16, 32); + active_help_sunken = new TQImage(16, 16, 32); bitBlt(active_help_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_help, *active_help_sunken, abr, abg, abb, 2); - inactive_help_normal = new QImage(16, 16, 32); + inactive_help_normal = new TQImage(16, 16, 32); bitBlt(inactive_help_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_help, *inactive_help_normal, isr, isg, isb, titleShadow+1); unicity(alias_help, *inactive_help_normal, ibr, ibg, ibb, 1); - inactive_help_hover = new QImage(16, 16, 32); + inactive_help_hover = new TQImage(16, 16, 32); bitBlt(inactive_help_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_help, *inactive_help_hover, isr, isg, isb, titleShadow+1); unicity(alias_help, *inactive_help_hover, ibr, ibg, ibb, 0); - inactive_help_sunken = new QImage(16, 16, 32); + inactive_help_sunken = new TQImage(16, 16, 32); bitBlt(inactive_help_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_help, *inactive_help_sunken, ibr, ibg, ibb, 2); // Six... - active_max_normal = new QImage(16, 16, 32); + active_max_normal = new TQImage(16, 16, 32); bitBlt(active_max_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_max, *active_max_normal, asr, asg, asb, titleShadow+1); unicity(alias_max, *active_max_normal, abr, abg, abb, 1); - active_max_hover = new QImage(16, 16, 32); + active_max_hover = new TQImage(16, 16, 32); bitBlt(active_max_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_max, *active_max_hover, asr, asg, asb, titleShadow+1); unicity(alias_max, *active_max_hover, abr, abg, abb, 0); - active_max_sunken = new QImage(16, 16, 32); + active_max_sunken = new TQImage(16, 16, 32); bitBlt(active_max_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_max, *active_max_sunken, abr, abg, abb, 2); - inactive_max_normal = new QImage(16, 16, 32); + inactive_max_normal = new TQImage(16, 16, 32); bitBlt(inactive_max_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_max, *inactive_max_normal, isr, isg, isb, titleShadow+1); unicity(alias_max, *inactive_max_normal, ibr, ibg, ibb, 1); - inactive_max_hover = new QImage(16, 16, 32); + inactive_max_hover = new TQImage(16, 16, 32); bitBlt(inactive_max_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_max, *inactive_max_hover, isr, isg, isb, titleShadow+1); unicity(alias_max, *inactive_max_hover, ibr, ibg, ibb, 0); - inactive_max_sunken = new QImage(16, 16, 32); + inactive_max_sunken = new TQImage(16, 16, 32); bitBlt(inactive_max_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_max, *inactive_max_sunken, ibr, ibg, ibb, 2); // Twelve... - active_restore_normal = new QImage(16, 16, 32); + active_restore_normal = new TQImage(16, 16, 32); bitBlt(active_restore_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_restore, *active_restore_normal, asr, asg, asb, titleShadow+1); unicity(alias_restore, *active_restore_normal, abr, abg, abb, 1); - active_restore_hover = new QImage(16, 16, 32); + active_restore_hover = new TQImage(16, 16, 32); bitBlt(active_restore_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_restore, *active_restore_hover, asr, asg, asb, titleShadow+1); unicity(alias_restore, *active_restore_hover, abr, abg, abb, 0); - active_restore_sunken = new QImage(16, 16, 32); + active_restore_sunken = new TQImage(16, 16, 32); bitBlt(active_restore_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_restore, *active_restore_sunken, abr, abg, abb, 2); - inactive_restore_normal = new QImage(16, 16, 32); + inactive_restore_normal = new TQImage(16, 16, 32); bitBlt(inactive_restore_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_restore, *inactive_restore_normal, isr, isg, isb, titleShadow+1); unicity(alias_restore, *inactive_restore_normal, ibr, ibg, ibb, 1); - inactive_restore_hover = new QImage(16, 16, 32); + inactive_restore_hover = new TQImage(16, 16, 32); bitBlt(inactive_restore_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_restore, *inactive_restore_hover, isr, isg, isb, titleShadow+1); unicity(alias_restore, *inactive_restore_hover, ibr, ibg, ibb, 0); - inactive_restore_sunken = new QImage(16, 16, 32); + inactive_restore_sunken = new TQImage(16, 16, 32); bitBlt(inactive_restore_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_restore, *inactive_restore_sunken, ibr, ibg, ibb, 2); // Eighteen - active_min_normal = new QImage(16, 16, 32); + active_min_normal = new TQImage(16, 16, 32); bitBlt(active_min_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_min, *active_min_normal, asr, asg, asb, titleShadow+1); unicity(alias_min, *active_min_normal, abr, abg, abb, 1); - active_min_hover = new QImage(16, 16, 32); + active_min_hover = new TQImage(16, 16, 32); bitBlt(active_min_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_min, *active_min_hover, asr, asg, asb, titleShadow+1); unicity(alias_min, *active_min_hover, abr, abg, abb, 0); - active_min_sunken = new QImage(16, 16, 32); + active_min_sunken = new TQImage(16, 16, 32); bitBlt(active_min_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_min, *active_min_sunken, abr, abg, abb, 2); - inactive_min_normal = new QImage(16, 16, 32); + inactive_min_normal = new TQImage(16, 16, 32); bitBlt(inactive_min_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_min, *inactive_min_normal, isr, isg, isb, titleShadow+1); unicity(alias_min, *inactive_min_normal, ibr, ibg, ibb, 1); - inactive_min_hover = new QImage(16, 16, 32); + inactive_min_hover = new TQImage(16, 16, 32); bitBlt(inactive_min_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_min, *inactive_min_hover, isr, isg, isb, titleShadow+1); unicity(alias_min, *inactive_min_hover, ibr, ibg, ibb, 0); - inactive_min_sunken = new QImage(16, 16, 32); + inactive_min_sunken = new TQImage(16, 16, 32); bitBlt(inactive_min_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_min, *inactive_min_sunken, ibr, ibg, ibb, 2); // Twenty four... - active_close_normal = new QImage(16, 16, 32); + active_close_normal = new TQImage(16, 16, 32); bitBlt(active_close_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_close, *active_close_normal, asr, asg, asb, titleShadow+1); unicity(alias_close, *active_close_normal, abr, abg, abb, 1); - active_close_hover = new QImage(16, 16, 32); + active_close_hover = new TQImage(16, 16, 32); bitBlt(active_close_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_close, *active_close_hover, asr, asg, asb, titleShadow+1); unicity(alias_close, *active_close_hover, abr, abg, abb, 0); - active_close_sunken = new QImage(16, 16, 32); + active_close_sunken = new TQImage(16, 16, 32); bitBlt(active_close_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_close, *active_close_sunken, abr, abg, abb, 2); - inactive_close_normal = new QImage(16, 16, 32); + inactive_close_normal = new TQImage(16, 16, 32); bitBlt(inactive_close_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_close, *inactive_close_normal, isr, isg, isb, titleShadow+1); unicity(alias_close, *inactive_close_normal, ibr, ibg, ibb, 1); - inactive_close_hover = new QImage(16, 16, 32); + inactive_close_hover = new TQImage(16, 16, 32); bitBlt(inactive_close_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_close, *inactive_close_hover, isr, isg, isb, titleShadow+1); unicity(alias_close, *inactive_close_hover, ibr, ibg, ibb, 0); - inactive_close_sunken = new QImage(16, 16, 32); + inactive_close_sunken = new TQImage(16, 16, 32); bitBlt(inactive_close_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_close, *inactive_close_sunken, ibr, ibg, ibb, 2); // Thirty... - active_sticky_normal = new QImage(16, 16, 32); + active_sticky_normal = new TQImage(16, 16, 32); bitBlt(active_sticky_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_sticky, *active_sticky_normal, asr, asg, asb, titleShadow+1); unicity(alias_sticky, *active_sticky_normal, abr, abg, abb, 1); - active_sticky_hover = new QImage(16, 16, 32); + active_sticky_hover = new TQImage(16, 16, 32); bitBlt(active_sticky_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_sticky, *active_sticky_hover, asr, asg, asb, titleShadow+1); unicity(alias_sticky, *active_sticky_hover, abr, abg, abb, 0); - active_sticky_sunken = new QImage(16, 16, 32); + active_sticky_sunken = new TQImage(16, 16, 32); bitBlt(active_sticky_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_sticky, *active_sticky_sunken, abr, abg, abb, 2); - inactive_sticky_normal = new QImage(16, 16, 32); + inactive_sticky_normal = new TQImage(16, 16, 32); bitBlt(inactive_sticky_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_sticky, *inactive_sticky_normal, isr, isg, isb, titleShadow+1); unicity(alias_sticky, *inactive_sticky_normal, ibr, ibg, ibb, 1); - inactive_sticky_hover = new QImage(16, 16, 32); + inactive_sticky_hover = new TQImage(16, 16, 32); bitBlt(inactive_sticky_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_sticky, *inactive_sticky_hover, isr, isg, isb, titleShadow+1); unicity(alias_sticky, *inactive_sticky_hover, ibr, ibg, ibb, 0); - inactive_sticky_sunken = new QImage(16, 16, 32); + inactive_sticky_sunken = new TQImage(16, 16, 32); bitBlt(inactive_sticky_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_sticky, *inactive_sticky_sunken, ibr, ibg, ibb, 2); // Thirty six... - active_unsticky_normal = new QImage(16, 16, 32); + active_unsticky_normal = new TQImage(16, 16, 32); bitBlt(active_unsticky_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_unsticky, *active_unsticky_normal, asr, asg, asb, titleShadow+1); unicity(alias_unsticky, *active_unsticky_normal, abr, abg, abb, 1); - active_unsticky_hover = new QImage(16, 16, 32); + active_unsticky_hover = new TQImage(16, 16, 32); bitBlt(active_unsticky_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_unsticky, *active_unsticky_hover, asr, asg, asb, titleShadow+1); unicity(alias_unsticky, *active_unsticky_hover, abr, abg, abb, 0); - active_unsticky_sunken = new QImage(16, 16, 32); + active_unsticky_sunken = new TQImage(16, 16, 32); bitBlt(active_unsticky_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_unsticky, *active_unsticky_sunken, abr, abg, abb, 2); - inactive_unsticky_normal = new QImage(16, 16, 32); + inactive_unsticky_normal = new TQImage(16, 16, 32); bitBlt(inactive_unsticky_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_unsticky, *inactive_unsticky_normal, isr, isg, isb, titleShadow+1); unicity(alias_unsticky, *inactive_unsticky_normal, ibr, ibg, ibb, 1); - inactive_unsticky_hover = new QImage(16, 16, 32); + inactive_unsticky_hover = new TQImage(16, 16, 32); bitBlt(inactive_unsticky_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_unsticky, *inactive_unsticky_hover, isr, isg, isb, titleShadow+1); unicity(alias_unsticky, *inactive_unsticky_hover, ibr, ibg, ibb, 0); - inactive_unsticky_sunken = new QImage(16, 16, 32); + inactive_unsticky_sunken = new TQImage(16, 16, 32); bitBlt(inactive_unsticky_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_unsticky, *inactive_unsticky_sunken, ibr, ibg, ibb, 2); // Forty two... - active_above_normal = new QImage(16, 16, 32); + active_above_normal = new TQImage(16, 16, 32); bitBlt(active_above_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_above, *active_above_normal, asr, asg, asb, titleShadow+1); unicity(alias_above, *active_above_normal, abr, abg, abb, 1); - active_above_hover = new QImage(16, 16, 32); + active_above_hover = new TQImage(16, 16, 32); bitBlt(active_above_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_above, *active_above_hover, asr, asg, asb, titleShadow+1); unicity(alias_above, *active_above_hover, abr, abg, abb, 0); - active_above_sunken = new QImage(16, 16, 32); + active_above_sunken = new TQImage(16, 16, 32); bitBlt(active_above_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_above, *active_above_sunken, abr, abg, abb, 2); - inactive_above_normal = new QImage(16, 16, 32); + inactive_above_normal = new TQImage(16, 16, 32); bitBlt(inactive_above_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_above, *inactive_above_normal, isr, isg, isb, titleShadow+1); unicity(alias_above, *inactive_above_normal, ibr, ibg, ibb, 1); - inactive_above_hover = new QImage(16, 16, 32); + inactive_above_hover = new TQImage(16, 16, 32); bitBlt(inactive_above_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_above, *inactive_above_hover, isr, isg, isb, titleShadow+1); unicity(alias_above, *inactive_above_hover, ibr, ibg, ibb, 0); - inactive_above_sunken = new QImage(16, 16, 32); + inactive_above_sunken = new TQImage(16, 16, 32); bitBlt(inactive_above_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_above, *inactive_above_sunken, ibr, ibg, ibb, 2); // Forty eight... - active_below_normal = new QImage(16, 16, 32); + active_below_normal = new TQImage(16, 16, 32); bitBlt(active_below_normal, 0, 0, aGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_below, *active_below_normal, asr, asg, asb, titleShadow+1); unicity(alias_below, *active_below_normal, abr, abg, abb, 1); - active_below_hover = new QImage(16, 16, 32); + active_below_hover = new TQImage(16, 16, 32); bitBlt(active_below_hover, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_below, *active_below_hover, asr, asg, asb, titleShadow+1); unicity(alias_below, *active_below_hover, abr, abg, abb, 0); - active_below_sunken = new QImage(16, 16, 32); + active_below_sunken = new TQImage(16, 16, 32); bitBlt(active_below_sunken, 0, 0, aGround, 0, 0, 16, 16, 0); unicity(alias_below, *active_below_sunken, abr, abg, abb, 2); - inactive_below_normal = new QImage(16, 16, 32); + inactive_below_normal = new TQImage(16, 16, 32); bitBlt(inactive_below_normal, 0, 0, iGround, 0, 0, 16, 16, 0); if (titleShadow) unicity(alias_below, *inactive_below_normal, isr, isg, isb, titleShadow+1); unicity(alias_below, *inactive_below_normal, ibr, ibg, ibb, 1); - inactive_below_hover = new QImage(16, 16, 32); + inactive_below_hover = new TQImage(16, 16, 32); bitBlt(inactive_below_hover, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_below, *inactive_below_hover, isr, isg, isb, titleShadow+1); unicity(alias_below, *inactive_below_hover, ibr, ibg, ibb, 0); - inactive_below_sunken = new QImage(16, 16, 32); + inactive_below_sunken = new TQImage(16, 16, 32); bitBlt(inactive_below_sunken, 0, 0, iGround, 0, 0, 16, 16, 0); unicity(alias_below, *inactive_below_sunken, ibr, ibg, ibb, 2); // Fifty four... Don't lose the count! @@ -759,7 +759,7 @@ void Pixmaps::deletePixmaps() active_above_normal = 0; delete active_below_normal; active_below_normal = 0; - + delete active_help_hover; active_help_hover = 0; delete active_max_hover; @@ -778,7 +778,7 @@ void Pixmaps::deletePixmaps() active_above_hover = 0; delete active_below_hover; active_below_hover = 0; - + delete active_help_sunken; active_help_sunken = 0; delete active_max_sunken; @@ -816,7 +816,7 @@ void Pixmaps::deletePixmaps() inactive_above_normal = 0; delete inactive_below_normal; inactive_below_normal = 0; - + delete inactive_help_hover; inactive_help_hover = 0; delete inactive_max_hover; @@ -835,7 +835,7 @@ void Pixmaps::deletePixmaps() inactive_above_hover = 0; delete inactive_below_hover; inactive_below_hover = 0; - + delete inactive_help_sunken; inactive_help_sunken = 0; delete inactive_max_sunken; @@ -873,7 +873,7 @@ void Pixmaps::deletePixmaps() } // Redo the buttons' background. -void Pixmaps::drawGround(QPainter* painter, bool active) +void Pixmaps::drawGround(TQPainter* painter, bool active) { int buttonSize = MalloryHandler::buttonSize(); int titleSize = MalloryHandler::titleSize(); @@ -881,10 +881,10 @@ void Pixmaps::drawGround(QPainter* painter, bool active) int buttonTop = (titleSize-buttonSize)/2; // Get the titlebar colors right behind the buttons for the gradient. - QImage *titlebar_image = new QImage(); + TQImage *titlebar_image = new TQImage(); *titlebar_image = active ? active_titlebar->convertToImage() : inactive_titlebar->convertToImage(); - QColor title_color1 = titlebar_image->pixel(0, buttonTop); - QColor title_color2 = titlebar_image->pixel(0, buttonTop+buttonSize-1); + TQColor title_color1 = titlebar_image->pixel(0, buttonTop); + TQColor title_color2 = titlebar_image->pixel(0, buttonTop+buttonSize-1); // The temporary canvas. KPixmap tempPixmap; @@ -895,7 +895,7 @@ void Pixmaps::drawGround(QPainter* painter, bool active) delete titlebar_image; } -void Pixmaps::unicity(int* alias, QImage& work, int rr, int gg, int bb, int offset) +void Pixmaps::unicity(int* alias, TQImage& work, int rr, int gg, int bb, int offset) { int x, y; int z = 0; @@ -910,13 +910,13 @@ void Pixmaps::unicity(int* alias, QImage& work, int rr, int gg, int bb, int offs case 0xF: // Keep background. break; case 0x0: // Replace. - line[x] = qRgb(rr, gg, bb); + line[x] = tqRgb(rr, gg, bb); break; default: // 15-level colorization uint pxl = line[x]; - line[x] = qRgb( (qRed(pxl)*alias[z]+rr*(15-alias[z]))/15, - (qGreen(pxl)*alias[z]+gg*(15-alias[z]))/15, - (qBlue(pxl)*alias[z]+bb*(15-alias[z]))/15 ); + line[x] = tqRgb( (tqRed(pxl)*alias[z]+rr*(15-alias[z]))/15, + (tqGreen(pxl)*alias[z]+gg*(15-alias[z]))/15, + (tqBlue(pxl)*alias[z]+bb*(15-alias[z]))/15 ); } z++; } diff --git a/malloryclient/pixmaps.h b/malloryclient/pixmaps.h index 6532c6e..93ee56b 100644 --- a/malloryclient/pixmaps.h +++ b/malloryclient/pixmaps.h @@ -8,92 +8,92 @@ #ifndef PIXMAPS_H #define PIXMAPS_H -#include -#include -#include +#include +#include +#include class Pixmaps { public: - static QPixmap *active_titlebar; - static QPixmap *active_titlebar_left; - static QPixmap *active_titlebar_right; - static QPixmap *inactive_titlebar; - static QPixmap *inactive_titlebar_left; - static QPixmap *inactive_titlebar_right; - - static QPixmap *active_button_ground; - static QPixmap *inactive_button_ground; - - static QImage *active_help_normal; - static QImage *active_max_normal; - static QImage *active_restore_normal; - static QImage *active_min_normal; - static QImage *active_close_normal; - static QImage *active_sticky_normal; - static QImage *active_unsticky_normal; - static QImage *active_above_normal; - static QImage *active_below_normal; - - static QImage *active_help_hover; - static QImage *active_max_hover; - static QImage *active_restore_hover; - static QImage *active_min_hover; - static QImage *active_close_hover; - static QImage *active_sticky_hover; - static QImage *active_unsticky_hover; - static QImage *active_above_hover; - static QImage *active_below_hover; - - static QImage *active_help_sunken; - static QImage *active_max_sunken; - static QImage *active_restore_sunken; - static QImage *active_min_sunken; - static QImage *active_close_sunken; - static QImage *active_sticky_sunken; - static QImage *active_unsticky_sunken; - static QImage *active_above_sunken; - static QImage *active_below_sunken; - - static QImage *inactive_help_normal; - static QImage *inactive_max_normal; - static QImage *inactive_restore_normal; - static QImage *inactive_min_normal; - static QImage *inactive_close_normal; - static QImage *inactive_sticky_normal; - static QImage *inactive_unsticky_normal; - static QImage *inactive_above_normal; - static QImage *inactive_below_normal; - - static QImage *inactive_help_hover; - static QImage *inactive_max_hover; - static QImage *inactive_restore_hover; - static QImage *inactive_min_hover; - static QImage *inactive_close_hover; - static QImage *inactive_sticky_hover; - static QImage *inactive_unsticky_hover; - static QImage *inactive_above_hover; - static QImage *inactive_below_hover; - - static QImage *inactive_help_sunken; - static QImage *inactive_max_sunken; - static QImage *inactive_restore_sunken; - static QImage *inactive_min_sunken; - static QImage *inactive_close_sunken; - static QImage *inactive_sticky_sunken; - static QImage *inactive_unsticky_sunken; - static QImage *inactive_above_sunken; - static QImage *inactive_below_sunken; + static TQPixmap *active_titlebar; + static TQPixmap *active_titlebar_left; + static TQPixmap *active_titlebar_right; + static TQPixmap *inactive_titlebar; + static TQPixmap *inactive_titlebar_left; + static TQPixmap *inactive_titlebar_right; + + static TQPixmap *active_button_ground; + static TQPixmap *inactive_button_ground; + + static TQImage *active_help_normal; + static TQImage *active_max_normal; + static TQImage *active_restore_normal; + static TQImage *active_min_normal; + static TQImage *active_close_normal; + static TQImage *active_sticky_normal; + static TQImage *active_unsticky_normal; + static TQImage *active_above_normal; + static TQImage *active_below_normal; + + static TQImage *active_help_hover; + static TQImage *active_max_hover; + static TQImage *active_restore_hover; + static TQImage *active_min_hover; + static TQImage *active_close_hover; + static TQImage *active_sticky_hover; + static TQImage *active_unsticky_hover; + static TQImage *active_above_hover; + static TQImage *active_below_hover; + + static TQImage *active_help_sunken; + static TQImage *active_max_sunken; + static TQImage *active_restore_sunken; + static TQImage *active_min_sunken; + static TQImage *active_close_sunken; + static TQImage *active_sticky_sunken; + static TQImage *active_unsticky_sunken; + static TQImage *active_above_sunken; + static TQImage *active_below_sunken; + + static TQImage *inactive_help_normal; + static TQImage *inactive_max_normal; + static TQImage *inactive_restore_normal; + static TQImage *inactive_min_normal; + static TQImage *inactive_close_normal; + static TQImage *inactive_sticky_normal; + static TQImage *inactive_unsticky_normal; + static TQImage *inactive_above_normal; + static TQImage *inactive_below_normal; + + static TQImage *inactive_help_hover; + static TQImage *inactive_max_hover; + static TQImage *inactive_restore_hover; + static TQImage *inactive_min_hover; + static TQImage *inactive_close_hover; + static TQImage *inactive_sticky_hover; + static TQImage *inactive_unsticky_hover; + static TQImage *inactive_above_hover; + static TQImage *inactive_below_hover; + + static TQImage *inactive_help_sunken; + static TQImage *inactive_max_sunken; + static TQImage *inactive_restore_sunken; + static TQImage *inactive_min_sunken; + static TQImage *inactive_close_sunken; + static TQImage *inactive_sticky_sunken; + static TQImage *inactive_unsticky_sunken; + static TQImage *inactive_above_sunken; + static TQImage *inactive_below_sunken; static bool pixmapsCreated; static void createPixmaps(); static void deletePixmaps(); - static void drawGround(QPainter* painter, bool active = true); + static void drawGround(TQPainter* painter, bool active = true); - static void unicity(int* alias, QImage& work, int rr, int gg, int bb, int offset); + static void unicity(int* alias, TQImage& work, int rr, int gg, int bb, int offset); }; #endif