summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/notation')
-rw-r--r--src/gui/editors/notation/FontViewFrame.cpp2
-rw-r--r--src/gui/editors/notation/FontViewFrame.h2
-rw-r--r--src/gui/editors/notation/NotationStaff.h4
-rw-r--r--src/gui/editors/notation/NotationView.cpp52
-rw-r--r--src/gui/editors/notation/NotationView.h8
-rw-r--r--src/gui/editors/notation/NotePixmapPainter.h12
-rw-r--r--src/gui/editors/notation/TrackHeader.cpp2
-rw-r--r--src/gui/editors/notation/TrackHeader.h2
8 files changed, 42 insertions, 42 deletions
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index d07ba40..0eddccd 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -125,7 +125,7 @@ void FontViewFrame::setGlyphs(bool glyphs)
update();
}
-TQSize FontViewFrame::tqsizeHint() const
+TQSize FontViewFrame::sizeHint() const
{
return TQSize(16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth(),
16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth());
diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h
index fbfc95a..1d649c4 100644
--- a/src/gui/editors/notation/FontViewFrame.h
+++ b/src/gui/editors/notation/FontViewFrame.h
@@ -49,7 +49,7 @@ public:
FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0);
virtual ~FontViewFrame();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
bool hasRow(int row) const;
public slots:
diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h
index bb056c0..783e3db 100644
--- a/src/gui/editors/notation/NotationStaff.h
+++ b/src/gui/editors/notation/NotationStaff.h
@@ -473,8 +473,8 @@ protected:
TQPainter *m_printPainter;
- enum BartqStatus { UnRendered = 0, Rendered, Positioned };
- typedef std::map<int, BartqStatus> BarStatusMap;
+ enum BarStatus { UnRendered = 0, Rendered, Positioned };
+ typedef std::map<int, BarStatus> BarStatusMap;
BarStatusMap m_status;
std::pair<int, int> m_lastRenderCheck;
bool m_ready;
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index bd553ee..6901135 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -585,7 +585,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
setPageMode(mode);
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
- m_staffs[i]->getSegment().getRefreshtqStatus
+ m_staffs[i]->getSegment().getRefreshStatus
(m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
}
@@ -754,7 +754,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
slotSetInsertCursorPosition(0);
slotSetPointerPosition(doc->getComposition().getPosition());
setCurrentSelection(0, false, true);
- slotUpdateInsertModetqStatus();
+ slotUpdateInsertModeStatus();
m_chordNameRuler->tqrepaint();
m_tempoRuler->tqrepaint();
m_rawNoteRuler->tqrepaint();
@@ -930,7 +930,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
setPageMode(LinedStaff::MultiPageMode); // also positions and renders the staffs!
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
- m_staffs[i]->getSegment().getRefreshtqStatus
+ m_staffs[i]->getSegment().getRefreshStatus
(m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
}
@@ -1365,14 +1365,14 @@ void NotationView::positionPages()
if (m_pageMode != LinedStaff::MultiPageMode) {
if (haveBackground) {
- canvas()->tqsetBackgroundPixmap(background);
+ canvas()->setBackgroundPixmap(background);
getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
getCanvasView()->setPaletteBackgroundPixmap(background);
getCanvasView()->setErasePixmap(background);
}
} else {
if (haveBackground) {
- canvas()->tqsetBackgroundPixmap(deskBackground);
+ canvas()->setBackgroundPixmap(deskBackground);
getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
getCanvasView()->setPaletteBackgroundPixmap(background);
getCanvasView()->setErasePixmap(background);
@@ -1482,13 +1482,13 @@ void NotationView::readOptions()
opt = m_config->readBoolEntry("Show Annotations", true);
m_annotationsVisible = opt;
getToggleAction("show_annotations")->setChecked(opt);
- slotUpdateAnnotationstqStatus();
+ slotUpdateAnnotationsStatus();
// slotToggleAnnotations();
opt = m_config->readBoolEntry("Show LilyPond Directives", true);
m_lilyPondDirectivesVisible = opt;
getToggleAction("show_lilypond_directives")->setChecked(opt);
- slotUpdateLilyPondDirectivestqStatus();
+ slotUpdateLilyPondDirectivesStatus();
}
void NotationView::setupActions()
@@ -1910,21 +1910,21 @@ void NotationView::setupActions()
icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("triplet")));
(new KToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G,
- TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "triplet_mode"))->
setChecked(false);
icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("chord")));
(new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
- TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "chord_mode"))->
setChecked(false);
icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("group-grace")));
(new KToggleAction(i18n("Grace Insert Mode"), icon, 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()),
actionCollection(), "grace_mode"))->
setChecked(false);
/*!!!
@@ -2990,12 +2990,12 @@ NotationView::paintEvent(TQPaintEvent *e)
}
}
- slotSetOperationNameAndtqStatus(i18n(" Ready."));
+ slotSetOperationNameAndStatus(i18n(" Ready."));
}
bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
{
- slotSetOperationNameAndtqStatus(i18n("Laying out score..."));
+ slotSetOperationNameAndStatus(i18n("Laying out score..."));
ProgressDialog::processEvents();
m_htqlayout->setStaffCount(m_staffs.size());
@@ -3008,7 +3008,7 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
if (staffNo >= 0 && (int)i != staffNo)
continue;
- slotSetOperationNameAndtqStatus(i18n("Laying out staff %1...").tqarg(i + 1));
+ slotSetOperationNameAndStatus(i18n("Laying out staff %1...").tqarg(i + 1));
ProgressDialog::processEvents();
m_htqlayout->resetStaff(*m_staffs[i], startTime, endTime);
@@ -3017,7 +3017,7 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
m_vtqlayout->scanStaff(*m_staffs[i], startTime, endTime);
}
- slotSetOperationNameAndtqStatus(i18n("Reconciling staffs..."));
+ slotSetOperationNameAndStatus(i18n("Reconciling staffs..."));
ProgressDialog::processEvents();
m_htqlayout->finishLayout(startTime, endTime);
@@ -3195,7 +3195,7 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
std::max(endA, endB));
} else {
// mark refresh status and then request a tqrepaint
- segment.getRefreshtqStatus
+ segment.getRefreshStatus
(m_segmentsRefreshStatusIds
[getLinedStaff(segment)->getId()]).
push(std::min(startA, startB), std::max(endA, endB));
@@ -3213,12 +3213,12 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
} else {
// mark refresh status and then request a tqrepaint
- oldSelection->getSegment().getRefreshtqStatus
+ oldSelection->getSegment().getRefreshStatus
(m_segmentsRefreshStatusIds
[getLinedStaff(oldSelection->getSegment())->getId()]).
push(startA, endA);
- s->getSegment().getRefreshtqStatus
+ s->getSegment().getRefreshStatus
(m_segmentsRefreshStatusIds
[getLinedStaff(s->getSegment())->getId()]).
push(startB, endB);
@@ -3809,7 +3809,7 @@ void NotationView::refreshSegment(Segment *segment,
}
setMenuStates();
- slotSetOperationNameAndtqStatus(i18n(" Ready."));
+ slotSetOperationNameAndStatus(i18n(" Ready."));
NOTATION_DEBUG << "*** " << endl;
}
@@ -3876,7 +3876,7 @@ void NotationView::readjustCanvasSize()
double maxWidth = 0.0;
int maxHeight = 0;
- slotSetOperationNameAndtqStatus(i18n("Sizing and allocating canvas..."));
+ slotSetOperationNameAndStatus(i18n("Sizing and allocating canvas..."));
ProgressDialog::processEvents();
int progressTotal = m_staffs.size() + 2;
@@ -4146,7 +4146,7 @@ void NotationView::setupProgress(ProgressDialog* dialog)
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)),
- this, TQT_SLOT(slotSetOperationNameAndtqStatus(TQString)));
+ this, TQT_SLOT(slotSetOperationNameAndStatus(TQString)));
connect(dialog, TQT_SIGNAL(cancelClicked()),
m_staffs[i], TQT_SLOT(slotCancel()));
@@ -4159,7 +4159,7 @@ void NotationView::setupProgress(ProgressDialog* dialog)
}
-void NotationView::slotSetOperationNameAndtqStatus(TQString name)
+void NotationView::slotSetOperationNameAndStatus(TQString name)
{
emit setOperationName(name);
statusBar()->changeItem(TQString(" %1").tqarg(name),
@@ -4230,7 +4230,7 @@ NotationView::MarkActionDataMap* NotationView::m_markActionDataMap = 0;
void
-NotationView::slotUpdateInsertModetqStatus()
+NotationView::slotUpdateInsertModeStatus()
{
TQString tripletMessage = i18n("Triplet");
TQString chordMessage = i18n("Chord");
@@ -4253,7 +4253,7 @@ NotationView::slotUpdateInsertModetqStatus()
}
void
-NotationView::slotUpdateAnnotationstqStatus()
+NotationView::slotUpdateAnnotationsStatus()
{
if (!areAnnotationsVisible()) {
for (int i = 0; i < getStaffCount(); ++i) {
@@ -4273,7 +4273,7 @@ NotationView::slotUpdateAnnotationstqStatus()
}
void
-NotationView::slotUpdateLilyPondDirectivestqStatus()
+NotationView::slotUpdateLilyPondDirectivesStatus()
{
if (!areLilyPondDirectivesVisible()) {
for (int i = 0; i < getStaffCount(); ++i) {
@@ -6998,7 +6998,7 @@ void NotationView::slotToggleTempoRuler()
void NotationView::slotToggleAnnotations()
{
m_annotationsVisible = !m_annotationsVisible;
- slotUpdateAnnotationstqStatus();
+ slotUpdateAnnotationsStatus();
//!!! use refresh mechanism
refreshSegment(0, 0, 0);
}
@@ -7006,7 +7006,7 @@ void NotationView::slotToggleAnnotations()
void NotationView::slotToggleLilyPondDirectives()
{
m_lilyPondDirectivesVisible = !m_lilyPondDirectivesVisible;
- slotUpdateLilyPondDirectivestqStatus();
+ slotUpdateLilyPondDirectivesStatus();
//!!! use refresh mechanism
refreshSegment(0, 0, 0);
}
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 461d299..2e51096 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -494,9 +494,9 @@ public slots:
void slotToggleStepByStep();
/// status stuff
- void slotUpdateInsertModetqStatus();
- void slotUpdateAnnotationstqStatus();
- void slotUpdateLilyPondDirectivestqStatus();
+ void slotUpdateInsertModeStatus();
+ void slotUpdateAnnotationsStatus();
+ void slotUpdateLilyPondDirectivesStatus();
/// edit menu
void slotPreviewSelection();
@@ -812,7 +812,7 @@ public slots:
/// Do some background rendering work.
void slotRenderSomething();
- void slotSetOperationNameAndtqStatus(TQString);
+ void slotSetOperationNameAndStatus(TQString);
// Update notation view based on track/staff name change
void slotUpdateStaffName();
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index 9b56052..c4836f6 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/src/gui/editors/notation/NotePixmapPainter.h
@@ -105,19 +105,19 @@ public:
void drawPolygon(const TQPointArray &a, bool winding = false,
int index = 0, int n = -1) {
- m_painter->tqdrawPolygon(a, winding, index, n);
- if (m_useMask) m_maskPainter.tqdrawPolygon(a, winding, index, n);
+ m_painter->drawPolygon(a, winding, index, n);
+ if (m_useMask) m_maskPainter.drawPolygon(a, winding, index, n);
}
void drawPolyline(const TQPointArray &a, int index = 0, int n = -1) {
- m_painter->tqdrawPolyline(a, index, n);
- if (m_useMask) m_maskPainter.tqdrawPolyline(a, index, n);
+ m_painter->drawPolyline(a, index, n);
+ if (m_useMask) m_maskPainter.drawPolyline(a, index, n);
}
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.mask()), sx, sy, sw, sh);
+ m_painter->drawPixmap(x, y, pm, sx, sy, sw, sh);
+ if (m_useMask) m_maskPainter.drawPixmap(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 fa19ca5..73ac29a 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -65,7 +65,7 @@ namespace Rosegarden
{
-// tqStatus bits
+// Status bits
const int TrackHeader::SEGMENT_HERE = 1 << 0;
const int TrackHeader::SUPERIMPOSED_SEGMENTS = 1 << 1;
const int TrackHeader::INCONSISTENT_CLEFS = 1 << 2;
diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h
index 3f7029e..85ee067 100644
--- a/src/gui/editors/notation/TrackHeader.h
+++ b/src/gui/editors/notation/TrackHeader.h
@@ -169,7 +169,7 @@ private :
void transposeValueToName(int transpose, TQString &transposeName);
- // tqStatus bits
+ // Status bits
static const int SEGMENT_HERE;
static const int SUPERIMPOSED_SEGMENTS;
static const int INCONSISTENT_CLEFS;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 01:50:25 +0000