summaryrefslogtreecommitdiffstats
path: root/arts/gui/kde
diff options
context:
space:
mode:
Diffstat (limited to 'arts/gui/kde')
-rw-r--r--arts/gui/kde/artstestgui.cpp10
-rw-r--r--arts/gui/kde/kartswidget.cpp16
-rw-r--r--arts/gui/kde/kartswidget.h6
-rw-r--r--arts/gui/kde/kbutton_impl.cpp4
-rw-r--r--arts/gui/kde/kbutton_impl.h2
-rw-r--r--arts/gui/kde/kcombobox_impl.h2
-rw-r--r--arts/gui/kde/kfader.cpp8
-rw-r--r--arts/gui/kde/kfader.h4
-rw-r--r--arts/gui/kde/kfader_impl.h2
-rw-r--r--arts/gui/kde/kframe_impl.h2
-rw-r--r--arts/gui/kde/kgraph.cpp4
-rw-r--r--arts/gui/kde/kgraph.h2
-rw-r--r--arts/gui/kde/kgraph_impl.h2
-rw-r--r--arts/gui/kde/klabel_impl.h2
-rw-r--r--arts/gui/kde/klayoutbox_impl.cpp4
-rw-r--r--arts/gui/kde/klevelmeter_firebars.cpp4
-rw-r--r--arts/gui/kde/klevelmeter_impl.cpp4
-rw-r--r--arts/gui/kde/klevelmeter_linebars.cpp4
-rw-r--r--arts/gui/kde/klevelmeter_normalbars.cpp4
-rw-r--r--arts/gui/kde/klevelmeter_normalbars.h2
-rw-r--r--arts/gui/kde/klevelmeter_small.cpp4
-rw-r--r--arts/gui/kde/klineedit_impl.h2
-rw-r--r--arts/gui/kde/kpopupbox_impl.cpp4
-rw-r--r--arts/gui/kde/kpopupbox_private.h6
-rw-r--r--arts/gui/kde/kpoti.cpp28
-rw-r--r--arts/gui/kde/kpoti.h4
-rw-r--r--arts/gui/kde/kspinbox_impl.h2
-rw-r--r--arts/gui/kde/kwidget_impl.cpp12
-rw-r--r--arts/gui/kde/kwidget_impl.h4
29 files changed, 77 insertions, 77 deletions
diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp
index 9464ac7a..c7532003 100644
--- a/arts/gui/kde/artstestgui.cpp
+++ b/arts/gui/kde/artstestgui.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
w.width(500); w.height(350); w.show();
Button b;
- b.tqparent(w);
+ b.parent(w);
b.x(10);
b.y(10);
b.width(100);
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
b.show();
Button b2;
- b2.tqparent(w);
+ b2.parent(w);
b2.x(10);
b2.y(30);
b2.width(100);
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
b2.show();
Poti p;
- p.tqparent(w);
+ p.parent(w);
p.x(150);
p.y(10);
p.caption("delay (ms)");
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
p.show();
Poti q;
- q.tqparent(w);
+ q.parent(w);
q.x(250);
q.y(10);
q.caption("delay (ms)");
@@ -81,7 +81,7 @@ int main(int argc, char **argv)
q.show();
Graph g;
- g.tqparent(w);
+ g.parent(w);
g.x(50);
g.y(70);
g.width(400);
diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp
index 5188e81a..763239f7 100644
--- a/arts/gui/kde/kartswidget.cpp
+++ b/arts/gui/kde/kartswidget.cpp
@@ -31,31 +31,31 @@ public:
TQHBoxLayout *tqlayout;
};
-KArtsWidget::KArtsWidget( TQWidget* tqparent, const char* name )
- :TQWidget( tqparent, name ), _content( Arts::Widget::null() )
+KArtsWidget::KArtsWidget( TQWidget* parent, const char* name )
+ :TQWidget( parent, name ), _content( Arts::Widget::null() )
{
d = new KArtsWidgetPrivate;
d->tqlayout = new TQHBoxLayout(this);
}
-KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name )
- :TQWidget( tqparent, 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->tqlayout = new TQHBoxLayout(this);
setContent(content);
}
-KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name, WFlags wflags )
- :TQWidget( tqparent, 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->tqlayout = new TQHBoxLayout( this );
setContent( content );
}
-KArtsWidget::KArtsWidget(TQWidget* tqparent, const char* name, WFlags wflags )
- :TQWidget(tqparent, 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->tqlayout = new TQHBoxLayout(this);
diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h
index 7e745bf6..df46ae3b 100644
--- a/arts/gui/kde/kartswidget.h
+++ b/arts/gui/kde/kartswidget.h
@@ -40,7 +40,7 @@ class KArtsWidgetPrivate;
* tqlayout->addWidget(w);
* </pre>
*
- * In line 2 of the code, the "this" is the tqparent widget (which is usually
+ * In line 2 of the code, the "this" is the parent widget (which is usually
* this in TQt code).
*
* The KArtsWidget class keeps a reference to the content widget, so the
@@ -57,12 +57,12 @@ public:
/**
* creates a new KArtsWidget
*/
- KArtsWidget( TQWidget* tqparent, 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, TQWidget* tqparent, const char* name );
+ KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name );
/**
* creates a new KArtsWidget with WidgetFlags and content
diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp
index 95f7699f..34c5791b 100644
--- a/arts/gui/kde/kbutton_impl.cpp
+++ b/arts/gui/kde/kbutton_impl.cpp
@@ -72,12 +72,12 @@ KButton_impl::KButton_impl( TQPushButton * widget )
void KButton_impl::constructor( Widget p )
{
- tqparent( p );
+ parent( p );
}
void KButton_impl::constructor( const string & t, Widget p )
{
- tqparent( p );
+ parent( p );
text( t );
}
diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h
index 4db27c84..be3aa2f6 100644
--- a/arts/gui/kde/kbutton_impl.h
+++ b/arts/gui/kde/kbutton_impl.h
@@ -55,7 +55,7 @@ protected:
public:
KButton_impl( TQPushButton * w = 0 );
- void constructor( Widget tqparent );
+ void constructor( Widget parent );
void constructor( const std::string &, Widget );
void emitClicked();
diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h
index ad8e5739..f9de6c55 100644
--- a/arts/gui/kde/kcombobox_impl.h
+++ b/arts/gui/kde/kcombobox_impl.h
@@ -57,7 +57,7 @@ protected:
public:
KComboBox_impl( KComboBox * w = 0 );
- void constructor( Widget p ) { tqparent( p ); }
+ void constructor( Widget p ) { parent( p ); }
std::string caption();
void caption(const std::string & newCaption);
diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp
index 239d303a..e5179f9f 100644
--- a/arts/gui/kde/kfader.cpp
+++ b/arts/gui/kde/kfader.cpp
@@ -5,14 +5,14 @@ void KFader::init()
{
}
-KFader::KFader( TQWidget * tqparent, const char * name )
- : TQSlider( Qt::Vertical, tqparent, name )
+KFader::KFader( TQWidget * parent, const char * name )
+ : TQSlider( Qt::Vertical, parent, name )
{
init();
}
-KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent, const char * name )
- : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, tqparent, 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();
}
diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h
index 33df0d40..6b63e066 100644
--- a/arts/gui/kde/kfader.h
+++ b/arts/gui/kde/kfader.h
@@ -32,8 +32,8 @@ class KFader : public TQSlider
protected:
void init();
public:
- KFader( TQWidget * tqparent = 0, const char * name = 0 );
- KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent = 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();
diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h
index e15695f0..9ef877bd 100644
--- a/arts/gui/kde/kfader_impl.h
+++ b/arts/gui/kde/kfader_impl.h
@@ -63,7 +63,7 @@ protected:
public:
KFader_impl( KFader * w = 0 );
- void constructor( Widget p ) { tqparent( p ); }
+ void constructor( Widget p ) { parent( p ); }
std::string caption();
void caption(const std::string& newText);
diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h
index ae2e79a4..57af42e6 100644
--- a/arts/gui/kde/kframe_impl.h
+++ b/arts/gui/kde/kframe_impl.h
@@ -34,7 +34,7 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
public:
KFrame_impl( TQFrame * widget = 0 );
- inline void constructor( Widget p ) { tqparent( p ); }
+ inline void constructor( Widget p ) { parent( p ); }
long margin();
void margin( long m );
diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp
index 96d18c5c..1278ba21 100644
--- a/arts/gui/kde/kgraph.cpp
+++ b/arts/gui/kde/kgraph.cpp
@@ -31,8 +31,8 @@
using namespace Arts;
using namespace std;
-KGraph::KGraph( TQWidget * tqparent, const char * name )
- : TQWidget( tqparent, name )
+KGraph::KGraph( TQWidget * parent, const char * name )
+ : TQWidget( parent, name )
{
setBackgroundColor(white);
diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h
index e9f772ff..a1904aa1 100644
--- a/arts/gui/kde/kgraph.h
+++ b/arts/gui/kde/kgraph.h
@@ -47,7 +47,7 @@ protected:
inline GraphPoint q2gPoint(const TQPoint &qp);
inline TQPoint g2qPoint(const GraphPoint &gp);
public:
- KGraph( TQWidget * tqparent = 0, const char * name = 0 );
+ KGraph( TQWidget * parent = 0, const char * name = 0 );
virtual ~KGraph();
void addLine(Arts::KGraphLine_impl *line);
diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h
index 2a603208..408ad961 100644
--- a/arts/gui/kde/kgraph_impl.h
+++ b/arts/gui/kde/kgraph_impl.h
@@ -44,7 +44,7 @@ protected:
public:
KGraph_impl( KGraph * w = 0 );
- void constructor( Widget p ) { tqparent( p ); }
+ void constructor( Widget p ) { parent( p ); }
std::string caption();
void caption(const std::string& newCaption);
diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h
index 8b78bedc..205d041d 100644
--- a/arts/gui/kde/klabel_impl.h
+++ b/arts/gui/kde/klabel_impl.h
@@ -42,7 +42,7 @@ protected:
RotateLabel* _label;
public:
KLabel_impl( TQFrame* w=0 );
- void constructor( Widget p ) { tqparent( p ); }
+ void constructor( Widget p ) { parent( p ); }
std::string text();
void text( const std::string& newtext );
diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index 6cbe9873..9aeee822 100644
--- a/arts/gui/kde/klayoutbox_impl.cpp
+++ b/arts/gui/kde/klayoutbox_impl.cpp
@@ -40,14 +40,14 @@ KLayoutBox_impl::~KLayoutBox_impl() {
}
void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) {
- widget.tqparent( self() );
+ widget.parent( self() );
this->_addChild( widget, "layoutbox_item" );
TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
_layout->addWidget( tmp, stretch, align );
}
void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) {
- widget.tqparent( self() );
+ widget.parent( self() );
this->_addChild( widget, "layoutbox_item" );
TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
_layout->insertWidget( index, tmp, stretch, align );
diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp
index ffb99c3e..5589b772 100644
--- a/arts/gui/kde/klevelmeter_firebars.cpp
+++ b/arts/gui/kde/klevelmeter_firebars.cpp
@@ -59,8 +59,8 @@ kdDebug() << k_funcinfo << dir << endl;
p.end();
}
-KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) {
-//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", 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 TQWidget( this );
diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp
index b6845dc4..418108ad 100644
--- a/arts/gui/kde/klevelmeter_impl.cpp
+++ b/arts/gui/kde/klevelmeter_impl.cpp
@@ -41,8 +41,8 @@
using namespace Arts;
using namespace std;
-KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* tqparent, const char* name )
- : TQObject( tqparent, 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 )
diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp
index 5d8b4b3c..37dfe4d3 100644
--- a/arts/gui/kde/klevelmeter_linebars.cpp
+++ b/arts/gui/kde/klevelmeter_linebars.cpp
@@ -24,11 +24,11 @@
#include <tqpainter.h>
#include <tqpixmap.h>
-KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax )
+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<<", TQWidget* "<<tqparent<<", 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 = tqcolorGroup();
diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp
index 9263737a..29593551 100644
--- a/arts/gui/kde/klevelmeter_normalbars.cpp
+++ b/arts/gui/kde/klevelmeter_normalbars.cpp
@@ -24,8 +24,8 @@
#include <tqpainter.h>
#include <tqlayout.h>
-KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) {
-//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
+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 );
}
diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h
index b141f2fc..8fc02208 100644
--- a/arts/gui/kde/klevelmeter_normalbars.h
+++ b/arts/gui/kde/klevelmeter_normalbars.h
@@ -55,7 +55,7 @@ private:
TQColor _color;
bool _on;
public:
- Bar( float min, float max, TQColor color, TQWidget* tqparent ) : TQWidget( tqparent ), _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 ) {
diff --git a/arts/gui/kde/klevelmeter_small.cpp b/arts/gui/kde/klevelmeter_small.cpp
index 3c07bc6b..c74dfa44 100644
--- a/arts/gui/kde/klevelmeter_small.cpp
+++ b/arts/gui/kde/klevelmeter_small.cpp
@@ -23,8 +23,8 @@
#include <kdebug.h>
#include <tqpainter.h>
-KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) {
-//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", 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 ) {
diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h
index 12ab7532..6164a078 100644
--- a/arts/gui/kde/klineedit_impl.h
+++ b/arts/gui/kde/klineedit_impl.h
@@ -38,7 +38,7 @@ protected:
public:
KLineEdit_impl( KLineEdit * w = 0 );
- void constructor( Widget p ) { tqparent( p ); }
+ void constructor( Widget p ) { parent( p ); }
std::string caption();
void caption(const std::string& newCaption);
diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp
index 5438d131..e685b1ae 100644
--- a/arts/gui/kde/kpopupbox_impl.cpp
+++ b/arts/gui/kde/kpopupbox_impl.cpp
@@ -43,7 +43,7 @@ Direction KPopupBox_impl::direction() { return _widget->direction(); }
void KPopupBox_impl::direction( Direction n ) { _widget->direction( n ); }
void KPopupBox_impl::widget( Arts::Widget widget ) {
- widget.tqparent( self() );
+ widget.parent( self() );
this->_addChild( widget, "PopupBox_child" );
_widget->setWidget( widget );
}
@@ -54,7 +54,7 @@ void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widg
// Following the private class:
-KPopupBox_widget::KPopupBox_widget( TQWidget *tqparent, const char* name ) : TQFrame( tqparent,name )
+KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name )
{
this->setFrameShape( TQFrame::Box );
this->setMargin( 1 ); this->setLineWidth( 1 );
diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h
index 06a58ebc..b9b38e7f 100644
--- a/arts/gui/kde/kpopupbox_private.h
+++ b/arts/gui/kde/kpopupbox_private.h
@@ -83,7 +83,7 @@ class HandleDrag : public TQWidget {
Q_OBJECT
TQ_OBJECT
public:
- HandleDrag( TQWidget *tqparent, const char* name=0 ) : TQWidget( tqparent,name ) {}
+ HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {}
void paintEvent( TQPaintEvent * ) {
TQPainter p( this );
TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -116,7 +116,7 @@ private:
TQBoxLayout::Direction _dir;
TQPixmap _pmleft, _pmright, _pmup, _pmdown;
public:
- ShowButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name ), _dir( TQBoxLayout::LeftToRight )
+ ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight )
{
connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) );
setToggleButton( true );
@@ -172,7 +172,7 @@ class OwnButton : public TQPushButton {
private:
TQPixmap _pmown, _pminside;
public:
- OwnButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name )
+ OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name )
{
connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) );
setToggleButton( true );
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index d7cf50df..03a99c29 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -62,14 +62,14 @@ struct KPoti::KPotiPrivate
dbp.setPen( TQt::NoPen );
TQRect drawRect = bgdb.rect();
- // create tqmask
- TQBitmap tqmask( bgdb.size(), true );
- TQPainter maskpainter( &tqmask );
+ // create mask
+ TQBitmap mask( bgdb.size(), true );
+ TQPainter maskpainter( &mask );
maskpainter.setPen( TQt::NoPen );
maskpainter.setBrush( TQt::color1 );
maskpainter.drawEllipse( drawRect );
maskpainter.end();
- bgdb.setMask( tqmask );
+ bgdb.setMask( mask );
// inset shadow
KPixmap gradient( bgdb.size() );
@@ -102,14 +102,14 @@ struct KPoti::KPotiPrivate
dbp.setPen( TQt::NoPen );
TQRect drawRect( potidb.rect() );
- // create tqmask
- TQBitmap tqmask( potidb.size(), true );
- TQPainter maskpainter( &tqmask );
+ // create mask
+ TQBitmap mask( potidb.size(), true );
+ TQPainter maskpainter( &mask );
maskpainter.setPen( TQt::NoPen );
maskpainter.setBrush( TQt::color1 );
maskpainter.drawEllipse( drawRect );
maskpainter.end();
- potidb.setMask( tqmask );
+ potidb.setMask( mask );
KPixmap gradient( potidb.size() );
KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient );
@@ -169,10 +169,10 @@ void KPoti::setText( const TQString & text )
/**
Constructs a poti.
- The \e tqparent and \e name arguments are sent to the TQWidget constructor.
+ The \e parent and \e name arguments are sent to the TQWidget constructor.
*/
-KPoti::KPoti( TQWidget *tqparent, const char *name )
- : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase )
+KPoti::KPoti( TQWidget *parent, const char *name )
+ : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase )
, d( 0 )
{
init();
@@ -188,12 +188,12 @@ KPoti::KPoti( TQWidget *tqparent, const char *name )
\arg \e step is the page step value.
\arg \e value is the initial value.
- The \e tqparent and \e name arguments are sent to the TQWidget constructor.
+ The \e parent and \e name arguments are sent to the TQWidget constructor.
*/
KPoti::KPoti( int minValue, int maxValue, int step,
- int value, TQWidget *tqparent, const char *name )
- : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase )
+ int value, TQWidget *parent, const char *name )
+ : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase )
, TQRangeControl( minValue, maxValue, 1, step, value )
, d( 0 )
{
diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h
index 80e32add..d9013c8a 100644
--- a/arts/gui/kde/kpoti.h
+++ b/arts/gui/kde/kpoti.h
@@ -34,9 +34,9 @@ class KPoti : public TQFrame, public TQRangeControl
TQ_OBJECT
public:
- KPoti( TQWidget *tqparent=0, const char *name=0 );
+ KPoti( TQWidget *parent=0, const char *name=0 );
KPoti( int minValue, int maxValue, int step, int value,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
~KPoti();
diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h
index 714da93f..0a926f83 100644
--- a/arts/gui/kde/kspinbox_impl.h
+++ b/arts/gui/kde/kspinbox_impl.h
@@ -55,7 +55,7 @@ protected:
public:
KSpinBox_impl( TQSpinBox * w = 0 );
- void constructor( Widget p ) { tqparent( p ); }
+ void constructor( Widget p ) { parent( p ); }
std::string caption();
void caption(const std::string& newCaption);
diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp
index b899f0cd..b716f4c3 100644
--- a/arts/gui/kde/kwidget_impl.cpp
+++ b/arts/gui/kde/kwidget_impl.cpp
@@ -65,24 +65,24 @@ long KWidget_impl::widgetID()
return _widgetID;
}
-Widget KWidget_impl::tqparent()
+Widget KWidget_impl::parent()
{
return KWidgetRepo::the()->lookupWidget(_parentID);
}
-void KWidget_impl::tqparent(Arts::Widget newParent)
+void KWidget_impl::parent(Arts::Widget newParent)
{
if(!newParent.isNull())
{
_parentID = newParent.widgetID();
- TQWidget *qtqparent;
- qtqparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID());
- if( qtqparent != 0 )
+ TQWidget *qparent;
+ qparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID());
+ if( qparent != 0 )
{
TQPoint pos(x(),y());
bool showIt = visible();
- _qwidget->reparent(qtqparent, pos, showIt);
+ _qwidget->reparent(qparent, pos, showIt);
}
}
else
diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h
index 40d7216c..6a0c45c0 100644
--- a/arts/gui/kde/kwidget_impl.h
+++ b/arts/gui/kde/kwidget_impl.h
@@ -43,8 +43,8 @@ public:
~KWidget_impl();
long widgetID();
- Widget tqparent();
- void tqparent(Arts::Widget);
+ Widget parent();
+ void parent(Arts::Widget);
long x();
void x(long newX);
long y();