summaryrefslogtreecommitdiffstats
path: root/src/gui/rulers
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/rulers')
-rw-r--r--src/gui/rulers/ChordNameRuler.cpp32
-rw-r--r--src/gui/rulers/ChordNameRuler.h4
-rw-r--r--src/gui/rulers/ControlRuler.cpp6
-rw-r--r--src/gui/rulers/ControllerEventsRuler.cpp4
-rw-r--r--src/gui/rulers/ControllerEventsRuler.h2
-rw-r--r--src/gui/rulers/LoopRuler.cpp8
-rw-r--r--src/gui/rulers/LoopRuler.h4
-rw-r--r--src/gui/rulers/MarkerRuler.cpp4
-rw-r--r--src/gui/rulers/MarkerRuler.h4
-rw-r--r--src/gui/rulers/PercussionPitchRuler.cpp6
-rw-r--r--src/gui/rulers/PercussionPitchRuler.h4
-rw-r--r--src/gui/rulers/PitchRuler.cpp8
-rw-r--r--src/gui/rulers/PitchRuler.h4
-rw-r--r--src/gui/rulers/PropertyBox.cpp4
-rw-r--r--src/gui/rulers/PropertyBox.h4
-rw-r--r--src/gui/rulers/PropertyViewRuler.cpp4
-rw-r--r--src/gui/rulers/PropertyViewRuler.h4
-rw-r--r--src/gui/rulers/RawNoteRuler.cpp4
-rw-r--r--src/gui/rulers/RawNoteRuler.h4
-rw-r--r--src/gui/rulers/TempoRuler.cpp4
-rw-r--r--src/gui/rulers/TempoRuler.h4
-rw-r--r--src/gui/rulers/TextRuler.cpp4
-rw-r--r--src/gui/rulers/TextRuler.h4
23 files changed, 65 insertions, 65 deletions
diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index ca366e2..80a985f 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -190,7 +190,7 @@ ChordNameRuler::slotScrollHoriz(int x)
}
TQSize
-ChordNameRuler::tqsizeHint() const
+ChordNameRuler::sizeHint() const
{
double width =
m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -204,7 +204,7 @@ ChordNameRuler::tqsizeHint() const
}
TQSize
-ChordNameRuler::tqminimumSizeHint() const
+ChordNameRuler::minimumSizeHint() const
{
double firstBarWidth = m_rulerScale->getBarWidth(0);
TQSize res = TQSize(int(firstBarWidth), m_height);
@@ -231,8 +231,8 @@ ChordNameRuler::recalculate(timeT from, timeT to)
} else if (m_regetSegmentsOnChange) {
- RefreshtqStatus &rs =
- m_composition->getRefreshtqStatus(m_compositionRefreshStatusId);
+ RefreshStatus &rs =
+ m_composition->getRefreshStatus(m_compositionRefreshStatusId);
if (rs.needsRefresh()) {
rs.setNeedsRefresh(false);
@@ -304,15 +304,15 @@ ChordNameRuler::recalculate(timeT from, timeT to)
if (m_segments.empty())
return ;
- SegmentRefreshtqStatus overalltqStatus;
- overalltqStatus.setNeedsRefresh(false);
+ SegmentRefreshStatus overallStatus;
+ overallStatus.setNeedsRefresh(false);
for (SegmentRefreshMap::iterator i = m_segments.begin();
i != m_segments.end(); ++i) {
- SegmentRefreshtqStatus &status =
- i->first->getRefreshtqStatus(i->second);
+ SegmentRefreshStatus &status =
+ i->first->getRefreshStatus(i->second);
if (status.needsRefresh()) {
- overalltqStatus.push(status.from(), status.to());
+ overallStatus.push(status.from(), status.to());
}
}
@@ -326,17 +326,17 @@ ChordNameRuler::recalculate(timeT from, timeT to)
if (from == to) {
NOTATION_DEBUG << "ChordNameRuler::recalculate: from==to, recalculating all" << endl;
level = RecalcWhole;
- } else if (overalltqStatus.from() == overalltqStatus.to()) {
+ } else if (overallStatus.from() == overallStatus.to()) {
NOTATION_DEBUG << "ChordNameRuler::recalculate: overallStatus.from==overallStatus.to, ignoring" << endl;
level = RecalcNone;
- } else if (overalltqStatus.from() >= from && overalltqStatus.to() <= to) {
- NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl;
+ } else if (overallStatus.from() >= from && overallStatus.to() <= to) {
+ NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl;
level = RecalcVisible;
- } else if (overalltqStatus.from() >= to || overalltqStatus.to() <= from) {
- NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl;
+ } else if (overallStatus.from() >= to || overallStatus.to() <= from) {
+ NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl;
level = RecalcNone;
} else {
- NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl;
+ NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl;
level = RecalcWhole;
}
}
@@ -346,7 +346,7 @@ ChordNameRuler::recalculate(timeT from, timeT to)
for (SegmentRefreshMap::iterator i = m_segments.begin();
i != m_segments.end(); ++i) {
- i->first->getRefreshtqStatus(i->second).setNeedsRefresh(false);
+ i->first->getRefreshStatus(i->second).setNeedsRefresh(false);
}
if (!m_currentSegment) { //!!! arbitrary, must do better
diff --git a/src/gui/rulers/ChordNameRuler.h b/src/gui/rulers/ChordNameRuler.h
index 54efd7c..9177c50 100644
--- a/src/gui/rulers/ChordNameRuler.h
+++ b/src/gui/rulers/ChordNameRuler.h
@@ -98,8 +98,8 @@ public:
// may have one of these (to avoid using percussion tracks in chords):
void setStudio(Studio *studio);
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void setMinimumWidth(int width) { m_width = width; }
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 94c66e8..6248a3d 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -86,7 +86,7 @@ ControlRuler::ControlRuler(Segment *segment,
m_selectionRect->setPen(TQt::red);
- setFixedHeight(tqsizeHint().height());
+ setFixedHeight(sizeHint().height());
connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
@@ -308,7 +308,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
// Borrowed from Rotary - compute total position within window
//
- TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
+ TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0));
int scrollX = dynamic_cast<EditView*>(m_parentEditView)->getRawCanvasView()->
horizontalScrollBar()->value();
@@ -393,7 +393,7 @@ void ControlRuler::createMenu()
{
RG_DEBUG << "ControlRuler::createMenu()\n";
- KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+ KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(topLevelWidget());
if (parentMainWindow && parentMainWindow->factory()) {
m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index a6a7d2f..9ee49e6 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -395,7 +395,7 @@ void ControllerEventsRuler::contentsMouseReleaseEvent(TQMouseEvent *e)
<< ", endValue = " << endValue
<< endl;
- tqdrawControlLine(startTime, endTime, startValue, endValue);
+ drawControlLine(startTime, endTime, startValue, endValue);
m_controlLineShowing = false;
m_controlLine->hide();
@@ -445,7 +445,7 @@ void ControllerEventsRuler::layoutItem(ControlItem* item)
}
void
-ControllerEventsRuler::tqdrawControlLine(timeT startTime,
+ControllerEventsRuler::drawControlLine(timeT startTime,
timeT endTime,
int startValue,
int endValue)
diff --git a/src/gui/rulers/ControllerEventsRuler.h b/src/gui/rulers/ControllerEventsRuler.h
index fc1d1f6..9f077fc 100644
--- a/src/gui/rulers/ControllerEventsRuler.h
+++ b/src/gui/rulers/ControllerEventsRuler.h
@@ -96,7 +96,7 @@ protected:
virtual void layoutItem(ControlItem*);
- void tqdrawControlLine(timeT startTime,
+ void drawControlLine(timeT startTime,
timeT endTime,
int startValue,
int endValue);
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index 885d7fc..3a3ad97 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -125,7 +125,7 @@ void LoopRuler::scrollHoriz(int x)
}
}
-TQSize LoopRuler::tqsizeHint() const
+TQSize LoopRuler::sizeHint() const
{
double width =
m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -137,7 +137,7 @@ TQSize LoopRuler::tqsizeHint() const
return res;
}
-TQSize LoopRuler::tqminimumSizeHint() const
+TQSize LoopRuler::minimumSizeHint() const
{
double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
@@ -156,7 +156,7 @@ void LoopRuler::paintEvent(TQPaintEvent* e)
paint.setClipRegion(e->region());
paint.setClipRect(e->rect().normalize());
- paint.setBrush(tqcolorGroup().foreground());
+ paint.setBrush(colorGroup().foreground());
drawBarSections(&paint);
drawLoopMarker(&paint);
@@ -352,7 +352,7 @@ void LoopRuler::slotSetLoopMarker(timeT startLoop,
m_endLoop = endLoop;
TQPainter paint(this);
- paint.setBrush(tqcolorGroup().foreground());
+ paint.setBrush(colorGroup().foreground());
drawBarSections(&paint);
drawLoopMarker(&paint);
diff --git a/src/gui/rulers/LoopRuler.h b/src/gui/rulers/LoopRuler.h
index 1d1fb19..f745cd0 100644
--- a/src/gui/rulers/LoopRuler.h
+++ b/src/gui/rulers/LoopRuler.h
@@ -69,8 +69,8 @@ public:
void setSnapGrid(SnapGrid *grid);
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void scrollHoriz(int x);
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index 749dfef..1ff0dfd 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -160,7 +160,7 @@ MarkerRuler::scrollHoriz(int x)
}
TQSize
-MarkerRuler::tqsizeHint() const
+MarkerRuler::sizeHint() const
{
int lastBar =
m_rulerScale->getLastVisibleBar();
@@ -172,7 +172,7 @@ MarkerRuler::tqsizeHint() const
}
TQSize
-MarkerRuler::tqminimumSizeHint() const
+MarkerRuler::minimumSizeHint() const
{
double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index 748108c..9d160d8 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -63,8 +63,8 @@ public:
virtual ~MarkerRuler();
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void scrollHoriz(int x);
diff --git a/src/gui/rulers/PercussionPitchRuler.cpp b/src/gui/rulers/PercussionPitchRuler.cpp
index 16b9558..ec2b00f 100644
--- a/src/gui/rulers/PercussionPitchRuler.cpp
+++ b/src/gui/rulers/PercussionPitchRuler.cpp
@@ -63,13 +63,13 @@ PercussionPitchRuler::PercussionPitchRuler(TQWidget *parent,
setMouseTracking(true);
}
-TQSize PercussionPitchRuler::tqsizeHint() const
+TQSize PercussionPitchRuler::sizeHint() const
{
return TQSize(m_width,
(m_lineSpacing + 1) * m_mapping->getPitchExtent());
}
-TQSize PercussionPitchRuler::tqminimumSizeHint() const
+TQSize PercussionPitchRuler::minimumSizeHint() const
{
return TQSize(m_width, m_lineSpacing + 1);
}
@@ -159,7 +159,7 @@ void PercussionPitchRuler::mouseMoveEvent(TQMouseEvent* e)
{
// ugh
- MatrixView *matrixView = dynamic_cast<MatrixView*>(tqtopLevelWidget());
+ MatrixView *matrixView = dynamic_cast<MatrixView*>(topLevelWidget());
if (matrixView) {
MatrixStaff *staff = matrixView->getStaff(0);
if (staff) {
diff --git a/src/gui/rulers/PercussionPitchRuler.h b/src/gui/rulers/PercussionPitchRuler.h
index 0bb05db..1e63b92 100644
--- a/src/gui/rulers/PercussionPitchRuler.h
+++ b/src/gui/rulers/PercussionPitchRuler.h
@@ -53,8 +53,8 @@ public:
const MidiKeyMapping *mapping,
int lineSpacing);
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void drawHoverNote(int evPitch);
diff --git a/src/gui/rulers/PitchRuler.cpp b/src/gui/rulers/PitchRuler.cpp
index 117fb87..7817bb8 100644
--- a/src/gui/rulers/PitchRuler.cpp
+++ b/src/gui/rulers/PitchRuler.cpp
@@ -40,15 +40,15 @@ PitchRuler(TQWidget *parent) :
}
TQSize
-PitchRuler::tqsizeHint() const
+PitchRuler::sizeHint() const
{
- return TQWidget::tqsizeHint();
+ return TQWidget::sizeHint();
}
TQSize
-PitchRuler::tqminimumSizeHint() const
+PitchRuler::minimumSizeHint() const
{
- return TQWidget::tqminimumSizeHint();
+ return TQWidget::minimumSizeHint();
}
}
diff --git a/src/gui/rulers/PitchRuler.h b/src/gui/rulers/PitchRuler.h
index 9e6bd19..715f1d4 100644
--- a/src/gui/rulers/PitchRuler.h
+++ b/src/gui/rulers/PitchRuler.h
@@ -44,8 +44,8 @@ class PitchRuler : public TQWidget
public:
PitchRuler(TQWidget *parent);
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
virtual void drawHoverNote(int evPitch) = 0;
diff --git a/src/gui/rulers/PropertyBox.cpp b/src/gui/rulers/PropertyBox.cpp
index 06880c1..f98300d 100644
--- a/src/gui/rulers/PropertyBox.cpp
+++ b/src/gui/rulers/PropertyBox.cpp
@@ -47,13 +47,13 @@ PropertyBox::PropertyBox(TQString label,
{}
TQSize
-PropertyBox::tqsizeHint() const
+PropertyBox::sizeHint() const
{
return TQSize(m_width, m_height);
}
TQSize
-PropertyBox::tqminimumSizeHint() const
+PropertyBox::minimumSizeHint() const
{
return TQSize(m_width, m_height);
}
diff --git a/src/gui/rulers/PropertyBox.h b/src/gui/rulers/PropertyBox.h
index 9df80aa..b5aba14 100644
--- a/src/gui/rulers/PropertyBox.h
+++ b/src/gui/rulers/PropertyBox.h
@@ -56,8 +56,8 @@ public:
TQWidget *parent=0,
const char *name = 0);
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
protected:
virtual void paintEvent(TQPaintEvent *);
diff --git a/src/gui/rulers/PropertyViewRuler.cpp b/src/gui/rulers/PropertyViewRuler.cpp
index 8998049..6a2c8a7 100644
--- a/src/gui/rulers/PropertyViewRuler.cpp
+++ b/src/gui/rulers/PropertyViewRuler.cpp
@@ -102,7 +102,7 @@ PropertyViewRuler::slotScrollHoriz(int x)
}
TQSize
-PropertyViewRuler::tqsizeHint() const
+PropertyViewRuler::sizeHint() const
{
double width =
m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -115,7 +115,7 @@ PropertyViewRuler::tqsizeHint() const
}
TQSize
-PropertyViewRuler::tqminimumSizeHint() const
+PropertyViewRuler::minimumSizeHint() const
{
double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
TQSize res = TQSize(int(firstBarWidth), m_height);
diff --git a/src/gui/rulers/PropertyViewRuler.h b/src/gui/rulers/PropertyViewRuler.h
index ff275ed..f5740fd 100644
--- a/src/gui/rulers/PropertyViewRuler.h
+++ b/src/gui/rulers/PropertyViewRuler.h
@@ -64,8 +64,8 @@ public:
~PropertyViewRuler();
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void setMinimumWidth(int width) { m_width = width; }
diff --git a/src/gui/rulers/RawNoteRuler.cpp b/src/gui/rulers/RawNoteRuler.cpp
index 75ddc37..ff86d60 100644
--- a/src/gui/rulers/RawNoteRuler.cpp
+++ b/src/gui/rulers/RawNoteRuler.cpp
@@ -94,7 +94,7 @@ RawNoteRuler::slotScrollHoriz(int x)
}
TQSize
-RawNoteRuler::tqsizeHint() const
+RawNoteRuler::sizeHint() const
{
double width =
m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -107,7 +107,7 @@ RawNoteRuler::tqsizeHint() const
}
TQSize
-RawNoteRuler::tqminimumSizeHint() const
+RawNoteRuler::minimumSizeHint() const
{
double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
TQSize res = TQSize(int(firstBarWidth), m_height);
diff --git a/src/gui/rulers/RawNoteRuler.h b/src/gui/rulers/RawNoteRuler.h
index 7690ad1..fcbf72b 100644
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@@ -71,8 +71,8 @@ public:
m_segment = segment;
}
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void setMinimumWidth(int width) { m_width = width; }
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 8aba08b..363a678 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -630,7 +630,7 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
}
TQSize
-TempoRuler::tqsizeHint() const
+TempoRuler::sizeHint() const
{
double width =
m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -643,7 +643,7 @@ TempoRuler::tqsizeHint() const
}
TQSize
-TempoRuler::tqminimumSizeHint() const
+TempoRuler::minimumSizeHint() const
{
double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
TQSize res = TQSize(int(firstBarWidth), m_height);
diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h
index 8327b13..afe1614 100644
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@@ -82,8 +82,8 @@ public:
~TempoRuler();
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void setMinimumWidth(int width) { m_width = width; }
diff --git a/src/gui/rulers/TextRuler.cpp b/src/gui/rulers/TextRuler.cpp
index a170b7a..db9b437 100644
--- a/src/gui/rulers/TextRuler.cpp
+++ b/src/gui/rulers/TextRuler.cpp
@@ -92,7 +92,7 @@ TextRuler::slotScrollHoriz(int x)
}
TQSize
-TextRuler::tqsizeHint() const
+TextRuler::sizeHint() const
{
double width =
m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -104,7 +104,7 @@ TextRuler::tqsizeHint() const
}
TQSize
-TextRuler::tqminimumSizeHint() const
+TextRuler::minimumSizeHint() const
{
double firstBarWidth = m_rulerScale->getBarWidth(0);
TQSize res = TQSize(int(firstBarWidth), m_height);
diff --git a/src/gui/rulers/TextRuler.h b/src/gui/rulers/TextRuler.h
index 057b384..9edbe20 100644
--- a/src/gui/rulers/TextRuler.h
+++ b/src/gui/rulers/TextRuler.h
@@ -82,8 +82,8 @@ public:
~TextRuler();
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
void setMinimumWidth(int width) { m_width = width; }
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-21 01:58:05 +0000