Raw Qt->TQt conversion using tde/scripts/conversions/qt3-tqt3/convert_existing_qt3_app_to_tq

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 1 year ago
parent 100a40e71a
commit 7665c8d3f7
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1054,7 +1054,7 @@ elif test "$kde_use_qt_emb" = "yes"; then
x_includes="" x_includes=""
x_libraries="" x_libraries=""
elif test "$kde_use_qt_mac" = "yes"; then elif test "$kde_use_qt_mac" = "yes"; then
dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to
dnl be included to get the information) --Sam dnl be included to get the information) --Sam
CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
@ -1086,19 +1086,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM],
AC_REQUIRE([KDE_USE_QT]) AC_REQUIRE([KDE_USE_QT])
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
#include <qglobal.h> #include <ntqglobal.h>
#include <qapplication.h> #include <ntqapplication.h>
EOF EOF
if test "$kde_qtver" = "2"; then if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qevent.h> #include <ntqevent.h>
#include <qstring.h> #include <ntqstring.h>
#include <qstyle.h> #include <ntqstyle.h>
EOF EOF
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210 #if TQT_VERSION < 210
#error 1 #error 1
#endif #endif
EOF EOF
@ -1107,8 +1107,8 @@ fi
if test "$kde_qtver" = "3"; then if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qcursor.h> #include <ntqcursor.h>
#include <qstylefactory.h> #include <ntqstylefactory.h>
#include <private/qucomextra_p.h> #include <private/qucomextra_p.h>
EOF EOF
fi fi
@ -1195,22 +1195,22 @@ fi
if test -z "$3"; then if test -z "$3"; then
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else else
kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi fi
fi fi
if test $kde_qtver = 2; then if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222" kde_qt_verstring="TQT_VERSION >= 222"
else else
kde_qt_verstring="QT_VERSION >= 200" kde_qt_verstring="TQT_VERSION >= 200"
fi fi
fi fi
if test $kde_qtver = 1; then 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 fi
else else
kde_qt_verstring="$3" kde_qt_verstring="$3"
@ -1316,7 +1316,7 @@ AC_ARG_ENABLE(
USING_QT_MT="" USING_QT_MT=""
dnl ------------------------------------------------------------------------ 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 ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS= KDE_MT_LDFLAGS=
@ -1379,7 +1379,7 @@ dnl ------------------------------------------------------------
fi fi
dnl ------------------------------------------------------------------------ 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 ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then if test "x$kde_use_qt_mt" = "xyes"; then
@ -1450,9 +1450,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi fi
if test "$kde_qtver" != "1"; then if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h kde_qt_header=ntqstyle.h
else else
kde_qt_header=qglobal.h kde_qt_header=ntqglobal.h
fi fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@ -2035,7 +2035,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <qdom.h> #include <ntqdom.h>
], ],
[ [
QDomDocument doc; QDomDocument doc;
@ -2596,7 +2596,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK( AC_TRY_LINK(
[#include <qapplication.h>], [#include <ntqapplication.h>],
[ [
int argc; int argc;
char** argv; char** argv;
@ -4467,7 +4467,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl AC_TRY_RUN(dnl
[ [
#include <qimageio.h> #include <qimageio.h>
#include <qstring.h> #include <ntqstring.h>
int main() { int main() {
QString t = "hallo"; QString t = "hallo";
t.fill('t'); t.fill('t');
@ -5313,7 +5313,7 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir" kde_qtdir="$with_qt_dir"
fi 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_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR) AC_SUBST(QTDOCDIR)
@ -5334,7 +5334,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER) AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no 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 KDE_HAS_DOXYGEN=yes
fi fi
AC_SUBST(KDE_HAS_DOXYGEN) AC_SUBST(KDE_HAS_DOXYGEN)

@ -928,7 +928,7 @@ INCLUDE_FILE_PATTERNS =
# or name=definition (no spaces). If the definition and the = are # or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed. # omitted =1 is assumed.
PREDEFINED = QT_VERSION=320 \ PREDEFINED = TQT_VERSION=320 \
__cplusplus \ __cplusplus \
Q_WS_X11 Q_WS_X11

@ -1054,7 +1054,7 @@ elif test "$kde_use_qt_emb" = "yes"; then
x_includes="" x_includes=""
x_libraries="" x_libraries=""
elif test "$kde_use_qt_mac" = "yes"; then elif test "$kde_use_qt_mac" = "yes"; then
dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to
dnl be included to get the information) --Sam dnl be included to get the information) --Sam
CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
@ -1086,19 +1086,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM],
AC_REQUIRE([KDE_USE_QT]) AC_REQUIRE([KDE_USE_QT])
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
#include <qglobal.h> #include <ntqglobal.h>
#include <qapplication.h> #include <ntqapplication.h>
EOF EOF
if test "$kde_qtver" = "2"; then if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qevent.h> #include <ntqevent.h>
#include <qstring.h> #include <ntqstring.h>
#include <qstyle.h> #include <ntqstyle.h>
EOF EOF
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210 #if TQT_VERSION < 210
#error 1 #error 1
#endif #endif
EOF EOF
@ -1107,8 +1107,8 @@ fi
if test "$kde_qtver" = "3"; then if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qcursor.h> #include <ntqcursor.h>
#include <qstylefactory.h> #include <ntqstylefactory.h>
#include <private/qucomextra_p.h> #include <private/qucomextra_p.h>
EOF EOF
fi fi
@ -1195,22 +1195,22 @@ fi
if test -z "$3"; then if test -z "$3"; then
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else else
kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi fi
fi fi
if test $kde_qtver = 2; then if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222" kde_qt_verstring="TQT_VERSION >= 222"
else else
kde_qt_verstring="QT_VERSION >= 200" kde_qt_verstring="TQT_VERSION >= 200"
fi fi
fi fi
if test $kde_qtver = 1; then 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 fi
else else
kde_qt_verstring="$3" kde_qt_verstring="$3"
@ -1316,7 +1316,7 @@ AC_ARG_ENABLE(
USING_QT_MT="" USING_QT_MT=""
dnl ------------------------------------------------------------------------ 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 ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS= KDE_MT_LDFLAGS=
@ -1379,7 +1379,7 @@ dnl ------------------------------------------------------------
fi fi
dnl ------------------------------------------------------------------------ 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 ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then if test "x$kde_use_qt_mt" = "xyes"; then
@ -1450,9 +1450,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi fi
if test "$kde_qtver" != "1"; then if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h kde_qt_header=ntqstyle.h
else else
kde_qt_header=qglobal.h kde_qt_header=ntqglobal.h
fi fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@ -2035,7 +2035,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <qdom.h> #include <ntqdom.h>
], ],
[ [
QDomDocument doc; QDomDocument doc;
@ -2596,7 +2596,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK( AC_TRY_LINK(
[#include <qapplication.h>], [#include <ntqapplication.h>],
[ [
int argc; int argc;
char** argv; char** argv;
@ -4467,7 +4467,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl AC_TRY_RUN(dnl
[ [
#include <qimageio.h> #include <qimageio.h>
#include <qstring.h> #include <ntqstring.h>
int main() { int main() {
QString t = "hallo"; QString t = "hallo";
t.fill('t'); t.fill('t');
@ -5313,7 +5313,7 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir" kde_qtdir="$with_qt_dir"
fi 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_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR) AC_SUBST(QTDOCDIR)
@ -5334,7 +5334,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER) AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no 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 KDE_HAS_DOXYGEN=yes
fi fi
AC_SUBST(KDE_HAS_DOXYGEN) AC_SUBST(KDE_HAS_DOXYGEN)

@ -1378,7 +1378,7 @@ sub tag_UIFILES ()
$dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "$source.h: $sourcedir$source.ui\n";
$dep_lines .= "\trm -rf $source.h;\n"; $dep_lines .= "\trm -rf $source.h;\n";
if (!$kdeopts{"qtonly"}) { if (!$kdeopts{"qtonly"}) {
$dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
} else { } else {
$dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n"; $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
} }

54
configure vendored

@ -689,7 +689,7 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*) | --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;; 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 | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
@ -1265,7 +1265,7 @@ do
do do
case $ac_arg in case $ac_arg in
-no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -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) | -silent | --silent | --silen | --sile | --sil)
continue ;; continue ;;
*" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
@ -21870,22 +21870,22 @@ fi
if test -z ""; then if test -z ""; then
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else else
kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi fi
fi fi
if test $kde_qtver = 2; then if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222" kde_qt_verstring="TQT_VERSION >= 222"
else else
kde_qt_verstring="QT_VERSION >= 200" kde_qt_verstring="TQT_VERSION >= 200"
fi fi
fi fi
if test $kde_qtver = 1; then 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 fi
else else
kde_qt_verstring="" kde_qt_verstring=""
@ -29616,9 +29616,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi fi
if test "$kde_qtver" != "1"; then if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h kde_qt_header=ntqstyle.h
else else
kde_qt_header=qglobal.h kde_qt_header=ntqglobal.h
fi fi
@ -29687,19 +29687,19 @@ LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
#include <qglobal.h> #include <ntqglobal.h>
#include <qapplication.h> #include <ntqapplication.h>
EOF EOF
if test "$kde_qtver" = "2"; then if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qevent.h> #include <ntqevent.h>
#include <qstring.h> #include <ntqstring.h>
#include <qstyle.h> #include <ntqstyle.h>
EOF EOF
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210 #if TQT_VERSION < 210
#error 1 #error 1
#endif #endif
EOF EOF
@ -29708,8 +29708,8 @@ fi
if test "$kde_qtver" = "3"; then if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qcursor.h> #include <ntqcursor.h>
#include <qstylefactory.h> #include <ntqstylefactory.h>
#include <private/qucomextra_p.h> #include <private/qucomextra_p.h>
EOF EOF
fi fi
@ -29856,19 +29856,19 @@ export LIBRARY_PATH
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
#include <qglobal.h> #include <ntqglobal.h>
#include <qapplication.h> #include <ntqapplication.h>
EOF EOF
if test "$kde_qtver" = "2"; then if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qevent.h> #include <ntqevent.h>
#include <qstring.h> #include <ntqstring.h>
#include <qstyle.h> #include <ntqstyle.h>
EOF EOF
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210 #if TQT_VERSION < 210
#error 1 #error 1
#endif #endif
EOF EOF
@ -29877,8 +29877,8 @@ fi
if test "$kde_qtver" = "3"; then if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qcursor.h> #include <ntqcursor.h>
#include <qstylefactory.h> #include <ntqstylefactory.h>
#include <private/qucomextra_p.h> #include <private/qucomextra_p.h>
EOF EOF
fi fi
@ -30283,7 +30283,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <qapplication.h> #include <ntqapplication.h>
int int
main () main ()
{ {
@ -33041,7 +33041,7 @@ Try \`$0 --help' for more information." >&2;}
$ac_shift $ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;; 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) | -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;; ac_cs_silent=: ;;

2
debian/control vendored

@ -2,7 +2,7 @@ Source: kommando
Section: kde Section: kde
Priority: optional Priority: optional
Maintainer: Sune Vuorela <debian@pusling.com> Maintainer: Sune Vuorela <debian@pusling.com>
Build-Depends: debhelper (>= 5.0.0), kdelibs4-dev, autotools-dev, quilt Build-Depends: debhelper (>= 5.0.0), kdelibs4-dev, autotools-dev, tquilt
Standards-Version: 3.7.2 Standards-Version: 3.7.2
Package: kommando Package: kommando

@ -5147,7 +5147,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;; + psdir=$ac_optarg ;;
+ +
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil) + | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;; + silent=yes ;;
+ +
@ -5665,7 +5665,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+ do + do
+ case $ac_arg in + case $ac_arg in
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -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) + | -silent | --silent | --silen | --sile | --sil)
+ continue ;; + continue ;;
+ *\'*) + *\'*)
@ -26303,22 +26303,22 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+if test -z ""; then +if test -z ""; then
+ if test $kde_qtver = 3; then + if test $kde_qtver = 3; then
+ if test $kde_qtsubver -gt 0; then + if test $kde_qtsubver -gt 0; then
+ kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
+ qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` + qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
+ kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` + kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
+ else + else
+ kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
+ fi + fi
+ fi + fi
+ if test $kde_qtver = 2; then + if test $kde_qtver = 2; then
+ if test $kde_qtsubver -gt 0; then + if test $kde_qtsubver -gt 0; then
+ kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222"
+ else + else
+ kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200"
+ fi + fi
+ fi + fi
+ if test $kde_qtver = 1; then + 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 + fi
+else +else
+ kde_qt_verstring="" + kde_qt_verstring=""
@ -33769,9 +33769,9 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+fi +fi
+ +
+if test "$kde_qtver" != "1"; then +if test "$kde_qtver" != "1"; then
+ kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h
+else +else
+ kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h
+fi +fi
+ +
+ +
@ -33839,19 +33839,19 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+ +
+cat > conftest.$ac_ext <<EOF +cat > conftest.$ac_ext <<EOF
+#include "confdefs.h" +#include "confdefs.h"
+#include <qglobal.h> +#include <ntqglobal.h>
+#include <qapplication.h> +#include <ntqapplication.h>
+EOF +EOF
+if test "$kde_qtver" = "2"; then +if test "$kde_qtver" = "2"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qevent.h> +#include <ntqevent.h>
+#include <qstring.h> +#include <ntqstring.h>
+#include <qstyle.h> +#include <ntqstyle.h>
+EOF +EOF
+ +
+if test $kde_qtsubver -gt 0; then +if test $kde_qtsubver -gt 0; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#if QT_VERSION < 210 +#if TQT_VERSION < 210
+#error 1 +#error 1
+#endif +#endif
+EOF +EOF
@ -33860,8 +33860,8 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+ +
+if test "$kde_qtver" = "3"; then +if test "$kde_qtver" = "3"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qcursor.h> +#include <ntqcursor.h>
+#include <qstylefactory.h> +#include <ntqstylefactory.h>
+#include <private/qucomextra_p.h> +#include <private/qucomextra_p.h>
+EOF +EOF
+fi +fi
@ -34007,19 +34007,19 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+ +
+cat > conftest.$ac_ext <<EOF +cat > conftest.$ac_ext <<EOF
+#include "confdefs.h" +#include "confdefs.h"
+#include <qglobal.h> +#include <ntqglobal.h>
+#include <qapplication.h> +#include <ntqapplication.h>
+EOF +EOF
+if test "$kde_qtver" = "2"; then +if test "$kde_qtver" = "2"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qevent.h> +#include <ntqevent.h>
+#include <qstring.h> +#include <ntqstring.h>
+#include <qstyle.h> +#include <ntqstyle.h>
+EOF +EOF
+ +
+if test $kde_qtsubver -gt 0; then +if test $kde_qtsubver -gt 0; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#if QT_VERSION < 210 +#if TQT_VERSION < 210
+#error 1 +#error 1
+#endif +#endif
+EOF +EOF
@ -34028,8 +34028,8 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+ +
+if test "$kde_qtver" = "3"; then +if test "$kde_qtver" = "3"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qcursor.h> +#include <ntqcursor.h>
+#include <qstylefactory.h> +#include <ntqstylefactory.h>
+#include <private/qucomextra_p.h> +#include <private/qucomextra_p.h>
+EOF +EOF
+fi +fi
@ -34433,7 +34433,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+cat confdefs.h >>conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF +cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */ +/* end confdefs.h. */
+#include <qapplication.h> +#include <ntqapplication.h>
+int +int
+main () +main ()
+{ +{
@ -37217,7 +37217,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.0 kommando-0.5.1/autom4te.ca
+ { (exit 1); exit 1; }; };; + { (exit 1); exit 1; }; };;
+ --help | --hel | -h ) + --help | --hel | -h )
+ echo "$ac_cs_usage"; exit ;; + echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s) + | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;; + ac_cs_silent=: ;;
+ +
@ -39595,7 +39595,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;; + psdir=$ac_optarg ;;
+ +
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil) + | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;; + silent=yes ;;
+ +
@ -40113,7 +40113,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+ do + do
+ case $ac_arg in + case $ac_arg in
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -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) + | -silent | --silent | --silen | --sile | --sil)
+ continue ;; + continue ;;
+ *\'*) + *\'*)
@ -60751,22 +60751,22 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+if test -z ""; then +if test -z ""; then
+ if test $kde_qtver = 3; then + if test $kde_qtver = 3; then
+ if test $kde_qtsubver -gt 0; then + if test $kde_qtsubver -gt 0; then
+ kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
+ qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` + qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
+ kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` + kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
+ else + else
+ kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
+ fi + fi
+ fi + fi
+ if test $kde_qtver = 2; then + if test $kde_qtver = 2; then
+ if test $kde_qtsubver -gt 0; then + if test $kde_qtsubver -gt 0; then
+ kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222"
+ else + else
+ kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200"
+ fi + fi
+ fi + fi
+ if test $kde_qtver = 1; then + 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 + fi
+else +else
+ kde_qt_verstring="" + kde_qt_verstring=""
@ -68217,9 +68217,9 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+fi +fi
+ +
+if test "$kde_qtver" != "1"; then +if test "$kde_qtver" != "1"; then
+ kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h
+else +else
+ kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h
+fi +fi
+ +
+ +
@ -68287,19 +68287,19 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+ +
+cat > conftest.$ac_ext <<EOF +cat > conftest.$ac_ext <<EOF
+#include "confdefs.h" +#include "confdefs.h"
+#include <qglobal.h> +#include <ntqglobal.h>
+#include <qapplication.h> +#include <ntqapplication.h>
+EOF +EOF
+if test "$kde_qtver" = "2"; then +if test "$kde_qtver" = "2"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qevent.h> +#include <ntqevent.h>
+#include <qstring.h> +#include <ntqstring.h>
+#include <qstyle.h> +#include <ntqstyle.h>
+EOF +EOF
+ +
+if test $kde_qtsubver -gt 0; then +if test $kde_qtsubver -gt 0; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#if QT_VERSION < 210 +#if TQT_VERSION < 210
+#error 1 +#error 1
+#endif +#endif
+EOF +EOF
@ -68308,8 +68308,8 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+ +
+if test "$kde_qtver" = "3"; then +if test "$kde_qtver" = "3"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qcursor.h> +#include <ntqcursor.h>
+#include <qstylefactory.h> +#include <ntqstylefactory.h>
+#include <private/qucomextra_p.h> +#include <private/qucomextra_p.h>
+EOF +EOF
+fi +fi
@ -68455,19 +68455,19 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+ +
+cat > conftest.$ac_ext <<EOF +cat > conftest.$ac_ext <<EOF
+#include "confdefs.h" +#include "confdefs.h"
+#include <qglobal.h> +#include <ntqglobal.h>
+#include <qapplication.h> +#include <ntqapplication.h>
+EOF +EOF
+if test "$kde_qtver" = "2"; then +if test "$kde_qtver" = "2"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qevent.h> +#include <ntqevent.h>
+#include <qstring.h> +#include <ntqstring.h>
+#include <qstyle.h> +#include <ntqstyle.h>
+EOF +EOF
+ +
+if test $kde_qtsubver -gt 0; then +if test $kde_qtsubver -gt 0; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#if QT_VERSION < 210 +#if TQT_VERSION < 210
+#error 1 +#error 1
+#endif +#endif
+EOF +EOF
@ -68476,8 +68476,8 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+ +
+if test "$kde_qtver" = "3"; then +if test "$kde_qtver" = "3"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qcursor.h> +#include <ntqcursor.h>
+#include <qstylefactory.h> +#include <ntqstylefactory.h>
+#include <private/qucomextra_p.h> +#include <private/qucomextra_p.h>
+EOF +EOF
+fi +fi
@ -68881,7 +68881,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+cat confdefs.h >>conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF +cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */ +/* end confdefs.h. */
+#include <qapplication.h> +#include <ntqapplication.h>
+int +int
+main () +main ()
+{ +{
@ -71665,7 +71665,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/output.1 kommando-0.5.1/autom4te.ca
+ { (exit 1); exit 1; }; };; + { (exit 1); exit 1; }; };;
+ --help | --hel | -h ) + --help | --hel | -h )
+ echo "$ac_cs_usage"; exit ;; + echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s) + | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;; + ac_cs_silent=: ;;
+ +
@ -74656,7 +74656,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+ x_includes="" + x_includes=""
+ x_libraries="" + x_libraries=""
+elif test "$kde_use_qt_mac" = "yes"; then +elif test "$kde_use_qt_mac" = "yes"; then
+ dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to + dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to
+ dnl be included to get the information) --Sam + dnl be included to get the information) --Sam
+ CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" + CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
+ CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" + CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
@ -74686,19 +74686,19 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+AC_REQUIRE([KDE_USE_QT]) +AC_REQUIRE([KDE_USE_QT])
+cat > conftest.$ac_ext <<EOF +cat > conftest.$ac_ext <<EOF
+#include "confdefs.h" +#include "confdefs.h"
+#include <qglobal.h> +#include <ntqglobal.h>
+#include <qapplication.h> +#include <ntqapplication.h>
+EOF +EOF
+if test "$kde_qtver" = "2"; then +if test "$kde_qtver" = "2"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qevent.h> +#include <ntqevent.h>
+#include <qstring.h> +#include <ntqstring.h>
+#include <qstyle.h> +#include <ntqstyle.h>
+EOF +EOF
+ +
+if test $kde_qtsubver -gt 0; then +if test $kde_qtsubver -gt 0; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#if QT_VERSION < 210 +#if TQT_VERSION < 210
+#error 1 +#error 1
+#endif +#endif
+EOF +EOF
@ -74707,8 +74707,8 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+ +
+if test "$kde_qtver" = "3"; then +if test "$kde_qtver" = "3"; then
+cat >> conftest.$ac_ext <<EOF +cat >> conftest.$ac_ext <<EOF
+#include <qcursor.h> +#include <ntqcursor.h>
+#include <qstylefactory.h> +#include <ntqstylefactory.h>
+#include <private/qucomextra_p.h> +#include <private/qucomextra_p.h>
+EOF +EOF
+fi +fi
@ -74793,22 +74793,22 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+if test -z "$3"; then +if test -z "$3"; then
+ if test $kde_qtver = 3; then + if test $kde_qtver = 3; then
+ if test $kde_qtsubver -gt 0; then + if test $kde_qtsubver -gt 0; then
+ kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
+ qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` + qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
+ kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` + kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
+ else + else
+ kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
+ fi + fi
+ fi + fi
+ if test $kde_qtver = 2; then + if test $kde_qtver = 2; then
+ if test $kde_qtsubver -gt 0; then + if test $kde_qtsubver -gt 0; then
+ kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222"
+ else + else
+ kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200"
+ fi + fi
+ fi + fi
+ if test $kde_qtver = 1; then + 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 + fi
+else +else
+ kde_qt_verstring="$3" + kde_qt_verstring="$3"
@ -74904,7 +74904,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+USING_QT_MT="" +USING_QT_MT=""
+ +
+dnl ------------------------------------------------------------------------ +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 ------------------------------------------------------------------------ +dnl ------------------------------------------------------------------------
+ +
+KDE_MT_LDFLAGS= +KDE_MT_LDFLAGS=
@ -74967,7 +74967,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+fi +fi
+ +
+dnl ------------------------------------------------------------------------ +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 ------------------------------------------------------------------------ +dnl ------------------------------------------------------------------------
+ +
+if test "x$kde_use_qt_mt" = "xyes"; then +if test "x$kde_use_qt_mt" = "xyes"; then
@ -75038,9 +75038,9 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+fi +fi
+ +
+if test "$kde_qtver" != "1"; then +if test "$kde_qtver" != "1"; then
+ kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h
+else +else
+ kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h
+fi +fi
+ +
+AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) +AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@ -75595,7 +75595,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+ LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" + LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
+ +
+ AC_TRY_LINK([ + AC_TRY_LINK([
+ #include <qdom.h> + #include <ntqdom.h>
+ ], + ],
+ [ + [
+ QDomDocument doc; + QDomDocument doc;
@ -76108,7 +76108,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+ac_save_CXXFLAGS="$CXXFLAGS" +ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" +CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
+AC_TRY_LINK( +AC_TRY_LINK(
+[#include <qapplication.h>], +[#include <ntqapplication.h>],
+ [ + [
+ int argc; + int argc;
+ char** argv; + char** argv;
@ -77829,7 +77829,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+AC_TRY_RUN(dnl +AC_TRY_RUN(dnl
+[ +[
+#include <qimageio.h> +#include <qimageio.h>
+#include <qstring.h> +#include <ntqstring.h>
+int main() { +int main() {
+ QString t = "hallo"; + QString t = "hallo";
+ t.fill('t'); + t.fill('t');
@ -78532,7 +78532,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+ kde_qtdir="$with_qt_dir" + kde_qtdir="$with_qt_dir"
+fi +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_MSG_RESULT($QTDOCDIR)
+ +
+AC_SUBST(QTDOCDIR) +AC_SUBST(QTDOCDIR)
@ -78553,7 +78553,7 @@ diff -urN kommando-0.5.1.orig/autom4te.cache/traces.0 kommando-0.5.1/autom4te.ca
+AC_SUBST(DOXYGEN_PROJECT_NUMBER) +AC_SUBST(DOXYGEN_PROJECT_NUMBER)
+ +
+KDE_HAS_DOXYGEN=no +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 + KDE_HAS_DOXYGEN=yes
+fi +fi
+AC_SUBST(KDE_HAS_DOXYGEN) +AC_SUBST(KDE_HAS_DOXYGEN)
@ -94654,7 +94654,7 @@ diff -urN kommando-0.5.1.orig/configure kommando-0.5.1/configure
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;; + psdir=$ac_optarg ;;
+ +
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
@@ -741,24 +1349,20 @@ @@ -741,24 +1349,20 @@
@ -95164,7 +95164,7 @@ diff -urN kommando-0.5.1.orig/configure kommando-0.5.1/configure
for ac_pass in 1 2 for ac_pass in 1 2
do do
@@ -1268,7 +1818,7 @@ @@ -1268,7 +1818,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
continue ;; continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
@ -125047,7 +125047,7 @@ diff -urN kommando-0.5.1.orig/configure kommando-0.5.1/configure
+ { (exit 1); exit 1; }; };; + { (exit 1); exit 1; }; };;
+ --help | --hel | -h ) + --help | --hel | -h )
+ echo "$ac_cs_usage"; exit ;; + echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s) | -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;; ac_cs_silent=: ;;

4
debian/rules vendored

@ -27,7 +27,7 @@ endif
config.status: configure config.status: configure
dh_testdir dh_testdir
$(MAKE) -f /usr/share/quilt/quilt.make patch $(MAKE) -f /usr/share/tquilt/tquilt.make patch
sleep 1 sleep 1
# aclocal.m4 and acinclude.m4 have too recent timestamps in the # aclocal.m4 and acinclude.m4 have too recent timestamps in the
@ -62,7 +62,7 @@ clean:
# Add here commands to clean up after the build process. # Add here commands to clean up after the build process.
-$(MAKE) distclean -$(MAKE) distclean
$(MAKE) -f /usr/share/quilt/quilt.make unpatch $(MAKE) -f /usr/share/tquilt/tquilt.make unpatch
rm -f config.sub config.guess rm -f config.sub config.guess
dh_clean dh_clean

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

@ -1051,6 +1051,6 @@ configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc
configdialog.h: $(srcdir)/configdialog.ui configdialog.h: $(srcdir)/configdialog.ui
rm -rf configdialog.h; rm -rf configdialog.h;
$(UIC) $(srcdir)/configdialog.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> configdialog.h ; $(UIC) $(srcdir)/configdialog.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g" >> configdialog.h ;
configdialog.moc: configdialog.h configdialog.moc: configdialog.h
$(MOC) configdialog.h -o configdialog.moc $(MOC) configdialog.h -o configdialog.moc

@ -24,7 +24,7 @@
/* /*
* Implementation CommandoButton * Implementation CommandoButton
*/ */
CommandoButton::CommandoButton(QWidget* parent, unsigned short rad) CommandoButton::CommandoButton(TQWidget* parent, unsigned short rad)
: RoundButton(parent,rad) : RoundButton(parent,rad)
{ {
} }
@ -44,23 +44,23 @@ Menu * SubmenuButton::execute( )
return subMenu(); return subMenu();
} }
SubmenuButton::SubmenuButton( QWidget * parent,unsigned short rad) SubmenuButton::SubmenuButton( TQWidget * parent,unsigned short rad)
:RoundButton(parent,rad) :RoundButton(parent,rad)
{ {
} }
SubmenuButton::SubmenuButton( QWidget * parent, Menu * submenu, unsigned short rad) SubmenuButton::SubmenuButton( TQWidget * parent, Menu * submenu, unsigned short rad)
:RoundButton(parent,rad),mSubMenu(submenu) :RoundButton(parent,rad),mSubMenu(submenu)
{ {
} }
/*void SubmenuButton::setIcon( QString path ) /*void SubmenuButton::setIcon( TQString path )
{ {
mIconPath=path; mIconPath=path;
icon=MainBarIcon(path,radius*2); //This line sometimes prints: "*** attempt to put segment in horiz list twice" icon=MainBarIcon(path,radius*2); //This line sometimes prints: "*** attempt to put segment in horiz list twice"
QPixmap overlay = MainBarIcon("kommando_overlay",radius*2); TQPixmap overlay = MainBarIcon("kommando_overlay",radius*2);
QImage temp1(icon.convertToImage()); TQImage temp1(icon.convertToImage());
QImage temp2(overlay.convertToImage()); TQImage temp2(overlay.convertToImage());
KIconEffect::overlay(temp1,temp2); KIconEffect::overlay(temp1,temp2);
icon.convertFromImage(temp1); icon.convertFromImage(temp1);
setPixmap(icon); setPixmap(icon);

@ -27,28 +27,28 @@ class CommandoButton : public RoundButton
{ {
Q_OBJECT Q_OBJECT
public: public:
CommandoButton(QWidget* parent,unsigned short rad= 32); CommandoButton(TQWidget* parent,unsigned short rad= 32);
virtual void setCommand(QString com){ mCommando=com; } virtual void setCommand(TQString com){ mCommando=com; }
virtual QString command(){ return mCommando; } virtual TQString command(){ return mCommando; }
virtual Menu* execute(); virtual Menu* execute();
virtual Type type() const { return RoundButton::Commando; } virtual Type type() const { return RoundButton::Commando; }
protected: protected:
QString mCommando; TQString mCommando;
}; };
class SubmenuButton : public RoundButton class SubmenuButton : public RoundButton
{ {
Q_OBJECT Q_OBJECT
public: public:
SubmenuButton(QWidget* parent, unsigned short rad= 32); SubmenuButton(TQWidget* parent, unsigned short rad= 32);
SubmenuButton(QWidget* parent, Menu* submenu, unsigned short rad= 32); SubmenuButton(TQWidget* parent, Menu* submenu, unsigned short rad= 32);
virtual void setSubMenu(Menu* theValue){ mSubMenu = theValue; } virtual void setSubMenu(Menu* theValue){ mSubMenu = theValue; }
virtual Menu* subMenu() const{ return mSubMenu; } virtual Menu* subMenu() const{ return mSubMenu; }
//virtual void setIcon(QString path); //virtual void setIcon(TQString path);
virtual Menu* execute(); virtual Menu* execute();
virtual Type type() const { return RoundButton::Submenu; } virtual Type type() const { return RoundButton::Submenu; }
protected: protected:

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigDialog</class> <class>ConfigDialog</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>ConfigDialog</cstring> <cstring>ConfigDialog</cstring>
</property> </property>
@ -19,23 +19,23 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QSplitter"> <widget class="TQSplitter">
<property name="name"> <property name="name">
<cstring>splitter12</cstring> <cstring>splitter12</cstring>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
<widget class="QListBox"> <widget class="TQListBox">
<property name="name"> <property name="name">
<cstring>listBox</cstring> <cstring>listBox</cstring>
</property> </property>
</widget> </widget>
<widget class="QWidgetStack"> <widget class="TQWidgetStack">
<property name="name"> <property name="name">
<cstring>pages</cstring> <cstring>pages</cstring>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>menuPage</cstring> <cstring>menuPage</cstring>
</property> </property>
@ -49,7 +49,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QFrame"> <widget class="TQFrame">
<property name="name"> <property name="name">
<cstring>MenuFrame</cstring> <cstring>MenuFrame</cstring>
</property> </property>
@ -63,7 +63,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>layout8</cstring> <cstring>layout8</cstring>
</property> </property>
@ -74,7 +74,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -82,7 +82,7 @@
<string>Command:</string> <string>Command:</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit"> <widget class="TQLineEdit">
<property name="name"> <property name="name">
<cstring>commandoEdit</cstring> <cstring>commandoEdit</cstring>
</property> </property>
@ -92,7 +92,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QPushButton" row="0" column="2"> <widget class="TQPushButton" row="0" column="2">
<property name="name"> <property name="name">
<cstring>removeListView</cstring> <cstring>removeListView</cstring>
</property> </property>
@ -100,12 +100,12 @@
<string>Remove</string> <string>Remove</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="0" column="0"> <widget class="TQComboBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>menuViewComboBox</cstring> <cstring>menuViewComboBox</cstring>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="0" column="1"> <widget class="TQPushButton" row="0" column="1">
<property name="name"> <property name="name">
<cstring>newListView</cstring> <cstring>newListView</cstring>
</property> </property>
@ -113,7 +113,7 @@
<string>Ne&amp;w</string> <string>Ne&amp;w</string>
</property> </property>
</widget> </widget>
<widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>layout11</cstring> <cstring>layout11</cstring>
</property> </property>
@ -121,7 +121,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>addMenu</cstring> <cstring>addMenu</cstring>
</property> </property>
@ -129,7 +129,7 @@
<string>Add Menu</string> <string>Add Menu</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>addButton</cstring> <cstring>addButton</cstring>
</property> </property>
@ -137,7 +137,7 @@
<string>Add &amp;Button</string> <string>Add &amp;Button</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>addService</cstring> <cstring>addService</cstring>
</property> </property>
@ -145,7 +145,7 @@
<string>&amp;From KMenu</string> <string>&amp;From KMenu</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>remove</cstring> <cstring>remove</cstring>
</property> </property>
@ -173,7 +173,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>buttonUp</cstring> <cstring>buttonUp</cstring>
</property> </property>
@ -181,7 +181,7 @@
<string>&amp;Up</string> <string>&amp;Up</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>buttonDown</cstring> <cstring>buttonDown</cstring>
</property> </property>
@ -206,7 +206,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout7</cstring> <cstring>layout7</cstring>
</property> </property>
@ -231,7 +231,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout6</cstring> <cstring>layout6</cstring>
</property> </property>
@ -239,7 +239,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel2</cstring> <cstring>textLabel2</cstring>
</property> </property>
@ -310,7 +310,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QWidgetStack" row="1" column="0"> <widget class="TQWidgetStack" row="1" column="0">
<property name="name"> <property name="name">
<cstring>lists</cstring> <cstring>lists</cstring>
</property> </property>
@ -320,7 +320,7 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>WStackPage</cstring> <cstring>WStackPage</cstring>
</property> </property>
@ -333,7 +333,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>shortcutPage</cstring> <cstring>shortcutPage</cstring>
</property> </property>
@ -347,7 +347,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QFrame"> <widget class="TQFrame">
<property name="name"> <property name="name">
<cstring>shortcutFrame</cstring> <cstring>shortcutFrame</cstring>
</property> </property>
@ -369,7 +369,7 @@
<string>N&amp;one</string> <string>N&amp;one</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1_2</cstring> <cstring>textLabel1_2</cstring>
</property> </property>
@ -432,7 +432,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>colorPage</cstring> <cstring>colorPage</cstring>
</property> </property>
@ -446,7 +446,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QFrame"> <widget class="TQFrame">
<property name="name"> <property name="name">
<cstring>colorFrame</cstring> <cstring>colorFrame</cstring>
</property> </property>
@ -460,7 +460,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout10</cstring> <cstring>layout10</cstring>
</property> </property>
@ -468,7 +468,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1_3</cstring> <cstring>textLabel1_3</cstring>
</property> </property>
@ -510,7 +510,7 @@
</spacer> </spacer>
</hbox> </hbox>
</widget> </widget>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout11</cstring> <cstring>layout11</cstring>
</property> </property>
@ -518,7 +518,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel2_2</cstring> <cstring>textLabel2_2</cstring>
</property> </property>
@ -526,7 +526,7 @@
<string>Opacity:</string> <string>Opacity:</string>
</property> </property>
</widget> </widget>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1_4</cstring> <cstring>textLabel1_4</cstring>
</property> </property>
@ -539,7 +539,7 @@
<string>&lt;font size="-1"&gt;Transparent&lt;/font&gt;</string> <string>&lt;font size="-1"&gt;Transparent&lt;/font&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QSlider"> <widget class="TQSlider">
<property name="name"> <property name="name">
<cstring>opacitySlider</cstring> <cstring>opacitySlider</cstring>
</property> </property>
@ -553,7 +553,7 @@
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
</widget> </widget>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1_4_2</cstring> <cstring>textLabel1_4_2</cstring>
</property> </property>
@ -582,7 +582,7 @@
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
</widget> </widget>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout12</cstring> <cstring>layout12</cstring>
</property> </property>
@ -590,7 +590,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1_7</cstring> <cstring>textLabel1_7</cstring>
</property> </property>
@ -598,7 +598,7 @@
<string>Scheme:</string> <string>Scheme:</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox"> <widget class="TQComboBox">
<item> <item>
<property name="text"> <property name="text">
<string>Tiny</string> <string>Tiny</string>
@ -642,7 +642,7 @@
</spacer> </spacer>
</hbox> </hbox>
</widget> </widget>
<widget class="QLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout14</cstring> <cstring>layout14</cstring>
</property> </property>
@ -667,7 +667,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QSpinBox" row="1" column="2"> <widget class="TQSpinBox" row="1" column="2">
<property name="name"> <property name="name">
<cstring>menuRadiusSpinbox</cstring> <cstring>menuRadiusSpinbox</cstring>
</property> </property>
@ -681,7 +681,7 @@
<number>30</number> <number>30</number>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="2" column="2"> <widget class="TQComboBox" row="2" column="2">
<item> <item>
<property name="text"> <property name="text">
<string>16</string> <string>16</string>
@ -722,7 +722,7 @@
<number>2</number> <number>2</number>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>textLabel1_5</cstring> <cstring>textLabel1_5</cstring>
</property> </property>
@ -730,7 +730,7 @@
<string>Menu Radius:</string> <string>Menu Radius:</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="0" column="0"> <widget class="TQCheckBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>customCheckbox</cstring> <cstring>customCheckbox</cstring>
</property> </property>
@ -744,7 +744,7 @@
<string>Alt+T</string> <string>Alt+T</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="3"> <widget class="TQLabel" row="1" column="3">
<property name="name"> <property name="name">
<cstring>textLabel1_8</cstring> <cstring>textLabel1_8</cstring>
</property> </property>
@ -752,7 +752,7 @@
<string>px</string> <string>px</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>textLabel2_3</cstring> <cstring>textLabel2_3</cstring>
</property> </property>
@ -760,7 +760,7 @@
<string>Menubutton size:</string> <string>Menubutton size:</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="3" column="2"> <widget class="TQComboBox" row="3" column="2">
<item> <item>
<property name="text"> <property name="text">
<string>16</string> <string>16</string>
@ -818,7 +818,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>textLabel1_6</cstring> <cstring>textLabel1_6</cstring>
</property> </property>
@ -870,15 +870,15 @@
<connections> <connections>
<connection> <connection>
<sender>navButtonSize</sender> <sender>navButtonSize</sender>
<signal>activated(const QString&amp;)</signal> <signal>activated(const TQString&amp;)</signal>
<receiver>ConfigDialog</receiver> <receiver>ConfigDialog</receiver>
<slot>slotNavButtonSizeChanged(const QString&amp;)</slot> <slot>slotNavButtonSizeChanged(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>kColorButton1</sender> <sender>kColorButton1</sender>
<signal>changed(const QColor&amp;)</signal> <signal>changed(const TQColor&amp;)</signal>
<receiver>ConfigDialog</receiver> <receiver>ConfigDialog</receiver>
<slot>slotColorButtonClicked(const QColor&amp;)</slot> <slot>slotColorButtonClicked(const TQColor&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>addButton</sender> <sender>addButton</sender>
@ -900,27 +900,27 @@
</connection> </connection>
<connection> <connection>
<sender>listBox</sender> <sender>listBox</sender>
<signal>clicked(QListBoxItem*)</signal> <signal>clicked(TQListBoxItem*)</signal>
<receiver>ConfigDialog</receiver> <receiver>ConfigDialog</receiver>
<slot>slotListBoxClicked(QListBoxItem*)</slot> <slot>slotListBoxClicked(TQListBoxItem*)</slot>
</connection> </connection>
<connection> <connection>
<sender>iconButton</sender> <sender>iconButton</sender>
<signal>iconChanged(QString)</signal> <signal>iconChanged(TQString)</signal>
<receiver>ConfigDialog</receiver> <receiver>ConfigDialog</receiver>
<slot>slotNewIcon()</slot> <slot>slotNewIcon()</slot>
</connection> </connection>
<connection> <connection>
<sender>commandoEdit</sender> <sender>commandoEdit</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const TQString&amp;)</signal>
<receiver>ConfigDialog</receiver> <receiver>ConfigDialog</receiver>
<slot>slotCommandoTyped(const QString&amp;)</slot> <slot>slotCommandoTyped(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>schemeCombobox</sender> <sender>schemeCombobox</sender>
<signal>activated(const QString&amp;)</signal> <signal>activated(const TQString&amp;)</signal>
<receiver>ConfigDialog</receiver> <receiver>ConfigDialog</receiver>
<slot>slotSchemeComboboxChanged(const QString&amp;)</slot> <slot>slotSchemeComboboxChanged(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>customCheckbox</sender> <sender>customCheckbox</sender>
@ -942,9 +942,9 @@
</connection> </connection>
<connection> <connection>
<sender>menuButtonSize</sender> <sender>menuButtonSize</sender>
<signal>activated(const QString&amp;)</signal> <signal>activated(const TQString&amp;)</signal>
<receiver>ConfigDialog</receiver> <receiver>ConfigDialog</receiver>
<slot>slotMenuButtonSizeChanged(const QString&amp;)</slot> <slot>slotMenuButtonSizeChanged(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>buttonUp</sender> <sender>buttonUp</sender>
@ -960,9 +960,9 @@
</connection> </connection>
<connection> <connection>
<sender>menuViewComboBox</sender> <sender>menuViewComboBox</sender>
<signal>activated(const QString&amp;)</signal> <signal>activated(const TQString&amp;)</signal>
<receiver>ConfigDialog</receiver> <receiver>ConfigDialog</receiver>
<slot>slotChangeListView(const QString&amp;)</slot> <slot>slotChangeListView(const TQString&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>newListView</sender> <sender>newListView</sender>
@ -978,24 +978,24 @@
</connection> </connection>
</connections> </connections>
<slots> <slots>
<slot access="protected">slotListBoxClicked(QListBoxItem* item)</slot> <slot access="protected">slotListBoxClicked(TQListBoxItem* item)</slot>
<slot access="protected">slotAddMenuClicked()</slot> <slot access="protected">slotAddMenuClicked()</slot>
<slot access="protected">slotCommandoTyped(const QString&amp; commando)</slot> <slot access="protected">slotCommandoTyped(const TQString&amp; commando)</slot>
<slot access="protected">slotRemoveClicked()</slot> <slot access="protected">slotRemoveClicked()</slot>
<slot access="protected">slotNewIcon()</slot> <slot access="protected">slotNewIcon()</slot>
<slot access="protected">slotAddButtonClicked()</slot> <slot access="protected">slotAddButtonClicked()</slot>
<slot access="protected">slotApplyClicked()</slot> <slot access="protected">slotApplyClicked()</slot>
<slot access="protected">slotResetClicked()</slot> <slot access="protected">slotResetClicked()</slot>
<slot access="protected">slotSchemeComboboxChanged(const QString&amp;)</slot> <slot access="protected">slotSchemeComboboxChanged(const TQString&amp;)</slot>
<slot access="protected">slotCustomSizeCheckboxToggled(bool)</slot> <slot access="protected">slotCustomSizeCheckboxToggled(bool)</slot>
<slot access="protected">slotColorButtonClicked(const QColor&amp; color)</slot> <slot access="protected">slotColorButtonClicked(const TQColor&amp; color)</slot>
<slot access="protected">slotOpacitySliderChanged(int value)</slot> <slot access="protected">slotOpacitySliderChanged(int value)</slot>
<slot access="protected">slotMenuButtonSizeChanged(const QString&amp;)</slot> <slot access="protected">slotMenuButtonSizeChanged(const TQString&amp;)</slot>
<slot access="protected">slotNavButtonSizeChanged(const QString&amp;)</slot> <slot access="protected">slotNavButtonSizeChanged(const TQString&amp;)</slot>
<slot access="protected">slotMenuRadiusSpinboxChanged(int)</slot> <slot access="protected">slotMenuRadiusSpinboxChanged(int)</slot>
<slot access="protected">slotButtonUpPressed()</slot> <slot access="protected">slotButtonUpPressed()</slot>
<slot access="protected">slotButtonDownPressed()</slot> <slot access="protected">slotButtonDownPressed()</slot>
<slot>slotChangeListView(const QString&amp;)</slot> <slot>slotChangeListView(const TQString&amp;)</slot>
<slot>slotNewListViewClicked()</slot> <slot>slotNewListViewClicked()</slot>
<slot>slotRemoveListViewClicked()</slot> <slot>slotRemoveListViewClicked()</slot>
</slots> </slots>

@ -30,14 +30,14 @@
#include <kapplication.h> #include <kapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <qslider.h> #include <ntqslider.h>
#include <qcombobox.h> #include <ntqcombobox.h>
#include <qregexp.h> #include <ntqregexp.h>
#include <qspinbox.h> #include <ntqspinbox.h>
#include <qlineedit.h> #include <ntqlineedit.h>
#include <qmessagebox.h> #include <ntqmessagebox.h>
#include <qcheckbox.h> #include <ntqcheckbox.h>
#include <qwidgetstack.h> #include <ntqwidgetstack.h>
#include "menulistviewitem.h" #include "menulistviewitem.h"
#include "servicemenu.h" #include "servicemenu.h"
@ -47,16 +47,16 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <fixx11h.h> #include <fixx11h.h>
ConfigDialogImpl::ConfigDialogImpl(QWidget* parent, const char* name, WFlags fl) ConfigDialogImpl::ConfigDialogImpl(TQWidget* parent, const char* name, WFlags fl)
: ConfigDialog(parent,name,fl), : ConfigDialog(parent,name,fl),
configChanged(false), configChanged(false),
grabbing(0), grabbing(0),
curListView(0), curListView(0),
mMenus(true) mMenus(true)
{ {
new QListBoxPixmap(listBox,MainBarIcon("kommando",KIcon::SizeLarge),"Menu"); new TQListBoxPixmap(listBox,MainBarIcon("kommando",KIcon::SizeLarge),"Menu");
new QListBoxPixmap(listBox,MainBarIcon("configure_shortcuts",KIcon::SizeLarge),"Shortcuts"); new TQListBoxPixmap(listBox,MainBarIcon("configure_shortcuts",KIcon::SizeLarge),"Shortcuts");
new QListBoxPixmap(listBox,MainBarIcon("colors",KIcon::SizeLarge),"Appearance"); new TQListBoxPixmap(listBox,MainBarIcon("colors",KIcon::SizeLarge),"Appearance");
listBox->setSelected(listBox->topItem(),true); listBox->setSelected(listBox->topItem(),true);
connect(kKeyButton1,SIGNAL(capturedShortcut(const KShortcut&)),this,SLOT(slotShortcutChanged(const KShortcut&)) ); connect(kKeyButton1,SIGNAL(capturedShortcut(const KShortcut&)),this,SLOT(slotShortcutChanged(const KShortcut&)) );
@ -69,8 +69,8 @@ void ConfigDialogImpl::readConfig()
{ {
Config& config = Config::getSingleton(); Config& config = Config::getSingleton();
navButtonSize->setCurrentText(QString::number(config.navButtonSize())); navButtonSize->setCurrentText(TQString::number(config.navButtonSize()));
menuButtonSize->setCurrentText(QString::number(config.menuButtonSize())); menuButtonSize->setCurrentText(TQString::number(config.menuButtonSize()));
menuRadiusSpinbox->setValue(config.menuRadius()); menuRadiusSpinbox->setValue(config.menuRadius());
if(config.scheme()=="none"){ if(config.scheme()=="none"){
@ -119,11 +119,11 @@ void ConfigDialogImpl::slotNewListViewClicked()
{ {
newListView->setEnabled(false); newListView->setEnabled(false);
grabbing = true; grabbing = true;
setCursor(Qt::CrossCursor); setCursor(TQt::CrossCursor);
grabMouse(); grabMouse();
} }
void ConfigDialogImpl::slotChangeListView(const QString& appname) void ConfigDialogImpl::slotChangeListView(const TQString& appname)
{ {
KommandoView* temp = mMenus.getViewOrDefault(appname); KommandoView* temp = mMenus.getViewOrDefault(appname);
if(temp == curListView){ if(temp == curListView){
@ -135,16 +135,16 @@ void ConfigDialogImpl::slotChangeListView(const QString& appname)
if(temp){ if(temp){
curListView = temp; curListView = temp;
lists->raiseWidget(curListView); lists->raiseWidget(curListView);
connect(curListView, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotMenuViewClicked(QListViewItem*))); connect(curListView, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotMenuViewClicked(TQListViewItem*)));
slotMenuViewClicked(curListView->selectedItem()); slotMenuViewClicked(curListView->selectedItem());
} }
} }
void ConfigDialogImpl::slotButtonDownPressed() void ConfigDialogImpl::slotButtonDownPressed()
{ {
QListViewItem* item = curListView->selectedItem(); TQListViewItem* item = curListView->selectedItem();
if(item!=NULL){ if(item!=NULL){
QListViewItem* below = item->itemBelow(); TQListViewItem* below = item->itemBelow();
while((below!=NULL)&&(item->parent()!=below->parent())){ while((below!=NULL)&&(item->parent()!=below->parent())){
below=below->itemBelow(); below=below->itemBelow();
} }
@ -157,9 +157,9 @@ void ConfigDialogImpl::slotButtonDownPressed()
void ConfigDialogImpl::slotButtonUpPressed() void ConfigDialogImpl::slotButtonUpPressed()
{ {
QListViewItem* item = curListView->selectedItem(); TQListViewItem* item = curListView->selectedItem();
if(item!=NULL){ if(item!=NULL){
QListViewItem* above = item->itemAbove(); TQListViewItem* above = item->itemAbove();
while((above!=NULL)&&(item->parent()!=above->parent())){ while((above!=NULL)&&(item->parent()!=above->parent())){
above=above->itemAbove(); above=above->itemAbove();
} }
@ -184,7 +184,7 @@ void ConfigDialogImpl::slotCustomSizeCheckboxToggled(bool mode)
setChanged(true); setChanged(true);
} }
void ConfigDialogImpl::slotSchemeComboboxChanged(const QString& scheme) void ConfigDialogImpl::slotSchemeComboboxChanged(const TQString& scheme)
{ {
Config& config=Config::getSingleton(); Config& config=Config::getSingleton();
if(scheme=="Tiny"){ if(scheme=="Tiny"){
@ -207,8 +207,8 @@ void ConfigDialogImpl::slotSchemeComboboxChanged(const QString& scheme)
config.setScheme(scheme); config.setScheme(scheme);
navButtonSize->setCurrentText(QString::number(config.navButtonSize())); navButtonSize->setCurrentText(TQString::number(config.navButtonSize()));
menuButtonSize->setCurrentText(QString::number(config.menuButtonSize())); menuButtonSize->setCurrentText(TQString::number(config.menuButtonSize()));
menuRadiusSpinbox->setValue(config.menuRadius()); menuRadiusSpinbox->setValue(config.menuRadius());
setChanged(true); setChanged(true);
} }
@ -219,19 +219,19 @@ void ConfigDialogImpl::slotMenuRadiusSpinboxChanged(int size)
setChanged(true); setChanged(true);
} }
void ConfigDialogImpl::slotNavButtonSizeChanged(const QString& size) void ConfigDialogImpl::slotNavButtonSizeChanged(const TQString& size)
{ {
Config::getSingleton().setNavButtonSize(size.toShort()); Config::getSingleton().setNavButtonSize(size.toShort());
setChanged(true); setChanged(true);
} }
void ConfigDialogImpl::slotMenuButtonSizeChanged(const QString& size) void ConfigDialogImpl::slotMenuButtonSizeChanged(const TQString& size)
{ {
Config::getSingleton().setMenuButtonSize(size.toShort()); Config::getSingleton().setMenuButtonSize(size.toShort());
setChanged(true); setChanged(true);
} }
void ConfigDialogImpl::slotCommandoTyped(const QString& commando) void ConfigDialogImpl::slotCommandoTyped(const TQString& commando)
{ {
if (curListView->selectedItem() && curListView->selectedItem()->text(1) != commando) { if (curListView->selectedItem() && curListView->selectedItem()->text(1) != commando) {
curListView->selectedItem()->setText(1,commando); curListView->selectedItem()->setText(1,commando);
@ -239,7 +239,7 @@ void ConfigDialogImpl::slotCommandoTyped(const QString& commando)
} }
} }
void ConfigDialogImpl::slotMenuViewClicked(QListViewItem* item) void ConfigDialogImpl::slotMenuViewClicked(TQListViewItem* item)
{ {
MenuListViewItem* temp = static_cast<MenuListViewItem*>(item); MenuListViewItem* temp = static_cast<MenuListViewItem*>(item);
if(item == 0){ if(item == 0){
@ -274,7 +274,7 @@ void ConfigDialogImpl::slotNewIcon()
void ConfigDialogImpl::slotRemoveClicked() void ConfigDialogImpl::slotRemoveClicked()
{ {
QListViewItem* temp = curListView->selectedItem()->nextSibling(); TQListViewItem* temp = curListView->selectedItem()->nextSibling();
delete curListView->selectedItem(); delete curListView->selectedItem();
curListView->setSelected(temp,true); curListView->setSelected(temp,true);
if(temp==NULL){ if(temp==NULL){
@ -295,10 +295,10 @@ void ConfigDialogImpl::slotAddMenuClicked()
commandoEdit->setEnabled(false); commandoEdit->setEnabled(false);
} }
void ConfigDialogImpl::createEntry(const QString& kind) void ConfigDialogImpl::createEntry(const TQString& kind)
{ {
QListViewItem* parent=NULL; TQListViewItem* parent=NULL;
QListViewItem* newItem; TQListViewItem* newItem;
MenuListViewItem* selected =static_cast<MenuListViewItem*>(curListView->selectedItem()); MenuListViewItem* selected =static_cast<MenuListViewItem*>(curListView->selectedItem());
MenuListViewItem::ItemType type; MenuListViewItem::ItemType type;
if(selected!=NULL){ if(selected!=NULL){
@ -333,7 +333,7 @@ void ConfigDialogImpl::createEntry(const QString& kind)
setChanged(true); setChanged(true);
} }
void ConfigDialogImpl::slotListBoxClicked(QListBoxItem* item) void ConfigDialogImpl::slotListBoxClicked(TQListBoxItem* item)
{ {
if(item!=NULL){ if(item!=NULL){
if(item->text()=="Menu"){ if(item->text()=="Menu"){
@ -358,7 +358,7 @@ void ConfigDialogImpl::slotApplyClicked()
Config& config = Config::getSingleton(); Config& config = Config::getSingleton();
config.fromConfigDlg(mMenus); config.fromConfigDlg(mMenus);
config.writeConfigFile(); config.writeConfigFile();
kapp->dcopClient()->send("kded", "kommandod", "reparseConfiguration()", QString::null); kapp->dcopClient()->send("kded", "kommandod", "reparseConfiguration()", TQString::null);
setChanged(false); setChanged(false);
} }
@ -371,7 +371,7 @@ void ConfigDialogImpl::slotShortcutChanged(const KShortcut & cut )
} }
} }
void ConfigDialogImpl::slotColorButtonClicked(const QColor& color) void ConfigDialogImpl::slotColorButtonClicked(const TQColor& color)
{ {
Config::getSingleton().setTintColor(color); Config::getSingleton().setTintColor(color);
setChanged(true); setChanged(true);
@ -387,8 +387,8 @@ void ConfigDialogImpl::slotAddService(KService* service)
{ {
slotAddButtonClicked(); slotAddButtonClicked();
QString commando = service->exec(); TQString commando = service->exec();
commando.remove(QRegExp(" %.\\b")); commando.remove(TQRegExp(" %.\\b"));
commando.remove(" -caption \"%c\""); commando.remove(" -caption \"%c\"");
commandoEdit->setText(commando); commandoEdit->setText(commando);
curListView->selectedItem()->setText(1, commando); curListView->selectedItem()->setText(1, commando);
@ -418,13 +418,13 @@ void ConfigDialogImpl::slotAddServiceGroup(KServiceGroup* group)
} }
} }
bool ConfigDialogImpl::event( QEvent * evt ) bool ConfigDialogImpl::event( TQEvent * evt )
{ {
if(grabbing){ if(grabbing){
switch(evt->type()){ switch(evt->type()){
case QEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
switch(static_cast<QMouseEvent*>(evt)->button()){ switch(static_cast<TQMouseEvent*>(evt)->button()){
case Qt::LeftButton: case TQt::LeftButton:
releaseMouse(); releaseMouse();
listViewFromClick(); listViewFromClick();
grabbing = false; grabbing = false;
@ -434,8 +434,8 @@ bool ConfigDialogImpl::event( QEvent * evt )
grabbing = false; grabbing = false;
} }
break; break;
case QEvent::KeyPress: case TQEvent::KeyPress:
if(static_cast<QKeyEvent*>(evt)->key() == Qt::Key_Escape){ if(static_cast<TQKeyEvent*>(evt)->key() == TQt::Key_Escape){
releaseMouse(); releaseMouse();
grabbing = false; grabbing = false;
} }
@ -469,8 +469,8 @@ void ConfigDialogImpl::listViewFromClick( )
int rep_rootx, rep_rooty; int rep_rootx, rep_rooty;
unsigned int rep_mask; unsigned int rep_mask;
int mousex, mousey; int mousex, mousey;
Display* dpy = qt_xdisplay(); Display* dpy = tqt_xdisplay();
Window win = qt_xrootwin(); Window win = tqt_xrootwin();
XClassHint hint; XClassHint hint;
hint.res_class = 0; hint.res_class = 0;

@ -27,7 +27,7 @@
#include "configdialog.h" #include "configdialog.h"
#include <qptrlist.h> #include <ntqptrlist.h>
#include "kommandoview.h" #include "kommandoview.h"
@ -46,7 +46,7 @@ class ConfigDialogImpl : public ConfigDialog
Q_OBJECT Q_OBJECT
public: public:
ConfigDialogImpl(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); ConfigDialogImpl(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0);
/*$PUBLIC_FUNCTIONS$*/ /*$PUBLIC_FUNCTIONS$*/
void readConfig(); void readConfig();
@ -67,29 +67,29 @@ class ConfigDialogImpl : public ConfigDialog
virtual void initView(); virtual void initView();
virtual void listViewFromClick(); virtual void listViewFromClick();
void createEntry(const QString& kind); //This is a helper function to add a new entry to the Listview void createEntry(const TQString& kind); //This is a helper function to add a new entry to the Listview
void setChanged(bool state); void setChanged(bool state);
bool event(QEvent* evt); bool event(TQEvent* evt);
protected slots: protected slots:
/*$PROTECTED_SLOTS$*/ /*$PROTECTED_SLOTS$*/
virtual void slotChangeListView(const QString&); virtual void slotChangeListView(const TQString&);
virtual void slotButtonUpPressed(); virtual void slotButtonUpPressed();
virtual void slotButtonDownPressed(); virtual void slotButtonDownPressed();
virtual void slotCustomSizeCheckboxToggled(bool); virtual void slotCustomSizeCheckboxToggled(bool);
virtual void slotSchemeComboboxChanged(const QString&); virtual void slotSchemeComboboxChanged(const TQString&);
virtual void slotMenuRadiusSpinboxChanged(int); virtual void slotMenuRadiusSpinboxChanged(int);
virtual void slotShortcutChanged(const KShortcut& cut); virtual void slotShortcutChanged(const KShortcut& cut);
virtual void slotCommandoTyped(const QString& commando); virtual void slotCommandoTyped(const TQString& commando);
virtual void slotMenuViewClicked(QListViewItem* item); virtual void slotMenuViewClicked(TQListViewItem* item);
virtual void slotNewIcon(); virtual void slotNewIcon();
virtual void slotRemoveClicked(); virtual void slotRemoveClicked();
virtual void slotAddButtonClicked(); virtual void slotAddButtonClicked();
virtual void slotAddMenuClicked(); virtual void slotAddMenuClicked();
virtual void slotListBoxClicked(QListBoxItem* item); virtual void slotListBoxClicked(TQListBoxItem* item);
virtual void slotColorButtonClicked(const QColor& color); virtual void slotColorButtonClicked(const TQColor& color);
virtual void slotOpacitySliderChanged(int value); virtual void slotOpacitySliderChanged(int value);
virtual void slotNavButtonSizeChanged(const QString&); virtual void slotNavButtonSizeChanged(const TQString&);
virtual void slotMenuButtonSizeChanged(const QString&); virtual void slotMenuButtonSizeChanged(const TQString&);
virtual void slotAddService(KService* service); virtual void slotAddService(KService* service);
virtual void slotAddServiceGroup(KServiceGroup* group); virtual void slotAddServiceGroup(KServiceGroup* group);
virtual void slotRemoveListViewClicked(); virtual void slotRemoveListViewClicked();

@ -19,10 +19,10 @@
***************************************************************************/ ***************************************************************************/
#include "configuration.h" #include "configuration.h"
#include <qfile.h> #include <ntqfile.h>
#include <qwidgetstack.h> #include <ntqwidgetstack.h>
#include <qobjectlist.h> #include <ntqobjectlist.h>
#include <qdir.h> #include <ntqdir.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kshell.h> #include <kshell.h>
@ -31,18 +31,18 @@
#include "menulistviewitem.h" #include "menulistviewitem.h"
Config::Config() Config::Config()
:mTintColor(Qt::black),mOpacity(0.2f),mScheme("none"),mMenuButtonSize(32),mNavButtonSize(32),mMenuRadius(132),doc(NULL) :mTintColor(TQt::black),mOpacity(0.2f),mScheme("none"),mMenuButtonSize(32),mNavButtonSize(32),mMenuRadius(132),doc(NULL)
{ {
mConfigPath = locate("data", "kommando/kommandorc"); mConfigPath = locate("data", "kommando/kommandorc");
kdDebug() << "kommandorc located: " << mConfigPath << endl; kdDebug() << "kommandorc located: " << mConfigPath << endl;
if (mConfigPath.isNull() || !QFile::exists(mConfigPath)){ //test for new config file if (mConfigPath.isNull() || !TQFile::exists(mConfigPath)){ //test for new config file
kdDebug() << "There is no kommandorc in kdedirs" << endl; kdDebug() << "There is no kommandorc in kdedirs" << endl;
mConfigPath = locateLocal("data", "kommando/kommandorc"); mConfigPath = locateLocal("data", "kommando/kommandorc");
if(QFile::exists(KShell::homeDir("")+"/.kommandorc")){ //tries old config file if(TQFile::exists(KShell::homeDir("")+"/.kommandorc")){ //tries old config file
kdDebug() << "There is a kommandorc in homedir, moving it to " << mConfigPath << endl; kdDebug() << "There is a kommandorc in homedir, moving it to " << mConfigPath << endl;
QDir dir; TQDir dir;
if (!dir.rename(KShell::homeDir("")+"/.kommandorc", mConfigPath)) { if (!dir.rename(KShell::homeDir("")+"/.kommandorc", mConfigPath)) {
kdWarning() << "Moving ~/.kommandorc failed, creating a default one" << endl; kdWarning() << "Moving ~/.kommandorc failed, creating a default one" << endl;
createDefaultConfigFile(); createDefaultConfigFile();
@ -69,22 +69,22 @@ void Config::createDefaultConfigFile()
bool Config::readConfigFile( ) bool Config::readConfigFile( )
{ {
QFile file(mConfigPath); TQFile file(mConfigPath);
if(!file.open(IO_ReadOnly)){ if(!file.open(IO_ReadOnly)){
return false; return false;
} }
if(doc){ if(doc){
delete doc; delete doc;
} }
doc = new QDomDocument(); doc = new TQDomDocument();
doc->setContent( &file ); doc->setContent( &file );
file.close(); file.close();
if(doc){ if(doc){
QDomNode topLevelNode = doc->documentElement().firstChild(); TQDomNode topLevelNode = doc->documentElement().firstChild();
while(!topLevelNode.isNull()){ while(!topLevelNode.isNull()){
if(topLevelNode.isElement()){ if(topLevelNode.isElement()){
QDomElement elem = topLevelNode.toElement(); TQDomElement elem = topLevelNode.toElement();
if(elem.tagName()=="access"){ if(elem.tagName()=="access"){
setShortcut(elem.text()); setShortcut(elem.text());
} else if(elem.tagName()=="tintcolor"){ } else if(elem.tagName()=="tintcolor"){
@ -114,11 +114,11 @@ bool Config::writeConfigFile( )
} }
mConfigPath = locateLocal("data", "kommando/kommandorc"); mConfigPath = locateLocal("data", "kommando/kommandorc");
QFile file(mConfigPath); TQFile file(mConfigPath);
if(!file.open(IO_WriteOnly)){ if(!file.open(IO_WriteOnly)){
return false; return false;
} }
QTextStream str(&file); TQTextStream str(&file);
str << *doc; str << *doc;
file.close(); file.close();
return true; return true;
@ -129,8 +129,8 @@ void Config::fromConfigDlg(KommandoViewList& listViews )
if(doc){ if(doc){
delete doc; delete doc;
} }
doc = new QDomDocument(); doc = new TQDomDocument();
QDomElement root=doc->createElement("root"); TQDomElement root=doc->createElement("root");
doc->appendChild(root); doc->appendChild(root);
newNode("access",root,Shortcut(),"method","shortcut"); newNode("access",root,Shortcut(),"method","shortcut");
@ -143,8 +143,8 @@ void Config::fromConfigDlg(KommandoViewList& listViews )
for(KommandoView* it = listViews.first(); it != 0; it = listViews.next()){ for(KommandoView* it = listViews.first(); it != 0; it = listViews.next()){
if(it->childCount() > 0){ if(it->childCount() > 0){
QDomElement node = newMenu(root,it->appName()); TQDomElement node = newMenu(root,it->appName());
QListViewItem* temp = it->firstChild(); TQListViewItem* temp = it->firstChild();
while(temp){ while(temp){
menuItemToXML(node,static_cast<MenuListViewItem*>(temp)); menuItemToXML(node,static_cast<MenuListViewItem*>(temp));
temp=temp->nextSibling(); temp=temp->nextSibling();
@ -154,12 +154,12 @@ void Config::fromConfigDlg(KommandoViewList& listViews )
} }
} }
//ARGHHH!! I need this function because QListView::lastItem returns not only top level items but also children of top level items //ARGHHH!! I need this function because TQListView::lastItem returns not only top level items but also children of top level items
//It took me hours of my precious lifetime to figure that out!! _Terribly_ annoying -.- //It took me hours of my precious lifetime to figure that out!! _Terribly_ annoying -.-
QListViewItem* lastChild(QListView* view) TQListViewItem* lastChild(TQListView* view)
{ {
QListViewItem* temp=view->firstChild(); TQListViewItem* temp=view->firstChild();
QListViewItem* item=NULL; TQListViewItem* item=NULL;
while(temp!=NULL){ while(temp!=NULL){
item=temp; item=temp;
temp=temp->nextSibling(); temp=temp->nextSibling();
@ -167,15 +167,15 @@ QListViewItem* lastChild(QListView* view)
return item; return item;
} }
void Config::toListView(KommandoViewList& listViews, QWidgetStack* listViewParent)//QListView* listView ) void Config::toListView(KommandoViewList& listViews, TQWidgetStack* listViewParent)//TQListView* listView )
{ {
if(doc){ if(doc){
QDomNode topLevelNode = doc->documentElement().firstChild(); TQDomNode topLevelNode = doc->documentElement().firstChild();
const QObjectList *children = listViewParent->children(); const TQObjectList *children = listViewParent->children();
if (children != 0) { if (children != 0) {
QObjectListIterator it(*children); TQObjectListIterator it(*children);
for (; *it != 0; ++it) for (; *it != 0; ++it)
listViewParent->removeWidget(static_cast<QWidget*>(*it)); listViewParent->removeWidget(static_cast<TQWidget*>(*it));
} }
while(!topLevelNode.isNull()){ while(!topLevelNode.isNull()){
@ -184,10 +184,10 @@ void Config::toListView(KommandoViewList& listViews, QWidgetStack* listViewParen
{ {
KommandoView* view = new KommandoView(listViewParent,topLevelNode.toElement().attribute("appname")); KommandoView* view = new KommandoView(listViewParent,topLevelNode.toElement().attribute("appname"));
listViewParent->addWidget(view); listViewParent->addWidget(view);
QDomNode menuNode = topLevelNode.firstChild(); TQDomNode menuNode = topLevelNode.firstChild();
while(!menuNode.isNull()){ while(!menuNode.isNull()){
if(menuNode.isElement()){ if(menuNode.isElement()){
QDomElement elemNode=menuNode.toElement(); TQDomElement elemNode=menuNode.toElement();
menuItemFromXML(view,lastChild(view),menuNode.toElement()); menuItemFromXML(view,lastChild(view),menuNode.toElement());
} }
menuNode = menuNode.nextSibling(); menuNode = menuNode.nextSibling();
@ -202,15 +202,15 @@ void Config::toListView(KommandoViewList& listViews, QWidgetStack* listViewParen
void Config::toKommandoMenu(Kommando* buttonParent) void Config::toKommandoMenu(Kommando* buttonParent)
{ {
QPtrList<Menu> topLevelMenus; TQPtrList<Menu> topLevelMenus;
Menu* defaultMenu = 0; Menu* defaultMenu = 0;
if(doc){ if(doc){
QDomNode node = doc->documentElement().firstChild(); TQDomNode node = doc->documentElement().firstChild();
while(!node.isNull()){ while(!node.isNull()){
if(node.isElement()&&(node.toElement().tagName() == "menu")){ if(node.isElement()&&(node.toElement().tagName() == "menu")){
Menu* mainMenu = menuFromXML(node.toElement(),buttonParent); Menu* mainMenu = menuFromXML(node.toElement(),buttonParent);
if((mainMenu->appName() == "default") || (mainMenu->appName() == QString::null)){ if((mainMenu->appName() == "default") || (mainMenu->appName() == TQString::null)){
defaultMenu = mainMenu; defaultMenu = mainMenu;
} }
mainMenu->arrangeButtons(); mainMenu->arrangeButtons();
@ -237,7 +237,7 @@ void Config::toKommandoMenu(Kommando* buttonParent)
void Config::setDefaultValues() void Config::setDefaultValues()
{ {
setTintColor(Qt::black); setTintColor(TQt::black);
setOpacity(0.2f); setOpacity(0.2f);
setShortcut("Alt+Ctrl+H"); setShortcut("Alt+Ctrl+H");
setNavButtonSize(32); setNavButtonSize(32);
@ -248,8 +248,8 @@ void Config::setDefaultValues()
if(doc){ if(doc){
delete doc; delete doc;
} }
doc = new QDomDocument(); doc = new TQDomDocument();
QDomElement root = doc->createElement("root"); TQDomElement root = doc->createElement("root");
doc->appendChild(root); doc->appendChild(root);
newNode("access",root,Shortcut(),"method","shortcut"); newNode("access",root,Shortcut(),"method","shortcut");
@ -260,23 +260,23 @@ void Config::setDefaultValues()
newNode("menuradius",root,132); newNode("menuradius",root,132);
newNode("scheme",root,"Normal"); newNode("scheme",root,"Normal");
QDomElement node= newMenu(root,"default"); TQDomElement node= newMenu(root,"default");
newButton(node,"konsole","konsole --workdir $HOME"); newButton(node,"konsole","konsole --workdir $HOME");
newButton(node,"kwrite","kwrite"); newButton(node,"kwrite","kwrite");
newButton(node,"konqueror","konqueror"); newButton(node,"konqueror","konqueror");
newButton(node,"kcalc","kcalc"); newButton(node,"kcalc","kcalc");
newButton(node,"gimp","gimp"); newButton(node,"gimp","gimp");
newButton(node,"kfm_home","kfmclient openProfile filemanagement"); newButton(node,"kfm_home","kfmclient openProfile filemanagement");
node = newMenu(node,QString::null,"kmix"); node = newMenu(node,TQString::null,"kmix");
newButton(node,"kmix","kmix"); newButton(node,"kmix","kmix");
newButton(node,"k3b","k3b"); newButton(node,"k3b","k3b");
newButton(node,"amarok","amarok"); newButton(node,"amarok","amarok");
newButton(node,"kaffeine","kaffeine"); newButton(node,"kaffeine","kaffeine");
} }
Menu * Config::menuFromXML( const QDomElement & ownNode, Kommando * buttonParent, Menu* parent) Menu * Config::menuFromXML( const TQDomElement & ownNode, Kommando * buttonParent, Menu* parent)
{ {
QDomNode node=ownNode.firstChild(); TQDomNode node=ownNode.firstChild();
Menu* newMenu = new Menu(parent,ownNode.attribute("appname")); Menu* newMenu = new Menu(parent,ownNode.attribute("appname"));
@ -303,11 +303,11 @@ Menu * Config::menuFromXML( const QDomElement & ownNode, Kommando * buttonParent
return newMenu; return newMenu;
} }
CommandoButton* Config::comButtonFromXML(const QDomElement& ownNode, Kommando* parent) CommandoButton* Config::comButtonFromXML(const TQDomElement& ownNode, Kommando* parent)
{ {
CommandoButton* button = new CommandoButton(parent,mMenuButtonSize); CommandoButton* button = new CommandoButton(parent,mMenuButtonSize);
QDomNode bnode=ownNode.firstChild(); TQDomNode bnode=ownNode.firstChild();
while (!bnode.isNull()){ while (!bnode.isNull()){
if(bnode.nodeName() == "command"){ if(bnode.nodeName() == "command"){
button->setCommand(bnode.firstChild().nodeValue()); button->setCommand(bnode.firstChild().nodeValue());
@ -319,36 +319,36 @@ CommandoButton* Config::comButtonFromXML(const QDomElement& ownNode, Kommando* p
return button; return button;
} }
QDomElement Config::newNode( const QString& nodename, QDomNode& parent, int value ) TQDomElement Config::newNode( const TQString& nodename, TQDomNode& parent, int value )
{ {
QDomElement node=doc->createElement(nodename); TQDomElement node=doc->createElement(nodename);
node.appendChild(doc->createTextNode(QString::number(value))); node.appendChild(doc->createTextNode(TQString::number(value)));
parent.appendChild(node); parent.appendChild(node);
return node; return node;
} }
QDomElement Config::newNode( const QString& nodename, QDomNode& parent, float value ) TQDomElement Config::newNode( const TQString& nodename, TQDomNode& parent, float value )
{ {
QDomElement node=doc->createElement(nodename); TQDomElement node=doc->createElement(nodename);
node.appendChild(doc->createTextNode(QString::number(value))); node.appendChild(doc->createTextNode(TQString::number(value)));
parent.appendChild(node); parent.appendChild(node);
return node; return node;
} }
QDomElement Config::newNode( const QString& nodename, QDomNode& parent, const QString& value ) TQDomElement Config::newNode( const TQString& nodename, TQDomNode& parent, const TQString& value )
{ {
QDomElement node=doc->createElement(nodename); TQDomElement node=doc->createElement(nodename);
node.appendChild(doc->createTextNode(value)); node.appendChild(doc->createTextNode(value));
parent.appendChild(node); parent.appendChild(node);
return node; return node;
} }
QDomElement Config::newNode( const QString& nodename, QDomNode& parent, const QString& value, const QString& attrname, const QString& attrvalue ) TQDomElement Config::newNode( const TQString& nodename, TQDomNode& parent, const TQString& value, const TQString& attrname, const TQString& attrvalue )
{ {
QDomElement node=doc->createElement(nodename); TQDomElement node=doc->createElement(nodename);
node.setAttribute(attrname,attrvalue); node.setAttribute(attrname,attrvalue);
node.appendChild(doc->createTextNode(value)); node.appendChild(doc->createTextNode(value));
parent.appendChild(node); parent.appendChild(node);
@ -356,16 +356,16 @@ QDomElement Config::newNode( const QString& nodename, QDomNode& parent, const QS
return node; return node;
} }
QDomElement Config::newButton(QDomNode& parent, const QString& icon, const QString& command ) TQDomElement Config::newButton(TQDomNode& parent, const TQString& icon, const TQString& command )
{ {
QDomElement root = doc->createElement("button"); TQDomElement root = doc->createElement("button");
if(command!=""){ if(command!=""){
QDomElement node = doc->createElement("command"); TQDomElement node = doc->createElement("command");
node.appendChild(doc->createTextNode(command)); node.appendChild(doc->createTextNode(command));
root.appendChild(node); root.appendChild(node);
} }
if(icon!=""){ if(icon!=""){
QDomElement node=doc->createElement("icon"); TQDomElement node=doc->createElement("icon");
node.appendChild(doc->createTextNode(icon)); node.appendChild(doc->createTextNode(icon));
root.appendChild(node); root.appendChild(node);
} }
@ -373,14 +373,14 @@ QDomElement Config::newButton(QDomNode& parent, const QString& icon, const QStri
return root; return root;
} }
QDomElement Config::newMenu( QDomNode & parent, const QString& appName, const QString& icon ) TQDomElement Config::newMenu( TQDomNode & parent, const TQString& appName, const TQString& icon )
{ {
QDomElement root = doc->createElement("menu"); TQDomElement root = doc->createElement("menu");
if(appName != QString::null){ if(appName != TQString::null){
root.setAttribute("appname", appName); root.setAttribute("appname", appName);
} }
if(icon != QString::null){ if(icon != TQString::null){
QDomElement node=doc->createElement("icon"); TQDomElement node=doc->createElement("icon");
node.appendChild(doc->createTextNode(icon)); node.appendChild(doc->createTextNode(icon));
root.appendChild(node); root.appendChild(node);
} }
@ -388,11 +388,11 @@ QDomElement Config::newMenu( QDomNode & parent, const QString& appName, const QS
return root; return root;
} }
void Config::menuItemToXML( QDomNode & parent, MenuListViewItem* item) void Config::menuItemToXML( TQDomNode & parent, MenuListViewItem* item)
{ {
if(item->type()==MenuListViewItem::Menu){ if(item->type()==MenuListViewItem::Menu){
QDomElement node = newMenu(parent,QString::null,item->iconPath()); TQDomElement node = newMenu(parent,TQString::null,item->iconPath());
QListViewItem* temp = item->firstChild(); TQListViewItem* temp = item->firstChild();
while(temp){ while(temp){
menuItemToXML(node,static_cast<MenuListViewItem*>(temp)); menuItemToXML(node,static_cast<MenuListViewItem*>(temp));
temp=temp->nextSibling(); temp=temp->nextSibling();
@ -402,7 +402,7 @@ void Config::menuItemToXML( QDomNode & parent, MenuListViewItem* item)
} }
} }
void Config::menuItemFromXML(KommandoView* parent, QListViewItem* after, const QDomElement& ownNode) void Config::menuItemFromXML(KommandoView* parent, TQListViewItem* after, const TQDomElement& ownNode)
{ {
MenuListViewItem* item; MenuListViewItem* item;
if (ownNode.tagName()=="menu"){ if (ownNode.tagName()=="menu"){
@ -414,7 +414,7 @@ void Config::menuItemFromXML(KommandoView* parent, QListViewItem* after, const Q
itemHelper(ownNode,item); //Parse properties and children of this item itemHelper(ownNode,item); //Parse properties and children of this item
} }
void Config::menuItemFromXML(QListViewItem* parent, QListViewItem* after, const QDomElement& ownNode) void Config::menuItemFromXML(TQListViewItem* parent, TQListViewItem* after, const TQDomElement& ownNode)
{ {
MenuListViewItem* item; MenuListViewItem* item;
if (ownNode.tagName()=="menu"){ if (ownNode.tagName()=="menu"){
@ -427,13 +427,13 @@ void Config::menuItemFromXML(QListViewItem* parent, QListViewItem* after, const
itemHelper(ownNode,item); //Parse properties and children of this item itemHelper(ownNode,item); //Parse properties and children of this item
} }
void Config::itemHelper(const QDomElement& ownNode, MenuListViewItem* item) void Config::itemHelper(const TQDomElement& ownNode, MenuListViewItem* item)
{ {
QDomNode temp = ownNode.firstChild(); TQDomNode temp = ownNode.firstChild();
while(!temp.isNull()){ while(!temp.isNull()){
if(temp.isElement()){ if(temp.isElement()){
QDomElement temp2=temp.toElement(); TQDomElement temp2=temp.toElement();
if(temp2.tagName() == "icon"){ if(temp2.tagName() == "icon"){
item->setIconPath(temp2.firstChild().nodeValue()); item->setIconPath(temp2.firstChild().nodeValue());
} else if((temp2.tagName() == "command") && (item->type() == MenuListViewItem::Button)){ } else if((temp2.tagName() == "command") && (item->type() == MenuListViewItem::Button)){

@ -20,14 +20,14 @@
#ifndef CONFIG_H #ifndef CONFIG_H
#define CONFIG_H #define CONFIG_H
#include <qdom.h> #include <ntqdom.h>
#include <menulistviewitem.h> #include <menulistviewitem.h>
#include "kommando.h" #include "kommando.h"
#include "commandobutton.h" #include "commandobutton.h"
#include "kommandoview.h" #include "kommandoview.h"
class QWidgetStack; class TQWidgetStack;
class Config{ class Config{
public: public:
@ -41,15 +41,15 @@ class Config{
bool readConfigFile(); bool readConfigFile();
bool writeConfigFile(); bool writeConfigFile();
void fromConfigDlg(KommandoViewList& listViews); void fromConfigDlg(KommandoViewList& listViews);
void toListView(KommandoViewList& listViews, QWidgetStack* listViewParent); void toListView(KommandoViewList& listViews, TQWidgetStack* listViewParent);
void toKommandoMenu(Kommando* buttonParent); void toKommandoMenu(Kommando* buttonParent);
void setDefaultValues(); void setDefaultValues();
void setShortcut(const QString& cut){ mShortcut = cut; } void setShortcut(const TQString& cut){ mShortcut = cut; }
QString Shortcut() const{ return mShortcut; } TQString Shortcut() const{ return mShortcut; }
void setTintColor(const QColor& theValue){ mTintColor = theValue; } void setTintColor(const TQColor& theValue){ mTintColor = theValue; }
QColor tintColor() const { return mTintColor; } TQColor tintColor() const { return mTintColor; }
void setOpacity(const float value){mOpacity=value;} void setOpacity(const float value){mOpacity=value;}
float opacity() const {return mOpacity;} float opacity() const {return mOpacity;}
@ -65,45 +65,45 @@ class Config{
unsigned int menuRadius() const{ return mMenuRadius; } unsigned int menuRadius() const{ return mMenuRadius; }
unsigned int buttonDistance() const { return (mMenuRadius-static_cast<int>(mMenuButtonSize*1.38)); } unsigned int buttonDistance() const { return (mMenuRadius-static_cast<int>(mMenuButtonSize*1.38)); }
void setScheme(const QString& theValue){ mScheme = theValue; } void setScheme(const TQString& theValue){ mScheme = theValue; }
QString scheme() const{ return mScheme; } TQString scheme() const{ return mScheme; }
protected: protected:
Config(); Config();
Config(const Config&); Config(const Config&);
void createDefaultConfigFile(); void createDefaultConfigFile();
QString mConfigPath; TQString mConfigPath;
QString mShortcut; TQString mShortcut;
QColor mTintColor; TQColor mTintColor;
float mOpacity; float mOpacity;
QString mScheme; TQString mScheme;
unsigned short mMenuButtonSize; unsigned short mMenuButtonSize;
unsigned short mNavButtonSize; unsigned short mNavButtonSize;
unsigned int mMenuRadius; unsigned int mMenuRadius;
bool mAddDefalutMenuLink; bool mAddDefalutMenuLink;
QDomDocument* doc; TQDomDocument* doc;
//Factory functions //Factory functions
Menu* menuFromXML(const QDomElement& ownNode, Kommando* buttonParent, Menu* parent=NULL); Menu* menuFromXML(const TQDomElement& ownNode, Kommando* buttonParent, Menu* parent=NULL);
CommandoButton* comButtonFromXML(const QDomElement& ownNode, Kommando* parent); CommandoButton* comButtonFromXML(const TQDomElement& ownNode, Kommando* parent);
QListView* newListView(QWidget * parent, const char* name); TQListView* newListView(TQWidget * parent, const char* name);
void menuItemToXML(QDomNode& parent, MenuListViewItem* item); void menuItemToXML(TQDomNode& parent, MenuListViewItem* item);
//The following 3 methods could have been implemented in just 1 method, if there would be no need in overriding the parent argument //The following 3 methods could have been implemented in just 1 method, if there would be no need in overriding the parent argument
//so I put the code both menuItemFromXML methods share in itemHelper to reduce redundancy //so I put the code both menuItemFromXML methods share in itemHelper to reduce redundancy
void menuItemFromXML(KommandoView* parent, QListViewItem* after, const QDomElement& ownNode); void menuItemFromXML(KommandoView* parent, TQListViewItem* after, const TQDomElement& ownNode);
void menuItemFromXML(QListViewItem* parent, QListViewItem* after, const QDomElement& ownNode); void menuItemFromXML(TQListViewItem* parent, TQListViewItem* after, const TQDomElement& ownNode);
void itemHelper(const QDomElement& ownNode, MenuListViewItem* item); void itemHelper(const TQDomElement& ownNode, MenuListViewItem* item);
//Some factory functions that allow to setup a xml file quickly //Some factory functions that allow to setup a xml file quickly
QDomElement newNode(const QString& nodename, QDomNode& parent, int value); TQDomElement newNode(const TQString& nodename, TQDomNode& parent, int value);
QDomElement newNode(const QString& nodename, QDomNode& parent, float value); TQDomElement newNode(const TQString& nodename, TQDomNode& parent, float value);
QDomElement newNode(const QString& nodename, QDomNode& parent, const QString& value); TQDomElement newNode(const TQString& nodename, TQDomNode& parent, const TQString& value);
QDomElement newNode(const QString& nodename, QDomNode& parent, const QString& value, const QString& attrname, const QString& attrvalue); TQDomElement newNode(const TQString& nodename, TQDomNode& parent, const TQString& value, const TQString& attrname, const TQString& attrvalue);
QDomElement newButton(QDomNode& parent, const QString& icon, const QString& command); TQDomElement newButton(TQDomNode& parent, const TQString& icon, const TQString& command);
QDomElement newMenu(QDomNode& parent, const QString& appName = QString::null, const QString& icon = QString::null); TQDomElement newMenu(TQDomNode& parent, const TQString& appName = TQString::null, const TQString& icon = TQString::null);
}; };
#endif #endif

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include <qlayout.h> #include <ntqlayout.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
@ -35,10 +35,10 @@ static const char description[] =
static const char version[] = "0.5.2"; static const char version[] = "0.5.2";
typedef KGenericFactory<KCMKommando, QWidget> kommandoFactory; typedef KGenericFactory<KCMKommando, TQWidget> kommandoFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kommando, kommandoFactory("kcmkommando")) K_EXPORT_COMPONENT_FACTORY( kcm_kommando, kommandoFactory("kcmkommando"))
KCMKommando::KCMKommando(QWidget *parent, const char *name, const QStringList&) KCMKommando::KCMKommando(TQWidget *parent, const char *name, const TQStringList&)
: KCModule(parent, name), about(0), configDialog(0) : KCModule(parent, name), about(0), configDialog(0)
{ {
about = new KAboutData("kommando", I18N_NOOP("Kommando"), version, description, about = new KAboutData("kommando", I18N_NOOP("Kommando"), version, description,
@ -47,7 +47,7 @@ KCMKommando::KCMKommando(QWidget *parent, const char *name, const QStringList&)
about->addAuthor( "Sergio Cambra", 0, "runico@users.berlios.de" ); about->addAuthor( "Sergio Cambra", 0, "runico@users.berlios.de" );
setAboutData(about); setAboutData(about);
QVBoxLayout* layout = new QVBoxLayout( this ); TQVBoxLayout* layout = new TQVBoxLayout( this );
layout->setAutoAdd( true ); layout->setAutoAdd( true );
configDialog = new ConfigDialogImpl(this); configDialog = new ConfigDialogImpl(this);
connect(configDialog, SIGNAL(changed(bool)), this, SLOT(configChanged(bool))); connect(configDialog, SIGNAL(changed(bool)), this, SLOT(configChanged(bool)));
@ -89,7 +89,7 @@ int KCMKommando::buttons()
} }
QString KCMKommando::quickHelp() const TQString KCMKommando::quickHelp() const
{ {
return i18n("Helpful information about the prueba module."); return i18n("Helpful information about the prueba module.");
} }

@ -32,14 +32,14 @@ class KCMKommando: public KCModule
Q_OBJECT Q_OBJECT
public: public:
KCMKommando( QWidget *parent=0, const char *name=0, const QStringList& = QStringList() ); KCMKommando( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
~KCMKommando(); ~KCMKommando();
virtual void load(); virtual void load();
virtual void save(); virtual void save();
virtual void defaults(); virtual void defaults();
virtual int buttons(); virtual int buttons();
virtual QString quickHelp() const; virtual TQString quickHelp() const;
virtual const KAboutData *aboutData()const { return about; }; virtual const KAboutData *aboutData()const { return about; };
protected slots: protected slots:

@ -27,9 +27,9 @@
#include "configuration.h" #include "configuration.h"
Kommando::Kommando() Kommando::Kommando()
: QWidget( 0, "Kommando", Qt::WDestructiveClose | : TQWidget( 0, "Kommando", TQt::WDestructiveClose |
Qt::WStyle_Customize | TQt::WStyle_Customize |
Qt::WStyle_NoBorder), TQt::WStyle_NoBorder),
actMenu(0), actMenu(0),
navbutton(this), navbutton(this),
oldNavbuttonIconType(0) oldNavbuttonIconType(0)
@ -57,8 +57,8 @@ void Kommando::show( )
int rep_rootx, rep_rooty; int rep_rootx, rep_rooty;
unsigned int rep_mask; unsigned int rep_mask;
int mousex, mousey; int mousex, mousey;
Display* dpy = qt_xdisplay(); Display* dpy = tqt_xdisplay();
Window win = qt_xrootwin(); Window win = tqt_xrootwin();
XClassHint hint; XClassHint hint;
hint.res_class = 0; hint.res_class = 0;
@ -84,16 +84,16 @@ void Kommando::show( )
move(mousex-config.menuRadius(),mousey-config.menuRadius()); move(mousex-config.menuRadius(),mousey-config.menuRadius());
//get the part of the screen the widget is drawn onto and apply a fade effect to it //get the part of the screen the widget is drawn onto and apply a fade effect to it
mScreenshot = QPixmap::grabWindow( qt_xrootwin(), x(), y(), width(), height() ); mScreenshot = TQPixmap::grabWindow( tqt_xrootwin(), x(), y(), width(), height() );
KPixmapEffect::fade( mScreenshot, config.opacity(), config.tintColor() ); KPixmapEffect::fade( mScreenshot, config.opacity(), config.tintColor() );
QWidget::show(); TQWidget::show();
} }
void Kommando::hide( ) void Kommando::hide( )
{ {
selectButton(BUTTON_DESELECT); selectButton(BUTTON_DESELECT);
QWidget::hide(); TQWidget::hide();
} }
void Kommando::toggle( ) void Kommando::toggle( )
@ -128,7 +128,7 @@ void Kommando::setActMenu( Menu * newMenu )
actMenu = newMenu; actMenu = newMenu;
} }
void Kommando::setActTopLevelMenu(const QString& appName ) void Kommando::setActTopLevelMenu(const TQString& appName )
{ {
Menu* menu = 0; Menu* menu = 0;
for(Menu* it = mTopLevelMenus.first(); it != 0; it = mTopLevelMenus.next()){ for(Menu* it = mTopLevelMenus.first(); it != 0; it = mTopLevelMenus.next()){
@ -136,15 +136,15 @@ void Kommando::setActTopLevelMenu(const QString& appName )
menu = it; menu = it;
break; break;
} }
//get a default menu, assume that a toplevel menu with QString::null or "default" as appname is one //get a default menu, assume that a toplevel menu with TQString::null or "default" as appname is one
if ((it->appName() == QString::null) || (it->appName() == "default")){ if ((it->appName() == TQString::null) || (it->appName() == "default")){
menu = it; menu = it;
} }
} }
setActMenu(menu); setActMenu(menu);
} }
void Kommando::setTopLevelMenus( const QPtrList<Menu>& newmenus ) void Kommando::setTopLevelMenus( const TQPtrList<Menu>& newmenus )
{ {
setActMenu(0); setActMenu(0);
//No need to clear the list, because autoDelete is turned on in //No need to clear the list, because autoDelete is turned on in
@ -160,13 +160,13 @@ void Kommando::windowActivationChange( bool oldActive )
} }
} }
void Kommando::paintEvent( QPaintEvent * evt ) void Kommando::paintEvent( TQPaintEvent * evt )
{ {
QPainter p(this); TQPainter p(this);
p.drawPixmap(evt->rect().topLeft(),mScreenshot,evt->rect()); p.drawPixmap(evt->rect().topLeft(),mScreenshot,evt->rect());
} }
void Kommando::wheelEvent( QWheelEvent * evt ) void Kommando::wheelEvent( TQWheelEvent * evt )
{ {
actMenu->selectButton(actMenu->selectedButtonNum()+evt->delta()/120); actMenu->selectButton(actMenu->selectedButtonNum()+evt->delta()/120);
} }
@ -223,36 +223,36 @@ void Kommando::slotButtonSelected( int type )
} }
} }
void Kommando::keyPressEvent( QKeyEvent * evt ) void Kommando::keyPressEvent( TQKeyEvent * evt )
{ {
switch(evt->key()){ switch(evt->key()){
case Qt::Key_Left: case TQt::Key_Left:
actMenu->selectButton(actMenu->selectedButtonNum()-1); actMenu->selectButton(actMenu->selectedButtonNum()-1);
break; break;
case Qt::Key_Right: case TQt::Key_Right:
actMenu->selectButton(actMenu->selectedButtonNum()+1); actMenu->selectButton(actMenu->selectedButtonNum()+1);
break; break;
case Qt::Key_Return: case TQt::Key_Return:
slotNavClick(); slotNavClick();
break; break;
case Qt::Key_Escape: case TQt::Key_Escape:
if(mTopLevelMenus.containsRef(actMenu)){ if(mTopLevelMenus.containsRef(actMenu)){
hide(); hide();
} else { } else {
setActMenu(actMenu->parentMenu()); setActMenu(actMenu->parentMenu());
} }
break; break;
case Qt::Key_1: case TQt::Key_1:
case Qt::Key_2: case TQt::Key_2:
case Qt::Key_3: case TQt::Key_3:
case Qt::Key_4: case TQt::Key_4:
case Qt::Key_5: case TQt::Key_5:
case Qt::Key_6: case TQt::Key_6:
case Qt::Key_7: case TQt::Key_7:
case Qt::Key_8: case TQt::Key_8:
case Qt::Key_9: case TQt::Key_9:
//We want to get the number of the button, so treat the enum as number (yes I know, but it works fine :->) //We want to get the number of the button, so treat the enum as number (yes I know, but it works fine :->)
actMenu->selectButton(evt->key() - Qt::Key_1); actMenu->selectButton(evt->key() - TQt::Key_1);
break; break;
} }
} }
@ -269,7 +269,7 @@ void Kommando::resize( )
Config& config = Config::getSingleton(); Config& config = Config::getSingleton();
setFixedSize(config.menuSize(),config.menuSize()); setFixedSize(config.menuSize(),config.menuSize());
//apply a circular mask //apply a circular mask
QRegion mask(rect(),QRegion::Ellipse); TQRegion mask(rect(),TQRegion::Ellipse);
setMask(mask); setMask(mask);
} }
@ -279,14 +279,14 @@ void Kommando::selectButton( int num )
actMenu->selectButton(num); actMenu->selectButton(num);
} }
void Kommando::mousePressEvent(QMouseEvent* evt) void Kommando::mousePressEvent(TQMouseEvent* evt)
{ {
middleMouseButtonState = (evt->button() == Qt::MidButton); middleMouseButtonState = (evt->button() == TQt::MidButton);
} }
void Kommando::mouseReleaseEvent(QMouseEvent* evt) void Kommando::mouseReleaseEvent(TQMouseEvent* evt)
{ {
if(middleMouseButtonState && (evt->button() == Qt::MidButton)){ if(middleMouseButtonState && (evt->button() == TQt::MidButton)){
middleMouseButtonState = false; middleMouseButtonState = false;
slotNavClick(); slotNavClick();
} }

@ -22,14 +22,14 @@
#ifndef _KOMMANDO_H_ #ifndef _KOMMANDO_H_
#define _KOMMANDO_H_ #define _KOMMANDO_H_
#include <qwidget.h> #include <ntqwidget.h>
#include <qptrlist.h> #include <ntqptrlist.h>
#include <kpixmap.h> #include <kpixmap.h>
#include "menu.h" #include "menu.h"
class Kommando : public QWidget class Kommando : public TQWidget
{ {
Q_OBJECT Q_OBJECT
@ -38,7 +38,7 @@ class Kommando : public QWidget
/* /*
* The window needs to appear at the mousecursors current position * The window needs to appear at the mousecursors current position
* overriding QWidget::show() makes this easy, showEvent() does not * overriding TQWidget::show() makes this easy, showEvent() does not
* work properly though. * work properly though.
*/ */
virtual void show(); virtual void show();
@ -49,11 +49,11 @@ class Kommando : public QWidget
virtual void nextButton() { selectButton(actMenu->selectedButtonNum()+1); } virtual void nextButton() { selectButton(actMenu->selectedButtonNum()+1); }
virtual void previousButton() { selectButton(actMenu->selectedButtonNum()-1); } virtual void previousButton() { selectButton(actMenu->selectedButtonNum()-1); }
virtual void setActTopLevelMenu(const QString& appName); virtual void setActTopLevelMenu(const TQString& appName);
virtual void setActMenu(Menu* newmenu); virtual void setActMenu(Menu* newmenu);
virtual void setTopLevelMenus(const QPtrList<Menu>& newmenus); virtual void setTopLevelMenus(const TQPtrList<Menu>& newmenus);
//virtual Menu* getMainMenu(){return mainMenu;} //virtual Menu* getMainMenu(){return mainMenu;}
virtual const QPixmap* screenshot(){return &mScreenshot;} virtual const TQPixmap* screenshot(){return &mScreenshot;}
virtual void setNavButtonSize(unsigned short size); virtual void setNavButtonSize(unsigned short size);
virtual void resize(); virtual void resize();
@ -63,19 +63,19 @@ class Kommando : public QWidget
protected: protected:
Menu* actMenu; Menu* actMenu;
QPtrList<Menu> mTopLevelMenus; TQPtrList<Menu> mTopLevelMenus;
RoundButton navbutton; RoundButton navbutton;
bool middleMouseButtonState; bool middleMouseButtonState;
int oldNavbuttonIconType; //holds whether the icon should be changed int oldNavbuttonIconType; //holds whether the icon should be changed
KPixmap mScreenshot; KPixmap mScreenshot;
//Some events //Some events
virtual void paintEvent (QPaintEvent* evt); virtual void paintEvent (TQPaintEvent* evt);
virtual void windowActivationChange ( bool oldActive ); virtual void windowActivationChange ( bool oldActive );
virtual void wheelEvent (QWheelEvent * evt); virtual void wheelEvent (TQWheelEvent * evt);
virtual void keyPressEvent(QKeyEvent* evt); virtual void keyPressEvent(TQKeyEvent* evt);
virtual void mousePressEvent(QMouseEvent* evt); virtual void mousePressEvent(TQMouseEvent* evt);
virtual void mouseReleaseEvent(QMouseEvent* evt); virtual void mouseReleaseEvent(TQMouseEvent* evt);
protected slots: protected slots:
virtual void slotOnClick(); virtual void slotOnClick();

@ -18,16 +18,16 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <qmessagebox.h> #include <ntqmessagebox.h>
#include <qdir.h> #include <ntqdir.h>
#include <klocale.h> #include <klocale.h>
#include <qmessagebox.h> #include <ntqmessagebox.h>
#include <kdebug.h> #include <kdebug.h>
#include "kommandod.h" #include "kommandod.h"
#include "configuration.h" #include "configuration.h"
KommandoDaemon::KommandoDaemon(const QCString &name) KommandoDaemon::KommandoDaemon(const TQCString &name)
: KDEDModule(name), Shortcut(this,"Shortcut"), kommandoWin(0) : KDEDModule(name), Shortcut(this,"Shortcut"), kommandoWin(0)
{ {
Config& config = Config::getSingleton(); Config& config = Config::getSingleton();
@ -61,7 +61,7 @@ void KommandoDaemon::reparseConfiguration()
} }
extern "C" { extern "C" {
KDE_EXPORT KDEDModule *create_kommandod(const QCString &obj) KDE_EXPORT KDEDModule *create_kommandod(const TQCString &obj)
{ {
return new KommandoDaemon(obj); return new KommandoDaemon(obj);
} }

@ -33,7 +33,7 @@ class KommandoDaemon : public KDEDModule
K_DCOP K_DCOP
public: public:
KommandoDaemon(const QCString &obj); KommandoDaemon(const TQCString &obj);
~KommandoDaemon(); ~KommandoDaemon();
k_dcop: k_dcop:

@ -19,10 +19,10 @@
***************************************************************************/ ***************************************************************************/
#include "kommandoview.h" #include "kommandoview.h"
KommandoView::KommandoView(QWidget* parent, const QString& name) KommandoView::KommandoView(TQWidget* parent, const TQString& name)
: QListView(parent) : TQListView(parent)
{ {
if(name == QString::null){ if(name == TQString::null){
m_AppName = "default"; m_AppName = "default";
} else { } else {
m_AppName = name; m_AppName = name;
@ -35,17 +35,17 @@ KommandoView::KommandoView(QWidget* parent, const QString& name)
KommandoViewList::KommandoViewList(bool autoDelete) KommandoViewList::KommandoViewList(bool autoDelete)
: QPtrList<KommandoView>() : TQPtrList<KommandoView>()
{ {
setAutoDelete(autoDelete); setAutoDelete(autoDelete);
} }
bool KommandoViewList::contains(const QString& view ) bool KommandoViewList::contains(const TQString& view )
{ {
return getView(view) != 0; return getView(view) != 0;
} }
KommandoView * KommandoViewList::getView(const QString& view ) KommandoView * KommandoViewList::getView(const TQString& view )
{ {
for(KommandoView* it = first(); it != 0; it = next()){ for(KommandoView* it = first(); it != 0; it = next()){
if(it->appName() == view){ if(it->appName() == view){
@ -55,21 +55,21 @@ KommandoView * KommandoViewList::getView(const QString& view )
return 0; return 0;
} }
KommandoView * KommandoViewList::getViewOrDefault( const QString& view ) KommandoView * KommandoViewList::getViewOrDefault( const TQString& view )
{ {
KommandoView* temp = 0; KommandoView* temp = 0;
for(KommandoView* it = first(); it != 0; it = next()){ for(KommandoView* it = first(); it != 0; it = next()){
if(it->appName() == view){ if(it->appName() == view){
return it; return it;
} }
if((it->appName() == "default") || (it->appName() == QString::null)){ if((it->appName() == "default") || (it->appName() == TQString::null)){
temp=it; temp=it;
} }
} }
return temp; return temp;
} }
void KommandoViewList::removeView( const QString & view ) void KommandoViewList::removeView( const TQString & view )
{ {
for(KommandoView* it = first(); it != 0; it = next()){ for(KommandoView* it = first(); it != 0; it = next()){
if(it->appName() == view){ if(it->appName() == view){

@ -20,33 +20,33 @@
#ifndef KOMMANDOVIEW_H #ifndef KOMMANDOVIEW_H
#define KOMMANDOVIEW_H #define KOMMANDOVIEW_H
#include <qlistview.h> #include <ntqlistview.h>
/** /**
@author Daniel Stöckel <the_docter@gmx.net> @author Daniel Stöckel <the_docter@gmx.net>
*/ */
class KommandoView : public QListView class KommandoView : public TQListView
{ {
public: public:
KommandoView(QWidget* parent, const QString& name); KommandoView(TQWidget* parent, const TQString& name);
void setAppName(const QString& theValue){ m_AppName = theValue; } void setAppName(const TQString& theValue){ m_AppName = theValue; }
QString appName() const{ return m_AppName; } TQString appName() const{ return m_AppName; }
private: private:
QString m_AppName; TQString m_AppName;
}; };
class KommandoViewList : public QPtrList<KommandoView> class KommandoViewList : public TQPtrList<KommandoView>
{ {
public: public:
KommandoViewList(bool autoDelete = false); KommandoViewList(bool autoDelete = false);
bool contains(const QString& view); bool contains(const TQString& view);
KommandoView* getView(const QString& view); KommandoView* getView(const TQString& view);
KommandoView* getViewOrDefault(const QString& view); KommandoView* getViewOrDefault(const TQString& view);
void removeView(const QString& view); void removeView(const TQString& view);
}; };

@ -24,8 +24,8 @@
#include "commandobutton.h" #include "commandobutton.h"
#include "configuration.h" #include "configuration.h"
Menu::Menu(Menu* parentMenu, const QString& appName) Menu::Menu(Menu* parentMenu, const TQString& appName)
: QButtonGroup(),mParentMenu(parentMenu),mSelectedButtonNum(BUTTON_DESELECT),mAppName(appName) : TQButtonGroup(),mParentMenu(parentMenu),mSelectedButtonNum(BUTTON_DESELECT),mAppName(appName)
{ {
children.setAutoDelete(true); children.setAutoDelete(true);
} }
@ -34,7 +34,7 @@ Menu::~Menu()
{ {
for(int i=0;i<count();++i) for(int i=0;i<count();++i)
{ {
QButton* temp = find(i); TQButton* temp = find(i);
remove(temp); remove(temp);
delete temp; delete temp;
} }
@ -96,7 +96,7 @@ void Menu::selectButton( int num )
} }
} }
QButton * Menu::selectedButton( ) TQButton * Menu::selectedButton( )
{ {
if(mSelectedButtonNum<0){ if(mSelectedButtonNum<0){
return NULL; return NULL;
@ -104,7 +104,7 @@ QButton * Menu::selectedButton( )
return find(mSelectedButtonNum); return find(mSelectedButtonNum);
} }
int Menu::insert( QButton * button, int id ) int Menu::insert( TQButton * button, int id )
{ {
RoundButton* rButton = static_cast<RoundButton*>(button); RoundButton* rButton = static_cast<RoundButton*>(button);
connect(rButton, SIGNAL(mouseIn(RoundButton*)),this,SLOT(slotMouseIn(RoundButton*))); connect(rButton, SIGNAL(mouseIn(RoundButton*)),this,SLOT(slotMouseIn(RoundButton*)));
@ -114,16 +114,16 @@ int Menu::insert( QButton * button, int id )
children.append(static_cast<SubmenuButton*>(rButton)->subMenu()); children.append(static_cast<SubmenuButton*>(rButton)->subMenu());
} }
return QButtonGroup::insert(button,id); return TQButtonGroup::insert(button,id);
} }
int Menu::insertNoChild( QButton * button, int id ) int Menu::insertNoChild( TQButton * button, int id )
{ {
RoundButton* rButton = static_cast<RoundButton*>(button); RoundButton* rButton = static_cast<RoundButton*>(button);
connect(rButton, SIGNAL(mouseIn(RoundButton*)),this,SLOT(slotMouseIn(RoundButton*))); connect(rButton, SIGNAL(mouseIn(RoundButton*)),this,SLOT(slotMouseIn(RoundButton*)));
connect(rButton, SIGNAL(mouseOut(RoundButton*)),this,SLOT(slotMouseOut())); connect(rButton, SIGNAL(mouseOut(RoundButton*)),this,SLOT(slotMouseOut()));
return QButtonGroup::insert(button,id); return TQButtonGroup::insert(button,id);
} }
void Menu::slotMouseIn(RoundButton* emitter) void Menu::slotMouseIn(RoundButton* emitter)
@ -146,7 +146,7 @@ Menu * Menu::execute( )
return 0; //Well, we shouldn't actually reach this place, as execute is only called if it is sure that a button was selected return 0; //Well, we shouldn't actually reach this place, as execute is only called if it is sure that a button was selected
} }
void Menu::selectButton( QButton * button ) void Menu::selectButton( TQButton * button )
{ {
selectButton(id(button)); selectButton(id(button));
} }

@ -20,8 +20,8 @@
#ifndef MENU_H #ifndef MENU_H
#define MENU_H #define MENU_H
#include <qbuttongroup.h> #include <ntqbuttongroup.h>
#include <qptrlist.h> #include <ntqptrlist.h>
#include "roundbutton.h" #include "roundbutton.h"
@ -29,46 +29,46 @@
class RoundButton; class RoundButton;
class Menu : public QButtonGroup class Menu : public TQButtonGroup
{ {
Q_OBJECT Q_OBJECT
public: public:
Menu(Menu* parentMenu=NULL, const QString& appName=""); Menu(Menu* parentMenu=NULL, const TQString& appName="");
virtual ~Menu(); virtual ~Menu();
virtual Menu* parentMenu(){ return mParentMenu; } virtual Menu* parentMenu(){ return mParentMenu; }
virtual void setParentMenu(Menu* menu){ mParentMenu=menu; } virtual void setParentMenu(Menu* menu){ mParentMenu=menu; }
virtual void selectButton(int num); virtual void selectButton(int num);
virtual void selectButton(QButton* button); virtual void selectButton(TQButton* button);
virtual void showButtons(); virtual void showButtons();
virtual void hideButtons(); virtual void hideButtons();
virtual void arrangeButtons(); virtual void arrangeButtons();
virtual Menu* execute(); virtual Menu* execute();
virtual int insert ( QButton * button, int id = -1 ); virtual int insert ( TQButton * button, int id = -1 );
//use this method for cross linking, otherway there will be problems with deletation //use this method for cross linking, otherway there will be problems with deletation
virtual int insertNoChild( QButton* button, int id = -1); virtual int insertNoChild( TQButton* button, int id = -1);
void setIconPath(const QString& theValue){ mIconPath = theValue; } void setIconPath(const TQString& theValue){ mIconPath = theValue; }
QString IconPath() const{ return mIconPath; } TQString IconPath() const{ return mIconPath; }
int selectedButtonNum() const { return mSelectedButtonNum; } int selectedButtonNum() const { return mSelectedButtonNum; }
virtual QButton* selectedButton(); virtual TQButton* selectedButton();
void setAppName(const QString& theValue){ mAppName = theValue; } void setAppName(const TQString& theValue){ mAppName = theValue; }
QString appName() const { return mAppName; } TQString appName() const { return mAppName; }
signals: signals:
virtual void buttonSelected(int type); virtual void buttonSelected(int type);
protected: protected:
Menu* mParentMenu; Menu* mParentMenu;
QString mIconPath; TQString mIconPath;
QPtrList<Menu> children; TQPtrList<Menu> children;
int mSelectedButtonNum; int mSelectedButtonNum;
QString mAppName; TQString mAppName;
protected slots: protected slots:
void slotMouseIn(RoundButton* emitter); void slotMouseIn(RoundButton* emitter);

@ -21,14 +21,14 @@
#include <kiconloader.h> #include <kiconloader.h>
MenuListViewItem::MenuListViewItem(QListViewItem* parent, QListViewItem* after, QString col1, ItemType type, QString iconPath, QString col2) MenuListViewItem::MenuListViewItem(TQListViewItem* parent, TQListViewItem* after, TQString col1, ItemType type, TQString iconPath, TQString col2)
: QListViewItem(parent,after,col1,col2),mType(type) : TQListViewItem(parent,after,col1,col2),mType(type)
{ {
setIconPath(iconPath); setIconPath(iconPath);
} }
MenuListViewItem::MenuListViewItem(QListView* parent, QListViewItem* after, QString col1, ItemType type, QString iconPath, QString col2) MenuListViewItem::MenuListViewItem(TQListView* parent, TQListViewItem* after, TQString col1, ItemType type, TQString iconPath, TQString col2)
: QListViewItem(parent,after,col1,col2),mType(type) : TQListViewItem(parent,after,col1,col2),mType(type)
{ {
setIconPath(iconPath); setIconPath(iconPath);
} }
@ -37,7 +37,7 @@ MenuListViewItem::~MenuListViewItem()
{ {
} }
void MenuListViewItem::setIconPath(const QString& path) void MenuListViewItem::setIconPath(const TQString& path)
{ {
mIconPath = path; mIconPath = path;
if(mIconPath!=NULL) if(mIconPath!=NULL)

@ -20,29 +20,29 @@
#ifndef MENULISTVIEWITEM_H #ifndef MENULISTVIEWITEM_H
#define MENULISTVIEWITEM_H #define MENULISTVIEWITEM_H
#include <qlistview.h> #include <ntqlistview.h>
class MenuListViewItem : public QListViewItem class MenuListViewItem : public TQListViewItem
{ {
public: public:
enum ItemType{Menu,Button}; enum ItemType{Menu,Button};
//The after parameter is needed to avoid, that the Buttons get reversed everytime the config file is loaded //The after parameter is needed to avoid, that the Buttons get reversed everytime the config file is loaded
MenuListViewItem(QListViewItem* parent, QListViewItem* after, QString col1, ItemType type=Button, QString iconPath=NULL, QString col2=NULL); MenuListViewItem(TQListViewItem* parent, TQListViewItem* after, TQString col1, ItemType type=Button, TQString iconPath=NULL, TQString col2=NULL);
MenuListViewItem(QListView* parent, QListViewItem* after, QString col1, ItemType type=Button, QString iconPath=NULL, QString col2=NULL); MenuListViewItem(TQListView* parent, TQListViewItem* after, TQString col1, ItemType type=Button, TQString iconPath=NULL, TQString col2=NULL);
~MenuListViewItem(); ~MenuListViewItem();
void setType(const ItemType icontype){ mType = icontype; } void setType(const ItemType icontype){ mType = icontype; }
ItemType type() const{ return mType; } ItemType type() const{ return mType; }
void setIconPath(const QString& path); void setIconPath(const TQString& path);
MenuListViewItem* lastChild(); MenuListViewItem* lastChild();
QString iconPath() const { return mIconPath; } TQString iconPath() const { return mIconPath; }
protected: protected:
ItemType mType; ItemType mType;
QString mIconPath; TQString mIconPath;
}; };
#endif #endif

@ -22,16 +22,16 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <qbitmap.h> #include <ntqbitmap.h>
#include "kommando.h" #include "kommando.h"
RoundButton::RoundButton( QWidget* parent, unsigned short rad, const char* name, WFlags f) RoundButton::RoundButton( TQWidget* parent, unsigned short rad, const char* name, WFlags f)
: QButton(parent, name, f) : TQButton(parent, name, f)
{ {
setRadius(rad); setRadius(rad);
//setBackgroundMode(NoBackground); //setBackgroundMode(NoBackground);
//setBackgroundColor(QColor(0,0,0)); //setBackgroundColor(TQColor(0,0,0));
background.resize(width(),height()); background.resize(width(),height());
} }
@ -40,13 +40,13 @@ RoundButton::~RoundButton()
{ {
} }
void RoundButton::drawButton( QPainter *Painter ) void RoundButton::drawButton( TQPainter *Painter )
{ {
Painter->drawPixmap(0,0,background); Painter->drawPixmap(0,0,background);
drawButtonLabel(Painter); drawButtonLabel(Painter);
} }
void RoundButton::drawButtonLabel( QPainter *Painter ) void RoundButton::drawButtonLabel( TQPainter *Painter )
{ {
//Do we have a pixmap? //Do we have a pixmap?
if(!pixmap()){ if(!pixmap()){
@ -58,7 +58,7 @@ void RoundButton::drawButtonLabel( QPainter *Painter )
void RoundButton::move( int x, int y ) void RoundButton::move( int x, int y )
{ {
QButton::move(x-radius,y-radius); TQButton::move(x-radius,y-radius);
} }
void RoundButton::setRadius( int rad ) void RoundButton::setRadius( int rad )
@ -69,7 +69,7 @@ void RoundButton::setRadius( int rad )
//setIcon(mIconPath); //setIcon(mIconPath);
} }
void RoundButton::setIcon( const QString& path ) void RoundButton::setIcon( const TQString& path )
{ {
mIconPath=path; mIconPath=path;
icon=MainBarIcon(path,radius*2); icon=MainBarIcon(path,radius*2);
@ -82,22 +82,22 @@ void RoundButton::show()
//get the buttons part of the screenshot //get the buttons part of the screenshot
copyBlt(&background,0,0,static_cast<Kommando*>(parent())->screenshot(),pos().x(),pos().y(),width(),height()); copyBlt(&background,0,0,static_cast<Kommando*>(parent())->screenshot(),pos().x(),pos().y(),width(),height());
QButton::show(); TQButton::show();
} }
bool RoundButton::event( QEvent * evt ) bool RoundButton::event( TQEvent * evt )
{ {
switch(evt->type()){ switch(evt->type()){
case QEvent::Enter: case TQEvent::Enter:
emit mouseIn(this); emit mouseIn(this);
setActive(true); setActive(true);
return true; return true;
case QEvent::Leave: case TQEvent::Leave:
emit mouseOut(this); emit mouseOut(this);
setActive(false); setActive(false);
return true; return true;
default: default:
return QButton::event(evt); return TQButton::event(evt);
} }
} }
@ -112,7 +112,7 @@ void RoundButton::setActive( bool mode )
//key press events need to be ignored, so that they can be captured by the menu //key press events need to be ignored, so that they can be captured by the menu
/* TODO execution could be placed here! */ /* TODO execution could be placed here! */
void RoundButton::keyPressEvent( QKeyEvent * evt ) void RoundButton::keyPressEvent( TQKeyEvent * evt )
{ {
evt->ignore(); evt->ignore();
} }

@ -20,25 +20,25 @@
#ifndef ROUNDBUTTON_H #ifndef ROUNDBUTTON_H
#define ROUNDBUTTON_H #define ROUNDBUTTON_H
#include <qbutton.h> #include <ntqbutton.h>
#include <qpainter.h> #include <ntqpainter.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <cassert> #include <cassert>
class Menu; class Menu;
class RoundButton : public QButton //well, there were round buttons in the begining at least *g* class RoundButton : public TQButton //well, there were round buttons in the begining at least *g*
{ {
Q_OBJECT Q_OBJECT
public: public:
enum Type {Round, Commando, Submenu}; enum Type {Round, Commando, Submenu};
RoundButton( QWidget* parent=0, unsigned short rad= 32, const char* name= 0, WFlags f = 0); RoundButton( TQWidget* parent=0, unsigned short rad= 32, const char* name= 0, WFlags f = 0);
~RoundButton(); ~RoundButton();
virtual void setRadius(int rad); virtual void setRadius(int rad);
virtual void setIcon(const QString& path); virtual void setIcon(const TQString& path);
virtual void setActive(bool mode); virtual void setActive(bool mode);
//This method should not be called on a RoundButton instance. Childclasses have to implement it. //This method should not be called on a RoundButton instance. Childclasses have to implement it.
@ -57,16 +57,16 @@ class RoundButton : public QButton //well, there were round buttons in the begi
protected: protected:
int radius; int radius;
QPixmap icon; TQPixmap icon;
QString mIconPath; TQString mIconPath;
KPixmap background; KPixmap background;
KIconEffect mEffect; KIconEffect mEffect;
virtual void keyPressEvent(QKeyEvent* evt); virtual void keyPressEvent(TQKeyEvent* evt);
virtual void drawButtonLabel(QPainter*); virtual void drawButtonLabel(TQPainter*);
virtual void drawButton(QPainter*); virtual void drawButton(TQPainter*);
virtual bool event(QEvent* evt); virtual bool event(TQEvent* evt);
}; };
#endif #endif

@ -21,23 +21,23 @@
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <qimage.h> #include <ntqimage.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kservicegroup.h> #include <kservicegroup.h>
#include <ksycoca.h> #include <ksycoca.h>
#include <kdebug.h> #include <kdebug.h>
ServiceMenu::ServiceMenu(QObject *receiver, const char *slotActivatedItem, ServiceMenu::ServiceMenu(TQObject *receiver, const char *slotActivatedItem,
const char *slotActivatedGroup, QWidget *parent, const char *name) const char *slotActivatedGroup, TQWidget *parent, const char *name)
: KPopupMenu(parent, name), m_relPath(QString::null), : KPopupMenu(parent, name), m_relPath(TQString::null),
m_receiver(receiver), m_slotActivatedItem(slotActivatedItem), m_receiver(receiver), m_slotActivatedItem(slotActivatedItem),
m_slotActivatedGroup(slotActivatedGroup) m_slotActivatedGroup(slotActivatedGroup)
{ {
initialize(); initialize();
} }
ServiceMenu::ServiceMenu(const QString & relPath, QObject *receiver, const char *slotActivatedItem, ServiceMenu::ServiceMenu(const TQString & relPath, TQObject *receiver, const char *slotActivatedItem,
const char *slotActivatedGroup, QWidget *parent, const char *name) const char *slotActivatedGroup, TQWidget *parent, const char *name)
: KPopupMenu(parent, name), m_relPath(relPath), : KPopupMenu(parent, name), m_relPath(relPath),
m_receiver(receiver), m_slotActivatedItem(slotActivatedItem), m_receiver(receiver), m_slotActivatedItem(slotActivatedItem),
m_slotActivatedGroup(slotActivatedGroup) m_slotActivatedGroup(slotActivatedGroup)
@ -89,7 +89,7 @@ void ServiceMenu::createMenu()
m_entryMap.insert(mid, static_cast<KSycocaEntry*>(root)); m_entryMap.insert(mid, static_cast<KSycocaEntry*>(root));
insertSeparator(); insertSeparator();
QStringList suppressGenericNames = root->suppressGenericNames(); TQStringList suppressGenericNames = root->suppressGenericNames();
KServiceGroup::List::ConstIterator it = list.begin(); KServiceGroup::List::ConstIterator it = list.begin();
for (; it != list.end(); ++it) { for (; it != list.end(); ++it) {
@ -106,7 +106,7 @@ void ServiceMenu::createMenu()
if ((g->name().at(0) == '.')) if ((g->name().at(0) == '.'))
continue; continue;
QString groupCaption = g->caption(); TQString groupCaption = g->caption();
// Item names may contain ampersands. To avoid them being converted // Item names may contain ampersands. To avoid them being converted
// to accelerators, replace them with two ampersands. // to accelerators, replace them with two ampersands.
@ -118,7 +118,7 @@ void ServiceMenu::createMenu()
int newId = insertItem(getIconSet(g->icon()), groupCaption, m); int newId = insertItem(getIconSet(g->icon()), groupCaption, m);
m_entryMap.insert(newId, static_cast<KSycocaEntry*>(g)); m_entryMap.insert(newId, static_cast<KSycocaEntry*>(g));
// We have to delete the sub menu our selves! (See Qt docs.) // We have to delete the sub menu our selves! (See TQt docs.)
m_subMenus.append(m); m_subMenus.append(m);
} else if (e->isType(KST_KService)) { } else if (e->isType(KST_KService)) {
KService::Ptr s(static_cast<KService *>(e)); KService::Ptr s(static_cast<KService *>(e));
@ -129,12 +129,12 @@ void ServiceMenu::createMenu()
} }
} }
QIconSet ServiceMenu::getIconSet(const QString& icon) const TQIconSet ServiceMenu::getIconSet(const TQString& icon) const
{ {
QIconSet iconset; TQIconSet iconset;
QPixmap normal = KGlobal::instance()->iconLoader()->loadIcon( TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(
icon, KIcon::Small, 0, KIcon::DefaultState, 0L, true); icon, KIcon::Small, 0, KIcon::DefaultState, 0L, true);
QPixmap active = KGlobal::instance()->iconLoader()->loadIcon( TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(
icon, KIcon::Small, 0, KIcon::ActiveState, 0L, true); icon, KIcon::Small, 0, KIcon::ActiveState, 0L, true);
// make sure they are not larger than 20x20 // make sure they are not larger than 20x20
@ -143,33 +143,33 @@ QIconSet ServiceMenu::getIconSet(const QString& icon) const
if (active.width() > 20 || active.height() > 20) if (active.width() > 20 || active.height() > 20)
active.convertFromImage(active.convertToImage().smoothScale(20,20)); active.convertFromImage(active.convertToImage().smoothScale(20,20));
iconset.setPixmap(normal, QIconSet::Small, QIconSet::Normal); iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal);
iconset.setPixmap(active, QIconSet::Small, QIconSet::Active); iconset.setPixmap(active, TQIconSet::Small, TQIconSet::Active);
return iconset; return iconset;
} }
void ServiceMenu::insertMenuItem(KService::Ptr & s, void ServiceMenu::insertMenuItem(KService::Ptr & s,
const QStringList *suppressGenericNames) const TQStringList *suppressGenericNames)
{ {
// check for NoDisplay // check for NoDisplay
if (s->noDisplay()) return; if (s->noDisplay()) return;
QString serviceName = s->name(); TQString serviceName = s->name();
// ignore dotfiles. // ignore dotfiles.
if ((serviceName.at(0) == '.')) return; if ((serviceName.at(0) == '.')) return;
// add comment // add comment
/*if (KickerSettings::detailedMenuEntries()) { /*if (KickerSettings::detailedMenuEntries()) {
QString comment = s->genericName(); TQString comment = s->genericName();
if ( !comment.isEmpty() ) { if ( !comment.isEmpty() ) {
if (KickerSettings::detailedEntriesNamesFirst()) { if (KickerSettings::detailedEntriesNamesFirst()) {
if (!suppressGenericNames || if (!suppressGenericNames ||
!suppressGenericNames->contains(s->untranslatedGenericName())) !suppressGenericNames->contains(s->untranslatedGenericName()))
{ {
serviceName = QString( "%1 (%2)" ).arg( serviceName ).arg( comment ); serviceName = TQString( "%1 (%2)" ).arg( serviceName ).arg( comment );
} }
} else } else
serviceName = QString( "%1 (%2)" ).arg( comment ).arg( serviceName ); serviceName = TQString( "%1 (%2)" ).arg( comment ).arg( serviceName );
} }
} }
*/ */
@ -183,10 +183,10 @@ void ServiceMenu::insertMenuItem(KService::Ptr & s,
// to accelerators, replace them with two ampersands. // to accelerators, replace them with two ampersands.
serviceName.replace("&", "&&"); serviceName.replace("&", "&&");
QIconSet iconset; TQIconSet iconset;
QPixmap normal = KGlobal::instance()->iconLoader()->loadIcon( TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(
s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true);
QPixmap active = KGlobal::instance()->iconLoader()->loadIcon( TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(
s->icon(), KIcon::Small, 0, KIcon::ActiveState, 0L, true); s->icon(), KIcon::Small, 0, KIcon::ActiveState, 0L, true);
// make sure they are not larger than 20x20 // make sure they are not larger than 20x20
@ -195,8 +195,8 @@ void ServiceMenu::insertMenuItem(KService::Ptr & s,
if (active.width() > 20 || active.height() > 20) if (active.width() > 20 || active.height() > 20)
active.convertFromImage(active.convertToImage().smoothScale(20,20)); active.convertFromImage(active.convertToImage().smoothScale(20,20));
iconset.setPixmap(normal, QIconSet::Small, QIconSet::Normal); iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal);
iconset.setPixmap(active, QIconSet::Small, QIconSet::Active); iconset.setPixmap(active, TQIconSet::Small, TQIconSet::Active);
int newId = insertItem(iconset, serviceName); int newId = insertItem(iconset, serviceName);
m_entryMap.insert(newId, static_cast<KSycocaEntry*>(s)); m_entryMap.insert(newId, static_cast<KSycocaEntry*>(s));

@ -34,10 +34,10 @@ class ServiceMenu : public KPopupMenu
{ {
Q_OBJECT Q_OBJECT
public: public:
ServiceMenu(QObject *receiver, const char *slotActivatedItem, ServiceMenu(TQObject *receiver, const char *slotActivatedItem,
const char *slotActivatedGroup, QWidget *parent = 0, const char *name = 0); const char *slotActivatedGroup, TQWidget *parent = 0, const char *name = 0);
ServiceMenu(const QString & relPath, QObject *receiver, const char *slotActivatedItem, ServiceMenu(const TQString & relPath, TQObject *receiver, const char *slotActivatedItem,
const char *slotActivatedGroup, QWidget *parent = 0, const char *name = 0); const char *slotActivatedGroup, TQWidget *parent = 0, const char *name = 0);
~ServiceMenu(); ~ServiceMenu();
@ -50,16 +50,16 @@ protected slots:
void slotActivated(int id); void slotActivated(int id);
private: private:
QIconSet getIconSet(const QString& icon) const; TQIconSet getIconSet(const TQString& icon) const;
QString m_relPath; TQString m_relPath;
QPtrList<QPopupMenu> m_subMenus; TQPtrList<TQPopupMenu> m_subMenus;
QMap<int, KSycocaEntry::Ptr> m_entryMap; TQMap<int, KSycocaEntry::Ptr> m_entryMap;
QObject *m_receiver; TQObject *m_receiver;
const char *m_slotActivatedItem; const char *m_slotActivatedItem;
const char *m_slotActivatedGroup; const char *m_slotActivatedGroup;
void initialize(); void initialize();
void insertMenuItem(KService::Ptr &s, const QStringList *suppressGenericNames = 0); void insertMenuItem(KService::Ptr &s, const TQStringList *suppressGenericNames = 0);
}; };
#endif #endif

Loading…
Cancel
Save