diff options
| author | Timothy Pearson <[email protected]> | 2013-07-24 09:59:06 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-07-24 09:59:06 -0500 |
| commit | 24857cad8e92c27bc7d7377549ae887adbeccc58 (patch) | |
| tree | e8aa2577506c17c68286ec1b65ae31b89ea0556b /src | |
| parent | ea3a9effca9bebfe18bfb7546da619ecbbb121f3 (diff) | |
| download | ksensors-24857cad8e92c27bc7d7377549ae887adbeccc58.tar.gz ksensors-24857cad8e92c27bc7d7377549ae887adbeccc58.zip | |
Convert to TDE R14 API
Diffstat (limited to 'src')
79 files changed, 1636 insertions, 1636 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 85896d5..7b82db2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,8 +42,8 @@ ksensors_SOURCES = main.cpp ksensors.cpp aboutcfgdesign.ui \ rampanel.cpp sensor.cpp sensorslist.cpp \ systemcfg.cpp systemcfgdesign.ui uptimepanel.cpp -ksensors_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ksensors_LDADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lsensors -lm +ksensors_LDFLAGS = $(TDE_RPATH) $(all_libraries) +ksensors_LDADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -lsensors -lm # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/src/aboutcfgdesign.cpp b/src/aboutcfgdesign.cpp index b72c70a..dbaf79c 100644 --- a/src/aboutcfgdesign.cpp +++ b/src/aboutcfgdesign.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file './aboutcfgdesign.ui' ** @@ -10,19 +10,19 @@ #include "aboutcfgdesign.h" -#include <qvariant.h> +#include <ntqvariant.h> #include <kcolorbutton.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qimage.h> -#include <qpixmap.h> +#include <ntqframe.h> +#include <ntqlabel.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> +#include <ntqimage.h> +#include <ntqpixmap.h> static const char* const img0_aboutcfgdesign[] = { "32 32 76 2", -"Qt c None", +"TQt c None", ".# c #000000", ".R c #292429", ".P c #292829", @@ -98,339 +98,339 @@ static const char* const img0_aboutcfgdesign[] = { ".1 c #e66918", "#h c #ee4820", "#f c #ee4c20", -"QtQtQtQt.#.#.#.#.#.#.#.#.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.a.b.a.b.a.b.a.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.a.a.a.a.a.a.a.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.#.#.#.#.#.#.#.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.c.d.c.d.c.e.c.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.f.f.f.f.f.f.f.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.#.#.#.#.#.#.#.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.g.h.i.h.g.h.i.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.j.j.k.j.j.j.l.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.#.#.#.#.#.#.#.#Qt.#.#.#.#QtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.m.m.m.m.m.n.m.#.#.o.o.p.q.#.#QtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.r.r.r.s.r.#.#.t.u.u.o.v.q.q.w.#.#QtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.#.#.#.#.#.t.t.u.u.o.x.p.p.y.y.w.y.#.#QtQtQtQtQtQtQtQt", -"QtQtQtQt.#.z.#.#.A.B.B.t.t.C.D.E.v.q.q.w.F.w.q.w.#.#QtQtQtQtQtQt", -"QtQtQtQt.#.#.G.G.H.H.I.t.u.u.o.o.J.E.K.y.w.y.w.y.w.y.#.#QtQtQtQt", -"QtQt.#.#.L.G.M.G.A.B.B.I.D.E.u.o.x.q.D.J.q.w.F.w.q.w.F.w.#.#QtQt", -"Qt.#.G.G.G.G.G.G.H.H.N.O.u.u.J.E.p.p.F.F.J.E.w.y.w.y.w.y.w.y.#Qt", -"Qt.#.L.G.M.G.L.G.G.B.B.t.t.u.u.o.D.J.q.y.F.w.q.w.F.w.q.w.F.w.#Qt", -"Qt.#.P.P.G.G.G.G.H.Q.N.B.u.u.o.x.p.v.F.F.w.y.w.y.w.y.w.y.G.G.#Qt", -"Qt.#.R.P.P.S.M.G.G.H.B.t.O.u.u.o.x.p.p.w.q.w.F.w.q.w.M.G.L.G.#Qt", -"Qt.#.P.P.T.S.U.T.H.H.B.B.I.u.x.x.p.p.F.F.w.y.w.y.G.G.G.G.G.G.#Qt", -"QtQt.#.#.P.T.S.U.U.U.Q.t.O.u.u.o.x.p.v.F.F.w.V.W.W.G.L.G.#.#QtQt", -"QtQt.UQt.#.#.U.U.X.U.Y.Y.I.u.o.x.v.v.F.F.Z.Z.0.W.M.L.#.#Qt.#QtQt", -"QtQt.UQt.U.1.#.#.U.X.X.Y.X.2.u.o.x.p.3.4.4.Z.Z.0.#.#Qt.#Qt.#QtQt", -"QtQtQtQt.U.#.U.#.#.#.2.Y.2.2.5.6.7.7.8.4.9.9.#.UQt.UQt.#QtQtQtQt", -"QtQtQtQt.##..U##.U#..#.#.2.2.2.6#a.7.7.4.#.#Qt.UQt.UQtQtQtQtQtQt", -"QtQtQtQt.##b#c#b.U#b.U#b.#.#.5.6#d#d.#.#Qt.UQt.UQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.#.#.#.#.#.U.#.UQt.#.#.#.#Qt.UQt.UQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.##e#f#e#f#e#f#g.UQt.UQtQt.UQt.UQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.##h#i#j#i#h#i#j.#Qt.UQtQt.UQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQt.#.#.#.#.#.#.#.#.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; +"TQtTQtTQtTQt.#.#.#.#.#.#.#.#.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.a.b.a.b.a.b.a.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.a.a.a.a.a.a.a.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.#.#.#.#.#.#.#.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.c.d.c.d.c.e.c.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.f.f.f.f.f.f.f.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.#.#.#.#.#.#.#.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.g.h.i.h.g.h.i.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.j.j.k.j.j.j.l.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.#.#.#.#.#.#.#.#TQt.#.#.#.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.m.m.m.m.m.n.m.#.#.o.o.p.q.#.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.r.r.r.s.r.#.#.t.u.u.o.v.q.q.w.#.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.#.#.#.#.#.t.t.u.u.o.x.p.p.y.y.w.y.#.#TQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.z.#.#.A.B.B.t.t.C.D.E.v.q.q.w.F.w.q.w.#.#TQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.#.G.G.H.H.I.t.u.u.o.o.J.E.K.y.w.y.w.y.w.y.#.#TQtTQtTQtTQt", +"TQtTQt.#.#.L.G.M.G.A.B.B.I.D.E.u.o.x.q.D.J.q.w.F.w.q.w.F.w.#.#TQtTQt", +"TQt.#.G.G.G.G.G.G.H.H.N.O.u.u.J.E.p.p.F.F.J.E.w.y.w.y.w.y.w.y.#TQt", +"TQt.#.L.G.M.G.L.G.G.B.B.t.t.u.u.o.D.J.q.y.F.w.q.w.F.w.q.w.F.w.#TQt", +"TQt.#.P.P.G.G.G.G.H.Q.N.B.u.u.o.x.p.v.F.F.w.y.w.y.w.y.w.y.G.G.#TQt", +"TQt.#.R.P.P.S.M.G.G.H.B.t.O.u.u.o.x.p.p.w.q.w.F.w.q.w.M.G.L.G.#TQt", +"TQt.#.P.P.T.S.U.T.H.H.B.B.I.u.x.x.p.p.F.F.w.y.w.y.G.G.G.G.G.G.#TQt", +"TQtTQt.#.#.P.T.S.U.U.U.Q.t.O.u.u.o.x.p.v.F.F.w.V.W.W.G.L.G.#.#TQtTQt", +"TQtTQt.UTQt.#.#.U.U.X.U.Y.Y.I.u.o.x.v.v.F.F.Z.Z.0.W.M.L.#.#TQt.#TQtTQt", +"TQtTQt.UTQt.U.1.#.#.U.X.X.Y.X.2.u.o.x.p.3.4.4.Z.Z.0.#.#TQt.#TQt.#TQtTQt", +"TQtTQtTQtTQt.U.#.U.#.#.#.2.Y.2.2.5.6.7.7.8.4.9.9.#.UTQt.UTQt.#TQtTQtTQtTQt", +"TQtTQtTQtTQt.##..U##.U#..#.#.2.2.2.6#a.7.7.4.#.#TQt.UTQt.UTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.##b#c#b.U#b.U#b.#.#.5.6#d#d.#.#TQt.UTQt.UTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.#.#.#.#.#.U.#.UTQt.#.#.#.#TQt.UTQt.UTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.##e#f#e#f#e#f#g.UTQt.UTQtTQt.UTQt.UTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.##h#i#j#i#h#i#j.#TQt.UTQtTQt.UTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQt.#.#.#.#.#.#.#.#.#TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt", +"TQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQtTQt"}; /* * Constructs a AboutCfgDesign as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -AboutCfgDesign::AboutCfgDesign( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ), +AboutCfgDesign::AboutCfgDesign( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ), image0( (const char **) img0_aboutcfgdesign ) { if ( !name ) setName( "AboutCfgDesign" ); - AboutCfgDesignLayout = new QVBoxLayout( this, 0, 0, "AboutCfgDesignLayout"); + AboutCfgDesignLayout = new TQVBoxLayout( this, 0, 0, "AboutCfgDesignLayout"); - Frame3 = new QFrame( this, "Frame3" ); - Frame3->setMinimumSize( QSize( 0, 47 ) ); - Frame3->setMaximumSize( QSize( 32767, 47 ) ); - QPalette pal; - QColorGroup cg; - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, QColor( 241, 241, 241) ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 222, 226, 246) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + Frame3 = new TQFrame( this, "Frame3" ); + Frame3->setMinimumSize( TQSize( 0, 47 ) ); + Frame3->setMaximumSize( TQSize( 32767, 47 ) ); + TQPalette pal; + TQColorGroup cg; + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, TQColor( 241, 241, 241) ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 222, 226, 246) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setActive( cg ); - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 222, 226, 246) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 222, 226, 246) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setInactive( cg ); - cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 222, 226, 246) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 222, 226, 246) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setDisabled( cg ); Frame3->setPalette( pal ); - Frame3->setFrameShape( QFrame::NoFrame ); - Frame3->setFrameShadow( QFrame::Plain ); + Frame3->setFrameShape( TQFrame::NoFrame ); + Frame3->setFrameShadow( TQFrame::Plain ); - PixmapLabel1 = new QLabel( Frame3, "PixmapLabel1" ); - PixmapLabel1->setGeometry( QRect( 10, 5, 38, 38 ) ); + PixmapLabel1 = new TQLabel( Frame3, "PixmapLabel1" ); + PixmapLabel1->setGeometry( TQRect( 10, 5, 38, 38 ) ); PixmapLabel1->setPixmap( image0 ); PixmapLabel1->setScaledContents( TRUE ); - TextLabel2 = new QLabel( Frame3, "TextLabel2" ); - TextLabel2->setGeometry( QRect( 61, 12, 326, 24 ) ); - QFont TextLabel2_font( TextLabel2->font() ); + TextLabel2 = new TQLabel( Frame3, "TextLabel2" ); + TextLabel2->setGeometry( TQRect( 61, 12, 326, 24 ) ); + TQFont TextLabel2_font( TextLabel2->font() ); TextLabel2_font.setPointSize( 14 ); TextLabel2_font.setBold( TRUE ); TextLabel2->setFont( TextLabel2_font ); AboutCfgDesignLayout->addWidget( Frame3 ); - Frame4 = new QFrame( this, "Frame4" ); - Frame4->setMinimumSize( QSize( 0, 22 ) ); - Frame4->setMaximumSize( QSize( 32767, 22 ) ); - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, QColor( 241, 241, 241) ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 97, 97, 97) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + Frame4 = new TQFrame( this, "Frame4" ); + Frame4->setMinimumSize( TQSize( 0, 22 ) ); + Frame4->setMaximumSize( TQSize( 32767, 22 ) ); + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, TQColor( 241, 241, 241) ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 97, 97, 97) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setActive( cg ); - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 97, 97, 97) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 97, 97, 97) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setInactive( cg ); - cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 97, 97, 97) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 97, 97, 97) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setDisabled( cg ); Frame4->setPalette( pal ); - Frame4->setFrameShape( QFrame::NoFrame ); - Frame4->setFrameShadow( QFrame::Plain ); + Frame4->setFrameShape( TQFrame::NoFrame ); + Frame4->setFrameShadow( TQFrame::Plain ); - TextLabel1 = new QLabel( Frame4, "TextLabel1" ); - TextLabel1->setGeometry( QRect( 7, 2, 305, 16 ) ); - cg.setColor( QColorGroup::Foreground, white ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, QColor( 241, 241, 241) ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 97, 97, 97) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + TextLabel1 = new TQLabel( Frame4, "TextLabel1" ); + TextLabel1->setGeometry( TQRect( 7, 2, 305, 16 ) ); + cg.setColor( TQColorGroup::Foreground, white ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, TQColor( 241, 241, 241) ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 97, 97, 97) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setActive( cg ); - cg.setColor( QColorGroup::Foreground, white ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 97, 97, 97) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, white ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 97, 97, 97) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setInactive( cg ); - cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 97, 97, 97) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 97, 97, 97) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setDisabled( cg ); TextLabel1->setPalette( pal ); AboutCfgDesignLayout->addWidget( Frame4 ); - Frame5 = new QFrame( this, "Frame5" ); - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, QColor( 241, 241, 241) ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 49, 121, 172) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + Frame5 = new TQFrame( this, "Frame5" ); + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, TQColor( 241, 241, 241) ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 49, 121, 172) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setActive( cg ); - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 49, 121, 172) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 49, 121, 172) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setInactive( cg ); - cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 49, 121, 172) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 49, 121, 172) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setDisabled( cg ); Frame5->setPalette( pal ); - Frame5->setFrameShape( QFrame::NoFrame ); - Frame5->setFrameShadow( QFrame::Plain ); - Frame5Layout = new QHBoxLayout( Frame5, 22, 6, "Frame5Layout"); + Frame5->setFrameShape( TQFrame::NoFrame ); + Frame5->setFrameShadow( TQFrame::Plain ); + Frame5Layout = new TQHBoxLayout( Frame5, 22, 6, "Frame5Layout"); - Frame6 = new QFrame( Frame5, "Frame6" ); - Frame6->setMinimumSize( QSize( 300, 200 ) ); - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, QColor( 241, 241, 241) ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 222, 226, 246) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + Frame6 = new TQFrame( Frame5, "Frame6" ); + Frame6->setMinimumSize( TQSize( 300, 200 ) ); + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, TQColor( 241, 241, 241) ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 222, 226, 246) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setActive( cg ); - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 222, 226, 246) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 222, 226, 246) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setInactive( cg ); - cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, QColor( 222, 226, 246) ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Foreground, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, TQColor( 222, 226, 246) ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); pal.setDisabled( cg ); Frame6->setPalette( pal ); - Frame6->setFrameShape( QFrame::NoFrame ); - Frame6->setFrameShadow( QFrame::Plain ); + Frame6->setFrameShape( TQFrame::NoFrame ); + Frame6->setFrameShadow( TQFrame::Plain ); - labelTitle = new QLabel( Frame6, "labelTitle" ); - labelTitle->setGeometry( QRect( 19, 19, 221, 16 ) ); - QFont labelTitle_font( labelTitle->font() ); + labelTitle = new TQLabel( Frame6, "labelTitle" ); + labelTitle->setGeometry( TQRect( 19, 19, 221, 16 ) ); + TQFont labelTitle_font( labelTitle->font() ); labelTitle_font.setPointSize( 10 ); labelTitle_font.setBold( TRUE ); labelTitle->setFont( labelTitle_font ); - TextLabel3_2 = new QLabel( Frame6, "TextLabel3_2" ); - TextLabel3_2->setGeometry( QRect( 20, 49, 248, 147 ) ); - TextLabel3_2->setAlignment( int( QLabel::WordBreak | QLabel::AlignTop | QLabel::AlignLeft ) ); + TextLabel3_2 = new TQLabel( Frame6, "TextLabel3_2" ); + TextLabel3_2->setGeometry( TQRect( 20, 49, 248, 147 ) ); + TextLabel3_2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignTop | TQLabel::AlignLeft ) ); Frame5Layout->addWidget( Frame6 ); - Spacer1 = new QSpacerItem( 61, 20, QSizePolicy::Fixed, QSizePolicy::Minimum ); + Spacer1 = new TQSpacerItem( 61, 20, TQSizePolicy::Fixed, TQSizePolicy::Minimum ); Frame5Layout->addItem( Spacer1 ); AboutCfgDesignLayout->addWidget( Frame5 ); languageChange(); - resize( QSize(413, 353).expandedTo(minimumSizeHint()) ); + resize( TQSize(413, 353).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -439,7 +439,7 @@ AboutCfgDesign::AboutCfgDesign( QWidget* parent, const char* name, WFlags fl ) */ AboutCfgDesign::~AboutCfgDesign() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/src/aboutcfgdesign.h b/src/aboutcfgdesign.h index 0f3dc00..2ffe75d 100644 --- a/src/aboutcfgdesign.h +++ b/src/aboutcfgdesign.h @@ -10,45 +10,45 @@ #ifndef ABOUTCFGDESIGN_H #define ABOUTCFGDESIGN_H -#include <qvariant.h> -#include <qpixmap.h> -#include <qwidget.h> - -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QFrame; -class QLabel; - -class AboutCfgDesign : public QWidget +#include <ntqvariant.h> +#include <ntqpixmap.h> +#include <ntqwidget.h> + +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; +class TQFrame; +class TQLabel; + +class AboutCfgDesign : public TQWidget { Q_OBJECT public: - AboutCfgDesign( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AboutCfgDesign( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~AboutCfgDesign(); - QFrame* Frame3; - QLabel* PixmapLabel1; - QLabel* TextLabel2; - QFrame* Frame4; - QLabel* TextLabel1; - QFrame* Frame5; - QFrame* Frame6; - QLabel* labelTitle; - QLabel* TextLabel3_2; + TQFrame* Frame3; + TQLabel* PixmapLabel1; + TQLabel* TextLabel2; + TQFrame* Frame4; + TQLabel* TextLabel1; + TQFrame* Frame5; + TQFrame* Frame6; + TQLabel* labelTitle; + TQLabel* TextLabel3_2; protected: - QVBoxLayout* AboutCfgDesignLayout; - QHBoxLayout* Frame5Layout; - QSpacerItem* Spacer1; + TQVBoxLayout* AboutCfgDesignLayout; + TQHBoxLayout* Frame5Layout; + TQSpacerItem* Spacer1; protected slots: virtual void languageChange(); private: - QPixmap image0; + TQPixmap image0; }; diff --git a/src/aboutcfgdesign.ui b/src/aboutcfgdesign.ui index 9f7bdcb..b9b75e7 100644 --- a/src/aboutcfgdesign.ui +++ b/src/aboutcfgdesign.ui @@ -2,7 +2,7 @@ <class>AboutCfgDesign</class> <include location="global">kcolorbutton.h</include> <widget> - <class>QWidget</class> + <class>TQWidget</class> <property stdset="1"> <name>name</name> <cstring>AboutCfgDesign</cstring> @@ -36,7 +36,7 @@ <number>0</number> </property> <widget> - <class>QFrame</class> + <class>TQFrame</class> <property stdset="1"> <name>name</name> <cstring>Frame3</cstring> @@ -285,7 +285,7 @@ <enum>Plain</enum> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>PixmapLabel1</cstring> @@ -309,7 +309,7 @@ </property> </widget> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel2</cstring> @@ -337,7 +337,7 @@ </widget> </widget> <widget> - <class>QFrame</class> + <class>TQFrame</class> <property stdset="1"> <name>name</name> <cstring>Frame4</cstring> @@ -586,7 +586,7 @@ <enum>Plain</enum> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel1</cstring> @@ -828,7 +828,7 @@ </widget> </widget> <widget> - <class>QFrame</class> + <class>TQFrame</class> <property stdset="1"> <name>name</name> <cstring>Frame5</cstring> @@ -1075,7 +1075,7 @@ <number>6</number> </property> <widget> - <class>QFrame</class> + <class>TQFrame</class> <property stdset="1"> <name>name</name> <cstring>Frame6</cstring> @@ -1317,7 +1317,7 @@ <enum>Plain</enum> </property> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>labelTitle</cstring> @@ -1344,7 +1344,7 @@ </property> </widget> <widget> - <class>QLabel</class> + <class>TQLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel3_2</cstring> diff --git a/src/cpupanel.cpp b/src/cpupanel.cpp index 2eca1e5..74d9a9a 100644 --- a/src/cpupanel.cpp +++ b/src/cpupanel.cpp @@ -18,13 +18,13 @@ #include "cpupanel.h" #include "qlcddraw.h" -#include <qcolor.h> -#include <qpainter.h> -#include <qlcdnumber.h> +#include <ntqcolor.h> +#include <ntqpainter.h> +#include <ntqlcdnumber.h> #include <string.h> -bool getCpuInfoValue(const char *name,QString &value) +bool getCpuInfoValue(const char *name,TQString &value) { char buffer[128]; char *ptr; @@ -49,7 +49,7 @@ bool result; return result; } -void adjustString(QString &str,int maxlen) +void adjustString(TQString &str,int maxlen) { int i= str.find('('); @@ -58,7 +58,7 @@ int i= str.find('('); str= str.stripWhiteSpace(); } -CpuPanel::CpuPanel(QWidget *parent, const char *name) : Panel(parent,name) +CpuPanel::CpuPanel(TQWidget *parent, const char *name) : Panel(parent,name) { sCpu= "Unknown"; getCpuInfoValue("model name",sCpu); @@ -72,22 +72,22 @@ CpuPanel::CpuPanel(QWidget *parent, const char *name) : Panel(parent,name) getCpuInfoValue("bogomips",sBogomips); sBogomips.sprintf("%.0f BMPS",sBogomips.toDouble()); - QString sSpeed= "0"; + TQString sSpeed= "0"; getCpuInfoValue("cpu MHz",sSpeed); sSpeed.sprintf("%.0f",sSpeed.toDouble()); - speed= new QLCDNumber(this); + speed= new TQLCDNumber(this); speed->setGeometry(6,20,52,26); speed->setNumDigits(sSpeed.length()); - speed->setSegmentStyle(QLCDNumber::Filled); - speed->setFrameShape(QFrame::NoFrame); + speed->setSegmentStyle(TQLCDNumber::Filled); + speed->setFrameShape(TQFrame::NoFrame); speed->display(sSpeed); - QPalette cg= speed->palette(); - cg.setColor( QColorGroup::Foreground, QColor( 255, 0, 0) ); - cg.setColor( QColorGroup::Light, QColor( 255, 0, 0) ); - cg.setColor( QColorGroup::Midlight, QColor( 231, 232, 246) ); - cg.setColor( QColorGroup::Dark, QColor( 104, 105, 118) ); - cg.setColor( QColorGroup::Mid, QColor( 139, 140, 158) ); - cg.setColor( QColorGroup::Background, palette().active().background() ); + TQPalette cg= speed->palette(); + cg.setColor( TQColorGroup::Foreground, TQColor( 255, 0, 0) ); + cg.setColor( TQColorGroup::Light, TQColor( 255, 0, 0) ); + cg.setColor( TQColorGroup::Midlight, TQColor( 231, 232, 246) ); + cg.setColor( TQColorGroup::Dark, TQColor( 104, 105, 118) ); + cg.setColor( TQColorGroup::Mid, TQColor( 139, 140, 158) ); + cg.setColor( TQColorGroup::Background, palette().active().background() ); speed->setPalette(cg); speed->installEventFilter(this); } @@ -108,7 +108,7 @@ void CpuPanel::updateInfo() update(); } -void CpuPanel::drawContents(QPainter *p) +void CpuPanel::drawContents(TQPainter *p) { int w= width(); int h= height(); @@ -116,20 +116,20 @@ void CpuPanel::drawContents(QPainter *p) int i2= (h * 4) / 5; int th= h-i2-h/11; - QLcd::draw(p, 2,h/10,w-4,th,sCpu.latin1(),QLcd::alignJustify, &getColorTitle()); - QLcd::draw(p, 2,i2+1,w-4,th,sBogomips.latin1(),QLcd::alignCenter,&getColorTitle()); + TQLcd::draw(p, 2,h/10,w-4,th,sCpu.latin1(),TQLcd::alignJustify, &getColorTitle()); + TQLcd::draw(p, 2,i2+1,w-4,th,sBogomips.latin1(),TQLcd::alignCenter,&getColorTitle()); } -void CpuPanel::paletteChange( const QPalette &oldPalette) +void CpuPanel::paletteChange( const TQPalette &oldPalette) { -QPalette cg= speed->palette(); +TQPalette cg= speed->palette(); - cg.setColor(QColorGroup::Background,palette().active().background()); + cg.setColor(TQColorGroup::Background,palette().active().background()); speed->setPalette(cg); } -void CpuPanel::resizeEvent ( QResizeEvent *e ) +void CpuPanel::resizeEvent ( TQResizeEvent *e ) { int w= width(); int h= height(); diff --git a/src/cpupanel.h b/src/cpupanel.h index 29d9a55..77aff3c 100644 --- a/src/cpupanel.h +++ b/src/cpupanel.h @@ -20,7 +20,7 @@ #include "panel.h" -#include <qlcdnumber.h> +#include <ntqlcdnumber.h> #include "qlcdstring.h" /** @@ -32,23 +32,23 @@ class CpuPanel : public Panel { Q_OBJECT public: - CpuPanel(QWidget *parent=0, const char *name=0); + CpuPanel(TQWidget *parent=0, const char *name=0); ~CpuPanel(); protected: - void drawContents ( QPainter *p ); - void paletteChange( const QPalette &oldPalette); + void drawContents ( TQPainter *p ); + void paletteChange( const TQPalette &oldPalette); private: void updateInfo(); - QLCDNumber *speed; + TQLCDNumber *speed; - QString sCpu,sVendor,sSpeed,sBogomips; + TQString sCpu,sVendor,sSpeed,sBogomips; - void resizeEvent ( QResizeEvent *e ); + void resizeEvent ( TQResizeEvent *e ); }; #endif diff --git a/src/cputimepanel.cpp b/src/cputimepanel.cpp index 5581dc2..6b6612a 100644 --- a/src/cputimepanel.cpp +++ b/src/cputimepanel.cpp @@ -19,49 +19,49 @@ #include "procinfo.h" -CpuTimePanel::CpuTimePanel(QWidget *parent, const char *name): Panel(parent,name) +CpuTimePanel::CpuTimePanel(TQWidget *parent, const char *name): Panel(parent,name) { - lcd1= new QLCDString(this); + lcd1= new TQLCDString(this); lcd1->setGeometry(16,38,46,8); lcd1->setForeColor(red); - lcd1->setAlign(QLCDString::alignLeft); + lcd1->setAlign(TQLCDString::alignLeft); lcd1->setNumberDisplay(true); lcd1->installEventFilter(this); - QColor color2( 200, 0, 0); + TQColor color2( 200, 0, 0); - lcd2= new QLCDString(this); + lcd2= new TQLCDString(this); lcd2->setGeometry(16,28,46,8); lcd2->setForeColor(color2); - lcd2->setAlign(QLCDString::alignLeft); + lcd2->setAlign(TQLCDString::alignLeft); lcd2->setNumberDisplay(true); lcd2->installEventFilter(this); - QColor color3( 128,32,0 ); + TQColor color3( 128,32,0 ); - lcd3= new QLCDString(this); + lcd3= new TQLCDString(this); lcd3->setGeometry(16,18,46,8); lcd3->setForeColor(color3); - lcd3->setAlign(QLCDString::alignLeft); + lcd3->setAlign(TQLCDString::alignLeft); lcd3->setNumberDisplay(true); lcd3->installEventFilter(this); - lcd4= new QLCDString(this); + lcd4= new TQLCDString(this); lcd4->setGeometry(16,8,46,8); lcd4->setForeColor(darkGreen); - lcd4->setAlign(QLCDString::alignLeft); + lcd4->setAlign(TQLCDString::alignLeft); lcd4->setNumberDisplay(true); lcd4->installEventFilter(this); - barMeter= new QBarMeter(this); + barMeter= new TQBarMeter(this); barMeter->setGeometry(6,6,6,40); - barMeter->setDirection(QBarMeter::dirUp); + barMeter->setDirection(TQBarMeter::dirUp); barMeter->setSteps(20); barMeter->useValueMax(false); barMeter->setValueColor( 0, red ); barMeter->setValueColor( 1, color2 ); barMeter->setValueColor( 2, color3 ); - barMeter->setValueColor( 3, QColor(0,220,0) ); + barMeter->setValueColor( 3, TQColor(0,220,0) ); barMeter->setValueCount(4); barMeter->installEventFilter(this); @@ -72,13 +72,13 @@ CpuTimePanel::CpuTimePanel(QWidget *parent, const char *name): Panel(parent,name CpuTimePanel::~CpuTimePanel(){ } -void CpuTimePanel::drawContents(QPainter *p) +void CpuTimePanel::drawContents(TQPainter *p) { int w= width(); int h= height(); int i2= (h * 4) / 5; int th= h-i2-h/11; - QLcd::draw(p, 2,i2+1,w-4,th, "CPU STATE",QLcd::alignCenter,&getColorTitle()); + TQLcd::draw(p, 2,i2+1,w-4,th, "CPU STATE",TQLcd::alignCenter,&getColorTitle()); } @@ -97,7 +97,7 @@ void CpuTimePanel::updateInfo() if (ptotal==0) ptotal=1; - QString str; + TQString str; str.sprintf ("USER%5.1f" , (float)puser /ptotal * 100 ); lcd1->display(str); str.sprintf ("NICE%5.1f" , (float)pnice /ptotal * 100 ); @@ -118,7 +118,7 @@ void CpuTimePanel::updateInfo() old_idle = idle; } -void CpuTimePanel::resizeEvent ( QResizeEvent *e ) +void CpuTimePanel::resizeEvent ( TQResizeEvent *e ) { int w= width(); int h= height(); diff --git a/src/cputimepanel.h b/src/cputimepanel.h index efc1326..d2b5f42 100644 --- a/src/cputimepanel.h +++ b/src/cputimepanel.h @@ -18,7 +18,7 @@ #ifndef CPUTIMEPANEL_H #define CPUTIMEPANEL_H -#include <qpainter.h> +#include <ntqpainter.h> #include <panel.h> #include "qlcdstring.h" @@ -30,18 +30,18 @@ class CpuTimePanel : public Panel { public: - CpuTimePanel(QWidget *parent=0, const char *name=0); + CpuTimePanel(TQWidget *parent=0, const char *name=0); ~CpuTimePanel(); protected: int old_user,old_nice,old_system,old_idle; - QLCDString *lcd1,*lcd2,*lcd3,*lcd4; - QBarMeter *barMeter; + TQLCDString *lcd1,*lcd2,*lcd3,*lcd4; + TQBarMeter *barMeter; void updateInfo(); - void drawContents(QPainter *p); - void resizeEvent ( QResizeEvent *e ); + void drawContents(TQPainter *p); + void resizeEvent ( TQResizeEvent *e ); }; #endif diff --git a/src/generalcfg.cpp b/src/generalcfg.cpp index 52ab597..ed35589 100644 --- a/src/generalcfg.cpp +++ b/src/generalcfg.cpp @@ -17,25 +17,25 @@ #include "generalcfg.h" -#include <qgroupbox.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qcheckbox.h> +#include <ntqgroupbox.h> +#include <ntqlayout.h> +#include <ntqpushbutton.h> +#include <ntqradiobutton.h> +#include <ntqcheckbox.h> #include "lmsensorswidget.h" #include "lmsensorsdock.h" -GeneralCfg::GeneralCfg(LMSensors *lsensors, QWidget *parent, const char *name) : GeneralCfgDesign(parent,name) +GeneralCfg::GeneralCfg(LMSensors *lsensors, TQWidget *parent, const char *name) : GeneralCfgDesign(parent,name) { sensors= lsensors; palPanelCfg= new PaletteCfg( boxGeneralPalette ); - boxGeneralPalette->setColumnLayout(0, Qt::Vertical ); + boxGeneralPalette->setColumnLayout(0, TQt::Vertical ); boxGeneralPalette->layout()->setSpacing( 6 ); boxGeneralPalette->layout()->setMargin( 12 ); - QGridLayout *boxGeneralPaletteLayout = new QGridLayout( boxGeneralPalette->layout() ); - boxGeneralPaletteLayout->setAlignment( Qt::AlignTop ); + TQGridLayout *boxGeneralPaletteLayout = new TQGridLayout( boxGeneralPalette->layout() ); + boxGeneralPaletteLayout->setAlignment( TQt::AlignTop ); boxGeneralPaletteLayout->addWidget( palPanelCfg, 0, 0 ); palPanelCfg->readPalette(0); @@ -47,7 +47,7 @@ GeneralCfg::GeneralCfg(LMSensors *lsensors, QWidget *parent, const char *name) : case 48: Radio48->setChecked(true); break; } - KConfig *cfg= KGlobal::config(); + TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup( "General" ); CheckBoxAutoStart->setChecked(cfg->readBoolEntry("AutoStart",true)); //connect( buttonApply ,SIGNAL(clicked()),this, SLOT(slotApplyChanges())); @@ -69,7 +69,7 @@ void GeneralCfg::slotApplyChanges() else if(Radio48->isChecked()) panelSize= 48; LMSensorsWidget::cfgWritePanelSize(panelSize); - KConfig *cfg= KGlobal::config(); + TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup( "General" ); cfg->writeEntry("AutoStart", CheckBoxAutoStart->isChecked()); diff --git a/src/generalcfg.h b/src/generalcfg.h index 7bcb32f..bb60a22 100644 --- a/src/generalcfg.h +++ b/src/generalcfg.h @@ -29,7 +29,7 @@ class GeneralCfg : public GeneralCfgDesign { Q_OBJECT public: - GeneralCfg(LMSensors *lsensors, QWidget *parent=0, const char *name=0); + GeneralCfg(LMSensors *lsensors, TQWidget *parent=0, const char *name=0); ~GeneralCfg(); public slots: diff --git a/src/generalcfgdesign.cpp b/src/generalcfgdesign.cpp index 692c693..a70211d 100644 --- a/src/generalcfgdesign.cpp +++ b/src/generalcfgdesign.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file './generalcfgdesign.ui' ** @@ -10,69 +10,69 @@ #include "generalcfgdesign.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqbuttongroup.h> +#include <ntqradiobutton.h> +#include <ntqgroupbox.h> +#include <ntqcheckbox.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a GeneralCfgDesign as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -GeneralCfgDesign::GeneralCfgDesign( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +GeneralCfgDesign::GeneralCfgDesign( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "GeneralCfgDesign" ); - GeneralCfgDesignLayout = new QGridLayout( this, 1, 1, 8, 6, "GeneralCfgDesignLayout"); + GeneralCfgDesignLayout = new TQGridLayout( this, 1, 1, 8, 6, "GeneralCfgDesignLayout"); - ButtonGroup5 = new QButtonGroup( this, "ButtonGroup5" ); - ButtonGroup5->setColumnLayout(0, Qt::Vertical ); + ButtonGroup5 = new TQButtonGroup( this, "ButtonGroup5" ); + ButtonGroup5->setColumnLayout(0, TQt::Vertical ); ButtonGroup5->layout()->setSpacing( 6 ); ButtonGroup5->layout()->setMargin( 11 ); - ButtonGroup5Layout = new QGridLayout( ButtonGroup5->layout() ); - ButtonGroup5Layout->setAlignment( Qt::AlignTop ); + ButtonGroup5Layout = new TQGridLayout( ButtonGroup5->layout() ); + ButtonGroup5Layout->setAlignment( TQt::AlignTop ); - Radio64 = new QRadioButton( ButtonGroup5, "Radio64" ); + Radio64 = new TQRadioButton( ButtonGroup5, "Radio64" ); Radio64->setChecked( TRUE ); ButtonGroup5Layout->addWidget( Radio64, 0, 0 ); - Radio56 = new QRadioButton( ButtonGroup5, "Radio56" ); + Radio56 = new TQRadioButton( ButtonGroup5, "Radio56" ); ButtonGroup5Layout->addWidget( Radio56, 0, 1 ); - Radio48 = new QRadioButton( ButtonGroup5, "Radio48" ); + Radio48 = new TQRadioButton( ButtonGroup5, "Radio48" ); ButtonGroup5Layout->addWidget( Radio48, 0, 2 ); GeneralCfgDesignLayout->addWidget( ButtonGroup5, 0, 0 ); - boxGeneralPalette = new QGroupBox( this, "boxGeneralPalette" ); - boxGeneralPalette->setMinimumSize( QSize( 0, 65 ) ); + boxGeneralPalette = new TQGroupBox( this, "boxGeneralPalette" ); + boxGeneralPalette->setMinimumSize( TQSize( 0, 65 ) ); GeneralCfgDesignLayout->addWidget( boxGeneralPalette, 1, 0 ); - GroupBox2 = new QGroupBox( this, "GroupBox2" ); - GroupBox2->setColumnLayout(0, Qt::Vertical ); + GroupBox2 = new TQGroupBox( this, "GroupBox2" ); + GroupBox2->setColumnLayout(0, TQt::Vertical ); GroupBox2->layout()->setSpacing( 6 ); GroupBox2->layout()->setMargin( 11 ); - GroupBox2Layout = new QVBoxLayout( GroupBox2->layout() ); - GroupBox2Layout->setAlignment( Qt::AlignTop ); + GroupBox2Layout = new TQVBoxLayout( GroupBox2->layout() ); + GroupBox2Layout->setAlignment( TQt::AlignTop ); - CheckBoxAutoStart = new QCheckBox( GroupBox2, "CheckBoxAutoStart" ); + CheckBoxAutoStart = new TQCheckBox( GroupBox2, "CheckBoxAutoStart" ); GroupBox2Layout->addWidget( CheckBoxAutoStart ); GeneralCfgDesignLayout->addWidget( GroupBox2, 2, 0 ); - Spacer28 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + Spacer28 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); GeneralCfgDesignLayout->addItem( Spacer28, 3, 0 ); languageChange(); - resize( QSize(343, 239).expandedTo(minimumSizeHint()) ); + resize( TQSize(343, 239).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -81,7 +81,7 @@ GeneralCfgDesign::GeneralCfgDesign( QWidget* parent, const char* name, WFlags fl */ GeneralCfgDesign::~GeneralCfgDesign() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/src/generalcfgdesign.h b/src/generalcfgdesign.h index 94735ab..2df78b8 100644 --- a/src/generalcfgdesign.h +++ b/src/generalcfgdesign.h @@ -10,39 +10,39 @@ #ifndef GENERALCFGDESIGN_H #define GENERALCFGDESIGN_H -#include <qvariant.h> -#include <qwidget.h> - -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QButtonGroup; -class QRadioButton; -class QGroupBox; -class QCheckBox; - -class GeneralCfgDesign : public QWidget +#include <ntqvariant.h> +#include <ntqwidget.h> + +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; +class TQButtonGroup; +class TQRadioButton; +class TQGroupBox; +class TQCheckBox; + +class GeneralCfgDesign : public TQWidget { Q_OBJECT public: - GeneralCfgDesign( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + GeneralCfgDesign( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~GeneralCfgDesign(); - QButtonGroup* ButtonGroup5; - QRadioButton* Radio64; - QRadioButton* Radio56; - QRadioButton* Radio48; - QGroupBox* boxGeneralPalette; - QGroupBox* GroupBox2; - QCheckBox* CheckBoxAutoStart; + TQButtonGroup* ButtonGroup5; + TQRadioButton* Radio64; + TQRadioButton* Radio56; + TQRadioButton* Radio48; + TQGroupBox* boxGeneralPalette; + TQGroupBox* GroupBox2; + TQCheckBox* CheckBoxAutoStart; protected: - QGridLayout* GeneralCfgDesignLayout; - QSpacerItem* Spacer28; - QGridLayout* ButtonGroup5Layout; - QVBoxLayout* GroupBox2Layout; + TQGridLayout* GeneralCfgDesignLayout; + TQSpacerItem* Spacer28; + TQGridLayout* ButtonGroup5Layout; + TQVBoxLayout* GroupBox2Layout; protected slots: virtual void languageChange(); diff --git a/src/generalcfgdesign.ui b/src/generalcfgdesign.ui index fa060e8..cd7c024 100644 --- a/src/generalcfgdesign.ui +++ b/src/generalcfgdesign.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>GeneralCfgDesign</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GeneralCfgDesign</cstring> </property> @@ -29,7 +29,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>ButtonGroup5</cstring> </property> @@ -46,7 +46,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>Radio64</cstring> </property> @@ -57,7 +57,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>Radio56</cstring> </property> @@ -65,7 +65,7 @@ <string>56 x 56</string> </property> </widget> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>Radio48</cstring> </property> @@ -75,7 +75,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>boxGeneralPalette</cstring> </property> @@ -93,7 +93,7 @@ <property name="layoutSpacing" stdset="0"> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -110,7 +110,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>CheckBoxAutoStart</cstring> </property> diff --git a/src/hdsensorslist.cpp b/src/hdsensorslist.cpp index 8cbfa13..aaec441 100644 --- a/src/hdsensorslist.cpp +++ b/src/hdsensorslist.cpp @@ -21,19 +21,19 @@ #include <dirent.h> #include <sys/types.h> #include <stdlib.h> -#include <qstringlist.h> -#include <klocale.h> -#include <qregexp.h> +#include <ntqstringlist.h> +#include <tdelocale.h> +#include <ntqregexp.h> #include "sensor.h" #include "hdsensorslist.h" -HDSensorsList::HDSensorsList(QObject *parent, const char * name): SensorsList(parent,name) +HDSensorsList::HDSensorsList(TQObject *parent, const char * name): SensorsList(parent,name) { process= 0; - setDescription( QString(i18n("Hard Disks")) ); + setDescription( TQString(i18n("Hard Disks")) ); setClass(Sensor::hdSensor); @@ -41,16 +41,16 @@ HDSensorsList::HDSensorsList(QObject *parent, const char * name): SensorsList(pa if(!isHddTempInstalled()) return; - QStringList disks; + TQStringList disks; if(!getDisks(disks)) return; - for(QStringList::Iterator it = disks.begin(); it != disks.end(); ++it ) { + for(TQStringList::Iterator it = disks.begin(); it != disks.end(); ++it ) { ProcessExec proc; proc << "hddtemp" << "-q"; proc << *it; if(proc.runAndWait()) { double value; - QString str; + TQString str; if(getDiskInfo(proc.getStdoutData(),str,value)) { Sensor *sensor= new Sensor(this); sensor->setType(Sensor::lmTemp); @@ -77,10 +77,10 @@ void HDSensorsList::updateSensors() { if(process) return; - QObjectList *list= (QObjectList *)children(); + TQObjectList *list= (TQObjectList *)children(); if(!list) return; - QStringList params; + TQStringList params; for(Sensor *obj= (Sensor *)list->first(); obj!=0; obj= (Sensor *)list->next()) if(obj->monitorized()) params << obj->name(); @@ -88,24 +88,24 @@ void HDSensorsList::updateSensors() if(params.count()>0) { process= new ProcessExec; *process << "hddtemp" << "-q" << params; - connect( process, SIGNAL(processExited(KProcess *)), this, SLOT(slotProcessExited(KProcess *)) ); + connect( process, SIGNAL(processExited(TDEProcess *)), this, SLOT(slotProcessExited(TDEProcess *)) ); process->run(); } } -void HDSensorsList::slotProcessExited(KProcess *) +void HDSensorsList::slotProcessExited(TDEProcess *) { - QObjectList *list= (QObjectList *)children(); + TQObjectList *list= (TQObjectList *)children(); if (!list) return; if (process->outputErrors()) - qWarning("HddTemp Error:\n%s", process->getStdoutData().ascii()); + tqWarning("HddTemp Error:\n%s", process->getStdoutData().ascii()); - QStringList buf = QStringList::split(QChar('\n'), process->getStdoutData()); - for(QStringList::Iterator it = buf.begin(); it != buf.end(); ++it ) { + TQStringList buf = TQStringList::split(TQChar('\n'), process->getStdoutData()); + for(TQStringList::Iterator it = buf.begin(); it != buf.end(); ++it ) { for(Sensor *obj= (Sensor *)list->first(); obj!=0; obj= (Sensor *)list->next()) { - QRegExp rx(QString(obj->name()) + QString(":\\s+.+:\\s+(\\d+).*C")); + TQRegExp rx(TQString(obj->name()) + TQString(":\\s+.+:\\s+(\\d+).*C")); if (rx.search((*it)) > -1) obj->setValue(rx.cap(1).toDouble(), Sensor::dgCelsius); } @@ -117,9 +117,9 @@ void HDSensorsList::slotProcessExited(KProcess *) // *************** Static methods -bool HDSensorsList::getDiskInfo(const QString buf, QString &name, double &value) +bool HDSensorsList::getDiskInfo(const TQString buf, TQString &name, double &value) { - QRegExp rx(":\\s+(.+):\\s+(\\d+).*C"); + TQRegExp rx(":\\s+(.+):\\s+(\\d+).*C"); if (rx.search(buf) > -1) { bool ok; @@ -142,12 +142,12 @@ bool HDSensorsList::isHddTempInstalled() proc << "hddtemp" << "-v" ; if(proc.runAndWait()) { if(proc.getStdoutData().contains("ERROR")==0) return true; - qWarning("HddTemp Error:\n%s", proc.getStdoutData().ascii()); + tqWarning("HddTemp Error:\n%s", proc.getStdoutData().ascii()); } return false; } -bool HDSensorsList::getDisks(QStringList &disks ) +bool HDSensorsList::getDisks(TQStringList &disks ) { DIR *dir; @@ -155,7 +155,7 @@ bool HDSensorsList::getDisks(QStringList &disks ) if((dir = opendir ("/sys/block")) == NULL) if ((dir = opendir ("/proc/ide")) == NULL) return false; - QString str; + TQString str; struct dirent *ptr; while((ptr= readdir(dir))) { if((ptr->d_name[0]=='h' || ptr->d_name[0]=='s') && ptr->d_name[1]=='d') { diff --git a/src/hdsensorslist.h b/src/hdsensorslist.h index fff3015..8ab53a1 100644 --- a/src/hdsensorslist.h +++ b/src/hdsensorslist.h @@ -30,7 +30,7 @@ class HDSensorsList : public SensorsList { Q_OBJECT public: - HDSensorsList(QObject *parent, const char * name); + HDSensorsList(TQObject *parent, const char * name); ~HDSensorsList(); public slots: @@ -39,15 +39,15 @@ public slots: protected slots: - void slotProcessExited(KProcess *proc); + void slotProcessExited(TDEProcess *proc); private: ProcessExec *process; static bool isHddTempInstalled(); - static bool getDisks(QStringList &disks); - static bool getDiskInfo(const QString buf, QString &name, double &value); + static bool getDisks(TQStringList &disks); + static bool getDiskInfo(const TQString buf, TQString &name, double &value); }; #endif diff --git a/src/i8ksensorslist.cpp b/src/i8ksensorslist.cpp index 06d12c9..178d223 100644 --- a/src/i8ksensorslist.cpp +++ b/src/i8ksensorslist.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include "i8ksensorslist.h" @@ -24,9 +24,9 @@ -I8KSensorsList::I8KSensorsList(QObject *parent, const char *name): SensorsList(parent,name) +I8KSensorsList::I8KSensorsList(TQObject *parent, const char *name): SensorsList(parent,name) { - setDescription(QString(i18n("MainBoard")) ); + setDescription(TQString(i18n("MainBoard")) ); setClass(Sensor::lmSensor); @@ -118,8 +118,8 @@ bool I8KSensorsList::I8KAvailable() int result; switch(result= I8KOnlyAvailable()) { - case -2: qWarning("I18K Warning: /proc/i8k format not valid or not supported. Inform the author."); break; - case -3: qWarning("I18K Warning: Only format version 1.0 is supported. Inform the author."); break; + case -2: tqWarning("I18K Warning: /proc/i8k format not valid or not supported. Inform the author."); break; + case -3: tqWarning("I18K Warning: Only format version 1.0 is supported. Inform the author."); break; } return (result==0 || AcpiAvailable()==0); diff --git a/src/i8ksensorslist.h b/src/i8ksensorslist.h index 39a355e..7310388 100644 --- a/src/i8ksensorslist.h +++ b/src/i8ksensorslist.h @@ -28,7 +28,7 @@ class I8KSensorsList : public SensorsList { Q_OBJECT public: - I8KSensorsList(QObject *parent, const char * name); + I8KSensorsList(TQObject *parent, const char * name); ~I8KSensorsList(); diff --git a/src/infopanels.cpp b/src/infopanels.cpp index 18d4736..a5f4132 100644 --- a/src/infopanels.cpp +++ b/src/infopanels.cpp @@ -19,11 +19,11 @@ -InfoPanels::InfoPanels(QWidget *panelsWidget, QObject *parent, const char *name): PanelsGroup(widget,parent,name) +InfoPanels::InfoPanels(TQWidget *panelsWidget, TQObject *parent, const char *name): PanelsGroup(widget,parent,name) { widget= panelsWidget; timerPanelCount=0; - timer = new QTimer(this); + timer = new TQTimer(this); configChanged("proc.CPUINFO"); configChanged("proc.RAMINFO"); configChanged("proc.SWAPINFO"); @@ -72,14 +72,14 @@ void InfoPanels::infoPanelDestroyed() void InfoPanels::cfgWriteUpdateInterval(int interval) { - KGlobal::config()->setGroup("ShowWidget"); - KGlobal::config()->writeEntry("UpdateInterval" , interval ); + TDEGlobal::config()->setGroup("ShowWidget"); + TDEGlobal::config()->writeEntry("UpdateInterval" , interval ); } int InfoPanels::cfgReadUpdateInterval() { - KGlobal::config()->setGroup("ShowWidget"); - return KGlobal::config()->readNumEntry("UpdateInterval" , 5 ); + TDEGlobal::config()->setGroup("ShowWidget"); + return TDEGlobal::config()->readNumEntry("UpdateInterval" , 5 ); } void InfoPanels::readUpdateInterval() diff --git a/src/infopanels.h b/src/infopanels.h index 9dff7a5..6e86a28 100644 --- a/src/infopanels.h +++ b/src/infopanels.h @@ -18,8 +18,8 @@ #ifndef INFOPANELS_H #define INFOPANELS_H -#include <qtimer.h> -#include <kglobal.h> +#include <ntqtimer.h> +#include <tdeglobal.h> #include "panelsgroup.h" #include "cpupanel.h" @@ -36,7 +36,7 @@ class InfoPanels : public PanelsGroup { Q_OBJECT public: - InfoPanels(QWidget *panelsWidget, QObject *parent=0, const char *name=0); + InfoPanels(TQWidget *panelsWidget, TQObject *parent=0, const char *name=0); ~InfoPanels(); static int cfgReadUpdateInterval(); @@ -53,8 +53,8 @@ protected slots: private: int timerPanelCount; - QTimer *timer; - QWidget *widget; + TQTimer *timer; + TQWidget *widget; void readUpdateInterval(); void timerConnect(Panel *display); diff --git a/src/ksensors.cpp b/src/ksensors.cpp index 2447fcb..c99ada1 100644 --- a/src/ksensors.cpp +++ b/src/ksensors.cpp @@ -4,18 +4,18 @@ #include "ksensors.h" -#include <qlabel.h> +#include <ntqlabel.h> -#include <kmainwindow.h> -#include <klocale.h> +#include <tdemainwindow.h> +#include <tdelocale.h> ksensors::ksensors() - : KMainWindow( 0, "ksensors" ) + : TDEMainWindow( 0, "ksensors" ) { // set the shell's ui resource file setXMLFile("ksensorsui.rc"); - new QLabel( "Hello World", this, "hello label" ); + new TQLabel( "Hello World", this, "hello label" ); } ksensors::~ksensors() diff --git a/src/ksensors.h b/src/ksensors.h index 16dbc7f..bbe85aa 100644 --- a/src/ksensors.h +++ b/src/ksensors.h @@ -9,14 +9,14 @@ #include <config.h> #endif -#include <kmainwindow.h> +#include <tdemainwindow.h> /** * @short Application Main Window * @author noname <[email protected]> * @version 0.1 */ -class ksensors : public KMainWindow +class ksensors : public TDEMainWindow { Q_OBJECT public: diff --git a/src/ksensorscfg.cpp b/src/ksensorscfg.cpp index 1b9e603..26f27c0 100644 --- a/src/ksensorscfg.cpp +++ b/src/ksensorscfg.cpp @@ -17,18 +17,18 @@ #include "ksensorscfg.h" -#include <qvariant.h> -#include <qframe.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qimage.h> -#include <qpixmap.h> +#include <ntqvariant.h> +#include <ntqframe.h> +#include <ntqlayout.h> +#include <ntqlabel.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> +#include <ntqimage.h> +#include <ntqpixmap.h> #include <kiconloader.h> -#include <klocale.h> -#include <kaboutdata.h> +#include <tdelocale.h> +#include <tdeaboutdata.h> #include <kdialogbase.h> #include <kuniqueapp.h> @@ -39,7 +39,7 @@ #include "lmsensorscfg.h" #include "aboutcfgdesign.h" -#define Icon(x) KGlobal::instance()->iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) +#define Icon(x) TDEGlobal::instance()->iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium ) KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) : KDialogBase(IconList, name, Apply|Close, Close ) @@ -47,27 +47,27 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) sensors= lsensors; //resize( 558, 370 ); - setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); setCaption( i18n("KSensors Configuration") ); - QFrame *page; - QVBoxLayout *lay; + TQFrame *page; + TQVBoxLayout *lay; page = addPage( i18n("Global settings"), i18n("Global settings"), Icon("earth.png") ); m_generalcfg = new GeneralCfg(sensors, page); - lay = new QVBoxLayout( page ); + lay = new TQVBoxLayout( page ); lay->addWidget(m_generalcfg); connect(this, SIGNAL(applyClicked()), m_generalcfg, SLOT(slotApplyChanges()) ); - QObjectList *list= sensors->getSensorsChips(); + TQObjectList *list= sensors->getSensorsChips(); if(list) { for(SensorsList *chip= (SensorsList *)list->first(); chip!=0; chip= (SensorsList *)list->next()) { if(chip->getClass()==Sensor::lmSensor) { - page = addPage( chip->getDescription()+QString(i18n(" sensors")), chip->getDescription()+QString(i18n(" sensors")), Icon("motherboard.png") ); + page = addPage( chip->getDescription()+TQString(i18n(" sensors")), chip->getDescription()+TQString(i18n(" sensors")), Icon("motherboard.png") ); cfgWidget = new LMSensorsCfg(chip, page); - lay = new QVBoxLayout( page ); + lay = new TQVBoxLayout( page ); lay->addWidget(cfgWidget); connect(this, SIGNAL(applyClicked()), cfgWidget, SLOT(slotApplyChanges()) ); } @@ -75,7 +75,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) { page = addPage( chip->getDescription(), chip->getDescription(), Icon("harddisk.png") ); cfgWidget = new LMSensorsCfg(chip, page); - lay = new QVBoxLayout( page ); + lay = new TQVBoxLayout( page ); lay->addWidget(cfgWidget); connect(this, SIGNAL(applyClicked()), cfgWidget, SLOT(slotApplyChanges()) ); } @@ -84,7 +84,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) page = addPage( i18n( "System Information" ), i18n( "System Information" ), Icon("computers.png") ); m_systemcfg = new SystemCfg(sensors, page); - lay = new QVBoxLayout( page ); + lay = new TQVBoxLayout( page ); lay->addWidget(m_systemcfg); connect(this, SIGNAL(applyClicked()), m_systemcfg, SLOT(slotApplyChanges()) ); diff --git a/src/ksensorscfg.h b/src/ksensorscfg.h index 764e7fc..33b41d0 100644 --- a/src/ksensorscfg.h +++ b/src/ksensorscfg.h @@ -18,15 +18,15 @@ #ifndef KSENSORSCFG_H #define KSENSORSCFG_H -#include <qwidget.h> +#include <ntqwidget.h> #include <kdialogbase.h> -//class QVBoxLayout; -//class QHBoxLayout; -//class QGridLayout; -//class QFrame; -//class QIconView; -//class QIconViewItem; +//class TQVBoxLayout; +//class TQHBoxLayout; +//class TQGridLayout; +//class TQFrame; +//class TQIconView; +//class TQIconViewItem; class KDialogBase; class GeneralCfg; class LMSensorsCfg; @@ -56,12 +56,12 @@ private: LMSensorsCfg *m_lmsensorscfg; SystemCfg *m_systemcfg; - QWidget *cfgWidget; + TQWidget *cfgWidget; /* - QIconView *IconView; - QWidget *cfgWidget; - QHBoxLayout *FormLayout;*/ + TQIconView *IconView; + TQWidget *cfgWidget; + TQHBoxLayout *FormLayout;*/ }; #endif diff --git a/src/ksensorssplash.cpp b/src/ksensorssplash.cpp index 0c65203..7736d2d 100644 --- a/src/ksensorssplash.cpp +++ b/src/ksensorssplash.cpp @@ -20,14 +20,14 @@ #include <kapp.h> #include <kstandarddirs.h> -KSensorsSplash::KSensorsSplash(QWidget *parent, const char *name ) : - QWidget(parent,name, WStyle_NoBorder | WStyle_Customize | WDestructiveClose | WStyle_StaysOnTop ) +KSensorsSplash::KSensorsSplash(TQWidget *parent, const char *name ) : + TQWidget(parent,name, WStyle_NoBorder | WStyle_Customize | WDestructiveClose | WStyle_StaysOnTop ) { - QPixmap pm; + TQPixmap pm; pm.load( locate("appdata", "pics/ksensorssplash.png") ); setBackgroundPixmap(pm); - setGeometry( QApplication::desktop()->width ()/2-pm.width()/2, - QApplication::desktop()->height()/2-pm.height()/2, + setGeometry( TQApplication::desktop()->width ()/2-pm.width()/2, + TQApplication::desktop()->height()/2-pm.height()/2, pm.width(),pm.height() ); show(); @@ -37,7 +37,7 @@ KSensorsSplash::KSensorsSplash(QWidget *parent, const char *name ) : KSensorsSplash::~KSensorsSplash(){ } -void KSensorsSplash::timerEvent( QTimerEvent * ) +void KSensorsSplash::timerEvent( TQTimerEvent * ) { close(); } diff --git a/src/ksensorssplash.h b/src/ksensorssplash.h index 3330b64..6d88a69 100644 --- a/src/ksensorssplash.h +++ b/src/ksensorssplash.h @@ -18,24 +18,24 @@ #ifndef KSENSORSSPLASH_H #define KSENSORSSPLASH_H -#include <qwidget.h> -//#include <qwidget.h> +#include <ntqwidget.h> +//#include <ntqwidget.h> /** *@author Miguel Novas */ -class KSensorsSplash : public QWidget { +class KSensorsSplash : public TQWidget { Q_OBJECT public: - KSensorsSplash(QWidget *parent=0, const char *name=0 ); + KSensorsSplash(TQWidget *parent=0, const char *name=0 ); ~KSensorsSplash(); protected: - void timerEvent( QTimerEvent * ); + void timerEvent( TQTimerEvent * ); }; #endif diff --git a/src/lmsensor.cpp b/src/lmsensor.cpp index 6214eb2..82a67f2 100644 --- a/src/lmsensor.cpp +++ b/src/lmsensor.cpp @@ -41,7 +41,7 @@ bool LMSensor::init(const sensors_feature **data, int *nr1, int *nr2) const char* main_name = (*data)->name; feature= (*data)->number; char *label = NULL; - QString uniqueSensorName; + TQString uniqueSensorName; #if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */ uniqueSensorName.sprintf("%s_%d_%d.%s", chip_name->prefix, chip_name->bus, chip_name->addr, main_name); @@ -108,7 +108,7 @@ bool LMSensor::init(const sensors_feature **data, int *nr1, int *nr2) sensors_get_label(*chip_name,feature,&label); if (label) { - setDescription(QString(label)); + setDescription(TQString(label)); delete label; label = NULL; } @@ -205,7 +205,7 @@ bool LMSensor::init(const sensors_feature **data, int *nr1, int *nr2) label = sensors_get_label(chip_name, feature_data); if (label) { - setDescription(QString(label)); + setDescription(TQString(label)); delete label; label = NULL; } diff --git a/src/lmsensor.h b/src/lmsensor.h index 87250e0..79e8aaf 100644 --- a/src/lmsensor.h +++ b/src/lmsensor.h @@ -18,10 +18,10 @@ #ifndef LMSENSOR_H #define LMSENSOR_H -#include <qobject.h> -#include <kconfig.h> -#include <qstring.h> -#include <qcstring.h> +#include <ntqobject.h> +#include <tdeconfig.h> +#include <ntqstring.h> +#include <ntqcstring.h> #include <sensors/sensors.h> #include "sensor.h" @@ -62,7 +62,7 @@ private: int feature; SensorType type; - QString description; + TQString description; double val; double valPrevious; double compensation; diff --git a/src/lmsensordockpanel.cpp b/src/lmsensordockpanel.cpp index 143007e..b0b9361 100644 --- a/src/lmsensordockpanel.cpp +++ b/src/lmsensordockpanel.cpp @@ -16,11 +16,11 @@ ***************************************************************************/ -#include <qpixmap.h> +#include <ntqpixmap.h> #include <kstddirs.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kiconloader.h> #include "lmsensordockpanel.h" @@ -70,14 +70,14 @@ void LMSensorDockPanel::updateConfig() setValue(sensor->getValue()); } -void LMSensorDockPanel::paintEvent ( QPaintEvent *e ) +void LMSensorDockPanel::paintEvent ( TQPaintEvent *e ) { if(sensor) { int w= width(); int h= height(); - QPainter painter(this); - QColor color= sensor->getAlarm() ? colorAlarm : colorNormal; - QColor colorShadow= color.dark(200); + TQPainter painter(this); + TQColor color= sensor->getAlarm() ? colorAlarm : colorNormal; + TQColor colorShadow= color.dark(200); painter.setPen(color); painter.drawLine(2, 2 , w-2,2 ); painter.drawLine(2, h-3, w-2,h-3); @@ -85,21 +85,21 @@ void LMSensorDockPanel::paintEvent ( QPaintEvent *e ) painter.drawLine(3, 3 , w-3,3 ); painter.drawLine(3, h-4, w-3,h-4); if(sensor->getType()==Sensor::lmTemp) { - QLcd::draw(&painter,4,6,w-6, h-12,strValue.latin1(),QLcd::drawShadow,&color,&colorShadow); + TQLcd::draw(&painter,4,6,w-6, h-12,strValue.latin1(),TQLcd::drawShadow,&color,&colorShadow); } else { - QLcd::draw(&painter,1,7,w-1, h-14,strValue.latin1(),QLcd::drawNumber|QLcd::alignCenter|QLcd::drawShadow,&color,&colorShadow); + TQLcd::draw(&painter,1,7,w-1, h-14,strValue.latin1(),TQLcd::drawNumber|TQLcd::alignCenter|TQLcd::drawShadow,&color,&colorShadow); } } else { KSystemTray::paintEvent(e); } } -void LMSensorDockPanel::mousePressEvent ( QMouseEvent *e ) +void LMSensorDockPanel::mousePressEvent ( TQMouseEvent *e ) { emit mouseEvent(e); } -void LMSensorDockPanel::mouseReleaseEvent ( QMouseEvent *e ) +void LMSensorDockPanel::mouseReleaseEvent ( TQMouseEvent *e ) { emit mouseEvent(e); } @@ -107,39 +107,39 @@ void LMSensorDockPanel::mouseReleaseEvent ( QMouseEvent *e ) //*****************************************************************+ -void LMSensorDockPanel::writeColorAlarm(const char *name, const QColor &color) +void LMSensorDockPanel::writeColorAlarm(const char *name, const TQColor &color) { - KGlobal::config()->setGroup(name); - KGlobal::config()->writeEntry("colorAlarm",color); + TDEGlobal::config()->setGroup(name); + TDEGlobal::config()->writeEntry("colorAlarm",color); } -void LMSensorDockPanel::writeColorNormal(const char *name,const QColor &color) +void LMSensorDockPanel::writeColorNormal(const char *name,const TQColor &color) { - KGlobal::config()->setGroup(name); - KGlobal::config()->writeEntry("colorNormal",color); + TDEGlobal::config()->setGroup(name); + TDEGlobal::config()->writeEntry("colorNormal",color); } -QColor LMSensorDockPanel::readColorAlarm(const char *name) +TQColor LMSensorDockPanel::readColorAlarm(const char *name) { - KGlobal::config()->setGroup(name); - return KGlobal::config()->readColorEntry("colorAlarm" , &red ); + TDEGlobal::config()->setGroup(name); + return TDEGlobal::config()->readColorEntry("colorAlarm" , &red ); } -QColor LMSensorDockPanel::readColorNormal(const char *name) +TQColor LMSensorDockPanel::readColorNormal(const char *name) { - KGlobal::config()->setGroup(name); - return KGlobal::config()->readColorEntry("colorNormal", &darkGreen); + TDEGlobal::config()->setGroup(name); + return TDEGlobal::config()->readColorEntry("colorNormal", &darkGreen); } void LMSensorDockPanel::writeShowInDock(const char *name, bool fShow) { - KGlobal::config()->setGroup(name); - KGlobal::config()->writeEntry("showInDock",fShow); + TDEGlobal::config()->setGroup(name); + TDEGlobal::config()->writeEntry("showInDock",fShow); } bool LMSensorDockPanel::readShowInDock(const char *name) { - KGlobal::config()->setGroup(name); - return KGlobal::config()->readBoolEntry("showInDock", false); + TDEGlobal::config()->setGroup(name); + return TDEGlobal::config()->readBoolEntry("showInDock", false); } diff --git a/src/lmsensordockpanel.h b/src/lmsensordockpanel.h index e8cb9fe..f55815c 100644 --- a/src/lmsensordockpanel.h +++ b/src/lmsensordockpanel.h @@ -20,8 +20,8 @@ #include <ksystemtray.h> -#include <kpopupmenu.h> -#include <qcolor.h> +#include <tdepopupmenu.h> +#include <ntqcolor.h> #include "qlcddraw.h" @@ -38,12 +38,12 @@ public: LMSensorDockPanel(Sensor *newSensor=0, const char *name=0); ~LMSensorDockPanel(); - static void writeColorAlarm (const char *name, const QColor &color); - static void writeColorNormal(const char *name, const QColor &color); + static void writeColorAlarm (const char *name, const TQColor &color); + static void writeColorNormal(const char *name, const TQColor &color); static void writeShowInDock (const char *name, bool fShow); - static QColor readColorAlarm (const char *name); - static QColor readColorNormal(const char *name); + static TQColor readColorAlarm (const char *name); + static TQColor readColorNormal(const char *name); static bool readShowInDock (const char *name); public slots: @@ -53,19 +53,19 @@ public slots: signals: - void mouseEvent(QMouseEvent *e); + void mouseEvent(TQMouseEvent *e); protected: - void paintEvent ( QPaintEvent * ); - void mousePressEvent ( QMouseEvent * ); - void mouseReleaseEvent ( QMouseEvent * ); + void paintEvent ( TQPaintEvent * ); + void mousePressEvent ( TQMouseEvent * ); + void mouseReleaseEvent ( TQMouseEvent * ); private: Sensor *sensor; - QString strValue; - QColor colorNormal,colorAlarm; + TQString strValue; + TQColor colorNormal,colorAlarm; }; diff --git a/src/lmsensorpanel.cpp b/src/lmsensorpanel.cpp index 5a73fde..7097321 100644 --- a/src/lmsensorpanel.cpp +++ b/src/lmsensorpanel.cpp @@ -17,7 +17,7 @@ #include "lmsensorpanel.h" -LMSensorPanel::LMSensorPanel(Sensor *newSensor, QWidget *parent, const char *name ) : Panel(parent,name) +LMSensorPanel::LMSensorPanel(Sensor *newSensor, TQWidget *parent, const char *name ) : Panel(parent,name) { alarm= false; // @@ -73,7 +73,7 @@ void LMSensorPanel::updateConfig() arc->setValueRanges( min - (max-min)/3, max + (max-min)/3 ); arc->setValueMinLimit( min,10); arc->setValueMaxLimit( max,10); - arc->setColorRanges(blue,QColor(0,200,150),blue); + arc->setColorRanges(blue,TQColor(0,200,150),blue); arc->setArrowColor(darkBlue); } valMask= "%.2fv"; @@ -89,7 +89,7 @@ void LMSensorPanel::updateConfig() void LMSensorPanel::setValue(double value) { -QString str; +TQString str; str.sprintf(valMask.latin1(),value); lcdVal->display(str); @@ -114,7 +114,7 @@ QString str; void LMSensorPanel::createTitleWidget() { - lcdDes = new QLCDString(this); + lcdDes = new TQLCDString(this); lcdDes->setNumberDisplay(true); lcdDes->installEventFilter(this); } @@ -122,7 +122,7 @@ void LMSensorPanel::createTitleWidget() void LMSensorPanel::createGraphicWidget() { - arc = new QDialArc(this); + arc = new TQDialArc(this); arc->installEventFilter(this); arc->setAngles(180,-180); } @@ -130,14 +130,14 @@ void LMSensorPanel::createGraphicWidget() void LMSensorPanel::createValueWidget() { - lcdVal = new QLCDString(this); + lcdVal = new TQLCDString(this); lcdVal->installEventFilter(this); lcdVal->setShadow(true); lcdVal->setNumberDisplay(sensor->getType()==Sensor::lmVoltage); } -void LMSensorPanel::resizeEvent ( QResizeEvent *e ) +void LMSensorPanel::resizeEvent ( TQResizeEvent *e ) { int w= width(); int h= height(); @@ -151,7 +151,7 @@ void LMSensorPanel::resizeEvent ( QResizeEvent *e ) lcdDes->setGeometry( 3 , i2+1, w -6 , h -i2-h/11); } -void LMSensorPanel::timerEvent( QTimerEvent * ) +void LMSensorPanel::timerEvent( TQTimerEvent * ) { if(lcdVal->isVisible()) lcdVal->hide(); else lcdVal->show(); @@ -159,7 +159,7 @@ void LMSensorPanel::timerEvent( QTimerEvent * ) } -void LMSensorPanel::paletteChange(const QPalette &oldPalette) +void LMSensorPanel::paletteChange(const TQPalette &oldPalette) { lcdDes->setForeColor(getColorTitle()); lcdVal->setForeColor(getColorValue()); diff --git a/src/lmsensorpanel.h b/src/lmsensorpanel.h index 8d0bad4..366aa43 100644 --- a/src/lmsensorpanel.h +++ b/src/lmsensorpanel.h @@ -18,7 +18,7 @@ #ifndef LMSENSORPANEL_H #define LMSENSORPANEL_H -#include <qstring.h> +#include <ntqstring.h> #include "panel.h" #include "sensor.h" @@ -34,7 +34,7 @@ class LMSensorPanel : public Panel { Q_OBJECT public: - LMSensorPanel(Sensor *newSensor, QWidget *parent=0, const char *name=0); + LMSensorPanel(Sensor *newSensor, TQWidget *parent=0, const char *name=0); ~LMSensorPanel(); public slots: @@ -44,22 +44,22 @@ public slots: protected: - void resizeEvent ( QResizeEvent * ); + void resizeEvent ( TQResizeEvent * ); void createTitleWidget(); void createGraphicWidget(); void createValueWidget(); - void timerEvent( QTimerEvent * ); - void paletteChange(const QPalette &oldPalette); + void timerEvent( TQTimerEvent * ); + void paletteChange(const TQPalette &oldPalette); private: Sensor *sensor; - QDialArc *arc; - QLCDString *lcdDes; - QLCDString *lcdVal; - QString valMask; + TQDialArc *arc; + TQLCDString *lcdDes; + TQLCDString *lcdVal; + TQString valMask; bool alarm; }; diff --git a/src/lmsensors.cpp b/src/lmsensors.cpp index 073d172..fb44e78 100644 --- a/src/lmsensors.cpp +++ b/src/lmsensors.cpp @@ -21,8 +21,8 @@ #include <string.h> #include <sys/stat.h> -#include <qstrlist.h> -#include <qobjectlist.h> +#include <ntqstrlist.h> +#include <ntqobjectlist.h> #include "lmsensors.h" @@ -30,8 +30,8 @@ // Public methods //**************************************************************************** -LMSensors::LMSensors(QObject *parent, const char * name) - : QObject(parent,name) +LMSensors::LMSensors(TQObject *parent, const char * name) + : TQObject(parent,name) { if(initSensors()) createLMSensors(); createI8KSensors(); @@ -48,7 +48,7 @@ bool LMSensors::initSensors() #if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */ FILE *fp=fopen("/etc/sensors.conf","r"); if(!fp) { - qWarning("KSensors error: /etc/sensors.conf not found !"); + tqWarning("KSensors error: /etc/sensors.conf not found !"); return false; } #else @@ -56,7 +56,7 @@ bool LMSensors::initSensors() #endif int err= sensors_init(fp); if(err) { - qWarning("KSensors error: sensors_init fail, error code %d",err); + tqWarning("KSensors error: sensors_init fail, error code %d",err); return false; } #if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */ @@ -115,7 +115,7 @@ const sensors_feature_data *sensor_data; void LMSensors::setMonitorized(bool enable) { - QObjectList *list= getSensorsChips(); + TQObjectList *list= getSensorsChips(); if(list) for(LMSensorsChip *sensor=(LMSensorsChip*)list->first(); sensor!=0; sensor= (LMSensorsChip *)list->next()) sensor->setMonitorized(enable); @@ -132,7 +132,7 @@ Sensor *LMSensors::getSensor(const char *name) return sensor; } -void LMSensors::childEvent( QChildEvent *e ) +void LMSensors::childEvent( TQChildEvent *e ) { if(e->inserted()) { connect((SensorsList *)e->child(),SIGNAL(valueChanged(Sensor *)) ,this,SIGNAL(valueChanged(Sensor *))); diff --git a/src/lmsensors.h b/src/lmsensors.h index 50c20ea..8a0b6ef 100644 --- a/src/lmsensors.h +++ b/src/lmsensors.h @@ -18,10 +18,10 @@ #ifndef LMSENSORS_H #define LMSENSORS_H -#include <qobject.h> -#include <qobjectlist.h> -#include <kconfig.h> -#include <qstringlist.h> +#include <ntqobject.h> +#include <ntqobjectlist.h> +#include <tdeconfig.h> +#include <ntqstringlist.h> #include <sensors/sensors.h> @@ -32,7 +32,7 @@ *@author Michael */ -class LMSensors : public QObject +class LMSensors : public TQObject { Q_OBJECT @@ -40,12 +40,12 @@ Q_OBJECT public: - LMSensors(QObject *parent=0, const char *name=0); + LMSensors(TQObject *parent=0, const char *name=0); ~LMSensors(); void setMonitorized(bool enable); - QObjectList *getSensorsChips() { return (QObjectList *)children(); }; - SensorsList *getSensorsChip(int index) { return children() ? (SensorsList *)((QObjectList *)children())->at(index) : 0; } + TQObjectList *getSensorsChips() { return (TQObjectList *)children(); }; + SensorsList *getSensorsChip(int index) { return children() ? (SensorsList *)((TQObjectList *)children())->at(index) : 0; } SensorsList *getSensorsChip(const char *name) { return (SensorsList *)child(name); } int count() { return children() ? children()->count() : 0; } Sensor *getSensor(const char *name); @@ -63,7 +63,7 @@ private: void createLMSensors(); void createHDSensors(); void createI8KSensors(); - void childEvent ( QChildEvent *e ); + void childEvent ( TQChildEvent *e ); #if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */ static int existSensor(const sensors_chip_name *chip_name,const char *sensor_name); diff --git a/src/lmsensorsalarms.cpp b/src/lmsensorsalarms.cpp index 895e223..f05962f 100644 --- a/src/lmsensorsalarms.cpp +++ b/src/lmsensorsalarms.cpp @@ -18,8 +18,8 @@ #include <stdlib.h> -#include <qstring.h> -#include <kglobal.h> +#include <ntqstring.h> +#include <tdeglobal.h> #include <kprocess.h> #include <kaudioplayer.h> #include "lmsensorsalarms.h" @@ -27,8 +27,8 @@ -LMSensorsAlarms::LMSensorsAlarms(LMSensors *sensors, QObject *parent, const char *name) - : QObject(parent,name) +LMSensorsAlarms::LMSensorsAlarms(LMSensors *sensors, TQObject *parent, const char *name) + : TQObject(parent,name) { sensorCount= 0; soundPlay = ""; @@ -82,7 +82,7 @@ void LMSensorsAlarms::setValueChanged(Sensor *sensor) runSensorCommand( (const char *)sensor->getDescription(), - (const char *)QString::number(sensor->getValue()), + (const char *)TQString::number(sensor->getValue()), (const char *)readAlarmCommand(sensor->name()) ); break; @@ -97,7 +97,7 @@ void LMSensorsAlarms::setValueChanged(Sensor *sensor) } } -void LMSensorsAlarms::timerEvent( QTimerEvent * ) +void LMSensorsAlarms::timerEvent( TQTimerEvent * ) { KAudioPlayer::play(soundPlay); } @@ -106,40 +106,40 @@ void LMSensorsAlarms::timerEvent( QTimerEvent * ) int LMSensorsAlarms::readAlarm(const char *name) { - KGlobal::config()->setGroup(name); - return KGlobal::config()->readNumEntry("Alarm",acNothing); + TDEGlobal::config()->setGroup(name); + return TDEGlobal::config()->readNumEntry("Alarm",acNothing); } void LMSensorsAlarms::writeAlarm(const char *name, int alarm) { - KGlobal::config()->setGroup(name); - KGlobal::config()->writeEntry("Alarm",alarm); + TDEGlobal::config()->setGroup(name); + TDEGlobal::config()->writeEntry("Alarm",alarm); } -QString LMSensorsAlarms::readAlarmCommand(const char *name) +TQString LMSensorsAlarms::readAlarmCommand(const char *name) { - KGlobal::config()->setGroup(name); - return KGlobal::config()->readEntry("AlarmCommand", ""); + TDEGlobal::config()->setGroup(name); + return TDEGlobal::config()->readEntry("AlarmCommand", ""); } -void LMSensorsAlarms::writeAlarmCommand(const char *name, const QString &cmd) +void LMSensorsAlarms::writeAlarmCommand(const char *name, const TQString &cmd) { - KGlobal::config()->setGroup(name); - KGlobal::config()->writeEntry("AlarmCommand", cmd); + TDEGlobal::config()->setGroup(name); + TDEGlobal::config()->writeEntry("AlarmCommand", cmd); } -QString LMSensorsAlarms::readAlarmSound(const char *name) +TQString LMSensorsAlarms::readAlarmSound(const char *name) { - KGlobal::config()->setGroup(name); - return KGlobal::config()->readEntry("AlarmSound", "ksensors_alert.wav"); + TDEGlobal::config()->setGroup(name); + return TDEGlobal::config()->readEntry("AlarmSound", "ksensors_alert.wav"); } -void LMSensorsAlarms::writeAlarmSound(const char *name, const QString &cmd) +void LMSensorsAlarms::writeAlarmSound(const char *name, const TQString &cmd) { - KGlobal::config()->setGroup(name); - KGlobal::config()->writeEntry("AlarmSound", cmd); + TDEGlobal::config()->setGroup(name); + TDEGlobal::config()->writeEntry("AlarmSound", cmd); } diff --git a/src/lmsensorsalarms.h b/src/lmsensorsalarms.h index 4c811bb..179d478 100644 --- a/src/lmsensorsalarms.h +++ b/src/lmsensorsalarms.h @@ -18,29 +18,29 @@ #ifndef LMSENSORSALARMS_H #define LMSENSORSALARMS_H -#include <qobject.h> -#include <qstring.h> +#include <ntqobject.h> +#include <ntqstring.h> #include "lmsensors.h" /** *@author Miguel Novas */ -class LMSensorsAlarms : public QObject { +class LMSensorsAlarms : public TQObject { Q_OBJECT public: enum Actions { acNothing, acSound, acCommand }; - LMSensorsAlarms(LMSensors *sensors, QObject *parent=0, const char *name=0); + LMSensorsAlarms(LMSensors *sensors, TQObject *parent=0, const char *name=0); ~LMSensorsAlarms(); static int readAlarm(const char *name); - static QString readAlarmSound(const char *name); + static TQString readAlarmSound(const char *name); static void writeAlarm(const char *name, int alarm); - static QString readAlarmCommand(const char *name); - static void writeAlarmCommand(const char *name, const QString &cmd); - static void writeAlarmSound(const char *name, const QString &cmd); + static TQString readAlarmCommand(const char *name); + static void writeAlarmCommand(const char *name, const TQString &cmd); + static void writeAlarmSound(const char *name, const TQString &cmd); static void runSensorCommand(const char *name,const char *value, const char *cmd); static void playSound(const char *sound); @@ -51,11 +51,11 @@ public slots: private: int sensorCount; - QString soundPlay; + TQString soundPlay; static void runCommand(const char *str); - void timerEvent( QTimerEvent * ); + void timerEvent( TQTimerEvent * ); }; #endif diff --git a/src/lmsensorscfg.cpp b/src/lmsensorscfg.cpp index 0aab99c..bc2e1ca 100644 --- a/src/lmsensorscfg.cpp +++ b/src/lmsensorscfg.cpp @@ -22,40 +22,40 @@ #include "lmsensordockpanel.h" #include "lmsensorswidget.h" -#include <qcolor.h> -#include <qlistbox.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qpushbutton.h> -#include <qobjectlist.h> -#include <qtabwidget.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qlayout.h> +#include <ntqcolor.h> +#include <ntqlistbox.h> +#include <ntqlineedit.h> +#include <ntqcheckbox.h> +#include <ntqgroupbox.h> +#include <ntqradiobutton.h> +#include <ntqpushbutton.h> +#include <ntqobjectlist.h> +#include <ntqtabwidget.h> +#include <ntqcombobox.h> +#include <ntqspinbox.h> +#include <ntqlayout.h> #include <kcolorbutton.h> #include <kiconloader.h> -#include <klocale.h> -#include <kaboutapplication.h> +#include <tdelocale.h> +#include <tdeaboutapplication.h> -LMSensorsCfg::LMSensorsCfg(SensorsList *lsensors,QWidget *parent, const char *name) : LMSensorsCfgDesign(parent,name,WDestructiveClose) +LMSensorsCfg::LMSensorsCfg(SensorsList *lsensors,TQWidget *parent, const char *name) : LMSensorsCfgDesign(parent,name,WDestructiveClose) { sensors = lsensors; curSensor= 0; palPanelCfg= new PaletteCfg( boxPanelPalette ); - boxPanelPalette->setColumnLayout(0, Qt::Vertical ); + boxPanelPalette->setColumnLayout(0, TQt::Vertical ); boxPanelPalette->layout()->setSpacing( 6 ); boxPanelPalette->layout()->setMargin( 12 ); - QGridLayout *boxPanelPaletteLayout = new QGridLayout( boxPanelPalette->layout() ); - boxPanelPaletteLayout->setAlignment( Qt::AlignTop ); + TQGridLayout *boxPanelPaletteLayout = new TQGridLayout( boxPanelPalette->layout() ); + boxPanelPaletteLayout->setAlignment( TQt::AlignTop ); boxPanelPaletteLayout->addWidget( palPanelCfg, 0, 0 ); readSensorsList(); - connect( MainTab ,SIGNAL(currentChanged(QWidget*)), this, SLOT(slotMainTabPageChanged(QWidget *))); + connect( MainTab ,SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotMainTabPageChanged(TQWidget *))); connect( listSensors ,SIGNAL(highlighted(int)),this,SLOT(slotCurrentSensorChanged(int)) ); //connect( buttonApply ,SIGNAL(clicked()),this,SLOT(slotApplyChanges())); connect( buttonTest ,SIGNAL(clicked()),this,SLOT(slotTestAlarm())); @@ -69,10 +69,10 @@ LMSensorsCfg::~LMSensorsCfg() void LMSensorsCfg::readSensorsList() { - QObjectList *list= sensors->getSensors(); + TQObjectList *list= sensors->getSensors(); if(list) { listSensors->clear(); - QPixmap pm; + TQPixmap pm; for(LMSensor *sensor=(LMSensor*)list->first(); sensor!=0; sensor= (LMSensor*)list->next()) { switch(sensor->getType()) { case LMSensor::lmTemp : pm= UserIcon("thermometer18x18.png"); break; @@ -114,7 +114,7 @@ void LMSensorsCfg::readSensorInfo(int index) editDescription ->setText(curSensor->getDescription()); - QString str; + TQString str; const char *mask= curSensor->getType()==LMSensor::lmVoltage ? "%.2lf":"%.0lf"; @@ -130,8 +130,8 @@ void LMSensorsCfg::readSensorInfo(int index) str.sprintf(mask, curSensor->getValueMax()); editMaxValue->setEditText(str); - editSum->setText(QString::number(curSensor->getCompensation())); - editMul->setText(QString::number(curSensor->getMultiplicator())); + editSum->setText(TQString::number(curSensor->getCompensation())); + editMul->setText(TQString::number(curSensor->getMultiplicator())); //checkShowInDock->setEnabled( curSensor->getType()==LMSensor::lmTemp ); //GroupBoxColorDock->setEnabled( curSensor->getType()==LMSensor::lmTemp ); @@ -171,7 +171,7 @@ void LMSensorsCfg::applySensorChanges() { if(!curSensor) return; - const QString sName(curSensor->name()); + const TQString sName(curSensor->name()); // Apply sensor configuration curSensor->setDescription(editDescription->text()); curSensor->setCompensation(editSum->text().toDouble()); @@ -195,7 +195,7 @@ void LMSensorsCfg::applySensorChanges() // // Apply alarms configuration if( CheckAllSensors->isChecked() ) { - QObjectList *list= sensors->getSensors(); + TQObjectList *list= sensors->getSensors(); for(Sensor *sensor=(Sensor*)list->first(); sensor!=0; sensor= (Sensor*)list->next()) { applySensorAlarmConfig(sensor); sensor->writeConfig(); @@ -266,7 +266,7 @@ void LMSensorsCfg::slotTestAlarm() } } -void LMSensorsCfg::slotMainTabPageChanged(QWidget *) +void LMSensorsCfg::slotMainTabPageChanged(TQWidget *) { switch(MainTab->currentPageIndex()) { @@ -277,8 +277,8 @@ void LMSensorsCfg::slotMainTabPageChanged(QWidget *) void LMSensorsCfg::slotComboMinMaxSelected(int index) { - QComboBox *combo = (QComboBox*)sender(); - QString str = combo->text(index); + TQComboBox *combo = (TQComboBox*)sender(); + TQString str = combo->text(index); double percent= str.left(str.length()-1).toDouble(); double value = editIdealValue->text().toDouble(); diff --git a/src/lmsensorscfg.h b/src/lmsensorscfg.h index 00300ca..bca1410 100644 --- a/src/lmsensorscfg.h +++ b/src/lmsensorscfg.h @@ -18,7 +18,7 @@ #ifndef LMSENSORSCFG_H #define LMSENSORSCFG_H -//#include <qobject.h> +//#include <ntqobject.h> #include "sensorslist.h" #include "lmsensorscfgdesign.h" @@ -31,7 +31,7 @@ class LMSensorsCfg : public LMSensorsCfgDesign { Q_OBJECT public: - LMSensorsCfg(SensorsList *lsensors,QWidget *parent=0, const char *name=0); + LMSensorsCfg(SensorsList *lsensors,TQWidget *parent=0, const char *name=0); ~LMSensorsCfg(); protected slots: @@ -41,7 +41,7 @@ protected slots: void slotTestAlarm(); void slotCurrentSensorChanged(int index); - void slotMainTabPageChanged(QWidget *); + void slotMainTabPageChanged(TQWidget *); void slotComboMinMaxSelected(int index); public slots: diff --git a/src/lmsensorscfgdesign.cpp b/src/lmsensorscfgdesign.cpp index 2f9f3c6..8c0eeeb 100644 --- a/src/lmsensorscfgdesign.cpp +++ b/src/lmsensorscfgdesign.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file './lmsensorscfgdesign.ui' ** @@ -10,71 +10,71 @@ #include "lmsensorscfgdesign.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qcheckbox.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqtabwidget.h> +#include <ntqgroupbox.h> +#include <ntqlabel.h> +#include <ntqlineedit.h> +#include <ntqcombobox.h> +#include <ntqcheckbox.h> #include <kcolorbutton.h> -#include <qframe.h> -#include <qradiobutton.h> -#include <qlistbox.h> -#include <qbuttongroup.h> -#include <qspinbox.h> -#include <qslider.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqframe.h> +#include <ntqradiobutton.h> +#include <ntqlistbox.h> +#include <ntqbuttongroup.h> +#include <ntqspinbox.h> +#include <ntqslider.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a LMSensorsCfgDesign as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -LMSensorsCfgDesign::LMSensorsCfgDesign( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +LMSensorsCfgDesign::LMSensorsCfgDesign( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "LMSensorsCfgDesign" ); - setMinimumSize( QSize( 0, 340 ) ); - LMSensorsCfgDesignLayout = new QGridLayout( this, 1, 1, 8, 4, "LMSensorsCfgDesignLayout"); + setMinimumSize( TQSize( 0, 340 ) ); + LMSensorsCfgDesignLayout = new TQGridLayout( this, 1, 1, 8, 4, "LMSensorsCfgDesignLayout"); - MainTab = new QTabWidget( this, "MainTab" ); - MainTab->setMinimumSize( QSize( 422, 295 ) ); + MainTab = new TQTabWidget( this, "MainTab" ); + MainTab->setMinimumSize( TQSize( 422, 295 ) ); - tab = new QWidget( MainTab, "tab" ); - tabLayout = new QGridLayout( tab, 1, 1, 11, 6, "tabLayout"); + tab = new TQWidget( MainTab, "tab" ); + tabLayout = new TQGridLayout( tab, 1, 1, 11, 6, "tabLayout"); - SensorsTab = new QTabWidget( tab, "SensorsTab" ); - SensorsTab->setMinimumSize( QSize( 272, 276 ) ); - SensorsTab->setTabShape( QTabWidget::Rounded ); + SensorsTab = new TQTabWidget( tab, "SensorsTab" ); + SensorsTab->setMinimumSize( TQSize( 272, 276 ) ); + SensorsTab->setTabShape( TQTabWidget::Rounded ); SensorsTab->setMargin( 0 ); - tab_2 = new QWidget( SensorsTab, "tab_2" ); - tabLayout_2 = new QGridLayout( tab_2, 1, 1, 11, 6, "tabLayout_2"); + tab_2 = new TQWidget( SensorsTab, "tab_2" ); + tabLayout_2 = new TQGridLayout( tab_2, 1, 1, 11, 6, "tabLayout_2"); - GroupBoxDes = new QGroupBox( tab_2, "GroupBoxDes" ); - GroupBoxDes->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)1, 0, 0, GroupBoxDes->sizePolicy().hasHeightForWidth() ) ); - GroupBoxDes->setColumnLayout(0, Qt::Vertical ); + GroupBoxDes = new TQGroupBox( tab_2, "GroupBoxDes" ); + GroupBoxDes->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, GroupBoxDes->sizePolicy().hasHeightForWidth() ) ); + GroupBoxDes->setColumnLayout(0, TQt::Vertical ); GroupBoxDes->layout()->setSpacing( 6 ); GroupBoxDes->layout()->setMargin( 11 ); - GroupBoxDesLayout = new QGridLayout( GroupBoxDes->layout() ); - GroupBoxDesLayout->setAlignment( Qt::AlignTop ); + GroupBoxDesLayout = new TQGridLayout( GroupBoxDes->layout() ); + GroupBoxDesLayout->setAlignment( TQt::AlignTop ); - layout5 = new QHBoxLayout( 0, 0, 6, "layout5"); + layout5 = new TQHBoxLayout( 0, 0, 6, "layout5"); - pixmapSensor = new QLabel( GroupBoxDes, "pixmapSensor" ); + pixmapSensor = new TQLabel( GroupBoxDes, "pixmapSensor" ); pixmapSensor->setScaledContents( TRUE ); layout5->addWidget( pixmapSensor ); - layout4 = new QVBoxLayout( 0, 0, 6, "layout4"); + layout4 = new TQVBoxLayout( 0, 0, 6, "layout4"); - TextLabel2_2 = new QLabel( GroupBoxDes, "TextLabel2_2" ); + TextLabel2_2 = new TQLabel( GroupBoxDes, "TextLabel2_2" ); layout4->addWidget( TextLabel2_2 ); - editDescription = new QLineEdit( GroupBoxDes, "editDescription" ); + editDescription = new TQLineEdit( GroupBoxDes, "editDescription" ); layout4->addWidget( editDescription ); layout5->addLayout( layout4 ); @@ -82,144 +82,144 @@ LMSensorsCfgDesign::LMSensorsCfgDesign( QWidget* parent, const char* name, WFlag tabLayout_2->addWidget( GroupBoxDes, 0, 0 ); - GroupBox2_2_2 = new QGroupBox( tab_2, "GroupBox2_2_2" ); - GroupBox2_2_2->setFrameShape( QGroupBox::Box ); - GroupBox2_2_2->setFrameShadow( QGroupBox::Sunken ); - GroupBox2_2_2->setColumnLayout(0, Qt::Vertical ); + GroupBox2_2_2 = new TQGroupBox( tab_2, "GroupBox2_2_2" ); + GroupBox2_2_2->setFrameShape( TQGroupBox::Box ); + GroupBox2_2_2->setFrameShadow( TQGroupBox::Sunken ); + GroupBox2_2_2->setColumnLayout(0, TQt::Vertical ); GroupBox2_2_2->layout()->setSpacing( 6 ); GroupBox2_2_2->layout()->setMargin( 11 ); - GroupBox2_2_2Layout = new QGridLayout( GroupBox2_2_2->layout() ); - GroupBox2_2_2Layout->setAlignment( Qt::AlignTop ); + GroupBox2_2_2Layout = new TQGridLayout( GroupBox2_2_2->layout() ); + GroupBox2_2_2Layout->setAlignment( TQt::AlignTop ); - editValue = new QLineEdit( GroupBox2_2_2, "editValue" ); + editValue = new TQLineEdit( GroupBox2_2_2, "editValue" ); editValue->setEnabled( FALSE ); - editValue->setAlignment( int( QLineEdit::AlignLeft ) ); + editValue->setAlignment( int( TQLineEdit::AlignLeft ) ); editValue->setEdited( TRUE ); GroupBox2_2_2Layout->addWidget( editValue, 1, 0 ); - TextLabel3_2_2_3_2_2_2 = new QLabel( GroupBox2_2_2, "TextLabel3_2_2_3_2_2_2" ); + TextLabel3_2_2_3_2_2_2 = new TQLabel( GroupBox2_2_2, "TextLabel3_2_2_3_2_2_2" ); GroupBox2_2_2Layout->addWidget( TextLabel3_2_2_3_2_2_2, 0, 0 ); - TextLabel3_2_4_2_2_2 = new QLabel( GroupBox2_2_2, "TextLabel3_2_4_2_2_2" ); + TextLabel3_2_4_2_2_2 = new TQLabel( GroupBox2_2_2, "TextLabel3_2_4_2_2_2" ); TextLabel3_2_4_2_2_2->setScaledContents( FALSE ); GroupBox2_2_2Layout->addWidget( TextLabel3_2_4_2_2_2, 0, 1 ); - editMaxValue = new QComboBox( FALSE, GroupBox2_2_2, "editMaxValue" ); + editMaxValue = new TQComboBox( FALSE, GroupBox2_2_2, "editMaxValue" ); editMaxValue->setEditable( TRUE ); editMaxValue->setSizeLimit( 12 ); GroupBox2_2_2Layout->addWidget( editMaxValue, 1, 1 ); - TextLabel1_2_3_2_2 = new QLabel( GroupBox2_2_2, "TextLabel1_2_3_2_2" ); + TextLabel1_2_3_2_2 = new TQLabel( GroupBox2_2_2, "TextLabel1_2_3_2_2" ); GroupBox2_2_2Layout->addWidget( TextLabel1_2_3_2_2, 0, 2 ); - editMul = new QLineEdit( GroupBox2_2_2, "editMul" ); + editMul = new TQLineEdit( GroupBox2_2_2, "editMul" ); GroupBox2_2_2Layout->addWidget( editMul, 1, 2 ); - TextLabel3_2 = new QLabel( GroupBox2_2_2, "TextLabel3_2" ); + TextLabel3_2 = new TQLabel( GroupBox2_2_2, "TextLabel3_2" ); GroupBox2_2_2Layout->addWidget( TextLabel3_2, 3, 0 ); - TextLabel3_2_3_2_2_2_2 = new QLabel( GroupBox2_2_2, "TextLabel3_2_3_2_2_2_2" ); + TextLabel3_2_3_2_2_2_2 = new TQLabel( GroupBox2_2_2, "TextLabel3_2_3_2_2_2_2" ); GroupBox2_2_2Layout->addWidget( TextLabel3_2_3_2_2_2_2, 3, 1 ); - TextLabel1_3_3_2 = new QLabel( GroupBox2_2_2, "TextLabel1_3_3_2" ); + TextLabel1_3_3_2 = new TQLabel( GroupBox2_2_2, "TextLabel1_3_3_2" ); GroupBox2_2_2Layout->addWidget( TextLabel1_3_3_2, 3, 2 ); - editIdealValue = new QLineEdit( GroupBox2_2_2, "editIdealValue" ); - editIdealValue->setAlignment( int( QLineEdit::AlignLeft ) ); + editIdealValue = new TQLineEdit( GroupBox2_2_2, "editIdealValue" ); + editIdealValue->setAlignment( int( TQLineEdit::AlignLeft ) ); GroupBox2_2_2Layout->addWidget( editIdealValue, 4, 0 ); - editMinValue = new QComboBox( FALSE, GroupBox2_2_2, "editMinValue" ); + editMinValue = new TQComboBox( FALSE, GroupBox2_2_2, "editMinValue" ); editMinValue->setEditable( TRUE ); editMinValue->setSizeLimit( 12 ); GroupBox2_2_2Layout->addWidget( editMinValue, 4, 1 ); - editSum = new QLineEdit( GroupBox2_2_2, "editSum" ); + editSum = new TQLineEdit( GroupBox2_2_2, "editSum" ); GroupBox2_2_2Layout->addWidget( editSum, 4, 2 ); - spacer12 = new QSpacerItem( 21, 21, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer12 = new TQSpacerItem( 21, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); GroupBox2_2_2Layout->addItem( spacer12, 5, 1 ); - spacer10 = new QSpacerItem( 20, 5, QSizePolicy::Minimum, QSizePolicy::Fixed ); + spacer10 = new TQSpacerItem( 20, 5, TQSizePolicy::Minimum, TQSizePolicy::Fixed ); GroupBox2_2_2Layout->addItem( spacer10, 2, 1 ); tabLayout_2->addWidget( GroupBox2_2_2, 1, 0 ); - SensorsTab->insertTab( tab_2, QString("") ); + SensorsTab->insertTab( tab_2, TQString("") ); - tab_3 = new QWidget( SensorsTab, "tab_3" ); - tabLayout_3 = new QVBoxLayout( tab_3, 11, 6, "tabLayout_3"); + tab_3 = new TQWidget( SensorsTab, "tab_3" ); + tabLayout_3 = new TQVBoxLayout( tab_3, 11, 6, "tabLayout_3"); - GroupBox13 = new QGroupBox( tab_3, "GroupBox13" ); - GroupBox13->setMinimumSize( QSize( 0, 50 ) ); - GroupBox13->setMaximumSize( QSize( 32767, 50 ) ); - GroupBox13->setColumnLayout(0, Qt::Vertical ); + GroupBox13 = new TQGroupBox( tab_3, "GroupBox13" ); + GroupBox13->setMinimumSize( TQSize( 0, 50 ) ); + GroupBox13->setMaximumSize( TQSize( 32767, 50 ) ); + GroupBox13->setColumnLayout(0, TQt::Vertical ); GroupBox13->layout()->setSpacing( 6 ); GroupBox13->layout()->setMargin( 11 ); - GroupBox13Layout = new QGridLayout( GroupBox13->layout() ); - GroupBox13Layout->setAlignment( Qt::AlignTop ); + GroupBox13Layout = new TQGridLayout( GroupBox13->layout() ); + GroupBox13Layout->setAlignment( TQt::AlignTop ); - checkShow = new QCheckBox( GroupBox13, "checkShow" ); - checkShow->setCursor( QCursor( 0 ) ); + checkShow = new TQCheckBox( GroupBox13, "checkShow" ); + checkShow->setCursor( TQCursor( 0 ) ); GroupBox13Layout->addWidget( checkShow, 0, 0 ); tabLayout_3->addWidget( GroupBox13 ); - boxPanelPalette = new QGroupBox( tab_3, "boxPanelPalette" ); - boxPanelPalette->setMinimumSize( QSize( 0, 90 ) ); + boxPanelPalette = new TQGroupBox( tab_3, "boxPanelPalette" ); + boxPanelPalette->setMinimumSize( TQSize( 0, 90 ) ); tabLayout_3->addWidget( boxPanelPalette ); - Spacer4_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + Spacer4_2 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_3->addItem( Spacer4_2 ); - SensorsTab->insertTab( tab_3, QString("") ); + SensorsTab->insertTab( tab_3, TQString("") ); - tab_4 = new QWidget( SensorsTab, "tab_4" ); - tabLayout_4 = new QGridLayout( tab_4, 1, 1, 11, 6, "tabLayout_4"); + tab_4 = new TQWidget( SensorsTab, "tab_4" ); + tabLayout_4 = new TQGridLayout( tab_4, 1, 1, 11, 6, "tabLayout_4"); - GroupBox14 = new QGroupBox( tab_4, "GroupBox14" ); - GroupBox14->setMinimumSize( QSize( 0, 50 ) ); - GroupBox14->setMaximumSize( QSize( 32767, 50 ) ); - GroupBox14->setColumnLayout(0, Qt::Vertical ); + GroupBox14 = new TQGroupBox( tab_4, "GroupBox14" ); + GroupBox14->setMinimumSize( TQSize( 0, 50 ) ); + GroupBox14->setMaximumSize( TQSize( 32767, 50 ) ); + GroupBox14->setColumnLayout(0, TQt::Vertical ); GroupBox14->layout()->setSpacing( 6 ); GroupBox14->layout()->setMargin( 11 ); - GroupBox14Layout = new QGridLayout( GroupBox14->layout() ); - GroupBox14Layout->setAlignment( Qt::AlignTop ); + GroupBox14Layout = new TQGridLayout( GroupBox14->layout() ); + GroupBox14Layout->setAlignment( TQt::AlignTop ); - checkShowInDock = new QCheckBox( GroupBox14, "checkShowInDock" ); - checkShowInDock->setCursor( QCursor( 0 ) ); + checkShowInDock = new TQCheckBox( GroupBox14, "checkShowInDock" ); + checkShowInDock->setCursor( TQCursor( 0 ) ); GroupBox14Layout->addWidget( checkShowInDock, 0, 0 ); tabLayout_4->addWidget( GroupBox14, 0, 0 ); - Spacer3_2 = new QSpacerItem( 20, 120, QSizePolicy::Minimum, QSizePolicy::Expanding ); + Spacer3_2 = new TQSpacerItem( 20, 120, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_4->addItem( Spacer3_2, 2, 0 ); - GroupBoxColorDock = new QGroupBox( tab_4, "GroupBoxColorDock" ); + GroupBoxColorDock = new TQGroupBox( tab_4, "GroupBoxColorDock" ); GroupBoxColorDock->setEnabled( TRUE ); - GroupBoxColorDock->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)5, 0, 0, GroupBoxColorDock->sizePolicy().hasHeightForWidth() ) ); - GroupBoxColorDock->setFrameShape( QGroupBox::Box ); - GroupBoxColorDock->setColumnLayout(0, Qt::Vertical ); + GroupBoxColorDock->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)5, 0, 0, GroupBoxColorDock->sizePolicy().hasHeightForWidth() ) ); + GroupBoxColorDock->setFrameShape( TQGroupBox::Box ); + GroupBoxColorDock->setColumnLayout(0, TQt::Vertical ); GroupBoxColorDock->layout()->setSpacing( 6 ); GroupBoxColorDock->layout()->setMargin( 11 ); - GroupBoxColorDockLayout = new QGridLayout( GroupBoxColorDock->layout() ); - GroupBoxColorDockLayout->setAlignment( Qt::AlignTop ); + GroupBoxColorDockLayout = new TQGridLayout( GroupBoxColorDock->layout() ); + GroupBoxColorDockLayout->setAlignment( TQt::AlignTop ); - TextLabel1_2_2_2_2 = new QLabel( GroupBoxColorDock, "TextLabel1_2_2_2_2" ); - TextLabel1_2_2_2_2->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignLeft ) ); + TextLabel1_2_2_2_2 = new TQLabel( GroupBoxColorDock, "TextLabel1_2_2_2_2" ); + TextLabel1_2_2_2_2->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); GroupBoxColorDockLayout->addWidget( TextLabel1_2_2_2_2, 1, 0 ); colorAlarm = new KColorButton( GroupBoxColorDock, "colorAlarm" ); colorAlarm->setEnabled( TRUE ); colorAlarm->setToggleButton( FALSE ); - colorAlarm->setColor( QColor( 255, 85, 0 ) ); + colorAlarm->setColor( TQColor( 255, 85, 0 ) ); GroupBoxColorDockLayout->addWidget( colorAlarm, 1, 1 ); @@ -228,155 +228,155 @@ LMSensorsCfgDesign::LMSensorsCfgDesign( QWidget* parent, const char* name, WFlag colorNormal->setAcceptDrops( TRUE ); colorNormal->setToggleButton( FALSE ); colorNormal->setOn( FALSE ); - colorNormal->setColor( QColor( 0, 0, 255 ) ); + colorNormal->setColor( TQColor( 0, 0, 255 ) ); GroupBoxColorDockLayout->addWidget( colorNormal, 0, 1 ); - spacer5 = new QSpacerItem( 41, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer5 = new TQSpacerItem( 41, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); GroupBoxColorDockLayout->addItem( spacer5, 0, 2 ); - spacer6 = new QSpacerItem( 41, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer6 = new TQSpacerItem( 41, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); GroupBoxColorDockLayout->addItem( spacer6, 1, 2 ); - TextLabel1_4_2_2 = new QLabel( GroupBoxColorDock, "TextLabel1_4_2_2" ); - TextLabel1_4_2_2->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignLeft ) ); + TextLabel1_4_2_2 = new TQLabel( GroupBoxColorDock, "TextLabel1_4_2_2" ); + TextLabel1_4_2_2->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); GroupBoxColorDockLayout->addWidget( TextLabel1_4_2_2, 0, 0 ); tabLayout_4->addWidget( GroupBoxColorDock, 1, 0 ); - SensorsTab->insertTab( tab_4, QString("") ); + SensorsTab->insertTab( tab_4, TQString("") ); - tab_5 = new QWidget( SensorsTab, "tab_5" ); - tabLayout_5 = new QVBoxLayout( tab_5, 11, 6, "tabLayout_5"); + tab_5 = new TQWidget( SensorsTab, "tab_5" ); + tabLayout_5 = new TQVBoxLayout( tab_5, 11, 6, "tabLayout_5"); - TextLabel1_3_2_2_2_2 = new QLabel( tab_5, "TextLabel1_3_2_2_2_2" ); + TextLabel1_3_2_2_2_2 = new TQLabel( tab_5, "TextLabel1_3_2_2_2_2" ); tabLayout_5->addWidget( TextLabel1_3_2_2_2_2 ); - Frame11_2_2_2 = new QFrame( tab_5, "Frame11_2_2_2" ); - Frame11_2_2_2->setFrameShape( QFrame::HLine ); - Frame11_2_2_2->setFrameShadow( QFrame::Sunken ); + Frame11_2_2_2 = new TQFrame( tab_5, "Frame11_2_2_2" ); + Frame11_2_2_2->setFrameShape( TQFrame::HLine ); + Frame11_2_2_2->setFrameShadow( TQFrame::Sunken ); tabLayout_5->addWidget( Frame11_2_2_2 ); - layout9 = new QGridLayout( 0, 1, 1, 0, 6, "layout9"); + layout9 = new TQGridLayout( 0, 1, 1, 0, 6, "layout9"); - CheckAllSensors = new QCheckBox( tab_5, "CheckAllSensors" ); + CheckAllSensors = new TQCheckBox( tab_5, "CheckAllSensors" ); CheckAllSensors->setAutoResize( TRUE ); layout9->addWidget( CheckAllSensors, 6, 0 ); - spacer9 = new QSpacerItem( 20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer9 = new TQSpacerItem( 20, 31, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); layout9->addItem( spacer9, 7, 0 ); - radioAlarm1 = new QRadioButton( tab_5, "radioAlarm1" ); - radioAlarm1->setCursor( QCursor( 0 ) ); + radioAlarm1 = new TQRadioButton( tab_5, "radioAlarm1" ); + radioAlarm1->setCursor( TQCursor( 0 ) ); radioAlarm1->setChecked( TRUE ); layout9->addWidget( radioAlarm1, 4, 0 ); - buttonTest = new QPushButton( tab_5, "buttonTest" ); + buttonTest = new TQPushButton( tab_5, "buttonTest" ); buttonTest->setEnabled( FALSE ); layout9->addWidget( buttonTest, 5, 1 ); - radioAlarm2 = new QRadioButton( tab_5, "radioAlarm2" ); - radioAlarm2->setCursor( QCursor( 0 ) ); + radioAlarm2 = new TQRadioButton( tab_5, "radioAlarm2" ); + radioAlarm2->setCursor( TQCursor( 0 ) ); radioAlarm2->setChecked( FALSE ); layout9->addWidget( radioAlarm2, 2, 0 ); - radioAlarm3 = new QRadioButton( tab_5, "radioAlarm3" ); - radioAlarm3->setCursor( QCursor( 0 ) ); + radioAlarm3 = new TQRadioButton( tab_5, "radioAlarm3" ); + radioAlarm3->setCursor( TQCursor( 0 ) ); layout9->addWidget( radioAlarm3, 0, 0 ); - layout6 = new QHBoxLayout( 0, 0, 6, "layout6"); - spacer7 = new QSpacerItem( 31, 20, QSizePolicy::Fixed, QSizePolicy::Minimum ); + layout6 = new TQHBoxLayout( 0, 0, 6, "layout6"); + spacer7 = new TQSpacerItem( 31, 20, TQSizePolicy::Fixed, TQSizePolicy::Minimum ); layout6->addItem( spacer7 ); - editLaunch = new QLineEdit( tab_5, "editLaunch" ); + editLaunch = new TQLineEdit( tab_5, "editLaunch" ); editLaunch->setEnabled( FALSE ); layout6->addWidget( editLaunch ); layout9->addLayout( layout6, 1, 0 ); - layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); - spacer8 = new QSpacerItem( 31, 21, QSizePolicy::Fixed, QSizePolicy::Minimum ); + layout7 = new TQHBoxLayout( 0, 0, 6, "layout7"); + spacer8 = new TQSpacerItem( 31, 21, TQSizePolicy::Fixed, TQSizePolicy::Minimum ); layout7->addItem( spacer8 ); - editPlay = new QLineEdit( tab_5, "editPlay" ); + editPlay = new TQLineEdit( tab_5, "editPlay" ); editPlay->setEnabled( FALSE ); layout7->addWidget( editPlay ); layout9->addLayout( layout7, 3, 0 ); tabLayout_5->addLayout( layout9 ); - SensorsTab->insertTab( tab_5, QString("") ); + SensorsTab->insertTab( tab_5, TQString("") ); tabLayout->addWidget( SensorsTab, 0, 1 ); - listSensors = new QListBox( tab, "listSensors" ); - listSensors->setMinimumSize( QSize( 120, 0 ) ); - listSensors->setMaximumSize( QSize( 120, 32767 ) ); - listSensors->setFrameShape( QListBox::StyledPanel ); - listSensors->setFrameShadow( QListBox::Sunken ); + listSensors = new TQListBox( tab, "listSensors" ); + listSensors->setMinimumSize( TQSize( 120, 0 ) ); + listSensors->setMaximumSize( TQSize( 120, 32767 ) ); + listSensors->setFrameShape( TQListBox::StyledPanel ); + listSensors->setFrameShadow( TQListBox::Sunken ); listSensors->setLineWidth( 2 ); - listSensors->setColumnMode( QListBox::FixedNumber ); + listSensors->setColumnMode( TQListBox::FixedNumber ); tabLayout->addWidget( listSensors, 0, 0 ); - MainTab->insertTab( tab, QString("") ); + MainTab->insertTab( tab, TQString("") ); - tab_6 = new QWidget( MainTab, "tab_6" ); - tabLayout_6 = new QGridLayout( tab_6, 1, 1, 11, 6, "tabLayout_6"); + tab_6 = new TQWidget( MainTab, "tab_6" ); + tabLayout_6 = new TQGridLayout( tab_6, 1, 1, 11, 6, "tabLayout_6"); - ButtonGroup5 = new QButtonGroup( tab_6, "ButtonGroup5" ); - ButtonGroup5->setColumnLayout(0, Qt::Vertical ); + ButtonGroup5 = new TQButtonGroup( tab_6, "ButtonGroup5" ); + ButtonGroup5->setColumnLayout(0, TQt::Vertical ); ButtonGroup5->layout()->setSpacing( 6 ); ButtonGroup5->layout()->setMargin( 11 ); - ButtonGroup5Layout = new QGridLayout( ButtonGroup5->layout() ); - ButtonGroup5Layout->setAlignment( Qt::AlignTop ); + ButtonGroup5Layout = new TQGridLayout( ButtonGroup5->layout() ); + ButtonGroup5Layout->setAlignment( TQt::AlignTop ); - RadioF = new QRadioButton( ButtonGroup5, "RadioF" ); - RadioF->setMinimumSize( QSize( 0, 0 ) ); + RadioF = new TQRadioButton( ButtonGroup5, "RadioF" ); + RadioF->setMinimumSize( TQSize( 0, 0 ) ); ButtonGroup5Layout->addWidget( RadioF, 1, 0 ); - RadioC = new QRadioButton( ButtonGroup5, "RadioC" ); + RadioC = new TQRadioButton( ButtonGroup5, "RadioC" ); RadioC->setChecked( TRUE ); ButtonGroup5Layout->addWidget( RadioC, 0, 0 ); - RadioK = new QRadioButton( ButtonGroup5, "RadioK" ); + RadioK = new TQRadioButton( ButtonGroup5, "RadioK" ); ButtonGroup5Layout->addWidget( RadioK, 2, 0 ); tabLayout_6->addWidget( ButtonGroup5, 0, 0 ); - spacer12_2 = new QSpacerItem( 5, 5, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer12_2 = new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_6->addItem( spacer12_2, 2, 0 ); - groupBox79 = new QGroupBox( tab_6, "groupBox79" ); - groupBox79->setColumnLayout(0, Qt::Vertical ); + groupBox79 = new TQGroupBox( tab_6, "groupBox79" ); + groupBox79->setColumnLayout(0, TQt::Vertical ); groupBox79->layout()->setSpacing( 6 ); groupBox79->layout()->setMargin( 18 ); - groupBox79Layout = new QGridLayout( groupBox79->layout() ); - groupBox79Layout->setAlignment( Qt::AlignTop ); + groupBox79Layout = new TQGridLayout( groupBox79->layout() ); + groupBox79Layout->setAlignment( TQt::AlignTop ); - SpinUpdateTime = new QSpinBox( groupBox79, "SpinUpdateTime" ); + SpinUpdateTime = new TQSpinBox( groupBox79, "SpinUpdateTime" ); SpinUpdateTime->setMinValue( 1 ); SpinUpdateTime->setValue( 5 ); groupBox79Layout->addWidget( SpinUpdateTime, 0, 0 ); - SliderUpdateTime = new QSlider( groupBox79, "SliderUpdateTime" ); + SliderUpdateTime = new TQSlider( groupBox79, "SliderUpdateTime" ); SliderUpdateTime->setMaxValue( 60 ); SliderUpdateTime->setValue( 5 ); - SliderUpdateTime->setOrientation( QSlider::Horizontal ); - SliderUpdateTime->setTickmarks( QSlider::Below ); + SliderUpdateTime->setOrientation( TQSlider::Horizontal ); + SliderUpdateTime->setTickmarks( TQSlider::Below ); SliderUpdateTime->setTickInterval( 1 ); groupBox79Layout->addWidget( SliderUpdateTime, 0, 1 ); tabLayout_6->addWidget( groupBox79, 1, 0 ); - MainTab->insertTab( tab_6, QString("") ); + MainTab->insertTab( tab_6, TQString("") ); LMSensorsCfgDesignLayout->addWidget( MainTab, 0, 0 ); languageChange(); - resize( QSize(438, 344).expandedTo(minimumSizeHint()) ); + resize( TQSize(438, 344).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections @@ -392,7 +392,7 @@ LMSensorsCfgDesign::LMSensorsCfgDesign( QWidget* parent, const char* name, WFlag */ LMSensorsCfgDesign::~LMSensorsCfgDesign() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -402,11 +402,11 @@ LMSensorsCfgDesign::~LMSensorsCfgDesign() void LMSensorsCfgDesign::languageChange() { setCaption( tr2i18n( "LMSensorsCfgDesign" ) ); - GroupBoxDes->setTitle( QString::null ); + GroupBoxDes->setTitle( TQString::null ); TextLabel2_2->setText( tr2i18n( "Description" ) ); - editDescription->setText( QString::null ); + editDescription->setText( TQString::null ); GroupBox2_2_2->setTitle( tr2i18n( "Values" ) ); - editValue->setText( QString::null ); + editValue->setText( TQString::null ); TextLabel3_2_2_3_2_2_2->setText( tr2i18n( "Current" ) ); TextLabel3_2_4_2_2_2->setText( tr2i18n( "Maximum" ) ); editMaxValue->clear(); @@ -425,7 +425,7 @@ void LMSensorsCfgDesign::languageChange() TextLabel3_2->setText( tr2i18n( "Ideal" ) ); TextLabel3_2_3_2_2_2_2->setText( tr2i18n( "Minimum" ) ); TextLabel1_3_3_2->setText( tr2i18n( "Addition" ) ); - editIdealValue->setText( QString::null ); + editIdealValue->setText( TQString::null ); editMinValue->clear(); editMinValue->insertItem( tr2i18n( "-1%" ) ); editMinValue->insertItem( tr2i18n( "-2%" ) ); @@ -439,16 +439,16 @@ void LMSensorsCfgDesign::languageChange() editMinValue->insertItem( tr2i18n( "-40%" ) ); editMinValue->insertItem( tr2i18n( "-50%" ) ); SensorsTab->changeTab( tab_2, tr2i18n( "General" ) ); - GroupBox13->setTitle( QString::null ); + GroupBox13->setTitle( TQString::null ); checkShow->setText( tr2i18n( "Visible" ) ); boxPanelPalette->setTitle( tr2i18n( "Colors" ) ); SensorsTab->changeTab( tab_3, tr2i18n( "Panel" ) ); - GroupBox14->setTitle( QString::null ); + GroupBox14->setTitle( TQString::null ); checkShowInDock->setText( tr2i18n( "Visible" ) ); GroupBoxColorDock->setTitle( tr2i18n( "Colors" ) ); TextLabel1_2_2_2_2->setText( tr2i18n( "Alarm" ) ); - colorAlarm->setText( QString::null ); - colorNormal->setText( QString::null ); + colorAlarm->setText( TQString::null ); + colorNormal->setText( TQString::null ); TextLabel1_4_2_2->setText( tr2i18n( "Normal" ) ); SensorsTab->changeTab( tab_4, tr2i18n( "Dock" ) ); TextLabel1_3_2_2_2_2->setText( tr2i18n( "On reach alarm value:" ) ); diff --git a/src/lmsensorscfgdesign.h b/src/lmsensorscfgdesign.h index 78db656..2db5b83 100644 --- a/src/lmsensorscfgdesign.h +++ b/src/lmsensorscfgdesign.h @@ -10,121 +10,121 @@ #ifndef LMSENSORSCFGDESIGN_H #define LMSENSORSCFGDESIGN_H -#include <qvariant.h> -#include <qwidget.h> +#include <ntqvariant.h> +#include <ntqwidget.h> #include <kcolorbutton.h> -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QTabWidget; -class QGroupBox; -class QLabel; -class QLineEdit; -class QComboBox; -class QCheckBox; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; +class TQTabWidget; +class TQGroupBox; +class TQLabel; +class TQLineEdit; +class TQComboBox; +class TQCheckBox; class KColorButton; -class QFrame; -class QRadioButton; -class QPushButton; -class QListBox; -class QListBoxItem; -class QButtonGroup; -class QSpinBox; -class QSlider; +class TQFrame; +class TQRadioButton; +class TQPushButton; +class TQListBox; +class TQListBoxItem; +class TQButtonGroup; +class TQSpinBox; +class TQSlider; -class LMSensorsCfgDesign : public QWidget +class LMSensorsCfgDesign : public TQWidget { Q_OBJECT public: - LMSensorsCfgDesign( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + LMSensorsCfgDesign( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~LMSensorsCfgDesign(); - QTabWidget* MainTab; - QWidget* tab; - QTabWidget* SensorsTab; - QWidget* tab_2; - QGroupBox* GroupBoxDes; - QLabel* pixmapSensor; - QLabel* TextLabel2_2; - QLineEdit* editDescription; - QGroupBox* GroupBox2_2_2; - QLineEdit* editValue; - QLabel* TextLabel3_2_2_3_2_2_2; - QLabel* TextLabel3_2_4_2_2_2; - QComboBox* editMaxValue; - QLabel* TextLabel1_2_3_2_2; - QLineEdit* editMul; - QLabel* TextLabel3_2; - QLabel* TextLabel3_2_3_2_2_2_2; - QLabel* TextLabel1_3_3_2; - QLineEdit* editIdealValue; - QComboBox* editMinValue; - QLineEdit* editSum; - QWidget* tab_3; - QGroupBox* GroupBox13; - QCheckBox* checkShow; - QGroupBox* boxPanelPalette; - QWidget* tab_4; - QGroupBox* GroupBox14; - QCheckBox* checkShowInDock; - QGroupBox* GroupBoxColorDock; - QLabel* TextLabel1_2_2_2_2; + TQTabWidget* MainTab; + TQWidget* tab; + TQTabWidget* SensorsTab; + TQWidget* tab_2; + TQGroupBox* GroupBoxDes; + TQLabel* pixmapSensor; + TQLabel* TextLabel2_2; + TQLineEdit* editDescription; + TQGroupBox* GroupBox2_2_2; + TQLineEdit* editValue; + TQLabel* TextLabel3_2_2_3_2_2_2; + TQLabel* TextLabel3_2_4_2_2_2; + TQComboBox* editMaxValue; + TQLabel* TextLabel1_2_3_2_2; + TQLineEdit* editMul; + TQLabel* TextLabel3_2; + TQLabel* TextLabel3_2_3_2_2_2_2; + TQLabel* TextLabel1_3_3_2; + TQLineEdit* editIdealValue; + TQComboBox* editMinValue; + TQLineEdit* editSum; + TQWidget* tab_3; + TQGroupBox* GroupBox13; + TQCheckBox* checkShow; + TQGroupBox* boxPanelPalette; + TQWidget* tab_4; + TQGroupBox* GroupBox14; + TQCheckBox* checkShowInDock; + TQGroupBox* GroupBoxColorDock; + TQLabel* TextLabel1_2_2_2_2; KColorButton* colorAlarm; KColorButton* colorNormal; - QLabel* TextLabel1_4_2_2; - QWidget* tab_5; - QLabel* TextLabel1_3_2_2_2_2; - QFrame* Frame11_2_2_2; - QCheckBox* CheckAllSensors; - QRadioButton* radioAlarm1; - QPushButton* buttonTest; - QRadioButton* radioAlarm2; - QRadioButton* radioAlarm3; - QLineEdit* editLaunch; - QLineEdit* editPlay; - QListBox* listSensors; - QWidget* tab_6; - QButtonGroup* ButtonGroup5; - QRadioButton* RadioF; - QRadioButton* RadioC; - QRadioButton* RadioK; - QGroupBox* groupBox79; - QSpinBox* SpinUpdateTime; - QSlider* SliderUpdateTime; + TQLabel* TextLabel1_4_2_2; + TQWidget* tab_5; + TQLabel* TextLabel1_3_2_2_2_2; + TQFrame* Frame11_2_2_2; + TQCheckBox* CheckAllSensors; + TQRadioButton* radioAlarm1; + TQPushButton* buttonTest; + TQRadioButton* radioAlarm2; + TQRadioButton* radioAlarm3; + TQLineEdit* editLaunch; + TQLineEdit* editPlay; + TQListBox* listSensors; + TQWidget* tab_6; + TQButtonGroup* ButtonGroup5; + TQRadioButton* RadioF; + TQRadioButton* RadioC; + TQRadioButton* RadioK; + TQGroupBox* groupBox79; + TQSpinBox* SpinUpdateTime; + TQSlider* SliderUpdateTime; protected: - QGridLayout* LMSensorsCfgDesignLayout; - QGridLayout* tabLayout; - QGridLayout* tabLayout_2; - QGridLayout* GroupBoxDesLayout; - QHBoxLayout* layout5; - QVBoxLayout* layout4; - QGridLayout* GroupBox2_2_2Layout; - QSpacerItem* spacer12; - QSpacerItem* spacer10; - QVBoxLayout* tabLayout_3; - QSpacerItem* Spacer4_2; - QGridLayout* GroupBox13Layout; - QGridLayout* tabLayout_4; - QSpacerItem* Spacer3_2; - QGridLayout* GroupBox14Layout; - QGridLayout* GroupBoxColorDockLayout; - QSpacerItem* spacer5; - QSpacerItem* spacer6; - QVBoxLayout* tabLayout_5; - QGridLayout* layout9; - QSpacerItem* spacer9; - QHBoxLayout* layout6; - QSpacerItem* spacer7; - QHBoxLayout* layout7; - QSpacerItem* spacer8; - QGridLayout* tabLayout_6; - QSpacerItem* spacer12_2; - QGridLayout* ButtonGroup5Layout; - QGridLayout* groupBox79Layout; + TQGridLayout* LMSensorsCfgDesignLayout; + TQGridLayout* tabLayout; + TQGridLayout* tabLayout_2; + TQGridLayout* GroupBoxDesLayout; + TQHBoxLayout* layout5; + TQVBoxLayout* layout4; + TQGridLayout* GroupBox2_2_2Layout; + TQSpacerItem* spacer12; + TQSpacerItem* spacer10; + TQVBoxLayout* tabLayout_3; + TQSpacerItem* Spacer4_2; + TQGridLayout* GroupBox13Layout; + TQGridLayout* tabLayout_4; + TQSpacerItem* Spacer3_2; + TQGridLayout* GroupBox14Layout; + TQGridLayout* GroupBoxColorDockLayout; + TQSpacerItem* spacer5; + TQSpacerItem* spacer6; + TQVBoxLayout* tabLayout_5; + TQGridLayout* layout9; + TQSpacerItem* spacer9; + TQHBoxLayout* layout6; + TQSpacerItem* spacer7; + TQHBoxLayout* layout7; + TQSpacerItem* spacer8; + TQGridLayout* tabLayout_6; + TQSpacerItem* spacer12_2; + TQGridLayout* ButtonGroup5Layout; + TQGridLayout* groupBox79Layout; protected slots: virtual void languageChange(); diff --git a/src/lmsensorscfgdesign.ui b/src/lmsensorscfgdesign.ui index d452b78..45fd904 100644 --- a/src/lmsensorscfgdesign.ui +++ b/src/lmsensorscfgdesign.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>LMSensorsCfgDesign</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>LMSensorsCfgDesign</cstring> </property> @@ -35,7 +35,7 @@ <property name="spacing"> <number>4</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>MainTab</cstring> </property> @@ -49,7 +49,7 @@ </property> <property name="layoutSpacing" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -60,7 +60,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="1"> + <widget class="TQTabWidget" row="0" column="1"> <property name="name"> <cstring>SensorsTab</cstring> </property> @@ -78,7 +78,7 @@ </property> <property name="layoutMargin" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -89,7 +89,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBoxDes</cstring> </property> @@ -108,7 +108,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>layout5</cstring> </property> @@ -116,7 +116,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapSensor</cstring> </property> @@ -124,7 +124,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -132,7 +132,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -140,7 +140,7 @@ <string>Description</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>editDescription</cstring> </property> @@ -154,7 +154,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>GroupBox2_2_2</cstring> </property> @@ -171,7 +171,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="0"> + <widget class="TQLineEdit" row="1" column="0"> <property name="name"> <cstring>editValue</cstring> </property> @@ -190,7 +190,7 @@ <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3_2_2_3_2_2_2</cstring> </property> @@ -201,7 +201,7 @@ <cstring></cstring> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>TextLabel3_2_4_2_2_2</cstring> </property> @@ -215,7 +215,7 @@ <cstring></cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>+1%</string> @@ -281,7 +281,7 @@ <number>12</number> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TextLabel1_2_3_2_2</cstring> </property> @@ -289,12 +289,12 @@ <string>Multiplier</string> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>editMul</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -302,7 +302,7 @@ <string>Ideal</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel3_2_3_2_2_2_2</cstring> </property> @@ -313,7 +313,7 @@ <cstring></cstring> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>TextLabel1_3_3_2</cstring> </property> @@ -321,7 +321,7 @@ <string>Addition</string> </property> </widget> - <widget class="QLineEdit" row="4" column="0"> + <widget class="TQLineEdit" row="4" column="0"> <property name="name"> <cstring>editIdealValue</cstring> </property> @@ -334,7 +334,7 @@ <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <item> <property name="text"> <string>-1%</string> @@ -400,7 +400,7 @@ <number>12</number> </property> </widget> - <widget class="QLineEdit" row="4" column="2"> + <widget class="TQLineEdit" row="4" column="2"> <property name="name"> <cstring>editSum</cstring> </property> @@ -443,7 +443,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -460,7 +460,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox13</cstring> </property> @@ -483,7 +483,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkShow</cstring> </property> @@ -498,7 +498,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>boxPanelPalette</cstring> </property> @@ -531,7 +531,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -542,7 +542,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox14</cstring> </property> @@ -565,7 +565,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkShowInDock</cstring> </property> @@ -597,7 +597,7 @@ </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>GroupBoxColorDock</cstring> </property> @@ -622,7 +622,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2_2_2_2</cstring> </property> @@ -720,7 +720,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_4_2_2</cstring> </property> @@ -737,7 +737,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -748,7 +748,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup9</cstring> </property> @@ -759,7 +759,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>CheckAllSensors</cstring> </property> @@ -787,7 +787,7 @@ </size> </property> </spacer> - <widget class="QRadioButton" row="4" column="0"> + <widget class="TQRadioButton" row="4" column="0"> <property name="name"> <cstring>radioAlarm1</cstring> </property> @@ -801,7 +801,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>buttonTest</cstring> </property> @@ -812,7 +812,7 @@ <string>Test</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioAlarm2</cstring> </property> @@ -826,7 +826,7 @@ <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioAlarm3</cstring> </property> @@ -837,7 +837,7 @@ <string>Run command</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout6</cstring> </property> @@ -862,7 +862,7 @@ </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>editLaunch</cstring> </property> @@ -872,7 +872,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>layout7</cstring> </property> @@ -897,7 +897,7 @@ </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>editPlay</cstring> </property> @@ -912,7 +912,7 @@ </vbox> </widget> </widget> - <widget class="QListBox" row="0" column="0"> + <widget class="TQListBox" row="0" column="0"> <property name="name"> <cstring>listSensors</cstring> </property> @@ -943,7 +943,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -954,7 +954,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>ButtonGroup5</cstring> </property> @@ -965,7 +965,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>RadioF</cstring> </property> @@ -981,7 +981,7 @@ <property name="toolTip" stdset="0"> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>RadioC</cstring> </property> @@ -992,7 +992,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>RadioK</cstring> </property> @@ -1019,7 +1019,7 @@ </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox79</cstring> </property> @@ -1033,7 +1033,7 @@ <property name="margin"> <number>18</number> </property> - <widget class="QSpinBox" row="0" column="0"> + <widget class="TQSpinBox" row="0" column="0"> <property name="name"> <cstring>SpinUpdateTime</cstring> </property> @@ -1047,7 +1047,7 @@ <number>5</number> </property> </widget> - <widget class="QSlider" row="0" column="1"> + <widget class="TQSlider" row="0" column="1"> <property name="name"> <cstring>SliderUpdateTime</cstring> </property> diff --git a/src/lmsensorschip.cpp b/src/lmsensorschip.cpp index d78a0a9..a03cd33 100644 --- a/src/lmsensorschip.cpp +++ b/src/lmsensorschip.cpp @@ -26,7 +26,7 @@ // Public methods //**************************************************************************** -LMSensorsChip::LMSensorsChip(const sensors_chip_name *chip, QObject *parent, const char * name) +LMSensorsChip::LMSensorsChip(const sensors_chip_name *chip, TQObject *parent, const char * name) : SensorsList(parent,name) { setClass(Sensor::lmSensor); @@ -68,7 +68,7 @@ void LMSensorsChip::createSensors() void LMSensorsChip::updateSensors() { -QObjectList *sensors= (QObjectList *)children(); +TQObjectList *sensors= (TQObjectList *)children(); if(sensors) for(LMSensor *sensor= (LMSensor *)sensors->first(); sensor!=0; sensor= (LMSensor *)sensors->next()) diff --git a/src/lmsensorschip.h b/src/lmsensorschip.h index 90972a1..6365c4a 100644 --- a/src/lmsensorschip.h +++ b/src/lmsensorschip.h @@ -33,7 +33,7 @@ Q_OBJECT public: - LMSensorsChip(const sensors_chip_name *chip=0, QObject *parent=0, const char *name=0); + LMSensorsChip(const sensors_chip_name *chip=0, TQObject *parent=0, const char *name=0); ~LMSensorsChip(); public slots: diff --git a/src/lmsensorsdock.cpp b/src/lmsensorsdock.cpp index 5429883..b5321ab 100644 --- a/src/lmsensorsdock.cpp +++ b/src/lmsensorsdock.cpp @@ -17,16 +17,16 @@ #include "lmsensorsdock.h" -#include <qobjectlist.h> -#include <klocale.h> +#include <ntqobjectlist.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kapp.h> -#include <kaboutapplication.h> +#include <tdeaboutapplication.h> -#include <kwin.h> +#include <twin.h> #include <netwm.h> -LMSensorsDock::LMSensorsDock(bool fNoDock, QObject *parent, const char *name): QObject(parent,name) +LMSensorsDock::LMSensorsDock(bool fNoDock, TQObject *parent, const char *name): TQObject(parent,name) { noDock= fNoDock; @@ -55,7 +55,7 @@ LMSensorsDock::~LMSensorsDock() void LMSensorsDock::createMenu() { - menu= new KPopupMenu; + menu= new TDEPopupMenu; menu->insertTitle(kapp->miniIcon(),"KSensors"); menu->insertItem(SmallIcon("configure"),i18n("&Configure"), this, SLOT(createConfigWidget() ) ,0,101 ); menu->insertSeparator(); @@ -67,32 +67,32 @@ void LMSensorsDock::createMenu() void LMSensorsDock::createWidgets() { - KGlobal::config()->setGroup("General"); + TDEGlobal::config()->setGroup("General"); if(noDock) createShowWidget(); - else if(KGlobal::config()->readBoolEntry("showWidget",false)) { - int desktop = KGlobal::config()->readNumEntry("desktop", 0); + else if(TDEGlobal::config()->readBoolEntry("showWidget",false)) { + int desktop = TDEGlobal::config()->readNumEntry("desktop", 0); createShowWidget(desktop); } } void LMSensorsDock::saveConfig() { - KGlobal::config()->setGroup("General"); - KGlobal::config()->writeEntry("showWidget",(bool)sensorsWidget); + TDEGlobal::config()->setGroup("General"); + TDEGlobal::config()->writeEntry("showWidget",(bool)sensorsWidget); if(sensorsWidget) { - NETWinInfo wm_client(qt_xdisplay(), sensorsWidget->winId(), qt_xrootwin(), NET::WMDesktop); - KGlobal::config()->writeEntry("desktop", wm_client.desktop()); + NETWinInfo wm_client(tqt_xdisplay(), sensorsWidget->winId(), tqt_xrootwin(), NET::WMDesktop); + TDEGlobal::config()->writeEntry("desktop", wm_client.desktop()); } } void LMSensorsDock::createDockWidgets() { -QObjectList *chips= sensors->getSensorsChips(); +TQObjectList *chips= sensors->getSensorsChips(); countSensors= 0; if(chips) for(LMSensorsChip *chip= (LMSensorsChip *)chips->first(); chip!=0; chip= (LMSensorsChip *)chips->next()) { - QObjectList *list= (QObjectList *)chip->getSensors(); + TQObjectList *list= (TQObjectList *)chip->getSensors(); if(list) { for(LMSensor *sensor= (LMSensor *)list->first(); sensor!=0; sensor= (LMSensor *)list->next()) { if( LMSensorDockPanel::readShowInDock(sensor->name()) ) @@ -128,7 +128,7 @@ void LMSensorsDock::createShowWidget(int desktop) { if(!sensorsWidget) { sensorsWidget= new LMSensorsWidget(sensors); - connect( sensorsWidget, SIGNAL(rightMouseClicked(QMouseEvent *)), this, SLOT(mouseEventReceived(QMouseEvent *)) ); + connect( sensorsWidget, SIGNAL(rightMouseClicked(TQMouseEvent *)), this, SLOT(mouseEventReceived(TQMouseEvent *)) ); connect( sensorsWidget, SIGNAL(destroyed()), this, SLOT(updateMenu()) ); } if ((desktop != 0) && (desktop <= KWin::numberOfDesktops())) KWin::setOnDesktop(sensorsWidget->winId(), desktop); @@ -150,9 +150,9 @@ void LMSensorsDock::close() delete this; } -void LMSensorsDock::mouseEventReceived(QMouseEvent *e) +void LMSensorsDock::mouseEventReceived(TQMouseEvent *e) { - if(e->type()==QEvent::MouseButtonRelease) { + if(e->type()==TQEvent::MouseButtonRelease) { if( e->button()==LeftButton ) minimizeRestoreWidget(); if( e->button()==RightButton ) menu->popup(e->globalPos()); } @@ -161,14 +161,14 @@ void LMSensorsDock::mouseEventReceived(QMouseEvent *e) void LMSensorsDock::createDockSensor(Sensor *sensor) { if(countSensors==0) { - QObjectList *list= (QObjectList *)children(); + TQObjectList *list= (TQObjectList *)children(); if(list) for(LMSensorDockPanel *sensor= (LMSensorDockPanel *)list->first(); sensor!=0; sensor= (LMSensorDockPanel *)list->next()) delete sensor; } const char *name= sensor ? sensor->name() : 0; LMSensorDockPanel *dock= new LMSensorDockPanel(sensor,name); - connect( dock, SIGNAL(mouseEvent(QMouseEvent *)), this, SLOT(mouseEventReceived(QMouseEvent *)) ); + connect( dock, SIGNAL(mouseEvent(TQMouseEvent *)), this, SLOT(mouseEventReceived(TQMouseEvent *)) ); insertChild(dock); dock->show(); if(name) countSensors++; @@ -202,9 +202,9 @@ void LMSensorsDock::updateItemDock(const char *name) void LMSensorsDock::showAbout() { -KAboutApplication *dialog; +TDEAboutApplication *dialog; - dialog= new KAboutApplication; + dialog= new TDEAboutApplication; dialog->exec(); delete dialog; } diff --git a/src/lmsensorsdock.h b/src/lmsensorsdock.h index ce52441..a350ef7 100644 --- a/src/lmsensorsdock.h +++ b/src/lmsensorsdock.h @@ -24,11 +24,11 @@ #endif -#include <qobject.h> -#include <qguardedptr.h> +#include <ntqobject.h> +#include <ntqguardedptr.h> -#include <kconfig.h> -#include <kpopupmenu.h> +#include <tdeconfig.h> +#include <tdepopupmenu.h> #include <kdialogbase.h> #include "lmsensors.h" @@ -42,13 +42,13 @@ *@author Miguel Novas */ -class LMSensorsDock : public QObject +class LMSensorsDock : public TQObject { Q_OBJECT public: - LMSensorsDock(bool fNoDock=false, QObject *parent=0, const char *name=0); + LMSensorsDock(bool fNoDock=false, TQObject *parent=0, const char *name=0); ~LMSensorsDock(); public slots: @@ -57,7 +57,7 @@ public slots: protected slots: void updateItemDock(const char *name); - void mouseEventReceived(QMouseEvent *e); + void mouseEventReceived(TQMouseEvent *e); void minimizeRestoreWidget(); void createConfigWidget(); void updateMenu(); @@ -71,11 +71,11 @@ private: int countSensors; LMSensors *sensors; - QGuardedPtr<KSensorsCfg> sensorsCfg; - QGuardedPtr<LMSensorsWidget> sensorsWidget; - QGuardedPtr<LMSensorsAlarms> sensorsAlarm; + TQGuardedPtr<KSensorsCfg> sensorsCfg; + TQGuardedPtr<LMSensorsWidget> sensorsWidget; + TQGuardedPtr<LMSensorsAlarms> sensorsAlarm; - KPopupMenu *menu; + TDEPopupMenu *menu; void createMenu(); void createWidgets(); diff --git a/src/lmsensorswidget.cpp b/src/lmsensorswidget.cpp index ab6a8b9..727fdc8 100644 --- a/src/lmsensorswidget.cpp +++ b/src/lmsensorswidget.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include <qobject.h> -#include <qobjectlist.h> -#include <qpixmap.h> -#include <qtimer.h> +#include <ntqobject.h> +#include <ntqobjectlist.h> +#include <ntqpixmap.h> +#include <ntqtimer.h> #include <kiconloader.h> #include <kstddirs.h> @@ -30,8 +30,8 @@ * Public methods * ***************************************************************************/ -LMSensorsWidget::LMSensorsWidget(LMSensors *lsensors,QWidget *parent, const char *name ) - : QWidget(parent,name, +LMSensorsWidget::LMSensorsWidget(LMSensors *lsensors,TQWidget *parent, const char *name ) + : TQWidget(parent,name, WStyle_Customize | WType_TopLevel | WStyle_StaysOnTop | @@ -55,9 +55,9 @@ LMSensorsWidget::LMSensorsWidget(LMSensors *lsensors,QWidget *parent, const char // setBackgroundPixmap( UserIcon("ksensorsbackground.png") ); // - KConfig *cfg= KGlobal::config(); + TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup("ShowWidget"); - QRect rect(32,32,64*4,64*3); + TQRect rect(32,32,64*4,64*3); rect= cfg->readRectEntry ("geometry", &rect); move( rect.topLeft() ); resize( rect.size() ); @@ -73,10 +73,10 @@ LMSensorsWidget::LMSensorsWidget(LMSensors *lsensors,QWidget *parent, const char LMSensorsWidget::~LMSensorsWidget() { if(x()>=0 && y()>=0) { - KConfig *cfg= KGlobal::config(); + TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup("ShowWidget"); //cfg->writeEntry("geometry" , geometry() ); - cfg->writeEntry( "geometry" , QRect(pos(), size()) ); + cfg->writeEntry( "geometry" , TQRect(pos(), size()) ); } delete infoPanels; } @@ -107,7 +107,7 @@ void LMSensorsWidget::slotConfigChanged(const char *name) * Private methods * ***************************************************************************/ -void LMSensorsWidget::childEvent(QChildEvent *e) +void LMSensorsWidget::childEvent(TQChildEvent *e) { if(e->inserted()) { loadDisplayConfig((Panel *)e->child()); @@ -116,17 +116,17 @@ void LMSensorsWidget::childEvent(QChildEvent *e) // ************* Draging panels and show menu ************************ -void LMSensorsWidget::childEventReceived(QEvent *e) +void LMSensorsWidget::childEventReceived(TQEvent *e) { -QMouseEvent *m = (QMouseEvent*)e; +TQMouseEvent *m = (TQMouseEvent*)e; switch(e->type()) { - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonPress: - if( m->button()==LeftButton ) startDragChild(m,(QWidget *)sender()); + if( m->button()==LeftButton ) startDragChild(m,(TQWidget *)sender()); break; - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: if( m->button()==RightButton ) emit rightMouseClicked(m); break; @@ -134,14 +134,14 @@ QMouseEvent *m = (QMouseEvent*)e; } -void LMSensorsWidget::startDragChild(QMouseEvent *m, QWidget *w) +void LMSensorsWidget::startDragChild(TQMouseEvent *m, TQWidget *w) { if(childDraging==0) { childDraging= w; grabMouse(sizeAllCursor); origMousePt = w->mapFromGlobal(m->globalPos()); - //w->move( m->globalPos()-mapToGlobal(QPoint(0,0))-origMousePt); + //w->move( m->globalPos()-mapToGlobal(TQPoint(0,0))-origMousePt); w->raise(); w->update(); } @@ -163,7 +163,7 @@ int y= childDraging->y(); childDraging= 0; } -void LMSensorsWidget::mouseMoveEvent ( QMouseEvent *m ) +void LMSensorsWidget::mouseMoveEvent ( TQMouseEvent *m ) { if(childDraging) { @@ -173,7 +173,7 @@ void LMSensorsWidget::mouseMoveEvent ( QMouseEvent *m ) } -void LMSensorsWidget::mouseReleaseEvent ( QMouseEvent *m ) +void LMSensorsWidget::mouseReleaseEvent ( TQMouseEvent *m ) { if(childDraging && m->button()==LeftButton) endDragChild(); else @@ -186,12 +186,12 @@ void LMSensorsWidget::findUnusedPosition(int *px,int *py) { bool found; uint mx,my,x,y,a[32]; -QObjectList *list= (QObjectList *)children(); +TQObjectList *list= (TQObjectList *)children(); for(y=0; y<32; y++) a[y]= 0; mx= 0; my= 0; if(list) - for(QWidget *obj= (QWidget *)list->first(); obj!=0; obj= (QWidget *)list->next()) + for(TQWidget *obj= (TQWidget *)list->first(); obj!=0; obj= (TQWidget *)list->next()) { y=obj->y()/panelsSize; x=obj->x()/panelsSize; @@ -223,8 +223,8 @@ void LMSensorsWidget::loadDisplayConfig(Panel *display) loadPalette(display); bool fNoCfg; - QPoint p(-1,-1); - KConfig *cfg= KGlobal::config(); + TQPoint p(-1,-1); + TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup(display->name()); p= cfg->readPointEntry("showPos", &p ); fNoCfg= (p.x()<0 || p.y()<0); @@ -237,26 +237,26 @@ void LMSensorsWidget::loadDisplayConfig(Panel *display) adjustSize(); } display->installEventFilter(this); - connect(display, SIGNAL(eventReceived(QEvent *)), this, SLOT(childEventReceived(QEvent *)) ); + connect(display, SIGNAL(eventReceived(TQEvent *)), this, SLOT(childEventReceived(TQEvent *)) ); } void LMSensorsWidget::saveDisplayConfig(Panel *display) { -KConfig *cfg= KGlobal::config(); +TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup(display->name()); cfg->writeEntry("show",true); - QPoint p= display->pos()/panelsSize; + TQPoint p= display->pos()/panelsSize; cfg->writeEntry("showPos",p); } void LMSensorsWidget::createSensorPanels() { - QObjectList *chips= sensors->getSensorsChips(); + TQObjectList *chips= sensors->getSensorsChips(); if(chips) for(LMSensorsChip *chip= (LMSensorsChip *)chips->first(); chip!=0; chip= (LMSensorsChip *)chips->next()) { - QObjectList *list= (QObjectList *)chip->getSensors(); + TQObjectList *list= (TQObjectList *)chip->getSensors(); if(list) { for(LMSensor *sensor= (LMSensor *)list->first(); sensor!=0; sensor= (LMSensor *)list->next()) { if( Panel::readShow(sensor->name()) ) @@ -268,10 +268,10 @@ void LMSensorsWidget::createSensorPanels() void LMSensorsWidget::resizePanels(int newSize) { -QObjectList *panels= (QObjectList *)children(); +TQObjectList *panels= (TQObjectList *)children(); if(panels) - for(QWidget *panel= (QWidget *)panels->first(); panel!=0; panel= (QWidget *)panels->next()) { + for(TQWidget *panel= (TQWidget *)panels->first(); panel!=0; panel= (TQWidget *)panels->next()) { panel->move( (panel->x()/panelsSize)*newSize, (panel->y()/panelsSize)*newSize); panel->resize(newSize,newSize); } @@ -281,14 +281,14 @@ QObjectList *panels= (QObjectList *)children(); int LMSensorsWidget::cfgReadPanelSize() { -KConfig *cfg= KGlobal::config(); +TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup( "ShowWidget" ); return cfg->readNumEntry("PanelsSize",64); } void LMSensorsWidget::cfgWritePanelSize(int newSize) { -KConfig *cfg= KGlobal::config(); +TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup( "ShowWidget" ); cfg->writeEntry("PanelsSize",newSize); } @@ -308,7 +308,7 @@ void LMSensorsWidget::loadGeneralOptions() void LMSensorsWidget::loadPalette(Panel *panel) { - QPalette pal= palette(); + TQPalette pal= palette(); if(panel) { if(cfgReadPalette(pal,panel->name(),false)) panel->setPalette(pal); else panel->unsetPalette(); @@ -319,26 +319,26 @@ void LMSensorsWidget::loadPalette(Panel *panel) } -void LMSensorsWidget::getDefaultPalette(QPalette &pal) +void LMSensorsWidget::getDefaultPalette(TQPalette &pal) { - pal.setColor(QColorGroup::Background, Qt::white ); - pal.setColor(QColorGroup::Light , Qt::white ); - pal.setColor(QColorGroup::Dark, Qt::black ); - pal.setColor(QColorGroup::Foreground, Qt::black ); - pal.setColor(QColorGroup::Text, Qt::black ); + pal.setColor(TQColorGroup::Background, TQt::white ); + pal.setColor(TQColorGroup::Light , TQt::white ); + pal.setColor(TQColorGroup::Dark, TQt::black ); + pal.setColor(TQColorGroup::Foreground, TQt::black ); + pal.setColor(TQColorGroup::Text, TQt::black ); } -bool LMSensorsWidget::cfgReadPalette(QPalette &pal,const char *name, bool returnDefault) +bool LMSensorsWidget::cfgReadPalette(TQPalette &pal,const char *name, bool returnDefault) { - KConfig *cfg= KGlobal::config(); + TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup( name ? name : "General" ); if (cfg->readBoolEntry("PaletteActive",false)) { - pal.setColor(QColorGroup::Background, cfg->readColorEntry("ColorBackground",&Qt::white) ); - pal.setColor(QColorGroup::Light , cfg->readColorEntry("ColorBackground",&Qt::white) ); - pal.setColor(QColorGroup::Dark, cfg->readColorEntry("ColorShadow" ,&Qt::black) ); - pal.setColor(QColorGroup::Foreground, cfg->readColorEntry("ColorValue" ,&Qt::black) ); - pal.setColor(QColorGroup::Text, cfg->readColorEntry("ColorTitle" ,&Qt::black) ); + pal.setColor(TQColorGroup::Background, cfg->readColorEntry("ColorBackground",&TQt::white) ); + pal.setColor(TQColorGroup::Light , cfg->readColorEntry("ColorBackground",&TQt::white) ); + pal.setColor(TQColorGroup::Dark, cfg->readColorEntry("ColorShadow" ,&TQt::black) ); + pal.setColor(TQColorGroup::Foreground, cfg->readColorEntry("ColorValue" ,&TQt::black) ); + pal.setColor(TQColorGroup::Text, cfg->readColorEntry("ColorTitle" ,&TQt::black) ); return true; } else { if(returnDefault) { @@ -349,10 +349,10 @@ bool LMSensorsWidget::cfgReadPalette(QPalette &pal,const char *name, bool return return false; } -void LMSensorsWidget::cfgWritePalette(const QPalette &pal,const char *name) +void LMSensorsWidget::cfgWritePalette(const TQPalette &pal,const char *name) { - KConfig *cfg= KGlobal::config(); - QColorGroup colors= pal.active(); + TDEConfig *cfg= TDEGlobal::config(); + TQColorGroup colors= pal.active(); cfg->setGroup( name ? name : "General" ); cfg->writeEntry("PaletteActive",true); cfg->writeEntry("ColorBackground",colors.background() ); @@ -363,8 +363,8 @@ void LMSensorsWidget::cfgWritePalette(const QPalette &pal,const char *name) void LMSensorsWidget::cfgUnsetPalette(const char *name) { - KGlobal::config()->setGroup( name ? name : "General" ); - KGlobal::config()->writeEntry("PaletteActive",false); + TDEGlobal::config()->setGroup( name ? name : "General" ); + TDEGlobal::config()->writeEntry("PaletteActive",false); } // *********************************** End ************************************* diff --git a/src/lmsensorswidget.h b/src/lmsensorswidget.h index c331ad0..d65018a 100644 --- a/src/lmsensorswidget.h +++ b/src/lmsensorswidget.h @@ -18,8 +18,8 @@ #ifndef LMSENSORSWIDGET_H #define LMSENSORSWIDGET_H -#include <qwidget.h> -#include <qpixmap.h> +#include <ntqwidget.h> +#include <ntqpixmap.h> #include "lmsensors.h" #include "lmsensorpanel.h" @@ -29,17 +29,17 @@ *@author Miguel Novas */ -class LMSensorsWidget : public QWidget { +class LMSensorsWidget : public TQWidget { Q_OBJECT public: - LMSensorsWidget(LMSensors *lsensors,QWidget *parent=0, const char *name=0); + LMSensorsWidget(LMSensors *lsensors,TQWidget *parent=0, const char *name=0); ~LMSensorsWidget(); - static bool cfgReadPalette(QPalette &pal,const char *name=0, bool returnDefault= false); - static void cfgWritePalette(const QPalette &pal,const char *name=0); + static bool cfgReadPalette(TQPalette &pal,const char *name=0, bool returnDefault= false); + static void cfgWritePalette(const TQPalette &pal,const char *name=0); static void cfgUnsetPalette(const char *name=0); - static void getDefaultPalette(QPalette &pal); + static void getDefaultPalette(TQPalette &pal); static void cfgWritePanelSize(int newSize); static int cfgReadPanelSize(); @@ -49,33 +49,33 @@ protected slots: signals: - void rightMouseClicked(QMouseEvent *); + void rightMouseClicked(TQMouseEvent *); private: LMSensors *sensors; InfoPanels *infoPanels; - QWidget *childDraging; + TQWidget *childDraging; int panelsSize; - QPoint origMousePt; + TQPoint origMousePt; void loadPalette(Panel *panel=0); void loadDisplayConfig(Panel *display); void saveDisplayConfig(Panel *display); - void mouseReleaseEvent ( QMouseEvent *m ); - void mouseMoveEvent ( QMouseEvent *m ); + void mouseReleaseEvent ( TQMouseEvent *m ); + void mouseMoveEvent ( TQMouseEvent *m ); void createSensorPanels(); void findUnusedPosition(int *px,int *py); - void startDragChild(QMouseEvent *m, QWidget *w); + void startDragChild(TQMouseEvent *m, TQWidget *w); void endDragChild(); void resizePanels(int newSize); void loadGeneralOptions(); private slots: - void childEvent(QChildEvent *); - void childEventReceived(QEvent *); + void childEvent(TQChildEvent *); + void childEventReceived(TQEvent *); }; diff --git a/src/main.cpp b/src/main.cpp index ac442cf..e670705 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include <kcmdlineargs.h> -#include <kaboutdata.h> -#include <klocale.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdelocale.h> #include <kuniqueapp.h> #include "ksensorssplash.h" @@ -28,7 +28,7 @@ static const char *description = // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "nodock", I18N_NOOP("Don't dock in KDE system tray."), 0 }, { "splash", I18N_NOOP("Show splash screen."), 0 }, @@ -40,16 +40,16 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "ksensors", I18N_NOOP("KSensors"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "ksensors", I18N_NOOP("KSensors"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2001, Miguel Novas", 0, 0, "[email protected]"); aboutData.addAuthor("Miguel Novas",0, "[email protected]"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool noDock= !args->isSet("dock"); bool showSplash= args->isSet("splash"); args->clear(); @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) if(!KUniqueApplication::start()) return 0; KUniqueApplication a; - KConfig *cfg= kapp->config(); + TDEConfig *cfg= kapp->config(); cfg->setGroup("General"); if( cfg->readEntry("Version")!=aboutData.version() ) { cfg->writeEntry("Version",aboutData.version()); @@ -67,8 +67,8 @@ int main(int argc, char *argv[]) if(showSplash) (void)new KSensorsSplash(); LMSensorsDock *ksensors= new LMSensorsDock(noDock); - QObject::connect( ksensors, SIGNAL(destroyed()), kapp, SLOT(quit()) ); - QObject::connect( kapp, SIGNAL(saveYourself()), ksensors, SLOT(saveConfig()) ); + TQObject::connect( ksensors, SIGNAL(destroyed()), kapp, SLOT(quit()) ); + TQObject::connect( kapp, SIGNAL(saveYourself()), ksensors, SLOT(saveConfig()) ); return a.exec(); } diff --git a/src/palettecfg.cpp b/src/palettecfg.cpp index 18e9d34..64fddd8 100644 --- a/src/palettecfg.cpp +++ b/src/palettecfg.cpp @@ -18,17 +18,17 @@ #include "palettecfg.h" #include "lmsensorswidget.h" -#include <qlabel.h> -#include <qpalette.h> -#include <qcombobox.h> +#include <ntqlabel.h> +#include <ntqpalette.h> +#include <ntqcombobox.h> #include <kcolorbutton.h> -PaletteCfg::PaletteCfg(QWidget *parent, const char *name): PaletteCfgDesign(parent,name) +PaletteCfg::PaletteCfg(TQWidget *parent, const char *name): PaletteCfgDesign(parent,name) { groupName= 0; slotComboSelected(0); connect( comboSelect,SIGNAL(activated(int)),this,SLOT(slotComboSelected(int)) ); - connect( buttonColor,SIGNAL(changed(const QColor &)),this,SLOT(slotColorChanged(const QColor &)) ); + connect( buttonColor,SIGNAL(changed(const TQColor &)),this,SLOT(slotColorChanged(const TQColor &)) ); connect( buttonDefaultPalette, SIGNAL(clicked()),this,SLOT(slotPaletteDefault()) ); } @@ -38,8 +38,8 @@ PaletteCfg::~PaletteCfg() void PaletteCfg::slotComboSelected(int index) { - QColorGroup colors= framePanel->palette().active(); - QColor color; + TQColorGroup colors= framePanel->palette().active(); + TQColor color; switch(index) { case 0: color= colors.background(); break; case 1: color= colors.dark(); break; @@ -51,15 +51,15 @@ void PaletteCfg::slotComboSelected(int index) buttonColor->blockSignals(false); } -void PaletteCfg::slotColorChanged(const QColor &newColor) +void PaletteCfg::slotColorChanged(const TQColor &newColor) { - QPalette pal= framePanel->palette(); + TQPalette pal= framePanel->palette(); switch(comboSelect->currentItem()) { - case 0: pal.setColor(QColorGroup::Background,newColor); - pal.setColor(QColorGroup::Light ,newColor); break; - case 1: pal.setColor(QColorGroup::Dark ,newColor); break; - case 2: pal.setColor(QColorGroup::Text ,newColor); break; - case 3: pal.setColor(QColorGroup::Foreground,newColor); break; + case 0: pal.setColor(TQColorGroup::Background,newColor); + pal.setColor(TQColorGroup::Light ,newColor); break; + case 1: pal.setColor(TQColorGroup::Dark ,newColor); break; + case 2: pal.setColor(TQColorGroup::Text ,newColor); break; + case 3: pal.setColor(TQColorGroup::Foreground,newColor); break; default: return; } setPanelPalette(pal,false); @@ -69,7 +69,7 @@ void PaletteCfg::slotColorChanged(const QColor &newColor) void PaletteCfg::slotPaletteDefault() { palDefault= true; - QPalette pal; + TQPalette pal; if(groupName) { LMSensorsWidget::cfgReadPalette(pal,"General",true); } else { @@ -78,7 +78,7 @@ void PaletteCfg::slotPaletteDefault() setPanelPalette(pal,true); } -void PaletteCfg::setPanelPalette(const QPalette &pal, bool updateColorButton) +void PaletteCfg::setPanelPalette(const TQPalette &pal, bool updateColorButton) { labelTitle->unsetPalette(); framePanel->setPalette(pal); @@ -89,7 +89,7 @@ void PaletteCfg::setPanelPalette(const QPalette &pal, bool updateColorButton) void PaletteCfg::readPalette(const char *name) { groupName= name; - QPalette pal; + TQPalette pal; palDefault= !LMSensorsWidget::cfgReadPalette(pal,name,false); if(palDefault) LMSensorsWidget::cfgReadPalette(pal,"General",true); setPanelPalette(pal,true); diff --git a/src/palettecfg.h b/src/palettecfg.h index 497be69..12cf4e5 100644 --- a/src/palettecfg.h +++ b/src/palettecfg.h @@ -20,7 +20,7 @@ #include <palettecfgdesign.h> -#include <kconfig.h> +#include <tdeconfig.h> /** *@author Miguel Novas @@ -29,7 +29,7 @@ class PaletteCfg : public PaletteCfgDesign { Q_OBJECT public: - PaletteCfg(QWidget *parent=0, const char *name=0); + PaletteCfg(TQWidget *parent=0, const char *name=0); ~PaletteCfg(); void readPalette(const char *name); @@ -38,7 +38,7 @@ public: protected slots: void slotComboSelected(int index); - void slotColorChanged(const QColor &newColor); + void slotColorChanged(const TQColor &newColor); void slotPaletteDefault(); private: @@ -46,7 +46,7 @@ private: bool palDefault; const char *groupName; - void setPanelPalette(const QPalette &pal, bool updateColorButton=false); + void setPanelPalette(const TQPalette &pal, bool updateColorButton=false); }; #endif diff --git a/src/palettecfgdesign.cpp b/src/palettecfgdesign.cpp index 4e9034f..43415e2 100644 --- a/src/palettecfgdesign.cpp +++ b/src/palettecfgdesign.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file './palettecfgdesign.ui' ** @@ -10,117 +10,117 @@ #include "palettecfgdesign.h" -#include <qvariant.h> -#include <qframe.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcombobox.h> +#include <ntqvariant.h> +#include <ntqframe.h> +#include <ntqlabel.h> +#include <ntqpushbutton.h> +#include <ntqcombobox.h> #include <kcolorbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a PaletteCfgDesign as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -PaletteCfgDesign::PaletteCfgDesign( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +PaletteCfgDesign::PaletteCfgDesign( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "PaletteCfgDesign" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - PaletteCfgDesignLayout = new QGridLayout( this, 1, 1, 0, 6, "PaletteCfgDesignLayout"); - - framePanel = new QFrame( this, "framePanel" ); - framePanel->setMinimumSize( QSize( 64, 64 ) ); - framePanel->setMaximumSize( QSize( 64, 64 ) ); - QPalette pal; - QColorGroup cg; - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, QColor( 241, 241, 241) ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, white ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); - cg.setColor( QColorGroup::Link, black ); - cg.setColor( QColorGroup::LinkVisited, black ); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); + PaletteCfgDesignLayout = new TQGridLayout( this, 1, 1, 0, 6, "PaletteCfgDesignLayout"); + + framePanel = new TQFrame( this, "framePanel" ); + framePanel->setMinimumSize( TQSize( 64, 64 ) ); + framePanel->setMaximumSize( TQSize( 64, 64 ) ); + TQPalette pal; + TQColorGroup cg; + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, TQColor( 241, 241, 241) ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, white ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Link, black ); + cg.setColor( TQColorGroup::LinkVisited, black ); pal.setActive( cg ); - cg.setColor( QColorGroup::Foreground, black ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, black ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, white ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); - cg.setColor( QColorGroup::Link, black ); - cg.setColor( QColorGroup::LinkVisited, black ); + cg.setColor( TQColorGroup::Foreground, black ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, black ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, white ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Link, black ); + cg.setColor( TQColorGroup::LinkVisited, black ); pal.setInactive( cg ); - cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Button, QColor( 228, 228, 228) ); - cg.setColor( QColorGroup::Light, white ); - cg.setColor( QColorGroup::Midlight, white ); - cg.setColor( QColorGroup::Dark, QColor( 114, 114, 114) ); - cg.setColor( QColorGroup::Mid, QColor( 152, 152, 152) ); - cg.setColor( QColorGroup::Text, black ); - cg.setColor( QColorGroup::BrightText, white ); - cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); - cg.setColor( QColorGroup::Base, white ); - cg.setColor( QColorGroup::Background, white ); - cg.setColor( QColorGroup::Shadow, black ); - cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); - cg.setColor( QColorGroup::HighlightedText, white ); - cg.setColor( QColorGroup::Link, black ); - cg.setColor( QColorGroup::LinkVisited, black ); + cg.setColor( TQColorGroup::Foreground, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Button, TQColor( 228, 228, 228) ); + cg.setColor( TQColorGroup::Light, white ); + cg.setColor( TQColorGroup::Midlight, white ); + cg.setColor( TQColorGroup::Dark, TQColor( 114, 114, 114) ); + cg.setColor( TQColorGroup::Mid, TQColor( 152, 152, 152) ); + cg.setColor( TQColorGroup::Text, black ); + cg.setColor( TQColorGroup::BrightText, white ); + cg.setColor( TQColorGroup::ButtonText, TQColor( 128, 128, 128) ); + cg.setColor( TQColorGroup::Base, white ); + cg.setColor( TQColorGroup::Background, white ); + cg.setColor( TQColorGroup::Shadow, black ); + cg.setColor( TQColorGroup::Highlight, TQColor( 10, 95, 137) ); + cg.setColor( TQColorGroup::HighlightedText, white ); + cg.setColor( TQColorGroup::Link, black ); + cg.setColor( TQColorGroup::LinkVisited, black ); pal.setDisabled( cg ); framePanel->setPalette( pal ); - framePanel->setFrameShape( QFrame::Panel ); - framePanel->setFrameShadow( QFrame::Raised ); + framePanel->setFrameShape( TQFrame::Panel ); + framePanel->setFrameShadow( TQFrame::Raised ); - labelTitle = new QLabel( framePanel, "labelTitle" ); - labelTitle->setGeometry( QRect( 8, 40, 50, 20 ) ); - QFont labelTitle_font( labelTitle->font() ); + labelTitle = new TQLabel( framePanel, "labelTitle" ); + labelTitle->setGeometry( TQRect( 8, 40, 50, 20 ) ); + TQFont labelTitle_font( labelTitle->font() ); labelTitle_font.setPointSize( 7 ); labelTitle->setFont( labelTitle_font ); - labelTitle->setAlignment( int( QLabel::AlignCenter ) ); + labelTitle->setAlignment( int( TQLabel::AlignCenter ) ); - labelValue = new QLabel( framePanel, "labelValue" ); - labelValue->setGeometry( QRect( 7, 16, 50, 20 ) ); - labelValue->setAlignment( int( QLabel::AlignCenter ) ); + labelValue = new TQLabel( framePanel, "labelValue" ); + labelValue->setGeometry( TQRect( 7, 16, 50, 20 ) ); + labelValue->setAlignment( int( TQLabel::AlignCenter ) ); PaletteCfgDesignLayout->addMultiCellWidget( framePanel, 0, 1, 0, 0 ); - buttonDefaultPalette = new QPushButton( this, "buttonDefaultPalette" ); - buttonDefaultPalette->setMinimumSize( QSize( 0, 22 ) ); + buttonDefaultPalette = new TQPushButton( this, "buttonDefaultPalette" ); + buttonDefaultPalette->setMinimumSize( TQSize( 0, 22 ) ); PaletteCfgDesignLayout->addMultiCellWidget( buttonDefaultPalette, 1, 1, 1, 2 ); - comboSelect = new QComboBox( FALSE, this, "comboSelect" ); - comboSelect->setMinimumSize( QSize( 0, 22 ) ); + comboSelect = new TQComboBox( FALSE, this, "comboSelect" ); + comboSelect->setMinimumSize( TQSize( 0, 22 ) ); PaletteCfgDesignLayout->addWidget( comboSelect, 0, 1 ); buttonColor = new KColorButton( this, "buttonColor" ); - buttonColor->setMinimumSize( QSize( 0, 22 ) ); + buttonColor->setMinimumSize( TQSize( 0, 22 ) ); PaletteCfgDesignLayout->addWidget( buttonColor, 0, 2 ); languageChange(); - resize( QSize(287, 74).expandedTo(minimumSizeHint()) ); + resize( TQSize(287, 74).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -129,7 +129,7 @@ PaletteCfgDesign::PaletteCfgDesign( QWidget* parent, const char* name, WFlags fl */ PaletteCfgDesign::~PaletteCfgDesign() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -147,7 +147,7 @@ void PaletteCfgDesign::languageChange() comboSelect->insertItem( tr2i18n( "Border" ) ); comboSelect->insertItem( tr2i18n( "Title" ) ); comboSelect->insertItem( tr2i18n( "Value" ) ); - buttonColor->setText( QString::null ); + buttonColor->setText( TQString::null ); } #include "palettecfgdesign.moc" diff --git a/src/palettecfgdesign.h b/src/palettecfgdesign.h index 466b6ac..4a0676b 100644 --- a/src/palettecfgdesign.h +++ b/src/palettecfgdesign.h @@ -10,37 +10,37 @@ #ifndef PALETTECFGDESIGN_H #define PALETTECFGDESIGN_H -#include <qvariant.h> -#include <qwidget.h> +#include <ntqvariant.h> +#include <ntqwidget.h> #include <kcolorbutton.h> -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QFrame; -class QLabel; -class QPushButton; -class QComboBox; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; +class TQFrame; +class TQLabel; +class TQPushButton; +class TQComboBox; class KColorButton; -class PaletteCfgDesign : public QWidget +class PaletteCfgDesign : public TQWidget { Q_OBJECT public: - PaletteCfgDesign( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PaletteCfgDesign( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PaletteCfgDesign(); - QFrame* framePanel; - QLabel* labelTitle; - QLabel* labelValue; - QPushButton* buttonDefaultPalette; - QComboBox* comboSelect; + TQFrame* framePanel; + TQLabel* labelTitle; + TQLabel* labelValue; + TQPushButton* buttonDefaultPalette; + TQComboBox* comboSelect; KColorButton* buttonColor; protected: - QGridLayout* PaletteCfgDesignLayout; + TQGridLayout* PaletteCfgDesignLayout; protected slots: virtual void languageChange(); diff --git a/src/palettecfgdesign.ui b/src/palettecfgdesign.ui index 879edd4..d958e8c 100644 --- a/src/palettecfgdesign.ui +++ b/src/palettecfgdesign.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PaletteCfgDesign</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PaletteCfgDesign</cstring> </property> @@ -35,7 +35,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QFrame" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQFrame" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>framePanel</cstring> </property> @@ -307,7 +307,7 @@ <property name="frameShadow"> <enum>Raised</enum> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelTitle</cstring> </property> @@ -333,7 +333,7 @@ <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelValue</cstring> </property> @@ -355,7 +355,7 @@ </property> </widget> </widget> - <widget class="QPushButton" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonDefaultPalette</cstring> </property> @@ -369,7 +369,7 @@ <string>Default colors</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Background</string> diff --git a/src/panel.cpp b/src/panel.cpp index 96c7763..4ac2f51 100644 --- a/src/panel.cpp +++ b/src/panel.cpp @@ -17,11 +17,11 @@ #include "panel.h" -#include <kglobal.h> +#include <tdeglobal.h> -Panel::Panel(QWidget *parent, const char *name) : QFrame(parent,name) +Panel::Panel(TQWidget *parent, const char *name) : TQFrame(parent,name) { - setFrameStyle(QFrame::Panel|QFrame::Raised); + setFrameStyle(TQFrame::Panel|TQFrame::Raised); resize(64,64); installEventFilter(this); } @@ -32,7 +32,7 @@ Panel::~Panel(){ // Maybe another better solution to capture childs of child widgets events ??? -bool Panel::eventFilter( QObject *o , QEvent *e) +bool Panel::eventFilter( TQObject *o , TQEvent *e) { emit eventReceived(e); return false; @@ -43,14 +43,14 @@ bool Panel::eventFilter( QObject *o , QEvent *e) bool Panel::readShow(const char *name) { - KGlobal::config()->setGroup(name); - return KGlobal::config()->readBoolEntry("show",false); + TDEGlobal::config()->setGroup(name); + return TDEGlobal::config()->readBoolEntry("show",false); } void Panel::writeShow(const char *name, bool fShow) { - KGlobal::config()->setGroup(name); - KGlobal::config()->writeEntry("show",fShow); + TDEGlobal::config()->setGroup(name); + TDEGlobal::config()->writeEntry("show",fShow); } diff --git a/src/panel.h b/src/panel.h index 51e5181..3214dfc 100644 --- a/src/panel.h +++ b/src/panel.h @@ -18,23 +18,23 @@ #ifndef PANEL_H #define PANEL_H -#include <qframe.h> -#include <kconfig.h> -#include <qpalette.h> +#include <ntqframe.h> +#include <tdeconfig.h> +#include <ntqpalette.h> /** *@author Miguel Novas */ -class Panel : public QFrame { +class Panel : public TQFrame { Q_OBJECT public: - Panel(QWidget *parent, const char *name); + Panel(TQWidget *parent, const char *name); ~Panel(); - inline const QColor &getColorTitle() { return colorGroup().text(); }; - inline const QColor &getColorValue() { return colorGroup().foreground(); }; + inline const TQColor &getColorTitle() { return colorGroup().text(); }; + inline const TQColor &getColorValue() { return colorGroup().foreground(); }; static bool readShow (const char *name); static void writeShow(const char *name, bool fShow); @@ -45,11 +45,11 @@ public slots: signals: - void eventReceived(QEvent *); + void eventReceived(TQEvent *); private: - bool eventFilter( QObject *o , QEvent *e); + bool eventFilter( TQObject *o , TQEvent *e); }; #endif diff --git a/src/panelsgroup.h b/src/panelsgroup.h index b1187a6..cd34697 100644 --- a/src/panelsgroup.h +++ b/src/panelsgroup.h @@ -18,18 +18,18 @@ #ifndef PANELSGROUP_H #define PANELSGROUP_H -#include <qobject.h> +#include <ntqobject.h> #include <panel.h> /** *@author Miguel Novas */ -class PanelsGroup : public QObject { +class PanelsGroup : public TQObject { Q_OBJECT public: - PanelsGroup(QWidget *widget, QObject *parent=0, const char *name=0) {}; + PanelsGroup(TQWidget *widget, TQObject *parent=0, const char *name=0) {}; ~PanelsGroup() {}; diff --git a/src/processexec.cpp b/src/processexec.cpp index ac2825c..6856ed3 100644 --- a/src/processexec.cpp +++ b/src/processexec.cpp @@ -18,11 +18,11 @@ #include <string.h> #include "processexec.h" -ProcessExec::ProcessExec(): KProcess() +ProcessExec::ProcessExec(): TDEProcess() { clearData(); - connect( this, SIGNAL(receivedStdout(KProcess *, char *, int)),this, SLOT(slotReceivedStdout(KProcess *, char *, int)) ); - connect( this, SIGNAL(receivedStderr(KProcess *, char *, int)),this, SLOT(slotReceivedStderr(KProcess *, char *, int)) ); + connect( this, SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, SLOT(slotReceivedStdout(TDEProcess *, char *, int)) ); + connect( this, SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, SLOT(slotReceivedStderr(TDEProcess *, char *, int)) ); } ProcessExec::~ProcessExec(){ @@ -40,12 +40,12 @@ bool ProcessExec::runAndWait() return start(Block,Communication(Stdout | Stderr)); } -void ProcessExec::slotReceivedStdout(KProcess *proc, char *buf, int len) +void ProcessExec::slotReceivedStdout(TDEProcess *proc, char *buf, int len) { - buffer = QString(buf); + buffer = TQString(buf); } -void ProcessExec::slotReceivedStderr(KProcess *proc, char *buf, int len) +void ProcessExec::slotReceivedStderr(TDEProcess *proc, char *buf, int len) { fErrors= true; slotReceivedStdout(proc,buf,len); diff --git a/src/processexec.h b/src/processexec.h index e259ca5..56672fc 100644 --- a/src/processexec.h +++ b/src/processexec.h @@ -25,7 +25,7 @@ *@author asdf */ -class ProcessExec : public KProcess { +class ProcessExec : public TDEProcess { Q_OBJECT public: ProcessExec(); @@ -35,19 +35,19 @@ public: bool runAndWait(); bool outputErrors() { return fErrors; }; - inline QString getStdoutData() { return buffer; }; + inline TQString getStdoutData() { return buffer; }; inline unsigned int getStdoutDataLen() { return buffer.length(); } inline void clearData() { buffer.truncate(0); fErrors= false; }; protected slots: - void slotReceivedStdout(KProcess *proc, char *buf, int len); - void slotReceivedStderr(KProcess *proc, char *buf, int len); + void slotReceivedStdout(TDEProcess *proc, char *buf, int len); + void slotReceivedStderr(TDEProcess *proc, char *buf, int len); private: static const int bufMax= 1023; - QString buffer; + TQString buffer; bool fErrors; }; diff --git a/src/qbarmeter.cpp b/src/qbarmeter.cpp index bb0d400..472618b 100644 --- a/src/qbarmeter.cpp +++ b/src/qbarmeter.cpp @@ -17,7 +17,7 @@ #include "qbarmeter.h" -QBarMeter::QBarMeter(QWidget *parent, const char *name): QWidget(parent,name) +TQBarMeter::TQBarMeter(TQWidget *parent, const char *name): TQWidget(parent,name) { count = 1; val[0] = 0; @@ -30,17 +30,17 @@ QBarMeter::QBarMeter(QWidget *parent, const char *name): QWidget(parent,name) } -QBarMeter::~QBarMeter() +TQBarMeter::~TQBarMeter() { } -void QBarMeter::setDirection(Direction newDir) +void TQBarMeter::setDirection(Direction newDir) { dir= newDir; update(); } -void QBarMeter::useValueMax(bool flag) +void TQBarMeter::useValueMax(bool flag) { if(useValMax!=flag) { useValMax= flag; @@ -48,7 +48,7 @@ void QBarMeter::useValueMax(bool flag) } } -void QBarMeter::setValueMax(double newVal) +void TQBarMeter::setValueMax(double newVal) { if(valMax!=newVal) { valMax= newVal; @@ -56,14 +56,14 @@ void QBarMeter::setValueMax(double newVal) } } -void QBarMeter::setValueMaxColor(const QColor &newColor) +void TQBarMeter::setValueMaxColor(const TQColor &newColor) { maxColor= newColor; update(); } -void QBarMeter::setValue(double newVal) +void TQBarMeter::setValue(double newVal) { if(val[0]!=newVal) { val[0]= newVal; @@ -71,13 +71,13 @@ void QBarMeter::setValue(double newVal) } } -void QBarMeter::setValueColor(const QColor &newColor) +void TQBarMeter::setValueColor(const TQColor &newColor) { color[0]= newColor; update(); } -void QBarMeter::setValue(int index, double newVal) +void TQBarMeter::setValue(int index, double newVal) { if(val[index]!=newVal) { val[index]= newVal; @@ -85,7 +85,7 @@ void QBarMeter::setValue(int index, double newVal) } } -void QBarMeter::setValueColor(int index, const QColor &newColor) +void TQBarMeter::setValueColor(int index, const TQColor &newColor) { if(color[index]!=newColor) { color[index]= newColor; @@ -94,7 +94,7 @@ void QBarMeter::setValueColor(int index, const QColor &newColor) } -void QBarMeter::setValueCount(int newCount) +void TQBarMeter::setValueCount(int newCount) { if(count!=newCount) { count= newCount; @@ -102,13 +102,13 @@ void QBarMeter::setValueCount(int newCount) } } -void QBarMeter::setSteps(int newSteps) +void TQBarMeter::setSteps(int newSteps) { steps= newSteps; update(); } -void QBarMeter::paintEvent( QPaintEvent *) +void TQBarMeter::paintEvent( TQPaintEvent *) { int x,y,lx,ly,sx,sy; switch(dir) { @@ -151,7 +151,7 @@ void QBarMeter::paintEvent( QPaintEvent *) } int csteps= steps; - QPainter p(this); + TQPainter p(this); for(int i= 0; i<count; i++) { int v= (int) ( ((double)steps * val[i]) / valMax +0.5); diff --git a/src/qbarmeter.h b/src/qbarmeter.h index 2dd13f3..ac8aaa6 100644 --- a/src/qbarmeter.h +++ b/src/qbarmeter.h @@ -15,49 +15,49 @@ * * ***************************************************************************/ -#ifndef QBARMETER_H -#define QBARMETER_H +#ifndef TQBARMETER_H +#define TQBARMETER_H -#include <qpainter.h> -#include <qwidget.h> -#include <qcolor.h> +#include <ntqpainter.h> +#include <ntqwidget.h> +#include <ntqcolor.h> /** *@author Miguel Novas */ -class QBarMeter: public QWidget { +class TQBarMeter: public TQWidget { Q_OBJECT public: enum Direction { dirLeft, dirRight ,dirUp, dirDown }; - QBarMeter(QWidget *parent=0, const char *name=0); - ~QBarMeter(); + TQBarMeter(TQWidget *parent=0, const char *name=0); + ~TQBarMeter(); void setDirection(Direction dir); void setValueMax(double newVal); void setValue(double newVal); - void setValueColor(const QColor &newColor); - void setValueMaxColor(const QColor &newColor); + void setValueColor(const TQColor &newColor); + void setValueMaxColor(const TQColor &newColor); void setSteps(int newSteps); void setValue(int index, double newVal); - void setValueColor(int index, const QColor &newColor); + void setValueColor(int index, const TQColor &newColor); void setValueCount(int count); void useValueMax(bool flag); protected: double val[8]; - QColor color[8]; + TQColor color[8]; bool useValMax; double valMax; - QColor maxColor; + TQColor maxColor; int count; int steps; Direction dir; - void paintEvent( QPaintEvent *); + void paintEvent( TQPaintEvent *); }; #endif diff --git a/src/qdialarc.cpp b/src/qdialarc.cpp index 418d13b..5ce84d7 100644 --- a/src/qdialarc.cpp +++ b/src/qdialarc.cpp @@ -18,16 +18,16 @@ #include "qdialarc.h" -#include <qpainter.h> +#include <ntqpainter.h> #include <math.h> #include <stdlib.h> #define qdegreesToRadians(n) ((-(n))*M_PI*2/(360*16)) -#define valToQDegrees(n) (int)(((n)-valMin)*angleLen/(valMax-valMin)+angleStart+0.5) +#define valToTQDegrees(n) (int)(((n)-valMin)*angleLen/(valMax-valMin)+angleStart+0.5) -QDialArc::QDialArc(QWidget *parent, const char *name ) : QWidget(parent,name) +TQDialArc::TQDialArc(TQWidget *parent, const char *name ) : TQWidget(parent,name) { val = 0; valMin = 0; @@ -40,20 +40,20 @@ QDialArc::QDialArc(QWidget *parent, const char *name ) : QWidget(parent,name) angleLen = 360*16; fShowMarks = false; fCalcParams = true; - colorMin = Qt::green; - colorMax = Qt::red; + colorMin = TQt::green; + colorMax = TQt::red; arrowColor = foregroundColor(); } -QDialArc::~QDialArc(){ +TQDialArc::~TQDialArc(){ } -void QDialArc::setValue(double value) +void TQDialArc::setValue(double value) { if(value>valMax) value= valMax; else if(value<valMin) value= valMin; if(val!=value) { - QPainter p(this); + TQPainter p(this); p.setPen(backgroundColor()); drawArrow(&p,val); val= value; @@ -63,21 +63,21 @@ void QDialArc::setValue(double value) } -void QDialArc::setValueMin(double value) +void TQDialArc::setValueMin(double value) { valMin= value; paramsChanged(); } -void QDialArc::setValueMax(double value) +void TQDialArc::setValueMax(double value) { valMax= value; paramsChanged(); } -void QDialArc::setValueRanges(double min,double max) +void TQDialArc::setValueRanges(double min,double max) { valMin= min; valMax= max; @@ -85,53 +85,53 @@ void QDialArc::setValueRanges(double min,double max) } -void QDialArc::setValueLimitRanges (double min,double max) +void TQDialArc::setValueLimitRanges (double min,double max) { valMinLimit= min; valMaxLimit= max; update(); } -void QDialArc::setAngle(int value) +void TQDialArc::setAngle(int value) { angleStart= value*16; paramsChanged(); } -void QDialArc::setAngleLen(int value) +void TQDialArc::setAngleLen(int value) { angleLen= value*16; paramsChanged(); } -void QDialArc::setAngles(int angle,int len) +void TQDialArc::setAngles(int angle,int len) { angleStart= angle*16; angleLen = len*16; paramsChanged(); } -void QDialArc::setColorMin(const QColor &color) +void TQDialArc::setColorMin(const TQColor &color) { colorMin= color; update(); } -void QDialArc::setColorMid(const QColor &color) +void TQDialArc::setColorMid(const TQColor &color) { colorMid= color; update(); } -void QDialArc::setColorMax(const QColor &color) +void TQDialArc::setColorMax(const TQColor &color) { colorMax= color; update(); } -void QDialArc::setColorRanges(const QColor &min,const QColor &mid,const QColor &max) +void TQDialArc::setColorRanges(const TQColor &min,const TQColor &mid,const TQColor &max) { colorMin= min; colorMid= mid; @@ -139,40 +139,40 @@ void QDialArc::setColorRanges(const QColor &min,const QColor &mid,const QColor & update(); } -void QDialArc::setValueMinLimit(double value, int percent) +void TQDialArc::setValueMinLimit(double value, int percent) { valMinLimit= value; valMinLimitPercent= percent; update(); } -void QDialArc::setValueMaxLimit(double value, int percent) +void TQDialArc::setValueMaxLimit(double value, int percent) { valMaxLimit= value; valMaxLimitPercent= percent; update(); } -void QDialArc::setValueMinLimitPercent(int value) +void TQDialArc::setValueMinLimitPercent(int value) { valMinLimitPercent=value; update(); } -void QDialArc::setValueMaxLimitPercent(int value) +void TQDialArc::setValueMaxLimitPercent(int value) { valMaxLimitPercent=value; update(); } -void QDialArc::setShowMarks (bool flag) +void TQDialArc::setShowMarks (bool flag) { fShowMarks= flag; update(); } -void QDialArc::setArrowColor(const QColor &color) +void TQDialArc::setArrowColor(const TQColor &color) { arrowColor= color; } @@ -180,7 +180,7 @@ void QDialArc::setArrowColor(const QColor &color) //***************************************************************** -void QDialArc::resizeEvent( QResizeEvent *) +void TQDialArc::resizeEvent( TQResizeEvent *) { paramsChanged(); } @@ -188,7 +188,7 @@ void QDialArc::resizeEvent( QResizeEvent *) //***************************************************************** -void QDialArc::drawMarks(QPainter *p,int l1,int l2) +void TQDialArc::drawMarks(TQPainter *p,int l1,int l2) { int a; double r,co,se; @@ -211,7 +211,7 @@ double r,co,se; } -void QDialArc::drawArc(QPainter *p,int l1,int l2,const QColor &color) +void TQDialArc::drawArc(TQPainter *p,int l1,int l2,const TQColor &color) { p->setPen(color); p->drawArc(centerx-radius,centery-radius,radius*2,radius*2, l1, l2-l1+1); @@ -219,9 +219,9 @@ void QDialArc::drawArc(QPainter *p,int l1,int l2,const QColor &color) } -void QDialArc::drawArrow(QPainter *p, double value) +void TQDialArc::drawArrow(TQPainter *p, double value) { -double r= qdegreesToRadians(valToQDegrees(value)); +double r= qdegreesToRadians(valToTQDegrees(value)); p->drawLine(centerx, centery, @@ -230,29 +230,29 @@ double r= qdegreesToRadians(valToQDegrees(value)); ); } -void QDialArc::paintEvent ( QPaintEvent *) +void TQDialArc::paintEvent ( TQPaintEvent *) { int l0,l1,l2,l3,l4,l5; -QPainter p(this); +TQPainter p(this); if(fCalcParams) calcParams(); l0= angleStart; - l1= valToQDegrees(valMinLimit); - l2= valToQDegrees(valMinLimit+(valMaxLimit-valMinLimit)*valMinLimitPercent/100); - l3= valToQDegrees(valMaxLimit-(valMaxLimit-valMinLimit)*valMaxLimitPercent/100); - l4= valToQDegrees(valMaxLimit); + l1= valToTQDegrees(valMinLimit); + l2= valToTQDegrees(valMinLimit+(valMaxLimit-valMinLimit)*valMinLimitPercent/100); + l3= valToTQDegrees(valMaxLimit-(valMaxLimit-valMinLimit)*valMaxLimitPercent/100); + l4= valToTQDegrees(valMaxLimit); l5= angleStart+angleLen; drawArc(&p,l0,l1,colorMin); - drawArc(&p,l1,l2, QColor( (colorMin.red() +colorMid.red() )/2, + drawArc(&p,l1,l2, TQColor( (colorMin.red() +colorMid.red() )/2, (colorMin.green()+colorMid.green())/2, (colorMin.blue() +colorMid.blue() )/2 ) ); drawArc(&p,l2,l3,colorMid); - drawArc(&p,l3,l4, QColor( (colorMax.red() +colorMid.red() )/2, + drawArc(&p,l3,l4, TQColor( (colorMax.red() +colorMid.red() )/2, (colorMax.green()+colorMid.green())/2, (colorMax.blue() +colorMid.blue() )/2 ) ); drawArc(&p,l4,l5,colorMax); @@ -300,7 +300,7 @@ int a2=a1+len; } -void QDialArc::calcParams() +void TQDialArc::calcParams() { double m,w,h; POINT2D p1,p2,d,a; @@ -343,7 +343,7 @@ POINT2D p1,p2,d,a; -void QDialArc::paramsChanged() +void TQDialArc::paramsChanged() { fCalcParams= true; update(); diff --git a/src/qdialarc.h b/src/qdialarc.h index a5db935..42c254e 100644 --- a/src/qdialarc.h +++ b/src/qdialarc.h @@ -15,20 +15,20 @@ * * ***************************************************************************/ -#ifndef QDIALARC_H -#define QDIALARC_H +#ifndef TQDIALARC_H +#define TQDIALARC_H -#include <qwidget.h> +#include <ntqwidget.h> /** *@author Miguel Novas */ -class QDialArc : public QWidget { +class TQDialArc : public TQWidget { Q_OBJECT public: - QDialArc(QWidget *parent=0, const char *name=0); - ~QDialArc(); + TQDialArc(TQWidget *parent=0, const char *name=0); + ~TQDialArc(); void setValue (double value); void setValueMin (double value); @@ -46,19 +46,19 @@ public: void setShowMarks (bool flag); - void setColorMax(const QColor &color); - void setColorMid(const QColor &color); - void setColorMin(const QColor &color); - void setColorRanges(const QColor &min,const QColor &mid, const QColor &max); + void setColorMax(const TQColor &color); + void setColorMid(const TQColor &color); + void setColorMin(const TQColor &color); + void setColorRanges(const TQColor &min,const TQColor &mid, const TQColor &max); - void setArrowColor(const QColor &color); + void setArrowColor(const TQColor &color); inline double getValue() { return val; } protected: - void resizeEvent( QResizeEvent *); - void paintEvent ( QPaintEvent *); + void resizeEvent( TQResizeEvent *); + void paintEvent ( TQPaintEvent *); private: @@ -73,17 +73,17 @@ private: int centerx,centery; bool fCalcParams; - QColor arrowColor; - QColor colorMin; - QColor colorMid; - QColor colorMax; + TQColor arrowColor; + TQColor colorMin; + TQColor colorMid; + TQColor colorMax; bool fShowMarks; void calcParams(); void paramsChanged(); - void drawMarks(QPainter *p,int l1,int l2); - void drawArc(QPainter *p,int l1,int l2,const QColor &color); - void drawArrow(QPainter *p, double value); + void drawMarks(TQPainter *p,int l1,int l2); + void drawArc(TQPainter *p,int l1,int l2,const TQColor &color); + void drawArrow(TQPainter *p, double value); }; #endif diff --git a/src/qlcddraw.h b/src/qlcddraw.h index c830066..a02a340 100644 --- a/src/qlcddraw.h +++ b/src/qlcddraw.h @@ -16,14 +16,14 @@ ***************************************************************************/ -#ifndef QLCDDRAW_H -#define QLCDDRAW_H +#ifndef TQLCDDRAW_H +#define TQLCDDRAW_H -#include <qpainter.h> -#include <qcolor.h> +#include <ntqpainter.h> +#include <ntqcolor.h> -class QLcd { +class TQLcd { public: @@ -41,15 +41,15 @@ public: }; - static int draw(QPainter *painter, + static int draw(TQPainter *painter, int x, int y, int w, int h, const char *str, int options=0, - const QColor *color=0, - const QColor *colorShadow=0); + const TQColor *color=0, + const TQColor *colorShadow=0); - static void draw(QPainter *p,int x,int y,int w,int h, char c); + static void draw(TQPainter *p,int x,int y,int w,int h, char c); static inline int charWidth(int height) { return (height * 3) / 4; }; static inline int strWidth(const char *str,int height) { return strlen(str)*charWidth(height); }; @@ -59,7 +59,7 @@ private: static const uint asciiSegments[128]; static const int segmentsCoords[32][8]; - static void drawSegment(QPainter *p,const int *c, int x, int y, int w, int h); + static void drawSegment(TQPainter *p,const int *c, int x, int y, int w, int h); }; diff --git a/src/qlcdraw.cpp b/src/qlcdraw.cpp index 26c68d4..97c16a3 100644 --- a/src/qlcdraw.cpp +++ b/src/qlcdraw.cpp @@ -18,7 +18,7 @@ #include "qlcddraw.h" -const uint QLcd::asciiSegments[128]= +const uint TQLcd::asciiSegments[128]= { 0x00000000, // 0 0x00000000, // 1 // From 1-31 maybe for future use (to draw symbols) @@ -151,7 +151,7 @@ const uint QLcd::asciiSegments[128]= }; -const int QLcd::segmentsCoords[32][8]= +const int TQLcd::segmentsCoords[32][8]= { { 0,0, 1,0, -1 }, // 00 { 1,0, 2,0, -1 }, @@ -189,7 +189,7 @@ const int QLcd::segmentsCoords[32][8]= -void QLcd::drawSegment(QPainter *p,const int *c, int x, int y, int w, int h) +void TQLcd::drawSegment(TQPainter *p,const int *c, int x, int y, int w, int h) { h--; p->moveTo( x+(c[0]*w)/2 , y+(c[1]*h)/4 ); @@ -201,7 +201,7 @@ void QLcd::drawSegment(QPainter *p,const int *c, int x, int y, int w, int h) } -void QLcd::draw(QPainter *p,int x,int y,int w,int h, char c) +void TQLcd::draw(TQPainter *p,int x,int y,int w,int h, char c) { uint mask= asciiSegments[(uint)c&0x007F]; @@ -217,7 +217,7 @@ uint mask= asciiSegments[(uint)c&0x007F]; -int QLcd::draw(QPainter *painter,int x, int y, int w, int h,const char *str, int options, const QColor *color, const QColor *colorShadow) +int TQLcd::draw(TQPainter *painter,int x, int y, int w, int h,const char *str, int options, const TQColor *color, const TQColor *colorShadow) { int len= strlen(str)<<1; diff --git a/src/qlcdstring.cpp b/src/qlcdstring.cpp index 114c9dd..8426c76 100644 --- a/src/qlcdstring.cpp +++ b/src/qlcdstring.cpp @@ -18,91 +18,91 @@ #include "qlcdstring.h" -#include <qpalette.h> +#include <ntqpalette.h> -QLCDString::QLCDString( QWidget *parent, const char *name ): QWidget( parent, name ) +TQLCDString::TQLCDString( TQWidget *parent, const char *name ): TQWidget( parent, name ) { digitStr= ""; - options= QLcd::alignCenter; + options= TQLcd::alignCenter; - QColorGroup g= colorGroup(); + TQColorGroup g= colorGroup(); forColor= g.foreground(); shaColor= g.shadow(); } -QLCDString::~QLCDString(){ +TQLCDString::~TQLCDString(){ } -void QLCDString::display( const QString &str ) +void TQLCDString::display( const TQString &str ) { digitStr= str; update(); } -void QLCDString::setAlign(Align newAlign) +void TQLCDString::setAlign(Align newAlign) { - if( (options & QLcd::alignMask)!=newAlign ) { - options= (options & ~QLcd::alignMask ) | newAlign; + if( (options & TQLcd::alignMask)!=newAlign ) { + options= (options & ~TQLcd::alignMask ) | newAlign; update(); } } -const QColor& QLCDString::foreColor() +const TQColor& TQLCDString::foreColor() { return forColor; } -const QColor& QLCDString::shadowColor() +const TQColor& TQLCDString::shadowColor() { return shaColor; } -void QLCDString::setForeColor(const QColor &fore) +void TQLCDString::setForeColor(const TQColor &fore) { forColor= fore; update(); } -void QLCDString::setShadowColor(const QColor &sha) +void TQLCDString::setShadowColor(const TQColor &sha) { shaColor= sha; update(); } -void QLCDString::resizeEvent ( QResizeEvent *) +void TQLCDString::resizeEvent ( TQResizeEvent *) { update(); } -void QLCDString::setShadow(bool enable) +void TQLCDString::setShadow(bool enable) { - if( (bool)(options & QLcd::drawShadow) != enable ) { - options^= QLcd::drawShadow; + if( (bool)(options & TQLcd::drawShadow) != enable ) { + options^= TQLcd::drawShadow; update(); } } -void QLCDString::setNumberDisplay(bool enable) +void TQLCDString::setNumberDisplay(bool enable) { - if( (bool)(options & QLcd::drawNumber) != enable ) { - options^= QLcd::drawNumber; + if( (bool)(options & TQLcd::drawNumber) != enable ) { + options^= TQLcd::drawNumber; update(); } } -void QLCDString::paintEvent( QPaintEvent *e ) +void TQLCDString::paintEvent( TQPaintEvent *e ) { -QPainter p(this); +TQPainter p(this); - QLcd::draw(&p,0,0,width(),height(),digitStr.latin1(),options,&forColor,&shaColor); + TQLcd::draw(&p,0,0,width(),height(),digitStr.latin1(),options,&forColor,&shaColor); } diff --git a/src/qlcdstring.h b/src/qlcdstring.h index 9db6b98..d0a517a 100644 --- a/src/qlcdstring.h +++ b/src/qlcdstring.h @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#ifndef QLCDSTRING_H -#define QLCDSTRING_H +#ifndef TQLCDSTRING_H +#define TQLCDSTRING_H -#include <qframe.h> -#include <qpainter.h> -#include <qcolor.h> -#include <qstring.h> +#include <ntqframe.h> +#include <ntqpainter.h> +#include <ntqcolor.h> +#include <ntqstring.h> #include "qlcddraw.h" @@ -29,9 +29,9 @@ *@author Miguel Novas */ -#include <qpalette.h> +#include <ntqpalette.h> -class QLCDString : public QWidget { +class TQLCDString : public TQWidget { Q_OBJECT public: @@ -42,35 +42,35 @@ public: alignJustify= 0x0003 }; - QLCDString( QWidget *parent=0, const char *name=0 ); - ~QLCDString(); + TQLCDString( TQWidget *parent=0, const char *name=0 ); + ~TQLCDString(); - void display( const QString &str ); + void display( const TQString &str ); void setShadow(bool enable); - bool getShadow() { return (bool)(options & QLcd::drawShadow); }; + bool getShadow() { return (bool)(options & TQLcd::drawShadow); }; void setAlign(Align newAlign); - void setForeColor(const QColor &fore); - void setShadowColor(const QColor &sha); + void setForeColor(const TQColor &fore); + void setShadowColor(const TQColor &sha); void setNumberDisplay(bool enable); - const QColor& foreColor(); - const QColor& shadowColor(); + const TQColor& foreColor(); + const TQColor& shadowColor(); protected: - void resizeEvent( QResizeEvent *); - void paintEvent ( QPaintEvent *); + void resizeEvent( TQResizeEvent *); + void paintEvent ( TQPaintEvent *); private: - QString digitStr; + TQString digitStr; int options; - QColor forColor,shaColor; + TQColor forColor,shaColor; }; #endif diff --git a/src/rampanel.cpp b/src/rampanel.cpp index b927ffb..17b72ab 100644 --- a/src/rampanel.cpp +++ b/src/rampanel.cpp @@ -19,29 +19,29 @@ #include "procinfo.h" -RamPanel::RamPanel(QWidget *parent, const char *name, RamType type): Panel(parent,name) +RamPanel::RamPanel(TQWidget *parent, const char *name, RamType type): Panel(parent,name) { ramType= type; memTotal= -1; memUsed = -1; - arc = new QDialArc(this); + arc = new TQDialArc(this); arc->installEventFilter(this); arc->setAngles(180,-180); arc->setGeometry( 6 , 64/4+9, 64-10, 64/2-8); - arc->setColorRanges(red,red,QColor(0,200,150)); // QColor(0,200,0)); + arc->setColorRanges(red,red,TQColor(0,200,150)); // TQColor(0,200,0)); - lcd1= new QLCDString(this); + lcd1= new TQLCDString(this); lcd1->setGeometry(6, 8,54,11); lcd1->setShadow(true); lcd1->setForeColor(getColorValue()); - lcd1->setAlign(QLCDString::alignCenter); + lcd1->setAlign(TQLCDString::alignCenter); lcd1->installEventFilter(this); - lcd2= new QLCDString(this); + lcd2= new TQLCDString(this); lcd2->setGeometry(4, 52,58,8); lcd2->setForeColor(getColorTitle()); - lcd2->setAlign(QLCDString::alignCenter); + lcd2->setAlign(TQLCDString::alignCenter); lcd2->installEventFilter(this); updateInfo(); @@ -67,14 +67,14 @@ void RamPanel::updateInfo() if(memTotal!=newMemTotal) { arc->setValueRanges(0,newMemTotal); - QString str; + TQString str; str.sprintf ( ramType==memSWAP ? "SWP %dM" : "RAM %dM", newMemTotal); lcd2->display(str); memTotal= newMemTotal; } if(memUsed!=newMemUsed) { - QString str; + TQString str; str.sprintf ("%dM" , newMemUsed ); lcd1->display(str); arc->setValue(newMemUsed); @@ -85,14 +85,14 @@ void RamPanel::updateInfo() } -void RamPanel::paletteChange(const QPalette &oldPalette) +void RamPanel::paletteChange(const TQPalette &oldPalette) { lcd2->setForeColor(getColorTitle()); lcd1->setForeColor(getColorValue()); arc->setArrowColor(getColorValue()); } -void RamPanel::resizeEvent ( QResizeEvent *e ) +void RamPanel::resizeEvent ( TQResizeEvent *e ) { int w= width(); int h= height(); diff --git a/src/rampanel.h b/src/rampanel.h index 62edf45..a52dc06 100644 --- a/src/rampanel.h +++ b/src/rampanel.h @@ -31,18 +31,18 @@ public: enum RamType { memRAM, memSWAP }; - RamPanel(QWidget *parent=0, const char *name=0, RamType type= memRAM); + RamPanel(TQWidget *parent=0, const char *name=0, RamType type= memRAM); ~RamPanel(); protected: RamType ramType; int memTotal,memUsed; - QDialArc *arc; - QLCDString *lcd1,*lcd2; + TQDialArc *arc; + TQLCDString *lcd1,*lcd2; void updateInfo(); - void paletteChange(const QPalette &oldPalette); - void resizeEvent ( QResizeEvent *e ); + void paletteChange(const TQPalette &oldPalette); + void resizeEvent ( TQResizeEvent *e ); }; #endif diff --git a/src/sensor.cpp b/src/sensor.cpp index 9ada02a..73c0829 100644 --- a/src/sensor.cpp +++ b/src/sensor.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include <kglobal.h> +#include <tdeglobal.h> #include "sensor.h" #include "sensorslist.h" -Sensor::Sensor(SensorsList *parent,const char *name): QObject(parent,name) +Sensor::Sensor(SensorsList *parent,const char *name): TQObject(parent,name) { description = ""; compensation = 0; @@ -39,7 +39,7 @@ Sensor::SensorClass Sensor::getClass() return ((SensorsList *)parent())->getClass(); } -QString Sensor::getPrintMask(bool addSufix) +TQString Sensor::getPrintMask(bool addSufix) { return getSensorPrintMask(type, addSufix, ((SensorsList*)parent())->getTempScale() ); } @@ -97,7 +97,7 @@ void Sensor::setMultiplicator(double value) multiplicator= value; } -void Sensor::setDescription(const QString &str) +void Sensor::setDescription(const TQString &str) { description= str; } @@ -118,10 +118,10 @@ void Sensor::setValue(double newVal, TempScale scale, bool ajust) void Sensor::writeConfig() { -KConfig *ksConfig= KGlobal::config(); +TDEConfig *ksConfig= TDEGlobal::config(); if(ksConfig) { - ksConfig->setGroup( QString(name()) ); + ksConfig->setGroup( TQString(name()) ); ksConfig->writeEntry("description" ,description); ksConfig->writeEntry("valueIdeal" ,valIdeal); ksConfig->writeEntry("valueMax" ,valMax); @@ -135,10 +135,10 @@ KConfig *ksConfig= KGlobal::config(); void Sensor::readConfig() { -KConfig *ksConfig= KGlobal::config(); +TDEConfig *ksConfig= TDEGlobal::config(); if(ksConfig) { - ksConfig->setGroup( QString(name()) ); + ksConfig->setGroup( TQString(name()) ); valMax = ksConfig->readDoubleNumEntry("valueMax" ,valMax); valMin = ksConfig->readDoubleNumEntry("valueMin" ,valMin); compensation = ksConfig->readDoubleNumEntry("compensation" ,compensation); diff --git a/src/sensor.h b/src/sensor.h index 6af1c79..c79237c 100644 --- a/src/sensor.h +++ b/src/sensor.h @@ -18,10 +18,10 @@ #ifndef SENSOR_H #define SENSOR_H -#include <qobject.h> -#include <kconfig.h> -#include <qstring.h> -#include <qcstring.h> +#include <ntqobject.h> +#include <tdeconfig.h> +#include <ntqstring.h> +#include <ntqcstring.h> /** *@author Miguel Novas @@ -31,7 +31,7 @@ class SensorsList; -class Sensor : public QObject { +class Sensor : public TQObject { Q_OBJECT friend class SensorsList; @@ -51,7 +51,7 @@ public: void setValue(double newVal, TempScale scale= dgDefault, bool ajust=true); inline SensorType getType() { return type; }; - inline const QString &getDescription() { return description; }; + inline const TQString &getDescription() { return description; }; inline double getValue() { return celsiusTo(val); }; inline double getValuePrevious() { return celsiusTo(valPrevious); }; inline double getValueIdeal() { return celsiusTo(valIdeal); }; @@ -66,7 +66,7 @@ public: bool monitorized(); void setMonitorized (bool enable); - void setDescription (const QString &str); + void setDescription (const TQString &str); void setValueIdeal (double value, TempScale scale= dgDefault); void setValueMax (double value, TempScale scale= dgDefault); void setValueMin (double value, TempScale scale= dgDefault); @@ -80,7 +80,7 @@ public: double toCelsiusDiff(double val, TempScale scale= dgDefault); double celsiusToDiff(double val, TempScale scale= dgDefault); - QString getPrintMask(bool addSufix); + TQString getPrintMask(bool addSufix); public slots: @@ -95,7 +95,7 @@ signals: private: SensorType type; - QString description; + TQString description; double val; double valPrevious; double compensation; diff --git a/src/sensorslist.cpp b/src/sensorslist.cpp index 57e6951..d5921b3 100644 --- a/src/sensorslist.cpp +++ b/src/sensorslist.cpp @@ -17,10 +17,10 @@ #include "sensorslist.h" -#include <kglobal.h> +#include <tdeglobal.h> -SensorsList::SensorsList(QObject *parent, const char * name) - : QObject(parent,name) +SensorsList::SensorsList(TQObject *parent, const char * name) + : TQObject(parent,name) { tempScale= Sensor::dgCelsius; updateInterval= 5000; @@ -56,7 +56,7 @@ void SensorsList::setTempScale(Sensor::TempScale scale) { if(tempScale!=scale) { tempScale= scale; - QObjectList *list= getSensors(); + TQObjectList *list= getSensors(); if(list) for(Sensor *sensor=(Sensor*)list->first(); sensor!=0; sensor= (Sensor*)list->next()) if(sensor->getType()==Sensor::lmTemp) @@ -67,10 +67,10 @@ void SensorsList::setTempScale(Sensor::TempScale scale) void SensorsList::readConfig() { - KConfig *ksConfig= KGlobal::config(); + TDEConfig *ksConfig= TDEGlobal::config(); ksConfig->setGroup( name() ); setUpdateInterval(ksConfig->readNumEntry("UpdateInterval",5)); - QString str= ksConfig->readEntry("Scale" ,"C"); + TQString str= ksConfig->readEntry("Scale" ,"C"); Sensor::TempScale tempScale; if(str=="F") tempScale= Sensor::dgFahrenheit; else if(str=="K") tempScale= Sensor::dgKelvin; @@ -81,10 +81,10 @@ void SensorsList::readConfig() void SensorsList::writeConfig() { - KConfig *ksConfig= KGlobal::config(); + TDEConfig *ksConfig= TDEGlobal::config(); ksConfig->setGroup( name() ); ksConfig->writeEntry("UpdateInterval",updateInterval/1000); - QString str; + TQString str; switch(tempScale) { case Sensor::dgCelsius : str='C'; break; case Sensor::dgKelvin : str='K'; break; @@ -98,14 +98,14 @@ void SensorsList::writeConfig() // Protected methods //**************************************************************************** -void SensorsList::timerEvent( QTimerEvent * ) +void SensorsList::timerEvent( TQTimerEvent * ) { updateSensors(); } //*************** -void SensorsList::childEvent ( QChildEvent *e ) +void SensorsList::childEvent ( TQChildEvent *e ) { if(e->inserted()) { connect((Sensor *)e->child(),SIGNAL(configChanged()),this,SLOT(slotConfigChanged())); diff --git a/src/sensorslist.h b/src/sensorslist.h index a2dc7ec..49a0871 100644 --- a/src/sensorslist.h +++ b/src/sensorslist.h @@ -18,10 +18,10 @@ #ifndef SENSORSLIST_H #define SENSORSLIST_H -#include <qobject.h> -#include <qobjectlist.h> -#include <kconfig.h> -#include <qstringlist.h> +#include <ntqobject.h> +#include <ntqobjectlist.h> +#include <tdeconfig.h> +#include <ntqstringlist.h> #include <sensor.h> @@ -29,21 +29,21 @@ *@author Miguel Novas */ -class SensorsList : public QObject { +class SensorsList : public TQObject { Q_OBJECT friend class Sensor; public: - SensorsList(QObject *parent=0, const char *name=0); + SensorsList(TQObject *parent=0, const char *name=0); ~SensorsList(); void setMonitorized(bool enable); - const QString &getDescription() { return description; }; - QObjectList *getSensors() { return (QObjectList *)children(); }; - Sensor *getSensor(int index) { return children() ? (Sensor *)((QObjectList *)children())->at(index) : 0; } + const TQString &getDescription() { return description; }; + TQObjectList *getSensors() { return (TQObjectList *)children(); }; + Sensor *getSensor(int index) { return children() ? (Sensor *)((TQObjectList *)children())->at(index) : 0; } Sensor *getSensor(const char *name) { return (Sensor *)child(name); } int count() { return children() ? children()->count() : 0; } @@ -73,20 +73,20 @@ protected slots: protected: - void setDescription(const QString &name) { description= name; }; + void setDescription(const TQString &name) { description= name; }; void setClass(Sensor::SensorClass newClass) { clas= newClass; } - void childEvent ( QChildEvent *e ); + void childEvent ( TQChildEvent *e ); private: - QString description; + TQString description; Sensor::SensorClass clas; bool monitorized; int updateInterval; - KConfig *ksConfig; + TDEConfig *ksConfig; Sensor::TempScale tempScale; - void timerEvent( QTimerEvent * ); + void timerEvent( TQTimerEvent * ); }; #endif diff --git a/src/sounds/Makefile.in b/src/sounds/Makefile.in index ea88b3c..b5521a8 100644 --- a/src/sounds/Makefile.in +++ b/src/sounds/Makefile.in @@ -400,16 +400,16 @@ uninstall-am: uninstall-info-am uninstall-local install-data-local: -#>- $(mkinstalldirs) $(kde_datadir)/sounds +#>- $(mkinstalldirs) $(kde_sounddir) #>+ 1 - $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/sounds -#>- $(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_datadir)/sounds/ksensors_alert.wav + $(mkinstalldirs) $(DESTDIR)$(kde_sounddir) +#>- $(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav #>+ 1 - $(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(DESTDIR)$(kde_datadir)/sounds/ksensors_alert.wav + $(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(DESTDIR)$(kde_sounddir)/ksensors_alert.wav uninstall-local: -#>- -rm -f $(kde_datadir)/sounds/ksensors_alert.wav +#>- -rm -f $(kde_sounddir)/ksensors_alert.wav #>+ 1 - -rm -f $(DESTDIR)$(kde_datadir)/sounds/ksensors_alert.wav + -rm -f $(DESTDIR)$(kde_sounddir)/ksensors_alert.wav ####### kdevelop will overwrite this part!!! (end)############ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/systemcfg.cpp b/src/systemcfg.cpp index 69a1053..3138970 100644 --- a/src/systemcfg.cpp +++ b/src/systemcfg.cpp @@ -15,32 +15,32 @@ * * ***************************************************************************/ -#include <qlistbox.h> -#include <qspinbox.h> -#include <qpushbutton.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtabwidget.h> -#include <klocale.h> +#include <ntqlistbox.h> +#include <ntqspinbox.h> +#include <ntqpushbutton.h> +#include <ntqgroupbox.h> +#include <ntqcheckbox.h> +#include <ntqlayout.h> +#include <ntqtabwidget.h> +#include <tdelocale.h> #include "systemcfg.h" #include "infopanels.h" -SystemCfg::SystemCfg(LMSensors *lsensors, QWidget *parent, const char *name): SystemCfgDesign(parent,name) +SystemCfg::SystemCfg(LMSensors *lsensors, TQWidget *parent, const char *name): SystemCfgDesign(parent,name) { sensors= lsensors; palPanelCfg= new PaletteCfg( boxPanelPalette ); - boxPanelPalette->setColumnLayout(0, Qt::Vertical ); + boxPanelPalette->setColumnLayout(0, TQt::Vertical ); boxPanelPalette->layout()->setSpacing( 6 ); boxPanelPalette->layout()->setMargin( 12 ); - QGridLayout *boxPanelPaletteLayout = new QGridLayout( boxPanelPalette->layout() ); - boxPanelPaletteLayout->setAlignment( Qt::AlignTop ); + TQGridLayout *boxPanelPaletteLayout = new TQGridLayout( boxPanelPalette->layout() ); + boxPanelPaletteLayout->setAlignment( TQt::AlignTop ); boxPanelPaletteLayout->addWidget( palPanelCfg, 0, 0 ); - connect( TabWidget ,SIGNAL(currentChanged(QWidget*)), this, SLOT(slotTabWidgetChanged(QWidget *))); + connect( TabWidget ,SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotTabWidgetChanged(TQWidget *))); //connect( buttonApply ,SIGNAL(clicked()),this, SLOT(slotApplyChanges())); listSensors->clear(); @@ -58,7 +58,7 @@ SystemCfg::SystemCfg(LMSensors *lsensors, QWidget *parent, const char *name): Sy SystemCfg::~SystemCfg(){ } -void SystemCfg::slotTabWidgetChanged(QWidget *) +void SystemCfg::slotTabWidgetChanged(TQWidget *) { switch(TabWidget->currentPageIndex()) { diff --git a/src/systemcfg.h b/src/systemcfg.h index ab5f0d1..4eacf0a 100644 --- a/src/systemcfg.h +++ b/src/systemcfg.h @@ -29,12 +29,12 @@ class SystemCfg : public SystemCfgDesign { Q_OBJECT public: - SystemCfg(LMSensors *lsensors, QWidget *parent=0, const char *name=0); + SystemCfg(LMSensors *lsensors, TQWidget *parent=0, const char *name=0); ~SystemCfg(); protected slots: void slotCurrentSensorChanged(int index); - void slotTabWidgetChanged(QWidget *); + void slotTabWidgetChanged(TQWidget *); void readSensorInfo(int index); void readPreferencesInfo(); diff --git a/src/systemcfgdesign.cpp b/src/systemcfgdesign.cpp index 2695218..f07956e 100644 --- a/src/systemcfgdesign.cpp +++ b/src/systemcfgdesign.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file './systemcfgdesign.ui' ** @@ -10,105 +10,105 @@ #include "systemcfgdesign.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qlistbox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qslider.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqtabwidget.h> +#include <ntqlistbox.h> +#include <ntqframe.h> +#include <ntqgroupbox.h> +#include <ntqcheckbox.h> +#include <ntqspinbox.h> +#include <ntqslider.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a SystemCfgDesign as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -SystemCfgDesign::SystemCfgDesign( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +SystemCfgDesign::SystemCfgDesign( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "SystemCfgDesign" ); - SystemCfgDesignLayout = new QGridLayout( this, 1, 1, 8, 4, "SystemCfgDesignLayout"); + SystemCfgDesignLayout = new TQGridLayout( this, 1, 1, 8, 4, "SystemCfgDesignLayout"); - TabWidget = new QTabWidget( this, "TabWidget" ); + TabWidget = new TQTabWidget( this, "TabWidget" ); - tab = new QWidget( TabWidget, "tab" ); - tabLayout = new QHBoxLayout( tab, 8, 8, "tabLayout"); + tab = new TQWidget( TabWidget, "tab" ); + tabLayout = new TQHBoxLayout( tab, 8, 8, "tabLayout"); - listSensors = new QListBox( tab, "listSensors" ); - listSensors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, listSensors->sizePolicy().hasHeightForWidth() ) ); - listSensors->setMinimumSize( QSize( 160, 0 ) ); - listSensors->setMaximumSize( QSize( 160, 32767 ) ); - listSensors->setFrameShape( QListBox::StyledPanel ); - listSensors->setFrameShadow( QListBox::Sunken ); + listSensors = new TQListBox( tab, "listSensors" ); + listSensors->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, listSensors->sizePolicy().hasHeightForWidth() ) ); + listSensors->setMinimumSize( TQSize( 160, 0 ) ); + listSensors->setMaximumSize( TQSize( 160, 32767 ) ); + listSensors->setFrameShape( TQListBox::StyledPanel ); + listSensors->setFrameShadow( TQListBox::Sunken ); listSensors->setLineWidth( 2 ); - listSensors->setColumnMode( QListBox::FixedNumber ); + listSensors->setColumnMode( TQListBox::FixedNumber ); tabLayout->addWidget( listSensors ); - framePanelCfg = new QFrame( tab, "framePanelCfg" ); - framePanelCfg->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, framePanelCfg->sizePolicy().hasHeightForWidth() ) ); - framePanelCfg->setFrameShape( QFrame::NoFrame ); - framePanelCfg->setFrameShadow( QFrame::Raised ); - framePanelCfgLayout = new QVBoxLayout( framePanelCfg, 0, 4, "framePanelCfgLayout"); + framePanelCfg = new TQFrame( tab, "framePanelCfg" ); + framePanelCfg->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, framePanelCfg->sizePolicy().hasHeightForWidth() ) ); + framePanelCfg->setFrameShape( TQFrame::NoFrame ); + framePanelCfg->setFrameShadow( TQFrame::Raised ); + framePanelCfgLayout = new TQVBoxLayout( framePanelCfg, 0, 4, "framePanelCfgLayout"); - GroupBox13 = new QGroupBox( framePanelCfg, "GroupBox13" ); - GroupBox13->setMinimumSize( QSize( 0, 50 ) ); - GroupBox13->setMaximumSize( QSize( 32767, 50 ) ); - GroupBox13->setColumnLayout(0, Qt::Vertical ); + GroupBox13 = new TQGroupBox( framePanelCfg, "GroupBox13" ); + GroupBox13->setMinimumSize( TQSize( 0, 50 ) ); + GroupBox13->setMaximumSize( TQSize( 32767, 50 ) ); + GroupBox13->setColumnLayout(0, TQt::Vertical ); GroupBox13->layout()->setSpacing( 6 ); GroupBox13->layout()->setMargin( 11 ); - GroupBox13Layout = new QGridLayout( GroupBox13->layout() ); - GroupBox13Layout->setAlignment( Qt::AlignTop ); + GroupBox13Layout = new TQGridLayout( GroupBox13->layout() ); + GroupBox13Layout->setAlignment( TQt::AlignTop ); - checkShow = new QCheckBox( GroupBox13, "checkShow" ); - checkShow->setCursor( QCursor( 0 ) ); + checkShow = new TQCheckBox( GroupBox13, "checkShow" ); + checkShow->setCursor( TQCursor( 0 ) ); GroupBox13Layout->addWidget( checkShow, 0, 0 ); framePanelCfgLayout->addWidget( GroupBox13 ); - boxPanelPalette = new QGroupBox( framePanelCfg, "boxPanelPalette" ); - boxPanelPalette->setMinimumSize( QSize( 0, 90 ) ); + boxPanelPalette = new TQGroupBox( framePanelCfg, "boxPanelPalette" ); + boxPanelPalette->setMinimumSize( TQSize( 0, 90 ) ); framePanelCfgLayout->addWidget( boxPanelPalette ); - Spacer4_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + Spacer4_2 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); framePanelCfgLayout->addItem( Spacer4_2 ); tabLayout->addWidget( framePanelCfg ); - TabWidget->insertTab( tab, QString("") ); + TabWidget->insertTab( tab, TQString("") ); - tab_2 = new QWidget( TabWidget, "tab_2" ); - tabLayout_2 = new QVBoxLayout( tab_2, 11, 6, "tabLayout_2"); + tab_2 = new TQWidget( TabWidget, "tab_2" ); + tabLayout_2 = new TQVBoxLayout( tab_2, 11, 6, "tabLayout_2"); - GroupBox7 = new QGroupBox( tab_2, "GroupBox7" ); - GroupBox7->setMinimumSize( QSize( 0, 0 ) ); - GroupBox7->setColumnLayout(0, Qt::Vertical ); + GroupBox7 = new TQGroupBox( tab_2, "GroupBox7" ); + GroupBox7->setMinimumSize( TQSize( 0, 0 ) ); + GroupBox7->setColumnLayout(0, TQt::Vertical ); GroupBox7->layout()->setSpacing( 12 ); GroupBox7->layout()->setMargin( 12 ); - GroupBox7Layout = new QHBoxLayout( GroupBox7->layout() ); - GroupBox7Layout->setAlignment( Qt::AlignTop ); + GroupBox7Layout = new TQHBoxLayout( GroupBox7->layout() ); + GroupBox7Layout->setAlignment( TQt::AlignTop ); - SpinUpdateTime = new QSpinBox( GroupBox7, "SpinUpdateTime" ); + SpinUpdateTime = new TQSpinBox( GroupBox7, "SpinUpdateTime" ); SpinUpdateTime->setMinValue( 1 ); SpinUpdateTime->setValue( 5 ); GroupBox7Layout->addWidget( SpinUpdateTime ); - SliderUpdateTime = new QSlider( GroupBox7, "SliderUpdateTime" ); + SliderUpdateTime = new TQSlider( GroupBox7, "SliderUpdateTime" ); SliderUpdateTime->setMaxValue( 60 ); SliderUpdateTime->setValue( 5 ); - SliderUpdateTime->setOrientation( QSlider::Horizontal ); - SliderUpdateTime->setTickmarks( QSlider::Right ); + SliderUpdateTime->setOrientation( TQSlider::Horizontal ); + SliderUpdateTime->setTickmarks( TQSlider::Right ); SliderUpdateTime->setTickInterval( 1 ); GroupBox7Layout->addWidget( SliderUpdateTime ); tabLayout_2->addWidget( GroupBox7 ); - Spacer18 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + Spacer18 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_2->addItem( Spacer18 ); - TabWidget->insertTab( tab_2, QString("") ); + TabWidget->insertTab( tab_2, TQString("") ); SystemCfgDesignLayout->addWidget( TabWidget, 0, 0 ); languageChange(); - resize( QSize(334, 240).expandedTo(minimumSizeHint()) ); + resize( TQSize(334, 240).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections @@ -121,7 +121,7 @@ SystemCfgDesign::SystemCfgDesign( QWidget* parent, const char* name, WFlags fl ) */ SystemCfgDesign::~SystemCfgDesign() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -131,7 +131,7 @@ SystemCfgDesign::~SystemCfgDesign() void SystemCfgDesign::languageChange() { setCaption( tr2i18n( "SystemCfgDesign" ) ); - GroupBox13->setTitle( QString::null ); + GroupBox13->setTitle( TQString::null ); checkShow->setText( tr2i18n( "Visible" ) ); boxPanelPalette->setTitle( tr2i18n( "Colors" ) ); TabWidget->changeTab( tab, tr2i18n( "System Panels" ) ); diff --git a/src/systemcfgdesign.h b/src/systemcfgdesign.h index 07c776e..5993305 100644 --- a/src/systemcfgdesign.h +++ b/src/systemcfgdesign.h @@ -10,51 +10,51 @@ #ifndef SYSTEMCFGDESIGN_H #define SYSTEMCFGDESIGN_H -#include <qvariant.h> -#include <qwidget.h> +#include <ntqvariant.h> +#include <ntqwidget.h> -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QTabWidget; -class QListBox; -class QListBoxItem; -class QFrame; -class QGroupBox; -class QCheckBox; -class QSpinBox; -class QSlider; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; +class TQTabWidget; +class TQListBox; +class TQListBoxItem; +class TQFrame; +class TQGroupBox; +class TQCheckBox; +class TQSpinBox; +class TQSlider; -class SystemCfgDesign : public QWidget +class SystemCfgDesign : public TQWidget { Q_OBJECT public: - SystemCfgDesign( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SystemCfgDesign( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SystemCfgDesign(); - QTabWidget* TabWidget; - QWidget* tab; - QListBox* listSensors; - QFrame* framePanelCfg; - QGroupBox* GroupBox13; - QCheckBox* checkShow; - QGroupBox* boxPanelPalette; - QWidget* tab_2; - QGroupBox* GroupBox7; - QSpinBox* SpinUpdateTime; - QSlider* SliderUpdateTime; + TQTabWidget* TabWidget; + TQWidget* tab; + TQListBox* listSensors; + TQFrame* framePanelCfg; + TQGroupBox* GroupBox13; + TQCheckBox* checkShow; + TQGroupBox* boxPanelPalette; + TQWidget* tab_2; + TQGroupBox* GroupBox7; + TQSpinBox* SpinUpdateTime; + TQSlider* SliderUpdateTime; protected: - QGridLayout* SystemCfgDesignLayout; - QHBoxLayout* tabLayout; - QVBoxLayout* framePanelCfgLayout; - QSpacerItem* Spacer4_2; - QGridLayout* GroupBox13Layout; - QVBoxLayout* tabLayout_2; - QSpacerItem* Spacer18; - QHBoxLayout* GroupBox7Layout; + TQGridLayout* SystemCfgDesignLayout; + TQHBoxLayout* tabLayout; + TQVBoxLayout* framePanelCfgLayout; + TQSpacerItem* Spacer4_2; + TQGridLayout* GroupBox13Layout; + TQVBoxLayout* tabLayout_2; + TQSpacerItem* Spacer18; + TQHBoxLayout* GroupBox7Layout; protected slots: virtual void languageChange(); diff --git a/src/systemcfgdesign.ui b/src/systemcfgdesign.ui index 3fe1e3a..b491a71 100644 --- a/src/systemcfgdesign.ui +++ b/src/systemcfgdesign.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SystemCfgDesign</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SystemCfgDesign</cstring> </property> @@ -29,7 +29,7 @@ <property name="spacing"> <number>4</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget</cstring> </property> @@ -37,7 +37,7 @@ </property> <property name="layoutSpacing" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -54,7 +54,7 @@ <property name="spacing"> <number>8</number> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>listSensors</cstring> </property> @@ -91,7 +91,7 @@ <enum>FixedNumber</enum> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>framePanelCfg</cstring> </property> @@ -123,7 +123,7 @@ <property name="spacing"> <number>4</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox13</cstring> </property> @@ -146,7 +146,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkShow</cstring> </property> @@ -161,7 +161,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>boxPanelPalette</cstring> </property> @@ -196,7 +196,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -213,7 +213,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox7</cstring> </property> @@ -240,7 +240,7 @@ <property name="spacing"> <number>12</number> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>SpinUpdateTime</cstring> </property> @@ -254,7 +254,7 @@ <number>5</number> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>SliderUpdateTime</cstring> </property> diff --git a/src/uptimepanel.cpp b/src/uptimepanel.cpp index 6852ff4..36a1f54 100644 --- a/src/uptimepanel.cpp +++ b/src/uptimepanel.cpp @@ -19,14 +19,14 @@ #include "procinfo.h" #include "qlcddraw.h" -#include <qcolor.h> -#include <qpainter.h> +#include <ntqcolor.h> +#include <ntqpainter.h> -UpTimePanel::UpTimePanel(QWidget *parent, const char *name) : Panel(parent,name) +UpTimePanel::UpTimePanel(TQWidget *parent, const char *name) : Panel(parent,name) { - lcd= new QLCDString(this); + lcd= new TQLCDString(this); lcd->setGeometry(6,25,52,15); lcd->setShadow(true); lcd->setForeColor(red); @@ -46,13 +46,13 @@ void UpTimePanel::updateInfo() int hours = uptime/ (60*60); int minutes= (uptime % (60*60)) / 60; - QString str; + TQString str; str.sprintf("%02d:%02d",hours,minutes); lcd->display(str); update(); } -void UpTimePanel::drawContents(QPainter *p) +void UpTimePanel::drawContents(TQPainter *p) { int w= width(); int h= height(); @@ -60,11 +60,11 @@ void UpTimePanel::drawContents(QPainter *p) int i2= (h * 4) / 5; int th= h-i2-h/11; - QLcd::draw(p, 2,h/10,w-4,th,"hh:mm",QLcd::alignCenter, &getColorTitle()); - QLcd::draw(p, 2,i2+1,w-4,th,"Up Time",QLcd::alignCenter,&getColorTitle()); + TQLcd::draw(p, 2,h/10,w-4,th,"hh:mm",TQLcd::alignCenter, &getColorTitle()); + TQLcd::draw(p, 2,i2+1,w-4,th,"Up Time",TQLcd::alignCenter,&getColorTitle()); } -void UpTimePanel::resizeEvent ( QResizeEvent *e ) +void UpTimePanel::resizeEvent ( TQResizeEvent *e ) { int w= width(); int h= height(); diff --git a/src/uptimepanel.h b/src/uptimepanel.h index b990312..b00cc0d 100644 --- a/src/uptimepanel.h +++ b/src/uptimepanel.h @@ -21,7 +21,7 @@ #include "panel.h" #include "qlcdstring.h" -#include <qstring.h> +#include <ntqstring.h> /** *@author Miguel Novas @@ -30,18 +30,18 @@ class UpTimePanel : public Panel { Q_OBJECT public: - UpTimePanel(QWidget *parent=0, const char *name=0); + UpTimePanel(TQWidget *parent=0, const char *name=0); ~UpTimePanel(); protected: void updateInfo(); - void drawContents ( QPainter *p ); + void drawContents ( TQPainter *p ); private: - QLCDString *lcd; - void resizeEvent ( QResizeEvent *e ); + TQLCDString *lcd; + void resizeEvent ( TQResizeEvent *e ); }; #endif |