rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 7ef01c0f34
commit 27edf28be2

@ -44,7 +44,7 @@ Wishlist for the artsbuilder app:
- make _changed Q_SIGNALS visible so you can connect the value_changed of a - make _changed Q_SIGNALS visible so you can connect the value_changed of a
poti to the frequency of a filter poti to the frequency of a filter
- make it possible to edit tqparent property of widgets (i.e. to insert one - make it possible to edit parent property of widgets (i.e. to insert one
widget into another) widget into another)
- add structure property dialog with structure meta information, at least - add structure property dialog with structure meta information, at least

@ -45,8 +45,8 @@ static void min_size(TQWidget *w) {
} }
#endif #endif
ExecDlg::ExecDlg(TQWidget *tqparent, ExecutableStructure *structure) ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
:TQDialog(tqparent,"X") :TQDialog(parent,"X")
/*, TRUE)*/ /*, TRUE)*/
{ {
this->structure = structure; this->structure = structure;

@ -40,7 +40,7 @@ public:
void start(); void start();
void done(int r); void done(int r);
ExecDlg(TQWidget *tqparent, ExecutableStructure *structure); ExecDlg(TQWidget *parent, ExecutableStructure *structure);
protected slots: protected slots:
void updateCpuUsage(); void updateCpuUsage();

@ -41,7 +41,7 @@
using namespace std; using namespace std;
InterfaceDlg::InterfaceDlg(TQWidget *tqparent) :TQDialog(tqparent,"Props", TRUE) InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
{ {
setCaption(i18n("aRts: Structureport View")); setCaption(i18n("aRts: Structureport View"));

@ -37,7 +37,7 @@ protected:
TQListBox *listbox; TQListBox *listbox;
public: public:
InterfaceDlg(TQWidget *tqparent); InterfaceDlg(TQWidget *parent);
std::string interfaceName(); std::string interfaceName();
void update(const std::string& interface, const std::string& indent); void update(const std::string& interface, const std::string& indent);

@ -5,11 +5,11 @@
using namespace std; using namespace std;
MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *tqparent, const char *text) MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text)
: menumaker(menumaker), text(text) : menumaker(menumaker), text(text)
{ {
action = new KAction(TQString::fromLocal8Bit(text)); action = new KAction(TQString::fromLocal8Bit(text));
tqparent->insert(action); parent->insert(action);
connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated())); connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated()));
} }
@ -95,7 +95,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix)
/* 000 */ /* 000 */
/*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int))); /*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int)));
pc->menu()->insertItem(catname(name).c_str(), newMenu, CAT_MAGIC_ID);*/ pc->menu()->insertItem(catname(name).c_str(), newMenu, CAT_MAGIC_ID);*/
arts_debug("inserting a menu called '%s' in the tqparent menu '%s'", arts_debug("inserting a menu called '%s' in the parent menu '%s'",
catname(name).local8Bit().data(),pc->name().local8Bit().data()); catname(name).local8Bit().data(),pc->name().local8Bit().data());
categories.push_back(new MenuCategory(name,prefix,newMenu)); categories.push_back(new MenuCategory(name,prefix,newMenu));
} }

@ -19,7 +19,7 @@ protected:
TQCString text; TQCString text;
public: public:
MenuEntry(MenuMaker *menumaker, KActionMenu *tqparent, const char *text); MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text);
public slots: public slots:
void activated(); void activated();

@ -608,8 +608,8 @@ void ModuleWidget::autoRedrawRouter()
if(autorouter->needRedraw()) redrawAll(); if(autorouter->needRedraw()) redrawAll();
} }
ModuleWidget::ModuleWidget(Structure *structure, TQWidget *tqparent, const char *name, WFlags f) ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *name, WFlags f)
: QtTableView( tqparent, name, f), : QtTableView( parent, name, f),
updateDepth( 0 ), updateDepth( 0 ),
activeTool( 0L ), activeTool( 0L ),
structure( structure ), structure( structure ),

@ -109,7 +109,7 @@ public:
TQPoint componentPos(const StructureComponent *component) const; TQPoint componentPos(const StructureComponent *component) const;
TQPoint portPos(const ModulePort *port) const; TQPoint portPos(const ModulePort *port) const;
ModuleWidget( Structure *structure, TQWidget *tqparent = 0, ModuleWidget( Structure *structure, TQWidget *parent = 0,
const char *name = 0, WFlags f = 0); const char *name = 0, WFlags f = 0);
~ModuleWidget(); ~ModuleWidget();

@ -40,7 +40,7 @@
using namespace std; using namespace std;
PortPosDlg::PortPosDlg(TQWidget *tqparent, Structure *structure) :TQDialog(tqparent,"Props", TRUE) PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,"Props", TRUE)
{ {
this->structure = structure; this->structure = structure;

@ -39,7 +39,7 @@ protected:
std::vector<StructurePort *> listports; std::vector<StructurePort *> listports;
public: public:
PortPosDlg(TQWidget *tqparent, Structure *structure); PortPosDlg(TQWidget *parent, Structure *structure);
void update(); void update();
public slots: public slots:

@ -36,8 +36,8 @@
#include <arts/debug.h> #include <arts/debug.h>
PropertyPanel::PropertyPanel( TQWidget* tqparent, const char* name, WFlags fl ) PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl )
: PropertyPanelBase( tqparent, name, fl ), : PropertyPanelBase( parent, name, fl ),
component(0L), component(0L),
port(0L) port(0L)
{ {

@ -36,7 +36,7 @@ class PropertyPanel: public PropertyPanelBase
TQ_OBJECT TQ_OBJECT
public: public:
PropertyPanel( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); PropertyPanel( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
public slots: public slots:
void setSelectedComponent( StructureComponent *component ); void setSelectedComponent( StructureComponent *component );

@ -45,8 +45,8 @@ public:
void paintEvent( TQPaintEvent * ); void paintEvent( TQPaintEvent * );
}; };
TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name ) TQCornerSquare::TQCornerSquare( TQWidget *parent, const char *name )
: TQWidget( tqparent, name ) : TQWidget( parent, name )
{ {
} }
@ -125,7 +125,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
/*! /*!
Constructs a table view. The \a tqparent, \a name and \f arguments Constructs a table view. The \a parent, \a name and \f arguments
are passed to the TQFrame constructor. are passed to the TQFrame constructor.
The \link setTableFlags() table flags\endlink are all cleared (set to 0). The \link setTableFlags() table flags\endlink are all cleared (set to 0).
@ -144,8 +144,8 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
*/ */
QtTableView::QtTableView( TQWidget *tqparent, const char *name, WFlags f ) QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f )
: TQFrame( tqparent, name, f ) : TQFrame( parent, name, f )
{ {
nRows = nCols = 0; // zero rows/cols nRows = nCols = 0; // zero rows/cols
xCellOffs = yCellOffs = 0; // zero offset xCellOffs = yCellOffs = 0; // zero offset

@ -37,7 +37,7 @@ public:
void tqrepaint( const TQRect &, bool erase=TRUE ); void tqrepaint( const TQRect &, bool erase=TRUE );
protected: protected:
QtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
~QtTableView(); ~QtTableView();
int numRows() const; int numRows() const;

@ -40,7 +40,7 @@ static void min_size(TQWidget *w) {
w->setMinimumSize(w->tqsizeHint()); w->setMinimumSize(w->tqsizeHint());
} }
RetrieveDlg::RetrieveDlg(TQWidget *tqparent) :TQDialog(tqparent,"X", TRUE) RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
{ {
setCaption(i18n("Retrieve Structure From Server")); setCaption(i18n("Retrieve Structure From Server"));

@ -38,7 +38,7 @@ class RetrieveDlg :public TQDialog {
TQ_OBJECT TQ_OBJECT
TQListBox *listbox; TQListBox *listbox;
public: public:
RetrieveDlg(TQWidget *tqparent); RetrieveDlg(TQWidget *parent);
TQString result(); TQString result();
public slots: public slots:
void help(); void help();

@ -8,7 +8,7 @@ module=Arts::Poti
{ {
id=1 id=1
} }
port=tqparent port=parent
{ {
id=2 id=2
} }
@ -71,7 +71,7 @@ module=Arts::Widget
{ {
id=14 id=14
} }
port=tqparent port=parent
{ {
id=15 id=15
} }
@ -110,7 +110,7 @@ module=Arts::Poti
{ {
id=22 id=22
} }
port=tqparent port=parent
{ {
id=23 id=23
} }
@ -169,7 +169,7 @@ module=Arts::Poti
{ {
id=35 id=35
} }
port=tqparent port=parent
{ {
id=36 id=36
} }
@ -230,7 +230,7 @@ module=Arts::Poti
{ {
id=48 id=48
} }
port=tqparent port=parent
{ {
id=49 id=49
} }
@ -291,7 +291,7 @@ module=Arts::Poti
{ {
id=61 id=61
} }
port=tqparent port=parent
{ {
id=62 id=62
} }
@ -345,7 +345,7 @@ module=Arts::Poti
} }
structureport structureport
{ {
name=tqparent name=parent
x=2 x=2
y=1 y=1
position=0 position=0

@ -8,7 +8,7 @@ module=Arts::Widget
{ {
id=1 id=1
} }
port=tqparent port=parent
{ {
id=2 id=2
} }
@ -47,7 +47,7 @@ module=Arts::Poti
{ {
id=9 id=9
} }
port=tqparent port=parent
{ {
id=10 id=10
} }
@ -110,7 +110,7 @@ module=Arts::Poti
{ {
id=22 id=22
} }
port=tqparent port=parent
{ {
id=23 id=23
} }
@ -173,7 +173,7 @@ module=Arts::Poti
{ {
id=35 id=35
} }
port=tqparent port=parent
{ {
id=36 id=36
} }
@ -229,7 +229,7 @@ module=Arts::Poti
} }
structureport structureport
{ {
name=tqparent name=parent
x=2 x=2
y=1 y=1
position=0 position=0

@ -8,7 +8,7 @@ module=Arts::Widget
{ {
id=1 id=1
} }
port=tqparent port=parent
{ {
id=2 id=2
} }
@ -550,7 +550,7 @@ structureport
} }
structureport structureport
{ {
name=tqparent name=parent
x=7 x=7
y=0 y=0
position=0 position=0

@ -4,7 +4,7 @@ module=Gui_SUB_PANEL
id=147 id=147
x=6 x=6
y=1 y=1
port=tqparent port=parent
{ {
id=148 id=148
connect_to=279 connect_to=279
@ -52,7 +52,7 @@ module=Gui_POTI
id=155 id=155
x=0 x=0
y=3 y=3
port=tqparent port=parent
{ {
id=156 id=156
connect_to=154 connect_to=154
@ -193,7 +193,7 @@ module=Gui_LABEL
id=182 id=182
x=13 x=13
y=4 y=4
port=tqparent port=parent
{ {
id=183 id=183
connect_to=154 connect_to=154
@ -313,7 +313,7 @@ module=Gui_POTI
id=205 id=205
x=14 x=14
y=9 y=9
port=tqparent port=parent
{ {
id=206 id=206
connect_to=154 connect_to=154
@ -365,7 +365,7 @@ module=Gui_POTI
id=215 id=215
x=14 x=14
y=11 y=11
port=tqparent port=parent
{ {
id=216 id=216
connect_to=154 connect_to=154
@ -417,7 +417,7 @@ module=Gui_POTI
id=225 id=225
x=14 x=14
y=7 y=7
port=tqparent port=parent
{ {
id=226 id=226
connect_to=154 connect_to=154
@ -469,7 +469,7 @@ module=Gui_POTI
id=235 id=235
x=14 x=14
y=13 y=13
port=tqparent port=parent
{ {
id=236 id=236
connect_to=154 connect_to=154
@ -521,7 +521,7 @@ module=Gui_POTI
id=245 id=245
x=14 x=14
y=15 y=15
port=tqparent port=parent
{ {
id=246 id=246
connect_to=154 connect_to=154
@ -573,7 +573,7 @@ module=Gui_POTI
id=255 id=255
x=14 x=14
y=17 y=17
port=tqparent port=parent
{ {
id=256 id=256
connect_to=154 connect_to=154
@ -722,7 +722,7 @@ structureport
} }
structureport structureport
{ {
name=tqparent name=parent
x=7 x=7
y=0 y=0
position=0 position=0

@ -8,7 +8,7 @@ module=Arts::Widget
{ {
id=1 id=1
} }
port=tqparent port=parent
{ {
id=2 id=2
} }
@ -47,7 +47,7 @@ module=Arts::Poti
{ {
id=9 id=9
} }
port=tqparent port=parent
{ {
id=10 id=10
} }
@ -218,7 +218,7 @@ structureport
} }
structureport structureport
{ {
name=tqparent name=parent
x=7 x=7
y=0 y=0
position=0 position=0

@ -8,7 +8,7 @@ module=Arts::Widget
{ {
id=1 id=1
} }
port=tqparent port=parent
{ {
id=2 id=2
} }
@ -40,7 +40,7 @@ module=Arts::Widget
} }
structureport structureport
{ {
name=tqparent name=parent
x=2 x=2
y=1 y=1
position=0 position=0

@ -4,7 +4,7 @@ module=Gui_SUB_PANEL
id=0 id=0
x=0 x=0
y=1 y=1
port=tqparent port=parent
{ {
id=1 id=1
connect_to=26 connect_to=26
@ -88,7 +88,7 @@ module=Gui_LABEL
id=17 id=17
x=6 x=6
y=4 y=4
port=tqparent port=parent
{ {
id=18 id=18
connect_to=7 connect_to=7
@ -158,7 +158,7 @@ structureport
} }
structureport structureport
{ {
name=tqparent name=parent
x=1 x=1
y=0 y=0
position=0 position=0

@ -48,7 +48,7 @@ module Arts {
interface Widget { interface Widget {
readonly attribute long widgetID; readonly attribute long widgetID;
attribute Widget tqparent; attribute Widget parent;
attribute long x,y,width,height; attribute long x,y,width,height;
attribute boolean visible; attribute boolean visible;
attribute SizePolicy hSizePolicy; attribute SizePolicy hSizePolicy;
@ -82,7 +82,7 @@ module Arts {
}; };
interface Frame : Widget { interface Frame : Widget {
void constructor( Widget tqparent ); void constructor( Widget parent );
attribute long margin; attribute long margin;
attribute long linewidth; attribute long linewidth;
@ -118,7 +118,7 @@ module Arts {
Usage is quite simple: Add the widgets you have in the right order Usage is quite simple: Add the widgets you have in the right order
to the layoutbox by calling addWidget(). to the layoutbox by calling addWidget().
Thats it, no ._addChild or .tqparent with this widget. Thats it, no ._addChild or .parent with this widget.
For more information see QBoxLayout. For more information see QBoxLayout.
(akrille) (akrille)
@ -173,7 +173,7 @@ module Arts {
Usage is quite simple: Create the Widget you want to be hidable inside Usage is quite simple: Create the Widget you want to be hidable inside
a container like LayoutBox or a normal widget. Then create the PopupBox a container like LayoutBox or a normal widget. Then create the PopupBox
and call <Name_of_PopupBox>.widget( <Name_of_your_Container> ). and call <Name_of_PopupBox>.widget( <Name_of_your_Container> ).
Thats it, no ._addChild or .tqparent with this widget. Thats it, no ._addChild or .parent with this widget.
(akrille) (akrille)
*/ */
interface PopupBox : Frame { interface PopupBox : Frame {
@ -186,8 +186,8 @@ module Arts {
}; };
interface Button : Widget { interface Button : Widget {
void constructor( Widget tqparent ); void constructor( Widget parent );
void constructor( string text, Widget tqparent ); void constructor( string text, Widget parent );
attribute string text; attribute string text;
attribute boolean toggle; attribute boolean toggle;
@ -205,7 +205,7 @@ module Arts {
}; };
interface Fader : Widget { interface Fader : Widget {
void constructor( Widget tqparent ); void constructor( Widget parent );
attribute string caption, color; attribute string caption, color;
attribute float min, max, value; attribute float min, max, value;
@ -213,21 +213,21 @@ module Arts {
}; };
interface LineEdit : Widget { interface LineEdit : Widget {
void constructor( Widget tqparent ); void constructor( Widget parent );
attribute string caption; attribute string caption;
attribute string text; attribute string text;
}; };
interface SpinBox : Widget { interface SpinBox : Widget {
void constructor( Widget tqparent ); void constructor( Widget parent );
attribute string caption; attribute string caption;
attribute long min, max, value; attribute long min, max, value;
}; };
interface ComboBox : Widget { interface ComboBox : Widget {
void constructor( Widget tqparent ); void constructor( Widget parent );
attribute string caption; attribute string caption;
attribute sequence<string> choices; attribute sequence<string> choices;
@ -235,7 +235,7 @@ module Arts {
}; };
interface Graph : Widget { interface Graph : Widget {
void constructor( Widget tqparent ); void constructor( Widget parent );
attribute string caption; attribute string caption;
attribute float minx, maxx, miny, maxy; attribute float minx, maxx, miny, maxy;

@ -41,7 +41,7 @@ int main(int argc, char **argv)
w.width(500); w.height(350); w.show(); w.width(500); w.height(350); w.show();
Button b; Button b;
b.tqparent(w); b.parent(w);
b.x(10); b.x(10);
b.y(10); b.y(10);
b.width(100); b.width(100);
@ -50,7 +50,7 @@ int main(int argc, char **argv)
b.show(); b.show();
Button b2; Button b2;
b2.tqparent(w); b2.parent(w);
b2.x(10); b2.x(10);
b2.y(30); b2.y(30);
b2.width(100); b2.width(100);
@ -59,7 +59,7 @@ int main(int argc, char **argv)
b2.show(); b2.show();
Poti p; Poti p;
p.tqparent(w); p.parent(w);
p.x(150); p.x(150);
p.y(10); p.y(10);
p.caption("delay (ms)"); p.caption("delay (ms)");
@ -70,7 +70,7 @@ int main(int argc, char **argv)
p.show(); p.show();
Poti q; Poti q;
q.tqparent(w); q.parent(w);
q.x(250); q.x(250);
q.y(10); q.y(10);
q.caption("delay (ms)"); q.caption("delay (ms)");
@ -81,7 +81,7 @@ int main(int argc, char **argv)
q.show(); q.show();
Graph g; Graph g;
g.tqparent(w); g.parent(w);
g.x(50); g.x(50);
g.y(70); g.y(70);
g.width(400); g.width(400);

@ -31,31 +31,31 @@ public:
TQHBoxLayout *tqlayout; TQHBoxLayout *tqlayout;
}; };
KArtsWidget::KArtsWidget( TQWidget* tqparent, const char* name ) KArtsWidget::KArtsWidget( TQWidget* parent, const char* name )
:TQWidget( tqparent, name ), _content( Arts::Widget::null() ) :TQWidget( parent, name ), _content( Arts::Widget::null() )
{ {
d = new KArtsWidgetPrivate; d = new KArtsWidgetPrivate;
d->tqlayout = new TQHBoxLayout(this); d->tqlayout = new TQHBoxLayout(this);
} }
KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name ) KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name )
:TQWidget( tqparent, name ), _content( Arts::Widget::null()) :TQWidget( parent, name ), _content( Arts::Widget::null())
{ {
d = new KArtsWidgetPrivate; d = new KArtsWidgetPrivate;
d->tqlayout = new TQHBoxLayout(this); d->tqlayout = new TQHBoxLayout(this);
setContent(content); setContent(content);
} }
KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name, WFlags wflags ) KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name, WFlags wflags )
:TQWidget( tqparent, name, wflags ), _content( Arts::Widget::null() ) :TQWidget( parent, name, wflags ), _content( Arts::Widget::null() )
{ {
d = new KArtsWidgetPrivate; d = new KArtsWidgetPrivate;
d->tqlayout = new TQHBoxLayout( this ); d->tqlayout = new TQHBoxLayout( this );
setContent( content ); setContent( content );
} }
KArtsWidget::KArtsWidget(TQWidget* tqparent, const char* name, WFlags wflags ) KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags )
:TQWidget(tqparent, name, wflags ), _content(Arts::Widget::null()) :TQWidget(parent, name, wflags ), _content(Arts::Widget::null())
{ {
d = new KArtsWidgetPrivate; d = new KArtsWidgetPrivate;
d->tqlayout = new TQHBoxLayout(this); d->tqlayout = new TQHBoxLayout(this);

@ -40,7 +40,7 @@ class KArtsWidgetPrivate;
* tqlayout->addWidget(w); * tqlayout->addWidget(w);
* </pre> * </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). * this in TQt code).
* *
* The KArtsWidget class keeps a reference to the content widget, so the * The KArtsWidget class keeps a reference to the content widget, so the
@ -57,12 +57,12 @@ public:
/** /**
* creates a new KArtsWidget * 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 * 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 * creates a new KArtsWidget with WidgetFlags and content

@ -72,12 +72,12 @@ KButton_impl::KButton_impl( TQPushButton * widget )
void KButton_impl::constructor( Widget p ) void KButton_impl::constructor( Widget p )
{ {
tqparent( p ); parent( p );
} }
void KButton_impl::constructor( const string & t, Widget p ) void KButton_impl::constructor( const string & t, Widget p )
{ {
tqparent( p ); parent( p );
text( t ); text( t );
} }

@ -55,7 +55,7 @@ protected:
public: public:
KButton_impl( TQPushButton * w = 0 ); KButton_impl( TQPushButton * w = 0 );
void constructor( Widget tqparent ); void constructor( Widget parent );
void constructor( const std::string &, Widget ); void constructor( const std::string &, Widget );
void emitClicked(); void emitClicked();

@ -57,7 +57,7 @@ protected:
public: public:
KComboBox_impl( KComboBox * w = 0 ); KComboBox_impl( KComboBox * w = 0 );
void constructor( Widget p ) { tqparent( p ); } void constructor( Widget p ) { parent( p ); }
std::string caption(); std::string caption();
void caption(const std::string & newCaption); void caption(const std::string & newCaption);

@ -5,14 +5,14 @@ void KFader::init()
{ {
} }
KFader::KFader( TQWidget * tqparent, const char * name ) KFader::KFader( TQWidget * parent, const char * name )
: TQSlider( Qt::Vertical, tqparent, name ) : TQSlider( Qt::Vertical, parent, name )
{ {
init(); init();
} }
KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent, const char * name ) KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent, const char * name )
: TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, tqparent, name ) : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name )
{ {
init(); init();
} }

@ -32,8 +32,8 @@ class KFader : public TQSlider
protected: protected:
void init(); void init();
public: public:
KFader( 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 * tqparent = 0, const char * name = 0 ); KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = 0, const char * name = 0 );
virtual ~KFader(); virtual ~KFader();

@ -63,7 +63,7 @@ protected:
public: public:
KFader_impl( KFader * w = 0 ); KFader_impl( KFader * w = 0 );
void constructor( Widget p ) { tqparent( p ); } void constructor( Widget p ) { parent( p ); }
std::string caption(); std::string caption();
void caption(const std::string& newText); void caption(const std::string& newText);

@ -34,7 +34,7 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
public: public:
KFrame_impl( TQFrame * widget = 0 ); KFrame_impl( TQFrame * widget = 0 );
inline void constructor( Widget p ) { tqparent( p ); } inline void constructor( Widget p ) { parent( p ); }
long margin(); long margin();
void margin( long m ); void margin( long m );

@ -31,8 +31,8 @@
using namespace Arts; using namespace Arts;
using namespace std; using namespace std;
KGraph::KGraph( TQWidget * tqparent, const char * name ) KGraph::KGraph( TQWidget * parent, const char * name )
: TQWidget( tqparent, name ) : TQWidget( parent, name )
{ {
setBackgroundColor(white); setBackgroundColor(white);

@ -47,7 +47,7 @@ protected:
inline GraphPoint q2gPoint(const TQPoint &qp); inline GraphPoint q2gPoint(const TQPoint &qp);
inline TQPoint g2qPoint(const GraphPoint &gp); inline TQPoint g2qPoint(const GraphPoint &gp);
public: public:
KGraph( TQWidget * tqparent = 0, const char * name = 0 ); KGraph( TQWidget * parent = 0, const char * name = 0 );
virtual ~KGraph(); virtual ~KGraph();
void addLine(Arts::KGraphLine_impl *line); void addLine(Arts::KGraphLine_impl *line);

@ -44,7 +44,7 @@ protected:
public: public:
KGraph_impl( KGraph * w = 0 ); KGraph_impl( KGraph * w = 0 );
void constructor( Widget p ) { tqparent( p ); } void constructor( Widget p ) { parent( p ); }
std::string caption(); std::string caption();
void caption(const std::string& newCaption); void caption(const std::string& newCaption);

@ -42,7 +42,7 @@ protected:
RotateLabel* _label; RotateLabel* _label;
public: public:
KLabel_impl( TQFrame* w=0 ); KLabel_impl( TQFrame* w=0 );
void constructor( Widget p ) { tqparent( p ); } void constructor( Widget p ) { parent( p ); }
std::string text(); std::string text();
void text( const std::string& newtext ); void text( const std::string& newtext );

@ -40,14 +40,14 @@ KLayoutBox_impl::~KLayoutBox_impl() {
} }
void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) { void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) {
widget.tqparent( self() ); widget.parent( self() );
this->_addChild( widget, "layoutbox_item" ); this->_addChild( widget, "layoutbox_item" );
TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
_layout->addWidget( tmp, stretch, align ); _layout->addWidget( tmp, stretch, align );
} }
void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long 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" ); this->_addChild( widget, "layoutbox_item" );
TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
_layout->insertWidget( index, tmp, stretch, align ); _layout->insertWidget( index, tmp, stretch, align );

@ -59,8 +59,8 @@ kdDebug() << k_funcinfo << dir << endl;
p.end(); 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 ) { 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* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; //kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
this->setMinimumSize( 5, 5 ); this->setMinimumSize( 5, 5 );
_bar = new KLevelMeter_FireBars_private( this, 0 ); _bar = new KLevelMeter_FireBars_private( this, 0 );
_peakwidget = new TQWidget( this ); _peakwidget = new TQWidget( this );

@ -41,8 +41,8 @@
using namespace Arts; using namespace Arts;
using namespace std; using namespace std;
KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* tqparent, const char* name ) KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* parent, const char* name )
: TQObject( tqparent, name ) : TQObject( parent, name )
, _impl( impl ) , _impl( impl )
, _frame( frame ) , _frame( frame )
, _levelmeter( 0 ) , _levelmeter( 0 )

@ -24,11 +24,11 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <tqpixmap.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 ) , _value( 0.0 )
, _peak( 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->setMinimumSize( 5, 5 );
this->substyle( substyle ); this->substyle( substyle );
_stdcolors = tqcolorGroup(); _stdcolors = tqcolorGroup();

@ -24,8 +24,8 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <tqlayout.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 ) { 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* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; //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 ); _layout = new TQBoxLayout( this, TQBoxLayout::BottomToTop );
} }

@ -55,7 +55,7 @@ private:
TQColor _color; TQColor _color;
bool _on; bool _on;
public: 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() ); setBackgroundColor( _color.dark() );
} }
void setValue( float n ) { void setValue( float n ) {

@ -23,8 +23,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <tqpainter.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 ) { 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* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; //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 ) { void KLevelMeter_Small::invalue( float n, float p ) {

@ -38,7 +38,7 @@ protected:
public: public:
KLineEdit_impl( KLineEdit * w = 0 ); KLineEdit_impl( KLineEdit * w = 0 );
void constructor( Widget p ) { tqparent( p ); } void constructor( Widget p ) { parent( p ); }
std::string caption(); std::string caption();
void caption(const std::string& newCaption); void caption(const std::string& newCaption);

@ -43,7 +43,7 @@ Direction KPopupBox_impl::direction() { return _widget->direction(); }
void KPopupBox_impl::direction( Direction n ) { _widget->direction( n ); } void KPopupBox_impl::direction( Direction n ) { _widget->direction( n ); }
void KPopupBox_impl::widget( Arts::Widget widget ) { void KPopupBox_impl::widget( Arts::Widget widget ) {
widget.tqparent( self() ); widget.parent( self() );
this->_addChild( widget, "PopupBox_child" ); this->_addChild( widget, "PopupBox_child" );
_widget->setWidget( widget ); _widget->setWidget( widget );
} }
@ -54,7 +54,7 @@ void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widg
// Following the private class: // 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->setFrameShape( TQFrame::Box );
this->setMargin( 1 ); this->setLineWidth( 1 ); this->setMargin( 1 ); this->setLineWidth( 1 );

@ -83,7 +83,7 @@ class HandleDrag : public TQWidget {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
HandleDrag( TQWidget *tqparent, const char* name=0 ) : TQWidget( tqparent,name ) {} HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {}
void paintEvent( TQPaintEvent * ) { void paintEvent( TQPaintEvent * ) {
TQPainter p( this ); TQPainter p( this );
TQStyle::SFlags flags = TQStyle::Style_Default; TQStyle::SFlags flags = TQStyle::Style_Default;
@ -116,7 +116,7 @@ private:
TQBoxLayout::Direction _dir; TQBoxLayout::Direction _dir;
TQPixmap _pmleft, _pmright, _pmup, _pmdown; TQPixmap _pmleft, _pmright, _pmup, _pmdown;
public: 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 ) ) ); connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) );
setToggleButton( true ); setToggleButton( true );
@ -172,7 +172,7 @@ class OwnButton : public TQPushButton {
private: private:
TQPixmap _pmown, _pminside; TQPixmap _pmown, _pminside;
public: 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 ) ) ); connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) );
setToggleButton( true ); setToggleButton( true );

@ -62,14 +62,14 @@ struct KPoti::KPotiPrivate
dbp.setPen( TQt::NoPen ); dbp.setPen( TQt::NoPen );
TQRect drawRect = bgdb.rect(); TQRect drawRect = bgdb.rect();
// create tqmask // create mask
TQBitmap tqmask( bgdb.size(), true ); TQBitmap mask( bgdb.size(), true );
TQPainter maskpainter( &tqmask ); TQPainter maskpainter( &mask );
maskpainter.setPen( TQt::NoPen ); maskpainter.setPen( TQt::NoPen );
maskpainter.setBrush( TQt::color1 ); maskpainter.setBrush( TQt::color1 );
maskpainter.drawEllipse( drawRect ); maskpainter.drawEllipse( drawRect );
maskpainter.end(); maskpainter.end();
bgdb.setMask( tqmask ); bgdb.setMask( mask );
// inset shadow // inset shadow
KPixmap gradient( bgdb.size() ); KPixmap gradient( bgdb.size() );
@ -102,14 +102,14 @@ struct KPoti::KPotiPrivate
dbp.setPen( TQt::NoPen ); dbp.setPen( TQt::NoPen );
TQRect drawRect( potidb.rect() ); TQRect drawRect( potidb.rect() );
// create tqmask // create mask
TQBitmap tqmask( potidb.size(), true ); TQBitmap mask( potidb.size(), true );
TQPainter maskpainter( &tqmask ); TQPainter maskpainter( &mask );
maskpainter.setPen( TQt::NoPen ); maskpainter.setPen( TQt::NoPen );
maskpainter.setBrush( TQt::color1 ); maskpainter.setBrush( TQt::color1 );
maskpainter.drawEllipse( drawRect ); maskpainter.drawEllipse( drawRect );
maskpainter.end(); maskpainter.end();
potidb.setMask( tqmask ); potidb.setMask( mask );
KPixmap gradient( potidb.size() ); KPixmap gradient( potidb.size() );
KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient ); KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient );
@ -169,10 +169,10 @@ void KPoti::setText( const TQString & text )
/** /**
Constructs a poti. 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 ) KPoti::KPoti( TQWidget *parent, const char *name )
: TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase ) : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase )
, d( 0 ) , d( 0 )
{ {
init(); init();
@ -188,12 +188,12 @@ KPoti::KPoti( TQWidget *tqparent, const char *name )
\arg \e step is the page step value. \arg \e step is the page step value.
\arg \e value is the initial 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, KPoti::KPoti( int minValue, int maxValue, int step,
int value, TQWidget *tqparent, const char *name ) int value, TQWidget *parent, const char *name )
: TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase ) : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase )
, TQRangeControl( minValue, maxValue, 1, step, value ) , TQRangeControl( minValue, maxValue, 1, step, value )
, d( 0 ) , d( 0 )
{ {

@ -34,9 +34,9 @@ class KPoti : public TQFrame, public TQRangeControl
TQ_OBJECT TQ_OBJECT
public: 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, KPoti( int minValue, int maxValue, int step, int value,
TQWidget *tqparent=0, const char *name=0 ); TQWidget *parent=0, const char *name=0 );
~KPoti(); ~KPoti();

@ -55,7 +55,7 @@ protected:
public: public:
KSpinBox_impl( TQSpinBox * w = 0 ); KSpinBox_impl( TQSpinBox * w = 0 );
void constructor( Widget p ) { tqparent( p ); } void constructor( Widget p ) { parent( p ); }
std::string caption(); std::string caption();
void caption(const std::string& newCaption); void caption(const std::string& newCaption);

@ -65,24 +65,24 @@ long KWidget_impl::widgetID()
return _widgetID; return _widgetID;
} }
Widget KWidget_impl::tqparent() Widget KWidget_impl::parent()
{ {
return KWidgetRepo::the()->lookupWidget(_parentID); return KWidgetRepo::the()->lookupWidget(_parentID);
} }
void KWidget_impl::tqparent(Arts::Widget newParent) void KWidget_impl::parent(Arts::Widget newParent)
{ {
if(!newParent.isNull()) if(!newParent.isNull())
{ {
_parentID = newParent.widgetID(); _parentID = newParent.widgetID();
TQWidget *qtqparent; TQWidget *qparent;
qtqparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID()); qparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID());
if( qtqparent != 0 ) if( qparent != 0 )
{ {
TQPoint pos(x(),y()); TQPoint pos(x(),y());
bool showIt = visible(); bool showIt = visible();
_qwidget->reparent(qtqparent, pos, showIt); _qwidget->reparent(qparent, pos, showIt);
} }
} }
else else

@ -43,8 +43,8 @@ public:
~KWidget_impl(); ~KWidget_impl();
long widgetID(); long widgetID();
Widget tqparent(); Widget parent();
void tqparent(Arts::Widget); void parent(Arts::Widget);
long x(); long x();
void x(long newX); void x(long newX);
long y(); long y();

@ -155,7 +155,7 @@ to tell the Item in which environment it lives. It also uses setContainer(
Container::null()) once the Item gets removed. Which container the Item Container::null()) once the Item gets removed. Which container the Item
is in can be seen in the is in can be seen in the
readonly attribute Container tqparent; readonly attribute Container parent;
Upon serialization, the container uses Upon serialization, the container uses

@ -72,7 +72,7 @@ module Environment {
/** /**
* the container the item lives in * the container the item lives in
*/ */
readonly attribute Container tqparent; readonly attribute Container parent;
/** /**
* called by the container to insert/remove item from/to the * called by the container to insert/remove item from/to the
@ -150,7 +150,7 @@ interface EffectRackItemGui {
}; };
interface EffectRackSlot { interface EffectRackSlot {
void constructor( Widget tqparent, Widget effect, EffectRackItemGui effectrackgui ); void constructor( Widget parent, Widget effect, EffectRackItemGui effectrackgui );
/*writeonly*/ attribute boolean removeslot; /*writeonly*/ attribute boolean removeslot;
/*writeonly*/ attribute boolean tomaster; /*writeonly*/ attribute boolean tomaster;
}; };

@ -42,23 +42,23 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
{ {
} }
void constructor( Widget tqparent, Widget effect, EffectRackItemGui effectrackgui ) void constructor( Widget parent, Widget effect, EffectRackItemGui effectrackgui )
{ {
_effectrackgui = effectrackgui; _effectrackgui = effectrackgui;
_hbox.tqparent( tqparent ); _hbox.parent( parent );
_hbox.margin( 0 ); _hbox.margin( 0 );
_hbox.spacing( 0 ); _hbox.spacing( 0 );
_hbox.framestyle( Sunken | Panel ); _hbox.framestyle( Sunken | Panel );
_hbox.linewidth( 1 ); _hbox.linewidth( 1 );
_hbox.show(); _hbox.show();
_buttonbox.tqparent( _hbox ); _buttonbox.parent( _hbox );
_buttonbox.margin( 0 ); _buttonbox.margin( 0 );
_buttonbox.spacing( 0 ); _buttonbox.spacing( 0 );
_buttonbox.show(); _buttonbox.show();
_removeButton.tqparent( _buttonbox ); _removeButton.parent( _buttonbox );
_removeButton.text( "x" ); _removeButton.text( "x" );
_removeButton.hSizePolicy( spFixed ); _removeButton.hSizePolicy( spFixed );
_removeButton.width( 20 ); _removeButton.width( 20 );
@ -66,7 +66,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
connect( _removeButton, "clicked_changed", self(), "removeslot" ); connect( _removeButton, "clicked_changed", self(), "removeslot" );
_removeButton.show(); _removeButton.show();
_masterButton.tqparent( _buttonbox ); _masterButton.parent( _buttonbox );
_masterButton.text( "MM" ); _masterButton.text( "MM" );
_masterButton.toggle( true ); _masterButton.toggle( true );
_masterButton.hSizePolicy( spFixed ); _masterButton.hSizePolicy( spFixed );
@ -75,7 +75,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
connect( _masterButton, "pressed_changed", self(), "tomaster" ); connect( _masterButton, "pressed_changed", self(), "tomaster" );
_masterButton.show(); _masterButton.show();
_frame.tqparent( _hbox ); _frame.parent( _hbox );
_frame.margin( 5 ); _frame.margin( 5 );
_frame.spacing( 0 ); _frame.spacing( 0 );
_frame.framestyle( Raised | Panel ); _frame.framestyle( Raised | Panel );
@ -85,10 +85,10 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
_frame.show(); _frame.show();
_effect = effect; _effect = effect;
_effect.tqparent( _frame ); _effect.parent( _frame );
_effect.show(); _effect.show();
_spacer.tqparent( _frame ); _spacer.parent( _frame );
_spacer.hSizePolicy( spExpanding ); _spacer.hSizePolicy( spExpanding );
_spacer.show(); _spacer.show();
} }

@ -226,7 +226,7 @@ public:
name = LineEdit(); name = LineEdit();
name.caption("name"); name.caption("name");
name.text(_effectRack.name()); name.text(_effectRack.name());
name.tqparent(hbox); name.parent(hbox);
connect(name,"text_changed", _effectRack, "name"); connect(name,"text_changed", _effectRack, "name");
#endif #endif
@ -248,7 +248,7 @@ public:
typebox = ComboBox(); typebox = ComboBox();
typebox.choices(choices); typebox.choices(choices);
typebox.value(_type); typebox.value(_type);
typebox.tqparent(hbox); typebox.parent(hbox);
connect(typebox,"value_changed", self(), "type"); connect(typebox,"value_changed", self(), "type");
addbutton = Button( "add", hbox ); addbutton = Button( "add", hbox );
@ -260,7 +260,7 @@ public:
effect_vbox.show(); effect_vbox.show();
Frame spacer; Frame spacer;
spacer.tqparent( effect_vbox ); spacer.parent( effect_vbox );
spacer.vSizePolicy( spExpanding ); spacer.vSizePolicy( spExpanding );
spacer.show(); spacer.show();
effect_vbox._addChild( spacer, "spacer" ); effect_vbox._addChild( spacer, "spacer" );

@ -98,7 +98,7 @@ public:
LineEdit edit; LineEdit edit;
edit.x(20); edit.y(10); edit.width(120); edit.height(40); edit.x(20); edit.y(10); edit.width(120); edit.height(40);
edit.text(instrument.filename()); edit.text(instrument.filename());
edit.tqparent(panel); edit.parent(panel);
edit.show(); edit.show();
connect(edit,"text_changed", instrument, "filename"); connect(edit,"text_changed", instrument, "filename");
panel._addChild(edit,"editWidget"); panel._addChild(edit,"editWidget");

@ -16,7 +16,7 @@ Environment::Item_impl::~Item_impl()
arts_assert(_active == false); arts_assert(_active == false);
} }
Environment::Container Environment::Item_impl::tqparent() Environment::Container Environment::Item_impl::parent()
{ {
Container p = _parent; Container p = _parent;
return p; return p;

@ -18,7 +18,7 @@ public:
~Item_impl(); ~Item_impl();
bool active(); bool active();
Container tqparent(); Container parent();
void setContainer(Container container); void setContainer(Container container);
}; };
} }

@ -165,7 +165,7 @@ public:
Widget w = guiFactory.createGui((*channels)[i]); Widget w = guiFactory.createGui((*channels)[i]);
if(!w.isNull()) if(!w.isNull())
{ {
w.tqparent(channel_hbox); w.parent(channel_hbox);
w.show(); w.show();
channelWidgets.push_back(w); channelWidgets.push_back(w);
} }
@ -183,21 +183,21 @@ public:
if(!_item.isNull() && !vbox.isNull()) if(!_item.isNull() && !vbox.isNull())
{ {
hbox = HBox(); hbox = HBox();
hbox.tqparent(vbox); hbox.parent(vbox);
hbox.show(); hbox.show();
spinbox = SpinBox(); spinbox = SpinBox();
spinbox.caption(i18n("channels").utf8().data()); spinbox.caption(i18n("channels").utf8().data());
spinbox.min(0); spinbox.max(32); spinbox.min(0); spinbox.max(32);
spinbox.value(_item.channelCount()); spinbox.value(_item.channelCount());
spinbox.tqparent(hbox); spinbox.parent(hbox);
spinbox.show(); spinbox.show();
connect(spinbox,"value_changed", _item, "channelCount"); connect(spinbox,"value_changed", _item, "channelCount");
name = LineEdit(); name = LineEdit();
name.caption(i18n("name").utf8().data()); name.caption(i18n("name").utf8().data());
name.text(_item.name()); name.text(_item.name());
name.tqparent(hbox); name.parent(hbox);
name.show(); name.show();
connect(name,"text_changed", _item, "name"); connect(name,"text_changed", _item, "name");
@ -212,12 +212,12 @@ public:
delete queryResults; delete queryResults;
typebox.choices(choices); typebox.choices(choices);
typebox.value(_type); typebox.value(_type);
typebox.tqparent(hbox); typebox.parent(hbox);
typebox.show(); typebox.show();
connect(typebox,"value_changed", _item, "type"); connect(typebox,"value_changed", _item, "type");
channel_hbox = HBox(); channel_hbox = HBox();
channel_hbox.tqparent(vbox); channel_hbox.parent(vbox);
channel_hbox.show(); channel_hbox.show();
channelWidgets.clear(); channelWidgets.clear();
@ -320,14 +320,14 @@ public:
HBox hbox; HBox hbox;
hbox.show(); hbox.show();
hbox.width(330); hbox.height(50); hbox.width(330); hbox.height(50);
hbox.tqparent(vbox); hbox.parent(vbox);
vbox._addChild(hbox,"hbox"); vbox._addChild(hbox,"hbox");
SpinBox spinbox; SpinBox spinbox;
spinbox.caption(i18n("channels").utf8().data()); spinbox.caption(i18n("channels").utf8().data());
spinbox.min(0); spinbox.max(32); spinbox.min(0); spinbox.max(32);
spinbox.value(mixerItem.channelCount()); spinbox.value(mixerItem.channelCount());
spinbox.tqparent(hbox); spinbox.parent(hbox);
spinbox.show(); spinbox.show();
connect(spinbox,"value_changed", mixerItem, "channelCount"); connect(spinbox,"value_changed", mixerItem, "channelCount");
hbox._addChild(spinbox,"channelsWidget"); hbox._addChild(spinbox,"channelsWidget");
@ -335,7 +335,7 @@ public:
LineEdit name; LineEdit name;
name.caption(i18n("name").utf8().data()); name.caption(i18n("name").utf8().data());
name.caption(mixerItem.name()); name.caption(mixerItem.name());
name.tqparent(hbox); name.parent(hbox);
name.show(); name.show();
connect(name,"caption_changed", mixerItem, "name"); connect(name,"caption_changed", mixerItem, "name");
hbox._addChild(name,"nameWidget"); hbox._addChild(name,"nameWidget");
@ -343,7 +343,7 @@ public:
HBox channel_hbox; HBox channel_hbox;
channel_hbox.show(); channel_hbox.show();
channel_hbox.width(330); hbox.height(450); channel_hbox.width(330); hbox.height(450);
channel_hbox.tqparent(vbox); channel_hbox.parent(vbox);
vbox._addChild(channel_hbox,"channel_hbox"); vbox._addChild(channel_hbox,"channel_hbox");
GenericGuiFactory gf; GenericGuiFactory gf;
@ -353,7 +353,7 @@ public:
for(i = channels->begin(); i != channels->end(); i++) for(i = channels->begin(); i != channels->end(); i++)
{ {
Widget w = gf.createGui(*i); Widget w = gf.createGui(*i);
w.tqparent(channel_hbox); w.parent(channel_hbox);
channel_hbox._addChild(w,"channel"); channel_hbox._addChild(w,"channel");
} }
#endif #endif

@ -123,11 +123,11 @@ public:
Arts::Poti lowfreq; lowfreq.color( "grey" ); lowfreq.caption( i18n( "Low Freq" ).utf8().data() ); Arts::Poti lowfreq; lowfreq.color( "grey" ); lowfreq.caption( i18n( "Low Freq" ).utf8().data() );
lowfreq.min( 20 ); lowfreq.max( 1000 ); lowfreq.min( 20 ); lowfreq.max( 1000 );
lowfreq.value( ch.lowfreq() ); connect( lowfreq, "value_changed", ch, "lowfreq" ); lowfreq.value( ch.lowfreq() ); connect( lowfreq, "value_changed", ch, "lowfreq" );
lowfreq.tqparent( lowbox ); lowbox._addChild( lowfreq , "" ); lowfreq.parent( lowbox ); lowbox._addChild( lowfreq , "" );
Arts::Poti lowq; lowq.color( "grey" ); lowq.caption( i18n( "Low Q" ).utf8().data() ); Arts::Poti lowq; lowq.color( "grey" ); lowq.caption( i18n( "Low Q" ).utf8().data() );
lowq.min( 0.01 ); lowq.max( 10 ); lowq.min( 0.01 ); lowq.max( 10 );
lowq.value( ch.lowq() ); connect( lowq, "value_changed", ch, "lowq" ); lowq.value( ch.lowq() ); connect( lowq, "value_changed", ch, "lowq" );
lowq.tqparent( lowbox ); lowbox._addChild( lowq , "" ); lowq.parent( lowbox ); lowbox._addChild( lowq , "" );
Arts::Poti mid1gain; mid1gain.caption( i18n( "Mid1 Gain" ).utf8().data() ); Arts::Poti mid1gain; mid1gain.caption( i18n( "Mid1 Gain" ).utf8().data() );
mid1gain.min( -24 ); mid1gain.max( 24 ); mid1gain.min( -24 ); mid1gain.max( 24 );
@ -140,11 +140,11 @@ public:
Arts::Poti mid1freq; mid1freq.color( "grey" ); mid1freq.caption( i18n( "Mid1 Freq" ).utf8().data() ); Arts::Poti mid1freq; mid1freq.color( "grey" ); mid1freq.caption( i18n( "Mid1 Freq" ).utf8().data() );
mid1freq.min( 20 ); mid1freq.max( 5000 ); mid1freq.min( 20 ); mid1freq.max( 5000 );
mid1freq.value( ch.mid1freq() ); connect( mid1freq, "value_changed", ch, "mid1freq" ); mid1freq.value( ch.mid1freq() ); connect( mid1freq, "value_changed", ch, "mid1freq" );
mid1freq.tqparent( mid1box ); mid1box._addChild( mid1freq , "" ); mid1freq.parent( mid1box ); mid1box._addChild( mid1freq , "" );
Arts::Poti mid1q; mid1q.color( "grey" ); mid1q.caption( i18n( "Mid1 Q" ).utf8().data() ); Arts::Poti mid1q; mid1q.color( "grey" ); mid1q.caption( i18n( "Mid1 Q" ).utf8().data() );
mid1q.min( 0.01 ); mid1q.max( 10 ); mid1q.min( 0.01 ); mid1q.max( 10 );
mid1q.value( ch.mid1q() ); connect( mid1q, "value_changed", ch, "mid1q" ); mid1q.value( ch.mid1q() ); connect( mid1q, "value_changed", ch, "mid1q" );
mid1q.tqparent( mid1box ); mid1box._addChild( mid1q , "" ); mid1q.parent( mid1box ); mid1box._addChild( mid1q , "" );
Arts::Poti mid2gain; mid2gain.caption( i18n( "Mid2 Gain" ).utf8().data() ); Arts::Poti mid2gain; mid2gain.caption( i18n( "Mid2 Gain" ).utf8().data() );
mid2gain.min( -24 ); mid2gain.max( 24 ); mid2gain.min( -24 ); mid2gain.max( 24 );
@ -157,11 +157,11 @@ public:
Arts::Poti mid2freq; mid2freq.color( "grey" ); mid2freq.caption( i18n( "Mid2 Freq" ).utf8().data() ); Arts::Poti mid2freq; mid2freq.color( "grey" ); mid2freq.caption( i18n( "Mid2 Freq" ).utf8().data() );
mid2freq.min( 20 ); mid2freq.max( 10000 ); mid2freq.min( 20 ); mid2freq.max( 10000 );
mid2freq.value( ch.mid2freq() ); connect( mid2freq, "value_changed", ch, "mid2freq" ); mid2freq.value( ch.mid2freq() ); connect( mid2freq, "value_changed", ch, "mid2freq" );
mid2freq.tqparent( mid2box ); mid2box._addChild( mid2freq , "" ); mid2freq.parent( mid2box ); mid2box._addChild( mid2freq , "" );
Arts::Poti mid2q; mid2q.color( "grey" ); mid2q.caption( i18n( "Mid2 Q" ).utf8().data() ); Arts::Poti mid2q; mid2q.color( "grey" ); mid2q.caption( i18n( "Mid2 Q" ).utf8().data() );
mid2q.min( 0.01 ); mid2q.max( 10 ); mid2q.min( 0.01 ); mid2q.max( 10 );
mid2q.value( ch.mid2q() ); connect( mid2q, "value_changed", ch, "mid2q" ); mid2q.value( ch.mid2q() ); connect( mid2q, "value_changed", ch, "mid2q" );
mid2q.tqparent( mid2box ); mid2box._addChild( mid2q , "" ); mid2q.parent( mid2box ); mid2box._addChild( mid2q , "" );
Arts::Poti mid3gain; mid3gain.caption( i18n( "Mid3 Gain" ).utf8().data() ); Arts::Poti mid3gain; mid3gain.caption( i18n( "Mid3 Gain" ).utf8().data() );
mid3gain.min( -24 ); mid3gain.max( 24 ); mid3gain.min( -24 ); mid3gain.max( 24 );
@ -174,11 +174,11 @@ public:
Arts::Poti mid3freq; mid3freq.color( "grey" ); mid3freq.caption( i18n( "Mid3 Freq" ).utf8().data() ); Arts::Poti mid3freq; mid3freq.color( "grey" ); mid3freq.caption( i18n( "Mid3 Freq" ).utf8().data() );
mid3freq.min( 1000 ); mid3freq.max( 10000 ); mid3freq.min( 1000 ); mid3freq.max( 10000 );
mid3freq.value( ch.mid3freq() ); connect( mid3freq, "value_changed", ch, "mid3freq" ); mid3freq.value( ch.mid3freq() ); connect( mid3freq, "value_changed", ch, "mid3freq" );
mid3freq.tqparent( mid3box ); mid3box._addChild( mid3freq , "" ); mid3freq.parent( mid3box ); mid3box._addChild( mid3freq , "" );
Arts::Poti mid3q; mid3q.color( "grey" ); mid3q.caption( i18n( "Mid3 Q" ).utf8().data() ); Arts::Poti mid3q; mid3q.color( "grey" ); mid3q.caption( i18n( "Mid3 Q" ).utf8().data() );
mid3q.min( 0.01 ); mid3q.max( 10 ); mid3q.min( 0.01 ); mid3q.max( 10 );
mid3q.value( ch.mid3q() ); connect( mid3q, "value_changed", ch, "mid3q" ); mid3q.value( ch.mid3q() ); connect( mid3q, "value_changed", ch, "mid3q" );
mid3q.tqparent( mid3box ); mid3box._addChild( mid3q , "" ); mid3q.parent( mid3box ); mid3box._addChild( mid3q , "" );
Arts::Poti highgain; highgain.caption( i18n( "High Gain" ).utf8().data() ); Arts::Poti highgain; highgain.caption( i18n( "High Gain" ).utf8().data() );
highgain.min( -24 ); highgain.max( 24 ); highgain.min( -24 ); highgain.max( 24 );
@ -191,11 +191,11 @@ public:
Arts::Poti highfreq; highfreq.color( "grey" ); highfreq.caption( i18n( "High Freq" ).utf8().data() ); Arts::Poti highfreq; highfreq.color( "grey" ); highfreq.caption( i18n( "High Freq" ).utf8().data() );
highfreq.min( 5000 ); highfreq.max( 16000 ); highfreq.min( 5000 ); highfreq.max( 16000 );
highfreq.value( ch.highfreq() ); connect( highfreq, "value_changed", ch, "highfreq" ); highfreq.value( ch.highfreq() ); connect( highfreq, "value_changed", ch, "highfreq" );
highfreq.tqparent( highbox ); highbox._addChild( highfreq , "" ); highfreq.parent( highbox ); highbox._addChild( highfreq , "" );
Arts::Poti highq; highq.color( "grey" ); highq.caption( i18n( "High Q" ).utf8().data() ); Arts::Poti highq; highq.color( "grey" ); highq.caption( i18n( "High Q" ).utf8().data() );
highq.min( 0.01 ); highq.max( 10 ); highq.min( 0.01 ); highq.max( 10 );
highq.value( ch.highq() ); connect( highq, "value_changed", ch, "highq" ); highq.value( ch.highq() ); connect( highq, "value_changed", ch, "highq" );
highq.tqparent( highbox ); highbox._addChild( highq , "" ); highq.parent( highbox ); highbox._addChild( highq , "" );
hbox.addStretch( 100 ); hbox.addStretch( 100 );

@ -58,7 +58,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
roomsize.color("red"); roomsize.min(0); roomsize.max(1); roomsize.color("red"); roomsize.min(0); roomsize.max(1);
roomsize.value(freeverb.roomsize()); roomsize.value(freeverb.roomsize());
roomsize.range(100); roomsize.range(100);
roomsize.tqparent(hbox); roomsize.parent(hbox);
roomsize.show(); roomsize.show();
connect(roomsize,"value_changed", freeverb, "roomsize"); connect(roomsize,"value_changed", freeverb, "roomsize");
hbox._addChild(roomsize,"roomsizeWidget"); hbox._addChild(roomsize,"roomsizeWidget");
@ -68,7 +68,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
damp.color("red"); damp.min(0); damp.max(1); damp.color("red"); damp.min(0); damp.max(1);
damp.value(freeverb.damp()); damp.value(freeverb.damp());
damp.range(100); damp.range(100);
damp.tqparent(hbox); damp.parent(hbox);
damp.show(); damp.show();
connect(damp,"value_changed", freeverb, "damp"); connect(damp,"value_changed", freeverb, "damp");
hbox._addChild(damp,"dampWidget"); hbox._addChild(damp,"dampWidget");
@ -78,7 +78,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
wet.color("red"); wet.min(0); wet.max(1); wet.color("red"); wet.min(0); wet.max(1);
wet.value(freeverb.wet()); wet.value(freeverb.wet());
wet.range(100); wet.range(100);
wet.tqparent(hbox); wet.parent(hbox);
wet.show(); wet.show();
connect(wet,"value_changed", freeverb, "wet"); connect(wet,"value_changed", freeverb, "wet");
hbox._addChild(wet,"wetWidget"); hbox._addChild(wet,"wetWidget");
@ -88,7 +88,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
dry.color("red"); dry.min(0); dry.max(1); dry.color("red"); dry.min(0); dry.max(1);
dry.value(freeverb.dry()); dry.value(freeverb.dry());
dry.range(100); dry.range(100);
dry.tqparent(hbox); dry.parent(hbox);
dry.show(); dry.show();
connect(dry,"value_changed", freeverb, "dry"); connect(dry,"value_changed", freeverb, "dry");
hbox._addChild(dry,"dryWidget"); hbox._addChild(dry,"dryWidget");
@ -98,7 +98,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object)
width.color("red"); width.min(0); width.max(1); width.color("red"); width.min(0); width.max(1);
width.value(freeverb.width()); width.value(freeverb.width());
width.range(100); width.range(100);
width.tqparent(hbox); width.parent(hbox);
width.show(); width.show();
connect(width,"value_changed", freeverb, "width"); connect(width,"value_changed", freeverb, "width");
hbox._addChild(width,"widthWidget"); hbox._addChild(width,"widthWidget");

@ -86,7 +86,7 @@ public:
TQTimer* _timer; TQTimer* _timer;
Arts::KStereoVolumeControlGui_impl* _impl; Arts::KStereoVolumeControlGui_impl* _impl;
public: public:
KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* tqparent, const char* name=0 ) : TQObject( tqparent,name ), _impl( impl ) { KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) {
_timer = new TQTimer( this ); _timer = new TQTimer( this );
connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) ); connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) );
} }

@ -186,7 +186,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object)
vbox.show(); vbox.show();
Graph g; Graph g;
g.tqparent(vbox); g.parent(vbox);
g.width(400); g.width(400);
g.height(230); g.height(230);
g.caption(i18n("a graph").utf8().data()); g.caption(i18n("a graph").utf8().data());
@ -211,7 +211,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object)
spinbox.caption(i18n("channels").utf8().data()); spinbox.caption(i18n("channels").utf8().data());
spinbox.min(3); spinbox.max(255); spinbox.min(3); spinbox.max(255);
spinbox.value(equalizer.taps()); spinbox.value(equalizer.taps());
spinbox.tqparent(vbox); spinbox.parent(vbox);
spinbox.show(); spinbox.show();
connect(spinbox,"value_changed", equalizer, "taps"); connect(spinbox,"value_changed", equalizer, "taps");
vbox._addChild(spinbox,"spinbox"); vbox._addChild(spinbox,"spinbox");

@ -53,7 +53,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
position.color( "grey" ); position.min( -1 ); position.max( 1 ); position.color( "grey" ); position.min( -1 ); position.max( 1 );
position.value( voiceremoval.position() ); position.value( voiceremoval.position() );
position.range( 100 ); position.range( 100 );
position.tqparent( hbox ); position.parent( hbox );
position.show(); position.show();
connect( position, "value_changed", voiceremoval, "position" ); connect( position, "value_changed", voiceremoval, "position" );
hbox._addChild( position, "positionWidget" ); hbox._addChild( position, "positionWidget" );
@ -64,7 +64,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
freq.value( voiceremoval.frequency() ); freq.value( voiceremoval.frequency() );
freq.range( 400 ); freq.range( 400 );
freq.logarithmic( 2.0 ); freq.logarithmic( 2.0 );
freq.tqparent( hbox ); freq.parent( hbox );
freq.show(); freq.show();
connect( freq, "value_changed", voiceremoval, "frequency" ); connect( freq, "value_changed", voiceremoval, "frequency" );
hbox._addChild( freq, "freqWidget" ); hbox._addChild( freq, "freqWidget" );

@ -43,14 +43,14 @@ class Synth_CDELAY_impl : virtual public Synth_CDELAY_skel,
{ {
protected: protected:
unsigned long _buffersize; unsigned long _buffersize;
unsigned long _bittqmask; unsigned long _bitmask;
float *_buffer; // holds the data to be delayed (variable size) float *_buffer; // holds the data to be delayed (variable size)
float _delaytime; float _delaytime;
unsigned int _readpos; unsigned int _readpos;
unsigned int _writepos; unsigned int _writepos;
public: public:
Synth_CDELAY_impl() : _buffersize( 0 ), _bittqmask( 0 ), _buffer( 0 ), _delaytime( 0 ), _readpos( 0 ), _writepos( 0 ) Synth_CDELAY_impl() : _buffersize( 0 ), _bitmask( 0 ), _buffer( 0 ), _delaytime( 0 ), _readpos( 0 ), _writepos( 0 )
{ {
} }
@ -66,7 +66,7 @@ public:
_delaytime = newTime; _delaytime = newTime;
double n = ceil( log( double(_delaytime * samplingRateFloat )) / log( 2. ) ); double n = ceil( log( double(_delaytime * samplingRateFloat )) / log( 2. ) );
unsigned long newbuffersize = (unsigned long)( pow( 2, n ) ); unsigned long newbuffersize = (unsigned long)( pow( 2, n ) );
unsigned long newbittqmask = newbuffersize - 1; unsigned long newbitmask = newbuffersize - 1;
if( newbuffersize != _buffersize ) if( newbuffersize != _buffersize )
{ {
float *newbuffer = new float[newbuffersize]; float *newbuffer = new float[newbuffersize];
@ -74,24 +74,24 @@ public:
for( unsigned long i = 0; i < _buffersize; i++ ) { for( unsigned long i = 0; i < _buffersize; i++ ) {
newbuffer[i] = _buffer[_writepos]; newbuffer[i] = _buffer[_writepos];
_writepos++; _writepos++;
_writepos &= newbittqmask; _writepos &= newbitmask;
} }
for( unsigned long i = _buffersize; i < newbuffersize; i++ ) for( unsigned long i = _buffersize; i < newbuffersize; i++ )
newbuffer[i] = 0; newbuffer[i] = 0;
} else { } else {
_writepos -= newbuffersize; _writepos -= newbuffersize;
_writepos &= newbittqmask; _writepos &= newbitmask;
for( unsigned long i = 0; i < newbuffersize; i++ ) { for( unsigned long i = 0; i < newbuffersize; i++ ) {
newbuffer[i] = _buffer[_writepos]; newbuffer[i] = _buffer[_writepos];
_writepos++; _writepos++;
_writepos &= newbittqmask; _writepos &= newbitmask;
} }
} }
_buffer = newbuffer; _buffer = newbuffer;
_buffersize = newbuffersize; _buffersize = newbuffersize;
_bittqmask = newbittqmask; _bitmask = newbitmask;
} }
_readpos = (unsigned long)rint( _writepos - _delaytime * samplingRateFloat ) & _bittqmask; _readpos = (unsigned long)rint( _writepos - _delaytime * samplingRateFloat ) & _bitmask;
time_changed( _delaytime ); time_changed( _delaytime );
} }
@ -113,9 +113,9 @@ public:
_buffer[_writepos] = invalue[i]; _buffer[_writepos] = invalue[i];
outvalue[i] = _buffer[_readpos]; outvalue[i] = _buffer[_readpos];
_readpos++; _readpos++;
_readpos &= _bittqmask; _readpos &= _bitmask;
_writepos++; _writepos++;
_writepos &= _bittqmask; _writepos &= _bitmask;
} }
} }
}; };

@ -56,13 +56,13 @@ class Synth_DELAY_impl : virtual public Synth_DELAY_skel,
{ {
protected: protected:
unsigned long _buffersize; unsigned long _buffersize;
unsigned long _bittqmask; unsigned long _bitmask;
float * _buffer; float * _buffer;
float _maxdelay; float _maxdelay;
unsigned int _writepos; unsigned int _writepos;
public: public:
Synth_DELAY_impl() : _buffersize( 0 ), _bittqmask( 0 ), _buffer( 0 ), _maxdelay( 0 ), _writepos( 0 ) Synth_DELAY_impl() : _buffersize( 0 ), _bitmask( 0 ), _buffer( 0 ), _maxdelay( 0 ), _writepos( 0 )
{ {
maxdelay( 1 ); // take a one second buffer if nothing else is specified maxdelay( 1 ); // take a one second buffer if nothing else is specified
} }
@ -85,15 +85,15 @@ public:
{ {
double int_pos; double int_pos;
double error = modf( time[i] * samplingRateFloat, &int_pos ); double error = modf( time[i] * samplingRateFloat, &int_pos );
unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bittqmask; unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bitmask;
unsigned long readpos2 = ( readpos1 - 1 ) & _bittqmask; // Shouldn't this be +1? (mkretz) unsigned long readpos2 = ( readpos1 - 1 ) & _bitmask; // Shouldn't this be +1? (mkretz)
// No, it's right this way: // No, it's right this way:
// ( 1 - error ) needs to be multiplied with the second // ( 1 - error ) needs to be multiplied with the second
// sample; error with the first // sample; error with the first
_buffer[_writepos] = invalue[i]; _buffer[_writepos] = invalue[i];
outvalue[i] = _buffer[readpos1] * ( 1 - error ) + _buffer[readpos2] * error; outvalue[i] = _buffer[readpos1] * ( 1 - error ) + _buffer[readpos2] * error;
_writepos++; _writepos++;
_writepos &= _bittqmask; _writepos &= _bitmask;
} }
} }
@ -106,7 +106,7 @@ public:
_maxdelay = newmaxdelay; _maxdelay = newmaxdelay;
double n = ceil( log( double(_maxdelay * samplingRateFloat) ) / log( 2. ) ); double n = ceil( log( double(_maxdelay * samplingRateFloat) ) / log( 2. ) );
unsigned long newbuffersize = (unsigned long)( pow( 2, n ) ); unsigned long newbuffersize = (unsigned long)( pow( 2, n ) );
unsigned long newbittqmask = newbuffersize - 1; unsigned long newbitmask = newbuffersize - 1;
if( newbuffersize != _buffersize ) if( newbuffersize != _buffersize )
{ {
float *newbuffer = new float[newbuffersize]; float *newbuffer = new float[newbuffersize];
@ -114,22 +114,22 @@ public:
for( unsigned long i = 0; i < _buffersize; i++ ) { for( unsigned long i = 0; i < _buffersize; i++ ) {
newbuffer[i] = _buffer[_writepos]; newbuffer[i] = _buffer[_writepos];
_writepos++; _writepos++;
_writepos &= newbittqmask; _writepos &= newbitmask;
} }
for( unsigned long i = _buffersize; i < newbuffersize; i++ ) for( unsigned long i = _buffersize; i < newbuffersize; i++ )
newbuffer[i] = 0; newbuffer[i] = 0;
} else { } else {
_writepos -= newbuffersize; _writepos -= newbuffersize;
_writepos &= newbittqmask; _writepos &= newbitmask;
for( unsigned long i = 0; i < newbuffersize; i++ ) { for( unsigned long i = 0; i < newbuffersize; i++ ) {
newbuffer[i] = _buffer[_writepos]; newbuffer[i] = _buffer[_writepos];
_writepos++; _writepos++;
_writepos &= newbittqmask; _writepos &= newbitmask;
} }
} }
_buffer = newbuffer; _buffer = newbuffer;
_buffersize = newbuffersize; _buffersize = newbuffersize;
_bittqmask = newbittqmask; _bitmask = newbitmask;
} }
maxdelay_changed( _maxdelay ); maxdelay_changed( _maxdelay );
} }

@ -76,11 +76,11 @@ module Arts {
interface PortDesc { interface PortDesc {
// internal: // internal:
void constructor(ModuleDesc tqparent, string name, PortType type); void constructor(ModuleDesc parent, string name, PortType type);
// ID is guaranteed to be unique in the structure the port belongs to // ID is guaranteed to be unique in the structure the port belongs to
readonly attribute long ID; readonly attribute long ID;
readonly attribute ModuleDesc tqparent; readonly attribute ModuleDesc parent;
// Name is guaranteed to be unique for each module (no two in/out- // Name is guaranteed to be unique for each module (no two in/out-
// ports with the same name allowed) // ports with the same name allowed)
@ -123,11 +123,11 @@ module Arts {
interface ModuleDesc { interface ModuleDesc {
// internal // internal
void constructor(StructureDesc tqparent, ModuleInfo info); void constructor(StructureDesc parent, ModuleInfo info);
// ID is guaranteed to be unique in the structure the module belongs to // ID is guaranteed to be unique in the structure the module belongs to
readonly attribute long ID; readonly attribute long ID;
readonly attribute StructureDesc tqparent; readonly attribute StructureDesc parent;
readonly attribute string name; readonly attribute string name;
readonly attribute sequence<PortDesc> ports; readonly attribute sequence<PortDesc> ports;
@ -184,7 +184,7 @@ module Arts {
interface StructurePortDesc : PortDesc { interface StructurePortDesc : PortDesc {
// internal // internal
void constructor(StructureDesc tqparent, string name, PortType type); void constructor(StructureDesc parent, string name, PortType type);
// Position: how the port is positioned when the structure is used // Position: how the port is positioned when the structure is used
// as module - 0 is leftmost, higher numbers are more right // as module - 0 is leftmost, higher numbers are more right
@ -192,7 +192,7 @@ module Arts {
readonly attribute StructureDesc parentStructure; readonly attribute StructureDesc parentStructure;
// if the port is associated with an inherited interface of the // if the port is associated with an inherited interface of the
// tqparent structure, then it should be setup here // parent structure, then it should be setup here
attribute string inheritedInterface; attribute string inheritedInterface;
boolean moveTo(long x, long y); // returns true when successful boolean moveTo(long x, long y); // returns true when successful

@ -96,7 +96,7 @@ ModuleDef StructureBuilder_impl::createTypeInfo(StructureDesc structure)
{ {
const Arts::PortType& type = pi->type(); const Arts::PortType& type = pi->type();
// if we inherited the port from a tqparent interface, we don't need to // if we inherited the port from a parent interface, we don't need to
// list it in our interface description // list it in our interface description
if(pi->inheritedInterface().empty()) if(pi->inheritedInterface().empty())
{ {
@ -236,12 +236,12 @@ Structure_impl::Structure_impl(StructureDesc structureDesc,
for(ci = connections->begin(); ci != connections->end(); ci++) for(ci = connections->begin(); ci != connections->end(); ci++)
{ {
if(!ci->tqparent().isNull()) // structureport otherwise if(!ci->parent().isNull()) // structureport otherwise
{ {
Object& dest = moduleMap[ci->tqparent().ID()]; Object& dest = moduleMap[ci->parent().ID()];
#ifdef STRUCTBUILDER_DEBUG #ifdef STRUCTBUILDER_DEBUG
cout << "connect " << mi->name() << "." << pi->name() cout << "connect " << mi->name() << "." << pi->name()
<< " to " << ci->tqparent().name() << " to " << ci->parent().name()
<< "." << ci->name() << endl; << "." << ci->name() << endl;
#endif #endif
connect(object,pd.name(),dest,ci->name()); connect(object,pd.name(),dest,ci->name());
@ -271,10 +271,10 @@ Structure_impl::Structure_impl(StructureDesc structureDesc,
for(ci = connections->begin(); ci != connections->end(); ci++) for(ci = connections->begin(); ci != connections->end(); ci++)
{ {
Object& dest = moduleMap[ci->tqparent().ID()]; Object& dest = moduleMap[ci->parent().ID()];
#ifdef STRUCTBUILDER_DEBUG #ifdef STRUCTBUILDER_DEBUG
cout << "virtualize " << pi->name() cout << "virtualize " << pi->name()
<< " to " << ci->tqparent().name() << "." << ci->name() << " to " << ci->parent().name() << "." << ci->name()
<< endl; << endl;
#endif #endif

@ -32,11 +32,11 @@ public:
~PortDesc_impl(); ~PortDesc_impl();
inline PortDesc self() { return PortDesc::_from_base(_copy()); } inline PortDesc self() { return PortDesc::_from_base(_copy()); }
void constructor(ModuleDesc tqparent, const string& name, const PortType& type); void constructor(ModuleDesc parent, const string& name, const PortType& type);
void disconnectAll(); void disconnectAll();
long ID(); long ID();
ModuleDesc tqparent(); ModuleDesc parent();
string name(); string name();
PortType type(); PortType type();
bool isConnected(); bool isConnected();
@ -78,7 +78,7 @@ private:
public: public:
long ID(); long ID();
StructureDesc tqparent(); StructureDesc parent();
string name(); string name();
vector<PortDesc> *ports(); vector<PortDesc> *ports();
long height(); long height();
@ -86,7 +86,7 @@ public:
long x(); long x();
long y(); long y();
bool moveTo( long x, long y ); bool moveTo( long x, long y );
void constructor( StructureDesc tqparent, const ModuleInfo& info ); void constructor( StructureDesc parent, const ModuleInfo& info );
void loadFromList(const vector<string>& list); void loadFromList(const vector<string>& list);
vector<string> *saveToList(); vector<string> *saveToList();
@ -155,7 +155,7 @@ protected:
return StructurePortDesc::_from_base(_copy()); return StructurePortDesc::_from_base(_copy());
} }
public: public:
void constructor(StructureDesc tqparent, const string& name, void constructor(StructureDesc parent, const string& name,
const PortType& type); const PortType& type);
~StructurePortDesc_impl(); ~StructurePortDesc_impl();
@ -192,13 +192,13 @@ REGISTER_IMPLEMENTATION(StructurePortDesc_impl);
#define pstat \ #define pstat \
printf("port name %s, direction %s, id %d\n",_Name.c_str(),dname(_Type.direction),_ID); printf("port name %s, direction %s, id %d\n",_Name.c_str(),dname(_Type.direction),_ID);
void PortDesc_impl::constructor(ModuleDesc tqparent, const string& name, void PortDesc_impl::constructor(ModuleDesc parent, const string& name,
const PortType& type) const PortType& type)
{ {
#if 0 #if 0
if(tqparent) if(parent)
{ {
char * pname = tqparent->Name(); char * pname = parent->Name();
describe("PortDesc."+string(pname)+string(".")+name); describe("PortDesc."+string(pname)+string(".")+name);
} }
else else
@ -208,14 +208,14 @@ void PortDesc_impl::constructor(ModuleDesc tqparent, const string& name,
#endif #endif
_name = name; _name = name;
_type = type; _type = type;
_parent = tqparent; _parent = parent;
_isConnected = false; _isConnected = false;
_hasValue = false; _hasValue = false;
_value.type = _type.dataType; _value.type = _type.dataType;
if(!tqparent.isNull()) if(!parent.isNull())
{ {
StructureDesc sd = tqparent.tqparent(); StructureDesc sd = parent.parent();
_ID = sd.obtainID(); _ID = sd.obtainID();
} }
// else: assume that some smart object which derives from us will set the ID accordingly // else: assume that some smart object which derives from us will set the ID accordingly
@ -276,7 +276,7 @@ long PortDesc_impl::ID()
return _ID; return _ID;
} }
ModuleDesc PortDesc_impl::tqparent() ModuleDesc PortDesc_impl::parent()
{ {
return _parent; return _parent;
} }
@ -468,11 +468,11 @@ void PortDesc_impl::disconnectFrom( PortDesc port )
_isConnected = !_connections.empty(); _isConnected = !_connections.empty();
ModuleDesc tqparent = _parent; ModuleDesc parent = _parent;
if(tqparent.isNull()) if(parent.isNull())
artsdebug("_Parent = <some structure>, isConnected = %d\n",_isConnected); artsdebug("_Parent = <some structure>, isConnected = %d\n",_isConnected);
else else
artsdebug("_Parent = %s, isConnected = %d\n",tqparent.name().c_str(),_isConnected); artsdebug("_Parent = %s, isConnected = %d\n",parent.name().c_str(),_isConnected);
if(found) if(found)
port.disconnectFrom(self()); port.disconnectFrom(self());
@ -484,7 +484,7 @@ long ModuleDesc_impl::ID()
return _ID; return _ID;
} }
StructureDesc ModuleDesc_impl::tqparent() StructureDesc ModuleDesc_impl::parent()
{ {
return _parent; return _parent;
} }
@ -549,14 +549,14 @@ long StructureDesc_impl::height()
* Query the module for it's paramenters * Query the module for it's paramenters
*/ */
void ModuleDesc_impl::constructor( StructureDesc tqparent, void ModuleDesc_impl::constructor( StructureDesc parent,
const Arts::ModuleInfo& info ) const Arts::ModuleInfo& info )
{ {
_name = info.name; _name = info.name;
_x = -1; // no position assigned _x = -1; // no position assigned
_y = -1; _y = -1;
_ID = tqparent.obtainID(); _ID = parent.obtainID();
_parent = tqparent; _parent = parent;
_isInterface = info.isInterface; _isInterface = info.isInterface;
_isStructure = info.isStructure; _isStructure = info.isStructure;
@ -1134,12 +1134,12 @@ void StructureDesc_impl::moveStructurePortDesc(StructurePortDesc
portdesc.internalSetPosition(newposition); portdesc.internalSetPosition(newposition);
} }
void StructurePortDesc_impl::constructor(StructureDesc tqparent, void StructurePortDesc_impl::constructor(StructureDesc parent,
const string& name, const PortType& type) const string& name, const PortType& type)
{ {
PortDesc_impl::constructor(ModuleDesc::null(),name,type); PortDesc_impl::constructor(ModuleDesc::null(),name,type);
_parentStructure = tqparent; _parentStructure = parent;
_ID = tqparent.obtainID(); _ID = parent.obtainID();
_x = 0; _x = 0;
_y = 0; _y = 0;
_position = 0; _position = 0;
@ -1167,18 +1167,18 @@ long StructurePortDesc_impl::position()
void StructurePortDesc_impl::lowerPosition() void StructurePortDesc_impl::lowerPosition()
{ {
StructureDesc tqparent = _parentStructure; // weak reference StructureDesc parent = _parentStructure; // weak reference
if(!tqparent.isNull()) if(!parent.isNull())
tqparent.moveStructurePortDesc(self(), _position-1); parent.moveStructurePortDesc(self(), _position-1);
} }
void StructurePortDesc_impl::raisePosition() void StructurePortDesc_impl::raisePosition()
{ {
StructureDesc tqparent = _parentStructure; // weak reference StructureDesc parent = _parentStructure; // weak reference
if(!tqparent.isNull()) if(!parent.isNull())
tqparent.moveStructurePortDesc(self(), _position+1); parent.moveStructurePortDesc(self(), _position+1);
} }
void StructurePortDesc_impl::rename(const string& newname) void StructurePortDesc_impl::rename(const string& newname)

@ -36,8 +36,8 @@
#include "environmentview.h" #include "environmentview.h"
#include "mediatypesview.h" #include "mediatypesview.h"
ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* tqparent, const char* name ) ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name )
: TQObject( tqparent,name ) : TQObject( parent,name )
, _kartsserver( server ) , _kartsserver( server )
, _actioncollection( col ) , _actioncollection( col )
, _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 ) , _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 )

@ -48,7 +48,7 @@ public:
@param artsserver a pointer to a existing KArtsServer. If 0 a new is created. @param artsserver a pointer to a existing KArtsServer. If 0 a new is created.
@param actioncollection the KActionCollection all the actions should belong to. Names of the actions are then: artssupport_* @param actioncollection the KActionCollection all the actions should belong to. Names of the actions are then: artssupport_*
@param qwidget the tqparent TQWidget @param qwidget the parent TQWidget
@param name the name of the object @param name the name of the object
*/ */
ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 );

@ -29,18 +29,18 @@
extern "C" extern "C"
{ {
KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile) KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
{ {
KGlobal::locale()->insertCatalogue("artscontrol"); KGlobal::locale()->insertCatalogue("artscontrol");
return new ArtsControlApplet(configFile, KPanelApplet::Normal, return new ArtsControlApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/, KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/,
tqparent, "artscontrolapplet"); parent, "artscontrolapplet");
} }
} }
ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) : KPanelApplet(configFile, type, actions, tqparent, name) ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name)
{ {
//kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<tqparent<<", const char* "<<name<<" )"<<endl; //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<parent<<", const char* "<<name<<" )"<<endl;
// Get the current application configuration handle // Get the current application configuration handle
ksConfig = config(); ksConfig = config();

@ -39,7 +39,7 @@ public:
* @param configFile The configFile handed over in the factory function. * @param configFile The configFile handed over in the factory function.
* @param Type The applet @ref type(). * @param Type The applet @ref type().
* @param actions Standard RMB menu actions supported by the applet (see @ref action() ). * @param actions Standard RMB menu actions supported by the applet (see @ref action() ).
* @param tqparent The pointer to the tqparent widget handed over in the factory function. * @param parent The pointer to the parent widget handed over in the factory function.
* @param name A TQt object name for your applet. * @param name A TQt object name for your applet.
**/ **/
ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0, ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0,

@ -66,9 +66,9 @@ public:
KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall;
ArtsControlAppletPrivate( ArtsControlApplet *tqparent ) ArtsControlAppletPrivate( ArtsControlApplet *parent )
: TQObject(tqparent) : TQObject(parent)
, _parent( tqparent ) , _parent( parent )
, barts( false ) , barts( false )
, bInUpdate( false ) , bInUpdate( false )
{ {
@ -78,7 +78,7 @@ public:
if( barts ) volume = arts->server().outVolume(); if( barts ) volume = arts->server().outVolume();
svinline=0; svinline=0;
_artsactions = new ArtsActions( arts, 0, tqparent ); _artsactions = new ArtsActions( arts, 0, parent );
menu = new KPopupMenu( 0 ); menu = new KPopupMenu( 0 );
_showSV = _artsactions->actionScopeView(); _showSV = _artsactions->actionScopeView();

@ -37,7 +37,7 @@ using namespace std;
* as this is an 1:1 port of an old arts-0.3.4.1 artsbuilable visual widget, * as this is an 1:1 port of an old arts-0.3.4.1 artsbuilable visual widget,
* you'll see some porting artefacts, and it's not elegance itself ;) * you'll see some porting artefacts, and it's not elegance itself ;)
*/ */
Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ) Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name )
{ {
this->setCaption( i18n( "Audio Manager" ) ); this->setCaption( i18n( "Audio Manager" ) );
this->setIcon( MainBarIcon( "artsaudiomanager", 32 ) ); this->setIcon( MainBarIcon( "artsaudiomanager", 32 ) );
@ -72,14 +72,14 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget)
} }
#endif #endif
void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/) void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/)
{ {
/************************************************************************ /************************************************************************
* From Gui_INSTRUMENT_MAPPER: * From Gui_INSTRUMENT_MAPPER:
* *
* I am still not sure wether this kind of putting yourself into a tqparent * I am still not sure wether this kind of putting yourself into a parent
* widget (with own tqlayout etc.) is a good idea (there may not even be * widget (with own tqlayout etc.) is a good idea (there may not even be
* a singe call to setParent, because there is no tqparent). * a singe call to setParent, because there is no parent).
* *
* But the "how to write aRts widgets"-stuff will need some experiments, * But the "how to write aRts widgets"-stuff will need some experiments,
* so lets try that method... * so lets try that method...
@ -90,12 +90,12 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/
* else would be appropriate. Check that. FIXME * else would be appropriate. Check that. FIXME
************************************************************************/ ************************************************************************/
TQVBoxLayout *maintqlayout = new TQVBoxLayout(tqparent); TQVBoxLayout *maintqlayout = new TQVBoxLayout(parent);
/*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/ /*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/
// list // list
listview = new KListView(tqparent); listview = new KListView(parent);
listview->addColumn(i18n("Title"),175); listview->addColumn(i18n("Title"),175);
listview->addColumn(i18n("Type"),50); listview->addColumn(i18n("Type"),50);
@ -110,7 +110,7 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/
maintqlayout->activate(); maintqlayout->activate();
//maintqlayout->freeze(); //maintqlayout->freeze();
ParentWidget = tqparent; ParentWidget = parent;
} }
void Gui_AUDIO_MANAGER::tick() void Gui_AUDIO_MANAGER::tick()
@ -178,8 +178,8 @@ void GuiAudioManagerProxy::edit(TQListViewItem *item)
gim->edit(item); gim->edit(item);
} }
AudioManagerItem::AudioManagerItem(TQListView *tqparent, TQString a, AudioManagerItem::AudioManagerItem(TQListView *parent, TQString a,
TQString b, TQString c, long ID) :TQListViewItem(tqparent,a,b,c) TQString b, TQString c, long ID) :TQListViewItem(parent,a,b,c)
{ {
_ID = ID; _ID = ID;
} }

@ -71,7 +71,7 @@ public slots:
class AudioManagerItem : public TQListViewItem { class AudioManagerItem : public TQListViewItem {
long _ID; long _ID;
public: public:
AudioManagerItem(TQListView *tqparent, TQString a, TQString b, AudioManagerItem(TQListView *parent, TQString a, TQString b,
TQString c, long ID); TQString c, long ID);
~AudioManagerItem(); ~AudioManagerItem();

@ -42,8 +42,8 @@ static void min_size(TQWidget *w) {
w->setMinimumSize(w->tqsizeHint()); w->setMinimumSize(w->tqsizeHint());
} }
ChooseBusDlg::ChooseBusDlg(TQWidget *tqparent) ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
: KDialog(tqparent,"X", TRUE) : KDialog(parent,"X", TRUE)
, _newbusitemindex( -1 ) , _newbusitemindex( -1 )
{ {
setCaption(i18n("Choose Bus")); setCaption(i18n("Choose Bus"));

@ -36,7 +36,7 @@ class ChooseBusDlg :public KDialog {
int _newbusitemindex; int _newbusitemindex;
public: public:
ChooseBusDlg(TQWidget *tqparent); ChooseBusDlg(TQWidget *parent);
public slots: public slots:
TQString result(); TQString result();

@ -61,7 +61,7 @@ public:
} }
}; };
EnvironmentView::EnvironmentView( Container container, TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ), container(container) EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ), container(container)
{ {
this->setCaption( i18n( "Environment" ) ); this->setCaption( i18n( "Environment" ) );
this->setIcon( MainBarIcon( "artsenvironment", 32 ) ); this->setIcon( MainBarIcon( "artsenvironment", 32 ) );

@ -37,8 +37,8 @@
using namespace std; using namespace std;
using namespace Arts; using namespace Arts;
FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* tqparent ) FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* parent )
: Template_ArtsView( tqparent ) : Template_ArtsView( parent )
, server( server ) , server( server )
, scopeData( 0 ) , scopeData( 0 )
{ {

@ -7,8 +7,8 @@
const int PeakBar::peakMillis=1500; const int PeakBar::peakMillis=1500;
PeakBar::PeakBar(TQWidget *tqparent) PeakBar::PeakBar(TQWidget *parent)
: ACLevelMeter(tqparent) : ACLevelMeter(parent)
, maxValue( 0.0f ) , maxValue( 0.0f )
, minValue( 0.0f ) , minValue( 0.0f )
{ {
@ -109,8 +109,8 @@ void PeakBar::setValue(float f) {
// ------------------------------------------------------------- // -------------------------------------------------------------
PeakLevelMeters::PeakLevelMeters(TQWidget *tqparent): PeakLevelMeters::PeakLevelMeters(TQWidget *parent):
StereoLevelMeter(tqparent), left(this), right(this), scaleView(this) StereoLevelMeter(parent), left(this), right(this), scaleView(this)
{ {
TQBoxLayout *tqlayout= new TQHBoxLayout(this); TQBoxLayout *tqlayout= new TQHBoxLayout(this);
tqlayout->addWidget(&left); tqlayout->addWidget(&left);
@ -142,7 +142,7 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) {
right.setValue(f); right.setValue(f);
} }
ScaleView::ScaleView(TQWidget *tqparent): TQFrame(tqparent) { ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) {
font.setPixelSize(10); font.setPixelSize(10);
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
} }
@ -187,7 +187,7 @@ void ScaleView::drawContents(TQPainter *p) {
// ------------------------------------------------------------- // -------------------------------------------------------------
LedMeter::LedMeter(TQWidget *tqparent, bool blueState) : ACLevelMeter(tqparent) { LedMeter::LedMeter(TQWidget *parent, bool blueState) : ACLevelMeter(parent) {
setBackgroundColor(black); setBackgroundColor(black);
TQBoxLayout * l = new TQVBoxLayout( this ); TQBoxLayout * l = new TQVBoxLayout( this );
l->setAutoAdd(TRUE); l->setAutoAdd(TRUE);
@ -223,8 +223,8 @@ void LedMeter::setValue(float f)
// ------------------------------------------------------------- // -------------------------------------------------------------
StereoLedMeters::StereoLedMeters(TQWidget *tqparent) StereoLedMeters::StereoLedMeters(TQWidget *parent)
: StereoLevelMeter(tqparent), left(this), right(this) : StereoLevelMeter(parent), left(this), right(this)
{ {
TQBoxLayout *tqlayout= new TQHBoxLayout(this); TQBoxLayout *tqlayout= new TQHBoxLayout(this);
tqlayout->addWidget(&left); tqlayout->addWidget(&left);

@ -46,7 +46,7 @@ class ACLevelMeter : public TQFrame {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ACLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {} ACLevelMeter(TQWidget *parent): TQFrame(parent) {}
public slots: public slots:
virtual void setValue(float f) = 0; virtual void setValue(float f) = 0;
}; };
@ -58,7 +58,7 @@ class StereoLevelMeter : public TQFrame {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
StereoLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {} StereoLevelMeter(TQWidget *parent): TQFrame(parent) {}
public slots: public slots:
virtual void setValues(float left, float right) = 0; virtual void setValues(float left, float right) = 0;
}; };
@ -92,7 +92,7 @@ protected:
void frameChanged(); void frameChanged();
public: public:
PeakBar(TQWidget *tqparent); PeakBar(TQWidget *parent);
TQSize tqsizeHint() const; TQSize tqsizeHint() const;
@ -111,7 +111,7 @@ protected:
int dbRange; int dbRange;
int upperMargin, lowerMargin; int upperMargin, lowerMargin;
public: public:
ScaleView(TQWidget *tqparent); ScaleView(TQWidget *parent);
void setDbRange(int db); void setDbRange(int db);
void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; } void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; }
TQSize tqsizeHint() const; TQSize tqsizeHint() const;
@ -132,7 +132,7 @@ protected:
ScaleView scaleView; ScaleView scaleView;
public: public:
PeakLevelMeters(TQWidget *tqparent); PeakLevelMeters(TQWidget *parent);
public slots: public slots:
void setValues(float leftVal, float rightVal); void setValues(float leftVal, float rightVal);
@ -153,7 +153,7 @@ protected:
KLed *leds[12]; KLed *leds[12];
public: public:
LedMeter(TQWidget *tqparent, bool blueState = false); LedMeter(TQWidget *parent, bool blueState = false);
void setValue(float f); void setValue(float f);
}; };
@ -167,7 +167,7 @@ protected:
LedMeter left, right; LedMeter left, right;
public: public:
StereoLedMeters(TQWidget *tqparent); StereoLedMeters(TQWidget *parent);
public slots: public slots:
void setValues(float left, float right); void setValues(float left, float right);
}; };

@ -82,7 +82,7 @@ FreeVerbView::~FreeVerbView() {
} }
VControl::VControl( KArtsServer* artsserver, TQWidget *tqparent) : TQFrame(tqparent) VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent)
, freeVerbView(0) , freeVerbView(0)
, server( artsserver ) , server( artsserver )
{ {

@ -79,7 +79,7 @@ protected:
TQBoxLayout *boxLayout; TQBoxLayout *boxLayout;
public: public:
VControl( KArtsServer*, TQWidget *tqparent); VControl( KArtsServer*, TQWidget *parent);
~VControl(); ~VControl();
public slots: public slots:

@ -33,7 +33,7 @@
using namespace std; using namespace std;
using namespace Arts; using namespace Arts;
MediaTypesView::MediaTypesView( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ) MediaTypesView::MediaTypesView( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name )
{ {
this->setCaption( i18n( "Available Media Types" ) ); this->setCaption( i18n( "Available Media Types" ) );
this->setIcon( MainBarIcon( "artsmediatypes", 32 ) ); this->setIcon( MainBarIcon( "artsmediatypes", 32 ) );

@ -63,8 +63,8 @@ static TQStringList listFiles(TQString directory, TQString extension)
return result; return result;
} }
MidiInstDlg::MidiInstDlg(TQWidget *tqparent) MidiInstDlg::MidiInstDlg(TQWidget *parent)
:TQDialog(tqparent,"instrument",TRUE) :TQDialog(parent,"instrument",TRUE)
{ {
TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);

@ -31,7 +31,7 @@ class MidiInstDlg :public TQDialog {
TQ_OBJECT TQ_OBJECT
TQComboBox *box; TQComboBox *box;
public: public:
MidiInstDlg(TQWidget *tqparent); MidiInstDlg(TQWidget *parent);
TQCString filename(); TQCString filename();
public slots: public slots:
void help(); void help();

@ -78,7 +78,7 @@ public:
class ConnectionWidget : public TQWidget { class ConnectionWidget : public TQWidget {
public: public:
MidiManagerView *v; MidiManagerView *v;
ConnectionWidget(MidiManagerView *v, TQWidget *tqparent) : TQWidget(tqparent), v(v) ConnectionWidget(MidiManagerView *v, TQWidget *parent) : TQWidget(parent), v(v)
{ {
} }
void paintEvent(TQPaintEvent * /*event*/) void paintEvent(TQPaintEvent * /*event*/)

@ -32,7 +32,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>
MidiPortDlg::MidiPortDlg(TQWidget *tqparent, const char *oldname, const char *title) :TQDialog(tqparent,title,TRUE) MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE)
{ {
TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);

@ -34,7 +34,7 @@ class MidiPortDlg :public TQDialog {
TQ_OBJECT TQ_OBJECT
TQLineEdit *edit; TQLineEdit *edit;
public: public:
MidiPortDlg(TQWidget *tqparent, const char *device, const char *title); MidiPortDlg(TQWidget *parent, const char *device, const char *title);
const char *device(); const char *device();
public slots: public slots:

@ -33,8 +33,8 @@
using namespace std; using namespace std;
using namespace Arts; using namespace Arts;
ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* tqparent, const char* name ) ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, const char* name )
: Template_ArtsView( tqparent,name ) : Template_ArtsView( parent,name )
, server(a_server) , server(a_server)
{ {
this->setCaption( i18n( "aRts tqStatus" ) ); this->setCaption( i18n( "aRts tqStatus" ) );

@ -22,7 +22,7 @@
//#include <kdebug.h> //#include <kdebug.h>
Template_ArtsView::Template_ArtsView( TQWidget* tqparent, const char* name ) : TQFrame( tqparent,name ){ Template_ArtsView::Template_ArtsView( TQWidget* parent, const char* name ) : TQFrame( parent,name ){
//kdDebug()<<k_funcinfo<<endl; //kdDebug()<<k_funcinfo<<endl;
} }

@ -36,9 +36,9 @@
AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName, AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName,
const PlaylistSearch &defaultSearch, const PlaylistSearch &defaultSearch,
TQWidget *tqparent, TQWidget *parent,
const char *name) : const char *name) :
KDialogBase(tqparent, name, true, i18n("Create Search Playlist"), Ok|Cancel) KDialogBase(parent, name, true, i18n("Create Search Playlist"), Ok|Cancel)
{ {
makeVBoxMainWidget(); makeVBoxMainWidget();

@ -39,7 +39,7 @@ public:
AdvancedSearchDialog(const TQString &defaultName, AdvancedSearchDialog(const TQString &defaultName,
const PlaylistSearch &defaultSearch = PlaylistSearch(), const PlaylistSearch &defaultSearch = PlaylistSearch(),
TQWidget *tqparent = 0, TQWidget *parent = 0,
const char *name = 0); const char *name = 0);
virtual ~AdvancedSearchDialog(); virtual ~AdvancedSearchDialog();

@ -34,8 +34,8 @@ using CoverUtility::CoverIconViewItem;
class AllArtistsListViewItem : public KListViewItem class AllArtistsListViewItem : public KListViewItem
{ {
public: public:
AllArtistsListViewItem(TQListView *tqparent) : AllArtistsListViewItem(TQListView *parent) :
KListViewItem(tqparent, i18n("<All Artists>")) KListViewItem(parent, i18n("<All Artists>"))
{ {
} }
@ -48,8 +48,8 @@ public:
class CaseInsensitiveItem : public KListViewItem class CaseInsensitiveItem : public KListViewItem
{ {
public: public:
CaseInsensitiveItem(TQListView *tqparent, const TQString &text) : CaseInsensitiveItem(TQListView *parent, const TQString &text) :
KListViewItem(tqparent, text) KListViewItem(parent, text)
{ {
} }
@ -60,8 +60,8 @@ public:
} }
}; };
CoverDialog::CoverDialog(TQWidget *tqparent) : CoverDialog::CoverDialog(TQWidget *parent) :
CoverDialogBase(tqparent, "juk_cover_dialog", WType_Dialog) CoverDialogBase(parent, "juk_cover_dialog", WType_Dialog)
{ {
m_covers->setResizeMode(TQIconView::Adjust); m_covers->setResizeMode(TQIconView::Adjust);
m_covers->setGridX(140); m_covers->setGridX(140);

@ -23,7 +23,7 @@ class CoverDialog : public CoverDialogBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
CoverDialog(TQWidget *tqparent); CoverDialog(TQWidget *parent);
~CoverDialog(); ~CoverDialog();
virtual void show(); virtual void show();

@ -18,15 +18,15 @@
using CoverUtility::CoverIconViewItem; using CoverUtility::CoverIconViewItem;
CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *tqparent) : CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) :
KIconViewItem(tqparent), m_id(id) KIconViewItem(parent), m_id(id)
{ {
CoverDataPtr data = CoverManager::coverInfo(id); CoverDataPtr data = CoverManager::coverInfo(id);
setText(TQString("%1 - %2").tqarg(data->artist, data->album)); setText(TQString("%1 - %2").tqarg(data->artist, data->album));
setPixmap(data->thumbnail()); setPixmap(data->thumbnail());
} }
CoverIconView::CoverIconView(TQWidget *tqparent, const char *name) : KIconView(tqparent, name) CoverIconView::CoverIconView(TQWidget *parent, const char *name) : KIconView(parent, name)
{ {
setResizeMode(Adjust); setResizeMode(Adjust);
} }

@ -29,7 +29,7 @@ namespace CoverUtility
class CoverIconViewItem : public KIconViewItem class CoverIconViewItem : public KIconViewItem
{ {
public: public:
CoverIconViewItem(coverKey id, TQIconView *tqparent); CoverIconViewItem(coverKey id, TQIconView *parent);
coverKey id() const { return m_id; } coverKey id() const { return m_id; }
@ -49,7 +49,7 @@ using CoverUtility::CoverIconViewItem;
class CoverIconView : public KIconView class CoverIconView : public KIconView
{ {
public: public:
CoverIconView(TQWidget *tqparent, const char *name); CoverIconView(TQWidget *parent, const char *name);
CoverIconViewItem *currentItem() const; CoverIconViewItem *currentItem() const;

@ -33,8 +33,8 @@
// DeleteWidget implementation // DeleteWidget implementation
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name) DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
: DeleteDialogBase(tqparent, name) : DeleteDialogBase(parent, name)
{ {
KConfigGroup messageGroup(KGlobal::config(), "FileRemover"); KConfigGroup messageGroup(KGlobal::config(), "FileRemover");
@ -69,8 +69,8 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
// DeleteDialog implementation // DeleteDialog implementation
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) : DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) :
KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name, KDialogBase(Swallow, WStyle_DialogBorder, parent, name,
true /* modal */, i18n("About to delete selected files"), true /* modal */, i18n("About to delete selected files"),
Ok | Cancel, Cancel /* Default */, true /* separator */), Ok | Cancel, Cancel /* Default */, true /* separator */),
m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full") m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full")

@ -32,7 +32,7 @@ class DeleteWidget : public DeleteDialogBase
TQ_OBJECT TQ_OBJECT
public: public:
DeleteWidget(TQWidget *tqparent = 0, const char *name = 0); DeleteWidget(TQWidget *parent = 0, const char *name = 0);
void setFiles(const TQStringList &files); void setFiles(const TQStringList &files);
@ -46,7 +46,7 @@ class DeleteDialog : public KDialogBase
TQ_OBJECT TQ_OBJECT
public: public:
DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog"); DeleteDialog(TQWidget *parent, const char *name = "delete_dialog");
bool confirmDeleteList(const TQStringList &condemnedFiles); bool confirmDeleteList(const TQStringList &condemnedFiles);
void setFiles(const TQStringList &files); void setFiles(const TQStringList &files);

@ -28,8 +28,8 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylists, DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylists,
TQWidget *tqparent, const char *name) : TQWidget *parent, const char *name) :
KDialogBase(tqparent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true), KDialogBase(parent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true),
m_dirList(directories), m_dirList(directories),
m_importPlaylists(importPlaylists) m_importPlaylists(importPlaylists)
{ {

@ -34,7 +34,7 @@ public:
}; };
DirectoryList(const TQStringList &directories, bool importPlaylists, DirectoryList(const TQStringList &directories, bool importPlaylists,
TQWidget *tqparent = 0, const char *name = 0); TQWidget *parent = 0, const char *name = 0);
virtual ~DirectoryList(); virtual ~DirectoryList();
public slots: public slots:

@ -23,9 +23,9 @@
class PlaylistDirtyObserver : public PlaylistObserver class PlaylistDirtyObserver : public PlaylistObserver
{ {
public: public:
PlaylistDirtyObserver(DynamicPlaylist *tqparent, Playlist *playlist) : PlaylistDirtyObserver(DynamicPlaylist *parent, Playlist *playlist) :
PlaylistObserver(playlist), PlaylistObserver(playlist),
m_parent(tqparent) m_parent(parent)
{ {
} }

@ -21,8 +21,8 @@
#include "exampleoptions.h" #include "exampleoptions.h"
ExampleOptions::ExampleOptions(TQWidget *tqparent) : ExampleOptions::ExampleOptions(TQWidget *parent) :
ExampleOptionsBase(tqparent, "example options widget") ExampleOptionsBase(parent, "example options widget")
{ {
} }
@ -44,8 +44,8 @@ void ExampleOptions::exampleFileChanged()
emit fileChanged(); emit fileChanged();
} }
ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *tqparent) : ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) :
TQDialog(tqparent, "example options dialog") TQDialog(parent, "example options dialog")
{ {
setCaption(i18n("JuK")); setCaption(i18n("JuK"));
TQVBoxLayout *l = new TQVBoxLayout(this); TQVBoxLayout *l = new TQVBoxLayout(this);

@ -24,7 +24,7 @@ class ExampleOptions : public ExampleOptionsBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ExampleOptions(TQWidget *tqparent); ExampleOptions(TQWidget *parent);
protected slots: protected slots:
virtual void exampleSelectionChanged(); virtual void exampleSelectionChanged();
@ -39,7 +39,7 @@ class ExampleOptionsDialog : public TQDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ExampleOptionsDialog(TQWidget *tqparent); ExampleOptionsDialog(TQWidget *parent);
const ExampleOptions *widget() const { return m_options; } const ExampleOptions *widget() const { return m_options; }

@ -60,8 +60,8 @@ class ConfirmationDialog : public KDialogBase
{ {
public: public:
ConfirmationDialog(const TQMap<TQString, TQString> &files, ConfirmationDialog(const TQMap<TQString, TQString> &files,
TQWidget *tqparent = 0, const char *name = 0) TQWidget *parent = 0, const char *name = 0)
: KDialogBase(tqparent, name, true, i18n("Warning"), Ok | Cancel) : KDialogBase(parent, name, true, i18n("Warning"), Ok | Cancel)
{ {
TQVBox *vbox = makeVBoxMainWidget(); TQVBox *vbox = makeVBoxMainWidget();
TQHBox *hbox = new TQHBox(vbox); TQHBox *hbox = new TQHBox(vbox);
@ -224,8 +224,8 @@ bool ConfigCategoryReader::isDisabled(const CategoryID &category) const
// Implementation of FileRenamerWidget // Implementation of FileRenamerWidget
// //
FileRenamerWidget::FileRenamerWidget(TQWidget *tqparent) : FileRenamerWidget::FileRenamerWidget(TQWidget *parent) :
FileRenamerBase(tqparent), CategoryReaderInterface(), FileRenamerBase(parent), CategoryReaderInterface(),
m_exampleFromFile(false) m_exampleFromFile(false)
{ {
TQLabel *temp = new TQLabel(0); TQLabel *temp = new TQLabel(0);
@ -412,7 +412,7 @@ bool FileRenamerWidget::removeRow(unsigned id)
// The checkbox is contained within a tqlayout widget, so the tqlayout // The checkbox is contained within a tqlayout widget, so the tqlayout
// widget is the one the needs to die. // widget is the one the needs to die.
delete m_folderSwitches[checkboxPosition]->tqparent(); delete m_folderSwitches[checkboxPosition]->parent();
m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]); m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]);
// Go through all the rows and if they have the same category and a // Go through all the rows and if they have the same category and a

@ -143,7 +143,7 @@ class FileRenamerWidget : public FileRenamerBase, public CategoryReaderInterface
TQ_OBJECT TQ_OBJECT
public: public:
FileRenamerWidget(TQWidget *tqparent); FileRenamerWidget(TQWidget *parent);
~FileRenamerWidget(); ~FileRenamerWidget();
/// Maximum number of total categories the widget will allow. /// Maximum number of total categories the widget will allow.

@ -19,8 +19,8 @@
#include "filerenamer.h" #include "filerenamer.h"
#include "filerenamerconfigdlg.h" #include "filerenamerconfigdlg.h"
FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *tqparent) : FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *parent) :
KDialogBase(tqparent, "file renamer dialog", true, KDialogBase(parent, "file renamer dialog", true,
i18n("File Renamer Options"), Ok | Cancel), i18n("File Renamer Options"), Ok | Cancel),
m_renamerWidget(new FileRenamerWidget(this)) m_renamerWidget(new FileRenamerWidget(this))
{ {

@ -25,7 +25,7 @@ class FileRenamerConfigDlg : public KDialogBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
FileRenamerConfigDlg(TQWidget *tqparent); FileRenamerConfigDlg(TQWidget *parent);
protected slots: protected slots:
virtual void accept(); virtual void accept();

@ -25,9 +25,9 @@
#include "filerenameroptions.h" #include "filerenameroptions.h"
FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *tqparent, FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent,
const TagRenamerOptions &options) : const TagRenamerOptions &options) :
FileRenamerTagOptionsBase(tqparent), m_options(options) FileRenamerTagOptionsBase(parent), m_options(options)
{ {
tqlayout()->setSpacing(KDialog::spacingHint()); tqlayout()->setSpacing(KDialog::spacingHint());
tqlayout()->setMargin(0); tqlayout()->setMargin(0);
@ -115,10 +115,10 @@ void FileRenamerTagOptions::slotEmptyActionChanged()
m_options.setEmptyAction(TagRenamerOptions::ForceEmptyInclude); m_options.setEmptyAction(TagRenamerOptions::ForceEmptyInclude);
} }
TagOptionsDialog::TagOptionsDialog(TQWidget *tqparent, TagOptionsDialog::TagOptionsDialog(TQWidget *parent,
const TagRenamerOptions &options, const TagRenamerOptions &options,
unsigned categoryNumber) : unsigned categoryNumber) :
KDialogBase(tqparent, 0, true, i18n("File Renamer"), Ok | Cancel), KDialogBase(parent, 0, true, i18n("File Renamer"), Ok | Cancel),
m_options(options), m_options(options),
m_categoryNumber(categoryNumber) m_categoryNumber(categoryNumber)
{ {

@ -31,7 +31,7 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase
TQ_OBJECT TQ_OBJECT
public: public:
FileRenamerTagOptions(TQWidget *tqparent, const TagRenamerOptions &options); FileRenamerTagOptions(TQWidget *parent, const TagRenamerOptions &options);
const TagRenamerOptions &options() const { return m_options; } const TagRenamerOptions &options() const { return m_options; }
@ -55,7 +55,7 @@ class TagOptionsDialog : public KDialogBase
TQ_OBJECT TQ_OBJECT
public: public:
TagOptionsDialog(TQWidget *tqparent, const TagRenamerOptions &options, unsigned categoryNumber); TagOptionsDialog(TQWidget *parent, const TagRenamerOptions &options, unsigned categoryNumber);
const TagRenamerOptions &options() const { return m_options; } const TagRenamerOptions &options() const { return m_options; }

@ -90,15 +90,15 @@ void HistoryPlaylist::slotCreateNewItem()
// HistoryPlaylistItem public members // HistoryPlaylistItem public members
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) : HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) :
PlaylistItem(item, tqparent, after), PlaylistItem(item, parent, after),
m_dateTime(TQDateTime::tqcurrentDateTime()) m_dateTime(TQDateTime::tqcurrentDateTime())
{ {
setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
} }
HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent) : HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) :
PlaylistItem(item, tqparent), PlaylistItem(item, parent),
m_dateTime(TQDateTime::tqcurrentDateTime()) m_dateTime(TQDateTime::tqcurrentDateTime())
{ {
setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); setText(0, KGlobal::locale()->formatDateTime(m_dateTime));

@ -23,8 +23,8 @@
class HistoryPlaylistItem : public PlaylistItem class HistoryPlaylistItem : public PlaylistItem
{ {
public: public:
HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after); HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after);
HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent); HistoryPlaylistItem(CollectionListItem *item, Playlist *parent);
virtual ~HistoryPlaylistItem(); virtual ~HistoryPlaylistItem();
TQDateTime dateTime() const { return m_dateTime; } TQDateTime dateTime() const { return m_dateTime; }

@ -43,8 +43,8 @@ using namespace ActionCollection;
// public members // public members
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
JuK::JuK(TQWidget *tqparent, const char *name) : JuK::JuK(TQWidget *parent, const char *name) :
KMainWindow(tqparent, name, WDestructiveClose), KMainWindow(parent, name, WDestructiveClose),
m_player(PlayerManager::instance()), m_player(PlayerManager::instance()),
m_shuttingDown(false) m_shuttingDown(false)
{ {

@ -40,7 +40,7 @@ class JuK : public KMainWindow
TQ_OBJECT TQ_OBJECT
public: public:
JuK(TQWidget* tqparent = 0, const char *name = 0); JuK(TQWidget* parent = 0, const char *name = 0);
virtual ~JuK(); virtual ~JuK();
virtual KActionCollection *actionCollection() const; virtual KActionCollection *actionCollection() const;

@ -97,7 +97,7 @@ class PlaylistAction : public KAction
PlaylistRecipientMap m_playlistRecipient; PlaylistRecipientMap m_playlistRecipient;
}; };
K3bExporter::K3bExporter(Playlist *tqparent) : PlaylistExporter(tqparent), m_parent(tqparent) K3bExporter::K3bExporter(Playlist *parent) : PlaylistExporter(parent), m_parent(parent)
{ {
} }
@ -263,8 +263,8 @@ K3bExporter::K3bOpenMode K3bExporter::openMode()
return Abort; return Abort;
} }
K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *tqparent) : K3bExporter(0), K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *parent) : K3bExporter(0),
m_playlistBox(tqparent) m_playlistBox(parent)
{ {
} }

@ -33,7 +33,7 @@ class K3bExporter : public PlaylistExporter
TQ_OBJECT TQ_OBJECT
public: public:
K3bExporter(Playlist *tqparent = 0); K3bExporter(Playlist *parent = 0);
/** /**
* Returns a KAction that can be used to invoke the export. * Returns a KAction that can be used to invoke the export.
@ -80,7 +80,7 @@ class K3bPlaylistExporter : public K3bExporter
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
K3bPlaylistExporter(PlaylistBox *tqparent = 0); K3bPlaylistExporter(PlaylistBox *parent = 0);
virtual KAction *action(); virtual KAction *action();

@ -75,8 +75,8 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]); const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]);
KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection,
TQWidget *tqparent, const char *name) TQWidget *parent, const char *name)
: KDialogBase(tqparent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok) : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
{ {
// Read key group from configuration // Read key group from configuration
@ -172,11 +172,11 @@ void KeyDialog::slotDefault()
} }
int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection, int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection,
TQWidget *tqparent) TQWidget *parent)
{ {
// Create and show dialog - update connections if accepted // Create and show dialog - update connections if accepted
int retcode = KeyDialog(keys, actionCollection, tqparent).configure(); int retcode = KeyDialog(keys, actionCollection, parent).configure();
if(retcode == Accepted) if(retcode == Accepted)
keys->updateConnections(); keys->updateConnections();

@ -30,9 +30,9 @@ class KeyDialog : public KDialogBase
public: public:
/** /**
* Constructs a KeyDialog called @p name as a child of @p tqparent. * Constructs a KeyDialog called @p name as a child of @p parent.
*/ */
KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *tqparent = 0, const char* name = 0); KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0);
/** /**
* Destructor. Deletes all resources used by a KeyDialog object. * Destructor. Deletes all resources used by a KeyDialog object.
@ -44,7 +44,7 @@ public:
* accelerators and actions. It behaves essentially like the functions * accelerators and actions. It behaves essentially like the functions
* in KKeyDialog. * in KKeyDialog.
*/ */
static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *tqparent = 0); static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0);
/** /**
* This is a member function, provided to create a global accelerator with * This is a member function, provided to create a global accelerator with

@ -45,9 +45,9 @@ namespace MediaFiles {
static const char playlistExtension[] = ".m3u"; static const char playlistExtension[] = ".m3u";
} }
TQStringList MediaFiles::openDialog(TQWidget *tqparent) TQStringList MediaFiles::openDialog(TQWidget *parent)
{ {
KFileDialog dialog(TQString(), TQString(), tqparent, "filedialog", true); KFileDialog dialog(TQString(), TQString(), parent, "filedialog", true);
dialog.setOperationMode(KFileDialog::Opening); dialog.setOperationMode(KFileDialog::Opening);
dialog.setCaption(i18n("Open")); dialog.setCaption(i18n("Open"));
@ -60,11 +60,11 @@ TQStringList MediaFiles::openDialog(TQWidget *tqparent)
return convertURLsToLocal(dialog.selectedFiles()); return convertURLsToLocal(dialog.selectedFiles());
} }
TQString MediaFiles::savePlaylistDialog(const TQString &playlistName, TQWidget *tqparent) TQString MediaFiles::savePlaylistDialog(const TQString &playlistName, TQWidget *parent)
{ {
TQString fileName = KFileDialog::getSaveFileName(playlistName + playlistExtension, TQString fileName = KFileDialog::getSaveFileName(playlistName + playlistExtension,
TQString("*").append(playlistExtension), TQString("*").append(playlistExtension),
tqparent, parent,
i18n("Playlists")); i18n("Playlists"));
if(!fileName.isEmpty() && !fileName.endsWith(playlistExtension)) if(!fileName.isEmpty() && !fileName.endsWith(playlistExtension))
fileName.append(playlistExtension); fileName.append(playlistExtension);

@ -24,15 +24,15 @@
namespace MediaFiles namespace MediaFiles
{ {
/** /**
* Creates a JuK specific KFileDialog with the specified tqparent. * Creates a JuK specific KFileDialog with the specified parent.
*/ */
TQStringList openDialog(TQWidget *tqparent = 0); TQStringList openDialog(TQWidget *parent = 0);
/** /**
* Creates a JuK specific KFileDialog for saving a playlist with the name * Creates a JuK specific KFileDialog for saving a playlist with the name
* playlistName and the specified tqparent and returns the file name. * playlistName and the specified parent and returns the file name.
*/ */
TQString savePlaylistDialog(const TQString &playlistName, TQWidget *tqparent = 0); TQString savePlaylistDialog(const TQString &playlistName, TQWidget *parent = 0);
/** /**
* Returns true if fileName is a supported media file. * Returns true if fileName is a supported media file.

@ -41,15 +41,15 @@ static const int imageSize = 64;
struct Line : public TQFrame struct Line : public TQFrame
{ {
Line(TQWidget *tqparent) : TQFrame(tqparent) { setFrameShape(VLine); } Line(TQWidget *parent) : TQFrame(parent) { setFrameShape(VLine); }
}; };
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// NowPlaying // NowPlaying
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
NowPlaying::NowPlaying(TQWidget *tqparent, PlaylistCollection *collection, const char *name) : NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const char *name) :
TQHBox(tqparent, name), TQHBox(parent, name),
m_observer(this, collection), m_observer(this, collection),
m_collection(collection) m_collection(collection)
{ {
@ -105,11 +105,11 @@ void NowPlaying::slotUpdate()
// CoverItem // CoverItem
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
CoverItem::CoverItem(NowPlaying *tqparent) : CoverItem::CoverItem(NowPlaying *parent) :
TQLabel(tqparent, "CoverItem"), TQLabel(parent, "CoverItem"),
NowPlayingItem(tqparent) NowPlayingItem(parent)
{ {
setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
setFrameStyle(Box | Plain); setFrameStyle(Box | Plain);
setLineWidth(1); setLineWidth(1);
setMargin(1); setMargin(1);
@ -214,11 +214,11 @@ void CoverItem::dropEvent(TQDropEvent *e)
// TrackItem // TrackItem
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
TrackItem::TrackItem(NowPlaying *tqparent) : TrackItem::TrackItem(NowPlaying *parent) :
TQWidget(tqparent, "TrackItem"), TQWidget(parent, "TrackItem"),
NowPlayingItem(tqparent) NowPlayingItem(parent)
{ {
setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
@ -242,7 +242,7 @@ void TrackItem::update(const FileHandle &file)
void TrackItem::slotOpenLink(const TQString &link) void TrackItem::slotOpenLink(const TQString &link)
{ {
PlaylistCollection *collection = NowPlayingItem::tqparent()->collection(); PlaylistCollection *collection = NowPlayingItem::parent()->collection();
if(link == "artist") if(link == "artist")
collection->showMore(m_file.tag()->artist()); collection->showMore(m_file.tag()->artist());
@ -269,7 +269,7 @@ void TrackItem::slotUpdate()
"<br />" "<br />"
"<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>"; "<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>";
if(NowPlayingItem::tqparent()->collection()->showMoreActive()) if(NowPlayingItem::parent()->collection()->showMoreActive())
format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist"))); format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist")));
format.append("</font>"); format.append("</font>");
@ -287,11 +287,11 @@ void TrackItem::slotUpdate()
// HistoryItem // HistoryItem
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
HistoryItem::HistoryItem(NowPlaying *tqparent) : HistoryItem::HistoryItem(NowPlaying *parent) :
LinkLabel(tqparent, "HistoryItem"), LinkLabel(parent, "HistoryItem"),
NowPlayingItem(tqparent) NowPlayingItem(parent)
{ {
setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
setLinkUnderline(false); setLinkUnderline(false);
setText(TQString("<b>%1</b>").tqarg(i18n("History"))); setText(TQString("<b>%1</b>").tqarg(i18n("History")));
@ -342,7 +342,7 @@ void HistoryItem::openLink(const TQString &link)
(*it).playlist->clearSelection(); (*it).playlist->clearSelection();
(*it).playlist->setSelected(item, true); (*it).playlist->setSelected(item, true);
(*it).playlist->ensureItemVisible(item); (*it).playlist->ensureItemVisible(item);
NowPlayingItem::tqparent()->collection()->raise((*it).playlist); NowPlayingItem::parent()->collection()->raise((*it).playlist);
} }
break; break;
} }

@ -43,7 +43,7 @@ class NowPlaying : public TQHBox
TQ_OBJECT TQ_OBJECT
public: public:
NowPlaying(TQWidget *tqparent, PlaylistCollection *collection, NowPlaying(TQWidget *parent, PlaylistCollection *collection,
const char *name = 0); const char *name = 0);
void addItem(NowPlayingItem *item); void addItem(NowPlayingItem *item);
PlaylistCollection *collection() const; PlaylistCollection *collection() const;
@ -54,9 +54,9 @@ private slots:
private: private:
struct Observer : public PlaylistObserver struct Observer : public PlaylistObserver
{ {
Observer(NowPlaying *tqparent, PlaylistInterface *playlist) : Observer(NowPlaying *parent, PlaylistInterface *playlist) :
PlaylistObserver(playlist), PlaylistObserver(playlist),
m_parent(tqparent) {} m_parent(parent) {}
virtual void updateCurrent() {} virtual void updateCurrent() {}
virtual void updateData() { m_parent->slotUpdate(); } virtual void updateData() { m_parent->slotUpdate(); }
NowPlaying *m_parent; NowPlaying *m_parent;
@ -76,9 +76,9 @@ class NowPlayingItem
{ {
public: public:
virtual void update(const FileHandle &file) = 0; virtual void update(const FileHandle &file) = 0;
NowPlaying *tqparent() const { return m_parent; } NowPlaying *parent() const { return m_parent; }
protected: protected:
NowPlayingItem(NowPlaying *tqparent) : m_parent(tqparent) { tqparent->addItem(this); } NowPlayingItem(NowPlaying *parent) : m_parent(parent) { parent->addItem(this); }
private: private:
NowPlaying *m_parent; NowPlaying *m_parent;
}; };
@ -91,7 +91,7 @@ private:
class CoverItem : public TQLabel, public NowPlayingItem class CoverItem : public TQLabel, public NowPlayingItem
{ {
public: public:
CoverItem(NowPlaying *tqparent); CoverItem(NowPlaying *parent);
virtual void update(const FileHandle &file); virtual void update(const FileHandle &file);
virtual void mouseReleaseEvent(TQMouseEvent *event); virtual void mouseReleaseEvent(TQMouseEvent *event);
@ -115,7 +115,7 @@ private:
class LinkLabel : public KActiveLabel class LinkLabel : public KActiveLabel
{ {
public: public:
LinkLabel(TQWidget *tqparent, const char *name = 0) : KActiveLabel(tqparent, name) {} LinkLabel(TQWidget *parent, const char *name = 0) : KActiveLabel(parent, name) {}
virtual void openLink(const TQString &) {} virtual void openLink(const TQString &) {}
}; };
@ -130,7 +130,7 @@ class TrackItem : public TQWidget, public NowPlayingItem
TQ_OBJECT TQ_OBJECT
public: public:
TrackItem(NowPlaying *tqparent); TrackItem(NowPlaying *parent);
virtual void update(const FileHandle &file); virtual void update(const FileHandle &file);
private slots: private slots:
@ -152,7 +152,7 @@ class HistoryItem : public LinkLabel, public NowPlayingItem
TQ_OBJECT TQ_OBJECT
public: public:
HistoryItem(NowPlaying *tqparent); HistoryItem(NowPlaying *parent);
virtual void update(const FileHandle &file); virtual void update(const FileHandle &file);
virtual void openLink(const TQString &link); virtual void openLink(const TQString &link);

@ -239,10 +239,10 @@ void PlayerManager::setStatusLabel(StatusLabel *label)
m_statusLabel = label; m_statusLabel = label;
} }
KSelectAction *PlayerManager::playerSelectAction(TQObject *tqparent) // static KSelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static
{ {
KSelectAction *action = 0; KSelectAction *action = 0;
action = new KSelectAction(i18n("&Output To"), 0, tqparent, "outputSelect"); action = new KSelectAction(i18n("&Output To"), 0, parent, "outputSelect");
TQStringList l; TQStringList l;
#if HAVE_ARTS #if HAVE_ARTS

@ -62,7 +62,7 @@ public:
TQString randomPlayMode() const; TQString randomPlayMode() const;
static KSelectAction *playerSelectAction(TQObject *tqparent); static KSelectAction *playerSelectAction(TQObject *parent);
public slots: public slots:

@ -83,8 +83,8 @@ static bool manualResize()
class PlaylistToolTip : public TQToolTip class PlaylistToolTip : public TQToolTip
{ {
public: public:
PlaylistToolTip(TQWidget *tqparent, Playlist *playlist) : PlaylistToolTip(TQWidget *parent, Playlist *playlist) :
TQToolTip(tqparent), m_playlist(playlist) {} TQToolTip(parent), m_playlist(playlist) {}
virtual void maybeTip(const TQPoint &p) virtual void maybeTip(const TQPoint &p)
{ {
@ -1015,7 +1015,7 @@ void Playlist::removeFromDisk(const PlaylistItemList &items)
} }
} }
TQDragObject *Playlist::dragObject(TQWidget *tqparent) TQDragObject *Playlist::dragObject(TQWidget *parent)
{ {
PlaylistItemList items = selectedItems(); PlaylistItemList items = selectedItems();
KURL::List urls; KURL::List urls;
@ -1025,7 +1025,7 @@ TQDragObject *Playlist::dragObject(TQWidget *tqparent)
urls.append(url); urls.append(url);
} }
KURLDrag *drag = new KURLDrag(urls, tqparent, "Playlist Items"); KURLDrag *drag = new KURLDrag(urls, parent, "Playlist Items");
drag->setPixmap(BarIcon("sound")); drag->setPixmap(BarIcon("sound"));
return drag; return drag;
@ -1161,7 +1161,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event)
TQListViewItemIterator visible(this, TQListViewItemIterator::IteratorFlag( TQListViewItemIterator visible(this, TQListViewItemIterator::IteratorFlag(
TQListViewItemIterator::Visible)); TQListViewItemIterator::Visible));
if(selected.current() == visible.current()) if(selected.current() == visible.current())
KApplication::postEvent(tqparent(), new FocusUpEvent); KApplication::postEvent(parent(), new FocusUpEvent);
} }
} }

@ -420,7 +420,7 @@ protected:
virtual bool eventFilter(TQObject *watched, TQEvent *e); virtual bool eventFilter(TQObject *watched, TQEvent *e);
virtual void keyPressEvent(TQKeyEvent *e); virtual void keyPressEvent(TQKeyEvent *e);
virtual TQDragObject *dragObject(TQWidget *tqparent); virtual TQDragObject *dragObject(TQWidget *parent);
virtual TQDragObject *dragObject() { return dragObject(this); } virtual TQDragObject *dragObject() { return dragObject(this); }
virtual bool canDecode(TQMimeSource *s); virtual bool canDecode(TQMimeSource *s);
virtual void decode(TQMimeSource *s, PlaylistItem *item = 0); virtual void decode(TQMimeSource *s, PlaylistItem *item = 0);
@ -457,7 +457,7 @@ protected:
void setupItem(PlaylistItem *item); void setupItem(PlaylistItem *item);
/** /**
* Forwards the call to the tqparent to enable or disable automatic deletion * Forwards the call to the parent to enable or disable automatic deletion
* of tree view playlists. Used by CollectionListItem. * of tree view playlists. Used by CollectionListItem.
*/ */
void setDynamicListsFrozen(bool frozen); void setDynamicListsFrozen(bool frozen);

@ -46,9 +46,9 @@ using namespace ActionCollection;
// PlaylistBox public methods // PlaylistBox public methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
PlaylistBox::PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack, PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
const char *name) : const char *name) :
KListView(tqparent, name), KListView(parent, name),
PlaylistCollection(playlistStack), PlaylistCollection(playlistStack),
m_viewModeIndex(0), m_viewModeIndex(0),
m_hasSelection(false), m_hasSelection(false),
@ -692,8 +692,8 @@ PlaylistBox::Item::Item(PlaylistBox *listBox, const TQString &icon, const TQStri
init(); init();
} }
PlaylistBox::Item::Item(Item *tqparent, const TQString &icon, const TQString &text, Playlist *l) PlaylistBox::Item::Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l)
: TQObject(tqparent->listView()), KListViewItem(tqparent, text), : TQObject(parent->listView()), KListViewItem(parent, text),
m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false) m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false)
{ {
init(); init();

@ -49,7 +49,7 @@ public:
friend class Item; friend class Item;
PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack, PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
const char *name = 0); const char *name = 0);
virtual ~PlaylistBox(); virtual ~PlaylistBox();
@ -153,7 +153,7 @@ public:
protected: protected:
Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l = 0); Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l = 0);
Item(Item *tqparent, const TQString &icon, const TQString &text, Playlist *l = 0); Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l = 0);
Playlist *playlist() const { return m_playlist; } Playlist *playlist() const { return m_playlist; }
PlaylistBox *listView() const { return static_cast<PlaylistBox *>(KListViewItem::listView()); } PlaylistBox *listView() const { return static_cast<PlaylistBox *>(KListViewItem::listView()); }

@ -31,7 +31,7 @@ class KActionCollection;
class PlaylistExporter : public TQObject class PlaylistExporter : public TQObject
{ {
public: public:
PlaylistExporter(TQWidget *tqparent = 0) : TQObject(tqparent) { } PlaylistExporter(TQWidget *parent = 0) : TQObject(parent) { }
virtual ~PlaylistExporter() { } virtual ~PlaylistExporter() { }
/** /**

@ -239,16 +239,16 @@ void PlaylistItem::clear()
// PlaylistItem protected methods // PlaylistItem protected methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent) : PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) :
KListViewItem(tqparent), KListViewItem(parent),
d(0), d(0),
m_watched(0) m_watched(0)
{ {
setup(item); setup(item);
} }
PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) : PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) :
KListViewItem(tqparent, after), KListViewItem(parent, after),
d(0), d(0),
m_watched(0) m_watched(0)
{ {
@ -258,8 +258,8 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListV
// This constructor should only be used by the CollectionList subclass. // This constructor should only be used by the CollectionList subclass.
PlaylistItem::PlaylistItem(CollectionList *tqparent) : PlaylistItem::PlaylistItem(CollectionList *parent) :
KListViewItem(tqparent), KListViewItem(parent),
m_watched(0) m_watched(0)
{ {
d = new Data; d = new Data;

@ -156,13 +156,13 @@ protected:
* Items should always be created using Playlist::createItem() or through a * Items should always be created using Playlist::createItem() or through a
* subclss or friend class. * subclss or friend class.
*/ */
PlaylistItem(CollectionListItem *item, Playlist *tqparent); PlaylistItem(CollectionListItem *item, Playlist *parent);
PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after); PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after);
/** /**
* This is the constructor that shold be used by subclasses. * This is the constructor that shold be used by subclasses.
*/ */
PlaylistItem(CollectionList *tqparent); PlaylistItem(CollectionList *parent);
/** /**
* See the class documentation for an explanation of construction and deletion * See the class documentation for an explanation of construction and deletion

@ -34,8 +34,8 @@ using namespace ActionCollection;
// public methods // public methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
PlaylistSplitter::PlaylistSplitter(TQWidget *tqparent, const char *name) : PlaylistSplitter::PlaylistSplitter(TQWidget *parent, const char *name) :
TQSplitter(Qt::Horizontal, tqparent, name), TQSplitter(Qt::Horizontal, parent, name),
m_newVisible(0), m_newVisible(0),
m_playlistBox(0), m_playlistBox(0),
m_searchWidget(0), m_searchWidget(0),

@ -44,7 +44,7 @@ class PlaylistSplitter : public TQSplitter
TQ_OBJECT TQ_OBJECT
public: public:
PlaylistSplitter(TQWidget *tqparent, const char *name = 0); PlaylistSplitter(TQWidget *parent, const char *name = 0);
virtual ~PlaylistSplitter(); virtual ~PlaylistSplitter();
PlaylistInterface *playlist() const { return m_playlistBox; } PlaylistInterface *playlist() const { return m_playlistBox; }

@ -39,8 +39,8 @@ using namespace ActionCollection;
// SearchLine public methods // SearchLine public methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
SearchLine::SearchLine(TQWidget *tqparent, bool simple, const char *name) : SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) :
TQHBox(tqparent, name), TQHBox(parent, name),
m_simple(simple), m_simple(simple),
m_searchFieldsBox(0) m_searchFieldsBox(0)
{ {
@ -188,7 +188,7 @@ void SearchLine::updateColumns()
// SearchWidget public methods // SearchWidget public methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
SearchWidget::SearchWidget(TQWidget *tqparent, const char *name) : KToolBar(tqparent, name) SearchWidget::SearchWidget(TQWidget *parent, const char *name) : KToolBar(parent, name)
{ {
setupLayout(); setupLayout();
updateColumns(); updateColumns();

@ -40,7 +40,7 @@ class SearchLine : public TQHBox
public: public:
enum Mode { Default = 0, CaseSensitive = 1, Pattern = 2 }; enum Mode { Default = 0, CaseSensitive = 1, Pattern = 2 };
SearchLine(TQWidget *tqparent, bool simple = false, const char *name = 0); SearchLine(TQWidget *parent, bool simple = false, const char *name = 0);
virtual ~SearchLine() {} virtual ~SearchLine() {}
PlaylistSearch::Component searchComponent() const; PlaylistSearch::Component searchComponent() const;
@ -76,7 +76,7 @@ class SearchWidget : public KToolBar, public SearchIface
TQ_OBJECT TQ_OBJECT
public: public:
SearchWidget(TQWidget *tqparent, const char *name = 0); SearchWidget(TQWidget *parent, const char *name = 0);
virtual ~SearchWidget(); virtual ~SearchWidget();
PlaylistSearch search(const PlaylistList &playlists) const; PlaylistSearch search(const PlaylistList &playlists) const;

@ -39,7 +39,7 @@
class TrackPositionSlider : public TQSlider class TrackPositionSlider : public TQSlider
{ {
public: public:
TrackPositionSlider(TQWidget *tqparent, const char *name) : TQSlider(tqparent, name) TrackPositionSlider(TQWidget *parent, const char *name) : TQSlider(parent, name)
{ {
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQ_NoFocus);
} }
@ -63,8 +63,8 @@ protected:
// VolumeSlider implementation // VolumeSlider implementation
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name) : VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name) :
TQSlider(o, tqparent, name) TQSlider(o, parent, name)
{ {
connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)));
} }
@ -126,8 +126,8 @@ void VolumeSlider::slotValueChanged(int value)
const int SliderAction::minPosition = 0; const int SliderAction::minPosition = 0;
const int SliderAction::maxPosition = 1000; const int SliderAction::maxPosition = 1000;
SliderAction::SliderAction(const TQString &text, TQObject *tqparent, const char *name) SliderAction::SliderAction(const TQString &text, TQObject *parent, const char *name)
: KAction(text, 0, tqparent, name), : KAction(text, 0, parent, name),
m_toolBar(0), m_toolBar(0),
m_layout(0), m_layout(0),
m_trackPositionSlider(0), m_trackPositionSlider(0),
@ -143,9 +143,9 @@ SliderAction::~SliderAction()
} }
int SliderAction::plug(TQWidget *tqparent, int index) int SliderAction::plug(TQWidget *parent, int index)
{ {
TQWidget *w = createWidget(tqparent); TQWidget *w = createWidget(parent);
if(!w) if(!w)
return -1; return -1;
@ -153,8 +153,8 @@ int SliderAction::plug(TQWidget *tqparent, int index)
// the check for null makes sure that there is only one toolbar that this is // the check for null makes sure that there is only one toolbar that this is
// "plugged" in to // "plugged" in to
if(tqparent->inherits("KToolBar") && !m_toolBar) { if(parent->inherits("KToolBar") && !m_toolBar) {
m_toolBar = static_cast<KToolBar *>(tqparent); m_toolBar = static_cast<KToolBar *>(parent);
int id = KAction::getToolButtonID(); int id = KAction::getToolButtonID();
@ -178,10 +178,10 @@ int SliderAction::plug(TQWidget *tqparent, int index)
} }
void SliderAction::unplug(TQWidget *tqparent) void SliderAction::unplug(TQWidget *parent)
{ {
if (tqparent->inherits("KToolBar")) { if (parent->inherits("KToolBar")) {
m_toolBar = static_cast<KToolBar *>(tqparent); m_toolBar = static_cast<KToolBar *>(parent);
int index = findContainer(m_toolBar); int index = findContainer(m_toolBar);
if (index != -1) { if (index != -1) {
@ -221,14 +221,14 @@ void SliderAction::slotUpdateOrientation()
// private members // private members
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
TQWidget *SliderAction::createWidget(TQWidget *tqparent) // virtual -- used by base class TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by base class
{ {
if(tqparent) { if(parent) {
TQWidget *base = new TQWidget(tqparent); TQWidget *base = new TQWidget(parent);
base->setBackgroundMode(tqparent->backgroundMode()); base->setBackgroundMode(parent->backgroundMode());
base->setName("kde toolbar widget"); base->setName("kde toolbar widget");
KToolBar *toolBar = dynamic_cast<KToolBar *>(tqparent); KToolBar *toolBar = dynamic_cast<KToolBar *>(parent);
if(toolBar) if(toolBar)
toolBar->setStretchableWidget(base); toolBar->setStretchableWidget(base);
@ -279,7 +279,7 @@ TQWidget *SliderAction::createWidget(TQWidget *tqparent) // virtual -- used by b
m_layout->setStretchFactor(m_trackPositionSlider, 4); m_layout->setStretchFactor(m_trackPositionSlider, 4);
m_layout->setStretchFactor(m_volumeSlider, 1); m_layout->setStretchFactor(m_volumeSlider, 1);
connect(tqparent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize())); connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize()));
return base; return base;
} }

@ -28,7 +28,7 @@ class VolumeSlider : public TQSlider
TQ_OBJECT TQ_OBJECT
public: public:
VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name); VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name);
int volume() const; int volume() const;
void setVolume(int value); void setVolume(int value);
@ -52,7 +52,7 @@ class SliderAction : public KAction
TQ_OBJECT TQ_OBJECT
public: public:
SliderAction(const TQString &text, TQObject *tqparent, const char *name); SliderAction(const TQString &text, TQObject *parent, const char *name);
virtual ~SliderAction(); virtual ~SliderAction();
VolumeSlider *volumeSlider() const { return m_volumeSlider; } VolumeSlider *volumeSlider() const { return m_volumeSlider; }
@ -61,7 +61,7 @@ public:
bool dragging() const { return m_dragging; } bool dragging() const { return m_dragging; }
bool volumeDragging() const { return m_volumeDragging; } bool volumeDragging() const { return m_volumeDragging; }
virtual int plug(TQWidget *tqparent, int index = -1); virtual int plug(TQWidget *parent, int index = -1);
virtual void unplug(TQWidget *widget); virtual void unplug(TQWidget *widget);
static const int minPosition; static const int minPosition;
@ -75,7 +75,7 @@ signals:
void signalVolumeChanged(int volume); void signalVolumeChanged(int volume);
private: private:
TQWidget *createWidget(TQWidget *tqparent); TQWidget *createWidget(TQWidget *parent);
private slots: private slots:
void slotUpdateSize(); void slotUpdateSize();

@ -20,11 +20,11 @@
class SortedStringList::Node class SortedStringList::Node
{ {
public: public:
Node(const TQString &value) : key(value), tqparent(0), left(0), right(0) {} Node(const TQString &value) : key(value), parent(0), left(0), right(0) {}
~Node() {} ~Node() {}
TQString key; TQString key;
Node *tqparent; Node *parent;
Node *left; Node *left;
Node *right; Node *right;
}; };
@ -61,11 +61,11 @@ SortedStringList::Node *SortedStringList::treeSuccessor(Node *n) const
if(n->right) if(n->right)
return treeMinimum(n->right); return treeMinimum(n->right);
Node *p = n->tqparent; Node *p = n->parent;
while(p && n == p->right) { while(p && n == p->right) {
n = p; n = p;
p = p->tqparent; p = p->parent;
} }
return p; return p;
@ -92,15 +92,15 @@ bool SortedStringList::remove(const TQString &value)
x = y->right; x = y->right;
if(x) if(x)
x->tqparent = y->tqparent; x->parent = y->parent;
if(!y->tqparent) if(!y->parent)
m_root = x; m_root = x;
else { else {
if(y == y->tqparent->left) if(y == y->parent->left)
y->tqparent->left = x; y->parent->left = x;
else else
y->tqparent->right = x; y->parent->right = x;
} }
if(y != x) if(y != x)
@ -155,7 +155,7 @@ bool SortedStringList::BSTInsert(const TQString &value)
Node *n = new Node(value); Node *n = new Node(value);
n->tqparent = previousNode; n->parent = previousNode;
if(!m_root) if(!m_root)
m_root = n; m_root = n;

@ -35,8 +35,8 @@ using namespace ActionCollection;
// public methods // public methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent, const char *name) : StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const char *name) :
TQHBox(tqparent, name), TQHBox(parent, name),
PlaylistObserver(playlist), PlaylistObserver(playlist),
m_showTimeRemaining(false) m_showTimeRemaining(false)
{ {

@ -31,7 +31,7 @@ class StatusLabel : public TQHBox, public PlaylistObserver
TQ_OBJECT TQ_OBJECT
public: public:
StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent = 0, const char *name = 0); StatusLabel(PlaylistInterface *playlist, TQWidget *parent = 0, const char *name = 0);
virtual ~StatusLabel(); virtual ~StatusLabel();
virtual void updateCurrent(); virtual void updateCurrent();

@ -50,8 +50,8 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y);
class FlickerFreeLabel : public TQLabel class FlickerFreeLabel : public TQLabel
{ {
public: public:
FlickerFreeLabel(const TQString &text, TQWidget *tqparent, const char *name = 0) : FlickerFreeLabel(const TQString &text, TQWidget *parent, const char *name = 0) :
TQLabel(text, tqparent, name) TQLabel(text, parent, name)
{ {
m_textColor = paletteForegroundColor(); m_textColor = paletteForegroundColor();
m_bgColor = parentWidget()->paletteBackgroundColor(); m_bgColor = parentWidget()->paletteBackgroundColor();
@ -90,8 +90,8 @@ protected:
TQColor m_bgColor; TQColor m_bgColor;
}; };
PassiveInfo::PassiveInfo(TQWidget *tqparent, const char *name) : PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) :
KPassivePopup(tqparent, name), m_timer(new TQTimer), m_justDie(false) KPassivePopup(parent, name), m_timer(new TQTimer), m_justDie(false)
{ {
// I'm so sick and tired of KPassivePopup screwing this up // I'm so sick and tired of KPassivePopup screwing this up
// that I'll just handle the timeout myself, thank you very much. // that I'll just handle the timeout myself, thank you very much.
@ -137,7 +137,7 @@ void PassiveInfo::leaveEvent(TQEvent *)
// public methods // public methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
SystemTray::SystemTray(TQWidget *tqparent, const char *name) : KSystemTray(tqparent, name), SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, name),
m_popup(0), m_popup(0),
m_fadeTimer(0), m_fadeTimer(0),
m_fade(true) m_fade(true)
@ -299,7 +299,7 @@ void SystemTray::slotMouseInPopup()
// private methods // private methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file) TQVBox *SystemTray::createPopupLayout(TQWidget *parent, const FileHandle &file)
{ {
TQVBox *infoBox = 0; TQVBox *infoBox = 0;
@ -307,17 +307,17 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file
// They go to the left because JuK is on that side // They go to the left because JuK is on that side
createButtonBox(tqparent); createButtonBox(parent);
addSeparatorLine(tqparent); addSeparatorLine(parent);
infoBox = new TQVBox(tqparent); infoBox = new TQVBox(parent);
// Another line, and the cover, if there's a cover, and if // Another line, and the cover, if there's a cover, and if
// it's selected to be shown // it's selected to be shown
if(file.coverInfo()->hasCover()) { if(file.coverInfo()->hasCover()) {
addSeparatorLine(tqparent); addSeparatorLine(parent);
addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
} }
} }
else { else {
@ -325,14 +325,14 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file
// Like above, but reversed. // Like above, but reversed.
if(file.coverInfo()->hasCover()) { if(file.coverInfo()->hasCover()) {
addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
addSeparatorLine(tqparent); addSeparatorLine(parent);
} }
infoBox = new TQVBox(tqparent); infoBox = new TQVBox(parent);
addSeparatorLine(tqparent); addSeparatorLine(parent);
createButtonBox(tqparent); createButtonBox(parent);
} }
infoBox->setSpacing(3); infoBox->setSpacing(3);
@ -440,9 +440,9 @@ TQPixmap SystemTray::createPixmap(const TQString &pixName)
return bgPix; return bgPix;
} }
void SystemTray::createButtonBox(TQWidget *tqparent) void SystemTray::createButtonBox(TQWidget *parent)
{ {
TQVBox *buttonBox = new TQVBox(tqparent); TQVBox *buttonBox = new TQVBox(parent);
buttonBox->setSpacing(3); buttonBox->setSpacing(3);
@ -472,9 +472,9 @@ void SystemTray::slotForward()
m_fade = false; m_fade = false;
} }
void SystemTray::addSeparatorLine(TQWidget *tqparent) void SystemTray::addSeparatorLine(TQWidget *parent)
{ {
TQFrame *line = new TQFrame(tqparent); TQFrame *line = new TQFrame(parent);
line->setFrameShape(TQFrame::VLine); line->setFrameShape(TQFrame::VLine);
// Cover art takes up 80 pixels, make sure we take up at least 80 pixels // Cover art takes up 80 pixels, make sure we take up at least 80 pixels
@ -483,9 +483,9 @@ void SystemTray::addSeparatorLine(TQWidget *tqparent)
line->setMinimumHeight(80); line->setMinimumHeight(80);
} }
void SystemTray::addCoverButton(TQWidget *tqparent, const TQPixmap &cover) void SystemTray::addCoverButton(TQWidget *parent, const TQPixmap &cover)
{ {
TQPushButton *coverButton = new TQPushButton(tqparent); TQPushButton *coverButton = new TQPushButton(parent);
coverButton->setPixmap(cover); coverButton->setPixmap(cover);
coverButton->setFixedSize(cover.size()); coverButton->setFixedSize(cover.size());

@ -40,7 +40,7 @@ class PassiveInfo : public KPassivePopup
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
PassiveInfo(TQWidget *tqparent = 0, const char *name = 0); PassiveInfo(TQWidget *parent = 0, const char *name = 0);
public slots: public slots:
void setTimeout(int delay); void setTimeout(int delay);
@ -68,7 +68,7 @@ class SystemTray : public KSystemTray
TQ_OBJECT TQ_OBJECT
public: public:
SystemTray(TQWidget *tqparent = 0, const char *name = 0); SystemTray(TQWidget *parent = 0, const char *name = 0);
virtual ~SystemTray(); virtual ~SystemTray();
signals: signals:
@ -88,15 +88,15 @@ private:
// (because the JuK icon is on the left side of the screen. // (because the JuK icon is on the left side of the screen.
bool buttonsToLeft() const; bool buttonsToLeft() const;
void createButtonBox(TQWidget *tqparent); void createButtonBox(TQWidget *parent);
// Creates the widget tqlayout for the popup, returning the TQVBox that // Creates the widget tqlayout for the popup, returning the TQVBox that
// holds the text labels. Uses buttonsToLeft() to figure out which // holds the text labels. Uses buttonsToLeft() to figure out which
// order to create them in. @p file is used to grab the cover. // order to create them in. @p file is used to grab the cover.
TQVBox *createPopupLayout(TQWidget *tqparent, const FileHandle &file); TQVBox *createPopupLayout(TQWidget *parent, const FileHandle &file);
void addSeparatorLine(TQWidget *tqparent); void addSeparatorLine(TQWidget *parent);
void addCoverButton(TQWidget *tqparent, const TQPixmap &cover); void addCoverButton(TQWidget *parent, const TQPixmap &cover);
// Interpolates from start color to end color. If @p step == 0, then // Interpolates from start color to end color. If @p step == 0, then
// m_startColor is returned, while @p step == @steps returns // m_startColor is returned, while @p step == @steps returns

@ -49,8 +49,8 @@ using namespace ActionCollection;
class FileNameValidator : public TQValidator class FileNameValidator : public TQValidator
{ {
public: public:
FileNameValidator(TQObject *tqparent, const char *name = 0) : FileNameValidator(TQObject *parent, const char *name = 0) :
TQValidator(tqparent, name) {} TQValidator(parent, name) {}
virtual void fixup(TQString &s) const virtual void fixup(TQString &s) const
{ {
@ -82,8 +82,8 @@ private:
class FixedHLayout : public TQHBoxLayout class FixedHLayout : public TQHBoxLayout
{ {
public: public:
FixedHLayout(TQWidget *tqparent, int margin = 0, int spacing = -1, const char *name = 0) : FixedHLayout(TQWidget *parent, int margin = 0, int spacing = -1, const char *name = 0) :
TQHBoxLayout(tqparent, margin, spacing, name), TQHBoxLayout(parent, margin, spacing, name),
m_width(-1) {} m_width(-1) {}
FixedHLayout(TQLayout *parentLayout, int spacing = -1, const char *name = 0) : FixedHLayout(TQLayout *parentLayout, int spacing = -1, const char *name = 0) :
TQHBoxLayout(parentLayout, spacing, name), TQHBoxLayout(parentLayout, spacing, name),
@ -105,9 +105,9 @@ private:
class CollectionObserver : public PlaylistObserver class CollectionObserver : public PlaylistObserver
{ {
public: public:
CollectionObserver(TagEditor *tqparent) : CollectionObserver(TagEditor *parent) :
PlaylistObserver(CollectionList::instance()), PlaylistObserver(CollectionList::instance()),
m_parent(tqparent) m_parent(parent)
{ {
} }
@ -127,8 +127,8 @@ private:
// public members // public members
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
TagEditor::TagEditor(TQWidget *tqparent, const char *name) : TagEditor::TagEditor(TQWidget *parent, const char *name) :
TQWidget(tqparent, name), TQWidget(parent, name),
m_currentPlaylist(0), m_currentPlaylist(0),
m_observer(0), m_observer(0),
m_performingSave(false) m_performingSave(false)

@ -40,7 +40,7 @@ class TagEditor : public TQWidget
TQ_OBJECT TQ_OBJECT
public: public:
TagEditor(TQWidget *tqparent = 0, const char *name = 0); TagEditor(TQWidget *parent = 0, const char *name = 0);
virtual ~TagEditor(); virtual ~TagEditor();
PlaylistItemList items() const { return m_items; } PlaylistItemList items() const { return m_items; }
void setupObservers(); void setupObservers();

@ -20,8 +20,8 @@
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
#include <tqevent.h> #include <tqevent.h>
TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *tqparent, const char *name) TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name)
: KDialogBase(tqparent, name, true, i18n("Tag Guesser Configuration"), : KDialogBase(parent, name, true, i18n("Tag Guesser Configuration"),
Ok | Cancel, Ok, true) Ok | Cancel, Ok, true)
{ {
m_child = new TagGuesserConfigDlgWidget(this, "child"); m_child = new TagGuesserConfigDlgWidget(this, "child");

@ -19,7 +19,7 @@ class TagGuesserConfigDlg : public KDialogBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
TagGuesserConfigDlg(TQWidget *tqparent, const char *name = 0); TagGuesserConfigDlg(TQWidget *parent, const char *name = 0);
protected slots: protected slots:
virtual void accept(); virtual void accept();

@ -123,7 +123,7 @@ bool TagTransactionManager::undo()
return result; return result;
} }
TagTransactionManager::TagTransactionManager(TQWidget *tqparent) : TQObject(tqparent, "tagmanager") TagTransactionManager::TagTransactionManager(TQWidget *parent) : TQObject(parent, "tagmanager")
{ {
m_manager = this; m_manager = this;
} }
@ -135,7 +135,7 @@ bool TagTransactionManager::renameFile(const TQFileInfo &from, const TQFileInfo
if(!to.exists() || if(!to.exists() ||
KMessageBox::warningContinueCancel( KMessageBox::warningContinueCancel(
TQT_TQWIDGET(tqparent()), TQT_TQWIDGET(parent()),
i18n("This file already exists.\nDo you want to replace it?"), i18n("This file already exists.\nDo you want to replace it?"),
i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue) i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue)
{ {
@ -200,7 +200,7 @@ bool TagTransactionManager::processChangeList(bool undo)
action("edit_undo")->setEnabled(false); action("edit_undo")->setEnabled(false);
if(!errorItems.isEmpty()) if(!errorItems.isEmpty())
KMessageBox::errorList(TQT_TQWIDGET(tqparent()), KMessageBox::errorList(TQT_TQWIDGET(parent()),
i18n("The following files were unable to be changed."), i18n("The following files were unable to be changed."),
errorItems, errorItems,
i18n("Error")); i18n("Error"));

@ -110,11 +110,11 @@ class TagTransactionManager : public TQObject
public: public:
/** /**
* Constructs a TagTransactionManager, owned by @p tqparent. * Constructs a TagTransactionManager, owned by @p parent.
* *
* @param tqparent The tqparent TQWidget. * @param parent The parent TQWidget.
*/ */
TagTransactionManager(TQWidget *tqparent = 0); TagTransactionManager(TQWidget *parent = 0);
/** /**
* Returns the global TagTransactionManager instance. * Returns the global TagTransactionManager instance.

@ -30,8 +30,8 @@
class TrackPickerItem : public KListViewItem class TrackPickerItem : public KListViewItem
{ {
public: public:
TrackPickerItem(KListView *tqparent, const KTRMResult &result) : TrackPickerItem(KListView *parent, const KTRMResult &result) :
KListViewItem(tqparent, tqparent->lastChild(), KListViewItem(parent, parent->lastChild(),
result.title(), result.artist(), result.album(), result.title(), result.artist(), result.album(),
NUMBER(result.track()), NUMBER(result.year())), NUMBER(result.track()), NUMBER(result.year())),
m_result(result) {} m_result(result) {}
@ -47,8 +47,8 @@ private:
TrackPickerDialog::TrackPickerDialog(const TQString &name, TrackPickerDialog::TrackPickerDialog(const TQString &name,
const KTRMResultList &results, const KTRMResultList &results,
TQWidget *tqparent) : TQWidget *parent) :
KDialogBase(tqparent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true) KDialogBase(parent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true)
{ {
m_base = new TrackPickerDialogBase(this); m_base = new TrackPickerDialogBase(this);
setMainWidget(m_base); setMainWidget(m_base);

@ -34,7 +34,7 @@ class TrackPickerDialog : public KDialogBase
public: public:
TrackPickerDialog(const TQString &name, TrackPickerDialog(const TQString &name,
const KTRMResultList &results, const KTRMResultList &results,
TQWidget *tqparent = 0); TQWidget *parent = 0);
virtual ~TrackPickerDialog(); virtual ~TrackPickerDialog();

@ -180,7 +180,7 @@ public:
/** /**
* This function sets the currently playing item to @a currentItem. If the * This function sets the currently playing item to @a currentItem. If the
* item doesn't belong to the tqparent UpcomingPlaylist, it will be added to * item doesn't belong to the parent UpcomingPlaylist, it will be added to
* the UpcomingPlaylist, replacing any track that may be playing. * the UpcomingPlaylist, replacing any track that may be playing.
* Otherwise, it is moved up and set to play, replacing any track that may * Otherwise, it is moved up and set to play, replacing any track that may
* be playing. * be playing.
@ -196,7 +196,7 @@ public:
/** /**
* This function readies the UpcomingSequenceIterator for playback, by * This function readies the UpcomingSequenceIterator for playback, by
* making sure the tqparent UpcomingPlaylist has items to play if it is * making sure the parent UpcomingPlaylist has items to play if it is
* empty. * empty.
*/ */
virtual void prepareToPlay(Playlist *); virtual void prepareToPlay(Playlist *);

@ -42,8 +42,8 @@ WebImage::WebImage(const TQString &imageURL, const TQString &thumbURL,
} }
WebImageFetcher::WebImageFetcher(TQObject *tqparent) WebImageFetcher::WebImageFetcher(TQObject *parent)
: TQObject(tqparent), : TQObject(parent),
m_connection(new TQHttp(this)), m_connection(new TQHttp(this)),
m_connectionId(-1), m_connectionId(-1),
m_dialog(0) m_dialog(0)

@ -58,7 +58,7 @@ class WebImageFetcher : public TQObject
TQ_OBJECT TQ_OBJECT
public: public:
WebImageFetcher(TQObject *tqparent); WebImageFetcher(TQObject *parent);
~WebImageFetcher(); ~WebImageFetcher();
void setFile(const FileHandle &file); void setFile(const FileHandle &file);

@ -36,8 +36,8 @@
WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList,
const FileHandle &file, const FileHandle &file,
TQWidget *tqparent) : TQWidget *parent) :
KDialogBase(tqparent, "internet_image_fetcher", true, TQString(), KDialogBase(parent, "internet_image_fetcher", true, TQString(),
Ok | Cancel | User1 , NoDefault, true), Ok | Cancel | User1 , NoDefault, true),
m_pixmap(TQPixmap()), m_pixmap(TQPixmap()),
m_imageList(imageList), m_imageList(imageList),
@ -184,8 +184,8 @@ TQPixmap WebImageFetcherDialog::pixmapFromURL(const KURL &url) const
// CoverIconViewItem // CoverIconViewItem
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
CoverIconViewItem::CoverIconViewItem(TQIconView *tqparent, const WebImage &image) : CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) :
TQObject(tqparent), KIconViewItem(tqparent, tqparent->lastItem(), image.size()), m_job(0) TQObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0)
{ {
// Set up the iconViewItem // Set up the iconViewItem

@ -32,7 +32,7 @@ class WebImageFetcherDialog : public KDialogBase
public: public:
WebImageFetcherDialog(const WebImageList &urlList, WebImageFetcherDialog(const WebImageList &urlList,
const FileHandle &file, const FileHandle &file,
TQWidget *tqparent = 0); TQWidget *parent = 0);
virtual ~WebImageFetcherDialog(); virtual ~WebImageFetcherDialog();
@ -77,7 +77,7 @@ class CoverIconViewItem : public TQObject, public KIconViewItem
TQ_OBJECT TQ_OBJECT
public: public:
CoverIconViewItem(TQIconView *tqparent, const WebImage &image); CoverIconViewItem(TQIconView *parent, const WebImage &image);
~CoverIconViewItem(); ~CoverIconViewItem();
private slots: private slots:

@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "controls.h" #include "controls.h"
Kaboodle::L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : Kaboodle::L33tSlider::L33tSlider(TQWidget * parent, const char * name) :
TQSlider(tqparent,name), pressed(false) TQSlider(parent,name), pressed(false)
{} {}
Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) :
TQSlider(o,tqparent,name), pressed(false) TQSlider(o,parent,name), pressed(false)
{} {}
Kaboodle::L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, Kaboodle::L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value,
Qt::Orientation o, TQWidget * tqparent, const char * name) : Qt::Orientation o, TQWidget * parent, const char * name) :
TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false)
{} {}
bool Kaboodle::L33tSlider::currentlyPressed() const bool Kaboodle::L33tSlider::currentlyPressed() const
@ -76,8 +76,8 @@ void Kaboodle::L33tSlider::wheelEvent(TQWheelEvent *e)
} }
Kaboodle::SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, Kaboodle::SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
const char *member, TQObject* tqparent, const char* name ) const char *member, TQObject* parent, const char* name )
: KAction( text, accel, tqparent, name ) : KAction( text, accel, parent, name )
{ {
m_receiver = receiver; m_receiver = receiver;
m_member = member; m_member = member;

@ -45,10 +45,10 @@ class L33tSlider : public TQSlider
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
L33tSlider(TQWidget * tqparent, const char * name=0); L33tSlider(TQWidget * parent, const char * name=0);
L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0);
L33tSlider(int minValue, int maxValue, int pageStep, int value, L33tSlider(int minValue, int maxValue, int pageStep, int value,
Qt::Orientation, TQWidget * tqparent, const char * name=0); Qt::Orientation, TQWidget * parent, const char * name=0);
bool currentlyPressed() const; bool currentlyPressed() const;
signals: signals:
@ -77,7 +77,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
SliderAction(const TQString& text, int accel, const TQObject *receiver, SliderAction(const TQString& text, int accel, const TQObject *receiver,
const char *member, TQObject* tqparent, const char* name ); const char *member, TQObject* parent, const char* name );
virtual int plug( TQWidget *w, int index = -1 ); virtual int plug( TQWidget *w, int index = -1 );
virtual void unplug( TQWidget *w ); virtual void unplug( TQWidget *w );
TQSlider* slider() const { return m_slider; } TQSlider* slider() const { return m_slider; }

@ -71,8 +71,8 @@ public:
KURL file; KURL file;
}; };
Kaboodle::Engine::Engine(TQObject *tqparent) Kaboodle::Engine::Engine(TQObject *parent)
: TQObject(tqparent) : TQObject(parent)
, d(new EnginePrivate) , d(new EnginePrivate)
{ {
} }

@ -48,7 +48,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Engine(TQObject *tqparent=0); Engine(TQObject *parent=0);
~Engine(); ~Engine();
Arts::PlayObject playObject() const; Arts::PlayObject playObject() const;

@ -42,15 +42,15 @@ Kaboodle::KaboodleFactory::~KaboodleFactory()
s_instance = 0; s_instance = 0;
} }
KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *tqparent, const char *name, const char *className, const TQStringList &) KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &)
{ {
if(className == TQString("KMediaPlayer/Engine")) if(className == TQString("KMediaPlayer/Engine"))
{ {
return new Player(tqparent, name); return new Player(parent, name);
} }
else else
{ {
return new Player(widgetParent, widgetName, tqparent, name); return new Player(widgetParent, widgetName, parent, name);
} }
} }

@ -41,7 +41,7 @@ public:
KaboodleFactory(); KaboodleFactory();
virtual ~KaboodleFactory(); virtual ~KaboodleFactory();
virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *tqparent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
static const KAboutData *aboutData(); static const KAboutData *aboutData();
static KInstance *instance(); static KInstance *instance();

@ -32,8 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "player.h" #include "player.h"
#include "view.h" #include "view.h"
Kaboodle::Player::Player(TQObject *tqparent, const char *name) Kaboodle::Player::Player(TQObject *parent, const char *name)
: KMediaPlayer::Player(tqparent, name) : KMediaPlayer::Player(parent, name)
, engine(new Engine(this)) , engine(new Engine(this))
, widget(0) , widget(0)
, uncompleted(true) , uncompleted(true)
@ -47,8 +47,8 @@ Kaboodle::Player::Player(TQObject *tqparent, const char *name)
} }
Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName, Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName,
TQObject *tqparent, const char *name) TQObject *parent, const char *name)
: KMediaPlayer::Player(widgetParent, widgetName, tqparent, name) : KMediaPlayer::Player(widgetParent, widgetName, parent, name)
, engine(new Engine(this)) , engine(new Engine(this))
, widget(new View(widgetParent, widgetName, this)) , widget(new View(widgetParent, widgetName, this))
, uncompleted(true) , uncompleted(true)
@ -260,8 +260,8 @@ void Kaboodle::Player::updateTitle()
} }
} }
Kaboodle::BrowserExtension::BrowserExtension(Player *tqparent) Kaboodle::BrowserExtension::BrowserExtension(Player *parent)
: KParts::BrowserExtension(tqparent, "Kaboodle Browser Extension") : KParts::BrowserExtension(parent, "Kaboodle Browser Extension")
{ {
} }

@ -46,7 +46,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
BrowserExtension(Player *tqparent); BrowserExtension(Player *parent);
}; };
class Player : public KMediaPlayer::Player class Player : public KMediaPlayer::Player
@ -56,8 +56,8 @@ Q_OBJECT
public: public:
Player(TQWidget *widgetParent, const char *widgetName, Player(TQWidget *widgetParent, const char *widgetName,
TQObject *tqparent, const char *name); TQObject *parent, const char *name);
Player(TQObject *tqparent, const char *name); Player(TQObject *parent, const char *name);
virtual ~Player(); virtual ~Player();
virtual bool openURL(const KURL &); virtual bool openURL(const KURL &);

@ -48,8 +48,8 @@
#include "view.h" #include "view.h"
#include "userinterface.h" #include "userinterface.h"
Kaboodle::UserInterface::UserInterface(TQWidget *tqparent, const KURL &initialFile) Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile)
: KParts::MainWindow(tqparent) : KParts::MainWindow(parent)
{ {
setAcceptDrops(true); setAcceptDrops(true);
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);

@ -44,7 +44,7 @@ class UserInterface : public KParts::MainWindow
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
UserInterface(TQWidget *tqparent, const KURL &initialFile = KURL()); UserInterface(TQWidget *parent, const KURL &initialFile = KURL());
virtual ~UserInterface(void); virtual ~UserInterface(void);
void load(const TQString& url); void load(const TQString& url);

@ -55,8 +55,8 @@ TQButton *createButton(const TQIconSet &_iconset, const TQString &_tip, TQObject
} }
} }
Kaboodle::View::View(TQWidget *tqparent, const char *name, Player *p) Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
: KMediaPlayer::View(tqparent, name) : KMediaPlayer::View(parent, name)
, state((KMediaPlayer::Player::State)p->state()) , state((KMediaPlayer::Player::State)p->state())
, autoPlay(false) , autoPlay(false)
, quitAfterPlaying(false) , quitAfterPlaying(false)

@ -48,7 +48,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
View(TQWidget *tqparent, const char *name, Player *player); View(TQWidget *parent, const char *name, Player *player);
virtual ~View(void); virtual ~View(void);
/** /**

@ -27,8 +27,8 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <kmessagebox.h> #include <kmessagebox.h>
EncodeFileImp::EncodeFileImp(TQWidget* tqparent, EncodeFileImp::EncodeFileImp(TQWidget* parent,
const char* name) : EncodeFile(tqparent, name), m_genres(KCDDB::Genres()) { const char* name) : EncodeFile(parent, name), m_genres(KCDDB::Genres()) {
genre->insertStringList(m_genres.i18nList()); genre->insertStringList(m_genres.i18nList());
// Specify to only accept wav files // Specify to only accept wav files
file->setFilter("*.wav|Wav Files"); file->setFilter("*.wav|Wav Files");

@ -40,7 +40,7 @@ signals:
void startJob(Job *newJob); void startJob(Job *newJob);
public: public:
EncodeFileImp(TQWidget* tqparent = 0, const char* name = 0); EncodeFileImp(TQWidget* parent = 0, const char* name = 0);
protected slots: protected slots:
// Encode button // Encode button

@ -37,7 +37,7 @@
/** /**
* Constructor, load settings. * Constructor, load settings.
*/ */
Encoder::Encoder( TQObject* tqparent, const char* name):TQObject(tqparent,name),reportCount(0) { Encoder::Encoder( TQObject* parent, const char* name):TQObject(parent,name),reportCount(0) {
loadSettings(); loadSettings();
} }

@ -41,7 +41,7 @@ signals:
void jobsChanged(); void jobsChanged();
public: public:
Encoder( TQObject* tqparent = 0, const char* name = 0); Encoder( TQObject* parent = 0, const char* name = 0);
~Encoder(); ~Encoder();
int activeJobCount(); int activeJobCount();
int pendingJobCount(); int pendingJobCount();

@ -32,8 +32,8 @@
/** /**
* Constructor. * Constructor.
*/ */
EncoderConfigImp::EncoderConfigImp( TQWidget* tqparent, const char* name) : EncoderConfigImp::EncoderConfigImp( TQWidget* parent, const char* name) :
EncoderConfig (tqparent, name) { EncoderConfig (parent, name) {
connect(addEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEncoderSlot())); connect(addEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEncoderSlot()));
connect(removeEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEncoderSlot())); connect(removeEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEncoderSlot()));
connect(configureEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureEncoderSlot())); connect(configureEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureEncoderSlot()));

@ -38,7 +38,7 @@ signals:
void encoderUpdated(); void encoderUpdated();
public: public:
EncoderConfigImp( TQWidget* tqparent = 0, const char* name = 0); EncoderConfigImp( TQWidget* parent = 0, const char* name = 0);
private slots: private slots:
void addEncoderSlot(); void addEncoderSlot();

@ -46,11 +46,11 @@
/** /**
* Constructor, set up signals. * Constructor, set up signals.
* @param tqparent - tqparent widget * @param parent - parent widget
* @param name - widget name * @param name - widget name
*/ */
JobQueImp::JobQueImp( TQWidget* tqparent, const char* name) : JobQueImp::JobQueImp( TQWidget* parent, const char* name) :
JobQue(tqparent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ JobQue(parent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){
connect(removeSelected,TQT_SIGNAL(clicked()), this, TQT_SLOT( removeSelectedJob())); connect(removeSelected,TQT_SIGNAL(clicked()), this, TQT_SLOT( removeSelectedJob()));
connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllJobs())); connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllJobs()));
connect(removeDoneJobs, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDoneJobs())); connect(removeDoneJobs, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDoneJobs()));
@ -303,7 +303,7 @@ void QueListViewItem::paintCell (TQPainter * p,const TQColorGroup &cg,int column
/** /**
* Header for built in treelist item so we can have a progress bar in them. * Header for built in treelist item so we can have a progress bar in them.
*/ */
QueListViewItem::QueListViewItem(TQListView *tqparent, const TQString id, const TQString p , const TQString name, const TQString d, const TQString e) : TQListViewItem(tqparent, id, p, name,d,e), percentDone(0), progressing(false) { QueListViewItem::QueListViewItem(TQListView *parent, const TQString id, const TQString p , const TQString name, const TQString d, const TQString e) : TQListViewItem(parent, id, p, name,d,e), percentDone(0), progressing(false) {
} }
#include "jobqueimp.moc" #include "jobqueimp.moc"

@ -55,7 +55,7 @@ signals:
void removeJob( int idNumber ); void removeJob( int idNumber );
public: public:
JobQueImp( TQWidget* tqparent = 0, const char* name = 0 ); JobQueImp( TQWidget* parent = 0, const char* name = 0 );
int numberOfJobsNotFinished(); int numberOfJobsNotFinished();
public slots: public slots:

@ -49,8 +49,8 @@
/** /**
* Constructor. Connect all of the object and the job control. * Constructor. Connect all of the object and the job control.
*/ */
KAudioCreator::KAudioCreator( TQWidget* tqparent, const char* name) : KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
KMainWindow(tqparent, name) KMainWindow(parent, name)
{ {
janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed); janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed);
setCentralWidget(janusWidget); setCentralWidget(janusWidget);
@ -235,8 +235,8 @@ void KAudioCreator::showSettings(){
dialog->show(); dialog->show();
} }
SettingsDialog::SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config) SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config)
: KConfigDialog(tqparent, name, config), : KConfigDialog(parent, name, config),
cddb(0), cddbChanged(false) cddb(0), cddbChanged(false)
{ {
addPage(new General(0, "General"), i18n("General"), "package_settings", addPage(new General(0, "General"), i18n("General"), "package_settings",

@ -39,7 +39,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KAudioCreator( TQWidget* tqparent = 0, const char* name = 0); KAudioCreator( TQWidget* parent = 0, const char* name = 0);
void setDevice( const TQString &device ); void setDevice( const TQString &device );
protected: protected:
@ -71,7 +71,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config); SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config);
protected slots: protected slots:
void updateSettings(); void updateSettings();

@ -32,7 +32,7 @@
/** /**
* Constructor, load settings. * Constructor, load settings.
*/ */
Ripper::Ripper( TQObject* tqparent, const char* name) : TQObject(tqparent,name) { Ripper::Ripper( TQObject* parent, const char* name) : TQObject(parent,name) {
loadSettings(); loadSettings();
} }

@ -41,7 +41,7 @@ signals:
void jobsChanged(); void jobsChanged();
public: public:
Ripper( TQObject* tqparent = 0, const char* name = 0 ); Ripper( TQObject* parent = 0, const char* name = 0 );
~Ripper(); ~Ripper();
int activeJobCount(); int activeJobCount();
int pendingJobCount(); int pendingJobCount();

@ -49,8 +49,8 @@
/** /**
* Constructor, connect up slots and signals. * Constructor, connect up slots and signals.
*/ */
TracksImp::TracksImp( TQWidget* tqparent, const char* name) : TracksImp::TracksImp( TQWidget* parent, const char* name) :
Tracks(tqparent,name), Tracks(parent,name),
cddbInfo() cddbInfo()
{ {
cd = new KCompactDisc; cd = new KCompactDisc;

@ -44,8 +44,8 @@ class KCompactDisc;
class TracksItem : public KListViewItem class TracksItem : public KListViewItem
{ {
public: public:
TracksItem( KListView *tqparent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c ) TracksItem( KListView *parent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c )
: KListViewItem( tqparent, after, TQString()/*rip*/, TQString::number(tr), l, t ) : KListViewItem( parent, after, TQString()/*rip*/, TQString::number(tr), l, t )
{ {
m_title = t; m_title = t;
m_artist = a; m_artist = a;
@ -94,7 +94,7 @@ signals:
void hasTracks(bool); void hasTracks(bool);
public: public:
TracksImp( TQWidget* tqparent = 0, const char* name = 0); TracksImp( TQWidget* parent = 0, const char* name = 0);
~TracksImp(); ~TracksImp();
bool hasCD(); bool hasCD();

@ -43,10 +43,10 @@ typedef KGenericFactory<KAuPlugin> AuFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_au, AuFactory( "kfile_au" )) K_EXPORT_COMPONENT_FACTORY(kfile_au, AuFactory( "kfile_au" ))
KAuPlugin::KAuPlugin(TQObject *tqparent, const char *name, KAuPlugin::KAuPlugin(TQObject *parent, const char *name,
const TQStringList &args) const TQStringList &args)
: KFilePlugin(tqparent, name, args) : KFilePlugin(parent, name, args)
{ {
KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/basic" ); KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/basic" );

@ -30,7 +30,7 @@ class KAuPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KAuPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); KAuPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool readInfo( KFileMetaInfo& info, uint what);
}; };

@ -45,10 +45,10 @@ typedef KGenericFactory<KAviPlugin> AviFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_avi, AviFactory( "kfile_avi" )) K_EXPORT_COMPONENT_FACTORY(kfile_avi, AviFactory( "kfile_avi" ))
KAviPlugin::KAviPlugin(TQObject *tqparent, const char *name, KAviPlugin::KAviPlugin(TQObject *parent, const char *name,
const TQStringList &args) const TQStringList &args)
: KFilePlugin(tqparent, name, args) : KFilePlugin(parent, name, args)
{ {
KFileMimeTypeInfo* info = addMimeTypeInfo( "video/x-msvideo" ); KFileMimeTypeInfo* info = addMimeTypeInfo( "video/x-msvideo" );

@ -40,7 +40,7 @@ class KAviPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KAviPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); KAviPlugin( TQObject *parent, const char *name, const TQStringList& args );

@ -56,9 +56,9 @@
K_EXPORT_COMPONENT_FACTORY(kfile_flac, KGenericFactory<KFlacPlugin>("kfile_flac")) K_EXPORT_COMPONENT_FACTORY(kfile_flac, KGenericFactory<KFlacPlugin>("kfile_flac"))
KFlacPlugin::KFlacPlugin( TQObject *tqparent, const char *name, KFlacPlugin::KFlacPlugin( TQObject *parent, const char *name,
const TQStringList &args ) const TQStringList &args )
: KFilePlugin( tqparent, name, args ) : KFilePlugin( parent, name, args )
{ {
kdDebug(7034) << "flac plugin\n"; kdDebug(7034) << "flac plugin\n";
@ -269,14 +269,14 @@ bool KFlacPlugin::writeInfo(const KFileMetaInfo& info) const
TQValidator* KFlacPlugin::createValidator( const TQString&, TQValidator* KFlacPlugin::createValidator( const TQString&,
const TQString &group, const TQString &key, const TQString &group, const TQString &key,
TQObject* tqparent, const char* name) const TQObject* parent, const char* name) const
{ {
if(key == "Tracknumber" || key == "Date") if(key == "Tracknumber" || key == "Date")
{ {
return new TQIntValidator(0, 9999, tqparent, name); return new TQIntValidator(0, 9999, parent, name);
} }
else else
return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); return new TQRegExpValidator(TQRegExp(".*"), parent, name);
} }
#include "kfile_flac.moc" #include "kfile_flac.moc"

@ -35,14 +35,14 @@ class KFlacPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KFlacPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); KFlacPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool readInfo( KFileMetaInfo& info, uint what);
virtual bool writeInfo( const KFileMetaInfo& info ) const; virtual bool writeInfo( const KFileMetaInfo& info ) const;
virtual TQValidator* createValidator( const TQString& mimetype, virtual TQValidator* createValidator( const TQString& mimetype,
const TQString &group, const TQString &group,
const TQString &key, const TQString &key,
TQObject* tqparent, const char* name) const; TQObject* parent, const char* name) const;
protected: protected:
virtual void makeMimeTypeInfo(const TQString& mimeType); virtual void makeMimeTypeInfo(const TQString& mimeType);
}; };

@ -37,9 +37,9 @@ typedef KGenericFactory<KM3uPlugin> M3uFactory;
K_EXPORT_COMPONENT_FACTORY( kfile_m3u, M3uFactory( "kfile_m3u" ) ) K_EXPORT_COMPONENT_FACTORY( kfile_m3u, M3uFactory( "kfile_m3u" ) )
KM3uPlugin::KM3uPlugin( TQObject *tqparent, const char *name, KM3uPlugin::KM3uPlugin( TQObject *parent, const char *name,
const TQStringList &preferredItems ) const TQStringList &preferredItems )
: KFilePlugin( tqparent, name, preferredItems ) : KFilePlugin( parent, name, preferredItems )
{ {
kdDebug(7034) << "m3u plugin\n"; kdDebug(7034) << "m3u plugin\n";

@ -32,7 +32,7 @@ class KM3uPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KM3uPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); KM3uPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what ); virtual bool readInfo( KFileMetaInfo& info, uint what );
}; };

@ -44,8 +44,8 @@ typedef KGenericFactory<KMp3Plugin> Mp3Factory;
K_EXPORT_COMPONENT_FACTORY(kfile_mp3, Mp3Factory( "kfile_mp3" )) K_EXPORT_COMPONENT_FACTORY(kfile_mp3, Mp3Factory( "kfile_mp3" ))
KMp3Plugin::KMp3Plugin(TQObject *tqparent, const char *name, const TQStringList &args) KMp3Plugin::KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args)
: KFilePlugin(tqparent, name, args) : KFilePlugin(parent, name, args)
{ {
kdDebug(7034) << "mp3 plugin\n"; kdDebug(7034) << "mp3 plugin\n";
@ -267,8 +267,8 @@ class ComboValidator : public KStringListValidator
{ {
public: public:
ComboValidator(const TQStringList &list, bool rejecting, ComboValidator(const TQStringList &list, bool rejecting,
bool fixupEnabled, TQObject *tqparent, const char *name) : bool fixupEnabled, TQObject *parent, const char *name) :
KStringListValidator(list, rejecting, fixupEnabled, tqparent, name) KStringListValidator(list, rejecting, fixupEnabled, parent, name)
{ {
} }
@ -281,13 +281,13 @@ public:
TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */,
const TQString &group, const TQString &key, const TQString &group, const TQString &key,
TQObject *tqparent, const char *name) const TQObject *parent, const char *name) const
{ {
kdDebug(7034) << "making a validator for " << group << "/" << key << endl; kdDebug(7034) << "making a validator for " << group << "/" << key << endl;
if(key == "Tracknumber" || key == "Date") if(key == "Tracknumber" || key == "Date")
{ {
return new TQIntValidator(0, 9999, tqparent, name); return new TQIntValidator(0, 9999, parent, name);
} }
if(key == "Genre") if(key == "Genre")
@ -298,7 +298,7 @@ TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */,
{ {
l.append(TStringToQString((*it))); l.append(TStringToQString((*it)));
} }
return new ComboValidator(l, false, true, tqparent, name); return new ComboValidator(l, false, true, parent, name);
} }
return 0; return 0;

@ -29,14 +29,14 @@ class KMp3Plugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KMp3Plugin(TQObject *tqparent, const char *name, const TQStringList &args); KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args);
virtual bool readInfo( KFileMetaInfo& info, uint what ); virtual bool readInfo( KFileMetaInfo& info, uint what );
virtual bool writeInfo( const KFileMetaInfo& info) const; virtual bool writeInfo( const KFileMetaInfo& info) const;
virtual TQValidator *createValidator(const TQString &mimetype, virtual TQValidator *createValidator(const TQString &mimetype,
const TQString &group, const TQString &group,
const TQString &key, const TQString &key,
TQObject *tqparent, const char *name) const; TQObject *parent, const char *name) const;
}; };
#endif #endif

@ -48,9 +48,9 @@
K_EXPORT_COMPONENT_FACTORY(kfile_mpc, KGenericFactory<KMpcPlugin>("kfile_mpc")) K_EXPORT_COMPONENT_FACTORY(kfile_mpc, KGenericFactory<KMpcPlugin>("kfile_mpc"))
KMpcPlugin::KMpcPlugin( TQObject *tqparent, const char *name, KMpcPlugin::KMpcPlugin( TQObject *parent, const char *name,
const TQStringList &args ) const TQStringList &args )
: KFilePlugin( tqparent, name, args ) : KFilePlugin( parent, name, args )
{ {
kdDebug(7034) << "mpc plugin\n"; kdDebug(7034) << "mpc plugin\n";
@ -240,14 +240,14 @@ bool KMpcPlugin::writeInfo(const KFileMetaInfo& info) const
TQValidator* KMpcPlugin::createValidator( const TQString&, TQValidator* KMpcPlugin::createValidator( const TQString&,
const TQString &group, const TQString &key, const TQString &group, const TQString &key,
TQObject* tqparent, const char* name) const TQObject* parent, const char* name) const
{ {
if(key == "Tracknumber" || key == "Date") if(key == "Tracknumber" || key == "Date")
{ {
return new TQIntValidator(0, 9999, tqparent, name); return new TQIntValidator(0, 9999, parent, name);
} }
else else
return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); return new TQRegExpValidator(TQRegExp(".*"), parent, name);
} }
#include "kfile_mpc.moc" #include "kfile_mpc.moc"

@ -35,14 +35,14 @@ class KMpcPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KMpcPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); KMpcPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool readInfo( KFileMetaInfo& info, uint what);
virtual bool writeInfo( const KFileMetaInfo& info ) const; virtual bool writeInfo( const KFileMetaInfo& info ) const;
virtual TQValidator* createValidator( const TQString& mimetype, virtual TQValidator* createValidator( const TQString& mimetype,
const TQString &group, const TQString &group,
const TQString &key, const TQString &key,
TQObject* tqparent, const char* name) const; TQObject* parent, const char* name) const;
}; };

@ -46,10 +46,10 @@ typedef KGenericFactory<KMpegPlugin> MpegFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_mpeg, MpegFactory( "kfile_mpeg" )) K_EXPORT_COMPONENT_FACTORY(kfile_mpeg, MpegFactory( "kfile_mpeg" ))
KMpegPlugin::KMpegPlugin(TQObject *tqparent, const char *name, KMpegPlugin::KMpegPlugin(TQObject *parent, const char *name,
const TQStringList &args) const TQStringList &args)
: KFilePlugin(tqparent, name, args) : KFilePlugin(parent, name, args)
{ {
KFileMimeTypeInfo* info = addMimeTypeInfo( "video/mpeg" ); KFileMimeTypeInfo* info = addMimeTypeInfo( "video/mpeg" );

@ -31,7 +31,7 @@ class KMpegPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KMpegPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); KMpegPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool readInfo( KFileMetaInfo& info, uint what);

@ -61,9 +61,9 @@ static const char* const knownTranslations[] = {
K_EXPORT_COMPONENT_FACTORY(kfile_ogg, KGenericFactory<KOggPlugin>("kfile_ogg")) K_EXPORT_COMPONENT_FACTORY(kfile_ogg, KGenericFactory<KOggPlugin>("kfile_ogg"))
KOggPlugin::KOggPlugin( TQObject *tqparent, const char *name, KOggPlugin::KOggPlugin( TQObject *parent, const char *name,
const TQStringList &args ) const TQStringList &args )
: KFilePlugin( tqparent, name, args ) : KFilePlugin( parent, name, args )
{ {
kdDebug(7034) << "ogg plugin\n"; kdDebug(7034) << "ogg plugin\n";
@ -350,8 +350,8 @@ bool KOggPlugin::writeInfo(const KFileMetaInfo& info) const
TQValidator* KOggPlugin::createValidator( const TQString&, TQValidator* KOggPlugin::createValidator( const TQString&,
const TQString &, const TQString &, const TQString &, const TQString &,
TQObject* tqparent, const char* name) const { TQObject* parent, const char* name) const {
return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); return new TQRegExpValidator(TQRegExp(".*"), parent, name);
} }
#include "kfile_ogg.moc" #include "kfile_ogg.moc"

@ -32,14 +32,14 @@ class KOggPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KOggPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); KOggPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool readInfo( KFileMetaInfo& info, uint what);
virtual bool writeInfo( const KFileMetaInfo& info ) const; virtual bool writeInfo( const KFileMetaInfo& info ) const;
virtual TQValidator* createValidator( const TQString& mimetype, virtual TQValidator* createValidator( const TQString& mimetype,
const TQString &group, const TQString &group,
const TQString &key, const TQString &key,
TQObject* tqparent, const char* name) const; TQObject* parent, const char* name) const;
}; };

@ -36,10 +36,10 @@ typedef KGenericFactory<KSidPlugin> SidFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_sid, SidFactory("kfile_sid")) K_EXPORT_COMPONENT_FACTORY(kfile_sid, SidFactory("kfile_sid"))
KSidPlugin::KSidPlugin(TQObject *tqparent, const char *name, KSidPlugin::KSidPlugin(TQObject *parent, const char *name,
const TQStringList &args) const TQStringList &args)
: KFilePlugin(tqparent, name, args) : KFilePlugin(parent, name, args)
{ {
kdDebug(7034) << "sid plugin\n"; kdDebug(7034) << "sid plugin\n";
@ -211,13 +211,13 @@ failure:
TQValidator* TQValidator*
KSidPlugin::createValidator(const TQString& /*mimetype*/, const TQString& group, KSidPlugin::createValidator(const TQString& /*mimetype*/, const TQString& group,
const TQString& /*key*/, TQObject* tqparent, const TQString& /*key*/, TQObject* parent,
const char* name) const const char* name) const
{ {
kdDebug(7034) << k_funcinfo << endl; kdDebug(7034) << k_funcinfo << endl;
// all items in "General" group are strings of max lenght 31 // all items in "General" group are strings of max lenght 31
if (group == "General") if (group == "General")
return new TQRegExpValidator(TQRegExp(".{,31}"), tqparent, name); return new TQRegExpValidator(TQRegExp(".{,31}"), parent, name);
// all others are read-only // all others are read-only
return 0; return 0;
} }

@ -31,12 +31,12 @@ class KSidPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KSidPlugin(TQObject *tqparent, const char *name, const TQStringList& args); KSidPlugin(TQObject *parent, const char *name, const TQStringList& args);
virtual bool readInfo(KFileMetaInfo& info, uint what); virtual bool readInfo(KFileMetaInfo& info, uint what);
virtual bool writeInfo(const KFileMetaInfo& info) const; virtual bool writeInfo(const KFileMetaInfo& info) const;
TQValidator* createValidator(const TQString& mimetype, const TQString& group, TQValidator* createValidator(const TQString& mimetype, const TQString& group,
const TQString& key, TQObject* tqparent, const TQString& key, TQObject* parent,
const char* name) const; const char* name) const;
}; };

@ -56,9 +56,9 @@ typedef KGenericFactory<theoraPlugin> theoraFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_theora, theoraFactory( "kfile_theora" )) K_EXPORT_COMPONENT_FACTORY(kfile_theora, theoraFactory( "kfile_theora" ))
theoraPlugin::theoraPlugin(TQObject *tqparent, const char *name, theoraPlugin::theoraPlugin(TQObject *parent, const char *name,
const TQStringList &args) const TQStringList &args)
: KFilePlugin(tqparent, name, args) : KFilePlugin(parent, name, args)
{ {
// kdDebug(7034) << "theora plugin\n"; // kdDebug(7034) << "theora plugin\n";

@ -34,7 +34,7 @@ class theoraPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
theoraPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); theoraPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool readInfo( KFileMetaInfo& info, uint what);
}; };

@ -43,10 +43,10 @@ typedef KGenericFactory<KWavPlugin> WavFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_wav, WavFactory( "kfile_wav" )) K_EXPORT_COMPONENT_FACTORY(kfile_wav, WavFactory( "kfile_wav" ))
KWavPlugin::KWavPlugin(TQObject *tqparent, const char *name, KWavPlugin::KWavPlugin(TQObject *parent, const char *name,
const TQStringList &args) const TQStringList &args)
: KFilePlugin(tqparent, name, args) : KFilePlugin(parent, name, args)
{ {
KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/x-wav" ); KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/x-wav" );

@ -30,7 +30,7 @@ class KWavPlugin: public KFilePlugin
TQ_OBJECT TQ_OBJECT
public: public:
KWavPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); KWavPlugin( TQObject *parent, const char *name, const TQStringList& args );
virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool readInfo( KFileMetaInfo& info, uint what);
}; };

@ -34,8 +34,8 @@
#include "kcmaudiocd.moc" #include "kcmaudiocd.moc"
#include <kconfigdialogmanager.h> #include <kconfigdialogmanager.h>
KAudiocdModule::KAudiocdModule(TQWidget *tqparent, const char *name) KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
: AudiocdConfig(tqparent, name), configChanged(false) : AudiocdConfig(parent, name), configChanged(false)
{ {
TQString foo = i18n("Report errors found on the cd."); TQString foo = i18n("Report errors found on the cd.");
@ -259,9 +259,9 @@ TQString KAudiocdModule::quickHelp() const
extern "C" extern "C"
{ {
KCModule *create_audiocd(TQWidget *tqparent, const char */*name*/) KCModule *create_audiocd(TQWidget *parent, const char */*name*/)
{ {
return new KAudiocdModule(tqparent, "kcmaudiocd"); return new KAudiocdModule(parent, "kcmaudiocd");
} }
} }

@ -36,7 +36,7 @@ class KAudiocdModule : public AudiocdConfig
public: public:
KAudiocdModule(TQWidget *tqparent=0, const char *name=0); KAudiocdModule(TQWidget *parent=0, const char *name=0);
~KAudiocdModule(); ~KAudiocdModule();
TQString quickHelp() const; TQString quickHelp() const;

@ -31,7 +31,7 @@ class AudioCDEncoder {
public: public:
/** /**
* Constructor. * Constructor.
* @param slave tqparent that this classes can use to call data() with * @param slave parent that this classes can use to call data() with
* when finished encoding bits. * when finished encoding bits.
*/ */
explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {}; explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {};

@ -47,8 +47,8 @@ struct CollectingProcess::Private {
}; };
CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name ) CollectingProcess::CollectingProcess( TQObject * parent, const char * name )
: KProcess( tqparent, name ) : KProcess( parent, name )
{ {
d = new Private(); d = new Private();
} }

@ -47,7 +47,7 @@ class CollectingProcess : public KProcess {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
CollectingProcess( TQObject * tqparent = 0, const char * name = 0 ); CollectingProcess( TQObject * parent = 0, const char * name = 0 );
~CollectingProcess(); ~CollectingProcess();
/** Starts the process in NotifyOnExit mode and writes in to stdin of /** Starts the process in NotifyOnExit mode and writes in to stdin of

@ -60,7 +60,7 @@ Index
3. Compiling consoleKMid 3. Compiling consoleKMid
----------------- -----------------
Do a configure from the tqparent directory, then go to the player directory, Do a configure from the parent directory, then go to the player directory,
and do a 'make' . Simple , isn't it ? and do a 'make' . Simple , isn't it ?
By default it will use the external midi device, if you want to use another By default it will use the external midi device, if you want to use another

@ -39,7 +39,7 @@
#include "instrname.h" #include "instrname.h"
#include <kiconloader.h> #include <kiconloader.h>
KMidChannel::KMidChannel(int chn,TQWidget *tqparent) : TQWidget (tqparent) KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
{ {
channel=chn; channel=chn;
replay=TRUE; replay=TRUE;

@ -25,7 +25,7 @@
#include "channel3d.h" #include "channel3d.h"
#include <tqpainter.h> #include <tqpainter.h>
KMidChannel3D::KMidChannel3D (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent) KMidChannel3D::KMidChannel3D (int chn,TQWidget *parent) : KMidChannel(chn,parent)
{ {
} }

@ -30,7 +30,7 @@
class KMidChannel3D : public KMidChannel class KMidChannel3D : public KMidChannel
{ {
public: public:
KMidChannel3D(int chn,TQWidget *tqparent); KMidChannel3D(int chn,TQWidget *parent);
virtual void drawDo (TQPainter *qpaint,int x,int p); virtual void drawDo (TQPainter *qpaint,int x,int p);

@ -25,7 +25,7 @@
#include "channel4d.h" #include "channel4d.h"
#include <tqpainter.h> #include <tqpainter.h>
KMidChannel4D::KMidChannel4D (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent) KMidChannel4D::KMidChannel4D (int chn,TQWidget *parent) : KMidChannel(chn,parent)
{ {
brushR = new TQBrush (red); brushR = new TQBrush (red);
brushW = new TQBrush (white); brushW = new TQBrush (white);

@ -36,7 +36,7 @@ private:
TQPen *penR; TQPen *penR;
public: public:
KMidChannel4D(int chn,TQWidget *tqparent); KMidChannel4D(int chn,TQWidget *parent);
virtual void drawDo (TQPainter *qpaint,int x,int p); virtual void drawDo (TQPainter *qpaint,int x,int p);

@ -12,7 +12,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>
ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *tqparent,const char *name) : KDialogBase(tqparent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok) ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok)
{ {
TQWidget *page = new TQWidget( this ); TQWidget *page = new TQWidget( this );
setMainWidget(page); setMainWidget(page);

@ -35,7 +35,7 @@ class ChannelViewConfigDialog : public KDialogBase
public: public:
ChannelViewConfigDialog(TQWidget *tqparent,const char *name); ChannelViewConfigDialog(TQWidget *parent,const char *name);
private: private:
TQVButtonGroup *qbg; TQVButtonGroup *qbg;

@ -38,7 +38,7 @@
#include "songlist.h" #include "songlist.h"
#include "slman.h" #include "slman.h"
CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *tqparent,const char *name) : TQDialog(tqparent,name,TRUE) CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *parent,const char *name) : TQDialog(parent,name,TRUE)
{ {
setCaption(i18n("Collections Manager")); setCaption(i18n("Collections Manager"));
ok=new KPushButton(KStdGuiItem::ok(),this); ok=new KPushButton(KStdGuiItem::ok(),this);

@ -49,7 +49,7 @@ protected:
void addSong(const KURL &); void addSong(const KURL &);
public: public:
CollectionDialog(SLManager *slm,int selc,TQWidget *tqparent,const char *name); CollectionDialog(SLManager *slm,int selc,TQWidget *parent,const char *name);
public slots: public slots:
void collectionselected(int idx); void collectionselected(int idx);

@ -40,7 +40,7 @@
//#define DRAW_BOUNDING_RECTS //#define DRAW_BOUNDING_RECTS
KDisplayText::KDisplayText(TQWidget *tqparent,const char *name) : TQScrollView(tqparent,name) KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(parent,name)
{ {
first_line_[0]=first_line_[1]=NULL; first_line_[0]=first_line_[1]=NULL;
linked_list_[0]=linked_list_[1]=NULL; linked_list_[0]=linked_list_[1]=NULL;

@ -92,7 +92,7 @@ protected:
virtual void timerEvent(TQTimerEvent *e); virtual void timerEvent(TQTimerEvent *e);
public: public:
KDisplayText(TQWidget *tqparent,const char *name); KDisplayText(TQWidget *parent,const char *name);
virtual ~KDisplayText(); virtual ~KDisplayText();
void ClearEv(bool totally=true); void ClearEv(bool totally=true);

@ -28,8 +28,8 @@
#define BUTTONWIDTH 9 #define BUTTONWIDTH 9
KLCDNumber::KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name) KLCDNumber::KLCDNumber(int _numDigits,TQWidget *parent,const char *name)
: TQWidget(tqparent,name) : TQWidget(parent,name)
{ {
initDigits(); initDigits();
setUserChangeValue=false; setUserChangeValue=false;
@ -47,8 +47,8 @@ KLCDNumber::KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name)
setLCDColor(100,255,100); setLCDColor(100,255,100);
} }
KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name) KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name)
: TQWidget(tqparent,name) : TQWidget(parent,name)
{ {
initDigits(); initDigits();
setUserChangeValue=_setUserChangeValue; setUserChangeValue=_setUserChangeValue;

@ -101,8 +101,8 @@ public:
void initDigits(void); void initDigits(void);
public: public:
KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name); KLCDNumber(int _numDigits,TQWidget *parent,const char *name);
KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name); KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name);
void setUserSetDefaultValue(bool _userSetDefaultValue); void setUserSetDefaultValue(bool _userSetDefaultValue);
void setDefaultValue(double v); void setDefaultValue(double v);

@ -38,10 +38,10 @@ KMidFactory::~KMidFactory()
} }
KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *widgetName, KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const char*, TQObject *parent, const char *name, const char*,
const TQStringList& ) const TQStringList& )
{ {
KParts::Part *obj = new KMidPart(parentWidget, widgetName, tqparent, name); KParts::Part *obj = new KMidPart(parentWidget, widgetName, parent, name);
return obj; return obj;
} }
@ -66,8 +66,8 @@ KInstance *KMidFactory::instance()
} }
KMidPart::KMidPart(TQWidget *parentWidget, const char *widgetName, KMidPart::KMidPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name) TQObject *parent, const char *name)
: KParts::ReadOnlyPart(tqparent, name) : KParts::ReadOnlyPart(parent, name)
{ {
setInstance(KMidFactory::instance()); setInstance(KMidFactory::instance());
@ -133,8 +133,8 @@ void KMidPart::slotStop()
{ {
widget->stop(); widget->stop();
} }
KMidBrowserExtension::KMidBrowserExtension(KMidPart *tqparent) KMidBrowserExtension::KMidBrowserExtension(KMidPart *parent)
: KParts::BrowserExtension(tqparent, "KMidBrowserExtension") : KParts::BrowserExtension(parent, "KMidBrowserExtension")
{ {
} }

@ -18,7 +18,7 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
virtual ~KMidFactory(); virtual ~KMidFactory();
virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName, virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName,
TQObject* tqparent = 0, const char* name = 0, TQObject* parent = 0, const char* name = 0,
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList()); const TQStringList &args = TQStringList());
@ -35,7 +35,7 @@ class KMidPart: public KParts::ReadOnlyPart
TQ_OBJECT TQ_OBJECT
public: public:
KMidPart(TQWidget *parentWidget, const char *widgetName, KMidPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name); TQObject *parent, const char *name);
virtual ~KMidPart(); virtual ~KMidPart();
@ -59,7 +59,7 @@ class KMidBrowserExtension : public KParts::BrowserExtension
TQ_OBJECT TQ_OBJECT
friend class KMidPart; friend class KMidPart;
public: public:
KMidBrowserExtension(KMidPart *tqparent); KMidBrowserExtension(KMidPart *parent);
virtual ~KMidBrowserExtension(); virtual ~KMidBrowserExtension();
}; };

@ -15,7 +15,7 @@ protected:
public: public:
KMidButton (TQWidget *tqparent,const char *name) : TQPushButton (tqparent,name) KMidButton (TQWidget *parent,const char *name) : TQPushButton (parent,name)
{ {
}; };

@ -65,8 +65,8 @@
//#define TEMPHACK //#define TEMPHACK
kmidClient::kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name) kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name)
: DCOPObject("KMidIface"), TQWidget(tqparent,name) : DCOPObject("KMidIface"), TQWidget(parent,name)
{ {
actionCollection=ac; actionCollection=ac;
KConfig *cfg=kapp->config(); KConfig *cfg=kapp->config();

@ -106,7 +106,7 @@ private:
int openFile(const char *filename); int openFile(const char *filename);
void allNotesOff(void); void allNotesOff(void);
public: public:
kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name=0); kmidClient(TQWidget *parent, KActionCollection *ac, const char *name=0);
~kmidClient(); ~kmidClient();
char *midiFileName(void) {return midifile_opened;}; char *midiFileName(void) {return midifile_opened;};

@ -49,7 +49,7 @@ int main(int argc, char **argv)
/* /*
struct sigaction act; struct sigaction act;
act.sa_handler = SIG_DFL; act.sa_handler = SIG_DFL;
sigemptyset(&(act.sa_tqmask)); sigemptyset(&(act.sa_mask));
act.sa_flags=0; act.sa_flags=0;
sigaction(SIGINT, &act, NULL); sigaction(SIGINT, &act, NULL);

@ -38,7 +38,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
MidiConfigDialog::MidiConfigDialog(DeviceManager *dm, MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
TQWidget *tqparent,const char *name) : KDialogBase(tqparent,name,TRUE, TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,
i18n("Configure MIDI Devices"), KDialogBase::Ok|KDialogBase::Cancel) i18n("Configure MIDI Devices"), KDialogBase::Ok|KDialogBase::Cancel)
{ {
setMinimumSize(360,240); setMinimumSize(360,240);

@ -38,7 +38,7 @@ class MidiConfigDialog : public KDialogBase
public: public:
MidiConfigDialog(DeviceManager *dm,TQWidget *tqparent,const char *name); MidiConfigDialog(DeviceManager *dm,TQWidget *parent,const char *name);
public slots: public slots:
void deviceselected(int idx); void deviceselected(int idx);

@ -28,8 +28,8 @@
#define ARROW_LENGTH 13 #define ARROW_LENGTH 13
QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *tqparent, const char *name) QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *parent, const char *name)
: TQWidget (tqparent,name) : TQWidget (parent,name)
{ {
kslider=ksl; kslider=ksl;

@ -39,7 +39,7 @@ private:
int fontheight; int fontheight;
public: public:
QSliderTime( TQSlider *ksl, TQWidget *tqparent = NULL, const char *name = NULL ); QSliderTime( TQSlider *ksl, TQWidget *parent = NULL, const char *name = NULL );
int getFontHeight(void) {return fontheight;}; int getFontHeight(void) {return fontheight;};

@ -23,7 +23,7 @@
***************************************************************************/ ***************************************************************************/
#include "rhythmview.h" #include "rhythmview.h"
RhythmView::RhythmView (TQWidget *tqparent, const char *name) : TQWidget (tqparent,name) RhythmView::RhythmView (TQWidget *parent, const char *name) : TQWidget (parent,name)
{ {
lamps=NULL; lamps=NULL;
setRhythm(4,4); setRhythm(4,4);

@ -34,7 +34,7 @@ class RhythmView : public TQWidget
KLed **lamps; KLed **lamps;
public: public:
RhythmView (TQWidget *tqparent, const char *name); RhythmView (TQWidget *parent, const char *name);
~RhythmView(); ~RhythmView();
void setRhythm(int numerator,int denominator); void setRhythm(int numerator,int denominator);

@ -15,7 +15,7 @@ class DialogViewConfiguration : public KDialogBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
DialogViewConfiguration(TQWidget* tqparent, ViewBase& view); DialogViewConfiguration(TQWidget* parent, ViewBase& view);
~DialogViewConfiguration(); ~DialogViewConfiguration();
TQSize tqsizeHint() const; TQSize tqsizeHint() const;

@ -24,17 +24,17 @@
#include "kledbutton.h" #include "kledbutton.h"
KLedButton::KLedButton(const TQColor &col, TQWidget *tqparent, const char *name) KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
: KLed( col, tqparent, name ) : KLed( col, parent, name )
{ {
// KLed and thus KLedButtung does not do proper positioning in TQLayout's. // KLed and thus KLedButtung does not do proper positioning in TQLayout's.
// Thus I will do a dirty trick here // Thus I will do a dirty trick here
installEventFilter(tqparent); installEventFilter(parent);
} }
KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
KLed::Shape tqshape, TQWidget *tqparent, const char *name) KLed::Shape tqshape, TQWidget *parent, const char *name)
: KLed( col, st, look, tqshape, tqparent, name ) : KLed( col, st, look, tqshape, parent, name )
{ {
} }

@ -34,9 +34,9 @@ class KLedButton : public KLed {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KLedButton(const TQColor &col=TQt::green, TQWidget *tqparent=0, const char *name=0); KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape, KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
TQWidget *tqparent=0, const char *name=0); TQWidget *parent=0, const char *name=0);
~KLedButton(); ~KLedButton();
TQSize tqsizeHint () const; TQSize tqsizeHint () const;

@ -66,11 +66,11 @@
extern "C" extern "C"
{ {
KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{ {
KGlobal::locale()->insertCatalogue("kmix"); KGlobal::locale()->insertCatalogue("kmix");
return new KMixApplet(configFile, KPanelApplet::Normal, return new KMixApplet(configFile, KPanelApplet::Normal,
tqparent, "kmixapplet"); parent, "kmixapplet");
} }
} }
@ -84,10 +84,10 @@ static const TQColor mutedHighColor = "#FFFFFF";
static const TQColor mutedLowColor = "#808080"; static const TQColor mutedLowColor = "#808080";
static const TQColor mutedBackColor = "#000000"; static const TQColor mutedBackColor = "#000000";
AppletConfigDialog::AppletConfigDialog( TQWidget * tqparent, const char * name ) AppletConfigDialog::AppletConfigDialog( TQWidget * parent, const char * name )
: KDialogBase( KDialogBase::Plain, TQString(), : KDialogBase( KDialogBase::Plain, TQString(),
KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel,
KDialogBase::Ok, tqparent, name, false, true) KDialogBase::Ok, parent, name, false, true)
{ {
setPlainCaption(i18n("Configure - Mixer Applet")); setPlainCaption(i18n("Configure - Mixer Applet"));
TQFrame* page = plainPage(); TQFrame* page = plainPage();
@ -150,9 +150,9 @@ bool AppletConfigDialog::useCustomColors() const
KMixApplet::KMixApplet( const TQString& configFile, Type t, KMixApplet::KMixApplet( const TQString& configFile, Type t,
TQWidget *tqparent, const char *name ) TQWidget *parent, const char *name )
: KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, tqparent, name ), : KPanelApplet( configFile, t, KPanelApplet::Preferences | KPanelApplet::ReportBug | KPanelApplet::About, parent, name ),
m_mixerWidget(0), m_errorLabel(0), m_pref(0), m_mixerWidget(0), m_errorLabel(0), m_pref(0),
m_aboutData( "kmix", I18N_NOOP("KMix Panel Applet"), m_aboutData( "kmix", I18N_NOOP("KMix Panel Applet"),
APP_VERSION, "Mini Sound Mixer Applet", KAboutData::License_GPL, APP_VERSION, "Mini Sound Mixer Applet", KAboutData::License_GPL,

@ -45,7 +45,7 @@ class AppletConfigDialog : public KDialogBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
AppletConfigDialog( TQWidget * tqparent=0, const char * name=0 ); AppletConfigDialog( TQWidget * parent=0, const char * name=0 );
virtual ~AppletConfigDialog() {}; virtual ~AppletConfigDialog() {};
void setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back); void setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back);
@ -75,7 +75,7 @@ class KMixApplet : public KPanelApplet
public: public:
KMixApplet( const TQString& configFile, Type t = Normal, KMixApplet( const TQString& configFile, Type t = Normal,
TQWidget *tqparent = 0, const char *name = 0 ); TQWidget *parent = 0, const char *name = 0 );
virtual ~KMixApplet(); virtual ~KMixApplet();
struct Colors { struct Colors {

@ -48,8 +48,8 @@
#include "kwin.h" #include "kwin.h"
#include "viewdockareapopup.h" #include "viewdockareapopup.h"
KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *tqparent, const char *name, bool volumePopup, bool dockIconMuting ) KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting )
: KSystemTray( tqparent, name ), : KSystemTray( parent, name ),
m_mixer(mixer), m_mixer(mixer),
_dockAreaPopup(0L), _dockAreaPopup(0L),
_audioPlayer(0L), _audioPlayer(0L),

@ -44,7 +44,7 @@ class KMixDockWidget : public KSystemTray {
friend class KMixWindow; friend class KMixWindow;
public: public:
KMixDockWidget(Mixer *, TQWidget *tqparent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false); KMixDockWidget(Mixer *, TQWidget *parent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false);
~KMixDockWidget(); ~KMixDockWidget();
void setErrorPixmap(); void setErrorPixmap();

@ -57,8 +57,8 @@
*/ */
KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
MixDevice::DeviceCategory categoryMask, MixDevice::DeviceCategory categoryMask,
TQWidget * tqparent, const char * name, ViewBase::ViewFlags vflags ) TQWidget * parent, const char * name, ViewBase::ViewFlags vflags )
: TQWidget( tqparent, name ), _mixer(mixer), m_balanceSlider(0), : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(0),
m_topLayout(0), m_topLayout(0),
m_id( _id ), m_id( _id ),
_iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ), _iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ),

@ -64,7 +64,7 @@ class KMixerWidget : public TQWidget
public: public:
KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
MixDevice::DeviceCategory categoryMask = MixDevice::ALL , MixDevice::DeviceCategory categoryMask = MixDevice::ALL ,
TQWidget *tqparent=0, const char *name=0, ViewBase::ViewFlags vflags=0 ); TQWidget *parent=0, const char *name=0, ViewBase::ViewFlags vflags=0 );
~KMixerWidget(); ~KMixerWidget();
enum KMixerWidgetIO { OUTPUT=0, INPUT }; enum KMixerWidgetIO { OUTPUT=0, INPUT };

@ -36,9 +36,9 @@
#include "kmixerwidget.h" #include "kmixerwidget.h"
KMixPrefDlg::KMixPrefDlg( TQWidget *tqparent ) KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
: KDialogBase( Plain, i18n( "Configure" ), : KDialogBase( Plain, i18n( "Configure" ),
Ok|Cancel|Apply, Ok, tqparent ) Ok|Cancel|Apply, Ok, parent )
{ {
// general buttons // general buttons
m_generalTab = plainPage( /* i18n("&General") */ ); m_generalTab = plainPage( /* i18n("&General") */ );

@ -38,7 +38,7 @@ KMixPrefDlg : public KDialogBase
friend class KMixWindow; friend class KMixWindow;
public: public:
KMixPrefDlg( TQWidget *tqparent ); KMixPrefDlg( TQWidget *parent );
~KMixPrefDlg(); ~KMixPrefDlg();
signals: signals:

@ -36,22 +36,22 @@ static const TQColor mutedLowColor2 = "#808080";
static const TQColor backColor2 = "#000000"; static const TQColor backColor2 = "#000000";
*/ */
KSmallSlider::KSmallSlider( TQWidget *tqparent, const char *name ) KSmallSlider::KSmallSlider( TQWidget *parent, const char *name )
: TQWidget( tqparent, name ), _orientation( Qt::Vertical ) : TQWidget( parent, name ), _orientation( Qt::Vertical )
{ {
init(); init();
} }
KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name ) KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *parent, const char *name )
: TQWidget( tqparent, name ), _orientation( orientation ) : TQWidget( parent, name ), _orientation( orientation )
{ {
init(); init();
} }
KSmallSlider::KSmallSlider( int minValue, int maxValue, int pageStep, KSmallSlider::KSmallSlider( int minValue, int maxValue, int pageStep,
int value, Qt::Orientation orientation, int value, Qt::Orientation orientation,
TQWidget *tqparent, const char *name ) TQWidget *parent, const char *name )
: TQWidget( tqparent, name ), : TQWidget( parent, name ),
TQRangeControl( minValue, maxValue, 1, pageStep, value ), _orientation( orientation) TQRangeControl( minValue, maxValue, 1, pageStep, value ), _orientation( orientation)
{ {
init(); init();

@ -35,10 +35,10 @@ class KSmallSlider : public TQWidget, public TQRangeControl
TQ_OBJECT TQ_OBJECT
public: public:
KSmallSlider( TQWidget *tqparent, const char *name=0 ); KSmallSlider( TQWidget *parent, const char *name=0 );
KSmallSlider( Qt::Orientation, TQWidget *tqparent, const char *name=0 ); KSmallSlider( Qt::Orientation, TQWidget *parent, const char *name=0 );
KSmallSlider( int minValue, int maxValue, int pageStep, int value, KSmallSlider( int minValue, int maxValue, int pageStep, int value,
Qt::Orientation, TQWidget *tqparent, const char *name=0 ); Qt::Orientation, TQWidget *parent, const char *name=0 );
//virtual void setTracking( bool enable ); //virtual void setTracking( bool enable );
//bool tracking() const; //bool tracking() const;

@ -46,8 +46,8 @@
*/ */
MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md,
Qt::Orientation orientation, Qt::Orientation orientation,
TQWidget* tqparent, ViewBase* mw, const char* name) : TQWidget* parent, ViewBase* mw, const char* name) :
MixDeviceWidget(mixer,md,false,orientation,tqparent,mw,name), MixDeviceWidget(mixer,md,false,orientation,parent,mw,name),
_label(0), _enumCombo(0), _layout(0) _label(0), _enumCombo(0), _layout(0)
{ {
// create actions (on _mdwActions, see MixDeviceWidget) // create actions (on _mdwActions, see MixDeviceWidget)

@ -47,7 +47,7 @@ class MDWEnum : public MixDeviceWidget
public: public:
MDWEnum( Mixer *mixer, MixDevice* md, MDWEnum( Mixer *mixer, MixDevice* md,
Qt::Orientation orientation, Qt::Orientation orientation,
TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWEnum(); ~MDWEnum();
void addActionToPopup( KAction *action ); void addActionToPopup( KAction *action );

@ -58,8 +58,8 @@
MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
bool showMuteLED, bool showRecordLED, bool showMuteLED, bool showRecordLED,
bool small, Qt::Orientation orientation, bool small, Qt::Orientation orientation,
TQWidget* tqparent, ViewBase* mw, const char* name) : TQWidget* parent, ViewBase* mw, const char* name) :
MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name), MixDeviceWidget(mixer,md,small,orientation,parent,mw,name),
m_linked(true), m_valueStyle( NNONE), m_iconLabel( 0 ), m_muteLED( 0 ), m_recordLED( 0 ), m_label( 0 ), _layout(0) m_linked(true), m_valueStyle( NNONE), m_iconLabel( 0 ), m_muteLED( 0 ), m_recordLED( 0 ), m_label( 0 ), _layout(0)
{ {
// create actions (on _mdwActions, see MixDeviceWidget) // create actions (on _mdwActions, see MixDeviceWidget)

@ -62,7 +62,7 @@ public:
MDWSlider( Mixer *mixer, MixDevice* md, MDWSlider( Mixer *mixer, MixDevice* md,
bool showMuteLED, bool showRecordLED, bool showMuteLED, bool showRecordLED,
bool small, Qt::Orientation, bool small, Qt::Orientation,
TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWSlider() {} ~MDWSlider() {}
void addActionToPopup( KAction *action ); void addActionToPopup( KAction *action );

@ -47,8 +47,8 @@
*/ */
MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md, MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md,
bool small, Qt::Orientation orientation, bool small, Qt::Orientation orientation,
TQWidget* tqparent, ViewBase* mw, const char* name) : TQWidget* parent, ViewBase* mw, const char* name) :
MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name), MixDeviceWidget(mixer,md,small,orientation,parent,mw,name),
_label(0) , _labelV(0) , _switchLED(0), _layout(0) _label(0) , _labelV(0) , _switchLED(0), _layout(0)
{ {
// create actions (on _mdwActions, see MixDeviceWidget) // create actions (on _mdwActions, see MixDeviceWidget)

@ -57,7 +57,7 @@ class MDWSwitch : public MixDeviceWidget
public: public:
MDWSwitch( Mixer *mixer, MixDevice* md, MDWSwitch( Mixer *mixer, MixDevice* md,
bool small, Qt::Orientation orientation, bool small, Qt::Orientation orientation,
TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWSwitch(); ~MDWSwitch();
void addActionToPopup( KAction *action ); void addActionToPopup( KAction *action );

@ -54,8 +54,8 @@
*/ */
MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md, MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md,
bool small, Qt::Orientation orientation, bool small, Qt::Orientation orientation,
TQWidget* tqparent, ViewBase* mw, const char* name) : TQWidget* parent, ViewBase* mw, const char* name) :
TQWidget( tqparent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), TQWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ),
m_disabled( false ), _orientation( orientation ), m_small( small ) m_disabled( false ), _orientation( orientation ), m_small( small )
{ {
_mdwActions = new KActionCollection( this ); _mdwActions = new KActionCollection( this );

@ -61,7 +61,7 @@ public:
MixDeviceWidget( Mixer *mixer, MixDevice* md, MixDeviceWidget( Mixer *mixer, MixDevice* md,
bool small, Qt::Orientation orientation, bool small, Qt::Orientation orientation,
TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MixDeviceWidget(); ~MixDeviceWidget();
void addActionToPopup( KAction *action ); void addActionToPopup( KAction *action );

@ -86,31 +86,31 @@ int Mixer_HPUX::open()
else else
{ {
/* Mixer is open. Now define properties */ /* Mixer is open. Now define properties */
stereodevs = devtqmask = (1<<ID_PCM); /* activate pcm */ stereodevs = devmask = (1<<ID_PCM); /* activate pcm */
rectqmask = 0; recmask = 0;
/* check Input devices... */ /* check Input devices... */
if (AInputSources(audio) & AMonoMicrophoneMask) { if (AInputSources(audio) & AMonoMicrophoneMask) {
devtqmask |= (1<<ID_IN_MICROPHONE); devmask |= (1<<ID_IN_MICROPHONE);
rectqmask |= (1<<ID_IN_MICROPHONE); recmask |= (1<<ID_IN_MICROPHONE);
} }
if (AInputSources(audio) & (ALeftAuxiliaryMask|ARightAuxiliaryMask)) { if (AInputSources(audio) & (ALeftAuxiliaryMask|ARightAuxiliaryMask)) {
devtqmask |= (1<<ID_IN_AUX); devmask |= (1<<ID_IN_AUX);
rectqmask |= (1<<ID_IN_AUX); recmask |= (1<<ID_IN_AUX);
stereodevs |= (1<<ID_IN_AUX); stereodevs |= (1<<ID_IN_AUX);
} }
/* check Output devices... */ /* check Output devices... */
if (AOutputDestinations(audio) & AMonoIntSpeakerMask) { if (AOutputDestinations(audio) & AMonoIntSpeakerMask) {
devtqmask |= (1<<ID_OUT_INT_SPEAKER); devmask |= (1<<ID_OUT_INT_SPEAKER);
stereodevs |= (1<<ID_OUT_INT_SPEAKER); stereodevs |= (1<<ID_OUT_INT_SPEAKER);
} }
/* implement later: /* implement later:
---------------- ----------------
if (AOutputDestinations(audio) & AMonoLineOutMask) devtqmask |= 64; // Line if (AOutputDestinations(audio) & AMonoLineOutMask) devmask |= 64; // Line
if (AOutputDestinations(audio) & AMonoJackMask) devtqmask |= (1<<14); // Line1 if (AOutputDestinations(audio) & AMonoJackMask) devmask |= (1<<14); // Line1
if (AOutputDestinations(audio) & AMonoHeadphoneMask) devtqmask |= (1<<15); // Line2 if (AOutputDestinations(audio) & AMonoHeadphoneMask) devmask |= (1<<15); // Line2
*/ */
MaxVolume = 255; MaxVolume = 255;

@ -28,7 +28,7 @@ protected:
virtual int close(); virtual int close();
Audio *audio; Audio *audio;
unsigned int stereodevs,devtqmask, rectqmask, MaxVolume, i_recsrc; unsigned int stereodevs,devmask, recmask, MaxVolume, i_recsrc;
}; };

@ -52,8 +52,8 @@ int Mixer_IRIX::open()
} }
else { else {
// Mixer is open. Now define properties // Mixer is open. Now define properties
devtqmask = 1+128+2048; devmask = 1+128+2048;
rectqmask = 128; recmask = 128;
i_recsrc = 128; i_recsrc = 128;
stereodevs = 1+128+2048; stereodevs = 1+128+2048;
MaxVolume = 255; MaxVolume = 255;

@ -108,31 +108,31 @@ int Mixer_OSS::open()
} }
} }
int devtqmask, rectqmask, i_recsrc, stereodevs; int devmask, recmask, i_recsrc, stereodevs;
// Mixer is open. Now define properties // Mixer is open. Now define properties
if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1)
return Mixer::ERR_READ; return Mixer::ERR_READ;
if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1)
return Mixer::ERR_READ; return Mixer::ERR_READ;
if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1)
return Mixer::ERR_READ; return Mixer::ERR_READ;
if (ioctl(m_fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) if (ioctl(m_fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1)
return Mixer::ERR_READ; return Mixer::ERR_READ;
if (!devtqmask) if (!devmask)
return Mixer::ERR_NODEV; return Mixer::ERR_NODEV;
int maxVolume =100; int maxVolume =100;
if( m_mixDevices.isEmpty() ) if( m_mixDevices.isEmpty() )
{ {
int idx = 0; int idx = 0;
while( devtqmask && idx < MAX_MIXDEVS ) while( devmask && idx < MAX_MIXDEVS )
{ {
if( devtqmask & ( 1 << idx ) ) // device active? if( devmask & ( 1 << idx ) ) // device active?
{ {
Volume vol( stereodevs & ( 1 << idx ) ? 2 : 1, maxVolume); Volume vol( stereodevs & ( 1 << idx ) ? 2 : 1, maxVolume);
readVolumeFromHW( idx, vol ); readVolumeFromHW( idx, vol );
MixDevice* md = MixDevice* md =
new MixDevice( idx, vol, rectqmask & ( 1 << idx ), true, new MixDevice( idx, vol, recmask & ( 1 << idx ), true,
MixerDevNames[idx], MixerDevNames[idx],
MixerChannelTypes[idx]); MixerChannelTypes[idx]);
md->setRecSource( isRecsrcHW( idx ) ); md->setRecSource( isRecsrcHW( idx ) );
@ -268,7 +268,7 @@ bool Mixer_OSS::setRecsrcHW( int devnum, bool on )
} }
// PORTING: Hint: Do not forget to set i_recsrc to the new valid // PORTING: Hint: Do not forget to set i_recsrc to the new valid
// record source tqmask. // record source mask.
return i_recsrc == oldrecsrc; return i_recsrc == oldrecsrc;
} }
@ -280,7 +280,7 @@ bool Mixer_OSS::isRecsrcHW( int devnum )
if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1) if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1)
errormsg(Mixer::ERR_READ); errormsg(Mixer::ERR_READ);
else { else {
// test if device bit is set in record bit tqmask // test if device bit is set in record bit mask
isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 ); isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 );
} }
return isRecsrc; return isRecsrc;

@ -89,7 +89,7 @@ const MixDevice::ChannelType MixerChannelTypes[] =
}; };
// //
// Mapping from device numbers to Sun port tqmask values // Mapping from device numbers to Sun port mask values
// //
const uint_t MixerSunPortMasks[] = const uint_t MixerSunPortMasks[] =
{ {
@ -323,7 +323,7 @@ int Mixer_SUN::writeVolumeToHW( int devnum, Volume &volume )
// //
// Now, based on the devnum that we are writing to, update the appropriate // Now, based on the devnum that we are writing to, update the appropriate
// volume field and twiddle the appropriate bittqmask to enable/mute the // volume field and twiddle the appropriate bitmask to enable/mute the
// device as necessary. // device as necessary.
// //
switch ( devnum ) switch ( devnum )

@ -24,9 +24,9 @@
#include <kdebug.h> #include <kdebug.h>
VerticalText::VerticalText(TQWidget * tqparent, const char * name, WFlags f) : TQWidget(tqparent,name,f) VerticalText::VerticalText(TQWidget * parent, const char * name, WFlags f) : TQWidget(parent,name,f)
{ {
resize(20,100 /*tqparent->height() */ ); resize(20,100 /*parent->height() */ );
setMinimumSize(20,10); // neccesary for smooth integration into layouts (we only care for the widths). setMinimumSize(20,10); // neccesary for smooth integration into layouts (we only care for the widths).
} }

@ -6,7 +6,7 @@
class VerticalText : public TQWidget class VerticalText : public TQWidget
{ {
public: public:
VerticalText(TQWidget * tqparent, const char * name, WFlags f = 0); VerticalText(TQWidget * parent, const char * name, WFlags f = 0);
~VerticalText(); ~VerticalText();
TQSize tqsizeHint() const; TQSize tqsizeHint() const;

@ -36,8 +36,8 @@
#include "mdwslider.h" #include "mdwslider.h"
#include "mixer.h" #include "mixer.h"
ViewApplet::ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position )
: ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags) : ViewBase(parent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags)
{ {
setBackgroundOrigin(AncestorOrigin); setBackgroundOrigin(AncestorOrigin);
// remove the menu bar action, that is put by the "ViewBase" constructor in _actions. // remove the menu bar action, that is put by the "ViewBase" constructor in _actions.
@ -119,7 +119,7 @@ TQWidget* ViewApplet::add(MixDevice *md)
false, // Show Record LED false, // Show Record LED
true, // Small true, // Small
sliderOrientation, // Qt::Orientation sliderOrientation, // Qt::Orientation
this, // tqparent this, // parent
this, // View widget this, // View widget
md->name().latin1() md->name().latin1()
); );

@ -15,7 +15,7 @@ class ViewApplet : public ViewBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos); ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos);
~ViewApplet(); ~ViewApplet();
virtual int count(); virtual int count();

@ -37,8 +37,8 @@
#include "mixer.h" #include "mixer.h"
ViewBase::ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags) ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags)
: TQWidget(tqparent, name, f), _vflags(vflags), _caption(caption) : TQWidget(parent, name, f), _vflags(vflags), _caption(caption)
{ {
_mixer = mixer; _mixer = mixer;
_mixSet = new MixSet(); _mixSet = new MixSet();

@ -32,7 +32,7 @@ public:
Experimental_GridView = 0x2000 Experimental_GridView = 0x2000
}; };
ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0); ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags=0, ViewFlags vflags=0);
virtual ~ViewBase(); virtual ~ViewBase();
// Subclasses must define this method. It is called by the ViewBase() constuctor. // Subclasses must define this method. It is called by the ViewBase() constuctor.

@ -40,11 +40,11 @@
#include "mixer.h" #include "mixer.h"
#include "kmixdockwidget.h" #include "kmixdockwidget.h"
// !! Do NOT remove or tqmask out "WType_Popup" // !! Do NOT remove or mask out "WType_Popup"
// Users will not be able to close the Popup without opening the KMix main window then. // Users will not be able to close the Popup without opening the KMix main window then.
// See Bug #93443, #96332 and #96404 for further details. -- esken // See Bug #93443, #96332 and #96404 for further details. -- esken
ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW ) ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW )
: ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW) : ViewBase(parent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW)
{ {
TQBoxLayout *tqlayout = new TQHBoxLayout( this ); TQBoxLayout *tqlayout = new TQHBoxLayout( this );
_frame = new TQFrame( this ); _frame = new TQFrame( this );
@ -128,7 +128,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md)
false, // Show Record LED false, // Show Record LED
false, // Small false, // Small
Qt::Vertical, // Direction: only 1 device, so doesn't matter Qt::Vertical, // Direction: only 1 device, so doesn't matter
_frame, // tqparent _frame, // parent
0, // Is "NULL", so that there is no RMB-popup 0, // Is "NULL", so that there is no RMB-popup
_dockDevice->name().latin1() ); _dockDevice->name().latin1() );
_layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 2 ); _layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 2 );

@ -20,7 +20,7 @@ class ViewDockAreaPopup : public ViewBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ViewDockAreaPopup(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW); ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW);
~ViewDockAreaPopup(); ~ViewDockAreaPopup();
MixDevice* dockDevice(); MixDevice* dockDevice();

@ -35,8 +35,8 @@
/** /**
*/ */
ViewGrid::ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) ViewGrid::ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
: ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
{ {
m_spacingHorizontal = 5; m_spacingHorizontal = 5;
m_spacingVertical = 5; m_spacingVertical = 5;
@ -89,7 +89,7 @@ TQWidget* ViewGrid::add(MixDevice *md)
_mixer, // the mixer for this device _mixer, // the mixer for this device
md, // MixDevice (parameter) md, // MixDevice (parameter)
orientation, // Qt::Orientation orientation, // Qt::Orientation
this, // tqparent this, // parent
this, // View widget this, // View widget
md->name().latin1() md->name().latin1()
); );
@ -102,7 +102,7 @@ TQWidget* ViewGrid::add(MixDevice *md)
md, // MixDevice (parameter) md, // MixDevice (parameter)
false, // Small false, // Small
orientation, // Qt::Orientation orientation, // Qt::Orientation
this, // tqparent this, // parent
this, // View widget this, // View widget
md->name().latin1() md->name().latin1()
); );
@ -118,7 +118,7 @@ TQWidget* ViewGrid::add(MixDevice *md)
true, // Show Record LED true, // Show Record LED
false, // Small false, // Small
orientation, // Qt::Orientation orientation, // Qt::Orientation
this, // tqparent this, // parent
this, // View widget this, // View widget
md->name().latin1() md->name().latin1()
); );

@ -13,7 +13,7 @@ class ViewGrid : public ViewBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewGrid(); ~ViewGrid();
virtual int count(); virtual int count();

@ -25,8 +25,8 @@
#include "mixer.h" #include "mixer.h"
#include "mixdevicewidget.h" #include "mixdevicewidget.h"
ViewInput::ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
: ViewSliders(tqparent, name, caption, mixer, vflags) : ViewSliders(parent, name, caption, mixer, vflags)
{ {
init(); init();
connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources

@ -10,7 +10,7 @@ class ViewInput : public ViewSliders
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewInput(); ~ViewInput();
virtual void setMixSet(MixSet *mixset); virtual void setMixSet(MixSet *mixset);

@ -25,8 +25,8 @@
#include "mixer.h" #include "mixer.h"
#include "mixdevicewidget.h" #include "mixdevicewidget.h"
ViewOutput::ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) ViewOutput::ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
: ViewSliders(tqparent, name, caption, mixer, vflags) : ViewSliders(parent, name, caption, mixer, vflags)
{ {
init(); init();
} }

@ -10,7 +10,7 @@ class ViewOutput : public ViewSliders
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewOutput(); ~ViewOutput();
virtual void setMixSet(MixSet *mixset); virtual void setMixSet(MixSet *mixset);

@ -37,8 +37,8 @@
* correctly because init() does not get called. * correctly because init() does not get called.
* See ViewInput and ViewOutput for "real" implementations. * See ViewInput and ViewOutput for "real" implementations.
*/ */
ViewSliders::ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) ViewSliders::ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
: ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
{ {
if ( _vflags & ViewBase::Vertical ) { if ( _vflags & ViewBase::Vertical ) {
_layoutMDW = new TQVBoxLayout(this); _layoutMDW = new TQVBoxLayout(this);
@ -94,7 +94,7 @@ TQWidget* ViewSliders::add(MixDevice *md)
true, // Show Record LED true, // Show Record LED
false, // Small false, // Small
orientation, // Qt::Orientation orientation, // Qt::Orientation
this, // tqparent this, // parent
this, // View widget this, // View widget
md->name().latin1() md->name().latin1()
); );

@ -12,7 +12,7 @@ class ViewSliders : public ViewBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSliders(); ~ViewSliders();
virtual int count(); virtual int count();

@ -39,8 +39,8 @@
* Demonstration verion of a "surround view" * Demonstration verion of a "surround view"
* Not really usable right now. * Not really usable right now.
*/ */
ViewSurround::ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) ViewSurround::ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
: ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags)
{ {
_mdSurroundFront = 0; _mdSurroundFront = 0;
_mdSurroundBack = 0; _mdSurroundBack = 0;
@ -260,7 +260,7 @@ MixDeviceWidget* ViewSurround::createMDW(MixDevice *md, bool small, Qt::Orientat
false, // Show Record LED false, // Show Record LED
small, // Small small, // Small
orientation, // Qt::Orientation orientation, // Qt::Orientation
this, // tqparent this, // parent
this, // View widget this, // View widget
md->name().latin1() md->name().latin1()
); );

@ -15,7 +15,7 @@ class ViewSurround : public ViewBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSurround(); ~ViewSurround();
virtual int count(); virtual int count();

@ -31,8 +31,8 @@
#include "mdwenum.h" #include "mdwenum.h"
#include "mixer.h" #include "mixer.h"
ViewSwitches::ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags)
: ViewBase(tqparent, name, caption, mixer, 0, vflags) : ViewBase(parent, name, caption, mixer, 0, vflags)
{ {
// Create switch buttonGroup // Create switch buttonGroup
if ( _vflags & ViewBase::Vertical ) { if ( _vflags & ViewBase::Vertical ) {
@ -93,7 +93,7 @@ TQWidget* ViewSwitches::add(MixDevice *md)
_mixer, // the mixer for this device _mixer, // the mixer for this device
md, // MixDevice (parameter) md, // MixDevice (parameter)
orientation, // Qt::Orientation orientation, // Qt::Orientation
this, // tqparent this, // parent
this, // View widget this, // View widget
md->name().latin1() md->name().latin1()
); );
@ -108,7 +108,7 @@ TQWidget* ViewSwitches::add(MixDevice *md)
md, // MixDevice (parameter) md, // MixDevice (parameter)
false, // Small false, // Small
orientation, // Qt::Orientation orientation, // Qt::Orientation
this, // tqparent this, // parent
this, // View widget this, // View widget
md->name().latin1() md->name().latin1()
); );

@ -12,7 +12,7 @@ class ViewSwitches : public ViewBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags); ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSwitches(); ~ViewSwitches();
virtual int count(); virtual int count();

@ -34,9 +34,9 @@ int Volume::_channelMaskEnum[10] =
MCUSTOM1, MCUSTOM2 MCUSTOM1, MCUSTOM2
}; };
Volume::Volume( ChannelMask chtqmask, long maxVolume, long minVolume, bool isCapture ) Volume::Volume( ChannelMask chmask, long maxVolume, long minVolume, bool isCapture )
{ {
init(chtqmask, maxVolume, minVolume, isCapture); init(chmask, maxVolume, minVolume, isCapture);
} }
@ -56,22 +56,22 @@ Volume::Volume( int channels, long maxVolume ) {
Volume::Volume( const Volume &v ) Volume::Volume( const Volume &v )
{ {
_chtqmask = v._chtqmask; _chmask = v._chmask;
_maxVolume = v._maxVolume; _maxVolume = v._maxVolume;
_minVolume = v._minVolume; _minVolume = v._minVolume;
_muted = v._muted; _muted = v._muted;
_isCapture = v._isCapture; _isCapture = v._isCapture;
setVolume(v, (ChannelMask)v._chtqmask); setVolume(v, (ChannelMask)v._chmask);
// kdDebug(67100) << "Volume::copy-constructor initialized " << v << "\n"; // kdDebug(67100) << "Volume::copy-constructor initialized " << v << "\n";
} }
void Volume::init( ChannelMask chtqmask, long maxVolume, long minVolume, bool isCapture ) void Volume::init( ChannelMask chmask, long maxVolume, long minVolume, bool isCapture )
{ {
for ( int i=0; i<= Volume::CHIDMAX; i++ ) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
_volumes[i] = 0; _volumes[i] = 0;
} }
_chtqmask = chtqmask; _chmask = chmask;
_maxVolume = maxVolume; _maxVolume = maxVolume;
_minVolume = minVolume; _minVolume = minVolume;
_isCapture = isCapture; _isCapture = isCapture;
@ -82,7 +82,7 @@ void Volume::init( ChannelMask chtqmask, long maxVolume, long minVolume, bool is
void Volume::setAllVolumes(long vol) void Volume::setAllVolumes(long vol)
{ {
for ( int i=0; i<= Volume::CHIDMAX; i++ ) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
if ( (_channelMaskEnum[i]) & _chtqmask ) { if ( (_channelMaskEnum[i]) & _chmask ) {
// we are supposed to set it // we are supposed to set it
_volumes[i] = volrange(vol); _volumes[i] = volrange(vol);
} }
@ -106,17 +106,17 @@ void Volume::setVolume( ChannelID chid, long vol)
*/ */
void Volume::setVolume(const Volume &v) void Volume::setVolume(const Volume &v)
{ {
setVolume(v, (ChannelMask)(v._chtqmask&_chtqmask) ); setVolume(v, (ChannelMask)(v._chmask&_chmask) );
} }
/** /**
* Copy the volume elements contained in v to this Volume object. * Copy the volume elements contained in v to this Volume object.
* Only those elments are copied, that are supported in BOTH Volume objects * Only those elments are copied, that are supported in BOTH Volume objects
* and match the ChannelMask given by chtqmask. * and match the ChannelMask given by chmask.
*/ */
void Volume::setVolume(const Volume &v, ChannelMask chtqmask) { void Volume::setVolume(const Volume &v, ChannelMask chmask) {
for ( int i=0; i<= Volume::CHIDMAX; i++ ) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
if ( _channelMaskEnum[i] & _chtqmask & (int)chtqmask ) { if ( _channelMaskEnum[i] & _chmask & (int)chmask ) {
// we are supposed to copy it // we are supposed to copy it
_volumes[i] = volrange(v._volumes[i]); _volumes[i] = volrange(v._volumes[i]);
} }
@ -149,8 +149,8 @@ long Volume::getVolume(ChannelID chid) {
} }
else { else {
// check if channel is supported // check if channel is supported
int chtqmask = _channelMaskEnum[chid]; int chmask = _channelMaskEnum[chid];
if ( (chtqmask & _chtqmask) != 0 ) { if ( (chmask & _chmask) != 0 ) {
// channel is supported // channel is supported
vol = _volumes[chid]; vol = _volumes[chid];
} }
@ -162,11 +162,11 @@ long Volume::getVolume(ChannelID chid) {
return vol; return vol;
} }
long Volume::getAvgVolume(ChannelMask chtqmask) { long Volume::getAvgVolume(ChannelMask chmask) {
int avgVolumeCounter = 0; int avgVolumeCounter = 0;
long long sumOfActiveVolumes = 0; long long sumOfActiveVolumes = 0;
for ( int i=0; i<= Volume::CHIDMAX; i++ ) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) { if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) {
avgVolumeCounter++; avgVolumeCounter++;
sumOfActiveVolumes += _volumes[i]; sumOfActiveVolumes += _volumes[i];
} }
@ -180,10 +180,10 @@ long Volume::getAvgVolume(ChannelMask chtqmask) {
return (long)sumOfActiveVolumes; return (long)sumOfActiveVolumes;
} }
long Volume::getTopStereoVolume(ChannelMask chtqmask) { long Volume::getTopStereoVolume(ChannelMask chmask) {
long long topVolumeCount = 0; long long topVolumeCount = 0;
for ( int i=0; i<= Volume::CHIDMAX; i++ ) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) { if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) {
if ( topVolumeCount < _volumes[i] ) if ( topVolumeCount < _volumes[i] )
topVolumeCount = _volumes[i]; topVolumeCount = _volumes[i];
} }
@ -194,7 +194,7 @@ long Volume::getTopStereoVolume(ChannelMask chtqmask) {
int Volume::count() { int Volume::count() {
int counter = 0; int counter = 0;
for ( int i=0; i<= Volume::CHIDMAX; i++ ) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
if ( _channelMaskEnum[i] & _chtqmask ) { if ( _channelMaskEnum[i] & _chmask ) {
counter++; counter++;
} }
} }
@ -225,7 +225,7 @@ std::ostream& operator<<(std::ostream& os, const Volume& vol) {
if ( i != 0 ) { if ( i != 0 ) {
os << ","; os << ",";
} }
if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) { if ( Volume::_channelMaskEnum[i] & vol._chmask ) {
// supported channel: Print Volume // supported channel: Print Volume
os << vol._volumes[i]; os << vol._volumes[i];
} }
@ -248,7 +248,7 @@ kdbgstream& operator<<(kdbgstream &os, const Volume& vol) {
if ( i != 0 ) { if ( i != 0 ) {
os << ","; os << ",";
} }
if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) { if ( Volume::_channelMaskEnum[i] & vol._chmask ) {
// supported channel: Print Volume // supported channel: Print Volume
os << vol._volumes[i]; os << vol._volumes[i];
} }

@ -27,7 +27,7 @@ class Volume
CUSTOM1 = 8, CUSTOM2 = 9, CHIDMAX = 9 }; CUSTOM1 = 8, CUSTOM2 = 9, CHIDMAX = 9 };
Volume( ChannelMask chtqmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false ); Volume( ChannelMask chmask = MALL, long maxVolume = 100, long minVolume=0, bool isCapture=false );
Volume( const Volume &v ); Volume( const Volume &v );
Volume( int channels, long maxVolume ); Volume( int channels, long maxVolume );
@ -37,13 +37,13 @@ class Volume
void setAllVolumes(long vol); void setAllVolumes(long vol);
// Set all volumes to the ones given in vol // Set all volumes to the ones given in vol
void setVolume(const Volume &vol ); void setVolume(const Volume &vol );
// Set volumes as specified by the channel tqmask // Set volumes as specified by the channel mask
void setVolume( const Volume &vol, ChannelMask chtqmask); void setVolume( const Volume &vol, ChannelMask chmask);
void setVolume( ChannelID chid, long volume); void setVolume( ChannelID chid, long volume);
long getVolume(ChannelID chid); long getVolume(ChannelID chid);
long getAvgVolume(ChannelMask chtqmask); long getAvgVolume(ChannelMask chmask);
long getTopStereoVolume(ChannelMask chtqmask); long getTopStereoVolume(ChannelMask chmask);
long operator[](int); long operator[](int);
long maxVolume(); long maxVolume();
long minVolume(); long minVolume();
@ -61,13 +61,13 @@ class Volume
static int _channelMaskEnum[10]; static int _channelMaskEnum[10];
bool _muted; bool _muted;
bool _isCapture; // true, when the Volume represents capture/record levels bool _isCapture; // true, when the Volume represents capture/record levels
long _chtqmask; long _chmask;
long _volumes[CHIDMAX+1]; long _volumes[CHIDMAX+1];
long _maxVolume; long _maxVolume;
long _minVolume; long _minVolume;
private: private:
void init( ChannelMask chtqmask, long, long, bool ); void init( ChannelMask chmask, long, long, bool );
long volrange( int vol ); long volrange( int vol );
long volrangeRec( int vol ); long volrangeRec( int vol );

@ -46,7 +46,7 @@ public:
/** /**
* Returns a pointer to the mainwidget. * Returns a pointer to the mainwidget.
* Usefull to display Messageboxes, etc correctly without beeing a * Usefull to display Messageboxes, etc correctly without beeing a
* TQWidget or knowing about a tqparent TQWidget. * TQWidget or knowing about a parent TQWidget.
*/ */
TQWidget* mainWidget(); TQWidget* mainWidget();

@ -264,12 +264,12 @@ void KRecPrivate::execKMix() {
*/ */
KRecord::KRecord(TQWidget *tqparent, const char *name ) KRecord::KRecord(TQWidget *parent, const char *name )
: KMainWindow(tqparent,name) : KMainWindow(parent,name)
, d( new KRecPrivate( this ) ) , d( new KRecPrivate( this ) )
{ {
kdDebug( 60005 ) << k_funcinfo << endl; kdDebug( 60005 ) << k_funcinfo << endl;
//kdDebug( 60005 )<<"KRecord::KRecord( TQWidget *"<<tqparent<<", const char* "<<name<<" )"<<endl; // (DEBUG) //kdDebug( 60005 )<<"KRecord::KRecord( TQWidget *"<<parent<<", const char* "<<name<<" )"<<endl; // (DEBUG)
KRecGlobal::the()->setMainWidget( this ); KRecGlobal::the()->setMainWidget( this );
KRecGlobal::the()->setStatusBar( statusBar() ); KRecGlobal::the()->setStatusBar( statusBar() );

@ -34,7 +34,7 @@ class KRecord : public KMainWindow {
TQ_OBJECT TQ_OBJECT
public: public:
/// Constructor /// Constructor
KRecord( TQWidget* /*tqparent*/=0, const char* /*name*/=0 ); KRecord( TQWidget* /*parent*/=0, const char* /*name*/=0 );
/// Destructor /// Destructor
~KRecord(); ~KRecord();
public slots: public slots:

@ -36,8 +36,8 @@ static char segs[14][8] =
{25, 0, 0, 0, 0, 0, 0, 0} }; // blank {25, 0, 0, 0, 0, 0, 0, 0} }; // blank
BW_LED_Number::BW_LED_Number( TQWidget *tqparent, const char *name ) BW_LED_Number::BW_LED_Number( TQWidget *parent, const char *name )
: TQFrame( tqparent, name ){ : TQFrame( parent, name ){
offcolor = TQColor(100,0,0); offcolor = TQColor(100,0,0);

@ -24,7 +24,7 @@ class BW_LED_Number : public TQFrame
public: public:
BW_LED_Number( TQWidget *tqparent=0, const char *name=0 ); BW_LED_Number( TQWidget *parent=0, const char *name=0 );
~BW_LED_Number(); ~BW_LED_Number();
void setSmallLED(bool ); // if you LED is small it might look better void setSmallLED(bool ); // if you LED is small it might look better

@ -33,8 +33,8 @@ struct mytoc
unsigned absframe; unsigned absframe;
}; };
CDDBDlg::CDDBDlg( TQWidget* tqparent, const char* name ) CDDBDlg::CDDBDlg( TQWidget* parent, const char* name )
: KDialogBase( tqparent, name, false, i18n( "CD Editor" ), : KDialogBase( parent, name, false, i18n( "CD Editor" ),
Ok|Cancel|User1|User2, Ok, true ) Ok|Cancel|User1|User2, Ok, true )
{ {
KGlobal::locale()->insertCatalogue("libkcddb"); KGlobal::locale()->insertCatalogue("libkcddb");

@ -15,7 +15,7 @@ class CDDBDlg : public KDialogBase
TQ_OBJECT TQ_OBJECT
public: public:
CDDBDlg(TQWidget* tqparent, const char* name = 0); CDDBDlg(TQWidget* parent, const char* name = 0);
~CDDBDlg(); ~CDDBDlg();
void setData( void setData(

@ -45,8 +45,8 @@ extern "C" {
class SpecialComboBox : public KComboBox class SpecialComboBox : public KComboBox
{ {
public: public:
SpecialComboBox(TQWidget* tqparent, const char* name) SpecialComboBox(TQWidget* parent, const char* name)
: KComboBox(tqparent, name) : KComboBox(parent, name)
{} {}
// TQComboBox::setCurrentText replaces the current text if // TQComboBox::setCurrentText replaces the current text if
@ -59,14 +59,14 @@ public:
} ; } ;
/* /*
* Constructs a configWidget which is a child of 'tqparent', with the * Constructs a configWidget which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'. * name 'name' and widget flags set to 'f'.
* *
* The dialog will by default be modeless, unless you set 'modal' to * The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog. * TRUE to construct a modal dialog.
*/ */
configWidget::configWidget(KSCD* player, TQWidget* tqparent, const char* name) configWidget::configWidget(KSCD* player, TQWidget* parent, const char* name)
: configWidgetUI(tqparent, name), : configWidgetUI(parent, name),
mPlayer(player) mPlayer(player)
{ {
if (!name) if (!name)

@ -34,7 +34,7 @@ class configWidget : public configWidgetUI
TQ_OBJECT TQ_OBJECT
public: public:
configWidget(KSCD* player, TQWidget* tqparent = 0, const char* name = 0); configWidget(KSCD* player, TQWidget* parent = 0, const char* name = 0);
~configWidget(); ~configWidget();
protected: protected:

@ -38,13 +38,13 @@
#include <kdebug.h> #include <kdebug.h>
DockWidget::DockWidget( KSCD* tqparent, const char *name) DockWidget::DockWidget( KSCD* parent, const char *name)
: KSystemTray( tqparent, name ) : KSystemTray( parent, name )
{ {
m_popup = 0; m_popup = 0;
setPixmap( loadIcon("cdsmall") ); setPixmap( loadIcon("cdsmall") );
KActionCollection* actionCollection = tqparent->actionCollection(); KActionCollection* actionCollection = parent->actionCollection();
m_backAction = actionCollection->action("Previous"); m_backAction = actionCollection->action("Previous");
m_forwardAction = actionCollection->action("Next"); m_forwardAction = actionCollection->action("Next");
m_backPix = loadIcon("player_start"); m_backPix = loadIcon("player_start");
@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* tqparent, const char *name)
// popup menu for right mouse button // popup menu for right mouse button
TQPopupMenu* popup = contextMenu(); TQPopupMenu* popup = contextMenu();
popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), tqparent, TQT_SLOT(playClicked())); popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked()));
popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), tqparent, TQT_SLOT(stopClicked())); popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked()));
popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), tqparent, TQT_SLOT(nextClicked())); popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked()));
popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), tqparent, TQT_SLOT(prevClicked())); popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked()));
popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), tqparent, TQT_SLOT(ejectClicked())); popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked()));
TQToolTip::add(this, kapp->aboutData()->programName()); TQToolTip::add(this, kapp->aboutData()->programName());
} }
@ -123,7 +123,7 @@ void DockWidget::wheelEvent(TQWheelEvent *e)
if (e->orientation() ==Qt::Horizontal) if (e->orientation() ==Qt::Horizontal)
return; return;
KSCD* kscd = dynamic_cast<KSCD*>(tqparent()); KSCD* kscd = dynamic_cast<KSCD*>(parent());
if (kscd == 0) if (kscd == 0)
return; return;

@ -49,7 +49,7 @@ class DockWidget : public KSystemTray
TQ_OBJECT TQ_OBJECT
public: public:
DockWidget( KSCD* tqparent, const char *name=0); DockWidget( KSCD* parent, const char *name=0);
~DockWidget(); ~DockWidget();
public slots: public slots:

@ -89,9 +89,9 @@ bool stoppedByUser = false;
The GUI part The GUI part
*****************************************************************************/ *****************************************************************************/
KSCD::KSCD( TQWidget *tqparent, const char *name ) KSCD::KSCD( TQWidget *parent, const char *name )
: DCOPObject("CDPlayer"), : DCOPObject("CDPlayer"),
kscdPanelDlg( tqparent, name, TQt::WDestructiveClose ), kscdPanelDlg( parent, name, TQt::WDestructiveClose ),
configDialog(0L), configDialog(0L),
cddialog(0L), //!!!! cddialog(0L), //!!!!
jumpToTrack(0L), jumpToTrack(0L),

@ -109,7 +109,7 @@ k_dcop:
TQStringList trackList(); TQStringList trackList();
public: public:
KSCD( TQWidget *tqparent = 0, const char *name = 0 ); KSCD( TQWidget *parent = 0, const char *name = 0 );
~KSCD(); ~KSCD();
virtual bool saveState(TQSessionManager& sm); virtual bool saveState(TQSessionManager& sm);

@ -320,9 +320,9 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib
xd->attributes->background_pixel = BlackPixel(xd->display, xd->attributes->background_pixel = BlackPixel(xd->display,
xd->screen); xd->screen);
xd->attributes->border_pixel = BlackPixel(xd->display, xd->screen); xd->attributes->border_pixel = BlackPixel(xd->display, xd->screen);
xd->attributes->event_tqmask = ButtonPressMask | StructureNotifyMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask | KeyReleaseMask; xd->attributes->event_mask = ButtonPressMask | StructureNotifyMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask | KeyReleaseMask;
xd->attributes->override_redirect = False; xd->attributes->override_redirect = False;
xd->attr_tqmask = CWBackPixel | CWBorderPixel | CWEventMask; xd->attr_mask = CWBackPixel | CWBorderPixel | CWEventMask;
xd->classX = InputOutput; xd->classX = InputOutput;
xd->xcolor.n = 0; xd->xcolor.n = 0;
xd->parent_window = RootWindow(xd->display, xd->screen); xd->parent_window = RootWindow(xd->display, xd->screen);
@ -406,7 +406,7 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib
xd->window = XCreateWindow(xd->display, xd->parent_window, xHint, yHint, xd->window = XCreateWindow(xd->display, xd->parent_window, xHint, yHint,
xd->width, xd->height, xd->border_width, xd->width, xd->height, xd->border_width,
vis.depth, xd->classX, xd->visual, vis.depth, xd->classX, xd->visual,
xd->attr_tqmask, xd->attributes); xd->attr_mask, xd->attributes);
if (!xd->fixedcolormap && params->privatecolormap) { if (!xd->fixedcolormap && params->privatecolormap) {
unsigned long pixels[256]; unsigned long pixels[256];
int i; int i;

@ -66,9 +66,9 @@ typedef struct {
int depth; int depth;
unsigned int classX; unsigned int classX;
Visual *visual; Visual *visual;
unsigned long valuetqmask; unsigned long valuemask;
XSetWindowAttributes *attributes; XSetWindowAttributes *attributes;
unsigned long attr_tqmask; unsigned long attr_mask;
XSizeHints sizehints; XSizeHints sizehints;
int screen; int screen;
const char *window_name; const char *window_name;

@ -26,7 +26,7 @@
#include "ledlamp.h" #include "ledlamp.h"
#include "ledlamp.moc" #include "ledlamp.moc"
LedLamp::LedLamp(TQWidget *tqparent, Type t) : TQFrame(tqparent), LedLamp::LedLamp(TQWidget *parent, Type t) : TQFrame(parent),
w( 10 ), h( 7 ), dx( 4 ) w( 10 ), h( 7 ), dx( 4 )
{ {
// Make sure we're in a sane state // Make sure we're in a sane state

@ -34,7 +34,7 @@ public:
enum Type { Rect, Loop }; enum Type { Rect, Loop };
LedLamp(TQWidget *tqparent=0, Type t=Rect); LedLamp(TQWidget *parent=0, Type t=Rect);
enum State { On, Off }; enum State { On, Off };

@ -54,7 +54,7 @@
* a marker into the audio stream; when the audio device driver encounters the * a marker into the audio stream; when the audio device driver encounters the
* marker, it increments a field in a status structure. When we see that * marker, it increments a field in a status structure. When we see that
* field go up, we grab the next status structure from the queue and send it * field go up, we grab the next status structure from the queue and send it
* to the tqparent process. * to the parent process.
* *
* The minimum size of the queue depends on the latency of the audio stream. * The minimum size of the queue depends on the latency of the audio stream.
*/ */
@ -284,7 +284,7 @@ sun_audio_send_status( void )
int qhead; int qhead;
/* /*
* Now send the most current status information to our tqparent. * Now send the most current status information to our parent.
*/ */
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
perror("AUDIO_GETINFO"); perror("AUDIO_GETINFO");

@ -169,7 +169,7 @@ receive_command(struct cdda_device *dev, struct cdda_block* blk)
if (read(0, inbuf, 1) <= 0) { if (read(0, inbuf, 1) <= 0) {
wmcdda_close(dev); wmcdda_close(dev);
oops->wmaudio_close(); oops->wmaudio_close();
/* ERRORLOG("cddaslave: tqparent died, exit\n");*/ /* ERRORLOG("cddaslave: parent died, exit\n");*/
exit(0); exit(0);
} }

@ -57,7 +57,7 @@ static char plat_linux_audio_id[] = "$Id$";
* a marker into the audio stream; when the audio device driver encounters the * a marker into the audio stream; when the audio device driver encounters the
* marker, it increments a field in a status structure. When we see that * marker, it increments a field in a status structure. When we see that
* field go up, we grab the next status structure from the queue and send it * field go up, we grab the next status structure from the queue and send it
* to the tqparent process. * to the parent process.
* *
* The minimum size of the queue depends on the latency of the audio stream. * The minimum size of the queue depends on the latency of the audio stream.
*/ */
@ -275,7 +275,7 @@ wmaudio_send_status( void )
int qhead; int qhead;
/* /*
* Now send the most current status information to our tqparent. * Now send the most current status information to our parent.
*/ */
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
perror("AUDIO_GETINFO"); perror("AUDIO_GETINFO");

@ -111,7 +111,7 @@ sigthawinit( void )
struct sigaction sa; struct sigaction sa;
sa.sa_handler = thawme; sa.sa_handler = thawme;
sigemptyset(&sa.sa_tqmask); sigemptyset(&sa.sa_mask);
sa.sa_flags = 0; sa.sa_flags = 0;
sigaction(SIGTHAW, &sa, NULL); sigaction(SIGTHAW, &sa, NULL);
@ -400,7 +400,7 @@ gen_get_drive_status( struct wm_drive *d,
* Now install the no-op signal handler. * Now install the no-op signal handler.
*/ */
new_sig.sa_handler = do_nothing; new_sig.sa_handler = do_nothing;
memset(&new_sig.sa_tqmask, 0, sizeof(new_sig.sa_tqmask)); memset(&new_sig.sa_mask, 0, sizeof(new_sig.sa_mask));
new_sig.sa_flags = 0; new_sig.sa_flags = 0;
if (sigaction(SIGALRM, &new_sig, &old_sig)) if (sigaction(SIGALRM, &new_sig, &old_sig))
perror("sigaction"); perror("sigaction");

@ -59,7 +59,7 @@ static char plat_sun_audio_id[] = "$Id$";
* a marker into the audio stream; when the audio device driver encounters the * a marker into the audio stream; when the audio device driver encounters the
* marker, it increments a field in a status structure. When we see that * marker, it increments a field in a status structure. When we see that
* field go up, we grab the next status structure from the queue and send it * field go up, we grab the next status structure from the queue and send it
* to the tqparent process. * to the parent process.
* *
* The minimum size of the queue depends on the latency of the audio stream. * The minimum size of the queue depends on the latency of the audio stream.
*/ */
@ -279,7 +279,7 @@ wmaudio_send_status( void )
int qhead; int qhead;
/* /*
* Now send the most current status information to our tqparent. * Now send the most current status information to our parent.
*/ */
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
perror("AUDIO_GETINFO"); perror("AUDIO_GETINFO");

@ -28,9 +28,9 @@
namespace KCDDB namespace KCDDB
{ {
CDInfoEncodingWidget::CDInfoEncodingWidget(TQWidget* tqparent, const TQString& artist, CDInfoEncodingWidget::CDInfoEncodingWidget(TQWidget* parent, const TQString& artist,
const TQString& title, const TQStringList& songTitles) const TQString& title, const TQStringList& songTitles)
: CDInfoEncodingWidgetBase(tqparent), m_artist(artist), m_title(title), : CDInfoEncodingWidgetBase(parent), m_artist(artist), m_title(title),
m_songTitles(songTitles) m_songTitles(songTitles)
{ {
encodingCombo->insertStringList(KGlobal::charsets()->descriptiveEncodingNames()); encodingCombo->insertStringList(KGlobal::charsets()->descriptiveEncodingNames());

@ -29,7 +29,7 @@ namespace KCDDB
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
CDInfoEncodingWidget(TQWidget* tqparent, const TQString& artist, const TQString& title, CDInfoEncodingWidget(TQWidget* parent, const TQString& artist, const TQString& title,
const TQStringList& songTitles); const TQStringList& songTitles);
TQString selectedEncoding(); TQString selectedEncoding();

@ -38,8 +38,8 @@
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
CDDBConfigWidget::CDDBConfigWidget(TQWidget * tqparent, const char * name) CDDBConfigWidget::CDDBConfigWidget(TQWidget * parent, const char * name)
: CDDBConfigWidgetBase(tqparent, name) : CDDBConfigWidgetBase(parent, name)
{ {
// Connections from widgets are made in designer. // Connections from widgets are made in designer.

@ -31,7 +31,7 @@ class CDDBConfigWidget : public CDDBConfigWidgetBase
public: public:
CDDBConfigWidget(TQWidget * tqparent = 0, const char * name = 0); CDDBConfigWidget(TQWidget * parent = 0, const char * name = 0);
protected slots: protected slots:

@ -45,8 +45,8 @@
typedef KGenericFactory<CDDBModule, TQWidget> KCDDBFactory; typedef KGenericFactory<CDDBModule, TQWidget> KCDDBFactory;
K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) ) K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) )
CDDBModule::CDDBModule(TQWidget *tqparent, const char *name, const TQStringList &) CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(tqparent, name) : KCModule(parent, name)
{ {
KGlobal::locale()->insertCatalogue("libkcddb"); KGlobal::locale()->insertCatalogue("libkcddb");
setButtons(Default | Apply); setButtons(Default | Apply);

@ -34,7 +34,7 @@ class CDDBModule : public KCModule
public: public:
CDDBModule(TQWidget * tqparent, const char *name, const TQStringList &); CDDBModule(TQWidget * parent, const char *name, const TQStringList &);
public slots: public slots:

@ -186,7 +186,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){
return "already output file selected"; return "already output file selected";
} }
yafOutput->setStreamFile(args); yafOutput->setStreamFile(args);
// now we have set the fifo. But we must say the tqparent // now we have set the fifo. But we must say the parent
// process that we start with waiting // process that we start with waiting
cout << "Command:0 Msg:fileopen before"<<endl; cout << "Command:0 Msg:fileopen before"<<endl;

@ -647,7 +647,7 @@ void DecoderClass::ParseReconBlock(int& n,int& mb_intra,
* flush_bitsX <--> flushed += X; * flush_bitsX <--> flushed += X;
* next16bits &= bitMask[flushed]; * next16bits &= bitMask[flushed];
* *
* I've streamlined the code a lot, so that we don't have to tqmask * I've streamlined the code a lot, so that we don't have to mask
* out the low order bits and a few of the extra adds are removed. * out the low order bits and a few of the extra adds are removed.
* bsmith * bsmith
*/ */

@ -329,7 +329,7 @@ int MacroBlock::reconstruct(int& recon_right_for,
int& mb_motion_forw, int& mb_motion_forw,
int& mb_motion_back, int& mb_motion_back,
PictureArray* pictureArray) { PictureArray* pictureArray) {
int tqmask, i; int mask, i;
int zero_block_flag; int zero_block_flag;
int mb_row; int mb_row;
int mb_col; int mb_col;
@ -364,11 +364,11 @@ int MacroBlock::reconstruct(int& recon_right_for,
copyFunctions->startNOFloatSection(); copyFunctions->startNOFloatSection();
for (tqmask = 32, i = 0; i < 6; tqmask >>= 1, i++) { for (mask = 32, i = 0; i < 6; mask >>= 1, i++) {
/* If block exists... */ /* If block exists... */
if ((mb_intra) || (cbp & tqmask)) { if ((mb_intra) || (cbp & mask)) {
zero_block_flag = 0; zero_block_flag = 0;
//copyFunctions->endNOFloatSection(); //copyFunctions->endNOFloatSection();
decoderClass->ParseReconBlock(i,mb_intra, decoderClass->ParseReconBlock(i,mb_intra,

@ -89,7 +89,7 @@ int MpegExtension::processExtra_bit_info(MpegVideoStream* mpegVideoStream) {
int MpegExtension::next_bits(int num,unsigned int tqmask, int MpegExtension::next_bits(int num,unsigned int mask,
MpegVideoStream* input) { MpegVideoStream* input) {
unsigned int data; unsigned int data;
@ -97,11 +97,11 @@ int MpegExtension::next_bits(int num,unsigned int tqmask,
data=input->showBits(num); data=input->showBits(num);
/* Compare bit stream and tqmask. Set return value toTRUE if equal, FALSE if /* Compare bit stream and mask. Set return value toTRUE if equal, FALSE if
differs. differs.
*/ */
if (tqmask == data) { if (mask == data) {
return true; return true;
} }
return false; return false;

@ -43,7 +43,7 @@ class MpegExtension {
private: private:
char* get_extra_bit_info(MpegVideoStream* mpegVideoStream); char* get_extra_bit_info(MpegVideoStream* mpegVideoStream);
int next_bits(int num,unsigned int tqmask,MpegVideoStream* input); int next_bits(int num,unsigned int mask,MpegVideoStream* input);
}; };
#endif #endif

@ -53,10 +53,10 @@ class MpegVideoBitWindow {
inline unsigned int showBits(int bits) { inline unsigned int showBits(int bits) {
unsigned int tqmask=nBitMask[bits]; unsigned int mask=nBitMask[bits];
int shift=32-(bits); int shift=32-(bits);
int bO; int bO;
shift=(curBits & tqmask)>>shift; shift=(curBits & mask)>>shift;
bO = bit_offset + bits; bO = bit_offset + bits;
if (bO > 32) { if (bO > 32) {
return (shift | (*(buffer+1)>>(64-bO))); return (shift | (*(buffer+1)>>(64-bO)));

@ -198,7 +198,7 @@ int OutputStream::getFrameusec() {
int OutputStream::waitStreamState(int method,int tqmask,int streamType) { int OutputStream::waitStreamState(int method,int mask,int streamType) {
int* waitState=NULL; int* waitState=NULL;
switch(streamType) { switch(streamType) {
@ -216,9 +216,9 @@ int OutputStream::waitStreamState(int method,int tqmask,int streamType) {
if (method == _OUTPUT_WAIT_METHOD_BLOCK) { if (method == _OUTPUT_WAIT_METHOD_BLOCK) {
abs_thread_mutex_lock(&stateChangeMut); abs_thread_mutex_lock(&stateChangeMut);
while ((*waitState &= tqmask)==0) { while ((*waitState &= mask)==0) {
cout << "waitStreamState:"<<waitState<<endl; cout << "waitStreamState:"<<waitState<<endl;
cout << "tqmask:"<<tqmask<<endl; cout << "mask:"<<mask<<endl;
abs_thread_cond_wait(&stateChangeCond,&stateChangeMut); abs_thread_cond_wait(&stateChangeCond,&stateChangeMut);
} }
abs_thread_mutex_unlock(&stateChangeMut); abs_thread_mutex_unlock(&stateChangeMut);

@ -105,10 +105,10 @@ class KDE_EXPORT OutputStream {
// stream State handling // stream State handling
// we return the tqmask which triggerd (by "AND") // we return the mask which triggerd (by "AND")
// or the current polled tqmask when method is POLL // or the current polled mask when method is POLL
// Note: you can only wait for "true" signals // Note: you can only wait for "true" signals
virtual int waitStreamState(int method,int tqmask,int streamType); virtual int waitStreamState(int method,int mask,int streamType);

@ -116,7 +116,7 @@ int MpegAudioHeader::parseHeader(unsigned char* buf){
inputstereo= (mode==_MODE_SINGLE)?0:1; inputstereo= (mode==_MODE_SINGLE)?0:1;
// //
// frequency can be 0,1 or 2 but the tqmask above allows 3 as well // frequency can be 0,1 or 2 but the mask above allows 3 as well
// check now. // check now.
if (frequency > 2) { if (frequency > 2) {
DEBUG_HEADER(cout << "frequency value out of range"<<endl;) DEBUG_HEADER(cout << "frequency value out of range"<<endl;)

@ -131,9 +131,9 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask,
unsigned int greenMask, unsigned int greenMask,
unsigned int blueMask) { unsigned int blueMask) {
unsigned PIXVAL red_tqmask = redMask; unsigned PIXVAL red_mask = redMask;
unsigned PIXVAL green_tqmask =greenMask; unsigned PIXVAL green_mask =greenMask;
unsigned PIXVAL blue_tqmask = blueMask; unsigned PIXVAL blue_mask = blueMask;
int CR, CB, i; int CR, CB, i;
@ -197,12 +197,12 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask,
* Set up entries 0-255 in rgb-to-pixel value tables. * Set up entries 0-255 in rgb-to-pixel value tables.
*/ */
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_tqmask)); r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_mask));
r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_tqmask); r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_mask);
g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_tqmask)); g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_mask));
g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_tqmask); g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_mask);
b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_tqmask)); b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_mask));
b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_tqmask); b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_mask);
/* /*
* If we have 16-bit output depth, then we double the value * If we have 16-bit output depth, then we double the value
* in the top word. This means that we can write out both * in the top word. This means that we can write out both

@ -26,8 +26,8 @@ static unsigned short MMX16_Vredcoeff[] = {0x66, 0x66, 0x66, 0x66};
static unsigned short MMX16_Ugrncoeff[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8}; static unsigned short MMX16_Ugrncoeff[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
static unsigned short MMX16_Vgrncoeff[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; static unsigned short MMX16_Vgrncoeff[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
static unsigned short MMX16_Ycoeff[] = {0x4a, 0x4a, 0x4a, 0x4a}; static unsigned short MMX16_Ycoeff[] = {0x4a, 0x4a, 0x4a, 0x4a};
static unsigned short MMX16_redtqmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; static unsigned short MMX16_redmask[] = {0xf800, 0xf800, 0xf800, 0xf800};
static unsigned short MMX16_grntqmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; static unsigned short MMX16_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0};
void dummy_dithermmx16() { void dummy_dithermmx16() {
cout << "MMX16_0"<<MMX16_0<<endl; cout << "MMX16_0"<<MMX16_0<<endl;
@ -38,8 +38,8 @@ void dummy_dithermmx16() {
cout << "MMX16_Ugrncoeff:"<<MMX16_Ugrncoeff<<endl; cout << "MMX16_Ugrncoeff:"<<MMX16_Ugrncoeff<<endl;
cout << "MMX16_Vgrncoeff:"<<MMX16_Vgrncoeff<<endl; cout << "MMX16_Vgrncoeff:"<<MMX16_Vgrncoeff<<endl;
cout << "MMX16_Ycoeff:"<<MMX16_Ycoeff<<endl; cout << "MMX16_Ycoeff:"<<MMX16_Ycoeff<<endl;
cout << "MMX16_redtqmask:"<<MMX16_redtqmask<<endl; cout << "MMX16_redmask:"<<MMX16_redmask<<endl;
cout << "MMX16_grntqmask:"<<MMX16_grntqmask<<endl; cout << "MMX16_grnmask:"<<MMX16_grnmask<<endl;
cout << "MMX16_00FFw:"<<MMX16_00FFw<<endl; cout << "MMX16_00FFw:"<<MMX16_00FFw<<endl;
} }
@ -114,11 +114,11 @@ void ditherBlock(unsigned char *lum,
"punpcklbw %%mm4, %%mm4\n" "punpcklbw %%mm4, %%mm4\n"
"punpcklbw %%mm5, %%mm5\n" "punpcklbw %%mm5, %%mm5\n"
"pand MMX16_redtqmask, %%mm4\n" "pand MMX16_redmask, %%mm4\n"
"psllw $3, %%mm5\n" // GREEN 1 "psllw $3, %%mm5\n" // GREEN 1
"punpcklbw %%mm6, %%mm6\n" "punpcklbw %%mm6, %%mm6\n"
"pand MMX16_grntqmask, %%mm5\n" "pand MMX16_grnmask, %%mm5\n"
"pand MMX16_redtqmask, %%mm6\n" "pand MMX16_redmask, %%mm6\n"
"por %%mm5, %%mm4\n" // "por %%mm5, %%mm4\n" //
"psrlw $11, %%mm6\n" // BLUE 1 "psrlw $11, %%mm6\n" // BLUE 1
"movq %%mm3, %%mm5\n" // lum2 "movq %%mm3, %%mm5\n" // lum2
@ -145,10 +145,10 @@ void ditherBlock(unsigned char *lum,
"pmullw MMX16_Ycoeff, %%mm6\n" // lum3 "pmullw MMX16_Ycoeff, %%mm6\n" // lum3
"punpcklbw %%mm7, %%mm7\n" "punpcklbw %%mm7, %%mm7\n"
"psllw $3, %%mm5\n" // GREEN 2 "psllw $3, %%mm5\n" // GREEN 2
"pand MMX16_redtqmask, %%mm7\n" "pand MMX16_redmask, %%mm7\n"
"pand MMX16_redtqmask, %%mm3\n" "pand MMX16_redmask, %%mm3\n"
"psrlw $11, %%mm7\n" // BLUE 2 "psrlw $11, %%mm7\n" // BLUE 2
"pand MMX16_grntqmask, %%mm5\n" "pand MMX16_grnmask, %%mm5\n"
"por %%mm7, %%mm3\n" "por %%mm7, %%mm3\n"
"movq (%2), %%mm7\n" // L4 load lum2 "movq (%2), %%mm7\n" // L4 load lum2
@ -186,11 +186,11 @@ void ditherBlock(unsigned char *lum,
"punpcklbw %%mm5, %%mm5\n" "punpcklbw %%mm5, %%mm5\n"
"punpcklbw %%mm6, %%mm6\n" "punpcklbw %%mm6, %%mm6\n"
"psllw $3, %%mm5\n" // GREEN 3 "psllw $3, %%mm5\n" // GREEN 3
"pand MMX16_redtqmask, %%mm4\n" "pand MMX16_redmask, %%mm4\n"
"psraw $6, %%mm3\n" // psr 6 "psraw $6, %%mm3\n" // psr 6
"psraw $6, %%mm0\n" "psraw $6, %%mm0\n"
"pand MMX16_redtqmask, %%mm6\n" // BLUE "pand MMX16_redmask, %%mm6\n" // BLUE
"pand MMX16_grntqmask, %%mm5\n" "pand MMX16_grnmask, %%mm5\n"
"psrlw $11, %%mm6\n" // BLUE 3 "psrlw $11, %%mm6\n" // BLUE 3
"por %%mm5, %%mm4\n" "por %%mm5, %%mm4\n"
"psraw $6, %%mm7\n" "psraw $6, %%mm7\n"
@ -201,11 +201,11 @@ void ditherBlock(unsigned char *lum,
"punpcklbw %%mm3, %%mm3\n" "punpcklbw %%mm3, %%mm3\n"
"punpcklbw %%mm0, %%mm0\n" "punpcklbw %%mm0, %%mm0\n"
"punpcklbw %%mm7, %%mm7\n" "punpcklbw %%mm7, %%mm7\n"
"pand MMX16_redtqmask, %%mm3\n" "pand MMX16_redmask, %%mm3\n"
"pand MMX16_redtqmask, %%mm7\n" // BLUE "pand MMX16_redmask, %%mm7\n" // BLUE
"psllw $3, %%mm0\n" // GREEN 4 "psllw $3, %%mm0\n" // GREEN 4
"psrlw $11, %%mm7\n" "psrlw $11, %%mm7\n"
"pand MMX16_grntqmask, %%mm0\n" "pand MMX16_grnmask, %%mm0\n"
"por %%mm7, %%mm3\n" "por %%mm7, %%mm3\n"
"por %%mm0, %%mm3\n" "por %%mm0, %%mm3\n"

@ -128,7 +128,7 @@ void CreateFullColorWindow (XWindow* xwindow) {
int depth; int depth;
Visual *visual; Visual *visual;
XSetWindowAttributes xswa; XSetWindowAttributes xswa;
unsigned long tqmask; unsigned long mask;
unsigned int c_class; unsigned int c_class;
int screen; int screen;
Display *dpy=xwindow->display; Display *dpy=xwindow->display;
@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) {
cout << "visual is null"<<endl; cout << "visual is null"<<endl;
return; return;
} }
tqmask = CWBackPixel | CWColormap | CWBorderPixel; mask = CWBackPixel | CWColormap | CWBorderPixel;
if (xwindow->colormap==0) { if (xwindow->colormap==0) {
xswa.colormap = XCreateColormap(dpy, xswa.colormap = XCreateColormap(dpy,
XRootWindow(dpy, screen), XRootWindow(dpy, screen),
@ -166,7 +166,7 @@ void CreateFullColorWindow (XWindow* xwindow) {
/* /*
xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h, xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h,
(unsigned int) 1, depth, c_class, (unsigned int) 1, depth, c_class,
visual, tqmask, &xswa); visual, mask, &xswa);
*/ */
} }

@ -95,7 +95,7 @@ void buffer_loop(struct audio_info_struct *ai, sigset_t *oldsigset)
catchsignal (SIGINT, catch_interrupt); catchsignal (SIGINT, catch_interrupt);
catchsignal (SIGUSR1, catch_usr1); catchsignal (SIGUSR1, catch_usr1);
sigproctqmask (SIG_SETMASK, oldsigset, NULL); sigprocmask (SIG_SETMASK, oldsigset, NULL);
#ifndef NO_DECODE_AUDIO #ifndef NO_DECODE_AUDIO
if (param.outmode == DECODE_AUDIO) { if (param.outmode == DECODE_AUDIO) {
if (audio_open(ai) < 0) { if (audio_open(ai) < 0) {

@ -114,7 +114,7 @@ void (*catchsignal(int signum, void(*handler)()))()
#endif #endif
new_sa.sa_handler = handler; new_sa.sa_handler = handler;
sigemptyset(&new_sa.sa_tqmask); sigemptyset(&new_sa.sa_mask);
new_sa.sa_flags = 0; new_sa.sa_flags = 0;
if (sigaction(signum, &new_sa, &old_sa) == -1) if (sigaction(signum, &new_sa, &old_sa) == -1)
return ((void (*)()) -1); return ((void (*)()) -1);

@ -612,7 +612,7 @@ static int pretab2[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
#define BITSHIFT ((sizeof(long)-1)*8) #define BITSHIFT ((sizeof(long)-1)*8)
#define REFRESH_MASK \ #define REFRESH_MASK \
while(num < BITSHIFT) { \ while(num < BITSHIFT) { \
tqmask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \ mask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \
num += 8; \ num += 8; \
part2remain -= 8; } part2remain -= 8; }
@ -626,10 +626,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
int *me; int *me;
int num=getbitoffset(&bsi); int num=getbitoffset(&bsi);
long tqmask; long mask;
/* we must split this, because for num==0 the shift is undefined if you do it in one step */ /* we must split this, because for num==0 the shift is undefined if you do it in one step */
tqmask = ((unsigned long) getbits(&bsi,num))<<BITSHIFT; mask = ((unsigned long) getbits(&bsi,num))<<BITSHIFT;
tqmask <<= 8-num; mask <<= 8-num;
part2remain -= num; part2remain -= num;
{ {
@ -702,10 +702,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
register short *val = h->table; register short *val = h->table;
REFRESH_MASK; REFRESH_MASK;
while((y=*val++)<0) { while((y=*val++)<0) {
if (tqmask < 0) if (mask < 0)
val -= y; val -= y;
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
x = y >> 4; x = y >> 4;
y &= 0xf; y &= 0xf;
@ -713,23 +713,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
if(x == 15 && h->linbits) { if(x == 15 && h->linbits) {
max[lwin] = cb; max[lwin] = cb;
REFRESH_MASK; REFRESH_MASK;
x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
num -= h->linbits+1; num -= h->linbits+1;
tqmask <<= h->linbits; mask <<= h->linbits;
if(tqmask < 0) if(mask < 0)
*xrpnt = REAL_MUL(-ispow[x], v); *xrpnt = REAL_MUL(-ispow[x], v);
else else
*xrpnt = REAL_MUL(ispow[x], v); *xrpnt = REAL_MUL(ispow[x], v);
tqmask <<= 1; mask <<= 1;
} }
else if(x) { else if(x) {
max[lwin] = cb; max[lwin] = cb;
if(tqmask < 0) if(mask < 0)
*xrpnt = REAL_MUL(-ispow[x], v); *xrpnt = REAL_MUL(-ispow[x], v);
else else
*xrpnt = REAL_MUL(ispow[x], v); *xrpnt = REAL_MUL(ispow[x], v);
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
else else
*xrpnt = DOUBLE_TO_REAL(0.0); *xrpnt = DOUBLE_TO_REAL(0.0);
@ -737,23 +737,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
if(y == 15 && h->linbits) { if(y == 15 && h->linbits) {
max[lwin] = cb; max[lwin] = cb;
REFRESH_MASK; REFRESH_MASK;
y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
num -= h->linbits+1; num -= h->linbits+1;
tqmask <<= h->linbits; mask <<= h->linbits;
if(tqmask < 0) if(mask < 0)
*xrpnt = REAL_MUL(-ispow[y], v); *xrpnt = REAL_MUL(-ispow[y], v);
else else
*xrpnt = REAL_MUL(ispow[y], v); *xrpnt = REAL_MUL(ispow[y], v);
tqmask <<= 1; mask <<= 1;
} }
else if(y) { else if(y) {
max[lwin] = cb; max[lwin] = cb;
if(tqmask < 0) if(mask < 0)
*xrpnt = REAL_MUL(-ispow[y], v); *xrpnt = REAL_MUL(-ispow[y], v);
else else
*xrpnt = REAL_MUL(ispow[y], v); *xrpnt = REAL_MUL(ispow[y], v);
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
else else
*xrpnt = DOUBLE_TO_REAL(0.0); *xrpnt = DOUBLE_TO_REAL(0.0);
@ -767,10 +767,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
REFRESH_MASK; REFRESH_MASK;
while((a=*val++)<0) { while((a=*val++)<0) {
if (tqmask < 0) if (mask < 0)
val -= a; val -= a;
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
if(part2remain+num <= 0) { if(part2remain+num <= 0) {
num -= part2remain+num; num -= part2remain+num;
@ -800,12 +800,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
if(part2remain+num <= 0) { if(part2remain+num <= 0) {
break; break;
} }
if(tqmask < 0) if(mask < 0)
*xrpnt = -v; *xrpnt = -v;
else else
*xrpnt = v; *xrpnt = v;
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
else else
*xrpnt = DOUBLE_TO_REAL(0.0); *xrpnt = DOUBLE_TO_REAL(0.0);
@ -879,10 +879,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
register short *val = h->table; register short *val = h->table;
REFRESH_MASK; REFRESH_MASK;
while((y=*val++)<0) { while((y=*val++)<0) {
if (tqmask < 0) if (mask < 0)
val -= y; val -= y;
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
x = y >> 4; x = y >> 4;
y &= 0xf; y &= 0xf;
@ -891,23 +891,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
if (x == 15 && h->linbits) { if (x == 15 && h->linbits) {
max = cb; max = cb;
REFRESH_MASK; REFRESH_MASK;
x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
num -= h->linbits+1; num -= h->linbits+1;
tqmask <<= h->linbits; mask <<= h->linbits;
if(tqmask < 0) if(mask < 0)
*xrpnt++ = REAL_MUL(-ispow[x], v); *xrpnt++ = REAL_MUL(-ispow[x], v);
else else
*xrpnt++ = REAL_MUL(ispow[x], v); *xrpnt++ = REAL_MUL(ispow[x], v);
tqmask <<= 1; mask <<= 1;
} }
else if(x) { else if(x) {
max = cb; max = cb;
if(tqmask < 0) if(mask < 0)
*xrpnt++ = REAL_MUL(-ispow[x], v); *xrpnt++ = REAL_MUL(-ispow[x], v);
else else
*xrpnt++ = REAL_MUL(ispow[x], v); *xrpnt++ = REAL_MUL(ispow[x], v);
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
else else
*xrpnt++ = DOUBLE_TO_REAL(0.0); *xrpnt++ = DOUBLE_TO_REAL(0.0);
@ -915,23 +915,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
if (y == 15 && h->linbits) { if (y == 15 && h->linbits) {
max = cb; max = cb;
REFRESH_MASK; REFRESH_MASK;
y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
num -= h->linbits+1; num -= h->linbits+1;
tqmask <<= h->linbits; mask <<= h->linbits;
if(tqmask < 0) if(mask < 0)
*xrpnt++ = REAL_MUL(-ispow[y], v); *xrpnt++ = REAL_MUL(-ispow[y], v);
else else
*xrpnt++ = REAL_MUL(ispow[y], v); *xrpnt++ = REAL_MUL(ispow[y], v);
tqmask <<= 1; mask <<= 1;
} }
else if(y) { else if(y) {
max = cb; max = cb;
if(tqmask < 0) if(mask < 0)
*xrpnt++ = REAL_MUL(-ispow[y], v); *xrpnt++ = REAL_MUL(-ispow[y], v);
else else
*xrpnt++ = REAL_MUL(ispow[y], v); *xrpnt++ = REAL_MUL(ispow[y], v);
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
else else
*xrpnt++ = DOUBLE_TO_REAL(0.0); *xrpnt++ = DOUBLE_TO_REAL(0.0);
@ -947,10 +947,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
REFRESH_MASK; REFRESH_MASK;
while((a=*val++)<0) { while((a=*val++)<0) {
if (tqmask < 0) if (mask < 0)
val -= a; val -= a;
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
if(part2remain+num <= 0) { if(part2remain+num <= 0) {
num -= part2remain+num; num -= part2remain+num;
@ -978,12 +978,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
if(part2remain+num <= 0) { if(part2remain+num <= 0) {
break; break;
} }
if(tqmask < 0) if(mask < 0)
*xrpnt++ = -v; *xrpnt++ = -v;
else else
*xrpnt++ = v; *xrpnt++ = v;
num--; num--;
tqmask <<= 1; mask <<= 1;
} }
else else
*xrpnt++ = DOUBLE_TO_REAL(0.0); *xrpnt++ = DOUBLE_TO_REAL(0.0);

@ -6,7 +6,7 @@
* *
* This is a stand-alone module which implements a unidirectional, * This is a stand-alone module which implements a unidirectional,
* fast pipe using mmap(). Its primary use is to transfer large * fast pipe using mmap(). Its primary use is to transfer large
* amounts of data from a tqparent process to its child process, * amounts of data from a parent process to its child process,
* with a buffer in between which decouples blocking conditions * with a buffer in between which decouples blocking conditions
* on both sides. Control information is transferred between the * on both sides. Control information is transferred between the
* processes through a socketpair. See xftest.c for an example on * processes through a socketpair. See xftest.c for an example on

@ -28,8 +28,8 @@
* General options * General options
*****************************************************************/ *****************************************************************/
General::General(TQObject *tqparent) General::General(TQObject *parent)
: CModule(i18n("General"), i18n("General Options"), "configure", tqparent) : CModule(i18n("General"), i18n("General Options"), "configure", parent)
{ {
mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this); mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this);
mLoopList->setChecked(napp->loopList()); mLoopList->setChecked(napp->loopList());

@ -24,7 +24,7 @@ class General : public CModule
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
General(TQObject *tqparent=0); General(TQObject *parent=0);
virtual void save(); virtual void save();
private slots: private slots:

@ -1,14 +1,14 @@
#include <noatun/controls.h> #include <noatun/controls.h>
L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : L33tSlider::L33tSlider(TQWidget * parent, const char * name) :
TQSlider(tqparent,name), pressed(false) TQSlider(parent,name), pressed(false)
{} {}
L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) :
TQSlider(o,tqparent,name), pressed(false) TQSlider(o,parent,name), pressed(false)
{} {}
L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value,
Qt::Orientation o, TQWidget * tqparent, const char * name) : Qt::Orientation o, TQWidget * parent, const char * name) :
TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false)
{} {}
bool L33tSlider::currentlyPressed() const bool L33tSlider::currentlyPressed() const
@ -52,8 +52,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e)
SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
const char *member, TQObject* tqparent, const char* name ) const char *member, TQObject* parent, const char* name )
: KAction( text, accel, tqparent, name ) : KAction( text, accel, parent, name )
{ {
m_receiver = receiver; m_receiver = receiver;
m_member = member; m_member = member;

@ -65,8 +65,8 @@ void DownloadItem::dequeue()
Downloader::Downloader(TQObject *tqparent) Downloader::Downloader(TQObject *parent)
: TQObject(tqparent), localfile(0), current(0), mJob(0), mTimeout(0) : TQObject(parent), localfile(0), current(0), mJob(0), mTimeout(0)
{ {
mStarted=false; mStarted=false;
mUnstartedQueue=new TQPtrList<Downloader::QueueItem>; mUnstartedQueue=new TQPtrList<Downloader::QueueItem>;

@ -28,8 +28,8 @@ using namespace Arts;
class EffectConfigWidget : public TQWidget class EffectConfigWidget : public TQWidget
{ {
public: public:
EffectConfigWidget(Effect *e, TQWidget *tqparent=0) EffectConfigWidget(Effect *e, TQWidget *parent=0)
: TQWidget(tqparent), mEf(e) : TQWidget(parent), mEf(e)
{} {}
virtual ~EffectConfigWidget() virtual ~EffectConfigWidget()

@ -44,8 +44,8 @@
class EffectListItem : public TQListViewItem class EffectListItem : public TQListViewItem
{ {
public: public:
EffectListItem(TQListView *tqparent, TQListViewItem *after, Effect *e) EffectListItem(TQListView *parent, TQListViewItem *after, Effect *e)
: TQListViewItem(tqparent, after, e->title()), mEffect(e) : TQListViewItem(parent, after, e->title()), mEffect(e)
{ {
} }
@ -55,8 +55,8 @@ private:
Effect *mEffect; Effect *mEffect;
}; };
EffectList::EffectList(TQWidget *tqparent) EffectList::EffectList(TQWidget *parent)
: KListView(tqparent) : KListView(parent)
{ {
} }
@ -85,9 +85,9 @@ void EffectView::show()
namespace namespace
{ {
TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *tqparent, const char *name = 0) TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *parent, const char *name = 0)
{ {
TQToolButton *button = new TQToolButton(tqparent, name); TQToolButton *button = new TQToolButton(parent, name);
button->setIconSet(iconSet); button->setIconSet(iconSet);
button->setTextLabel(textLabel, true); button->setTextLabel(textLabel, true);
TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot); TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot);

@ -77,7 +77,7 @@ class EffectList : public KListView
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
EffectList(TQWidget *tqparent); EffectList(TQWidget *parent);
virtual bool acceptDrag(TQDropEvent *) const; virtual bool acceptDrag(TQDropEvent *) const;
virtual TQDragObject *dragObject() const; virtual TQDragObject *dragObject() const;
}; };

@ -79,13 +79,13 @@ namespace VolumeControls
else else
{ {
#define ERROR { fd=-1; return; } #define ERROR { fd=-1; return; }
int devtqmask, rectqmask, i_recsrc, stereodevs; int devmask, recmask, i_recsrc, stereodevs;
// Mixer is open. Now define properties // Mixer is open. Now define properties
if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) ERROR
if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) ERROR
if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) ERROR
if (ioctl(fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) ERROR
if (!devtqmask) ERROR if (!devmask) ERROR
#undef ERROR #undef ERROR
} }
@ -248,7 +248,7 @@ Noatun::StereoEffectStack *Engine::globalEffectStack() const { return &d->globa
Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; } Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; }
Noatun::Session *Engine::session() const { return &d->session; } Noatun::Session *Engine::session() const { return &d->session; }
Engine::Engine(TQObject *tqparent) : TQObject(tqparent, "Engine"), mPlay(false) Engine::Engine(TQObject *parent) : TQObject(parent, "Engine"), mPlay(false)
{ {
d=new EnginePrivate; d=new EnginePrivate;
// Connect to aRts // Connect to aRts

@ -30,8 +30,8 @@
//////////////////////////////////////////////// ////////////////////////////////////////////////
// PresetList // PresetList
PresetList::PresetList(TQWidget *tqparent, const char *name) PresetList::PresetList(TQWidget *parent, const char *name)
: KListView(tqparent, name) : KListView(parent, name)
{ {
setItemsRenameable(true); setItemsRenameable(true);
setRenameable(0, true); setRenameable(0, true);
@ -61,8 +61,8 @@ void PresetList::rename(TQListViewItem *item, int c)
//////////////////////////////////////////////// ////////////////////////////////////////////////
// EqualizerLevel // EqualizerLevel
EqualizerLevel::EqualizerLevel(TQWidget *tqparent, VBand band) EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
: TQWidget(tqparent), mBand(band) : TQWidget(parent), mBand(band)
{ {
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, TQVBoxLayout *tqlayout = new TQVBoxLayout(this,
0, 0, "EqualizerLevel::tqlayout"); 0, 0, "EqualizerLevel::tqlayout");

@ -19,7 +19,7 @@ class EqualizerLevel : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
EqualizerLevel(TQWidget *tqparent, VBand band); EqualizerLevel(TQWidget *parent, VBand band);
public slots: public slots:
void changed(); void changed();
@ -39,7 +39,7 @@ class PresetList : public KListView
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
PresetList(TQWidget *tqparent, const char *name=0); PresetList(TQWidget *parent, const char *name=0);
public: public:
void rename(TQListViewItem *item, int c); void rename(TQListViewItem *item, int c);

@ -4,8 +4,8 @@
#include <tqheader.h> #include <tqheader.h>
MimeTypeTree::MimeTypeTree(TQWidget *tqparent) MimeTypeTree::MimeTypeTree(TQWidget *parent)
: KListView(tqparent) : KListView(parent)
{ {
KMimeType::List list=KMimeType::allMimeTypes(); KMimeType::List list=KMimeType::allMimeTypes();
TQDict<TQListViewItem> map; TQDict<TQListViewItem> map;
@ -38,7 +38,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *tqparent)
void MimeTypeTree::sel(TQListViewItem *item) void MimeTypeTree::sel(TQListViewItem *item)
{ {
TQListViewItem *p=item->tqparent(); TQListViewItem *p=item->parent();
if (!p) return; if (!p) return;
TQString major=p->text(0); TQString major=p->text(0);
TQString minor=item->text(0); TQString minor=item->text(0);

@ -21,7 +21,7 @@ class MimeTypeTree : public KListView
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
MimeTypeTree(TQWidget *tqparent); MimeTypeTree(TQWidget *parent);
private: private:
TQListViewItem *addMajor(const TQString &name); TQListViewItem *addMajor(const TQString &name);

@ -25,10 +25,10 @@ class KDE_EXPORT L33tSlider : public TQSlider
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
L33tSlider(TQWidget * tqparent, const char * name=0); L33tSlider(TQWidget * parent, const char * name=0);
L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0);
L33tSlider(int minValue, int maxValue, int pageStep, int value, L33tSlider(int minValue, int maxValue, int pageStep, int value,
Qt::Orientation, TQWidget * tqparent, const char * name=0); Qt::Orientation, TQWidget * parent, const char * name=0);
bool currentlyPressed() const; bool currentlyPressed() const;
signals: signals:
@ -60,7 +60,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
SliderAction(const TQString& text, int accel, const TQObject *receiver, SliderAction(const TQString& text, int accel, const TQObject *receiver,
const char *member, TQObject* tqparent, const char* name ); const char *member, TQObject* parent, const char* name );
virtual int plug( TQWidget *w, int index = -1 ); virtual int plug( TQWidget *w, int index = -1 );
virtual void unplug( TQWidget *w ); virtual void unplug( TQWidget *w );
TQSlider* slider() const { return m_slider; } TQSlider* slider() const { return m_slider; }

@ -75,7 +75,7 @@ Q_OBJECT
}; };
public: public:
Downloader(TQObject *tqparent=0); Downloader(TQObject *parent=0);
virtual ~Downloader(); virtual ~Downloader();
public slots: public slots:

@ -36,7 +36,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
friend class NoatunApp; friend class NoatunApp;
public: public:
Engine(TQObject *tqparent=0); Engine(TQObject *parent=0);
~Engine(); ~Engine();
void setInitialized(); void setInitialized();
bool initialized() const; bool initialized() const;

@ -42,7 +42,7 @@ public:
enum LoopType { None=0, Song, Playlist, Random }; enum LoopType { None=0, Song, Playlist, Random };
public: public:
Player(TQObject *tqparent=0); Player(TQObject *parent=0);
~Player(); ~Player();
/** /**

@ -332,7 +332,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
friend class PlaylistItemData; friend class PlaylistItemData;
public: public:
Playlist(TQObject *tqparent, const char *name); Playlist(TQObject *parent, const char *name);
/** /**
* on playlist unload, your playlist must * on playlist unload, your playlist must
* have current()==0 and emit playCurrent * have current()==0 and emit playCurrent

@ -409,7 +409,7 @@ Q_OBJECT
friend class NoatunListenerNotif; friend class NoatunListenerNotif;
public: public:
NoatunListener(TQObject *tqparent=0); NoatunListener(TQObject *parent=0);
virtual ~NoatunListener(); virtual ~NoatunListener();
signals: signals:
@ -433,7 +433,7 @@ protected:
class ExitNotifier : public NoatunListener class ExitNotifier : public NoatunListener
{ {
public: public:
ExitNotifier(int pid, TQObject *tqparent=0); ExitNotifier(int pid, TQObject *parent=0);
virtual ~ExitNotifier(); virtual ~ExitNotifier();
private: private:
@ -456,7 +456,7 @@ class BoolNotifier : public TQObject
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent=0); BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0);
private slots: private slots:
void event() {*mValue=false;} void event() {*mValue=false;}

@ -64,10 +64,10 @@ public:
* arguments are short and long descriptions * arguments are short and long descriptions
* for this module, respectively * for this module, respectively
* *
* tqparent is the object that is this modules virtual-tqparent. * parent is the object that is this modules virtual-parent.
* When that is deleted, this also will go away, automagically. * When that is deleted, this also will go away, automagically.
**/ **/
CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *tqparent=0); CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=0);
virtual ~CModule(); virtual ~CModule();

@ -34,7 +34,7 @@ class ScrollingLabel : public TQWidget
TQ_OBJECT TQ_OBJECT
public: public:
ScrollingLabel(const TQString &initialText,TQWidget *tqparent, ScrollingLabel(const TQString &initialText,TQWidget *parent,
const char * name = 0); const char * name = 0);
virtual ~ScrollingLabel(); virtual ~ScrollingLabel();

@ -22,7 +22,7 @@ class PlayAction : public KAction
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
PlayAction(TQObject *tqparent, const char *name); PlayAction(TQObject *parent, const char *name);
private slots: private slots:
void playing(); void playing();
void notplaying(); void notplaying();
@ -36,7 +36,7 @@ class PlaylistAction : public KToggleAction
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
PlaylistAction(TQObject *tqparent, const char *name); PlaylistAction(TQObject *parent, const char *name);
private slots: private slots:
void shown(); void shown();
void hidden(); void hidden();
@ -51,7 +51,7 @@ class PluginActionMenu : public KActionMenu
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
PluginActionMenu(TQObject *tqparent, const char *name); PluginActionMenu(TQObject *parent, const char *name);
/** /**
* inserts the given @p action into the action-menu * inserts the given @p action into the action-menu
* @param action the action to insert * @param action the action to insert
@ -85,7 +85,7 @@ class VisActionMenu : public KActionMenu
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
VisActionMenu(TQObject *tqparent, const char *name); VisActionMenu(TQObject *parent, const char *name);
private slots: private slots:
void fillPopup(); void fillPopup();
void toggleVisPlugin(int); void toggleVisPlugin(int);
@ -103,7 +103,7 @@ class LoopActionMenu : public KActionMenu
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
LoopActionMenu(TQObject *tqparent, const char *name); LoopActionMenu(TQObject *parent, const char *name);
private slots: private slots:
void updateLooping(int); void updateLooping(int);
void loopNoneSelected(); void loopNoneSelected();
@ -121,48 +121,48 @@ private:
/** /**
* @return pointer to a KAction which opens the effects dialog on activation * @return pointer to a KAction which opens the effects dialog on activation
*/ */
KDE_EXPORT KAction *effects(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0);
/** /**
* @return pointer to a KAction which opens the equalizer dialog on activation * @return pointer to a KAction which opens the equalizer dialog on activation
*/ */
KDE_EXPORT KAction *equalizer(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0);
/** /**
* @return pointer to a KAction which goes back one track on activation * @return pointer to a KAction which goes back one track on activation
*/ */
KDE_EXPORT KAction *back(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0);
/** /**
* @return pointer to a KAction which stops playback on activation * @return pointer to a KAction which stops playback on activation
*/ */
KDE_EXPORT KAction *stop(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0);
/** /**
* @return pointer to a KAction which starts/pauses playback on activation * @return pointer to a KAction which starts/pauses playback on activation
*/ */
KDE_EXPORT KAction *playpause(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0);
/** /**
* @return pointer to a KAction which advances one track on activation * @return pointer to a KAction which advances one track on activation
*/ */
KDE_EXPORT KAction *forward(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0);
/** /**
* @return pointer to a KToggleAction which shows/hides the playlist * @return pointer to a KToggleAction which shows/hides the playlist
*/ */
KDE_EXPORT KToggleAction *playlist(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0);
/** /**
* loop action * loop action
**/ **/
KDE_EXPORT LoopActionMenu *loop(TQObject *tqparent, const char *name); KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name);
/** /**
* play action * play action
*/ */
KDE_EXPORT KAction *play(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0);
/** /**
* pause action * pause action
*/ */
KDE_EXPORT KAction *pause(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0);
/** /**
* @return pointer to the global PluginActionMenu object (there is only one instance) * @return pointer to the global PluginActionMenu object (there is only one instance)
@ -172,7 +172,7 @@ KDE_EXPORT PluginActionMenu *actions();
/** /**
* @return pointer to a VisActionMenu object * @return pointer to a VisActionMenu object
*/ */
KDE_EXPORT VisActionMenu *visualizations(TQObject *tqparent = 0, const char *name = 0); KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0);
/** /**
* The global popupmenu of noatun, there's not two or three but only one of these :) * The global popupmenu of noatun, there's not two or three but only one of these :)

@ -15,12 +15,12 @@ class StereoButtonAction : public KAction
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
StereoButtonAction(const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 );
StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 );
StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
public slots: public slots:
void disable(void); void disable(void);
void enable(void); void enable(void);

@ -20,8 +20,8 @@ Q_OBJECT
static VideoFrame *whose; static VideoFrame *whose;
public: public:
VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent=0, const char *name=0, WFlags f=0); VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent=0, const char *name=0, WFlags f=0);
VideoFrame(TQWidget *tqparent = 0, const char *name=0, WFlags f=0); VideoFrame(TQWidget *parent = 0, const char *name=0, WFlags f=0);
~VideoFrame(); ~VideoFrame();
/** /**
@ -29,7 +29,7 @@ public:
**/ **/
static VideoFrame *playing(); static VideoFrame *playing();
TQPopupMenu *popupMenu(TQWidget *tqparent); TQPopupMenu *popupMenu(TQWidget *parent);
TQPopupMenu *popupMenu() { return popupMenu(this); } TQPopupMenu *popupMenu() { return popupMenu(this); }
public slots: public slots:

@ -21,8 +21,8 @@
namespace NoatunStdAction namespace NoatunStdAction
{ {
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
PlayAction::PlayAction(TQObject *tqparent, const char *name) PlayAction::PlayAction(TQObject *parent, const char *name)
: KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), tqparent, name) : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name)
{ {
connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing()));
connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying())); connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying()));
@ -46,8 +46,8 @@ void PlayAction::notplaying()
} }
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
PlaylistAction::PlaylistAction(TQObject *tqparent, const char *name) PlaylistAction::PlaylistAction(TQObject *parent, const char *name)
: KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), tqparent, name) : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name)
{ {
setCheckedState(i18n("Hide Playlist")); setCheckedState(i18n("Hide Playlist"));
connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown())); connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown()));
@ -67,8 +67,8 @@ void PlaylistAction::hidden()
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
PluginActionMenu::PluginActionMenu(TQObject *tqparent, const char *name) PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name)
: KActionMenu(i18n("&Actions"), tqparent, name) : KActionMenu(i18n("&Actions"), parent, name)
{ {
// kdDebug(66666) << k_funcinfo << "called" << endl; // kdDebug(66666) << k_funcinfo << "called" << endl;
setEnabled(false); setEnabled(false);
@ -111,8 +111,8 @@ void PluginActionMenu::menuRemove(int id)
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
VisActionMenu::VisActionMenu(TQObject *tqparent, const char *name) VisActionMenu::VisActionMenu(TQObject *parent, const char *name)
: KActionMenu(i18n("&Visualizations"), tqparent, name) : KActionMenu(i18n("&Visualizations"), parent, name)
{ {
connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup())); connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup()));
connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int))); connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int)));
@ -159,8 +159,8 @@ void VisActionMenu::toggleVisPlugin(int id)
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
LoopActionMenu::LoopActionMenu(TQObject *tqparent, const char *name) LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name)
: KActionMenu(i18n("&Loop"), tqparent, name) : KActionMenu(i18n("&Loop"), parent, name)
{ {
mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none"); 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none");
@ -232,29 +232,29 @@ void LoopActionMenu::loopRandomSelected()
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
KAction *playpause(TQObject *tqparent, const char *name) KAction *playpause(TQObject *parent, const char *name)
{ {
return new PlayAction(tqparent, name); return new PlayAction(parent, name);
} }
KAction *effects(TQObject *tqparent, const char *name) KAction *effects(TQObject *parent, const char *name)
{ {
return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), tqparent, name); return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name);
} }
KAction *equalizer(TQObject *tqparent, const char *name) KAction *equalizer(TQObject *parent, const char *name)
{ {
return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), tqparent, name); return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name);
} }
KAction *back(TQObject *tqparent, const char *name) KAction *back(TQObject *parent, const char *name)
{ {
return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), tqparent, name); return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name);
} }
KAction *stop(TQObject *tqparent, const char *name) KAction *stop(TQObject *parent, const char *name)
{ {
StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), tqparent, name); StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
@ -265,14 +265,14 @@ KAction *stop(TQObject *tqparent, const char *name)
return action; return action;
} }
KAction *forward(TQObject *tqparent, const char *name) KAction *forward(TQObject *parent, const char *name)
{ {
return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), tqparent, name); return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name);
} }
KAction *play(TQObject *tqparent, const char *name) KAction *play(TQObject *parent, const char *name)
{ {
StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name); StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable()));
TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable()));
@ -283,9 +283,9 @@ KAction *play(TQObject *tqparent, const char *name)
return action; return action;
} }
KAction *pause(TQObject *tqparent, const char *name) KAction *pause(TQObject *parent, const char *name)
{ {
StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name); StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable()));
TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
@ -296,9 +296,9 @@ KAction *pause(TQObject *tqparent, const char *name)
return action; return action;
} }
LoopActionMenu *loop(TQObject *tqparent, const char *name) LoopActionMenu *loop(TQObject *parent, const char *name)
{ {
return new LoopActionMenu(tqparent, name); return new LoopActionMenu(parent, name);
} }
PluginActionMenu *actions() PluginActionMenu *actions()
@ -307,14 +307,14 @@ PluginActionMenu *actions()
return napp->pluginActionMenu(); return napp->pluginActionMenu();
} }
VisActionMenu *visualizations(TQObject *tqparent, const char *name) VisActionMenu *visualizations(TQObject *parent, const char *name)
{ {
return new VisActionMenu(tqparent, name); return new VisActionMenu(parent, name);
} }
KToggleAction *playlist(TQObject *tqparent, const char *name) KToggleAction *playlist(TQObject *parent, const char *name)
{ {
return new PlaylistAction(tqparent, name); return new PlaylistAction(parent, name);
} }
KPopupMenu *ContextMenu::mContextMenu = 0; KPopupMenu *ContextMenu::mContextMenu = 0;

@ -177,8 +177,8 @@ Tags::~Tags()
} }
Control::Control(TagsGetter *tqparent) Control::Control(TagsGetter *parent)
: CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", tqparent) : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", parent)
{ {
// todo // todo
(void)I18N_NOOP("Rescan All Tags"); (void)I18N_NOOP("Rescan All Tags");
@ -212,14 +212,14 @@ Control::Control(TagsGetter *tqparent)
connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int))); connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int)));
connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int))); connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int)));
slider->setValue(tqparent->interval()); slider->setValue(parent->interval());
connect(slider, TQT_SIGNAL(valueChanged(int)), tqparent, TQT_SLOT(setInterval(int))); connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int)));
connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool))); connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool)));
} }
connect(onPlay, TQT_SIGNAL(toggled(bool)), tqparent, TQT_SLOT(setLoadAuto(bool))); connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool)));
onPlay->setChecked(tqparent->loadAuto()); onPlay->setChecked(parent->loadAuto());
} }

@ -50,7 +50,7 @@ class Control : public CModule
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Control(TagsGetter* tqparent); Control(TagsGetter* parent);
}; };

@ -14,7 +14,7 @@ enum ArtsPOS { posIdle=0, posPlaying, posPaused };
Player::Player(TQObject *tqparent) : TQObject(tqparent, "Player"), Player::Player(TQObject *parent) : TQObject(parent, "Player"),
position(-1), mLoopStyle(None), firstTimeout(true) position(-1), mLoopStyle(None), firstTimeout(true)
{ {
mEngine=new Engine; mEngine=new Engine;

@ -278,7 +278,7 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const
Playlist::Playlist(TQObject *tqparent, const char *name) : TQObject(tqparent, name) Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name)
{ {
napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent())); napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent()));
napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden())); napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden()));

@ -85,16 +85,16 @@ Visualization::Visualization(int timeout, int pid)
// if this is a fork, do a cutesy arts thingy to get a remote // if this is a fork, do a cutesy arts thingy to get a remote
// stack, otherwise, get it from localhost :) // stack, otherwise, get it from localhost :)
{ {
int tqparent=pid ? pid : getppid(); int parent=pid ? pid : getppid();
if (getenv("NOATUN_PID")) if (getenv("NOATUN_PID"))
tqparent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt(); parent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt();
DCOPClient c; DCOPClient c;
c.attach(); c.attach();
TQCString appids[2]; TQCString appids[2];
appids[0]=TQString("noatun-%1").tqarg(tqparent).local8Bit(); appids[0]=TQString("noatun-%1").tqarg(parent).local8Bit();
appids[1]="noatun"; appids[1]="noatun";
TQCString &appid=appids[0]; TQCString &appid=appids[0];
@ -120,7 +120,7 @@ Visualization::Visualization(int timeout, int pid)
if (!c.call(appid, "Noatun", "visStack()", TQByteArray(), replyType, replyData)) if (!c.call(appid, "Noatun", "visStack()", TQByteArray(), replyType, replyData))
{ {
kdDebug(66666) << "Error communicating to tqparent noatun" << endl; kdDebug(66666) << "Error communicating to parent noatun" << endl;
} }
else else
{ {
@ -473,7 +473,7 @@ void StereoScope::setSamples(int len)
NoatunListener::NoatunListener(TQObject *tqparent) : TQObject(tqparent) NoatunListener::NoatunListener(TQObject *parent) : TQObject(parent)
{ } { }
NoatunListener::~NoatunListener() NoatunListener::~NoatunListener()
@ -495,7 +495,7 @@ void NoatunListenerNotif::message()
} }
ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparent) ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
{ {
mNotif=new NoatunListenerNotif(this); mNotif=new NoatunListenerNotif(this);
@ -528,7 +528,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparen
if (!c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData)) if (!c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData))
{ {
kdDebug(66666) << "Error communicating to tqparent noatun" << endl; kdDebug(66666) << "Error communicating to parent noatun" << endl;
} }
else else
{ {
@ -563,8 +563,8 @@ ExitNotifier::~ExitNotifier()
delete mNotif; delete mNotif;
} }
BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent) BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent)
: TQObject(tqparent) : TQObject(parent)
{ {
connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event())); connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event()));
mValue=value; mValue=value;

@ -203,34 +203,34 @@ void Plugins::reopen()
for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i)
{ {
PluginListView *tqparent; PluginListView *parent;
bool exclusive = false; bool exclusive = false;
if((*i).type == "userinterface") if((*i).type == "userinterface")
{ {
tqparent = interfaceList; parent = interfaceList;
} }
else if((*i).type == "playlist") else if((*i).type == "playlist")
{ {
tqparent = playlistList; parent = playlistList;
exclusive = true; exclusive = true;
} }
else if((*i).type == "sm" || (*i).type=="hidden") else if((*i).type == "sm" || (*i).type=="hidden")
{ {
tqparent = 0; parent = 0;
} }
else if ((*i).type == "visualization") else if ((*i).type == "visualization")
{ {
tqparent = visList; parent = visList;
} }
else else
{ {
tqparent = otherList; parent = otherList;
} }
if(tqparent) if(parent)
{ {
PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, tqparent); PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, parent);
item->setText(0, (*i).name); item->setText(0, (*i).name);
item->setText(1, (*i).comment); item->setText(1, (*i).comment);
item->setText(2, (*i).author); item->setText(2, (*i).author);

@ -8,9 +8,9 @@
//#include <tqlabel.h> //#include <tqlabel.h>
#include "cmodule.h" #include "cmodule.h"
NoatunPreferences::NoatunPreferences(TQWidget *tqparent) NoatunPreferences::NoatunPreferences(TQWidget *parent)
: KDialogBase(TreeList, i18n("Preferences - Noatun"), : KDialogBase(TreeList, i18n("Preferences - Noatun"),
Ok|Apply|Cancel|Help, Ok, tqparent, "NoatunPreferences", false, true) Ok|Apply|Cancel|Help, Ok, parent, "NoatunPreferences", false, true)
{ {
resize(640, 480); // KDE is required to support 800x600 min. resize(640, 480); // KDE is required to support 800x600 min.
setShowIconsInTreeList(true); setShowIconsInTreeList(true);
@ -32,7 +32,7 @@ void NoatunPreferences::show()
void NoatunPreferences::show(CModule *page) void NoatunPreferences::show(CModule *page)
{ {
int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->tqparent())) ); int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->parent())) );
if (index != -1) if (index != -1)
showPage(index); showPage(index);
show(); show();
@ -65,7 +65,7 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri
napp->preferencesBox()->add(this); napp->preferencesBox()->add(this);
TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(tqparent())); TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(parent()));
(new TQHBoxLayout(page))->addWidget(this); (new TQHBoxLayout(page))->addWidget(this);
} }
@ -78,7 +78,7 @@ CModule::~CModule()
void CModule::ownerDeleted() void CModule::ownerDeleted()
{ {
TQObject *p=tqparent(); TQObject *p=parent();
delete this; delete this;
p->deleteLater(); p->deleteLater();
} }

@ -55,10 +55,10 @@ class ScrollingLabel::Private
ScrollingLabel::ScrollingLabel ScrollingLabel::ScrollingLabel
( (
const TQString & initialText, const TQString & initialText,
TQWidget * tqparent, TQWidget * parent,
const char * name const char * name
) )
: TQWidget(tqparent, name) : TQWidget(parent, name)
{ {
d = new Private; d = new Private;

@ -3,28 +3,28 @@
namespace NoatunStdAction namespace NoatunStdAction
{ {
StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* tqparent, const char* name ) StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name )
: KAction(text, accel, tqparent, name) : KAction(text, accel, parent, name)
{} {}
StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
: KAction(text, accel, receiver, slot, tqparent, name) : KAction(text, accel, receiver, slot, parent, name)
{} {}
StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* tqparent, const char* name ) StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name )
: KAction(text, pix, accel, tqparent, name) : KAction(text, pix, accel, parent, name)
{} {}
StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* tqparent, const char* name ) StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* name )
: KAction(text, pix, accel, tqparent, name) : KAction(text, pix, accel, parent, name)
{} {}
StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
: KAction(text, pix, accel, receiver, slot, tqparent, name) : KAction(text, pix, accel, receiver, slot, parent, name)
{} {}
StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
: KAction(text, pix, accel, receiver, slot, tqparent, name) : KAction(text, pix, accel, receiver, slot, parent, name)
{} {}
void StereoButtonAction::disable(void) void StereoButtonAction::disable(void)

@ -115,8 +115,8 @@ namespace TitleProxy
TQ_OBJECT TQ_OBJECT
public: public:
Server( TQ_UINT16 port, TQObject* tqparent ) Server( TQ_UINT16 port, TQObject* parent )
: TQServerSocket( port, 1, tqparent, "TitleProxyServer" ) {}; : TQServerSocket( port, 1, parent, "TitleProxyServer" ) {};
signals: signals:
void connected( int socket ); void connected( int socket );

@ -24,8 +24,8 @@ struct VideoFrame::Private
}; };
VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const char*name, WFlags f) VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char*name, WFlags f)
: KVideoWidget(clientParent, tqparent, name, f) : KVideoWidget(clientParent, parent, name, f)
{ {
d = new Private; d = new Private;
connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed()));
@ -33,8 +33,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const ch
frames.append(this); frames.append(this);
} }
VideoFrame::VideoFrame(TQWidget *tqparent, const char *name, WFlags f) VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f)
: KVideoWidget(tqparent, name, f) : KVideoWidget(parent, name, f)
{ {
d = new Private; d = new Private;
connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed()));
@ -62,9 +62,9 @@ VideoFrame *VideoFrame::playing()
return whose; return whose;
} }
TQPopupMenu *VideoFrame::popupMenu(TQWidget *tqparent) TQPopupMenu *VideoFrame::popupMenu(TQWidget *parent)
{ {
TQPopupMenu *view = new TQPopupMenu(tqparent); TQPopupMenu *view = new TQPopupMenu(parent);
action( "half_size" )->plug( view ); action( "half_size" )->plug( view );
action( "normal_size" )->plug( view ); action( "normal_size" )->plug( view );
action( "double_size" )->plug( view ); action( "double_size" )->plug( view );

@ -134,7 +134,7 @@ public:
intense.min(0); intense.min(0);
intense.max(5); intense.max(5);
intense.value(e.intensity()); intense.value(e.intensity());
intense.tqparent(hbox); intense.parent(hbox);
intense.show(); intense.show();
connect(intense,"value_changed", e, "intensity"); connect(intense,"value_changed", e, "intensity");

@ -171,8 +171,8 @@ TQString HTMLExport::getColorByEntry(TQString s)
} }
//////////////////////////////////// Settings //////////////////////////////////// //////////////////////////////////// Settings ////////////////////////////////////
Prefs::Prefs(TQObject *tqparent) Prefs::Prefs(TQObject *parent)
: CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", tqparent) : CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", parent)
{ {
// Init Config // Init Config

@ -57,7 +57,7 @@ class Prefs : public CModule
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Prefs(TQObject *tqparent); Prefs(TQObject *parent);
virtual void save(); virtual void save();
virtual void reopen(); virtual void reopen();

@ -51,8 +51,8 @@ Lirc *IRPrefs::s_lirc = 0;
bool IRPrefs::s_configRead = false; bool IRPrefs::s_configRead = false;
TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands; TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands;
IRPrefs::IRPrefs(TQObject *tqparent) IRPrefs::IRPrefs(TQObject *parent)
: CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", tqparent) : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent)
{ {
TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setColStretch(1, 1); tqlayout->setColStretch(1, 1);

@ -25,7 +25,7 @@ public:
NextSection, PreviousSection NextSection, PreviousSection
}; };
IRPrefs(TQObject *tqparent); IRPrefs(TQObject *parent);
virtual void save(); virtual void save();

@ -12,8 +12,8 @@
#include "lirc.h" #include "lirc.h"
Lirc::Lirc(TQObject *tqparent) Lirc::Lirc(TQObject *parent)
: TQObject(tqparent), : TQObject(parent),
m_socket(0) m_socket(0)
{ {
int sock = ::socket(PF_UNIX, SOCK_STREAM, 0); int sock = ::socket(PF_UNIX, SOCK_STREAM, 0);

@ -18,7 +18,7 @@ public:
/** /**
* Constructor * Constructor
*/ */
Lirc(TQObject *tqparent); Lirc(TQObject *parent);
/** /**
* Destructor * Destructor
*/ */

@ -95,8 +95,8 @@ Mask: filename
(this is DEPRECATED!, for transparent skins just add transparency to the (this is DEPRECATED!, for transparent skins just add transparency to the
Background image, Mask remains merely for backwards compatibility) Background image, Mask remains merely for backwards compatibility)
filename filename
The tqmask image file, only needed for skins which are tqshaped windows (not The mask image file, only needed for skins which are tqshaped windows (not
rectangular). Contains a transparency tqmask for the main window. rectangular). Contains a transparency mask for the main window.
========================== ==========================
Text display Text display
@ -151,9 +151,9 @@ Play/Pause/Stop/Shuffle/Repeat/
clip_filename (optional) clip_filename (optional)
When specified, defines an image with transparency to be used as the button's When specified, defines an image with transparency to be used as the button's
draw clip tqmask. The clip tqmask is placed at location x, y The transparency is used to draw clip mask. The clip mask is placed at location x, y The transparency is used to
indicate the portions of the button that should be visible (drawn) and respond to indicate the portions of the button that should be visible (drawn) and respond to
mouse clicks. If the image contains a multiple level alpha channel, the tqmask is reduced mouse clicks. If the image contains a multiple level alpha channel, the mask is reduced
such that levels above 50% are visible and those below 50% are not visible. such that levels above 50% are visible and those below 50% are not visible.
========================== ==========================
@ -175,9 +175,9 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename]
clip_filename (optional) clip_filename (optional)
When specified, defines an image with transparency to be used as the button's When specified, defines an image with transparency to be used as the button's
draw clip tqmask. The clip tqmask is placed at location x, y The transparency is used to draw clip mask. The clip mask is placed at location x, y The transparency is used to
indicate the portions of the button that should be visible (drawn) and respond to indicate the portions of the button that should be visible (drawn) and respond to
mouse clicks. If the image contains a multiple level alpha channel, the tqmask is reduced mouse clicks. If the image contains a multiple level alpha channel, the mask is reduced
such that levels above 50% are visible and those below 50% are not visible. such that levels above 50% are visible and those below 50% are not visible.
@ -354,15 +354,15 @@ Position/Volume/Balance_Dial: filename has_press_image has_prelight_image revers
x, y, width, height: x, y, width, height:
Marks the clipping region to draw the dial, basically the handle is not drawn Marks the clipping region to draw the dial, basically the handle is not drawn
outside this region. (width and height will be ignored if a clip tqmask image outside this region. (width and height will be ignored if a clip mask image
is specified (see next option). is specified (see next option).
clip_filename (optional) clip_filename (optional)
When specified, defines an image with transparency to be used as the dial's When specified, defines an image with transparency to be used as the dial's
draw clip tqmask. The clip tqmask is placed at x, y (above) and the image's dimensions draw clip mask. The clip mask is placed at x, y (above) and the image's dimensions
are used in place of width, height (above). The transparency is used to indicate the are used in place of width, height (above). The transparency is used to indicate the
portions of the dial that should be visible (drawn) and respond to mouse clicks. portions of the dial that should be visible (drawn) and respond to mouse clicks.
If the image contains a multiple level alpha channel, the tqmask is reduced such that If the image contains a multiple level alpha channel, the mask is reduced such that
levels above 50% are visible and those below 50% are not visible. levels above 50% are visible and those below 50% are not visible.
============================================================================== ==============================================================================

@ -31,8 +31,8 @@
#include "userinterface.h" #include "userinterface.h"
KaimanPrefDlg::KaimanPrefDlg(TQObject *tqparent ) KaimanPrefDlg::KaimanPrefDlg(TQObject *parent )
: CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", tqparent) : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", parent)
{ {
// create widgets // create widgets
TQVBoxLayout *topLayout = new TQVBoxLayout( this, 6, 11 ); TQVBoxLayout *topLayout = new TQVBoxLayout( this, 6, 11 );

@ -29,7 +29,7 @@ class KaimanPrefDlg : public CModule
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanPrefDlg( TQObject *tqparent ); KaimanPrefDlg( TQObject *parent );
virtual ~KaimanPrefDlg(); virtual ~KaimanPrefDlg();
virtual void save(); virtual void save();

@ -4,7 +4,7 @@ Released: November 25, 1998
Version: 1.0 Version: 1.0
URL: http://www.geocities.com/SiliconValley/Haven/5235 URL: http://www.geocities.com/SiliconValley/Haven/5235
Comments: Skin with a doughnut tqshape to test tqshaped windows. Comments: Skin with a doughnut tqshape to test tqshaped windows.
(skins with a tqshape tqmask) (skins with a tqshape mask)
Note: For transparency to work, GQmpeg 0.4.2 is required. Note: For transparency to work, GQmpeg 0.4.2 is required.
Previous versions will work, but will be _ugly_. Previous versions will work, but will be _ugly_.

@ -7,7 +7,7 @@
#Author: John Ellis <gqview@geocities.com> #Author: John Ellis <gqview@geocities.com>
#URL: http://www.geocities.com/SiliconValley/Haven/5235/ #URL: http://www.geocities.com/SiliconValley/Haven/5235/
#Comments: Skin with a doughnut tqshape to test tqshaped windows. #Comments: Skin with a doughnut tqshape to test tqshaped windows.
# (skins with a tqshape tqmask) # (skins with a tqshape mask)
#run 'gqmpeg -skinhelp' for help with coordinates. #run 'gqmpeg -skinhelp' for help with coordinates.
#simply comment out items you do not want to display #simply comment out items you do not want to display
@ -15,7 +15,7 @@
Background: back.png Background: back.png
#Mask is an image with transparency used to define a tqshaped window #Mask is an image with transparency used to define a tqshaped window
Mask: back_tqmask.png Mask: back_mask.png
#Title: filename length x y #Title: filename length x y
Title: letters.png 23 32 86 Title: letters.png 23 32 86

@ -7,7 +7,7 @@
#Author: John Ellis <gqview@geocities.com> #Author: John Ellis <gqview@geocities.com>
#URL: http://www.geocities.com/SiliconValley/Haven/5235/ #URL: http://www.geocities.com/SiliconValley/Haven/5235/
#Comments: Skin with a doughnut tqshape to test tqshaped windows. #Comments: Skin with a doughnut tqshape to test tqshaped windows.
# (skins with a tqshape tqmask) # (skins with a tqshape mask)
#run 'gqmpeg -skinhelp' for help with coordinates. #run 'gqmpeg -skinhelp' for help with coordinates.
#simply comment out items you do not want to display #simply comment out items you do not want to display
@ -15,7 +15,7 @@
Background: back_sm.png Background: back_sm.png
#Mask is an image with transparency used to define a tqshaped window #Mask is an image with transparency used to define a tqshaped window
Mask: back_sm_tqmask.png Mask: back_sm_mask.png
#Title: filename length x y #Title: filename length x y
Title: letters.png 21 8 4 Title: letters.png 21 8 4

@ -10,7 +10,7 @@
###################################################### ######################################################
Background: knine-normal2.jpg Background: knine-normal2.jpg
Mask: tqmask.png Mask: mask.png
Play_Button: play.jpg FALSE FALSE 55 133 89 166 Play_Button: play.jpg FALSE FALSE 55 133 89 166
Stop_Button: stop.jpg FALSE FALSE 28 124 52 145 Stop_Button: stop.jpg FALSE FALSE 28 124 52 145

@ -42,8 +42,8 @@ const bool KaimanStyleSlider::optionVertical = 1;
const bool KaimanStyleSlider::optionReversed = 2; const bool KaimanStyleSlider::optionReversed = 2;
const bool KaimanStyleText::optionExtended = 1; const bool KaimanStyleText::optionExtended = 1;
KaimanStyleElement::KaimanStyleElement(TQWidget *tqparent, const char *name) KaimanStyleElement::KaimanStyleElement(TQWidget *parent, const char *name)
: TQWidget(tqparent, name) : TQWidget(parent, name)
{ {
// Initialize everything to default values // Initialize everything to default values
filename = ""; filename = "";
@ -122,10 +122,10 @@ void KaimanStyleElement::loadPixmaps(TQString &val_s_filename)
bitBlt(part,0,0,&pixmap,sourcex,sourcey,w,h); bitBlt(part,0,0,&pixmap,sourcex,sourcey,w,h);
pixmaps.insert(i,part); pixmaps.insert(i,part);
if(pixmap.tqmask()) if(pixmap.mask())
{ {
TQBitmap maskpart(w,h); TQBitmap maskpart(w,h);
bitBlt(&maskpart,0,0,pixmap.tqmask(),sourcex,sourcey,w,h); bitBlt(&maskpart,0,0,pixmap.mask(),sourcex,sourcey,w,h);
part->setMask(maskpart); part->setMask(maskpart);
} }
@ -192,8 +192,8 @@ void KaimanStyleElement::dropEvent( TQDropEvent *event )
/***************************************************************************/ /***************************************************************************/
KaimanStyleButton::KaimanStyleButton(TQWidget *tqparent, const char *name) KaimanStyleButton::KaimanStyleButton(TQWidget *parent, const char *name)
: KaimanStyleMasked(tqparent, name) : KaimanStyleMasked(parent, name)
{ {
i_b_lit = i_b_prelit = i_b_down = false; i_b_lit = i_b_prelit = i_b_down = false;
i_i_currentState = NormalUp; i_i_currentState = NormalUp;
@ -327,8 +327,8 @@ void KaimanStyleButton::updateButtonState() {
/***********************************************************************/ /***********************************************************************/
KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name) KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name)
: KaimanStyleMasked( tqparent, name ) : KaimanStyleMasked( parent, name )
{ {
_min = min; _min = min;
_max = max; _max = max;
@ -486,8 +486,8 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e )
/***********************************************************************/ /***********************************************************************/
KaimanStyleBackground::KaimanStyleBackground(TQWidget *tqparent, const char *name) KaimanStyleBackground::KaimanStyleBackground(TQWidget *parent, const char *name)
: KaimanStyleMasked( tqparent, name ) : KaimanStyleMasked( parent, name )
{ {
i_b_move = false; i_b_move = false;
} }
@ -533,8 +533,8 @@ void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme)
/***********************************************************************/ /***********************************************************************/
KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name) KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *parent, const char *name)
: KaimanStyleMasked( tqparent, name ) : KaimanStyleMasked( parent, name )
{ {
_min = min; _min = min;
_max = max; _max = max;
@ -571,8 +571,8 @@ void KaimanStyleValue::setValue( int value, int min, int max )
/***********************************************************************/ /***********************************************************************/
KaimanStyleNumber::KaimanStyleNumber(TQWidget *tqparent, const char *name) KaimanStyleNumber::KaimanStyleNumber(TQWidget *parent, const char *name)
: KaimanStyleElement( tqparent, name ) : KaimanStyleElement( parent, name )
{ {
//kdDebug(66666) << k_funcinfo << "name = '" << name << "'" << endl; //kdDebug(66666) << k_funcinfo << "name = '" << name << "'" << endl;
_value = 0; _value = 0;
@ -640,8 +640,8 @@ void KaimanStyleNumber::paintEvent(TQPaintEvent */*qpe*/)
/***********************************************************************/ /***********************************************************************/
KaimanStyleText::KaimanStyleText(TQWidget *tqparent, const char *name) KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name)
: KaimanStyleElement( tqparent, name ) : KaimanStyleElement( parent, name )
{ {
_pos = 0; _pos = 0;
_timer = new TQTimer( this ); _timer = new TQTimer( this );
@ -735,8 +735,8 @@ void KaimanStyleText::paintEvent(TQPaintEvent */*qpe*/)
/***********************************************************************/ /***********************************************************************/
KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name) KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const char *name)
: KaimanStyleMasked( tqparent, name ) : KaimanStyleMasked( parent, name )
{ {
_delay = delay; _delay = delay;
_frame = 0; _frame = 0;
@ -774,8 +774,8 @@ void KaimanStyleAnimation::timeout()
/***********************************************************************/ /***********************************************************************/
KaimanStyleState::KaimanStyleState(TQWidget *tqparent, const char *name) KaimanStyleState::KaimanStyleState(TQWidget *parent, const char *name)
: KaimanStyleMasked( tqparent, name ) : KaimanStyleMasked( parent, name )
{ {
_value = 0; _value = 0;
} }
@ -799,10 +799,10 @@ void KaimanStyleState::mousePressEvent(TQMouseEvent *qme)
/***********************************************************************/ /***********************************************************************/
KaimanStyle::KaimanStyle( TQWidget *tqparent, const char *name ) KaimanStyle::KaimanStyle( TQWidget *parent, const char *name )
: TQWidget( tqparent, name ) : TQWidget( parent, name )
{ {
i_qw_parent = tqparent; i_qw_parent = parent;
i_eventSemaphore = false; i_eventSemaphore = false;
} }
@ -1456,7 +1456,7 @@ bool KaimanStyle::loadPixmaps()
if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) { if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) {
// OK, background and tqmask are defined. So now I can calculate the tqshape // OK, background and mask are defined. So now I can calculate the tqshape
int l_i_width_Mask = l_pixmap_Mask->width(); int l_i_width_Mask = l_pixmap_Mask->width();
int l_i_height_Mask = l_pixmap_Mask->height(); int l_i_height_Mask = l_pixmap_Mask->height();

@ -34,7 +34,7 @@ class KaimanStyleElement : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleElement(TQWidget *tqparent, const char *name=0); KaimanStyleElement(TQWidget *parent, const char *name=0);
~KaimanStyleElement(); ~KaimanStyleElement();
virtual void loadPixmaps(TQString &val_s_filename); virtual void loadPixmaps(TQString &val_s_filename);
@ -75,14 +75,14 @@ class KaimanStyleMasked : public KaimanStyleElement
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleMasked(TQWidget *tqparent, const char *name=0) KaimanStyleMasked(TQWidget *parent, const char *name=0)
: KaimanStyleElement( tqparent, name ) {}; : KaimanStyleElement( parent, name ) {};
virtual void loadPixmaps(TQString &val_s_filename) virtual void loadPixmaps(TQString &val_s_filename)
{ {
KaimanStyleElement::loadPixmaps( val_s_filename ); KaimanStyleElement::loadPixmaps( val_s_filename );
if(pixmaps[0]->tqmask()) if(pixmaps[0]->mask())
setMask(*pixmaps[0]->tqmask()); setMask(*pixmaps[0]->mask());
}; };
}; };
@ -92,7 +92,7 @@ class KaimanStyleButton : public KaimanStyleMasked
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleButton(TQWidget *tqparent, const char *name=0); KaimanStyleButton(TQWidget *parent, const char *name=0);
~KaimanStyleButton(); ~KaimanStyleButton();
// Button states. // Button states.
@ -130,7 +130,7 @@ class KaimanStyleSlider : public KaimanStyleMasked
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name=0); KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0);
~KaimanStyleSlider(); ~KaimanStyleSlider();
int value() { return _value; }; int value() { return _value; };
@ -169,7 +169,7 @@ class KaimanStyleBackground : public KaimanStyleMasked
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleBackground(TQWidget *tqparent, const char *name=0); KaimanStyleBackground(TQWidget *parent, const char *name=0);
~KaimanStyleBackground(); ~KaimanStyleBackground();
protected: protected:
@ -189,7 +189,7 @@ class KaimanStyleValue : public KaimanStyleMasked
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name=0); KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0);
~KaimanStyleValue(); ~KaimanStyleValue();
int value() { return _value; }; int value() { return _value; };
@ -208,7 +208,7 @@ class KaimanStyleState : public KaimanStyleMasked
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleState(TQWidget *tqparent, const char *name=0); KaimanStyleState(TQWidget *parent, const char *name=0);
~KaimanStyleState(); ~KaimanStyleState();
int value() { return _value; }; int value() { return _value; };
@ -232,7 +232,7 @@ class KaimanStyleNumber : public KaimanStyleElement
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleNumber(TQWidget *tqparent, const char *name=0); KaimanStyleNumber(TQWidget *parent, const char *name=0);
~KaimanStyleNumber(); ~KaimanStyleNumber();
virtual void loadPixmaps(TQString &val_s_filename); virtual void loadPixmaps(TQString &val_s_filename);
@ -257,7 +257,7 @@ class KaimanStyleText : public KaimanStyleElement
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleText(TQWidget *tqparent, const char *name=0); KaimanStyleText(TQWidget *parent, const char *name=0);
~KaimanStyleText(); ~KaimanStyleText();
virtual void loadPixmaps(TQString &val_s_filename); virtual void loadPixmaps(TQString &val_s_filename);
@ -292,7 +292,7 @@ class KaimanStyleAnimation : public KaimanStyleMasked
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name=0); KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0);
~KaimanStyleAnimation(); ~KaimanStyleAnimation();
public slots: public slots:
@ -313,10 +313,10 @@ class KaimanStyle : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KaimanStyle(TQWidget *tqparent, const char *name=0); KaimanStyle(TQWidget *parent, const char *name=0);
~KaimanStyle(); ~KaimanStyle();
enum { background, tqmask, play_Button, stop_Button, pause_Button, prev_Button, next_Button, repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider }; enum { background, mask, play_Button, stop_Button, pause_Button, prev_Button, next_Button, repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider };
enum { ParsingError=1, FileNotFound }; enum { ParsingError=1, FileNotFound };
@ -327,7 +327,7 @@ public:
bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" ); bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" );
TQString skinName() { return i_skinName; }; TQString skinName() { return i_skinName; };
/// Returns the tqmask /// Returns the mask
TQBitmap* Mask(); TQBitmap* Mask();
virtual bool eventFilter( TQObject *o, TQEvent *e ); virtual bool eventFilter( TQObject *o, TQEvent *e );
@ -346,13 +346,13 @@ private:
TQString i_s_styleBase; TQString i_s_styleBase;
// The tqmask of the complete style. Used for doing tqshaped windows // The mask of the complete style. Used for doing tqshaped windows
TQBitmap i_bitmap_Mask; TQBitmap i_bitmap_Mask;
/// All style elements are stored here. /// All style elements are stored here.
TQPtrVector<KaimanStyleElement> I_styleElem; TQPtrVector<KaimanStyleElement> I_styleElem;
// The tqparent window. In other words: The container that holds all the KaimanStyleElement's // The parent window. In other words: The container that holds all the KaimanStyleElement's
TQWidget* i_qw_parent; TQWidget* i_qw_parent;
TQPtrList<TQWidget> i_sliders; TQPtrList<TQWidget> i_sliders;

@ -170,9 +170,9 @@ void Keyz::slotMute()
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
KeyzPrefs::KeyzPrefs( TQObject *tqparent ) : KeyzPrefs::KeyzPrefs( TQObject *parent ) :
CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings", CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings",
tqparent ) parent )
{ {
TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
m_chooser = new KKeyChooser( Keyz::accel(), this ); m_chooser = new KKeyChooser( Keyz::accel(), this );

@ -39,7 +39,7 @@ class KeyzPrefs : public CModule
TQ_OBJECT TQ_OBJECT
public: public:
KeyzPrefs( TQObject *tqparent ); KeyzPrefs( TQObject *parent );
virtual void save(); virtual void save();
private: private:

@ -9,18 +9,18 @@
#include "kjbackground.h" #include "kjbackground.h"
KJBackground::KJBackground(KJLoader *tqparent) KJBackground::KJBackground(KJLoader *parent)
: KJWidget(tqparent) : KJWidget(parent)
{ {
TQImage ibackground; TQImage ibackground;
mBackground = tqparent->pixmap(parser()["backgroundimage"][1]); mBackground = parent->pixmap(parser()["backgroundimage"][1]);
ibackground = tqparent->image(parser()["backgroundimage"][1]); ibackground = parent->image(parser()["backgroundimage"][1]);
tqparent->setMask( getMask(ibackground) ); parent->setMask( getMask(ibackground) );
tqparent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) ); parent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) );
setRect(0,0,tqparent->width(),tqparent->height()); setRect(0,0,parent->width(),parent->height());
} }
void KJBackground::paint(TQPainter *painter, const TQRect &rect) void KJBackground::paint(TQPainter *painter, const TQRect &rect)

@ -30,8 +30,8 @@
* KJButton * KJButton
*******************************************/ *******************************************/
KJButton::KJButton(const TQStringList &i, KJLoader *tqparent) KJButton::KJButton(const TQStringList &i, KJLoader *parent)
: TQObject(0), KJWidget(tqparent), mTitle(i[0]), mShowPressed(false) : TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false)
{ {
// kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl; // kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl;
mPushedPixmap = (i.count() >= 7); mPushedPixmap = (i.count() >= 7);
@ -58,7 +58,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
TQString pressedTmp = backgroundPressed((*it)); TQString pressedTmp = backgroundPressed((*it));
if(!pressedTmp.isEmpty()) if(!pressedTmp.isEmpty())
{ {
mPressed = tqparent->pixmap(pressedTmp); mPressed = parent->pixmap(pressedTmp);
gotBack = true; gotBack = true;
} }
} }
@ -67,7 +67,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
// take background and darken the buttons rectangle // take background and darken the buttons rectangle
// FIXME: what KPixmapEffect causes the desired effect? // FIXME: what KPixmapEffect causes the desired effect?
// intensity is the wrong one // intensity is the wrong one
KPixmap temp = tqparent->pixmap(parser()["backgroundimage"][1]); KPixmap temp = parent->pixmap(parser()["backgroundimage"][1]);
mPressed = (TQPixmap)KPixmapEffect::intensity ( temp, 1.2f ); mPressed = (TQPixmap)KPixmapEffect::intensity ( temp, 1.2f );
gotBack = true; gotBack = true;
} }
@ -79,7 +79,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
{ {
kdDebug(66666) << k_funcinfo << "Couldn't find valid background for button '" << kdDebug(66666) << k_funcinfo << "Couldn't find valid background for button '" <<
mTitle << "', dafulting to backgroundimage" << endl; mTitle << "', dafulting to backgroundimage" << endl;
mPressed = tqparent->pixmap(parser()["backgroundimage"][1]); mPressed = parent->pixmap(parser()["backgroundimage"][1]);
} }
// playlistbutton has to show if playlistwindow is open // playlistbutton has to show if playlistwindow is open
@ -152,12 +152,12 @@ TQString KJButton::tip()
void KJButton::paint(TQPainter *, const TQRect &) void KJButton::paint(TQPainter *, const TQRect &)
{ {
if (mShowPressed) if (mShowPressed)
bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP); bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
} }
bool KJButton::mousePress(const TQPoint &) bool KJButton::mousePress(const TQPoint &)
{ {
bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP); bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
return true; return true;
} }
@ -201,11 +201,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
// now, find what widget I am and do the proper action // now, find what widget I am and do the proper action
if (mTitle=="closebutton") if (mTitle=="closebutton")
KJWidget::tqparent()->close(); KJWidget::parent()->close();
else if (mTitle=="minimizebutton") else if (mTitle=="minimizebutton")
KJWidget::tqparent()->minimize(); KJWidget::parent()->minimize();
else if (mTitle=="aboutbutton") else if (mTitle=="aboutbutton")
KJWidget::tqparent()->helpMenu()->aboutApplication(); KJWidget::parent()->helpMenu()->aboutApplication();
else if (mTitle=="stopbutton") else if (mTitle=="stopbutton")
napp->player()->stop(); napp->player()->stop();
else if (mTitle=="playbutton") else if (mTitle=="playbutton")
@ -214,7 +214,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
napp->player()->playpause(); napp->player()->playpause();
else if (mTitle=="openfilebutton") else if (mTitle=="openfilebutton")
{ {
KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::tqparent(), i18n("Select File to Play"))); KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::parent(), i18n("Select File to Play")));
if (file.isValid()) if (file.isValid())
napp->player()->openFile(file); napp->player()->openFile(file);
} }
@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
napp->player()->toggleListView(); napp->player()->toggleListView();
else if (mTitle=="repeatbutton") else if (mTitle=="repeatbutton")
{ {
KPopupMenu *loopMenu = new KPopupMenu(KJWidget::tqparent(),"loopMenu"); KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu");
int selectedItem = 0; int selectedItem = 0;
loopMenu->setCheckable(true); loopMenu->setCheckable(true);
@ -291,11 +291,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
else if (mTitle=="rewindbutton") else if (mTitle=="rewindbutton")
napp->player()->skipTo(napp->player()->getTime()-10000); napp->player()->skipTo(napp->player()->getTime()-10000);
else if (mTitle=="preferencesbutton") else if (mTitle=="preferencesbutton")
napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::tqparent()->prefs())); napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::parent()->prefs()));
else if (mTitle=="dockmodebutton") else if (mTitle=="dockmodebutton")
KJWidget::tqparent()->switchToDockmode(); KJWidget::parent()->switchToDockmode();
else if (mTitle=="undockmodebutton") else if (mTitle=="undockmodebutton")
KJWidget::tqparent()->returnFromDockmode(); KJWidget::parent()->returnFromDockmode();
else else
kdDebug(66666) << "unknown buttontype: " << mTitle.latin1() << endl; kdDebug(66666) << "unknown buttontype: " << mTitle.latin1() << endl;
} }

@ -87,8 +87,8 @@ void KJEqualizer::slotUpdateBuffer()
{ {
// kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl; // kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl;
TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent tqmask TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask
TQPainter tqmask( &regionMask ); TQPainter mask( &regionMask );
TQPoint destX = TQPoint(0, 0); TQPoint destX = TQPoint(0, 0);
@ -103,12 +103,12 @@ void KJEqualizer::slotUpdateBuffer()
// kdDebug(66666) << "[KJEqualizer] band=" << band << ", level=" << level << ", picNum=" << picNum << " @ xpos=" << xPos << "." << endl; // kdDebug(66666) << "[KJEqualizer] band=" << band << ", level=" << level << ", picNum=" << picNum << " @ xpos=" << xPos << "." << endl;
bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), TQt::CopyROP); bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), TQt::CopyROP);
// make slider opaque in tqmask so you see something on screen // make slider opaque in mask so you see something on screen
tqmask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 ); mask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 );
destX += TQPoint(mXSpace,0); destX += TQPoint(mXSpace,0);
} // for() } // for()
// whole thingy has been drawn, now set the tqmask // whole thingy has been drawn, now set the mask
mView->setMask( regionMask ); mView->setMask( regionMask );
tqrepaint(); tqrepaint();
} }

@ -13,7 +13,7 @@ class KJEqualizer : public TQObject, public KJWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KJEqualizer(const TQStringList &, KJLoader *tqparent); KJEqualizer(const TQStringList &, KJLoader *parent);
~KJEqualizer(void); ~KJEqualizer(void);
virtual void mouseMove(const TQPoint &pos, bool); virtual void mouseMove(const TQPoint &pos, bool);

@ -23,9 +23,9 @@
* KJFont * KJFont
*******************************************/ *******************************************/
KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTransparentRGB(0) KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0)
{ {
// kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *tqparent)" << prefix.latin1() << endl; // kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *parent)" << prefix.latin1() << endl;
if (prefix=="timefont") if (prefix=="timefont")
{ {
@ -47,12 +47,12 @@ KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTran
mNullChar=' '; mNullChar=' ';
} }
mText = tqparent->pixmap(tqparent->item(prefix+"image")[1]); mText = parent->pixmap(parent->item(prefix+"image")[1]);
if ( tqparent->exist(prefix+"size") ) if ( parent->exist(prefix+"size") )
{ {
mWidth = tqparent->item(prefix+"size")[1].toInt(); mWidth = parent->item(prefix+"size")[1].toInt();
mHeight = tqparent->item(prefix+"size")[2].toInt(); mHeight = parent->item(prefix+"size")[2].toInt();
} }
else // try to load the font even we are missing important settings else // try to load the font even we are missing important settings
{ // this still can cause crashes! { // this still can cause crashes!
@ -73,13 +73,13 @@ KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTran
mHeight = mText.height(); mHeight = mText.height();
// Stupid Skin authors tend to forget keys :/ // Stupid Skin authors tend to forget keys :/
if ( tqparent->exist(prefix+"spacing") ) if ( parent->exist(prefix+"spacing") )
mSpacing = tqparent->item(prefix+"spacing")[1].toInt(); mSpacing = parent->item(prefix+"spacing")[1].toInt();
else else
mSpacing = 0; // FIXME: What's default for this in kjöfol??? mSpacing = 0; // FIXME: What's default for this in kjöfol???
if ( tqparent->exist(prefix+"transparent") ) if ( parent->exist(prefix+"transparent") )
mTransparent = (bool)tqparent->item(prefix+"transparent")[1].toInt(); mTransparent = (bool)parent->item(prefix+"transparent")[1].toInt();
else else
mTransparent = true; // transparency seems to be default in kjöfol mTransparent = true; // transparency seems to be default in kjöfol
@ -153,8 +153,8 @@ TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) c
TQBitmap regionMask( TQBitmap regionMask(
(stringWidth > wide ? stringWidth : wide), (stringWidth > wide ? stringWidth : wide),
mHeight, true); // fully transparent tqmask mHeight, true); // fully transparent mask
TQPainter mp(&regionMask); // tqmask painter TQPainter mp(&regionMask); // mask painter
// kdDebug(66666) << "region; w=" << region.width() << ", h=" << region.height() << endl; // kdDebug(66666) << "region; w=" << region.width() << ", h=" << region.height() << endl;
@ -206,8 +206,8 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
TQBitmap regionMask( TQBitmap regionMask(
(string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide (string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide
? string.length()*mWidth+string.length()*mSpacing : wide), ? string.length()*mWidth+string.length()*mSpacing : wide),
mHeight, true); // fully transparent tqmask mHeight, true); // fully transparent mask
TQPainter tqmask( &regionMask ); TQPainter mask( &regionMask );
// kdDebug(66666) << "draw: {" << str << "}" << endl; // kdDebug(66666) << "draw: {" << str << "}" << endl;
@ -216,7 +216,7 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
if ( string.length()*mWidth+string.length()*mSpacing < (unsigned int)wide ) if ( string.length()*mWidth+string.length()*mSpacing < (unsigned int)wide )
{ {
freeSpace = wide - string.length()*mWidth+string.length()*mSpacing; freeSpace = wide - string.length()*mWidth+string.length()*mSpacing;
tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
to += TQPoint ( (freeSpace/2), 0 ); to += TQPoint ( (freeSpace/2), 0 );
} }
@ -234,14 +234,14 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
// draw according to "spacing" // draw according to "spacing"
if ( (charPos < string.length()-1) && mSpacing > 0 ) if ( (charPos < string.length()-1) && mSpacing > 0 )
{ // make the spacing-area transparent { // make the spacing-area transparent
tqmask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 ); mask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 );
to += TQPoint ( mSpacing, 0 ); to += TQPoint ( mSpacing, 0 );
} }
} }
if (freeSpace > 0) if (freeSpace > 0)
{ {
tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
to += TQPoint ( (freeSpace/2), 0 ); to += TQPoint ( (freeSpace/2), 0 );
} }
@ -260,12 +260,12 @@ void KJFont::drawCharacter(TQPixmap *dev, TQBitmap *devMask, const TQPoint &to,
bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), TQt::CopyROP); bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), TQt::CopyROP);
// bitBlt tqmask for transparency // bitBlt mask for transparency
if ( mTransparent ) if ( mTransparent )
{ {
bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), TQt::OrROP); bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), TQt::OrROP);
} }
else // fill tqmask else // fill mask
{ {
TQPainter tempPainter (devMask); TQPainter tempPainter (devMask);
tempPainter.fillRect ( to.x(), 0, xs,ys, TQt::color1 ); tempPainter.fillRect ( to.x(), 0, xs,ys, TQt::color1 );

@ -11,7 +11,7 @@ class KJLoader;
class KJFont class KJFont
{ {
public: public:
KJFont(const TQString &prefix, KJLoader *tqparent); KJFont(const TQString &prefix, KJLoader *parent);
// draw the string str to dev at position pos, within rectangle limit in relation to pos // draw the string str to dev at position pos, within rectangle limit in relation to pos
TQPixmap draw(const TQCString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const; TQPixmap draw(const TQCString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const;
TQPixmap draw(const TQString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const TQPixmap draw(const TQString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const

@ -72,8 +72,8 @@
class KJToolTip : public TQToolTip class KJToolTip : public TQToolTip
{ {
public: public:
KJToolTip(KJLoader *tqparent) KJToolTip(KJLoader *parent)
: TQToolTip(tqparent), mParent(tqparent) : TQToolTip(parent), mParent(parent)
{} {}
protected: protected:

@ -45,8 +45,8 @@
static TQString expand(TQString s); static TQString expand(TQString s);
KJPrefs::KJPrefs(TQObject* tqparent) KJPrefs::KJPrefs(TQObject* parent)
: CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", tqparent) : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent)
{ {
cfg = KGlobal::config(); cfg = KGlobal::config();

@ -27,7 +27,7 @@ class KJPrefs : public CModule
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KJPrefs(TQObject* tqparent); KJPrefs(TQObject* parent);
// Save which Skin is currently selected // Save which Skin is currently selected
virtual void save(); virtual void save();

@ -22,24 +22,24 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
{ {
kdDebug(66666) << k_funcinfo << "No pressed background found for seeker," << kdDebug(66666) << k_funcinfo << "No pressed background found for seeker," <<
" using default background!" << endl; " using default background!" << endl;
tqparent()->image(parser()["backgroundimage"][1]); parent()->image(parser()["backgroundimage"][1]);
} }
else else
mActive = tqparent()->image(activeBg); mActive = parent()->image(activeBg);
mScale = tqparent()->image(parser()["seekimage"][1]); mScale = parent()->image(parser()["seekimage"][1]);
TQImage pixmapNoPress = tqparent()->image(parser()["backgroundimage"][1]); TQImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]);
// generate transparent tqmask // generate transparent mask
int x, y, xs, ys; int x, y, xs, ys;
x=i[1].toInt(); x=i[1].toInt();
y=i[2].toInt(); y=i[2].toInt();
xs=i[3].toInt()-x; xs=i[3].toInt()-x;
ys=i[4].toInt()-y; ys=i[4].toInt()-y;
setRect(x,y,xs,ys); setRect(x,y,xs,ys);
TQImage transtqmask(xs, ys, 1, 2, TQImage::LittleEndian); TQImage transmask(xs, ys, 1, 2, TQImage::LittleEndian);
transtqmask.setColor(1, tqRgb(0,0,0)); transmask.setColor(1, tqRgb(0,0,0));
transtqmask.setColor(0, tqRgb(255,255,255)); transmask.setColor(0, tqRgb(255,255,255));
// clear the pointers // clear the pointers
memset(barmodeImages, 0, 256*sizeof(TQImage*)); memset(barmodeImages, 0, 256*sizeof(TQImage*));
@ -55,10 +55,10 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
// am I transparent? // am I transparent?
if (!isGray(checkmScale)) if (!isGray(checkmScale))
{ {
setPixel1BPP(transtqmask, ix-x, iy-y, 0); setPixel1BPP(transmask, ix-x, iy-y, 0);
continue; continue;
} }
setPixel1BPP(transtqmask, ix-x, iy-y, 1); setPixel1BPP(transmask, ix-x, iy-y, 1);
// what is the level // what is the level
int level=grayRgb(checkmScale)+1; int level=grayRgb(checkmScale)+1;
@ -89,9 +89,9 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
// create the blank one // create the blank one
barmode[0]=new TQPixmap(xs, ys); barmode[0]=new TQPixmap(xs, ys);
TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]); TQPixmap px=parent()->pixmap(parser()["backgroundimage"][1]);
bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP); bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP);
px.convertFromImage(transtqmask); px.convertFromImage(transmask);
barModeMask=px; barModeMask=px;
// kdDebug(66666) << "END KJSeeker constructor" << endl; // kdDebug(66666) << "END KJSeeker constructor" << endl;
@ -180,7 +180,7 @@ void KJSeeker::timeUpdate(int sec)
g = sec * 255 / length; g = sec * 255 / length;
//kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl; //kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl;
TQPainter p(tqparent()); TQPainter p(parent());
paint(&p, rect()); paint(&p, rect());
} }

@ -44,8 +44,8 @@ KJVolumeBar::KJVolumeBar(const TQStringList &i, KJLoader *p)
// kdDebug(66666) << "x: " << x << " y: " << y << " w: " << xs << " h: " << ys << endl; // kdDebug(66666) << "x: " << x << " y: " << y << " w: " << xs << " h: " << ys << endl;
mBack = tqparent()->pixmap(parser()["backgroundimage"][1]); mBack = parent()->pixmap(parser()["backgroundimage"][1]);
mSlider = tqparent()->pixmap(parser()["volumecontrolimage"][1]); mSlider = parent()->pixmap(parser()["volumecontrolimage"][1]);
} }
TQString KJVolumeBar::tip() TQString KJVolumeBar::tip()
@ -133,8 +133,8 @@ KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p)
mWidth = parser()["volumecontrolimagexsize"][1].toInt(); mWidth = parser()["volumecontrolimagexsize"][1].toInt();
mCount = parser()["volumecontrolimagenb"][1].toInt()-1; mCount = parser()["volumecontrolimagenb"][1].toInt()-1;
mImages = tqparent()->pixmap(parser()["volumecontrolimage"][1]); mImages = parent()->pixmap(parser()["volumecontrolimage"][1]);
mPos = tqparent()->image(parser()["volumecontrolimageposition"][1]); mPos = parent()->image(parser()["volumecontrolimageposition"][1]);
timeUpdate(0); timeUpdate(0);
} }
@ -208,12 +208,12 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p)
mWidth = parser()["pitchcontrolimagexsize"][1].toInt(); mWidth = parser()["pitchcontrolimagexsize"][1].toInt();
mCount = parser()["pitchcontrolimagenb"][1].toInt()-1; mCount = parser()["pitchcontrolimagenb"][1].toInt()-1;
mImages = tqparent()->pixmap(parser()["pitchcontrolimage"][1]); mImages = parent()->pixmap(parser()["pitchcontrolimage"][1]);
mPos = tqparent()->image(parser()["pitchcontrolimageposition"][1]); mPos = parent()->image(parser()["pitchcontrolimageposition"][1]);
// makes all pixels with rgb(255,0,255) transparent // makes all pixels with rgb(255,0,255) transparent
TQImage ibackground; TQImage ibackground;
ibackground = tqparent()->image(parser()["pitchcontrolimage"][1]); ibackground = parent()->image(parser()["pitchcontrolimage"][1]);
mImages.setMask( getMask(ibackground) ); mImages.setMask( getMask(ibackground) );
Arts::PlayObject playobject = napp->player()->engine()->playObject(); Arts::PlayObject playobject = napp->player()->engine()->playObject();

@ -12,7 +12,7 @@ class KJVolumeText;
class KJVolumeBMP : public KJWidget class KJVolumeBMP : public KJWidget
{ {
public: public:
KJVolumeBMP(const TQStringList &, KJLoader *tqparent); KJVolumeBMP(const TQStringList &, KJLoader *parent);
virtual void paint(TQPainter *, const TQRect &rect); virtual void paint(TQPainter *, const TQRect &rect);
virtual bool mousePress(const TQPoint &pos); virtual bool mousePress(const TQPoint &pos);
@ -36,7 +36,7 @@ private:
class KJVolumeBar : public KJWidget class KJVolumeBar : public KJWidget
{ {
public: public:
KJVolumeBar(const TQStringList &, KJLoader *tqparent); KJVolumeBar(const TQStringList &, KJLoader *parent);
virtual void paint(TQPainter *, const TQRect &rect); virtual void paint(TQPainter *, const TQRect &rect);
virtual bool mousePress(const TQPoint &pos); virtual bool mousePress(const TQPoint &pos);
@ -59,7 +59,7 @@ private:
class KJPitchBMP : public KJWidget class KJPitchBMP : public KJWidget
{ {
public: public:
KJPitchBMP(const TQStringList &, KJLoader *tqparent); KJPitchBMP(const TQStringList &, KJLoader *parent);
virtual void paint(TQPainter *, const TQRect &rect); virtual void paint(TQPainter *, const TQRect &rect);
virtual bool mousePress(const TQPoint &pos); virtual bool mousePress(const TQPoint &pos);

@ -90,12 +90,12 @@ void KJFilename::timerEvent(TQTimerEvent *)
int height = mView.height(); int height = mView.height();
int width = mView.width(); int width = mView.width();
TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the tqmask TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the mask
TQPixmap cycle ( mDistance, height ); // temporary-space for moving parts of the pixmap TQPixmap cycle ( mDistance, height ); // temporary-space for moving parts of the pixmap
TQBitmap newMask ( *mView.tqmask() ); // save old tqmask TQBitmap newMask ( *mView.mask() ); // save old mask
// copy tqmask like the same way we're doing it with the pixmap // copy mask like the same way we're doing it with the pixmap
// a tqmask does not get copied on a bitblt automatically, we have to do // a mask does not get copied on a bitblt automatically, we have to do
// it "by hand" // it "by hand"
bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, TQt::CopyROP); bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, TQt::CopyROP);
bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, TQt::CopyROP); bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, TQt::CopyROP);
@ -105,7 +105,7 @@ void KJFilename::timerEvent(TQTimerEvent *)
bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, TQt::CopyROP); bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, TQt::CopyROP);
bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, TQt::CopyROP); bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, TQt::CopyROP);
// apply the newly created tqmask // apply the newly created mask
mView.setMask(newMask); mView.setMask(newMask);
tqrepaint(); tqrepaint();
@ -227,7 +227,7 @@ void KJTime::paint(TQPainter *p, const TQRect &)
// draw background into buffer // draw background into buffer
bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
// draw time-display into buffer (that's a pixmap with a tqmask applied) // draw time-display into buffer (that's a pixmap with a mask applied)
bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP); bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
// and draw it on screen // and draw it on screen
@ -584,7 +584,7 @@ void KJFileInfo::paint(TQPainter *p, const TQRect &)
// draw background into buffer // draw background into buffer
bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
// draw time-display into buffer (that's a pixmap with a tqmask applied) // draw time-display into buffer (that's a pixmap with a mask applied)
bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP); bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
// and draw it on screen // and draw it on screen

@ -14,7 +14,7 @@ class KJFilename : public TQObject, public KJWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KJFilename(const TQStringList &, KJLoader *tqparent); KJFilename(const TQStringList &, KJLoader *parent);
~KJFilename(); ~KJFilename();
virtual void paint(TQPainter *, const TQRect &rect); virtual void paint(TQPainter *, const TQRect &rect);
@ -43,7 +43,7 @@ private:
class KJTime : public KJWidget class KJTime : public KJWidget
{ {
public: public:
KJTime(const TQStringList &, KJLoader *tqparent); KJTime(const TQStringList &, KJLoader *parent);
~KJTime(); ~KJTime();
virtual void paint(TQPainter *, const TQRect &rect); virtual void paint(TQPainter *, const TQRect &rect);
@ -73,7 +73,7 @@ private:
class KJVolumeText : public KJWidget class KJVolumeText : public KJWidget
{ {
public: public:
KJVolumeText(const TQStringList &, KJLoader *tqparent); KJVolumeText(const TQStringList &, KJLoader *parent);
~KJVolumeText(); ~KJVolumeText();
virtual void paint(TQPainter *, const TQRect &rect); virtual void paint(TQPainter *, const TQRect &rect);
@ -95,7 +95,7 @@ private:
class KJPitchText : public KJWidget class KJPitchText : public KJWidget
{ {
public: public:
KJPitchText(const TQStringList &, KJLoader *tqparent); KJPitchText(const TQStringList &, KJLoader *parent);
~KJPitchText(); ~KJPitchText();
virtual void paint(TQPainter *, const TQRect &rect); virtual void paint(TQPainter *, const TQRect &rect);
@ -118,7 +118,7 @@ private:
class KJFileInfo : public KJWidget class KJFileInfo : public KJWidget
{ {
public: public:
KJFileInfo(const TQStringList &, KJLoader *tqparent); KJFileInfo(const TQStringList &, KJLoader *parent);
~KJFileInfo(); ~KJFileInfo();
virtual void paint(TQPainter *, const TQRect &rect); virtual void paint(TQPainter *, const TQRect &rect);

@ -35,8 +35,8 @@
void KJVisScope::swapScope(Visuals newOne) void KJVisScope::swapScope(Visuals newOne)
{ {
//kdDebug(66666) << k_funcinfo << endl; //kdDebug(66666) << k_funcinfo << endl;
TQStringList line = tqparent()->item("analyzerwindow"); TQStringList line = parent()->item("analyzerwindow");
KJLoader *p=tqparent(); KJLoader *p=parent();
p->removeChild(this); p->removeChild(this);
delete this; delete this;
@ -66,8 +66,8 @@ void KJVisScope::swapScope(Visuals newOne)
* KJNullScope * KJNullScope
*******************************************/ *******************************************/
KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent) KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent)
: KJVisScope(tqparent) : KJVisScope(parent)
{ {
int x = l[1].toInt(); int x = l[1].toInt();
int y = l[2].toInt(); int y = l[2].toInt();
@ -75,7 +75,7 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent)
int ys = l[4].toInt() - y; int ys = l[4].toInt() - y;
// background under vis // background under vis
TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]);
mBack = new KPixmap ( TQSize(xs,ys) ); mBack = new KPixmap ( TQSize(xs,ys) );
bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
setRect ( x, y, xs, ys ); setRect ( x, y, xs, ys );
@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in)
if (!in) // only do something if users is still inside the button if (!in) // only do something if users is still inside the button
return; return;
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
swapScope(FFT); swapScope(FFT);
} }
@ -108,7 +108,7 @@ void KJNullScope::readConfig()
Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType(); Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType();
if ( v != Null ) if ( v != Null )
{ {
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
swapScope ( v ); swapScope ( v );
} }
} }
@ -118,8 +118,8 @@ void KJNullScope::readConfig()
* KJFFT - Analyzer like visualization, mono * KJFFT - Analyzer like visualization, mono
*************************************************/ *************************************************/
KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent) KJFFT::KJFFT(const TQStringList &l, KJLoader *parent)
: KJVisScope(tqparent), MonoFFTScope(50), mGradient(0) : KJVisScope(parent), MonoFFTScope(50), mGradient(0)
{ {
int x = l[1].toInt(); int x = l[1].toInt();
int y = l[2].toInt(); int y = l[2].toInt();
@ -129,7 +129,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
// each bar will be 1px wide // each bar will be 1px wide
mMultiples=1; mMultiples=1;
if ( tqparent->exist("analyzercolor") ) if ( parent->exist("analyzercolor") )
{ {
TQStringList &col = parser()["analyzercolor"]; TQStringList &col = parser()["analyzercolor"];
mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@ -140,7 +140,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
} }
// background under vis // background under vis
TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]);
mBack = new KPixmap ( TQSize(xs,ys) ); mBack = new KPixmap ( TQSize(xs,ys) );
bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size)
if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped) if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
{ {
if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
return; return;
} }
@ -171,12 +171,12 @@ void KJFFT::scopeEvent(float *d, int size)
int h = rect().height(); int h = rect().height();
TQBitmap mGradientMask ( rect().width(), h, true ); TQBitmap mGradientMask ( rect().width(), h, true );
TQPainter tqmask( &mGradientMask ); TQPainter mask( &mGradientMask );
float *start = d ; float *start = d ;
float *end = d + size /*- 1*/; float *end = d + size /*- 1*/;
// loop creating the tqmask for vis-gradient // loop creating the mask for vis-gradient
for ( ; start < end; ++start ) for ( ; start < end; ++start )
{ {
// 5 has been 8 before and I have no idea how this scaling works :/ // 5 has been 8 before and I have no idea how this scaling works :/
@ -191,10 +191,10 @@ void KJFFT::scopeEvent(float *d, int size)
else if ( amp > h ) amp = h; else if ( amp > h ) amp = h;
// make a part of the analyzer-gradient visible // make a part of the analyzer-gradient visible
tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 ); mask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
x += mMultiples; x += mMultiples;
} }
// done creating our tqmask // done creating our mask
// draw background of vis into it // draw background of vis into it
bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in)
return; return;
stop(); stop();
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
swapScope(Mono); swapScope(Mono);
} }
@ -236,7 +236,7 @@ void KJFFT::readConfig()
if ( v != FFT ) if ( v != FFT )
{ {
stop(); stop();
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
swapScope ( v ); swapScope ( v );
return; return;
} }
@ -250,8 +250,8 @@ void KJFFT::readConfig()
* KJStereoFFT - Analyzer like visualization, stereo * KJStereoFFT - Analyzer like visualization, stereo
*************************************************/ *************************************************/
KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent) KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent)
: KJVisScope(tqparent), StereoFFTScope(50), mGradient(0) : KJVisScope(parent), StereoFFTScope(50), mGradient(0)
{ {
//kdDebug(66666) << k_funcinfo << endl; //kdDebug(66666) << k_funcinfo << endl;
@ -263,7 +263,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
// each bar will be 1px wide // each bar will be 1px wide
mMultiples=1; mMultiples=1;
if ( tqparent->exist("analyzercolor") ) if ( parent->exist("analyzercolor") )
{ {
TQStringList &col = parser()["analyzercolor"]; TQStringList &col = parser()["analyzercolor"];
mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@ -274,7 +274,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
} }
// background under vis // background under vis
TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]);
mBack = new KPixmap ( TQSize(xs,ys) ); mBack = new KPixmap ( TQSize(xs,ys) );
bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped) if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
{ {
if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
return; return;
} }
@ -305,7 +305,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
int hh = (int)(rect().height()/2); int hh = (int)(rect().height()/2);
TQBitmap mGradientMask ( rect().width(), h, true ); TQBitmap mGradientMask ( rect().width(), h, true );
TQPainter tqmask( &mGradientMask ); TQPainter mask( &mGradientMask );
float *start = left; float *start = left;
float *end = left + len; float *end = left + len;
@ -313,7 +313,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
int amp = 0; int amp = 0;
int x = 0; int x = 0;
// loop creating the tqmask for vis-gradient // loop creating the mask for vis-gradient
for ( ; start < end; ++start ) for ( ; start < end; ++start )
{ {
n = log((*start)+1) * (float)hh * 5; n = log((*start)+1) * (float)hh * 5;
@ -324,16 +324,16 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
else if ( amp > hh ) amp = hh; else if ( amp > hh ) amp = hh;
// make a part of the analyzer-gradient visible // make a part of the analyzer-gradient visible
tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 ); mask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
x += mMultiples; x += mMultiples;
} }
// done creating our tqmask // done creating our mask
start = right; start = right;
end = right + len; end = right + len;
x = 0; x = 0;
// loop creating the tqmask for vis-gradient // loop creating the mask for vis-gradient
for ( ; start < end; ++start ) for ( ; start < end; ++start )
{ {
n = log((*start)+1) * (float)hh * 5; n = log((*start)+1) * (float)hh * 5;
@ -344,7 +344,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
else if ( amp > hh ) amp = hh; else if ( amp > hh ) amp = hh;
// make a part of the analyzer-gradient visible // make a part of the analyzer-gradient visible
tqmask.fillRect ( x, 0, mMultiples, amp, TQt::color1 ); mask.fillRect ( x, 0, mMultiples, amp, TQt::color1 );
x += mMultiples; x += mMultiples;
} }
@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in)
if (!in) // only do something if users is still inside the button if (!in) // only do something if users is still inside the button
return; return;
stop(); stop();
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
swapScope(Null); swapScope(Null);
} }
@ -387,7 +387,7 @@ void KJStereoFFT::readConfig()
if ( v != StereoFFT ) if ( v != StereoFFT )
{ {
stop(); stop();
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
swapScope ( v ); swapScope ( v );
return; return;
} }
@ -399,8 +399,8 @@ void KJStereoFFT::readConfig()
* KJScope - oscilloscope like visualization * KJScope - oscilloscope like visualization
*************************************************/ *************************************************/
KJScope::KJScope(const TQStringList &l, KJLoader *tqparent) KJScope::KJScope(const TQStringList &l, KJLoader *parent)
: KJVisScope(tqparent), MonoScope(50)/*, blurnum(0), mOsci(0)*/ : KJVisScope(parent), MonoScope(50)/*, blurnum(0), mOsci(0)*/
{ {
int x=l[1].toInt(); int x=l[1].toInt();
int y=l[2].toInt(); int y=l[2].toInt();
@ -411,7 +411,7 @@ KJScope::KJScope(const TQStringList &l, KJLoader *tqparent)
// kdDebug(66666) << "Analyzer Window " << x << "," << y << " " << mWidth << "," << mHeight << endl; // kdDebug(66666) << "Analyzer Window " << x << "," << y << " " << mWidth << "," << mHeight << endl;
if ( tqparent->exist("analyzercolor") ) if ( parent->exist("analyzercolor") )
{ {
TQStringList &col = parser()["analyzercolor"]; TQStringList &col = parser()["analyzercolor"];
mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@ -420,7 +420,7 @@ KJScope::KJScope(const TQStringList &l, KJLoader *tqparent)
mColor.setRgb ( 255, 255, 255 ); mColor.setRgb ( 255, 255, 255 );
// background under vis // background under vis
TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]);
mBack = new KPixmap ( TQSize(xs,ys) ); mBack = new KPixmap ( TQSize(xs,ys) );
bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in)
return; return;
stop(); stop();
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
swapScope(/*Null*/ StereoFFT); swapScope(/*Null*/ StereoFFT);
} }
@ -528,7 +528,7 @@ void KJScope::readConfig()
if ( v != Mono ) if ( v != Mono )
{ {
stop(); stop();
tqparent()->tqrepaint(rect(), false); parent()->tqrepaint(rect(), false);
swapScope ( v ); swapScope ( v );
return; return;
} }

@ -8,7 +8,7 @@ class KPixmap;
class KJVisScope : public KJWidget class KJVisScope : public KJWidget
{ {
public: public:
KJVisScope(KJLoader *tqparent) : KJWidget(tqparent) {}; KJVisScope(KJLoader *parent) : KJWidget(parent) {};
enum Visuals { Null=0, FFT, Mono, StereoFFT }; enum Visuals { Null=0, FFT, Mono, StereoFFT };
void swapScope(Visuals newOne); void swapScope(Visuals newOne);
// virtual void readConfig(); // virtual void readConfig();
@ -19,7 +19,7 @@ public:
class KJNullScope : public KJVisScope class KJNullScope : public KJVisScope
{ {
public: public:
KJNullScope(const TQStringList &, KJLoader *tqparent); KJNullScope(const TQStringList &, KJLoader *parent);
virtual void paint(TQPainter *p, const TQRect &); virtual void paint(TQPainter *p, const TQRect &);
virtual bool mousePress(const TQPoint&); virtual bool mousePress(const TQPoint&);
virtual void mouseRelease(const TQPoint &, bool in); virtual void mouseRelease(const TQPoint &, bool in);
@ -35,7 +35,7 @@ private:
class KJFFT : public KJVisScope, public MonoFFTScope class KJFFT : public KJVisScope, public MonoFFTScope
{ {
public: public:
KJFFT(const TQStringList &, KJLoader *tqparent); KJFFT(const TQStringList &, KJLoader *parent);
virtual void paint(TQPainter *p, const TQRect &); virtual void paint(TQPainter *p, const TQRect &);
virtual void scopeEvent(float *d, int size); virtual void scopeEvent(float *d, int size);
@ -57,7 +57,7 @@ private:
class KJStereoFFT : public KJVisScope, public StereoFFTScope class KJStereoFFT : public KJVisScope, public StereoFFTScope
{ {
public: public:
KJStereoFFT(const TQStringList &, KJLoader *tqparent); KJStereoFFT(const TQStringList &, KJLoader *parent);
virtual void paint(TQPainter *p, const TQRect &); virtual void paint(TQPainter *p, const TQRect &);
virtual void scopeEvent(float *left, float *right, int len); virtual void scopeEvent(float *left, float *right, int len);
@ -79,7 +79,7 @@ private:
class KJScope : public KJVisScope, public MonoScope class KJScope : public KJVisScope, public MonoScope
{ {
public: public:
KJScope ( const TQStringList &, KJLoader *tqparent); KJScope ( const TQStringList &, KJLoader *parent);
virtual void paint(TQPainter *p, const TQRect &); virtual void paint(TQPainter *p, const TQRect &);
virtual void scopeEvent(float *d, int size); virtual void scopeEvent(float *d, int size);

@ -36,11 +36,11 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent)
void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear) void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear)
{ {
TQPainter p(tqparent()); TQPainter p(parent());
if (me) if (me)
paint(&p, r.isValid() ? r : rect()); paint(&p, r.isValid() ? r : rect());
else else
tqparent()->tqrepaint(r.isValid() ? r : rect(), clear); parent()->tqrepaint(r.isValid() ? r : rect(), clear);
} }
const TQString &KJWidget::backgroundPressed(const TQString &bmp) const const TQString &KJWidget::backgroundPressed(const TQString &bmp) const

@ -35,7 +35,7 @@ public:
protected: protected:
const TQString &backgroundPressed(const TQString &bmp) const; const TQString &backgroundPressed(const TQString &bmp) const;
KJLoader *tqparent() const {return mParent;} KJLoader *parent() const {return mParent;}
KJLoader &parser() const {return *mParent;} KJLoader &parser() const {return *mParent;}
KJFont &textFont() const {return *mParent->mText;} KJFont &textFont() const {return *mParent->mText;}

@ -158,7 +158,7 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget
kdWarning() << "Cannot save " << meta_widget.key << " as required type." << endl; kdWarning() << "Cannot save " << meta_widget.key << " as required type." << endl;
} }
MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent) { MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent) {
TQLabel *tmp_label = 0L; TQLabel *tmp_label = 0L;
KFileMetaInfoItem info_item = meta_info.item(key); KFileMetaInfoItem info_item = meta_info.item(key);
TQVariant::Type type; TQVariant::Type type;
@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
// Get the correct validator // Get the correct validator
if ( info && !groupName.isNull() ) if ( info && !groupName.isNull() )
validator = info->createValidator( groupName, key, TQT_TQOBJECT(tqparent) ); validator = info->createValidator( groupName, key, TQT_TQOBJECT(parent) );
// meta_widget is used for book-keeping internally // meta_widget is used for book-keeping internally
meta_widget = new MetaWidget; meta_widget = new MetaWidget;
@ -190,7 +190,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
if ((type == TQVariant::Int) || (type == TQVariant::UInt)) { if ((type == TQVariant::Int) || (type == TQVariant::UInt)) {
// We're an int, make a spin box // We're an int, make a spin box
TQSpinBox *box = new TQSpinBox(tqparent); TQSpinBox *box = new TQSpinBox(parent);
// Well, normally metatag doesn't care that much about suffixes // Well, normally metatag doesn't care that much about suffixes
// and prefixes, but this is just too easy. // and prefixes, but this is just too easy.
@ -226,7 +226,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
combo_box = validator->isA("KStringListValidator"); combo_box = validator->isA("KStringListValidator");
if (combo_box) { if (combo_box) {
TQComboBox *combo = new TQComboBox(tqparent); TQComboBox *combo = new TQComboBox(parent);
combo->clear(); combo->clear();
combo->insertStringList(static_cast< combo->insertStringList(static_cast<
@ -241,7 +241,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
else { else {
KLineEdit *edit; KLineEdit *edit;
edit = new KLineEdit(tqparent); edit = new KLineEdit(parent);
edit->setText(info_item.value().toString()); edit->setText(info_item.value().toString());
edit->setValidator(validator); edit->setValidator(validator);
connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified())); connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified()));
@ -258,7 +258,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
mGrid->addMultiCellWidget(meta_widget->widget, mNextRow, mNextRow, 1, 2); mGrid->addMultiCellWidget(meta_widget->widget, mNextRow, mNextRow, 1, 2);
// Add our label. This is the easy part // Add our label. This is the easy part
tmp_label = new TQLabel(meta_widget->widget, label + ":", tqparent); tmp_label = new TQLabel(meta_widget->widget, label + ":", parent);
mGrid->addWidget(tmp_label, mNextRow, 0); mGrid->addWidget(tmp_label, mNextRow, 0);

@ -36,7 +36,7 @@ class Editor:public KDialogBase {
TQString keyGroup(const KFileMetaInfo &, TQString); TQString keyGroup(const KFileMetaInfo &, TQString);
void saveControl(KFileMetaInfo& meta_info, const MetaWidget&); void saveControl(KFileMetaInfo& meta_info, const MetaWidget&);
MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent); MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent);
TQPtrList<MetaWidget> mControls; TQPtrList<MetaWidget> mControls;

@ -205,7 +205,7 @@ void MilkChocolate::popup()
void MilkChocolate::slotPlaying() void MilkChocolate::slotPlaying()
{ {
// connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptRetqparent(WId))); // connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId)));
changeStatusbar(napp->player()->current().title(), napp->player()->lengthString()); changeStatusbar(napp->player()->current().title(), napp->player()->lengthString());
mPlay->setOn(true); mPlay->setOn(true);
mStop->setEnabled(true); mStop->setEnabled(true);

@ -5,7 +5,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <klocale.h> #include <klocale.h>
Finder::Finder(TQWidget *tqparent) : KDialogBase(tqparent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find")) Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find"))
{ {
TQWidget *mainWidget = new TQWidget(this); TQWidget *mainWidget = new TQWidget(this);
mainWidget->setMinimumWidth(320); mainWidget->setMinimumWidth(320);

@ -12,7 +12,7 @@ class Finder : public KDialogBase
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Finder(TQWidget *tqparent); Finder(TQWidget *parent);
bool regexp() const; bool regexp() const;
bool isForward() const; bool isForward() const;

@ -43,13 +43,13 @@
#define SPL SplitPlaylist::SPL() #define SPL SplitPlaylist::SPL()
SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text) SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text)
: TQCheckListItem(tqparent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) : TQCheckListItem(parent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false)
{ {
addRef(); addRef();
setUrl(text); setUrl(text);
static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after); static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
setOn(true); setOn(true);
// is this really needed, it makes the listview too wide for me :( // is this really needed, it makes the listview too wide for me :(
@ -65,8 +65,8 @@ SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after,
PlaylistItemData::added(); PlaylistItemData::added();
} }
SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &props) SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &props)
: TQCheckListItem(tqparent, 0, TQCheckListItem::CheckBox), removed(false) : TQCheckListItem(parent, 0, TQCheckListItem::CheckBox), removed(false)
{ {
addRef(); addRef();
@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after,
} }
} }
static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after); static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
modified(); modified();
if (!streamable() && enqueue(url())) if (!streamable() && enqueue(url()))
@ -344,8 +344,8 @@ void SafeListViewItem::remove()
PlaylistItemData::removed(); PlaylistItemData::removed();
} }
List::List(View *tqparent) List::List(View *parent)
: KListView(tqparent), recursiveAddAfter(0), listJob(0) : KListView(parent), recursiveAddAfter(0), listJob(0)
{ {
addColumn(i18n("File")); addColumn(i18n("File"));
addColumn(i18n("Time")); addColumn(i18n("Time"));
@ -357,8 +357,8 @@ List::List(View *tqparent)
setSelectionMode(TQListView::Extended); setSelectionMode(TQListView::Extended);
connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move())); connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move()));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), tqparent, TQT_SLOT(setNoSorting())); connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting()));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), tqparent, TQT_SLOT(deleteSelected())); connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected()));
} }
List::~List() List::~List()
@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const
void List::dropEvent(TQDropEvent *event, TQListViewItem *after) void List::dropEvent(TQDropEvent *event, TQListViewItem *after)
{ {
static_cast<View*>(TQT_TQWIDGET(tqparent()))->setNoSorting(); static_cast<View*>(TQT_TQWIDGET(parent()))->setNoSorting();
KURL::List textlist; KURL::List textlist;
if (!KURLDrag::decode(event, textlist)) return; if (!KURLDrag::decode(event, textlist)) return;
event->acceptAction(); event->acceptAction();

@ -21,8 +21,8 @@ class SafeListViewItem
, public DownloadItem , public DownloadItem
{ {
public: public:
SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text); SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text);
SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &properties); SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &properties);
virtual ~SafeListViewItem(); virtual ~SafeListViewItem();
virtual TQString property(const TQString &, const TQString & = 0) const; virtual TQString property(const TQString &, const TQString & = 0) const;
@ -61,7 +61,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
friend class View; friend class View;
public: public:
List(View *tqparent); List(View *parent);
virtual ~List(); virtual ~List();
TQListViewItem *openGlobal(const KURL&, TQListViewItem * =0); TQListViewItem *openGlobal(const KURL&, TQListViewItem * =0);
TQListViewItem *importGlobal(const KURL&, TQListViewItem * =0); TQListViewItem *importGlobal(const KURL&, TQListViewItem * =0);

@ -44,11 +44,11 @@
#include <fixx11h.h> #include <fixx11h.h>
KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name) KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name)
: KSystemTray(tqparent, name) : KSystemTray(parent, name)
{ {
tqsetAlignment(AlignHCenter | AlignVCenter); tqsetAlignment(AlignHCenter | AlignVCenter);
menu = (KPopupMenu *)tqparent->guiFactory()->container(contextMenu, tqparent); menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0); menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0);
setAcceptDrops(true); setAcceptDrops(true);
} }

@ -40,7 +40,7 @@ Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name = 0); KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0);
void changeTitle(const TQPixmap &, const TQString &); void changeTitle(const TQPixmap &, const TQString &);
protected: protected:
virtual void showEvent(TQShowEvent *); virtual void showEvent(TQShowEvent *);

@ -72,7 +72,7 @@ const int COVER_MAXH = 128;
class PassivePopup : public KPassivePopup class PassivePopup : public KPassivePopup
{ {
public: public:
PassivePopup(TQWidget *tqparent = 0, const char *name = 0) : KPassivePopup(tqparent, name) {} PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {}
protected: protected:
virtual void enterEvent(TQEvent *) virtual void enterEvent(TQEvent *)

@ -8,8 +8,8 @@
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kconfig.h> #include <kconfig.h>
Prefs::Prefs(TQObject* tqparent) Prefs::Prefs(TQObject* parent)
: CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", tqparent) : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", parent)
{ {
TQVBoxLayout *king=new TQVBoxLayout(this); TQVBoxLayout *king=new TQVBoxLayout(this);
TQHBoxLayout *minor; TQHBoxLayout *minor;

@ -11,7 +11,7 @@ class Prefs : public CModule
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Prefs(TQObject* tqparent); Prefs(TQObject* parent);
virtual void save(); virtual void save();
virtual void reopen(); virtual void reopen();

@ -20,7 +20,7 @@
RealFFT::RealFFT(int fftlen) { RealFFT::RealFFT(int fftlen) {
int i; int i;
int temp; int temp;
int tqmask; int mask;
/* /*
* FFT size is only half the number of data points * FFT size is only half the number of data points
@ -43,8 +43,8 @@ RealFFT::RealFFT(int fftlen) {
for(i=0;i<Points/2;i++) for(i=0;i<Points/2;i++)
{ {
temp=0; temp=0;
for(tqmask=Points/4;tqmask>0;tqmask >>= 1) for(mask=Points/4;mask>0;mask >>= 1)
temp=(temp >> 1) + (i&tqmask ? Points/2 : 0); temp=(temp >> 1) + (i&mask ? Points/2 : 0);
BitReversed[i]=temp; BitReversed[i]=temp;
} }

@ -31,14 +31,14 @@ WaRegion::WaRegion(TQString filename) {
KSimpleConfig regionFile(filename, true); KSimpleConfig regionFile(filename, true);
// Clear our variables by default // Clear our variables by default
window_tqmask = 0; window_mask = 0;
shade_tqmask = 0; shade_mask = 0;
// Make the new bitmaps, default window size // Make the new bitmaps, default window size
window_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true);
shade_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); shade_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true);
// Load the normal window tqmask data // Load the normal window mask data
regionFile.setGroup("Normal"); regionFile.setGroup("Normal");
TQValueList<int> num_points; TQValueList<int> num_points;
@ -53,22 +53,22 @@ WaRegion::WaRegion(TQString filename) {
point_list = parseList(regionFile.readEntry(pointListNames[x])); point_list = parseList(regionFile.readEntry(pointListNames[x]));
} }
// Now build the tqmask // Now build the mask
buildPixmap(num_points, point_list, window_tqmask); buildPixmap(num_points, point_list, window_mask);
// Load the windowshade tqmask data // Load the windowshade mask data
regionFile.setGroup("WindowShade"); regionFile.setGroup("WindowShade");
num_points = parseList(regionFile.readEntry("NumPoints")); num_points = parseList(regionFile.readEntry("NumPoints"));
point_list = parseList(regionFile.readEntry("PointList")); point_list = parseList(regionFile.readEntry("PointList"));
// Now build the tqmask // Now build the mask
buildPixmap(num_points, point_list, shade_tqmask); buildPixmap(num_points, point_list, shade_mask);
} }
WaRegion::~WaRegion() { WaRegion::~WaRegion() {
delete window_tqmask; delete window_mask;
delete shade_tqmask; delete shade_mask;
} }
void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValueList<int> &points_list, TQBitmap *dest) { void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValueList<int> &points_list, TQBitmap *dest) {
@ -101,7 +101,7 @@ void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValu
point_array.setPoint(i, x, y); point_array.setPoint(i, x, y);
} }
// Now draw it as a filled polygon on the tqmask // Now draw it as a filled polygon on the mask
bmp.drawPolygon(point_array); bmp.drawPolygon(point_array);
} }

@ -9,15 +9,15 @@ public:
WaRegion(TQString filename); WaRegion(TQString filename);
~WaRegion(); ~WaRegion();
const TQBitmap *mainWindowMask() const { return window_tqmask; } const TQBitmap *mainWindowMask() const { return window_mask; }
const TQBitmap *mainWindowShadeMask() const { return shade_tqmask; } const TQBitmap *mainWindowShadeMask() const { return shade_mask; }
private: private:
TQValueList<int> parseList(const TQString &list) const; TQValueList<int> parseList(const TQString &list) const;
void buildPixmap(const TQValueList<int> &num_points, const TQValueList<int> &point_list, TQBitmap *dest); void buildPixmap(const TQValueList<int> &num_points, const TQValueList<int> &point_list, TQBitmap *dest);
TQBitmap *window_tqmask; TQBitmap *window_mask;
TQBitmap *shade_tqmask; TQBitmap *shade_mask;
}; };
extern WaRegion *windowRegion; extern WaRegion *windowRegion;

@ -23,11 +23,11 @@
#include "waSkinManager.h" #include "waSkinManager.h"
#include "winSkinConfig.h" #include "winSkinConfig.h"
WinSkinConfig::WinSkinConfig(TQWidget * tqparent, WaSkinManager *waSkinManager) : WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
CModule(i18n("Winskin"), CModule(i18n("Winskin"),
i18n("Skin Selection for the Winskin Plugin"), i18n("Skin Selection for the Winskin Plugin"),
"style", "style",
TQT_TQOBJECT(tqparent)) TQT_TQOBJECT(parent))
{ {
// Make a token horizontal tqlayout box // Make a token horizontal tqlayout box
vbox = new TQVBoxLayout(this); vbox = new TQVBoxLayout(this);

@ -12,7 +12,7 @@ class WinSkinConfig:public CModule {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
WinSkinConfig(TQWidget * tqparent, WaSkinManager *waManager); WinSkinConfig(TQWidget * parent, WaSkinManager *waManager);
void save(); void save();

@ -17,8 +17,8 @@
#define __BANDS 75 #define __BANDS 75
#define __SPAHEIGHT 15 #define __SPAHEIGHT 15
WinSkinVis::WinSkinVis(TQObject *tqparent, const char *name): WinSkinVis::WinSkinVis(TQObject *parent, const char *name):
TQObject(tqparent,name),Visualization(50) { TQObject(parent,name),Visualization(50) {
m_currentPeaks=new float[__BANDS]; m_currentPeaks=new float[__BANDS];

@ -28,7 +28,7 @@ class WinSkinVis : public TQObject, public Visualization {
TQ_OBJECT TQ_OBJECT
public: public:
WinSkinVis(TQObject* tqparent,const char* name); WinSkinVis(TQObject* parent,const char* name);
~WinSkinVis(); ~WinSkinVis();
/** /**

@ -739,7 +739,7 @@ void xineVideoPlayObject_impl::x11WindowId( long window )
{ {
XLockDisplay( display ); XLockDisplay( display );
// Change window and set event tqmask of new window // Change window and set event mask of new window
visual.d = window; visual.d = window;
XSelectInput( display, window, ExposureMask ); XSelectInput( display, window, ExposureMask );

Loading…
Cancel
Save