diff options
-rw-r--r-- | acinclude.m4 | 46 | ||||
-rw-r--r-- | aclocal.m4 | 46 | ||||
-rw-r--r-- | src/brightnesschooser.cpp | 54 | ||||
-rw-r--r-- | src/brightnesschooser.h | 44 | ||||
-rw-r--r-- | src/brightnesschooser.ui | 14 | ||||
-rw-r--r-- | src/brightnesschooserimpl.cpp | 74 | ||||
-rw-r--r-- | src/brightnesschooserimpl.h | 12 | ||||
-rw-r--r-- | src/klcddimmer.cpp | 26 | ||||
-rw-r--r-- | src/klcddimmer.h | 14 | ||||
-rw-r--r-- | src/klcddimmerapplet.cpp | 18 | ||||
-rw-r--r-- | src/klcddimmerapplet.h | 18 | ||||
-rw-r--r-- | src/preferences.cpp | 36 | ||||
-rw-r--r-- | src/preferences.h | 58 | ||||
-rw-r--r-- | src/progpreferences.cpp | 96 | ||||
-rw-r--r-- | src/progpreferences.h | 64 | ||||
-rw-r--r-- | src/progpreferences.ui | 36 |
16 files changed, 328 insertions, 328 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4f122d7..9df64a8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1033,7 +1033,7 @@ elif test "$kde_use_qt_emb" = "yes"; then x_includes="" x_libraries="" elif test "$kde_use_qt_mac" = "yes"; then - dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to + dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to dnl be included to get the information) --Sam CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" @@ -1065,19 +1065,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM], AC_REQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext <<EOF #include "confdefs.h" -#include <qglobal.h> -#include <qapplication.h> +#include <ntqglobal.h> +#include <ntqapplication.h> EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<EOF -#include <qevent.h> -#include <qstring.h> -#include <qstyle.h> +#include <ntqevent.h> +#include <ntqstring.h> +#include <ntqstyle.h> EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF -#if QT_VERSION < 210 +#if TQT_VERSION < 210 #error 1 #endif EOF @@ -1086,8 +1086,8 @@ fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF -#include <qcursor.h> -#include <qstylefactory.h> +#include <ntqcursor.h> +#include <ntqstylefactory.h> #include <private/qucomextra_p.h> EOF fi @@ -1170,22 +1170,22 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x03@VER@00" + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00" qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` else - kde_qt_verstring="QT_VERSION >= 300" + kde_qt_verstring="TQT_VERSION >= 300" fi fi if test $kde_qtver = 2; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222" else - kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200" fi fi if test $kde_qtver = 1; then - kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" + kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" fi else kde_qt_verstring="$3" @@ -1291,7 +1291,7 @@ AC_ARG_ENABLE( USING_QT_MT="" dnl ------------------------------------------------------------------------ -dnl If we not get --disable-qt-mt then adjust some vars for the host. +dnl If we not get --disable-tqt-mt then adjust some vars for the host. dnl ------------------------------------------------------------------------ KDE_MT_LDFLAGS= @@ -1354,7 +1354,7 @@ dnl ------------------------------------------------------------ fi dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +dnl If we got --enable-tqt-mt then adjust the Qt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then @@ -1425,9 +1425,9 @@ if test ! "$ac_qt_includes" = "NO"; then fi if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h else - kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h fi AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) @@ -1979,7 +1979,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include <qdom.h> + #include <ntqdom.h> ], [ QDomDocument doc; @@ -2498,7 +2498,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include <qapplication.h>], +[#include <ntqapplication.h>], [ int argc; char** argv; @@ -4205,7 +4205,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include <qimageio.h> -#include <qstring.h> +#include <ntqstring.h> int main() { QString t = "hallo"; t.fill('t'); @@ -4989,7 +4989,7 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) +AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) AC_MSG_RESULT($QTDOCDIR) AC_SUBST(QTDOCDIR) @@ -5010,7 +5010,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) @@ -1045,7 +1045,7 @@ elif test "$kde_use_qt_emb" = "yes"; then x_includes="" x_libraries="" elif test "$kde_use_qt_mac" = "yes"; then - dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to + dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to dnl be included to get the information) --Sam CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" @@ -1077,19 +1077,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM], AC_REQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext <<EOF #include "confdefs.h" -#include <qglobal.h> -#include <qapplication.h> +#include <ntqglobal.h> +#include <ntqapplication.h> EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<EOF -#include <qevent.h> -#include <qstring.h> -#include <qstyle.h> +#include <ntqevent.h> +#include <ntqstring.h> +#include <ntqstyle.h> EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF -#if QT_VERSION < 210 +#if TQT_VERSION < 210 #error 1 #endif EOF @@ -1098,8 +1098,8 @@ fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF -#include <qcursor.h> -#include <qstylefactory.h> +#include <ntqcursor.h> +#include <ntqstylefactory.h> #include <private/qucomextra_p.h> EOF fi @@ -1182,22 +1182,22 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x03@VER@00" + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00" qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` else - kde_qt_verstring="QT_VERSION >= 300" + kde_qt_verstring="TQT_VERSION >= 300" fi fi if test $kde_qtver = 2; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222" else - kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200" fi fi if test $kde_qtver = 1; then - kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" + kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" fi else kde_qt_verstring="$3" @@ -1303,7 +1303,7 @@ AC_ARG_ENABLE( USING_QT_MT="" dnl ------------------------------------------------------------------------ -dnl If we not get --disable-qt-mt then adjust some vars for the host. +dnl If we not get --disable-tqt-mt then adjust some vars for the host. dnl ------------------------------------------------------------------------ KDE_MT_LDFLAGS= @@ -1366,7 +1366,7 @@ dnl ------------------------------------------------------------ fi dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +dnl If we got --enable-tqt-mt then adjust the Qt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then @@ -1437,9 +1437,9 @@ if test ! "$ac_qt_includes" = "NO"; then fi if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h else - kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h fi AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) @@ -1991,7 +1991,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include <qdom.h> + #include <ntqdom.h> ], [ QDomDocument doc; @@ -2510,7 +2510,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include <qapplication.h>], +[#include <ntqapplication.h>], [ int argc; char** argv; @@ -4217,7 +4217,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include <qimageio.h> -#include <qstring.h> +#include <ntqstring.h> int main() { QString t = "hallo"; t.fill('t'); @@ -5001,7 +5001,7 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) +AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) AC_MSG_RESULT($QTDOCDIR) AC_SUBST(QTDOCDIR) @@ -5022,7 +5022,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) diff --git a/src/brightnesschooser.cpp b/src/brightnesschooser.cpp index 2b2c282..6a55991 100644 --- a/src/brightnesschooser.cpp +++ b/src/brightnesschooser.cpp @@ -11,54 +11,54 @@ #include "brightnesschooser.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qslider.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqlabel.h> +#include <ntqslider.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a BrightnessChooser as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -BrightnessChooser::BrightnessChooser( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +BrightnessChooser::BrightnessChooser( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "BrightnessChooser" ); - BrightnessChooserLayout = new QGridLayout( this, 1, 1, 11, 6, "BrightnessChooserLayout"); + BrightnessChooserLayout = new TQGridLayout( this, 1, 1, 11, 6, "BrightnessChooserLayout"); - layout9 = new QGridLayout( 0, 1, 1, 0, 6, "layout9"); + layout9 = new TQGridLayout( 0, 1, 1, 0, 6, "layout9"); - layout7 = new QHBoxLayout( 0, 0, 0, "layout7"); - spacer1 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum ); + layout7 = new TQHBoxLayout( 0, 0, 0, "layout7"); + spacer1 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Minimum ); layout7->addItem( spacer1 ); - layout5 = new QVBoxLayout( 0, 0, 6, "layout5"); + layout5 = new TQVBoxLayout( 0, 0, 6, "layout5"); - valueLabel = new QLabel( this, "valueLabel" ); - valueLabel->setAlignment( int( QLabel::AlignCenter ) ); + valueLabel = new TQLabel( this, "valueLabel" ); + valueLabel->setAlignment( int( TQLabel::AlignCenter ) ); layout5->addWidget( valueLabel ); - brightnessSlider = new QSlider( this, "brightnessSlider" ); - brightnessSlider->setOrientation( QSlider::Vertical ); + brightnessSlider = new TQSlider( this, "brightnessSlider" ); + brightnessSlider->setOrientation( TQSlider::Vertical ); layout5->addWidget( brightnessSlider ); layout7->addLayout( layout5 ); - spacer1_2 = new QSpacerItem( 16, 20, QSizePolicy::Minimum, QSizePolicy::Minimum ); + spacer1_2 = new TQSpacerItem( 16, 20, TQSizePolicy::Minimum, TQSizePolicy::Minimum ); layout7->addItem( spacer1_2 ); layout9->addLayout( layout7, 0, 0 ); - okButton = new QPushButton( this, "okButton" ); - okButton->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, okButton->sizePolicy().hasHeightForWidth() ) ); + okButton = new TQPushButton( this, "okButton" ); + okButton->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, okButton->sizePolicy().hasHeightForWidth() ) ); layout9->addWidget( okButton, 1, 0 ); BrightnessChooserLayout->addLayout( layout9, 0, 0 ); languageChange(); - resize( QSize(124, 163).expandedTo(minimumSizeHint()) ); + resize( TQSize(124, 163).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections @@ -71,7 +71,7 @@ BrightnessChooser::BrightnessChooser( QWidget* parent, const char* name, WFlags */ BrightnessChooser::~BrightnessChooser() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -82,19 +82,19 @@ void BrightnessChooser::languageChange() { setCaption( tr2i18n( "Form1" ) ); valueLabel->setText( tr2i18n( "0" ) ); - QToolTip::add( brightnessSlider, tr2i18n( "set the brightness and click OK or press ENTER" ) ); + TQToolTip::add( brightnessSlider, tr2i18n( "set the brightness and click OK or press ENTER" ) ); okButton->setText( tr2i18n( "&OK" ) ); - okButton->setAccel( QKeySequence( tr2i18n( "Alt+O" ) ) ); + okButton->setAccel( TQKeySequence( tr2i18n( "Alt+O" ) ) ); } void BrightnessChooser::updateBrightness() { - qWarning( "BrightnessChooser::updateBrightness(): Not implemented yet" ); + tqWarning( "BrightnessChooser::updateBrightness(): Not implemented yet" ); } void BrightnessChooser::updateValue(int) { - qWarning( "BrightnessChooser::updateValue(int): Not implemented yet" ); + tqWarning( "BrightnessChooser::updateValue(int): Not implemented yet" ); } #include "brightnesschooser.moc" diff --git a/src/brightnesschooser.h b/src/brightnesschooser.h index 9d36265..26f5134 100644 --- a/src/brightnesschooser.h +++ b/src/brightnesschooser.h @@ -10,40 +10,40 @@ #ifndef BRIGHTNESSCHOOSER_H #define BRIGHTNESSCHOOSER_H -#include <qvariant.h> -#include <qwidget.h> - -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QLabel; -class QSlider; -class QPushButton; - -class BrightnessChooser : public QWidget +#include <ntqvariant.h> +#include <ntqwidget.h> + +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; +class TQLabel; +class TQSlider; +class TQPushButton; + +class BrightnessChooser : public TQWidget { Q_OBJECT public: - BrightnessChooser( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + BrightnessChooser( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~BrightnessChooser(); - QLabel* valueLabel; - QSlider* brightnessSlider; - QPushButton* okButton; + TQLabel* valueLabel; + TQSlider* brightnessSlider; + TQPushButton* okButton; public slots: virtual void updateBrightness(); virtual void updateValue(int); protected: - QGridLayout* BrightnessChooserLayout; - QGridLayout* layout9; - QHBoxLayout* layout7; - QSpacerItem* spacer1; - QSpacerItem* spacer1_2; - QVBoxLayout* layout5; + TQGridLayout* BrightnessChooserLayout; + TQGridLayout* layout9; + TQHBoxLayout* layout7; + TQSpacerItem* spacer1; + TQSpacerItem* spacer1_2; + TQVBoxLayout* layout5; protected slots: virtual void languageChange(); diff --git a/src/brightnesschooser.ui b/src/brightnesschooser.ui index 4f6524f..e2429c5 100644 --- a/src/brightnesschooser.ui +++ b/src/brightnesschooser.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>BrightnessChooser</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>BrightnessChooser</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout9</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout7</cstring> </property> @@ -58,7 +58,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -66,7 +66,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>valueLabel</cstring> </property> @@ -77,7 +77,7 @@ <set>AlignCenter</set> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>brightnessSlider</cstring> </property> @@ -109,7 +109,7 @@ </spacer> </hbox> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>okButton</cstring> </property> diff --git a/src/brightnesschooserimpl.cpp b/src/brightnesschooserimpl.cpp index 30fed3e..60051b6 100644 --- a/src/brightnesschooserimpl.cpp +++ b/src/brightnesschooserimpl.cpp @@ -19,17 +19,17 @@ ***************************************************************************/ #include "brightnesschooserimpl.h" -#include <qprocess.h> -#include <qslider.h> -#include <qlabel.h> -#include <qmessagebox.h> +#include <ntqprocess.h> +#include <ntqslider.h> +#include <ntqlabel.h> +#include <ntqmessagebox.h> #include <kdebug.h> -#include <qevent.h> -#include <qregexp.h> +#include <ntqevent.h> +#include <ntqregexp.h> #include "preferences.h" -BrightnessChooserImpl::BrightnessChooserImpl(QWidget *parent, const char *name) +BrightnessChooserImpl::BrightnessChooserImpl(TQWidget *parent, const char *name) : BrightnessChooser(parent, name), proc(0) { updateSlider(); @@ -50,7 +50,7 @@ BrightnessChooserImpl::~BrightnessChooserImpl() { // in case save the current brightness setting if (Preferences::saveCurrent()) { - const QString &val = getValue(); + const TQString &val = getValue(); kdDebug() << "save the current brightness value: " << val << endl; Preferences::setCurrentValue(val); Preferences::writeConfig(); @@ -59,10 +59,10 @@ BrightnessChooserImpl::~BrightnessChooserImpl() void BrightnessChooserImpl::updateSlider() { - brightnessSlider->setPageStep(QString(Preferences::step()).toInt()); - brightnessSlider->setLineStep(QString(Preferences::step()).toInt()); - brightnessSlider->setRange(QString(Preferences::minValue()).toInt(), - QString(Preferences::maxValue()).toInt()+1); + brightnessSlider->setPageStep(TQString(Preferences::step()).toInt()); + brightnessSlider->setLineStep(TQString(Preferences::step()).toInt()); + brightnessSlider->setRange(TQString(Preferences::minValue()).toInt(), + TQString(Preferences::maxValue()).toInt()+1); valueLabel->setText(getValue()); kdDebug() << "updateSlider" << endl; kdDebug() << "program: " << Preferences::program() << endl; @@ -77,9 +77,9 @@ void BrightnessChooserImpl::updateBrightness() if (proc) delete proc; // delete the previous instance - proc = new QProcess(this); + proc = new TQProcess(this); - QString args = Preferences::setArgument(); + TQString args = Preferences::setArgument(); args += getValue(); proc->addArgument( Preferences::program() ); proc->addArgument( args ); @@ -93,19 +93,19 @@ void BrightnessChooserImpl::updateBrightness() if ( !proc->start() ) { // error handling - QMessageBox::critical( 0, + TQMessageBox::critical( 0, tr("Fatal error"), tr("Could not start the brightness adjustment command."), tr("Quit") ); } - QString arguments = proc->arguments().join(" "); - qWarning("%s", arguments.ascii()); + TQString arguments = proc->arguments().join(" "); + tqWarning("%s", arguments.ascii()); } void BrightnessChooserImpl::getBrightness() { - QString args = Preferences::getArgument(); + TQString args = Preferences::getArgument(); /* some programs, such as nvclock, do not have a parameter to get the current brightness; in such case we simply return */ @@ -117,7 +117,7 @@ void BrightnessChooserImpl::getBrightness() if (proc) delete proc; // delete the previous instance - proc = new QProcess(this); + proc = new TQProcess(this); proc->addArgument( Preferences::program() ); proc->addArgument( args ); @@ -131,14 +131,14 @@ void BrightnessChooserImpl::getBrightness() if ( !proc->start() ) { // error handling - QMessageBox::critical( 0, + TQMessageBox::critical( 0, tr("Fatal error"), tr("Could not start the brightness adjustment command."), tr("Quit") ); } - QString arguments = proc->arguments().join(" "); - qWarning("%s", arguments.ascii()); + TQString arguments = proc->arguments().join(" "); + tqWarning("%s", arguments.ascii()); } void BrightnessChooserImpl::updateValue(int) @@ -150,47 +150,47 @@ void BrightnessChooserImpl::readFromStderr() { // Read and process the data. // Bear in mind that the data might be output in chunks. - QString out = proc->readStderr(); - qWarning( "%s", out.ascii() ); + TQString out = proc->readStderr(); + tqWarning( "%s", out.ascii() ); } void BrightnessChooserImpl::readFromStdout() { // Read and process the data. // Bear in mind that the data might be output in chunks. - QString out = proc->readStdout(); - qWarning( "%s", out.ascii() ); + TQString out = proc->readStdout(); + tqWarning( "%s", out.ascii() ); } void BrightnessChooserImpl::readValueFromStdout() { // Read and process the data. // Bear in mind that the data might be output in chunks. - QString out = proc->readStdout(); - QRegExp regexp("(\\d+)"); + TQString out = proc->readStdout(); + TQRegExp regexp("(\\d+)"); if (regexp.search(out) > 0) { - QString result = regexp.cap(1); + TQString result = regexp.cap(1); kdDebug() << "initial slider value: " << brightnessSlider->value() << endl; kdDebug() << "captured result: " << result << endl; brightnessSlider->setValue(brightnessSlider->maxValue() - result.toInt()); kdDebug() << "updated slider value: " << brightnessSlider->value() << endl; } - qWarning( "%s", out.ascii() ); + tqWarning( "%s", out.ascii() ); } void BrightnessChooserImpl::procExited() { - qWarning("process terminated"); + tqWarning("process terminated"); emit valueUpdated(); } -const QString BrightnessChooserImpl::getValue() +const TQString BrightnessChooserImpl::getValue() { - return QString::number((brightnessSlider->maxValue() - brightnessSlider->value())); + return TQString::number((brightnessSlider->maxValue() - brightnessSlider->value())); } -void BrightnessChooserImpl::setValue(const QString &val) +void BrightnessChooserImpl::setValue(const TQString &val) { int iVal = brightnessSlider->maxValue() - val.toInt(); kdDebug() << "set slider value: " << iVal << endl; @@ -198,15 +198,15 @@ void BrightnessChooserImpl::setValue(const QString &val) updateBrightness(); } -void BrightnessChooserImpl::keyPressEvent(QKeyEvent *event) +void BrightnessChooserImpl::keyPressEvent(TQKeyEvent *event) { /* intercept ENTER and simulate the OK button; also intercept ESC in order to close the parent widget (otherwise ESC is passed to the applet which seems to close the main panel?)*/ - if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) { + if (event->key() == TQt::Key_Return || event->key() == TQt::Key_Enter) { kdDebug() << "pressed ENTER" << endl; updateBrightness(); - } else if (event->key() == Qt::Key_Escape) { + } else if (event->key() == TQt::Key_Escape) { kdDebug() << "pressed ESC" << endl; parentWidget()->close(); } else { diff --git a/src/brightnesschooserimpl.h b/src/brightnesschooserimpl.h index 2bf2fa9..c97786e 100644 --- a/src/brightnesschooserimpl.h +++ b/src/brightnesschooserimpl.h @@ -22,7 +22,7 @@ #include <brightnesschooser.h> -class QProcess; +class TQProcess; /** Implementation slots for BrightnessChooser @@ -33,7 +33,7 @@ class BrightnessChooserImpl : public BrightnessChooser { Q_OBJECT public: - BrightnessChooserImpl(QWidget *parent = 0, const char *name = 0); + BrightnessChooserImpl(TQWidget *parent = 0, const char *name = 0); ~BrightnessChooserImpl(); @@ -47,13 +47,13 @@ public: * Returns the current value of brightness. * @return */ - const QString getValue(); + const TQString getValue(); /** * Sets the current value of brightness * @param val */ - void setValue(const QString &val); + void setValue(const TQString &val); /// retrieve the current brightness void getBrightness(); @@ -68,14 +68,14 @@ public: private: /// process instance used to adjust brightness - QProcess *proc; + TQProcess *proc; signals: void valueUpdated(); protected: /// to intercept the Enter key press and direct it to OK button - void keyPressEvent( QKeyEvent * ); + void keyPressEvent( TQKeyEvent * ); }; diff --git a/src/klcddimmer.cpp b/src/klcddimmer.cpp index 971c7c1..f5a8e13 100644 --- a/src/klcddimmer.cpp +++ b/src/klcddimmer.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <qlcdnumber.h> +#include <ntqlcdnumber.h> #include <kglobal.h> #include <klocale.h> #include <kconfigdialog.h> @@ -28,8 +28,8 @@ #include <kdatetbl.h> // for KPopupFrame #include <kiconloader.h> #include <kaboutapplication.h> -#include <qlabel.h> -#include <qframe.h> +#include <ntqlabel.h> +#include <ntqframe.h> #include <kdebug.h> #ifdef HAVE_CONFIG_H @@ -43,7 +43,7 @@ #include "klcddimmerapplet.h" -klcddimmer::klcddimmer(const QString& configFile, Type type, int actions, QWidget *parent, const char *name) +klcddimmer::klcddimmer(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), mBrightnessChooserFrame(0) { @@ -51,14 +51,14 @@ klcddimmer::klcddimmer(const QString& configFile, Type type, int actions, QWidge ksConfig = config(); /* - QLCDNumber *w = new QLCDNumber(this); + TQLCDNumber *w = new TQLCDNumber(this); w->display(42); */ // this is the popup windows that is shown when the left button is pressed mBrightnessChooserFrame = new KPopupFrame(this); - //mBrightnessChooserFrame = new QWidget - // (this, "klcddimmer popup", WStyle_Customize | WType_Popup | Qt::WStyle_DialogBorder); + //mBrightnessChooserFrame = new TQWidget + // (this, "klcddimmer popup", WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder); chooser = new BrightnessChooserImpl(mBrightnessChooserFrame); mBrightnessChooserFrame->setMainWidget(chooser); mBrightnessChooserFrame->resize(chooser->size()); @@ -68,8 +68,8 @@ klcddimmer::klcddimmer(const QString& configFile, Type type, int actions, QWidge initContextMenu(); /* - QFrame *w = new QFrame(this); - valueLabel = new QLabel(w); + TQFrame *w = new TQFrame(this); + valueLabel = new TQLabel(w); valueLabel->setText(chooser->getValue()); */ @@ -78,7 +78,7 @@ klcddimmer::klcddimmer(const QString& configFile, Type type, int actions, QWidge // klcddimmerView->brightnessIcon->setPixmap(SmallIcon("klcddimmer")); klcddimmerView->setBrightnessLevel(chooser->getValue()); - //klcddimmerView->resize( QSize(122, 48).expandedTo(minimumSizeHint()) ); + //klcddimmerView->resize( TQSize(122, 48).expandedTo(minimumSizeHint()) ); mainView->show(); @@ -157,7 +157,7 @@ int klcddimmer::heightForWidth( int width ) const } -void klcddimmer::resizeEvent(QResizeEvent *e) +void klcddimmer::resizeEvent(TQResizeEvent *e) { klcddimmerView->resize(this->width(),this->height()); } @@ -174,7 +174,7 @@ void klcddimmer::initContextMenu() setCustomMenu(mContextMenu); } -void klcddimmer::mousePressEvent(QMouseEvent *e) +void klcddimmer::mousePressEvent(TQMouseEvent *e) { if ( e->button() == LeftButton ) { @@ -201,7 +201,7 @@ void klcddimmer::valueUpdate() extern "C" { - KPanelApplet* init( QWidget *parent, const QString& configFile) + KPanelApplet* init( TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("klcddimmer"); return new klcddimmer(configFile, KPanelApplet::Normal, diff --git a/src/klcddimmer.h b/src/klcddimmer.h index d8ee218..51f7f1d 100644 --- a/src/klcddimmer.h +++ b/src/klcddimmer.h @@ -26,7 +26,7 @@ #endif #include <kpanelapplet.h> -#include <qstring.h> +#include <ntqstring.h> #include <kconfig.h> class KPopupMenu; @@ -46,10 +46,10 @@ public: * @param Type The applet @ref type(). * @param actions Standard RMB menu actions supported by the applet (see @ref action() ). * @param parent The pointer to the parent widget handed over in the factory function. - * @param name A Qt object name for your applet. + * @param name A TQt object name for your applet. **/ - klcddimmer(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + klcddimmer(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); /** destructor */ ~klcddimmer(); @@ -125,12 +125,12 @@ public: virtual void valueUpdate(); protected: - void resizeEvent(QResizeEvent *); - void mousePressEvent(QMouseEvent *e); + void resizeEvent(TQResizeEvent *); + void mousePressEvent(TQMouseEvent *e); private: KConfig *ksConfig; - QWidget *mainView; + TQWidget *mainView; KPopupMenu *mContextMenu; KPopupFrame *mBrightnessChooserFrame; BrightnessChooserImpl *chooser; diff --git a/src/klcddimmerapplet.cpp b/src/klcddimmerapplet.cpp index 2c64bfb..a77412f 100644 --- a/src/klcddimmerapplet.cpp +++ b/src/klcddimmerapplet.cpp @@ -19,21 +19,21 @@ ***************************************************************************/ #include "klcddimmerapplet.h" -#include <qpixmap.h> -#include <qlabel.h> +#include <ntqpixmap.h> +#include <ntqlabel.h> #include <kiconloader.h> -#include <qlayout.h> +#include <ntqlayout.h> -KlcdDimmerApplet::KlcdDimmerApplet(QWidget *parent, const char *name) - : QWidget(parent, name) +KlcdDimmerApplet::KlcdDimmerApplet(TQWidget *parent, const char *name) + : TQWidget(parent, name) { // the icon and the text will be aligned vertically centered - layout = new QVBoxLayout(this); + layout = new TQVBoxLayout(this); - brightnessIcon = new QLabel(this); + brightnessIcon = new TQLabel(this); brightnessIcon->setAlignment(AlignCenter); brightnessIcon->setBackgroundOrigin(AncestorOrigin); - brightnessLevel = new QLabel(this); + brightnessLevel = new TQLabel(this); brightnessLevel->setAlignment(AlignCenter); // use the same background of the panel brightnessLevel->setBackgroundOrigin(AncestorOrigin); @@ -49,7 +49,7 @@ KlcdDimmerApplet::~KlcdDimmerApplet() { } -void KlcdDimmerApplet::setBrightnessLevel(const QString &level) +void KlcdDimmerApplet::setBrightnessLevel(const TQString &level) { brightnessLevel->setText(level); } diff --git a/src/klcddimmerapplet.h b/src/klcddimmerapplet.h index 2e5067b..02ef15b 100644 --- a/src/klcddimmerapplet.h +++ b/src/klcddimmerapplet.h @@ -20,31 +20,31 @@ #ifndef KLCDDIMMERAPPLET_H #define KLCDDIMMERAPPLET_H -#include <qwidget.h> +#include <ntqwidget.h> -class QLabel; -class QBoxLayout; +class TQLabel; +class TQBoxLayout; /** * The actual graphical representation for KlcdDimmer * @author Lorenzo Bettini, http://www.lorenzobettini.it,, */ -class KlcdDimmerApplet : public QWidget +class KlcdDimmerApplet : public TQWidget { Q_OBJECT public: - KlcdDimmerApplet(QWidget *parent=0, const char *name=0); + KlcdDimmerApplet(TQWidget *parent=0, const char *name=0); ~KlcdDimmerApplet(); - void setBrightnessLevel(const QString &level); + void setBrightnessLevel(const TQString &level); protected: - QLabel* brightnessLevel; - QLabel* brightnessIcon; + TQLabel* brightnessLevel; + TQLabel* brightnessIcon; - QBoxLayout *layout; + TQBoxLayout *layout; }; #endif diff --git a/src/preferences.cpp b/src/preferences.cpp index 11bc28d..b8e6328 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -19,35 +19,35 @@ Preferences *Preferences::self() } Preferences::Preferences( ) - : KConfigSkeleton( QString::fromLatin1( "klcddimmerrc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "klcddimmerrc" ) ) { mSelf = this; - setCurrentGroup( QString::fromLatin1( "general" ) ); + setCurrentGroup( TQString::fromLatin1( "general" ) ); KConfigSkeleton::ItemString *itemProgram; - itemProgram = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "Program" ), mProgram, QString::fromLatin1( "smartdimmer" ) ); - addItem( itemProgram, QString::fromLatin1( "Program" ) ); + itemProgram = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Program" ), mProgram, TQString::fromLatin1( "smartdimmer" ) ); + addItem( itemProgram, TQString::fromLatin1( "Program" ) ); KConfigSkeleton::ItemString *itemSetArgument; - itemSetArgument = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "SetArgument" ), mSetArgument, QString::fromLatin1( "-s" ) ); - addItem( itemSetArgument, QString::fromLatin1( "SetArgument" ) ); + itemSetArgument = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "SetArgument" ), mSetArgument, TQString::fromLatin1( "-s" ) ); + addItem( itemSetArgument, TQString::fromLatin1( "SetArgument" ) ); KConfigSkeleton::ItemString *itemGetArgument; - itemGetArgument = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "GetArgument" ), mGetArgument, QString::fromLatin1( "-g" ) ); - addItem( itemGetArgument, QString::fromLatin1( "GetArgument" ) ); + itemGetArgument = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "GetArgument" ), mGetArgument, TQString::fromLatin1( "-g" ) ); + addItem( itemGetArgument, TQString::fromLatin1( "GetArgument" ) ); KConfigSkeleton::ItemString *itemMinValue; - itemMinValue = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "MinValue" ), mMinValue, QString::fromLatin1( "1" ) ); - addItem( itemMinValue, QString::fromLatin1( "MinValue" ) ); + itemMinValue = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MinValue" ), mMinValue, TQString::fromLatin1( "1" ) ); + addItem( itemMinValue, TQString::fromLatin1( "MinValue" ) ); KConfigSkeleton::ItemString *itemMaxValue; - itemMaxValue = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "MaxValue" ), mMaxValue, QString::fromLatin1( "21" ) ); - addItem( itemMaxValue, QString::fromLatin1( "MaxValue" ) ); + itemMaxValue = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MaxValue" ), mMaxValue, TQString::fromLatin1( "21" ) ); + addItem( itemMaxValue, TQString::fromLatin1( "MaxValue" ) ); KConfigSkeleton::ItemString *itemStep; - itemStep = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "Step" ), mStep, QString::fromLatin1( "1" ) ); - addItem( itemStep, QString::fromLatin1( "Step" ) ); + itemStep = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Step" ), mStep, TQString::fromLatin1( "1" ) ); + addItem( itemStep, TQString::fromLatin1( "Step" ) ); KConfigSkeleton::ItemBool *itemSaveCurrent; - itemSaveCurrent = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "SaveCurrent" ), mSaveCurrent, false ); - addItem( itemSaveCurrent, QString::fromLatin1( "SaveCurrent" ) ); + itemSaveCurrent = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SaveCurrent" ), mSaveCurrent, false ); + addItem( itemSaveCurrent, TQString::fromLatin1( "SaveCurrent" ) ); KConfigSkeleton::ItemString *itemCurrentValue; - itemCurrentValue = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "CurrentValue" ), mCurrentValue ); - addItem( itemCurrentValue, QString::fromLatin1( "CurrentValue" ) ); + itemCurrentValue = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "CurrentValue" ), mCurrentValue ); + addItem( itemCurrentValue, TQString::fromLatin1( "CurrentValue" ) ); } Preferences::~Preferences() diff --git a/src/preferences.h b/src/preferences.h index 7966ccc..f21be7f 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -17,9 +17,9 @@ class Preferences : public KConfigSkeleton Set program to adjust lcd brightness */ static - void setProgram( const QString & v ) + void setProgram( const TQString & v ) { - if (!self()->isImmutable( QString::fromLatin1( "Program" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "Program" ) )) self()->mProgram = v; } @@ -27,7 +27,7 @@ class Preferences : public KConfigSkeleton Get program to adjust lcd brightness */ static - QString program() + TQString program() { return self()->mProgram; } @@ -36,9 +36,9 @@ class Preferences : public KConfigSkeleton Set argument to set the brighness */ static - void setSetArgument( const QString & v ) + void setSetArgument( const TQString & v ) { - if (!self()->isImmutable( QString::fromLatin1( "SetArgument" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "SetArgument" ) )) self()->mSetArgument = v; } @@ -46,7 +46,7 @@ class Preferences : public KConfigSkeleton Get argument to set the brighness */ static - QString setArgument() + TQString setArgument() { return self()->mSetArgument; } @@ -55,9 +55,9 @@ class Preferences : public KConfigSkeleton Set argument to get the brighness */ static - void setGetArgument( const QString & v ) + void setGetArgument( const TQString & v ) { - if (!self()->isImmutable( QString::fromLatin1( "GetArgument" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "GetArgument" ) )) self()->mGetArgument = v; } @@ -65,7 +65,7 @@ class Preferences : public KConfigSkeleton Get argument to get the brighness */ static - QString getArgument() + TQString getArgument() { return self()->mGetArgument; } @@ -74,9 +74,9 @@ class Preferences : public KConfigSkeleton Set minimum value for brightness */ static - void setMinValue( const QString & v ) + void setMinValue( const TQString & v ) { - if (!self()->isImmutable( QString::fromLatin1( "MinValue" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "MinValue" ) )) self()->mMinValue = v; } @@ -84,7 +84,7 @@ class Preferences : public KConfigSkeleton Get minimum value for brightness */ static - QString minValue() + TQString minValue() { return self()->mMinValue; } @@ -93,9 +93,9 @@ class Preferences : public KConfigSkeleton Set maximum value for brightness */ static - void setMaxValue( const QString & v ) + void setMaxValue( const TQString & v ) { - if (!self()->isImmutable( QString::fromLatin1( "MaxValue" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "MaxValue" ) )) self()->mMaxValue = v; } @@ -103,7 +103,7 @@ class Preferences : public KConfigSkeleton Get maximum value for brightness */ static - QString maxValue() + TQString maxValue() { return self()->mMaxValue; } @@ -112,9 +112,9 @@ class Preferences : public KConfigSkeleton Set step to increment */ static - void setStep( const QString & v ) + void setStep( const TQString & v ) { - if (!self()->isImmutable( QString::fromLatin1( "Step" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "Step" ) )) self()->mStep = v; } @@ -122,7 +122,7 @@ class Preferences : public KConfigSkeleton Get step to increment */ static - QString step() + TQString step() { return self()->mStep; } @@ -133,7 +133,7 @@ class Preferences : public KConfigSkeleton static void setSaveCurrent( bool v ) { - if (!self()->isImmutable( QString::fromLatin1( "SaveCurrent" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "SaveCurrent" ) )) self()->mSaveCurrent = v; } @@ -150,9 +150,9 @@ class Preferences : public KConfigSkeleton Set the current brightness value */ static - void setCurrentValue( const QString & v ) + void setCurrentValue( const TQString & v ) { - if (!self()->isImmutable( QString::fromLatin1( "CurrentValue" ) )) + if (!self()->isImmutable( TQString::fromLatin1( "CurrentValue" ) )) self()->mCurrentValue = v; } @@ -160,7 +160,7 @@ class Preferences : public KConfigSkeleton Get the current brightness value */ static - QString currentValue() + TQString currentValue() { return self()->mCurrentValue; } @@ -176,14 +176,14 @@ class Preferences : public KConfigSkeleton // general - QString mProgram; - QString mSetArgument; - QString mGetArgument; - QString mMinValue; - QString mMaxValue; - QString mStep; + TQString mProgram; + TQString mSetArgument; + TQString mGetArgument; + TQString mMinValue; + TQString mMaxValue; + TQString mStep; bool mSaveCurrent; - QString mCurrentValue; + TQString mCurrentValue; private: }; diff --git a/src/progpreferences.cpp b/src/progpreferences.cpp index 0070f19..d15e3f0 100644 --- a/src/progpreferences.cpp +++ b/src/progpreferences.cpp @@ -11,95 +11,95 @@ #include "progpreferences.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qlineedit.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqlabel.h> +#include <ntqlineedit.h> #include <knuminput.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqcheckbox.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a ProgPreferences as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -ProgPreferences::ProgPreferences( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +ProgPreferences::ProgPreferences( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "ProgPreferences" ); - ProgPreferencesLayout = new QGridLayout( this, 1, 1, 11, 6, "ProgPreferencesLayout"); + ProgPreferencesLayout = new TQGridLayout( this, 1, 1, 11, 6, "ProgPreferencesLayout"); - layout11 = new QVBoxLayout( 0, 0, 6, "layout11"); + layout11 = new TQVBoxLayout( 0, 0, 6, "layout11"); - layout2 = new QHBoxLayout( 0, 0, 6, "layout2"); + layout2 = new TQHBoxLayout( 0, 0, 6, "layout2"); - textLabel1 = new QLabel( this, "textLabel1" ); + textLabel1 = new TQLabel( this, "textLabel1" ); layout2->addWidget( textLabel1 ); - kcfg_Program = new QLineEdit( this, "kcfg_Program" ); + kcfg_Program = new TQLineEdit( this, "kcfg_Program" ); layout2->addWidget( kcfg_Program ); layout11->addLayout( layout2 ); - layout3 = new QHBoxLayout( 0, 0, 6, "layout3"); + layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); - textLabel2 = new QLabel( this, "textLabel2" ); + textLabel2 = new TQLabel( this, "textLabel2" ); layout3->addWidget( textLabel2 ); - kcfg_SetArgument = new QLineEdit( this, "kcfg_SetArgument" ); + kcfg_SetArgument = new TQLineEdit( this, "kcfg_SetArgument" ); layout3->addWidget( kcfg_SetArgument ); layout11->addLayout( layout3 ); - layout3_2 = new QHBoxLayout( 0, 0, 6, "layout3_2"); + layout3_2 = new TQHBoxLayout( 0, 0, 6, "layout3_2"); - textLabel2_2 = new QLabel( this, "textLabel2_2" ); + textLabel2_2 = new TQLabel( this, "textLabel2_2" ); layout3_2->addWidget( textLabel2_2 ); - kcfg_GetArgument = new QLineEdit( this, "kcfg_GetArgument" ); + kcfg_GetArgument = new TQLineEdit( this, "kcfg_GetArgument" ); layout3_2->addWidget( kcfg_GetArgument ); layout11->addLayout( layout3_2 ); - layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); + layout7 = new TQHBoxLayout( 0, 0, 6, "layout7"); - textLabel3 = new QLabel( this, "textLabel3" ); + textLabel3 = new TQLabel( this, "textLabel3" ); layout7->addWidget( textLabel3 ); - spacer1 = new QSpacerItem( 40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1 = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); layout7->addItem( spacer1 ); kcfg_MinValue = new KIntNumInput( this, "kcfg_MinValue" ); layout7->addWidget( kcfg_MinValue ); layout11->addLayout( layout7 ); - layout7_2 = new QHBoxLayout( 0, 0, 6, "layout7_2"); + layout7_2 = new TQHBoxLayout( 0, 0, 6, "layout7_2"); - textLabel3_2 = new QLabel( this, "textLabel3_2" ); + textLabel3_2 = new TQLabel( this, "textLabel3_2" ); layout7_2->addWidget( textLabel3_2 ); - spacer1_2 = new QSpacerItem( 40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1_2 = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); layout7_2->addItem( spacer1_2 ); kcfg_MaxValue = new KIntNumInput( this, "kcfg_MaxValue" ); layout7_2->addWidget( kcfg_MaxValue ); layout11->addLayout( layout7_2 ); - layout7_2_2 = new QHBoxLayout( 0, 0, 6, "layout7_2_2"); + layout7_2_2 = new TQHBoxLayout( 0, 0, 6, "layout7_2_2"); - textLabel3_2_2 = new QLabel( this, "textLabel3_2_2" ); + textLabel3_2_2 = new TQLabel( this, "textLabel3_2_2" ); layout7_2_2->addWidget( textLabel3_2_2 ); - spacer1_2_2 = new QSpacerItem( 40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1_2_2 = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); layout7_2_2->addItem( spacer1_2_2 ); kcfg_Step = new KIntNumInput( this, "kcfg_Step" ); layout7_2_2->addWidget( kcfg_Step ); layout11->addLayout( layout7_2_2 ); - kcfg_SaveCurrent = new QCheckBox( this, "kcfg_SaveCurrent" ); + kcfg_SaveCurrent = new TQCheckBox( this, "kcfg_SaveCurrent" ); layout11->addWidget( kcfg_SaveCurrent ); ProgPreferencesLayout->addLayout( layout11, 0, 0 ); languageChange(); - resize( QSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -108,7 +108,7 @@ ProgPreferences::ProgPreferences( QWidget* parent, const char* name, WFlags fl ) */ ProgPreferences::~ProgPreferences() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -119,32 +119,32 @@ void ProgPreferences::languageChange() { setCaption( tr2i18n( "Form1" ) ); textLabel1->setText( tr2i18n( "program" ) ); - QToolTip::add( kcfg_Program, tr2i18n( "the program to set the brightness" ) ); - QWhatsThis::add( kcfg_Program, tr2i18n( "the program to set the brightness" ) ); + TQToolTip::add( kcfg_Program, tr2i18n( "the program to set the brightness" ) ); + TQWhatsThis::add( kcfg_Program, tr2i18n( "the program to set the brightness" ) ); textLabel2->setText( tr2i18n( "set argument" ) ); - QToolTip::add( kcfg_SetArgument, tr2i18n( "the argument to pass to the program<br>to set the brightness" ) ); - QWhatsThis::add( kcfg_SetArgument, tr2i18n( "the argument to pass to the program<br>\n" + TQToolTip::add( kcfg_SetArgument, tr2i18n( "the argument to pass to the program<br>to set the brightness" ) ); + TQWhatsThis::add( kcfg_SetArgument, tr2i18n( "the argument to pass to the program<br>\n" "to set the brightness" ) ); textLabel2_2->setText( tr2i18n( "get argument" ) ); - QToolTip::add( kcfg_GetArgument, tr2i18n( "the argument to pass to the program<br>to get the brightness" ) ); - QWhatsThis::add( kcfg_GetArgument, tr2i18n( "the argument to pass to the program<br>\n" + TQToolTip::add( kcfg_GetArgument, tr2i18n( "the argument to pass to the program<br>to get the brightness" ) ); + TQWhatsThis::add( kcfg_GetArgument, tr2i18n( "the argument to pass to the program<br>\n" "to get the brightness.\n" "<p>\n" "This can be left empty if the program does not support\n" "a \"get\" argument." ) ); textLabel3->setText( tr2i18n( "minimum value" ) ); - QToolTip::add( kcfg_MinValue, tr2i18n( "the minimum value for the brightness" ) ); - QWhatsThis::add( kcfg_MinValue, tr2i18n( "brightness" ) ); + TQToolTip::add( kcfg_MinValue, tr2i18n( "the minimum value for the brightness" ) ); + TQWhatsThis::add( kcfg_MinValue, tr2i18n( "brightness" ) ); textLabel3_2->setText( tr2i18n( "maximum value" ) ); - QToolTip::add( kcfg_MaxValue, tr2i18n( "the maximum value for the brightness" ) ); - QWhatsThis::add( kcfg_MaxValue, tr2i18n( "brightness" ) ); + TQToolTip::add( kcfg_MaxValue, tr2i18n( "the maximum value for the brightness" ) ); + TQWhatsThis::add( kcfg_MaxValue, tr2i18n( "brightness" ) ); textLabel3_2_2->setText( tr2i18n( "step" ) ); - QToolTip::add( kcfg_Step, tr2i18n( "step value<br>to increment/decrement the brightness" ) ); - QWhatsThis::add( kcfg_Step, tr2i18n( "brightness" ) ); + TQToolTip::add( kcfg_Step, tr2i18n( "step value<br>to increment/decrement the brightness" ) ); + TQWhatsThis::add( kcfg_Step, tr2i18n( "brightness" ) ); kcfg_SaveCurrent->setText( tr2i18n( "S&ave the current brightness value" ) ); - kcfg_SaveCurrent->setAccel( QKeySequence( tr2i18n( "Alt+A" ) ) ); - QToolTip::add( kcfg_SaveCurrent, tr2i18n( "When closing, it saves the current brightness value<br>so that it can be restored<br>when the applet starts." ) ); - QWhatsThis::add( kcfg_SaveCurrent, tr2i18n( "When closing, it saves the current brightness value<br>\n" + kcfg_SaveCurrent->setAccel( TQKeySequence( tr2i18n( "Alt+A" ) ) ); + TQToolTip::add( kcfg_SaveCurrent, tr2i18n( "When closing, it saves the current brightness value<br>so that it can be restored<br>when the applet starts." ) ); + TQWhatsThis::add( kcfg_SaveCurrent, tr2i18n( "When closing, it saves the current brightness value<br>\n" "so that it can be restored<br>\n" "when the applet starts." ) ); } diff --git a/src/progpreferences.h b/src/progpreferences.h index aceaf95..9d1fa9e 100644 --- a/src/progpreferences.h +++ b/src/progpreferences.h @@ -10,52 +10,52 @@ #ifndef PROGPREFERENCES_H #define PROGPREFERENCES_H -#include <qvariant.h> -#include <qwidget.h> +#include <ntqvariant.h> +#include <ntqwidget.h> -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QLabel; -class QLineEdit; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; +class TQLabel; +class TQLineEdit; class KIntNumInput; -class QCheckBox; +class TQCheckBox; -class ProgPreferences : public QWidget +class ProgPreferences : public TQWidget { Q_OBJECT public: - ProgPreferences( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ProgPreferences( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~ProgPreferences(); - QLabel* textLabel1; - QLineEdit* kcfg_Program; - QLabel* textLabel2; - QLineEdit* kcfg_SetArgument; - QLabel* textLabel2_2; - QLineEdit* kcfg_GetArgument; - QLabel* textLabel3; + TQLabel* textLabel1; + TQLineEdit* kcfg_Program; + TQLabel* textLabel2; + TQLineEdit* kcfg_SetArgument; + TQLabel* textLabel2_2; + TQLineEdit* kcfg_GetArgument; + TQLabel* textLabel3; KIntNumInput* kcfg_MinValue; - QLabel* textLabel3_2; + TQLabel* textLabel3_2; KIntNumInput* kcfg_MaxValue; - QLabel* textLabel3_2_2; + TQLabel* textLabel3_2_2; KIntNumInput* kcfg_Step; - QCheckBox* kcfg_SaveCurrent; + TQCheckBox* kcfg_SaveCurrent; protected: - QGridLayout* ProgPreferencesLayout; - QVBoxLayout* layout11; - QHBoxLayout* layout2; - QHBoxLayout* layout3; - QHBoxLayout* layout3_2; - QHBoxLayout* layout7; - QSpacerItem* spacer1; - QHBoxLayout* layout7_2; - QSpacerItem* spacer1_2; - QHBoxLayout* layout7_2_2; - QSpacerItem* spacer1_2_2; + TQGridLayout* ProgPreferencesLayout; + TQVBoxLayout* layout11; + TQHBoxLayout* layout2; + TQHBoxLayout* layout3; + TQHBoxLayout* layout3_2; + TQHBoxLayout* layout7; + TQSpacerItem* spacer1; + TQHBoxLayout* layout7_2; + TQSpacerItem* spacer1_2; + TQHBoxLayout* layout7_2_2; + TQSpacerItem* spacer1_2_2; protected slots: virtual void languageChange(); diff --git a/src/progpreferences.ui b/src/progpreferences.ui index a8e208f..170324f 100644 --- a/src/progpreferences.ui +++ b/src/progpreferences.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ProgPreferences</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProgPreferences</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout11</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -35,7 +35,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -43,7 +43,7 @@ <string>program</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>kcfg_Program</cstring> </property> @@ -56,7 +56,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -64,7 +64,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -72,7 +72,7 @@ <string>set argument</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>kcfg_SetArgument</cstring> </property> @@ -86,7 +86,7 @@ to set the brightness</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3_2</cstring> </property> @@ -94,7 +94,7 @@ to set the brightness</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -102,7 +102,7 @@ to set the brightness</string> <string>get argument</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>kcfg_GetArgument</cstring> </property> @@ -119,7 +119,7 @@ a "get" argument.</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -127,7 +127,7 @@ a "get" argument.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -165,7 +165,7 @@ a "get" argument.</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7_2</cstring> </property> @@ -173,7 +173,7 @@ a "get" argument.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -211,7 +211,7 @@ a "get" argument.</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7_2_2</cstring> </property> @@ -219,7 +219,7 @@ a "get" argument.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2_2</cstring> </property> @@ -257,7 +257,7 @@ a "get" argument.</string> </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_SaveCurrent</cstring> </property> |