diff options
Diffstat (limited to 'arts/gui')
39 files changed, 76 insertions, 76 deletions
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp index e1933b17..57a03730 100644 --- a/arts/gui/kde/dbtest.cpp +++ b/arts/gui/kde/dbtest.cpp @@ -12,7 +12,7 @@ dBTestWidget::dBTestWidget( TQWidget* p, const char* n ) : TQWidget( p,n ), dB2VolCalc( -24,6 ) { kdDebug() << k_funcinfo << endl; - ( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new TDEActionCollection( this ) ); + ( void* ) KStdAction::quit( this, TQ_SLOT( close() ), new TDEActionCollection( this ) ); for ( float i=0; i<=1; i+=0.25 ) kdDebug() << i << " : " << amptodb( i ) << "dB" <<endl; diff --git a/arts/gui/kde/dbtest.h b/arts/gui/kde/dbtest.h index b78facd9..041cdff2 100644 --- a/arts/gui/kde/dbtest.h +++ b/arts/gui/kde/dbtest.h @@ -7,7 +7,7 @@ #include "dbvolcalc.h" class dBTestWidget : public TQWidget, public dB2VolCalc { - Q_OBJECT + TQ_OBJECT public: dBTestWidget( TQWidget*, const char* =0 ); diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index d33efa15..43cb0b95 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -46,7 +46,7 @@ class KArtsWidgetPrivate; * The KArtsWidget class keeps a reference to the content widget, so the * content widget will not be freed until the KArtsWidget gets destroyed. */ -class KDE_EXPORT KArtsWidget : public TQWidget { +class TDE_EXPORT KArtsWidget : public TQWidget { private: KArtsWidgetPrivate *d; diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp index 752761b2..dfe4678f 100644 --- a/arts/gui/kde/kbutton_impl.cpp +++ b/arts/gui/kde/kbutton_impl.cpp @@ -33,10 +33,10 @@ KButtonMapper::KButtonMapper( KButton_impl *_impl, TQPushButton *but ) , impl( _impl ) , button( but ) { - connect( but, TQT_SIGNAL( pressed() ), this, TQT_SLOT( pressed() ) ); - connect( but, TQT_SIGNAL( released() ), this, TQT_SLOT( released() ) ); - connect( but, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggled( bool ) ) ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); + connect( but, TQ_SIGNAL( pressed() ), this, TQ_SLOT( pressed() ) ); + connect( but, TQ_SIGNAL( released() ), this, TQ_SLOT( released() ) ); + connect( but, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggled( bool ) ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); } void KButtonMapper::pressed() diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h index 17bad4d2..22c4cf81 100644 --- a/arts/gui/kde/kbutton_impl.h +++ b/arts/gui/kde/kbutton_impl.h @@ -31,7 +31,7 @@ namespace Arts { class KButton_impl; class KButtonMapper : public TQObject { - Q_OBJECT + TQ_OBJECT KButton_impl *impl; TQPushButton * button; diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp index 1bbc36c7..fced3445 100644 --- a/arts/gui/kde/kcombobox_impl.cpp +++ b/arts/gui/kde/kcombobox_impl.cpp @@ -34,7 +34,7 @@ ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co) : TQObject( co, "map TQt signal to aRts" ) ,impl(impl) { - connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &))); + connect(co, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(activated(const TQString &))); } void ComboBoxIntMapper::activated(const TQString & newValue) diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h index 71f76123..e1b533ad 100644 --- a/arts/gui/kde/kcombobox_impl.h +++ b/arts/gui/kde/kcombobox_impl.h @@ -35,7 +35,7 @@ namespace Arts { class KComboBox_impl; class ComboBoxIntMapper :public TQObject { - Q_OBJECT + TQ_OBJECT KComboBox_impl *impl; public: diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp index e5179f9f..499d509c 100644 --- a/arts/gui/kde/kfader.cpp +++ b/arts/gui/kde/kfader.cpp @@ -6,13 +6,13 @@ void KFader::init() } KFader::KFader( TQWidget * parent, const char * name ) - : TQSlider( Qt::Vertical, parent, name ) + : TQSlider( TQt::Vertical, parent, 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 ) + : TQSlider( minValue, maxValue, pageStep, value, TQt::Vertical, parent, name ) { init(); } diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h index 886f289a..84e4d371 100644 --- a/arts/gui/kde/kfader.h +++ b/arts/gui/kde/kfader.h @@ -27,7 +27,7 @@ class KFader : public TQSlider { - Q_OBJECT + TQ_OBJECT protected: void init(); diff --git a/arts/gui/kde/kfader_impl.cpp b/arts/gui/kde/kfader_impl.cpp index cda42179..b667056d 100644 --- a/arts/gui/kde/kfader_impl.cpp +++ b/arts/gui/kde/kfader_impl.cpp @@ -34,7 +34,7 @@ using namespace std; FaderIntMapper::FaderIntMapper(KFader_impl *impl, KFader *kp) :impl(impl) { - connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } void FaderIntMapper::valueChanged(int pos) diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h index 7d227e14..5dd03f2a 100644 --- a/arts/gui/kde/kfader_impl.h +++ b/arts/gui/kde/kfader_impl.h @@ -36,7 +36,7 @@ namespace Arts { class KFader_impl; class FaderIntMapper :public TQObject { - Q_OBJECT + TQ_OBJECT KFader_impl *impl; public: diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h index 60d0be6b..a55d8271 100644 --- a/arts/gui/kde/kframe_impl.h +++ b/arts/gui/kde/kframe_impl.h @@ -26,7 +26,7 @@ class TQFrame; namespace Arts { -class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, +class TDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, public Arts::KWidget_impl { protected: diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp index 2040793e..70f173ec 100644 --- a/arts/gui/kde/kgraph.cpp +++ b/arts/gui/kde/kgraph.cpp @@ -111,7 +111,7 @@ void KGraph::paintEvent( TQPaintEvent *e ) void KGraph::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton || e->button() == Qt::RightButton) + if(e->button() == TQt::LeftButton || e->button() == TQt::RightButton) { std::list<KGraphLine_impl *>::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() == Qt::RightButton) + if(e->button() == TQt::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() == Qt::LeftButton) + else if(e->button() == TQt::LeftButton) { // try to insert a point std::list<KGraphLine_impl *>::iterator li; diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h index 2bb64398..6da8247e 100644 --- a/arts/gui/kde/kgraph.h +++ b/arts/gui/kde/kgraph.h @@ -33,7 +33,7 @@ namespace Arts { class KGraphLine_impl; class KGraph : public TQWidget { -Q_OBJECT +TQ_OBJECT protected: diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h index 3139431d..1b1c0a73 100644 --- a/arts/gui/kde/klabel_impl.h +++ b/arts/gui/kde/klabel_impl.h @@ -35,7 +35,7 @@ class RotateLabel; namespace Arts { -class KDE_EXPORT KLabel_impl : virtual public Arts::Label_skel, +class TDE_EXPORT KLabel_impl : virtual public Arts::Label_skel, public Arts::KFrame_impl { protected: @@ -64,7 +64,7 @@ public: } // namespace class RotateLabel : public TQFrame { - Q_OBJECT + TQ_OBJECT public: RotateLabel( TQWidget*, const char* =0 ); diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index bbd38be0..84a4e202 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -85,7 +85,7 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if ( width() < height() ) flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); + style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); } TQSize KLayoutBox_Separator::minimumSizeHint() const { diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index 287c7583..c42fd146 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -32,7 +32,7 @@ class TQBoxLayout; namespace Arts { -class KDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel, +class TDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel, public Arts::KFrame_impl { protected: @@ -78,8 +78,8 @@ public: } // namespace -class KDE_EXPORT KLayoutBox_Separator : public TQWidget { - Q_OBJECT +class TDE_EXPORT KLayoutBox_Separator : public TQWidget { + TQ_OBJECT public: KLayoutBox_Separator( TQWidget*, const char* =0 ); @@ -89,7 +89,7 @@ public: }; class KLayoutBox_Line : public TQWidget { - Q_OBJECT + TQ_OBJECT private: int _width, _space; diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h index bbabef2f..04ecc3dc 100644 --- a/arts/gui/kde/klevelmeter_firebars.h +++ b/arts/gui/kde/klevelmeter_firebars.h @@ -27,7 +27,7 @@ class TQPixmap; class KLevelMeter_FireBars; class KLevelMeter_FireBars_private : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KLevelMeter_FireBars_private( KLevelMeter_FireBars*, const char* ); @@ -40,7 +40,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_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index e3a15ca2..1f3cd450 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) { p.drawLine( 0, top, w, top ); } - bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true ); + bitBlt( this, 0, 0, &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 89caeb93..3a7def62 100644 --- a/arts/gui/kde/klevelmeter_linebars.h +++ b/arts/gui/kde/klevelmeter_linebars.h @@ -24,7 +24,7 @@ #include "klevelmeter_template.h" 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.h b/arts/gui/kde/klevelmeter_normalbars.h index 7697d502..e0f1eebf 100644 --- a/arts/gui/kde/klevelmeter_normalbars.h +++ b/arts/gui/kde/klevelmeter_normalbars.h @@ -29,7 +29,7 @@ class Bar; class TQBoxLayout; class KLevelMeter_NormalBars : public KLevelMeter_Template { - Q_OBJECT + TQ_OBJECT public: KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); @@ -48,7 +48,7 @@ private: }; class Bar : public TQWidget { - Q_OBJECT + TQ_OBJECT private: float _min, _max; diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h index 531bbdfc..b7662cd7 100644 --- a/arts/gui/kde/klevelmeter_private.h +++ b/arts/gui/kde/klevelmeter_private.h @@ -30,7 +30,7 @@ class TQBoxLayout; class KArtsWidget; class KLevelMeter_Private : public TQObject { - Q_OBJECT + TQ_OBJECT public: Arts::KLevelMeter_impl* _impl; diff --git a/arts/gui/kde/klevelmeter_small.h b/arts/gui/kde/klevelmeter_small.h index ba50a669..2fa67e68 100644 --- a/arts/gui/kde/klevelmeter_small.h +++ b/arts/gui/kde/klevelmeter_small.h @@ -24,7 +24,7 @@ #include "klevelmeter_template.h" class KLevelMeter_Small : public KLevelMeter_Template { - Q_OBJECT + TQ_OBJECT public: KLevelMeter_Small( 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_template.h b/arts/gui/kde/klevelmeter_template.h index abf8c4d2..655e4f75 100644 --- a/arts/gui/kde/klevelmeter_template.h +++ b/arts/gui/kde/klevelmeter_template.h @@ -30,7 +30,7 @@ #include "klevelmeter_impl.h" class KLevelMeter_Template : public TQWidget, public dB2VolCalc { - Q_OBJECT + TQ_OBJECT public: Arts::KLevelMeter_impl* _impl; diff --git a/arts/gui/kde/klineedit_impl.cpp b/arts/gui/kde/klineedit_impl.cpp index 6c3c907b..3054270e 100644 --- a/arts/gui/kde/klineedit_impl.cpp +++ b/arts/gui/kde/klineedit_impl.cpp @@ -29,8 +29,8 @@ using namespace std; KLineEditStringMapper::KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ke) :impl(impl) { - connect(ke, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(textChanged(const TQString&))); + connect(ke, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(textChanged(const TQString&))); } void KLineEditStringMapper::textChanged(const TQString& newText) diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h index bc96569c..7ce88794 100644 --- a/arts/gui/kde/klineedit_impl.h +++ b/arts/gui/kde/klineedit_impl.h @@ -48,7 +48,7 @@ public: }; class KLineEditStringMapper :public TQObject { - Q_OBJECT + TQ_OBJECT KLineEdit_impl *impl; public: diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index 538eb4ac..03bd905d 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -223,7 +223,7 @@ void KPoti::init(int value) m_bLabel = true; tickInt = 0; - setFocusPolicy( TQ_TabFocus ); + setFocusPolicy( TQWidget::TabFocus ); initTicks(); } @@ -458,7 +458,7 @@ void KPoti::drawContents( TQPainter * p ) dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); if( hasFocus() ) - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); paintPoti( &dbp ); dbp.end(); @@ -474,13 +474,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e ) { resetState(); - if ( e->button() == Qt::MidButton ) { + if ( e->button() == TQt::MidButton ) { double pos = atan2( double(e->pos().x()-d->center.x()), double(- e->pos().y() + d->center.y()) ); movePoti( pos ); return; } - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; @@ -495,14 +495,14 @@ void KPoti::mousePressEvent( TQMouseEvent *e ) subtractPage(); if ( !timer ) timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } else { state = TimingUp; addPage(); if ( !timer ) timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } } @@ -513,13 +513,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e ) void KPoti::mouseMoveEvent( TQMouseEvent *e ) { - if ( (e->state() & Qt::MidButton) ) { // middle button wins + if ( (e->state() & TQt::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() & Qt::LeftButton) ) + if ( !(e->state() & TQt::LeftButton) ) return; // left mouse button is up if ( state != Dragging ) return; @@ -535,7 +535,7 @@ void KPoti::mouseMoveEvent( TQMouseEvent *e ) void KPoti::mouseReleaseEvent( TQMouseEvent *e ) { - if ( !(e->button() & Qt::LeftButton) ) + if ( !(e->button() & TQt::LeftButton) ) return; resetState(); } @@ -695,9 +695,9 @@ void KPoti::repeatTimeout() Q_ASSERT( timer ); timer->disconnect(); if ( state == TimingDown ) - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(subtractStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(subtractStep()) ); else if ( state == TimingUp ) - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(addStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(addStep()) ); timer->start( repeatTime, FALSE ); } diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index 25696399..ad7be8f1 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -30,7 +30,7 @@ struct TQPotiData; class KPoti : public TQFrame, public TQRangeControl { - Q_OBJECT + TQ_OBJECT public: diff --git a/arts/gui/kde/kpoti_impl.cpp b/arts/gui/kde/kpoti_impl.cpp index b5d4f043..fbf442f0 100644 --- a/arts/gui/kde/kpoti_impl.cpp +++ b/arts/gui/kde/kpoti_impl.cpp @@ -35,7 +35,7 @@ PotiIntMapper::PotiIntMapper(KPoti_impl *impl, KPoti *kp) : TQObject( kp ) , impl( impl ) { - connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } void PotiIntMapper::valueChanged(int pos) diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h index 7e0ee083..e7d1d75b 100644 --- a/arts/gui/kde/kpoti_impl.h +++ b/arts/gui/kde/kpoti_impl.h @@ -35,7 +35,7 @@ namespace Arts { class KPoti_impl; class PotiIntMapper :public TQObject { - Q_OBJECT + TQ_OBJECT KPoti_impl *impl; public: diff --git a/arts/gui/kde/kspinbox_impl.cpp b/arts/gui/kde/kspinbox_impl.cpp index e352033c..877c080f 100644 --- a/arts/gui/kde/kspinbox_impl.cpp +++ b/arts/gui/kde/kspinbox_impl.cpp @@ -32,7 +32,7 @@ using namespace std; SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp) :impl(impl) { - connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(sp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } void SpinBoxIntMapper::valueChanged(int pos) diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h index df99de21..1369393a 100644 --- a/arts/gui/kde/kspinbox_impl.h +++ b/arts/gui/kde/kspinbox_impl.h @@ -34,7 +34,7 @@ namespace Arts { class KSpinBox_impl; class SpinBoxIntMapper :public TQObject { - Q_OBJECT + TQ_OBJECT KSpinBox_impl *impl; public: diff --git a/arts/gui/kde/ktickmarks_impl.h b/arts/gui/kde/ktickmarks_impl.h index 84478142..498ad9f4 100644 --- a/arts/gui/kde/ktickmarks_impl.h +++ b/arts/gui/kde/ktickmarks_impl.h @@ -60,7 +60,7 @@ private: }; class KTickmarks_Widget : public TQFrame, public dB2VolCalc { - Q_OBJECT + TQ_OBJECT private: KTickmarks_impl* _impl; diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 598485f0..4236e0cd 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 TDEPopupMenu( this ) ) - , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) ) + , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), this, TQ_SLOT( exactValue() ), this ) ) { //kdDebug() << k_funcinfo << endl; setMinimumSize( 10,10 ); @@ -184,8 +184,8 @@ void KVolumeFader_Widget::mousePressEvent( TQMouseEvent* ){ void KVolumeFader_Widget::mouseReleaseEvent( TQMouseEvent* qme ){ bool setValue = false; - if ( TDEGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true; - if ( TDEGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true; + if ( TDEGlobalSettings::mouseSettings().handed == 0 && qme->button() == TQt::LeftButton ) setValue=true; + if ( TDEGlobalSettings::mouseSettings().handed == 1 && qme->button() == TQt::RightButton ) setValue=true; if ( setValue ) { switch ( _dir ) { diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h index e734bc3c..0604497f 100644 --- a/arts/gui/kde/kvolumefader_impl.h +++ b/arts/gui/kde/kvolumefader_impl.h @@ -68,7 +68,7 @@ class TDEPopupMenu; class TDEAction; class KVolumeFader_Widget : public TQFrame { - Q_OBJECT + TQ_OBJECT private: KVolumeFader_impl* _impl; diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index 53ccb8ad..e44a818f 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -39,8 +39,8 @@ KWidget_impl::KWidget_impl( TQWidget * widget ) * the panel got deleted, our widget will be gone, too) */ _guard = new KWidgetGuard(this); - TQObject::connect(_qwidget, TQT_SIGNAL(destroyed()), - _guard, TQT_SLOT(widgetDestroyed())); + TQObject::connect(_qwidget, TQ_SIGNAL(destroyed()), + _guard, TQ_SLOT(widgetDestroyed())); } KWidget_impl::~KWidget_impl() diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h index 1f75ae01..430e8c97 100644 --- a/arts/gui/kde/kwidget_impl.h +++ b/arts/gui/kde/kwidget_impl.h @@ -31,7 +31,7 @@ namespace Arts { class KWidgetGuard; -class KDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel { +class TDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel { protected: TQWidget * _qwidget; KWidgetGuard * _guard; @@ -69,7 +69,7 @@ public: }; class KWidgetGuard : public TQObject { - Q_OBJECT + TQ_OBJECT protected: KWidget_impl *impl; diff --git a/arts/gui/kde/tdepopupbox_impl.cpp b/arts/gui/kde/tdepopupbox_impl.cpp index 9263fc0d..150cccb7 100644 --- a/arts/gui/kde/tdepopupbox_impl.cpp +++ b/arts/gui/kde/tdepopupbox_impl.cpp @@ -64,11 +64,11 @@ TDEPopupBox_widget::TDEPopupBox_widget( TQWidget *parent, const char* name ) : T _titlebarlayout->setAutoAdd( true ); _showbutton = new ShowButton( _titlebar ); - connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) ); + connect( _showbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( hide( bool ) ) ); _drag = new HandleDrag( _titlebar ); - connect( _drag, TQT_SIGNAL( clicked() ), _showbutton, TQT_SLOT( toggle() ) ); + connect( _drag, TQ_SIGNAL( clicked() ), _showbutton, TQ_SLOT( toggle() ) ); _ownbutton = new OwnButton( _titlebar ); - connect( _ownbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( own( bool ) ) ); + connect( _ownbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( own( bool ) ) ); _artswidget = new OwnWidget( _showbutton, this ); diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h index 1cd94aab..21fc3034 100644 --- a/arts/gui/kde/tdepopupbox_private.h +++ b/arts/gui/kde/tdepopupbox_private.h @@ -34,7 +34,7 @@ class TQBoxLayout; class TDEPopupBox_widget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: TDEPopupBox_widget( TQWidget* =0, const char* =0); @@ -65,7 +65,7 @@ private: // See tdepopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future... /*class TDEPopupBoxEventMapper : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDEPopupBoxEventMapper( TDEPopupBox_widget *widget, Arts::TDEPopupBox_impl *impl ) @@ -80,7 +80,7 @@ private: #include <tqstyle.h> class HandleDrag : public TQWidget { - Q_OBJECT + TQ_OBJECT public: HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {} @@ -88,7 +88,7 @@ public: TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if( width() < height() ) flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); + style().drawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); } signals: void clicked(); @@ -110,7 +110,7 @@ static const char* const own_xpm[] = { "5 5 2 1", "# c black", ". c None", "# #include <tqlayout.h> class ShowButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT private: TQBoxLayout::Direction _dir; @@ -118,7 +118,7 @@ private: public: ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) { - connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( owntoggle( bool ) ) ); setToggleButton( true ); _pmleft = TQPixmap( const_cast<const char**>( left_xpm ) ); _pmright = TQPixmap( const_cast<const char**>( right_xpm ) ); @@ -167,14 +167,14 @@ public: }; class OwnButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT private: TQPixmap _pmown, _pminside; public: OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ) { - connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggle( bool ) ) ); setToggleButton( true ); _pmown = TQPixmap( const_cast<const char**>( own_xpm ) ); _pminside = TQPixmap( const_cast<const char**>( inside_xpm ) ); @@ -206,7 +206,7 @@ public: class OwnWidget : public KArtsWidget { - Q_OBJECT + TQ_OBJECT ShowButton *_b; public: |