diff options
Diffstat (limited to 'src/gui/widgets')
50 files changed, 107 insertions, 107 deletions
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp index f544003..4c8e76c 100644 --- a/src/gui/widgets/AudioFaderBox.cpp +++ b/src/gui/widgets/AudioFaderBox.cpp @@ -57,11 +57,11 @@ namespace Rosegarden { -AudioFaderBox::AudioFaderBox(TQWidget *tqparent, +AudioFaderBox::AudioFaderBox(TQWidget *parent, TQString id, bool haveInOut, const char *name): - TQFrame(tqparent, name), + TQFrame(parent, name), m_signalMapper(new TQSignalMapper(TQT_TQOBJECT(this))), m_id(id), m_isStereo(false) @@ -244,8 +244,8 @@ bool AudioFaderBox::owns(const TQObject *object) { return (object && - ((TQT_BASE_OBJECT(object->tqparent()) == TQT_BASE_OBJECT(this)) || - (object->tqparent() && (TQT_BASE_OBJECT(object->tqparent()->tqparent()) == TQT_BASE_OBJECT(this))))); + ((TQT_BASE_OBJECT(object->parent()) == TQT_BASE_OBJECT(this)) || + (object->parent() && (TQT_BASE_OBJECT(object->parent()->parent()) == TQT_BASE_OBJECT(this))))); } void diff --git a/src/gui/widgets/AudioFaderBox.h b/src/gui/widgets/AudioFaderBox.h index 8c4f291..caa88c8 100644 --- a/src/gui/widgets/AudioFaderBox.h +++ b/src/gui/widgets/AudioFaderBox.h @@ -56,7 +56,7 @@ class AudioFaderBox : public TQFrame TQ_OBJECT public: - AudioFaderBox(TQWidget *tqparent, + AudioFaderBox(TQWidget *parent, TQString id = "", bool haveInOut = true, const char *name = 0); diff --git a/src/gui/widgets/AudioListItem.h b/src/gui/widgets/AudioListItem.h index 7486bfa..b2bdf99 100644 --- a/src/gui/widgets/AudioListItem.h +++ b/src/gui/widgets/AudioListItem.h @@ -40,25 +40,25 @@ class AudioListItem : public KListViewItem public: - AudioListItem(KListView *tqparent):KListViewItem(tqparent), + AudioListItem(KListView *parent):KListViewItem(parent), m_segment(0) {;} - AudioListItem(KListViewItem *tqparent):KListViewItem(tqparent), + AudioListItem(KListViewItem *parent):KListViewItem(parent), m_segment(0) {;} - AudioListItem(KListView *tqparent, + AudioListItem(KListView *parent, TQString label, AudioFileId id): - KListViewItem(tqparent, + KListViewItem(parent, label, "", "", "", "", "", "", ""), m_id(id), m_segment(0) {;} - AudioListItem(KListViewItem *tqparent, + AudioListItem(KListViewItem *parent, TQString label, AudioFileId id): - KListViewItem(tqparent, + KListViewItem(parent, label, "", "", "", "", "", "", ""), m_id(id), diff --git a/src/gui/widgets/AudioListView.cpp b/src/gui/widgets/AudioListView.cpp index a840868..3c75526 100644 --- a/src/gui/widgets/AudioListView.cpp +++ b/src/gui/widgets/AudioListView.cpp @@ -31,8 +31,8 @@ namespace Rosegarden { -AudioListView::AudioListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +AudioListView::AudioListView(TQWidget *parent, const char *name) + : KListView(parent, name) { setDragEnabled(true); setAcceptDrops(true); diff --git a/src/gui/widgets/AudioListView.h b/src/gui/widgets/AudioListView.h index e6bbaca..04c293e 100644 --- a/src/gui/widgets/AudioListView.h +++ b/src/gui/widgets/AudioListView.h @@ -32,7 +32,7 @@ namespace Rosegarden { class AudioListView : public KListView { public: - AudioListView(TQWidget *tqparent = 0, const char *name = 0); + AudioListView(TQWidget *parent = 0, const char *name = 0); protected: bool acceptDrag(TQDropEvent* e) const; diff --git a/src/gui/widgets/AudioRouteMenu.cpp b/src/gui/widgets/AudioRouteMenu.cpp index 9af8ec3..a2f6985 100644 --- a/src/gui/widgets/AudioRouteMenu.cpp +++ b/src/gui/widgets/AudioRouteMenu.cpp @@ -133,7 +133,7 @@ AudioRouteMenu::slotShowMenu() if (getNumEntries() == 0) return ; - RosegardenPopupMenu *menu = new RosegardenPopupMenu((TQWidget *)tqparent()); + RosegardenPopupMenu *menu = new RosegardenPopupMenu((TQWidget *)parent()); for (int i = 0; i < getNumEntries(); ++i) { diff --git a/src/gui/widgets/AudioRouteMenu.h b/src/gui/widgets/AudioRouteMenu.h index 400d64e..ee54862 100644 --- a/src/gui/widgets/AudioRouteMenu.h +++ b/src/gui/widgets/AudioRouteMenu.h @@ -51,7 +51,7 @@ public: enum Direction { In, Out }; enum Format { Compact, Regular }; - AudioRouteMenu(TQWidget *tqparent, + AudioRouteMenu(TQWidget *parent, Direction direction, Format format, Studio *studio = 0, diff --git a/src/gui/widgets/AudioVUMeter.cpp b/src/gui/widgets/AudioVUMeter.cpp index adc8bb2..aacb7c2 100644 --- a/src/gui/widgets/AudioVUMeter.cpp +++ b/src/gui/widgets/AudioVUMeter.cpp @@ -37,14 +37,14 @@ namespace Rosegarden { -AudioVUMeter::AudioVUMeter(TQWidget *tqparent, +AudioVUMeter::AudioVUMeter(TQWidget *parent, VUMeter::VUMeterType type, bool stereo, bool hasRecord, int width, int height, const char *name) : - TQWidget(tqparent, name), + TQWidget(parent, name), m_stereo(stereo) { setBackgroundMode(TQt::NoBackground); @@ -90,14 +90,14 @@ AudioVUMeter::paintEvent(TQPaintEvent *e) m_meter->paintEvent(e); } -AudioVUMeter::AudioVUMeterImpl::AudioVUMeterImpl(TQWidget *tqparent, +AudioVUMeter::AudioVUMeterImpl::AudioVUMeterImpl(TQWidget *parent, VUMeterType type, bool stereo, bool hasRecord, int width, int height, const char *name) : - VUMeter(tqparent, type, stereo, hasRecord, width, height, VUMeter::Vertical, name) + VUMeter(parent, type, stereo, hasRecord, width, height, VUMeter::Vertical, name) {} } diff --git a/src/gui/widgets/AudioVUMeter.h b/src/gui/widgets/AudioVUMeter.h index 73e406b..1868666 100644 --- a/src/gui/widgets/AudioVUMeter.h +++ b/src/gui/widgets/AudioVUMeter.h @@ -41,7 +41,7 @@ namespace Rosegarden class AudioVUMeter : public TQWidget { public: - AudioVUMeter(TQWidget *tqparent = 0, + AudioVUMeter(TQWidget *parent = 0, VUMeter::VUMeterType type = VUMeter::AudioPeakHoldShort, bool stereo = true, bool hasRecord = false, @@ -69,7 +69,7 @@ protected: class AudioVUMeterImpl : public VUMeter { public: - AudioVUMeterImpl(TQWidget *tqparent, + AudioVUMeterImpl(TQWidget *parent, VUMeterType type, bool stereo, bool hasRecord, diff --git a/src/gui/widgets/BigArrowButton.h b/src/gui/widgets/BigArrowButton.h index 3a51143..eb364e1 100644 --- a/src/gui/widgets/BigArrowButton.h +++ b/src/gui/widgets/BigArrowButton.h @@ -32,9 +32,9 @@ namespace Rosegarden { class BigArrowButton : public KArrowButton { public: - BigArrowButton(TQWidget *tqparent = 0, Qt::ArrowType arrow = Qt::UpArrow, + BigArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0) : - KArrowButton(tqparent, arrow, name) { } + KArrowButton(parent, arrow, name) { } virtual ~BigArrowButton() { } virtual TQSize tqsizeHint() const { diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp index 5835045..56c530b 100644 --- a/src/gui/widgets/CollapsingFrame.cpp +++ b/src/gui/widgets/CollapsingFrame.cpp @@ -41,8 +41,8 @@ namespace Rosegarden { -CollapsingFrame::CollapsingFrame(TQString label, TQWidget *tqparent, const char *n) : - TQFrame(tqparent, n), +CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n) : + TQFrame(parent, n), m_widget(0), m_fill(false), m_collapsed(false) diff --git a/src/gui/widgets/CollapsingFrame.h b/src/gui/widgets/CollapsingFrame.h index 90a7887..6ae6feb 100644 --- a/src/gui/widgets/CollapsingFrame.h +++ b/src/gui/widgets/CollapsingFrame.h @@ -46,7 +46,7 @@ class CollapsingFrame : public TQFrame TQ_OBJECT public: - CollapsingFrame(TQString label, TQWidget *tqparent = 0, const char *name = 0); + CollapsingFrame(TQString label, TQWidget *parent = 0, const char *name = 0); virtual ~CollapsingFrame(); TQFont font() const; diff --git a/src/gui/widgets/ColourTable.cpp b/src/gui/widgets/ColourTable.cpp index cde4dbc..2cceca4 100644 --- a/src/gui/widgets/ColourTable.cpp +++ b/src/gui/widgets/ColourTable.cpp @@ -43,8 +43,8 @@ namespace Rosegarden { ColourTable::ColourTable -(TQWidget *tqparent, ColourMap &input, ColourList &list) - : TQTable(1, 2, tqparent, "RColourTable") +(TQWidget *parent, ColourMap &input, ColourList &list) + : TQTable(1, 2, parent, "RColourTable") { setSorting(FALSE); setSelectionMode(TQTable::SingleRow); diff --git a/src/gui/widgets/ColourTable.h b/src/gui/widgets/ColourTable.h index 3932df6..e1ddd5f 100644 --- a/src/gui/widgets/ColourTable.h +++ b/src/gui/widgets/ColourTable.h @@ -51,7 +51,7 @@ class ColourTable : public TQTable public: typedef std::map<unsigned int, unsigned int, std::less<unsigned int> > ColourList; - ColourTable(TQWidget *tqparent, ColourMap &input, ColourList &list); + ColourTable(TQWidget *parent, ColourMap &input, ColourList &list); void populate_table(ColourMap &input, ColourList &list); diff --git a/src/gui/widgets/CurrentProgressDialog.h b/src/gui/widgets/CurrentProgressDialog.h index 90823ea..4a1de52 100644 --- a/src/gui/widgets/CurrentProgressDialog.h +++ b/src/gui/widgets/CurrentProgressDialog.h @@ -65,8 +65,8 @@ public slots: void slotCurrentProgressDialogDestroyed(); protected: - CurrentProgressDialog(TQObject* tqparent, const char* name = 0) - : TQObject(tqparent, name) {} + CurrentProgressDialog(TQObject* parent, const char* name = 0) + : TQObject(parent, name) {} //--------------- Data members --------------------------------- static CurrentProgressDialog* m_instance; diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp index 13fe3b5..c1a800a 100644 --- a/src/gui/widgets/DiatonicPitchChooser.cpp +++ b/src/gui/widgets/DiatonicPitchChooser.cpp @@ -43,11 +43,11 @@ namespace Rosegarden { DiatonicPitchChooser::DiatonicPitchChooser(TQString title, - TQWidget *tqparent, + TQWidget *parent, int defaultNote, int defaultPitch, int defaultOctave) : - TQGroupBox(1, Qt::Horizontal, title, tqparent), + TQGroupBox(1, Qt::Horizontal, title, parent), m_defaultPitch(defaultPitch) { m_pitchDragLabel = new PitchDragLabel(this, defaultPitch); diff --git a/src/gui/widgets/DiatonicPitchChooser.h b/src/gui/widgets/DiatonicPitchChooser.h index 7992a76..26f983a 100644 --- a/src/gui/widgets/DiatonicPitchChooser.h +++ b/src/gui/widgets/DiatonicPitchChooser.h @@ -48,7 +48,7 @@ class DiatonicPitchChooser : public TQGroupBox TQ_OBJECT public: DiatonicPitchChooser(TQString title, - TQWidget *tqparent, + TQWidget *parent, int defaultNote = 0, int defaultPitch = 60, int defaultOctave = 5); diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp index 54c746f..022f0ca 100644 --- a/src/gui/widgets/Fader.cpp +++ b/src/gui/widgets/Fader.cpp @@ -45,8 +45,8 @@ Fader::PixmapCache Fader::m_pixmapCache; Fader::Fader(AudioLevel::FaderType type, - int w, int h, TQWidget *tqparent) : - TQWidget(tqparent), + int w, int h, TQWidget *parent) : + TQWidget(parent), m_integral(false), m_vertical(h > w), m_min(0), @@ -83,8 +83,8 @@ Fader::Fader(AudioLevel::FaderType type, } Fader::Fader(int min, int max, int deflt, - int w, int h, TQWidget *tqparent) : - TQWidget(tqparent), + int w, int h, TQWidget *parent) : + TQWidget(parent), m_integral(true), m_vertical(h > w), m_min(min), @@ -120,8 +120,8 @@ Fader::Fader(int min, int max, int deflt, } Fader::Fader(int min, int max, int deflt, - bool vertical, TQWidget *tqparent) : - TQWidget(tqparent), + bool vertical, TQWidget *parent) : + TQWidget(parent), m_integral(true), m_vertical(vertical), m_min(min), diff --git a/src/gui/widgets/Fader.h b/src/gui/widgets/Fader.h index dad638b..7abb3fc 100644 --- a/src/gui/widgets/Fader.h +++ b/src/gui/widgets/Fader.h @@ -57,21 +57,21 @@ public: * based on the given dimensions. */ Fader(AudioLevel::FaderType, - int width, int height, TQWidget *tqparent); + int width, int height, TQWidget *parent); /** * Construct a fader on an integral scale. The fader calculates * its orientation based on the given dimensions. */ Fader(int min, int max, int deflt, - int width, int height, TQWidget *tqparent); + int width, int height, TQWidget *parent); /** * Construct a fader on an integral scale, with a 1:1 ratio of * pixel positions and values. */ Fader(int min, int max, int deflt, - bool vertical, TQWidget *tqparent); + bool vertical, TQWidget *parent); virtual ~Fader(); diff --git a/src/gui/widgets/HSpinBox.cpp b/src/gui/widgets/HSpinBox.cpp index 637c010..e49cf1b 100644 --- a/src/gui/widgets/HSpinBox.cpp +++ b/src/gui/widgets/HSpinBox.cpp @@ -46,9 +46,9 @@ int HSpinBox::mapTextToValue( bool* ok ) return int(f * m_scaleFactor); } -HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* tqparent, +HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* parent, double bottom, double top, int decimals, float initialValue) - : TQSpinBox(minV,maxV,step,tqparent) + : TQSpinBox(minV,maxV,step,parent) { setValidator(new TQDoubleValidator(bottom,top,decimals,TQT_TQOBJECT(this))); initialize(decimals); @@ -56,11 +56,11 @@ HSpinBox::HSpinBox( int minV, int maxV, int step, TQWidget* tqparent, } //constructor with default settings -HSpinBox::HSpinBox( TQWidget* tqparent, float initialValue, int step, +HSpinBox::HSpinBox( TQWidget* parent, float initialValue, int step, double bottom, double top, int decimals, const TQObject* recv, const char* mem) : TQSpinBox((int)(bottom*pow(10.0, decimals)), - (int)(top*pow(10.0, decimals)), step, tqparent) + (int)(top*pow(10.0, decimals)), step, parent) { setValidator(new TQDoubleValidator(bottom,top,decimals,TQT_TQOBJECT(this))); initialize(decimals); diff --git a/src/gui/widgets/HSpinBox.h b/src/gui/widgets/HSpinBox.h index 584d086..52c336d 100644 --- a/src/gui/widgets/HSpinBox.h +++ b/src/gui/widgets/HSpinBox.h @@ -42,11 +42,11 @@ class HSpinBox : public TQSpinBox int mapTextToValue( bool* ok ); public: - HSpinBox( int minV, int maxV, int step, TQWidget* tqparent, + HSpinBox( int minV, int maxV, int step, TQWidget* parent, double bottom, double top, int decimals, float initialValue); //constructor with default settings - HSpinBox( TQWidget* tqparent, float initialValue = 0.2, int step=1, + HSpinBox( TQWidget* parent, float initialValue = 0.2, int step=1, double bottom=-25.0, double top=25.0, int decimals=3, const TQObject* recv=NULL, const char* mem=NULL); diff --git a/src/gui/widgets/Label.h b/src/gui/widgets/Label.h index 60c98fa..e50f7f2 100644 --- a/src/gui/widgets/Label.h +++ b/src/gui/widgets/Label.h @@ -42,8 +42,8 @@ class Label : public TQLabel Q_OBJECT TQ_OBJECT public: - Label(TQWidget *tqparent = 0, const char *name=0): - TQLabel(tqparent, name) {;} + Label(TQWidget *parent = 0, const char *name=0): + TQLabel(parent, name) {;} protected: virtual void mouseDoubleClickEvent(TQMouseEvent * /*e*/) diff --git a/src/gui/widgets/MidiFaderWidget.h b/src/gui/widgets/MidiFaderWidget.h index 0e24bfa..57ec254 100644 --- a/src/gui/widgets/MidiFaderWidget.h +++ b/src/gui/widgets/MidiFaderWidget.h @@ -49,7 +49,7 @@ class MidiFaderWidget : public TQFrame TQ_OBJECT public: - MidiFaderWidget(TQWidget *tqparent, + MidiFaderWidget(TQWidget *parent, TQString id = ""); AudioVUMeter *m_vuMeter; diff --git a/src/gui/widgets/PitchChooser.cpp b/src/gui/widgets/PitchChooser.cpp index b46efda..869d11c 100644 --- a/src/gui/widgets/PitchChooser.cpp +++ b/src/gui/widgets/PitchChooser.cpp @@ -40,9 +40,9 @@ namespace Rosegarden { PitchChooser::PitchChooser(TQString title, - TQWidget *tqparent, + TQWidget *parent, int defaultPitch) : - TQGroupBox(1, Qt::Horizontal, title, tqparent), + TQGroupBox(1, Qt::Horizontal, title, parent), m_defaultPitch(defaultPitch) { m_pitchDragLabel = new PitchDragLabel(this, defaultPitch); diff --git a/src/gui/widgets/PitchChooser.h b/src/gui/widgets/PitchChooser.h index ef6dcf5..bc8e742 100644 --- a/src/gui/widgets/PitchChooser.h +++ b/src/gui/widgets/PitchChooser.h @@ -47,7 +47,7 @@ class PitchChooser : public TQGroupBox TQ_OBJECT public: PitchChooser(TQString title, - TQWidget *tqparent, + TQWidget *parent, int defaultPitch = 60); int getPitch() const; diff --git a/src/gui/widgets/PitchDragLabel.cpp b/src/gui/widgets/PitchDragLabel.cpp index 55a06d5..b43c15f 100644 --- a/src/gui/widgets/PitchDragLabel.cpp +++ b/src/gui/widgets/PitchDragLabel.cpp @@ -38,10 +38,10 @@ namespace Rosegarden { -PitchDragLabel::PitchDragLabel(TQWidget *tqparent, +PitchDragLabel::PitchDragLabel(TQWidget *parent, int defaultPitch, bool defaultSharps) : - TQWidget(tqparent), + TQWidget(parent), m_pitch(defaultPitch), m_usingSharps(defaultSharps), m_clickedY(0), diff --git a/src/gui/widgets/PitchDragLabel.h b/src/gui/widgets/PitchDragLabel.h index 1be7232..6f11b17 100644 --- a/src/gui/widgets/PitchDragLabel.h +++ b/src/gui/widgets/PitchDragLabel.h @@ -47,7 +47,7 @@ class PitchDragLabel : public TQWidget Q_OBJECT TQ_OBJECT public: - PitchDragLabel(TQWidget *tqparent, + PitchDragLabel(TQWidget *parent, int defaultPitch = 60, bool defaultSharps = true); ~PitchDragLabel(); diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp index 1f546da..0c998f3 100644 --- a/src/gui/widgets/PluginControl.cpp +++ b/src/gui/widgets/PluginControl.cpp @@ -43,7 +43,7 @@ namespace Rosegarden { -PluginControl::PluginControl(TQWidget *tqparent, +PluginControl::PluginControl(TQWidget *parent, TQGridLayout *tqlayout, ControlType type, PluginPort *port, @@ -52,7 +52,7 @@ PluginControl::PluginControl(TQWidget *tqparent, float initialValue, bool showBounds, bool hidden): - TQObject(tqparent), + TQObject(parent), m_tqlayout(tqlayout), m_type(type), m_port(port), @@ -63,7 +63,7 @@ PluginControl::PluginControl(TQWidget *tqparent, plainFont.setPointSize((plainFont.pointSize() * 9 ) / 10); TQLabel *controlTitle = - new TQLabel(TQString("%1 ").tqarg(strtoqstr(port->getName())), tqparent); + new TQLabel(TQString("%1 ").tqarg(strtoqstr(port->getName())), parent); controlTitle->setFont(plainFont); if (type == Rotary) { @@ -121,9 +121,9 @@ PluginControl::PluginControl(TQWidget *tqparent, TQLabel *low; if (port->getDisplayHint() & (PluginPort::Integer | PluginPort::Toggled)) { - low = new TQLabel(TQString("%1").tqarg(int(displayLower)), tqparent); + low = new TQLabel(TQString("%1").tqarg(int(displayLower)), parent); } else { - low = new TQLabel(TQString("%1").tqarg(displayLower), tqparent); + low = new TQLabel(TQString("%1").tqarg(displayLower), parent); } low->setFont(plainFont); @@ -134,7 +134,7 @@ PluginControl::PluginControl(TQWidget *tqparent, // << ", actual upper " << upperBound << ", step " // << step << std::endl; - m_dial = new ::Rosegarden::Rotary(tqparent, + m_dial = new ::Rosegarden::Rotary(parent, lowerBound, // min upperBound, // max step, // step @@ -154,9 +154,9 @@ PluginControl::PluginControl(TQWidget *tqparent, TQLabel *upp; if (port->getDisplayHint() & (PluginPort::Integer | PluginPort::Toggled)) { - upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), tqparent); + upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), parent); } else { - upp = new TQLabel(TQString("%1").tqarg(displayUpper), tqparent); + upp = new TQLabel(TQString("%1").tqarg(displayUpper), parent); } upp->setFont(plainFont); diff --git a/src/gui/widgets/PluginControl.h b/src/gui/widgets/PluginControl.h index 468bb09..de90836 100644 --- a/src/gui/widgets/PluginControl.h +++ b/src/gui/widgets/PluginControl.h @@ -56,7 +56,7 @@ public: NumericSlider } ControlType; - PluginControl(TQWidget *tqparent, + PluginControl(TQWidget *parent, TQGridLayout *tqlayout, ControlType type, PluginPort *port, diff --git a/src/gui/widgets/QDeferScrollView.cpp b/src/gui/widgets/QDeferScrollView.cpp index 35f098e..6363239 100644 --- a/src/gui/widgets/QDeferScrollView.cpp +++ b/src/gui/widgets/QDeferScrollView.cpp @@ -32,8 +32,8 @@ namespace Rosegarden { -QDeferScrollView::QDeferScrollView(TQWidget* tqparent, const char *name, WFlags f) - : TQScrollView(tqparent, name, f) +QDeferScrollView::QDeferScrollView(TQWidget* parent, const char *name, WFlags f) + : TQScrollView(parent, name, f) { setFocusPolicy(TQ_WheelFocus); } diff --git a/src/gui/widgets/QDeferScrollView.h b/src/gui/widgets/QDeferScrollView.h index d9a1d36..f8504ff 100644 --- a/src/gui/widgets/QDeferScrollView.h +++ b/src/gui/widgets/QDeferScrollView.h @@ -58,7 +58,7 @@ class QDeferScrollView : public TQScrollView Q_OBJECT TQ_OBJECT public: - QDeferScrollView(TQWidget* tqparent=0, const char *name=0, WFlags f=0); + QDeferScrollView(TQWidget* parent=0, const char *name=0, WFlags f=0); void setBottomMargin(int); diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp index a00969a..132aaef 100644 --- a/src/gui/widgets/QuantizeParameters.cpp +++ b/src/gui/widgets/QuantizeParameters.cpp @@ -52,13 +52,13 @@ namespace Rosegarden { -QuantizeParameters::QuantizeParameters(TQWidget *tqparent, +QuantizeParameters::QuantizeParameters(TQWidget *parent, QuantizerType defaultQuantizer, bool showNotationOption, bool showAdvancedButton, TQString configCategory, TQString preamble) : - TQFrame(tqparent), + TQFrame(parent), m_configCategory(configCategory), m_standardQuantizations (BasicQuantizer::getStandardQuantizations()) diff --git a/src/gui/widgets/QuantizeParameters.h b/src/gui/widgets/QuantizeParameters.h index 97a6350..c9c45b6 100644 --- a/src/gui/widgets/QuantizeParameters.h +++ b/src/gui/widgets/QuantizeParameters.h @@ -54,7 +54,7 @@ class QuantizeParameters : public TQFrame public: enum QuantizerType { Grid, Legato, Notation }; - QuantizeParameters(TQWidget *tqparent, + QuantizeParameters(TQWidget *parent, QuantizerType defaultQuantizer, bool showNotationOption, bool showAdvancedButton, diff --git a/src/gui/widgets/RosegardenPopupMenu.h b/src/gui/widgets/RosegardenPopupMenu.h index f16b2f7..5385e52 100644 --- a/src/gui/widgets/RosegardenPopupMenu.h +++ b/src/gui/widgets/RosegardenPopupMenu.h @@ -33,7 +33,7 @@ class RosegardenPopupMenu : public TQPopupMenu { // just to make itemHeight public public: - RosegardenPopupMenu(TQWidget *tqparent) : TQPopupMenu(tqparent) { } + RosegardenPopupMenu(TQWidget *parent) : TQPopupMenu(parent) { } using TQPopupMenu::itemHeight; }; diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp index a011275..c700e54 100644 --- a/src/gui/widgets/Rotary.cpp +++ b/src/gui/widgets/Rotary.cpp @@ -60,7 +60,7 @@ static TQTimer *_floatTimer = 0; Rotary::PixmapCache Rotary::m_pixmaps; -Rotary::Rotary(TQWidget *tqparent, +Rotary::Rotary(TQWidget *parent, float minValue, float maxValue, float step, @@ -71,7 +71,7 @@ Rotary::Rotary(TQWidget *tqparent, bool snapToTicks, bool centred, bool logarithmic) : - TQWidget(tqparent), + TQWidget(parent), m_minValue(minValue), m_maxValue(maxValue), m_step(step), diff --git a/src/gui/widgets/Rotary.h b/src/gui/widgets/Rotary.h index f399eab..9cc8901 100644 --- a/src/gui/widgets/Rotary.h +++ b/src/gui/widgets/Rotary.h @@ -56,7 +56,7 @@ public: StepTicks // end points plus every step interval }; - Rotary(TQWidget *tqparent, + Rotary(TQWidget *parent, float minValue = 0.0, float maxValue = 100.0, float step = 1.0, diff --git a/src/gui/widgets/ScrollBox.cpp b/src/gui/widgets/ScrollBox.cpp index 66e32e2..66ecc21 100644 --- a/src/gui/widgets/ScrollBox.cpp +++ b/src/gui/widgets/ScrollBox.cpp @@ -43,8 +43,8 @@ namespace Rosegarden { -ScrollBox::ScrollBox(TQWidget* tqparent, SizeMode sizeMode, const char* name) : - TQFrame(tqparent, name), +ScrollBox::ScrollBox(TQWidget* parent, SizeMode sizeMode, const char* name) : + TQFrame(parent, name), m_sizeMode(sizeMode) { setFrameStyle(Panel | Sunken); diff --git a/src/gui/widgets/ScrollBox.h b/src/gui/widgets/ScrollBox.h index aeca48d..e9dab4d 100644 --- a/src/gui/widgets/ScrollBox.h +++ b/src/gui/widgets/ScrollBox.h @@ -52,7 +52,7 @@ class ScrollBox: public TQFrame public: enum SizeMode { FixWidth, FixHeight }; - ScrollBox(TQWidget *tqparent = 0, + ScrollBox(TQWidget *parent = 0, SizeMode mode = FixWidth, const char *name = 0); diff --git a/src/gui/widgets/ScrollBoxDialog.cpp b/src/gui/widgets/ScrollBoxDialog.cpp index f262605..008c868 100644 --- a/src/gui/widgets/ScrollBoxDialog.cpp +++ b/src/gui/widgets/ScrollBoxDialog.cpp @@ -38,11 +38,11 @@ namespace Rosegarden { -ScrollBoxDialog::ScrollBoxDialog(TQWidget *tqparent, +ScrollBoxDialog::ScrollBoxDialog(TQWidget *parent, ScrollBox::SizeMode sizeMode, const char *name, WFlags flags) : - KDialog(tqparent, name, flags), + KDialog(parent, name, flags), m_scrollbox(new ScrollBox(this, sizeMode)) { } diff --git a/src/gui/widgets/ScrollBoxDialog.h b/src/gui/widgets/ScrollBoxDialog.h index 722f518..a3671bb 100644 --- a/src/gui/widgets/ScrollBoxDialog.h +++ b/src/gui/widgets/ScrollBoxDialog.h @@ -46,7 +46,7 @@ class ScrollBoxDialog : public KDialog TQ_OBJECT public: - ScrollBoxDialog(TQWidget *tqparent = 0, + ScrollBoxDialog(TQWidget *parent = 0, ScrollBox::SizeMode mode = ScrollBox::FixWidth, const char *name = 0, WFlags flags = 0); diff --git a/src/gui/widgets/SpinBox.cpp b/src/gui/widgets/SpinBox.cpp index ec77fda..1222f13 100644 --- a/src/gui/widgets/SpinBox.cpp +++ b/src/gui/widgets/SpinBox.cpp @@ -34,8 +34,8 @@ namespace Rosegarden { -SpinBox::SpinBox(TQWidget *tqparent, const char *name): - TQSpinBox(tqparent, name), m_doubleValue(0) +SpinBox::SpinBox(TQWidget *parent, const char *name): + TQSpinBox(parent, name), m_doubleValue(0) {} TQString diff --git a/src/gui/widgets/SpinBox.h b/src/gui/widgets/SpinBox.h index 25d99bb..0a9740b 100644 --- a/src/gui/widgets/SpinBox.h +++ b/src/gui/widgets/SpinBox.h @@ -48,7 +48,7 @@ class SpinBox : public TQSpinBox Q_OBJECT TQ_OBJECT public: - SpinBox(TQWidget *tqparent = 0, const char *name=0); + SpinBox(TQWidget *parent = 0, const char *name=0); double getDoubleValue() const { return m_doubleValue; } diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp index 5bc9446..d3cc9d5 100644 --- a/src/gui/widgets/TextFloat.cpp +++ b/src/gui/widgets/TextFloat.cpp @@ -39,8 +39,8 @@ namespace Rosegarden { -TextFloat::TextFloat(TQWidget *tqparent): - TQWidget(tqparent, "TextFloat", +TextFloat::TextFloat(TQWidget *parent): + TQWidget(parent, "TextFloat", WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop), m_text("") { @@ -61,9 +61,9 @@ TextFloat::reparent(TQWidget *newParent) position += newParent->pos(); } - // Position this widget to the right of the tqparent + // Position this widget to the right of the parent // - //move(pos + TQPoint(tqparent->width() + 5, 5)); + //move(pos + TQPoint(parent->width() + 5, 5)); TQWidget::reparent(newParent, WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop, diff --git a/src/gui/widgets/TextFloat.h b/src/gui/widgets/TextFloat.h index d68cd4d..5fa5448 100644 --- a/src/gui/widgets/TextFloat.h +++ b/src/gui/widgets/TextFloat.h @@ -41,12 +41,12 @@ namespace Rosegarden class TextFloat : public TQWidget { public: - TextFloat(TQWidget *tqparent); + TextFloat(TQWidget *parent); virtual ~TextFloat() {;} void setText(const TQString &text); - // Retqparent the float correctly by context + // Reparent the float correctly by context // void reparent(TQWidget *newParent); diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp index df177a4..82877f8 100644 --- a/src/gui/widgets/TimeWidget.cpp +++ b/src/gui/widgets/TimeWidget.cpp @@ -48,12 +48,12 @@ namespace Rosegarden { TimeWidget::TimeWidget(TQString title, - TQWidget *tqparent, + TQWidget *parent, Composition *composition, timeT absTime, bool editable, bool constrainToCompositionDuration) : - TQGroupBox(1, Qt::Horizontal, title, tqparent), + TQGroupBox(1, Qt::Horizontal, title, parent), m_composition(composition), m_isDuration(false), m_constrain(constrainToCompositionDuration), @@ -65,13 +65,13 @@ TimeWidget::TimeWidget(TQString title, } TimeWidget::TimeWidget(TQString title, - TQWidget *tqparent, + TQWidget *parent, Composition *composition, timeT startTime, timeT duration, bool editable, bool constrainToCompositionDuration) : - TQGroupBox(1, Qt::Horizontal, title, tqparent), + TQGroupBox(1, Qt::Horizontal, title, parent), m_composition(composition), m_isDuration(true), m_constrain(constrainToCompositionDuration), diff --git a/src/gui/widgets/TimeWidget.h b/src/gui/widgets/TimeWidget.h index 4ede052..6daa6a0 100644 --- a/src/gui/widgets/TimeWidget.h +++ b/src/gui/widgets/TimeWidget.h @@ -55,7 +55,7 @@ public: * Constructor for absolute time widget */ TimeWidget(TQString title, - TQWidget *tqparent, + TQWidget *parent, Composition *composition, // for bar/beat/msec timeT initialTime, bool editable = true, @@ -67,7 +67,7 @@ public: * correct real-time (based on tempo at startTime) etc. */ TimeWidget(TQString title, - TQWidget *tqparent, + TQWidget *parent, Composition *composition, // for bar/beat/msec timeT startTime, timeT initialDuration, diff --git a/src/gui/widgets/TristateCheckBox.h b/src/gui/widgets/TristateCheckBox.h index 4d8f318..ab38db7 100644 --- a/src/gui/widgets/TristateCheckBox.h +++ b/src/gui/widgets/TristateCheckBox.h @@ -47,8 +47,8 @@ class TristateCheckBox : public TQCheckBox Q_OBJECT TQ_OBJECT public: - TristateCheckBox(TQWidget *tqparent=0, - const char *name=0):TQCheckBox(tqparent, name) + TristateCheckBox(TQWidget *parent=0, + const char *name=0):TQCheckBox(parent, name) { setTristate(true) ;} virtual ~TristateCheckBox(); diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp index d963cc6..2aa89e9 100644 --- a/src/gui/widgets/VUMeter.cpp +++ b/src/gui/widgets/VUMeter.cpp @@ -40,7 +40,7 @@ namespace Rosegarden { -VUMeter::VUMeter(TQWidget *tqparent, +VUMeter::VUMeter(TQWidget *parent, VUMeterType type, bool stereo, bool hasRecord, @@ -48,7 +48,7 @@ VUMeter::VUMeter(TQWidget *tqparent, int height, VUAlignment tqalignment, const char *name): - TQLabel(tqparent, name), + TQLabel(parent, name), m_originalHeight(height), m_active(true), m_type(type), diff --git a/src/gui/widgets/VUMeter.h b/src/gui/widgets/VUMeter.h index 610d87c..53c90b3 100644 --- a/src/gui/widgets/VUMeter.h +++ b/src/gui/widgets/VUMeter.h @@ -83,7 +83,7 @@ protected: // Constructor is protected - we can only create an object // from a sub-class of this type from a sub-class. // - VUMeter(TQWidget *tqparent = 0, + VUMeter(TQWidget *parent = 0, VUMeterType type = Plain, bool stereo = false, bool hasRecord = false, diff --git a/src/gui/widgets/ZoomSlider.h b/src/gui/widgets/ZoomSlider.h index 9cf58ab..5d37ab8 100644 --- a/src/gui/widgets/ZoomSlider.h +++ b/src/gui/widgets/ZoomSlider.h @@ -60,7 +60,7 @@ public: * to the user as a nice continuous range. */ ZoomSlider(const std::vector<T> &sizes, T defaultValue, - Qt::Orientation, TQWidget * tqparent, const char * name=0); + Qt::Orientation, TQWidget * parent, const char * name=0); virtual ~ZoomSlider(); @@ -85,9 +85,9 @@ protected: template<class T> ZoomSlider<T>::ZoomSlider(const std::vector<T> &sizes, T initialSize, Qt::Orientation o, - TQWidget *tqparent, const char *name) : + TQWidget *parent, const char *name) : TQSlider(0, sizes.size()-1, 1, - getIndex(sizes, initialSize), o, tqparent, name), + getIndex(sizes, initialSize), o, parent, name), m_sizes(sizes), m_defaultValue(initialSize) { |