summaryrefslogtreecommitdiffstats
path: root/src/gui/general
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/general')
-rw-r--r--src/gui/general/BarLine.h8
-rw-r--r--src/gui/general/BaseTool.cpp4
-rw-r--r--src/gui/general/BaseTool.h2
-rw-r--r--src/gui/general/EditTool.cpp6
-rw-r--r--src/gui/general/EditTool.h2
-rw-r--r--src/gui/general/EditToolBox.cpp2
-rw-r--r--src/gui/general/EditToolBox.h2
-rw-r--r--src/gui/general/EditView.cpp2
-rw-r--r--src/gui/general/LinedStaff.cpp40
-rw-r--r--src/gui/general/LinedStaff.h14
-rw-r--r--src/gui/general/PixmapFunctions.h6
11 files changed, 44 insertions, 44 deletions
diff --git a/src/gui/general/BarLine.h b/src/gui/general/BarLine.h
index 02157f1..518135c 100644
--- a/src/gui/general/BarLine.h
+++ b/src/gui/general/BarLine.h
@@ -34,24 +34,24 @@ namespace Rosegarden {
class BarLine : public TQCanvasPolygonalItem
{
public:
- BarLine(TQCanvas *canvas, double tqlayoutX,
+ BarLine(TQCanvas *canvas, double layoutX,
int barLineHeight, int baseBarThickness, int lineSpacing,
int inset, LinedStaff::BarStyle style) :
TQCanvasPolygonalItem(canvas),
- m_tqlayoutX(tqlayoutX),
+ m_layoutX(layoutX),
m_barLineHeight(barLineHeight),
m_baseBarThickness(baseBarThickness),
m_lineSpacing(lineSpacing),
m_inset(inset),
m_style(style) { }
- double getLayoutX() const { return m_tqlayoutX; }
+ double getLayoutX() const { return m_layoutX; }
virtual TQPointArray areaPoints() const;
virtual void drawShape(TQPainter &);
protected:
- double m_tqlayoutX;
+ double m_layoutX;
int m_barLineHeight;
int m_baseBarThickness;
int m_lineSpacing;
diff --git a/src/gui/general/BaseTool.cpp b/src/gui/general/BaseTool.cpp
index ee95231..76dc608 100644
--- a/src/gui/general/BaseTool.cpp
+++ b/src/gui/general/BaseTool.cpp
@@ -40,7 +40,7 @@ BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject*
: TQObject(tqparent),
m_menuName(menuName),
m_menu(0),
- m_tqparentFactory(factory)
+ m_parentFactory(factory)
{}
BaseTool::~BaseTool()
@@ -48,7 +48,7 @@ BaseTool::~BaseTool()
RG_DEBUG << "BaseTool::~BaseTool()\n";
// delete m_menu;
- // m_tqparentView->factory()->removeClient(this);
+ // m_parentView->factory()->removeClient(this);
// m_instance = 0;
}
diff --git a/src/gui/general/BaseTool.h b/src/gui/general/BaseTool.h
index 29ef8dd..c750679 100644
--- a/src/gui/general/BaseTool.h
+++ b/src/gui/general/BaseTool.h
@@ -101,7 +101,7 @@ protected:
TQString m_menuName;
TQPopupMenu* m_menu;
- KXMLGUIFactory* m_tqparentFactory;
+ KXMLGUIFactory* m_parentFactory;
TQString m_contextHelp;
};
diff --git a/src/gui/general/EditTool.cpp b/src/gui/general/EditTool.cpp
index 8a07fe8..b08024c 100644
--- a/src/gui/general/EditTool.cpp
+++ b/src/gui/general/EditTool.cpp
@@ -42,7 +42,7 @@ namespace Rosegarden
EditTool::EditTool(const TQString& menuName, EditView* view)
: BaseTool(menuName, view->factory(), TQT_TQOBJECT(view)),
- m_tqparentView(view)
+ m_parentView(view)
{}
void EditTool::handleMousePress(timeT time,
@@ -123,9 +123,9 @@ void EditTool::createMenu()
RG_DEBUG << "BaseTool::createMenu() " << m_rcFileName << " - " << m_menuName << endl;
setXMLFile(m_rcFileName);
- m_tqparentFactory->addClient(this);
+ m_parentFactory->addClient(this);
- TQWidget* tmp = m_tqparentFactory->container(m_menuName, this);
+ TQWidget* tmp = m_parentFactory->container(m_menuName, this);
if (!tmp)
RG_DEBUG << "BaseTool::createMenu(" << m_rcFileName
diff --git a/src/gui/general/EditTool.h b/src/gui/general/EditTool.h
index f38bfa1..7fda27f 100644
--- a/src/gui/general/EditTool.h
+++ b/src/gui/general/EditTool.h
@@ -157,7 +157,7 @@ protected:
//--------------- Data members ---------------------------------
TQString m_rcFileName;
- EditView* m_tqparentView;
+ EditView* m_parentView;
};
diff --git a/src/gui/general/EditToolBox.cpp b/src/gui/general/EditToolBox.cpp
index c19a076..c96f8af 100644
--- a/src/gui/general/EditToolBox.cpp
+++ b/src/gui/general/EditToolBox.cpp
@@ -37,7 +37,7 @@ namespace Rosegarden
EditToolBox::EditToolBox(EditView *tqparent)
: BaseToolBox(tqparent),
- m_tqparentView(tqparent)
+ m_parentView(tqparent)
{
}
diff --git a/src/gui/general/EditToolBox.h b/src/gui/general/EditToolBox.h
index 1818b35..becb023 100644
--- a/src/gui/general/EditToolBox.h
+++ b/src/gui/general/EditToolBox.h
@@ -57,7 +57,7 @@ protected:
//--------------- Data members ---------------------------------
- EditView* m_tqparentView;
+ EditView* m_parentView;
};
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index f216dad..8566b7e 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -112,7 +112,7 @@ const unsigned int EditView::TOPBARBUTTONS_ROW = RULERS_ROW + 1;
const unsigned int EditView::CANVASVIEW_ROW = TOPBARBUTTONS_ROW + 1;
const unsigned int EditView::CONTROLRULER_ROW = CANVASVIEW_ROW + 1;
-// Just some simple features we might want to show - make them bit tqmaskable
+// Just some simple features we might want to show - make them bit maskable
//
static int FeatureShowVelocity = 0x00001; // show the velocity ruler
diff --git a/src/gui/general/LinedStaff.cpp b/src/gui/general/LinedStaff.cpp
index 5ca0c90..ffaa28c 100644
--- a/src/gui/general/LinedStaff.cpp
+++ b/src/gui/general/LinedStaff.cpp
@@ -443,8 +443,8 @@ LinedStaff::getBarExtents(double x, int y) const
for (int i = 1; i < m_barLines.size(); ++i) {
- double tqlayoutX = m_barLines[i]->getLayoutX();
- int barRow = getRowForLayoutX(tqlayoutX);
+ double layoutX = m_barLines[i]->getLayoutX();
+ int barRow = getRowForLayoutX(layoutX);
if (m_pageMode != LinearMode && (barRow < row))
continue;
@@ -667,41 +667,41 @@ LinedStaff::deleteBars()
}
void
-LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
+LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
const TimeSignature &timeSig,
int barNo, bool showBarNo)
{
- // RG_DEBUG << "insertBar: " << tqlayoutX << ", " << width
+ // RG_DEBUG << "insertBar: " << layoutX << ", " << width
// << ", " << isCorrect << endl;
int barThickness = m_lineThickness * 5 / 4;
// hack to ensure the bar line appears on the correct row in
- // notation page tqlayouts, with a conditional to prevent us from
+ // notation page layouts, with a conditional to prevent us from
// moving the bar and beat lines in the matrix
if (!showBeatLines()) {
if (width > 0.01) { // not final bar in staff
- tqlayoutX += 1;
+ layoutX += 1;
} else {
- tqlayoutX -= 1;
+ layoutX -= 1;
}
}
- int row = getRowForLayoutX(tqlayoutX);
- double x = getCanvasXForLayoutX(tqlayoutX);
+ int row = getRowForLayoutX(layoutX);
+ double x = getCanvasXForLayoutX(layoutX);
int y = getCanvasYForTopLine(row);
bool firstBarInRow = false, lastBarInRow = false;
if (m_pageMode != LinearMode &&
- (getRowForLayoutX(tqlayoutX) >
- getRowForLayoutX(tqlayoutX - getMargin() - 2)))
+ (getRowForLayoutX(layoutX) >
+ getRowForLayoutX(layoutX - getMargin() - 2)))
firstBarInRow = true;
if (m_pageMode != LinearMode &&
width > 0.01 && // width == 0 for final bar in staff
- (getRowForLayoutX(tqlayoutX) <
- getRowForLayoutX(tqlayoutX + width + getMargin() + 2)))
+ (getRowForLayoutX(layoutX) <
+ getRowForLayoutX(layoutX + width + getMargin() + 2)))
lastBarInRow = true;
BarStyle style = getBarStyle(barNo);
@@ -710,7 +710,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
style = RepeatStartBar;
if (firstBarInRow)
- insertRepeatedClefAndKey(tqlayoutX, barNo);
+ insertRepeatedClefAndKey(layoutX, barNo);
// If we're supposed to be hiding bar lines, we do just that --
// create them as normal, then hide them. We can't simply not
@@ -725,7 +725,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
inset = getBarInset(barNo, firstBarInRow);
}
- BarLine *line = new BarLine(m_canvas, tqlayoutX,
+ BarLine *line = new BarLine(m_canvas, layoutX,
getBarLineHeight(), barThickness, getLineSpacing(),
(int)inset, style);
@@ -758,7 +758,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
if (style == RepeatBothBar)
style = RepeatEndBar;
- BarLine *eline = new BarLine(m_canvas, tqlayoutX,
+ BarLine *eline = new BarLine(m_canvas, layoutX,
getBarLineHeight(), barThickness, getLineSpacing(),
0, style);
eline->moveBy(xe, y);
@@ -834,7 +834,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
rect->setZ( -1);
rect->show(); // show beat lines even if the bar lines are hidden
- LineRec beatLine(tqlayoutX + gridLine * dx, rect);
+ LineRec beatLine(layoutX + gridLine * dx, rect);
m_beatLines.push_back(beatLine);
}
}
@@ -854,7 +854,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
else
rect->show();
- LineRec connectingLine(tqlayoutX, rect);
+ LineRec connectingLine(layoutX, rect);
m_barConnectingLines.push_back(connectingLine);
}
}
@@ -1148,9 +1148,9 @@ LinedStaff::setPointerPosition(HorizontalLayoutEngine &tqlayout,
}
void
-LinedStaff::setPointerPosition(double tqlayoutX)
+LinedStaff::setPointerPosition(double layoutX)
{
- LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(tqlayoutX, 0);
+ LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX, 0);
setPointerPosition(coords.first, coords.second);
}
diff --git a/src/gui/general/LinedStaff.h b/src/gui/general/LinedStaff.h
index e7dab8f..3dff372 100644
--- a/src/gui/general/LinedStaff.h
+++ b/src/gui/general/LinedStaff.h
@@ -525,9 +525,9 @@ public:
(double x, int y,
Event *&clef, Event *&key,
bool notesAndRestsOnly = false, int proximityThreshold = 10) {
- LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(x, y);
+ LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(x, y);
return getClosestElementToLayoutX
- (tqlayoutCoords.first, clef, key,
+ (layoutCoords.first, clef, key,
notesAndRestsOnly, proximityThreshold);
}
@@ -568,8 +568,8 @@ public:
*/
virtual ViewElementList::iterator getElementUnderCanvasCoords
(double x, int y, Event *&clef, Event *&key) {
- LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(x, y);
- return getElementUnderLayoutX(tqlayoutCoords.first, clef, key);
+ LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(x, y);
+ return getElementUnderLayoutX(layoutCoords.first, clef, key);
}
/**
@@ -690,18 +690,18 @@ protected:
virtual void resizeStaffLineRow(int row, double offset, double length);
virtual void deleteBars();
- virtual void insertBar(double tqlayoutX, double width, bool isCorrect,
+ virtual void insertBar(double layoutX, double width, bool isCorrect,
const TimeSignature &,
int barNo, bool showBarNo);
// The default implementations of the following two are empty.
virtual void deleteTimeSignatures();
- virtual void insertTimeSignature(double tqlayoutX,
+ virtual void insertTimeSignature(double layoutX,
const TimeSignature &);
// The default implementations of the following two are empty.
virtual void deleteRepeatedClefsAndKeys();
- virtual void insertRepeatedClefAndKey(double tqlayoutX, int barNo);
+ virtual void insertRepeatedClefAndKey(double layoutX, int barNo);
void initCursors();
diff --git a/src/gui/general/PixmapFunctions.h b/src/gui/general/PixmapFunctions.h
index 22b743b..8a84813 100644
--- a/src/gui/general/PixmapFunctions.h
+++ b/src/gui/general/PixmapFunctions.h
@@ -42,7 +42,7 @@ public:
/**
* Generate a heuristic tqmask for the given pixmap. Unlike
* TQPixmap::createHeuristicMask, this removes from the tqmask all
- * pixels that are aptqparently "background" even if they appear in
+ * pixels that are apparently "background" even if they appear in
* holes in the middle of the image. This is more usually what we
* want than the default behaviour of createHeuristicMask.
*
@@ -55,7 +55,7 @@ public:
/**
* Generate a heuristic tqmask for the given pixmap. Unlike
* TQPixmap::createHeuristicMask, this removes from the tqmask all
- * pixels that are aptqparently "background" even if they appear in
+ * pixels that are apparently "background" even if they appear in
* holes in the middle of the image. This is more usually what we
* want than the default behaviour of createHeuristicMask.
*
@@ -91,7 +91,7 @@ public:
* Using TQPainter::drawPixmap to draw one pixmap on another does
* not appear to take the tqmask into account properly. Background
* pixels in the second pixmap erase foreground pixels in the
- * first one, regardless of whether they're tqmasked or not. This
+ * first one, regardless of whether they're masked or not. This
* function does what I expect.
*
* Note that the source pixmap _must_ have a tqmask.
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 20:26:43 +0000