summaryrefslogtreecommitdiffstats
path: root/src/gui/general
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/general')
-rw-r--r--src/gui/general/EditView.cpp4
-rw-r--r--src/gui/general/EditViewBase.cpp6
-rw-r--r--src/gui/general/LinedStaff.cpp30
-rw-r--r--src/gui/general/LinedStaff.h50
-rw-r--r--src/gui/general/PresetHandlerDialog.cpp18
5 files changed, 54 insertions, 54 deletions
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index 4694e02..42655f8 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -138,7 +138,7 @@ EditView::EditView(RosegardenGUIDoc *doc,
connect(m_controlRulers, TQT_SIGNAL(closeRequest(TQWidget*)),
this, TQT_SLOT(slotRemoveControlRuler(TQWidget*)));
- (dynamic_cast<TQBoxLayout*>(m_bottomBox->tqlayout()))->setDirection(TQBoxLayout::BottomToTop);
+ (dynamic_cast<TQBoxLayout*>(m_bottomBox->layout()))->setDirection(TQBoxLayout::BottomToTop);
// m_rulerBoxFiller is a white label used to keep m_rulerBox exactly
// above the scrolling part of the view (and never above the
@@ -169,7 +169,7 @@ EditView::~EditView()
void EditView::updateBottomWidgetGeometry()
{
- getBottomWidget()->tqlayout()->invalidate();
+ getBottomWidget()->layout()->invalidate();
getBottomWidget()->updateGeometry();
getCanvasView()->updateBottomWidgetGeometry();
}
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index d618a68..6f5cbfe 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -311,7 +311,7 @@ EditViewBase::makeViewLocalPropertyPrefix()
void EditViewBase::paintEvent(TQPaintEvent* e)
{
// It is possible for this function to be called re-entrantly,
- // because a re-tqlayout procedure may deliberately ask the event
+ // because a re-layout procedure may deliberately ask the event
// loop to process some more events so as to keep the GUI looking
// responsive. If that happens, we remember the events that came
// in in the middle of one paintEvent call and process their union
@@ -362,7 +362,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
//
// If we have more than one segment modified, we need to update
// them all at once with the same time range, otherwise we can run
- // into problems when the tqlayout of one depends on the others. So
+ // into problems when the layout of one depends on the others. So
// we use updateStart/End to calculate a bounding range for all
// modifications.
@@ -379,7 +379,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
if (refreshStatus.needsRefresh() && isCompositionModified()) {
- // if composition is also modified, retqlayout everything
+ // if composition is also modified, relayout everything
refreshSegment(0);
segmentsToUpdate = 0;
break;
diff --git a/src/gui/general/LinedStaff.cpp b/src/gui/general/LinedStaff.cpp
index bb6bf59..9156efe 100644
--- a/src/gui/general/LinedStaff.cpp
+++ b/src/gui/general/LinedStaff.cpp
@@ -572,7 +572,7 @@ LinedStaff::getCanvasXForLeftOfRow(int row) const
}
void
-LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
+LinedStaff::sizeStaff(HorizontalLayoutEngine &layout)
{
Profiler profiler("LinedStaff::sizeStaff", true);
@@ -582,19 +582,19 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
// RG_DEBUG << "LinedStaff::sizeStaff" << endl;
- int lastBar = tqlayout.getLastVisibleBarOnStaff(*this);
+ int lastBar = layout.getLastVisibleBarOnStaff(*this);
double xleft = 0, xright = 0;
bool haveXLeft = false;
- xright = tqlayout.getBarPosition(lastBar) - 1;
+ xright = layout.getBarPosition(lastBar) - 1;
TimeSignature currentTimeSignature;
- for (int barNo = tqlayout.getFirstVisibleBarOnStaff(*this);
+ for (int barNo = layout.getFirstVisibleBarOnStaff(*this);
barNo <= lastBar; ++barNo) {
- double x = tqlayout.getBarPosition(barNo);
+ double x = layout.getBarPosition(barNo);
if (!haveXLeft) {
xleft = x;
@@ -603,7 +603,7 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
double timeSigX = 0;
TimeSignature timeSig;
- bool isNew = tqlayout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX);
+ bool isNew = layout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX);
if (isNew && barNo < lastBar) {
currentTimeSignature = timeSig;
@@ -619,8 +619,8 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
insertBar(x,
((barNo == lastBar) ? 0 :
- (tqlayout.getBarPosition(barNo + 1) - x)),
- tqlayout.isBarCorrectOnStaff(*this, barNo - 1),
+ (layout.getBarPosition(barNo + 1) - x)),
+ layout.isBarCorrectOnStaff(*this, barNo - 1),
currentTimeSignature,
barNo,
showBarNo);
@@ -745,7 +745,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
else
line->show();
- // The bar lines have to be in order of tqlayout-x (there's no
+ // The bar lines have to be in order of layout-x (there's no
// such interesting stipulation for beat or connecting lines)
BarLineList::iterator insertPoint = lower_bound
(m_barLines.begin(), m_barLines.end(), line, compareBars);
@@ -1110,10 +1110,10 @@ LinedStaff::getLayoutXOfInsertCursor() const
}
timeT
-LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &tqlayout) const
+LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &layout) const
{
if (m_insertCursorTimeValid) return m_insertCursorTime;
- return tqlayout.getTimeForX(getLayoutXOfInsertCursor());
+ return layout.getTimeForX(getLayoutXOfInsertCursor());
}
void
@@ -1141,10 +1141,10 @@ LinedStaff::setPointerPosition(double canvasX, int canvasY)
}
void
-LinedStaff::setPointerPosition(HorizontalLayoutEngine &tqlayout,
+LinedStaff::setPointerPosition(HorizontalLayoutEngine &layout,
timeT time)
{
- setPointerPosition(tqlayout.getXForTime(time));
+ setPointerPosition(layout.getXForTime(time));
}
void
@@ -1176,10 +1176,10 @@ LinedStaff::setInsertCursorPosition(double canvasX, int canvasY)
}
void
-LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &tqlayout,
+LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &layout,
timeT time)
{
- double x = tqlayout.getXForTime(time);
+ double x = layout.getXForTime(time);
LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(x, 0);
setInsertCursorPosition(coords.first, coords.second);
m_insertCursorTime = time;
diff --git a/src/gui/general/LinedStaff.h b/src/gui/general/LinedStaff.h
index 3dff372..0ebdf5f 100644
--- a/src/gui/general/LinedStaff.h
+++ b/src/gui/general/LinedStaff.h
@@ -87,7 +87,7 @@ public:
protected:
/**
* Create a new LinedStaff for the given Segment, with a
- * linear tqlayout.
+ * linear layout.
*
* \a id is an arbitrary id for the staff in its view,
* not used within the LinedStaff implementation but
@@ -104,7 +104,7 @@ protected:
/**
* Create a new LinedStaff for the given Segment, with a
- * page tqlayout.
+ * page layout.
*
* \a id is an arbitrary id for the staff in its view,
* not used within the LinedStaff implementation but
@@ -117,7 +117,7 @@ protected:
* staff line should be
*
* \a pageWidth is the width of a page, to determine
- * when to break lines for page tqlayout
+ * when to break lines for page layout
*
* \a rowsPerPage is the number of rows to a page, or zero
* for a single continuous page
@@ -131,7 +131,7 @@ protected:
/**
* Create a new LinedStaff for the given Segment, with
- * either page or linear tqlayout.
+ * either page or linear layout.
*/
LinedStaff(TQCanvas *, Segment *, SnapGrid *,
int id, int resolution, int lineThickness, PageMode pageMode,
@@ -304,14 +304,14 @@ public:
virtual int getTitleHeight() const;
/**
- * Returns the width of the entire staff after tqlayout. Call
+ * Returns the width of the entire staff after layout. Call
* this only after you've done the full sizeStaff/positionElements
* procedure.
*/
virtual double getTotalWidth() const;
/**
- * Returns the height of the entire staff after tqlayout. Call
+ * Returns the height of the entire staff after layout. Call
* this only after you've done the full sizeStaff/positionElements
* procedure. If there are multiple rows, this will be the
* height of all rows, including any space between rows that
@@ -383,26 +383,26 @@ public:
virtual void setCurrent(bool current);
/**
- * Move the playback pointer to the tqlayout-X coordinate
+ * Move the playback pointer to the layout-X coordinate
* corresponding to the given time, and show it.
*/
virtual void setPointerPosition
(HorizontalLayoutEngine&, timeT);
/**
- * Move the playback pointer to the tqlayout-X coordinate
+ * Move the playback pointer to the layout-X coordinate
* corresponding to the given canvas coordinates, and show it.
*/
virtual void setPointerPosition(double x, int y);
/**
- * Move the playback pointer to the given tqlayout-X
+ * Move the playback pointer to the given layout-X
* coordinate, and show it.
*/
virtual void setPointerPosition(double x);
/**
- * Returns the tqlayout-X coordinate corresponding to the current
+ * Returns the layout-X coordinate corresponding to the current
* position of the playback pointer.
*/
virtual double getLayoutXOfPointer() const;
@@ -419,19 +419,19 @@ public:
virtual void hidePointer();
/**
- * Move the insertion cursor to the tqlayout-X coordinate
+ * Move the insertion cursor to the layout-X coordinate
* corresponding to the given time, and show it.
*/
virtual void setInsertCursorPosition(HorizontalLayoutEngine&, timeT);
/**
- * Move the insertion cursor to the tqlayout-X coordinate
+ * Move the insertion cursor to the layout-X coordinate
* corresponding to the given canvas coordinates, and show it.
*/
virtual void setInsertCursorPosition(double x, int y);
/**
- * Returns the tqlayout-X coordinate corresponding to the current
+ * Returns the layout-X coordinate corresponding to the current
* position of the insertion cursor. Returns -1 if this staff
* is not current or there is some other problem.
*/
@@ -454,8 +454,8 @@ public:
virtual void hideInsertCursor();
/**
- * Query the given horizontal tqlayout object (which is assumed to
- * have just completed its tqlayout procedure) to determine the
+ * Query the given horizontal layout object (which is assumed to
+ * have just completed its layout procedure) to determine the
* required extents of the staff and the positions of the bars,
* and create the bars and staff lines accordingly. It may be
* called either before or after renderElements and/or
@@ -464,7 +464,7 @@ public:
* No bars or staff lines will appear unless this method has
* been called.
*/
- virtual void sizeStaff(HorizontalLayoutEngine& tqlayout);
+ virtual void sizeStaff(HorizontalLayoutEngine& layout);
/**
* Generate or re-generate sprites for all the elements between
@@ -486,9 +486,9 @@ public:
/**
* Assign suitable coordinates to the elements on the staff
- * between the start and end times, based entirely on the tqlayout
+ * between the start and end times, based entirely on the layout
* X and Y coordinates they were given by the horizontal and
- * vertical tqlayout processes.
+ * vertical layout processes.
*
* The implementation is free to render any elements it
* chooses in this method as well.
@@ -519,7 +519,7 @@ public:
* Also return the clef and key in force at these coordinates.
*
* The default implementation should suit for subclasses that only
- * show a single element per tqlayout X coordinate.
+ * show a single element per layout X coordinate.
*/
virtual ViewElementList::iterator getClosestElementToCanvasCoords
(double x, int y,
@@ -533,7 +533,7 @@ public:
/**
* Return an iterator pointing to the nearest view element to the
- * given tqlayout x-coordinate.
+ * given layout x-coordinate.
*
* If notesAndRestsOnly is true, do not return any view element
* other than a note or rest.
@@ -564,7 +564,7 @@ public:
*
*
* The default implementation should suit for subclasses that only
- * show a single element per tqlayout X coordinate.
+ * show a single element per layout X coordinate.
*/
virtual ViewElementList::iterator getElementUnderCanvasCoords
(double x, int y, Event *&clef, Event *&key) {
@@ -627,10 +627,10 @@ public:
protected:
// Methods that the subclass may (indeed, should) use to convert
- // between the tqlayout coordinates of elements and their canvas
+ // between the layout coordinates of elements and their canvas
// coordinates. These are deliberately not virtual.
- // Note that even linear-tqlayout staffs have multiple rows; their
+ // Note that even linear-layout staffs have multiple rows; their
// rows all have the same y coordinate but increasing x
// coordinates, instead of the other way around. (The only reason
// for this is that it seems to be more efficient from the TQCanvas
@@ -682,7 +682,7 @@ protected:
// signatures, override the deleteTimeSignatures and
// insertTimeSignature methods. For repeated clefs and keys at
// the start of each row, override deleteRepeatedClefsAndKeys
- // and insertRepeatedClefAndKey, but note that your tqlayout class
+ // and insertRepeatedClefAndKey, but note that your layout class
// will need to allot the space for them separately.
virtual void resizeStaffLines();
@@ -737,7 +737,7 @@ protected:
ItemMatrix m_staffLines;
ItemList m_staffConnectingLines;
- typedef std::pair<double, TQCanvasItem *> LineRec; // tqlayout-x, line
+ typedef std::pair<double, TQCanvasItem *> LineRec; // layout-x, line
typedef FastVector<LineRec> LineRecList;
typedef FastVector<BarLine *> BarLineList;//!!! should be multiset I reckon
static bool compareBars(const BarLine *, const BarLine *);
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index 9d9c897..79124e4 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -81,7 +81,7 @@ PresetHandlerDialog::initDialog()
TQFrame *frame = new TQFrame(vBox);
- TQGridLayout *tqlayout = new TQGridLayout(frame, 6, 5, 10, 5);
+ TQGridLayout *layout = new TQGridLayout(frame, 6, 5, 10, 5);
TQLabel *title = new TQLabel(i18n("Select preset track parameters for:"), frame);
if (m_fromNotation) title->setText(i18n("Create appropriate notation for:"));
@@ -114,14 +114,14 @@ PresetHandlerDialog::initDialog()
onlyNewSegments->setChecked(true);
}
- tqlayout->addMultiCellWidget(title, 0, 0, 0, 1, AlignLeft);
- tqlayout->addWidget(catlabel, 1, 0, AlignRight);
- tqlayout->addWidget(m_categoryCombo, 1, 1);
- tqlayout->addWidget(inslabel, 2, 0, AlignRight);
- tqlayout->addWidget(m_instrumentCombo, 2, 1);
- tqlayout->addWidget(plylabel, 3, 0, AlignRight);
- tqlayout->addWidget(m_playerCombo, 3, 1);
- tqlayout->addMultiCellWidget(scopeBox, 4, 4, 0, 1, AlignLeft);
+ layout->addMultiCellWidget(title, 0, 0, 0, 1, AlignLeft);
+ layout->addWidget(catlabel, 1, 0, AlignRight);
+ layout->addWidget(m_categoryCombo, 1, 1);
+ layout->addWidget(inslabel, 2, 0, AlignRight);
+ layout->addWidget(m_instrumentCombo, 2, 1);
+ layout->addWidget(plylabel, 3, 0, AlignRight);
+ layout->addWidget(m_playerCombo, 3, 1);
+ layout->addMultiCellWidget(scopeBox, 4, 4, 0, 1, AlignLeft);
populateCategoryCombo();
// try to set to same category used previously
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 06:51:06 +0000