diff options
Diffstat (limited to 'arts/gui/kde')
58 files changed, 556 insertions, 556 deletions
diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp index 1ccde8cf..6d1b798e 100644 --- a/arts/gui/kde/artstestgui.cpp +++ b/arts/gui/kde/artstestgui.cpp @@ -23,7 +23,7 @@ #include "artsgui.h" #include <connect.h> #include <qiomanager.h> -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <kapplication.h> #include <objectmanager.h> diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp index 164b3630..fef8b0b9 100644 --- a/arts/gui/kde/dbtest.cpp +++ b/arts/gui/kde/dbtest.cpp @@ -10,9 +10,9 @@ #include <dbtest.h> #include <dbtest.moc> -dBTestWidget::dBTestWidget( QWidget* p, const char* n ) : QWidget( p,n ), dB2VolCalc( -24,6 ) { +dBTestWidget::dBTestWidget( TQWidget* p, const char* n ) : TQWidget( p,n ), dB2VolCalc( -24,6 ) { kdDebug() << k_funcinfo << endl; - ( void* ) KStdAction::quit( this, SLOT( close() ), new KActionCollection( this ) ); + ( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new KActionCollection( 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 e7d996b0..085ee7a0 100644 --- a/arts/gui/kde/dbtest.h +++ b/arts/gui/kde/dbtest.h @@ -2,14 +2,14 @@ #ifndef DBTESTWIDGET_H #define DBTESTWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> #include "dbvolcalc.h" -class dBTestWidget : public QWidget, public dB2VolCalc { +class dBTestWidget : public TQWidget, public dB2VolCalc { Q_OBJECT public: - dBTestWidget( QWidget*, const char* =0 ); + dBTestWidget( TQWidget*, const char* =0 ); ~dBTestWidget(); }; diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp index 1a9c6b0e..dde61820 100644 --- a/arts/gui/kde/kartswidget.cpp +++ b/arts/gui/kde/kartswidget.cpp @@ -24,48 +24,48 @@ #include "kartswidget.h" #include "kwidgetrepo.h" #include "debug.h" -#include "qlayout.h" +#include "tqlayout.h" class KArtsWidgetPrivate { public: - QHBoxLayout *layout; + TQHBoxLayout *layout; }; -KArtsWidget::KArtsWidget( QWidget* parent, const char* name ) - :QWidget( parent, name ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( TQWidget* parent, const char* name ) + :TQWidget( parent, name ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->layout = new QHBoxLayout(this); + d->layout = new TQHBoxLayout(this); } -KArtsWidget::KArtsWidget( Arts::Widget content, QWidget* parent, const char* name ) - :QWidget( parent, name ), _content( Arts::Widget::null()) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ) + :TQWidget( parent, name ), _content( Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->layout = new QHBoxLayout(this); + d->layout = new TQHBoxLayout(this); setContent(content); } -KArtsWidget::KArtsWidget( Arts::Widget content, QWidget* parent, const char* name, WFlags wflags ) - :QWidget( parent, name, wflags ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name, WFlags wflags ) + :TQWidget( parent, name, wflags ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->layout = new QHBoxLayout( this ); + d->layout = new TQHBoxLayout( this ); setContent( content ); } -KArtsWidget::KArtsWidget(QWidget* parent, const char* name, WFlags wflags ) - :QWidget(parent, name, wflags ), _content(Arts::Widget::null()) +KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags ) + :TQWidget(parent, name, wflags ), _content(Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->layout = new QHBoxLayout(this); + d->layout = new TQHBoxLayout(this); } KArtsWidget::~KArtsWidget() { - QWidget *contentAsWidget + TQWidget *contentAsWidget = KWidgetRepo::the()->lookupQWidget(_content.widgetID()); - contentAsWidget->reparent(0,QPoint(0,0),_content.visible()); + contentAsWidget->reparent(0,TQPoint(0,0),_content.visible()); delete d; d = 0; } @@ -74,12 +74,12 @@ KArtsWidget::~KArtsWidget() void KArtsWidget::setContent(Arts::Widget content) { arts_return_if_fail(!content.isNull()); - QWidget *contentAsWidget + TQWidget *contentAsWidget = KWidgetRepo::the()->lookupQWidget(content.widgetID()); arts_return_if_fail(contentAsWidget != 0); _content = content; - contentAsWidget->reparent(this,QPoint(0,0),content.visible()); + contentAsWidget->reparent(this,TQPoint(0,0),content.visible()); d->layout->addWidget(contentAsWidget); } diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index 353a09b2..2cd072bc 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -24,7 +24,7 @@ #ifndef ARTS_GUI_KARTSWIDGET_H #define ARTS_GUI_KARTSWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> #include "artsgui.h" #include <kdelibs_export.h> class KArtsWidgetPrivate; @@ -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 QWidget { +class KDE_EXPORT KArtsWidget : public TQWidget { private: KArtsWidgetPrivate *d; @@ -57,21 +57,21 @@ public: /** * creates a new KArtsWidget */ - KArtsWidget( QWidget* parent, const char* name ); + KArtsWidget( TQWidget* parent, const char* name ); /** * creates a new KArtsWidget and sets the content to an Arts::Widget */ - KArtsWidget( Arts::Widget content, QWidget* parent, const char* name ); + KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ); /** * creates a new KArtsWidget with WidgetFlags and content * * BCI: should replace the above in the next major release. ( akrille ) */ - KArtsWidget( Arts::Widget, QWidget* =0, const char* =0, WFlags =0 ); + KArtsWidget( Arts::Widget, TQWidget* =0, const char* =0, WFlags =0 ); // same without the content - KArtsWidget( QWidget* =0, const char* =0, WFlags =0 ); + KArtsWidget( TQWidget* =0, const char* =0, WFlags =0 ); /** * destructor diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp index 119e72e0..34c5791b 100644 --- a/arts/gui/kde/kbutton_impl.cpp +++ b/arts/gui/kde/kbutton_impl.cpp @@ -28,15 +28,15 @@ using namespace Arts; using namespace std; -KButtonMapper::KButtonMapper( KButton_impl *_impl, QPushButton *but ) - : QObject( but, "KButtonMapper" ) +KButtonMapper::KButtonMapper( KButton_impl *_impl, TQPushButton *but ) + : TQObject( but, "KButtonMapper" ) , impl( _impl ) , button( but ) { - connect( but, SIGNAL( pressed() ), this, SLOT( pressed() ) ); - connect( but, SIGNAL( released() ), this, SLOT( released() ) ); - connect( but, SIGNAL( toggled( bool ) ), this, SLOT( toggled( bool ) ) ); - connect( but, SIGNAL( clicked() ), this, SLOT( clicked() ) ); + 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() ) ); } void KButtonMapper::pressed() @@ -62,11 +62,11 @@ void KButtonMapper::clicked() impl->emitClicked(); } -KButton_impl::KButton_impl( QPushButton * widget ) - : KWidget_impl( widget ? widget : new QPushButton( 0 ) ) +KButton_impl::KButton_impl( TQPushButton * widget ) + : KWidget_impl( widget ? widget : new TQPushButton( 0 ) ) , _clicked( false ) { - _qpushbutton = static_cast<QPushButton*>( _qwidget ); + _qpushbutton = static_cast<TQPushButton*>( _qwidget ); ( void )new KButtonMapper( this, _qpushbutton ); } @@ -94,7 +94,7 @@ string KButton_impl::text() void KButton_impl::text(const string& newText) { - _qpushbutton->setText(QString::fromUtf8(newText.c_str())); + _qpushbutton->setText(TQString::fromUtf8(newText.c_str())); } bool KButton_impl::toggle() diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h index f254c00a..723c5023 100644 --- a/arts/gui/kde/kbutton_impl.h +++ b/arts/gui/kde/kbutton_impl.h @@ -25,17 +25,17 @@ #ifndef ARTS_GUI_KBUTTON_IMPL_H #define ARTS_GUI_KBUTTON_IMPL_H #include "kwidget_impl.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> namespace Arts { class KButton_impl; -class KButtonMapper : public QObject { +class KButtonMapper : public TQObject { Q_OBJECT KButton_impl *impl; - QPushButton * button; + TQPushButton * button; public: - KButtonMapper(KButton_impl *impl, QPushButton *but); + KButtonMapper(KButton_impl *impl, TQPushButton *but); protected slots: void pressed(); void released(); @@ -50,10 +50,10 @@ private: bool _clicked; protected: - QPushButton * _qpushbutton; + TQPushButton * _qpushbutton; public: - KButton_impl( QPushButton * w = 0 ); + KButton_impl( TQPushButton * w = 0 ); void constructor( Widget parent ); void constructor( const std::string &, Widget ); diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp index b73f57f9..eab55d0d 100644 --- a/arts/gui/kde/kcombobox_impl.cpp +++ b/arts/gui/kde/kcombobox_impl.cpp @@ -31,13 +31,13 @@ using namespace Arts; using namespace std; ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co) - : QObject( co, "map Qt signal to aRts" ) + : TQObject( co, "map Qt signal to aRts" ) ,impl(impl) { - connect(co, SIGNAL(activated(const QString &)), this, SLOT(activated(const QString &))); + connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &))); } -void ComboBoxIntMapper::activated(const QString & newValue) +void ComboBoxIntMapper::activated(const TQString & newValue) { impl->value(string(newValue.utf8().data())); } @@ -56,7 +56,7 @@ string KComboBox_impl::caption() void KComboBox_impl::caption(const string& newCaption) { - m_caption = QString::fromUtf8(newCaption.c_str()); + m_caption = TQString::fromUtf8(newCaption.c_str()); // FIXME: do something with the caption here } @@ -73,7 +73,7 @@ void KComboBox_impl::choices(const vector<string> & newChoices) _kcombobox->clear(); for(vector<string>::const_iterator it = m_choices.begin(); it != m_choices.end(); ++it) { - _kcombobox->insertItem(QString::fromUtf8(it->c_str())); + _kcombobox->insertItem(TQString::fromUtf8(it->c_str())); } if(visible()) choices_changed(newChoices); @@ -89,7 +89,7 @@ void KComboBox_impl::value(const string & newValue) { if(newValue != m_value.utf8().data()) { - m_value = QString::fromUtf8(newValue.c_str()); + m_value = TQString::fromUtf8(newValue.c_str()); for(unsigned int i = 0; i < m_choices.size(); ++i) { if(m_choices[i] == newValue) diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h index 52a95109..3041d352 100644 --- a/arts/gui/kde/kcombobox_impl.h +++ b/arts/gui/kde/kcombobox_impl.h @@ -26,21 +26,21 @@ #define ARTS_GUI_KCOMBOBOX_IMPL_H #include "kwidget_impl.h" #include <kcombobox.h> -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> namespace Arts { class KComboBox_impl; -class ComboBoxIntMapper :public QObject { +class ComboBoxIntMapper :public TQObject { Q_OBJECT KComboBox_impl *impl; public: ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co); public slots: - void activated(const QString &); + void activated(const TQString &); }; class KComboBox_impl : virtual public Arts::ComboBox_skel, @@ -48,8 +48,8 @@ class KComboBox_impl : virtual public Arts::ComboBox_skel, { protected: KComboBox * _kcombobox; - QString m_caption; - QString m_value; + TQString m_caption; + TQString m_value; std::vector<std::string> m_choices; void applyValue(); diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp index 2978dd0c..e5179f9f 100644 --- a/arts/gui/kde/kfader.cpp +++ b/arts/gui/kde/kfader.cpp @@ -5,14 +5,14 @@ void KFader::init() { } -KFader::KFader( QWidget * parent, const char * name ) - : QSlider( Qt::Vertical, parent, name ) +KFader::KFader( TQWidget * parent, const char * name ) + : TQSlider( Qt::Vertical, parent, name ) { init(); } -KFader::KFader( int minValue, int maxValue, int pageStep, int value, QWidget * parent, const char * name ) - : QSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name ) +KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent, const char * name ) + : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name ) { init(); } @@ -21,11 +21,11 @@ KFader::~KFader() { } -void KFader::setColor( QColor & ) +void KFader::setColor( TQColor & ) { } void KFader::setRange( int minValue, int maxValue ) { - QRangeControl::setRange( minValue, maxValue ); + TQRangeControl::setRange( minValue, maxValue ); } diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h index 71b3ba03..603ad7cd 100644 --- a/arts/gui/kde/kfader.h +++ b/arts/gui/kde/kfader.h @@ -23,7 +23,7 @@ #ifndef _KFADER_H #define _KFADER_H -#include <qslider.h> +#include <tqslider.h> class KFader : public QSlider { @@ -31,12 +31,12 @@ class KFader : public QSlider protected: void init(); public: - KFader( QWidget * parent = 0, const char * name = 0 ); - KFader( int minValue, int maxValue, int pageStep, int value, QWidget * parent = 0, const char * name = 0 ); + KFader( TQWidget * parent = 0, const char * name = 0 ); + KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = 0, const char * name = 0 ); virtual ~KFader(); - void setColor( QColor & ); + void setColor( TQColor & ); virtual void setRange( int, int ); }; diff --git a/arts/gui/kde/kfader_impl.cpp b/arts/gui/kde/kfader_impl.cpp index a0caf7db..27a50191 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, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); + connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } void FaderIntMapper::valueChanged(int pos) @@ -63,7 +63,7 @@ string KFader_impl::caption() void KFader_impl::caption(const string& newText) { - _caption = QString::fromUtf8(newText.c_str()); + _caption = TQString::fromUtf8(newText.c_str()); _kfader->setName(_caption.utf8().data()); } @@ -77,7 +77,7 @@ void KFader_impl::color(const string& newColor) _color = newColor; if(strlen(_color.c_str())) { - QColor qc(_color.c_str()); + TQColor qc(_color.c_str()); _kfader->setColor(qc); } } diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h index 2368d551..0d1b81ed 100644 --- a/arts/gui/kde/kfader_impl.h +++ b/arts/gui/kde/kfader_impl.h @@ -27,15 +27,15 @@ #include "kwidget_impl.h" #include "kfader.h" -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> namespace Arts { class KFader_impl; -class FaderIntMapper :public QObject { +class FaderIntMapper :public TQObject { Q_OBJECT KFader_impl *impl; public: @@ -49,7 +49,7 @@ class KFader_impl : virtual public Arts::Fader_skel, { protected: KFader * _kfader; - QString _caption; + TQString _caption; std::string _color; float _min, _max, _value; float _factor; diff --git a/arts/gui/kde/kframe_impl.cpp b/arts/gui/kde/kframe_impl.cpp index 472484e2..d95da549 100644 --- a/arts/gui/kde/kframe_impl.cpp +++ b/arts/gui/kde/kframe_impl.cpp @@ -19,17 +19,17 @@ // $Id$ #include "kframe_impl.h" -#include <qframe.h> +#include <tqframe.h> #include <debug.h> #include <stdio.h> using namespace Arts; using namespace std; -KFrame_impl::KFrame_impl( QFrame * widget ) - : KWidget_impl( widget ? widget : new QFrame ) +KFrame_impl::KFrame_impl( TQFrame * widget ) + : KWidget_impl( widget ? widget : new TQFrame ) { - _qframe = static_cast<QFrame*>( _qwidget ); + _qframe = static_cast<TQFrame*>( _qwidget ); assert( _qframe ); } @@ -80,7 +80,7 @@ Shape KFrame_impl::frameshape() void KFrame_impl::frameshape( Shape fs ) { - _qframe->setFrameShape( ( QFrame::Shape )fs ); + _qframe->setFrameShape( ( TQFrame::Shape )fs ); } Shadow KFrame_impl::frameshadow() @@ -90,7 +90,7 @@ Shadow KFrame_impl::frameshadow() void KFrame_impl::frameshadow( Shadow fs ) { - _qframe->setFrameShadow( ( QFrame::Shadow )fs ); + _qframe->setFrameShadow( ( TQFrame::Shadow )fs ); } REGISTER_IMPLEMENTATION(KFrame_impl); diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h index f4653314..68585b5c 100644 --- a/arts/gui/kde/kframe_impl.h +++ b/arts/gui/kde/kframe_impl.h @@ -30,10 +30,10 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, public Arts::KWidget_impl { protected: - QFrame * _qframe; + TQFrame * _qframe; public: - KFrame_impl( QFrame * widget = 0 ); + KFrame_impl( TQFrame * widget = 0 ); inline void constructor( Widget p ) { parent( p ); } long margin(); diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp index 80541b96..21d3d8cf 100644 --- a/arts/gui/kde/kgraph.cpp +++ b/arts/gui/kde/kgraph.cpp @@ -23,7 +23,7 @@ #include "kgraph.h" #include "kgraph.moc" #include "kgraphline_impl.h" -#include "qpainter.h" +#include "tqpainter.h" #include <cstdlib> #include <math.h> @@ -31,8 +31,8 @@ using namespace Arts; using namespace std; -KGraph::KGraph( QWidget * parent, const char * name ) - : QWidget( parent, name ) +KGraph::KGraph( TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { setBackgroundColor(white); @@ -65,21 +65,21 @@ void KGraph::removeLine(Arts::KGraphLine_impl *line) lines.remove(line); } -inline QPoint KGraph::g2qPoint(const GraphPoint &gp) +inline TQPoint KGraph::g2qPoint(const GraphPoint &gp) { - return QPoint(int(((gp.x - minx)/(maxx-minx)) * (width()-1)), + return TQPoint(int(((gp.x - minx)/(maxx-minx)) * (width()-1)), int((1.0 - (gp.y - miny)/(maxy-miny)) * (height()-1))); } -inline GraphPoint KGraph::q2gPoint(const QPoint &qp) +inline GraphPoint KGraph::q2gPoint(const TQPoint &qp) { return GraphPoint((float(qp.x())/float(width()-1)) * (maxx-minx) + minx, (1.0 - (float(qp.y())/float(height()-1))) * (maxy-miny) + miny); } -void KGraph::paintEvent( QPaintEvent *e ) +void KGraph::paintEvent( TQPaintEvent *e ) { - QPainter painter(this); + TQPainter painter(this); painter.setClipRect(e->rect()); std::list<KGraphLine_impl *>::iterator li; @@ -88,14 +88,14 @@ void KGraph::paintEvent( QPaintEvent *e ) KGraphLine_impl *gline = *li; vector<GraphPoint>::iterator pi; - QPoint lastp; + TQPoint lastp; bool first = true; painter.setPen(gline->_color.c_str()); for(pi = gline->_points.begin(); pi != gline->_points.end(); pi++) { - QPoint p = g2qPoint(*pi); + TQPoint p = g2qPoint(*pi); if(!first) painter.drawLine(lastp,p); @@ -109,7 +109,7 @@ void KGraph::paintEvent( QPaintEvent *e ) } } -void KGraph::mousePressEvent(QMouseEvent *e) +void KGraph::mousePressEvent(TQMouseEvent *e) { if(e->button() == LeftButton || e->button() == RightButton) { @@ -122,7 +122,7 @@ void KGraph::mousePressEvent(QMouseEvent *e) int index = 0; for(pi = gline->_points.begin(); pi != gline->_points.end(); pi++, index++) { - QPoint p = g2qPoint(*pi); + TQPoint p = g2qPoint(*pi); int dx = e->x() - p.x(); int dy = e->y() - p.y(); @@ -167,14 +167,14 @@ void KGraph::mousePressEvent(QMouseEvent *e) { KGraphLine_impl *gline = *li; - QPoint lastp; + TQPoint lastp; bool first = true; vector<GraphPoint>::iterator pi; int index = 0; for(pi = gline->_points.begin(); pi != gline->_points.end(); pi++, index++) { - QPoint p = g2qPoint(*pi); + TQPoint p = g2qPoint(*pi); if(!first && (e->x() > lastp.x()+2) && (e->x() < p.x()-2)) { @@ -183,7 +183,7 @@ void KGraph::mousePressEvent(QMouseEvent *e) if(abs(y-e->y()) < 5) { - GraphPoint gp = q2gPoint(QPoint(e->x(),y)); + GraphPoint gp = q2gPoint(TQPoint(e->x(),y)); vector<GraphPoint> newPoints; for(int i=0;i<( int )gline->_points.size();i++) @@ -208,9 +208,9 @@ void KGraph::mousePressEvent(QMouseEvent *e) } } -void KGraph::mouseMoveEvent(QMouseEvent *e) +void KGraph::mouseMoveEvent(TQMouseEvent *e) { - QPoint pos = e->pos(); + TQPoint pos = e->pos(); if(pos.x() < 0) pos.setX(0); if(pos.y() < 0) pos.setY(0); @@ -257,7 +257,7 @@ void KGraph::mouseMoveEvent(QMouseEvent *e) } } -void KGraph::mouseReleaseEvent(QMouseEvent *) +void KGraph::mouseReleaseEvent(TQMouseEvent *) { selectedIndex = -1; selectedLine = 0; diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h index d3e622ad..83c1aa7c 100644 --- a/arts/gui/kde/kgraph.h +++ b/arts/gui/kde/kgraph.h @@ -23,8 +23,8 @@ #ifndef _KGRAPH_H #define _KGRAPH_H -#include <qwidget.h> -#include <qpoint.h> +#include <tqwidget.h> +#include <tqpoint.h> #include "artsgui.h" #include <list> @@ -43,21 +43,21 @@ protected: GraphPoint selectedPoint; int selectedIndex; // -1 if nothing is selected - inline GraphPoint q2gPoint(const QPoint &qp); - inline QPoint g2qPoint(const GraphPoint &gp); + inline GraphPoint q2gPoint(const TQPoint &qp); + inline TQPoint g2qPoint(const GraphPoint &gp); public: - KGraph( QWidget * parent = 0, const char * name = 0 ); + KGraph( TQWidget * parent = 0, const char * name = 0 ); virtual ~KGraph(); void addLine(Arts::KGraphLine_impl *line); void redrawLine(Arts::KGraphLine_impl *line); void removeLine(Arts::KGraphLine_impl *line); - void mousePressEvent(QMouseEvent *me); - void mouseMoveEvent(QMouseEvent *me); - void mouseReleaseEvent(QMouseEvent *me); + void mousePressEvent(TQMouseEvent *me); + void mouseMoveEvent(TQMouseEvent *me); + void mouseReleaseEvent(TQMouseEvent *me); - void paintEvent(QPaintEvent *e); + void paintEvent(TQPaintEvent *e); }; } diff --git a/arts/gui/kde/kgraph_impl.cpp b/arts/gui/kde/kgraph_impl.cpp index 354fdad7..85ad72ad 100644 --- a/arts/gui/kde/kgraph_impl.cpp +++ b/arts/gui/kde/kgraph_impl.cpp @@ -43,7 +43,7 @@ string KGraph_impl::caption() void KGraph_impl::caption(const string& newCaption) { - _caption = QString::fromUtf8(newCaption.c_str()); + _caption = TQString::fromUtf8(newCaption.c_str()); // FIXME: do something with the caption here } diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h index e100b095..408ad961 100644 --- a/arts/gui/kde/kgraph_impl.h +++ b/arts/gui/kde/kgraph_impl.h @@ -25,8 +25,8 @@ #include "kwidget_impl.h" #include "kgraph.h" -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> namespace Arts { @@ -37,7 +37,7 @@ class KGraph_impl : virtual public Arts::Graph_skel, public Arts::KWidget_impl { protected: - QString _caption; + TQString _caption; float _minx, _miny, _maxx, _maxy; KGraph * _kgraph; diff --git a/arts/gui/kde/kgraphline_impl.cpp b/arts/gui/kde/kgraphline_impl.cpp index affb5fc2..ccb6ed1f 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<GraphPoint>& newPoints) KGraph *KGraphLine_impl::getKGraph() { - QWidget *widget = KWidgetRepo::the()->lookupQWidget(_graphID); + TQWidget *widget = KWidgetRepo::the()->lookupQWidget(_graphID); if(!widget) return 0; diff --git a/arts/gui/kde/khbox_impl.cpp b/arts/gui/kde/khbox_impl.cpp index 29438a09..431ce286 100644 --- a/arts/gui/kde/khbox_impl.cpp +++ b/arts/gui/kde/khbox_impl.cpp @@ -22,15 +22,15 @@ */ #include "khbox_impl.h" -#include <qhbox.h> +#include <tqhbox.h> using namespace Arts; -KHBox_impl::KHBox_impl( QHBox * widget ) - : KFrame_impl( widget ? widget : new QHBox ) +KHBox_impl::KHBox_impl( TQHBox * widget ) + : KFrame_impl( widget ? widget : new TQHBox ) , _spacing( 5 ) { - _qhbox = static_cast<QHBox*>( _qwidget ); + _qhbox = static_cast<TQHBox*>( _qwidget ); _qhbox->setSpacing( _spacing ); _qhbox->setMargin( 5 ); } diff --git a/arts/gui/kde/khbox_impl.h b/arts/gui/kde/khbox_impl.h index b82bf80c..7b020b39 100644 --- a/arts/gui/kde/khbox_impl.h +++ b/arts/gui/kde/khbox_impl.h @@ -34,10 +34,10 @@ private: long _spacing; protected: - QHBox * _qhbox; + TQHBox * _qhbox; public: - KHBox_impl( QHBox * w = 0 ); + KHBox_impl( TQHBox * w = 0 ); long spacing(); void spacing( long ); diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp index 774a7de0..dd0a9557 100644 --- a/arts/gui/kde/klabel_impl.cpp +++ b/arts/gui/kde/klabel_impl.cpp @@ -22,12 +22,12 @@ #include "klabel_impl.moc" #include <kdebug.h> -#include <qfont.h> +#include <tqfont.h> using namespace Arts; using namespace std; -KLabel_impl::KLabel_impl( QFrame *widget ) : KFrame_impl( widget ? widget : new RotateLabel( 0 ) ) { +KLabel_impl::KLabel_impl( TQFrame *widget ) : KFrame_impl( widget ? widget : new RotateLabel( 0 ) ) { _label = static_cast<RotateLabel*>( _qwidget ); } @@ -36,7 +36,7 @@ string KLabel_impl::text() { } void KLabel_impl::text( const string& newtext ) { - _label->title( QString::fromUtf8( newtext.c_str() ) ); + _label->title( TQString::fromUtf8( newtext.c_str() ) ); } long KLabel_impl::align() { return _label->align(); } @@ -50,40 +50,40 @@ void KLabel_impl::bottom( Arts::TextBottom n ) { _label->bottom( n ); } REGISTER_IMPLEMENTATION( KLabel_impl ); -RotateLabel::RotateLabel( QWidget* p, const char* n ) : QFrame( p,n ) { +RotateLabel::RotateLabel( TQWidget* p, const char* n ) : TQFrame( p,n ) { _bottom = Arts::South; _align = Arts::AlignCenter; } -void RotateLabel::paintEvent( QPaintEvent* ) { - QPainter p( this ); +void RotateLabel::paintEvent( TQPaintEvent* ) { + TQPainter p( this ); if ( _bottom == Arts::East ) { p.rotate( 270 ); - p.drawText( QRect( 0,0, -height(), width() ), _align, _title ); + p.drawText( TQRect( 0,0, -height(), width() ), _align, _title ); } else if ( _bottom == Arts::West ) { p.rotate( 90 ); - p.drawText( QRect( 0,0, height(), -width() ), _align, _title ); + p.drawText( TQRect( 0,0, height(), -width() ), _align, _title ); } else if ( _bottom == Arts::North ) { p.rotate( 180 ); - p.drawText( QRect( 0,0, -width(), -height() ), _align, _title ); + p.drawText( TQRect( 0,0, -width(), -height() ), _align, _title ); } else { - p.drawText( QRect( 0,0, width(), height() ), _align, _title ); + p.drawText( TQRect( 0,0, width(), height() ), _align, _title ); } } -void RotateLabel::fontfamily( QString n ) { - QFont font = this->font(); +void RotateLabel::fontfamily( TQString n ) { + TQFont font = this->font(); font.setFamily( n ); this->setFont( font ); } void RotateLabel::fontsize( int n ) { - QFont font = this->font(); + TQFont font = this->font(); font.setPixelSize( n ); this->setFont( font ); } -void RotateLabel::title( QString n ) { +void RotateLabel::title( TQString n ) { _title = n; - QSize size = this->fontMetrics().size( SingleLine, _title ); + TQSize size = this->fontMetrics().size( SingleLine, _title ); if ( _bottom == Arts::East || _bottom == Arts::West ) this->setMinimumSize( size.height(), size.width() ); else diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h index 332b0006..7822e960 100644 --- a/arts/gui/kde/klabel_impl.h +++ b/arts/gui/kde/klabel_impl.h @@ -23,10 +23,10 @@ #define ARTS_KLABEL_IMPL #include <kframe_impl.h> -#include <qframe.h> -#include <qpainter.h> -#include <qfontmetrics.h> -#include <qfont.h> +#include <tqframe.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> +#include <tqfont.h> #include <artsgui.h> #include <kdelibs_export.h> @@ -41,7 +41,7 @@ class KDE_EXPORT KLabel_impl : virtual public Arts::Label_skel, protected: RotateLabel* _label; public: - KLabel_impl( QFrame* w=0 ); + KLabel_impl( TQFrame* w=0 ); void constructor( Widget p ) { parent( p ); } std::string text(); @@ -63,16 +63,16 @@ public: } // namespace -class RotateLabel : public QFrame { +class RotateLabel : public TQFrame { Q_OBJECT public: - RotateLabel( QWidget*, const char* =0 ); - void paintEvent( QPaintEvent* ); + RotateLabel( TQWidget*, const char* =0 ); + void paintEvent( TQPaintEvent* ); - void fontfamily( QString ); + void fontfamily( TQString ); void fontsize( int ); - void title( QString ); - QString title() { return _title; } + void title( TQString ); + TQString title() { return _title; } long align() { return _align; } void align( long ); @@ -82,7 +82,7 @@ public: private: long _align; Arts::TextBottom _bottom; - QString _title; + TQString _title; }; #endif diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 7f9efa9b..847e803a 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -20,21 +20,21 @@ #include "klayoutbox_impl.h" -#include <qframe.h> -#include <qlayout.h> +#include <tqframe.h> +#include <tqlayout.h> #include <kdebug.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qpen.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqpen.h> #include "kwidgetrepo.h" using namespace Arts; using namespace std; -KLayoutBox_impl::KLayoutBox_impl( QFrame *widget ) : KFrame_impl( widget ? widget :new QFrame( 0 ) ) +KLayoutBox_impl::KLayoutBox_impl( TQFrame *widget ) : KFrame_impl( widget ? widget :new TQFrame( 0 ) ) { - _qframe = static_cast<QFrame*>( _qwidget ); - _layout = new QBoxLayout( _qframe, QBoxLayout::LeftToRight ); + _qframe = static_cast<TQFrame*>( _qwidget ); + _layout = new TQBoxLayout( _qframe, TQBoxLayout::LeftToRight ); } KLayoutBox_impl::~KLayoutBox_impl() { } @@ -42,14 +42,14 @@ KLayoutBox_impl::~KLayoutBox_impl() { void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) { widget.parent( self() ); this->_addChild( widget, "layoutbox_item" ); - QWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); + TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( 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" ); - QWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); + TQWidget * tmp = KWidgetRepo::the()->lookupQWidget( widget.widgetID() ); _layout->insertWidget( index, tmp, stretch, align ); } @@ -70,31 +70,31 @@ long KLayoutBox_impl::layoutmargin() { return _layout->margin(); } void KLayoutBox_impl::layoutmargin( 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( QBoxLayout::Direction( d ) ); } +void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( TQBoxLayout::Direction( d ) ); } REGISTER_IMPLEMENTATION( KLayoutBox_impl ); -KLayoutBox_Separator::KLayoutBox_Separator( QWidget* p, const char* n ) : QWidget( p,n ) { +KLayoutBox_Separator::KLayoutBox_Separator( TQWidget* p, const char* n ) : TQWidget( p,n ) { //kdDebug() << k_funcinfo << endl; } -void KLayoutBox_Separator::resizeEvent( QResizeEvent* ) { kdDebug() << k_funcinfo << size() << endl; } +void KLayoutBox_Separator::resizeEvent( TQResizeEvent* ) { kdDebug() << k_funcinfo << size() << endl; } -void KLayoutBox_Separator::paintEvent( QPaintEvent* ) { +void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { //kdDebug() << k_funcinfo << size() << endl; - QPainter p( this ); - QStyle::SFlags flags = QStyle::Style_Default; - if ( width() < height() ) flags |= QStyle::Style_Horizontal; - style().drawPrimitive( QStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); + 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 ); } -QSize KLayoutBox_Separator::minimumSizeHint() const { - int wh = style().pixelMetric( QStyle::PM_SplitterWidth, this ); - return QSize( wh, wh ); +TQSize KLayoutBox_Separator::minimumSizeHint() const { + int wh = style().pixelMetric( TQStyle::PM_SplitterWidth, this ); + return TQSize( wh, wh ); } -KLayoutBox_Line::KLayoutBox_Line( int width, int space, QWidget* p, const char* n ) - : QWidget( p,n ) +KLayoutBox_Line::KLayoutBox_Line( int width, int space, TQWidget* p, const char* n ) + : TQWidget( p,n ) , _width( width ) , _space( space ) { @@ -102,18 +102,18 @@ KLayoutBox_Line::KLayoutBox_Line( int width, int space, QWidget* p, const char* } -void KLayoutBox_Line::paintEvent( QPaintEvent* ) { +void KLayoutBox_Line::paintEvent( TQPaintEvent* ) { //kdDebug() << k_funcinfo << size() << endl; - QPainter p( this ); - p.setPen( QPen( colorGroup().foreground(), _width ) ); + TQPainter p( this ); + p.setPen( TQPen( colorGroup().foreground(), _width ) ); if ( width() > height() ) p.drawLine( 0, height()/2, width(), height()/2 ); else p.drawLine( width()/2, 0, width()/2, height() ); } -QSize KLayoutBox_Line::minimumSizeHint() const { +TQSize KLayoutBox_Line::minimumSizeHint() const { //kdDebug() << k_funcinfo << size() << endl; int wh = _width + 2* _space; - return QSize( wh, wh ); + return TQSize( wh, wh ); } #include <klayoutbox_impl.moc> diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index ee8f18a3..cdebba71 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -36,12 +36,12 @@ class KDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel, public Arts::KFrame_impl { protected: - QFrame* _qframe; - QBoxLayout* _layout; + TQFrame* _qframe; + TQBoxLayout* _layout; LayoutBox self() { return LayoutBox::_from_base( _copy() ); } public: - KLayoutBox_impl( QFrame* w=0 ); + KLayoutBox_impl( TQFrame* w=0 ); ~KLayoutBox_impl(); Direction direction(); @@ -78,23 +78,23 @@ public: } // namespace -class KDE_EXPORT KLayoutBox_Separator : public QWidget { +class KDE_EXPORT KLayoutBox_Separator : public TQWidget { Q_OBJECT public: - KLayoutBox_Separator( QWidget*, const char* =0 ); - void resizeEvent( QResizeEvent* ); - void paintEvent( QPaintEvent* ); - QSize minimumSizeHint() const; + KLayoutBox_Separator( TQWidget*, const char* =0 ); + void resizeEvent( TQResizeEvent* ); + void paintEvent( TQPaintEvent* ); + TQSize minimumSizeHint() const; }; -class KLayoutBox_Line : public QWidget { +class KLayoutBox_Line : public TQWidget { Q_OBJECT private: int _width, _space; public: - KLayoutBox_Line( int, int, QWidget*, const char* =0 ); - void paintEvent( QPaintEvent* ); - QSize minimumSizeHint() const; + KLayoutBox_Line( int, int, TQWidget*, const char* =0 ); + void paintEvent( TQPaintEvent* ); + TQSize minimumSizeHint() const; }; #endif diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp index 83d93d3c..9a78804c 100644 --- a/arts/gui/kde/klevelmeter_firebars.cpp +++ b/arts/gui/kde/klevelmeter_firebars.cpp @@ -21,16 +21,16 @@ #include "klevelmeter_firebars.h" #include <kdebug.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> -KLevelMeter_FireBars_private::KLevelMeter_FireBars_private( KLevelMeter_FireBars* p, const char* n ) : QWidget( p,n ) { +KLevelMeter_FireBars_private::KLevelMeter_FireBars_private( KLevelMeter_FireBars* p, const char* n ) : TQWidget( p,n ) { _parent = p; - _pixmap = new QPixmap( 0,0 ); -// setPaletteBackgroundColor( QColor( 0,0,255 ) ); + _pixmap = new TQPixmap( 0,0 ); +// setPaletteBackgroundColor( TQColor( 0,0,255 ) ); } -void KLevelMeter_FireBars_private::paintEvent( QPaintEvent* ) { - QPainter p; +void KLevelMeter_FireBars_private::paintEvent( TQPaintEvent* ) { + TQPainter p; if ( _pixmap->size() != this->size() ) { _pixmap->resize( this->size() ); p.begin( _pixmap ); @@ -55,15 +55,15 @@ kdDebug() << k_funcinfo << dir << endl; } p.begin( this ); p.translate( 0,0 ); - p.drawPixmap( QPoint( 0,0 ), *_pixmap ); + p.drawPixmap( TQPoint( 0,0 ), *_pixmap ); p.end(); } -KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, QWidget* 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* "<<impl<<", QWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +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* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; this->setMinimumSize( 5, 5 ); _bar = new KLevelMeter_FireBars_private( this, 0 ); - _peakwidget = new QWidget( this ); + _peakwidget = new TQWidget( this ); _peakwidget->resize( size() ); _peakwidget->setPaletteBackgroundColor( color( 1 ) ); _peakwidget->hide(); @@ -94,10 +94,10 @@ void KLevelMeter_FireBars::invalue( float n, float p ) { repaint(); } -void KLevelMeter_FireBars::paintEvent( QPaintEvent* ) { - QPainter p( this ); +void KLevelMeter_FireBars::paintEvent( TQPaintEvent* ) { + TQPainter p( this ); //p.setPen( NoPen ); - p.setPen( QColor( 0,0,255 ) ); + p.setPen( TQColor( 0,0,255 ) ); // PeakBar if ( _peak > 1.0/1000 ) { if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) { @@ -117,8 +117,8 @@ void KLevelMeter_FireBars::paintEvent( QPaintEvent* ) { /** Planned feature: a little Tooltip showing the actual value of the volume in deziBel and perhaps as linear scaleFactor */ -void KLevelMeter_FireBars::mouseMoveEvent( QMouseEvent* /*qme*/ ) { -//kdDebug()<<"KLevelMeter_FireBars::mouseMoveEvent(QMouseEvent* "<<qme<<" )"<<endl; +void KLevelMeter_FireBars::mouseMoveEvent( TQMouseEvent* /*qme*/ ) { +//kdDebug()<<"KLevelMeter_FireBars::mouseMoveEvent(TQMouseEvent* "<<qme<<" )"<<endl; } #include <klevelmeter_firebars.moc> diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h index 5dcc628a..5d7ff2d7 100644 --- a/arts/gui/kde/klevelmeter_firebars.h +++ b/arts/gui/kde/klevelmeter_firebars.h @@ -26,32 +26,32 @@ class QPixmap; class KLevelMeter_FireBars; -class KLevelMeter_FireBars_private : public QWidget { +class KLevelMeter_FireBars_private : public TQWidget { Q_OBJECT public: KLevelMeter_FireBars_private( KLevelMeter_FireBars*, const char* ); - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); Arts::Direction dir; private: KLevelMeter_FireBars* _parent; - QPixmap *_pixmap; + TQPixmap *_pixmap; }; class KLevelMeter_FireBars : public KLevelMeter_Template { Q_OBJECT public: - KLevelMeter_FireBars( Arts::KLevelMeter_impl*, QWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); - void mouseMoveEvent( QMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); private: float _value, _peak; KLevelMeter_FireBars_private *_bar; - QWidget* _peakwidget; + TQWidget* _peakwidget; }; #endif diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp index 1e090e65..418108ad 100644 --- a/arts/gui/kde/klevelmeter_impl.cpp +++ b/arts/gui/kde/klevelmeter_impl.cpp @@ -23,9 +23,9 @@ #include <math.h> -#include <qframe.h> +#include <tqframe.h> #include <kdebug.h> -#include <qlayout.h> +#include <tqlayout.h> #include <kartswidget.h> #include "klevelmeter_private.h" @@ -41,8 +41,8 @@ using namespace Arts; using namespace std; -KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, QFrame* frame, LevelMeterStyle defstyle, QObject* parent, const char* name ) - : QObject( parent, name ) +KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* parent, const char* name ) + : TQObject( parent, name ) , _impl( impl ) , _frame( frame ) , _levelmeter( 0 ) @@ -53,7 +53,7 @@ KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, QFrame* frame, , _peak( 20 ), _peakvalue( 0.0 ) , _dbmin( -36 ), _dbmax( 0 ) { - _layout = new QBoxLayout( _frame, QBoxLayout::LeftToRight ); + _layout = new TQBoxLayout( _frame, TQBoxLayout::LeftToRight ); } void KLevelMeter_Private::createWidget() { @@ -78,8 +78,8 @@ void KLevelMeter_Private::createWidget() { _levelmeter->setMinimumSize( 10,10 ); } -KLevelMeter_impl::KLevelMeter_impl( QFrame* w ) : Arts::KFrame_impl( w ? w : new QFrame( 0 ) ) { -//kdDebug()<<"KLevelMeter_impl::KLevelMeter_impl( QFrame* "<<w<<" )"<<endl; +KLevelMeter_impl::KLevelMeter_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new TQFrame( 0 ) ) { +//kdDebug()<<"KLevelMeter_impl::KLevelMeter_impl( TQFrame* "<<w<<" )"<<endl; p = new KLevelMeter_Private( this, _qframe, lmLineBars ); p->createWidget(); } diff --git a/arts/gui/kde/klevelmeter_impl.h b/arts/gui/kde/klevelmeter_impl.h index 2e26b996..b2f58ce8 100644 --- a/arts/gui/kde/klevelmeter_impl.h +++ b/arts/gui/kde/klevelmeter_impl.h @@ -37,7 +37,7 @@ class KLevelMeter_impl : virtual public Arts::LevelMeter_skel, private: KLevelMeter_Private *p; public: - KLevelMeter_impl( QFrame* =0 ); + KLevelMeter_impl( TQFrame* =0 ); LevelMeterStyle style(); void style( LevelMeterStyle ); diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index 3292ba4a..6d63a18c 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -21,14 +21,14 @@ #include "klevelmeter_linebars.h" #include <kdebug.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> -KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, QWidget* 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* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) , _value( 0.0 ) , _peak( 0.0 ) { -//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", QWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; this->setMinimumSize( 5, 5 ); this->substyle( substyle ); _stdcolors = colorGroup(); @@ -47,9 +47,9 @@ void KLevelMeter_LineBars::substyle( long n ) { } long KLevelMeter_LineBars::substyle() { return _substyle; } -void KLevelMeter_LineBars::paintEvent( QPaintEvent* ) { - QPixmap pm( size() ); - QPainter p( &pm ); +void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) { + TQPixmap pm( size() ); + TQPainter p( &pm ); switch ( _dir ) { case Arts::BottomToTop: @@ -69,16 +69,16 @@ void KLevelMeter_LineBars::paintEvent( QPaintEvent* ) { } if ( _substyle & 1 ) - p.setBrush( ( _peak<1 )?QColor( 0,0,255 ):QColor( 255,0,0 ) ); + p.setBrush( ( _peak<1 )?TQColor( 0,0,255 ):TQColor( 255,0,0 ) ); else - p.setBrush( ( _peak<1 )?color( _value ):QColor( 255,0,0 ) ); + p.setBrush( ( _peak<1 )?color( _value ):TQColor( 255,0,0 ) ); - QColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : _stdcolors.background(); + TQColor bgcolor = ( _substyle & 2 ) ? p.brush().color().dark() : _stdcolors.background(); pm.fill( bgcolor ); p.setPen( NoPen ); - QSize s = size(); + TQSize s = size(); if ( Arts::LeftToRight == _dir || Arts::RightToLeft == _dir ) s.transpose(); @@ -89,7 +89,7 @@ void KLevelMeter_LineBars::paintEvent( QPaintEvent* ) { p.drawRect( 0, top, w, h ); // PeakBar if ( _peak > 1.0/1000 && _peak <= 1.0 ) { - p.setPen( QColor( 255-bgcolor.red(), 255-bgcolor.green(), 255-bgcolor.blue() ) ); + p.setPen( TQColor( 255-bgcolor.red(), 255-bgcolor.green(), 255-bgcolor.blue() ) ); top = int( s.height() * ( 1 - _peak ) ); p.drawLine( 0, top, w, top ); } @@ -100,8 +100,8 @@ void KLevelMeter_LineBars::paintEvent( QPaintEvent* ) { /** Planned feature: a little Tooltip showing the actual value of the volume in deziBel and perhaps as linear scaleFactor */ -void KLevelMeter_LineBars::mouseMoveEvent( QMouseEvent* /*qme*/ ) { -//kdDebug()<<"KLevelMeter_LineBars::mouseMoveEvent(QMouseEvent* "<<qme<<" )"<<endl; +void KLevelMeter_LineBars::mouseMoveEvent( TQMouseEvent* /*qme*/ ) { +//kdDebug()<<"KLevelMeter_LineBars::mouseMoveEvent(TQMouseEvent* "<<qme<<" )"<<endl; //kdDebug()<<"qme.y()="<<this->height()-qme->y()<<" db="<<db<<" dbtoamp(db)="<<dbtoamp( db )<<endl; } diff --git a/arts/gui/kde/klevelmeter_linebars.h b/arts/gui/kde/klevelmeter_linebars.h index e10d4ba7..cf0c4217 100644 --- a/arts/gui/kde/klevelmeter_linebars.h +++ b/arts/gui/kde/klevelmeter_linebars.h @@ -26,20 +26,20 @@ class KLevelMeter_LineBars : public KLevelMeter_Template { Q_OBJECT public: - KLevelMeter_LineBars( Arts::KLevelMeter_impl*, QWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); void substyle( long ); long substyle(); - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); - void mouseMoveEvent( QMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); private: float _value, _peak; long _substyle; - QColorGroup _stdcolors; + TQColorGroup _stdcolors; }; #endif diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp index 7a6fcdfb..29593551 100644 --- a/arts/gui/kde/klevelmeter_normalbars.cpp +++ b/arts/gui/kde/klevelmeter_normalbars.cpp @@ -21,19 +21,19 @@ #include "klevelmeter_normalbars.h" #include <kdebug.h> -#include <qpainter.h> -#include <qlayout.h> +#include <tqpainter.h> +#include <tqlayout.h> -KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, QWidget* 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* "<<impl<<", QWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; - _layout = new QBoxLayout( this, QBoxLayout::BottomToTop ); +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* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; + _layout = new TQBoxLayout( this, TQBoxLayout::BottomToTop ); } void KLevelMeter_NormalBars::invalue( float n, float p ) { //kdDebug()<<"KLevelMeter_NormalBars::invalue( float "<<n<<", float "<<p<<" )"<<endl; _peak = amptondb( p ); _value = amptondb( n ); - if ( _dir != Arts::Direction( _layout->direction() ) ) _layout->setDirection( QBoxLayout::Direction( _dir ) ); + if ( _dir != Arts::Direction( _layout->direction() ) ) _layout->setDirection( TQBoxLayout::Direction( _dir ) ); for ( uint i=0; i<bars.count(); i++ ) bars.at( i )->setValue( _value ); } @@ -46,8 +46,8 @@ void KLevelMeter_NormalBars::count( long n ) { } } -void KLevelMeter_NormalBars::resizeEvent( QResizeEvent* ) { - //kdDebug()<<"KLevelMeter_NormalBars::resizeEvent( QResizeEvent* )"<<endl; +void KLevelMeter_NormalBars::resizeEvent( TQResizeEvent* ) { + //kdDebug()<<"KLevelMeter_NormalBars::resizeEvent( TQResizeEvent* )"<<endl; uint barscount = _count; //kdDebug()<<"[1] barscount="<<barscount<<" bars.count()="<<bars.count()<<endl; if ( _dir==Arts::BottomToTop || _dir==Arts::TopToBottom ) { diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h index 2783e09f..5705ef5e 100644 --- a/arts/gui/kde/klevelmeter_normalbars.h +++ b/arts/gui/kde/klevelmeter_normalbars.h @@ -23,7 +23,7 @@ #include "klevelmeter_template.h" -#include <qptrlist.h> +#include <tqptrlist.h> class Bar; class QBoxLayout; @@ -31,29 +31,29 @@ class QBoxLayout; class KLevelMeter_NormalBars : public KLevelMeter_Template { Q_OBJECT public: - KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, QWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); void count( long ); long count(); - void resizeEvent( QResizeEvent* =0 ); + void resizeEvent( TQResizeEvent* =0 ); private: float _value, _peak; - QPtrList <Bar> bars; + TQPtrList <Bar> bars; // long _count; - QBoxLayout *_layout; + TQBoxLayout *_layout; }; -class Bar : public QWidget { +class Bar : public TQWidget { Q_OBJECT private: float _min, _max; - QColor _color; + TQColor _color; bool _on; public: - Bar( float min, float max, QColor color, QWidget* parent ) : QWidget( parent ), _min( min ), _max( max ), _color( color ), _on( false ) { + Bar( float min, float max, TQColor color, TQWidget* parent ) : TQWidget( parent ), _min( min ), _max( max ), _color( color ), _on( false ) { setBackgroundColor( _color.dark() ); } void setValue( float n ) { @@ -68,7 +68,7 @@ public: else setBackgroundColor( _color.dark() ); } } - void setValues( float min, float max, QColor color ) { _min = min; _max = max; _color = color; on( _on ); } + void setValues( float min, float max, TQColor color ) { _min = min; _max = max; _color = color; on( _on ); } }; #endif diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h index f7ff4e93..79fe49b2 100644 --- a/arts/gui/kde/klevelmeter_private.h +++ b/arts/gui/kde/klevelmeter_private.h @@ -21,7 +21,7 @@ #ifndef ARTS_KLEVELMETER_PRIVATE_H #define ARTS_KLEVELMETER_PRIVATE_H -#include <qwidget.h> +#include <tqwidget.h> #include "klevelmeter_impl.h" @@ -29,12 +29,12 @@ class KLevelMeter_Template; class QBoxLayout; class KArtsWidget; -class KLevelMeter_Private : public QObject { +class KLevelMeter_Private : public TQObject { Q_OBJECT public: Arts::KLevelMeter_impl* _impl; - QFrame* _frame; - QBoxLayout *_layout; + TQFrame* _frame; + TQBoxLayout *_layout; KLevelMeter_Template *_levelmeter; @@ -46,7 +46,7 @@ public: float _peakvalue; float _dbmin, _dbmax; - KLevelMeter_Private( Arts::KLevelMeter_impl* impl, QFrame* frame, Arts::LevelMeterStyle defstyle, QObject* =0, const char* =0 ); + KLevelMeter_Private( Arts::KLevelMeter_impl* impl, TQFrame* frame, Arts::LevelMeterStyle defstyle, TQObject* =0, const char* =0 ); void createWidget(); }; diff --git a/arts/gui/kde/klevelmeter_small.cpp b/arts/gui/kde/klevelmeter_small.cpp index 1c9c4817..c74dfa44 100644 --- a/arts/gui/kde/klevelmeter_small.cpp +++ b/arts/gui/kde/klevelmeter_small.cpp @@ -21,26 +21,26 @@ #include "klevelmeter_small.h" #include <kdebug.h> -#include <qpainter.h> +#include <tqpainter.h> -KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, QWidget* 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* "<<impl<<", QWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +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* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; } void KLevelMeter_Small::invalue( float n, float p ) { //kdDebug()<<"KLevelMeter_Small::invalue( float "<<n<<", float "<<p<<" )"<<endl; _peak = amptondb( p ); if ( n ) this->setBackgroundColor( color( amptondb( n ) ) ); - else this->setBackgroundColor( QColor( 0,255,0 ).dark() ); + else this->setBackgroundColor( TQColor( 0,255,0 ).dark() ); } -void KLevelMeter_Small::paintEvent( QPaintEvent* /*qpe*/ ) { -//kdDebug()<<"KLevelMeter_Small::paintEvent( QPaintEvent* "<<qpe<<" )"<<endl; +void KLevelMeter_Small::paintEvent( TQPaintEvent* /*qpe*/ ) { +//kdDebug()<<"KLevelMeter_Small::paintEvent( TQPaintEvent* "<<qpe<<" )"<<endl; if ( _peak && _peak <= 1.0 ) { - QPainter p( this ); - //p.setPen( QColor( 0,0,0 ) ); - QColor bgcolor = this->paletteBackgroundColor(); - p.setPen( QColor( 255-bgcolor.red(), 255-bgcolor.green(), 255-bgcolor.blue() ) ); + TQPainter p( this ); + //p.setPen( TQColor( 0,0,0 ) ); + TQColor bgcolor = this->paletteBackgroundColor(); + p.setPen( TQColor( 255-bgcolor.red(), 255-bgcolor.green(), 255-bgcolor.blue() ) ); if ( _dir==Arts::BottomToTop || _dir==Arts::TopToBottom ) { if ( _dir==Arts::BottomToTop ) p.translate( 0, rect().bottom() ); int h = int( this->height() * _peak ); diff --git a/arts/gui/kde/klevelmeter_small.h b/arts/gui/kde/klevelmeter_small.h index ba189dd6..1c2c20e6 100644 --- a/arts/gui/kde/klevelmeter_small.h +++ b/arts/gui/kde/klevelmeter_small.h @@ -26,11 +26,11 @@ class KLevelMeter_Small : public KLevelMeter_Template { Q_OBJECT public: - KLevelMeter_Small( Arts::KLevelMeter_impl*, QWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_Small( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); - void paintEvent( QPaintEvent* ); + void paintEvent( TQPaintEvent* ); private: float _peak; }; diff --git a/arts/gui/kde/klevelmeter_template.h b/arts/gui/kde/klevelmeter_template.h index 1b3915be..c822be40 100644 --- a/arts/gui/kde/klevelmeter_template.h +++ b/arts/gui/kde/klevelmeter_template.h @@ -21,7 +21,7 @@ #ifndef ARTS_KLEVELMETER_TEMPLATE_H #define ARTS_KLEVELMETER_TEMPLATE_H -#include <qwidget.h> +#include <tqwidget.h> #include <math.h> @@ -29,13 +29,13 @@ #include "klevelmeter_impl.h" -class KLevelMeter_Template : public QWidget, public dB2VolCalc { +class KLevelMeter_Template : public TQWidget, public dB2VolCalc { Q_OBJECT public: Arts::KLevelMeter_impl* _impl; - KLevelMeter_Template( Arts::KLevelMeter_impl* impl, QWidget* p, long /*substyle*/, long count, Arts::Direction dir, float _dbmin, float _dbmax ) - : QWidget( p ) + KLevelMeter_Template( Arts::KLevelMeter_impl* impl, TQWidget* p, long /*substyle*/, long count, Arts::Direction dir, float _dbmin, float _dbmax ) + : TQWidget( p ) , dB2VolCalc( _dbmin, _dbmax ) , _impl( impl ) , _count( count ) @@ -57,8 +57,8 @@ public: float nilline; /// Gives the colors between green and red - QColor color( float n ) { - return QColor( int( ( n<=nilline )?255*( 1/nilline )*n:255 ), + TQColor color( float n ) { + return TQColor( int( ( n<=nilline )?255*( 1/nilline )*n:255 ), int( ( n<=1 && n>nilline )?255-255*( 1/nilline )*( n-nilline ):( ( n>1 )?0:255 ) ), 0 ); } diff --git a/arts/gui/kde/klineedit_impl.cpp b/arts/gui/kde/klineedit_impl.cpp index 898879f7..e3643645 100644 --- a/arts/gui/kde/klineedit_impl.cpp +++ b/arts/gui/kde/klineedit_impl.cpp @@ -29,11 +29,11 @@ using namespace std; KLineEditStringMapper::KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ke) :impl(impl) { - connect(ke, SIGNAL(textChanged(const QString&)), - this, SLOT(textChanged(const QString&))); + connect(ke, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(textChanged(const TQString&))); } -void KLineEditStringMapper::textChanged(const QString& newText) +void KLineEditStringMapper::textChanged(const TQString& newText) { impl->textChanged(newText.utf8().data()); } @@ -52,7 +52,7 @@ string KLineEdit_impl::text() void KLineEdit_impl::text(const string& newText) { - _klineedit->setText(QString::fromUtf8(newText.c_str())); + _klineedit->setText(TQString::fromUtf8(newText.c_str())); } void KLineEdit_impl::textChanged(const string& newText) diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h index b9099ac2..2bd6b693 100644 --- a/arts/gui/kde/klineedit_impl.h +++ b/arts/gui/kde/klineedit_impl.h @@ -47,13 +47,13 @@ public: void textChanged(const std::string& newText); }; -class KLineEditStringMapper :public QObject { +class KLineEditStringMapper :public TQObject { Q_OBJECT KLineEdit_impl *impl; public: KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ed); public slots: - void textChanged(const QString& newText); + void textChanged(const TQString& newText); }; } diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp index 2c56c73e..23de74fc 100644 --- a/arts/gui/kde/kpopupbox_impl.cpp +++ b/arts/gui/kde/kpopupbox_impl.cpp @@ -22,7 +22,7 @@ #include "kpopupbox_impl.h" #include "kpopupbox_private.h" -#include <qlayout.h> +#include <tqlayout.h> using namespace Arts; @@ -54,25 +54,25 @@ void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widg // Following the private class: -KPopupBox_widget::KPopupBox_widget( QWidget *parent, const char* name ) : QFrame( parent,name ) +KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name ) { - this->setFrameShape( QFrame::Box ); + this->setFrameShape( TQFrame::Box ); this->setMargin( 1 ); this->setLineWidth( 1 ); - _titlebar = new QFrame( this ); - _titlebarlayout = new QBoxLayout( _titlebar, QBoxLayout::BottomToTop ); + _titlebar = new TQFrame( this ); + _titlebarlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop ); _titlebarlayout->setAutoAdd( true ); _showbutton = new ShowButton( _titlebar ); - connect( _showbutton, SIGNAL( toggled( bool ) ), this, SLOT( hide( bool ) ) ); + connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) ); _drag = new HandleDrag( _titlebar ); - connect( _drag, SIGNAL( clicked() ), _showbutton, SLOT( toggle() ) ); + connect( _drag, TQT_SIGNAL( clicked() ), _showbutton, TQT_SLOT( toggle() ) ); _ownbutton = new OwnButton( _titlebar ); - connect( _ownbutton, SIGNAL( toggled( bool ) ), this, SLOT( own( bool ) ) ); + connect( _ownbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( own( bool ) ) ); _artswidget = new OwnWidget( _showbutton, this ); - _layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); + _layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); _layout->addWidget( _titlebar , -1 ); _layout->addWidget( _artswidget, 20 ); _layout->addStretch( 0 ); @@ -85,18 +85,18 @@ Arts::Direction KPopupBox_widget::direction() { } void KPopupBox_widget::direction( Arts::Direction n ) { - _layout->setDirection( QBoxLayout::Direction( n ) ); - _showbutton->direction( QBoxLayout::Direction( n ) ); + _layout->setDirection( TQBoxLayout::Direction( n ) ); + _showbutton->direction( TQBoxLayout::Direction( n ) ); switch( n ) { case LeftToRight: case RightToLeft: - _titlebarlayout->setDirection( QBoxLayout::BottomToTop ); + _titlebarlayout->setDirection( TQBoxLayout::BottomToTop ); _drag->setMinimumHeight( 30 ); _drag->setMinimumWidth( 0 ); break; case TopToBottom: case BottomToTop: - _titlebarlayout->setDirection( QBoxLayout::RightToLeft ); + _titlebarlayout->setDirection( TQBoxLayout::RightToLeft ); _drag->setMinimumHeight( 0 ); _drag->setMinimumWidth( 30 ); } @@ -117,7 +117,7 @@ void KPopupBox_widget::own( bool n ) { _artswidget->reparent( 0, _artswidget->mapToGlobal( _artswidget->pos() ), !( _artswidget->isHidden() ) ); else { - _artswidget->reparent( this, QPoint( 0,0 ), !( _artswidget->isHidden() ) ); + _artswidget->reparent( this, TQPoint( 0,0 ), !( _artswidget->isHidden() ) ); _layout->insertWidget( 1, _artswidget, 20 ); } } diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h index 6b032912..a5072b05 100644 --- a/arts/gui/kde/kpopupbox_private.h +++ b/arts/gui/kde/kpopupbox_private.h @@ -30,13 +30,13 @@ class KArtsWidget; class OwnWidget; class QBoxLayout; -#include <qframe.h> +#include <tqframe.h> class KPopupBox_widget : public QFrame { Q_OBJECT public: - KPopupBox_widget( QWidget* =0, const char* =0); + KPopupBox_widget( TQWidget* =0, const char* =0); ~KPopupBox_widget(); Arts::Direction direction(); @@ -50,10 +50,10 @@ private slots: void hide( bool ); void own( bool ); private: - QBoxLayout *_layout; + TQBoxLayout *_layout; - QFrame *_titlebar; - QBoxLayout *_titlebarlayout; + TQFrame *_titlebar; + TQBoxLayout *_titlebarlayout; HandleDrag *_drag; ShowButton *_showbutton; OwnButton *_ownbutton; @@ -63,34 +63,34 @@ private: // See kpopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future... -/*class KPopupBoxEventMapper : public QObject { +/*class KPopupBoxEventMapper : public TQObject { Q_OBJECT public: KPopupBoxEventMapper( KPopupBox_widget *widget, Arts::KPopupBox_impl *impl ) - : QObject( widget,"" ), _widget( widget ), _impl( impl ) + : TQObject( widget,"" ), _widget( widget ), _impl( impl ) {} private: KPopupBox_widget *_widget; Arts::KPopupBox_impl *_impl; };*/ -#include <qpainter.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqstyle.h> -class HandleDrag : public QWidget { +class HandleDrag : public TQWidget { Q_OBJECT public: - HandleDrag( QWidget *parent, const char* name=0 ) : QWidget( parent,name ) {} - void paintEvent( QPaintEvent * ) { - QPainter p( this ); - QStyle::SFlags flags = QStyle::Style_Default; - if( width() < height() ) flags |= QStyle::Style_Horizontal; - style().drawPrimitive( QStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); + HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,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 ); } signals: void clicked(); protected: - virtual void mouseDoubleClickEvent( QMouseEvent * ) { + virtual void mouseDoubleClickEvent( TQMouseEvent * ) { emit clicked(); } }; @@ -103,76 +103,76 @@ static const char* const right_xpm[] = { "5 5 2 1", "# c black", ". c None", ". static const char* const inside_xpm[] = { "5 5 2 1", "# c black", ". c None", "#####", "#...#", "#...#", "#...#", "#####"}; static const char* const own_xpm[] = { "5 5 2 1", "# c black", ". c None", "###..", "#.###", "###.#", ".#..#", ".####"}; -#include <qpushbutton.h> -#include <qlayout.h> +#include <tqpushbutton.h> +#include <tqlayout.h> -class ShowButton : public QPushButton { +class ShowButton : public TQPushButton { Q_OBJECT private: - QBoxLayout::Direction _dir; - QPixmap _pmleft, _pmright, _pmup, _pmdown; + TQBoxLayout::Direction _dir; + TQPixmap _pmleft, _pmright, _pmup, _pmdown; public: - ShowButton( QWidget *parent, const char* name=0 ) : QPushButton( parent,name ), _dir( QBoxLayout::LeftToRight ) + ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) { - connect( this, SIGNAL( toggled( bool ) ), this, SLOT( owntoggle( bool ) ) ); + connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) ); setToggleButton( true ); - _pmleft = QPixmap( const_cast<const char**>( left_xpm ) ); - _pmright = QPixmap( const_cast<const char**>( right_xpm ) ); - _pmup = QPixmap( const_cast<const char**>( up_xpm ) ); - _pmdown = QPixmap( const_cast<const char**>( down_xpm ) ); + _pmleft = TQPixmap( const_cast<const char**>( left_xpm ) ); + _pmright = TQPixmap( const_cast<const char**>( right_xpm ) ); + _pmup = TQPixmap( const_cast<const char**>( up_xpm ) ); + _pmdown = TQPixmap( const_cast<const char**>( down_xpm ) ); setPixmap( _pmright ); } - void direction( QBoxLayout::Direction n ) { _dir=n; } + void direction( TQBoxLayout::Direction n ) { _dir=n; } public slots: void owntoggle( bool b ) { switch( _dir ) { - case QBoxLayout::BottomToTop: + case TQBoxLayout::BottomToTop: if( b ) setPixmap( _pmdown ); else setPixmap( _pmup ); break; - case QBoxLayout::TopToBottom: + case TQBoxLayout::TopToBottom: if( b ) setPixmap( _pmup ); else setPixmap( _pmdown ); break; - case QBoxLayout::LeftToRight: + case TQBoxLayout::LeftToRight: if( b ) setPixmap( _pmright ); else setPixmap( _pmleft ); break; - case QBoxLayout::RightToLeft: + case TQBoxLayout::RightToLeft: if( b ) setPixmap( _pmleft ); else setPixmap( _pmright ); break; } } public: - QSize minimumSizeHint() const { - int wh = style().pixelMetric( QStyle::PM_DockWindowHandleExtent, this ); - return QSize( wh, wh ); + TQSize minimumSizeHint() const { + int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + return TQSize( wh, wh ); } - QSizePolicy sizePolicy() const { return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); } - QSize minimumSize() const { return minimumSizeHint(); } - QSize sizeHint() const { return minimumSize(); } + TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } - void drawButton( QPainter * p ) + void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), QBrush( colorGroup().brush( QColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; -class OwnButton : public QPushButton { +class OwnButton : public TQPushButton { Q_OBJECT private: - QPixmap _pmown, _pminside; + TQPixmap _pmown, _pminside; public: - OwnButton( QWidget *parent, const char* name=0 ) : QPushButton( parent,name ) + OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ) { - connect( this, SIGNAL( toggled( bool ) ), this, SLOT( toggle( bool ) ) ); + connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) ); setToggleButton( true ); - _pmown = QPixmap( const_cast<const char**>( own_xpm ) ); - _pminside = QPixmap( const_cast<const char**>( inside_xpm ) ); + _pmown = TQPixmap( const_cast<const char**>( own_xpm ) ); + _pminside = TQPixmap( const_cast<const char**>( inside_xpm ) ); setPixmap( _pmown ); } @@ -182,17 +182,17 @@ public slots: else setPixmap( _pmown ); } public: - QSize minimumSizeHint() const { - int wh = style().pixelMetric( QStyle::PM_DockWindowHandleExtent, this ); - return QSize( wh, wh ); + TQSize minimumSizeHint() const { + int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + return TQSize( wh, wh ); } - QSizePolicy sizePolicy() const { return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); } - QSize minimumSize() const { return minimumSizeHint(); } - QSize sizeHint() const { return minimumSize(); } + TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } - void drawButton( QPainter * p ) + void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), QBrush( colorGroup().brush( QColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; @@ -204,10 +204,10 @@ class OwnWidget : public KArtsWidget Q_OBJECT ShowButton *_b; public: - OwnWidget( ShowButton* b, QWidget* p, const char* n=0, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; } + OwnWidget( ShowButton* b, TQWidget* p, const char* n=0, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; } ~OwnWidget() {} public slots: - void closeEvent( QCloseEvent * ) { _b->toggle(); } + void closeEvent( TQCloseEvent * ) { _b->toggle(); } }; #endif diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index e12c1bf5..462d640b 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -20,15 +20,15 @@ #include "kpoti.h" #include "kpoti.moc" -#include <qbitmap.h> -#include <qpainter.h> -#include <qcolor.h> -#include <qdrawutil.h> -#include <qtimer.h> -#include <qkeycode.h> -#include <qpen.h> -#include <qstring.h> -#include <qstyle.h> +#include <tqbitmap.h> +#include <tqpainter.h> +#include <tqcolor.h> +#include <tqdrawutil.h> +#include <tqtimer.h> +#include <tqkeycode.h> +#include <tqpen.h> +#include <tqstring.h> +#include <tqstyle.h> #include <math.h> @@ -53,18 +53,18 @@ struct KPoti::KPotiPrivate bool bgDirty; KPixmap bgdb; - KPixmap bgPixmap( const QColorGroup & colorGroup ) + KPixmap bgPixmap( const TQColorGroup & colorGroup ) { if( bgDirty || bgdb.isNull() ) { bgdb.resize( buttonRect.size() ); - QPainter dbp( &bgdb ); + TQPainter dbp( &bgdb ); dbp.setPen( Qt::NoPen ); - QRect drawRect = bgdb.rect(); + TQRect drawRect = bgdb.rect(); // create mask - QBitmap mask( bgdb.size(), true ); - QPainter maskpainter( &mask ); + TQBitmap mask( bgdb.size(), true ); + TQPainter maskpainter( &mask ); maskpainter.setPen( Qt::NoPen ); maskpainter.setBrush( Qt::color1 ); maskpainter.drawEllipse( drawRect ); @@ -74,7 +74,7 @@ struct KPoti::KPotiPrivate // inset shadow KPixmap gradient( bgdb.size() ); KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient ); - dbp.setBrush( QBrush( colorGroup.button(), gradient ) ); + dbp.setBrush( TQBrush( colorGroup.button(), gradient ) ); dbp.drawEllipse( drawRect ); potiRect.setSize( drawRect.size() * 0.9 ); @@ -90,7 +90,7 @@ struct KPoti::KPotiPrivate return bgdb; } - QColor potiColor; + TQColor potiColor; bool potiDirty; KPixmap potidb; KPixmap potiPixmap() @@ -98,13 +98,13 @@ struct KPoti::KPotiPrivate if( ( potiDirty || potidb.isNull() ) && ! potiRect.size().isEmpty() ) { potidb.resize( potiRect.size() ); - QPainter dbp( &potidb ); + TQPainter dbp( &potidb ); dbp.setPen( Qt::NoPen ); - QRect drawRect( potidb.rect() ); + TQRect drawRect( potidb.rect() ); // create mask - QBitmap mask( potidb.size(), true ); - QPainter maskpainter( &mask ); + TQBitmap mask( potidb.size(), true ); + TQPainter maskpainter( &mask ); maskpainter.setPen( Qt::NoPen ); maskpainter.setBrush( Qt::color1 ); maskpainter.drawEllipse( drawRect ); @@ -113,7 +113,7 @@ struct KPoti::KPotiPrivate KPixmap gradient( potidb.size() ); KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient ); - dbp.setBrush( QBrush( potiColor, gradient ) ); + dbp.setBrush( TQBrush( potiColor, gradient ) ); dbp.drawEllipse( drawRect ); potiDirty = false; @@ -121,45 +121,45 @@ struct KPoti::KPotiPrivate return potidb; } - QRect buttonRect; - QRect potiRect; - QRect labelRect; - QString label; - QPoint center; + TQRect buttonRect; + TQRect potiRect; + TQRect labelRect; + TQString label; + TQPoint center; }; -QSizePolicy KPoti::sizePolicy() const +TQSizePolicy KPoti::sizePolicy() const { - return QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); + return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); } -QSize KPoti::sizeHint() const +TQSize KPoti::sizeHint() const { return minimumSizeHint(); } -QSize KPoti::minimumSizeHint() const +TQSize KPoti::minimumSizeHint() const { int width = 40; int height = 40; if( m_bLabel ) { - QFontMetrics metrics( font() ); + TQFontMetrics metrics( font() ); d->labelRect = metrics.boundingRect( d->label ); d->labelRect.setHeight( metrics.lineSpacing() ); width = KMAX( width, d->labelRect.width() + frameRect().width() - contentsRect().width() ); height += metrics.lineSpacing(); } //kdDebug() << k_funcinfo << "return " << width << "x" << height << endl; - return QSize( width, height ); + return TQSize( width, height ); } -QString KPoti::text() const +TQString KPoti::text() const { return d->label; } -void KPoti::setText( const QString & text ) +void KPoti::setText( const TQString & text ) { d->label = text; setMinimumSize( minimumSizeHint() ); @@ -169,10 +169,10 @@ void KPoti::setText( const QString & text ) /** Constructs a poti. - The \e parent and \e name arguments are sent to the QWidget constructor. + The \e parent and \e name arguments are sent to the TQWidget constructor. */ -KPoti::KPoti( QWidget *parent, const char *name ) - : QFrame( parent, name, WResizeNoErase | WRepaintNoErase ) +KPoti::KPoti( TQWidget *parent, const char *name ) + : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) , d( 0 ) { init(); @@ -188,13 +188,13 @@ KPoti::KPoti( QWidget *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 QWidget constructor. + The \e parent and \e name arguments are sent to the TQWidget constructor. */ KPoti::KPoti( int minValue, int maxValue, int step, - int value, QWidget *parent, const char *name ) - : QFrame( parent, name, WResizeNoErase | WRepaintNoErase ) - , QRangeControl( minValue, maxValue, 1, step, value ) + int value, TQWidget *parent, const char *name ) + : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) + , TQRangeControl( minValue, maxValue, 1, step, value ) , d( 0 ) { init(value); @@ -233,7 +233,7 @@ void KPoti::init(int value) void KPoti::initTicks() { - QRect available = contentsRect(); + TQRect available = contentsRect(); if( m_bLabel ) available.rTop() += d->labelRect.height(); d->center = available.center(); @@ -336,7 +336,7 @@ int KPoti::valueFromPosition( float p ) const } /*! - Implements the virtual QRangeControl function. + Implements the virtual TQRangeControl function. */ void KPoti::rangeChange() @@ -347,7 +347,7 @@ void KPoti::rangeChange() } } -void KPoti::paletteChange( const QPalette & ) +void KPoti::paletteChange( const TQPalette & ) { d->bgDirty = true; d->potiDirty = true; @@ -372,7 +372,7 @@ void KPoti::valueChange() Handles resize events for the poti. */ -void KPoti::resizeEvent( QResizeEvent * ) +void KPoti::resizeEvent( TQResizeEvent * ) { rangeChange(); initTicks(); @@ -387,7 +387,7 @@ void KPoti::setLabel(bool s) /** Sets the color of the button */ -void KPoti::setColor( const QColor &c ) +void KPoti::setColor( const TQColor &c ) { d->potiColor = c; d->potiDirty = true; @@ -395,7 +395,7 @@ void KPoti::setColor( const QColor &c ) } -void KPoti::paintPoti( QPainter * p ) +void KPoti::paintPoti( TQPainter * p ) { if( isVisible() ) { @@ -403,11 +403,11 @@ void KPoti::paintPoti( QPainter * p ) if( db.isNull() ) return; - QPainter p2( &db ); + TQPainter p2( &db ); p2.translate( db.rect().center().x(), db.rect().center().y() ); p2.rotate( potiPos * 180.0 / PI ); - QRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 ); - QBrush buttonbrush( colorGroup().button() ); + 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 ); p2.end(); @@ -421,7 +421,7 @@ void KPoti::paintPoti( QPainter * p ) void KPoti::reallyMovePoti( float newPos ) { - QPainter p; + TQPainter p; p.begin( this ); p.setPen(NoPen); potiPos = newPos; @@ -436,15 +436,15 @@ void KPoti::reallyMovePoti( float newPos ) Handles paint events for the slider. */ -void KPoti::drawContents( QPainter * p ) +void KPoti::drawContents( TQPainter * p ) { - QPixmap doublebuffer( contentsRect().size() ); + TQPixmap doublebuffer( contentsRect().size() ); doublebuffer.fill( colorGroup().background() ); - QPainter dbp( &doublebuffer ); + TQPainter dbp( &doublebuffer ); if( m_bLabel ) { dbp.setFont( font() ); - QFontMetrics metrics = dbp.fontMetrics(); + TQFontMetrics metrics = dbp.fontMetrics(); dbp.drawText( contentsRect().x() - metrics.leftBearing( d->label[ 0 ] ) + ( contentsRect().width() - d->labelRect.width() ) / 2, metrics.height(), d->label ); } @@ -457,7 +457,7 @@ void KPoti::drawContents( QPainter * p ) dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); if( hasFocus() ) - style().drawPrimitive( QStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); paintPoti( &dbp ); dbp.end(); @@ -469,7 +469,7 @@ void KPoti::drawContents( QPainter * p ) Handles mouse press events for the slider. */ -void KPoti::mousePressEvent( QMouseEvent *e ) +void KPoti::mousePressEvent( TQMouseEvent *e ) { resetState(); @@ -493,15 +493,15 @@ void KPoti::mousePressEvent( QMouseEvent *e ) state = TimingDown; subtractPage(); if ( !timer ) - timer = new QTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + timer = new TQTimer( this ); + connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } else { state = TimingUp; addPage(); if ( !timer ) - timer = new QTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + timer = new TQTimer( this ); + connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } } @@ -509,7 +509,7 @@ void KPoti::mousePressEvent( QMouseEvent *e ) /*! Handles mouse move events for the slider. */ -void KPoti::mouseMoveEvent( QMouseEvent *e ) +void KPoti::mouseMoveEvent( TQMouseEvent *e ) { if ( (e->state() & MidButton) ) { // middle button wins @@ -532,29 +532,29 @@ void KPoti::mouseMoveEvent( QMouseEvent *e ) Handles mouse release events for the slider. */ -void KPoti::mouseReleaseEvent( QMouseEvent *e ) +void KPoti::mouseReleaseEvent( TQMouseEvent *e ) { if ( !(e->button() & LeftButton) ) return; resetState(); } -void KPoti::focusInEvent( QFocusEvent * e ) +void KPoti::focusInEvent( TQFocusEvent * e ) { //setFrameStyle( Raised | Box ); //setLineWidth( 1 ); - QFrame::focusInEvent( e ); + TQFrame::focusInEvent( e ); } -void KPoti::focusOutEvent( QFocusEvent * e ) +void KPoti::focusOutEvent( TQFocusEvent * e ) { //setFrameStyle( NoFrame ); //setLineWidth( 0 ); - QFrame::focusOutEvent( e ); + TQFrame::focusOutEvent( e ); } -void KPoti::enterEvent( QEvent * ) +void KPoti::enterEvent( TQEvent * ) { emit mouseEntered( potiVal ); } @@ -616,7 +616,7 @@ void KPoti::resetState() Handles key press events for the slider. */ -void KPoti::keyPressEvent( QKeyEvent *e ) +void KPoti::keyPressEvent( TQKeyEvent *e ) { switch ( e->key() ) { @@ -656,12 +656,12 @@ void KPoti::keyPressEvent( QKeyEvent *e ) /*! - Makes QRangeControl::setValue() available as a slot. + Makes TQRangeControl::setValue() available as a slot. */ void KPoti::setValue( int value ) { - QRangeControl::setValue( value ); + TQRangeControl::setValue( value ); } @@ -694,9 +694,9 @@ void KPoti::repeatTimeout() Q_ASSERT( timer ); timer->disconnect(); if ( state == TimingDown ) - connect( timer, SIGNAL(timeout()), SLOT(subtractStep()) ); + connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(subtractStep()) ); else if ( state == TimingUp ) - connect( timer, SIGNAL(timeout()), SLOT(addStep()) ); + connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(addStep()) ); timer->start( repeatTime, FALSE ); } @@ -708,7 +708,7 @@ void KPoti::repeatTimeout() of the widget, using \a w pixels and \a i intervals. */ -void KPoti::drawTicks( QPainter *p, double dist, double w, int i ) const +void KPoti::drawTicks( TQPainter *p, double dist, double w, int i ) const { p->setPen( colorGroup().foreground() ); double angle,s,c; @@ -725,7 +725,7 @@ void KPoti::drawTicks( QPainter *p, double dist, double w, int i ) const } } -void KPoti::wheelEvent(QWheelEvent *e) +void KPoti::wheelEvent(TQWheelEvent *e) { setValue(value()+e->delta()/120*8); } @@ -760,7 +760,7 @@ void KPoti::setTickmarks( bool s ) not a pixel interval. If \a i is 0, the slider will choose between lineStep() and pageStep(). The initial value of tickInterval() is 0. - \sa tickInterval(), QRangeControl::lineStep(), QRangeControl::pageStep() + \sa tickInterval(), TQRangeControl::lineStep(), TQRangeControl::pageStep() */ void KPoti::setTickInterval( int i ) diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index a87b5162..278d6350 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -20,29 +20,29 @@ #ifndef _KPOTI_H #define _KPOTI_H -#include <qframe.h> -#include <qrangecontrol.h> +#include <tqframe.h> +#include <tqrangecontrol.h> class QTimer; struct QPotiData; -class KPoti : public QFrame, public QRangeControl +class KPoti : public TQFrame, public QRangeControl { Q_OBJECT public: - KPoti( QWidget *parent=0, const char *name=0 ); + KPoti( TQWidget *parent=0, const char *name=0 ); KPoti( int minValue, int maxValue, int step, int value, - QWidget *parent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); ~KPoti(); void setTracking( bool enable ); bool tracking() const; - void setColor( const QColor & ); + void setColor( const TQColor & ); virtual void setTickmarks( bool ); virtual void setLabel( bool ); @@ -51,16 +51,16 @@ public: virtual void setTickInterval( int ); int tickInterval() const { return tickInt; } - virtual QSizePolicy sizePolicy() const; - virtual QSize sizeHint() const; - virtual QSize minimumSizeHint() const; - QString text() const; + virtual TQSizePolicy sizePolicy() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; + TQString text() const; public slots: void setValue( int ); void addStep(); void subtractStep(); - void setText( const QString & ); + void setText( const TQString & ); signals: void valueChanged( int value ); @@ -70,29 +70,29 @@ signals: void mouseEntered(int value); protected: - void resizeEvent( QResizeEvent * ); - void drawContents( QPainter * ); + void resizeEvent( TQResizeEvent * ); + void drawContents( TQPainter * ); - void keyPressEvent( QKeyEvent * ); + void keyPressEvent( TQKeyEvent * ); - void mousePressEvent( QMouseEvent * ); - void mouseReleaseEvent( QMouseEvent * ); - void mouseMoveEvent( QMouseEvent * ); - void enterEvent( QEvent *); + void mousePressEvent( TQMouseEvent * ); + void mouseReleaseEvent( TQMouseEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void enterEvent( TQEvent *); - void focusInEvent( QFocusEvent *e ); - void focusOutEvent( QFocusEvent *e ); + void focusInEvent( TQFocusEvent *e ); + void focusOutEvent( TQFocusEvent *e ); void valueChange(); void rangeChange(); - virtual void paletteChange( const QPalette & ); + virtual void paletteChange( const TQPalette & ); - virtual void paintPoti( QPainter * ); - void drawButton( QPainter *); - void drawTicks( QPainter *, double, double, int=1 ) const; + virtual void paintPoti( TQPainter * ); + void drawButton( TQPainter *); + void drawTicks( TQPainter *, double, double, int=1 ) const; - virtual void wheelEvent(QWheelEvent *e); + virtual void wheelEvent(TQWheelEvent *e); private slots: void repeatTimeout(); diff --git a/arts/gui/kde/kpoti_impl.cpp b/arts/gui/kde/kpoti_impl.cpp index ba904f7a..ffac2a20 100644 --- a/arts/gui/kde/kpoti_impl.cpp +++ b/arts/gui/kde/kpoti_impl.cpp @@ -32,10 +32,10 @@ using namespace Arts; using namespace std; PotiIntMapper::PotiIntMapper(KPoti_impl *impl, KPoti *kp) - : QObject( kp ) + : TQObject( kp ) , impl( impl ) { - connect(kp, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); + connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } void PotiIntMapper::valueChanged(int pos) @@ -62,7 +62,7 @@ string KPoti_impl::caption() void KPoti_impl::caption(const string& newText) { - _caption = QString::fromUtf8( newText.c_str() ); + _caption = TQString::fromUtf8( newText.c_str() ); _kpoti->setText( _caption ); } @@ -76,7 +76,7 @@ void KPoti_impl::color(const string& newColor) _color = newColor; if(strlen(_color.c_str())) { - QColor qc(_color.c_str()); + TQColor qc(_color.c_str()); _kpoti->setColor(qc); } } diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h index a87972c5..0502cdc8 100644 --- a/arts/gui/kde/kpoti_impl.h +++ b/arts/gui/kde/kpoti_impl.h @@ -26,15 +26,15 @@ #include "kframe_impl.h" #include "kpoti.h" -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> namespace Arts { class KPoti_impl; -class PotiIntMapper :public QObject { +class PotiIntMapper :public TQObject { Q_OBJECT KPoti_impl *impl; public: @@ -48,7 +48,7 @@ class KPoti_impl : virtual public Arts::Poti_skel, { protected: KPoti * _kpoti; - QString _caption; + TQString _caption; std::string _color; float _min, _max, _value; float _factor; diff --git a/arts/gui/kde/kspinbox_impl.cpp b/arts/gui/kde/kspinbox_impl.cpp index cd8c90c5..db40ae10 100644 --- a/arts/gui/kde/kspinbox_impl.cpp +++ b/arts/gui/kde/kspinbox_impl.cpp @@ -29,10 +29,10 @@ using namespace Arts; using namespace std; -SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, QSpinBox *sp) +SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp) :impl(impl) { - connect(sp, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); + connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } void SpinBoxIntMapper::valueChanged(int pos) @@ -40,11 +40,11 @@ void SpinBoxIntMapper::valueChanged(int pos) impl->valueChanged(pos); } -KSpinBox_impl::KSpinBox_impl( QSpinBox * widget ) - : KWidget_impl( widget ? widget : new QSpinBox ) +KSpinBox_impl::KSpinBox_impl( TQSpinBox * widget ) + : KWidget_impl( widget ? widget : new TQSpinBox ) { _min = 0; _max = 100; _value = 0; - _qspinbox = static_cast<QSpinBox*>( _qwidget ); + _qspinbox = static_cast<TQSpinBox*>( _qwidget ); _qspinbox->setRange( 0, 100 ); ( void )new SpinBoxIntMapper( this, _qspinbox ); } @@ -56,7 +56,7 @@ string KSpinBox_impl::caption() void KSpinBox_impl::caption(const string& newCaption) { - _caption = QString::fromUtf8(newCaption.c_str()); + _caption = TQString::fromUtf8(newCaption.c_str()); // FIXME: do something with the caption here } diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h index ef662a10..d200c6f3 100644 --- a/arts/gui/kde/kspinbox_impl.h +++ b/arts/gui/kde/kspinbox_impl.h @@ -25,19 +25,19 @@ #define ARTS_GUI_KSPINBOX_IMPL_H #include "kwidget_impl.h" -#include <qspinbox.h> -#include <qobject.h> -#include <qstring.h> +#include <tqspinbox.h> +#include <tqobject.h> +#include <tqstring.h> namespace Arts { class KSpinBox_impl; -class SpinBoxIntMapper :public QObject { +class SpinBoxIntMapper :public TQObject { Q_OBJECT KSpinBox_impl *impl; public: - SpinBoxIntMapper(KSpinBox_impl *impl, QSpinBox *sp); + SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp); public slots: void valueChanged(int x); }; @@ -46,14 +46,14 @@ class KSpinBox_impl : virtual public Arts::SpinBox_skel, public Arts::KWidget_impl { protected: - QSpinBox * _qspinbox; - QString _caption; + TQSpinBox * _qspinbox; + TQString _caption; long _min, _max, _value; void applyValue(); public: - KSpinBox_impl( QSpinBox * w = 0 ); + KSpinBox_impl( TQSpinBox * w = 0 ); void constructor( Widget p ) { parent( p ); } std::string caption(); diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp index 4db81ee0..1a95c2a6 100644 --- a/arts/gui/kde/ktickmarks_impl.cpp +++ b/arts/gui/kde/ktickmarks_impl.cpp @@ -21,13 +21,13 @@ #include "ktickmarks_impl.h" #include <kdebug.h> -#include <qpainter.h> -#include <qfont.h> -#include <qfontmetrics.h> +#include <tqpainter.h> +#include <tqfont.h> +#include <tqfontmetrics.h> -KTickmarks_impl::KTickmarks_impl( QFrame* w ) : Arts::KFrame_impl( w ? w : new KTickmarks_Widget( 0 ) ) +KTickmarks_impl::KTickmarks_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new KTickmarks_Widget( 0 ) ) { - //kdDebug()<<"KTickmarks_impl::KTickmarks_impl( QFrame* w="<<w<<" )"<<endl; + //kdDebug()<<"KTickmarks_impl::KTickmarks_impl( TQFrame* w="<<w<<" )"<<endl; _tmwidget = static_cast<KTickmarks_Widget*>( _qwidget ); } @@ -50,22 +50,22 @@ void KTickmarks_impl::constructor( float min, float max, Arts::Direction dir, lo this->min( min ); this->max( max ); direction( dir ); position( pos ); } -KTickmarks_Widget::KTickmarks_Widget( KTickmarks_impl* impl, QWidget* p, const char* n ) : QFrame( p,n ), dB2VolCalc( -24, 0 ), _impl( impl ), _pos( Arts::posLeft ), _dir( Arts::BottomToTop ), minstep( 1 ), substep( 0.5 ) { +KTickmarks_Widget::KTickmarks_Widget( KTickmarks_impl* impl, TQWidget* p, const char* n ) : TQFrame( p,n ), dB2VolCalc( -24, 0 ), _impl( impl ), _pos( Arts::posLeft ), _dir( Arts::BottomToTop ), minstep( 1 ), substep( 0.5 ) { setMinimumSize( 20,20 ); } -void KTickmarks_Widget::drawContents( QPainter* p ) { - //kdDebug()<<"KTickmarks::drawContents( QPainter* "<<p<<" )"<<endl; +void KTickmarks_Widget::drawContents( TQPainter* p ) { + //kdDebug()<<"KTickmarks::drawContents( TQPainter* "<<p<<" )"<<endl; bool left=false, right=false; if ( _pos&Arts::posLeft ) left=true; if ( _pos&Arts::posRight ) right=true; // Setting the font - QFont font; + TQFont font; font.setPixelSize( 8 /*font.pixelSize()/2*/ ); // Maybe this could be adjusted... p->setFont( font ); // Determining the size of the largest text (currently the text at the minimum-scale) - QFontMetrics fontmetric( font ); - QRect fontrect = fontmetric.boundingRect( QString::number( dbmin ) ); + TQFontMetrics fontmetric( font ); + TQRect fontrect = fontmetric.boundingRect( TQString::number( dbmin ) ); // Calculating stepsizes float _minstepcount = ( dbmax-dbmin )/minstep; float _minstep = minstep; // this value gets changed @@ -75,8 +75,8 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { int _minsize; // Shorcuts int w,h; - QColor colornormal = colorGroup().foreground(); - QColor colordiff = colorGroup().buttonText(); + TQColor colornormal = colorGroup().foreground(); + TQColor colordiff = colorGroup().buttonText(); if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) { p->translate( contentsRect().left(), contentsRect().bottom() ); @@ -95,7 +95,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { w = contentsRect().width(); // Just a shortcut h=0; // Painting substep marks - p->setPen( QPen( colordiff, 1 ) ); + p->setPen( TQPen( colordiff, 1 ) ); for ( float i=dbmax; i>=dbmin; i-=_substep ) { h = int( -contentsRect().height() * dbtondb( i ) ); if ( _dir==Arts::TopToBottom ) h = 1 - h; @@ -103,7 +103,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { if ( right ) p->drawLine( w-3, h, w, h ); } // Painting step marks and texts - p->setPen( QPen( colornormal, 1 ) ); + p->setPen( TQPen( colornormal, 1 ) ); for ( float i=0; i>=dbmin; i-=_minstep ) { h = int( -contentsRect().height() * dbtondb( i ) ); if ( _dir==Arts::TopToBottom ) h = 1 - h; @@ -111,7 +111,7 @@ void KTickmarks_Widget::drawContents( QPainter* 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, QString::number( i ) ); + Qt::AlignRight|Qt::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( QPainter* 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, QString::number( i ) ); + Qt::AlignRight|Qt::AlignTop, TQString::number( i ) ); if ( right ) p->drawLine( w-6, h, w, h ); } } else { @@ -141,7 +141,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { w = 0; // Just a shortcut h = frameWidth() + contentsRect().height(); // Painting substep marks - p->setPen( QPen( colordiff, 1 ) ); + p->setPen( TQPen( colordiff, 1 ) ); for ( float i=dbmax; i>=dbmin; i-=_substep ) { w = this->frameWidth()+ int( contentsRect().width() * dbtondb( i ) ); if ( _dir==Arts::RightToLeft ) w = 1 - w; @@ -149,7 +149,7 @@ void KTickmarks_Widget::drawContents( QPainter* p ) { if ( right ) p->drawLine( w, h-3, w, h ); } // Painting step marks and texts - p->setPen( QPen( colornormal, 1 ) ); + p->setPen( TQPen( colornormal, 1 ) ); for ( float i=0; i>=dbmin; i-=_minstep ) { w = int( contentsRect().width() * dbtondb( i ) ); if ( _dir==Arts::RightToLeft ) w = 1 - w; @@ -157,7 +157,7 @@ void KTickmarks_Widget::drawContents( QPainter* 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, QString::number( i ) ); + Qt::AlignRight|Qt::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( QPainter* 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, QString::number( i ) ); + Qt::AlignRight|Qt::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 b85e302a..1d0006a1 100644 --- a/arts/gui/kde/ktickmarks_impl.h +++ b/arts/gui/kde/ktickmarks_impl.h @@ -21,7 +21,7 @@ #ifndef ARTS_KLEVELMETER_TICKMARKS_H #define ARTS_KLEVELMETER_TICKMARKS_H -#include <qframe.h> +#include <tqframe.h> #include <math.h> #include "artsgui.h" @@ -36,7 +36,7 @@ class KTickmarks_impl : virtual public Arts::Tickmarks_skel, virtual public Arts::KFrame_impl { public: - KTickmarks_impl( QFrame* =0 ); + KTickmarks_impl( TQFrame* =0 ); float min(); void min( float ); @@ -59,13 +59,13 @@ private: KTickmarks_Widget* _tmwidget; }; -class KTickmarks_Widget : public QFrame, public dB2VolCalc { +class KTickmarks_Widget : public TQFrame, public dB2VolCalc { Q_OBJECT private: KTickmarks_impl* _impl; public: - KTickmarks_Widget( KTickmarks_impl*, QWidget* =0, const char* =0 ); - void drawContents( QPainter* ); + KTickmarks_Widget( KTickmarks_impl*, TQWidget* =0, const char* =0 ); + void drawContents( TQPainter* ); long _pos; Arts::Direction _dir; diff --git a/arts/gui/kde/kvbox_impl.cpp b/arts/gui/kde/kvbox_impl.cpp index 6d1b0606..b1dc6dd4 100644 --- a/arts/gui/kde/kvbox_impl.cpp +++ b/arts/gui/kde/kvbox_impl.cpp @@ -22,15 +22,15 @@ */ #include "kvbox_impl.h" -#include <qvbox.h> +#include <tqvbox.h> using namespace Arts; -KVBox_impl::KVBox_impl( QVBox * widget ) - : KFrame_impl( widget ? widget : new QVBox ) +KVBox_impl::KVBox_impl( TQVBox * widget ) + : KFrame_impl( widget ? widget : new TQVBox ) , _spacing( 5 ) { - _qvbox = static_cast<QVBox*>( _qwidget ); + _qvbox = static_cast<TQVBox*>( _qwidget ); _qvbox->setSpacing( _spacing ); _qvbox->setMargin( 5 ); } diff --git a/arts/gui/kde/kvbox_impl.h b/arts/gui/kde/kvbox_impl.h index e9480419..8f9c5b48 100644 --- a/arts/gui/kde/kvbox_impl.h +++ b/arts/gui/kde/kvbox_impl.h @@ -34,10 +34,10 @@ private: long _spacing; protected: - QVBox * _qvbox; + TQVBox * _qvbox; public: - KVBox_impl( QVBox * w = 0 ); + KVBox_impl( TQVBox * w = 0 ); long spacing(); void spacing( long ); diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 1b5cf7fe..1c32f23d 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -21,17 +21,17 @@ #include "kvolumefader_impl.h" #include <kdebug.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qfont.h> -#include <qfontmetrics.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqfont.h> +#include <tqfontmetrics.h> #include <kglobalsettings.h> #include <klocale.h> #include <kpopupmenu.h> #include <kaction.h> #include <kinputdialog.h> -KVolumeFader_impl::KVolumeFader_impl( QFrame* w ) +KVolumeFader_impl::KVolumeFader_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new KVolumeFader_Widget( 0 ) ) , dB2VolCalc( -36, 6 ) , _dir( Arts::BottomToTop ) @@ -40,7 +40,7 @@ KVolumeFader_impl::KVolumeFader_impl( QFrame* w ) , direction_inupdate( false ) , ignoreUpdates( 0 ) { - //kdDebug()<<"KVolumeFader_impl::KVolumeFader_impl( QFrame* w="<<w<<" )"<<endl; + //kdDebug()<<"KVolumeFader_impl::KVolumeFader_impl( TQFrame* w="<<w<<" )"<<endl; _vfwidget = static_cast<KVolumeFader_Widget*>( _qwidget ); _vfwidget->setImpl( this ); } @@ -114,14 +114,14 @@ void KVolumeFader_impl::constructor( float dbmin, float dbmax, Arts::Direction d -KVolumeFader_Widget::KVolumeFader_Widget( QWidget* p, const char* n ) - : QFrame( p,n ) +KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n ) + : TQFrame( p,n ) , _impl( 0 ) , _inupdate( false ) , _value( -1 ) , _dir( Arts::BottomToTop ) , _menu( new KPopupMenu( this ) ) - , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), this, SLOT( exactValue() ), this ) ) + , _aExactValue( new KAction( i18n( "Set Exact Value..." ), KShortcut(), this, TQT_SLOT( exactValue() ), this ) ) { //kdDebug() << k_funcinfo << endl; setMinimumSize( 10,10 ); @@ -144,16 +144,16 @@ void KVolumeFader_Widget::setValue( float n ) { } } -QColor KVolumeFader_Widget::interpolate( QColor low, QColor high, float percent ) { +TQColor KVolumeFader_Widget::interpolate( TQColor low, TQColor high, float percent ) { if ( percent<=0 ) return low; else if ( percent>=1 ) return high; else - return QColor( + return TQColor( int( low.red() + ( high.red()-low.red() ) * percent ), int( low.green() + ( high.green()-low.green() ) * percent ), int( low.blue() + ( high.blue()-low.blue() ) * percent ) ); } -void KVolumeFader_Widget::drawContents( QPainter* p ){ +void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::BottomToTop || _dir==Arts::BottomToTop ) { float h; if ( _dir==Arts::BottomToTop ) h = contentsRect().height() * ( 1 - _value ); @@ -178,11 +178,11 @@ void KVolumeFader_Widget::drawContents( QPainter* p ){ } } -void KVolumeFader_Widget::mousePressEvent( QMouseEvent* ){ +void KVolumeFader_Widget::mousePressEvent( TQMouseEvent* ){ //kdDebug() << k_funcinfo << endl; } -void KVolumeFader_Widget::mouseReleaseEvent( QMouseEvent* qme ){ +void KVolumeFader_Widget::mouseReleaseEvent( TQMouseEvent* qme ){ bool setValue = false; if ( KGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true; if ( KGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true; @@ -206,7 +206,7 @@ void KVolumeFader_Widget::mouseReleaseEvent( QMouseEvent* qme ){ } else _menu->exec( qme->globalPos() ); } -void KVolumeFader_Widget::mouseMoveEvent( QMouseEvent* qme ){ +void KVolumeFader_Widget::mouseMoveEvent( TQMouseEvent* qme ){ switch ( _dir ) { default: case Arts::BottomToTop: @@ -224,7 +224,7 @@ void KVolumeFader_Widget::mouseMoveEvent( QMouseEvent* qme ){ } } -void KVolumeFader_Widget::wheelEvent( QWheelEvent* qwe ){ +void KVolumeFader_Widget::wheelEvent( TQWheelEvent* qwe ){ //kdDebug() << k_funcinfo << endl; if ( qwe->delta() < 0 ) { if ( _impl ) _impl->normalizedvolume( _impl->dbtondb( _impl->dbvolume() - 1 ) ); } if ( qwe->delta() > 0 ) { if ( _impl ) _impl->normalizedvolume( _impl->dbtondb( _impl->dbvolume() + 1 ) ); } diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h index 603ac28e..c2db6a0b 100644 --- a/arts/gui/kde/kvolumefader_impl.h +++ b/arts/gui/kde/kvolumefader_impl.h @@ -21,7 +21,7 @@ #ifndef ARTS_KVOLUMEFADER_TICKMARKS_H #define ARTS_KVOLUMEFADER_TICKMARKS_H -#include <qframe.h> +#include <tqframe.h> #include <math.h> #include "artsgui.h" @@ -37,7 +37,7 @@ class KVolumeFader_impl : virtual public Arts::VolumeFader_skel, public dB2VolCalc { public: - KVolumeFader_impl( QFrame* =0 ); + KVolumeFader_impl( TQFrame* =0 ); ~KVolumeFader_impl(); float dbmin(); @@ -67,7 +67,7 @@ private: class KPopupMenu; class KAction; -class KVolumeFader_Widget : public QFrame { +class KVolumeFader_Widget : public TQFrame { Q_OBJECT private: KVolumeFader_impl* _impl; @@ -76,19 +76,19 @@ private: Arts::Direction _dir; KPopupMenu *_menu; KAction *_aExactValue; - QColor interpolate( QColor, QColor, float ); + TQColor interpolate( TQColor, TQColor, float ); public: - KVolumeFader_Widget( QWidget* =0, const char* =0 ); + KVolumeFader_Widget( TQWidget* =0, const char* =0 ); ~KVolumeFader_Widget(); void setImpl( KVolumeFader_impl* ); void setValue( float ); void setDirection( Arts::Direction ); protected: - void drawContents( QPainter* ); - void mousePressEvent( QMouseEvent* ); - void mouseReleaseEvent( QMouseEvent* ); - void mouseMoveEvent( QMouseEvent* ); - void wheelEvent( QWheelEvent* ); + void drawContents( TQPainter* ); + void mousePressEvent( TQMouseEvent* ); + void mouseReleaseEvent( TQMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); + void wheelEvent( TQWheelEvent* ); private slots: void exactValue(); }; diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index f5c47055..ede8ad38 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -28,8 +28,8 @@ using namespace Arts; -KWidget_impl::KWidget_impl( QWidget * widget ) - : _qwidget( widget ? widget : new QWidget ) +KWidget_impl::KWidget_impl( TQWidget * widget ) + : _qwidget( widget ? widget : new TQWidget ) { _widgetID = KWidgetRepo::the()->add( this, _qwidget ); @@ -39,8 +39,8 @@ KWidget_impl::KWidget_impl( QWidget * widget ) * the panel got deleted, our widget will be gone, too) */ _guard = new KWidgetGuard(this); - QObject::connect(_qwidget, SIGNAL(destroyed()), - _guard, SLOT(widgetDestroyed())); + TQObject::connect(_qwidget, TQT_SIGNAL(destroyed()), + _guard, TQT_SLOT(widgetDestroyed())); } KWidget_impl::~KWidget_impl() @@ -76,11 +76,11 @@ void KWidget_impl::parent(Arts::Widget newParent) { _parentID = newParent.widgetID(); - QWidget *qparent; + TQWidget *qparent; qparent = KWidgetRepo::the()->lookupQWidget(newParent.widgetID()); if( qparent != 0 ) { - QPoint pos(x(),y()); + TQPoint pos(x(),y()); bool showIt = visible(); _qwidget->reparent(qparent, pos, showIt); } @@ -148,8 +148,8 @@ SizePolicy KWidget_impl::hSizePolicy() void KWidget_impl::hSizePolicy( SizePolicy p ) { - QSizePolicy sp = _qwidget->sizePolicy(); - sp.setHorData( ( QSizePolicy::SizeType )p ); + TQSizePolicy sp = _qwidget->sizePolicy(); + sp.setHorData( ( TQSizePolicy::SizeType )p ); _qwidget->setSizePolicy( sp ); } @@ -160,8 +160,8 @@ SizePolicy KWidget_impl::vSizePolicy() void KWidget_impl::vSizePolicy( SizePolicy p ) { - QSizePolicy sp = _qwidget->sizePolicy(); - sp.setVerData( ( QSizePolicy::SizeType )p ); + TQSizePolicy sp = _qwidget->sizePolicy(); + sp.setVerData( ( TQSizePolicy::SizeType )p ); _qwidget->setSizePolicy( sp ); } diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h index 46f29092..292f8cc8 100644 --- a/arts/gui/kde/kwidget_impl.h +++ b/arts/gui/kde/kwidget_impl.h @@ -24,7 +24,7 @@ #ifndef ARTS_GUI_KWIDGET_IMPL_H #define ARTS_GUI_KWIDGET_IMPL_H #include "artsgui.h" -#include <qwidget.h> +#include <tqwidget.h> #include <kwidgetrepo.h> #include <kdelibs_export.h> @@ -33,12 +33,12 @@ namespace Arts { class KWidgetGuard; class KDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel { protected: - QWidget * _qwidget; + TQWidget * _qwidget; KWidgetGuard * _guard; long _parentID; long _widgetID; public: - KWidget_impl( QWidget * w = 0 ); + KWidget_impl( TQWidget * w = 0 ); ~KWidget_impl(); @@ -68,7 +68,7 @@ public: void widgetDestroyed(); }; -class KWidgetGuard : public QObject { +class KWidgetGuard : public TQObject { Q_OBJECT protected: KWidget_impl *impl; diff --git a/arts/gui/kde/kwidgetrepo.cpp b/arts/gui/kde/kwidgetrepo.cpp index e0d93bd6..120f9cc5 100644 --- a/arts/gui/kde/kwidgetrepo.cpp +++ b/arts/gui/kde/kwidgetrepo.cpp @@ -63,7 +63,7 @@ KWidgetRepo::~KWidgetRepo() } -long KWidgetRepo::add(KWidget_impl *widget, QWidget *qwidget) +long KWidgetRepo::add(KWidget_impl *widget, TQWidget *qwidget) { long ID = nextID++; widgets[ID] = widget; @@ -71,7 +71,7 @@ long KWidgetRepo::add(KWidget_impl *widget, QWidget *qwidget) return ID; } -QWidget *KWidgetRepo::lookupQWidget(long ID) +TQWidget *KWidgetRepo::lookupQWidget(long ID) { return qwidgets[ID]; } diff --git a/arts/gui/kde/kwidgetrepo.h b/arts/gui/kde/kwidgetrepo.h index adab8090..1bcb5870 100644 --- a/arts/gui/kde/kwidgetrepo.h +++ b/arts/gui/kde/kwidgetrepo.h @@ -24,7 +24,7 @@ #define KWIDGETREPO_H #include <map> -#include <qwidget.h> +#include <tqwidget.h> #include <weakreference.h> #include "artsgui.h" @@ -35,7 +35,7 @@ namespace Arts { class KWidgetRepo { protected: long nextID; - std::map<long, QWidget *> qwidgets; + std::map<long, TQWidget *> qwidgets; std::map<long, Arts::KWidget_impl *> widgets; static KWidgetRepo *instance; @@ -44,9 +44,9 @@ protected: public: - long add(Arts::KWidget_impl *widget, QWidget *qwidget); + long add(Arts::KWidget_impl *widget, TQWidget *qwidget); Arts::Widget lookupWidget(long ID); - QWidget *lookupQWidget(long ID); + TQWidget *lookupQWidget(long ID); void remove(long ID); static KWidgetRepo *the(); |