diff options
Diffstat (limited to 'src/gui/editors/matrix')
-rw-r--r-- | src/gui/editors/matrix/MatrixCanvasView.cpp | 4 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixCanvasView.h | 2 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixEraser.cpp | 4 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixMover.cpp | 4 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixPainter.cpp | 8 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixParameterBox.cpp | 4 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixParameterBox.h | 2 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixResizer.cpp | 4 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixTool.cpp | 6 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixToolBox.cpp | 6 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixToolBox.h | 2 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixView.cpp | 6 | ||||
-rw-r--r-- | src/gui/editors/matrix/MatrixView.h | 2 | ||||
-rw-r--r-- | src/gui/editors/matrix/PianoKeyboard.cpp | 4 | ||||
-rw-r--r-- | src/gui/editors/matrix/PianoKeyboard.h | 2 |
15 files changed, 30 insertions, 30 deletions
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; |