diff options
Diffstat (limited to 'src/gui/editors')
107 files changed, 210 insertions, 210 deletions
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp index 8e251ac..91b2b4d 100644 --- a/src/gui/editors/eventlist/EventView.cpp +++ b/src/gui/editors/eventlist/EventView.cpp @@ -97,8 +97,8 @@ EventView::m_lastSetEventFilter = -1; EventView::EventView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *tqparent): - EditViewBase(doc, segments, 2, tqparent, "eventview"), + TQWidget *parent): + EditViewBase(doc, segments, 2, parent, "eventview"), m_eventFilter(Note | Text | SystemExclusive | Controller | ProgramChange | PitchBend | Indication | Other), m_menu(0) diff --git a/src/gui/editors/eventlist/EventView.h b/src/gui/editors/eventlist/EventView.h index b4f03c9..0adbab0 100644 --- a/src/gui/editors/eventlist/EventView.h +++ b/src/gui/editors/eventlist/EventView.h @@ -81,7 +81,7 @@ class EventView : public EditViewBase, public SegmentObserver public: EventView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *tqparent); + TQWidget *parent); virtual ~EventView(); diff --git a/src/gui/editors/eventlist/EventViewItem.h b/src/gui/editors/eventlist/EventViewItem.h index f5b47bb..b46f8b2 100644 --- a/src/gui/editors/eventlist/EventViewItem.h +++ b/src/gui/editors/eventlist/EventViewItem.h @@ -41,21 +41,21 @@ class EventViewItem : public KListViewItem public: EventViewItem(Rosegarden::Segment *segment, Rosegarden::Event *event, - KListView *tqparent) : - KListViewItem(tqparent), + KListView *parent) : + KListViewItem(parent), m_segment(segment), m_event(event) {;} EventViewItem(Rosegarden::Segment *segment, Rosegarden::Event *event, - KListViewItem *tqparent) : - KListViewItem(tqparent), + KListViewItem *parent) : + KListViewItem(parent), m_segment(segment), m_event(event) {;} EventViewItem(Rosegarden::Segment *segment, Rosegarden::Event *event, - TQListView *tqparent, TQString label1, + TQListView *parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), @@ -63,14 +63,14 @@ public: TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()) : - KListViewItem(tqparent, label1, label2, label3, label4, + KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), m_segment(segment), m_event(event) {;} EventViewItem(Rosegarden::Segment *segment, Rosegarden::Event *event, - KListViewItem *tqparent, TQString label1, + KListViewItem *parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), @@ -78,7 +78,7 @@ public: TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()) : - KListViewItem(tqparent, label1, label2, label3, label4, + KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), m_segment(segment), m_event(event) {;} diff --git a/src/gui/editors/eventlist/TrivialVelocityDialog.cpp b/src/gui/editors/eventlist/TrivialVelocityDialog.cpp index 08a4d22..6b9f748 100644 --- a/src/gui/editors/eventlist/TrivialVelocityDialog.cpp +++ b/src/gui/editors/eventlist/TrivialVelocityDialog.cpp @@ -30,8 +30,8 @@ namespace Rosegarden { -TrivialVelocityDialog::TrivialVelocityDialog(TQWidget *tqparent, TQString label, int deft) : - KDialogBase(tqparent, 0, true, label, Ok | Cancel) +TrivialVelocityDialog::TrivialVelocityDialog(TQWidget *parent, TQString label, int deft) : + KDialogBase(parent, 0, true, label, Ok | Cancel) { TQHBox *hbox = makeHBoxMainWidget(); new TQLabel(label, hbox); diff --git a/src/gui/editors/eventlist/TrivialVelocityDialog.h b/src/gui/editors/eventlist/TrivialVelocityDialog.h index cadb1e1..c164110 100644 --- a/src/gui/editors/eventlist/TrivialVelocityDialog.h +++ b/src/gui/editors/eventlist/TrivialVelocityDialog.h @@ -35,7 +35,7 @@ namespace Rosegarden { class TrivialVelocityDialog : public KDialogBase { public: - TrivialVelocityDialog(TQWidget *tqparent, TQString label, int deft); + TrivialVelocityDialog(TQWidget *parent, TQString label, int deft); int getVelocity(); diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp index 7677b85..6ca2c39 100644 --- a/src/gui/editors/guitar/FingeringBox.cpp +++ b/src/gui/editors/guitar/FingeringBox.cpp @@ -31,8 +31,8 @@ namespace Rosegarden { -FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *tqparent, const char* name) - : TQFrame(tqparent, name), +FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *parent, const char* name) + : TQFrame(parent, name), m_nbFretsDisplayed(nbFrets), m_startFret(1), m_nbStrings(nbStrings), @@ -44,8 +44,8 @@ FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool ed init(); } -FingeringBox::FingeringBox(bool editable, TQWidget *tqparent, const char* name) - : TQFrame(tqparent, name), +FingeringBox::FingeringBox(bool editable, TQWidget *parent, const char* name) + : TQFrame(parent, name), m_nbFretsDisplayed(DEFAULT_NB_DISPLAYED_FRETS), m_startFret(1), m_nbStrings(Guitar::Fingering::DEFAULT_NB_STRINGS), diff --git a/src/gui/editors/guitar/FingeringBox.h b/src/gui/editors/guitar/FingeringBox.h index 06b8500..8c5a600 100644 --- a/src/gui/editors/guitar/FingeringBox.h +++ b/src/gui/editors/guitar/FingeringBox.h @@ -43,8 +43,8 @@ class FingeringBox : public TQFrame static const unsigned int IMG_HEIGHT = 200; public: - FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *tqparent, const char* name = 0); - FingeringBox(bool editable, TQWidget *tqparent, const char* name = 0); + FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *parent, const char* name = 0); + FingeringBox(bool editable, TQWidget *parent, const char* name = 0); void setStartFret(unsigned int f) { m_startFret = f; update(); } unsigned int getStartFret() const { return m_startFret; } diff --git a/src/gui/editors/guitar/FingeringListBoxItem.cpp b/src/gui/editors/guitar/FingeringListBoxItem.cpp index 64b7f10..aeb8fcd 100644 --- a/src/gui/editors/guitar/FingeringListBoxItem.cpp +++ b/src/gui/editors/guitar/FingeringListBoxItem.cpp @@ -27,8 +27,8 @@ namespace Rosegarden { -FingeringListBoxItem::FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* tqparent, TQPixmap pixmap, TQString fingeringString) - : TQListBoxPixmap(tqparent, pixmap, fingeringString), +FingeringListBoxItem::FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* parent, TQPixmap pixmap, TQString fingeringString) + : TQListBoxPixmap(parent, pixmap, fingeringString), m_chord(chord) { } diff --git a/src/gui/editors/guitar/FingeringListBoxItem.h b/src/gui/editors/guitar/FingeringListBoxItem.h index f900056..5524054 100644 --- a/src/gui/editors/guitar/FingeringListBoxItem.h +++ b/src/gui/editors/guitar/FingeringListBoxItem.h @@ -34,7 +34,7 @@ namespace Rosegarden { class FingeringListBoxItem : public TQListBoxPixmap { public: - FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* tqparent, TQPixmap pixmap, TQString fingeringString); + FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* parent, TQPixmap pixmap, TQString fingeringString); const Guitar::Chord& getChord() { return m_chord; } protected: diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp index 58ec54d..8a4fb3e 100644 --- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp +++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp @@ -39,8 +39,8 @@ namespace Rosegarden { -GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Guitar::ChordMap& chordMap, TQWidget *tqparent) - : KDialogBase(tqparent, "GuitarChordEditor", true, i18n("Guitar Chord Editor"), Ok|Cancel), +GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Guitar::ChordMap& chordMap, TQWidget *parent) + : KDialogBase(parent, "GuitarChordEditor", true, i18n("Guitar Chord Editor"), Ok|Cancel), m_chord(chord), m_chordMap(chordMap) { diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.h b/src/gui/editors/guitar/GuitarChordEditorDialog.h index 2b286ee..1e8e1e1 100644 --- a/src/gui/editors/guitar/GuitarChordEditorDialog.h +++ b/src/gui/editors/guitar/GuitarChordEditorDialog.h @@ -45,7 +45,7 @@ class GuitarChordEditorDialog : public KDialogBase TQ_OBJECT public: - GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *tqparent=0); + GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *parent=0); protected slots: void slotStartFretChanged(int); diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp index f564fdb..f401cd1 100644 --- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp +++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp @@ -41,8 +41,8 @@ namespace Rosegarden { -GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *tqparent) - : KDialogBase(tqparent, "GuitarChordSelector", true, i18n("Guitar Chord Selector"), Ok|Cancel) +GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *parent) + : KDialogBase(parent, "GuitarChordSelector", true, i18n("Guitar Chord Selector"), Ok|Cancel) { TQWidget *page = new TQWidget(this); setMainWidget(page); diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.h b/src/gui/editors/guitar/GuitarChordSelectorDialog.h index b6ddea1..bb0e529 100644 --- a/src/gui/editors/guitar/GuitarChordSelectorDialog.h +++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.h @@ -51,7 +51,7 @@ class GuitarChordSelectorDialog : public KDialogBase enum { COMPLEXITY_BEGINNER, COMPLEXITY_COMMON, COMPLEXITY_ALL }; public: - GuitarChordSelectorDialog(TQWidget *tqparent=0); + GuitarChordSelectorDialog(TQWidget *parent=0); void init(); diff --git a/src/gui/editors/matrix/MatrixCanvasView.cpp b/src/gui/editors/matrix/MatrixCanvasView.cpp index ee0bab2..9c56805 100644 --- a/src/gui/editors/matrix/MatrixCanvasView.cpp +++ b/src/gui/editors/matrix/MatrixCanvasView.cpp @@ -45,9 +45,9 @@ namespace Rosegarden MatrixCanvasView::MatrixCanvasView(MatrixStaff& staff, SnapGrid *snapGrid, bool drumMode, - TQCanvas *viewing, TQWidget *tqparent, + TQCanvas *viewing, TQWidget *parent, const char *name, WFlags f) - : RosegardenCanvasView(viewing, tqparent, name, f), + : RosegardenCanvasView(viewing, parent, name, f), m_staff(staff), m_snapGrid(snapGrid), m_drumMode(drumMode), diff --git a/src/gui/editors/matrix/MatrixCanvasView.h b/src/gui/editors/matrix/MatrixCanvasView.h index 5391f9f..440e941 100644 --- a/src/gui/editors/matrix/MatrixCanvasView.h +++ b/src/gui/editors/matrix/MatrixCanvasView.h @@ -55,7 +55,7 @@ public: SnapGrid *, bool drumMode, TQCanvas *viewing, - TQWidget *tqparent=0, const char *name=0, WFlags f=0); + TQWidget *parent=0, const char *name=0, WFlags f=0); ~MatrixCanvasView(); diff --git a/src/gui/editors/matrix/MatrixEraser.cpp b/src/gui/editors/matrix/MatrixEraser.cpp index a5f261a..9f60479 100644 --- a/src/gui/editors/matrix/MatrixEraser.cpp +++ b/src/gui/editors/matrix/MatrixEraser.cpp @@ -43,8 +43,8 @@ namespace Rosegarden { -MatrixEraser::MatrixEraser(MatrixView* tqparent) - : MatrixTool("MatrixEraser", tqparent), +MatrixEraser::MatrixEraser(MatrixView* parent) + : MatrixTool("MatrixEraser", parent), m_currentStaff(0) { TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp index b525b4b..cb604ba 100644 --- a/src/gui/editors/matrix/MatrixMover.cpp +++ b/src/gui/editors/matrix/MatrixMover.cpp @@ -54,8 +54,8 @@ namespace Rosegarden { -MatrixMover::MatrixMover(MatrixView* tqparent) : - MatrixTool("MatrixMover", tqparent), +MatrixMover::MatrixMover(MatrixView* parent) : + MatrixTool("MatrixMover", parent), m_currentElement(0), m_currentStaff(0), m_lastPlayedPitch(-1) diff --git a/src/gui/editors/matrix/MatrixPainter.cpp b/src/gui/editors/matrix/MatrixPainter.cpp index 4ed4c6b..04048a7 100644 --- a/src/gui/editors/matrix/MatrixPainter.cpp +++ b/src/gui/editors/matrix/MatrixPainter.cpp @@ -53,8 +53,8 @@ namespace Rosegarden { -MatrixPainter::MatrixPainter(MatrixView* tqparent) - : MatrixTool("MatrixPainter", tqparent), +MatrixPainter::MatrixPainter(MatrixView* parent) + : MatrixTool("MatrixPainter", parent), m_currentElement(0), m_currentStaff(0) { @@ -83,8 +83,8 @@ MatrixPainter::MatrixPainter(MatrixView* tqparent) createMenu("matrixpainter.rc"); } -MatrixPainter::MatrixPainter(TQString name, MatrixView* tqparent) - : MatrixTool(name, tqparent), +MatrixPainter::MatrixPainter(TQString name, MatrixView* parent) + : MatrixTool(name, parent), m_currentElement(0), m_currentStaff(0) {} diff --git a/src/gui/editors/matrix/MatrixParameterBox.cpp b/src/gui/editors/matrix/MatrixParameterBox.cpp index cd4a743..75228c3 100644 --- a/src/gui/editors/matrix/MatrixParameterBox.cpp +++ b/src/gui/editors/matrix/MatrixParameterBox.cpp @@ -42,8 +42,8 @@ namespace Rosegarden { MatrixParameterBox::MatrixParameterBox(RosegardenGUIDoc *doc, - TQWidget *tqparent, const char* name): - TQFrame(tqparent, name), + TQWidget *parent, const char* name): + TQFrame(parent, name), m_quantizations(BasicQuantizer::getStandardQuantizations()), m_doc(doc) { diff --git a/src/gui/editors/matrix/MatrixParameterBox.h b/src/gui/editors/matrix/MatrixParameterBox.h index d67269a..be69899 100644 --- a/src/gui/editors/matrix/MatrixParameterBox.h +++ b/src/gui/editors/matrix/MatrixParameterBox.h @@ -50,7 +50,7 @@ class MatrixParameterBox : public TQFrame TQ_OBJECT public: - MatrixParameterBox(RosegardenGUIDoc *doc=0, TQWidget *tqparent=0, const char* name=0); + MatrixParameterBox(RosegardenGUIDoc *doc=0, TQWidget *parent=0, const char* name=0); ~MatrixParameterBox(); void initBox(); diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp index 817b4c3..253f3c0 100644 --- a/src/gui/editors/matrix/MatrixResizer.cpp +++ b/src/gui/editors/matrix/MatrixResizer.cpp @@ -51,8 +51,8 @@ namespace Rosegarden { -MatrixResizer::MatrixResizer(MatrixView* tqparent) - : MatrixTool("MatrixResizer", tqparent), +MatrixResizer::MatrixResizer(MatrixView* parent) + : MatrixTool("MatrixResizer", parent), m_currentElement(0), m_currentStaff(0) { diff --git a/src/gui/editors/matrix/MatrixTool.cpp b/src/gui/editors/matrix/MatrixTool.cpp index 7876caf..a478aa3 100644 --- a/src/gui/editors/matrix/MatrixTool.cpp +++ b/src/gui/editors/matrix/MatrixTool.cpp @@ -34,9 +34,9 @@ namespace Rosegarden { -MatrixTool::MatrixTool(const TQString& menuName, MatrixView* tqparent) - : EditTool(menuName, tqparent), - m_mParentView(tqparent) +MatrixTool::MatrixTool(const TQString& menuName, MatrixView* parent) + : EditTool(menuName, parent), + m_mParentView(parent) {} void diff --git a/src/gui/editors/matrix/MatrixToolBox.cpp b/src/gui/editors/matrix/MatrixToolBox.cpp index e38abf1..3254b35 100644 --- a/src/gui/editors/matrix/MatrixToolBox.cpp +++ b/src/gui/editors/matrix/MatrixToolBox.cpp @@ -40,9 +40,9 @@ namespace Rosegarden { -MatrixToolBox::MatrixToolBox(MatrixView* tqparent) - : EditToolBox(tqparent), - m_mParentView(tqparent) +MatrixToolBox::MatrixToolBox(MatrixView* parent) + : EditToolBox(parent), + m_mParentView(parent) {} EditTool* MatrixToolBox::createTool(const TQString& toolName) diff --git a/src/gui/editors/matrix/MatrixToolBox.h b/src/gui/editors/matrix/MatrixToolBox.h index b997405..2f43206 100644 --- a/src/gui/editors/matrix/MatrixToolBox.h +++ b/src/gui/editors/matrix/MatrixToolBox.h @@ -44,7 +44,7 @@ class MatrixToolBox : public EditToolBox Q_OBJECT TQ_OBJECT public: - MatrixToolBox(MatrixView* tqparent); + MatrixToolBox(MatrixView* parent); protected: diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index 22db8a6..568f70f 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -137,9 +137,9 @@ static double xorigin = 0.0; MatrixView::MatrixView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *tqparent, + TQWidget *parent, bool drumMode) - : EditView(doc, segments, 3, tqparent, "matrixview"), + : EditView(doc, segments, 3, parent, "matrixview"), m_htqlayout(&doc->getComposition()), m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_htqlayout)), m_vtqlayout(), @@ -301,7 +301,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, TQT_SIGNAL(showPluginGUI(InstrumentId, int)), app, TQT_SLOT(slotShowPluginGUI(InstrumentId, int))); - connect(tqparent, // RosegardenGUIView + connect(parent, // RosegardenGUIView TQT_SIGNAL(checkTrackAssignments()), this, TQT_SLOT(slotCheckTrackAssignments())); diff --git a/src/gui/editors/matrix/MatrixView.h b/src/gui/editors/matrix/MatrixView.h index afe07d7..6dc6519 100644 --- a/src/gui/editors/matrix/MatrixView.h +++ b/src/gui/editors/matrix/MatrixView.h @@ -89,7 +89,7 @@ class MatrixView : public EditView public: MatrixView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *tqparent, bool drumMode); + TQWidget *parent, bool drumMode); virtual ~MatrixView(); diff --git a/src/gui/editors/matrix/PianoKeyboard.cpp b/src/gui/editors/matrix/PianoKeyboard.cpp index e61cdc6..7ae4a5a 100644 --- a/src/gui/editors/matrix/PianoKeyboard.cpp +++ b/src/gui/editors/matrix/PianoKeyboard.cpp @@ -46,8 +46,8 @@ namespace Rosegarden const unsigned int _smallWhiteKeyHeight = 14; const unsigned int _whiteKeyHeight = 18; -PianoKeyboard::PianoKeyboard(TQWidget *tqparent, int keys) - : PitchRuler(tqparent), +PianoKeyboard::PianoKeyboard(TQWidget *parent, int keys) + : PitchRuler(parent), m_keySize(48, 18), m_blackKeySize(24, 8), m_nbKeys(keys), diff --git a/src/gui/editors/matrix/PianoKeyboard.h b/src/gui/editors/matrix/PianoKeyboard.h index c8c09e8..7c29c89 100644 --- a/src/gui/editors/matrix/PianoKeyboard.h +++ b/src/gui/editors/matrix/PianoKeyboard.h @@ -47,7 +47,7 @@ class PianoKeyboard : public PitchRuler Q_OBJECT TQ_OBJECT public: - PianoKeyboard(TQWidget *tqparent, int keys = 88); + PianoKeyboard(TQWidget *parent, int keys = 88); virtual TQSize tqsizeHint() const; virtual TQSize tqminimumSizeHint() const; diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp index 5bfdee1..3770441 100644 --- a/src/gui/editors/notation/FontViewFrame.cpp +++ b/src/gui/editors/notation/FontViewFrame.cpp @@ -46,8 +46,8 @@ namespace Rosegarden { -FontViewFrame::FontViewFrame( int pixelSize, TQWidget* tqparent, const char* name ) : - TQFrame(tqparent, name), +FontViewFrame::FontViewFrame( int pixelSize, TQWidget* parent, const char* name ) : + TQFrame(parent, name), m_fontSize(pixelSize), m_tableFont(0) { diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h index 524e393..fbfc95a 100644 --- a/src/gui/editors/notation/FontViewFrame.h +++ b/src/gui/editors/notation/FontViewFrame.h @@ -46,7 +46,7 @@ class FontViewFrame : public TQFrame TQ_OBJECT public: - FontViewFrame(int pixelSize, TQWidget *tqparent = 0, const char *name = 0); + FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0); virtual ~FontViewFrame(); TQSize tqsizeHint() const; diff --git a/src/gui/editors/notation/HeadersGroup.cpp b/src/gui/editors/notation/HeadersGroup.cpp index b08ed1c..f7dcc82 100644 --- a/src/gui/editors/notation/HeadersGroup.cpp +++ b/src/gui/editors/notation/HeadersGroup.cpp @@ -43,8 +43,8 @@ namespace Rosegarden HeadersGroup:: -HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp) : - TQVBox(tqparent), +HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp) : + TQVBox(parent), m_notationView(nv), m_composition(comp), m_usedHeight(0), diff --git a/src/gui/editors/notation/HeadersGroup.h b/src/gui/editors/notation/HeadersGroup.h index a995646..a3fb706 100644 --- a/src/gui/editors/notation/HeadersGroup.h +++ b/src/gui/editors/notation/HeadersGroup.h @@ -59,7 +59,7 @@ public: /** * Create an empty headers group */ - HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp); + HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp); void removeAllHeaders(); diff --git a/src/gui/editors/notation/NotationCanvasView.cpp b/src/gui/editors/notation/NotationCanvasView.cpp index 40c2d59..a80d04d 100644 --- a/src/gui/editors/notation/NotationCanvasView.cpp +++ b/src/gui/editors/notation/NotationCanvasView.cpp @@ -49,9 +49,9 @@ namespace Rosegarden { NotationCanvasView::NotationCanvasView(const LinedStaffManager &staffmgr, - TQCanvas *viewing, TQWidget *tqparent, + TQCanvas *viewing, TQWidget *parent, const char *name, WFlags f) : - RosegardenCanvasView(viewing, tqparent, name, f), + RosegardenCanvasView(viewing, parent, name, f), m_linedStaffManager(staffmgr), m_lastYPosNearStaff(0), m_currentStaff(0), diff --git a/src/gui/editors/notation/NotationCanvasView.h b/src/gui/editors/notation/NotationCanvasView.h index e327de8..01f19b2 100644 --- a/src/gui/editors/notation/NotationCanvasView.h +++ b/src/gui/editors/notation/NotationCanvasView.h @@ -70,7 +70,7 @@ class NotationCanvasView : public RosegardenCanvasView public: NotationCanvasView(const LinedStaffManager &staffmgr, - TQCanvas *viewing, TQWidget *tqparent=0, + TQCanvas *viewing, TQWidget *parent=0, const char *name=0, WFlags f=0); ~NotationCanvasView(); diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp index be40dca..e971521 100644 --- a/src/gui/editors/notation/NotationHLayout.cpp +++ b/src/gui/editors/notation/NotationHLayout.cpp @@ -58,8 +58,8 @@ using namespace BaseProperties; NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf, const NotationProperties &properties, - TQObject* tqparent, const char* name) : - ProgressReporter(tqparent, name), + TQObject* parent, const char* name) : + ProgressReporter(parent, name), HorizontalLayoutEngine(c), m_totalWidth(0.), m_pageMode(false), diff --git a/src/gui/editors/notation/NotationHLayout.h b/src/gui/editors/notation/NotationHLayout.h index aba9a27..07cf25e 100644 --- a/src/gui/editors/notation/NotationHLayout.h +++ b/src/gui/editors/notation/NotationHLayout.h @@ -68,7 +68,7 @@ public: NotationHLayout(Composition *c, NotePixmapFactory *npf, const NotationProperties &properties, - TQObject* tqparent, const char* name = 0); + TQObject* parent, const char* name = 0); virtual ~NotationHLayout(); diff --git a/src/gui/editors/notation/NotationSelector.h b/src/gui/editors/notation/NotationSelector.h index f865cb7..85ab92a 100644 --- a/src/gui/editors/notation/NotationSelector.h +++ b/src/gui/editors/notation/NotationSelector.h @@ -160,7 +160,7 @@ protected: NotationSelector(NotationView*); /** - * Set the current selection on the tqparent NotationView + * Set the current selection on the parent NotationView */ void setViewCurrentSelection(bool preview); diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp index d3511fb..f2fa642 100644 --- a/src/gui/editors/notation/NotationToolBox.cpp +++ b/src/gui/editors/notation/NotationToolBox.cpp @@ -42,9 +42,9 @@ namespace Rosegarden { -NotationToolBox::NotationToolBox(NotationView *tqparent) - : EditToolBox(tqparent), - m_nParentView(tqparent) +NotationToolBox::NotationToolBox(NotationView *parent) + : EditToolBox(parent), + m_nParentView(parent) { //m_tools.setAutoDelete(true); } diff --git a/src/gui/editors/notation/NotationToolBox.h b/src/gui/editors/notation/NotationToolBox.h index 5c15b2b..06ef576 100644 --- a/src/gui/editors/notation/NotationToolBox.h +++ b/src/gui/editors/notation/NotationToolBox.h @@ -49,7 +49,7 @@ class NotationToolBox : public EditToolBox Q_OBJECT TQ_OBJECT public: - NotationToolBox(NotationView* tqparent); + NotationToolBox(NotationView* parent); protected: virtual EditTool* createTool(const TQString& toolName); diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp index 12979ea..55f4d76 100644 --- a/src/gui/editors/notation/NotationVLayout.cpp +++ b/src/gui/editors/notation/NotationVLayout.cpp @@ -55,8 +55,8 @@ using namespace BaseProperties; NotationVLayout::NotationVLayout(Composition *c, NotePixmapFactory *npf, const NotationProperties &properties, - TQObject* tqparent, const char* name) : - ProgressReporter(tqparent, name), + TQObject* parent, const char* name) : + ProgressReporter(parent, name), m_composition(c), m_npf(npf), m_notationQuantizer(c->getNotationQuantizer()), @@ -490,7 +490,7 @@ NotationVLayout::positionSlur(NotationStaff &staff, if (!event->get <Int>(m_properties.HEIGHT_ON_STAFF, h)) { KMessageBox::sorry - ((TQWidget *)tqparent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime())); + ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime())); event->dump(std::cerr); } diff --git a/src/gui/editors/notation/NotationVLayout.h b/src/gui/editors/notation/NotationVLayout.h index afddb0b..b69c06c 100644 --- a/src/gui/editors/notation/NotationVLayout.h +++ b/src/gui/editors/notation/NotationVLayout.h @@ -63,7 +63,7 @@ class NotationVLayout : public ProgressReporter, public: NotationVLayout(Composition *c, NotePixmapFactory *npf, const NotationProperties &properties, - TQObject* tqparent, const char* name = 0); + TQObject* parent, const char* name = 0); virtual ~NotationVLayout(); diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index 707e85c..0a471d5 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -346,9 +346,9 @@ public: NotationView::NotationView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *tqparent, + TQWidget *parent, bool showProgressive) : - EditView(doc, segments, 2, tqparent, "notationview"), + EditView(doc, segments, 2, parent, "notationview"), m_properties(getViewLocalPropertyPrefix()), m_selectionCounter(0), m_insertModeLabel(0), @@ -768,10 +768,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc, (this, TQT_SIGNAL(renderComplete()), getCanvasView(), TQT_SLOT(slotRenderComplete())); - if (tqparent) + if (parent) { const TrackButtons * trackLabels = - ((RosegardenGUIView*)tqparent)->getTrackEditor()->getTrackButtons(); + ((RosegardenGUIView*)parent)->getTrackEditor()->getTrackButtons(); TQObject::connect (trackLabels, TQT_SIGNAL(nameChanged()), this, TQT_SLOT(slotUpdateStaffName())); @@ -796,7 +796,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, NotationView::NotationView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *tqparent, + TQWidget *parent, NotationView *referenceView) : EditView(doc, segments, 1, 0, "printview"), m_properties(getViewLocalPropertyPrefix()), @@ -907,7 +907,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, ProgressDialog* progressDlg = 0; - if (tqparent) + if (parent) { ProgressDialog::processEvents(); @@ -915,7 +915,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, NOTATION_DEBUG << "NotationView : setting up progress dialog" << endl; progressDlg = new ProgressDialog(i18n("Preparing to print..."), - 100, tqparent); + 100, parent); progressDlg->setAutoClose(false); progressDlg->setAutoReset(true); progressDlg->setMinimumDuration(1000); @@ -3541,7 +3541,7 @@ void NotationView::print(bool previewOnly) if (previewOnly) printer.setPreviewOnly(true); - else if (!printer.setup((TQWidget *)tqparent())) + else if (!printer.setup((TQWidget *)parent())) return ; TQPaintDeviceMetrics pdm(&printer); @@ -4613,7 +4613,7 @@ NotationView::slotFilePrint() SetWaitCursor waitCursor; NotationView printingView(getDocument(), m_segments, - (TQWidget *)tqparent(), this); + (TQWidget *)parent(), this); if (!printingView.isOK()) { NOTATION_DEBUG << "Print : operation cancelled\n"; @@ -4630,7 +4630,7 @@ NotationView::slotFilePrintPreview() SetWaitCursor waitCursor; NotationView printingView(getDocument(), m_segments, - (TQWidget *)tqparent(), this); + (TQWidget *)parent(), this); if (!printingView.isOK()) { NOTATION_DEBUG << "Print preview : operation cancelled\n"; diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h index 236b89b..461d299 100644 --- a/src/gui/editors/notation/NotationView.h +++ b/src/gui/editors/notation/NotationView.h @@ -114,18 +114,18 @@ class NotationView : public EditView, public: explicit NotationView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *tqparent, + TQWidget *parent, bool showProgressive); // update during initial render? /** - * Constructor for printing only. If tqparent is provided, a + * Constructor for printing only. If parent is provided, a * progress dialog will be shown -- otherwise not. If another * NotationView is provided, the fonts and other settings used * for printing will be taken from that view. */ explicit NotationView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - TQWidget *tqparent, + TQWidget *parent, NotationView *referenceView); ~NotationView(); diff --git a/src/gui/editors/notation/NoteCharacter.cpp b/src/gui/editors/notation/NoteCharacter.cpp index e3beed2..9f49131 100644 --- a/src/gui/editors/notation/NoteCharacter.cpp +++ b/src/gui/editors/notation/NoteCharacter.cpp @@ -125,8 +125,8 @@ NoteCharacter::draw(TQPainter *painter, int x, int y) const void NoteCharacter::drawMask(TQPainter *painter, int x, int y) const { - if (!m_rep && m_pixmap->tqmask()) { - painter->drawPixmap(x, y, *(m_pixmap->tqmask())); + if (!m_rep && m_pixmap->mask()) { + painter->drawPixmap(x, y, *(m_pixmap->mask())); } } diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp index e494169..18f82f7 100644 --- a/src/gui/editors/notation/NoteFont.cpp +++ b/src/gui/editors/notation/NoteFont.cpp @@ -286,8 +286,8 @@ NoteFont::getPixmap(CharName charName, TQPixmap &pixmap, bool inverted) const if (!found->isNull()) { - if (found->tqmask() == 0) { - std::cerr << "NoteFont::getPixmap: Warning: No automatic tqmask " + if (found->mask() == 0) { + std::cerr << "NoteFont::getPixmap: Warning: No automatic mask " << "for character \"" << charName << "\"" << (inverted ? " (inverted)" : "") << " in font \"" << m_fontMap.getName() << "-" << m_size diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp index 918c7ac..d485244 100644 --- a/src/gui/editors/notation/NoteFontViewer.cpp +++ b/src/gui/editors/notation/NoteFontViewer.cpp @@ -81,9 +81,9 @@ NoteFontViewer::slotFontChanged(const TQString &s) slotViewChanged(m_view->currentItem()); } -NoteFontViewer::NoteFontViewer(TQWidget *tqparent, TQString noteFontName, +NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName, TQStringList fontNames, int pixelSize) : - KDialogBase(tqparent, 0, true, + KDialogBase(parent, 0, true, i18n("Note Font Viewer: %1").tqarg(noteFontName), Close) { TQVBox *box = makeVBoxMainWidget(); diff --git a/src/gui/editors/notation/NoteFontViewer.h b/src/gui/editors/notation/NoteFontViewer.h index 17b41a7..69c62c6 100644 --- a/src/gui/editors/notation/NoteFontViewer.h +++ b/src/gui/editors/notation/NoteFontViewer.h @@ -47,7 +47,7 @@ class NoteFontViewer : public KDialogBase TQ_OBJECT public: - NoteFontViewer(TQWidget *tqparent, TQString noteFontName, + NoteFontViewer(TQWidget *parent, TQString noteFontName, TQStringList systemFontNames, int pixelSize); protected slots: diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index e5f306b..ac9064a 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -1261,7 +1261,7 @@ NotePixmapFactory::drawFlags(int flagCount, } else { - // No problem with tqmask here + // No problem with mask here m_p->drawNoteCharacter(m_left + s1.x() - hotspot.x(), y, flagChar); @@ -2890,7 +2890,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp, m_p->beginExternal(painter); painter->translate(x - backpedal, y - height); } else { - NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and tqmask " << width << "x" << height << endl; + NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and mask " << width << "x" << height << endl; createPixmapAndMask(width, height); } @@ -3443,7 +3443,7 @@ NotePixmapFactory::createPixmapAndMask(int width, int height, total += width * height; // NOTATION_DEBUG << "createPixmapAndMask: " << width << "x" << height << " (" << (width*height) << " px, " << total << " total)" << endl; - // clear up pixmap and tqmask + // clear up pixmap and mask m_generatedPixmap->fill(); m_generatedMask->fill(TQt::color0); diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h index 485f5a1..9b56052 100644 --- a/src/gui/editors/notation/NotePixmapPainter.h +++ b/src/gui/editors/notation/NotePixmapPainter.h @@ -33,7 +33,7 @@ namespace Rosegarden { class NotePixmapPainter { // Just a trivial class that instructs two painters to do the - // same thing (one for the pixmap, one for the tqmask). We only + // same thing (one for the pixmap, one for the mask). We only // duplicate those methods we actually use in NotePixmapFactory public: @@ -55,13 +55,13 @@ public: } } - bool begin(TQPaintDevice *device, TQPaintDevice *tqmask = 0, bool unclipped = false) { + bool begin(TQPaintDevice *device, TQPaintDevice *mask = 0, bool unclipped = false) { m_externalPainter = 0; - if (tqmask) { + if (mask) { m_useMask = true; - m_maskPainter.tqbegin(tqmask, unclipped); + m_maskPainter.tqbegin(mask, unclipped); } else { m_useMask = false; } @@ -117,7 +117,7 @@ public: void drawPixmap(int x, int y, const TQPixmap &pm, int sx = 0, int sy = 0, int sw = -1, int sh = -1) { m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh); - if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh); + if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh); } void drawText(int x, int y, const TQString &string) { diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp index de5bf5f..fa19ca5 100644 --- a/src/gui/editors/notation/TrackHeader.cpp +++ b/src/gui/editors/notation/TrackHeader.cpp @@ -75,8 +75,8 @@ const int TrackHeader::INCONSISTENT_TRANSPOSITIONS = 1 << 5; const int TrackHeader::BEFORE_FIRST_SEGMENT = 1 << 6; -TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos) : - TQLabel(tqparent), +TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos) : + TQLabel(parent), m_track(trackId), m_height(height), m_ypos(ypos), @@ -96,7 +96,7 @@ TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int yp m_current(false) { - m_notationView = static_cast<HeadersGroup *>(tqparent)->getNotationView(); + m_notationView = static_cast<HeadersGroup *>(parent)->getNotationView(); setFrameStyle(TQFrame::Box | TQFrame::Plain); setCurrent(false); @@ -106,7 +106,7 @@ TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int yp // Tooltip text creation Composition *comp = - static_cast<HeadersGroup *>(tqparent)->getComposition(); + static_cast<HeadersGroup *>(parent)->getComposition(); Track *track = comp->getTrackById(m_track); int trackPos = comp->getTrackPositionById(m_track); @@ -274,7 +274,7 @@ TrackHeader::lookAtStaff(double x, int maxWidth) int staff; Composition *comp = - static_cast<HeadersGroup *>(TQT_TQWIDGET(tqparent()))->getComposition(); + static_cast<HeadersGroup *>(TQT_TQWIDGET(parent()))->getComposition(); Track *track = comp->getTrackById(m_track); int trackPos = comp->getTrackPositionById(m_track); diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h index 0b8a0a6..3f7029e 100644 --- a/src/gui/editors/notation/TrackHeader.h +++ b/src/gui/editors/notation/TrackHeader.h @@ -57,10 +57,10 @@ class TrackHeader : public TQLabel public: /** * Create a new track header for track of id trackId. - * *tqparent is the tqparent widget, height the height of staff and + * *parent is the parent widget, height the height of staff and * ypos is the staff y position on canvas. */ - TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos); + TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos); /** * Draw a blue line around header when current is true diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp index d7bf79a..7299a9f 100644 --- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp +++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp @@ -242,8 +242,8 @@ AudioInstrumentParameterPanel::setButtonColour( } } -AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* tqparent) - : InstrumentParameterPanel(doc, tqparent), +AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* parent) + : InstrumentParameterPanel(doc, parent), m_audioFader(new AudioFaderBox(this)) { TQGridLayout *gridLayout = new TQGridLayout(this, 3, 2, 5, 5); diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.h b/src/gui/editors/parameters/AudioInstrumentParameterPanel.h index a9ff117..9b771c7 100644 --- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.h +++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.h @@ -49,7 +49,7 @@ class AudioInstrumentParameterPanel : public InstrumentParameterPanel Q_OBJECT TQ_OBJECT public: - AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* tqparent); + AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* parent); virtual void setupForInstrument(Instrument*); diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp index f31c474..b618bed 100644 --- a/src/gui/editors/parameters/InstrumentParameterBox.cpp +++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp @@ -49,10 +49,10 @@ namespace Rosegarden { InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc, - TQWidget *tqparent) + TQWidget *parent) : RosegardenParameterBox(i18n("Instrument"), i18n("Instrument Parameters"), - tqparent), + parent), m_widgetStack(new TQWidgetStack(this)), m_noInstrumentParameters(new TQVBox(this)), m_midiInstrumentParameters(new MIDIInstrumentParameterPanel(doc, this)), diff --git a/src/gui/editors/parameters/InstrumentParameterBox.h b/src/gui/editors/parameters/InstrumentParameterBox.h index cb50d7a..6d03b7b 100644 --- a/src/gui/editors/parameters/InstrumentParameterBox.h +++ b/src/gui/editors/parameters/InstrumentParameterBox.h @@ -57,7 +57,7 @@ Q_OBJECT public: InstrumentParameterBox(RosegardenGUIDoc *doc, - TQWidget *tqparent = 0); + TQWidget *parent = 0); ~InstrumentParameterBox(); void useInstrument(Instrument *instrument); diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.cpp b/src/gui/editors/parameters/InstrumentParameterPanel.cpp index d0f45d4..9cca26d 100644 --- a/src/gui/editors/parameters/InstrumentParameterPanel.cpp +++ b/src/gui/editors/parameters/InstrumentParameterPanel.cpp @@ -38,8 +38,8 @@ namespace Rosegarden { InstrumentParameterPanel::InstrumentParameterPanel(RosegardenGUIDoc *doc, - TQWidget* tqparent) - : TQFrame(tqparent), + TQWidget* parent) + : TQFrame(parent), m_instrumentLabel(new KSqueezedTextLabel(this)), m_selectedInstrument(0), m_doc(doc) diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.h b/src/gui/editors/parameters/InstrumentParameterPanel.h index 42ceee5..1674a74 100644 --- a/src/gui/editors/parameters/InstrumentParameterPanel.h +++ b/src/gui/editors/parameters/InstrumentParameterPanel.h @@ -52,7 +52,7 @@ class InstrumentParameterPanel : public TQFrame Q_OBJECT TQ_OBJECT public: - InstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent); + InstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent); virtual ~InstrumentParameterPanel() {}; diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp index 3f0e543..ceb2e26 100644 --- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp +++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp @@ -60,8 +60,8 @@ namespace Rosegarden { -MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent): - InstrumentParameterPanel(doc, tqparent), +MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent): + InstrumentParameterPanel(doc, parent), m_rotaryFrame(0), m_rotaryMapper(new TQSignalMapper(TQT_TQOBJECT(this))) { diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h index 635c009..1a8db85 100644 --- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h +++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h @@ -55,7 +55,7 @@ class MIDIInstrumentParameterPanel : public InstrumentParameterPanel TQ_OBJECT public: - MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* tqparent); + MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent); void setupControllers(MidiDevice *); // setup ControlParameters on box diff --git a/src/gui/editors/parameters/RosegardenParameterArea.cpp b/src/gui/editors/parameters/RosegardenParameterArea.cpp index 9d717a1..5e13652 100644 --- a/src/gui/editors/parameters/RosegardenParameterArea.cpp +++ b/src/gui/editors/parameters/RosegardenParameterArea.cpp @@ -46,9 +46,9 @@ namespace Rosegarden { -RosegardenParameterArea::RosegardenParameterArea(TQWidget *tqparent, +RosegardenParameterArea::RosegardenParameterArea(TQWidget *parent, const char *name, WFlags f) - : TQWidgetStack(tqparent, name, f), + : TQWidgetStack(parent, name, f), m_style(RosegardenParameterArea::CLASSIC_STYLE), m_scrollView(new TQScrollView(this, 0, TQt::WStaticContents)), m_classic(new TQVBox(m_scrollView->viewport())), @@ -204,7 +204,7 @@ void RosegardenParameterArea::moveWidget(TQWidget *old_container, m_tabBox->removePage(box); } - // Retqparent the parameter box, and perform any container-specific + // Reparent the parameter box, and perform any container-specific // configuration. if (new_container == m_classic) { diff --git a/src/gui/editors/parameters/RosegardenParameterArea.h b/src/gui/editors/parameters/RosegardenParameterArea.h index 1000017..7fd8989 100644 --- a/src/gui/editors/parameters/RosegardenParameterArea.h +++ b/src/gui/editors/parameters/RosegardenParameterArea.h @@ -57,7 +57,7 @@ public: // Create the parameter display area. - RosegardenParameterArea(TQWidget *tqparent=0, const char *name=0, WFlags f=0); + RosegardenParameterArea(TQWidget *parent=0, const char *name=0, WFlags f=0); // Add a rosegarden parameter box to the list that are to be displayed. diff --git a/src/gui/editors/parameters/RosegardenParameterBox.cpp b/src/gui/editors/parameters/RosegardenParameterBox.cpp index b52d65c..dbefda0 100644 --- a/src/gui/editors/parameters/RosegardenParameterBox.cpp +++ b/src/gui/editors/parameters/RosegardenParameterBox.cpp @@ -41,9 +41,9 @@ namespace Rosegarden RosegardenParameterBox::RosegardenParameterBox(const TQString &shortLabel, const TQString &longLabel, - TQWidget *tqparent, + TQWidget *parent, const char *name) : - TQFrame(tqparent, name), + TQFrame(parent, name), m_shortLabel(shortLabel), m_longLabel(longLabel), m_mode(LANDSCAPE_MODE) diff --git a/src/gui/editors/parameters/RosegardenParameterBox.h b/src/gui/editors/parameters/RosegardenParameterBox.h index c75f875..459aeab 100644 --- a/src/gui/editors/parameters/RosegardenParameterBox.h +++ b/src/gui/editors/parameters/RosegardenParameterBox.h @@ -55,7 +55,7 @@ class RosegardenParameterBox : public TQFrame public: RosegardenParameterBox(const TQString &shortLabel, // e.g. i18n("Track") const TQString &longLabel, // e.g. i18n("Track Parameters") - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); // Ask for a one-word string that can be used to label the widget. @@ -75,8 +75,8 @@ protected: // List the tqlayout styles that may be requested via a call to setStyle(). enum LayoutMode { - LANDSCAPE_MODE, // Optimize the tqlayout for a tall and narrow tqparent. - PORTRAIT_MODE // Optimize the tqlayout for a short and wide tqparent. + LANDSCAPE_MODE, // Optimize the tqlayout for a tall and narrow parent. + PORTRAIT_MODE // Optimize the tqlayout for a short and wide parent. }; void setLayoutMode(LayoutMode mode); diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp index 8e35960..34f3976 100644 --- a/src/gui/editors/parameters/SegmentParameterBox.cpp +++ b/src/gui/editors/parameters/SegmentParameterBox.cpp @@ -84,10 +84,10 @@ namespace Rosegarden { SegmentParameterBox::SegmentParameterBox(RosegardenGUIDoc* doc, - TQWidget *tqparent) + TQWidget *parent) : RosegardenParameterBox(i18n("Segment"), i18n("Segment Parameters"), - tqparent), + parent), m_highestPlayable(127), m_lowestPlayable(0), m_standardQuantizations(BasicQuantizer::getStandardQuantizations()), diff --git a/src/gui/editors/parameters/SegmentParameterBox.h b/src/gui/editors/parameters/SegmentParameterBox.h index b67a8f1..cfc801a 100644 --- a/src/gui/editors/parameters/SegmentParameterBox.h +++ b/src/gui/editors/parameters/SegmentParameterBox.h @@ -73,7 +73,7 @@ public: } Tristate; SegmentParameterBox(RosegardenGUIDoc *doc, - TQWidget *tqparent=0); + TQWidget *parent=0); ~SegmentParameterBox(); // Use Segments to update GUI parameters diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp index b9bdcdd..94b1137 100644 --- a/src/gui/editors/parameters/TrackParameterBox.cpp +++ b/src/gui/editors/parameters/TrackParameterBox.cpp @@ -88,10 +88,10 @@ namespace Rosegarden { TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc, - TQWidget *tqparent) + TQWidget *parent) : RosegardenParameterBox(i18n("Track"), i18n("Track Parameters"), - tqparent), + parent), m_doc(doc), m_highestPlayable(127), m_lowestPlayable(0), diff --git a/src/gui/editors/parameters/TrackParameterBox.h b/src/gui/editors/parameters/TrackParameterBox.h index 3d55201..3975813 100644 --- a/src/gui/editors/parameters/TrackParameterBox.h +++ b/src/gui/editors/parameters/TrackParameterBox.h @@ -61,7 +61,7 @@ Q_OBJECT public: TrackParameterBox( RosegardenGUIDoc *doc, - TQWidget *tqparent=0); + TQWidget *parent=0); ~TrackParameterBox(); void setDocument( RosegardenGUIDoc *doc ); diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp index 48d0f0a..581e065 100644 --- a/src/gui/editors/segment/ControlEditorDialog.cpp +++ b/src/gui/editors/segment/ControlEditorDialog.cpp @@ -72,10 +72,10 @@ namespace Rosegarden const TQString notShowing(i18n("<not showing>")); -ControlEditorDialog::ControlEditorDialog(TQWidget *tqparent, +ControlEditorDialog::ControlEditorDialog(TQWidget *parent, RosegardenGUIDoc *doc, DeviceId device): - KMainWindow(tqparent, "controleditordialog"), + KMainWindow(parent, "controleditordialog"), m_studio(&doc->getStudio()), m_doc(doc), m_device(device), diff --git a/src/gui/editors/segment/ControlEditorDialog.h b/src/gui/editors/segment/ControlEditorDialog.h index e9722e5..fa481d1 100644 --- a/src/gui/editors/segment/ControlEditorDialog.h +++ b/src/gui/editors/segment/ControlEditorDialog.h @@ -53,7 +53,7 @@ class ControlEditorDialog : public KMainWindow TQ_OBJECT public: - ControlEditorDialog(TQWidget *tqparent, + ControlEditorDialog(TQWidget *parent, RosegardenGUIDoc *doc, DeviceId device); diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp index 47f01db..b00ac83 100644 --- a/src/gui/editors/segment/ControlParameterEditDialog.cpp +++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp @@ -55,10 +55,10 @@ namespace Rosegarden const TQString notShowing(i18n("<not showing>")); ControlParameterEditDialog::ControlParameterEditDialog( - TQWidget *tqparent, + TQWidget *parent, ControlParameter *control, RosegardenGUIDoc *doc): - KDialogBase(tqparent, 0, true, + KDialogBase(parent, 0, true, i18n("Edit Control Parameter"), Ok | Cancel), m_doc(doc), m_control(control) diff --git a/src/gui/editors/segment/ControlParameterEditDialog.h b/src/gui/editors/segment/ControlParameterEditDialog.h index 289dc68..727585d 100644 --- a/src/gui/editors/segment/ControlParameterEditDialog.h +++ b/src/gui/editors/segment/ControlParameterEditDialog.h @@ -49,7 +49,7 @@ class ControlParameterEditDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ControlParameterEditDialog(TQWidget *tqparent, + ControlParameterEditDialog(TQWidget *parent, ControlParameter *control, RosegardenGUIDoc *doc); diff --git a/src/gui/editors/segment/ControlParameterItem.h b/src/gui/editors/segment/ControlParameterItem.h index e64b1d3..7be91b3 100644 --- a/src/gui/editors/segment/ControlParameterItem.h +++ b/src/gui/editors/segment/ControlParameterItem.h @@ -38,7 +38,7 @@ class ControlParameterItem : public KListViewItem { public: ControlParameterItem(int id, - TQListView *tqparent, + TQListView *parent, TQString str1, TQString str2, TQString str3, @@ -48,7 +48,7 @@ public: TQString str7, TQString str8, TQString str9): - KListViewItem(tqparent, str1, str2, str3, str4, str5, str6, str7, str8), + KListViewItem(parent, str1, str2, str3, str4, str5, str6, str7, str8), m_id(id) { setText(8, str9); } int getId() const { return m_id; } diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp index dffe446..029ff9c 100644 --- a/src/gui/editors/segment/MarkerEditor.cpp +++ b/src/gui/editors/segment/MarkerEditor.cpp @@ -71,9 +71,9 @@ namespace Rosegarden { -MarkerEditor::MarkerEditor(TQWidget *tqparent, +MarkerEditor::MarkerEditor(TQWidget *parent, RosegardenGUIDoc *doc): - KMainWindow(tqparent, "markereditordialog"), + KMainWindow(parent, "markereditordialog"), m_doc(doc), m_modified(false) { diff --git a/src/gui/editors/segment/MarkerEditor.h b/src/gui/editors/segment/MarkerEditor.h index c5a1973..1ddc200 100644 --- a/src/gui/editors/segment/MarkerEditor.h +++ b/src/gui/editors/segment/MarkerEditor.h @@ -54,7 +54,7 @@ class MarkerEditor : public KMainWindow TQ_OBJECT public: - MarkerEditor(TQWidget *tqparent, + MarkerEditor(TQWidget *parent, RosegardenGUIDoc *doc); ~MarkerEditor(); diff --git a/src/gui/editors/segment/MarkerEditorViewItem.h b/src/gui/editors/segment/MarkerEditorViewItem.h index 03320aa..1a835c0 100644 --- a/src/gui/editors/segment/MarkerEditorViewItem.h +++ b/src/gui/editors/segment/MarkerEditorViewItem.h @@ -35,7 +35,7 @@ namespace Rosegarden { class MarkerEditorViewItem : public KListViewItem { public: - MarkerEditorViewItem(TQListView * tqparent, int id, + MarkerEditorViewItem(TQListView * parent, int id, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), @@ -44,7 +44,7 @@ public: TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()): - KListViewItem(tqparent, label1, label2, label3, label4, + KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), m_rawTime(0), m_fake(false), m_id(id) { ; } diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp index c0154ec..da56edc 100644 --- a/src/gui/editors/segment/PlayList.cpp +++ b/src/gui/editors/segment/PlayList.cpp @@ -47,8 +47,8 @@ namespace Rosegarden { -PlayList::PlayList(TQWidget *tqparent, const char *name) - : TQVBox(tqparent, name), +PlayList::PlayList(TQWidget *parent, const char *name) + : TQVBox(parent, name), m_listView(new PlayListView(this)), m_buttonBar(new TQFrame(this)), m_barLayout(new TQHBoxLayout(m_buttonBar)), diff --git a/src/gui/editors/segment/PlayList.h b/src/gui/editors/segment/PlayList.h index 606eecd..cf7b073 100644 --- a/src/gui/editors/segment/PlayList.h +++ b/src/gui/editors/segment/PlayList.h @@ -49,7 +49,7 @@ class PlayList : public TQVBox TQ_OBJECT public: - PlayList(TQWidget *tqparent = 0, const char *name = 0); + PlayList(TQWidget *parent = 0, const char *name = 0); ~PlayList(); PlayListView* getListView() { return m_listView; } diff --git a/src/gui/editors/segment/PlayListDialog.cpp b/src/gui/editors/segment/PlayListDialog.cpp index 74c386b..b519b6e 100644 --- a/src/gui/editors/segment/PlayListDialog.cpp +++ b/src/gui/editors/segment/PlayListDialog.cpp @@ -36,8 +36,8 @@ namespace Rosegarden { PlayListDialog::PlayListDialog(TQString caption, - TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, false, caption, + TQWidget* parent, const char* name) + : KDialogBase(parent, name, false, caption, KDialogBase::Close, // standard buttons KDialogBase::Close, // default button true), diff --git a/src/gui/editors/segment/PlayListDialog.h b/src/gui/editors/segment/PlayListDialog.h index 69956dd..0ae205c 100644 --- a/src/gui/editors/segment/PlayListDialog.h +++ b/src/gui/editors/segment/PlayListDialog.h @@ -46,7 +46,7 @@ class PlayListDialog : public KDialogBase TQ_OBJECT public: - PlayListDialog(TQString caption, TQWidget* tqparent = 0, const char* name = 0); + PlayListDialog(TQString caption, TQWidget* parent = 0, const char* name = 0); PlayList* getPlayList() { return m_playList; } diff --git a/src/gui/editors/segment/PlayListView.cpp b/src/gui/editors/segment/PlayListView.cpp index e83e5e6..ff4d1c8 100644 --- a/src/gui/editors/segment/PlayListView.cpp +++ b/src/gui/editors/segment/PlayListView.cpp @@ -29,8 +29,8 @@ namespace Rosegarden { -PlayListView::PlayListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +PlayListView::PlayListView(TQWidget *parent, const char *name) + : KListView(parent, name) { addColumn(i18n("Title")); addColumn(i18n("File name")); diff --git a/src/gui/editors/segment/PlayListView.h b/src/gui/editors/segment/PlayListView.h index b21551e..43390d0 100644 --- a/src/gui/editors/segment/PlayListView.h +++ b/src/gui/editors/segment/PlayListView.h @@ -32,7 +32,7 @@ namespace Rosegarden { class PlayListView : public KListView { public: - PlayListView(TQWidget *tqparent=0, const char *name=0); + PlayListView(TQWidget *parent=0, const char *name=0); TQListViewItem* previousSibling(TQListViewItem*); diff --git a/src/gui/editors/segment/PlayListViewItem.cpp b/src/gui/editors/segment/PlayListViewItem.cpp index 12d60b8..ab0c25c 100644 --- a/src/gui/editors/segment/PlayListViewItem.cpp +++ b/src/gui/editors/segment/PlayListViewItem.cpp @@ -26,14 +26,14 @@ namespace Rosegarden { -PlayListViewItem::PlayListViewItem(KListView* tqparent, KURL kurl) - : KListViewItem(tqparent, kurl.fileName(), kurl.prettyURL()), +PlayListViewItem::PlayListViewItem(KListView* parent, KURL kurl) + : KListViewItem(parent, kurl.fileName(), kurl.prettyURL()), m_kurl(kurl) { } -PlayListViewItem::PlayListViewItem(KListView* tqparent, TQListViewItem* after, KURL kurl) - : KListViewItem(tqparent, after, kurl.fileName(), kurl.prettyURL()), +PlayListViewItem::PlayListViewItem(KListView* parent, TQListViewItem* after, KURL kurl) + : KListViewItem(parent, after, kurl.fileName(), kurl.prettyURL()), m_kurl(kurl) { } diff --git a/src/gui/editors/segment/PlayListViewItem.h b/src/gui/editors/segment/PlayListViewItem.h index aa39bb8..a622682 100644 --- a/src/gui/editors/segment/PlayListViewItem.h +++ b/src/gui/editors/segment/PlayListViewItem.h @@ -33,8 +33,8 @@ namespace Rosegarden { class PlayListViewItem : public KListViewItem { public: - PlayListViewItem(KListView* tqparent, KURL); - PlayListViewItem(KListView* tqparent, TQListViewItem*, KURL); + PlayListViewItem(KListView* parent, KURL); + PlayListViewItem(KListView* parent, TQListViewItem*, KURL); const KURL& getURL() { return m_kurl; } diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp index fba7327..2e779fd 100644 --- a/src/gui/editors/segment/TrackButtons.cpp +++ b/src/gui/editors/segment/TrackButtons.cpp @@ -72,10 +72,10 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc, unsigned int trackLabelWidth, bool showTrackLabels, int overallHeight, - TQWidget* tqparent, + TQWidget* parent, const char* name, WFlags f) - : TQFrame(tqparent, name, f), + : TQFrame(parent, name, f), m_doc(doc), m_tqlayout(new TQVBoxLayout(this)), m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), diff --git a/src/gui/editors/segment/TrackButtons.h b/src/gui/editors/segment/TrackButtons.h index 050c564..0622642 100644 --- a/src/gui/editors/segment/TrackButtons.h +++ b/src/gui/editors/segment/TrackButtons.h @@ -62,7 +62,7 @@ public: unsigned int trackLabelWidth, bool showTrackLabels, int overallHeight, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0, WFlags f=0); diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp index 7381790..3fa85ba 100644 --- a/src/gui/editors/segment/TrackEditor.cpp +++ b/src/gui/editors/segment/TrackEditor.cpp @@ -87,10 +87,10 @@ TrackEditor::TrackEditor(RosegardenGUIDoc* doc, RulerScale *rulerScale, bool showTrackLabels, double initialUnitsPerPixel, - TQWidget* tqparent, const char* name, + TQWidget* parent, const char* name, WFlags) : DCOPObject("TrackEditorIface"), - TQWidget(tqparent, name), + TQWidget(parent, name), m_doc(doc), m_rulerScale(rulerScale), m_topStandardRuler(0), @@ -166,7 +166,7 @@ TrackEditor::init(TQWidget* rosegardenguiview) connect(rosegardenguiview, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId))); - connect(rosegardenguiview->tqparent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), + connect(rosegardenguiview->parent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)), m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId))); m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this); diff --git a/src/gui/editors/segment/TrackEditor.h b/src/gui/editors/segment/TrackEditor.h index 86e3b77..88dab1d 100644 --- a/src/gui/editors/segment/TrackEditor.h +++ b/src/gui/editors/segment/TrackEditor.h @@ -78,7 +78,7 @@ public: RulerScale *rulerScale, bool showTrackLabels, double initialUnitsPerPixel = 0, - TQWidget* tqparent = 0, const char* name = 0, + TQWidget* parent = 0, const char* name = 0, WFlags f=0); ~TrackEditor(); diff --git a/src/gui/editors/segment/TrackHeader.h b/src/gui/editors/segment/TrackHeader.h index 56891f4..d1abcc1 100644 --- a/src/gui/editors/segment/TrackHeader.h +++ b/src/gui/editors/segment/TrackHeader.h @@ -43,9 +43,9 @@ class TrackHeader : public TQHeader public: TrackHeader(int number, - TQWidget *tqparent=0, + TQWidget *parent=0, const char *name=0 ): - TQHeader(number, tqparent, name) {;} + TQHeader(number, parent, name) {;} ~TrackHeader(); protected: diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp index 53795a7..144fcd6 100644 --- a/src/gui/editors/segment/TrackLabel.cpp +++ b/src/gui/editors/segment/TrackLabel.cpp @@ -45,9 +45,9 @@ namespace Rosegarden TrackLabel::TrackLabel(TrackId id, int position, - TQWidget *tqparent, + TQWidget *parent, const char *name): - TQWidgetStack(tqparent, name), + TQWidgetStack(parent, name), m_instrumentLabel(new TQLabel(this)), m_trackLabel(new TQLabel(this)), m_id(id), diff --git a/src/gui/editors/segment/TrackLabel.h b/src/gui/editors/segment/TrackLabel.h index a7b5207..5369165 100644 --- a/src/gui/editors/segment/TrackLabel.h +++ b/src/gui/editors/segment/TrackLabel.h @@ -62,7 +62,7 @@ public: TrackLabel(TrackId id, int position, - TQWidget *tqparent, + TQWidget *parent, const char *name=0); ~TrackLabel(); diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp index 5001a28..ad91278 100644 --- a/src/gui/editors/segment/TrackVUMeter.cpp +++ b/src/gui/editors/segment/TrackVUMeter.cpp @@ -34,13 +34,13 @@ namespace Rosegarden { -TrackVUMeter::TrackVUMeter(TQWidget *tqparent, +TrackVUMeter::TrackVUMeter(TQWidget *parent, VUMeterType type, int width, int height, int position, const char *name): - VUMeter(tqparent, type, false, false, width, height, VUMeter::Horizontal, name), + VUMeter(parent, type, false, false, width, height, VUMeter::Horizontal, name), m_position(position), m_textHeight(12) { tqsetAlignment(AlignCenter); diff --git a/src/gui/editors/segment/TrackVUMeter.h b/src/gui/editors/segment/TrackVUMeter.h index 9630301..dad0455 100644 --- a/src/gui/editors/segment/TrackVUMeter.h +++ b/src/gui/editors/segment/TrackVUMeter.h @@ -40,7 +40,7 @@ namespace Rosegarden class TrackVUMeter: public VUMeter { public: - TrackVUMeter(TQWidget *tqparent = 0, + TrackVUMeter(TQWidget *parent = 0, VUMeterType type = Plain, int width = 0, int height = 0, diff --git a/src/gui/editors/segment/TriggerManagerItem.h b/src/gui/editors/segment/TriggerManagerItem.h index 1d6a819..eb52a86 100644 --- a/src/gui/editors/segment/TriggerManagerItem.h +++ b/src/gui/editors/segment/TriggerManagerItem.h @@ -35,7 +35,7 @@ namespace Rosegarden { class TriggerManagerItem : public TQListViewItem { public: - TriggerManagerItem(TQListView * tqparent, TQString label1, + TriggerManagerItem(TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), @@ -43,7 +43,7 @@ public: TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString()): - TQListViewItem(tqparent, label1, label2, label3, label4, + TQListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { ; } virtual int compare(TQListViewItem * i, int col, bool ascending) const; diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp index e658cc3..29b7bf0 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.cpp +++ b/src/gui/editors/segment/TriggerSegmentManager.cpp @@ -73,9 +73,9 @@ namespace Rosegarden { -TriggerSegmentManager::TriggerSegmentManager(TQWidget *tqparent, +TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent, RosegardenGUIDoc *doc): - KMainWindow(tqparent, "triggereditordialog"), + KMainWindow(parent, "triggereditordialog"), m_doc(doc), m_modified(false) { diff --git a/src/gui/editors/segment/TriggerSegmentManager.h b/src/gui/editors/segment/TriggerSegmentManager.h index dbe5ea0..bae2245 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.h +++ b/src/gui/editors/segment/TriggerSegmentManager.h @@ -53,7 +53,7 @@ class TriggerSegmentManager : public KMainWindow TQ_OBJECT public: - TriggerSegmentManager(TQWidget *tqparent, + TriggerSegmentManager(TQWidget *parent, RosegardenGUIDoc *doc); ~TriggerSegmentManager(); diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp index 1ae0acd..182eb9b 100644 --- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp +++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp @@ -44,8 +44,8 @@ static int apuExtantCount = 0; AudioPreviewUpdater::AudioPreviewUpdater(AudioPreviewThread &thread, const Composition& c, const Segment* s, const TQRect& r, - CompositionModelImpl* tqparent) - : TQObject(tqparent), + CompositionModelImpl* parent) + : TQObject(parent), m_thread(thread), m_composition(c), m_segment(s), diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h index 047f9b2..f7ef967 100644 --- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h +++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h @@ -53,7 +53,7 @@ public: const Composition &composition, const Segment *segment, const TQRect &displayExtent, - CompositionModelImpl *tqparent); + CompositionModelImpl *parent); ~AudioPreviewUpdater(); void update(); diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp index d4e7909..7d38151 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp @@ -88,12 +88,12 @@ protected: CompositionView::CompositionView(RosegardenGUIDoc* doc, CompositionModel* model, - TQWidget * tqparent, const char * name, WFlags f) + TQWidget * parent, const char * name, WFlags f) #if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0) - : RosegardenScrollView(tqparent, name, f | WNoAutoErase | WStaticContents), + : RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents), #else : - RosegardenScrollView(tqparent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents), + RosegardenScrollView(parent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents), #endif m_model(model), m_currentItem(0), diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h index 12c5fb4..a1f6f07 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h @@ -67,7 +67,7 @@ class CompositionView : public RosegardenScrollView TQ_OBJECT public: CompositionView(RosegardenGUIDoc*, CompositionModel*, - TQWidget * tqparent=0, const char* name=0, WFlags f=0); + TQWidget * parent=0, const char* name=0, WFlags f=0); void setPointerPos(int pos); int getPointerPos() { return m_pointerPos; } diff --git a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h index 00d942e..cdf373e 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h @@ -44,7 +44,7 @@ class RulerScale; class SegmentItemPreview { public: - SegmentItemPreview(Segment& tqparent, + SegmentItemPreview(Segment& parent, RulerScale* scale); virtual ~SegmentItemPreview(); diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp index 130add7..85800b2 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp @@ -42,7 +42,7 @@ namespace Rosegarden { SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc) - : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->tqparent())->factory(), TQT_TQOBJECT(canvas)), + : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->parent())->factory(), TQT_TQOBJECT(canvas)), m_canvas(canvas), m_doc(doc), m_changeMade(false) @@ -86,7 +86,7 @@ SegmentTool::createMenu() RG_DEBUG << "SegmentTool::createMenu()\n"; RosegardenGUIApp *app = - dynamic_cast<RosegardenGUIApp*>(m_doc->tqparent()); + dynamic_cast<RosegardenGUIApp*>(m_doc->parent()); if (app) { m_menu = static_cast<TQPopupMenu*> diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.h b/src/gui/editors/segment/segmentcanvas/SegmentTool.h index 1b33ba3..5b054a8 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentTool.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.h @@ -64,7 +64,7 @@ public: virtual ~SegmentTool(); /** - * Is called by the tqparent View (EditView or SegmentCanvas) when + * Is called by the parent View (EditView or SegmentCanvas) when * the tool is set as current. * Add any setup here */ diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp index c0b4aeb..68bee60 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp @@ -42,9 +42,9 @@ namespace Rosegarden { -SegmentToolBox::SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc* doc) - : BaseToolBox(tqparent), - m_canvas(tqparent), +SegmentToolBox::SegmentToolBox(CompositionView* parent, RosegardenGUIDoc* doc) + : BaseToolBox(parent), + m_canvas(parent), m_doc(doc) {} diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h index c975e53..92306f3 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h @@ -45,7 +45,7 @@ class SegmentToolBox : public BaseToolBox Q_OBJECT TQ_OBJECT public: - SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc*); + SegmentToolBox(CompositionView* parent, RosegardenGUIDoc*); virtual SegmentTool* getTool(const TQString& toolName); diff --git a/src/gui/editors/tempo/TempoListItem.h b/src/gui/editors/tempo/TempoListItem.h index be9e7a1..4d62ab0 100644 --- a/src/gui/editors/tempo/TempoListItem.h +++ b/src/gui/editors/tempo/TempoListItem.h @@ -42,12 +42,12 @@ public: Type type, timeT time, int index, - KListView *tqparent, + KListView *parent, TQString label1, TQString label2, TQString label3, TQString label4 = TQString()) : - KListViewItem(tqparent, label1, label2, label3, label4), + KListViewItem(parent, label1, label2, label3, label4), m_composition(composition), m_type(type), m_time(time), diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp index f8b680d..7629632 100644 --- a/src/gui/editors/tempo/TempoView.cpp +++ b/src/gui/editors/tempo/TempoView.cpp @@ -70,8 +70,8 @@ int TempoView::m_lastSetFilter = -1; -TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *tqparent, timeT openTime): - EditViewBase(doc, std::vector<Segment *>(), 2, tqparent, "tempoview"), +TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT openTime): + EditViewBase(doc, std::vector<Segment *>(), 2, parent, "tempoview"), m_filter(Tempo | TimeSignature), m_ignoreUpdates(true) { diff --git a/src/gui/editors/tempo/TempoView.h b/src/gui/editors/tempo/TempoView.h index b715d24..ad69a32 100644 --- a/src/gui/editors/tempo/TempoView.h +++ b/src/gui/editors/tempo/TempoView.h @@ -72,7 +72,7 @@ class TempoView : public EditViewBase, public CompositionObserver }; public: - TempoView(RosegardenGUIDoc *doc, TQWidget *tqparent, timeT); + TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT); virtual ~TempoView(); virtual bool applyLayout(int staffNo = -1); |