diff options
421 files changed, 1411 insertions, 1411 deletions
diff --git a/arts/builder/TODO b/arts/builder/TODO index 0c8a0859..8b962aa5 100644 --- a/arts/builder/TODO +++ b/arts/builder/TODO @@ -44,7 +44,7 @@ Wishlist for the artsbuilder app: - make _changed Q_SIGNALS visible so you can connect the value_changed of a 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) - add structure property dialog with structure meta information, at least diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index bad531aa..790691e8 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -45,8 +45,8 @@ static void min_size(TQWidget *w) { } #endif -ExecDlg::ExecDlg(TQWidget *tqparent, ExecutableStructure *structure) - :TQDialog(tqparent,"X") +ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) + :TQDialog(parent,"X") /*, TRUE)*/ { this->structure = structure; diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h index d916a4ff..61348c0f 100644 --- a/arts/builder/execdlg.h +++ b/arts/builder/execdlg.h @@ -40,7 +40,7 @@ public: void start(); void done(int r); - ExecDlg(TQWidget *tqparent, ExecutableStructure *structure); + ExecDlg(TQWidget *parent, ExecutableStructure *structure); protected slots: void updateCpuUsage(); diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp index 9680fc7e..3b4d455a 100644 --- a/arts/builder/interfacedlg.cpp +++ b/arts/builder/interfacedlg.cpp @@ -41,7 +41,7 @@ using namespace std; -InterfaceDlg::InterfaceDlg(TQWidget *tqparent) :TQDialog(tqparent,"Props", TRUE) +InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) { setCaption(i18n("aRts: Structureport View")); diff --git a/arts/builder/interfacedlg.h b/arts/builder/interfacedlg.h index 235245a7..09cf5659 100644 --- a/arts/builder/interfacedlg.h +++ b/arts/builder/interfacedlg.h @@ -37,7 +37,7 @@ protected: TQListBox *listbox; public: - InterfaceDlg(TQWidget *tqparent); + InterfaceDlg(TQWidget *parent); std::string interfaceName(); void update(const std::string& interface, const std::string& indent); diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp index 38f28ace..2aed8401 100644 --- a/arts/builder/menumaker.cpp +++ b/arts/builder/menumaker.cpp @@ -5,11 +5,11 @@ 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) { action = new KAction(TQString::fromLocal8Bit(text)); - tqparent->insert(action); + parent->insert(action); connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated())); } @@ -95,7 +95,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix) /* 000 */ /*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int))); 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()); categories.push_back(new MenuCategory(name,prefix,newMenu)); } diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h index 583854f6..3cb93fe3 100644 --- a/arts/builder/menumaker.h +++ b/arts/builder/menumaker.h @@ -19,7 +19,7 @@ protected: TQCString text; public: - MenuEntry(MenuMaker *menumaker, KActionMenu *tqparent, const char *text); + MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text); public slots: void activated(); diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp index 5ab19fe7..8b2aeed8 100644 --- a/arts/builder/mwidget.cpp +++ b/arts/builder/mwidget.cpp @@ -608,8 +608,8 @@ void ModuleWidget::autoRedrawRouter() if(autorouter->needRedraw()) redrawAll(); } -ModuleWidget::ModuleWidget(Structure *structure, TQWidget *tqparent, const char *name, WFlags f) - : QtTableView( tqparent, name, f), +ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *name, WFlags f) + : QtTableView( parent, name, f), updateDepth( 0 ), activeTool( 0L ), structure( structure ), diff --git a/arts/builder/mwidget.h b/arts/builder/mwidget.h index b3b41b78..cc6dbfca 100644 --- a/arts/builder/mwidget.h +++ b/arts/builder/mwidget.h @@ -109,7 +109,7 @@ public: TQPoint componentPos(const StructureComponent *component) 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); ~ModuleWidget(); diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index ecd877c9..63f2546c 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -40,7 +40,7 @@ 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; diff --git a/arts/builder/portposdlg.h b/arts/builder/portposdlg.h index aa61bad1..70d39338 100644 --- a/arts/builder/portposdlg.h +++ b/arts/builder/portposdlg.h @@ -39,7 +39,7 @@ protected: std::vector<StructurePort *> listports; public: - PortPosDlg(TQWidget *tqparent, Structure *structure); + PortPosDlg(TQWidget *parent, Structure *structure); void update(); public slots: diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index ed3df208..df76588a 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -36,8 +36,8 @@ #include <arts/debug.h> -PropertyPanel::PropertyPanel( TQWidget* tqparent, const char* name, WFlags fl ) - : PropertyPanelBase( tqparent, name, fl ), +PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl ) + : PropertyPanelBase( parent, name, fl ), component(0L), port(0L) { diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h index 07ce3f90..cf34fe65 100644 --- a/arts/builder/propertypanel.h +++ b/arts/builder/propertypanel.h @@ -36,7 +36,7 @@ class PropertyPanel: public PropertyPanelBase TQ_OBJECT 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: void setSelectedComponent( StructureComponent *component ); diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index bfb5539c..f8716b44 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -45,8 +45,8 @@ public: void paintEvent( TQPaintEvent * ); }; -TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +TQCornerSquare::TQCornerSquare( TQWidget *parent, const char *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. 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 ) - : TQFrame( tqparent, name, f ) +QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { nRows = nCols = 0; // zero rows/cols xCellOffs = yCellOffs = 0; // zero offset diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h index a6e868b6..7d4f14e2 100644 --- a/arts/builder/qttableview.h +++ b/arts/builder/qttableview.h @@ -37,7 +37,7 @@ public: void tqrepaint( const TQRect &, bool erase=TRUE ); protected: - QtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); ~QtTableView(); int numRows() const; diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp index c54cbabd..5b738471 100644 --- a/arts/builder/retrievedlg.cpp +++ b/arts/builder/retrievedlg.cpp @@ -40,7 +40,7 @@ static void min_size(TQWidget *w) { 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")); diff --git a/arts/builder/retrievedlg.h b/arts/builder/retrievedlg.h index 3ffa57ee..51649c4f 100644 --- a/arts/builder/retrievedlg.h +++ b/arts/builder/retrievedlg.h @@ -38,7 +38,7 @@ class RetrieveDlg :public TQDialog { TQ_OBJECT TQListBox *listbox; public: - RetrieveDlg(TQWidget *tqparent); + RetrieveDlg(TQWidget *parent); TQString result(); public slots: void help(); diff --git a/arts/examples/instrument_flexible_slide_GUI.arts b/arts/examples/instrument_flexible_slide_GUI.arts index 92523fa0..3b0f0bca 100644 --- a/arts/examples/instrument_flexible_slide_GUI.arts +++ b/arts/examples/instrument_flexible_slide_GUI.arts @@ -8,7 +8,7 @@ module=Arts::Poti { id=1 } - port=tqparent + port=parent { id=2 } @@ -71,7 +71,7 @@ module=Arts::Widget { id=14 } - port=tqparent + port=parent { id=15 } @@ -110,7 +110,7 @@ module=Arts::Poti { id=22 } - port=tqparent + port=parent { id=23 } @@ -169,7 +169,7 @@ module=Arts::Poti { id=35 } - port=tqparent + port=parent { id=36 } @@ -230,7 +230,7 @@ module=Arts::Poti { id=48 } - port=tqparent + port=parent { id=49 } @@ -291,7 +291,7 @@ module=Arts::Poti { id=61 } - port=tqparent + port=parent { id=62 } @@ -345,7 +345,7 @@ module=Arts::Poti } structureport { - name=tqparent + name=parent x=2 y=1 position=0 diff --git a/arts/examples/instrument_moog_vcf_tune_GUI.arts b/arts/examples/instrument_moog_vcf_tune_GUI.arts index 0aff72a8..6db62f60 100644 --- a/arts/examples/instrument_moog_vcf_tune_GUI.arts +++ b/arts/examples/instrument_moog_vcf_tune_GUI.arts @@ -8,7 +8,7 @@ module=Arts::Widget { id=1 } - port=tqparent + port=parent { id=2 } @@ -47,7 +47,7 @@ module=Arts::Poti { id=9 } - port=tqparent + port=parent { id=10 } @@ -110,7 +110,7 @@ module=Arts::Poti { id=22 } - port=tqparent + port=parent { id=23 } @@ -173,7 +173,7 @@ module=Arts::Poti { id=35 } - port=tqparent + port=parent { id=36 } @@ -229,7 +229,7 @@ module=Arts::Poti } structureport { - name=tqparent + name=parent x=2 y=1 position=0 diff --git a/arts/examples/mixer_element_eq.arts b/arts/examples/mixer_element_eq.arts index c798166f..6123bb24 100644 --- a/arts/examples/mixer_element_eq.arts +++ b/arts/examples/mixer_element_eq.arts @@ -8,7 +8,7 @@ module=Arts::Widget { id=1 } - port=tqparent + port=parent { id=2 } @@ -550,7 +550,7 @@ structureport } structureport { - name=tqparent + name=parent x=7 y=0 position=0 diff --git a/arts/examples/mixer_element_eqfx.arts b/arts/examples/mixer_element_eqfx.arts index 8bde0f61..b7248fcb 100644 --- a/arts/examples/mixer_element_eqfx.arts +++ b/arts/examples/mixer_element_eqfx.arts @@ -4,7 +4,7 @@ module=Gui_SUB_PANEL id=147 x=6 y=1 - port=tqparent + port=parent { id=148 connect_to=279 @@ -52,7 +52,7 @@ module=Gui_POTI id=155 x=0 y=3 - port=tqparent + port=parent { id=156 connect_to=154 @@ -193,7 +193,7 @@ module=Gui_LABEL id=182 x=13 y=4 - port=tqparent + port=parent { id=183 connect_to=154 @@ -313,7 +313,7 @@ module=Gui_POTI id=205 x=14 y=9 - port=tqparent + port=parent { id=206 connect_to=154 @@ -365,7 +365,7 @@ module=Gui_POTI id=215 x=14 y=11 - port=tqparent + port=parent { id=216 connect_to=154 @@ -417,7 +417,7 @@ module=Gui_POTI id=225 x=14 y=7 - port=tqparent + port=parent { id=226 connect_to=154 @@ -469,7 +469,7 @@ module=Gui_POTI id=235 x=14 y=13 - port=tqparent + port=parent { id=236 connect_to=154 @@ -521,7 +521,7 @@ module=Gui_POTI id=245 x=14 y=15 - port=tqparent + port=parent { id=246 connect_to=154 @@ -573,7 +573,7 @@ module=Gui_POTI id=255 x=14 y=17 - port=tqparent + port=parent { id=256 connect_to=154 @@ -722,7 +722,7 @@ structureport } structureport { - name=tqparent + name=parent x=7 y=0 position=0 diff --git a/arts/examples/mixer_element_simple.arts b/arts/examples/mixer_element_simple.arts index be572011..01246090 100644 --- a/arts/examples/mixer_element_simple.arts +++ b/arts/examples/mixer_element_simple.arts @@ -8,7 +8,7 @@ module=Arts::Widget { id=1 } - port=tqparent + port=parent { id=2 } @@ -47,7 +47,7 @@ module=Arts::Poti { id=9 } - port=tqparent + port=parent { id=10 } @@ -218,7 +218,7 @@ structureport } structureport { - name=tqparent + name=parent x=7 y=0 position=0 diff --git a/arts/examples/template_Instrument_GUI.arts b/arts/examples/template_Instrument_GUI.arts index 751d4cc4..67db385e 100644 --- a/arts/examples/template_Instrument_GUI.arts +++ b/arts/examples/template_Instrument_GUI.arts @@ -8,7 +8,7 @@ module=Arts::Widget { id=1 } - port=tqparent + port=parent { id=2 } @@ -40,7 +40,7 @@ module=Arts::Widget } structureport { - name=tqparent + name=parent x=2 y=1 position=0 diff --git a/arts/examples/template_Mixer_Element.arts b/arts/examples/template_Mixer_Element.arts index caa885ed..40c3e63c 100644 --- a/arts/examples/template_Mixer_Element.arts +++ b/arts/examples/template_Mixer_Element.arts @@ -4,7 +4,7 @@ module=Gui_SUB_PANEL id=0 x=0 y=1 - port=tqparent + port=parent { id=1 connect_to=26 @@ -88,7 +88,7 @@ module=Gui_LABEL id=17 x=6 y=4 - port=tqparent + port=parent { id=18 connect_to=7 @@ -158,7 +158,7 @@ structureport } structureport { - name=tqparent + name=parent x=1 y=0 position=0 diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl index de6da9e7..c88dd3f1 100644 --- a/arts/gui/common/artsgui.idl +++ b/arts/gui/common/artsgui.idl @@ -48,7 +48,7 @@ module Arts { interface Widget { readonly attribute long widgetID; - attribute Widget tqparent; + attribute Widget parent; attribute long x,y,width,height; attribute boolean visible; attribute SizePolicy hSizePolicy; @@ -82,7 +82,7 @@ module Arts { }; interface Frame : Widget { - void constructor( Widget tqparent ); + void constructor( Widget parent ); attribute long margin; attribute long linewidth; @@ -118,7 +118,7 @@ module Arts { Usage is quite simple: Add the widgets you have in the right order 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. (akrille) @@ -173,7 +173,7 @@ module Arts { 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 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) */ interface PopupBox : Frame { @@ -186,8 +186,8 @@ module Arts { }; interface Button : Widget { - void constructor( Widget tqparent ); - void constructor( string text, Widget tqparent ); + void constructor( Widget parent ); + void constructor( string text, Widget parent ); attribute string text; attribute boolean toggle; @@ -205,7 +205,7 @@ module Arts { }; interface Fader : Widget { - void constructor( Widget tqparent ); + void constructor( Widget parent ); attribute string caption, color; attribute float min, max, value; @@ -213,21 +213,21 @@ module Arts { }; interface LineEdit : Widget { - void constructor( Widget tqparent ); + void constructor( Widget parent ); attribute string caption; attribute string text; }; interface SpinBox : Widget { - void constructor( Widget tqparent ); + void constructor( Widget parent ); attribute string caption; attribute long min, max, value; }; interface ComboBox : Widget { - void constructor( Widget tqparent ); + void constructor( Widget parent ); attribute string caption; attribute sequence<string> choices; @@ -235,7 +235,7 @@ module Arts { }; interface Graph : Widget { - void constructor( Widget tqparent ); + void constructor( Widget parent ); attribute string caption; attribute float minx, maxx, miny, maxy; diff --git a/arts/gui/kde/artstestgui.cpp b/arts/gui/kde/artstestgui.cpp index 9464ac7a..c7532003 100644 --- a/arts/gui/kde/artstestgui.cpp +++ b/arts/gui/kde/artstestgui.cpp @@ -41,7 +41,7 @@ int main(int argc, char **argv) w.width(500); w.height(350); w.show(); Button b; - b.tqparent(w); + b.parent(w); b.x(10); b.y(10); b.width(100); @@ -50,7 +50,7 @@ int main(int argc, char **argv) b.show(); Button b2; - b2.tqparent(w); + b2.parent(w); b2.x(10); b2.y(30); b2.width(100); @@ -59,7 +59,7 @@ int main(int argc, char **argv) b2.show(); Poti p; - p.tqparent(w); + p.parent(w); p.x(150); p.y(10); p.caption("delay (ms)"); @@ -70,7 +70,7 @@ int main(int argc, char **argv) p.show(); Poti q; - q.tqparent(w); + q.parent(w); q.x(250); q.y(10); q.caption("delay (ms)"); @@ -81,7 +81,7 @@ int main(int argc, char **argv) q.show(); Graph g; - g.tqparent(w); + g.parent(w); g.x(50); g.y(70); g.width(400); diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp index 5188e81a..763239f7 100644 --- a/arts/gui/kde/kartswidget.cpp +++ b/arts/gui/kde/kartswidget.cpp @@ -31,31 +31,31 @@ public: TQHBoxLayout *tqlayout; }; -KArtsWidget::KArtsWidget( TQWidget* tqparent, const char* name ) - :TQWidget( tqparent, name ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( TQWidget* parent, const char* name ) + :TQWidget( parent, name ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; d->tqlayout = new TQHBoxLayout(this); } -KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name ) - :TQWidget( tqparent, name ), _content( Arts::Widget::null()) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ) + :TQWidget( parent, name ), _content( Arts::Widget::null()) { d = new KArtsWidgetPrivate; d->tqlayout = new TQHBoxLayout(this); setContent(content); } -KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name, WFlags wflags ) - :TQWidget( tqparent, name, wflags ), _content( Arts::Widget::null() ) +KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name, WFlags wflags ) + :TQWidget( parent, name, wflags ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; d->tqlayout = new TQHBoxLayout( this ); setContent( content ); } -KArtsWidget::KArtsWidget(TQWidget* tqparent, const char* name, WFlags wflags ) - :TQWidget(tqparent, name, wflags ), _content(Arts::Widget::null()) +KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags ) + :TQWidget(parent, name, wflags ), _content(Arts::Widget::null()) { d = new KArtsWidgetPrivate; d->tqlayout = new TQHBoxLayout(this); diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index 7e745bf6..df46ae3b 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -40,7 +40,7 @@ class KArtsWidgetPrivate; * tqlayout->addWidget(w); * </pre> * - * In line 2 of the code, the "this" is the tqparent widget (which is usually + * In line 2 of the code, the "this" is the parent widget (which is usually * this in TQt code). * * The KArtsWidget class keeps a reference to the content widget, so the @@ -57,12 +57,12 @@ public: /** * creates a new KArtsWidget */ - KArtsWidget( TQWidget* tqparent, const char* name ); + KArtsWidget( TQWidget* parent, const char* name ); /** * creates a new KArtsWidget and sets the content to an Arts::Widget */ - KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name ); + KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ); /** * creates a new KArtsWidget with WidgetFlags and content diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp index 95f7699f..34c5791b 100644 --- a/arts/gui/kde/kbutton_impl.cpp +++ b/arts/gui/kde/kbutton_impl.cpp @@ -72,12 +72,12 @@ KButton_impl::KButton_impl( TQPushButton * widget ) void KButton_impl::constructor( Widget p ) { - tqparent( p ); + parent( p ); } void KButton_impl::constructor( const string & t, Widget p ) { - tqparent( p ); + parent( p ); text( t ); } diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h index 4db27c84..be3aa2f6 100644 --- a/arts/gui/kde/kbutton_impl.h +++ b/arts/gui/kde/kbutton_impl.h @@ -55,7 +55,7 @@ protected: public: KButton_impl( TQPushButton * w = 0 ); - void constructor( Widget tqparent ); + void constructor( Widget parent ); void constructor( const std::string &, Widget ); void emitClicked(); diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h index ad8e5739..f9de6c55 100644 --- a/arts/gui/kde/kcombobox_impl.h +++ b/arts/gui/kde/kcombobox_impl.h @@ -57,7 +57,7 @@ protected: public: KComboBox_impl( KComboBox * w = 0 ); - void constructor( Widget p ) { tqparent( p ); } + void constructor( Widget p ) { parent( p ); } std::string caption(); void caption(const std::string & newCaption); diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp index 239d303a..e5179f9f 100644 --- a/arts/gui/kde/kfader.cpp +++ b/arts/gui/kde/kfader.cpp @@ -5,14 +5,14 @@ void KFader::init() { } -KFader::KFader( TQWidget * tqparent, const char * name ) - : TQSlider( Qt::Vertical, tqparent, name ) +KFader::KFader( TQWidget * parent, const char * name ) + : TQSlider( Qt::Vertical, parent, name ) { init(); } -KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent, const char * name ) - : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, tqparent, name ) +KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent, const char * name ) + : TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name ) { init(); } diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h index 33df0d40..6b63e066 100644 --- a/arts/gui/kde/kfader.h +++ b/arts/gui/kde/kfader.h @@ -32,8 +32,8 @@ class KFader : public TQSlider protected: void init(); public: - KFader( TQWidget * tqparent = 0, const char * name = 0 ); - KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * tqparent = 0, const char * name = 0 ); + KFader( TQWidget * parent = 0, const char * name = 0 ); + KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = 0, const char * name = 0 ); virtual ~KFader(); diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h index e15695f0..9ef877bd 100644 --- a/arts/gui/kde/kfader_impl.h +++ b/arts/gui/kde/kfader_impl.h @@ -63,7 +63,7 @@ protected: public: KFader_impl( KFader * w = 0 ); - void constructor( Widget p ) { tqparent( p ); } + void constructor( Widget p ) { parent( p ); } std::string caption(); void caption(const std::string& newText); diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h index ae2e79a4..57af42e6 100644 --- a/arts/gui/kde/kframe_impl.h +++ b/arts/gui/kde/kframe_impl.h @@ -34,7 +34,7 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, public: KFrame_impl( TQFrame * widget = 0 ); - inline void constructor( Widget p ) { tqparent( p ); } + inline void constructor( Widget p ) { parent( p ); } long margin(); void margin( long m ); diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp index 96d18c5c..1278ba21 100644 --- a/arts/gui/kde/kgraph.cpp +++ b/arts/gui/kde/kgraph.cpp @@ -31,8 +31,8 @@ using namespace Arts; using namespace std; -KGraph::KGraph( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ) +KGraph::KGraph( TQWidget * parent, const char * name ) + : TQWidget( parent, name ) { setBackgroundColor(white); diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h index e9f772ff..a1904aa1 100644 --- a/arts/gui/kde/kgraph.h +++ b/arts/gui/kde/kgraph.h @@ -47,7 +47,7 @@ protected: inline GraphPoint q2gPoint(const TQPoint &qp); inline TQPoint g2qPoint(const GraphPoint &gp); public: - KGraph( TQWidget * tqparent = 0, const char * name = 0 ); + KGraph( TQWidget * parent = 0, const char * name = 0 ); virtual ~KGraph(); void addLine(Arts::KGraphLine_impl *line); diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h index 2a603208..408ad961 100644 --- a/arts/gui/kde/kgraph_impl.h +++ b/arts/gui/kde/kgraph_impl.h @@ -44,7 +44,7 @@ protected: public: KGraph_impl( KGraph * w = 0 ); - void constructor( Widget p ) { tqparent( p ); } + void constructor( Widget p ) { parent( p ); } std::string caption(); void caption(const std::string& newCaption); diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h index 8b78bedc..205d041d 100644 --- a/arts/gui/kde/klabel_impl.h +++ b/arts/gui/kde/klabel_impl.h @@ -42,7 +42,7 @@ protected: RotateLabel* _label; public: KLabel_impl( TQFrame* w=0 ); - void constructor( Widget p ) { tqparent( p ); } + void constructor( Widget p ) { parent( p ); } std::string text(); void text( const std::string& newtext ); diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 6cbe9873..9aeee822 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -40,14 +40,14 @@ KLayoutBox_impl::~KLayoutBox_impl() { } void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) { - widget.tqparent( self() ); + widget.parent( self() ); this->_addChild( widget, "layoutbox_item" ); TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); _layout->addWidget( tmp, stretch, align ); } void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) { - widget.tqparent( self() ); + widget.parent( self() ); this->_addChild( widget, "layoutbox_item" ); TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() ); _layout->insertWidget( index, tmp, stretch, align ); diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp index ffb99c3e..5589b772 100644 --- a/arts/gui/kde/klevelmeter_firebars.cpp +++ b/arts/gui/kde/klevelmeter_firebars.cpp @@ -59,8 +59,8 @@ kdDebug() << k_funcinfo << dir << endl; p.end(); } -KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; this->setMinimumSize( 5, 5 ); _bar = new KLevelMeter_FireBars_private( this, 0 ); _peakwidget = new TQWidget( this ); diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp index b6845dc4..418108ad 100644 --- a/arts/gui/kde/klevelmeter_impl.cpp +++ b/arts/gui/kde/klevelmeter_impl.cpp @@ -41,8 +41,8 @@ using namespace Arts; using namespace std; -KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame, LevelMeterStyle defstyle, TQObject* parent, const char* name ) + : TQObject( parent, name ) , _impl( impl ) , _frame( frame ) , _levelmeter( 0 ) diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index 5d8b4b3c..37dfe4d3 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -24,11 +24,11 @@ #include <tqpainter.h> #include <tqpixmap.h> -KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) +KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) , _value( 0.0 ) , _peak( 0.0 ) { -//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +//kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; this->setMinimumSize( 5, 5 ); this->substyle( substyle ); _stdcolors = tqcolorGroup(); diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp index 9263737a..29593551 100644 --- a/arts/gui/kde/klevelmeter_normalbars.cpp +++ b/arts/gui/kde/klevelmeter_normalbars.cpp @@ -24,8 +24,8 @@ #include <tqpainter.h> #include <tqlayout.h> -KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; _layout = new TQBoxLayout( this, TQBoxLayout::BottomToTop ); } diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h index b141f2fc..8fc02208 100644 --- a/arts/gui/kde/klevelmeter_normalbars.h +++ b/arts/gui/kde/klevelmeter_normalbars.h @@ -55,7 +55,7 @@ private: TQColor _color; bool _on; public: - Bar( float min, float max, TQColor color, TQWidget* tqparent ) : TQWidget( tqparent ), _min( min ), _max( max ), _color( color ), _on( false ) { + Bar( float min, float max, TQColor color, TQWidget* parent ) : TQWidget( parent ), _min( min ), _max( max ), _color( color ), _on( false ) { setBackgroundColor( _color.dark() ); } void setValue( float n ) { diff --git a/arts/gui/kde/klevelmeter_small.cpp b/arts/gui/kde/klevelmeter_small.cpp index 3c07bc6b..c74dfa44 100644 --- a/arts/gui/kde/klevelmeter_small.cpp +++ b/arts/gui/kde/klevelmeter_small.cpp @@ -23,8 +23,8 @@ #include <kdebug.h> #include <tqpainter.h> -KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* tqparent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, tqparent, substyle, count, dir, _dbmin, _dbmax ) { -//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<tqparent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; +KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { +//kdDebug()<<"KLevelMeter_Small::KLevelMeter_Small( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl; } void KLevelMeter_Small::invalue( float n, float p ) { diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h index 12ab7532..6164a078 100644 --- a/arts/gui/kde/klineedit_impl.h +++ b/arts/gui/kde/klineedit_impl.h @@ -38,7 +38,7 @@ protected: public: KLineEdit_impl( KLineEdit * w = 0 ); - void constructor( Widget p ) { tqparent( p ); } + void constructor( Widget p ) { parent( p ); } std::string caption(); void caption(const std::string& newCaption); diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp index 5438d131..e685b1ae 100644 --- a/arts/gui/kde/kpopupbox_impl.cpp +++ b/arts/gui/kde/kpopupbox_impl.cpp @@ -43,7 +43,7 @@ Direction KPopupBox_impl::direction() { return _widget->direction(); } void KPopupBox_impl::direction( Direction n ) { _widget->direction( n ); } void KPopupBox_impl::widget( Arts::Widget widget ) { - widget.tqparent( self() ); + widget.parent( self() ); this->_addChild( widget, "PopupBox_child" ); _widget->setWidget( widget ); } @@ -54,7 +54,7 @@ void KPopupBox_impl::name( const std::string& n ) { _name = ""; _name = n; _widg // Following the private class: -KPopupBox_widget::KPopupBox_widget( TQWidget *tqparent, const char* name ) : TQFrame( tqparent,name ) +KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFrame( parent,name ) { this->setFrameShape( TQFrame::Box ); this->setMargin( 1 ); this->setLineWidth( 1 ); diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h index 06a58ebc..b9b38e7f 100644 --- a/arts/gui/kde/kpopupbox_private.h +++ b/arts/gui/kde/kpopupbox_private.h @@ -83,7 +83,7 @@ class HandleDrag : public TQWidget { Q_OBJECT TQ_OBJECT public: - HandleDrag( TQWidget *tqparent, const char* name=0 ) : TQWidget( tqparent,name ) {} + HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {} void paintEvent( TQPaintEvent * ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; @@ -116,7 +116,7 @@ private: TQBoxLayout::Direction _dir; TQPixmap _pmleft, _pmright, _pmup, _pmdown; public: - ShowButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name ), _dir( TQBoxLayout::LeftToRight ) + ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) { connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) ); setToggleButton( true ); @@ -172,7 +172,7 @@ class OwnButton : public TQPushButton { private: TQPixmap _pmown, _pminside; public: - OwnButton( TQWidget *tqparent, const char* name=0 ) : TQPushButton( tqparent,name ) + OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ) { connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) ); setToggleButton( true ); diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index d7cf50df..03a99c29 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -62,14 +62,14 @@ struct KPoti::KPotiPrivate dbp.setPen( TQt::NoPen ); TQRect drawRect = bgdb.rect(); - // create tqmask - TQBitmap tqmask( bgdb.size(), true ); - TQPainter maskpainter( &tqmask ); + // create mask + TQBitmap mask( bgdb.size(), true ); + TQPainter maskpainter( &mask ); maskpainter.setPen( TQt::NoPen ); maskpainter.setBrush( TQt::color1 ); maskpainter.drawEllipse( drawRect ); maskpainter.end(); - bgdb.setMask( tqmask ); + bgdb.setMask( mask ); // inset shadow KPixmap gradient( bgdb.size() ); @@ -102,14 +102,14 @@ struct KPoti::KPotiPrivate dbp.setPen( TQt::NoPen ); TQRect drawRect( potidb.rect() ); - // create tqmask - TQBitmap tqmask( potidb.size(), true ); - TQPainter maskpainter( &tqmask ); + // create mask + TQBitmap mask( potidb.size(), true ); + TQPainter maskpainter( &mask ); maskpainter.setPen( TQt::NoPen ); maskpainter.setBrush( TQt::color1 ); maskpainter.drawEllipse( drawRect ); maskpainter.end(); - potidb.setMask( tqmask ); + potidb.setMask( mask ); KPixmap gradient( potidb.size() ); KPixmapEffect::gradient( gradient, potiColor.dark( 130 ), potiColor.light( 130 ), KPixmapEffect::DiagonalGradient ); @@ -169,10 +169,10 @@ void KPoti::setText( const TQString & text ) /** Constructs a poti. - The \e tqparent and \e name arguments are sent to the TQWidget constructor. + The \e parent and \e name arguments are sent to the TQWidget constructor. */ -KPoti::KPoti( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase ) +KPoti::KPoti( TQWidget *parent, const char *name ) + : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) , d( 0 ) { init(); @@ -188,12 +188,12 @@ KPoti::KPoti( TQWidget *tqparent, const char *name ) \arg \e step is the page step value. \arg \e value is the initial value. - The \e tqparent and \e name arguments are sent to the TQWidget constructor. + The \e parent and \e name arguments are sent to the TQWidget constructor. */ KPoti::KPoti( int minValue, int maxValue, int step, - int value, TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, WResizeNoErase | WRepaintNoErase ) + int value, TQWidget *parent, const char *name ) + : TQFrame( parent, name, WResizeNoErase | WRepaintNoErase ) , TQRangeControl( minValue, maxValue, 1, step, value ) , d( 0 ) { diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index 80e32add..d9013c8a 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -34,9 +34,9 @@ class KPoti : public TQFrame, public TQRangeControl TQ_OBJECT public: - KPoti( TQWidget *tqparent=0, const char *name=0 ); + KPoti( TQWidget *parent=0, const char *name=0 ); KPoti( int minValue, int maxValue, int step, int value, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); ~KPoti(); diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h index 714da93f..0a926f83 100644 --- a/arts/gui/kde/kspinbox_impl.h +++ b/arts/gui/kde/kspinbox_impl.h @@ -55,7 +55,7 @@ protected: public: KSpinBox_impl( TQSpinBox * w = 0 ); - void constructor( Widget p ) { tqparent( p ); } + void constructor( Widget p ) { parent( p ); } std::string caption(); void caption(const std::string& newCaption); diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index b899f0cd..b716f4c3 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -65,24 +65,24 @@ long KWidget_impl::widgetID() return _widgetID; } -Widget KWidget_impl::tqparent() +Widget KWidget_impl::parent() { return KWidgetRepo::the()->lookupWidget(_parentID); } -void KWidget_impl::tqparent(Arts::Widget newParent) +void KWidget_impl::parent(Arts::Widget newParent) { if(!newParent.isNull()) { _parentID = newParent.widgetID(); - TQWidget *qtqparent; - qtqparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID()); - if( qtqparent != 0 ) + TQWidget *qparent; + qparent = KWidgetRepo::the()->lookupTQWidget(newParent.widgetID()); + if( qparent != 0 ) { TQPoint pos(x(),y()); bool showIt = visible(); - _qwidget->reparent(qtqparent, pos, showIt); + _qwidget->reparent(qparent, pos, showIt); } } else diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h index 40d7216c..6a0c45c0 100644 --- a/arts/gui/kde/kwidget_impl.h +++ b/arts/gui/kde/kwidget_impl.h @@ -43,8 +43,8 @@ public: ~KWidget_impl(); long widgetID(); - Widget tqparent(); - void tqparent(Arts::Widget); + Widget parent(); + void parent(Arts::Widget); long x(); void x(long newX); long y(); diff --git a/arts/modules/README.environments b/arts/modules/README.environments index 5dc6c66e..0ac64df5 100644 --- a/arts/modules/README.environments +++ b/arts/modules/README.environments @@ -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 is in can be seen in the - readonly attribute Container tqparent; + readonly attribute Container parent; Upon serialization, the container uses diff --git a/arts/modules/common/artsmodulescommon.idl b/arts/modules/common/artsmodulescommon.idl index 7f657568..10ccd218 100644 --- a/arts/modules/common/artsmodulescommon.idl +++ b/arts/modules/common/artsmodulescommon.idl @@ -72,7 +72,7 @@ module Environment { /** * 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 @@ -150,7 +150,7 @@ interface EffectRackItemGui { }; 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 tomaster; }; diff --git a/arts/modules/common/effectrackslot_impl.cc b/arts/modules/common/effectrackslot_impl.cc index 359c40a3..8e7e48e8 100644 --- a/arts/modules/common/effectrackslot_impl.cc +++ b/arts/modules/common/effectrackslot_impl.cc @@ -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; - _hbox.tqparent( tqparent ); + _hbox.parent( parent ); _hbox.margin( 0 ); _hbox.spacing( 0 ); _hbox.framestyle( Sunken | Panel ); _hbox.linewidth( 1 ); _hbox.show(); - _buttonbox.tqparent( _hbox ); + _buttonbox.parent( _hbox ); _buttonbox.margin( 0 ); _buttonbox.spacing( 0 ); _buttonbox.show(); - _removeButton.tqparent( _buttonbox ); + _removeButton.parent( _buttonbox ); _removeButton.text( "x" ); _removeButton.hSizePolicy( spFixed ); _removeButton.width( 20 ); @@ -66,7 +66,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel connect( _removeButton, "clicked_changed", self(), "removeslot" ); _removeButton.show(); - _masterButton.tqparent( _buttonbox ); + _masterButton.parent( _buttonbox ); _masterButton.text( "MM" ); _masterButton.toggle( true ); _masterButton.hSizePolicy( spFixed ); @@ -75,7 +75,7 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel connect( _masterButton, "pressed_changed", self(), "tomaster" ); _masterButton.show(); - _frame.tqparent( _hbox ); + _frame.parent( _hbox ); _frame.margin( 5 ); _frame.spacing( 0 ); _frame.framestyle( Raised | Panel ); @@ -85,10 +85,10 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel _frame.show(); _effect = effect; - _effect.tqparent( _frame ); + _effect.parent( _frame ); _effect.show(); - _spacer.tqparent( _frame ); + _spacer.parent( _frame ); _spacer.hSizePolicy( spExpanding ); _spacer.show(); } diff --git a/arts/modules/common/env_effectrackitem_impl.cc b/arts/modules/common/env_effectrackitem_impl.cc index ac76db70..50fb116e 100644 --- a/arts/modules/common/env_effectrackitem_impl.cc +++ b/arts/modules/common/env_effectrackitem_impl.cc @@ -226,7 +226,7 @@ public: name = LineEdit(); name.caption("name"); name.text(_effectRack.name()); - name.tqparent(hbox); + name.parent(hbox); connect(name,"text_changed", _effectRack, "name"); #endif @@ -248,7 +248,7 @@ public: typebox = ComboBox(); typebox.choices(choices); typebox.value(_type); - typebox.tqparent(hbox); + typebox.parent(hbox); connect(typebox,"value_changed", self(), "type"); addbutton = Button( "add", hbox ); @@ -260,7 +260,7 @@ public: effect_vbox.show(); Frame spacer; - spacer.tqparent( effect_vbox ); + spacer.parent( effect_vbox ); spacer.vSizePolicy( spExpanding ); spacer.show(); effect_vbox._addChild( spacer, "spacer" ); diff --git a/arts/modules/common/env_instrumentitem_impl.cc b/arts/modules/common/env_instrumentitem_impl.cc index 0b979b6c..17959ca0 100644 --- a/arts/modules/common/env_instrumentitem_impl.cc +++ b/arts/modules/common/env_instrumentitem_impl.cc @@ -98,7 +98,7 @@ public: LineEdit edit; edit.x(20); edit.y(10); edit.width(120); edit.height(40); edit.text(instrument.filename()); - edit.tqparent(panel); + edit.parent(panel); edit.show(); connect(edit,"text_changed", instrument, "filename"); panel._addChild(edit,"editWidget"); diff --git a/arts/modules/common/env_item_impl.cc b/arts/modules/common/env_item_impl.cc index da3a6941..6bc960d8 100644 --- a/arts/modules/common/env_item_impl.cc +++ b/arts/modules/common/env_item_impl.cc @@ -16,7 +16,7 @@ Environment::Item_impl::~Item_impl() arts_assert(_active == false); } -Environment::Container Environment::Item_impl::tqparent() +Environment::Container Environment::Item_impl::parent() { Container p = _parent; return p; diff --git a/arts/modules/common/env_item_impl.h b/arts/modules/common/env_item_impl.h index 4fcd1fc8..dbdca1f9 100644 --- a/arts/modules/common/env_item_impl.h +++ b/arts/modules/common/env_item_impl.h @@ -18,7 +18,7 @@ public: ~Item_impl(); bool active(); - Container tqparent(); + Container parent(); void setContainer(Container container); }; } diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc index db4bc18c..3e80e603 100644 --- a/arts/modules/common/env_mixeritem_impl.cc +++ b/arts/modules/common/env_mixeritem_impl.cc @@ -165,7 +165,7 @@ public: Widget w = guiFactory.createGui((*channels)[i]); if(!w.isNull()) { - w.tqparent(channel_hbox); + w.parent(channel_hbox); w.show(); channelWidgets.push_back(w); } @@ -183,21 +183,21 @@ public: if(!_item.isNull() && !vbox.isNull()) { hbox = HBox(); - hbox.tqparent(vbox); + hbox.parent(vbox); hbox.show(); spinbox = SpinBox(); spinbox.caption(i18n("channels").utf8().data()); spinbox.min(0); spinbox.max(32); spinbox.value(_item.channelCount()); - spinbox.tqparent(hbox); + spinbox.parent(hbox); spinbox.show(); connect(spinbox,"value_changed", _item, "channelCount"); name = LineEdit(); name.caption(i18n("name").utf8().data()); name.text(_item.name()); - name.tqparent(hbox); + name.parent(hbox); name.show(); connect(name,"text_changed", _item, "name"); @@ -212,12 +212,12 @@ public: delete queryResults; typebox.choices(choices); typebox.value(_type); - typebox.tqparent(hbox); + typebox.parent(hbox); typebox.show(); connect(typebox,"value_changed", _item, "type"); channel_hbox = HBox(); - channel_hbox.tqparent(vbox); + channel_hbox.parent(vbox); channel_hbox.show(); channelWidgets.clear(); @@ -320,14 +320,14 @@ public: HBox hbox; hbox.show(); hbox.width(330); hbox.height(50); - hbox.tqparent(vbox); + hbox.parent(vbox); vbox._addChild(hbox,"hbox"); SpinBox spinbox; spinbox.caption(i18n("channels").utf8().data()); spinbox.min(0); spinbox.max(32); spinbox.value(mixerItem.channelCount()); - spinbox.tqparent(hbox); + spinbox.parent(hbox); spinbox.show(); connect(spinbox,"value_changed", mixerItem, "channelCount"); hbox._addChild(spinbox,"channelsWidget"); @@ -335,7 +335,7 @@ public: LineEdit name; name.caption(i18n("name").utf8().data()); name.caption(mixerItem.name()); - name.tqparent(hbox); + name.parent(hbox); name.show(); connect(name,"caption_changed", mixerItem, "name"); hbox._addChild(name,"nameWidget"); @@ -343,7 +343,7 @@ public: HBox channel_hbox; channel_hbox.show(); channel_hbox.width(330); hbox.height(450); - channel_hbox.tqparent(vbox); + channel_hbox.parent(vbox); vbox._addChild(channel_hbox,"channel_hbox"); GenericGuiFactory gf; @@ -353,7 +353,7 @@ public: for(i = channels->begin(); i != channels->end(); i++) { Widget w = gf.createGui(*i); - w.tqparent(channel_hbox); + w.parent(channel_hbox); channel_hbox._addChild(w,"channel"); } #endif diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc index 827687e2..56ca6037 100644 --- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc +++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc @@ -123,11 +123,11 @@ public: Arts::Poti lowfreq; lowfreq.color( "grey" ); lowfreq.caption( i18n( "Low Freq" ).utf8().data() ); lowfreq.min( 20 ); lowfreq.max( 1000 ); 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() ); lowq.min( 0.01 ); lowq.max( 10 ); 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() ); mid1gain.min( -24 ); mid1gain.max( 24 ); @@ -140,11 +140,11 @@ public: Arts::Poti mid1freq; mid1freq.color( "grey" ); mid1freq.caption( i18n( "Mid1 Freq" ).utf8().data() ); mid1freq.min( 20 ); mid1freq.max( 5000 ); 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() ); mid1q.min( 0.01 ); mid1q.max( 10 ); 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() ); mid2gain.min( -24 ); mid2gain.max( 24 ); @@ -157,11 +157,11 @@ public: Arts::Poti mid2freq; mid2freq.color( "grey" ); mid2freq.caption( i18n( "Mid2 Freq" ).utf8().data() ); mid2freq.min( 20 ); mid2freq.max( 10000 ); 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() ); mid2q.min( 0.01 ); mid2q.max( 10 ); 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() ); mid3gain.min( -24 ); mid3gain.max( 24 ); @@ -174,11 +174,11 @@ public: Arts::Poti mid3freq; mid3freq.color( "grey" ); mid3freq.caption( i18n( "Mid3 Freq" ).utf8().data() ); mid3freq.min( 1000 ); mid3freq.max( 10000 ); 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() ); mid3q.min( 0.01 ); mid3q.max( 10 ); 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() ); highgain.min( -24 ); highgain.max( 24 ); @@ -191,11 +191,11 @@ public: Arts::Poti highfreq; highfreq.color( "grey" ); highfreq.caption( i18n( "High Freq" ).utf8().data() ); highfreq.min( 5000 ); highfreq.max( 16000 ); 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() ); highq.min( 0.01 ); highq.max( 10 ); 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 ); diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc index 17878daa..7af1f471 100644 --- a/arts/modules/effects/freeverbguifactory_impl.cc +++ b/arts/modules/effects/freeverbguifactory_impl.cc @@ -58,7 +58,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) roomsize.color("red"); roomsize.min(0); roomsize.max(1); roomsize.value(freeverb.roomsize()); roomsize.range(100); - roomsize.tqparent(hbox); + roomsize.parent(hbox); roomsize.show(); connect(roomsize,"value_changed", freeverb, "roomsize"); hbox._addChild(roomsize,"roomsizeWidget"); @@ -68,7 +68,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) damp.color("red"); damp.min(0); damp.max(1); damp.value(freeverb.damp()); damp.range(100); - damp.tqparent(hbox); + damp.parent(hbox); damp.show(); connect(damp,"value_changed", freeverb, "damp"); hbox._addChild(damp,"dampWidget"); @@ -78,7 +78,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) wet.color("red"); wet.min(0); wet.max(1); wet.value(freeverb.wet()); wet.range(100); - wet.tqparent(hbox); + wet.parent(hbox); wet.show(); connect(wet,"value_changed", freeverb, "wet"); hbox._addChild(wet,"wetWidget"); @@ -88,7 +88,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) dry.color("red"); dry.min(0); dry.max(1); dry.value(freeverb.dry()); dry.range(100); - dry.tqparent(hbox); + dry.parent(hbox); dry.show(); connect(dry,"value_changed", freeverb, "dry"); hbox._addChild(dry,"dryWidget"); @@ -98,7 +98,7 @@ Widget FreeverbGuiFactory_impl::createGui(Object object) width.color("red"); width.min(0); width.max(1); width.value(freeverb.width()); width.range(100); - width.tqparent(hbox); + width.parent(hbox); width.show(); connect(width,"value_changed", freeverb, "width"); hbox._addChild(width,"widthWidget"); diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h index 855c979c..28400f1e 100644 --- a/arts/modules/effects/kstereovolumecontrolgui_impl.h +++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h @@ -86,7 +86,7 @@ public: TQTimer* _timer; Arts::KStereoVolumeControlGui_impl* _impl; 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 ); connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) ); } diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc index 86f7c1bb..ece106c2 100644 --- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc +++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc @@ -186,7 +186,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object) vbox.show(); Graph g; - g.tqparent(vbox); + g.parent(vbox); g.width(400); g.height(230); g.caption(i18n("a graph").utf8().data()); @@ -211,7 +211,7 @@ Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object) spinbox.caption(i18n("channels").utf8().data()); spinbox.min(3); spinbox.max(255); spinbox.value(equalizer.taps()); - spinbox.tqparent(vbox); + spinbox.parent(vbox); spinbox.show(); connect(spinbox,"value_changed", equalizer, "taps"); vbox._addChild(spinbox,"spinbox"); diff --git a/arts/modules/effects/voiceremovalguifactory_impl.cc b/arts/modules/effects/voiceremovalguifactory_impl.cc index 4a4011be..d4879b87 100644 --- a/arts/modules/effects/voiceremovalguifactory_impl.cc +++ b/arts/modules/effects/voiceremovalguifactory_impl.cc @@ -53,7 +53,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object ) position.color( "grey" ); position.min( -1 ); position.max( 1 ); position.value( voiceremoval.position() ); position.range( 100 ); - position.tqparent( hbox ); + position.parent( hbox ); position.show(); connect( position, "value_changed", voiceremoval, "position" ); hbox._addChild( position, "positionWidget" ); @@ -64,7 +64,7 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object ) freq.value( voiceremoval.frequency() ); freq.range( 400 ); freq.logarithmic( 2.0 ); - freq.tqparent( hbox ); + freq.parent( hbox ); freq.show(); connect( freq, "value_changed", voiceremoval, "frequency" ); hbox._addChild( freq, "freqWidget" ); diff --git a/arts/modules/synth/synth_cdelay_impl.cc b/arts/modules/synth/synth_cdelay_impl.cc index 267daab8..28f4d12f 100644 --- a/arts/modules/synth/synth_cdelay_impl.cc +++ b/arts/modules/synth/synth_cdelay_impl.cc @@ -43,14 +43,14 @@ class Synth_CDELAY_impl : virtual public Synth_CDELAY_skel, { protected: unsigned long _buffersize; - unsigned long _bittqmask; + unsigned long _bitmask; float *_buffer; // holds the data to be delayed (variable size) float _delaytime; unsigned int _readpos; unsigned int _writepos; 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; double n = ceil( log( double(_delaytime * samplingRateFloat )) / log( 2. ) ); unsigned long newbuffersize = (unsigned long)( pow( 2, n ) ); - unsigned long newbittqmask = newbuffersize - 1; + unsigned long newbitmask = newbuffersize - 1; if( newbuffersize != _buffersize ) { float *newbuffer = new float[newbuffersize]; @@ -74,24 +74,24 @@ public: for( unsigned long i = 0; i < _buffersize; i++ ) { newbuffer[i] = _buffer[_writepos]; _writepos++; - _writepos &= newbittqmask; + _writepos &= newbitmask; } for( unsigned long i = _buffersize; i < newbuffersize; i++ ) newbuffer[i] = 0; } else { _writepos -= newbuffersize; - _writepos &= newbittqmask; + _writepos &= newbitmask; for( unsigned long i = 0; i < newbuffersize; i++ ) { newbuffer[i] = _buffer[_writepos]; _writepos++; - _writepos &= newbittqmask; + _writepos &= newbitmask; } } _buffer = newbuffer; _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 ); } @@ -113,9 +113,9 @@ public: _buffer[_writepos] = invalue[i]; outvalue[i] = _buffer[_readpos]; _readpos++; - _readpos &= _bittqmask; + _readpos &= _bitmask; _writepos++; - _writepos &= _bittqmask; + _writepos &= _bitmask; } } }; diff --git a/arts/modules/synth/synth_delay_impl.cc b/arts/modules/synth/synth_delay_impl.cc index 57285118..92c23fd1 100644 --- a/arts/modules/synth/synth_delay_impl.cc +++ b/arts/modules/synth/synth_delay_impl.cc @@ -56,13 +56,13 @@ class Synth_DELAY_impl : virtual public Synth_DELAY_skel, { protected: unsigned long _buffersize; - unsigned long _bittqmask; + unsigned long _bitmask; float * _buffer; float _maxdelay; unsigned int _writepos; 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 } @@ -85,15 +85,15 @@ public: { double int_pos; double error = modf( time[i] * samplingRateFloat, &int_pos ); - unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bittqmask; - unsigned long readpos2 = ( readpos1 - 1 ) & _bittqmask; // Shouldn't this be +1? (mkretz) + unsigned long readpos1 = ( _writepos - (unsigned long)(int_pos) ) & _bitmask; + unsigned long readpos2 = ( readpos1 - 1 ) & _bitmask; // Shouldn't this be +1? (mkretz) // No, it's right this way: // ( 1 - error ) needs to be multiplied with the second // sample; error with the first _buffer[_writepos] = invalue[i]; outvalue[i] = _buffer[readpos1] * ( 1 - error ) + _buffer[readpos2] * error; _writepos++; - _writepos &= _bittqmask; + _writepos &= _bitmask; } } @@ -106,7 +106,7 @@ public: _maxdelay = newmaxdelay; double n = ceil( log( double(_maxdelay * samplingRateFloat) ) / log( 2. ) ); unsigned long newbuffersize = (unsigned long)( pow( 2, n ) ); - unsigned long newbittqmask = newbuffersize - 1; + unsigned long newbitmask = newbuffersize - 1; if( newbuffersize != _buffersize ) { float *newbuffer = new float[newbuffersize]; @@ -114,22 +114,22 @@ public: for( unsigned long i = 0; i < _buffersize; i++ ) { newbuffer[i] = _buffer[_writepos]; _writepos++; - _writepos &= newbittqmask; + _writepos &= newbitmask; } for( unsigned long i = _buffersize; i < newbuffersize; i++ ) newbuffer[i] = 0; } else { _writepos -= newbuffersize; - _writepos &= newbittqmask; + _writepos &= newbitmask; for( unsigned long i = 0; i < newbuffersize; i++ ) { newbuffer[i] = _buffer[_writepos]; _writepos++; - _writepos &= newbittqmask; + _writepos &= newbitmask; } } _buffer = newbuffer; _buffersize = newbuffersize; - _bittqmask = newbittqmask; + _bitmask = newbitmask; } maxdelay_changed( _maxdelay ); } diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl index 7fe75949..2da25a68 100644 --- a/arts/runtime/artsbuilder.idl +++ b/arts/runtime/artsbuilder.idl @@ -76,11 +76,11 @@ module Arts { interface PortDesc { // 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 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- // ports with the same name allowed) @@ -123,11 +123,11 @@ module Arts { interface ModuleDesc { // 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 readonly attribute long ID; - readonly attribute StructureDesc tqparent; + readonly attribute StructureDesc parent; readonly attribute string name; readonly attribute sequence<PortDesc> ports; @@ -184,7 +184,7 @@ module Arts { interface StructurePortDesc : PortDesc { // 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 // as module - 0 is leftmost, higher numbers are more right @@ -192,7 +192,7 @@ module Arts { readonly attribute StructureDesc parentStructure; // 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; boolean moveTo(long x, long y); // returns true when successful diff --git a/arts/runtime/structurebuilder_impl.cc b/arts/runtime/structurebuilder_impl.cc index c2e217e8..43e5485c 100644 --- a/arts/runtime/structurebuilder_impl.cc +++ b/arts/runtime/structurebuilder_impl.cc @@ -96,7 +96,7 @@ ModuleDef StructureBuilder_impl::createTypeInfo(StructureDesc structure) { 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 if(pi->inheritedInterface().empty()) { @@ -236,12 +236,12 @@ Structure_impl::Structure_impl(StructureDesc structureDesc, 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 cout << "connect " << mi->name() << "." << pi->name() - << " to " << ci->tqparent().name() + << " to " << ci->parent().name() << "." << ci->name() << endl; #endif 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++) { - Object& dest = moduleMap[ci->tqparent().ID()]; + Object& dest = moduleMap[ci->parent().ID()]; #ifdef STRUCTBUILDER_DEBUG cout << "virtualize " << pi->name() - << " to " << ci->tqparent().name() << "." << ci->name() + << " to " << ci->parent().name() << "." << ci->name() << endl; #endif diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cc index 5c392e91..7c5a5e05 100644 --- a/arts/runtime/structures_impl.cc +++ b/arts/runtime/structures_impl.cc @@ -32,11 +32,11 @@ public: ~PortDesc_impl(); 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(); long ID(); - ModuleDesc tqparent(); + ModuleDesc parent(); string name(); PortType type(); bool isConnected(); @@ -78,7 +78,7 @@ private: public: long ID(); - StructureDesc tqparent(); + StructureDesc parent(); string name(); vector<PortDesc> *ports(); long height(); @@ -86,7 +86,7 @@ public: 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); vector<string> *saveToList(); @@ -155,7 +155,7 @@ protected: return StructurePortDesc::_from_base(_copy()); } public: - void constructor(StructureDesc tqparent, const string& name, + void constructor(StructureDesc parent, const string& name, const PortType& type); ~StructurePortDesc_impl(); @@ -192,13 +192,13 @@ REGISTER_IMPLEMENTATION(StructurePortDesc_impl); #define pstat \ 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) { #if 0 - if(tqparent) + if(parent) { - char * pname = tqparent->Name(); + char * pname = parent->Name(); describe("PortDesc."+string(pname)+string(".")+name); } else @@ -208,14 +208,14 @@ void PortDesc_impl::constructor(ModuleDesc tqparent, const string& name, #endif _name = name; _type = type; - _parent = tqparent; + _parent = parent; _isConnected = false; _hasValue = false; _value.type = _type.dataType; - if(!tqparent.isNull()) + if(!parent.isNull()) { - StructureDesc sd = tqparent.tqparent(); + StructureDesc sd = parent.parent(); _ID = sd.obtainID(); } // 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; } -ModuleDesc PortDesc_impl::tqparent() +ModuleDesc PortDesc_impl::parent() { return _parent; } @@ -468,11 +468,11 @@ void PortDesc_impl::disconnectFrom( PortDesc port ) _isConnected = !_connections.empty(); - ModuleDesc tqparent = _parent; - if(tqparent.isNull()) + ModuleDesc parent = _parent; + if(parent.isNull()) artsdebug("_Parent = <some structure>, isConnected = %d\n",_isConnected); 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) port.disconnectFrom(self()); @@ -484,7 +484,7 @@ long ModuleDesc_impl::ID() return _ID; } -StructureDesc ModuleDesc_impl::tqparent() +StructureDesc ModuleDesc_impl::parent() { return _parent; } @@ -549,14 +549,14 @@ long StructureDesc_impl::height() * Query the module for it's paramenters */ -void ModuleDesc_impl::constructor( StructureDesc tqparent, +void ModuleDesc_impl::constructor( StructureDesc parent, const Arts::ModuleInfo& info ) { _name = info.name; _x = -1; // no position assigned _y = -1; - _ID = tqparent.obtainID(); - _parent = tqparent; + _ID = parent.obtainID(); + _parent = parent; _isInterface = info.isInterface; _isStructure = info.isStructure; @@ -1134,12 +1134,12 @@ void StructureDesc_impl::moveStructurePortDesc(StructurePortDesc portdesc.internalSetPosition(newposition); } -void StructurePortDesc_impl::constructor(StructureDesc tqparent, +void StructurePortDesc_impl::constructor(StructureDesc parent, const string& name, const PortType& type) { PortDesc_impl::constructor(ModuleDesc::null(),name,type); - _parentStructure = tqparent; - _ID = tqparent.obtainID(); + _parentStructure = parent; + _ID = parent.obtainID(); _x = 0; _y = 0; _position = 0; @@ -1167,18 +1167,18 @@ long StructurePortDesc_impl::position() void StructurePortDesc_impl::lowerPosition() { - StructureDesc tqparent = _parentStructure; // weak reference + StructureDesc parent = _parentStructure; // weak reference - if(!tqparent.isNull()) - tqparent.moveStructurePortDesc(self(), _position-1); + if(!parent.isNull()) + parent.moveStructurePortDesc(self(), _position-1); } void StructurePortDesc_impl::raisePosition() { - StructureDesc tqparent = _parentStructure; // weak reference + StructureDesc parent = _parentStructure; // weak reference - if(!tqparent.isNull()) - tqparent.moveStructurePortDesc(self(), _position+1); + if(!parent.isNull()) + parent.moveStructurePortDesc(self(), _position+1); } void StructurePortDesc_impl::rename(const string& newname) diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index 9075f87e..6f07a322 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -36,8 +36,8 @@ #include "environmentview.h" #include "mediatypesview.h" -ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* tqparent, const char* name ) - : TQObject( tqparent,name ) +ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name ) + : TQObject( parent,name ) , _kartsserver( server ) , _actioncollection( col ) , _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 ) diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h index b6f77839..d28edd33 100644 --- a/arts/tools/artsactions.h +++ b/arts/tools/artsactions.h @@ -48,7 +48,7 @@ public: @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 qwidget the tqparent TQWidget + @param qwidget the parent TQWidget @param name the name of the object */ ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index 490366d1..f59bc9ff 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -29,18 +29,18 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { KGlobal::locale()->insertCatalogue("artscontrol"); return new ArtsControlApplet(configFile, KPanelApplet::Normal, 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 ksConfig = config(); diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h index ab683464..e1722ebf 100644 --- a/arts/tools/artscontrolapplet.h +++ b/arts/tools/artscontrolapplet.h @@ -39,7 +39,7 @@ public: * @param configFile The configFile handed over in the factory function. * @param Type The applet @ref type(). * @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. **/ ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0, diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 2f7c553d..bddc0728 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -66,9 +66,9 @@ public: KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; - ArtsControlAppletPrivate( ArtsControlApplet *tqparent ) - : TQObject(tqparent) - , _parent( tqparent ) + ArtsControlAppletPrivate( ArtsControlApplet *parent ) + : TQObject(parent) + , _parent( parent ) , barts( false ) , bInUpdate( false ) { @@ -78,7 +78,7 @@ public: if( barts ) volume = arts->server().outVolume(); svinline=0; - _artsactions = new ArtsActions( arts, 0, tqparent ); + _artsactions = new ArtsActions( arts, 0, parent ); menu = new KPopupMenu( 0 ); _showSV = _artsactions->actionScopeView(); diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index 73debf80..439ab191 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -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, * 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->setIcon( MainBarIcon( "artsaudiomanager", 32 ) ); @@ -72,14 +72,14 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget) } #endif -void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/) +void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/) { /************************************************************************ * 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 - * 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, * 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 ************************************************************************/ - TQVBoxLayout *maintqlayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *maintqlayout = new TQVBoxLayout(parent); /*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/ // list - listview = new KListView(tqparent); + listview = new KListView(parent); listview->addColumn(i18n("Title"),175); listview->addColumn(i18n("Type"),50); @@ -110,7 +110,7 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/ maintqlayout->activate(); //maintqlayout->freeze(); - ParentWidget = tqparent; + ParentWidget = parent; } void Gui_AUDIO_MANAGER::tick() @@ -178,8 +178,8 @@ void GuiAudioManagerProxy::edit(TQListViewItem *item) gim->edit(item); } -AudioManagerItem::AudioManagerItem(TQListView *tqparent, TQString a, - TQString b, TQString c, long ID) :TQListViewItem(tqparent,a,b,c) +AudioManagerItem::AudioManagerItem(TQListView *parent, TQString a, + TQString b, TQString c, long ID) :TQListViewItem(parent,a,b,c) { _ID = ID; } diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h index 5a23092d..6f86778e 100644 --- a/arts/tools/audiomanager.h +++ b/arts/tools/audiomanager.h @@ -71,7 +71,7 @@ public slots: class AudioManagerItem : public TQListViewItem { long _ID; public: - AudioManagerItem(TQListView *tqparent, TQString a, TQString b, + AudioManagerItem(TQListView *parent, TQString a, TQString b, TQString c, long ID); ~AudioManagerItem(); diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index a4f96ba5..29a1bb69 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -42,8 +42,8 @@ static void min_size(TQWidget *w) { w->setMinimumSize(w->tqsizeHint()); } -ChooseBusDlg::ChooseBusDlg(TQWidget *tqparent) - : KDialog(tqparent,"X", TRUE) +ChooseBusDlg::ChooseBusDlg(TQWidget *parent) + : KDialog(parent,"X", TRUE) , _newbusitemindex( -1 ) { setCaption(i18n("Choose Bus")); diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h index 9ba29b8a..13312651 100644 --- a/arts/tools/choosebusdlg.h +++ b/arts/tools/choosebusdlg.h @@ -36,7 +36,7 @@ class ChooseBusDlg :public KDialog { int _newbusitemindex; public: - ChooseBusDlg(TQWidget *tqparent); + ChooseBusDlg(TQWidget *parent); public slots: TQString result(); diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index 0ba42a7f..f62a5c06 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -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->setIcon( MainBarIcon( "artsenvironment", 32 ) ); diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index 1d5c5345..ab15dc59 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -37,8 +37,8 @@ using namespace std; using namespace Arts; -FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* tqparent ) - : Template_ArtsView( tqparent ) +FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* parent ) + : Template_ArtsView( parent ) , server( server ) , scopeData( 0 ) { diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp index ae7834a8..08d9099b 100644 --- a/arts/tools/levelmeters.cpp +++ b/arts/tools/levelmeters.cpp @@ -7,8 +7,8 @@ const int PeakBar::peakMillis=1500; -PeakBar::PeakBar(TQWidget *tqparent) - : ACLevelMeter(tqparent) +PeakBar::PeakBar(TQWidget *parent) + : ACLevelMeter(parent) , maxValue( 0.0f ) , minValue( 0.0f ) { @@ -109,8 +109,8 @@ void PeakBar::setValue(float f) { // ------------------------------------------------------------- -PeakLevelMeters::PeakLevelMeters(TQWidget *tqparent): - StereoLevelMeter(tqparent), left(this), right(this), scaleView(this) +PeakLevelMeters::PeakLevelMeters(TQWidget *parent): + StereoLevelMeter(parent), left(this), right(this), scaleView(this) { TQBoxLayout *tqlayout= new TQHBoxLayout(this); tqlayout->addWidget(&left); @@ -142,7 +142,7 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) { right.setValue(f); } -ScaleView::ScaleView(TQWidget *tqparent): TQFrame(tqparent) { +ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) { font.setPixelSize(10); 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); TQBoxLayout * l = new TQVBoxLayout( this ); l->setAutoAdd(TRUE); @@ -223,8 +223,8 @@ void LedMeter::setValue(float f) // ------------------------------------------------------------- -StereoLedMeters::StereoLedMeters(TQWidget *tqparent) - : StereoLevelMeter(tqparent), left(this), right(this) +StereoLedMeters::StereoLedMeters(TQWidget *parent) + : StereoLevelMeter(parent), left(this), right(this) { TQBoxLayout *tqlayout= new TQHBoxLayout(this); tqlayout->addWidget(&left); diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h index 64c41c0b..8046d745 100644 --- a/arts/tools/levelmeters.h +++ b/arts/tools/levelmeters.h @@ -46,7 +46,7 @@ class ACLevelMeter : public TQFrame { Q_OBJECT TQ_OBJECT public: - ACLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {} + ACLevelMeter(TQWidget *parent): TQFrame(parent) {} public slots: virtual void setValue(float f) = 0; }; @@ -58,7 +58,7 @@ class StereoLevelMeter : public TQFrame { Q_OBJECT TQ_OBJECT public: - StereoLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {} + StereoLevelMeter(TQWidget *parent): TQFrame(parent) {} public slots: virtual void setValues(float left, float right) = 0; }; @@ -92,7 +92,7 @@ protected: void frameChanged(); public: - PeakBar(TQWidget *tqparent); + PeakBar(TQWidget *parent); TQSize tqsizeHint() const; @@ -111,7 +111,7 @@ protected: int dbRange; int upperMargin, lowerMargin; public: - ScaleView(TQWidget *tqparent); + ScaleView(TQWidget *parent); void setDbRange(int db); void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; } TQSize tqsizeHint() const; @@ -132,7 +132,7 @@ protected: ScaleView scaleView; public: - PeakLevelMeters(TQWidget *tqparent); + PeakLevelMeters(TQWidget *parent); public slots: void setValues(float leftVal, float rightVal); @@ -153,7 +153,7 @@ protected: KLed *leds[12]; public: - LedMeter(TQWidget *tqparent, bool blueState = false); + LedMeter(TQWidget *parent, bool blueState = false); void setValue(float f); }; @@ -167,7 +167,7 @@ protected: LedMeter left, right; public: - StereoLedMeters(TQWidget *tqparent); + StereoLedMeters(TQWidget *parent); public slots: void setValues(float left, float right); }; diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 5492f38a..62b3668a 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -82,7 +82,7 @@ FreeVerbView::~FreeVerbView() { } -VControl::VControl( KArtsServer* artsserver, TQWidget *tqparent) : TQFrame(tqparent) +VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent) , freeVerbView(0) , server( artsserver ) { diff --git a/arts/tools/main.h b/arts/tools/main.h index 3b52dadb..41bcccdd 100644 --- a/arts/tools/main.h +++ b/arts/tools/main.h @@ -79,7 +79,7 @@ protected: TQBoxLayout *boxLayout; public: - VControl( KArtsServer*, TQWidget *tqparent); + VControl( KArtsServer*, TQWidget *parent); ~VControl(); public slots: diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp index fb8938d7..9353cda6 100644 --- a/arts/tools/mediatypesview.cpp +++ b/arts/tools/mediatypesview.cpp @@ -33,7 +33,7 @@ using namespace std; 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->setIcon( MainBarIcon( "artsmediatypes", 32 ) ); diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index 339cafa6..8fe922b7 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -63,8 +63,8 @@ static TQStringList listFiles(TQString directory, TQString extension) return result; } -MidiInstDlg::MidiInstDlg(TQWidget *tqparent) - :TQDialog(tqparent,"instrument",TRUE) +MidiInstDlg::MidiInstDlg(TQWidget *parent) + :TQDialog(parent,"instrument",TRUE) { TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); diff --git a/arts/tools/midiinstdlg.h b/arts/tools/midiinstdlg.h index 0e425225..52b617ef 100644 --- a/arts/tools/midiinstdlg.h +++ b/arts/tools/midiinstdlg.h @@ -31,7 +31,7 @@ class MidiInstDlg :public TQDialog { TQ_OBJECT TQComboBox *box; public: - MidiInstDlg(TQWidget *tqparent); + MidiInstDlg(TQWidget *parent); TQCString filename(); public slots: void help(); diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index a9cefb07..3f137dea 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -78,7 +78,7 @@ public: class ConnectionWidget : public TQWidget { public: MidiManagerView *v; - ConnectionWidget(MidiManagerView *v, TQWidget *tqparent) : TQWidget(tqparent), v(v) + ConnectionWidget(MidiManagerView *v, TQWidget *parent) : TQWidget(parent), v(v) { } void paintEvent(TQPaintEvent * /*event*/) diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index eaed97f1..1c46d9e5 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -32,7 +32,7 @@ #include <tqpushbutton.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); diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h index b6b428bc..59cb4f0f 100644 --- a/arts/tools/midiportdlg.h +++ b/arts/tools/midiportdlg.h @@ -34,7 +34,7 @@ class MidiPortDlg :public TQDialog { TQ_OBJECT TQLineEdit *edit; public: - MidiPortDlg(TQWidget *tqparent, const char *device, const char *title); + MidiPortDlg(TQWidget *parent, const char *device, const char *title); const char *device(); public slots: diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp index 6a9f0a25..901362fd 100644 --- a/arts/tools/statusview.cpp +++ b/arts/tools/statusview.cpp @@ -33,8 +33,8 @@ using namespace std; using namespace Arts; -ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* tqparent, const char* name ) - : Template_ArtsView( tqparent,name ) +ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, const char* name ) + : Template_ArtsView( parent,name ) , server(a_server) { this->setCaption( i18n( "aRts tqStatus" ) ); diff --git a/arts/tools/templateview.cpp b/arts/tools/templateview.cpp index a89efac4..a589ff46 100644 --- a/arts/tools/templateview.cpp +++ b/arts/tools/templateview.cpp @@ -22,7 +22,7 @@ //#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; } diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp index a7b73c65..711c1275 100644 --- a/juk/advancedsearchdialog.cpp +++ b/juk/advancedsearchdialog.cpp @@ -36,9 +36,9 @@ AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName, const PlaylistSearch &defaultSearch, - TQWidget *tqparent, + TQWidget *parent, const char *name) : - KDialogBase(tqparent, name, true, i18n("Create Search Playlist"), Ok|Cancel) + KDialogBase(parent, name, true, i18n("Create Search Playlist"), Ok|Cancel) { makeVBoxMainWidget(); diff --git a/juk/advancedsearchdialog.h b/juk/advancedsearchdialog.h index 65158273..a17f1fc4 100644 --- a/juk/advancedsearchdialog.h +++ b/juk/advancedsearchdialog.h @@ -39,7 +39,7 @@ public: AdvancedSearchDialog(const TQString &defaultName, const PlaylistSearch &defaultSearch = PlaylistSearch(), - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~AdvancedSearchDialog(); diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index 2b04f3c1..509f0695 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -34,8 +34,8 @@ using CoverUtility::CoverIconViewItem; class AllArtistsListViewItem : public KListViewItem { public: - AllArtistsListViewItem(TQListView *tqparent) : - KListViewItem(tqparent, i18n("<All Artists>")) + AllArtistsListViewItem(TQListView *parent) : + KListViewItem(parent, i18n("<All Artists>")) { } @@ -48,8 +48,8 @@ public: class CaseInsensitiveItem : public KListViewItem { public: - CaseInsensitiveItem(TQListView *tqparent, const TQString &text) : - KListViewItem(tqparent, text) + CaseInsensitiveItem(TQListView *parent, const TQString &text) : + KListViewItem(parent, text) { } @@ -60,8 +60,8 @@ public: } }; -CoverDialog::CoverDialog(TQWidget *tqparent) : - CoverDialogBase(tqparent, "juk_cover_dialog", WType_Dialog) +CoverDialog::CoverDialog(TQWidget *parent) : + CoverDialogBase(parent, "juk_cover_dialog", WType_Dialog) { m_covers->setResizeMode(TQIconView::Adjust); m_covers->setGridX(140); diff --git a/juk/coverdialog.h b/juk/coverdialog.h index 6bbbba4a..0f5d9d0a 100644 --- a/juk/coverdialog.h +++ b/juk/coverdialog.h @@ -23,7 +23,7 @@ class CoverDialog : public CoverDialogBase Q_OBJECT TQ_OBJECT public: - CoverDialog(TQWidget *tqparent); + CoverDialog(TQWidget *parent); ~CoverDialog(); virtual void show(); diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp index 2dd1260b..58b5a2b9 100644 --- a/juk/covericonview.cpp +++ b/juk/covericonview.cpp @@ -18,15 +18,15 @@ using CoverUtility::CoverIconViewItem; -CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *tqparent) : - KIconViewItem(tqparent), m_id(id) +CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) : + KIconViewItem(parent), m_id(id) { CoverDataPtr data = CoverManager::coverInfo(id); setText(TQString("%1 - %2").tqarg(data->artist, data->album)); 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); } diff --git a/juk/covericonview.h b/juk/covericonview.h index a12f4354..42e44d66 100644 --- a/juk/covericonview.h +++ b/juk/covericonview.h @@ -29,7 +29,7 @@ namespace CoverUtility class CoverIconViewItem : public KIconViewItem { public: - CoverIconViewItem(coverKey id, TQIconView *tqparent); + CoverIconViewItem(coverKey id, TQIconView *parent); coverKey id() const { return m_id; } @@ -49,7 +49,7 @@ using CoverUtility::CoverIconViewItem; class CoverIconView : public KIconView { public: - CoverIconView(TQWidget *tqparent, const char *name); + CoverIconView(TQWidget *parent, const char *name); CoverIconViewItem *currentItem() const; diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp index 688015c1..e780eec0 100644 --- a/juk/deletedialog.cpp +++ b/juk/deletedialog.cpp @@ -33,8 +33,8 @@ // DeleteWidget implementation ////////////////////////////////////////////////////////////////////////////// -DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name) - : DeleteDialogBase(tqparent, name) +DeleteWidget::DeleteWidget(TQWidget *parent, const char *name) + : DeleteDialogBase(parent, name) { KConfigGroup messageGroup(KGlobal::config(), "FileRemover"); @@ -69,8 +69,8 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete) // DeleteDialog implementation ////////////////////////////////////////////////////////////////////////////// -DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) : - KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name, +DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) : + KDialogBase(Swallow, WStyle_DialogBorder, parent, name, true /* modal */, i18n("About to delete selected files"), Ok | Cancel, Cancel /* Default */, true /* separator */), m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full") diff --git a/juk/deletedialog.h b/juk/deletedialog.h index bc347f41..e8fdc678 100644 --- a/juk/deletedialog.h +++ b/juk/deletedialog.h @@ -32,7 +32,7 @@ class DeleteWidget : public DeleteDialogBase TQ_OBJECT public: - DeleteWidget(TQWidget *tqparent = 0, const char *name = 0); + DeleteWidget(TQWidget *parent = 0, const char *name = 0); void setFiles(const TQStringList &files); @@ -46,7 +46,7 @@ class DeleteDialog : public KDialogBase TQ_OBJECT public: - DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog"); + DeleteDialog(TQWidget *parent, const char *name = "delete_dialog"); bool confirmDeleteList(const TQStringList &condemnedFiles); void setFiles(const TQStringList &files); diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index 85de9134..ceb0d71d 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -28,8 +28,8 @@ //////////////////////////////////////////////////////////////////////////////// DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylists, - TQWidget *tqparent, const char *name) : - KDialogBase(tqparent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true), + TQWidget *parent, const char *name) : + KDialogBase(parent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true), m_dirList(directories), m_importPlaylists(importPlaylists) { diff --git a/juk/directorylist.h b/juk/directorylist.h index f25c21ae..94835f2a 100644 --- a/juk/directorylist.h +++ b/juk/directorylist.h @@ -34,7 +34,7 @@ public: }; DirectoryList(const TQStringList &directories, bool importPlaylists, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~DirectoryList(); public slots: diff --git a/juk/dynamicplaylist.cpp b/juk/dynamicplaylist.cpp index a1ef1cd0..336d1e3e 100644 --- a/juk/dynamicplaylist.cpp +++ b/juk/dynamicplaylist.cpp @@ -23,9 +23,9 @@ class PlaylistDirtyObserver : public PlaylistObserver { public: - PlaylistDirtyObserver(DynamicPlaylist *tqparent, Playlist *playlist) : + PlaylistDirtyObserver(DynamicPlaylist *parent, Playlist *playlist) : PlaylistObserver(playlist), - m_parent(tqparent) + m_parent(parent) { } diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp index 0f5bd862..e365546a 100644 --- a/juk/exampleoptions.cpp +++ b/juk/exampleoptions.cpp @@ -21,8 +21,8 @@ #include "exampleoptions.h" -ExampleOptions::ExampleOptions(TQWidget *tqparent) : - ExampleOptionsBase(tqparent, "example options widget") +ExampleOptions::ExampleOptions(TQWidget *parent) : + ExampleOptionsBase(parent, "example options widget") { } @@ -44,8 +44,8 @@ void ExampleOptions::exampleFileChanged() emit fileChanged(); } -ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *tqparent) : - TQDialog(tqparent, "example options dialog") +ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) : + TQDialog(parent, "example options dialog") { setCaption(i18n("JuK")); TQVBoxLayout *l = new TQVBoxLayout(this); diff --git a/juk/exampleoptions.h b/juk/exampleoptions.h index 4d849b75..03dfaa13 100644 --- a/juk/exampleoptions.h +++ b/juk/exampleoptions.h @@ -24,7 +24,7 @@ class ExampleOptions : public ExampleOptionsBase Q_OBJECT TQ_OBJECT public: - ExampleOptions(TQWidget *tqparent); + ExampleOptions(TQWidget *parent); protected slots: virtual void exampleSelectionChanged(); @@ -39,7 +39,7 @@ class ExampleOptionsDialog : public TQDialog Q_OBJECT TQ_OBJECT public: - ExampleOptionsDialog(TQWidget *tqparent); + ExampleOptionsDialog(TQWidget *parent); const ExampleOptions *widget() const { return m_options; } diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index cf3866b0..6f479313 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -60,8 +60,8 @@ class ConfirmationDialog : public KDialogBase { public: ConfirmationDialog(const TQMap<TQString, TQString> &files, - TQWidget *tqparent = 0, const char *name = 0) - : KDialogBase(tqparent, name, true, i18n("Warning"), Ok | Cancel) + TQWidget *parent = 0, const char *name = 0) + : KDialogBase(parent, name, true, i18n("Warning"), Ok | Cancel) { TQVBox *vbox = makeVBoxMainWidget(); TQHBox *hbox = new TQHBox(vbox); @@ -224,8 +224,8 @@ bool ConfigCategoryReader::isDisabled(const CategoryID &category) const // Implementation of FileRenamerWidget // -FileRenamerWidget::FileRenamerWidget(TQWidget *tqparent) : - FileRenamerBase(tqparent), CategoryReaderInterface(), +FileRenamerWidget::FileRenamerWidget(TQWidget *parent) : + FileRenamerBase(parent), CategoryReaderInterface(), m_exampleFromFile(false) { 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 // widget is the one the needs to die. - delete m_folderSwitches[checkboxPosition]->tqparent(); + delete m_folderSwitches[checkboxPosition]->parent(); m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]); // Go through all the rows and if they have the same category and a diff --git a/juk/filerenamer.h b/juk/filerenamer.h index 06d8be0f..93f4e4cb 100644 --- a/juk/filerenamer.h +++ b/juk/filerenamer.h @@ -143,7 +143,7 @@ class FileRenamerWidget : public FileRenamerBase, public CategoryReaderInterface TQ_OBJECT public: - FileRenamerWidget(TQWidget *tqparent); + FileRenamerWidget(TQWidget *parent); ~FileRenamerWidget(); /// Maximum number of total categories the widget will allow. diff --git a/juk/filerenamerconfigdlg.cpp b/juk/filerenamerconfigdlg.cpp index a1f43687..8a741d03 100644 --- a/juk/filerenamerconfigdlg.cpp +++ b/juk/filerenamerconfigdlg.cpp @@ -19,8 +19,8 @@ #include "filerenamer.h" #include "filerenamerconfigdlg.h" -FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *tqparent) : - KDialogBase(tqparent, "file renamer dialog", true, +FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *parent) : + KDialogBase(parent, "file renamer dialog", true, i18n("File Renamer Options"), Ok | Cancel), m_renamerWidget(new FileRenamerWidget(this)) { diff --git a/juk/filerenamerconfigdlg.h b/juk/filerenamerconfigdlg.h index fc953181..fb209cc7 100644 --- a/juk/filerenamerconfigdlg.h +++ b/juk/filerenamerconfigdlg.h @@ -25,7 +25,7 @@ class FileRenamerConfigDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - FileRenamerConfigDlg(TQWidget *tqparent); + FileRenamerConfigDlg(TQWidget *parent); protected slots: virtual void accept(); diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp index cc9ab7fa..d800d2e2 100644 --- a/juk/filerenameroptions.cpp +++ b/juk/filerenameroptions.cpp @@ -25,9 +25,9 @@ #include "filerenameroptions.h" -FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *tqparent, +FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent, const TagRenamerOptions &options) : - FileRenamerTagOptionsBase(tqparent), m_options(options) + FileRenamerTagOptionsBase(parent), m_options(options) { tqlayout()->setSpacing(KDialog::spacingHint()); tqlayout()->setMargin(0); @@ -115,10 +115,10 @@ void FileRenamerTagOptions::slotEmptyActionChanged() m_options.setEmptyAction(TagRenamerOptions::ForceEmptyInclude); } -TagOptionsDialog::TagOptionsDialog(TQWidget *tqparent, +TagOptionsDialog::TagOptionsDialog(TQWidget *parent, const TagRenamerOptions &options, unsigned categoryNumber) : - KDialogBase(tqparent, 0, true, i18n("File Renamer"), Ok | Cancel), + KDialogBase(parent, 0, true, i18n("File Renamer"), Ok | Cancel), m_options(options), m_categoryNumber(categoryNumber) { diff --git a/juk/filerenameroptions.h b/juk/filerenameroptions.h index 88248f65..fa158124 100644 --- a/juk/filerenameroptions.h +++ b/juk/filerenameroptions.h @@ -31,7 +31,7 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase TQ_OBJECT public: - FileRenamerTagOptions(TQWidget *tqparent, const TagRenamerOptions &options); + FileRenamerTagOptions(TQWidget *parent, const TagRenamerOptions &options); const TagRenamerOptions &options() const { return m_options; } @@ -55,7 +55,7 @@ class TagOptionsDialog : public KDialogBase TQ_OBJECT public: - TagOptionsDialog(TQWidget *tqparent, const TagRenamerOptions &options, unsigned categoryNumber); + TagOptionsDialog(TQWidget *parent, const TagRenamerOptions &options, unsigned categoryNumber); const TagRenamerOptions &options() const { return m_options; } diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp index 53aa927e..a9bded13 100644 --- a/juk/historyplaylist.cpp +++ b/juk/historyplaylist.cpp @@ -90,15 +90,15 @@ void HistoryPlaylist::slotCreateNewItem() // HistoryPlaylistItem public members //////////////////////////////////////////////////////////////////////////////// -HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) : - PlaylistItem(item, tqparent, after), +HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) : + PlaylistItem(item, parent, after), m_dateTime(TQDateTime::tqcurrentDateTime()) { setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); } -HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent) : - PlaylistItem(item, tqparent), +HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) : + PlaylistItem(item, parent), m_dateTime(TQDateTime::tqcurrentDateTime()) { setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); diff --git a/juk/historyplaylist.h b/juk/historyplaylist.h index 13cf5436..bac4631f 100644 --- a/juk/historyplaylist.h +++ b/juk/historyplaylist.h @@ -23,8 +23,8 @@ class HistoryPlaylistItem : public PlaylistItem { public: - HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after); - HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent); + HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after); + HistoryPlaylistItem(CollectionListItem *item, Playlist *parent); virtual ~HistoryPlaylistItem(); TQDateTime dateTime() const { return m_dateTime; } diff --git a/juk/juk.cpp b/juk/juk.cpp index 47a94692..60c09426 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -43,8 +43,8 @@ using namespace ActionCollection; // public members //////////////////////////////////////////////////////////////////////////////// -JuK::JuK(TQWidget *tqparent, const char *name) : - KMainWindow(tqparent, name, WDestructiveClose), +JuK::JuK(TQWidget *parent, const char *name) : + KMainWindow(parent, name, WDestructiveClose), m_player(PlayerManager::instance()), m_shuttingDown(false) { @@ -40,7 +40,7 @@ class JuK : public KMainWindow TQ_OBJECT public: - JuK(TQWidget* tqparent = 0, const char *name = 0); + JuK(TQWidget* parent = 0, const char *name = 0); virtual ~JuK(); virtual KActionCollection *actionCollection() const; diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp index a4e4a7c6..ab480268 100644 --- a/juk/k3bexporter.cpp +++ b/juk/k3bexporter.cpp @@ -97,7 +97,7 @@ class PlaylistAction : public KAction 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; } -K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *tqparent) : K3bExporter(0), - m_playlistBox(tqparent) +K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *parent) : K3bExporter(0), + m_playlistBox(parent) { } diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h index fa49dc88..9577e0b3 100644 --- a/juk/k3bexporter.h +++ b/juk/k3bexporter.h @@ -33,7 +33,7 @@ class K3bExporter : public PlaylistExporter TQ_OBJECT public: - K3bExporter(Playlist *tqparent = 0); + K3bExporter(Playlist *parent = 0); /** * Returns a KAction that can be used to invoke the export. @@ -80,7 +80,7 @@ class K3bPlaylistExporter : public K3bExporter Q_OBJECT TQ_OBJECT public: - K3bPlaylistExporter(PlaylistBox *tqparent = 0); + K3bPlaylistExporter(PlaylistBox *parent = 0); virtual KAction *action(); diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp index 46455c37..80e7c1bd 100644 --- a/juk/keydialog.cpp +++ b/juk/keydialog.cpp @@ -75,8 +75,8 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = { const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]); KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, - TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok) + TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok) { // Read key group from configuration @@ -172,11 +172,11 @@ void KeyDialog::slotDefault() } int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection, - TQWidget *tqparent) + TQWidget *parent) { // 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) keys->updateConnections(); diff --git a/juk/keydialog.h b/juk/keydialog.h index 83c14d9d..41a1c6d1 100644 --- a/juk/keydialog.h +++ b/juk/keydialog.h @@ -30,9 +30,9 @@ class KeyDialog : public KDialogBase 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. @@ -44,7 +44,7 @@ public: * accelerators and actions. It behaves essentially like the functions * 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 diff --git a/juk/mediafiles.cpp b/juk/mediafiles.cpp index 7a0eb6a2..8ed0d859 100644 --- a/juk/mediafiles.cpp +++ b/juk/mediafiles.cpp @@ -45,9 +45,9 @@ namespace MediaFiles { 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.setCaption(i18n("Open")); @@ -60,11 +60,11 @@ TQStringList MediaFiles::openDialog(TQWidget *tqparent) 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("*").append(playlistExtension), - tqparent, + parent, i18n("Playlists")); if(!fileName.isEmpty() && !fileName.endsWith(playlistExtension)) fileName.append(playlistExtension); diff --git a/juk/mediafiles.h b/juk/mediafiles.h index ea6a4345..342739e7 100644 --- a/juk/mediafiles.h +++ b/juk/mediafiles.h @@ -24,15 +24,15 @@ 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 - * 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. diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index ebf03b94..8e14f1e9 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -41,15 +41,15 @@ static const int imageSize = 64; struct Line : public TQFrame { - Line(TQWidget *tqparent) : TQFrame(tqparent) { setFrameShape(VLine); } + Line(TQWidget *parent) : TQFrame(parent) { setFrameShape(VLine); } }; //////////////////////////////////////////////////////////////////////////////// // NowPlaying //////////////////////////////////////////////////////////////////////////////// -NowPlaying::NowPlaying(TQWidget *tqparent, PlaylistCollection *collection, const char *name) : - TQHBox(tqparent, name), +NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const char *name) : + TQHBox(parent, name), m_observer(this, collection), m_collection(collection) { @@ -105,11 +105,11 @@ void NowPlaying::slotUpdate() // CoverItem //////////////////////////////////////////////////////////////////////////////// -CoverItem::CoverItem(NowPlaying *tqparent) : - TQLabel(tqparent, "CoverItem"), - NowPlayingItem(tqparent) +CoverItem::CoverItem(NowPlaying *parent) : + TQLabel(parent, "CoverItem"), + NowPlayingItem(parent) { - setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); + setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); setFrameStyle(Box | Plain); setLineWidth(1); setMargin(1); @@ -214,11 +214,11 @@ void CoverItem::dropEvent(TQDropEvent *e) // TrackItem //////////////////////////////////////////////////////////////////////////////// -TrackItem::TrackItem(NowPlaying *tqparent) : - TQWidget(tqparent, "TrackItem"), - NowPlayingItem(tqparent) +TrackItem::TrackItem(NowPlaying *parent) : + TQWidget(parent, "TrackItem"), + NowPlayingItem(parent) { - setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); + setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); TQVBoxLayout *tqlayout = new TQVBoxLayout(this); @@ -242,7 +242,7 @@ void TrackItem::update(const FileHandle &file) void TrackItem::slotOpenLink(const TQString &link) { - PlaylistCollection *collection = NowPlayingItem::tqparent()->collection(); + PlaylistCollection *collection = NowPlayingItem::parent()->collection(); if(link == "artist") collection->showMore(m_file.tag()->artist()); @@ -269,7 +269,7 @@ void TrackItem::slotUpdate() "<br />" "<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("</font>"); @@ -287,11 +287,11 @@ void TrackItem::slotUpdate() // HistoryItem //////////////////////////////////////////////////////////////////////////////// -HistoryItem::HistoryItem(NowPlaying *tqparent) : - LinkLabel(tqparent, "HistoryItem"), - NowPlayingItem(tqparent) +HistoryItem::HistoryItem(NowPlaying *parent) : + LinkLabel(parent, "HistoryItem"), + NowPlayingItem(parent) { - setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2); + setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); setLinkUnderline(false); setText(TQString("<b>%1</b>").tqarg(i18n("History"))); @@ -342,7 +342,7 @@ void HistoryItem::openLink(const TQString &link) (*it).playlist->clearSelection(); (*it).playlist->setSelected(item, true); (*it).playlist->ensureItemVisible(item); - NowPlayingItem::tqparent()->collection()->raise((*it).playlist); + NowPlayingItem::parent()->collection()->raise((*it).playlist); } break; } diff --git a/juk/nowplaying.h b/juk/nowplaying.h index bacc6582..f1b38dce 100644 --- a/juk/nowplaying.h +++ b/juk/nowplaying.h @@ -43,7 +43,7 @@ class NowPlaying : public TQHBox TQ_OBJECT public: - NowPlaying(TQWidget *tqparent, PlaylistCollection *collection, + NowPlaying(TQWidget *parent, PlaylistCollection *collection, const char *name = 0); void addItem(NowPlayingItem *item); PlaylistCollection *collection() const; @@ -54,9 +54,9 @@ private slots: private: struct Observer : public PlaylistObserver { - Observer(NowPlaying *tqparent, PlaylistInterface *playlist) : + Observer(NowPlaying *parent, PlaylistInterface *playlist) : PlaylistObserver(playlist), - m_parent(tqparent) {} + m_parent(parent) {} virtual void updateCurrent() {} virtual void updateData() { m_parent->slotUpdate(); } NowPlaying *m_parent; @@ -76,9 +76,9 @@ class NowPlayingItem { public: virtual void update(const FileHandle &file) = 0; - NowPlaying *tqparent() const { return m_parent; } + NowPlaying *parent() const { return m_parent; } protected: - NowPlayingItem(NowPlaying *tqparent) : m_parent(tqparent) { tqparent->addItem(this); } + NowPlayingItem(NowPlaying *parent) : m_parent(parent) { parent->addItem(this); } private: NowPlaying *m_parent; }; @@ -91,7 +91,7 @@ private: class CoverItem : public TQLabel, public NowPlayingItem { public: - CoverItem(NowPlaying *tqparent); + CoverItem(NowPlaying *parent); virtual void update(const FileHandle &file); virtual void mouseReleaseEvent(TQMouseEvent *event); @@ -115,7 +115,7 @@ private: class LinkLabel : public KActiveLabel { 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 &) {} }; @@ -130,7 +130,7 @@ class TrackItem : public TQWidget, public NowPlayingItem TQ_OBJECT public: - TrackItem(NowPlaying *tqparent); + TrackItem(NowPlaying *parent); virtual void update(const FileHandle &file); private slots: @@ -152,7 +152,7 @@ class HistoryItem : public LinkLabel, public NowPlayingItem TQ_OBJECT public: - HistoryItem(NowPlaying *tqparent); + HistoryItem(NowPlaying *parent); virtual void update(const FileHandle &file); virtual void openLink(const TQString &link); diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index d62c84c4..db01392c 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -239,10 +239,10 @@ void PlayerManager::setStatusLabel(StatusLabel *label) m_statusLabel = label; } -KSelectAction *PlayerManager::playerSelectAction(TQObject *tqparent) // static +KSelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static { KSelectAction *action = 0; - action = new KSelectAction(i18n("&Output To"), 0, tqparent, "outputSelect"); + action = new KSelectAction(i18n("&Output To"), 0, parent, "outputSelect"); TQStringList l; #if HAVE_ARTS diff --git a/juk/playermanager.h b/juk/playermanager.h index 3b384762..9d6b3b06 100644 --- a/juk/playermanager.h +++ b/juk/playermanager.h @@ -62,7 +62,7 @@ public: TQString randomPlayMode() const; - static KSelectAction *playerSelectAction(TQObject *tqparent); + static KSelectAction *playerSelectAction(TQObject *parent); public slots: diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 267ec8e8..41f18228 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -83,8 +83,8 @@ static bool manualResize() class PlaylistToolTip : public TQToolTip { public: - PlaylistToolTip(TQWidget *tqparent, Playlist *playlist) : - TQToolTip(tqparent), m_playlist(playlist) {} + PlaylistToolTip(TQWidget *parent, Playlist *playlist) : + TQToolTip(parent), m_playlist(playlist) {} 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(); KURL::List urls; @@ -1025,7 +1025,7 @@ TQDragObject *Playlist::dragObject(TQWidget *tqparent) urls.append(url); } - KURLDrag *drag = new KURLDrag(urls, tqparent, "Playlist Items"); + KURLDrag *drag = new KURLDrag(urls, parent, "Playlist Items"); drag->setPixmap(BarIcon("sound")); return drag; @@ -1161,7 +1161,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event) TQListViewItemIterator visible(this, TQListViewItemIterator::IteratorFlag( TQListViewItemIterator::Visible)); if(selected.current() == visible.current()) - KApplication::postEvent(tqparent(), new FocusUpEvent); + KApplication::postEvent(parent(), new FocusUpEvent); } } diff --git a/juk/playlist.h b/juk/playlist.h index ba1363a1..22c16b45 100644 --- a/juk/playlist.h +++ b/juk/playlist.h @@ -420,7 +420,7 @@ protected: virtual bool eventFilter(TQObject *watched, TQEvent *e); virtual void keyPressEvent(TQKeyEvent *e); - virtual TQDragObject *dragObject(TQWidget *tqparent); + virtual TQDragObject *dragObject(TQWidget *parent); virtual TQDragObject *dragObject() { return dragObject(this); } virtual bool canDecode(TQMimeSource *s); virtual void decode(TQMimeSource *s, PlaylistItem *item = 0); @@ -457,7 +457,7 @@ protected: 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. */ void setDynamicListsFrozen(bool frozen); diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index abef8e74..d0e82d27 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -46,9 +46,9 @@ using namespace ActionCollection; // PlaylistBox public methods //////////////////////////////////////////////////////////////////////////////// -PlaylistBox::PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack, +PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, const char *name) : - KListView(tqparent, name), + KListView(parent, name), PlaylistCollection(playlistStack), m_viewModeIndex(0), m_hasSelection(false), @@ -692,8 +692,8 @@ PlaylistBox::Item::Item(PlaylistBox *listBox, const TQString &icon, const TQStri init(); } -PlaylistBox::Item::Item(Item *tqparent, const TQString &icon, const TQString &text, Playlist *l) - : TQObject(tqparent->listView()), KListViewItem(tqparent, text), +PlaylistBox::Item::Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l) + : TQObject(parent->listView()), KListViewItem(parent, text), m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false) { init(); diff --git a/juk/playlistbox.h b/juk/playlistbox.h index 27f48f45..793ae654 100644 --- a/juk/playlistbox.h +++ b/juk/playlistbox.h @@ -49,7 +49,7 @@ public: friend class Item; - PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack, + PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, const char *name = 0); virtual ~PlaylistBox(); @@ -153,7 +153,7 @@ public: protected: 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; } PlaylistBox *listView() const { return static_cast<PlaylistBox *>(KListViewItem::listView()); } diff --git a/juk/playlistexporter.h b/juk/playlistexporter.h index ca7d0dc6..3caae65f 100644 --- a/juk/playlistexporter.h +++ b/juk/playlistexporter.h @@ -31,7 +31,7 @@ class KActionCollection; class PlaylistExporter : public TQObject { public: - PlaylistExporter(TQWidget *tqparent = 0) : TQObject(tqparent) { } + PlaylistExporter(TQWidget *parent = 0) : TQObject(parent) { } virtual ~PlaylistExporter() { } /** diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp index b29d338c..81aad977 100644 --- a/juk/playlistitem.cpp +++ b/juk/playlistitem.cpp @@ -239,16 +239,16 @@ void PlaylistItem::clear() // PlaylistItem protected methods //////////////////////////////////////////////////////////////////////////////// -PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent) : - KListViewItem(tqparent), +PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) : + KListViewItem(parent), d(0), m_watched(0) { setup(item); } -PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) : - KListViewItem(tqparent, after), +PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) : + KListViewItem(parent, after), d(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. -PlaylistItem::PlaylistItem(CollectionList *tqparent) : - KListViewItem(tqparent), +PlaylistItem::PlaylistItem(CollectionList *parent) : + KListViewItem(parent), m_watched(0) { d = new Data; diff --git a/juk/playlistitem.h b/juk/playlistitem.h index d8797208..9b9cfa80 100644 --- a/juk/playlistitem.h +++ b/juk/playlistitem.h @@ -156,13 +156,13 @@ protected: * Items should always be created using Playlist::createItem() or through a * subclss or friend class. */ - PlaylistItem(CollectionListItem *item, Playlist *tqparent); - PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after); + PlaylistItem(CollectionListItem *item, Playlist *parent); + PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after); /** * 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 diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index 5fa2b72b..caf2ce00 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -34,8 +34,8 @@ using namespace ActionCollection; // public methods //////////////////////////////////////////////////////////////////////////////// -PlaylistSplitter::PlaylistSplitter(TQWidget *tqparent, const char *name) : - TQSplitter(Qt::Horizontal, tqparent, name), +PlaylistSplitter::PlaylistSplitter(TQWidget *parent, const char *name) : + TQSplitter(Qt::Horizontal, parent, name), m_newVisible(0), m_playlistBox(0), m_searchWidget(0), diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h index 4865fa22..b0ed1a75 100644 --- a/juk/playlistsplitter.h +++ b/juk/playlistsplitter.h @@ -44,7 +44,7 @@ class PlaylistSplitter : public TQSplitter TQ_OBJECT public: - PlaylistSplitter(TQWidget *tqparent, const char *name = 0); + PlaylistSplitter(TQWidget *parent, const char *name = 0); virtual ~PlaylistSplitter(); PlaylistInterface *playlist() const { return m_playlistBox; } diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index a0a110fa..8201f931 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -39,8 +39,8 @@ using namespace ActionCollection; // SearchLine public methods //////////////////////////////////////////////////////////////////////////////// -SearchLine::SearchLine(TQWidget *tqparent, bool simple, const char *name) : - TQHBox(tqparent, name), +SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) : + TQHBox(parent, name), m_simple(simple), m_searchFieldsBox(0) { @@ -188,7 +188,7 @@ void SearchLine::updateColumns() // SearchWidget public methods //////////////////////////////////////////////////////////////////////////////// -SearchWidget::SearchWidget(TQWidget *tqparent, const char *name) : KToolBar(tqparent, name) +SearchWidget::SearchWidget(TQWidget *parent, const char *name) : KToolBar(parent, name) { setupLayout(); updateColumns(); diff --git a/juk/searchwidget.h b/juk/searchwidget.h index 75f0c513..8bb20ab9 100644 --- a/juk/searchwidget.h +++ b/juk/searchwidget.h @@ -40,7 +40,7 @@ class SearchLine : public TQHBox public: 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() {} PlaylistSearch::Component searchComponent() const; @@ -76,7 +76,7 @@ class SearchWidget : public KToolBar, public SearchIface TQ_OBJECT public: - SearchWidget(TQWidget *tqparent, const char *name = 0); + SearchWidget(TQWidget *parent, const char *name = 0); virtual ~SearchWidget(); PlaylistSearch search(const PlaylistList &playlists) const; diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index a001fc31..cf68043c 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -39,7 +39,7 @@ class TrackPositionSlider : public TQSlider { public: - TrackPositionSlider(TQWidget *tqparent, const char *name) : TQSlider(tqparent, name) + TrackPositionSlider(TQWidget *parent, const char *name) : TQSlider(parent, name) { setFocusPolicy(TQ_NoFocus); } @@ -63,8 +63,8 @@ protected: // VolumeSlider implementation //////////////////////////////////////////////////////////////////////////////// -VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name) : - TQSlider(o, tqparent, name) +VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name) : + TQSlider(o, parent, name) { 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::maxPosition = 1000; -SliderAction::SliderAction(const TQString &text, TQObject *tqparent, const char *name) - : KAction(text, 0, tqparent, name), +SliderAction::SliderAction(const TQString &text, TQObject *parent, const char *name) + : KAction(text, 0, parent, name), m_toolBar(0), m_layout(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) 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 // "plugged" in to - if(tqparent->inherits("KToolBar") && !m_toolBar) { - m_toolBar = static_cast<KToolBar *>(tqparent); + if(parent->inherits("KToolBar") && !m_toolBar) { + m_toolBar = static_cast<KToolBar *>(parent); 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")) { - m_toolBar = static_cast<KToolBar *>(tqparent); + if (parent->inherits("KToolBar")) { + m_toolBar = static_cast<KToolBar *>(parent); int index = findContainer(m_toolBar); if (index != -1) { @@ -221,14 +221,14 @@ void SliderAction::slotUpdateOrientation() // private members //////////////////////////////////////////////////////////////////////////////// -TQWidget *SliderAction::createWidget(TQWidget *tqparent) // virtual -- used by base class +TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by base class { - if(tqparent) { - TQWidget *base = new TQWidget(tqparent); - base->setBackgroundMode(tqparent->backgroundMode()); + if(parent) { + TQWidget *base = new TQWidget(parent); + base->setBackgroundMode(parent->backgroundMode()); base->setName("kde toolbar widget"); - KToolBar *toolBar = dynamic_cast<KToolBar *>(tqparent); + KToolBar *toolBar = dynamic_cast<KToolBar *>(parent); if(toolBar) 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_volumeSlider, 1); - connect(tqparent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize())); + connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize())); return base; } diff --git a/juk/slideraction.h b/juk/slideraction.h index 5577a481..70fb3a9d 100644 --- a/juk/slideraction.h +++ b/juk/slideraction.h @@ -28,7 +28,7 @@ class VolumeSlider : public TQSlider TQ_OBJECT public: - VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name); + VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name); int volume() const; void setVolume(int value); @@ -52,7 +52,7 @@ class SliderAction : public KAction TQ_OBJECT public: - SliderAction(const TQString &text, TQObject *tqparent, const char *name); + SliderAction(const TQString &text, TQObject *parent, const char *name); virtual ~SliderAction(); VolumeSlider *volumeSlider() const { return m_volumeSlider; } @@ -61,7 +61,7 @@ public: bool dragging() const { return m_dragging; } 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); static const int minPosition; @@ -75,7 +75,7 @@ signals: void signalVolumeChanged(int volume); private: - TQWidget *createWidget(TQWidget *tqparent); + TQWidget *createWidget(TQWidget *parent); private slots: void slotUpdateSize(); diff --git a/juk/sortedstringlist.cpp b/juk/sortedstringlist.cpp index b952067b..0886a88d 100644 --- a/juk/sortedstringlist.cpp +++ b/juk/sortedstringlist.cpp @@ -20,11 +20,11 @@ class SortedStringList::Node { 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() {} TQString key; - Node *tqparent; + Node *parent; Node *left; Node *right; }; @@ -61,11 +61,11 @@ SortedStringList::Node *SortedStringList::treeSuccessor(Node *n) const if(n->right) return treeMinimum(n->right); - Node *p = n->tqparent; + Node *p = n->parent; while(p && n == p->right) { n = p; - p = p->tqparent; + p = p->parent; } return p; @@ -92,15 +92,15 @@ bool SortedStringList::remove(const TQString &value) x = y->right; if(x) - x->tqparent = y->tqparent; + x->parent = y->parent; - if(!y->tqparent) + if(!y->parent) m_root = x; else { - if(y == y->tqparent->left) - y->tqparent->left = x; + if(y == y->parent->left) + y->parent->left = x; else - y->tqparent->right = x; + y->parent->right = x; } if(y != x) @@ -155,7 +155,7 @@ bool SortedStringList::BSTInsert(const TQString &value) Node *n = new Node(value); - n->tqparent = previousNode; + n->parent = previousNode; if(!m_root) m_root = n; diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index 4867c7ec..951604cd 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -35,8 +35,8 @@ using namespace ActionCollection; // public methods //////////////////////////////////////////////////////////////////////////////// -StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent, const char *name) : - TQHBox(tqparent, name), +StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const char *name) : + TQHBox(parent, name), PlaylistObserver(playlist), m_showTimeRemaining(false) { diff --git a/juk/statuslabel.h b/juk/statuslabel.h index a2411622..4d33f387 100644 --- a/juk/statuslabel.h +++ b/juk/statuslabel.h @@ -31,7 +31,7 @@ class StatusLabel : public TQHBox, public PlaylistObserver TQ_OBJECT public: - StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent = 0, const char *name = 0); + StatusLabel(PlaylistInterface *playlist, TQWidget *parent = 0, const char *name = 0); virtual ~StatusLabel(); virtual void updateCurrent(); diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 8a9a9c32..e326ef27 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -50,8 +50,8 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y); class FlickerFreeLabel : public TQLabel { public: - FlickerFreeLabel(const TQString &text, TQWidget *tqparent, const char *name = 0) : - TQLabel(text, tqparent, name) + FlickerFreeLabel(const TQString &text, TQWidget *parent, const char *name = 0) : + TQLabel(text, parent, name) { m_textColor = paletteForegroundColor(); m_bgColor = parentWidget()->paletteBackgroundColor(); @@ -90,8 +90,8 @@ protected: TQColor m_bgColor; }; -PassiveInfo::PassiveInfo(TQWidget *tqparent, const char *name) : - KPassivePopup(tqparent, name), m_timer(new TQTimer), m_justDie(false) +PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) : + KPassivePopup(parent, name), m_timer(new TQTimer), m_justDie(false) { // I'm so sick and tired of KPassivePopup screwing this up // that I'll just handle the timeout myself, thank you very much. @@ -137,7 +137,7 @@ void PassiveInfo::leaveEvent(TQEvent *) // 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_fadeTimer(0), m_fade(true) @@ -299,7 +299,7 @@ void SystemTray::slotMouseInPopup() // private methods //////////////////////////////////////////////////////////////////////////////// -TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file) +TQVBox *SystemTray::createPopupLayout(TQWidget *parent, const FileHandle &file) { 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 - createButtonBox(tqparent); - addSeparatorLine(tqparent); + createButtonBox(parent); + addSeparatorLine(parent); - infoBox = new TQVBox(tqparent); + infoBox = new TQVBox(parent); // Another line, and the cover, if there's a cover, and if // it's selected to be shown if(file.coverInfo()->hasCover()) { - addSeparatorLine(tqparent); - addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); + addSeparatorLine(parent); + addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); } } else { @@ -325,14 +325,14 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file // Like above, but reversed. if(file.coverInfo()->hasCover()) { - addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); - addSeparatorLine(tqparent); + addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail)); + addSeparatorLine(parent); } - infoBox = new TQVBox(tqparent); + infoBox = new TQVBox(parent); - addSeparatorLine(tqparent); - createButtonBox(tqparent); + addSeparatorLine(parent); + createButtonBox(parent); } infoBox->setSpacing(3); @@ -440,9 +440,9 @@ TQPixmap SystemTray::createPixmap(const TQString &pixName) 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); @@ -472,9 +472,9 @@ void SystemTray::slotForward() 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); // 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); } -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->setFixedSize(cover.size()); diff --git a/juk/systemtray.h b/juk/systemtray.h index 0dcb9676..fb6e91f9 100644 --- a/juk/systemtray.h +++ b/juk/systemtray.h @@ -40,7 +40,7 @@ class PassiveInfo : public KPassivePopup Q_OBJECT TQ_OBJECT public: - PassiveInfo(TQWidget *tqparent = 0, const char *name = 0); + PassiveInfo(TQWidget *parent = 0, const char *name = 0); public slots: void setTimeout(int delay); @@ -68,7 +68,7 @@ class SystemTray : public KSystemTray TQ_OBJECT public: - SystemTray(TQWidget *tqparent = 0, const char *name = 0); + SystemTray(TQWidget *parent = 0, const char *name = 0); virtual ~SystemTray(); signals: @@ -88,15 +88,15 @@ private: // (because the JuK icon is on the left side of the screen. bool buttonsToLeft() const; - void createButtonBox(TQWidget *tqparent); + void createButtonBox(TQWidget *parent); // Creates the widget tqlayout for the popup, returning the TQVBox that // holds the text labels. Uses buttonsToLeft() to figure out which // 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 addCoverButton(TQWidget *tqparent, const TQPixmap &cover); + void addSeparatorLine(TQWidget *parent); + void addCoverButton(TQWidget *parent, const TQPixmap &cover); // Interpolates from start color to end color. If @p step == 0, then // m_startColor is returned, while @p step == @steps returns diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index f02f11ab..c9f866c4 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -49,8 +49,8 @@ using namespace ActionCollection; class FileNameValidator : public TQValidator { public: - FileNameValidator(TQObject *tqparent, const char *name = 0) : - TQValidator(tqparent, name) {} + FileNameValidator(TQObject *parent, const char *name = 0) : + TQValidator(parent, name) {} virtual void fixup(TQString &s) const { @@ -82,8 +82,8 @@ private: class FixedHLayout : public TQHBoxLayout { public: - FixedHLayout(TQWidget *tqparent, int margin = 0, int spacing = -1, const char *name = 0) : - TQHBoxLayout(tqparent, margin, spacing, name), + FixedHLayout(TQWidget *parent, int margin = 0, int spacing = -1, const char *name = 0) : + TQHBoxLayout(parent, margin, spacing, name), m_width(-1) {} FixedHLayout(TQLayout *parentLayout, int spacing = -1, const char *name = 0) : TQHBoxLayout(parentLayout, spacing, name), @@ -105,9 +105,9 @@ private: class CollectionObserver : public PlaylistObserver { public: - CollectionObserver(TagEditor *tqparent) : + CollectionObserver(TagEditor *parent) : PlaylistObserver(CollectionList::instance()), - m_parent(tqparent) + m_parent(parent) { } @@ -127,8 +127,8 @@ private: // public members //////////////////////////////////////////////////////////////////////////////// -TagEditor::TagEditor(TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name), +TagEditor::TagEditor(TQWidget *parent, const char *name) : + TQWidget(parent, name), m_currentPlaylist(0), m_observer(0), m_performingSave(false) diff --git a/juk/tageditor.h b/juk/tageditor.h index 8a616f15..35526380 100644 --- a/juk/tageditor.h +++ b/juk/tageditor.h @@ -40,7 +40,7 @@ class TagEditor : public TQWidget TQ_OBJECT public: - TagEditor(TQWidget *tqparent = 0, const char *name = 0); + TagEditor(TQWidget *parent = 0, const char *name = 0); virtual ~TagEditor(); PlaylistItemList items() const { return m_items; } void setupObservers(); diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp index f6f1c469..7caea019 100644 --- a/juk/tagguesserconfigdlg.cpp +++ b/juk/tagguesserconfigdlg.cpp @@ -20,8 +20,8 @@ #include <tqtoolbutton.h> #include <tqevent.h> -TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n("Tag Guesser Configuration"), +TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n("Tag Guesser Configuration"), Ok | Cancel, Ok, true) { m_child = new TagGuesserConfigDlgWidget(this, "child"); diff --git a/juk/tagguesserconfigdlg.h b/juk/tagguesserconfigdlg.h index 480e00f3..c268c725 100644 --- a/juk/tagguesserconfigdlg.h +++ b/juk/tagguesserconfigdlg.h @@ -19,7 +19,7 @@ class TagGuesserConfigDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - TagGuesserConfigDlg(TQWidget *tqparent, const char *name = 0); + TagGuesserConfigDlg(TQWidget *parent, const char *name = 0); protected slots: virtual void accept(); diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp index 256b7041..97028983 100644 --- a/juk/tagtransactionmanager.cpp +++ b/juk/tagtransactionmanager.cpp @@ -123,7 +123,7 @@ bool TagTransactionManager::undo() return result; } -TagTransactionManager::TagTransactionManager(TQWidget *tqparent) : TQObject(tqparent, "tagmanager") +TagTransactionManager::TagTransactionManager(TQWidget *parent) : TQObject(parent, "tagmanager") { m_manager = this; } @@ -135,7 +135,7 @@ bool TagTransactionManager::renameFile(const TQFileInfo &from, const TQFileInfo if(!to.exists() || KMessageBox::warningContinueCancel( - TQT_TQWIDGET(tqparent()), + TQT_TQWIDGET(parent()), i18n("This file already exists.\nDo you want to replace it?"), i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue) { @@ -200,7 +200,7 @@ bool TagTransactionManager::processChangeList(bool undo) action("edit_undo")->setEnabled(false); if(!errorItems.isEmpty()) - KMessageBox::errorList(TQT_TQWIDGET(tqparent()), + KMessageBox::errorList(TQT_TQWIDGET(parent()), i18n("The following files were unable to be changed."), errorItems, i18n("Error")); diff --git a/juk/tagtransactionmanager.h b/juk/tagtransactionmanager.h index 7ea38f96..dfb63d1a 100644 --- a/juk/tagtransactionmanager.h +++ b/juk/tagtransactionmanager.h @@ -110,11 +110,11 @@ class TagTransactionManager : public TQObject 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. diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp index ee70ebda..91e2b012 100644 --- a/juk/trackpickerdialog.cpp +++ b/juk/trackpickerdialog.cpp @@ -30,8 +30,8 @@ class TrackPickerItem : public KListViewItem { public: - TrackPickerItem(KListView *tqparent, const KTRMResult &result) : - KListViewItem(tqparent, tqparent->lastChild(), + TrackPickerItem(KListView *parent, const KTRMResult &result) : + KListViewItem(parent, parent->lastChild(), result.title(), result.artist(), result.album(), NUMBER(result.track()), NUMBER(result.year())), m_result(result) {} @@ -47,8 +47,8 @@ private: TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList &results, - TQWidget *tqparent) : - KDialogBase(tqparent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true) + TQWidget *parent) : + KDialogBase(parent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true) { m_base = new TrackPickerDialogBase(this); setMainWidget(m_base); diff --git a/juk/trackpickerdialog.h b/juk/trackpickerdialog.h index 9cc5f347..a25cc3d1 100644 --- a/juk/trackpickerdialog.h +++ b/juk/trackpickerdialog.h @@ -34,7 +34,7 @@ class TrackPickerDialog : public KDialogBase public: TrackPickerDialog(const TQString &name, const KTRMResultList &results, - TQWidget *tqparent = 0); + TQWidget *parent = 0); virtual ~TrackPickerDialog(); diff --git a/juk/upcomingplaylist.h b/juk/upcomingplaylist.h index a0a95083..4bd7b712 100644 --- a/juk/upcomingplaylist.h +++ b/juk/upcomingplaylist.h @@ -180,7 +180,7 @@ public: /** * 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. * Otherwise, it is moved up and set to play, replacing any track that may * be playing. @@ -196,7 +196,7 @@ public: /** * 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. */ virtual void prepareToPlay(Playlist *); diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index f8445bc3..61dc37a1 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -42,8 +42,8 @@ WebImage::WebImage(const TQString &imageURL, const TQString &thumbURL, } -WebImageFetcher::WebImageFetcher(TQObject *tqparent) - : TQObject(tqparent), +WebImageFetcher::WebImageFetcher(TQObject *parent) + : TQObject(parent), m_connection(new TQHttp(this)), m_connectionId(-1), m_dialog(0) diff --git a/juk/webimagefetcher.h b/juk/webimagefetcher.h index 4c2aafef..08bfe837 100644 --- a/juk/webimagefetcher.h +++ b/juk/webimagefetcher.h @@ -58,7 +58,7 @@ class WebImageFetcher : public TQObject TQ_OBJECT public: - WebImageFetcher(TQObject *tqparent); + WebImageFetcher(TQObject *parent); ~WebImageFetcher(); void setFile(const FileHandle &file); diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index 32cbbe9b..eb2b1c2a 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -36,8 +36,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, const FileHandle &file, - TQWidget *tqparent) : - KDialogBase(tqparent, "internet_image_fetcher", true, TQString(), + TQWidget *parent) : + KDialogBase(parent, "internet_image_fetcher", true, TQString(), Ok | Cancel | User1 , NoDefault, true), m_pixmap(TQPixmap()), m_imageList(imageList), @@ -184,8 +184,8 @@ TQPixmap WebImageFetcherDialog::pixmapFromURL(const KURL &url) const // CoverIconViewItem //////////////////////////////////////////////////////////////////////////////// -CoverIconViewItem::CoverIconViewItem(TQIconView *tqparent, const WebImage &image) : - TQObject(tqparent), KIconViewItem(tqparent, tqparent->lastItem(), image.size()), m_job(0) +CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) : + TQObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0) { // Set up the iconViewItem diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h index bd9eb43e..0211ceec 100644 --- a/juk/webimagefetcherdialog.h +++ b/juk/webimagefetcherdialog.h @@ -32,7 +32,7 @@ class WebImageFetcherDialog : public KDialogBase public: WebImageFetcherDialog(const WebImageList &urlList, const FileHandle &file, - TQWidget *tqparent = 0); + TQWidget *parent = 0); virtual ~WebImageFetcherDialog(); @@ -77,7 +77,7 @@ class CoverIconViewItem : public TQObject, public KIconViewItem TQ_OBJECT public: - CoverIconViewItem(TQIconView *tqparent, const WebImage &image); + CoverIconViewItem(TQIconView *parent, const WebImage &image); ~CoverIconViewItem(); private slots: diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp index b718b659..896d77cb 100644 --- a/kaboodle/controls.cpp +++ b/kaboodle/controls.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "controls.h" -Kaboodle::L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : - TQSlider(tqparent,name), pressed(false) +Kaboodle::L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : - TQSlider(o,tqparent,name), pressed(false) +Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} Kaboodle::L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation o, TQWidget * tqparent, const char * name) : - TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) + Qt::Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} 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, - const char *member, TQObject* tqparent, const char* name ) - : KAction( text, accel, tqparent, name ) + const char *member, TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; diff --git a/kaboodle/controls.h b/kaboodle/controls.h index 19b11fde..d746df81 100644 --- a/kaboodle/controls.h +++ b/kaboodle/controls.h @@ -45,10 +45,10 @@ class L33tSlider : public TQSlider Q_OBJECT TQ_OBJECT public: - L33tSlider(TQWidget * tqparent, const char * name=0); - L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0); 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; signals: @@ -77,7 +77,7 @@ Q_OBJECT TQ_OBJECT public: 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 void unplug( TQWidget *w ); TQSlider* slider() const { return m_slider; } diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp index f103ca19..5909dbcd 100644 --- a/kaboodle/engine.cpp +++ b/kaboodle/engine.cpp @@ -71,8 +71,8 @@ public: KURL file; }; -Kaboodle::Engine::Engine(TQObject *tqparent) - : TQObject(tqparent) +Kaboodle::Engine::Engine(TQObject *parent) + : TQObject(parent) , d(new EnginePrivate) { } diff --git a/kaboodle/engine.h b/kaboodle/engine.h index 5a1b51b3..c269a02d 100644 --- a/kaboodle/engine.h +++ b/kaboodle/engine.h @@ -48,7 +48,7 @@ Q_OBJECT TQ_OBJECT public: - Engine(TQObject *tqparent=0); + Engine(TQObject *parent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/kaboodle/kaboodle_factory.cpp b/kaboodle/kaboodle_factory.cpp index 0b842d53..99302702 100644 --- a/kaboodle/kaboodle_factory.cpp +++ b/kaboodle/kaboodle_factory.cpp @@ -42,15 +42,15 @@ Kaboodle::KaboodleFactory::~KaboodleFactory() 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")) { - return new Player(tqparent, name); + return new Player(parent, name); } else { - return new Player(widgetParent, widgetName, tqparent, name); + return new Player(widgetParent, widgetName, parent, name); } } diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index 46e02af6..11ce0cbf 100644 --- a/kaboodle/kaboodle_factory.h +++ b/kaboodle/kaboodle_factory.h @@ -41,7 +41,7 @@ public: 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 KInstance *instance(); diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp index 32cc37d2..0d384ded 100644 --- a/kaboodle/player.cpp +++ b/kaboodle/player.cpp @@ -32,8 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "player.h" #include "view.h" -Kaboodle::Player::Player(TQObject *tqparent, const char *name) - : KMediaPlayer::Player(tqparent, name) +Kaboodle::Player::Player(TQObject *parent, const char *name) + : KMediaPlayer::Player(parent, name) , engine(new Engine(this)) , widget(0) , uncompleted(true) @@ -47,8 +47,8 @@ Kaboodle::Player::Player(TQObject *tqparent, const char *name) } Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName, - TQObject *tqparent, const char *name) - : KMediaPlayer::Player(widgetParent, widgetName, tqparent, name) + TQObject *parent, const char *name) + : KMediaPlayer::Player(widgetParent, widgetName, parent, name) , engine(new Engine(this)) , widget(new View(widgetParent, widgetName, this)) , uncompleted(true) @@ -260,8 +260,8 @@ void Kaboodle::Player::updateTitle() } } -Kaboodle::BrowserExtension::BrowserExtension(Player *tqparent) - : KParts::BrowserExtension(tqparent, "Kaboodle Browser Extension") +Kaboodle::BrowserExtension::BrowserExtension(Player *parent) + : KParts::BrowserExtension(parent, "Kaboodle Browser Extension") { } diff --git a/kaboodle/player.h b/kaboodle/player.h index ee7f1b0a..1fab8e3c 100644 --- a/kaboodle/player.h +++ b/kaboodle/player.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_OBJECT public: - BrowserExtension(Player *tqparent); + BrowserExtension(Player *parent); }; class Player : public KMediaPlayer::Player @@ -56,8 +56,8 @@ Q_OBJECT public: Player(TQWidget *widgetParent, const char *widgetName, - TQObject *tqparent, const char *name); - Player(TQObject *tqparent, const char *name); + TQObject *parent, const char *name); + Player(TQObject *parent, const char *name); virtual ~Player(); virtual bool openURL(const KURL &); diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp index 5dd8bd70..10f7e56e 100644 --- a/kaboodle/userinterface.cpp +++ b/kaboodle/userinterface.cpp @@ -48,8 +48,8 @@ #include "view.h" #include "userinterface.h" -Kaboodle::UserInterface::UserInterface(TQWidget *tqparent, const KURL &initialFile) - : KParts::MainWindow(tqparent) +Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile) + : KParts::MainWindow(parent) { setAcceptDrops(true); setStandardToolBarMenuEnabled(true); diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h index 076a4eec..6b430815 100644 --- a/kaboodle/userinterface.h +++ b/kaboodle/userinterface.h @@ -44,7 +44,7 @@ class UserInterface : public KParts::MainWindow Q_OBJECT TQ_OBJECT public: - UserInterface(TQWidget *tqparent, const KURL &initialFile = KURL()); + UserInterface(TQWidget *parent, const KURL &initialFile = KURL()); virtual ~UserInterface(void); void load(const TQString& url); diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index 75171584..437af5b0 100644 --- a/kaboodle/view.cpp +++ b/kaboodle/view.cpp @@ -55,8 +55,8 @@ TQButton *createButton(const TQIconSet &_iconset, const TQString &_tip, TQObject } } -Kaboodle::View::View(TQWidget *tqparent, const char *name, Player *p) - : KMediaPlayer::View(tqparent, name) +Kaboodle::View::View(TQWidget *parent, const char *name, Player *p) + : KMediaPlayer::View(parent, name) , state((KMediaPlayer::Player::State)p->state()) , autoPlay(false) , quitAfterPlaying(false) diff --git a/kaboodle/view.h b/kaboodle/view.h index 5aa2a6b7..75ed28b4 100644 --- a/kaboodle/view.h +++ b/kaboodle/view.h @@ -48,7 +48,7 @@ Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent, const char *name, Player *player); + View(TQWidget *parent, const char *name, Player *player); virtual ~View(void); /** diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp index d4aae9a3..28d46320 100644 --- a/kaudiocreator/encodefileimp.cpp +++ b/kaudiocreator/encodefileimp.cpp @@ -27,8 +27,8 @@ #include <tqcombobox.h> #include <kmessagebox.h> -EncodeFileImp::EncodeFileImp(TQWidget* tqparent, - const char* name) : EncodeFile(tqparent, name), m_genres(KCDDB::Genres()) { +EncodeFileImp::EncodeFileImp(TQWidget* parent, + const char* name) : EncodeFile(parent, name), m_genres(KCDDB::Genres()) { genre->insertStringList(m_genres.i18nList()); // Specify to only accept wav files file->setFilter("*.wav|Wav Files"); diff --git a/kaudiocreator/encodefileimp.h b/kaudiocreator/encodefileimp.h index de556417..3ac77c80 100644 --- a/kaudiocreator/encodefileimp.h +++ b/kaudiocreator/encodefileimp.h @@ -40,7 +40,7 @@ signals: void startJob(Job *newJob); public: - EncodeFileImp(TQWidget* tqparent = 0, const char* name = 0); + EncodeFileImp(TQWidget* parent = 0, const char* name = 0); protected slots: // Encode button diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index 97ab366a..e528a29a 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -37,7 +37,7 @@ /** * 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(); } diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h index 1209c71d..e5f8229a 100644 --- a/kaudiocreator/encoder.h +++ b/kaudiocreator/encoder.h @@ -41,7 +41,7 @@ signals: void jobsChanged(); public: - Encoder( TQObject* tqparent = 0, const char* name = 0); + Encoder( TQObject* parent = 0, const char* name = 0); ~Encoder(); int activeJobCount(); int pendingJobCount(); diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index a2fb31e2..98321887 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -32,8 +32,8 @@ /** * Constructor. */ -EncoderConfigImp::EncoderConfigImp( TQWidget* tqparent, const char* name) : - EncoderConfig (tqparent, name) { +EncoderConfigImp::EncoderConfigImp( TQWidget* parent, const char* name) : + EncoderConfig (parent, name) { connect(addEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEncoderSlot())); connect(removeEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEncoderSlot())); connect(configureEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureEncoderSlot())); diff --git a/kaudiocreator/encoderconfigimp.h b/kaudiocreator/encoderconfigimp.h index 86fbf5a4..1ead8390 100644 --- a/kaudiocreator/encoderconfigimp.h +++ b/kaudiocreator/encoderconfigimp.h @@ -38,7 +38,7 @@ signals: void encoderUpdated(); public: - EncoderConfigImp( TQWidget* tqparent = 0, const char* name = 0); + EncoderConfigImp( TQWidget* parent = 0, const char* name = 0); private slots: void addEncoderSlot(); diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp index fc580a29..8ca6d087 100644 --- a/kaudiocreator/jobqueimp.cpp +++ b/kaudiocreator/jobqueimp.cpp @@ -46,11 +46,11 @@ /** * Constructor, set up signals. - * @param tqparent - tqparent widget + * @param parent - parent widget * @param name - widget name */ -JobQueImp::JobQueImp( TQWidget* tqparent, const char* name) : - JobQue(tqparent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ +JobQueImp::JobQueImp( TQWidget* parent, const char* name) : + JobQue(parent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ connect(removeSelected,TQT_SIGNAL(clicked()), this, TQT_SLOT( removeSelectedJob())); connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllJobs())); 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. */ -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" diff --git a/kaudiocreator/jobqueimp.h b/kaudiocreator/jobqueimp.h index 32735a3a..31315790 100644 --- a/kaudiocreator/jobqueimp.h +++ b/kaudiocreator/jobqueimp.h @@ -55,7 +55,7 @@ signals: void removeJob( int idNumber ); public: - JobQueImp( TQWidget* tqparent = 0, const char* name = 0 ); + JobQueImp( TQWidget* parent = 0, const char* name = 0 ); int numberOfJobsNotFinished(); public slots: diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index 946b57dc..91c0de17 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -49,8 +49,8 @@ /** * Constructor. Connect all of the object and the job control. */ -KAudioCreator::KAudioCreator( TQWidget* tqparent, const char* name) : - KMainWindow(tqparent, name) +KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : + KMainWindow(parent, name) { janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed); setCentralWidget(janusWidget); @@ -235,8 +235,8 @@ void KAudioCreator::showSettings(){ dialog->show(); } -SettingsDialog::SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config) - : KConfigDialog(tqparent, name, config), +SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config) + : KConfigDialog(parent, name, config), cddb(0), cddbChanged(false) { addPage(new General(0, "General"), i18n("General"), "package_settings", diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index 29951b74..5e901d77 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - KAudioCreator( TQWidget* tqparent = 0, const char* name = 0); + KAudioCreator( TQWidget* parent = 0, const char* name = 0); void setDevice( const TQString &device ); protected: @@ -71,7 +71,7 @@ Q_OBJECT TQ_OBJECT public: - SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config); + SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config); protected slots: void updateSettings(); diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index dcc391ca..2e953ce6 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -32,7 +32,7 @@ /** * Constructor, load settings. */ -Ripper::Ripper( TQObject* tqparent, const char* name) : TQObject(tqparent,name) { +Ripper::Ripper( TQObject* parent, const char* name) : TQObject(parent,name) { loadSettings(); } diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h index 9dfed908..54a7872e 100644 --- a/kaudiocreator/ripper.h +++ b/kaudiocreator/ripper.h @@ -41,7 +41,7 @@ signals: void jobsChanged(); public: - Ripper( TQObject* tqparent = 0, const char* name = 0 ); + Ripper( TQObject* parent = 0, const char* name = 0 ); ~Ripper(); int activeJobCount(); int pendingJobCount(); diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 146a4c89..81dbe1c9 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -49,8 +49,8 @@ /** * Constructor, connect up slots and signals. */ -TracksImp::TracksImp( TQWidget* tqparent, const char* name) : - Tracks(tqparent,name), +TracksImp::TracksImp( TQWidget* parent, const char* name) : + Tracks(parent,name), cddbInfo() { cd = new KCompactDisc; diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h index bc109f55..555d4003 100644 --- a/kaudiocreator/tracksimp.h +++ b/kaudiocreator/tracksimp.h @@ -44,8 +44,8 @@ class KCompactDisc; class TracksItem : public KListViewItem { public: - TracksItem( KListView *tqparent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c ) - : KListViewItem( tqparent, after, TQString()/*rip*/, TQString::number(tr), l, t ) + TracksItem( KListView *parent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c ) + : KListViewItem( parent, after, TQString()/*rip*/, TQString::number(tr), l, t ) { m_title = t; m_artist = a; @@ -94,7 +94,7 @@ signals: void hasTracks(bool); public: - TracksImp( TQWidget* tqparent = 0, const char* name = 0); + TracksImp( TQWidget* parent = 0, const char* name = 0); ~TracksImp(); bool hasCD(); diff --git a/kfile-plugins/au/kfile_au.cpp b/kfile-plugins/au/kfile_au.cpp index 1c6e3cfd..8a2108a9 100644 --- a/kfile-plugins/au/kfile_au.cpp +++ b/kfile-plugins/au/kfile_au.cpp @@ -43,10 +43,10 @@ typedef KGenericFactory<KAuPlugin> AuFactory; 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) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/basic" ); diff --git a/kfile-plugins/au/kfile_au.h b/kfile-plugins/au/kfile_au.h index d09ce2a7..062fcce6 100644 --- a/kfile-plugins/au/kfile_au.h +++ b/kfile-plugins/au/kfile_au.h @@ -30,7 +30,7 @@ class KAuPlugin: public KFilePlugin TQ_OBJECT 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); }; diff --git a/kfile-plugins/avi/kfile_avi.cpp b/kfile-plugins/avi/kfile_avi.cpp index d8dd2f7b..131ae027 100644 --- a/kfile-plugins/avi/kfile_avi.cpp +++ b/kfile-plugins/avi/kfile_avi.cpp @@ -45,10 +45,10 @@ typedef KGenericFactory<KAviPlugin> AviFactory; 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) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "video/x-msvideo" ); diff --git a/kfile-plugins/avi/kfile_avi.h b/kfile-plugins/avi/kfile_avi.h index da16a16b..bc22284c 100644 --- a/kfile-plugins/avi/kfile_avi.h +++ b/kfile-plugins/avi/kfile_avi.h @@ -40,7 +40,7 @@ class KAviPlugin: public KFilePlugin TQ_OBJECT public: - KAviPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KAviPlugin( TQObject *parent, const char *name, const TQStringList& args ); diff --git a/kfile-plugins/flac/kfile_flac.cpp b/kfile-plugins/flac/kfile_flac.cpp index be804ee1..c621f74c 100644 --- a/kfile-plugins/flac/kfile_flac.cpp +++ b/kfile-plugins/flac/kfile_flac.cpp @@ -56,9 +56,9 @@ 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 ) - : KFilePlugin( tqparent, name, args ) + : KFilePlugin( parent, name, args ) { kdDebug(7034) << "flac plugin\n"; @@ -269,14 +269,14 @@ bool KFlacPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KFlacPlugin::createValidator( const TQString&, const TQString &group, const TQString &key, - TQObject* tqparent, const char* name) const + TQObject* parent, const char* name) const { if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, tqparent, name); + return new TQIntValidator(0, 9999, parent, name); } else - return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); + return new TQRegExpValidator(TQRegExp(".*"), parent, name); } #include "kfile_flac.moc" diff --git a/kfile-plugins/flac/kfile_flac.h b/kfile-plugins/flac/kfile_flac.h index 8d60169c..d8019195 100644 --- a/kfile-plugins/flac/kfile_flac.h +++ b/kfile-plugins/flac/kfile_flac.h @@ -35,14 +35,14 @@ class KFlacPlugin: public KFilePlugin TQ_OBJECT 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 writeInfo( const KFileMetaInfo& info ) const; virtual TQValidator* createValidator( const TQString& mimetype, const TQString &group, const TQString &key, - TQObject* tqparent, const char* name) const; + TQObject* parent, const char* name) const; protected: virtual void makeMimeTypeInfo(const TQString& mimeType); }; diff --git a/kfile-plugins/m3u/kfile_m3u.cpp b/kfile-plugins/m3u/kfile_m3u.cpp index d366685f..12c3315c 100644 --- a/kfile-plugins/m3u/kfile_m3u.cpp +++ b/kfile-plugins/m3u/kfile_m3u.cpp @@ -37,9 +37,9 @@ typedef KGenericFactory<KM3uPlugin> M3uFactory; 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 ) - : KFilePlugin( tqparent, name, preferredItems ) + : KFilePlugin( parent, name, preferredItems ) { kdDebug(7034) << "m3u plugin\n"; diff --git a/kfile-plugins/m3u/kfile_m3u.h b/kfile-plugins/m3u/kfile_m3u.h index a91d392d..b64999b9 100644 --- a/kfile-plugins/m3u/kfile_m3u.h +++ b/kfile-plugins/m3u/kfile_m3u.h @@ -32,7 +32,7 @@ class KM3uPlugin: public KFilePlugin TQ_OBJECT 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 ); }; diff --git a/kfile-plugins/mp3/kfile_mp3.cpp b/kfile-plugins/mp3/kfile_mp3.cpp index 8036cef8..f686147c 100644 --- a/kfile-plugins/mp3/kfile_mp3.cpp +++ b/kfile-plugins/mp3/kfile_mp3.cpp @@ -44,8 +44,8 @@ typedef KGenericFactory<KMp3Plugin> Mp3Factory; K_EXPORT_COMPONENT_FACTORY(kfile_mp3, Mp3Factory( "kfile_mp3" )) -KMp3Plugin::KMp3Plugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) +KMp3Plugin::KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args) + : KFilePlugin(parent, name, args) { kdDebug(7034) << "mp3 plugin\n"; @@ -267,8 +267,8 @@ class ComboValidator : public KStringListValidator { public: ComboValidator(const TQStringList &list, bool rejecting, - bool fixupEnabled, TQObject *tqparent, const char *name) : - KStringListValidator(list, rejecting, fixupEnabled, tqparent, name) + bool fixupEnabled, TQObject *parent, const char *name) : + KStringListValidator(list, rejecting, fixupEnabled, parent, name) { } @@ -281,13 +281,13 @@ public: TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, 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; if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, tqparent, name); + return new TQIntValidator(0, 9999, parent, name); } if(key == "Genre") @@ -298,7 +298,7 @@ TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, { l.append(TStringToQString((*it))); } - return new ComboValidator(l, false, true, tqparent, name); + return new ComboValidator(l, false, true, parent, name); } return 0; diff --git a/kfile-plugins/mp3/kfile_mp3.h b/kfile-plugins/mp3/kfile_mp3.h index 903a5804..3bccebe1 100644 --- a/kfile-plugins/mp3/kfile_mp3.h +++ b/kfile-plugins/mp3/kfile_mp3.h @@ -29,14 +29,14 @@ class KMp3Plugin: public KFilePlugin TQ_OBJECT 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 writeInfo( const KFileMetaInfo& info) const; virtual TQValidator *createValidator(const TQString &mimetype, const TQString &group, const TQString &key, - TQObject *tqparent, const char *name) const; + TQObject *parent, const char *name) const; }; #endif diff --git a/kfile-plugins/mpc/kfile_mpc.cpp b/kfile-plugins/mpc/kfile_mpc.cpp index a1bf5648..830feb54 100644 --- a/kfile-plugins/mpc/kfile_mpc.cpp +++ b/kfile-plugins/mpc/kfile_mpc.cpp @@ -48,9 +48,9 @@ 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 ) - : KFilePlugin( tqparent, name, args ) + : KFilePlugin( parent, name, args ) { kdDebug(7034) << "mpc plugin\n"; @@ -240,14 +240,14 @@ bool KMpcPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KMpcPlugin::createValidator( const TQString&, const TQString &group, const TQString &key, - TQObject* tqparent, const char* name) const + TQObject* parent, const char* name) const { if(key == "Tracknumber" || key == "Date") { - return new TQIntValidator(0, 9999, tqparent, name); + return new TQIntValidator(0, 9999, parent, name); } else - return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); + return new TQRegExpValidator(TQRegExp(".*"), parent, name); } #include "kfile_mpc.moc" diff --git a/kfile-plugins/mpc/kfile_mpc.h b/kfile-plugins/mpc/kfile_mpc.h index 380da446..ef747c50 100644 --- a/kfile-plugins/mpc/kfile_mpc.h +++ b/kfile-plugins/mpc/kfile_mpc.h @@ -35,14 +35,14 @@ class KMpcPlugin: public KFilePlugin TQ_OBJECT 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 writeInfo( const KFileMetaInfo& info ) const; virtual TQValidator* createValidator( const TQString& mimetype, const TQString &group, const TQString &key, - TQObject* tqparent, const char* name) const; + TQObject* parent, const char* name) const; }; diff --git a/kfile-plugins/mpeg/kfile_mpeg.cpp b/kfile-plugins/mpeg/kfile_mpeg.cpp index 71f5f7fa..4d51f64d 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.cpp +++ b/kfile-plugins/mpeg/kfile_mpeg.cpp @@ -46,10 +46,10 @@ typedef KGenericFactory<KMpegPlugin> MpegFactory; 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) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "video/mpeg" ); diff --git a/kfile-plugins/mpeg/kfile_mpeg.h b/kfile-plugins/mpeg/kfile_mpeg.h index e35b639e..6f6c9ddd 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.h +++ b/kfile-plugins/mpeg/kfile_mpeg.h @@ -31,7 +31,7 @@ class KMpegPlugin: public KFilePlugin TQ_OBJECT 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); diff --git a/kfile-plugins/ogg/kfile_ogg.cpp b/kfile-plugins/ogg/kfile_ogg.cpp index 3964b814..30f96096 100644 --- a/kfile-plugins/ogg/kfile_ogg.cpp +++ b/kfile-plugins/ogg/kfile_ogg.cpp @@ -61,9 +61,9 @@ static const char* const knownTranslations[] = { 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 ) - : KFilePlugin( tqparent, name, args ) + : KFilePlugin( parent, name, args ) { kdDebug(7034) << "ogg plugin\n"; @@ -350,8 +350,8 @@ bool KOggPlugin::writeInfo(const KFileMetaInfo& info) const TQValidator* KOggPlugin::createValidator( const TQString&, const TQString &, const TQString &, - TQObject* tqparent, const char* name) const { - return new TQRegExpValidator(TQRegExp(".*"), tqparent, name); + TQObject* parent, const char* name) const { + return new TQRegExpValidator(TQRegExp(".*"), parent, name); } #include "kfile_ogg.moc" diff --git a/kfile-plugins/ogg/kfile_ogg.h b/kfile-plugins/ogg/kfile_ogg.h index 47472c6d..08b9ad04 100644 --- a/kfile-plugins/ogg/kfile_ogg.h +++ b/kfile-plugins/ogg/kfile_ogg.h @@ -32,14 +32,14 @@ class KOggPlugin: public KFilePlugin TQ_OBJECT 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 writeInfo( const KFileMetaInfo& info ) const; virtual TQValidator* createValidator( const TQString& mimetype, const TQString &group, const TQString &key, - TQObject* tqparent, const char* name) const; + TQObject* parent, const char* name) const; }; diff --git a/kfile-plugins/sid/kfile_sid.cpp b/kfile-plugins/sid/kfile_sid.cpp index 3bdaf681..444e2ea8 100644 --- a/kfile-plugins/sid/kfile_sid.cpp +++ b/kfile-plugins/sid/kfile_sid.cpp @@ -36,10 +36,10 @@ typedef KGenericFactory<KSidPlugin> SidFactory; 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) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { kdDebug(7034) << "sid plugin\n"; @@ -211,13 +211,13 @@ failure: TQValidator* KSidPlugin::createValidator(const TQString& /*mimetype*/, const TQString& group, - const TQString& /*key*/, TQObject* tqparent, + const TQString& /*key*/, TQObject* parent, const char* name) const { kdDebug(7034) << k_funcinfo << endl; // all items in "General" group are strings of max lenght 31 if (group == "General") - return new TQRegExpValidator(TQRegExp(".{,31}"), tqparent, name); + return new TQRegExpValidator(TQRegExp(".{,31}"), parent, name); // all others are read-only return 0; } diff --git a/kfile-plugins/sid/kfile_sid.h b/kfile-plugins/sid/kfile_sid.h index d042e57d..468f2b32 100644 --- a/kfile-plugins/sid/kfile_sid.h +++ b/kfile-plugins/sid/kfile_sid.h @@ -31,12 +31,12 @@ class KSidPlugin: public KFilePlugin TQ_OBJECT 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 writeInfo(const KFileMetaInfo& info) const; TQValidator* createValidator(const TQString& mimetype, const TQString& group, - const TQString& key, TQObject* tqparent, + const TQString& key, TQObject* parent, const char* name) const; }; diff --git a/kfile-plugins/theora/kfile_theora.cpp b/kfile-plugins/theora/kfile_theora.cpp index 0dbefbe7..aac38978 100644 --- a/kfile-plugins/theora/kfile_theora.cpp +++ b/kfile-plugins/theora/kfile_theora.cpp @@ -56,9 +56,9 @@ typedef KGenericFactory<theoraPlugin> theoraFactory; 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) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { // kdDebug(7034) << "theora plugin\n"; diff --git a/kfile-plugins/theora/kfile_theora.h b/kfile-plugins/theora/kfile_theora.h index 13c943c4..a1d05bfd 100644 --- a/kfile-plugins/theora/kfile_theora.h +++ b/kfile-plugins/theora/kfile_theora.h @@ -34,7 +34,7 @@ class theoraPlugin: public KFilePlugin TQ_OBJECT 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); }; diff --git a/kfile-plugins/wav/kfile_wav.cpp b/kfile-plugins/wav/kfile_wav.cpp index 917d8fca..50841d95 100644 --- a/kfile-plugins/wav/kfile_wav.cpp +++ b/kfile-plugins/wav/kfile_wav.cpp @@ -43,10 +43,10 @@ typedef KGenericFactory<KWavPlugin> WavFactory; 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) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/x-wav" ); diff --git a/kfile-plugins/wav/kfile_wav.h b/kfile-plugins/wav/kfile_wav.h index 9eb4d796..01117312 100644 --- a/kfile-plugins/wav/kfile_wav.h +++ b/kfile-plugins/wav/kfile_wav.h @@ -30,7 +30,7 @@ class KWavPlugin: public KFilePlugin TQ_OBJECT 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); }; diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index e922d6fd..1e1868fb 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -34,8 +34,8 @@ #include "kcmaudiocd.moc" #include <kconfigdialogmanager.h> -KAudiocdModule::KAudiocdModule(TQWidget *tqparent, const char *name) - : AudiocdConfig(tqparent, name), configChanged(false) +KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) + : AudiocdConfig(parent, name), configChanged(false) { TQString foo = i18n("Report errors found on the cd."); @@ -259,9 +259,9 @@ TQString KAudiocdModule::quickHelp() const 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"); } } diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h index b69a6784..147fcb40 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h @@ -36,7 +36,7 @@ class KAudiocdModule : public AudiocdConfig public: - KAudiocdModule(TQWidget *tqparent=0, const char *name=0); + KAudiocdModule(TQWidget *parent=0, const char *name=0); ~KAudiocdModule(); TQString quickHelp() const; diff --git a/kioslave/audiocd/plugins/audiocdencoder.h b/kioslave/audiocd/plugins/audiocdencoder.h index 9f58536f..0e8d3144 100644 --- a/kioslave/audiocd/plugins/audiocdencoder.h +++ b/kioslave/audiocd/plugins/audiocdencoder.h @@ -31,7 +31,7 @@ class AudioCDEncoder { public: /** * 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. */ explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {}; diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.cpp b/kioslave/audiocd/plugins/lame/collectingprocess.cpp index 58485fa3..0261d8eb 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/kioslave/audiocd/plugins/lame/collectingprocess.cpp @@ -47,8 +47,8 @@ struct CollectingProcess::Private { }; -CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name ) - : KProcess( tqparent, name ) +CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) + : KProcess( parent, name ) { d = new Private(); } diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.h b/kioslave/audiocd/plugins/lame/collectingprocess.h index bd5abca9..1821078b 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.h +++ b/kioslave/audiocd/plugins/lame/collectingprocess.h @@ -47,7 +47,7 @@ class CollectingProcess : public KProcess { Q_OBJECT TQ_OBJECT public: - CollectingProcess( TQObject * tqparent = 0, const char * name = 0 ); + CollectingProcess( TQObject * parent = 0, const char * name = 0 ); ~CollectingProcess(); /** Starts the process in NotifyOnExit mode and writes in to stdin of diff --git a/kmid/README b/kmid/README index 3b819871..52c5f759 100644 --- a/kmid/README +++ b/kmid/README @@ -60,7 +60,7 @@ Index 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 ? By default it will use the external midi device, if you want to use another diff --git a/kmid/channel.cpp b/kmid/channel.cpp index a4547767..2fe22de6 100644 --- a/kmid/channel.cpp +++ b/kmid/channel.cpp @@ -39,7 +39,7 @@ #include "instrname.h" #include <kiconloader.h> -KMidChannel::KMidChannel(int chn,TQWidget *tqparent) : TQWidget (tqparent) +KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) { channel=chn; replay=TRUE; diff --git a/kmid/channel3d.cpp b/kmid/channel3d.cpp index 8a24410b..d3bef7fd 100644 --- a/kmid/channel3d.cpp +++ b/kmid/channel3d.cpp @@ -25,7 +25,7 @@ #include "channel3d.h" #include <tqpainter.h> -KMidChannel3D::KMidChannel3D (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent) +KMidChannel3D::KMidChannel3D (int chn,TQWidget *parent) : KMidChannel(chn,parent) { } diff --git a/kmid/channel3d.h b/kmid/channel3d.h index 2ce8de10..a8c81da0 100644 --- a/kmid/channel3d.h +++ b/kmid/channel3d.h @@ -30,7 +30,7 @@ class KMidChannel3D : public KMidChannel { public: - KMidChannel3D(int chn,TQWidget *tqparent); + KMidChannel3D(int chn,TQWidget *parent); virtual void drawDo (TQPainter *qpaint,int x,int p); diff --git a/kmid/channel4d.cpp b/kmid/channel4d.cpp index a12165eb..4f47c3ae 100644 --- a/kmid/channel4d.cpp +++ b/kmid/channel4d.cpp @@ -25,7 +25,7 @@ #include "channel4d.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); brushW = new TQBrush (white); diff --git a/kmid/channel4d.h b/kmid/channel4d.h index e5cba3c7..e6326f4a 100644 --- a/kmid/channel4d.h +++ b/kmid/channel4d.h @@ -36,7 +36,7 @@ private: TQPen *penR; public: - KMidChannel4D(int chn,TQWidget *tqparent); + KMidChannel4D(int chn,TQWidget *parent); virtual void drawDo (TQPainter *qpaint,int x,int p); diff --git a/kmid/channelcfgdlg.cpp b/kmid/channelcfgdlg.cpp index 4384dd7c..db320a28 100644 --- a/kmid/channelcfgdlg.cpp +++ b/kmid/channelcfgdlg.cpp @@ -12,7 +12,7 @@ #include <tqlayout.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 ); setMainWidget(page); diff --git a/kmid/channelcfgdlg.h b/kmid/channelcfgdlg.h index 040b741b..21a33198 100644 --- a/kmid/channelcfgdlg.h +++ b/kmid/channelcfgdlg.h @@ -35,7 +35,7 @@ class ChannelViewConfigDialog : public KDialogBase public: - ChannelViewConfigDialog(TQWidget *tqparent,const char *name); + ChannelViewConfigDialog(TQWidget *parent,const char *name); private: TQVButtonGroup *qbg; diff --git a/kmid/collectdlg.cpp b/kmid/collectdlg.cpp index a98a8a05..11158b18 100644 --- a/kmid/collectdlg.cpp +++ b/kmid/collectdlg.cpp @@ -38,7 +38,7 @@ #include "songlist.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")); ok=new KPushButton(KStdGuiItem::ok(),this); diff --git a/kmid/collectdlg.h b/kmid/collectdlg.h index a53dff70..31981d8c 100644 --- a/kmid/collectdlg.h +++ b/kmid/collectdlg.h @@ -49,7 +49,7 @@ protected: void addSong(const KURL &); public: - CollectionDialog(SLManager *slm,int selc,TQWidget *tqparent,const char *name); + CollectionDialog(SLManager *slm,int selc,TQWidget *parent,const char *name); public slots: void collectionselected(int idx); diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp index 7485a109..72436009 100644 --- a/kmid/kdisptext.cpp +++ b/kmid/kdisptext.cpp @@ -40,7 +40,7 @@ //#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; linked_list_[0]=linked_list_[1]=NULL; diff --git a/kmid/kdisptext.h b/kmid/kdisptext.h index 2b9c3fed..8cd9939f 100644 --- a/kmid/kdisptext.h +++ b/kmid/kdisptext.h @@ -92,7 +92,7 @@ protected: virtual void timerEvent(TQTimerEvent *e); public: - KDisplayText(TQWidget *tqparent,const char *name); + KDisplayText(TQWidget *parent,const char *name); virtual ~KDisplayText(); void ClearEv(bool totally=true); diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp index 21bdbbd5..355f9578 100644 --- a/kmid/klcdnumber.cpp +++ b/kmid/klcdnumber.cpp @@ -28,8 +28,8 @@ #define BUTTONWIDTH 9 -KLCDNumber::KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name) - : TQWidget(tqparent,name) +KLCDNumber::KLCDNumber(int _numDigits,TQWidget *parent,const char *name) + : TQWidget(parent,name) { initDigits(); setUserChangeValue=false; @@ -47,8 +47,8 @@ KLCDNumber::KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name) setLCDColor(100,255,100); } -KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name) - : TQWidget(tqparent,name) +KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name) + : TQWidget(parent,name) { initDigits(); setUserChangeValue=_setUserChangeValue; diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h index d7be294f..cf1fca4e 100644 --- a/kmid/klcdnumber.h +++ b/kmid/klcdnumber.h @@ -101,8 +101,8 @@ public: void initDigits(void); public: - KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name); - KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name); + KLCDNumber(int _numDigits,TQWidget *parent,const char *name); + KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name); void setUserSetDefaultValue(bool _userSetDefaultValue); void setDefaultValue(double v); diff --git a/kmid/kmid_part.cpp b/kmid/kmid_part.cpp index 5e800aaa..239e8b40 100644 --- a/kmid/kmid_part.cpp +++ b/kmid/kmid_part.cpp @@ -38,10 +38,10 @@ KMidFactory::~KMidFactory() } 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& ) { - KParts::Part *obj = new KMidPart(parentWidget, widgetName, tqparent, name); + KParts::Part *obj = new KMidPart(parentWidget, widgetName, parent, name); return obj; } @@ -66,8 +66,8 @@ KInstance *KMidFactory::instance() } KMidPart::KMidPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name) -: KParts::ReadOnlyPart(tqparent, name) + TQObject *parent, const char *name) +: KParts::ReadOnlyPart(parent, name) { setInstance(KMidFactory::instance()); @@ -133,8 +133,8 @@ void KMidPart::slotStop() { widget->stop(); } -KMidBrowserExtension::KMidBrowserExtension(KMidPart *tqparent) - : KParts::BrowserExtension(tqparent, "KMidBrowserExtension") +KMidBrowserExtension::KMidBrowserExtension(KMidPart *parent) + : KParts::BrowserExtension(parent, "KMidBrowserExtension") { } diff --git a/kmid/kmid_part.h b/kmid/kmid_part.h index cb4b2d2c..9cb5a564 100644 --- a/kmid/kmid_part.h +++ b/kmid/kmid_part.h @@ -18,7 +18,7 @@ class KDE_EXPORT KMidFactory : public KParts::Factory virtual ~KMidFactory(); 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 TQStringList &args = TQStringList()); @@ -35,7 +35,7 @@ class KMidPart: public KParts::ReadOnlyPart TQ_OBJECT public: KMidPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name); + TQObject *parent, const char *name); virtual ~KMidPart(); @@ -59,7 +59,7 @@ class KMidBrowserExtension : public KParts::BrowserExtension TQ_OBJECT friend class KMidPart; public: - KMidBrowserExtension(KMidPart *tqparent); + KMidBrowserExtension(KMidPart *parent); virtual ~KMidBrowserExtension(); }; diff --git a/kmid/kmidbutton.h b/kmid/kmidbutton.h index ceba94a5..ca48d9fb 100644 --- a/kmid/kmidbutton.h +++ b/kmid/kmidbutton.h @@ -15,7 +15,7 @@ protected: public: - KMidButton (TQWidget *tqparent,const char *name) : TQPushButton (tqparent,name) + KMidButton (TQWidget *parent,const char *name) : TQPushButton (parent,name) { }; diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index a0088266..706e7cbf 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -65,8 +65,8 @@ //#define TEMPHACK -kmidClient::kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name) - : DCOPObject("KMidIface"), TQWidget(tqparent,name) +kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name) + : DCOPObject("KMidIface"), TQWidget(parent,name) { actionCollection=ac; KConfig *cfg=kapp->config(); diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h index 39ecbd50..dbfa7518 100644 --- a/kmid/kmidclient.h +++ b/kmid/kmidclient.h @@ -106,7 +106,7 @@ private: int openFile(const char *filename); void allNotesOff(void); public: - kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name=0); + kmidClient(TQWidget *parent, KActionCollection *ac, const char *name=0); ~kmidClient(); char *midiFileName(void) {return midifile_opened;}; diff --git a/kmid/main.cpp b/kmid/main.cpp index 3bafb1f9..45cd1fab 100644 --- a/kmid/main.cpp +++ b/kmid/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) /* struct sigaction act; act.sa_handler = SIG_DFL; - sigemptyset(&(act.sa_tqmask)); + sigemptyset(&(act.sa_mask)); act.sa_flags=0; sigaction(SIGINT, &act, NULL); diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp index 7c26c295..00497d05 100644 --- a/kmid/midicfgdlg.cpp +++ b/kmid/midicfgdlg.cpp @@ -38,7 +38,7 @@ #include <kstandarddirs.h> 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) { setMinimumSize(360,240); diff --git a/kmid/midicfgdlg.h b/kmid/midicfgdlg.h index bab949b8..dd67cf6d 100644 --- a/kmid/midicfgdlg.h +++ b/kmid/midicfgdlg.h @@ -38,7 +38,7 @@ class MidiConfigDialog : public KDialogBase public: - MidiConfigDialog(DeviceManager *dm,TQWidget *tqparent,const char *name); + MidiConfigDialog(DeviceManager *dm,TQWidget *parent,const char *name); public slots: void deviceselected(int idx); diff --git a/kmid/qslidertime.cpp b/kmid/qslidertime.cpp index e7313d22..ba1b62f8 100644 --- a/kmid/qslidertime.cpp +++ b/kmid/qslidertime.cpp @@ -28,8 +28,8 @@ #define ARROW_LENGTH 13 -QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *tqparent, const char *name) - : TQWidget (tqparent,name) +QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *parent, const char *name) + : TQWidget (parent,name) { kslider=ksl; diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h index c42632b0..a409332b 100644 --- a/kmid/qslidertime.h +++ b/kmid/qslidertime.h @@ -39,7 +39,7 @@ private: int fontheight; 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;}; diff --git a/kmid/rhythmview.cpp b/kmid/rhythmview.cpp index a10bb79c..49499d46 100644 --- a/kmid/rhythmview.cpp +++ b/kmid/rhythmview.cpp @@ -23,7 +23,7 @@ ***************************************************************************/ #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; setRhythm(4,4); diff --git a/kmid/rhythmview.h b/kmid/rhythmview.h index 3754c074..97a7ae1a 100644 --- a/kmid/rhythmview.h +++ b/kmid/rhythmview.h @@ -34,7 +34,7 @@ class RhythmView : public TQWidget KLed **lamps; public: - RhythmView (TQWidget *tqparent, const char *name); + RhythmView (TQWidget *parent, const char *name); ~RhythmView(); void setRhythm(int numerator,int denominator); diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h index 4b90a168..c0a80bae 100644 --- a/kmix/dialogviewconfiguration.h +++ b/kmix/dialogviewconfiguration.h @@ -15,7 +15,7 @@ class DialogViewConfiguration : public KDialogBase Q_OBJECT TQ_OBJECT public: - DialogViewConfiguration(TQWidget* tqparent, ViewBase& view); + DialogViewConfiguration(TQWidget* parent, ViewBase& view); ~DialogViewConfiguration(); TQSize tqsizeHint() const; diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp index 366263f4..7e9fbe02 100644 --- a/kmix/kledbutton.cpp +++ b/kmix/kledbutton.cpp @@ -24,17 +24,17 @@ #include "kledbutton.h" -KLedButton::KLedButton(const TQColor &col, TQWidget *tqparent, const char *name) - : KLed( col, tqparent, name ) +KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name) + : KLed( col, parent, name ) { // KLed and thus KLedButtung does not do proper positioning in TQLayout's. // Thus I will do a dirty trick here - installEventFilter(tqparent); + installEventFilter(parent); } KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look, - KLed::Shape tqshape, TQWidget *tqparent, const char *name) - : KLed( col, st, look, tqshape, tqparent, name ) + KLed::Shape tqshape, TQWidget *parent, const char *name) + : KLed( col, st, look, tqshape, parent, name ) { } diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h index ed7f529b..da07d492 100644 --- a/kmix/kledbutton.h +++ b/kmix/kledbutton.h @@ -34,9 +34,9 @@ class KLedButton : public KLed { Q_OBJECT TQ_OBJECT 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, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); ~KLedButton(); TQSize tqsizeHint () const; diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index 5e37841e..741cbd0e 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -66,11 +66,11 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kmix"); 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 mutedBackColor = "#000000"; -AppletConfigDialog::AppletConfigDialog( TQWidget * tqparent, const char * name ) +AppletConfigDialog::AppletConfigDialog( TQWidget * parent, const char * name ) : KDialogBase( KDialogBase::Plain, TQString(), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name, false, true) + KDialogBase::Ok, parent, name, false, true) { setPlainCaption(i18n("Configure - Mixer Applet")); TQFrame* page = plainPage(); @@ -150,9 +150,9 @@ bool AppletConfigDialog::useCustomColors() const 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_aboutData( "kmix", I18N_NOOP("KMix Panel Applet"), APP_VERSION, "Mini Sound Mixer Applet", KAboutData::License_GPL, diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h index 1b997a5b..5f7136ad 100644 --- a/kmix/kmixapplet.h +++ b/kmix/kmixapplet.h @@ -45,7 +45,7 @@ class AppletConfigDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - AppletConfigDialog( TQWidget * tqparent=0, const char * name=0 ); + AppletConfigDialog( TQWidget * parent=0, const char * name=0 ); virtual ~AppletConfigDialog() {}; void setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back); @@ -75,7 +75,7 @@ class KMixApplet : public KPanelApplet public: KMixApplet( const TQString& configFile, Type t = Normal, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); virtual ~KMixApplet(); struct Colors { diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp index d5c254e6..49d96627 100644 --- a/kmix/kmixdockwidget.cpp +++ b/kmix/kmixdockwidget.cpp @@ -48,8 +48,8 @@ #include "kwin.h" #include "viewdockareapopup.h" -KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *tqparent, const char *name, bool volumePopup, bool dockIconMuting ) - : KSystemTray( tqparent, name ), +KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name, bool volumePopup, bool dockIconMuting ) + : KSystemTray( parent, name ), m_mixer(mixer), _dockAreaPopup(0L), _audioPlayer(0L), diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h index 9efaefb6..bf9c4390 100644 --- a/kmix/kmixdockwidget.h +++ b/kmix/kmixdockwidget.h @@ -44,7 +44,7 @@ class KMixDockWidget : public KSystemTray { friend class KMixWindow; 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(); void setErrorPixmap(); diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index b283d830..56c90d03 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -57,8 +57,8 @@ */ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask, - TQWidget * tqparent, const char * name, ViewBase::ViewFlags vflags ) - : TQWidget( tqparent, name ), _mixer(mixer), m_balanceSlider(0), + TQWidget * parent, const char * name, ViewBase::ViewFlags vflags ) + : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(0), m_topLayout(0), m_id( _id ), _iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ), diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h index 06ea6745..7e03ff79 100644 --- a/kmix/kmixerwidget.h +++ b/kmix/kmixerwidget.h @@ -64,7 +64,7 @@ class KMixerWidget : public TQWidget public: KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, 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(); enum KMixerWidgetIO { OUTPUT=0, INPUT }; diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp index eebc0c9a..3cfa42e5 100644 --- a/kmix/kmixprefdlg.cpp +++ b/kmix/kmixprefdlg.cpp @@ -36,9 +36,9 @@ #include "kmixerwidget.h" -KMixPrefDlg::KMixPrefDlg( TQWidget *tqparent ) +KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) : KDialogBase( Plain, i18n( "Configure" ), - Ok|Cancel|Apply, Ok, tqparent ) + Ok|Cancel|Apply, Ok, parent ) { // general buttons m_generalTab = plainPage( /* i18n("&General") */ ); diff --git a/kmix/kmixprefdlg.h b/kmix/kmixprefdlg.h index 0840e05e..e719dd50 100644 --- a/kmix/kmixprefdlg.h +++ b/kmix/kmixprefdlg.h @@ -38,7 +38,7 @@ KMixPrefDlg : public KDialogBase friend class KMixWindow; public: - KMixPrefDlg( TQWidget *tqparent ); + KMixPrefDlg( TQWidget *parent ); ~KMixPrefDlg(); signals: diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index eb03cfc7..fea113b5 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -36,22 +36,22 @@ static const TQColor mutedLowColor2 = "#808080"; static const TQColor backColor2 = "#000000"; */ -KSmallSlider::KSmallSlider( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), _orientation( Qt::Vertical ) +KSmallSlider::KSmallSlider( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), _orientation( Qt::Vertical ) { init(); } -KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), _orientation( orientation ) +KSmallSlider::KSmallSlider( Qt::Orientation orientation, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), _orientation( orientation ) { init(); } KSmallSlider::KSmallSlider( int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, - TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), + TQWidget *parent, const char *name ) + : TQWidget( parent, name ), TQRangeControl( minValue, maxValue, 1, pageStep, value ), _orientation( orientation) { init(); diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h index 23a84695..7b672720 100644 --- a/kmix/ksmallslider.h +++ b/kmix/ksmallslider.h @@ -35,10 +35,10 @@ class KSmallSlider : public TQWidget, public TQRangeControl TQ_OBJECT public: - KSmallSlider( TQWidget *tqparent, const char *name=0 ); - KSmallSlider( Qt::Orientation, TQWidget *tqparent, const char *name=0 ); + KSmallSlider( TQWidget *parent, const char *name=0 ); + KSmallSlider( Qt::Orientation, TQWidget *parent, const char *name=0 ); 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 ); //bool tracking() const; diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 17a5887d..90ac1350 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -46,8 +46,8 @@ */ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, Qt::Orientation orientation, - TQWidget* tqparent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,false,orientation,tqparent,mw,name), + TQWidget* parent, ViewBase* mw, const char* name) : + MixDeviceWidget(mixer,md,false,orientation,parent,mw,name), _label(0), _enumCombo(0), _layout(0) { // create actions (on _mdwActions, see MixDeviceWidget) diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h index d0ec1bec..0a77506f 100644 --- a/kmix/mdwenum.h +++ b/kmix/mdwenum.h @@ -47,7 +47,7 @@ class MDWEnum : public MixDeviceWidget public: MDWEnum( Mixer *mixer, MixDevice* md, Qt::Orientation orientation, - TQWidget* tqparent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); ~MDWEnum(); void addActionToPopup( KAction *action ); diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 2ea95412..8d363c5e 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -58,8 +58,8 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, bool small, Qt::Orientation orientation, - TQWidget* tqparent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name), + TQWidget* parent, ViewBase* mw, const char* 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) { // create actions (on _mdwActions, see MixDeviceWidget) diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h index 17836bd1..61a95c96 100644 --- a/kmix/mdwslider.h +++ b/kmix/mdwslider.h @@ -62,7 +62,7 @@ public: MDWSlider( Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, 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() {} void addActionToPopup( KAction *action ); diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 7ee2b1e4..056bca57 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -47,8 +47,8 @@ */ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* tqparent, ViewBase* mw, const char* name) : - MixDeviceWidget(mixer,md,small,orientation,tqparent,mw,name), + TQWidget* parent, ViewBase* mw, const char* name) : + MixDeviceWidget(mixer,md,small,orientation,parent,mw,name), _label(0) , _labelV(0) , _switchLED(0), _layout(0) { // create actions (on _mdwActions, see MixDeviceWidget) diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h index 4e2258ea..6c6f3bbf 100644 --- a/kmix/mdwswitch.h +++ b/kmix/mdwswitch.h @@ -57,7 +57,7 @@ class MDWSwitch : public MixDeviceWidget public: MDWSwitch( Mixer *mixer, MixDevice* md, 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(); void addActionToPopup( KAction *action ); diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index b7e3b3ce..f90a9455 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -54,8 +54,8 @@ */ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md, bool small, Qt::Orientation orientation, - TQWidget* tqparent, ViewBase* mw, const char* name) : - TQWidget( tqparent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), + TQWidget* parent, ViewBase* mw, const char* name) : + TQWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ), m_disabled( false ), _orientation( orientation ), m_small( small ) { _mdwActions = new KActionCollection( this ); diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h index d652a749..c5a06cc6 100644 --- a/kmix/mixdevicewidget.h +++ b/kmix/mixdevicewidget.h @@ -61,7 +61,7 @@ public: MixDeviceWidget( Mixer *mixer, MixDevice* md, 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(); void addActionToPopup( KAction *action ); diff --git a/kmix/mixer_hpux.cpp b/kmix/mixer_hpux.cpp index 82e1ad51..20ef91f3 100644 --- a/kmix/mixer_hpux.cpp +++ b/kmix/mixer_hpux.cpp @@ -86,31 +86,31 @@ int Mixer_HPUX::open() else { /* Mixer is open. Now define properties */ - stereodevs = devtqmask = (1<<ID_PCM); /* activate pcm */ - rectqmask = 0; + stereodevs = devmask = (1<<ID_PCM); /* activate pcm */ + recmask = 0; /* check Input devices... */ if (AInputSources(audio) & AMonoMicrophoneMask) { - devtqmask |= (1<<ID_IN_MICROPHONE); - rectqmask |= (1<<ID_IN_MICROPHONE); + devmask |= (1<<ID_IN_MICROPHONE); + recmask |= (1<<ID_IN_MICROPHONE); } if (AInputSources(audio) & (ALeftAuxiliaryMask|ARightAuxiliaryMask)) { - devtqmask |= (1<<ID_IN_AUX); - rectqmask |= (1<<ID_IN_AUX); + devmask |= (1<<ID_IN_AUX); + recmask |= (1<<ID_IN_AUX); stereodevs |= (1<<ID_IN_AUX); } /* check Output devices... */ if (AOutputDestinations(audio) & AMonoIntSpeakerMask) { - devtqmask |= (1<<ID_OUT_INT_SPEAKER); + devmask |= (1<<ID_OUT_INT_SPEAKER); stereodevs |= (1<<ID_OUT_INT_SPEAKER); } /* implement later: ---------------- - if (AOutputDestinations(audio) & AMonoLineOutMask) devtqmask |= 64; // Line - if (AOutputDestinations(audio) & AMonoJackMask) devtqmask |= (1<<14); // Line1 - if (AOutputDestinations(audio) & AMonoHeadphoneMask) devtqmask |= (1<<15); // Line2 + if (AOutputDestinations(audio) & AMonoLineOutMask) devmask |= 64; // Line + if (AOutputDestinations(audio) & AMonoJackMask) devmask |= (1<<14); // Line1 + if (AOutputDestinations(audio) & AMonoHeadphoneMask) devmask |= (1<<15); // Line2 */ MaxVolume = 255; diff --git a/kmix/mixer_hpux.h b/kmix/mixer_hpux.h index 85892b0f..410758c9 100644 --- a/kmix/mixer_hpux.h +++ b/kmix/mixer_hpux.h @@ -28,7 +28,7 @@ protected: virtual int close(); Audio *audio; - unsigned int stereodevs,devtqmask, rectqmask, MaxVolume, i_recsrc; + unsigned int stereodevs,devmask, recmask, MaxVolume, i_recsrc; }; diff --git a/kmix/mixer_irix.cpp b/kmix/mixer_irix.cpp index 4a19e478..eb407567 100644 --- a/kmix/mixer_irix.cpp +++ b/kmix/mixer_irix.cpp @@ -52,8 +52,8 @@ int Mixer_IRIX::open() } else { // Mixer is open. Now define properties - devtqmask = 1+128+2048; - rectqmask = 128; + devmask = 1+128+2048; + recmask = 128; i_recsrc = 128; stereodevs = 1+128+2048; MaxVolume = 255; diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp index 5b51db16..7fcfb38e 100644 --- a/kmix/mixer_oss.cpp +++ b/kmix/mixer_oss.cpp @@ -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 - if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) + if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) 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; if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) return Mixer::ERR_READ; if (ioctl(m_fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) return Mixer::ERR_READ; - if (!devtqmask) + if (!devmask) return Mixer::ERR_NODEV; int maxVolume =100; if( m_mixDevices.isEmpty() ) { 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); readVolumeFromHW( idx, vol ); MixDevice* md = - new MixDevice( idx, vol, rectqmask & ( 1 << idx ), true, + new MixDevice( idx, vol, recmask & ( 1 << idx ), true, MixerDevNames[idx], MixerChannelTypes[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 - // record source tqmask. + // record source mask. return i_recsrc == oldrecsrc; } @@ -280,7 +280,7 @@ bool Mixer_OSS::isRecsrcHW( int devnum ) if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1) errormsg(Mixer::ERR_READ); 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 ); } return isRecsrc; diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp index 10299add..12806bda 100644 --- a/kmix/mixer_sun.cpp +++ b/kmix/mixer_sun.cpp @@ -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[] = { @@ -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 - // 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. // switch ( devnum ) diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp index 8db5c60f..aabe8a23 100644 --- a/kmix/verticaltext.cpp +++ b/kmix/verticaltext.cpp @@ -24,9 +24,9 @@ #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). } diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h index b7f94f4d..1e621e83 100644 --- a/kmix/verticaltext.h +++ b/kmix/verticaltext.h @@ -6,7 +6,7 @@ class VerticalText : public TQWidget { public: - VerticalText(TQWidget * tqparent, const char * name, WFlags f = 0); + VerticalText(TQWidget * parent, const char * name, WFlags f = 0); ~VerticalText(); TQSize tqsizeHint() const; diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index 6be7860d..6b25dde0 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -36,8 +36,8 @@ #include "mdwslider.h" #include "mixer.h" -ViewApplet::ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) - : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) + : ViewBase(parent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags) { setBackgroundOrigin(AncestorOrigin); // 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 true, // Small sliderOrientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h index 9b9e1b9c..38d21465 100644 --- a/kmix/viewapplet.h +++ b/kmix/viewapplet.h @@ -15,7 +15,7 @@ class ViewApplet : public ViewBase Q_OBJECT TQ_OBJECT 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(); virtual int count(); diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp index b140fce7..58767073 100644 --- a/kmix/viewbase.cpp +++ b/kmix/viewbase.cpp @@ -37,8 +37,8 @@ #include "mixer.h" -ViewBase::ViewBase(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags) - : TQWidget(tqparent, name, f), _vflags(vflags), _caption(caption) +ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, WFlags f, ViewBase::ViewFlags vflags) + : TQWidget(parent, name, f), _vflags(vflags), _caption(caption) { _mixer = mixer; _mixSet = new MixSet(); diff --git a/kmix/viewbase.h b/kmix/viewbase.h index d0d4063c..95787198 100644 --- a/kmix/viewbase.h +++ b/kmix/viewbase.h @@ -32,7 +32,7 @@ public: 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(); // Subclasses must define this method. It is called by the ViewBase() constuctor. diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp index 38b942dc..859993bb 100644 --- a/kmix/viewdockareapopup.cpp +++ b/kmix/viewdockareapopup.cpp @@ -40,11 +40,11 @@ #include "mixer.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. // See Bug #93443, #96332 and #96404 for further details. -- esken -ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* tqparent, 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) +ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW ) + : ViewBase(parent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW) { TQBoxLayout *tqlayout = new TQHBoxLayout( this ); _frame = new TQFrame( this ); @@ -128,7 +128,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md) false, // Show Record LED false, // Small Qt::Vertical, // Direction: only 1 device, so doesn't matter - _frame, // tqparent + _frame, // parent 0, // Is "NULL", so that there is no RMB-popup _dockDevice->name().latin1() ); _layoutMDW->addItem( new TQSpacerItem( 5, 20 ), 0, 2 ); diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h index 71100ec1..a31afa4b 100644 --- a/kmix/viewdockareapopup.h +++ b/kmix/viewdockareapopup.h @@ -20,7 +20,7 @@ class ViewDockAreaPopup : public ViewBase Q_OBJECT TQ_OBJECT 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(); MixDevice* dockDevice(); diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp index 360953f8..1aba7fcf 100644 --- a/kmix/viewgrid.cpp +++ b/kmix/viewgrid.cpp @@ -35,8 +35,8 @@ /** */ -ViewGrid::ViewGrid(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewGrid::ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { m_spacingHorizontal = 5; m_spacingVertical = 5; @@ -89,7 +89,7 @@ TQWidget* ViewGrid::add(MixDevice *md) _mixer, // the mixer for this device md, // MixDevice (parameter) orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); @@ -102,7 +102,7 @@ TQWidget* ViewGrid::add(MixDevice *md) md, // MixDevice (parameter) false, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); @@ -118,7 +118,7 @@ TQWidget* ViewGrid::add(MixDevice *md) true, // Show Record LED false, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h index d0608794..5fd1a183 100644 --- a/kmix/viewgrid.h +++ b/kmix/viewgrid.h @@ -13,7 +13,7 @@ class ViewGrid : public ViewBase Q_OBJECT TQ_OBJECT 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(); virtual int count(); diff --git a/kmix/viewinput.cpp b/kmix/viewinput.cpp index fa6f06e3..eeadc61b 100644 --- a/kmix/viewinput.cpp +++ b/kmix/viewinput.cpp @@ -25,8 +25,8 @@ #include "mixer.h" #include "mixdevicewidget.h" -ViewInput::ViewInput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewSliders(tqparent, name, caption, mixer, vflags) +ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewSliders(parent, name, caption, mixer, vflags) { init(); connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources diff --git a/kmix/viewinput.h b/kmix/viewinput.h index 03aa101f..e21ef5c9 100644 --- a/kmix/viewinput.h +++ b/kmix/viewinput.h @@ -10,7 +10,7 @@ class ViewInput : public ViewSliders Q_OBJECT TQ_OBJECT 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(); virtual void setMixSet(MixSet *mixset); diff --git a/kmix/viewoutput.cpp b/kmix/viewoutput.cpp index 6340291b..9550b1d1 100644 --- a/kmix/viewoutput.cpp +++ b/kmix/viewoutput.cpp @@ -25,8 +25,8 @@ #include "mixer.h" #include "mixdevicewidget.h" -ViewOutput::ViewOutput(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewSliders(tqparent, name, caption, mixer, vflags) +ViewOutput::ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewSliders(parent, name, caption, mixer, vflags) { init(); } diff --git a/kmix/viewoutput.h b/kmix/viewoutput.h index 9f3866dd..9c4b299b 100644 --- a/kmix/viewoutput.h +++ b/kmix/viewoutput.h @@ -10,7 +10,7 @@ class ViewOutput : public ViewSliders Q_OBJECT TQ_OBJECT 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(); virtual void setMixSet(MixSet *mixset); diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp index 1191f202..3cab3c6d 100644 --- a/kmix/viewsliders.cpp +++ b/kmix/viewsliders.cpp @@ -37,8 +37,8 @@ * correctly because init() does not get called. * See ViewInput and ViewOutput for "real" implementations. */ -ViewSliders::ViewSliders(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewSliders::ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { if ( _vflags & ViewBase::Vertical ) { _layoutMDW = new TQVBoxLayout(this); @@ -94,7 +94,7 @@ TQWidget* ViewSliders::add(MixDevice *md) true, // Show Record LED false, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h index c078fb8c..168a425c 100644 --- a/kmix/viewsliders.h +++ b/kmix/viewsliders.h @@ -12,7 +12,7 @@ class ViewSliders : public ViewBase Q_OBJECT TQ_OBJECT 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(); virtual int count(); diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp index 7e653b32..5b2ac99f 100644 --- a/kmix/viewsurround.cpp +++ b/kmix/viewsurround.cpp @@ -39,8 +39,8 @@ * Demonstration verion of a "surround view" * Not really usable right now. */ -ViewSurround::ViewSurround(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(tqparent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewSurround::ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { _mdSurroundFront = 0; _mdSurroundBack = 0; @@ -260,7 +260,7 @@ MixDeviceWidget* ViewSurround::createMDW(MixDevice *md, bool small, Qt::Orientat false, // Show Record LED small, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h index d0bc3c4e..de469292 100644 --- a/kmix/viewsurround.h +++ b/kmix/viewsurround.h @@ -15,7 +15,7 @@ class ViewSurround : public ViewBase Q_OBJECT TQ_OBJECT 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(); virtual int count(); diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp index cf5ac958..3d3166bb 100644 --- a/kmix/viewswitches.cpp +++ b/kmix/viewswitches.cpp @@ -31,8 +31,8 @@ #include "mdwenum.h" #include "mixer.h" -ViewSwitches::ViewSwitches(TQWidget* tqparent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) - : ViewBase(tqparent, name, caption, mixer, 0, vflags) +ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) + : ViewBase(parent, name, caption, mixer, 0, vflags) { // Create switch buttonGroup if ( _vflags & ViewBase::Vertical ) { @@ -93,7 +93,7 @@ TQWidget* ViewSwitches::add(MixDevice *md) _mixer, // the mixer for this device md, // MixDevice (parameter) orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); @@ -108,7 +108,7 @@ TQWidget* ViewSwitches::add(MixDevice *md) md, // MixDevice (parameter) false, // Small orientation, // Qt::Orientation - this, // tqparent + this, // parent this, // View widget md->name().latin1() ); diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h index 39b81f40..9e591514 100644 --- a/kmix/viewswitches.h +++ b/kmix/viewswitches.h @@ -12,7 +12,7 @@ class ViewSwitches : public ViewBase Q_OBJECT TQ_OBJECT 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(); virtual int count(); diff --git a/kmix/volume.cpp b/kmix/volume.cpp index d2eb4314..99dd180b 100644 --- a/kmix/volume.cpp +++ b/kmix/volume.cpp @@ -34,9 +34,9 @@ int Volume::_channelMaskEnum[10] = 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 ) { - _chtqmask = v._chtqmask; + _chmask = v._chmask; _maxVolume = v._maxVolume; _minVolume = v._minVolume; _muted = v._muted; _isCapture = v._isCapture; - setVolume(v, (ChannelMask)v._chtqmask); + setVolume(v, (ChannelMask)v._chmask); // 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++ ) { _volumes[i] = 0; } - _chtqmask = chtqmask; + _chmask = chmask; _maxVolume = maxVolume; _minVolume = minVolume; _isCapture = isCapture; @@ -82,7 +82,7 @@ void Volume::init( ChannelMask chtqmask, long maxVolume, long minVolume, bool is void Volume::setAllVolumes(long vol) { for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i]) & _chtqmask ) { + if ( (_channelMaskEnum[i]) & _chmask ) { // we are supposed to set it _volumes[i] = volrange(vol); } @@ -106,17 +106,17 @@ void Volume::setVolume( ChannelID chid, long vol) */ 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. * 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++ ) { - if ( _channelMaskEnum[i] & _chtqmask & (int)chtqmask ) { + if ( _channelMaskEnum[i] & _chmask & (int)chmask ) { // we are supposed to copy it _volumes[i] = volrange(v._volumes[i]); } @@ -149,8 +149,8 @@ long Volume::getVolume(ChannelID chid) { } else { // check if channel is supported - int chtqmask = _channelMaskEnum[chid]; - if ( (chtqmask & _chtqmask) != 0 ) { + int chmask = _channelMaskEnum[chid]; + if ( (chmask & _chmask) != 0 ) { // channel is supported vol = _volumes[chid]; } @@ -162,11 +162,11 @@ long Volume::getVolume(ChannelID chid) { return vol; } -long Volume::getAvgVolume(ChannelMask chtqmask) { +long Volume::getAvgVolume(ChannelMask chmask) { int avgVolumeCounter = 0; long long sumOfActiveVolumes = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) { + if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) { avgVolumeCounter++; sumOfActiveVolumes += _volumes[i]; } @@ -180,10 +180,10 @@ long Volume::getAvgVolume(ChannelMask chtqmask) { return (long)sumOfActiveVolumes; } -long Volume::getTopStereoVolume(ChannelMask chtqmask) { +long Volume::getTopStereoVolume(ChannelMask chmask) { long long topVolumeCount = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( (_channelMaskEnum[i] & _chtqmask) & (int)chtqmask ) { + if ( (_channelMaskEnum[i] & _chmask) & (int)chmask ) { if ( topVolumeCount < _volumes[i] ) topVolumeCount = _volumes[i]; } @@ -194,7 +194,7 @@ long Volume::getTopStereoVolume(ChannelMask chtqmask) { int Volume::count() { int counter = 0; for ( int i=0; i<= Volume::CHIDMAX; i++ ) { - if ( _channelMaskEnum[i] & _chtqmask ) { + if ( _channelMaskEnum[i] & _chmask ) { counter++; } } @@ -225,7 +225,7 @@ std::ostream& operator<<(std::ostream& os, const Volume& vol) { if ( i != 0 ) { os << ","; } - if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) { + if ( Volume::_channelMaskEnum[i] & vol._chmask ) { // supported channel: Print Volume os << vol._volumes[i]; } @@ -248,7 +248,7 @@ kdbgstream& operator<<(kdbgstream &os, const Volume& vol) { if ( i != 0 ) { os << ","; } - if ( Volume::_channelMaskEnum[i] & vol._chtqmask ) { + if ( Volume::_channelMaskEnum[i] & vol._chmask ) { // supported channel: Print Volume os << vol._volumes[i]; } diff --git a/kmix/volume.h b/kmix/volume.h index a731ad59..9051ed0c 100644 --- a/kmix/volume.h +++ b/kmix/volume.h @@ -27,7 +27,7 @@ class Volume 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( int channels, long maxVolume ); @@ -37,13 +37,13 @@ class Volume void setAllVolumes(long vol); // Set all volumes to the ones given in vol void setVolume(const Volume &vol ); - // Set volumes as specified by the channel tqmask - void setVolume( const Volume &vol, ChannelMask chtqmask); + // Set volumes as specified by the channel mask + void setVolume( const Volume &vol, ChannelMask chmask); void setVolume( ChannelID chid, long volume); long getVolume(ChannelID chid); - long getAvgVolume(ChannelMask chtqmask); - long getTopStereoVolume(ChannelMask chtqmask); + long getAvgVolume(ChannelMask chmask); + long getTopStereoVolume(ChannelMask chmask); long operator[](int); long maxVolume(); long minVolume(); @@ -61,13 +61,13 @@ class Volume static int _channelMaskEnum[10]; bool _muted; bool _isCapture; // true, when the Volume represents capture/record levels - long _chtqmask; + long _chmask; long _volumes[CHIDMAX+1]; long _maxVolume; long _minVolume; private: - void init( ChannelMask chtqmask, long, long, bool ); + void init( ChannelMask chmask, long, long, bool ); long volrange( int vol ); long volrangeRec( int vol ); diff --git a/krec/krecglobal.h b/krec/krecglobal.h index 698ab0a0..c43c2ce2 100644 --- a/krec/krecglobal.h +++ b/krec/krecglobal.h @@ -46,7 +46,7 @@ public: /** * Returns a pointer to the mainwidget. * 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(); diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 26f312be..37b0d1cd 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -264,12 +264,12 @@ void KRecPrivate::execKMix() { */ -KRecord::KRecord(TQWidget *tqparent, const char *name ) - : KMainWindow(tqparent,name) +KRecord::KRecord(TQWidget *parent, const char *name ) + : KMainWindow(parent,name) , d( new KRecPrivate( this ) ) { 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()->setStatusBar( statusBar() ); diff --git a/krec/krecord.h b/krec/krecord.h index 1fd4e08f..d200badd 100644 --- a/krec/krecord.h +++ b/krec/krecord.h @@ -34,7 +34,7 @@ class KRecord : public KMainWindow { TQ_OBJECT public: /// Constructor - KRecord( TQWidget* /*tqparent*/=0, const char* /*name*/=0 ); + KRecord( TQWidget* /*parent*/=0, const char* /*name*/=0 ); /// Destructor ~KRecord(); public slots: diff --git a/kscd/bwlednum.cpp b/kscd/bwlednum.cpp index 2810135b..385c0c74 100644 --- a/kscd/bwlednum.cpp +++ b/kscd/bwlednum.cpp @@ -36,8 +36,8 @@ static char segs[14][8] = {25, 0, 0, 0, 0, 0, 0, 0} }; // blank -BW_LED_Number::BW_LED_Number( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ){ +BW_LED_Number::BW_LED_Number( TQWidget *parent, const char *name ) + : TQFrame( parent, name ){ offcolor = TQColor(100,0,0); diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h index 76bc10a8..13064f44 100644 --- a/kscd/bwlednum.h +++ b/kscd/bwlednum.h @@ -24,7 +24,7 @@ class BW_LED_Number : public TQFrame public: - BW_LED_Number( TQWidget *tqparent=0, const char *name=0 ); + BW_LED_Number( TQWidget *parent=0, const char *name=0 ); ~BW_LED_Number(); void setSmallLED(bool ); // if you LED is small it might look better diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index 13efb8b7..fea5ddd6 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -33,8 +33,8 @@ struct mytoc unsigned absframe; }; -CDDBDlg::CDDBDlg( TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, false, i18n( "CD Editor" ), +CDDBDlg::CDDBDlg( TQWidget* parent, const char* name ) + : KDialogBase( parent, name, false, i18n( "CD Editor" ), Ok|Cancel|User1|User2, Ok, true ) { KGlobal::locale()->insertCatalogue("libkcddb"); diff --git a/kscd/cddbdlg.h b/kscd/cddbdlg.h index cee86052..c07d6655 100644 --- a/kscd/cddbdlg.h +++ b/kscd/cddbdlg.h @@ -15,7 +15,7 @@ class CDDBDlg : public KDialogBase TQ_OBJECT public: - CDDBDlg(TQWidget* tqparent, const char* name = 0); + CDDBDlg(TQWidget* parent, const char* name = 0); ~CDDBDlg(); void setData( diff --git a/kscd/configWidget.cpp b/kscd/configWidget.cpp index 4d8e03fb..bae787e9 100644 --- a/kscd/configWidget.cpp +++ b/kscd/configWidget.cpp @@ -45,8 +45,8 @@ extern "C" { class SpecialComboBox : public KComboBox { public: - SpecialComboBox(TQWidget* tqparent, const char* name) - : KComboBox(tqparent, name) + SpecialComboBox(TQWidget* parent, const char* name) + : KComboBox(parent, name) {} // 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'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -configWidget::configWidget(KSCD* player, TQWidget* tqparent, const char* name) - : configWidgetUI(tqparent, name), +configWidget::configWidget(KSCD* player, TQWidget* parent, const char* name) + : configWidgetUI(parent, name), mPlayer(player) { if (!name) diff --git a/kscd/configWidget.h b/kscd/configWidget.h index 5072d930..3a4fa43f 100644 --- a/kscd/configWidget.h +++ b/kscd/configWidget.h @@ -34,7 +34,7 @@ class configWidget : public configWidgetUI TQ_OBJECT public: - configWidget(KSCD* player, TQWidget* tqparent = 0, const char* name = 0); + configWidget(KSCD* player, TQWidget* parent = 0, const char* name = 0); ~configWidget(); protected: diff --git a/kscd/docking.cpp b/kscd/docking.cpp index ca85b914..3759ab7b 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -38,13 +38,13 @@ #include <kdebug.h> -DockWidget::DockWidget( KSCD* tqparent, const char *name) - : KSystemTray( tqparent, name ) +DockWidget::DockWidget( KSCD* parent, const char *name) + : KSystemTray( parent, name ) { m_popup = 0; setPixmap( loadIcon("cdsmall") ); - KActionCollection* actionCollection = tqparent->actionCollection(); + KActionCollection* actionCollection = parent->actionCollection(); m_backAction = actionCollection->action("Previous"); m_forwardAction = actionCollection->action("Next"); m_backPix = loadIcon("player_start"); @@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* tqparent, const char *name) // popup menu for right mouse button 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_stop", KIcon::Small), i18n("Stop"), tqparent, TQT_SLOT(stopClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), tqparent, TQT_SLOT(nextClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), tqparent, TQT_SLOT(prevClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), tqparent, TQT_SLOT(ejectClicked())); + 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"), parent, TQT_SLOT(stopClicked())); + 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"), parent, TQT_SLOT(prevClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); TQToolTip::add(this, kapp->aboutData()->programName()); } @@ -123,7 +123,7 @@ void DockWidget::wheelEvent(TQWheelEvent *e) if (e->orientation() ==Qt::Horizontal) return; - KSCD* kscd = dynamic_cast<KSCD*>(tqparent()); + KSCD* kscd = dynamic_cast<KSCD*>(parent()); if (kscd == 0) return; diff --git a/kscd/docking.h b/kscd/docking.h index 2ffc431a..56245ffd 100644 --- a/kscd/docking.h +++ b/kscd/docking.h @@ -49,7 +49,7 @@ class DockWidget : public KSystemTray TQ_OBJECT public: - DockWidget( KSCD* tqparent, const char *name=0); + DockWidget( KSCD* parent, const char *name=0); ~DockWidget(); public slots: diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 7c8af4b1..604a023d 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -89,9 +89,9 @@ bool stoppedByUser = false; The GUI part *****************************************************************************/ -KSCD::KSCD( TQWidget *tqparent, const char *name ) +KSCD::KSCD( TQWidget *parent, const char *name ) : DCOPObject("CDPlayer"), - kscdPanelDlg( tqparent, name, TQt::WDestructiveClose ), + kscdPanelDlg( parent, name, TQt::WDestructiveClose ), configDialog(0L), cddialog(0L), //!!!! jumpToTrack(0L), diff --git a/kscd/kscd.h b/kscd/kscd.h index c6f2a8c1..a6c192bd 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -109,7 +109,7 @@ k_dcop: TQStringList trackList(); public: - KSCD( TQWidget *tqparent = 0, const char *name = 0 ); + KSCD( TQWidget *parent = 0, const char *name = 0 ); ~KSCD(); virtual bool saveState(TQSessionManager& sm); diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c index 530336cf..b28a0650 100644 --- a/kscd/kscdmagic/xlib.c +++ b/kscd/kscdmagic/xlib.c @@ -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->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->attr_tqmask = CWBackPixel | CWBorderPixel | CWEventMask; + xd->attr_mask = CWBackPixel | CWBorderPixel | CWEventMask; xd->classX = InputOutput; xd->xcolor.n = 0; 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->width, xd->height, xd->border_width, vis.depth, xd->classX, xd->visual, - xd->attr_tqmask, xd->attributes); + xd->attr_mask, xd->attributes); if (!xd->fixedcolormap && params->privatecolormap) { unsigned long pixels[256]; int i; diff --git a/kscd/kscdmagic/xlib.h b/kscd/kscdmagic/xlib.h index 00b6242e..73113292 100644 --- a/kscd/kscdmagic/xlib.h +++ b/kscd/kscdmagic/xlib.h @@ -66,9 +66,9 @@ typedef struct { int depth; unsigned int classX; Visual *visual; - unsigned long valuetqmask; + unsigned long valuemask; XSetWindowAttributes *attributes; - unsigned long attr_tqmask; + unsigned long attr_mask; XSizeHints sizehints; int screen; const char *window_name; diff --git a/kscd/ledlamp.cpp b/kscd/ledlamp.cpp index 93aa8000..96675921 100644 --- a/kscd/ledlamp.cpp +++ b/kscd/ledlamp.cpp @@ -26,7 +26,7 @@ #include "ledlamp.h" #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 ) { // Make sure we're in a sane state diff --git a/kscd/ledlamp.h b/kscd/ledlamp.h index d7673998..6bd2e44f 100644 --- a/kscd/ledlamp.h +++ b/kscd/ledlamp.h @@ -34,7 +34,7 @@ public: enum Type { Rect, Loop }; - LedLamp(TQWidget *tqparent=0, Type t=Rect); + LedLamp(TQWidget *parent=0, Type t=Rect); enum State { On, Off }; diff --git a/kscd/libwm/audio/audio_sun.c b/kscd/libwm/audio/audio_sun.c index 93ce78d2..12b7c55c 100644 --- a/kscd/libwm/audio/audio_sun.c +++ b/kscd/libwm/audio/audio_sun.c @@ -54,7 +54,7 @@ * 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 * 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. */ @@ -284,7 +284,7 @@ sun_audio_send_status( void ) 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) perror("AUDIO_GETINFO"); diff --git a/kscd/libwm/cddaslave.c b/kscd/libwm/cddaslave.c index dac475e8..b378f95d 100644 --- a/kscd/libwm/cddaslave.c +++ b/kscd/libwm/cddaslave.c @@ -169,7 +169,7 @@ receive_command(struct cdda_device *dev, struct cdda_block* blk) if (read(0, inbuf, 1) <= 0) { wmcdda_close(dev); oops->wmaudio_close(); -/* ERRORLOG("cddaslave: tqparent died, exit\n");*/ +/* ERRORLOG("cddaslave: parent died, exit\n");*/ exit(0); } diff --git a/kscd/libwm/plat_linux_audio.c b/kscd/libwm/plat_linux_audio.c index 690a36e5..9cec45cb 100644 --- a/kscd/libwm/plat_linux_audio.c +++ b/kscd/libwm/plat_linux_audio.c @@ -57,7 +57,7 @@ static char plat_linux_audio_id[] = "$Id$"; * 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 * 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. */ @@ -275,7 +275,7 @@ wmaudio_send_status( void ) 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) perror("AUDIO_GETINFO"); diff --git a/kscd/libwm/plat_sun.c b/kscd/libwm/plat_sun.c index 8d09efee..4e61d68f 100644 --- a/kscd/libwm/plat_sun.c +++ b/kscd/libwm/plat_sun.c @@ -111,7 +111,7 @@ sigthawinit( void ) struct sigaction sa; sa.sa_handler = thawme; - sigemptyset(&sa.sa_tqmask); + sigemptyset(&sa.sa_mask); sa.sa_flags = 0; sigaction(SIGTHAW, &sa, NULL); @@ -400,7 +400,7 @@ gen_get_drive_status( struct wm_drive *d, * Now install the no-op signal handler. */ 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; if (sigaction(SIGALRM, &new_sig, &old_sig)) perror("sigaction"); diff --git a/kscd/libwm/plat_sun_audio.c b/kscd/libwm/plat_sun_audio.c index 3c9dfdc1..34603991 100644 --- a/kscd/libwm/plat_sun_audio.c +++ b/kscd/libwm/plat_sun_audio.c @@ -59,7 +59,7 @@ static char plat_sun_audio_id[] = "$Id$"; * 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 * 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. */ @@ -279,7 +279,7 @@ wmaudio_send_status( void ) 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) perror("AUDIO_GETINFO"); diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp index 0cf47196..f18bb95b 100644 --- a/libkcddb/cdinfoencodingwidget.cpp +++ b/libkcddb/cdinfoencodingwidget.cpp @@ -28,9 +28,9 @@ namespace KCDDB { - CDInfoEncodingWidget::CDInfoEncodingWidget(TQWidget* tqparent, const TQString& artist, + CDInfoEncodingWidget::CDInfoEncodingWidget(TQWidget* parent, const TQString& artist, 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) { encodingCombo->insertStringList(KGlobal::charsets()->descriptiveEncodingNames()); diff --git a/libkcddb/cdinfoencodingwidget.h b/libkcddb/cdinfoencodingwidget.h index a5fa8522..f147fe93 100644 --- a/libkcddb/cdinfoencodingwidget.h +++ b/libkcddb/cdinfoencodingwidget.h @@ -29,7 +29,7 @@ namespace KCDDB Q_OBJECT TQ_OBJECT public: - CDInfoEncodingWidget(TQWidget* tqparent, const TQString& artist, const TQString& title, + CDInfoEncodingWidget(TQWidget* parent, const TQString& artist, const TQString& title, const TQStringList& songTitles); TQString selectedEncoding(); diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp index ec08253a..442efd12 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.cpp +++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp @@ -38,8 +38,8 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -CDDBConfigWidget::CDDBConfigWidget(TQWidget * tqparent, const char * name) - : CDDBConfigWidgetBase(tqparent, name) +CDDBConfigWidget::CDDBConfigWidget(TQWidget * parent, const char * name) + : CDDBConfigWidgetBase(parent, name) { // Connections from widgets are made in designer. diff --git a/libkcddb/kcmcddb/cddbconfigwidget.h b/libkcddb/kcmcddb/cddbconfigwidget.h index 647d4717..a869b646 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.h +++ b/libkcddb/kcmcddb/cddbconfigwidget.h @@ -31,7 +31,7 @@ class CDDBConfigWidget : public CDDBConfigWidgetBase public: - CDDBConfigWidget(TQWidget * tqparent = 0, const char * name = 0); + CDDBConfigWidget(TQWidget * parent = 0, const char * name = 0); protected slots: diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index 5694749a..fa15a995 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -45,8 +45,8 @@ typedef KGenericFactory<CDDBModule, TQWidget> KCDDBFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) ) -CDDBModule::CDDBModule(TQWidget *tqparent, const char *name, const TQStringList &) - : KCModule(tqparent, name) +CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &) + : KCModule(parent, name) { KGlobal::locale()->insertCatalogue("libkcddb"); setButtons(Default | Apply); diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h index 84978228..d78feb6f 100644 --- a/libkcddb/kcmcddb/kcmcddb.h +++ b/libkcddb/kcmcddb/kcmcddb.h @@ -34,7 +34,7 @@ class CDDBModule : public KCModule public: - CDDBModule(TQWidget * tqparent, const char *name, const TQStringList &); + CDDBModule(TQWidget * parent, const char *name, const TQStringList &); public slots: diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp index 00e9a213..0d1bd034 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp @@ -186,7 +186,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ return "already output file selected"; } 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 cout << "Command:0 Msg:fileopen before"<<endl; diff --git a/mpeglib/lib/mpegplay/decoderClass.cpp b/mpeglib/lib/mpegplay/decoderClass.cpp index 1e7df93c..e259c8e6 100644 --- a/mpeglib/lib/mpegplay/decoderClass.cpp +++ b/mpeglib/lib/mpegplay/decoderClass.cpp @@ -647,7 +647,7 @@ void DecoderClass::ParseReconBlock(int& n,int& mb_intra, * flush_bitsX <--> flushed += X; * 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. * bsmith */ diff --git a/mpeglib/lib/mpegplay/macroBlock.cpp b/mpeglib/lib/mpegplay/macroBlock.cpp index 730fdd62..5436dbd7 100644 --- a/mpeglib/lib/mpegplay/macroBlock.cpp +++ b/mpeglib/lib/mpegplay/macroBlock.cpp @@ -329,7 +329,7 @@ int MacroBlock::reconstruct(int& recon_right_for, int& mb_motion_forw, int& mb_motion_back, PictureArray* pictureArray) { - int tqmask, i; + int mask, i; int zero_block_flag; int mb_row; int mb_col; @@ -364,11 +364,11 @@ int MacroBlock::reconstruct(int& recon_right_for, 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 ((mb_intra) || (cbp & tqmask)) { + if ((mb_intra) || (cbp & mask)) { zero_block_flag = 0; //copyFunctions->endNOFloatSection(); decoderClass->ParseReconBlock(i,mb_intra, diff --git a/mpeglib/lib/mpegplay/mpegExtension.cpp b/mpeglib/lib/mpegplay/mpegExtension.cpp index 3fc89215..657fe683 100644 --- a/mpeglib/lib/mpegplay/mpegExtension.cpp +++ b/mpeglib/lib/mpegplay/mpegExtension.cpp @@ -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) { unsigned int data; @@ -97,11 +97,11 @@ int MpegExtension::next_bits(int num,unsigned int tqmask, 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. */ - if (tqmask == data) { + if (mask == data) { return true; } return false; diff --git a/mpeglib/lib/mpegplay/mpegExtension.h b/mpeglib/lib/mpegplay/mpegExtension.h index 3b0f1680..23b79c5b 100644 --- a/mpeglib/lib/mpegplay/mpegExtension.h +++ b/mpeglib/lib/mpegplay/mpegExtension.h @@ -43,7 +43,7 @@ class MpegExtension { private: 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 diff --git a/mpeglib/lib/mpegplay/mpegVideoBitWindow.h b/mpeglib/lib/mpegplay/mpegVideoBitWindow.h index 5c957e4d..46abe44e 100644 --- a/mpeglib/lib/mpegplay/mpegVideoBitWindow.h +++ b/mpeglib/lib/mpegplay/mpegVideoBitWindow.h @@ -53,10 +53,10 @@ class MpegVideoBitWindow { inline unsigned int showBits(int bits) { - unsigned int tqmask=nBitMask[bits]; + unsigned int mask=nBitMask[bits]; int shift=32-(bits); int bO; - shift=(curBits & tqmask)>>shift; + shift=(curBits & mask)>>shift; bO = bit_offset + bits; if (bO > 32) { return (shift | (*(buffer+1)>>(64-bO))); diff --git a/mpeglib/lib/output/outputStream.cpp b/mpeglib/lib/output/outputStream.cpp index 560ab75f..ef209cbc 100644 --- a/mpeglib/lib/output/outputStream.cpp +++ b/mpeglib/lib/output/outputStream.cpp @@ -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; switch(streamType) { @@ -216,9 +216,9 @@ int OutputStream::waitStreamState(int method,int tqmask,int streamType) { if (method == _OUTPUT_WAIT_METHOD_BLOCK) { abs_thread_mutex_lock(&stateChangeMut); - while ((*waitState &= tqmask)==0) { + while ((*waitState &= mask)==0) { cout << "waitStreamState:"<<waitState<<endl; - cout << "tqmask:"<<tqmask<<endl; + cout << "mask:"<<mask<<endl; abs_thread_cond_wait(&stateChangeCond,&stateChangeMut); } abs_thread_mutex_unlock(&stateChangeMut); diff --git a/mpeglib/lib/output/outputStream.h b/mpeglib/lib/output/outputStream.h index 6dccd02e..9ef538fd 100644 --- a/mpeglib/lib/output/outputStream.h +++ b/mpeglib/lib/output/outputStream.h @@ -105,10 +105,10 @@ class KDE_EXPORT OutputStream { // stream State handling - // we return the tqmask which triggerd (by "AND") - // or the current polled tqmask when method is POLL + // we return the mask which triggerd (by "AND") + // or the current polled mask when method is POLL // 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); diff --git a/mpeglib/lib/splay/mpegAudioHeader.cpp b/mpeglib/lib/splay/mpegAudioHeader.cpp index 31e97563..7e34b212 100644 --- a/mpeglib/lib/splay/mpegAudioHeader.cpp +++ b/mpeglib/lib/splay/mpegAudioHeader.cpp @@ -116,7 +116,7 @@ int MpegAudioHeader::parseHeader(unsigned char* buf){ 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. if (frequency > 2) { DEBUG_HEADER(cout << "frequency value out of range"<<endl;) diff --git a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp index 86b0b135..76038a5c 100644 --- a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp +++ b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp @@ -131,9 +131,9 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask, unsigned int greenMask, unsigned int blueMask) { - unsigned PIXVAL red_tqmask = redMask; - unsigned PIXVAL green_tqmask =greenMask; - unsigned PIXVAL blue_tqmask = blueMask; + unsigned PIXVAL red_mask = redMask; + unsigned PIXVAL green_mask =greenMask; + unsigned PIXVAL blue_mask = blueMask; 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. */ 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] <<= free_bits_at_bottom(red_tqmask); - g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_tqmask)); - g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_tqmask); - b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_tqmask)); - b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_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_mask); + 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_mask); + 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_mask); /* * If we have 16-bit output depth, then we double the value * in the top word. This means that we can write out both diff --git a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp index 1de9cc17..757f0676 100644 --- a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp +++ b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp @@ -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_Vgrncoeff[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; static unsigned short MMX16_Ycoeff[] = {0x4a, 0x4a, 0x4a, 0x4a}; -static unsigned short MMX16_redtqmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; -static unsigned short MMX16_grntqmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; +static unsigned short MMX16_redmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; +static unsigned short MMX16_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; void dummy_dithermmx16() { cout << "MMX16_0"<<MMX16_0<<endl; @@ -38,8 +38,8 @@ void dummy_dithermmx16() { cout << "MMX16_Ugrncoeff:"<<MMX16_Ugrncoeff<<endl; cout << "MMX16_Vgrncoeff:"<<MMX16_Vgrncoeff<<endl; cout << "MMX16_Ycoeff:"<<MMX16_Ycoeff<<endl; - cout << "MMX16_redtqmask:"<<MMX16_redtqmask<<endl; - cout << "MMX16_grntqmask:"<<MMX16_grntqmask<<endl; + cout << "MMX16_redmask:"<<MMX16_redmask<<endl; + cout << "MMX16_grnmask:"<<MMX16_grnmask<<endl; cout << "MMX16_00FFw:"<<MMX16_00FFw<<endl; } @@ -114,11 +114,11 @@ void ditherBlock(unsigned char *lum, "punpcklbw %%mm4, %%mm4\n" "punpcklbw %%mm5, %%mm5\n" - "pand MMX16_redtqmask, %%mm4\n" + "pand MMX16_redmask, %%mm4\n" "psllw $3, %%mm5\n" // GREEN 1 "punpcklbw %%mm6, %%mm6\n" - "pand MMX16_grntqmask, %%mm5\n" - "pand MMX16_redtqmask, %%mm6\n" + "pand MMX16_grnmask, %%mm5\n" + "pand MMX16_redmask, %%mm6\n" "por %%mm5, %%mm4\n" // "psrlw $11, %%mm6\n" // BLUE 1 "movq %%mm3, %%mm5\n" // lum2 @@ -145,10 +145,10 @@ void ditherBlock(unsigned char *lum, "pmullw MMX16_Ycoeff, %%mm6\n" // lum3 "punpcklbw %%mm7, %%mm7\n" "psllw $3, %%mm5\n" // GREEN 2 - "pand MMX16_redtqmask, %%mm7\n" - "pand MMX16_redtqmask, %%mm3\n" + "pand MMX16_redmask, %%mm7\n" + "pand MMX16_redmask, %%mm3\n" "psrlw $11, %%mm7\n" // BLUE 2 - "pand MMX16_grntqmask, %%mm5\n" + "pand MMX16_grnmask, %%mm5\n" "por %%mm7, %%mm3\n" "movq (%2), %%mm7\n" // L4 load lum2 @@ -186,11 +186,11 @@ void ditherBlock(unsigned char *lum, "punpcklbw %%mm5, %%mm5\n" "punpcklbw %%mm6, %%mm6\n" "psllw $3, %%mm5\n" // GREEN 3 - "pand MMX16_redtqmask, %%mm4\n" + "pand MMX16_redmask, %%mm4\n" "psraw $6, %%mm3\n" // psr 6 "psraw $6, %%mm0\n" - "pand MMX16_redtqmask, %%mm6\n" // BLUE - "pand MMX16_grntqmask, %%mm5\n" + "pand MMX16_redmask, %%mm6\n" // BLUE + "pand MMX16_grnmask, %%mm5\n" "psrlw $11, %%mm6\n" // BLUE 3 "por %%mm5, %%mm4\n" "psraw $6, %%mm7\n" @@ -201,11 +201,11 @@ void ditherBlock(unsigned char *lum, "punpcklbw %%mm3, %%mm3\n" "punpcklbw %%mm0, %%mm0\n" "punpcklbw %%mm7, %%mm7\n" - "pand MMX16_redtqmask, %%mm3\n" - "pand MMX16_redtqmask, %%mm7\n" // BLUE + "pand MMX16_redmask, %%mm3\n" + "pand MMX16_redmask, %%mm7\n" // BLUE "psllw $3, %%mm0\n" // GREEN 4 "psrlw $11, %%mm7\n" - "pand MMX16_grntqmask, %%mm0\n" + "pand MMX16_grnmask, %%mm0\n" "por %%mm7, %%mm3\n" "por %%mm0, %%mm3\n" diff --git a/mpeglib/lib/util/render/x11/initDisplay.cpp b/mpeglib/lib/util/render/x11/initDisplay.cpp index 2a62e721..d0029eb6 100644 --- a/mpeglib/lib/util/render/x11/initDisplay.cpp +++ b/mpeglib/lib/util/render/x11/initDisplay.cpp @@ -128,7 +128,7 @@ void CreateFullColorWindow (XWindow* xwindow) { int depth; Visual *visual; XSetWindowAttributes xswa; - unsigned long tqmask; + unsigned long mask; unsigned int c_class; int screen; Display *dpy=xwindow->display; @@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) { cout << "visual is null"<<endl; return; } - tqmask = CWBackPixel | CWColormap | CWBorderPixel; + mask = CWBackPixel | CWColormap | CWBorderPixel; if (xwindow->colormap==0) { xswa.colormap = XCreateColormap(dpy, XRootWindow(dpy, screen), @@ -166,7 +166,7 @@ void CreateFullColorWindow (XWindow* xwindow) { /* xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h, (unsigned int) 1, depth, c_class, - visual, tqmask, &xswa); + visual, mask, &xswa); */ } diff --git a/mpg123_artsplugin/mpg123/buffer.c b/mpg123_artsplugin/mpg123/buffer.c index 33b4c92b..3c85b654 100644 --- a/mpg123_artsplugin/mpg123/buffer.c +++ b/mpg123_artsplugin/mpg123/buffer.c @@ -95,7 +95,7 @@ void buffer_loop(struct audio_info_struct *ai, sigset_t *oldsigset) catchsignal (SIGINT, catch_interrupt); catchsignal (SIGUSR1, catch_usr1); - sigproctqmask (SIG_SETMASK, oldsigset, NULL); + sigprocmask (SIG_SETMASK, oldsigset, NULL); #ifndef NO_DECODE_AUDIO if (param.outmode == DECODE_AUDIO) { if (audio_open(ai) < 0) { diff --git a/mpg123_artsplugin/mpg123/common.c b/mpg123_artsplugin/mpg123/common.c index cd7cc121..65d658fd 100644 --- a/mpg123_artsplugin/mpg123/common.c +++ b/mpg123_artsplugin/mpg123/common.c @@ -114,7 +114,7 @@ void (*catchsignal(int signum, void(*handler)()))() #endif new_sa.sa_handler = handler; - sigemptyset(&new_sa.sa_tqmask); + sigemptyset(&new_sa.sa_mask); new_sa.sa_flags = 0; if (sigaction(signum, &new_sa, &old_sa) == -1) return ((void (*)()) -1); diff --git a/mpg123_artsplugin/mpg123/layer3.c b/mpg123_artsplugin/mpg123/layer3.c index b012047a..b4f33510 100644 --- a/mpg123_artsplugin/mpg123/layer3.c +++ b/mpg123_artsplugin/mpg123/layer3.c @@ -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 REFRESH_MASK \ while(num < BITSHIFT) { \ - tqmask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \ + mask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \ num += 8; \ part2remain -= 8; } @@ -626,10 +626,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, int *me; 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 */ - tqmask = ((unsigned long) getbits(&bsi,num))<<BITSHIFT; - tqmask <<= 8-num; + mask = ((unsigned long) getbits(&bsi,num))<<BITSHIFT; + mask <<= 8-num; part2remain -= num; { @@ -702,10 +702,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, register short *val = h->table; REFRESH_MASK; while((y=*val++)<0) { - if (tqmask < 0) + if (mask < 0) val -= y; num--; - tqmask <<= 1; + mask <<= 1; } x = y >> 4; y &= 0xf; @@ -713,23 +713,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(x == 15 && h->linbits) { max[lwin] = cb; REFRESH_MASK; - x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); + x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - tqmask <<= h->linbits; - if(tqmask < 0) + mask <<= h->linbits; + if(mask < 0) *xrpnt = REAL_MUL(-ispow[x], v); else *xrpnt = REAL_MUL(ispow[x], v); - tqmask <<= 1; + mask <<= 1; } else if(x) { max[lwin] = cb; - if(tqmask < 0) + if(mask < 0) *xrpnt = REAL_MUL(-ispow[x], v); else *xrpnt = REAL_MUL(ispow[x], v); num--; - tqmask <<= 1; + mask <<= 1; } else *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) { max[lwin] = cb; REFRESH_MASK; - y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); + y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - tqmask <<= h->linbits; - if(tqmask < 0) + mask <<= h->linbits; + if(mask < 0) *xrpnt = REAL_MUL(-ispow[y], v); else *xrpnt = REAL_MUL(ispow[y], v); - tqmask <<= 1; + mask <<= 1; } else if(y) { max[lwin] = cb; - if(tqmask < 0) + if(mask < 0) *xrpnt = REAL_MUL(-ispow[y], v); else *xrpnt = REAL_MUL(ispow[y], v); num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt = DOUBLE_TO_REAL(0.0); @@ -767,10 +767,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, REFRESH_MASK; while((a=*val++)<0) { - if (tqmask < 0) + if (mask < 0) val -= a; num--; - tqmask <<= 1; + mask <<= 1; } if(part2remain+num <= 0) { num -= part2remain+num; @@ -800,12 +800,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(part2remain+num <= 0) { break; } - if(tqmask < 0) + if(mask < 0) *xrpnt = -v; else *xrpnt = v; num--; - tqmask <<= 1; + mask <<= 1; } else *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; REFRESH_MASK; while((y=*val++)<0) { - if (tqmask < 0) + if (mask < 0) val -= y; num--; - tqmask <<= 1; + mask <<= 1; } x = y >> 4; y &= 0xf; @@ -891,23 +891,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if (x == 15 && h->linbits) { max = cb; REFRESH_MASK; - x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); + x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - tqmask <<= h->linbits; - if(tqmask < 0) + mask <<= h->linbits; + if(mask < 0) *xrpnt++ = REAL_MUL(-ispow[x], v); else *xrpnt++ = REAL_MUL(ispow[x], v); - tqmask <<= 1; + mask <<= 1; } else if(x) { max = cb; - if(tqmask < 0) + if(mask < 0) *xrpnt++ = REAL_MUL(-ispow[x], v); else *xrpnt++ = REAL_MUL(ispow[x], v); num--; - tqmask <<= 1; + mask <<= 1; } else *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) { max = cb; REFRESH_MASK; - y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits); + y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); num -= h->linbits+1; - tqmask <<= h->linbits; - if(tqmask < 0) + mask <<= h->linbits; + if(mask < 0) *xrpnt++ = REAL_MUL(-ispow[y], v); else *xrpnt++ = REAL_MUL(ispow[y], v); - tqmask <<= 1; + mask <<= 1; } else if(y) { max = cb; - if(tqmask < 0) + if(mask < 0) *xrpnt++ = REAL_MUL(-ispow[y], v); else *xrpnt++ = REAL_MUL(ispow[y], v); num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt++ = DOUBLE_TO_REAL(0.0); @@ -947,10 +947,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, REFRESH_MASK; while((a=*val++)<0) { - if (tqmask < 0) + if (mask < 0) val -= a; num--; - tqmask <<= 1; + mask <<= 1; } if(part2remain+num <= 0) { num -= part2remain+num; @@ -978,12 +978,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(part2remain+num <= 0) { break; } - if(tqmask < 0) + if(mask < 0) *xrpnt++ = -v; else *xrpnt++ = v; num--; - tqmask <<= 1; + mask <<= 1; } else *xrpnt++ = DOUBLE_TO_REAL(0.0); diff --git a/mpg123_artsplugin/mpg123/xfermem.h b/mpg123_artsplugin/mpg123/xfermem.h index 8d94c863..ae7e5afd 100644 --- a/mpg123_artsplugin/mpg123/xfermem.h +++ b/mpg123_artsplugin/mpg123/xfermem.h @@ -6,7 +6,7 @@ * * This is a stand-alone module which implements a unidirectional, * 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 * on both sides. Control information is transferred between the * processes through a socketpair. See xftest.c for an example on diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 185c98bc..2924e1bc 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -28,8 +28,8 @@ * General options *****************************************************************/ -General::General(TQObject *tqparent) - : CModule(i18n("General"), i18n("General Options"), "configure", tqparent) +General::General(TQObject *parent) + : CModule(i18n("General"), i18n("General Options"), "configure", parent) { mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this); mLoopList->setChecked(napp->loopList()); diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h index 9a592075..c5e18027 100644 --- a/noatun/library/cmodule.h +++ b/noatun/library/cmodule.h @@ -24,7 +24,7 @@ class General : public CModule Q_OBJECT TQ_OBJECT public: - General(TQObject *tqparent=0); + General(TQObject *parent=0); virtual void save(); private slots: diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp index 1644f724..4fbc0a19 100644 --- a/noatun/library/controls.cpp +++ b/noatun/library/controls.cpp @@ -1,14 +1,14 @@ #include <noatun/controls.h> -L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : - TQSlider(tqparent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : - TQSlider(o,tqparent,name), pressed(false) +L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Qt::Orientation o, TQWidget * tqparent, const char * name) : - TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) + Qt::Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -52,8 +52,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e) SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* tqparent, const char* name ) - : KAction( text, accel, tqparent, name ) + const char *member, TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index efb456ac..7836e61b 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -65,8 +65,8 @@ void DownloadItem::dequeue() -Downloader::Downloader(TQObject *tqparent) - : TQObject(tqparent), localfile(0), current(0), mJob(0), mTimeout(0) +Downloader::Downloader(TQObject *parent) + : TQObject(parent), localfile(0), current(0), mJob(0), mTimeout(0) { mStarted=false; mUnstartedQueue=new TQPtrList<Downloader::QueueItem>; diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp index cc64331d..6815a90a 100644 --- a/noatun/library/effects.cpp +++ b/noatun/library/effects.cpp @@ -28,8 +28,8 @@ using namespace Arts; class EffectConfigWidget : public TQWidget { public: - EffectConfigWidget(Effect *e, TQWidget *tqparent=0) - : TQWidget(tqparent), mEf(e) + EffectConfigWidget(Effect *e, TQWidget *parent=0) + : TQWidget(parent), mEf(e) {} virtual ~EffectConfigWidget() diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index fe25abcb..cd9e7d93 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -44,8 +44,8 @@ class EffectListItem : public TQListViewItem { public: - EffectListItem(TQListView *tqparent, TQListViewItem *after, Effect *e) - : TQListViewItem(tqparent, after, e->title()), mEffect(e) + EffectListItem(TQListView *parent, TQListViewItem *after, Effect *e) + : TQListViewItem(parent, after, e->title()), mEffect(e) { } @@ -55,8 +55,8 @@ private: Effect *mEffect; }; -EffectList::EffectList(TQWidget *tqparent) - : KListView(tqparent) +EffectList::EffectList(TQWidget *parent) + : KListView(parent) { } @@ -85,9 +85,9 @@ void EffectView::show() 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->setTextLabel(textLabel, true); TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot); diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h index c0946d89..3b371921 100644 --- a/noatun/library/effectview.h +++ b/noatun/library/effectview.h @@ -77,7 +77,7 @@ class EffectList : public KListView Q_OBJECT TQ_OBJECT public: - EffectList(TQWidget *tqparent); + EffectList(TQWidget *parent); virtual bool acceptDrag(TQDropEvent *) const; virtual TQDragObject *dragObject() const; }; diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index 06693797..36863a0c 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -79,13 +79,13 @@ namespace VolumeControls else { #define ERROR { fd=-1; return; } - int devtqmask, rectqmask, i_recsrc, stereodevs; + int devmask, recmask, i_recsrc, stereodevs; // Mixer is open. Now define properties - if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) ERROR - if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) ERROR + if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -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_STEREODEVS, &stereodevs) == -1) ERROR - if (!devtqmask) ERROR + if (!devmask) ERROR #undef ERROR } @@ -248,7 +248,7 @@ Noatun::StereoEffectStack *Engine::globalEffectStack() const { return &d->globa Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; } 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; // Connect to aRts diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index 7758f35c..7a55d6f7 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -30,8 +30,8 @@ //////////////////////////////////////////////// // PresetList -PresetList::PresetList(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +PresetList::PresetList(TQWidget *parent, const char *name) + : KListView(parent, name) { setItemsRenameable(true); setRenameable(0, true); @@ -61,8 +61,8 @@ void PresetList::rename(TQListViewItem *item, int c) //////////////////////////////////////////////// // EqualizerLevel -EqualizerLevel::EqualizerLevel(TQWidget *tqparent, VBand band) - : TQWidget(tqparent), mBand(band) +EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) + : TQWidget(parent), mBand(band) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, 0, "EqualizerLevel::tqlayout"); diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h index d902f49b..1f881742 100644 --- a/noatun/library/equalizerview.h +++ b/noatun/library/equalizerview.h @@ -19,7 +19,7 @@ class EqualizerLevel : public TQWidget Q_OBJECT TQ_OBJECT public: - EqualizerLevel(TQWidget *tqparent, VBand band); + EqualizerLevel(TQWidget *parent, VBand band); public slots: void changed(); @@ -39,7 +39,7 @@ class PresetList : public KListView Q_OBJECT TQ_OBJECT public: - PresetList(TQWidget *tqparent, const char *name=0); + PresetList(TQWidget *parent, const char *name=0); public: void rename(TQListViewItem *item, int c); diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp index 8dba7fc6..0370b048 100644 --- a/noatun/library/mimetypetree.cpp +++ b/noatun/library/mimetypetree.cpp @@ -4,8 +4,8 @@ #include <tqheader.h> -MimeTypeTree::MimeTypeTree(TQWidget *tqparent) - : KListView(tqparent) +MimeTypeTree::MimeTypeTree(TQWidget *parent) + : KListView(parent) { KMimeType::List list=KMimeType::allMimeTypes(); TQDict<TQListViewItem> map; @@ -38,7 +38,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *tqparent) void MimeTypeTree::sel(TQListViewItem *item) { - TQListViewItem *p=item->tqparent(); + TQListViewItem *p=item->parent(); if (!p) return; TQString major=p->text(0); TQString minor=item->text(0); diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h index b3f7ccb7..818f63c7 100644 --- a/noatun/library/mimetypetree.h +++ b/noatun/library/mimetypetree.h @@ -21,7 +21,7 @@ class MimeTypeTree : public KListView Q_OBJECT TQ_OBJECT public: - MimeTypeTree(TQWidget *tqparent); + MimeTypeTree(TQWidget *parent); private: TQListViewItem *addMajor(const TQString &name); diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 02564048..fad688fa 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -25,10 +25,10 @@ class KDE_EXPORT L33tSlider : public TQSlider Q_OBJECT TQ_OBJECT public: - L33tSlider(TQWidget * tqparent, const char * name=0); - L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0); 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; signals: @@ -60,7 +60,7 @@ Q_OBJECT TQ_OBJECT public: 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 void unplug( TQWidget *w ); TQSlider* slider() const { return m_slider; } diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h index 7d711c26..3fffc772 100644 --- a/noatun/library/noatun/downloader.h +++ b/noatun/library/noatun/downloader.h @@ -75,7 +75,7 @@ Q_OBJECT }; public: - Downloader(TQObject *tqparent=0); + Downloader(TQObject *parent=0); virtual ~Downloader(); public slots: diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index 3108ae84..19e28dde 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT friend class NoatunApp; public: - Engine(TQObject *tqparent=0); + Engine(TQObject *parent=0); ~Engine(); void setInitialized(); bool initialized() const; diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index 406f4f1b..ef65b648 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -42,7 +42,7 @@ public: enum LoopType { None=0, Song, Playlist, Random }; public: - Player(TQObject *tqparent=0); + Player(TQObject *parent=0); ~Player(); /** diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index d1baa25d..6c390e77 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -332,7 +332,7 @@ Q_OBJECT TQ_OBJECT friend class PlaylistItemData; public: - Playlist(TQObject *tqparent, const char *name); + Playlist(TQObject *parent, const char *name); /** * on playlist unload, your playlist must * have current()==0 and emit playCurrent diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index d127ab9f..a79c05aa 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -409,7 +409,7 @@ Q_OBJECT friend class NoatunListenerNotif; public: - NoatunListener(TQObject *tqparent=0); + NoatunListener(TQObject *parent=0); virtual ~NoatunListener(); signals: @@ -433,7 +433,7 @@ protected: class ExitNotifier : public NoatunListener { public: - ExitNotifier(int pid, TQObject *tqparent=0); + ExitNotifier(int pid, TQObject *parent=0); virtual ~ExitNotifier(); private: @@ -456,7 +456,7 @@ class BoolNotifier : public TQObject Q_OBJECT TQ_OBJECT public: - BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent=0); + BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0); private slots: void event() {*mValue=false;} diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index a290e51c..fe29fdf1 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -64,10 +64,10 @@ public: * arguments are short and long descriptions * 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. **/ - 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(); diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index 94253d4a..c267aedd 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -34,7 +34,7 @@ class ScrollingLabel : public TQWidget TQ_OBJECT public: - ScrollingLabel(const TQString &initialText,TQWidget *tqparent, + ScrollingLabel(const TQString &initialText,TQWidget *parent, const char * name = 0); virtual ~ScrollingLabel(); diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index f7413e70..b0e30098 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -22,7 +22,7 @@ class PlayAction : public KAction Q_OBJECT TQ_OBJECT public: - PlayAction(TQObject *tqparent, const char *name); + PlayAction(TQObject *parent, const char *name); private slots: void playing(); void notplaying(); @@ -36,7 +36,7 @@ class PlaylistAction : public KToggleAction Q_OBJECT TQ_OBJECT public: - PlaylistAction(TQObject *tqparent, const char *name); + PlaylistAction(TQObject *parent, const char *name); private slots: void shown(); void hidden(); @@ -51,7 +51,7 @@ class PluginActionMenu : public KActionMenu Q_OBJECT TQ_OBJECT public: - PluginActionMenu(TQObject *tqparent, const char *name); + PluginActionMenu(TQObject *parent, const char *name); /** * inserts the given @p action into the action-menu * @param action the action to insert @@ -85,7 +85,7 @@ class VisActionMenu : public KActionMenu Q_OBJECT TQ_OBJECT public: - VisActionMenu(TQObject *tqparent, const char *name); + VisActionMenu(TQObject *parent, const char *name); private slots: void fillPopup(); void toggleVisPlugin(int); @@ -103,7 +103,7 @@ class LoopActionMenu : public KActionMenu Q_OBJECT TQ_OBJECT public: - LoopActionMenu(TQObject *tqparent, const char *name); + LoopActionMenu(TQObject *parent, const char *name); private slots: void updateLooping(int); void loopNoneSelected(); @@ -121,48 +121,48 @@ private: /** * @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 */ -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 */ -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 */ -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 */ -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 */ -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 */ -KDE_EXPORT KToggleAction *playlist(TQObject *tqparent = 0, const char *name = 0); +KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0); /** * loop action **/ -KDE_EXPORT LoopActionMenu *loop(TQObject *tqparent, const char *name); +KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); /** * 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 */ -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) @@ -172,7 +172,7 @@ KDE_EXPORT PluginActionMenu *actions(); /** * @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 :) diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h index a364dba0..ac85b9ed 100644 --- a/noatun/library/noatun/stereobuttonaction.h +++ b/noatun/library/noatun/stereobuttonaction.h @@ -15,12 +15,12 @@ class StereoButtonAction : public KAction Q_OBJECT TQ_OBJECT public: - StereoButtonAction(const TQString& text, int accel = 0, TQObject* tqparent = 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, const TQIconSet& pix, int accel = 0, TQObject* tqparent = 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 TQIconSet& 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* tqparent, 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* parent, 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* parent = 0, 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* parent, const char* name = 0 ); public slots: void disable(void); void enable(void); diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h index 217a8640..bed8f8ac 100644 --- a/noatun/library/noatun/video.h +++ b/noatun/library/noatun/video.h @@ -20,8 +20,8 @@ Q_OBJECT static VideoFrame *whose; public: - VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent=0, const char *name=0, WFlags f=0); - VideoFrame(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 *parent = 0, const char *name=0, WFlags f=0); ~VideoFrame(); /** @@ -29,7 +29,7 @@ public: **/ static VideoFrame *playing(); - TQPopupMenu *popupMenu(TQWidget *tqparent); + TQPopupMenu *popupMenu(TQWidget *parent); TQPopupMenu *popupMenu() { return popupMenu(this); } public slots: diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index 851b846b..d37adefb 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -21,8 +21,8 @@ namespace NoatunStdAction { ///////////////////////////////////////////////////// -PlayAction::PlayAction(TQObject *tqparent, const char *name) - : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), tqparent, name) +PlayAction::PlayAction(TQObject *parent, const char *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(paused()), TQT_SLOT(notplaying())); @@ -46,8 +46,8 @@ void PlayAction::notplaying() } ///////////////////////////////////////////////////// -PlaylistAction::PlaylistAction(TQObject *tqparent, const char *name) - : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), tqparent, name) +PlaylistAction::PlaylistAction(TQObject *parent, const char *name) + : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name) { setCheckedState(i18n("Hide Playlist")); connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown())); @@ -67,8 +67,8 @@ void PlaylistAction::hidden() //////////////////////////////////////////////////// -PluginActionMenu::PluginActionMenu(TQObject *tqparent, const char *name) - : KActionMenu(i18n("&Actions"), tqparent, name) +PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name) + : KActionMenu(i18n("&Actions"), parent, name) { // kdDebug(66666) << k_funcinfo << "called" << endl; setEnabled(false); @@ -111,8 +111,8 @@ void PluginActionMenu::menuRemove(int id) //////////////////////////////////////////////////// -VisActionMenu::VisActionMenu(TQObject *tqparent, const char *name) - : KActionMenu(i18n("&Visualizations"), tqparent, name) +VisActionMenu::VisActionMenu(TQObject *parent, const char *name) + : KActionMenu(i18n("&Visualizations"), parent, name) { connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup())); 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) - : KActionMenu(i18n("&Loop"), tqparent, name) +LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name) + : KActionMenu(i18n("&Loop"), parent, name) { mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), 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(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); @@ -265,14 +265,14 @@ KAction *stop(TQObject *tqparent, const char *name) 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(paused()), 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; } -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(paused()), 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; } -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() @@ -307,14 +307,14 @@ PluginActionMenu *actions() 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; diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 47e2d92a..b1ea94d5 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -177,8 +177,8 @@ Tags::~Tags() } -Control::Control(TagsGetter *tqparent) - : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", tqparent) +Control::Control(TagsGetter *parent) + : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", parent) { // todo (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(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int))); - slider->setValue(tqparent->interval()); - connect(slider, TQT_SIGNAL(valueChanged(int)), tqparent, TQT_SLOT(setInterval(int))); + slider->setValue(parent->interval()); + 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)), tqparent, TQT_SLOT(setLoadAuto(bool))); + connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool))); - onPlay->setChecked(tqparent->loadAuto()); + onPlay->setChecked(parent->loadAuto()); } diff --git a/noatun/library/noatuntags/tagsgetter.h b/noatun/library/noatuntags/tagsgetter.h index bd66ab3f..cf336c7d 100644 --- a/noatun/library/noatuntags/tagsgetter.h +++ b/noatun/library/noatuntags/tagsgetter.h @@ -50,7 +50,7 @@ class Control : public CModule Q_OBJECT TQ_OBJECT public: - Control(TagsGetter* tqparent); + Control(TagsGetter* parent); }; diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp index accdfd47..0b90952c 100644 --- a/noatun/library/player.cpp +++ b/noatun/library/player.cpp @@ -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) { mEngine=new Engine; diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 33e5c1f0..7cc28337 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -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(listHidden()), TQT_SIGNAL(playlistHidden())); diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 033ccace..02c2f743 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -85,16 +85,16 @@ Visualization::Visualization(int timeout, int pid) // if this is a fork, do a cutesy arts thingy to get a remote // stack, otherwise, get it from localhost :) { - int tqparent=pid ? pid : getppid(); + int parent=pid ? pid : getppid(); if (getenv("NOATUN_PID")) - tqparent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt(); + parent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt(); DCOPClient c; c.attach(); TQCString appids[2]; - appids[0]=TQString("noatun-%1").tqarg(tqparent).local8Bit(); + appids[0]=TQString("noatun-%1").tqarg(parent).local8Bit(); appids[1]="noatun"; TQCString &appid=appids[0]; @@ -120,7 +120,7 @@ Visualization::Visualization(int timeout, int pid) 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 { @@ -473,7 +473,7 @@ void StereoScope::setSamples(int len) -NoatunListener::NoatunListener(TQObject *tqparent) : TQObject(tqparent) +NoatunListener::NoatunListener(TQObject *parent) : TQObject(parent) { } 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); @@ -528,7 +528,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparen 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 { @@ -563,8 +563,8 @@ ExitNotifier::~ExitNotifier() delete mNotif; } -BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent) - : TQObject(tqparent) +BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent) + : TQObject(parent) { connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event())); mValue=value; diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index fb57f39b..dd30111e 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -203,34 +203,34 @@ void Plugins::reopen() for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) { - PluginListView *tqparent; + PluginListView *parent; bool exclusive = false; if((*i).type == "userinterface") { - tqparent = interfaceList; + parent = interfaceList; } else if((*i).type == "playlist") { - tqparent = playlistList; + parent = playlistList; exclusive = true; } else if((*i).type == "sm" || (*i).type=="hidden") { - tqparent = 0; + parent = 0; } else if ((*i).type == "visualization") { - tqparent = visList; + parent = visList; } 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(1, (*i).comment); item->setText(2, (*i).author); diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 04e301ff..98c05453 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -8,9 +8,9 @@ //#include <tqlabel.h> #include "cmodule.h" -NoatunPreferences::NoatunPreferences(TQWidget *tqparent) +NoatunPreferences::NoatunPreferences(TQWidget *parent) : 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. setShowIconsInTreeList(true); @@ -32,7 +32,7 @@ void NoatunPreferences::show() 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) showPage(index); show(); @@ -65,7 +65,7 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri 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); } @@ -78,7 +78,7 @@ CModule::~CModule() void CModule::ownerDeleted() { - TQObject *p=tqparent(); + TQObject *p=parent(); delete this; p->deleteLater(); } diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index 682c4f6a..4484c872 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -55,10 +55,10 @@ class ScrollingLabel::Private ScrollingLabel::ScrollingLabel ( const TQString & initialText, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQWidget(tqparent, name) + : TQWidget(parent, name) { d = new Private; diff --git a/noatun/library/stereobuttonaction.cpp b/noatun/library/stereobuttonaction.cpp index 7d5d3936..e8df0046 100644 --- a/noatun/library/stereobuttonaction.cpp +++ b/noatun/library/stereobuttonaction.cpp @@ -3,28 +3,28 @@ namespace NoatunStdAction { -StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* tqparent, const char* name ) - : KAction(text, accel, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name ) + : KAction(text, accel, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) - : KAction(text, accel, receiver, slot, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) + : KAction(text, accel, receiver, slot, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* tqparent, const char* name ) - : KAction(text, pix, accel, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name ) + : KAction(text, pix, accel, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* tqparent, const char* name ) - : KAction(text, pix, accel, tqparent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* 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 ) - : KAction(text, pix, accel, receiver, slot, tqparent, 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, parent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) - : KAction(text, pix, accel, receiver, slot, tqparent, 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, parent, name) {} void StereoButtonAction::disable(void) diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h index 947ccff5..21f9528d 100644 --- a/noatun/library/titleproxy.h +++ b/noatun/library/titleproxy.h @@ -115,8 +115,8 @@ namespace TitleProxy TQ_OBJECT public: - Server( TQ_UINT16 port, TQObject* tqparent ) - : TQServerSocket( port, 1, tqparent, "TitleProxyServer" ) {}; + Server( TQ_UINT16 port, TQObject* parent ) + : TQServerSocket( port, 1, parent, "TitleProxyServer" ) {}; signals: void connected( int socket ); diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index e009b044..f2428bc4 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -24,8 +24,8 @@ struct VideoFrame::Private }; -VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const char*name, WFlags f) - : KVideoWidget(clientParent, tqparent, name, f) +VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char*name, WFlags f) + : KVideoWidget(clientParent, parent, name, f) { d = new Private; connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); @@ -33,8 +33,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const ch frames.append(this); } -VideoFrame::VideoFrame(TQWidget *tqparent, const char *name, WFlags f) - : KVideoWidget(tqparent, name, f) +VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f) + : KVideoWidget(parent, name, f) { d = new Private; connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); @@ -62,9 +62,9 @@ VideoFrame *VideoFrame::playing() 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( "normal_size" )->plug( view ); action( "double_size" )->plug( view ); diff --git a/noatun/modules/artseffects/extrastereo_impl.cc b/noatun/modules/artseffects/extrastereo_impl.cc index 28b02d8e..3dc92705 100644 --- a/noatun/modules/artseffects/extrastereo_impl.cc +++ b/noatun/modules/artseffects/extrastereo_impl.cc @@ -134,7 +134,7 @@ public: intense.min(0); intense.max(5); intense.value(e.intensity()); - intense.tqparent(hbox); + intense.parent(hbox); intense.show(); connect(intense,"value_changed", e, "intensity"); diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index 14c1dc20..3a1e2b4e 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -171,8 +171,8 @@ TQString HTMLExport::getColorByEntry(TQString s) } //////////////////////////////////// Settings //////////////////////////////////// -Prefs::Prefs(TQObject *tqparent) - : CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", tqparent) +Prefs::Prefs(TQObject *parent) + : CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", parent) { // Init Config diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h index 65f5c5e9..663eaae0 100644 --- a/noatun/modules/htmlexport/htmlexport.h +++ b/noatun/modules/htmlexport/htmlexport.h @@ -57,7 +57,7 @@ class Prefs : public CModule Q_OBJECT TQ_OBJECT public: - Prefs(TQObject *tqparent); + Prefs(TQObject *parent); virtual void save(); virtual void reopen(); diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index eb9a6fd3..c83326ad 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -51,8 +51,8 @@ Lirc *IRPrefs::s_lirc = 0; bool IRPrefs::s_configRead = false; TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands; -IRPrefs::IRPrefs(TQObject *tqparent) - : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", tqparent) +IRPrefs::IRPrefs(TQObject *parent) + : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent) { TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); tqlayout->setColStretch(1, 1); diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h index 69d7f41f..747b80c8 100644 --- a/noatun/modules/infrared/irprefs.h +++ b/noatun/modules/infrared/irprefs.h @@ -25,7 +25,7 @@ public: NextSection, PreviousSection }; - IRPrefs(TQObject *tqparent); + IRPrefs(TQObject *parent); virtual void save(); diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 57d98c9b..7278b0ec 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -12,8 +12,8 @@ #include "lirc.h" -Lirc::Lirc(TQObject *tqparent) - : TQObject(tqparent), +Lirc::Lirc(TQObject *parent) + : TQObject(parent), m_socket(0) { int sock = ::socket(PF_UNIX, SOCK_STREAM, 0); diff --git a/noatun/modules/infrared/lirc.h b/noatun/modules/infrared/lirc.h index 5f30d751..81bd5edc 100644 --- a/noatun/modules/infrared/lirc.h +++ b/noatun/modules/infrared/lirc.h @@ -18,7 +18,7 @@ public: /** * Constructor */ - Lirc(TQObject *tqparent); + Lirc(TQObject *parent); /** * Destructor */ diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index 0612242c..7cfc61e2 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -95,8 +95,8 @@ Mask: filename (this is DEPRECATED!, for transparent skins just add transparency to the Background image, Mask remains merely for backwards compatibility) filename - The tqmask image file, only needed for skins which are tqshaped windows (not - rectangular). Contains a transparency tqmask for the main window. + The mask image file, only needed for skins which are tqshaped windows (not + rectangular). Contains a transparency mask for the main window. ========================== Text display @@ -151,9 +151,9 @@ Play/Pause/Stop/Shuffle/Repeat/ clip_filename (optional) 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 - 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. ========================== @@ -175,9 +175,9 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename] clip_filename (optional) 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 - 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. @@ -354,15 +354,15 @@ Position/Volume/Balance_Dial: filename has_press_image has_prelight_image revers x, y, width, height: 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). clip_filename (optional) 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 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. ============================================================================== diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 87e1a5e2..1077613b 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -31,8 +31,8 @@ #include "userinterface.h" -KaimanPrefDlg::KaimanPrefDlg(TQObject *tqparent ) - : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", tqparent) +KaimanPrefDlg::KaimanPrefDlg(TQObject *parent ) + : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", parent) { // create widgets TQVBoxLayout *topLayout = new TQVBoxLayout( this, 6, 11 ); diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h index dbdf935b..11b19c8b 100644 --- a/noatun/modules/kaiman/pref.h +++ b/noatun/modules/kaiman/pref.h @@ -29,7 +29,7 @@ class KaimanPrefDlg : public CModule Q_OBJECT TQ_OBJECT public: - KaimanPrefDlg( TQObject *tqparent ); + KaimanPrefDlg( TQObject *parent ); virtual ~KaimanPrefDlg(); virtual void save(); diff --git a/noatun/modules/kaiman/skins/circle/README b/noatun/modules/kaiman/skins/circle/README index f2071dca..a39fff38 100644 --- a/noatun/modules/kaiman/skins/circle/README +++ b/noatun/modules/kaiman/skins/circle/README @@ -4,7 +4,7 @@ Released: November 25, 1998 Version: 1.0 URL: http://www.geocities.com/SiliconValley/Haven/5235 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. Previous versions will work, but will be _ugly_. diff --git a/noatun/modules/kaiman/skins/circle/skindata b/noatun/modules/kaiman/skins/circle/skindata index 57c07cc6..8dba21db 100644 --- a/noatun/modules/kaiman/skins/circle/skindata +++ b/noatun/modules/kaiman/skins/circle/skindata @@ -7,7 +7,7 @@ #Author: John Ellis <[email protected]> #URL: http://www.geocities.com/SiliconValley/Haven/5235/ #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. #simply comment out items you do not want to display @@ -15,7 +15,7 @@ Background: back.png #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: letters.png 23 32 86 diff --git a/noatun/modules/kaiman/skins/circle/skindata_alt b/noatun/modules/kaiman/skins/circle/skindata_alt index 0bfda442..42661e81 100644 --- a/noatun/modules/kaiman/skins/circle/skindata_alt +++ b/noatun/modules/kaiman/skins/circle/skindata_alt @@ -7,7 +7,7 @@ #Author: John Ellis <[email protected]> #URL: http://www.geocities.com/SiliconValley/Haven/5235/ #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. #simply comment out items you do not want to display @@ -15,7 +15,7 @@ Background: back_sm.png #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: letters.png 21 8 4 diff --git a/noatun/modules/kaiman/skins/k9/skindata b/noatun/modules/kaiman/skins/k9/skindata index d7d25a56..1fdc4320 100644 --- a/noatun/modules/kaiman/skins/k9/skindata +++ b/noatun/modules/kaiman/skins/k9/skindata @@ -10,7 +10,7 @@ ###################################################### Background: knine-normal2.jpg -Mask: tqmask.png +Mask: mask.png Play_Button: play.jpg FALSE FALSE 55 133 89 166 Stop_Button: stop.jpg FALSE FALSE 28 124 52 145 diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 4f9b5315..bbf55cb3 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -42,8 +42,8 @@ const bool KaimanStyleSlider::optionVertical = 1; const bool KaimanStyleSlider::optionReversed = 2; const bool KaimanStyleText::optionExtended = 1; -KaimanStyleElement::KaimanStyleElement(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KaimanStyleElement::KaimanStyleElement(TQWidget *parent, const char *name) + : TQWidget(parent, name) { // Initialize everything to default values filename = ""; @@ -122,10 +122,10 @@ void KaimanStyleElement::loadPixmaps(TQString &val_s_filename) bitBlt(part,0,0,&pixmap,sourcex,sourcey,w,h); pixmaps.insert(i,part); - if(pixmap.tqmask()) + if(pixmap.mask()) { 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); } @@ -192,8 +192,8 @@ void KaimanStyleElement::dropEvent( TQDropEvent *event ) /***************************************************************************/ -KaimanStyleButton::KaimanStyleButton(TQWidget *tqparent, const char *name) - : KaimanStyleMasked(tqparent, name) +KaimanStyleButton::KaimanStyleButton(TQWidget *parent, const char *name) + : KaimanStyleMasked(parent, name) { i_b_lit = i_b_prelit = i_b_down = false; i_i_currentState = NormalUp; @@ -327,8 +327,8 @@ void KaimanStyleButton::updateButtonState() { /***********************************************************************/ -KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name) - : KaimanStyleMasked( tqparent, name ) +KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name) + : KaimanStyleMasked( parent, name ) { _min = min; _max = max; @@ -486,8 +486,8 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e ) /***********************************************************************/ -KaimanStyleBackground::KaimanStyleBackground(TQWidget *tqparent, const char *name) - : KaimanStyleMasked( tqparent, name ) +KaimanStyleBackground::KaimanStyleBackground(TQWidget *parent, const char *name) + : KaimanStyleMasked( parent, name ) { i_b_move = false; } @@ -533,8 +533,8 @@ void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) /***********************************************************************/ -KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name) - : KaimanStyleMasked( tqparent, name ) +KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *parent, const char *name) + : KaimanStyleMasked( parent, name ) { _min = min; _max = max; @@ -571,8 +571,8 @@ void KaimanStyleValue::setValue( int value, int min, int max ) /***********************************************************************/ -KaimanStyleNumber::KaimanStyleNumber(TQWidget *tqparent, const char *name) - : KaimanStyleElement( tqparent, name ) +KaimanStyleNumber::KaimanStyleNumber(TQWidget *parent, const char *name) + : KaimanStyleElement( parent, name ) { //kdDebug(66666) << k_funcinfo << "name = '" << name << "'" << endl; _value = 0; @@ -640,8 +640,8 @@ void KaimanStyleNumber::paintEvent(TQPaintEvent */*qpe*/) /***********************************************************************/ -KaimanStyleText::KaimanStyleText(TQWidget *tqparent, const char *name) - : KaimanStyleElement( tqparent, name ) +KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name) + : KaimanStyleElement( parent, name ) { _pos = 0; _timer = new TQTimer( this ); @@ -735,8 +735,8 @@ void KaimanStyleText::paintEvent(TQPaintEvent */*qpe*/) /***********************************************************************/ -KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name) - : KaimanStyleMasked( tqparent, name ) +KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const char *name) + : KaimanStyleMasked( parent, name ) { _delay = delay; _frame = 0; @@ -774,8 +774,8 @@ void KaimanStyleAnimation::timeout() /***********************************************************************/ -KaimanStyleState::KaimanStyleState(TQWidget *tqparent, const char *name) - : KaimanStyleMasked( tqparent, name ) +KaimanStyleState::KaimanStyleState(TQWidget *parent, const char *name) + : KaimanStyleMasked( parent, name ) { _value = 0; } @@ -799,10 +799,10 @@ void KaimanStyleState::mousePressEvent(TQMouseEvent *qme) /***********************************************************************/ -KaimanStyle::KaimanStyle( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KaimanStyle::KaimanStyle( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { - i_qw_parent = tqparent; + i_qw_parent = parent; i_eventSemaphore = false; } @@ -1456,7 +1456,7 @@ bool KaimanStyle::loadPixmaps() 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_height_Mask = l_pixmap_Mask->height(); diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 03ba4f2d..5d3bfcdb 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -34,7 +34,7 @@ class KaimanStyleElement : public TQWidget Q_OBJECT TQ_OBJECT public: - KaimanStyleElement(TQWidget *tqparent, const char *name=0); + KaimanStyleElement(TQWidget *parent, const char *name=0); ~KaimanStyleElement(); virtual void loadPixmaps(TQString &val_s_filename); @@ -75,14 +75,14 @@ class KaimanStyleMasked : public KaimanStyleElement Q_OBJECT TQ_OBJECT public: - KaimanStyleMasked(TQWidget *tqparent, const char *name=0) - : KaimanStyleElement( tqparent, name ) {}; + KaimanStyleMasked(TQWidget *parent, const char *name=0) + : KaimanStyleElement( parent, name ) {}; virtual void loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); - if(pixmaps[0]->tqmask()) - setMask(*pixmaps[0]->tqmask()); + if(pixmaps[0]->mask()) + setMask(*pixmaps[0]->mask()); }; }; @@ -92,7 +92,7 @@ class KaimanStyleButton : public KaimanStyleMasked Q_OBJECT TQ_OBJECT public: - KaimanStyleButton(TQWidget *tqparent, const char *name=0); + KaimanStyleButton(TQWidget *parent, const char *name=0); ~KaimanStyleButton(); // Button states. @@ -130,7 +130,7 @@ class KaimanStyleSlider : public KaimanStyleMasked Q_OBJECT TQ_OBJECT public: - KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name=0); + KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0); ~KaimanStyleSlider(); int value() { return _value; }; @@ -169,7 +169,7 @@ class KaimanStyleBackground : public KaimanStyleMasked Q_OBJECT TQ_OBJECT public: - KaimanStyleBackground(TQWidget *tqparent, const char *name=0); + KaimanStyleBackground(TQWidget *parent, const char *name=0); ~KaimanStyleBackground(); protected: @@ -189,7 +189,7 @@ class KaimanStyleValue : public KaimanStyleMasked Q_OBJECT TQ_OBJECT public: - KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name=0); + KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0); ~KaimanStyleValue(); int value() { return _value; }; @@ -208,7 +208,7 @@ class KaimanStyleState : public KaimanStyleMasked Q_OBJECT TQ_OBJECT public: - KaimanStyleState(TQWidget *tqparent, const char *name=0); + KaimanStyleState(TQWidget *parent, const char *name=0); ~KaimanStyleState(); int value() { return _value; }; @@ -232,7 +232,7 @@ class KaimanStyleNumber : public KaimanStyleElement Q_OBJECT TQ_OBJECT public: - KaimanStyleNumber(TQWidget *tqparent, const char *name=0); + KaimanStyleNumber(TQWidget *parent, const char *name=0); ~KaimanStyleNumber(); virtual void loadPixmaps(TQString &val_s_filename); @@ -257,7 +257,7 @@ class KaimanStyleText : public KaimanStyleElement Q_OBJECT TQ_OBJECT public: - KaimanStyleText(TQWidget *tqparent, const char *name=0); + KaimanStyleText(TQWidget *parent, const char *name=0); ~KaimanStyleText(); virtual void loadPixmaps(TQString &val_s_filename); @@ -292,7 +292,7 @@ class KaimanStyleAnimation : public KaimanStyleMasked Q_OBJECT TQ_OBJECT public: - KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name=0); + KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0); ~KaimanStyleAnimation(); public slots: @@ -313,10 +313,10 @@ class KaimanStyle : public TQWidget Q_OBJECT TQ_OBJECT public: - KaimanStyle(TQWidget *tqparent, const char *name=0); + KaimanStyle(TQWidget *parent, const char *name=0); ~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 }; @@ -327,7 +327,7 @@ public: bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" ); TQString skinName() { return i_skinName; }; - /// Returns the tqmask + /// Returns the mask TQBitmap* Mask(); virtual bool eventFilter( TQObject *o, TQEvent *e ); @@ -346,13 +346,13 @@ private: 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; /// All style elements are stored here. 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; TQPtrList<TQWidget> i_sliders; diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index 877e5846..e1f2286a 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -170,9 +170,9 @@ void Keyz::slotMute() /////////////////////////////////////////////////////////////////// -KeyzPrefs::KeyzPrefs( TQObject *tqparent ) : +KeyzPrefs::KeyzPrefs( TQObject *parent ) : CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings", - tqparent ) + parent ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); m_chooser = new KKeyChooser( Keyz::accel(), this ); diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h index b21e44f8..d1955319 100644 --- a/noatun/modules/keyz/keyz.h +++ b/noatun/modules/keyz/keyz.h @@ -39,7 +39,7 @@ class KeyzPrefs : public CModule TQ_OBJECT public: - KeyzPrefs( TQObject *tqparent ); + KeyzPrefs( TQObject *parent ); virtual void save(); private: diff --git a/noatun/modules/kjofol-skin/kjbackground.cpp b/noatun/modules/kjofol-skin/kjbackground.cpp index 543d92cc..5a6e8587 100644 --- a/noatun/modules/kjofol-skin/kjbackground.cpp +++ b/noatun/modules/kjofol-skin/kjbackground.cpp @@ -9,18 +9,18 @@ #include "kjbackground.h" -KJBackground::KJBackground(KJLoader *tqparent) - : KJWidget(tqparent) +KJBackground::KJBackground(KJLoader *parent) + : KJWidget(parent) { TQImage ibackground; - mBackground = tqparent->pixmap(parser()["backgroundimage"][1]); - ibackground = tqparent->image(parser()["backgroundimage"][1]); + mBackground = parent->pixmap(parser()["backgroundimage"][1]); + ibackground = parent->image(parser()["backgroundimage"][1]); - tqparent->setMask( getMask(ibackground) ); - tqparent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) ); + parent->setMask( getMask(ibackground) ); + 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) diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index 6777c518..edd53e2b 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -30,8 +30,8 @@ * KJButton *******************************************/ -KJButton::KJButton(const TQStringList &i, KJLoader *tqparent) - : TQObject(0), KJWidget(tqparent), mTitle(i[0]), mShowPressed(false) +KJButton::KJButton(const TQStringList &i, KJLoader *parent) + : TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false) { // kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl; mPushedPixmap = (i.count() >= 7); @@ -58,7 +58,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent) TQString pressedTmp = backgroundPressed((*it)); if(!pressedTmp.isEmpty()) { - mPressed = tqparent->pixmap(pressedTmp); + mPressed = parent->pixmap(pressedTmp); gotBack = true; } } @@ -67,7 +67,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent) // take background and darken the buttons rectangle // FIXME: what KPixmapEffect causes the desired effect? // 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 ); gotBack = true; } @@ -79,7 +79,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent) { kdDebug(66666) << k_funcinfo << "Couldn't find valid background for button '" << 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 @@ -152,12 +152,12 @@ TQString KJButton::tip() void KJButton::paint(TQPainter *, const TQRect &) { 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 &) { - bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP); + bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP); return true; } @@ -201,11 +201,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in) // now, find what widget I am and do the proper action if (mTitle=="closebutton") - KJWidget::tqparent()->close(); + KJWidget::parent()->close(); else if (mTitle=="minimizebutton") - KJWidget::tqparent()->minimize(); + KJWidget::parent()->minimize(); else if (mTitle=="aboutbutton") - KJWidget::tqparent()->helpMenu()->aboutApplication(); + KJWidget::parent()->helpMenu()->aboutApplication(); else if (mTitle=="stopbutton") napp->player()->stop(); else if (mTitle=="playbutton") @@ -214,7 +214,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in) napp->player()->playpause(); 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()) napp->player()->openFile(file); } @@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in) napp->player()->toggleListView(); else if (mTitle=="repeatbutton") { - KPopupMenu *loopMenu = new KPopupMenu(KJWidget::tqparent(),"loopMenu"); + KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu"); int selectedItem = 0; loopMenu->setCheckable(true); @@ -291,11 +291,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in) else if (mTitle=="rewindbutton") napp->player()->skipTo(napp->player()->getTime()-10000); 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") - KJWidget::tqparent()->switchToDockmode(); + KJWidget::parent()->switchToDockmode(); else if (mTitle=="undockmodebutton") - KJWidget::tqparent()->returnFromDockmode(); + KJWidget::parent()->returnFromDockmode(); else kdDebug(66666) << "unknown buttontype: " << mTitle.latin1() << endl; } diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp index 4b260f6f..b84a0185 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.cpp +++ b/noatun/modules/kjofol-skin/kjequalizer.cpp @@ -87,8 +87,8 @@ void KJEqualizer::slotUpdateBuffer() { // kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl; - TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent tqmask - TQPainter tqmask( ®ionMask ); + TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask + TQPainter mask( ®ionMask ); TQPoint destX = TQPoint(0, 0); @@ -103,12 +103,12 @@ void KJEqualizer::slotUpdateBuffer() // kdDebug(66666) << "[KJEqualizer] band=" << band << ", level=" << level << ", picNum=" << picNum << " @ xpos=" << xPos << "." << endl; bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), TQt::CopyROP); - // make slider opaque in tqmask so you see something on screen - tqmask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 ); + // make slider opaque in mask so you see something on screen + mask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 ); destX += TQPoint(mXSpace,0); } // for() - // whole thingy has been drawn, now set the tqmask + // whole thingy has been drawn, now set the mask mView->setMask( regionMask ); tqrepaint(); } diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h index f2e85678..42c64a45 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.h +++ b/noatun/modules/kjofol-skin/kjequalizer.h @@ -13,7 +13,7 @@ class KJEqualizer : public TQObject, public KJWidget Q_OBJECT TQ_OBJECT public: - KJEqualizer(const TQStringList &, KJLoader *tqparent); + KJEqualizer(const TQStringList &, KJLoader *parent); ~KJEqualizer(void); virtual void mouseMove(const TQPoint &pos, bool); diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp index cf82fa43..7d5a967f 100644 --- a/noatun/modules/kjofol-skin/kjfont.cpp +++ b/noatun/modules/kjofol-skin/kjfont.cpp @@ -23,9 +23,9 @@ * 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") { @@ -47,12 +47,12 @@ KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTran 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(); - mHeight = tqparent->item(prefix+"size")[2].toInt(); + mWidth = parent->item(prefix+"size")[1].toInt(); + mHeight = parent->item(prefix+"size")[2].toInt(); } else // try to load the font even we are missing important settings { // this still can cause crashes! @@ -73,13 +73,13 @@ KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTran mHeight = mText.height(); // Stupid Skin authors tend to forget keys :/ - if ( tqparent->exist(prefix+"spacing") ) - mSpacing = tqparent->item(prefix+"spacing")[1].toInt(); + if ( parent->exist(prefix+"spacing") ) + mSpacing = parent->item(prefix+"spacing")[1].toInt(); else mSpacing = 0; // FIXME: What's default for this in kj�fol??? - if ( tqparent->exist(prefix+"transparent") ) - mTransparent = (bool)tqparent->item(prefix+"transparent")[1].toInt(); + if ( parent->exist(prefix+"transparent") ) + mTransparent = (bool)parent->item(prefix+"transparent")[1].toInt(); else 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( (stringWidth > wide ? stringWidth : wide), - mHeight, true); // fully transparent tqmask - TQPainter mp(®ionMask); // tqmask painter + mHeight, true); // fully transparent mask + TQPainter mp(®ionMask); // mask painter // 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( (string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide ? string.length()*mWidth+string.length()*mSpacing : wide), - mHeight, true); // fully transparent tqmask - TQPainter tqmask( ®ionMask ); + mHeight, true); // fully transparent mask + TQPainter mask( ®ionMask ); // 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 ) { 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 ); } @@ -234,14 +234,14 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p // draw according to "spacing" if ( (charPos < string.length()-1) && mSpacing > 0 ) { // 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 ); } } 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 ); } @@ -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 tqmask for transparency + // bitBlt mask for transparency if ( mTransparent ) { bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), TQt::OrROP); } - else // fill tqmask + else // fill mask { TQPainter tempPainter (devMask); tempPainter.fillRect ( to.x(), 0, xs,ys, TQt::color1 ); diff --git a/noatun/modules/kjofol-skin/kjfont.h b/noatun/modules/kjofol-skin/kjfont.h index 626ed027..69e12052 100644 --- a/noatun/modules/kjofol-skin/kjfont.h +++ b/noatun/modules/kjofol-skin/kjfont.h @@ -11,7 +11,7 @@ class KJLoader; class KJFont { 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 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 diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 6c433e74..ae25f152 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -72,8 +72,8 @@ class KJToolTip : public TQToolTip { public: - KJToolTip(KJLoader *tqparent) - : TQToolTip(tqparent), mParent(tqparent) + KJToolTip(KJLoader *parent) + : TQToolTip(parent), mParent(parent) {} protected: diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 9e3727b6..4231d0ff 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -45,8 +45,8 @@ static TQString expand(TQString s); -KJPrefs::KJPrefs(TQObject* tqparent) - : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", tqparent) +KJPrefs::KJPrefs(TQObject* parent) + : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent) { cfg = KGlobal::config(); diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h index a0849d17..89991dea 100644 --- a/noatun/modules/kjofol-skin/kjprefs.h +++ b/noatun/modules/kjofol-skin/kjprefs.h @@ -27,7 +27,7 @@ class KJPrefs : public CModule Q_OBJECT TQ_OBJECT public: - KJPrefs(TQObject* tqparent); + KJPrefs(TQObject* parent); // Save which Skin is currently selected virtual void save(); diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp index 24fc2da1..e82a1f8e 100644 --- a/noatun/modules/kjofol-skin/kjseeker.cpp +++ b/noatun/modules/kjofol-skin/kjseeker.cpp @@ -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," << " using default background!" << endl; - tqparent()->image(parser()["backgroundimage"][1]); + parent()->image(parser()["backgroundimage"][1]); } else - mActive = tqparent()->image(activeBg); + mActive = parent()->image(activeBg); - mScale = tqparent()->image(parser()["seekimage"][1]); - TQImage pixmapNoPress = tqparent()->image(parser()["backgroundimage"][1]); + mScale = parent()->image(parser()["seekimage"][1]); + TQImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]); - // generate transparent tqmask + // generate transparent mask int x, y, xs, ys; x=i[1].toInt(); y=i[2].toInt(); xs=i[3].toInt()-x; ys=i[4].toInt()-y; setRect(x,y,xs,ys); - TQImage transtqmask(xs, ys, 1, 2, TQImage::LittleEndian); - transtqmask.setColor(1, tqRgb(0,0,0)); - transtqmask.setColor(0, tqRgb(255,255,255)); + TQImage transmask(xs, ys, 1, 2, TQImage::LittleEndian); + transmask.setColor(1, tqRgb(0,0,0)); + transmask.setColor(0, tqRgb(255,255,255)); // clear the pointers memset(barmodeImages, 0, 256*sizeof(TQImage*)); @@ -55,10 +55,10 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) // am I transparent? if (!isGray(checkmScale)) { - setPixel1BPP(transtqmask, ix-x, iy-y, 0); + setPixel1BPP(transmask, ix-x, iy-y, 0); continue; } - setPixel1BPP(transtqmask, ix-x, iy-y, 1); + setPixel1BPP(transmask, ix-x, iy-y, 1); // what is the level int level=grayRgb(checkmScale)+1; @@ -89,9 +89,9 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) // create the blank one 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); - px.convertFromImage(transtqmask); + px.convertFromImage(transmask); barModeMask=px; // kdDebug(66666) << "END KJSeeker constructor" << endl; @@ -180,7 +180,7 @@ void KJSeeker::timeUpdate(int sec) g = sec * 255 / length; //kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl; - TQPainter p(tqparent()); + TQPainter p(parent()); paint(&p, rect()); } diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp index b1e03b7a..589f994f 100644 --- a/noatun/modules/kjofol-skin/kjsliders.cpp +++ b/noatun/modules/kjofol-skin/kjsliders.cpp @@ -44,8 +44,8 @@ KJVolumeBar::KJVolumeBar(const TQStringList &i, KJLoader *p) // kdDebug(66666) << "x: " << x << " y: " << y << " w: " << xs << " h: " << ys << endl; - mBack = tqparent()->pixmap(parser()["backgroundimage"][1]); - mSlider = tqparent()->pixmap(parser()["volumecontrolimage"][1]); + mBack = parent()->pixmap(parser()["backgroundimage"][1]); + mSlider = parent()->pixmap(parser()["volumecontrolimage"][1]); } TQString KJVolumeBar::tip() @@ -133,8 +133,8 @@ KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p) mWidth = parser()["volumecontrolimagexsize"][1].toInt(); mCount = parser()["volumecontrolimagenb"][1].toInt()-1; - mImages = tqparent()->pixmap(parser()["volumecontrolimage"][1]); - mPos = tqparent()->image(parser()["volumecontrolimageposition"][1]); + mImages = parent()->pixmap(parser()["volumecontrolimage"][1]); + mPos = parent()->image(parser()["volumecontrolimageposition"][1]); timeUpdate(0); } @@ -208,12 +208,12 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p) mWidth = parser()["pitchcontrolimagexsize"][1].toInt(); mCount = parser()["pitchcontrolimagenb"][1].toInt()-1; - mImages = tqparent()->pixmap(parser()["pitchcontrolimage"][1]); - mPos = tqparent()->image(parser()["pitchcontrolimageposition"][1]); + mImages = parent()->pixmap(parser()["pitchcontrolimage"][1]); + mPos = parent()->image(parser()["pitchcontrolimageposition"][1]); // makes all pixels with rgb(255,0,255) transparent TQImage ibackground; - ibackground = tqparent()->image(parser()["pitchcontrolimage"][1]); + ibackground = parent()->image(parser()["pitchcontrolimage"][1]); mImages.setMask( getMask(ibackground) ); Arts::PlayObject playobject = napp->player()->engine()->playObject(); diff --git a/noatun/modules/kjofol-skin/kjsliders.h b/noatun/modules/kjofol-skin/kjsliders.h index 131261c7..bd3c3324 100644 --- a/noatun/modules/kjofol-skin/kjsliders.h +++ b/noatun/modules/kjofol-skin/kjsliders.h @@ -12,7 +12,7 @@ class KJVolumeText; class KJVolumeBMP : public KJWidget { public: - KJVolumeBMP(const TQStringList &, KJLoader *tqparent); + KJVolumeBMP(const TQStringList &, KJLoader *parent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); @@ -36,7 +36,7 @@ private: class KJVolumeBar : public KJWidget { public: - KJVolumeBar(const TQStringList &, KJLoader *tqparent); + KJVolumeBar(const TQStringList &, KJLoader *parent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); @@ -59,7 +59,7 @@ private: class KJPitchBMP : public KJWidget { public: - KJPitchBMP(const TQStringList &, KJLoader *tqparent); + KJPitchBMP(const TQStringList &, KJLoader *parent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp index ab583a24..e0d3028e 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp +++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp @@ -90,12 +90,12 @@ void KJFilename::timerEvent(TQTimerEvent *) int height = mView.height(); 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 - 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 - // a tqmask does not get copied on a bitblt automatically, we have to do + // copy mask like the same way we're doing it with the pixmap + // a mask does not get copied on a bitblt automatically, we have to do // it "by hand" bitBlt(&cycleMask, 0,0, &newMask, 0,0, 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, width-mDistance, 0, &cycle, 0,0, mDistance, height, TQt::CopyROP); - // apply the newly created tqmask + // apply the newly created mask mView.setMask(newMask); tqrepaint(); @@ -227,7 +227,7 @@ void KJTime::paint(TQPainter *p, const TQRect &) // draw background into buffer 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); // and draw it on screen @@ -584,7 +584,7 @@ void KJFileInfo::paint(TQPainter *p, const TQRect &) // draw background into buffer 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); // and draw it on screen diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.h b/noatun/modules/kjofol-skin/kjtextdisplay.h index 0a5caa0a..4997df9d 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.h +++ b/noatun/modules/kjofol-skin/kjtextdisplay.h @@ -14,7 +14,7 @@ class KJFilename : public TQObject, public KJWidget Q_OBJECT TQ_OBJECT public: - KJFilename(const TQStringList &, KJLoader *tqparent); + KJFilename(const TQStringList &, KJLoader *parent); ~KJFilename(); virtual void paint(TQPainter *, const TQRect &rect); @@ -43,7 +43,7 @@ private: class KJTime : public KJWidget { public: - KJTime(const TQStringList &, KJLoader *tqparent); + KJTime(const TQStringList &, KJLoader *parent); ~KJTime(); virtual void paint(TQPainter *, const TQRect &rect); @@ -73,7 +73,7 @@ private: class KJVolumeText : public KJWidget { public: - KJVolumeText(const TQStringList &, KJLoader *tqparent); + KJVolumeText(const TQStringList &, KJLoader *parent); ~KJVolumeText(); virtual void paint(TQPainter *, const TQRect &rect); @@ -95,7 +95,7 @@ private: class KJPitchText : public KJWidget { public: - KJPitchText(const TQStringList &, KJLoader *tqparent); + KJPitchText(const TQStringList &, KJLoader *parent); ~KJPitchText(); virtual void paint(TQPainter *, const TQRect &rect); @@ -118,7 +118,7 @@ private: class KJFileInfo : public KJWidget { public: - KJFileInfo(const TQStringList &, KJLoader *tqparent); + KJFileInfo(const TQStringList &, KJLoader *parent); ~KJFileInfo(); virtual void paint(TQPainter *, const TQRect &rect); diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index 8915e434..a1a4c840 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -35,8 +35,8 @@ void KJVisScope::swapScope(Visuals newOne) { //kdDebug(66666) << k_funcinfo << endl; - TQStringList line = tqparent()->item("analyzerwindow"); - KJLoader *p=tqparent(); + TQStringList line = parent()->item("analyzerwindow"); + KJLoader *p=parent(); p->removeChild(this); delete this; @@ -66,8 +66,8 @@ void KJVisScope::swapScope(Visuals newOne) * KJNullScope *******************************************/ -KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent) - : KJVisScope(tqparent) +KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent) + : KJVisScope(parent) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -75,7 +75,7 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent) int ys = l[4].toInt() - y; // 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) ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); 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 return; - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); swapScope(FFT); } @@ -108,7 +108,7 @@ void KJNullScope::readConfig() Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType(); if ( v != Null ) { - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); swapScope ( v ); } } @@ -118,8 +118,8 @@ void KJNullScope::readConfig() * KJFFT - Analyzer like visualization, mono *************************************************/ -KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent) - : KJVisScope(tqparent), MonoFFTScope(50), mGradient(0) +KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) + : KJVisScope(parent), MonoFFTScope(50), mGradient(0) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -129,7 +129,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent) // each bar will be 1px wide mMultiples=1; - if ( tqparent->exist("analyzercolor") ) + if ( parent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; 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 - TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); + TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); 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()->isStopped() ) // clear vis-window if playing has been stopped - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); return; } @@ -171,12 +171,12 @@ void KJFFT::scopeEvent(float *d, int size) int h = rect().height(); TQBitmap mGradientMask ( rect().width(), h, true ); - TQPainter tqmask( &mGradientMask ); + TQPainter mask( &mGradientMask ); float *start = d ; float *end = d + size /*- 1*/; - // loop creating the tqmask for vis-gradient + // loop creating the mask for vis-gradient for ( ; start < end; ++start ) { // 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; // 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; } - // done creating our tqmask + // done creating our mask // draw background of vis into it bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); @@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in) return; stop(); - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); swapScope(Mono); } @@ -236,7 +236,7 @@ void KJFFT::readConfig() if ( v != FFT ) { stop(); - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); swapScope ( v ); return; } @@ -250,8 +250,8 @@ void KJFFT::readConfig() * KJStereoFFT - Analyzer like visualization, stereo *************************************************/ -KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent) - : KJVisScope(tqparent), StereoFFTScope(50), mGradient(0) +KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) + : KJVisScope(parent), StereoFFTScope(50), mGradient(0) { //kdDebug(66666) << k_funcinfo << endl; @@ -263,7 +263,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent) // each bar will be 1px wide mMultiples=1; - if ( tqparent->exist("analyzercolor") ) + if ( parent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; 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 - TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); + TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); 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()->isStopped() ) // clear vis-window if playing has been stopped - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); return; } @@ -305,7 +305,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) int hh = (int)(rect().height()/2); TQBitmap mGradientMask ( rect().width(), h, true ); - TQPainter tqmask( &mGradientMask ); + TQPainter mask( &mGradientMask ); float *start = left; float *end = left + len; @@ -313,7 +313,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) int amp = 0; int x = 0; - // loop creating the tqmask for vis-gradient + // loop creating the mask for vis-gradient for ( ; start < end; ++start ) { 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; // 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; } - // done creating our tqmask + // done creating our mask start = right; end = right + len; x = 0; - // loop creating the tqmask for vis-gradient + // loop creating the mask for vis-gradient for ( ; start < end; ++start ) { 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; // 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; } @@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in) if (!in) // only do something if users is still inside the button return; stop(); - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); swapScope(Null); } @@ -387,7 +387,7 @@ void KJStereoFFT::readConfig() if ( v != StereoFFT ) { stop(); - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); swapScope ( v ); return; } @@ -399,8 +399,8 @@ void KJStereoFFT::readConfig() * KJScope - oscilloscope like visualization *************************************************/ -KJScope::KJScope(const TQStringList &l, KJLoader *tqparent) - : KJVisScope(tqparent), MonoScope(50)/*, blurnum(0), mOsci(0)*/ +KJScope::KJScope(const TQStringList &l, KJLoader *parent) + : KJVisScope(parent), MonoScope(50)/*, blurnum(0), mOsci(0)*/ { int x=l[1].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; - if ( tqparent->exist("analyzercolor") ) + if ( parent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; 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 ); // 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) ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); @@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in) return; stop(); - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); swapScope(/*Null*/ StereoFFT); } @@ -528,7 +528,7 @@ void KJScope::readConfig() if ( v != Mono ) { stop(); - tqparent()->tqrepaint(rect(), false); + parent()->tqrepaint(rect(), false); swapScope ( v ); return; } diff --git a/noatun/modules/kjofol-skin/kjvis.h b/noatun/modules/kjofol-skin/kjvis.h index 9f8bec4d..a05103d8 100644 --- a/noatun/modules/kjofol-skin/kjvis.h +++ b/noatun/modules/kjofol-skin/kjvis.h @@ -8,7 +8,7 @@ class KPixmap; class KJVisScope : public KJWidget { public: - KJVisScope(KJLoader *tqparent) : KJWidget(tqparent) {}; + KJVisScope(KJLoader *parent) : KJWidget(parent) {}; enum Visuals { Null=0, FFT, Mono, StereoFFT }; void swapScope(Visuals newOne); // virtual void readConfig(); @@ -19,7 +19,7 @@ public: class KJNullScope : public KJVisScope { public: - KJNullScope(const TQStringList &, KJLoader *tqparent); + KJNullScope(const TQStringList &, KJLoader *parent); virtual void paint(TQPainter *p, const TQRect &); virtual bool mousePress(const TQPoint&); virtual void mouseRelease(const TQPoint &, bool in); @@ -35,7 +35,7 @@ private: class KJFFT : public KJVisScope, public MonoFFTScope { public: - KJFFT(const TQStringList &, KJLoader *tqparent); + KJFFT(const TQStringList &, KJLoader *parent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *d, int size); @@ -57,7 +57,7 @@ private: class KJStereoFFT : public KJVisScope, public StereoFFTScope { public: - KJStereoFFT(const TQStringList &, KJLoader *tqparent); + KJStereoFFT(const TQStringList &, KJLoader *parent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *left, float *right, int len); @@ -79,7 +79,7 @@ private: class KJScope : public KJVisScope, public MonoScope { public: - KJScope ( const TQStringList &, KJLoader *tqparent); + KJScope ( const TQStringList &, KJLoader *parent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *d, int size); diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp index d292637a..f9cb345a 100644 --- a/noatun/modules/kjofol-skin/kjwidget.cpp +++ b/noatun/modules/kjofol-skin/kjwidget.cpp @@ -36,11 +36,11 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent) void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear) { - TQPainter p(tqparent()); + TQPainter p(parent()); if (me) paint(&p, r.isValid() ? r : rect()); else - tqparent()->tqrepaint(r.isValid() ? r : rect(), clear); + parent()->tqrepaint(r.isValid() ? r : rect(), clear); } const TQString &KJWidget::backgroundPressed(const TQString &bmp) const diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h index 693d4eaa..a678e8a7 100644 --- a/noatun/modules/kjofol-skin/kjwidget.h +++ b/noatun/modules/kjofol-skin/kjwidget.h @@ -35,7 +35,7 @@ public: protected: const TQString &backgroundPressed(const TQString &bmp) const; - KJLoader *tqparent() const {return mParent;} + KJLoader *parent() const {return mParent;} KJLoader &parser() const {return *mParent;} KJFont &textFont() const {return *mParent->mText;} diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index dd4390db..89c123a4 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -158,7 +158,7 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget 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; KFileMetaInfoItem info_item = meta_info.item(key); TQVariant::Type type; @@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe // Get the correct validator 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 = new MetaWidget; @@ -190,7 +190,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe if ((type == TQVariant::Int) || (type == TQVariant::UInt)) { // 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 // 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"); if (combo_box) { - TQComboBox *combo = new TQComboBox(tqparent); + TQComboBox *combo = new TQComboBox(parent); combo->clear(); combo->insertStringList(static_cast< @@ -241,7 +241,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe else { KLineEdit *edit; - edit = new KLineEdit(tqparent); + edit = new KLineEdit(parent); edit->setText(info_item.value().toString()); edit->setValidator(validator); 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); // 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); diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h index f0e94778..a3aa0947 100644 --- a/noatun/modules/metatag/edit.h +++ b/noatun/modules/metatag/edit.h @@ -36,7 +36,7 @@ class Editor:public KDialogBase { TQString keyGroup(const KFileMetaInfo &, TQString); 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; diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 3afd3698..0aeb2fc8 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -205,7 +205,7 @@ void MilkChocolate::popup() 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()); mPlay->setOn(true); mStop->setEnabled(true); diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index 6584f040..d167e02e 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -5,7 +5,7 @@ #include <tqcheckbox.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); mainWidget->setMinimumWidth(320); diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h index 47a53f99..7aa07201 100644 --- a/noatun/modules/splitplaylist/find.h +++ b/noatun/modules/splitplaylist/find.h @@ -12,7 +12,7 @@ class Finder : public KDialogBase Q_OBJECT TQ_OBJECT public: - Finder(TQWidget *tqparent); + Finder(TQWidget *parent); bool regexp() const; bool isForward() const; diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 97ccca20..693b57ce 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -43,13 +43,13 @@ #define SPL SplitPlaylist::SPL() -SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text) - : TQCheckListItem(tqparent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) +SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text) + : TQCheckListItem(parent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) { addRef(); setUrl(text); - static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after); + static_cast<KListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after); setOn(true); // is this really needed, it makes the listview too wide for me :( @@ -65,8 +65,8 @@ SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, PlaylistItemData::added(); } -SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &props) - : TQCheckListItem(tqparent, 0, TQCheckListItem::CheckBox), removed(false) +SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &props) + : TQCheckListItem(parent, 0, TQCheckListItem::CheckBox), removed(false) { 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(); if (!streamable() && enqueue(url())) @@ -344,8 +344,8 @@ void SafeListViewItem::remove() PlaylistItemData::removed(); } -List::List(View *tqparent) - : KListView(tqparent), recursiveAddAfter(0), listJob(0) +List::List(View *parent) + : KListView(parent), recursiveAddAfter(0), listJob(0) { addColumn(i18n("File")); addColumn(i18n("Time")); @@ -357,8 +357,8 @@ List::List(View *tqparent) setSelectionMode(TQListView::Extended); 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(aboutToMove()), tqparent, TQT_SLOT(setNoSorting())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), tqparent, TQT_SLOT(deleteSelected())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected())); } List::~List() @@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const void List::dropEvent(TQDropEvent *event, TQListViewItem *after) { - static_cast<View*>(TQT_TQWIDGET(tqparent()))->setNoSorting(); + static_cast<View*>(TQT_TQWIDGET(parent()))->setNoSorting(); KURL::List textlist; if (!KURLDrag::decode(event, textlist)) return; event->acceptAction(); diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index c8b71e93..7b803f99 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -21,8 +21,8 @@ class SafeListViewItem , public DownloadItem { public: - SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text); - SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &properties); + SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text); + SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &properties); virtual ~SafeListViewItem(); virtual TQString property(const TQString &, const TQString & = 0) const; @@ -61,7 +61,7 @@ Q_OBJECT TQ_OBJECT friend class View; public: - List(View *tqparent); + List(View *parent); virtual ~List(); TQListViewItem *openGlobal(const KURL&, TQListViewItem * =0); TQListViewItem *importGlobal(const KURL&, TQListViewItem * =0); diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 61c0f035..95bbb698 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -44,11 +44,11 @@ #include <fixx11h.h> -KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name) - : KSystemTray(tqparent, name) +KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name) + : KSystemTray(parent, name) { tqsetAlignment(AlignHCenter | AlignVCenter); - menu = (KPopupMenu *)tqparent->guiFactory()->container(contextMenu, tqparent); + menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent); menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0); setAcceptDrops(true); } diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h index d933a19e..153d772a 100644 --- a/noatun/modules/systray/kitsystemtray.h +++ b/noatun/modules/systray/kitsystemtray.h @@ -40,7 +40,7 @@ Q_OBJECT TQ_OBJECT 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 &); protected: virtual void showEvent(TQShowEvent *); diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 57ce2105..c298df37 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -72,7 +72,7 @@ const int COVER_MAXH = 128; class PassivePopup : public KPassivePopup { public: - PassivePopup(TQWidget *tqparent = 0, const char *name = 0) : KPassivePopup(tqparent, name) {} + PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {} protected: virtual void enterEvent(TQEvent *) diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp index a50db7ff..b90d4b03 100644 --- a/noatun/modules/voiceprint/prefs.cpp +++ b/noatun/modules/voiceprint/prefs.cpp @@ -8,8 +8,8 @@ #include <kcolorbutton.h> #include <kconfig.h> -Prefs::Prefs(TQObject* tqparent) - : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", tqparent) +Prefs::Prefs(TQObject* parent) + : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", parent) { TQVBoxLayout *king=new TQVBoxLayout(this); TQHBoxLayout *minor; diff --git a/noatun/modules/voiceprint/prefs.h b/noatun/modules/voiceprint/prefs.h index 1803fe9b..13977a84 100644 --- a/noatun/modules/voiceprint/prefs.h +++ b/noatun/modules/voiceprint/prefs.h @@ -11,7 +11,7 @@ class Prefs : public CModule Q_OBJECT TQ_OBJECT public: - Prefs(TQObject* tqparent); + Prefs(TQObject* parent); virtual void save(); virtual void reopen(); diff --git a/noatun/modules/winskin/vis/realFFT.cpp b/noatun/modules/winskin/vis/realFFT.cpp index 383831b7..330280ea 100644 --- a/noatun/modules/winskin/vis/realFFT.cpp +++ b/noatun/modules/winskin/vis/realFFT.cpp @@ -20,7 +20,7 @@ RealFFT::RealFFT(int fftlen) { int i; int temp; - int tqmask; + int mask; /* * 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++) { temp=0; - for(tqmask=Points/4;tqmask>0;tqmask >>= 1) - temp=(temp >> 1) + (i&tqmask ? Points/2 : 0); + for(mask=Points/4;mask>0;mask >>= 1) + temp=(temp >> 1) + (i&mask ? Points/2 : 0); BitReversed[i]=temp; } diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp index 5f968b00..f76cdabb 100644 --- a/noatun/modules/winskin/waRegion.cpp +++ b/noatun/modules/winskin/waRegion.cpp @@ -31,14 +31,14 @@ WaRegion::WaRegion(TQString filename) { KSimpleConfig regionFile(filename, true); // Clear our variables by default - window_tqmask = 0; - shade_tqmask = 0; + window_mask = 0; + shade_mask = 0; // Make the new bitmaps, default window size - window_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); - shade_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); + window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).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"); TQValueList<int> num_points; @@ -53,22 +53,22 @@ WaRegion::WaRegion(TQString filename) { point_list = parseList(regionFile.readEntry(pointListNames[x])); } - // Now build the tqmask - buildPixmap(num_points, point_list, window_tqmask); + // Now build the mask + buildPixmap(num_points, point_list, window_mask); - // Load the windowshade tqmask data + // Load the windowshade mask data regionFile.setGroup("WindowShade"); num_points = parseList(regionFile.readEntry("NumPoints")); point_list = parseList(regionFile.readEntry("PointList")); - // Now build the tqmask - buildPixmap(num_points, point_list, shade_tqmask); + // Now build the mask + buildPixmap(num_points, point_list, shade_mask); } WaRegion::~WaRegion() { - delete window_tqmask; - delete shade_tqmask; + delete window_mask; + delete shade_mask; } 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); } - // Now draw it as a filled polygon on the tqmask + // Now draw it as a filled polygon on the mask bmp.drawPolygon(point_array); } diff --git a/noatun/modules/winskin/waRegion.h b/noatun/modules/winskin/waRegion.h index 737ebdb9..66c7c811 100644 --- a/noatun/modules/winskin/waRegion.h +++ b/noatun/modules/winskin/waRegion.h @@ -9,15 +9,15 @@ public: WaRegion(TQString filename); ~WaRegion(); - const TQBitmap *mainWindowMask() const { return window_tqmask; } - const TQBitmap *mainWindowShadeMask() const { return shade_tqmask; } + const TQBitmap *mainWindowMask() const { return window_mask; } + const TQBitmap *mainWindowShadeMask() const { return shade_mask; } private: TQValueList<int> parseList(const TQString &list) const; void buildPixmap(const TQValueList<int> &num_points, const TQValueList<int> &point_list, TQBitmap *dest); - TQBitmap *window_tqmask; - TQBitmap *shade_tqmask; + TQBitmap *window_mask; + TQBitmap *shade_mask; }; extern WaRegion *windowRegion; diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 06573c7f..0cfd7f90 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -23,11 +23,11 @@ #include "waSkinManager.h" #include "winSkinConfig.h" -WinSkinConfig::WinSkinConfig(TQWidget * tqparent, WaSkinManager *waSkinManager) : +WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : CModule(i18n("Winskin"), i18n("Skin Selection for the Winskin Plugin"), "style", - TQT_TQOBJECT(tqparent)) + TQT_TQOBJECT(parent)) { // Make a token horizontal tqlayout box vbox = new TQVBoxLayout(this); diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h index 047f0805..a047a1f3 100644 --- a/noatun/modules/winskin/winSkinConfig.h +++ b/noatun/modules/winskin/winSkinConfig.h @@ -12,7 +12,7 @@ class WinSkinConfig:public CModule { Q_OBJECT TQ_OBJECT public: - WinSkinConfig(TQWidget * tqparent, WaSkinManager *waManager); + WinSkinConfig(TQWidget * parent, WaSkinManager *waManager); void save(); diff --git a/noatun/modules/winskin/winSkinVis.cpp b/noatun/modules/winskin/winSkinVis.cpp index f760fac3..8ec025d2 100644 --- a/noatun/modules/winskin/winSkinVis.cpp +++ b/noatun/modules/winskin/winSkinVis.cpp @@ -17,8 +17,8 @@ #define __BANDS 75 #define __SPAHEIGHT 15 -WinSkinVis::WinSkinVis(TQObject *tqparent, const char *name): - TQObject(tqparent,name),Visualization(50) { +WinSkinVis::WinSkinVis(TQObject *parent, const char *name): + TQObject(parent,name),Visualization(50) { m_currentPeaks=new float[__BANDS]; diff --git a/noatun/modules/winskin/winSkinVis.h b/noatun/modules/winskin/winSkinVis.h index 3f941c6f..e4164212 100644 --- a/noatun/modules/winskin/winSkinVis.h +++ b/noatun/modules/winskin/winSkinVis.h @@ -28,7 +28,7 @@ class WinSkinVis : public TQObject, public Visualization { TQ_OBJECT public: - WinSkinVis(TQObject* tqparent,const char* name); + WinSkinVis(TQObject* parent,const char* name); ~WinSkinVis(); /** diff --git a/xine_artsplugin/xinePlayObject_impl.cpp b/xine_artsplugin/xinePlayObject_impl.cpp index 9b5cef18..21e3dff5 100644 --- a/xine_artsplugin/xinePlayObject_impl.cpp +++ b/xine_artsplugin/xinePlayObject_impl.cpp @@ -739,7 +739,7 @@ void xineVideoPlayObject_impl::x11WindowId( long window ) { XLockDisplay( display ); - // Change window and set event tqmask of new window + // Change window and set event mask of new window visual.d = window; XSelectInput( display, window, ExposureMask ); |