From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- arts/gui/kde/artstestgui.cpp | 12 ++--- arts/gui/kde/dbtest.h | 1 + arts/gui/kde/kartswidget.cpp | 32 +++++------ arts/gui/kde/kartswidget.h | 14 ++--- arts/gui/kde/kbutton_impl.cpp | 4 +- arts/gui/kde/kbutton_impl.h | 3 +- arts/gui/kde/kcombobox_impl.cpp | 2 +- arts/gui/kde/kcombobox_impl.h | 3 +- arts/gui/kde/kfader.cpp | 8 +-- arts/gui/kde/kfader.h | 7 +-- arts/gui/kde/kfader_impl.h | 3 +- arts/gui/kde/kframe_impl.cpp | 4 +- arts/gui/kde/kframe_impl.h | 6 +-- arts/gui/kde/kgraph.cpp | 12 ++--- arts/gui/kde/kgraph.h | 5 +- arts/gui/kde/kgraph_impl.h | 2 +- arts/gui/kde/kgraphline_impl.cpp | 2 +- arts/gui/kde/klabel_impl.cpp | 4 +- arts/gui/kde/klabel_impl.h | 3 +- arts/gui/kde/klayoutbox_impl.cpp | 26 ++++----- arts/gui/kde/klayoutbox_impl.h | 10 ++-- arts/gui/kde/klevelmeter_firebars.cpp | 6 +-- arts/gui/kde/klevelmeter_firebars.h | 2 + arts/gui/kde/klevelmeter_impl.cpp | 4 +- arts/gui/kde/klevelmeter_linebars.cpp | 14 ++--- arts/gui/kde/klevelmeter_linebars.h | 1 + arts/gui/kde/klevelmeter_normalbars.cpp | 4 +- arts/gui/kde/klevelmeter_normalbars.h | 4 +- arts/gui/kde/klevelmeter_private.h | 1 + arts/gui/kde/klevelmeter_small.cpp | 4 +- arts/gui/kde/klevelmeter_small.h | 1 + arts/gui/kde/klevelmeter_template.h | 1 + arts/gui/kde/klineedit_impl.h | 3 +- arts/gui/kde/kpopupbox_impl.cpp | 12 ++--- arts/gui/kde/kpopupbox_private.h | 38 +++++++------ arts/gui/kde/kpoti.cpp | 94 ++++++++++++++++----------------- arts/gui/kde/kpoti.h | 15 +++--- arts/gui/kde/kpoti_impl.h | 1 + arts/gui/kde/kspinbox_impl.h | 3 +- arts/gui/kde/ktickmarks_impl.cpp | 12 ++--- arts/gui/kde/ktickmarks_impl.h | 1 + arts/gui/kde/kvolumefader_impl.cpp | 10 ++-- arts/gui/kde/kvolumefader_impl.h | 1 + arts/gui/kde/kwidget_impl.cpp | 26 ++++----- arts/gui/kde/kwidget_impl.h | 5 +- arts/gui/kde/kwidgetrepo.cpp | 2 +- arts/gui/kde/kwidgetrepo.h | 2 +- 47 files changed, 230 insertions(+), 200 deletions(-) (limited to 'arts/gui/kde') diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp index 6d1b798e..9464ac7a 100644 --- a/arts/gui/kde/artstestgui.cpp +++ b/arts/gui/kde/artstestgui.cpp @@ -31,7 +31,7 @@ using namespace Arts; int main(int argc, char **argv) { - QIOManager iomanager; + TQIOManager iomanager; Dispatcher dispatcher(&iomanager); KApplication application(argc, argv, "testgui"); @@ -41,7 +41,7 @@ int main(int argc, char **argv) w.width(500); w.height(350); w.show(); Button b; - b.parent(w); + b.tqparent(w); b.x(10); b.y(10); b.width(100); @@ -50,7 +50,7 @@ int main(int argc, char **argv) b.show(); Button b2; - b2.parent(w); + b2.tqparent(w); b2.x(10); b2.y(30); b2.width(100); @@ -59,7 +59,7 @@ int main(int argc, char **argv) b2.show(); Poti p; - p.parent(w); + p.tqparent(w); p.x(150); p.y(10); p.caption("delay (ms)"); @@ -70,7 +70,7 @@ int main(int argc, char **argv) p.show(); Poti q; - q.parent(w); + q.tqparent(w); q.x(250); q.y(10); q.caption("delay (ms)"); @@ -81,7 +81,7 @@ int main(int argc, char **argv) q.show(); Graph g; - g.parent(w); + g.tqparent(w); g.x(50); g.y(70); g.width(400); diff --git a/arts/gui/kde/dbtest.h b/arts/gui/kde/dbtest.h index 085ee7a0..23163973 100644 --- a/arts/gui/kde/dbtest.h +++ b/arts/gui/kde/dbtest.h @@ -8,6 +8,7 @@ class dBTestWidget : public TQWidget, public dB2VolCalc { Q_OBJECT + TQ_OBJECT public: dBTestWidget( TQWidget*, const char* =0 ); ~dBTestWidget(); diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp index dde61820..5188e81a 100644 --- a/arts/gui/kde/kartswidget.cpp +++ b/arts/gui/kde/kartswidget.cpp @@ -28,43 +28,43 @@ class KArtsWidgetPrivate { public: - TQHBoxLayout *layout; + TQHBoxLayout *tqlayout; }; -KArtsWidget::KArtsWidget( TQWidget* parent, const char* name ) - :TQWidget( parent, name ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( TQWidget* tqparent, const char* name ) + :TQWidget( tqparent, name ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->layout = new TQHBoxLayout(this); + d->tqlayout = new TQHBoxLayout(this); } -KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ) - :TQWidget( parent, name ), _content( Arts::Widget::null()) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name ) + :TQWidget( tqparent, name ), _content( Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->layout = new TQHBoxLayout(this); + d->tqlayout = new TQHBoxLayout(this); setContent(content); } -KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name, WFlags wflags ) - :TQWidget( parent, name, wflags ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name, WFlags wflags ) + :TQWidget( tqparent, name, wflags ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->layout = new TQHBoxLayout( this ); + d->tqlayout = new TQHBoxLayout( this ); setContent( content ); } -KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags ) - :TQWidget(parent, name, wflags ), _content(Arts::Widget::null()) +KArtsWidget::KArtsWidget(TQWidget* tqparent, const char* name, WFlags wflags ) + :TQWidget(tqparent, name, wflags ), _content(Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->layout = new TQHBoxLayout(this); + d->tqlayout = new TQHBoxLayout(this); } KArtsWidget::~KArtsWidget() { TQWidget *contentAsWidget - = KWidgetRepo::the()->lookupQWidget(_content.widgetID()); + = KWidgetRepo::the()->lookupTQWidget(_content.widgetID()); contentAsWidget->reparent(0,TQPoint(0,0),_content.visible()); delete d; d = 0; @@ -75,12 +75,12 @@ void KArtsWidget::setContent(Arts::Widget content) { arts_return_if_fail(!content.isNull()); TQWidget *contentAsWidget - = KWidgetRepo::the()->lookupQWidget(content.widgetID()); + = KWidgetRepo::the()->lookupTQWidget(content.widgetID()); arts_return_if_fail(contentAsWidget != 0); _content = content; contentAsWidget->reparent(this,TQPoint(0,0),content.visible()); - d->layout->addWidget(contentAsWidget); + d->tqlayout->addWidget(contentAsWidget); } Arts::Widget KArtsWidget::content() diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index 2cd072bc..7e745bf6 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -31,17 +31,17 @@ class KArtsWidgetPrivate; /** * KArtsWidget provides a simple way to treat Arts::Widget classes like - * native Qt widgets. Suppose you use Qt, and want to put an Arts::Widget - * type into a layout, you can do so using this code + * native TQt widgets. Suppose you use TQt, and want to put an Arts::Widget + * type into a tqlayout, you can do so using this code * * 
  *    Arts::Widget widget = ...get widget from somewhere...;
  *    KArtsWidget *w = new KArtsWidget(widget, this);
- *    layout->addWidget(w);
+ *    tqlayout->addWidget(w);
  *
* - * In line 2 of the code, the "this" is the parent widget (which is usually - * this in Qt code). + * In line 2 of the code, the "this" is the tqparent widget (which is usually + * this in TQt code). * * The KArtsWidget class keeps a reference to the content widget, so the * content widget will not be freed until the KArtsWidget gets destroyed. @@ -57,12 +57,12 @@ public: /** * creates a new KArtsWidget */ - KArtsWidget( TQWidget* parent, const char* name ); + KArtsWidget( TQWidget* tqparent, const char* name ); /** * creates a new KArtsWidget and sets the content to an Arts::Widget */ - KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ); + KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name ); /** * creates a new KArtsWidget with WidgetFlags and content diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp index 34c5791b..95f7699f 100644 --- a/arts/gui/kde/kbutton_impl.cpp +++ b/arts/gui/kde/kbutton_impl.cpp @@ -72,12 +72,12 @@ KButton_impl::KButton_impl( TQPushButton * widget ) void KButton_impl::constructor( Widget p ) { - parent( p ); + tqparent( p ); } void KButton_impl::constructor( const string & t, Widget p ) { - parent( p ); + tqparent( p ); text( t ); } diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h index 723c5023..4db27c84 100644 --- a/arts/gui/kde/kbutton_impl.h +++ b/arts/gui/kde/kbutton_impl.h @@ -32,6 +32,7 @@ namespace Arts { class KButton_impl; class KButtonMapper : public TQObject { Q_OBJECT + TQ_OBJECT KButton_impl *impl; TQPushButton * button; public: @@ -54,7 +55,7 @@ protected: public: KButton_impl( TQPushButton * w = 0 ); - void constructor( Widget parent ); + void constructor( Widget tqparent ); void constructor( const std::string &, Widget ); void emitClicked(); diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp index eab55d0d..58c401ce 100644 --- a/arts/gui/kde/kcombobox_impl.cpp +++ b/arts/gui/kde/kcombobox_impl.cpp @@ -31,7 +31,7 @@ using namespace Arts; using namespace std; ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co) - : TQObject( co, "map Qt signal to aRts" ) + : TQObject( co, "map TQt signal to aRts" ) ,impl(impl) { connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &))); diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h index 3041d352..ad8e5739 100644 --- a/arts/gui/kde/kcombobox_impl.h +++ b/arts/gui/kde/kcombobox_impl.h @@ -36,6 +36,7 @@ namespace Arts { class KComboBox_impl; class ComboBoxIntMapper :public TQObject { Q_OBJECT + TQ_OBJECT KComboBox_impl *impl; public: ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co); @@ -56,7 +57,7 @@ protected: public: KComboBox_impl( KComboBox * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string & newCaption); diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp index e5179f9f..239d303a 100644 --- a/arts/gui/kde/kfader.cpp +++ b/arts/gui/kde/kfader.cpp @@ -5,14 +5,14 @@ void KFader::init() { } -KFader::KFader( TQWidget * parent, const char * name ) - : TQSlider( Qt::Vertical, parent, name ) +KFader::KFader( TQWidget * tqparent, const char * name ) + : TQSlider( Qt::Vertical, tqparent, name ) { init(); } -KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent, const char * name ) - : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name ) +KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent, const char * name ) + : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, tqparent, name ) { init(); } diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h index 603ad7cd..33df0d40 100644 --- a/arts/gui/kde/kfader.h +++ b/arts/gui/kde/kfader.h @@ -25,14 +25,15 @@ #include -class KFader : public QSlider +class KFader : public TQSlider { Q_OBJECT + TQ_OBJECT protected: void init(); public: - KFader( TQWidget * parent = 0, const char * name = 0 ); - KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = 0, const char * name = 0 ); + KFader( TQWidget * tqparent = 0, const char * name = 0 ); + KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent = 0, const char * name = 0 ); virtual ~KFader(); diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h index 0d1b81ed..e15695f0 100644 --- a/arts/gui/kde/kfader_impl.h +++ b/arts/gui/kde/kfader_impl.h @@ -37,6 +37,7 @@ class KFader_impl; class FaderIntMapper :public TQObject { Q_OBJECT + TQ_OBJECT KFader_impl *impl; public: FaderIntMapper(KFader_impl *impl, KFader *kp); @@ -62,7 +63,7 @@ protected: public: KFader_impl( KFader * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string& newText); diff --git a/arts/gui/kde/kframe_impl.cpp b/arts/gui/kde/kframe_impl.cpp index d95da549..478d8ec4 100644 --- a/arts/gui/kde/kframe_impl.cpp +++ b/arts/gui/kde/kframe_impl.cpp @@ -73,12 +73,12 @@ void KFrame_impl::framestyle( long fs ) _qframe->setFrameStyle( fs ); } -Shape KFrame_impl::frameshape() +Shape KFrame_impl::frametqshape() { return ( Shape )_qframe->frameShape(); } -void KFrame_impl::frameshape( Shape fs ) +void KFrame_impl::frametqshape( Shape fs ) { _qframe->setFrameShape( ( TQFrame::Shape )fs ); } diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h index febc0057..ae2e79a4 100644 --- a/arts/gui/kde/kframe_impl.h +++ b/arts/gui/kde/kframe_impl.h @@ -34,7 +34,7 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, public: KFrame_impl( TQFrame * widget = 0 ); - inline void constructor( Widget p ) { parent( p ); } + inline void constructor( Widget p ) { tqparent( p ); } long margin(); void margin( long m ); @@ -44,8 +44,8 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, void midlinewidth( long mlw ); long framestyle(); void framestyle( long fs ); - Shape frameshape(); - void frameshape( Shape fs ); + Shape frametqshape(); + void frametqshape( Shape fs ); Shadow frameshadow(); void frameshadow( Shadow fs ); }; //class diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp index 21d3d8cf..96d18c5c 100644 --- a/arts/gui/kde/kgraph.cpp +++ b/arts/gui/kde/kgraph.cpp @@ -31,8 +31,8 @@ using namespace Arts; using namespace std; -KGraph::KGraph( TQWidget * parent, const char * name ) - : TQWidget( parent, name ) +KGraph::KGraph( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ) { setBackgroundColor(white); @@ -52,7 +52,7 @@ void KGraph::addLine(Arts::KGraphLine_impl *line) void KGraph::redrawLine(Arts::KGraphLine_impl * /*line*/) { - repaint(); + tqrepaint(); } void KGraph::removeLine(Arts::KGraphLine_impl *line) @@ -111,7 +111,7 @@ void KGraph::paintEvent( TQPaintEvent *e ) void KGraph::mousePressEvent(TQMouseEvent *e) { - if(e->button() == LeftButton || e->button() == RightButton) + if(e->button() == Qt::LeftButton || e->button() == Qt::RightButton) { std::list::iterator li; for(li = lines.begin(); li != lines.end(); li++) @@ -140,7 +140,7 @@ void KGraph::mousePressEvent(TQMouseEvent *e) if(selectedIndex >= 0) { // erase point - if(e->button() == RightButton) + if(e->button() == Qt::RightButton) { if(selectedIndex != 0 && selectedIndex != (( int )( selectedLine->_points.size() )-1)) { @@ -159,7 +159,7 @@ void KGraph::mousePressEvent(TQMouseEvent *e) selectedIndex = -1; } } - else if(e->button() == LeftButton) + else if(e->button() == Qt::LeftButton) { // try to insert a point std::list::iterator li; diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h index 83c1aa7c..e9f772ff 100644 --- a/arts/gui/kde/kgraph.h +++ b/arts/gui/kde/kgraph.h @@ -31,9 +31,10 @@ namespace Arts { class KGraphLine_impl; -class KGraph : public QWidget +class KGraph : public TQWidget { Q_OBJECT + TQ_OBJECT protected: std::list lines; @@ -46,7 +47,7 @@ protected: inline GraphPoint q2gPoint(const TQPoint &qp); inline TQPoint g2qPoint(const GraphPoint &gp); public: - KGraph( TQWidget * parent = 0, const char * name = 0 ); + KGraph( TQWidget * tqparent = 0, const char * name = 0 ); virtual ~KGraph(); void addLine(Arts::KGraphLine_impl *line); diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h index 408ad961..2a603208 100644 --- a/arts/gui/kde/kgraph_impl.h +++ b/arts/gui/kde/kgraph_impl.h @@ -44,7 +44,7 @@ protected: public: KGraph_impl( KGraph * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string& newCaption); diff --git a/arts/gui/kde/kgraphline_impl.cpp b/arts/gui/kde/kgraphline_impl.cpp index ccb6ed1f..9fcd4507 100644 --- a/arts/gui/kde/kgraphline_impl.cpp +++ b/arts/gui/kde/kgraphline_impl.cpp @@ -112,7 +112,7 @@ void KGraphLine_impl::points(const vector& newPoints) KGraph *KGraphLine_impl::getKGraph() { - TQWidget *widget = KWidgetRepo::the()->lookupQWidget(_graphID); + TQWidget *widget = KWidgetRepo::the()->lookupTQWidget(_graphID); if(!widget) return 0; diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp index dd0a9557..e6a008c4 100644 --- a/arts/gui/kde/klabel_impl.cpp +++ b/arts/gui/kde/klabel_impl.cpp @@ -92,13 +92,13 @@ void RotateLabel::title( TQString n ) { void RotateLabel::align( long n ) { _align=n; - repaint(); + tqrepaint(); } void RotateLabel::bottom( Arts::TextBottom bottom ) { _bottom = bottom; title( _title ); - repaint(); + tqrepaint(); } // vim: sw=4 ts=4 diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h index 7822e960..8b78bedc 100644 --- a/arts/gui/kde/klabel_impl.h +++ b/arts/gui/kde/klabel_impl.h @@ -42,7 +42,7 @@ protected: RotateLabel* _label; public: KLabel_impl( TQFrame* w=0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string text(); void text( const std::string& newtext ); @@ -65,6 +65,7 @@ public: class RotateLabel : public TQFrame { Q_OBJECT + TQ_OBJECT public: RotateLabel( TQWidget*, const char* =0 ); void paintEvent( TQPaintEvent* ); diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 847e803a..e94ed1ec 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -40,16 +40,16 @@ KLayoutBox_impl::~KLayoutBox_impl() { } void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) { - widget.parent( self() ); - this->_addChild( widget, "layoutbox_item" ); - TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); + widget.tqparent( self() ); + this->_addChild( widget, "tqlayoutbox_item" ); + TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); _layout->addWidget( tmp, stretch, align ); } void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) { - widget.parent( self() ); - this->_addChild( widget, "layoutbox_item" ); - TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); + widget.tqparent( self() ); + this->_addChild( widget, "tqlayoutbox_item" ); + TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); _layout->insertWidget( index, tmp, stretch, align ); } @@ -66,8 +66,8 @@ void KLayoutBox_impl::addLine( long width, long space, long stretch, long align long KLayoutBox_impl::spacing() { return _layout->spacing(); } void KLayoutBox_impl::spacing( long n ) { _layout->setSpacing( n ); } -long KLayoutBox_impl::layoutmargin() { return _layout->margin(); } -void KLayoutBox_impl::layoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); } +long KLayoutBox_impl::tqlayoutmargin() { return _layout->margin(); } +void KLayoutBox_impl::tqlayoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); } Direction KLayoutBox_impl::direction() { return Arts::Direction( _layout->direction() ); } void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( TQBoxLayout::Direction( d ) ); } @@ -85,11 +85,11 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if ( width() < height() ) flags |= TQStyle::Style_Horizontal; - style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), flags ); } -TQSize KLayoutBox_Separator::minimumSizeHint() const { - int wh = style().pixelMetric( TQStyle::PM_SplitterWidth, this ); +TQSize KLayoutBox_Separator::tqminimumSizeHint() const { + int wh = tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this ); return TQSize( wh, wh ); } @@ -105,12 +105,12 @@ KLayoutBox_Line::KLayoutBox_Line( int width, int space, TQWidget* p, const char* void KLayoutBox_Line::paintEvent( TQPaintEvent* ) { //kdDebug() << k_funcinfo << size() << endl; TQPainter p( this ); - p.setPen( TQPen( colorGroup().foreground(), _width ) ); + p.setPen( TQPen( tqcolorGroup().foreground(), _width ) ); if ( width() > height() ) p.drawLine( 0, height()/2, width(), height()/2 ); else p.drawLine( width()/2, 0, width()/2, height() ); } -TQSize KLayoutBox_Line::minimumSizeHint() const { +TQSize KLayoutBox_Line::tqminimumSizeHint() const { //kdDebug() << k_funcinfo << size() << endl; int wh = _width + 2* _space; return TQSize( wh, wh ); diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index bb5302ea..a8272fe3 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -72,29 +72,31 @@ public: long spacing(); void spacing( long ); - long layoutmargin(); - void layoutmargin( long ); + long tqlayoutmargin(); + void tqlayoutmargin( long ); }; // class } // namespace class KDE_EXPORT KLayoutBox_Separator : public TQWidget { Q_OBJECT + TQ_OBJECT public: KLayoutBox_Separator( TQWidget*, const char* =0 ); void resizeEvent( TQResizeEvent* ); void paintEvent( TQPaintEvent* ); - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; }; class KLayoutBox_Line : public TQWidget { Q_OBJECT + TQ_OBJECT private: int _width, _space; public: KLayoutBox_Line( int, int, TQWidget*, const char* =0 ); void paintEvent( TQPaintEvent* ); - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; }; #endif diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp index 9a78804c..ffb99c3e 100644 --- a/arts/gui/kde/klevelmeter_firebars.cpp +++ b/arts/gui/kde/klevelmeter_firebars.cpp @@ -59,8 +59,8 @@ kdDebug() << k_funcinfo << dir << endl; p.end(); } -KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<setMinimumSize( 5, 5 ); _bar = new KLevelMeter_FireBars_private( this, 0 ); _peakwidget = new TQWidget( this ); @@ -91,7 +91,7 @@ void KLevelMeter_FireBars::invalue( float n, float p ) { _bar->setGeometry( int( this->width()-_value*this->width() ), 0, this->width(), this->height() ); break; } - repaint(); + tqrepaint(); } void KLevelMeter_FireBars::paintEvent( TQPaintEvent* ) { diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h index da740961..4313004e 100644 --- a/arts/gui/kde/klevelmeter_firebars.h +++ b/arts/gui/kde/klevelmeter_firebars.h @@ -28,6 +28,7 @@ class KLevelMeter_FireBars; class KLevelMeter_FireBars_private : public TQWidget { Q_OBJECT + TQ_OBJECT public: KLevelMeter_FireBars_private( KLevelMeter_FireBars*, const char* ); void paintEvent( TQPaintEvent* ); @@ -40,6 +41,7 @@ private: class KLevelMeter_FireBars : public KLevelMeter_Template { Q_OBJECT + TQ_OBJECT public: KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp index 418108ad..b6845dc4 100644 --- a/arts/gui/kde/klevelmeter_impl.cpp +++ b/arts/gui/kde/klevelmeter_impl.cpp @@ -41,8 +41,8 @@ using namespace Arts; using namespace std; -KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* parent, const char* name ) - : TQObject( parent, name ) +KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) , _impl( impl ) , _frame( frame ) , _levelmeter( 0 ) diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index 6d63a18c..5d8b4b3c 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -24,21 +24,21 @@ #include #include -KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) +KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) , _value( 0.0 ) , _peak( 0.0 ) { -//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<setMinimumSize( 5, 5 ); this->substyle( substyle ); - _stdcolors = colorGroup(); - setBackgroundMode( Qt::NoBackground ); + _stdcolors = tqcolorGroup(); + setBackgroundMode( TQt::NoBackground ); } void KLevelMeter_LineBars::invalue( float n, float p ) { _value = amptondb( n ); _peak = amptondb( p ); - repaint(); + tqrepaint(); } void KLevelMeter_LineBars::substyle( long n ) { @@ -73,7 +73,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) { else p.setBrush( ( _peak<1 )?color( _value ):TQColor( 255,0,0 ) ); - TQColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : _stdcolors.background(); + TQColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : TQColor(_stdcolors.background()); pm.fill( bgcolor ); p.setPen( NoPen ); @@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) { p.drawLine( 0, top, w, top ); } - bitBlt( this, 0, 0, &pm, 0, 0, pm.width(), pm.height(), CopyROP, true ); + bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true ); } /** diff --git a/arts/gui/kde/klevelmeter_linebars.h b/arts/gui/kde/klevelmeter_linebars.h index cf0c4217..996b2c68 100644 --- a/arts/gui/kde/klevelmeter_linebars.h +++ b/arts/gui/kde/klevelmeter_linebars.h @@ -25,6 +25,7 @@ class KLevelMeter_LineBars : public KLevelMeter_Template { Q_OBJECT + TQ_OBJECT public: KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp index 29593551..9263737a 100644 --- a/arts/gui/kde/klevelmeter_normalbars.cpp +++ b/arts/gui/kde/klevelmeter_normalbars.cpp @@ -24,8 +24,8 @@ #include #include -KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "< #include -KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<direction(); } void KPopupBox_impl::direction( Direction n ) { _widget->direction( n ); } void KPopupBox_impl::widget( Arts::Widget widget ) { - widget.parent( self() ); + widget.tqparent( self() ); this->_addChild( widget, "PopupBox_child" ); _widget->setWidget( widget ); } @@ -54,14 +54,14 @@ void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widg // Following the private class: -KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name ) +KPopupBox_widget::KPopupBox_widget( TQWidget *tqparent, const char* name ) : TQFrame( tqparent,name ) { this->setFrameShape( TQFrame::Box ); this->setMargin( 1 ); this->setLineWidth( 1 ); _titlebar = new TQFrame( this ); - _titlebarlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop ); - _titlebarlayout->setAutoAdd( true ); + _titlebartqlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop ); + _titlebartqlayout->setAutoAdd( true ); _showbutton = new ShowButton( _titlebar ); connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) ); @@ -90,13 +90,13 @@ void KPopupBox_widget::direction( Arts::Direction n ) { switch( n ) { case LeftToRight: case RightToLeft: - _titlebarlayout->setDirection( TQBoxLayout::BottomToTop ); + _titlebartqlayout->setDirection( TQBoxLayout::BottomToTop ); _drag->setMinimumHeight( 30 ); _drag->setMinimumWidth( 0 ); break; case TopToBottom: case BottomToTop: - _titlebarlayout->setDirection( TQBoxLayout::RightToLeft ); + _titlebartqlayout->setDirection( TQBoxLayout::RightToLeft ); _drag->setMinimumHeight( 0 ); _drag->setMinimumWidth( 30 ); } diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h index 8fb25bea..06a58ebc 100644 --- a/arts/gui/kde/kpopupbox_private.h +++ b/arts/gui/kde/kpopupbox_private.h @@ -32,9 +32,10 @@ class TQBoxLayout; #include -class KPopupBox_widget : public QFrame +class KPopupBox_widget : public TQFrame { Q_OBJECT + TQ_OBJECT public: KPopupBox_widget( TQWidget* =0, const char* =0); ~KPopupBox_widget(); @@ -53,7 +54,7 @@ private: TQBoxLayout *_layout; TQFrame *_titlebar; - TQBoxLayout *_titlebarlayout; + TQBoxLayout *_titlebartqlayout; HandleDrag *_drag; ShowButton *_showbutton; OwnButton *_ownbutton; @@ -65,6 +66,7 @@ private: /*class KPopupBoxEventMapper : public TQObject { Q_OBJECT + TQ_OBJECT public: KPopupBoxEventMapper( KPopupBox_widget *widget, Arts::KPopupBox_impl *impl ) : TQObject( widget,"" ), _widget( widget ), _impl( impl ) @@ -79,13 +81,14 @@ private: class HandleDrag : public TQWidget { Q_OBJECT + TQ_OBJECT public: - HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {} + HandleDrag( TQWidget *tqparent, const char* name=0 ) : TQWidget( tqparent,name ) {} void paintEvent( TQPaintEvent * ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if( width() < height() ) flags |= TQStyle::Style_Horizontal; - style().drawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), tqcolorGroup(), flags ); } signals: void clicked(); @@ -108,11 +111,12 @@ static const char* const own_xpm[] = { "5 5 2 1", "# c black", ". c None", "# class ShowButton : public TQPushButton { Q_OBJECT + TQ_OBJECT private: TQBoxLayout::Direction _dir; TQPixmap _pmleft, _pmright, _pmup, _pmdown; public: - ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) + ShowButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name ), _dir( TQBoxLayout::LeftToRight ) { connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) ); setToggleButton( true ); @@ -147,27 +151,28 @@ public slots: } } public: - TQSize minimumSizeHint() const { - int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + TQSize tqminimumSizeHint() const { + int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize minimumSize() const { return minimumSizeHint(); } - TQSize sizeHint() const { return minimumSize(); } + TQSize tqminimumSize() const { return tqminimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSize(); } void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; class OwnButton : public TQPushButton { Q_OBJECT + TQ_OBJECT private: TQPixmap _pmown, _pminside; public: - OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ) + OwnButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name ) { connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) ); setToggleButton( true ); @@ -182,17 +187,17 @@ public slots: else setPixmap( _pmown ); } public: - TQSize minimumSizeHint() const { - int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + TQSize tqminimumSizeHint() const { + int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize minimumSize() const { return minimumSizeHint(); } - TQSize sizeHint() const { return minimumSize(); } + TQSize tqminimumSize() const { return tqminimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSize(); } void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; @@ -202,6 +207,7 @@ public: class OwnWidget : public KArtsWidget { Q_OBJECT + TQ_OBJECT ShowButton *_b; public: OwnWidget( ShowButton* b, TQWidget* p, const char* n=0, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; } diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index 462d640b..dd4e484b 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -53,28 +53,28 @@ struct KPoti::KPotiPrivate bool bgDirty; KPixmap bgdb; - KPixmap bgPixmap( const TQColorGroup & colorGroup ) + KPixmap bgPixmap( const TQColorGroup & tqcolorGroup ) { if( bgDirty || bgdb.isNull() ) { bgdb.resize( buttonRect.size() ); TQPainter dbp( &bgdb ); - dbp.setPen( Qt::NoPen ); + dbp.setPen( TQt::NoPen ); TQRect drawRect = bgdb.rect(); - // create mask - TQBitmap mask( bgdb.size(), true ); - TQPainter maskpainter( &mask ); - maskpainter.setPen( Qt::NoPen ); - maskpainter.setBrush( Qt::color1 ); - maskpainter.drawEllipse( drawRect ); - maskpainter.end(); - bgdb.setMask( mask ); + // create tqmask + TQBitmap tqmask( bgdb.size(), true ); + TQPainter tqmaskpainter( &tqmask ); + tqmaskpainter.setPen( TQt::NoPen ); + tqmaskpainter.setBrush( TQt::color1 ); + tqmaskpainter.drawEllipse( drawRect ); + tqmaskpainter.end(); + bgdb.setMask( tqmask ); // inset shadow KPixmap gradient( bgdb.size() ); - KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient ); - dbp.setBrush( TQBrush( colorGroup.button(), gradient ) ); + KPixmapEffect::gradient( gradient, tqcolorGroup.light(), tqcolorGroup.dark(), KPixmapEffect::DiagonalGradient ); + dbp.setBrush( TQBrush( tqcolorGroup.button(), gradient ) ); dbp.drawEllipse( drawRect ); potiRect.setSize( drawRect.size() * 0.9 ); @@ -99,17 +99,17 @@ struct KPoti::KPotiPrivate { potidb.resize( potiRect.size() ); TQPainter dbp( &potidb ); - dbp.setPen( Qt::NoPen ); + dbp.setPen( TQt::NoPen ); TQRect drawRect( potidb.rect() ); - // create mask - TQBitmap mask( potidb.size(), true ); - TQPainter maskpainter( &mask ); - maskpainter.setPen( Qt::NoPen ); - maskpainter.setBrush( Qt::color1 ); - maskpainter.drawEllipse( drawRect ); - maskpainter.end(); - potidb.setMask( mask ); + // create tqmask + TQBitmap tqmask( potidb.size(), true ); + TQPainter tqmaskpainter( &tqmask ); + tqmaskpainter.setPen( TQt::NoPen ); + tqmaskpainter.setBrush( TQt::color1 ); + tqmaskpainter.drawEllipse( drawRect ); + tqmaskpainter.end(); + potidb.setMask( tqmask ); KPixmap gradient( potidb.size() ); KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient ); @@ -133,12 +133,12 @@ TQSizePolicy KPoti::sizePolicy() const return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); } -TQSize KPoti::sizeHint() const +TQSize KPoti::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -TQSize KPoti::minimumSizeHint() const +TQSize KPoti::tqminimumSizeHint() const { int width = 40; int height = 40; @@ -162,17 +162,17 @@ TQString KPoti::text() const void KPoti::setText( const TQString & text ) { d->label = text; - setMinimumSize( minimumSizeHint() ); + setMinimumSize( tqminimumSizeHint() ); updateGeometry(); } /** Constructs a poti. - The \e parent and \e name arguments are sent to the TQWidget constructor. + The \e tqparent and \e name arguments are sent to the TQWidget constructor. */ -KPoti::KPoti( TQWidget *parent, const char *name ) - : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) +KPoti::KPoti( TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase ) , d( 0 ) { init(); @@ -188,12 +188,12 @@ KPoti::KPoti( TQWidget *parent, const char *name ) \arg \e step is the page step value. \arg \e value is the initial value. - The \e parent and \e name arguments are sent to the TQWidget constructor. + The \e tqparent and \e name arguments are sent to the TQWidget constructor. */ KPoti::KPoti( int minValue, int maxValue, int step, - int value, TQWidget *parent, const char *name ) - : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) + int value, TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase ) , TQRangeControl( minValue, maxValue, 1, step, value ) , d( 0 ) { @@ -209,7 +209,7 @@ KPoti::~KPoti() void KPoti::init(int value) { d = new KPotiPrivate; - font().setPointSize( 8 ); + const_cast(font()).setPointSize( 8 ); d->potiColor.setNamedColor( "red" ); timer = 0; @@ -222,7 +222,7 @@ void KPoti::init(int value) m_bLabel = true; tickInt = 0; - setFocusPolicy( TabFocus ); + setFocusPolicy( TQ_TabFocus ); initTicks(); } @@ -391,7 +391,7 @@ void KPoti::setColor( const TQColor &c ) { d->potiColor = c; d->potiDirty = true; - repaint(); + tqrepaint(); } @@ -407,8 +407,8 @@ void KPoti::paintPoti( TQPainter * p ) p2.translate( db.rect().center().x(), db.rect().center().y() ); p2.rotate( potiPos * 180.0 / PI ); TQRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 ); - TQBrush buttonbrush( colorGroup().button() ); - qDrawShadePanel( &p2, pointer, colorGroup(), true, 1, &buttonbrush ); + TQBrush buttonbrush( tqcolorGroup().button() ); + qDrawShadePanel( &p2, pointer, tqcolorGroup(), true, 1, &buttonbrush ); p2.end(); p->drawPixmap( d->potiRect, db ); @@ -439,7 +439,7 @@ void KPoti::reallyMovePoti( float newPos ) void KPoti::drawContents( TQPainter * p ) { TQPixmap doublebuffer( contentsRect().size() ); - doublebuffer.fill( colorGroup().background() ); + doublebuffer.fill( tqcolorGroup().background() ); TQPainter dbp( &doublebuffer ); if( m_bLabel ) { @@ -454,10 +454,10 @@ void KPoti::drawContents( TQPainter * p ) if( ticks ) drawTicks( &dbp, buttonRadius, tickLength, interval ); - dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); + dbp.drawPixmap( d->buttonRect, d->bgPixmap( tqcolorGroup() ) ); if( hasFocus() ) - style().drawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, tqcolorGroup() ); paintPoti( &dbp ); dbp.end(); @@ -473,13 +473,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e ) { resetState(); - if ( e->button() == MidButton ) { + if ( e->button() == Qt::MidButton ) { double pos = atan2( double(e->pos().x()-d->center.x()), double(- e->pos().y() + d->center.y()) ); movePoti( pos ); return; } - if ( e->button() != LeftButton ) + if ( e->button() != Qt::LeftButton ) return; @@ -512,13 +512,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e ) void KPoti::mouseMoveEvent( TQMouseEvent *e ) { - if ( (e->state() & MidButton) ) { // middle button wins + if ( (e->state() & Qt::MidButton) ) { // middle button wins double pos = atan2( double(e->pos().x()-d->center.x()), double(- e->pos().y()+d->center.y()) ); movePoti( pos ); return; } - if ( !(e->state() & LeftButton) ) + if ( !(e->state() & Qt::LeftButton) ) return; // left mouse button is up if ( state != Dragging ) return; @@ -534,7 +534,7 @@ void KPoti::mouseMoveEvent( TQMouseEvent *e ) void KPoti::mouseReleaseEvent( TQMouseEvent *e ) { - if ( !(e->button() & LeftButton) ) + if ( !(e->button() & Qt::LeftButton) ) return; resetState(); } @@ -567,7 +567,7 @@ void KPoti::enterEvent( TQEvent * ) void KPoti::movePoti( float pos ) { - float newPos = QMIN( maxAngle, QMAX( -maxAngle, pos ) ); + float newPos = TQMIN( maxAngle, TQMAX( -maxAngle, pos ) ); int newVal = valueFromPosition( newPos ); if ( potiVal != newVal ) { potiVal = newVal; @@ -710,7 +710,7 @@ void KPoti::repeatTimeout() void KPoti::drawTicks( TQPainter *p, double dist, double w, int i ) const { - p->setPen( colorGroup().foreground() ); + p->setPen( tqcolorGroup().foreground() ); double angle,s,c; double x, y; for (int v=0; v<=i; v++) @@ -765,7 +765,7 @@ void KPoti::setTickmarks( bool s ) void KPoti::setTickInterval( int i ) { - tickInt = QMAX( 0, i ); + tickInt = TQMAX( 0, i ); update(); } diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index 2994dd1e..80e32add 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -25,17 +25,18 @@ class TQTimer; -struct QPotiData; +struct TQPotiData; -class KPoti : public TQFrame, public QRangeControl +class KPoti : public TQFrame, public TQRangeControl { Q_OBJECT + TQ_OBJECT public: - KPoti( TQWidget *parent=0, const char *name=0 ); + KPoti( TQWidget *tqparent=0, const char *name=0 ); KPoti( int minValue, int maxValue, int step, int value, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); ~KPoti(); @@ -52,8 +53,8 @@ public: int tickInterval() const { return tickInt; } virtual TQSizePolicy sizePolicy() const; - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; TQString text() const; public slots: @@ -108,7 +109,7 @@ private: int potiRadius() const; void initTicks(); - QTimer *timer; + TQTimer *timer; float potiPos; int potiVal; int clickOffset; diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h index 0502cdc8..92d7a101 100644 --- a/arts/gui/kde/kpoti_impl.h +++ b/arts/gui/kde/kpoti_impl.h @@ -36,6 +36,7 @@ class KPoti_impl; class PotiIntMapper :public TQObject { Q_OBJECT + TQ_OBJECT KPoti_impl *impl; public: PotiIntMapper(KPoti_impl *impl, KPoti *kp); diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h index d200c6f3..714da93f 100644 --- a/arts/gui/kde/kspinbox_impl.h +++ b/arts/gui/kde/kspinbox_impl.h @@ -35,6 +35,7 @@ namespace Arts { class KSpinBox_impl; class SpinBoxIntMapper :public TQObject { Q_OBJECT + TQ_OBJECT KSpinBox_impl *impl; public: SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp); @@ -54,7 +55,7 @@ protected: public: KSpinBox_impl( TQSpinBox * w = 0 ); - void constructor( Widget p ) { parent( p ); } + void constructor( Widget p ) { tqparent( p ); } std::string caption(); void caption(const std::string& newCaption); diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp index 1a95c2a6..4988ad7b 100644 --- a/arts/gui/kde/ktickmarks_impl.cpp +++ b/arts/gui/kde/ktickmarks_impl.cpp @@ -75,8 +75,8 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { int _minsize; // Shorcuts int w,h; - TQColor colornormal = colorGroup().foreground(); - TQColor colordiff = colorGroup().buttonText(); + TQColor colornormal = tqcolorGroup().foreground(); + TQColor colordiff = tqcolorGroup().buttonText(); if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) { p->translate( contentsRect().left(), contentsRect().bottom() ); @@ -111,7 +111,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { p->drawText( ( w - (left)*6 - (right)*6 - fontrect.width() )/2 + (left)*6 , h-fontrect.height()/2, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); + TQt::AlignRight|TQt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w-6, h, w, h ); } for ( float i=_minstep; i<=dbmax; i+=_minstep ) { @@ -121,7 +121,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { p->drawText( ( w - (left)*6 - (right)*6 - fontrect.width() )/2 + (left)*6 , h-fontrect.height()/2, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); + TQt::AlignRight|TQt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w-6, h, w, h ); } } else { @@ -157,7 +157,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { p->drawText( w - fontrect.width()/2 , ( h - (left)*6 - (right)*6 - fontrect.height() )/2 + (left)*6, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); + TQt::AlignRight|TQt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w, h-6, w, h ); } for ( float i=_minstep; i<=dbmax; i+=_minstep ) { @@ -167,7 +167,7 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { p->drawText( w - fontrect.width()/2 , ( h - (left)*6 - (right)*6 - fontrect.height() )/2 + (left)*6, fontrect.width(), fontrect.height()+2, - Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); + TQt::AlignRight|TQt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w, h-6, w, h ); } } diff --git a/arts/gui/kde/ktickmarks_impl.h b/arts/gui/kde/ktickmarks_impl.h index 1d0006a1..a54baf5a 100644 --- a/arts/gui/kde/ktickmarks_impl.h +++ b/arts/gui/kde/ktickmarks_impl.h @@ -61,6 +61,7 @@ private: class KTickmarks_Widget : public TQFrame, public dB2VolCalc { Q_OBJECT + TQ_OBJECT private: KTickmarks_impl* _impl; public: diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 1c32f23d..fca3466e 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -121,7 +121,7 @@ KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n ) , _value( -1 ) , _dir( Arts::BottomToTop ) , _menu( new KPopupMenu( this ) ) - , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), this, TQT_SLOT( exactValue() ), this ) ) + , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) ) { //kdDebug() << k_funcinfo << endl; setMinimumSize( 10,10 ); @@ -159,10 +159,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::BottomToTop ) h = contentsRect().height() * ( 1 - _value ); else h = contentsRect().height() * _value; for ( int i=int( h ); isetPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( i )/contentsRect().height() ) ); + p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( i )/contentsRect().height() ) ); p->drawLine( contentsRect().left(), this->frameWidth() + i, contentsRect().right(), this->frameWidth() + i ); } - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->drawLine( contentsRect().left(), this->frameWidth() + int( h ), contentsRect().right(), this->frameWidth() + int( h ) ); } else { float w; @@ -170,10 +170,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::LeftToRight ) w = - contentsRect().width() * ( 1 - _value ); else w = - contentsRect().width() * _value; for ( int i=int( w ); i>=-contentsRect().width(); i-- ) { - p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( -i )/contentsRect().width() ) ); + p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( -i )/contentsRect().width() ) ); p->drawLine( this->frameWidth() + i, contentsRect().top(), this->frameWidth() + i, contentsRect().bottom() ); } - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->drawLine( this->frameWidth() + int( w ), contentsRect().top(), this->frameWidth() + int( w ), contentsRect().bottom() ); } } diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h index c2db6a0b..354c483a 100644 --- a/arts/gui/kde/kvolumefader_impl.h +++ b/arts/gui/kde/kvolumefader_impl.h @@ -69,6 +69,7 @@ class KAction; class KVolumeFader_Widget : public TQFrame { Q_OBJECT + TQ_OBJECT private: KVolumeFader_impl* _impl; bool _inupdate; diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index ede8ad38..b899f0cd 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -34,7 +34,7 @@ KWidget_impl::KWidget_impl( TQWidget * widget ) _widgetID = KWidgetRepo::the()->add( this, _qwidget ); /* - * KWidgetGuard will protect us against deleting the widget if Qt already + * KWidgetGuard will protect us against deleting the widget if TQt already * has done so (for instance if our widget was inside a panel, and * the panel got deleted, our widget will be gone, too) */ @@ -65,24 +65,24 @@ long KWidget_impl::widgetID() return _widgetID; } -Widget KWidget_impl::parent() +Widget KWidget_impl::tqparent() { return KWidgetRepo::the()->lookupWidget(_parentID); } -void KWidget_impl::parent(Arts::Widget newParent) +void KWidget_impl::tqparent(Arts::Widget newParent) { if(!newParent.isNull()) { _parentID = newParent.widgetID(); - TQWidget *qparent; - qparent = KWidgetRepo::the()->lookupQWidget(newParent.widgetID()); - if( qparent != 0 ) + TQWidget *qtqparent; + qtqparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID()); + if( qtqparent != 0 ) { TQPoint pos(x(),y()); bool showIt = visible(); - _qwidget->reparent(qparent, pos, showIt); + _qwidget->reparent(qtqparent, pos, showIt); } } else @@ -143,26 +143,26 @@ void KWidget_impl::visible(bool newVisible) SizePolicy KWidget_impl::hSizePolicy() { - return ( SizePolicy )_qwidget->sizePolicy().horData(); + return ( SizePolicy )_qwidget->tqsizePolicy().horData(); } void KWidget_impl::hSizePolicy( SizePolicy p ) { - TQSizePolicy sp = _qwidget->sizePolicy(); + TQSizePolicy sp = _qwidget->tqsizePolicy(); sp.setHorData( ( TQSizePolicy::SizeType )p ); - _qwidget->setSizePolicy( sp ); + _qwidget->tqsetSizePolicy( sp ); } SizePolicy KWidget_impl::vSizePolicy() { - return ( SizePolicy )_qwidget->sizePolicy().verData(); + return ( SizePolicy )_qwidget->tqsizePolicy().verData(); } void KWidget_impl::vSizePolicy( SizePolicy p ) { - TQSizePolicy sp = _qwidget->sizePolicy(); + TQSizePolicy sp = _qwidget->tqsizePolicy(); sp.setVerData( ( TQSizePolicy::SizeType )p ); - _qwidget->setSizePolicy( sp ); + _qwidget->tqsetSizePolicy( sp ); } void KWidget_impl::show() diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h index 292f8cc8..40d7216c 100644 --- a/arts/gui/kde/kwidget_impl.h +++ b/arts/gui/kde/kwidget_impl.h @@ -43,8 +43,8 @@ public: ~KWidget_impl(); long widgetID(); - Widget parent(); - void parent(Arts::Widget); + Widget tqparent(); + void tqparent(Arts::Widget); long x(); void x(long newX); long y(); @@ -70,6 +70,7 @@ public: class KWidgetGuard : public TQObject { Q_OBJECT + TQ_OBJECT protected: KWidget_impl *impl; diff --git a/arts/gui/kde/kwidgetrepo.cpp b/arts/gui/kde/kwidgetrepo.cpp index 120f9cc5..9c7a99de 100644 --- a/arts/gui/kde/kwidgetrepo.cpp +++ b/arts/gui/kde/kwidgetrepo.cpp @@ -71,7 +71,7 @@ long KWidgetRepo::add(KWidget_impl *widget, TQWidget *qwidget) return ID; } -TQWidget *KWidgetRepo::lookupQWidget(long ID) +TQWidget *KWidgetRepo::lookupTQWidget(long ID) { return qwidgets[ID]; } diff --git a/arts/gui/kde/kwidgetrepo.h b/arts/gui/kde/kwidgetrepo.h index 1bcb5870..bfc9206d 100644 --- a/arts/gui/kde/kwidgetrepo.h +++ b/arts/gui/kde/kwidgetrepo.h @@ -46,7 +46,7 @@ public: long add(Arts::KWidget_impl *widget, TQWidget *qwidget); Arts::Widget lookupWidget(long ID); - TQWidget *lookupQWidget(long ID); + TQWidget *lookupTQWidget(long ID); void remove(long ID); static KWidgetRepo *the(); -- cgit v1.2.1