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/ClefInserter.cpp12
-rw-r--r--src/gui/editors/notation/ClefInserter.h1
-rw-r--r--src/gui/editors/notation/FontViewFrame.cpp32
-rw-r--r--src/gui/editors/notation/FontViewFrame.h7
-rw-r--r--src/gui/editors/notation/GuitarChordInserter.cpp10
-rw-r--r--src/gui/editors/notation/GuitarChordInserter.h1
-rw-r--r--src/gui/editors/notation/HeadersGroup.cpp4
-rw-r--r--src/gui/editors/notation/HeadersGroup.h5
-rw-r--r--src/gui/editors/notation/NotationCanvasView.cpp26
-rw-r--r--src/gui/editors/notation/NotationCanvasView.h19
-rw-r--r--src/gui/editors/notation/NotationChord.cpp2
-rw-r--r--src/gui/editors/notation/NotationElement.h4
-rw-r--r--src/gui/editors/notation/NotationEraser.cpp8
-rw-r--r--src/gui/editors/notation/NotationEraser.h1
-rw-r--r--src/gui/editors/notation/NotationGroup.cpp2
-rw-r--r--src/gui/editors/notation/NotationGroup.h8
-rw-r--r--src/gui/editors/notation/NotationHLayout.cpp68
-rw-r--r--src/gui/editors/notation/NotationHLayout.h24
-rw-r--r--src/gui/editors/notation/NotationSelectionPaster.cpp10
-rw-r--r--src/gui/editors/notation/NotationSelector.cpp62
-rw-r--r--src/gui/editors/notation/NotationSelector.h5
-rw-r--r--src/gui/editors/notation/NotationStaff.cpp92
-rw-r--r--src/gui/editors/notation/NotationStaff.h30
-rw-r--r--src/gui/editors/notation/NotationStrings.cpp48
-rw-r--r--src/gui/editors/notation/NotationTool.cpp4
-rw-r--r--src/gui/editors/notation/NotationToolBox.cpp8
-rw-r--r--src/gui/editors/notation/NotationToolBox.h3
-rw-r--r--src/gui/editors/notation/NotationVLayout.cpp14
-rw-r--r--src/gui/editors/notation/NotationVLayout.h10
-rw-r--r--src/gui/editors/notation/NotationView.cpp980
-rw-r--r--src/gui/editors/notation/NotationView.h59
-rw-r--r--src/gui/editors/notation/NoteCharacter.cpp2
-rw-r--r--src/gui/editors/notation/NoteCharacter.h2
-rw-r--r--src/gui/editors/notation/NoteCharacterNames.cpp6
-rw-r--r--src/gui/editors/notation/NoteCharacterNames.h6
-rw-r--r--src/gui/editors/notation/NoteFont.cpp19
-rw-r--r--src/gui/editors/notation/NoteFontMap.cpp56
-rw-r--r--src/gui/editors/notation/NoteFontMap.h2
-rw-r--r--src/gui/editors/notation/NoteFontViewer.cpp8
-rw-r--r--src/gui/editors/notation/NoteFontViewer.h3
-rw-r--r--src/gui/editors/notation/NoteInserter.cpp46
-rw-r--r--src/gui/editors/notation/NoteInserter.h1
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.cpp172
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.h12
-rw-r--r--src/gui/editors/notation/NotePixmapPainter.h44
-rw-r--r--src/gui/editors/notation/NoteStyle.cpp34
-rw-r--r--src/gui/editors/notation/NoteStyle.h10
-rw-r--r--src/gui/editors/notation/NoteStyleFactory.cpp2
-rw-r--r--src/gui/editors/notation/NoteStyleFileReader.cpp10
-rw-r--r--src/gui/editors/notation/NoteStyleFileReader.h2
-rw-r--r--src/gui/editors/notation/RestInserter.cpp18
-rw-r--r--src/gui/editors/notation/RestInserter.h1
-rw-r--r--src/gui/editors/notation/SystemFont.cpp12
-rw-r--r--src/gui/editors/notation/SystemFontQt.cpp12
-rw-r--r--src/gui/editors/notation/SystemFontQt.h4
-rw-r--r--src/gui/editors/notation/SystemFontXft.cpp8
-rw-r--r--src/gui/editors/notation/TextInserter.cpp12
-rw-r--r--src/gui/editors/notation/TextInserter.h1
-rw-r--r--src/gui/editors/notation/TrackHeader.cpp54
-rw-r--r--src/gui/editors/notation/TrackHeader.h9
60 files changed, 1068 insertions, 1059 deletions
diff --git a/src/gui/editors/notation/ClefInserter.cpp b/src/gui/editors/notation/ClefInserter.cpp
index 5e324a9..8392aa5 100644
--- a/src/gui/editors/notation/ClefInserter.cpp
+++ b/src/gui/editors/notation/ClefInserter.cpp
@@ -48,7 +48,7 @@ ClefInserter::ClefInserter(NotationView* view)
: NotationTool("ClefInserter", view),
m_clef(Clef::Treble)
{
- TQIconSet icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
TQT_SLOT(slotSelectSelected()), actionCollection(),
@@ -58,8 +58,8 @@ ClefInserter::ClefInserter(NotationView* view)
TQT_SLOT(slotEraseSelected()), actionCollection(),
"erase");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new KAction(i18n("Switch to Inserting Notes"), icon, 0, this,
TQT_SLOT(slotNotesSelected()), actionCollection(),
@@ -75,17 +75,17 @@ void ClefInserter::slotNotesSelected()
void ClefInserter::slotEraseSelected()
{
- m_parentView->actionCollection()->action("erase")->activate();
+ m_tqparentView->actionCollection()->action("erase")->activate();
}
void ClefInserter::slotSelectSelected()
{
- m_parentView->actionCollection()->action("select")->activate();
+ m_tqparentView->actionCollection()->action("select")->activate();
}
void ClefInserter::ready()
{
- m_nParentView->setCanvasCursor(Qt::crossCursor);
+ m_nParentView->setCanvasCursor(TQt::crossCursor);
m_nParentView->setHeightTracking(false);
}
diff --git a/src/gui/editors/notation/ClefInserter.h b/src/gui/editors/notation/ClefInserter.h
index 427f885..adab546 100644
--- a/src/gui/editors/notation/ClefInserter.h
+++ b/src/gui/editors/notation/ClefInserter.h
@@ -48,6 +48,7 @@ class NotationView;
class ClefInserter : public NotationTool
{
Q_OBJECT
+ TQ_OBJECT
friend class NotationToolBox;
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index d2a668f..5bfdee1 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -46,8 +46,8 @@
namespace Rosegarden
{
-FontViewFrame::FontViewFrame( int pixelSize, TQWidget* parent, const char* name ) :
- TQFrame(parent, name),
+FontViewFrame::FontViewFrame( int pixelSize, TQWidget* tqparent, const char* name ) :
+ TQFrame(tqparent, name),
m_fontSize(pixelSize),
m_tableFont(0)
{
@@ -75,7 +75,7 @@ FontViewFrame::loadFont()
{
#ifdef HAVE_XFT
if (m_tableFont) {
- XftFontClose(x11AppDisplay(), (XftFont *)m_tableFont);
+ XftFontClose(TQT_TQPAINTDEVICE(this)->x11AppDisplay(), (XftFont *)m_tableFont);
}
m_tableFont = 0;
@@ -97,7 +97,7 @@ FontViewFrame::loadFont()
FcPatternDestroy(pattern);
if (!match || result != FcResultMatch) {
- KMessageBox::error(this, i18n("Error: Unable to match font name %1").arg(m_fontName));
+ KMessageBox::error(this, i18n("Error: Unable to match font name %1").tqarg(m_fontName));
return ;
}
@@ -106,11 +106,11 @@ FontViewFrame::loadFont()
if (TQString((const char *)matchFamily).lower() != m_fontName.lower()) {
KMessageBox::sorry(this, i18n("Warning: No good match for font name %1 (best is %2)").
- arg(m_fontName).arg(TQString((const char *)matchFamily)));
+ tqarg(m_fontName).tqarg(TQString((const char *)matchFamily)));
m_fontName = (const char *)matchFamily;
}
- m_tableFont = XftFontOpenPattern(x11AppDisplay(), match);
+ m_tableFont = XftFontOpenPattern(TQT_TQPAINTDEVICE(this)->x11AppDisplay(), match);
if (!m_tableFont) {
KMessageBox::error(this, i18n("Error: Unable to open best-match font %1").
@@ -125,7 +125,7 @@ void FontViewFrame::setGlyphs(bool glyphs)
update();
}
-TQSize FontViewFrame::sizeHint() const
+TQSize FontViewFrame::tqsizeHint() const
{
return TQSize(16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth(),
16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth());
@@ -161,10 +161,10 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
TQColor rpositive(128, 128, 255);
Drawable drawable = (Drawable)handle();
- XftDraw *draw = XftDrawCreate(x11AppDisplay(), drawable,
- (Visual *)x11Visual(), x11Colormap());
+ XftDraw *draw = XftDrawCreate(TQT_TQPAINTDEVICE(this)->x11AppDisplay(), drawable,
+ (Visual *)TQT_TQPAINTDEVICE(this)->x11Visual(), TQT_TQPAINTDEVICE(this)->x11Colormap());
- TQColor pen(Qt::black);
+ TQColor pen(TQt::black);
XftColor col;
col.color.red = pen.red () | pen.red() << 8;
col.color.green = pen.green () | pen.green() << 8;
@@ -186,19 +186,19 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
continue;
p.setFont(kapp->font());
TQFontMetrics afm(kapp->font());
- TQString s = TQString("%1").arg(m_row * 256 + (j - 1) * 16);
+ TQString s = TQString("%1").tqarg(m_row * 256 + (j - 1) * 16);
p.drawText(x - afm.width(s), y, s);
p.setPen(TQColor(190, 190, 255));
p.drawLine(0, y, width(), y);
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
continue;
} else if (j == 0) {
p.setFont(kapp->font());
- TQString s = TQString("%1").arg(i - 1);
+ TQString s = TQString("%1").tqarg(i - 1);
p.drawText(x, y, s);
p.setPen(TQColor(190, 190, 255));
p.drawLine(x, 0, x, height());
- p.setPen(Qt::black);
+ p.setPen(TQt::black);
continue;
}
@@ -209,7 +209,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
XftDrawGlyphs(draw, &col, (XftFont *)m_tableFont, x, y, &ui, 1);
} else {
FcChar32 ch = m_row * 256 + (j - 1) * 16 + i - 1;
- if (XftCharExists(x11AppDisplay(), (XftFont *)m_tableFont, ch)) {
+ if (XftCharExists(TQT_TQPAINTDEVICE(this)->x11AppDisplay(), (XftFont *)m_tableFont, ch)) {
XftDrawString32(draw, &col, (XftFont *)m_tableFont, x, y, &ch, 1);
}
}
@@ -233,7 +233,7 @@ FontViewFrame::hasRow(int r) const
for (int c = 0; c < 256; ++c) {
FcChar32 ch = r * 256 + c;
- if (XftCharExists(x11AppDisplay(), (XftFont *)m_tableFont, ch)) {
+ if (XftCharExists(TQT_TQPAINTDEVICE_CONST(this)->x11AppDisplay(), (XftFont *)m_tableFont, ch)) {
return true;
}
}
diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h
index a344fc1..524e393 100644
--- a/src/gui/editors/notation/FontViewFrame.h
+++ b/src/gui/editors/notation/FontViewFrame.h
@@ -40,15 +40,16 @@ namespace Rosegarden
-class FontViewFrame : public QFrame
+class FontViewFrame : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0);
+ FontViewFrame(int pixelSize, TQWidget *tqparent = 0, const char *name = 0);
virtual ~FontViewFrame();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
bool hasRow(int row) const;
public slots:
diff --git a/src/gui/editors/notation/GuitarChordInserter.cpp b/src/gui/editors/notation/GuitarChordInserter.cpp
index b4f6839..f47f2c9 100644
--- a/src/gui/editors/notation/GuitarChordInserter.cpp
+++ b/src/gui/editors/notation/GuitarChordInserter.cpp
@@ -53,7 +53,7 @@ GuitarChordInserter::GuitarChordInserter(NotationView* view)
: NotationTool("GuitarChordInserter", view),
m_guitarChordSelector(0)
{
- TQIconSet icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
@@ -64,8 +64,8 @@ GuitarChordInserter::GuitarChordInserter(NotationView* view)
TQT_SLOT(slotEraseSelected()), actionCollection(),
"erase");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new KAction(i18n("Switch to Inserting Notes"), icon, 0, this,
@@ -85,12 +85,12 @@ void GuitarChordInserter::slotGuitarChordSelected()
void GuitarChordInserter::slotEraseSelected()
{
- m_parentView->actionCollection()->action("erase")->activate();
+ m_tqparentView->actionCollection()->action("erase")->activate();
}
void GuitarChordInserter::slotSelectSelected()
{
- m_parentView->actionCollection()->action("select")->activate();
+ m_tqparentView->actionCollection()->action("select")->activate();
}
void GuitarChordInserter::handleLeftButtonPress(timeT,
diff --git a/src/gui/editors/notation/GuitarChordInserter.h b/src/gui/editors/notation/GuitarChordInserter.h
index d66174b..166f179 100644
--- a/src/gui/editors/notation/GuitarChordInserter.h
+++ b/src/gui/editors/notation/GuitarChordInserter.h
@@ -48,6 +48,7 @@ class GuitarChordSelectorDialog;
class GuitarChordInserter : public NotationTool
{
Q_OBJECT
+ TQ_OBJECT
friend class NotationToolBox;
diff --git a/src/gui/editors/notation/HeadersGroup.cpp b/src/gui/editors/notation/HeadersGroup.cpp
index f7dcc82..b08ed1c 100644
--- a/src/gui/editors/notation/HeadersGroup.cpp
+++ b/src/gui/editors/notation/HeadersGroup.cpp
@@ -43,8 +43,8 @@ namespace Rosegarden
HeadersGroup::
-HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp) :
- TQVBox(parent),
+HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp) :
+ TQVBox(tqparent),
m_notationView(nv),
m_composition(comp),
m_usedHeight(0),
diff --git a/src/gui/editors/notation/HeadersGroup.h b/src/gui/editors/notation/HeadersGroup.h
index b2a9edb..a995646 100644
--- a/src/gui/editors/notation/HeadersGroup.h
+++ b/src/gui/editors/notation/HeadersGroup.h
@@ -51,14 +51,15 @@ class Composition;
class TrackHeader;
-class HeadersGroup : public QVBox
+class HeadersGroup : public TQVBox
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Create an empty headers group
*/
- HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp);
+ HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp);
void removeAllHeaders();
diff --git a/src/gui/editors/notation/NotationCanvasView.cpp b/src/gui/editors/notation/NotationCanvasView.cpp
index fb7d2d9..40c2d59 100644
--- a/src/gui/editors/notation/NotationCanvasView.cpp
+++ b/src/gui/editors/notation/NotationCanvasView.cpp
@@ -49,9 +49,9 @@ namespace Rosegarden
{
NotationCanvasView::NotationCanvasView(const LinedStaffManager &staffmgr,
- TQCanvas *viewing, TQWidget *parent,
+ TQCanvas *viewing, TQWidget *tqparent,
const char *name, WFlags f) :
- RosegardenCanvasView(viewing, parent, name, f),
+ RosegardenCanvasView(viewing, tqparent, name, f),
m_linedStaffManager(staffmgr),
m_lastYPosNearStaff(0),
m_currentStaff(0),
@@ -70,13 +70,13 @@ NotationCanvasView::NotationCanvasView(const LinedStaffManager &staffmgr,
viewport()->setMouseTracking(true);
- m_heightMarker = new QCanvasItemGroup(viewing);
+ m_heightMarker = new TQCanvasItemGroup(viewing);
- m_vert1 = new QCanvasLineGroupable(viewing, m_heightMarker);
+ m_vert1 = new TQCanvasLineGroupable(viewing, m_heightMarker);
m_vert1->setPoints(0, 0, 0, 8);
m_vert1->setPen(TQPen(TQColor(64, 64, 64), 1));
- m_vert2 = new QCanvasLineGroupable(viewing, m_heightMarker);
+ m_vert2 = new TQCanvasLineGroupable(viewing, m_heightMarker);
m_vert2->setPoints(17, 0, 17, 8);
m_vert2->setPen(TQPen(TQColor(64, 64, 64), 1));
@@ -115,7 +115,7 @@ NotationCanvasView::contentsMouseMoveEvent(TQMouseEvent *e)
if (!m_currentStaff) {
- emit hoveredOverNoteChanged(TQString::null);
+ emit hoveredOverNoteChanged(TQString());
if (prevStaff) {
m_heightMarker->hide();
canvas()->update();
@@ -191,10 +191,10 @@ void NotationCanvasView::contentsMousePressEvent(TQMouseEvent *e)
return ;
}
- QCanvasNotationSprite *sprite =
- dynamic_cast<QCanvasNotationSprite*>(*it);
+ TQCanvasNotationSprite *sprite =
+ dynamic_cast<TQCanvasNotationSprite*>(*it);
if (!sprite) {
- if (dynamic_cast<QCanvasNonElementSprite *>(*it)) {
+ if (dynamic_cast<TQCanvasNonElementSprite *>(*it)) {
emit nonNotationItemPressed(e, *it);
return ;
} else if (dynamic_cast<TQCanvasText *>(*it)) {
@@ -378,8 +378,8 @@ NotationCanvasView::setHeightMarkerHeight(TQMouseEvent *e)
for (i = 0; i < legerLineCount; ++i) {
- QCanvasLineGroupable *line =
- new QCanvasLineGroupable(canvas(), m_heightMarker);
+ TQCanvasLineGroupable *line =
+ new TQCanvasLineGroupable(canvas(), m_heightMarker);
line->setPen(TQPen(TQColor(64, 64, 64), 1));
@@ -411,14 +411,14 @@ NotationCanvasView::getElementAtXCoord(TQMouseEvent *e) // any old element
TQCanvasItemList itemList = canvas()->collisions(threshold);
TQCanvasItemList::Iterator it;
- QCanvasNotationSprite* sprite = 0;
+ TQCanvasNotationSprite* sprite = 0;
for (it = itemList.begin(); it != itemList.end(); ++it)
{
TQCanvasItem *item = *it;
- if ((sprite = dynamic_cast<QCanvasNotationSprite*>(item))) {
+ if ((sprite = dynamic_cast<TQCanvasNotationSprite*>(item))) {
return & (sprite->getNotationElement());
}
}
diff --git a/src/gui/editors/notation/NotationCanvasView.h b/src/gui/editors/notation/NotationCanvasView.h
index 3c26ded..e327de8 100644
--- a/src/gui/editors/notation/NotationCanvasView.h
+++ b/src/gui/editors/notation/NotationCanvasView.h
@@ -37,8 +37,8 @@ class TQPoint;
class TQPaintEvent;
class TQPainter;
class TQMouseEvent;
-class QCanvasLineGroupable;
-class QCanvasItemGroup;
+class TQCanvasLineGroupable;
+class TQCanvasItemGroup;
class TQCanvasItem;
class TQCanvas;
@@ -66,10 +66,11 @@ class LinedStaffManager;
class NotationCanvasView : public RosegardenCanvasView
{
Q_OBJECT
+ TQ_OBJECT
public:
NotationCanvasView(const LinedStaffManager &staffmgr,
- TQCanvas *viewing, TQWidget *parent=0,
+ TQCanvas *viewing, TQWidget *tqparent=0,
const char *name=0, WFlags f=0);
~NotationCanvasView();
@@ -92,7 +93,7 @@ signals:
/**
* Emitted when the user clicks on a TQCanvasItem which is active
*
- * @see QCanvasItem#setActive
+ * @see TQCanvasItem#setActive
*/
void activeItemPressed(TQMouseEvent*,
TQCanvasItem* item);
@@ -106,7 +107,7 @@ signals:
/**
* Emitted when the user clicks on a TQCanvasItem which is a
- * plain QCanvasText
+ * plain TQCanvasText
*/
void textItemPressed(TQMouseEvent *,
TQCanvasItem *);
@@ -200,10 +201,10 @@ protected:
NotationStaff *m_currentStaff;
int m_currentHeight;
- QCanvasItemGroup *m_heightMarker;
- QCanvasLineGroupable *m_vert1;
- QCanvasLineGroupable *m_vert2;
- std::vector<QCanvasLineGroupable *> m_legerLines;
+ TQCanvasItemGroup *m_heightMarker;
+ TQCanvasLineGroupable *m_vert1;
+ TQCanvasLineGroupable *m_vert2;
+ std::vector<TQCanvasLineGroupable *> m_legerLines;
bool m_legerLineOffset;
bool m_heightTracking;
diff --git a/src/gui/editors/notation/NotationChord.cpp b/src/gui/editors/notation/NotationChord.cpp
index 7b0a263..297cee7 100644
--- a/src/gui/editors/notation/NotationChord.cpp
+++ b/src/gui/editors/notation/NotationChord.cpp
@@ -110,7 +110,7 @@ NotationChord::hasStemUp() const
NotationRules rules;
// believe anything found in any of the notes, if in a persistent
- // property or a property apparently set by the beaming algorithm
+ // property or a property aptqparently set by the beaming algorithm
Iterator i(getInitialNote());
diff --git a/src/gui/editors/notation/NotationElement.h b/src/gui/editors/notation/NotationElement.h
index 2bb036f..6dfad3d 100644
--- a/src/gui/editors/notation/NotationElement.h
+++ b/src/gui/editors/notation/NotationElement.h
@@ -43,7 +43,7 @@ class Event;
/**
- * The Notation H and V layout is performed on a
+ * The Notation H and V tqlayout is performed on a
* NotationElementList. Once this is done, each NotationElement is
* affected a TQCanvasItem which is set at these coords.
*
@@ -82,7 +82,7 @@ public:
* Sets the X coordinate and width of the space "underneath"
* this element, i.e. the extents within which a mouse click
* or some such might be considered to be interested in this
- * element as opposed to any other. These are layout coords
+ * element as opposed to any other. These are tqlayout coords
*/
void setLayoutAirspace(double x, double width) {
m_airX = x; m_airWidth = width;
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index 856a622..d9d5f3a 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -56,13 +56,13 @@ NotationEraser::NotationEraser(NotationView* view)
"toggle_rest_collapse");
TQIconSet icon
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new KAction(i18n("Switch to Insert Tool"), icon, 0, this,
TQT_SLOT(slotInsertSelected()), actionCollection(),
"insert");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
TQT_SLOT(slotSelectSelected()), actionCollection(),
@@ -73,7 +73,7 @@ NotationEraser::NotationEraser(NotationView* view)
void NotationEraser::ready()
{
- m_nParentView->setCanvasCursor(Qt::pointingHandCursor);
+ m_nParentView->setCanvasCursor(TQt::pointingHandCursor);
m_nParentView->setHeightTracking(false);
}
@@ -106,7 +106,7 @@ void NotationEraser::slotInsertSelected()
void NotationEraser::slotSelectSelected()
{
- m_parentView->actionCollection()->action("select")->activate();
+ m_tqparentView->actionCollection()->action("select")->activate();
}
const TQString NotationEraser::ToolName = "notationeraser";
diff --git a/src/gui/editors/notation/NotationEraser.h b/src/gui/editors/notation/NotationEraser.h
index b13ed89..d87f21f 100644
--- a/src/gui/editors/notation/NotationEraser.h
+++ b/src/gui/editors/notation/NotationEraser.h
@@ -47,6 +47,7 @@ class NotationView;
class NotationEraser : public NotationTool
{
Q_OBJECT
+ TQ_OBJECT
friend class NotationToolBox;
diff --git a/src/gui/editors/notation/NotationGroup.cpp b/src/gui/editors/notation/NotationGroup.cpp
index 78525d9..caa7256 100644
--- a/src/gui/editors/notation/NotationGroup.cpp
+++ b/src/gui/editors/notation/NotationGroup.cpp
@@ -185,7 +185,7 @@ NotationGroup::sample(const NELIterator &i, bool goingForwards)
}
bool
-NotationGroup::contains(const NELIterator &i) const
+NotationGroup::tqcontains(const NELIterator &i) const
{
NELIterator j(getInitialElement()),
k( getFinalElement());
diff --git a/src/gui/editors/notation/NotationGroup.h b/src/gui/editors/notation/NotationGroup.h
index c7b1134..ed1b7c2 100644
--- a/src/gui/editors/notation/NotationGroup.h
+++ b/src/gui/editors/notation/NotationGroup.h
@@ -73,13 +73,13 @@ public:
/**
* Writes the BEAMED, BEAM_ABOVE, and STEM_UP properties into the
- * notes in the group, as appropriate. Does not require layout x
+ * notes in the group, as appropriate. Does not require tqlayout x
* coordinates to have been set.
*/
void applyStemProperties();
/**
- * Writes beam data into each note in the group. Notes' layout x
+ * Writes beam data into each note in the group. Notes' tqlayout x
* coordinates must already have been set. Does not require
* applyStemProperties to have already been called.
*/
@@ -87,12 +87,12 @@ public:
/**
* Writes tupling line data into each note in the group. Notes'
- * layout x coordinates must already have been set. Does nothing
+ * tqlayout x coordinates must already have been set. Does nothing
* if this is not a tupled group.
*/
void applyTuplingLine(NotationStaff &);
- virtual bool contains(const NELIterator &) const;
+ virtual bool tqcontains(const NELIterator &) const;
virtual bool sample(const NELIterator &i, bool goingForwards);
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 4d891a6..20b7469 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -58,8 +58,8 @@ using namespace BaseProperties;
NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
const NotationProperties &properties,
- TQObject* parent, const char* name) :
- ProgressReporter(parent, name),
+ TQObject* tqparent, const char* name) :
+ ProgressReporter(tqparent, name),
HorizontalLayoutEngine(c),
m_totalWidth(0.),
m_pageMode(false),
@@ -324,7 +324,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
setBarBasicData(staff, barNo, from, barCorrect, timeSignature, newTimeSig);
BarDataList::iterator bdli(barList.find(barNo));
- bdli->second.layoutData.needsLayout = true;
+ bdli->second.tqlayoutData.needsLayout = true;
ChunkList &chunks = bdli->second.chunks;
chunks.clear();
@@ -655,10 +655,10 @@ NotationHLayout::scanChord(NotationElementList *notes,
extraWidth += e;
}
- float layoutExtra = 0;
+ float tqlayoutExtra = 0;
if (chord.hasNoteHeadShifted()) {
if (chord.hasStemUp()) {
- layoutExtra += npf->getNoteBodyWidth();
+ tqlayoutExtra += npf->getNoteBodyWidth();
} else {
extraWidth = std::max(extraWidth, float(npf->getNoteBodyWidth()));
}
@@ -686,13 +686,13 @@ NotationHLayout::scanChord(NotationElementList *notes,
if (grace) {
chunks.push_back(Chunk(d, chord.getSubOrdering(),
- extraWidth + layoutExtra
+ extraWidth + tqlayoutExtra
+ getLayoutWidth(**myLongest, npf, key)
- npf->getNoteBodyWidth(), // tighten up
0));
} else {
chunks.push_back(Chunk(d, 0, extraWidth,
- std::max(layoutExtra +
+ std::max(tqlayoutExtra +
getLayoutWidth(**myLongest, npf, key),
lyricWidth)));
lyricWidth = 0;
@@ -847,7 +847,7 @@ NotationHLayout::preSquishBar(int barNo)
bdli->second.sizeData.reconciledWidth =
bdli->second.sizeData.idealWidth;
- bdli->second.layoutData.needsLayout = true;
+ bdli->second.tqlayoutData.needsLayout = true;
}
}
}
@@ -987,7 +987,7 @@ NotationHLayout::reconcileBarsLinear()
double diff = maxWidth - bd.reconciledWidth;
if (diff < -0.1 || diff > 0.1) {
NOTATION_DEBUG << "(So needsLayout becomes true)" << endl;
- bdli->second.layoutData.needsLayout = true;
+ bdli->second.tqlayoutData.needsLayout = true;
}
bd.reconciledWidth = maxWidth;
}
@@ -1181,7 +1181,7 @@ NotationHLayout::reconcileBarsPage()
BarData::SizeData &bd(bdli->second.sizeData);
double diff = maxWidth - bd.reconciledWidth;
if (diff < -0.1 || diff > 0.1) {
- bdli->second.layoutData.needsLayout = true;
+ bdli->second.tqlayoutData.needsLayout = true;
}
bd.reconciledWidth = maxWidth;
}
@@ -1230,15 +1230,15 @@ NotationHLayout::finishLayout(timeT startTime, timeT endTime)
m_timePerProgressIncrement = timeCovered / (100 / m_barData.size());
- layout(i, startTime, endTime);
+ tqlayout(i, startTime, endTime);
++staffNo;
}
}
void
-NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
+NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime)
{
- Profiler profiler("NotationHLayout::layout");
+ Profiler profiler("NotationHLayout::tqlayout");
Staff &staff = *(i->first);
NotationElementList *notes = staff.getViewElementList();
@@ -1247,11 +1247,11 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
bool isFullLayout = (startTime == endTime);
- // these two are for partial layouts:
+ // these two are for partial tqlayouts:
// bool haveSimpleOffset = false;
// double simpleOffset = 0;
- NOTATION_DEBUG << "NotationHLayout::layout: full layout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
+ NOTATION_DEBUG << "NotationHLayout::tqlayout: full tqlayout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
double x = 0, barX = 0;
TieMap tieMap;
@@ -1287,7 +1287,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
NotationElementList::iterator from = bdi->second.basicData.start;
NotationElementList::iterator to;
- NOTATION_DEBUG << "NotationHLayout::layout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
+ NOTATION_DEBUG << "NotationHLayout::tqlayout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
BarDataList::iterator nbdi(bdi);
if (++nbdi == barList.end()) {
@@ -1303,27 +1303,27 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
NOTATION_DEBUG << "Start is to" << endl;
}
- if (!bdi->second.layoutData.needsLayout) {
+ if (!bdi->second.tqlayoutData.needsLayout) {
- double offset = barX - bdi->second.layoutData.x;
+ double offset = barX - bdi->second.tqlayoutData.x;
- NOTATION_DEBUG << "NotationHLayout::layout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
+ NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
if (offset > -0.1 && offset < 0.1) {
- NOTATION_DEBUG << "NotationHLayout::layout(): no offset, ignoring" << endl;
+ NOTATION_DEBUG << "NotationHLayout::tqlayout(): no offset, ignoring" << endl;
continue;
}
- bdi->second.layoutData.x += offset;
+ bdi->second.tqlayoutData.x += offset;
if (bdi->second.basicData.newTimeSig)
- bdi->second.layoutData.timeSigX += (int)offset;
+ bdi->second.tqlayoutData.timeSigX += (int)offset;
for (NotationElementList::iterator it = from;
it != to && it != notes->end(); ++it) {
NotationElement* nel = static_cast<NotationElement*>(*it);
- NOTATION_DEBUG << "NotationHLayout::layout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
+ NOTATION_DEBUG << "NotationHLayout::tqlayout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
nel->setLayoutX((*it)->getLayoutX() + offset);
double airX, airWidth;
nel->getLayoutAirspace(airX, airWidth);
@@ -1333,7 +1333,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
continue;
}
- bdi->second.layoutData.x = barX;
+ bdi->second.tqlayoutData.x = barX;
// x = barX + getPostBarMargin();
bool timeSigToPlace = false;
@@ -1342,7 +1342,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
timeSigToPlace = !bdi->second.basicData.timeSignature.isHidden();
}
if (timeSigToPlace) {
- NOTATION_DEBUG << "NotationHLayout::layout(): there's a time sig in this bar" << endl;
+ NOTATION_DEBUG << "NotationHLayout::tqlayout(): there's a time sig in this bar" << endl;
}
bool repeatClefAndKey = false;
@@ -1350,7 +1350,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
repeatClefAndKey = true;
}
if (repeatClefAndKey) {
- NOTATION_DEBUG << "NotationHLayout::layout(): need to repeat clef & key in this bar" << endl;
+ NOTATION_DEBUG << "NotationHLayout::tqlayout(): need to repeat clef & key in this bar" << endl;
}
double barInset = notationStaff.getBarInset(barNo, repeatClefAndKey);
@@ -1446,9 +1446,9 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
}
// NOTATION_DEBUG << "Placing timesig at " << (x - fixed) << endl;
-// bdi->second.layoutData.timeSigX = (int)(x - fixed);
+// bdi->second.tqlayoutData.timeSigX = (int)(x - fixed);
NOTATION_DEBUG << "Placing timesig at " << sigx << " (would previously have been " << int(x-fixed) << "?)" << endl;
- bdi->second.layoutData.timeSigX = (int)sigx;
+ bdi->second.tqlayoutData.timeSigX = (int)sigx;
double shift = getFixedItemSpacing() +
m_npf->getTimeSigWidth(timeSignature);
offset += shift;
@@ -1467,7 +1467,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
}
}
- NOTATION_DEBUG << "NotationHLayout::layout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
+ NOTATION_DEBUG << "NotationHLayout::tqlayout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
double displacedX = 0.0;
long dxRaw = 0;
@@ -1571,7 +1571,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
// no other events in this bar, so we never managed to place it
x = barX + offset;
NOTATION_DEBUG << "Placing timesig reluctantly at " << x << endl;
- bdi->second.layoutData.timeSigX = (int)(x);
+ bdi->second.tqlayoutData.timeSigX = (int)(x);
timeSigToPlace = false;
}
@@ -1583,7 +1583,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
}
m_groupsExtant.clear();
- bdi->second.layoutData.needsLayout = false;
+ bdi->second.tqlayoutData.needsLayout = false;
}
}
@@ -1653,7 +1653,7 @@ NotationHLayout::getSpacingDuration(Staff &staff,
if (d > 0 && (*i)->event()->getDuration() == 0) return d; // grace note
NotationElementList::iterator j(i), e(staff.getViewElementList()->end());
- while (j != e && (chord.contains(j) || (*j)->getViewDuration() == 0))
+ while (j != e && (chord.tqcontains(j) || (*j)->getViewDuration() == 0))
++j;
if (j != e) {
@@ -1692,7 +1692,7 @@ NotationHLayout::positionChord(Staff &staff,
barEndsInChord = true;
// #704958 (multiple tuplet spanners created when entering
- // triplet chord) -- layout() updates the beamed group data
+ // triplet chord) -- tqlayout() updates the beamed group data
// for non-notes, but we have to do it for notes so as to
// ensure every note in the chord is accounted for
sampleGroupElement(staff, clef, key, citr);
@@ -2024,7 +2024,7 @@ bool NotationHLayout::getTimeSignaturePosition(Staff &staff,
BarDataList::iterator bdli(bdl.find(i));
if (bdli != bdl.end()) {
timeSig = bdli->second.basicData.timeSignature;
- timeSigX = (double)(bdli->second.layoutData.timeSigX);
+ timeSigX = (double)(bdli->second.tqlayoutData.timeSigX);
return bdli->second.basicData.newTimeSig;
} else
return 0;
diff --git a/src/gui/editors/notation/NotationHLayout.h b/src/gui/editors/notation/NotationHLayout.h
index 878dc17..59a666b 100644
--- a/src/gui/editors/notation/NotationHLayout.h
+++ b/src/gui/editors/notation/NotationHLayout.h
@@ -56,7 +56,7 @@ class AccidentalTable;
/**
- * Horizontal notation layout
+ * Horizontal notation tqlayout
*
* computes the X coordinates of notation elements
*/
@@ -68,7 +68,7 @@ public:
NotationHLayout(Composition *c,
NotePixmapFactory *npf,
const NotationProperties &properties,
- TQObject* parent, const char* name = 0);
+ TQObject* tqparent, const char* name = 0);
virtual ~NotationHLayout();
@@ -77,9 +77,9 @@ public:
}
/**
- * Precomputes layout data for a single staff. The resulting data
+ * Precomputes tqlayout data for a single staff. The resulting data
* is stored in the BarDataMap, keyed from the staff reference;
- * the entire map is then used by reconcileBars() and layout().
+ * the entire map is then used by reconcileBars() and tqlayout().
* The map should be cleared (by calling reset()) before a full
* set of staffs is preparsed.
*/
@@ -167,7 +167,7 @@ public:
static std::vector<int> getAvailableProportions();
/**
- * Returns the total length of all elements once layout is done
+ * Returns the total length of all elements once tqlayout is done
* This is the x-coord of the end of the last element on the longest
* staff, plus the space allocated to that element
*/
@@ -211,7 +211,7 @@ public:
* Returns the X coord corresponding to the given time value.
* This RulerScale method works by interpolating between bar lines
* (the inverse of the way getTimeForX works), and should be used
- * for any rulers associated with the layout.
+ * for any rulers associated with the tqlayout.
*/
virtual double getXForTime(timeT time) const;
@@ -286,12 +286,12 @@ protected:
} sizeData;
struct LayoutData
- { // slots either assumed, or only known at layout time
+ { // slots either assumed, or only known at tqlayout time
bool needsLayout;
double x; // coordinate for display of barline
int timeSigX;
- } layoutData;
+ } tqlayoutData;
BarData(NotationElementList::iterator i,
bool correct, TimeSignature timeSig, bool newTimeSig) {
@@ -304,9 +304,9 @@ protected:
sizeData.fixedWidth = 0;
sizeData.clefKeyWidth = 0;
sizeData.actualDuration = 0;
- layoutData.needsLayout = true;
- layoutData.x = -1;
- layoutData.timeSigX = -1;
+ tqlayoutData.needsLayout = true;
+ tqlayoutData.x = -1;
+ tqlayoutData.timeSigX = -1;
}
};
@@ -360,7 +360,7 @@ protected:
/// Tries to harmonize the bar positions for all the staves (page mode)
void reconcileBarsPage();
- void layout(BarDataMap::iterator,
+ void tqlayout(BarDataMap::iterator,
timeT startTime,
timeT endTime);
diff --git a/src/gui/editors/notation/NotationSelectionPaster.cpp b/src/gui/editors/notation/NotationSelectionPaster.cpp
index 96d894c..b1f8d4b 100644
--- a/src/gui/editors/notation/NotationSelectionPaster.cpp
+++ b/src/gui/editors/notation/NotationSelectionPaster.cpp
@@ -46,7 +46,7 @@ NotationSelectionPaster::NotationSelectionPaster(EventSelection& es,
: NotationTool("NotationPaster", view),
m_selection(es)
{
- m_nParentView->setCanvasCursor(Qt::crossCursor);
+ m_nParentView->setCanvasCursor(TQt::crossCursor);
}
NotationSelectionPaster::~NotationSelectionPaster()
@@ -75,14 +75,14 @@ void NotationSelectionPaster::handleLeftButtonPress(timeT,
Segment& segment = staff->getSegment();
PasteEventsCommand *command = new PasteEventsCommand
- (segment, m_parentView->getDocument()->getClipboard(), time,
+ (segment, m_tqparentView->getDocument()->getClipboard(), time,
PasteEventsCommand::Restricted);
if (!command->isPossible()) {
- m_parentView->slotStatusHelpMsg(i18n("Couldn't paste at this point"));
+ m_tqparentView->slotStatusHelpMsg(i18n("Couldn't paste at this point"));
} else {
- m_parentView->addCommandToHistory(command);
- m_parentView->slotStatusHelpMsg(i18n("Ready."));
+ m_tqparentView->addCommandToHistory(command);
+ m_tqparentView->slotStatusHelpMsg(i18n("Ready."));
}
}
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index 2a28545..3b5eda2 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -71,14 +71,14 @@ NotationSelector::NotationSelector(NotationView* view)
m_justSelectedBar(false),
m_wholeStaffSelectionComplete(false)
{
- connect(m_parentView, TQT_SIGNAL(usedSelection()),
+ connect(m_tqparentView, TQT_SIGNAL(usedSelection()),
this, TQT_SLOT(slotHideSelection()));
connect(this, TQT_SIGNAL(editElement(NotationStaff *, NotationElement *, bool)),
- m_parentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
+ m_tqparentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
TQIconSet icon
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new KToggleAction(i18n("Switch to Insert Tool"), icon, 0, this,
TQT_SLOT(slotInsertSelected()), actionCollection(),
@@ -188,7 +188,7 @@ void NotationSelector::handleLeftButtonPress(timeT t,
m_updateRect = true;
m_startedFineDrag = false;
- //m_parentView->setCursorPosition(p.x());
+ //m_tqparentView->setCursorPosition(p.x());
}
void NotationSelector::handleRightButtonPress(timeT t,
@@ -327,7 +327,7 @@ int NotationSelector::handleMouseMove(timeT, int,
} else {
- // Qt rectangle dimensions appear to be 1-based
+ // TQt rectangle dimensions appear to be 1-based
if (w > 0)
++w;
else
@@ -375,7 +375,7 @@ void NotationSelector::handleMouseRelease(timeT, int, TQMouseEvent *e)
// if the event was already part of the selection, we want to
// remove it
- if (m_selectionToMerge->contains(m_clickedElement->event())) {
+ if (m_selectionToMerge->tqcontains(m_clickedElement->event())) {
m_selectionToMerge->removeEvent(m_clickedElement->event());
} else {
m_selectionToMerge->addEvent(m_clickedElement->event());
@@ -431,7 +431,7 @@ void NotationSelector::drag(int x, int y, bool final)
return ;
EventSelection *selection = m_nParentView->getCurrentSelection();
- if (!selection || !selection->contains(m_clickedElement->event())) {
+ if (!selection || !selection->tqcontains(m_clickedElement->event())) {
selection = new EventSelection(m_selectedStaff->getSegment());
selection->addEvent(m_clickedElement->event());
}
@@ -460,7 +460,7 @@ void NotationSelector::drag(int x, int y, bool final)
::Rosegarden::Key key;
timeT dragTime = clickedTime;
- double layoutX = m_clickedElement->getLayoutX();
+ double tqlayoutX = m_clickedElement->getLayoutX();
timeT duration = m_clickedElement->getViewDuration();
NotationElementList::iterator itr =
@@ -470,7 +470,7 @@ void NotationSelector::drag(int x, int y, bool final)
NotationElement *elt = dynamic_cast<NotationElement *>(*itr);
dragTime = elt->getViewAbsoluteTime();
- layoutX = elt->getLayoutX();
+ tqlayoutX = elt->getLayoutX();
if (elt->isRest() && duration > 0 && elt->getCanvasItem()) {
@@ -490,7 +490,7 @@ void NotationSelector::drag(int x, int y, bool final)
part = parts - 1;
dragTime += part * restDuration / parts;
- layoutX += part * restWidth / parts +
+ tqlayoutX += part * restWidth / parts +
(restX - elt->getCanvasX());
}
}
@@ -532,7 +532,7 @@ void NotationSelector::drag(int x, int y, bool final)
m_clickedElement->isNote()) {
m_nParentView->showPreviewNote(targetStaff->getId(),
- layoutX, pitch, height,
+ tqlayoutX, pitch, height,
Note::getNearestNote(duration),
m_clickedElement->isGrace());
m_lastDragPitch = pitch;
@@ -614,7 +614,7 @@ void NotationSelector::dragFine(int x, int y, bool final)
EventSelection *selection = m_nParentView->getCurrentSelection();
if (!selection)
selection = new EventSelection(m_selectedStaff->getSegment());
- if (!selection->contains(m_clickedElement->event()))
+ if (!selection->tqcontains(m_clickedElement->event()))
selection->addEvent(m_clickedElement->event());
m_nParentView->setCurrentSelection(selection);
@@ -711,7 +711,7 @@ void NotationSelector::ready()
m_selectionRect->hide();
m_selectionRect->setPen(GUIPalette::getColour(GUIPalette::SelectionRectangle));
- m_nParentView->setCanvasCursor(Qt::arrowCursor);
+ m_nParentView->setCanvasCursor(TQt::arrowCursor);
m_nParentView->setHeightTracking(false);
}
@@ -738,57 +738,57 @@ void NotationSelector::slotInsertSelected()
void NotationSelector::slotEraseSelected()
{
- m_parentView->actionCollection()->action("erase")->activate();
+ m_tqparentView->actionCollection()->action("erase")->activate();
}
void NotationSelector::slotCollapseRestsHard()
{
- m_parentView->actionCollection()->action("collapse_rests_aggressively")->activate();
+ m_tqparentView->actionCollection()->action("collapse_rests_aggressively")->activate();
}
void NotationSelector::slotRespellFlat()
{
- m_parentView->actionCollection()->action("respell_flat")->activate();
+ m_tqparentView->actionCollection()->action("respell_flat")->activate();
}
void NotationSelector::slotRespellSharp()
{
- m_parentView->actionCollection()->action("respell_sharp")->activate();
+ m_tqparentView->actionCollection()->action("respell_sharp")->activate();
}
void NotationSelector::slotRespellNatural()
{
- m_parentView->actionCollection()->action("respell_natural")->activate();
+ m_tqparentView->actionCollection()->action("respell_natural")->activate();
}
void NotationSelector::slotCollapseNotes()
{
- m_parentView->actionCollection()->action("collapse_notes")->activate();
+ m_tqparentView->actionCollection()->action("collapse_notes")->activate();
}
void NotationSelector::slotInterpret()
{
- m_parentView->actionCollection()->action("interpret")->activate();
+ m_tqparentView->actionCollection()->action("interpret")->activate();
}
void NotationSelector::slotStaffAbove()
{
- m_parentView->actionCollection()->action("move_events_up_staff")->activate();
+ m_tqparentView->actionCollection()->action("move_events_up_staff")->activate();
}
void NotationSelector::slotStaffBelow()
{
- m_parentView->actionCollection()->action("move_events_down_staff")->activate();
+ m_tqparentView->actionCollection()->action("move_events_down_staff")->activate();
}
void NotationSelector::slotMakeInvisible()
{
- m_parentView->actionCollection()->action("make_invisible")->activate();
+ m_tqparentView->actionCollection()->action("make_invisible")->activate();
}
void NotationSelector::slotMakeVisible()
{
- m_parentView->actionCollection()->action("make_visible")->activate();
+ m_tqparentView->actionCollection()->action("make_visible")->activate();
}
void NotationSelector::setViewCurrentSelection(bool preview)
@@ -838,7 +838,7 @@ EventSelection* NotationSelector::getSelection()
TQCanvasItemList::Iterator it;
TQRect rect = m_selectionRect->rect().normalize();
- QCanvasNotationSprite *sprite = 0;
+ TQCanvasNotationSprite *sprite = 0;
if (!m_selectedStaff) {
@@ -850,7 +850,7 @@ EventSelection* NotationSelector::getSelection()
for (it = itemList.begin(); it != itemList.end(); ++it) {
- if ((sprite = dynamic_cast<QCanvasNotationSprite*>(*it))) {
+ if ((sprite = dynamic_cast<TQCanvasNotationSprite*>(*it))) {
NotationElement &el = sprite->getNotationElement();
@@ -870,11 +870,11 @@ EventSelection* NotationSelector::getSelection()
x += nbw;
}
- if (!rect.contains(x, int((*it)->y()), true)) {
+ if (!rect.tqcontains(x, int((*it)->y()), true)) {
// #988217 (Notation: Special column of pixels
// prevents sweep selection) -- for notes, test
// again with centred x-coord
- if (!el.isNote() || !rect.contains(x + nbw/2, int((*it)->y()), true)) {
+ if (!el.isNote() || !rect.tqcontains(x + nbw/2, int((*it)->y()), true)) {
continue;
}
}
@@ -906,7 +906,7 @@ EventSelection* NotationSelector::getSelection()
for (it = itemList.begin(); it != itemList.end(); ++it) {
- if ((sprite = dynamic_cast<QCanvasNotationSprite*>(*it))) {
+ if ((sprite = dynamic_cast<TQCanvasNotationSprite*>(*it))) {
NotationElement &el = sprite->getNotationElement();
@@ -925,11 +925,11 @@ EventSelection* NotationSelector::getSelection()
// check if the element's rect
// is actually included in the selection rect.
//
- if (!rect.contains(x, int((*it)->y()), true)) {
+ if (!rect.tqcontains(x, int((*it)->y()), true)) {
// #988217 (Notation: Special column of pixels
// prevents sweep selection) -- for notes, test again
// with centred x-coord
- if (!el.isNote() || !rect.contains(x + nbw/2, int((*it)->y()), true)) {
+ if (!el.isNote() || !rect.tqcontains(x + nbw/2, int((*it)->y()), true)) {
continue;
}
}
diff --git a/src/gui/editors/notation/NotationSelector.h b/src/gui/editors/notation/NotationSelector.h
index 6f9494a..f865cb7 100644
--- a/src/gui/editors/notation/NotationSelector.h
+++ b/src/gui/editors/notation/NotationSelector.h
@@ -54,6 +54,7 @@ class Event;
class NotationSelector : public NotationTool
{
Q_OBJECT
+ TQ_OBJECT
friend class NotationToolBox;
@@ -96,7 +97,7 @@ public:
/**
* Create the selection rect
*
- * We need this because NotationView deletes all QCanvasItems
+ * We need this because NotationView deletes all TQCanvasItems
* along with it. This happens before the NotationSelector is
* deleted, so we can't delete the selection rect in
* ~NotationSelector because that leads to double deletion.
@@ -159,7 +160,7 @@ protected:
NotationSelector(NotationView*);
/**
- * Set the current selection on the parent NotationView
+ * Set the current selection on the tqparent NotationView
*/
void setViewCurrentSelection(bool preview);
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 717e418..1b875f3 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -141,7 +141,7 @@ NotationStaff::changeFont(std::string fontName, int size)
}
void
-NotationStaff::insertTimeSignature(double layoutX,
+NotationStaff::insertTimeSignature(double tqlayoutX,
const TimeSignature &timeSig)
{
if (timeSig.isHidden())
@@ -149,11 +149,11 @@ NotationStaff::insertTimeSignature(double layoutX,
m_notePixmapFactory->setSelected(false);
TQCanvasPixmap *pixmap = m_notePixmapFactory->makeTimeSigPixmap(timeSig);
- QCanvasTimeSigSprite *sprite =
- new QCanvasTimeSigSprite(layoutX, pixmap, m_canvas);
+ TQCanvasTimeSigSprite *sprite =
+ new TQCanvasTimeSigSprite(tqlayoutX, pixmap, m_canvas);
LinedStaffCoords sigCoords =
- getCanvasCoordsForLayoutCoords(layoutX, getLayoutYForHeight(4));
+ getCanvasCoordsForLayoutCoords(tqlayoutX, getLayoutYForHeight(4));
sprite->move(sigCoords.first, (double)sigCoords.second);
sprite->show();
@@ -174,7 +174,7 @@ NotationStaff::deleteTimeSignatures()
}
void
-NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo)
+NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
{
bool needClef = false, needKey = false;
timeT t;
@@ -196,15 +196,15 @@ NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo)
if (needClef) {
- int layoutY = getLayoutYForHeight(clef.getAxisHeight());
+ int tqlayoutY = getLayoutYForHeight(clef.getAxisHeight());
LinedStaffCoords coords =
- getCanvasCoordsForLayoutCoords(layoutX + dx, layoutY);
+ getCanvasCoordsForLayoutCoords(tqlayoutX + dx, tqlayoutY);
TQCanvasPixmap *pixmap = m_notePixmapFactory->makeClefPixmap(clef);
- QCanvasNonElementSprite *sprite =
- new QCanvasNonElementSprite(pixmap, m_canvas);
+ TQCanvasNonElementSprite *sprite =
+ new TQCanvasNonElementSprite(pixmap, m_canvas);
sprite->move(coords.first, coords.second);
sprite->show();
@@ -215,15 +215,15 @@ NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo)
if (needKey) {
- int layoutY = getLayoutYForHeight(12);
+ int tqlayoutY = getLayoutYForHeight(12);
LinedStaffCoords coords =
- getCanvasCoordsForLayoutCoords(layoutX + dx, layoutY);
+ getCanvasCoordsForLayoutCoords(tqlayoutX + dx, tqlayoutY);
TQCanvasPixmap *pixmap = m_notePixmapFactory->makeKeyPixmap(key, clef);
- QCanvasNonElementSprite *sprite =
- new QCanvasNonElementSprite(pixmap, m_canvas);
+ TQCanvasNonElementSprite *sprite =
+ new TQCanvasNonElementSprite(pixmap, m_canvas);
sprite->move(coords.first, coords.second);
sprite->show();
@@ -236,16 +236,16 @@ NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo)
if (m_notationView->isInPrintMode() && (needClef || needKey)) {
- int layoutY = getLayoutYForHeight(14);
- int h = getLayoutYForHeight(-8) - layoutY;
+ int tqlayoutY = getLayoutYForHeight(14);
+ int h = getLayoutYForHeight(-8) - tqlayoutY;
LinedStaffCoords coords =
- getCanvasCoordsForLayoutCoords(layoutX, layoutY);
+ getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
TQCanvasRectangle *rect = new TQCanvasRectangle(coords.first, coords.second,
dx, h, m_canvas);
- rect->setPen(Qt::black);
- rect->setBrush(Qt::white);
+ rect->setPen(TQt::black);
+ rect->setBrush(TQt::white);
rect->setZ(1);
rect->show();
@@ -282,8 +282,8 @@ NotationStaff::drawStaffName()
m_staffName = new QCanvasStaffNameSprite(map, m_canvas);
- int layoutY = getLayoutYForHeight(3);
- LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(0, layoutY);
+ int tqlayoutY = getLayoutYForHeight(3);
+ LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(0, tqlayoutY);
m_staffName->move(getX() + getMargin() + m_notePixmapFactory->getNoteBodyWidth(),
coords.second - map->height() / 2);
m_staffName->show();
@@ -300,9 +300,9 @@ NotationStaff::isStaffNameUpToDate()
timeT
NotationStaff::getTimeAtCanvasCoords(double cx, int cy) const
{
- LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
+ LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
RulerScale * rs = m_notationView->getHLayout();
- return rs->getTimeForX(layoutCoords.first);
+ return rs->getTimeForX(tqlayoutCoords.first);
}
void
@@ -310,17 +310,17 @@ NotationStaff::getClefAndKeyAtCanvasCoords(double cx, int cy,
Clef &clef,
::Rosegarden::Key &key) const
{
- LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
+ LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
int i;
for (i = 0; i < m_clefChanges.size(); ++i) {
- if (m_clefChanges[i].first > layoutCoords.first)
+ if (m_clefChanges[i].first > tqlayoutCoords.first)
break;
clef = m_clefChanges[i].second;
}
for (i = 0; i < m_keyChanges.size(); ++i) {
- if (m_keyChanges[i].first > layoutCoords.first)
+ if (m_keyChanges[i].first > tqlayoutCoords.first)
break;
key = m_keyChanges[i].second;
}
@@ -379,7 +379,7 @@ NotationStaff::getClosestElementToLayoutX(double x,
return notes->end();
}
- NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at layout " << (*result)->getLayoutX() << " - we're at layout " << x << endl;
+ NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at tqlayout " << (*result)->getLayoutX() << " - we're at tqlayout " << x << endl;
PRINT_ELAPSED("NotationStaff::getClosestElementToLayoutX");
@@ -449,7 +449,7 @@ NotationStaff::renderElements(NotationElementList::iterator from,
// NOTATION_DEBUG << "NotationStaff " << this << "::renderElements()" << endl;
Profiler profiler("NotationStaff::renderElements");
- emit setOperationName(i18n("Rendering staff %1...").arg(getId() + 1));
+ emit setOperationName(i18n("Rendering staff %1...").tqarg(getId() + 1));
emit setProgress(0);
throwIfCancelled();
@@ -512,7 +512,7 @@ NotationStaff::renderPrintable(timeT from, timeT to)
Profiler profiler("NotationStaff::renderElements");
- emit setOperationName(i18n("Rendering notes on staff %1...").arg(getId() + 1));
+ emit setOperationName(i18n("Rendering notes on staff %1...").tqarg(getId() + 1));
emit setProgress(0);
throwIfCancelled();
@@ -580,7 +580,7 @@ NotationStaff::positionElements(timeT from, timeT to)
if (to < startTime) to = startTime;
if (to == from) return;
- emit setOperationName(i18n("Positioning staff %1...").arg(getId() + 1));
+ emit setOperationName(i18n("Positioning staff %1...").tqarg(getId() + 1));
emit setProgress(0);
throwIfCancelled();
@@ -1395,15 +1395,15 @@ void
NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
FitPolicy policy)
{
- double layoutX = elt->getLayoutX();
- int layoutY = (int)elt->getLayoutY();
+ double tqlayoutX = elt->getLayoutX();
+ int tqlayoutY = (int)elt->getLayoutY();
elt->removeCanvasItem();
while (1) {
LinedStaffCoords coords =
- getCanvasCoordsForLayoutCoords(layoutX, layoutY);
+ getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
double canvasX = coords.first;
int canvasY = coords.second;
@@ -1412,11 +1412,11 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
if (m_pageMode == LinearMode || policy == PretendItFittedAllAlong) {
- item = new QCanvasNotationSprite(*elt, pixmap, m_canvas);
+ item = new TQCanvasNotationSprite(*elt, pixmap, m_canvas);
} else {
- int row = getRowForLayoutX(layoutX);
+ int row = getRowForLayoutX(tqlayoutX);
double rightMargin = getCanvasXForRightOfRow(row);
double extent = canvasX + pixmap->width();
@@ -1432,13 +1432,13 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
PixmapFunctions::splitPixmap(*pixmap,
int(rightMargin - canvasX));
- TQCanvasPixmap *leftCanvasPixmap = new QCanvasPixmap
+ TQCanvasPixmap *leftCanvasPixmap = new TQCanvasPixmap
(split.first, TQPoint(pixmap->offsetX(), pixmap->offsetY()));
- TQCanvasPixmap *rightCanvasPixmap = new QCanvasPixmap
+ TQCanvasPixmap *rightCanvasPixmap = new TQCanvasPixmap
(split.second, TQPoint(0, pixmap->offsetY()));
- item = new QCanvasNotationSprite(*elt, leftCanvasPixmap, m_canvas);
+ item = new TQCanvasNotationSprite(*elt, leftCanvasPixmap, m_canvas);
item->setZ(z);
if (elt->getCanvasItem()) {
@@ -1452,19 +1452,19 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
delete pixmap;
pixmap = rightCanvasPixmap;
- layoutX += rightMargin - canvasX + 0.01; // ensure flip to next row
+ tqlayoutX += rightMargin - canvasX + 0.01; // ensure flip to next row
continue;
} else { // policy == MoveBackToFit
- item = new QCanvasNotationSprite(*elt, pixmap, m_canvas);
+ item = new TQCanvasNotationSprite(*elt, pixmap, m_canvas);
elt->setLayoutX(elt->getLayoutX() - (extent - rightMargin));
- coords = getCanvasCoordsForLayoutCoords(layoutX, layoutY);
+ coords = getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
canvasX = coords.first;
}
} else {
- item = new QCanvasNotationSprite(*elt, pixmap, m_canvas);
+ item = new TQCanvasNotationSprite(*elt, pixmap, m_canvas);
}
}
@@ -1742,7 +1742,7 @@ NotationStaff::renderNote(ViewElementList::iterator &vli)
if (collision) {
// Make collision halo
TQCanvasPixmap *haloPixmap = factory->makeNoteHaloPixmap(params);
- haloItem = new QCanvasNotationSprite(*elt, haloPixmap, m_canvas);
+ haloItem = new TQCanvasNotationSprite(*elt, haloPixmap, m_canvas);
haloItem->setZ(-1);
}
}
@@ -1819,11 +1819,11 @@ NotationStaff::isSelected(NotationElementList::iterator it)
{
const EventSelection *selection =
m_notationView->getCurrentSelection();
- return selection && selection->contains((*it)->event());
+ return selection && selection->tqcontains((*it)->event());
}
void
-NotationStaff::showPreviewNote(double layoutX, int heightOnStaff,
+NotationStaff::showPreviewNote(double tqlayoutX, int heightOnStaff,
const Note &note, bool grace)
{
NotePixmapFactory *npf = m_notePixmapFactory;
@@ -1851,8 +1851,8 @@ NotationStaff::showPreviewNote(double layoutX, int heightOnStaff,
m_previewSprite = new QCanvasSimpleSprite
(npf->makeNotePixmap(params), m_canvas);
- int layoutY = getLayoutYForHeight(heightOnStaff);
- LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX, layoutY);
+ int tqlayoutY = getLayoutYForHeight(heightOnStaff);
+ LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
m_previewSprite->move(coords.first, (double)coords.second);
m_previewSprite->setZ(4);
diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h
index f58e77d..b941ac0 100644
--- a/src/gui/editors/notation/NotationStaff.h
+++ b/src/gui/editors/notation/NotationStaff.h
@@ -136,14 +136,14 @@ public:
/**
* Assign suitable coordinates to the elements on the staff,
- * based entirely on the layout X and Y coordinates they were
- * given by the horizontal and vertical layout processes.
+ * based entirely on the tqlayout X and Y coordinates they were
+ * given by the horizontal and vertical tqlayout processes.
*
* This is necessary because the sprites that are being positioned
- * may have been created either after the layout process completed
+ * may have been created either after the tqlayout process completed
* (by renderElements) or before (by the previous renderElements
* call, if the sprites are unchanged but have moved) -- so
- * neither the layout nor renderElements can authoritatively set
+ * neither the tqlayout nor renderElements can authoritatively set
* their final positions.
*
* This method also updates the selected-ness of any elements it
@@ -197,7 +197,7 @@ public:
* elements). Pass movedOnly as true to indicate that elements
* have not changed but only been repositioned, for example as a
* consequence of a modification on another staff that caused a
- * relayout.
+ * retqlayout.
*/
virtual void markChanged(timeT from = 0,
timeT to = 0,
@@ -223,7 +223,7 @@ public:
/**
* Insert time signature at x-coordinate \a x.
*/
- virtual void insertTimeSignature(double layoutX,
+ virtual void insertTimeSignature(double tqlayoutX,
const TimeSignature &timeSig);
/**
@@ -234,7 +234,7 @@ public:
/**
* Insert repeated clef and key at start of new line, at x-coordinate \a x.
*/
- virtual void insertRepeatedClefAndKey(double layoutX, int barNo);
+ virtual void insertRepeatedClefAndKey(double tqlayoutX, int barNo);
/**
* Delete all repeated clefs and keys.
@@ -270,7 +270,7 @@ public:
Accidentals::NoAccidental) const;
/**
- * Find the NotationElement whose layout x-coord is closest to x,
+ * Find the NotationElement whose tqlayout x-coord is closest to x,
* without regard to its y-coord.
*
* If notesAndRestsOnly is true, will return the closest note
@@ -289,7 +289,7 @@ public:
int proximityThreshold = 10);
/**
- * Find the NotationElement "under" the given layout x-coord,
+ * Find the NotationElement "under" the given tqlayout x-coord,
* without regard to its y-coord.
*
* Also returns the clef and key in force at the given coordinates.
@@ -301,7 +301,7 @@ public:
* Draw a note on the staff to show an insert position prior to
* an insert.
*/
- virtual void showPreviewNote(double layoutX, int heightOnStaff,
+ virtual void showPreviewNote(double tqlayoutX, int heightOnStaff,
const Note &note, bool grace);
/**
@@ -396,7 +396,7 @@ protected:
* Returns true if the item at the given iterator appears to have
* moved horizontally without the spacing around it changing.
*
- * In practice, calculates the offset between the intended layout
+ * In practice, calculates the offset between the intended tqlayout
* and current canvas coordinates of the item at the given
* iterator, and returns true if this offset is equal to those of
* all other following iterators at the same time as well as the
@@ -412,7 +412,7 @@ protected:
/**
* Prepare a painter to draw an object of logical width w at
- * layout-x coord x, starting at offset dx into the object, by
+ * tqlayout-x coord x, starting at offset dx into the object, by
* setting the painter's clipping so as to crop the object at the
* right edge of the row if it would otherwise overrun. The
* return value is the amount of the object visible on this row
@@ -423,7 +423,7 @@ protected:
* This function calls painter.save(), and the caller must call
* painter.restore() after use.
*/
- virtual double setPainterClipping(TQPainter *, double layoutX, int layoutY,
+ virtual double setPainterClipping(TQPainter *, double tqlayoutX, int tqlayoutY,
double dx, double w, LinedStaffCoords &coords,
FitPolicy policy);
@@ -473,8 +473,8 @@ protected:
TQPainter *m_printPainter;
- enum BarStatus { UnRendered = 0, Rendered, Positioned };
- typedef std::map<int, BarStatus> BarStatusMap;
+ enum BartqStatus { UnRendered = 0, Rendered, Positioned };
+ typedef std::map<int, BartqStatus> BarStatusMap;
BarStatusMap m_status;
std::pair<int, int> m_lastRenderCheck;
bool m_ready;
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index 6065323..0c73bbc 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -39,7 +39,7 @@
namespace Rosegarden
{
-QString
+TQString
NotationStrings::addDots(TQString s, int dots,
bool hyphenate, bool internationalize)
{
@@ -49,31 +49,31 @@ NotationStrings::addDots(TQString s, int dots,
if (internationalize) {
if (dots > 1) {
if (hyphenate)
- return i18n("%1-dotted-%2").arg(dots).arg(s);
+ return i18n("%1-dotted-%2").tqarg(dots).tqarg(s);
else
- return i18n("%1-dotted %2").arg(dots).arg(s);
+ return i18n("%1-dotted %2").tqarg(dots).tqarg(s);
} else {
if (hyphenate)
- return i18n("dotted-%1").arg(s);
+ return i18n("dotted-%1").tqarg(s);
else
- return i18n("dotted %1").arg(s);
+ return i18n("dotted %1").tqarg(s);
}
} else {
if (dots > 1) {
if (hyphenate)
- return TQString("%1-dotted-%2").arg(dots).arg(s);
+ return TQString("%1-dotted-%2").tqarg(dots).tqarg(s);
else
- return TQString("%1-dotted %2").arg(dots).arg(s);
+ return TQString("%1-dotted %2").tqarg(dots).tqarg(s);
} else {
if (hyphenate)
- return TQString("dotted-%1").arg(s);
+ return TQString("dotted-%1").tqarg(s);
else
- return TQString("dotted %1").arg(s);
+ return TQString("dotted %1").tqarg(s);
}
}
}
-QString
+TQString
NotationStrings::getNoteName(Note note, bool plural, bool triplet)
{
Note::Type type = note.getNoteType();
@@ -93,17 +93,17 @@ NotationStrings::getNoteName(Note note, bool plural, bool triplet)
};
if (plural && triplet) {
- return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form
+ return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form
} else if (plural) {
return addDots(pluralnames[type], dots, false, true);
} else if (triplet) {
- return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
+ return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true);
} else {
return addDots(names[type], dots, false, true);
}
}
-QString
+TQString
NotationStrings::getAmericanName(Note note, bool plural, bool triplet)
{
Note::Type type = note.getNoteType();
@@ -123,17 +123,17 @@ NotationStrings::getAmericanName(Note note, bool plural, bool triplet)
};
if (plural && triplet) {
- return addDots(TQString("%1 triplets").arg(names[type]), dots, false, false);
+ return addDots(TQString("%1 triplets").tqarg(names[type]), dots, false, false);
} else if (plural) {
return addDots(pluralnames[type], dots, false, false);
} else if (triplet) {
- return addDots(TQString("%1 triplet").arg(names[type]), dots, false, false);
+ return addDots(TQString("%1 triplet").tqarg(names[type]), dots, false, false);
} else {
return addDots(names[type], dots, false, false);
}
}
-QString
+TQString
NotationStrings::getShortNoteName(Note note, bool plural, bool triplet)
{
Note::Type type = note.getNoteType();
@@ -151,17 +151,17 @@ NotationStrings::getShortNoteName(Note note, bool plural, bool triplet)
};
if (plural && triplet) {
- return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
+ return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form
} else if (plural) {
return addDots(pluralnames[type], dots, false, true);
} else if (triplet) {
- return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true);
+ return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true);
} else {
return addDots(names[type], dots, false, true);
}
}
-QString
+TQString
NotationStrings::getReferenceName(Note note, bool isRest)
{
Note::Type type = note.getNoteType();
@@ -182,7 +182,7 @@ Note
NotationStrings::getNoteForName(TQString name)
{
std::string origName(qstrtostr(name));
- int pos = name.find('-');
+ int pos = name.tqfind('-');
int dots = 0;
if (pos > 0 && pos < 6 && pos < int(name.length()) - 1) {
@@ -236,7 +236,7 @@ NotationStrings::getNoteForName(TQString name)
throw MalformedNoteName("Can't parse note name \"" + origName + "\"");
}
-QString
+TQString
NotationStrings::makeNoteMenuLabel(timeT duration,
bool brief,
timeT &errorReturn,
@@ -271,11 +271,11 @@ NotationStrings::makeNoteMenuLabel(timeT duration,
timeT wholeNote = Note(Note::Semibreve).getDuration();
if ((wholeNote / duration) * duration == wholeNote) {
- return TQString("1/%1").arg(wholeNote / duration);
+ return TQString("1/%1").tqarg(wholeNote / duration);
} else if ((duration / wholeNote) * wholeNote == duration) {
- return TQString("%1/1").arg(duration / wholeNote);
+ return TQString("%1/1").tqarg(duration / wholeNote);
} else {
- return i18n("%1 ticks").arg(duration);
+ return i18n("%1 ticks").tqarg(duration);
plural = false;
}
diff --git a/src/gui/editors/notation/NotationTool.cpp b/src/gui/editors/notation/NotationTool.cpp
index b187fbb..6d32782 100644
--- a/src/gui/editors/notation/NotationTool.cpp
+++ b/src/gui/editors/notation/NotationTool.cpp
@@ -44,13 +44,13 @@ NotationTool::~NotationTool()
NOTATION_DEBUG << "NotationTool::~NotationTool()" << endl;
// delete m_menu;
- // m_parentView->factory()->removeClient(this);
+ // m_tqparentView->factory()->removeClient(this);
// m_instance = 0;
}
void NotationTool::ready()
{
- m_nParentView->setCanvasCursor(Qt::arrowCursor);
+ m_nParentView->setCanvasCursor(TQt::arrowCursor);
m_nParentView->setHeightTracking(false);
}
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index 7632413..d3511fb 100644
--- a/src/gui/editors/notation/NotationToolBox.cpp
+++ b/src/gui/editors/notation/NotationToolBox.cpp
@@ -42,9 +42,9 @@
namespace Rosegarden
{
-NotationToolBox::NotationToolBox(NotationView *parent)
- : EditToolBox(parent),
- m_nParentView(parent)
+NotationToolBox::NotationToolBox(NotationView *tqparent)
+ : EditToolBox(tqparent),
+ m_nParentView(tqparent)
{
//m_tools.setAutoDelete(true);
}
@@ -89,7 +89,7 @@ EditTool* NotationToolBox::createTool(const TQString& toolName)
else {
KMessageBox::error(0, TQString("NotationToolBox::createTool : unrecognised toolname %1 (%2)")
- .arg(toolName).arg(toolNamelc));
+ .tqarg(toolName).tqarg(toolNamelc));
return 0;
}
diff --git a/src/gui/editors/notation/NotationToolBox.h b/src/gui/editors/notation/NotationToolBox.h
index d6765e6..5c15b2b 100644
--- a/src/gui/editors/notation/NotationToolBox.h
+++ b/src/gui/editors/notation/NotationToolBox.h
@@ -47,8 +47,9 @@ class EditTool;
class NotationToolBox : public EditToolBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- NotationToolBox(NotationView* parent);
+ NotationToolBox(NotationView* tqparent);
protected:
virtual EditTool* createTool(const TQString& toolName);
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index 5be5532..12979ea 100644
--- a/src/gui/editors/notation/NotationVLayout.cpp
+++ b/src/gui/editors/notation/NotationVLayout.cpp
@@ -55,8 +55,8 @@ using namespace BaseProperties;
NotationVLayout::NotationVLayout(Composition *c, NotePixmapFactory *npf,
const NotationProperties &properties,
- TQObject* parent, const char* name) :
- ProgressReporter(parent, name),
+ TQObject* tqparent, const char* name) :
+ ProgressReporter(tqparent, name),
m_composition(c),
m_npf(npf),
m_notationQuantizer(c->getNotationQuantizer()),
@@ -236,7 +236,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
if (!(*chord[j])->event()->get
<Int>
(m_properties.HEIGHT_ON_STAFF, height)) {
- std::cerr << TQString("ERROR: Event in chord at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").arg((*chord[j])->getViewAbsoluteTime()) << std::endl;
+ std::cerr << TQString("ERROR: Event in chord at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*chord[j])->getViewAbsoluteTime()) << std::endl;
(*chord[j])->event()->dump(std::cerr);
}
h.push_back(height);
@@ -249,7 +249,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
bool hasShifted = chord.hasNoteHeadShifted();
- double y0 = -1E50; // A very unlikely Y layout value
+ double y0 = -1E50; // A very unlikely Y tqlayout value
for (unsigned int j = 0; j < chord.size(); ++j) {
@@ -269,7 +269,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
// These calculations and assignments are pretty much final
// if the chord is not in a beamed group, but if it is then
// they will be reworked by NotationGroup::applyBeam, which
- // is called from NotationHLayout::layout, which is called
+ // is called from NotationHLayout::tqlayout, which is called
// after this. Any inaccuracies here for beamed groups
// should be stamped out there.
@@ -342,7 +342,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
// Not optimal, as we can end up scanning the chord
// multiple times (we'll return to it after scanning the
// contained note). [We can't just iterate over all
- // elements within the chord (as we can in hlayout)
+ // elements within the chord (as we can in htqlayout)
// because we need them in height order.]
i = chord.getFirstElementNotInChord();
@@ -490,7 +490,7 @@ NotationVLayout::positionSlur(NotationStaff &staff,
if (!event->get
<Int>(m_properties.HEIGHT_ON_STAFF, h)) {
KMessageBox::sorry
- ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").arg((*scooter)->getViewAbsoluteTime()));
+ ((TQWidget *)tqparent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
event->dump(std::cerr);
}
diff --git a/src/gui/editors/notation/NotationVLayout.h b/src/gui/editors/notation/NotationVLayout.h
index 2e718c7..afddb0b 100644
--- a/src/gui/editors/notation/NotationVLayout.h
+++ b/src/gui/editors/notation/NotationVLayout.h
@@ -52,7 +52,7 @@ class Composition;
/**
- * Vertical notation layout
+ * Vertical notation tqlayout
*
* computes the Y coordinate of notation elements
*/
@@ -63,7 +63,7 @@ class NotationVLayout : public ProgressReporter,
public:
NotationVLayout(Composition *c, NotePixmapFactory *npf,
const NotationProperties &properties,
- TQObject* parent, const char* name = 0);
+ TQObject* tqparent, const char* name = 0);
virtual ~NotationVLayout();
@@ -91,9 +91,9 @@ public:
timeT = 0);
/**
- * Do any layout dependent on more than one staff. As it
- * happens, we have none, but we do have some layout that
- * depends on the final results from the horizontal layout
+ * Do any tqlayout dependent on more than one staff. As it
+ * happens, we have none, but we do have some tqlayout that
+ * depends on the final results from the horizontal tqlayout
* (for slurs), so we should do that here
*/
virtual void finishLayout(timeT = 0,
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index b3db080..4d16fb7 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -346,9 +346,9 @@ public:
NotationView::NotationView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *parent,
+ TQWidget *tqparent,
bool showProgressive) :
- EditView(doc, segments, 2, parent, "notationview"),
+ EditView(doc, segments, 2, tqparent, "notationview"),
m_properties(getViewLocalPropertyPrefix()),
m_selectionCounter(0),
m_insertModeLabel(0),
@@ -372,10 +372,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_pageMode(LinedStaff::LinearMode),
m_leftGutter(20),
m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)),
- m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
- m_properties, this)),
- m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
- m_properties, this)),
+ m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
+ m_properties, TQT_TQOBJECT(this))),
+ m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
+ m_properties, TQT_TQOBJECT(this))),
m_chordNameRuler(0),
m_tempoRuler(0),
m_rawNoteRuler(0),
@@ -409,7 +409,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
// Initialise the display-related defaults that will be needed
- // by both the actions and the layout toolbar
+ // by both the actions and the tqlayout toolbar
m_config->setGroup(NotationViewConfigGroup);
@@ -435,15 +435,15 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
NoteFontFactory::getDefaultSize(m_fontName));
int defaultSpacing = m_config->readNumEntry("spacing", 100);
- m_hlayout->setSpacing(defaultSpacing);
+ m_htqlayout->setSpacing(defaultSpacing);
int defaultProportion = m_config->readNumEntry("proportion", 60);
- m_hlayout->setProportion(defaultProportion);
+ m_htqlayout->setProportion(defaultProportion);
delete m_notePixmapFactory;
m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize);
- m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
- m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
+ m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
+ m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
setupActions();
// setupAddControlRulerMenu(); - too early for notation, moved to end of ctor.
@@ -452,7 +452,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
setBackgroundMode(PaletteBase);
- TQCanvas *tCanvas = new TQCanvas(this);
+ TQCanvas *tCanvas = new TQCanvas(TQT_TQOBJECT(this));
tCanvas->resize(width() * 2, height() * 2);
setCanvasView(new NotationCanvasView(*this, tCanvas, getCentralWidget()));
@@ -460,19 +460,19 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
updateViewCaption();
m_chordNameRuler = new ChordNameRuler
- (m_hlayout, doc, segments, m_leftGutter, 20, getCentralWidget());
+ (m_htqlayout, doc, segments, m_leftGutter, 20, getCentralWidget());
addRuler(m_chordNameRuler);
if (showProgressive)
m_chordNameRuler->show();
m_tempoRuler = new TempoRuler
- (m_hlayout, doc, this, m_leftGutter, 24, false, getCentralWidget());
+ (m_htqlayout, doc, this, m_leftGutter, 24, false, getCentralWidget());
addRuler(m_tempoRuler);
m_tempoRuler->hide();
static_cast<TempoRuler *>(m_tempoRuler)->connectSignals();
m_rawNoteRuler = new RawNoteRuler
- (m_hlayout, segments[0], m_leftGutter, 20, getCentralWidget());
+ (m_htqlayout, segments[0], m_leftGutter, 20, getCentralWidget());
addRuler(m_rawNoteRuler);
m_rawNoteRuler->show();
@@ -484,7 +484,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
readOptions();
- setBottomStandardRuler(new StandardRuler(getDocument(), m_hlayout, m_leftGutter, 25,
+ setBottomStandardRuler(new StandardRuler(getDocument(), m_htqlayout, m_leftGutter, 25,
true, getBottomWidget()));
for (unsigned int i = 0; i < segments.size(); ++i)
@@ -506,7 +506,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_canvasView->setLeftFixedWidget(m_headersGroupView);
// Add a close button just above the track headers.
- // The grid layout is only here to maintain the button in a
+ // The grid tqlayout is only here to maintain the button in a
// right place
m_headersTopFrame = new TQFrame(getCentralWidget());
TQGridLayout * headersTopGrid
@@ -516,13 +516,13 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
TQPushButton * hideHeadersButton
= new TQPushButton(m_headersTopFrame);
headersTopGrid->addWidget(hideHeadersButton, 1, 1,
- Qt::AlignRight | Qt::AlignBottom);
+ TQt::AlignRight | TQt::AlignBottom);
hideHeadersButton->setIconSet(TQIconSet(pixmap));
hideHeadersButton->setFlat(true);
TQToolTip::add(hideHeadersButton, i18n("Close track headers"));
headersTopGrid->setMargin(4);
setTopStandardRuler(new StandardRuler(getDocument(),
- m_hlayout, m_leftGutter, 25,
+ m_htqlayout, m_leftGutter, 25,
false, getCentralWidget()), m_headersTopFrame);
m_topStandardRuler->getLoopRuler()->setBackgroundColor
@@ -544,7 +544,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
//
- // layout
+ // tqlayout
//
ProgressDialog* progressDlg = 0;
@@ -571,21 +571,21 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_staffs[0]->setCurrent(true);
m_config->setGroup(NotationViewConfigGroup);
- int layoutMode = m_config->readNumEntry("layoutmode", 0);
+ int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0);
try
{
LinedStaff::PageMode mode = LinedStaff::LinearMode;
- if (layoutMode == 1)
+ if (tqlayoutMode == 1)
mode = LinedStaff::ContinuousPageMode;
- else if (layoutMode == 2)
+ else if (tqlayoutMode == 2)
mode = LinedStaff::MultiPageMode;
setPageMode(mode);
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
- m_staffs[i]->getSegment().getRefreshStatus
+ m_staffs[i]->getSegment().getRefreshtqStatus
(m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
}
@@ -594,7 +594,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
} catch (ProgressReporter::Cancelled c)
{
// when cancelled, m_ok is false -- checked by calling method
- NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl;
+ NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl;
}
NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl;
@@ -676,10 +676,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
this, TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int)));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(zoomIn()), this, TQT_SLOT(slotZoomIn()));
+ (getCanvasView(), TQT_SIGNAL(zoomIn()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn()));
TQObject::connect
- (getCanvasView(), TQT_SIGNAL(zoomOut()), this, TQT_SLOT(slotZoomOut()));
+ (getCanvasView(), TQT_SIGNAL(zoomOut()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut()));
TQObject::connect
(m_pannerDialog->scrollbox(), TQT_SIGNAL(valueChanged(const TQPoint &)),
@@ -754,24 +754,24 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
slotSetInsertCursorPosition(0);
slotSetPointerPosition(doc->getComposition().getPosition());
setCurrentSelection(0, false, true);
- slotUpdateInsertModeStatus();
- m_chordNameRuler->repaint();
- m_tempoRuler->repaint();
- m_rawNoteRuler->repaint();
+ slotUpdateInsertModetqStatus();
+ m_chordNameRuler->tqrepaint();
+ m_tempoRuler->tqrepaint();
+ m_rawNoteRuler->tqrepaint();
m_inhibitRefresh = false;
// slotCheckRendered(0, getCanvasView()->visibleWidth());
- // getCanvasView()->repaintContents();
+ // getCanvasView()->tqrepaintContents();
updateView();
TQObject::connect
(this, TQT_SIGNAL(renderComplete()),
getCanvasView(), TQT_SLOT(slotRenderComplete()));
- if (parent)
+ if (tqparent)
{
const TrackButtons * trackLabels =
- ((RosegardenGUIView*)parent)->getTrackEditor()->getTrackButtons();
+ ((RosegardenGUIView*)tqparent)->getTrackEditor()->getTrackButtons();
TQObject::connect
(trackLabels, TQT_SIGNAL(nameChanged()),
this, TQT_SLOT(slotUpdateStaffName()));
@@ -796,7 +796,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
NotationView::NotationView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *parent,
+ TQWidget *tqparent,
NotationView *referenceView)
: EditView(doc, segments, 1, 0, "printview"),
m_properties(getViewLocalPropertyPrefix()),
@@ -817,10 +817,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_pageMode(LinedStaff::LinearMode),
m_leftGutter(0),
m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)),
- m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
- m_properties, this)),
- m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
- m_properties, this)),
+ m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
+ m_properties, TQT_TQOBJECT(this))),
+ m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
+ m_properties, TQT_TQOBJECT(this))),
m_chordNameRuler(0),
m_tempoRuler(0),
m_rawNoteRuler(0),
@@ -850,7 +850,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
// Initialise the display-related defaults that will be needed
- // by both the actions and the layout toolbar
+ // by both the actions and the tqlayout toolbar
m_config->setGroup(NotationViewConfigGroup);
@@ -871,25 +871,25 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
if (referenceView)
{
- m_hlayout->setSpacing(referenceView->m_hlayout->getSpacing());
- m_hlayout->setProportion(referenceView->m_hlayout->getProportion());
+ m_htqlayout->setSpacing(referenceView->m_htqlayout->getSpacing());
+ m_htqlayout->setProportion(referenceView->m_htqlayout->getProportion());
} else
{
int defaultSpacing = m_config->readNumEntry("spacing", 100);
- m_hlayout->setSpacing(defaultSpacing);
+ m_htqlayout->setSpacing(defaultSpacing);
int defaultProportion = m_config->readNumEntry("proportion", 60);
- m_hlayout->setProportion(defaultProportion);
+ m_htqlayout->setProportion(defaultProportion);
}
delete m_notePixmapFactory;
m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize);
- m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
- m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
+ m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
+ m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
setBackgroundMode(PaletteBase);
m_config->setGroup(NotationViewConfigGroup);
- TQCanvas *tCanvas = new TQCanvas(this);
+ TQCanvas *tCanvas = new TQCanvas(TQT_TQOBJECT(this));
tCanvas->resize(width() * 2, height() * 2); //!!!
setCanvasView(new NotationCanvasView(*this, tCanvas, getCentralWidget()));
@@ -907,7 +907,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
ProgressDialog* progressDlg = 0;
- if (parent)
+ if (tqparent)
{
ProgressDialog::processEvents();
@@ -915,7 +915,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
NOTATION_DEBUG << "NotationView : setting up progress dialog" << endl;
progressDlg = new ProgressDialog(i18n("Preparing to print..."),
- 100, parent);
+ 100, tqparent);
progressDlg->setAutoClose(false);
progressDlg->setAutoReset(true);
progressDlg->setMinimumDuration(1000);
@@ -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().getRefreshStatus
+ m_staffs[i]->getSegment().getRefreshtqStatus
(m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false);
}
@@ -939,7 +939,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
} catch (ProgressReporter::Cancelled c)
{
// when cancelled, m_ok is false -- checked by calling method
- NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl;
+ NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl;
}
NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl;
@@ -1223,7 +1223,7 @@ void NotationView::positionStaffs()
}
}
- m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
+ m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
int topGutter = 0;
@@ -1341,7 +1341,7 @@ void NotationView::positionPages()
haveBackground = true;
}
// we're happy to ignore errors from this one:
- deskBackground.load(TQString("%1/misc/bg-desktop.xpm").arg(pixmapDir));
+ deskBackground.load(TQString("%1/misc/bg-desktop.xpm").tqarg(pixmapDir));
}
int pageWidth = getPageWidth();
@@ -1365,15 +1365,15 @@ void NotationView::positionPages()
if (m_pageMode != LinedStaff::MultiPageMode) {
if (haveBackground) {
- canvas()->setBackgroundPixmap(background);
- getCanvasView()->setBackgroundMode(Qt::FixedPixmap);
+ canvas()->tqsetBackgroundPixmap(background);
+ getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
getCanvasView()->setPaletteBackgroundPixmap(background);
getCanvasView()->setErasePixmap(background);
}
} else {
if (haveBackground) {
- canvas()->setBackgroundPixmap(deskBackground);
- getCanvasView()->setBackgroundMode(Qt::FixedPixmap);
+ canvas()->tqsetBackgroundPixmap(deskBackground);
+ getCanvasView()->setBackgroundMode(TQt::FixedPixmap);
getCanvasView()->setPaletteBackgroundPixmap(background);
getCanvasView()->setErasePixmap(background);
}
@@ -1389,7 +1389,7 @@ void NotationView::positionPages()
int w = pageWidth - leftMargin / 2;
int h = pageHeight;
- TQString str = TQString("%1").arg(page + 1);
+ TQString str = TQString("%1").tqarg(page + 1);
TQCanvasText *text = new TQCanvasText(str, pageNumberFont, canvas());
text->setX(m_leftGutter + pageWidth * page + pageWidth - pageNumberMetrics.width(str) - leftMargin);
text->setY(y + h - pageNumberMetrics.descent() - topMargin);
@@ -1399,8 +1399,8 @@ void NotationView::positionPages()
TQCanvasRectangle *rect = new TQCanvasRectangle(x, y, w, h, canvas());
if (haveBackground)
- rect->setBrush(TQBrush(Qt::white, background));
- rect->setPen(Qt::black);
+ rect->setBrush(TQBrush(TQt::white, background));
+ rect->setPen(TQt::black);
rect->setZ( -1000);
rect->show();
m_pages.push_back(rect);
@@ -1458,7 +1458,7 @@ void NotationView::readOptions()
setOneToolbar("show_clefs_toolbar", "Clefs Toolbar");
setOneToolbar("show_group_toolbar", "Group Toolbar");
setOneToolbar("show_marks_toolbar", "Marks Toolbar");
- setOneToolbar("show_layout_toolbar", "Layout Toolbar");
+ setOneToolbar("show_tqlayout_toolbar", "Layout Toolbar");
setOneToolbar("show_transport_toolbar", "Transport Toolbar");
setOneToolbar("show_accidentals_toolbar", "Accidentals Toolbar");
setOneToolbar("show_meta_toolbar", "Meta Toolbar");
@@ -1482,26 +1482,26 @@ void NotationView::readOptions()
opt = m_config->readBoolEntry("Show Annotations", true);
m_annotationsVisible = opt;
getToggleAction("show_annotations")->setChecked(opt);
- slotUpdateAnnotationsStatus();
+ slotUpdateAnnotationstqStatus();
// slotToggleAnnotations();
opt = m_config->readBoolEntry("Show LilyPond Directives", true);
m_lilyPondDirectivesVisible = opt;
getToggleAction("show_lilypond_directives")->setChecked(opt);
- slotUpdateLilyPondDirectivesStatus();
+ slotUpdateLilyPondDirectivestqStatus();
}
void NotationView::setupActions()
{
- KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
- KStdAction::printPreview(this, TQT_SLOT(slotFilePrintPreview()),
+ KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
+ KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrintPreview()),
actionCollection());
- new KAction(i18n("Print &with LilyPond..."), 0, 0, this,
+ new KAction(i18n("Print &with LilyPond..."), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotPrintLilyPond()), actionCollection(),
"file_print_lilypond");
- new KAction(i18n("Preview with Lil&yPond..."), 0, 0, this,
+ new KAction(i18n("Preview with Lil&yPond..."), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotPreviewLilyPond()), actionCollection(),
"file_preview_lilypond");
@@ -1513,7 +1513,7 @@ void NotationView::setupActions()
// View menu stuff
KActionMenu *fontActionMenu =
- new KActionMenu(i18n("Note &Font"), this, "note_font_actionmenu");
+ new KActionMenu(i18n("Note &Font"), TQT_TQOBJECT(this), "note_font_actionmenu");
std::set
<std::string> fs(NoteFontFactory::getFontNames());
@@ -1522,12 +1522,12 @@ void NotationView::setupActions()
for (std::vector<std::string>::iterator i = f.begin(); i != f.end(); ++i) {
- TQString fontQName(strtoqstr(*i));
+ TQString fontTQName(strtoqstr(*i));
KToggleAction *fontAction =
new KToggleAction
- (fontQName, 0, this, TQT_SLOT(slotChangeFontFromAction()),
- actionCollection(), "note_font_" + fontQName);
+ (fontTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeFontFromAction()),
+ actionCollection(), "note_font_" + fontTQName);
fontAction->setChecked(*i == m_fontName);
fontActionMenu->insert(fontAction);
@@ -1536,20 +1536,20 @@ void NotationView::setupActions()
actionCollection()->insert(fontActionMenu);
m_fontSizeActionMenu =
- new KActionMenu(i18n("Si&ze"), this, "note_font_size_actionmenu");
+ new KActionMenu(i18n("Si&ze"), TQT_TQOBJECT(this), "note_font_size_actionmenu");
setupFontSizeMenu();
actionCollection()->insert(m_fontSizeActionMenu);
m_showHeadersMenuEntry
- = new KAction(i18n("Show Track Headers"), 0, this,
+ = new KAction(i18n("Show Track Headers"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotShowHeadersGroup()),
actionCollection(), "show_track_headers");
KActionMenu *spacingActionMenu =
- new KActionMenu(i18n("S&pacing"), this, "stretch_actionmenu");
+ new KActionMenu(i18n("S&pacing"), TQT_TQOBJECT(this), "stretch_actionmenu");
- int defaultSpacing = m_hlayout->getSpacing();
+ int defaultSpacing = m_htqlayout->getSpacing();
std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
for (std::vector<int>::iterator i = spacings.begin();
@@ -1557,9 +1557,9 @@ void NotationView::setupActions()
KToggleAction *spacingAction =
new KToggleAction
- (TQString("%1%").arg(*i), 0, this,
+ (TQString("%1%").tqarg(*i), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotChangeSpacingFromAction()),
- actionCollection(), TQString("spacing_%1").arg(*i));
+ actionCollection(), TQString("spacing_%1").tqarg(*i));
spacingAction->setExclusiveGroup("spacing");
spacingAction->setChecked(*i == defaultSpacing);
@@ -1569,23 +1569,23 @@ void NotationView::setupActions()
actionCollection()->insert(spacingActionMenu);
KActionMenu *proportionActionMenu =
- new KActionMenu(i18n("Du&ration Factor"), this, "proportion_actionmenu");
+ new KActionMenu(i18n("Du&ration Factor"), TQT_TQOBJECT(this), "proportion_actionmenu");
- int defaultProportion = m_hlayout->getProportion();
+ int defaultProportion = m_htqlayout->getProportion();
std::vector<int> proportions = NotationHLayout::getAvailableProportions();
for (std::vector<int>::iterator i = proportions.begin();
i != proportions.end(); ++i) {
- TQString name = TQString("%1%").arg(*i);
+ TQString name = TQString("%1%").tqarg(*i);
if (*i == 0)
name = i18n("None");
KToggleAction *proportionAction =
new KToggleAction
- (name, 0, this,
+ (name, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotChangeProportionFromAction()),
- actionCollection(), TQString("proportion_%1").arg(*i));
+ actionCollection(), TQString("proportion_%1").tqarg(*i));
proportionAction->setExclusiveGroup("proportion");
proportionAction->setChecked(*i == defaultProportion);
@@ -1595,7 +1595,7 @@ void NotationView::setupActions()
actionCollection()->insert(proportionActionMenu);
KActionMenu *styleActionMenu =
- new KActionMenu(i18n("Note &Style"), this, "note_style_actionmenu");
+ new KActionMenu(i18n("Note &Style"), TQT_TQOBJECT(this), "note_style_actionmenu");
std::vector<NoteStyleName> styles
(NoteStyleFactory::getAvailableStyleNames());
@@ -1603,12 +1603,12 @@ void NotationView::setupActions()
for (std::vector<NoteStyleName>::iterator i = styles.begin();
i != styles.end(); ++i) {
- TQString styleQName(strtoqstr(*i));
+ TQString styleTQName(strtoqstr(*i));
KAction *styleAction =
new KAction
- (styleQName, 0, this, TQT_SLOT(slotSetStyleFromAction()),
- actionCollection(), "style_" + styleQName);
+ (styleTQName, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetStyleFromAction()),
+ actionCollection(), "style_" + styleTQName);
styleActionMenu->insert(styleAction);
}
@@ -1616,21 +1616,21 @@ void NotationView::setupActions()
actionCollection()->insert(styleActionMenu);
KActionMenu *ornamentActionMenu =
- new KActionMenu(i18n("Use Ornament"), this, "ornament_actionmenu");
+ new KActionMenu(i18n("Use Ornament"), TQT_TQOBJECT(this), "ornament_actionmenu");
new KAction
- (i18n("Insert Rest"), Key_P, this, TQT_SLOT(slotInsertRest()),
+ (i18n("Insert Rest"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRest()),
actionCollection(), TQString("insert_rest"));
new KAction
- (i18n("Switch from Note to Rest"), Key_T, this,
+ (i18n("Switch from Note to Rest"), Key_T, TQT_TQOBJECT(this),
TQT_SLOT(slotSwitchFromNoteToRest()),
actionCollection(), TQString("switch_from_note_to_rest"));
new KAction
- (i18n("Switch from Rest to Note"), Key_Y, this,
+ (i18n("Switch from Rest to Note"), Key_Y, TQT_TQOBJECT(this),
TQT_SLOT(slotSwitchFromRestToNote()),
actionCollection(), TQString("switch_from_rest_to_note"));
@@ -1644,13 +1644,13 @@ void NotationView::setupActions()
NoteActionData noteActionData = **actionDataIter;
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
(noteActionData.pixmapName)));
noteAction = new KRadioAction(noteActionData.title,
icon,
noteActionData.keycode,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT(slotNoteAction()),
actionCollection(),
noteActionData.actionName);
@@ -1669,14 +1669,14 @@ void NotationView::setupActions()
NoteChangeActionData data = **actionDataIter;
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
(data.pixmapName)));
KAction *action = new KAction(data.title,
icon,
data.keycode,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT(slotNoteChangeAction()),
actionCollection(),
data.actionName);
@@ -1699,9 +1699,9 @@ void NotationView::setupActions()
for (unsigned int i = 0;
i < sizeof(actionsAccidental) / sizeof(actionsAccidental[0]); ++i) {
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
(actionsAccidental[i][3])));
- noteAction = new KRadioAction(actionsAccidental[i][0], icon, 0, this,
+ noteAction = new KRadioAction(actionsAccidental[i][0], icon, 0, TQT_TQOBJECT(this),
actionsAccidental[i][1],
actionCollection(), actionsAccidental[i][2]);
noteAction->setExclusiveGroup("accidentals");
@@ -1713,48 +1713,48 @@ void NotationView::setupActions()
//
// Treble
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble")));
- noteAction = new KRadioAction(i18n("&Treble Clef"), icon, 0, this,
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble")));
+ noteAction = new KRadioAction(i18n("&Treble Clef"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTrebleClef()),
actionCollection(), "treble_clef");
noteAction->setExclusiveGroup("notes");
// Alto
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto")));
- noteAction = new KRadioAction(i18n("&Alto Clef"), icon, 0, this,
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto")));
+ noteAction = new KRadioAction(i18n("&Alto Clef"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAltoClef()),
actionCollection(), "alto_clef");
noteAction->setExclusiveGroup("notes");
// Tenor
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor")));
- noteAction = new KRadioAction(i18n("Te&nor Clef"), icon, 0, this,
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor")));
+ noteAction = new KRadioAction(i18n("Te&nor Clef"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTenorClef()),
actionCollection(), "tenor_clef");
noteAction->setExclusiveGroup("notes");
// Bass
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass")));
- noteAction = new KRadioAction(i18n("&Bass Clef"), icon, 0, this,
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass")));
+ noteAction = new KRadioAction(i18n("&Bass Clef"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotBassClef()),
actionCollection(), "bass_clef");
noteAction->setExclusiveGroup("notes");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("text")));
- noteAction = new KRadioAction(i18n("&Text"), icon, Key_F8, this,
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("text")));
+ noteAction = new KRadioAction(i18n("&Text"), icon, Key_F8, TQT_TQOBJECT(this),
TQT_SLOT(slotText()),
actionCollection(), "text");
noteAction->setExclusiveGroup("notes");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord")));
- noteAction = new KRadioAction(i18n("&Guitar Chord"), icon, Key_F9, this,
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord")));
+ noteAction = new KRadioAction(i18n("&Guitar Chord"), icon, Key_F9, TQT_TQOBJECT(this),
TQT_SLOT(slotGuitarChord()),
actionCollection(), "guitarchord");
noteAction->setExclusiveGroup("notes");
- /* icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond")));
- noteAction = new KRadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, this,
+ /* icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond")));
+ noteAction = new KRadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, TQT_TQOBJECT(this),
TQT_SLOT(slotLilyPondDirective()),
actionCollection(), "lilypond_directive");
noteAction->setExclusiveGroup("notes"); */
@@ -1764,420 +1764,420 @@ void NotationView::setupActions()
// Edition tools (eraser, selector...)
//
noteAction = new KRadioAction(i18n("&Erase"), "eraser", Key_F4,
- this, TQT_SLOT(slotEraseSelected()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotEraseSelected()),
actionCollection(), "erase");
noteAction->setExclusiveGroup("notes");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("select")));
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("select")));
noteAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2,
- this, TQT_SLOT(slotSelectSelected()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSelectSelected()),
actionCollection(), "select");
noteAction->setExclusiveGroup("notes");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step")));
- new KToggleAction(i18n("Ste&p Recording"), icon, 0, this,
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step")));
+ new KToggleAction(i18n("Ste&p Recording"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleStepByStep()), actionCollection(),
"toggle_step_by_step");
// Edit menu
- new KAction(i18n("Select from Sta&rt"), 0, this,
+ new KAction(i18n("Select from Sta&rt"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditSelectFromStart()), actionCollection(),
"select_from_start");
- new KAction(i18n("Select to &End"), 0, this,
+ new KAction(i18n("Select to &End"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditSelectToEnd()), actionCollection(),
"select_to_end");
- new KAction(i18n("Select Whole St&aff"), Key_A + CTRL, this,
+ new KAction(i18n("Select Whole St&aff"), Key_A + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotEditSelectWholeStaff()), actionCollection(),
"select_whole_staff");
- new KAction(i18n("C&ut and Close"), CTRL + SHIFT + Key_X, this,
+ new KAction(i18n("C&ut and Close"), CTRL + SHIFT + Key_X, TQT_TQOBJECT(this),
TQT_SLOT(slotEditCutAndClose()), actionCollection(),
"cut_and_close");
- new KAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, this,
+ new KAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, TQT_TQOBJECT(this),
TQT_SLOT(slotEditGeneralPaste()), actionCollection(),
"general_paste");
- new KAction(i18n("De&lete"), Key_Delete, this,
+ new KAction(i18n("De&lete"), Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT(slotEditDelete()), actionCollection(),
"delete");
- new KAction(i18n("Move to Staff Above"), 0, this,
+ new KAction(i18n("Move to Staff Above"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMoveEventsUpStaff()), actionCollection(),
"move_events_up_staff");
- new KAction(i18n("Move to Staff Below"), 0, this,
+ new KAction(i18n("Move to Staff Below"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMoveEventsDownStaff()), actionCollection(),
"move_events_down_staff");
//
// Settings menu
//
- int layoutMode = m_config->readNumEntry("layoutmode", 0);
+ int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0);
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm");
+ TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-tqlayout.xpm");
icon = TQIconSet(pixmap);
KRadioAction *linearModeAction = new KRadioAction
- (i18n("&Linear Layout"), icon, 0, this, TQT_SLOT(slotLinearMode()),
+ (i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()),
actionCollection(), "linear_mode");
- linearModeAction->setExclusiveGroup("layoutMode");
- if (layoutMode == 0)
+ linearModeAction->setExclusiveGroup("tqlayoutMode");
+ if (tqlayoutMode == 0)
linearModeAction->setChecked(true);
pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm");
icon = TQIconSet(pixmap);
KRadioAction *continuousPageModeAction = new KRadioAction
- (i18n("&Continuous Page Layout"), icon, 0, this, TQT_SLOT(slotContinuousPageMode()),
+ (i18n("&Continuous Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinuousPageMode()),
actionCollection(), "continuous_page_mode");
- continuousPageModeAction->setExclusiveGroup("layoutMode");
- if (layoutMode == 1)
+ continuousPageModeAction->setExclusiveGroup("tqlayoutMode");
+ if (tqlayoutMode == 1)
continuousPageModeAction->setChecked(true);
pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm");
icon = TQIconSet(pixmap);
KRadioAction *multiPageModeAction = new KRadioAction
- (i18n("&Multiple Page Layout"), icon, 0, this, TQT_SLOT(slotMultiPageMode()),
+ (i18n("&Multiple Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMultiPageMode()),
actionCollection(), "multi_page_mode");
- multiPageModeAction->setExclusiveGroup("layoutMode");
- if (layoutMode == 2)
+ multiPageModeAction->setExclusiveGroup("tqlayoutMode");
+ if (tqlayoutMode == 2)
multiPageModeAction->setChecked(true);
- new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, this,
+ new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleChordsRuler()),
actionCollection(), "show_chords_ruler");
- new KToggleAction(i18n("Show Ra&w Note Ruler"), 0, this,
+ new KToggleAction(i18n("Show Ra&w Note Ruler"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleRawNoteRuler()),
actionCollection(), "show_raw_note_ruler");
- new KToggleAction(i18n("Show &Tempo Ruler"), 0, this,
+ new KToggleAction(i18n("Show &Tempo Ruler"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleTempoRuler()),
actionCollection(), "show_tempo_ruler");
- new KToggleAction(i18n("Show &Annotations"), 0, this,
+ new KToggleAction(i18n("Show &Annotations"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleAnnotations()),
actionCollection(), "show_annotations");
- new KToggleAction(i18n("Show Lily&Pond Directives"), 0, this,
+ new KToggleAction(i18n("Show Lily&Pond Directives"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleLilyPondDirectives()),
actionCollection(), "show_lilypond_directives");
- new KAction(i18n("Open L&yric Editor"), 0, this, TQT_SLOT(slotEditLyrics()),
+ new KAction(i18n("Open L&yric Editor"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditLyrics()),
actionCollection(), "lyric_editor");
//
// Group menu
//
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-beam")));
- new KAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, this,
+ new KAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupBeam()), actionCollection(), "beam");
- new KAction(AutoBeamCommand::getGlobalName(), 0, this,
+ new KAction(AutoBeamCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupAutoBeam()), actionCollection(), "auto_beam");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-unbeam")));
- new KAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, this,
+ new KAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupBreak()), actionCollection(), "break_group");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-simple-tuplet")));
- new KAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, this,
+ new KAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupSimpleTuplet()), actionCollection(), "simple_tuplet");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-tuplet")));
- new KAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, this,
+ new KAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupGeneralTuplet()), actionCollection(), "tuplet");
- new KAction(UnTupletCommand::getGlobalName(), 0, this,
+ new KAction(UnTupletCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupUnTuplet()), actionCollection(), "break_tuplets");
- icon = TQIconSet(NotePixmapFactory::toQPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("triplet")));
(new KToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G,
- this, TQT_SLOT(slotUpdateInsertModeStatus()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
actionCollection(), "triplet_mode"))->
setChecked(false);
- icon = TQIconSet(NotePixmapFactory::toQPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("chord")));
(new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H,
- this, TQT_SLOT(slotUpdateInsertModeStatus()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
actionCollection(), "chord_mode"))->
setChecked(false);
- icon = TQIconSet(NotePixmapFactory::toQPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("group-grace")));
(new KToggleAction(i18n("Grace Insert Mode"), icon, 0,
- this, TQT_SLOT(slotUpdateInsertModeStatus()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()),
actionCollection(), "grace_mode"))->
setChecked(false);
/*!!!
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-grace")));
- new KAction(GraceCommand::getGlobalName(), icon, 0, this,
+ new KAction(GraceCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupGrace()), actionCollection(), "grace");
- new KAction(UnGraceCommand::getGlobalName(), 0, this,
+ new KAction(UnGraceCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupUnGrace()), actionCollection(), "ungrace");
*/
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-slur")));
new KAction(AddIndicationCommand::getGlobalName
- (Indication::Slur), icon, Key_ParenRight, this,
+ (Indication::Slur), icon, Key_ParenRight, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupSlur()), actionCollection(), "slur");
new KAction(AddIndicationCommand::getGlobalName
- (Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, this,
+ (Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupPhrasingSlur()), actionCollection(), "phrasing_slur");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-glissando")));
new KAction(AddIndicationCommand::getGlobalName
- (Indication::Glissando), icon, 0, this,
+ (Indication::Glissando), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupGlissando()), actionCollection(), "glissando");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-crescendo")));
new KAction(AddIndicationCommand::getGlobalName
- (Indication::Crescendo), icon, Key_Less, this,
+ (Indication::Crescendo), icon, Key_Less, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupCrescendo()), actionCollection(), "crescendo");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-decrescendo")));
new KAction(AddIndicationCommand::getGlobalName
- (Indication::Decrescendo), icon, Key_Greater, this,
+ (Indication::Decrescendo), icon, Key_Greater, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupDecrescendo()), actionCollection(), "decrescendo");
new KAction(AddIndicationCommand::getGlobalName
- (Indication::QuindicesimaUp), 0, 0, this,
+ (Indication::QuindicesimaUp), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupOctave2Up()), actionCollection(), "octave_2up");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-ottava")));
new KAction(AddIndicationCommand::getGlobalName
- (Indication::OttavaUp), icon, 0, this,
+ (Indication::OttavaUp), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupOctaveUp()), actionCollection(), "octave_up");
new KAction(AddIndicationCommand::getGlobalName
- (Indication::OttavaDown), 0, 0, this,
+ (Indication::OttavaDown), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupOctaveDown()), actionCollection(), "octave_down");
new KAction(AddIndicationCommand::getGlobalName
- (Indication::QuindicesimaDown), 0, 0, this,
+ (Indication::QuindicesimaDown), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupOctave2Down()), actionCollection(), "octave_2down");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("group-chord")));
- new KAction(MakeChordCommand::getGlobalName(), icon, 0, this,
+ new KAction(MakeChordCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotGroupMakeChord()), actionCollection(), "make_chord");
// setup Transforms menu
- new KAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, this,
+ new KAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsNormalizeRests()), actionCollection(),
"normalize_rests");
- new KAction(CollapseRestsCommand::getGlobalName(), 0, this,
+ new KAction(CollapseRestsCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsCollapseRests()), actionCollection(),
"collapse_rests_aggressively");
- new KAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, this,
+ new KAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(),
"collapse_notes");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transforms-tie")));
- new KAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, this,
+ new KAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsTieNotes()), actionCollection(),
"tie_notes");
- new KAction(UntieNotesCommand::getGlobalName(), 0, this,
+ new KAction(UntieNotesCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsUntieNotes()), actionCollection(),
"untie_notes");
- new KAction(MakeNotesViableCommand::getGlobalName(), 0, this,
+ new KAction(MakeNotesViableCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsMakeNotesViable()), actionCollection(),
"make_notes_viable");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transforms-decounterpoint")));
- new KAction(DeCounterpointCommand::getGlobalName(), icon, 0, this,
+ new KAction(DeCounterpointCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsDeCounterpoint()), actionCollection(),
"de_counterpoint");
new KAction(ChangeStemsCommand::getGlobalName(true),
- 0, Key_PageUp + CTRL, this,
+ 0, Key_PageUp + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsStemsUp()), actionCollection(),
"stems_up");
new KAction(ChangeStemsCommand::getGlobalName(false),
- 0, Key_PageDown + CTRL, this,
+ 0, Key_PageDown + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsStemsDown()), actionCollection(),
"stems_down");
- new KAction(RestoreStemsCommand::getGlobalName(), 0, this,
+ new KAction(RestoreStemsCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsRestoreStems()), actionCollection(),
"restore_stems");
new KAction(ChangeSlurPositionCommand::getGlobalName(true),
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsSlursAbove()), actionCollection(),
"slurs_above");
new KAction(ChangeSlurPositionCommand::getGlobalName(false),
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsSlursBelow()), actionCollection(),
"slurs_below");
- new KAction(RestoreSlursCommand::getGlobalName(), 0, this,
+ new KAction(RestoreSlursCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsRestoreSlurs()), actionCollection(),
"restore_slurs");
new KAction(ChangeTiePositionCommand::getGlobalName(true),
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsTiesAbove()), actionCollection(),
"ties_above");
new KAction(ChangeTiePositionCommand::getGlobalName(false),
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsTiesBelow()), actionCollection(),
"ties_below");
- new KAction(RestoreTiesCommand::getGlobalName(), 0, this,
+ new KAction(RestoreTiesCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsRestoreTies()), actionCollection(),
"restore_ties");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("accmenu-doubleflat")));
new KAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::DoubleFlat),
- icon, 0, this,
+ icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRespellDoubleFlat()), actionCollection(),
"respell_doubleflat");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("accmenu-flat")));
new KAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Flat),
- icon, 0, this,
+ icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRespellFlat()), actionCollection(),
"respell_flat");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("accmenu-natural")));
new KAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Natural),
- icon, 0, this,
+ icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRespellNatural()), actionCollection(),
"respell_natural");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("accmenu-sharp")));
new KAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::Sharp),
- icon, 0, this,
+ icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRespellSharp()), actionCollection(),
"respell_sharp");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("accmenu-doublesharp")));
new KAction(RespellCommand::getGlobalName
(RespellCommand::Set, Accidentals::DoubleSharp),
- icon, 0, this,
+ icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRespellDoubleSharp()), actionCollection(),
"respell_doublesharp");
new KAction(RespellCommand::getGlobalName
(RespellCommand::Up, Accidentals::NoAccidental),
- Key_Up + CTRL + SHIFT, this,
+ Key_Up + CTRL + SHIFT, TQT_TQOBJECT(this),
TQT_SLOT(slotRespellUp()), actionCollection(),
"respell_up");
new KAction(RespellCommand::getGlobalName
(RespellCommand::Down, Accidentals::NoAccidental),
- Key_Down + CTRL + SHIFT, this,
+ Key_Down + CTRL + SHIFT, TQT_TQOBJECT(this),
TQT_SLOT(slotRespellDown()), actionCollection(),
"respell_down");
new KAction(RespellCommand::getGlobalName
(RespellCommand::Restore, Accidentals::NoAccidental),
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRespellRestore()), actionCollection(),
"respell_restore");
new KAction(MakeAccidentalsCautionaryCommand::getGlobalName(true),
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(slotShowCautionary()), actionCollection(),
"show_cautionary");
new KAction(MakeAccidentalsCautionaryCommand::getGlobalName(false),
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(slotCancelCautionary()), actionCollection(),
"cancel_cautionary");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("quantize")));
- new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this,
+ new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, TQT_TQOBJECT(this),
TQT_SLOT(slotTransformsQuantize()), actionCollection(),
"quantize");
new KAction(FixNotationQuantizeCommand::getGlobalName(), 0,
- this, TQT_SLOT(slotTransformsFixQuantization()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotTransformsFixQuantization()), actionCollection(),
"fix_quantization");
new KAction(RemoveNotationQuantizeCommand::getGlobalName(), 0,
- this, TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(),
"remove_quantization");
new KAction(InterpretCommand::getGlobalName(), 0,
- this, TQT_SLOT(slotTransformsInterpret()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotTransformsInterpret()), actionCollection(),
"interpret");
- new KAction(i18n("&Dump selected events to stderr"), 0, this,
+ new KAction(i18n("&Dump selected events to stderr"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump");
for (MarkActionDataMap::Iterator i = m_markActionDataMap->begin();
@@ -2185,75 +2185,75 @@ void NotationView::setupActions()
const MarkActionData &markActionData = **i;
- icon = TQIconSet(NotePixmapFactory::toQPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeMarkMenuPixmap(markActionData.mark)));
new KAction(markActionData.title,
icon,
markActionData.keycode,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT(slotAddMark()),
actionCollection(),
markActionData.actionName);
}
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("text-mark")));
- new KAction(AddTextMarkCommand::getGlobalName(), icon, 0, this,
+ new KAction(AddTextMarkCommand::getGlobalName(), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddTextMark()), actionCollection(),
"add_text_mark");
- new KAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, this,
+ new KAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_0");
- new KAction(AddFingeringMarkCommand::getGlobalName("1"), 0, Key_1 + ALT, this,
+ new KAction(AddFingeringMarkCommand::getGlobalName("1"), 0, Key_1 + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_1");
- new KAction(AddFingeringMarkCommand::getGlobalName("2"), 0, Key_2 + ALT, this,
+ new KAction(AddFingeringMarkCommand::getGlobalName("2"), 0, Key_2 + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_2");
- new KAction(AddFingeringMarkCommand::getGlobalName("3"), 0, Key_3 + ALT, this,
+ new KAction(AddFingeringMarkCommand::getGlobalName("3"), 0, Key_3 + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_3");
- new KAction(AddFingeringMarkCommand::getGlobalName("4"), 0, Key_4 + ALT, this,
+ new KAction(AddFingeringMarkCommand::getGlobalName("4"), 0, Key_4 + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_4");
- new KAction(AddFingeringMarkCommand::getGlobalName("5"), 0, Key_5 + ALT, this,
+ new KAction(AddFingeringMarkCommand::getGlobalName("5"), 0, Key_5 + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_5");
- new KAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, this,
+ new KAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(),
"add_fingering_plus");
- new KAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, this,
+ new KAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksAddFingeringMark()), actionCollection(),
"add_fingering_mark");
- new KAction(RemoveMarksCommand::getGlobalName(), 0, this,
+ new KAction(RemoveMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksRemoveMarks()), actionCollection(),
"remove_marks");
- new KAction(RemoveFingeringMarksCommand::getGlobalName(), 0, this,
+ new KAction(RemoveFingeringMarksCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMarksRemoveFingeringMarks()), actionCollection(),
"remove_fingering_marks");
- new KAction(i18n("Ma&ke Ornament..."), 0, this,
+ new KAction(i18n("Ma&ke Ornament..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMakeOrnament()), actionCollection(),
"make_ornament");
- new KAction(i18n("Trigger &Ornament..."), 0, this,
+ new KAction(i18n("Trigger &Ornament..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotUseOrnament()), actionCollection(),
"use_ornament");
- new KAction(i18n("Remove Ornament..."), 0, this,
+ new KAction(i18n("Remove Ornament..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRemoveOrnament()), actionCollection(),
"remove_ornament");
@@ -2261,32 +2261,32 @@ void NotationView::setupActions()
i18n("&None"), "&1", "&2", "&3", "&4", "&5"
};
for (int i = 0; i <= 5; ++i) {
- new KAction(slashTitles[i], 0, this,
+ new KAction(slashTitles[i], 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAddSlashes()), actionCollection(),
- TQString("slashes_%1").arg(i));
+ TQString("slashes_%1").tqarg(i));
}
- new KAction(ClefInsertionCommand::getGlobalName(), 0, this,
+ new KAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditAddClef()), actionCollection(),
"add_clef");
- new KAction(KeyInsertionCommand::getGlobalName(), 0, this,
+ new KAction(KeyInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditAddKeySignature()), actionCollection(),
"add_key_signature");
- new KAction(SustainInsertionCommand::getGlobalName(true), 0, this,
+ new KAction(SustainInsertionCommand::getGlobalName(true), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditAddSustainDown()), actionCollection(),
"add_sustain_down");
- new KAction(SustainInsertionCommand::getGlobalName(false), 0, this,
+ new KAction(SustainInsertionCommand::getGlobalName(false), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditAddSustainUp()), actionCollection(),
"add_sustain_up");
- new KAction(TransposeCommand::getDiatonicGlobalName(false), 0, this,
+ new KAction(TransposeCommand::getDiatonicGlobalName(false), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditTranspose()), actionCollection(),
"transpose_segment");
- new KAction(i18n("Convert Notation For..."), 0, this,
+ new KAction(i18n("Convert Notation For..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditSwitchPreset()), actionCollection(),
"switch_preset");
@@ -2304,7 +2304,7 @@ void NotationView::setupActions()
"palette-marks" },
{ i18n("Show &Group Toolbar"), "1slotToggleGroupToolBar()", "show_group_toolbar",
"palette-group" },
- { i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_layout_toolbar",
+ { i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_tqlayout_toolbar",
"palette-font" },
{ i18n("Show Trans&port Toolbar"), "1slotToggleTransportToolBar()", "show_transport_toolbar",
"palette-transport" },
@@ -2315,200 +2315,200 @@ void NotationView::setupActions()
for (unsigned int i = 0;
i < sizeof(actionsToolbars) / sizeof(actionsToolbars[0]); ++i) {
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3])));
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3])));
new KToggleAction(actionsToolbars[i][0], icon, 0,
- this, actionsToolbars[i][1],
+ TQT_TQOBJECT(this), actionsToolbars[i][1],
actionCollection(), actionsToolbars[i][2]);
}
- new KAction(i18n("Cursor &Back"), 0, Key_Left, this,
+ new KAction(i18n("Cursor &Back"), 0, Key_Left, TQT_TQOBJECT(this),
TQT_SLOT(slotStepBackward()), actionCollection(),
"cursor_back");
- new KAction(i18n("Cursor &Forward"), 0, Key_Right, this,
+ new KAction(i18n("Cursor &Forward"), 0, Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(slotStepForward()), actionCollection(),
"cursor_forward");
- new KAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, this,
+ new KAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotJumpBackward()), actionCollection(),
"cursor_back_bar");
- new KAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, this,
+ new KAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotJumpForward()), actionCollection(),
"cursor_forward_bar");
- new KAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, this,
+ new KAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, TQT_TQOBJECT(this),
TQT_SLOT(slotExtendSelectionBackward()), actionCollection(),
"extend_selection_backward");
- new KAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, this,
+ new KAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(slotExtendSelectionForward()), actionCollection(),
"extend_selection_forward");
- new KAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, this,
+ new KAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, TQT_TQOBJECT(this),
TQT_SLOT(slotExtendSelectionBackwardBar()), actionCollection(),
"extend_selection_backward_bar");
- new KAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, this,
+ new KAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(slotExtendSelectionForwardBar()), actionCollection(),
"extend_selection_forward_bar");
/*!!! not here yet
- new KAction(i18n("Move Selection Left"), Key_Minus, this,
+ new KAction(i18n("Move Selection Left"), Key_Minus, TQT_TQOBJECT(this),
TQT_SLOT(slotMoveSelectionLeft()), actionCollection(),
"move_selection_left");
*/
new KAction(i18n("Cursor to St&art"), 0,
/* #1025717: conflicting meanings for ctrl+a - dupe with Select All
- Key_A + CTRL, */ this,
+ Key_A + CTRL, */ TQT_TQOBJECT(this),
TQT_SLOT(slotJumpToStart()), actionCollection(),
"cursor_start");
- new KAction(i18n("Cursor to &End"), 0, Key_E + CTRL, this,
+ new KAction(i18n("Cursor to &End"), 0, Key_E + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotJumpToEnd()), actionCollection(),
"cursor_end");
- new KAction(i18n("Cursor &Up Staff"), 0, Key_Up + SHIFT, this,
+ new KAction(i18n("Cursor &Up Staff"), 0, Key_Up + SHIFT, TQT_TQOBJECT(this),
TQT_SLOT(slotCurrentStaffUp()), actionCollection(),
"cursor_up_staff");
- new KAction(i18n("Cursor &Down Staff"), 0, Key_Down + SHIFT, this,
+ new KAction(i18n("Cursor &Down Staff"), 0, Key_Down + SHIFT, TQT_TQOBJECT(this),
TQT_SLOT(slotCurrentStaffDown()), actionCollection(),
"cursor_down_staff");
- new KAction(i18n("Cursor Pre&vious Segment"), 0, Key_Prior + ALT, this,
+ new KAction(i18n("Cursor Pre&vious Segment"), 0, Key_Prior + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotCurrentSegmentPrior()), actionCollection(),
"cursor_prior_segment");
- new KAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, this,
+ new KAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotCurrentSegmentNext()), actionCollection(),
"cursor_next_segment");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-cursor-to-pointer")));
- new KAction(i18n("Cursor to &Playback Pointer"), icon, 0, this,
+ new KAction(i18n("Cursor to &Playback Pointer"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(),
"cursor_to_playback_pointer");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-play")));
- KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, this,
+ KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this),
TQT_SIGNAL(play()), actionCollection(), "play");
// Alternative shortcut for Play
KShortcut playShortcut = play->shortcut();
playShortcut.append( KKey(Key_Return + CTRL) );
play->setShortcut(playShortcut);
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-stop")));
- new KAction(i18n("&Stop"), icon, Key_Insert, this,
+ new KAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this),
TQT_SIGNAL(stop()), actionCollection(), "stop");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind")));
- new KAction(i18n("Re&wind"), icon, Key_End, this,
+ new KAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this),
TQT_SIGNAL(rewindPlayback()), actionCollection(),
"playback_pointer_back_bar");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd")));
- new KAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
+ new KAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this),
TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
"playback_pointer_forward_bar");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-rewind-end")));
- new KAction(i18n("Rewind to &Beginning"), icon, 0, this,
+ new KAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this),
TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
"playback_pointer_start");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-ffwd-end")));
- new KAction(i18n("Fast Forward to &End"), icon, 0, this,
+ new KAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this),
TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
"playback_pointer_end");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-pointer-to-cursor")));
- new KAction(i18n("Playback Pointer to &Cursor"), icon, 0, this,
+ new KAction(i18n("Playback Pointer to &Cursor"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(),
"playback_pointer_to_cursor");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-solo")));
- new KToggleAction(i18n("&Solo"), icon, 0, this,
+ new KToggleAction(i18n("&Solo"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleSolo()), actionCollection(),
"toggle_solo");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-tracking")));
- (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this,
+ (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleTracking()), actionCollection(),
"toggle_tracking"))->setChecked(m_playTracking);
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
("transport-panic")));
- new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
+ new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this),
TQT_SIGNAL(panic()), actionCollection(), "panic");
- new KAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, this,
+ new KAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotPreviewSelection()), actionCollection(),
"preview_selection");
- new KAction(i18n("Clear L&oop"), Key_Colon + CTRL, this,
+ new KAction(i18n("Clear L&oop"), Key_Colon + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotClearLoop()), actionCollection(),
"clear_loop");
- new KAction(i18n("Clear Selection"), Key_Escape, this,
+ new KAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this),
TQT_SLOT(slotClearSelection()), actionCollection(),
"clear_selection");
// TQString pixmapDir =
// KGlobal::dirs()->findResource("appdata", "pixmaps/");
// icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm"));
- new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, this,
+ new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotFilterSelection()), actionCollection(),
"filter_selection");
- new KAction(i18n("Push &Left"), 0, this,
+ new KAction(i18n("Push &Left"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFinePositionLeft()), actionCollection(),
"fine_position_left");
- new KAction(i18n("Push &Right"), 0, this,
+ new KAction(i18n("Push &Right"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFinePositionRight()), actionCollection(),
"fine_position_right");
- new KAction(i18n("Push &Up"), 0, this,
+ new KAction(i18n("Push &Up"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFinePositionUp()), actionCollection(),
"fine_position_up");
- new KAction(i18n("Push &Down"), 0, this,
+ new KAction(i18n("Push &Down"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFinePositionDown()), actionCollection(),
"fine_position_down");
- new KAction(i18n("&Restore Positions"), 0, this,
+ new KAction(i18n("&Restore Positions"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFinePositionRestore()), actionCollection(),
"fine_position_restore");
- new KAction(i18n("Make &Invisible"), 0, this,
+ new KAction(i18n("Make &Invisible"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMakeInvisible()), actionCollection(),
"make_invisible");
- new KAction(i18n("Make &Visible"), 0, this,
+ new KAction(i18n("Make &Visible"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMakeVisible()), actionCollection(),
"make_visible");
- new KAction(i18n("Toggle Dot"), Key_Period, this,
+ new KAction(i18n("Toggle Dot"), Key_Period, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleDot()), actionCollection(),
"toggle_dot");
- new KAction(i18n("Add Dot"), Key_Period + CTRL, this,
+ new KAction(i18n("Add Dot"), Key_Period + CTRL, TQT_TQOBJECT(this),
TQT_SLOT(slotAddDot()), actionCollection(),
"add_dot");
- new KAction(i18n("Add Dot"), Key_Period + CTRL + ALT, this,
+ new KAction(i18n("Add Dot"), Key_Period + CTRL + ALT, TQT_TQOBJECT(this),
TQT_SLOT(slotAddDotNotationOnly()), actionCollection(),
"add_notation_dot");
@@ -2546,7 +2546,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
for (unsigned int i = 0; i < sizes.size(); ++i) {
KAction *action =
actionCollection()->action
- (TQString("note_font_size_%1").arg(sizes[i]));
+ (TQString("note_font_size_%1").tqarg(sizes[i]));
m_fontSizeActionMenu->remove
(action);
@@ -2560,7 +2560,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
for (unsigned int i = 0; i < sizes.size(); ++i) {
- TQString actionName = TQString("note_font_size_%1").arg(sizes[i]);
+ TQString actionName = TQString("note_font_size_%1").tqarg(sizes[i]);
KToggleAction *sizeAction = dynamic_cast<KToggleAction *>
(actionCollection()->action(actionName));
@@ -2568,7 +2568,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName)
if (!sizeAction) {
sizeAction =
new KToggleAction(i18n("1 pixel", "%n pixels", sizes[i]),
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT(slotChangeFontSizeFromAction()),
actionCollection(), actionName);
}
@@ -2607,21 +2607,21 @@ bool NotationView::isCurrentStaff(int i)
void NotationView::initLayoutToolbar()
{
- KToolBar *layoutToolbar = toolBar("Layout Toolbar");
+ KToolBar *tqlayoutToolbar = toolBar("Layout Toolbar");
- if (!layoutToolbar) {
+ if (!tqlayoutToolbar) {
std::cerr
- << "NotationView::initLayoutToolbar() : layout toolbar not found"
+ << "NotationView::initLayoutToolbar() : tqlayout toolbar not found"
<< std::endl;
return ;
}
- new TQLabel(i18n(" Font: "), layoutToolbar, "font label");
+ new TQLabel(i18n(" Font: "), tqlayoutToolbar, "font label");
//
// font combo
//
- m_fontCombo = new KComboBox(layoutToolbar);
+ m_fontCombo = new KComboBox(tqlayoutToolbar);
m_fontCombo->setEditable(false);
std::set
@@ -2633,10 +2633,10 @@ void NotationView::initLayoutToolbar()
for (std::vector<std::string>::iterator i = f.begin(); i != f.end(); ++i) {
- TQString fontQName(strtoqstr(*i));
+ TQString fontTQName(strtoqstr(*i));
- m_fontCombo->insertItem(fontQName);
- if (fontQName.lower() == strtoqstr(m_fontName).lower()) {
+ m_fontCombo->insertItem(fontTQName);
+ if (fontTQName.lower() == strtoqstr(m_fontName).lower()) {
m_fontCombo->setCurrentItem(m_fontCombo->count() - 1);
foundFont = true;
}
@@ -2652,7 +2652,7 @@ void NotationView::initLayoutToolbar()
connect(m_fontCombo, TQT_SIGNAL(activated(const TQString &)),
this, TQT_SLOT(slotChangeFont(const TQString &)));
- new TQLabel(i18n(" Size: "), layoutToolbar, "size label");
+ new TQLabel(i18n(" Size: "), tqlayoutToolbar, "size label");
TQString value;
@@ -2660,7 +2660,7 @@ void NotationView::initLayoutToolbar()
// font size combo
//
std::vector<int> sizes = NoteFontFactory::getScreenSizes(m_fontName);
- m_fontSizeCombo = new KComboBox(layoutToolbar, "font size combo");
+ m_fontSizeCombo = new KComboBox(tqlayoutToolbar, "font size combo");
for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) {
@@ -2674,15 +2674,15 @@ void NotationView::initLayoutToolbar()
connect(m_fontSizeCombo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotChangeFontSizeFromStringValue(const TQString&)));
- new TQLabel(i18n(" Spacing: "), layoutToolbar, "spacing label");
+ new TQLabel(i18n(" Spacing: "), tqlayoutToolbar, "spacing label");
//
// spacing combo
//
- int defaultSpacing = m_hlayout->getSpacing();
+ int defaultSpacing = m_htqlayout->getSpacing();
std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
- m_spacingCombo = new KComboBox(layoutToolbar, "spacing combo");
+ m_spacingCombo = new KComboBox(tqlayoutToolbar, "spacing combo");
for (std::vector<int>::iterator i = spacings.begin(); i != spacings.end(); ++i) {
value.setNum(*i);
@@ -2786,17 +2786,17 @@ NotationView::setPageMode(LinedStaff::PageMode pageMode)
int topMargin = 0, leftMargin = 0;
getPageMargins(leftMargin, topMargin);
- m_hlayout->setPageMode(pageMode != LinedStaff::LinearMode);
- m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
+ m_htqlayout->setPageMode(pageMode != LinedStaff::LinearMode);
+ m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
- NOTATION_DEBUG << "NotationView::setPageMode: set layout's page width to "
+ NOTATION_DEBUG << "NotationView::setPageMode: set tqlayout's page width to "
<< (pageWidth - leftMargin * 2) << endl;
positionStaffs();
- bool layoutApplied = applyLayout();
- if (!layoutApplied)
- KMessageBox::sorry(0, "Couldn't apply layout");
+ bool tqlayoutApplied = applyLayout();
+ if (!tqlayoutApplied)
+ KMessageBox::sorry(0, "Couldn't apply tqlayout");
else {
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
m_staffs[i]->markChanged();
@@ -2894,7 +2894,7 @@ void
NotationView::scrollToTime(timeT t)
{
- double notationViewLayoutCoord = m_hlayout->getXForTime(t);
+ double notationViewLayoutCoord = m_htqlayout->getXForTime(t);
// Doesn't appear to matter which staff we use
//!!! actually it probably does matter, if they don't have the same extents
@@ -2912,7 +2912,7 @@ NotationView::scrollToTime(timeT t)
RulerScale*
NotationView::getHLayout()
{
- return m_hlayout;
+ return m_htqlayout;
}
void
@@ -2948,8 +2948,8 @@ NotationView::paintEvent(TQPaintEvent *e)
getPageMargins(leftMargin, topMargin);
if (m_pageMode == LinedStaff::ContinuousPageMode) {
- // relayout if the window width changes significantly in continuous page mode
- int diff = int(getPageWidth() - leftMargin * 2 - m_hlayout->getPageWidth());
+ // retqlayout if the window width changes significantly in continuous page mode
+ int diff = int(getPageWidth() - leftMargin * 2 - m_htqlayout->getPageWidth());
if (diff < -10 || diff > 10) {
setPageMode(m_pageMode);
refreshSegment(0, 0, 0);
@@ -2990,15 +2990,15 @@ NotationView::paintEvent(TQPaintEvent *e)
}
}
- slotSetOperationNameAndStatus(i18n(" Ready."));
+ slotSetOperationNameAndtqStatus(i18n(" Ready."));
}
bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
{
- slotSetOperationNameAndStatus(i18n("Laying out score..."));
+ slotSetOperationNameAndtqStatus(i18n("Laying out score..."));
ProgressDialog::processEvents();
- m_hlayout->setStaffCount(m_staffs.size());
+ m_htqlayout->setStaffCount(m_staffs.size());
Profiler profiler("NotationView::applyLayout");
unsigned int i;
@@ -3008,20 +3008,20 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
if (staffNo >= 0 && (int)i != staffNo)
continue;
- slotSetOperationNameAndStatus(i18n("Laying out staff %1...").arg(i + 1));
+ slotSetOperationNameAndtqStatus(i18n("Laying out staff %1...").tqarg(i + 1));
ProgressDialog::processEvents();
- m_hlayout->resetStaff(*m_staffs[i], startTime, endTime);
- m_vlayout->resetStaff(*m_staffs[i], startTime, endTime);
- m_hlayout->scanStaff(*m_staffs[i], startTime, endTime);
- m_vlayout->scanStaff(*m_staffs[i], startTime, endTime);
+ m_htqlayout->resetStaff(*m_staffs[i], startTime, endTime);
+ m_vtqlayout->resetStaff(*m_staffs[i], startTime, endTime);
+ m_htqlayout->scanStaff(*m_staffs[i], startTime, endTime);
+ m_vtqlayout->scanStaff(*m_staffs[i], startTime, endTime);
}
- slotSetOperationNameAndStatus(i18n("Reconciling staffs..."));
+ slotSetOperationNameAndtqStatus(i18n("Reconciling staffs..."));
ProgressDialog::processEvents();
- m_hlayout->finishLayout(startTime, endTime);
- m_vlayout->finishLayout(startTime, endTime);
+ m_htqlayout->finishLayout(startTime, endTime);
+ m_vtqlayout->finishLayout(startTime, endTime);
// find the last finishing staff for future use
@@ -3083,7 +3083,7 @@ void NotationView::setCurrentSelectedNote(const char *pixmapName,
setTool(inserter);
m_currentNotePixmap->setPixmap
- (NotePixmapFactory::toQPixmap
+ (NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap(pixmapName, true)));
emit changeCurrentNote(rest, n);
@@ -3147,7 +3147,7 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
i != s->getSegmentEvents().end(); ++i) {
if (oldSelection && oldSelection->getSegment() == s->getSegment()
- && oldSelection->contains(*i))
+ && oldSelection->tqcontains(*i))
continue;
foundNewEvent = true;
@@ -3194,8 +3194,8 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
getLinedStaff(segment)->positionElements(std::min(startA, startB),
std::max(endA, endB));
} else {
- // mark refresh status and then request a repaint
- segment.getRefreshStatus
+ // mark refresh status and then request a tqrepaint
+ segment.getRefreshtqStatus
(m_segmentsRefreshStatusIds
[getLinedStaff(segment)->getId()]).
push(std::min(startA, startB), std::max(endA, endB));
@@ -3211,14 +3211,14 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
getLinedStaff(s->getSegment())->positionElements(startB, endB);
} else {
- // mark refresh status and then request a repaint
+ // mark refresh status and then request a tqrepaint
- oldSelection->getSegment().getRefreshStatus
+ oldSelection->getSegment().getRefreshtqStatus
(m_segmentsRefreshStatusIds
[getLinedStaff(oldSelection->getSegment())->getId()]).
push(startA, endA);
- s->getSegment().getRefreshStatus
+ s->getSegment().getRefreshtqStatus
(m_segmentsRefreshStatusIds
[getLinedStaff(s->getSegment())->getId()]).
push(startB, endB);
@@ -3329,12 +3329,12 @@ void NotationView::playNote(Segment &s, int pitch, int velocity)
StudioControl::sendMappedEvent(mE);
}
-void NotationView::showPreviewNote(int staffNo, double layoutX,
+void NotationView::showPreviewNote(int staffNo, double tqlayoutX,
int pitch, int height,
const Note &note, bool grace,
int velocity)
{
- m_staffs[staffNo]->showPreviewNote(layoutX, height, note, grace);
+ m_staffs[staffNo]->showPreviewNote(tqlayoutX, height, note, grace);
playNote(m_staffs[staffNo]->getSegment(), pitch, velocity);
}
@@ -3349,10 +3349,10 @@ void NotationView::setNotePixmapFactory(NotePixmapFactory* f)
{
delete m_notePixmapFactory;
m_notePixmapFactory = f;
- if (m_hlayout)
- m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
- if (m_vlayout)
- m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
+ if (m_htqlayout)
+ m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
+ if (m_vtqlayout)
+ m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
}
Segment *
@@ -3446,10 +3446,10 @@ NotationView::getInsertionTime(Clef &clef,
// the segment but the staff has a more efficient lookup
LinedStaff *staff = m_staffs[m_currentStaff];
- double layoutX = staff->getLayoutXOfInsertCursor();
- if (layoutX < 0) layoutX = 0;
+ double tqlayoutX = staff->getLayoutXOfInsertCursor();
+ if (tqlayoutX < 0) tqlayoutX = 0;
Event *clefEvt = 0, *keyEvt = 0;
- (void)staff->getElementUnderLayoutX(layoutX, clefEvt, keyEvt);
+ (void)staff->getElementUnderLayoutX(tqlayoutX, clefEvt, keyEvt);
if (clefEvt) clef = Clef(*clefEvt);
else clef = Clef();
@@ -3469,7 +3469,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const
LinedStaff::LinedStaffCoords coords =
s->getLayoutCoordsForCanvasCoords(x, y);
- timeT t = m_hlayout->getTimeForX(coords.first);
+ timeT t = m_htqlayout->getTimeForX(coords.first);
// In order to find the correct starting and ending bar of the segment,
// make infinitesimal shifts (+1 and -1) towards its center.
timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[m_currentStaff]->getSegment().getStartTime()+1);
@@ -3488,7 +3488,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const
LinedStaff::LinedStaffCoords coords =
s->getLayoutCoordsForCanvasCoords(x, y);
- timeT t = m_hlayout->getTimeForX(coords.first);
+ timeT t = m_htqlayout->getTimeForX(coords.first);
// In order to find the correct starting and ending bar of the segment,
// make infinitesimal shifts (+1 and -1) towards its center.
timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[i]->getSegment().getStartTime()+1);
@@ -3541,7 +3541,7 @@ void NotationView::print(bool previewOnly)
if (previewOnly)
printer.setPreviewOnly(true);
- else if (!printer.setup((TQWidget *)parent()))
+ else if (!printer.setup((TQWidget *)tqparent()))
return ;
TQPaintDeviceMetrics pdm(&printer);
@@ -3589,8 +3589,8 @@ void NotationView::print(bool previewOnly)
LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
(pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height());
- timeT t0 = m_hlayout->getTimeForX(cc0.first);
- timeT t1 = m_hlayout->getTimeForX(cc1.first);
+ timeT t0 = m_htqlayout->getTimeForX(cc0.first);
+ timeT t1 = m_htqlayout->getTimeForX(cc1.first);
m_staffs[i]->setPrintPainter(&printpainter);
m_staffs[i]->checkRendered(t0, t1);
@@ -3599,7 +3599,7 @@ void NotationView::print(bool previewOnly)
// Supplying doublebuffer==true to this method appears to
// slow down printing considerably but without it we get
// all sorts of horrible artifacts (possibly related to
- // mishandling of pixmap masks?) in qt-3.0. Let's permit
+ // mishandling of pixmap tqmasks?) in qt-3.0. Let's permit
// it as a "hidden" option.
m_config->setGroup(NotationViewConfigGroup);
@@ -3612,13 +3612,7 @@ void NotationView::print(bool previewOnly)
if (m_config->readBoolEntry("forcedoublebufferprinting", false)) {
getCanvasView()->canvas()->drawArea(pageRect, &printpainter, true);
} else {
-#if QT_VERSION >= 0x030100
getCanvasView()->canvas()->drawArea(pageRect, &printpainter, false);
-#else
-
- getCanvasView()->canvas()->drawArea(pageRect, &printpainter, true);
-#endif
-
}
}
@@ -3635,8 +3629,8 @@ void NotationView::print(bool previewOnly)
LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
(pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height());
- timeT t0 = m_hlayout->getTimeForX(cc0.first);
- timeT t1 = m_hlayout->getTimeForX(cc1.first);
+ timeT t0 = m_htqlayout->getTimeForX(cc0.first);
+ timeT t1 = m_htqlayout->getTimeForX(cc1.first);
m_staffs[i]->renderPrintable(t0, t1);
}
@@ -3687,14 +3681,14 @@ NotationView::updateThumbnails(bool complete)
int thumbScale = 20;
TQPixmap thumbnail(canvas()->width() / thumbScale,
canvas()->height() / thumbScale);
- thumbnail.fill(Qt::white);
+ thumbnail.fill(TQt::white);
TQPainter thumbPainter(&thumbnail);
if (complete) {
thumbPainter.scale(1.0 / double(thumbScale), 1.0 / double(thumbScale));
- thumbPainter.setPen(Qt::black);
- thumbPainter.setBrush(Qt::white);
+ thumbPainter.setPen(TQt::black);
+ thumbPainter.setBrush(TQt::white);
/*
TQCanvas *canvas = getCanvasView()->canvas();
@@ -3742,7 +3736,7 @@ NotationView::updateThumbnails(bool complete)
} else {
- thumbPainter.setPen(Qt::black);
+ thumbPainter.setPen(TQt::black);
for (int page = 0; page < maxPageCount; ++page) {
@@ -3751,7 +3745,7 @@ NotationView::updateThumbnails(bool complete)
int w = pageWidth - leftMargin / 2;
int h = pageHeight;
- TQString str = TQString("%1").arg(page + 1);
+ TQString str = TQString("%1").tqarg(page + 1);
thumbPainter.drawRect(x / thumbScale, y / thumbScale,
w / thumbScale, h / thumbScale);
@@ -3815,7 +3809,7 @@ void NotationView::refreshSegment(Segment *segment,
}
setMenuStates();
- slotSetOperationNameAndStatus(i18n(" Ready."));
+ slotSetOperationNameAndtqStatus(i18n(" Ready."));
NOTATION_DEBUG << "*** " << endl;
}
@@ -3835,12 +3829,12 @@ void NotationView::setMenuStates()
NOTATION_DEBUG << "NotationView::setMenuStates: Have selection; it's " << m_currentEventSelection << " covering range from " << m_currentEventSelection->getStartTime() << " to " << m_currentEventSelection->getEndTime() << " (" << m_currentEventSelection->getSegmentEvents().size() << " events)" << endl;
stateChanged("have_selection", KXMLGUIClient::StateNoReverse);
- if (m_currentEventSelection->contains
+ if (m_currentEventSelection->tqcontains
(Note::EventType)) {
stateChanged("have_notes_in_selection",
KXMLGUIClient::StateNoReverse);
}
- if (m_currentEventSelection->contains
+ if (m_currentEventSelection->tqcontains
(Note::EventRestType)) {
stateChanged("have_rests_in_selection",
KXMLGUIClient::StateNoReverse);
@@ -3882,7 +3876,7 @@ void NotationView::readjustCanvasSize()
double maxWidth = 0.0;
int maxHeight = 0;
- slotSetOperationNameAndStatus(i18n("Sizing and allocating canvas..."));
+ slotSetOperationNameAndtqStatus(i18n("Sizing and allocating canvas..."));
ProgressDialog::processEvents();
int progressTotal = m_staffs.size() + 2;
@@ -3892,7 +3886,7 @@ void NotationView::readjustCanvasSize()
LinedStaff &staff = *m_staffs[i];
- staff.sizeStaff(*m_hlayout);
+ staff.sizeStaff(*m_htqlayout);
UPDATE_PROGRESS(1);
if (staff.getTotalWidth() + staff.getX() > maxWidth) {
@@ -3950,7 +3944,7 @@ void NotationView::readjustCanvasSize()
}
}
- // Give a correct vertical alignment to track headers
+ // Give a correct vertical tqalignment to track headers
if ((m_pageMode == LinedStaff::LinearMode) && m_showHeadersGroup) {
m_headersGroupView->setContentsPos(0, getCanvasView()->contentsY());
}
@@ -3958,10 +3952,10 @@ void NotationView::readjustCanvasSize()
void NotationView::slotNoteAction()
{
- const TQObject* sigSender = sender();
+ const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
NoteActionDataMap::Iterator noteAct =
- m_noteActionDataMap->find(sigSender->name());
+ m_noteActionDataMap->tqfind(sigSender->name());
if (noteAct != m_noteActionDataMap->end()) {
m_lastNoteAction = sigSender->name();
@@ -3989,11 +3983,11 @@ void NotationView::slotLastNoteAction()
void NotationView::slotAddMark()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
if (!m_currentEventSelection)
return ;
- MarkActionDataMap::Iterator i = m_markActionDataMap->find(s->name());
+ MarkActionDataMap::Iterator i = m_markActionDataMap->tqfind(s->name());
if (i != m_markActionDataMap->end()) {
addCommandToHistory(new AddMarkCommand
@@ -4003,10 +3997,10 @@ void NotationView::slotAddMark()
void NotationView::slotNoteChangeAction()
{
- const TQObject* sigSender = sender();
+ const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
NoteChangeActionDataMap::Iterator noteAct =
- m_noteChangeActionDataMap->find(sigSender->name());
+ m_noteChangeActionDataMap->tqfind(sigSender->name());
if (noteAct != m_noteChangeActionDataMap->end()) {
slotSetNoteDurations((**noteAct).noteType, (**noteAct).notationOnly);
@@ -4038,7 +4032,7 @@ void NotationView::initActionDataMaps()
(NotationStrings::getReferenceName(Note(type, dots), rest == 1));
TQString shortName(refName);
- shortName.replace(TQRegExp("-"), "_");
+ shortName.tqreplace(TQRegExp("-"), "_");
TQString titleName
(NotationStrings::getNoteName(Note(type, dots)));
@@ -4047,7 +4041,7 @@ void NotationView::initActionDataMaps()
titleName.right(titleName.length() - 1);
if (rest) {
- titleName.replace(TQRegExp(i18n("note")), i18n("rest"));
+ titleName.tqreplace(TQRegExp(i18n("note")), i18n("rest"));
}
int keycode = keys[type - Note::Shortest];
@@ -4073,8 +4067,8 @@ void NotationView::initActionDataMaps()
(NotationStrings::getReferenceName(Note(type, 0), false));
TQString shortName(TQString("change_%1%2")
- .arg(notationOnly ? "notation_" : "").arg(refName));
- shortName.replace(TQRegExp("-"), "_");
+ .tqarg(notationOnly ? "notation_" : "").tqarg(refName));
+ shortName.tqreplace(TQRegExp("-"), "_");
TQString titleName
(NotationStrings::getNoteName(Note(type, 0)));
@@ -4101,7 +4095,7 @@ void NotationView::initActionDataMaps()
Mark mark = marks[i];
TQString markName(strtoqstr(mark));
- TQString actionName = TQString("add_%1").arg(markName);
+ TQString actionName = TQString("add_%1").tqarg(markName);
m_markActionDataMap->insert
(actionName, new MarkActionData
@@ -4116,10 +4110,10 @@ void NotationView::setupProgress(KProgress* bar)
if (bar) {
NOTATION_DEBUG << "NotationView::setupProgress(bar)\n";
- connect(m_hlayout, TQT_SIGNAL(setProgress(int)),
+ connect(m_htqlayout, TQT_SIGNAL(setProgress(int)),
bar, TQT_SLOT(setValue(int)));
- connect(m_hlayout, TQT_SIGNAL(incrementProgress(int)),
+ connect(m_htqlayout, TQT_SIGNAL(incrementProgress(int)),
bar, TQT_SLOT(advance(int)));
connect(this, TQT_SIGNAL(setProgress(int)),
@@ -4148,11 +4142,11 @@ void NotationView::setupProgress(ProgressDialog* dialog)
setupProgress(dialog->progressBar());
connect(dialog, TQT_SIGNAL(cancelClicked()),
- m_hlayout, TQT_SLOT(slotCancel()));
+ m_htqlayout, TQT_SLOT(slotCancel()));
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)),
- this, TQT_SLOT(slotSetOperationNameAndStatus(TQString)));
+ this, TQT_SLOT(slotSetOperationNameAndtqStatus(TQString)));
connect(dialog, TQT_SIGNAL(cancelClicked()),
m_staffs[i], TQT_SLOT(slotCancel()));
@@ -4165,10 +4159,10 @@ void NotationView::setupProgress(ProgressDialog* dialog)
}
-void NotationView::slotSetOperationNameAndStatus(TQString name)
+void NotationView::slotSetOperationNameAndtqStatus(TQString name)
{
emit setOperationName(name);
- statusBar()->changeItem(TQString(" %1").arg(name),
+ statusBar()->changeItem(TQString(" %1").tqarg(name),
KTmpStatusMsg::getDefaultId());
}
@@ -4176,7 +4170,7 @@ void NotationView::disconnectProgress()
{
NOTATION_DEBUG << "NotationView::disconnectProgress()" << endl;
- m_hlayout->disconnect();
+ m_htqlayout->disconnect();
disconnect(TQT_SIGNAL(setProgress(int)));
disconnect(TQT_SIGNAL(incrementProgress(int)));
disconnect(TQT_SIGNAL(setOperationName(TQString)));
@@ -4209,18 +4203,18 @@ void NotationView::updateViewCaption()
trackPosition = track->getPosition();
// std::cout << std::endl << std::endl << std::endl << "DEBUG TITLE BAR: " << getDocument()->getTitle() << std::endl << std::endl << std::endl;
setCaption(i18n("%1 - Segment Track #%2 - Notation")
- .arg(getDocument()->getTitle())
- .arg(trackPosition + 1));
+ .tqarg(getDocument()->getTitle())
+ .tqarg(trackPosition + 1));
} else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) {
setCaption(i18n("%1 - All Segments - Notation")
- .arg(getDocument()->getTitle()));
+ .tqarg(getDocument()->getTitle()));
} else {
setCaption(i18n("%1 - Segment - Notation", "%1 - %n Segments - Notation", m_segments.size())
- .arg(getDocument()->getTitle()));
+ .tqarg(getDocument()->getTitle()));
}
}
@@ -4236,7 +4230,7 @@ NotationView::MarkActionDataMap* NotationView::m_markActionDataMap = 0;
void
-NotationView::slotUpdateInsertModeStatus()
+NotationView::slotUpdateInsertModetqStatus()
{
TQString tripletMessage = i18n("Triplet");
TQString chordMessage = i18n("Chord");
@@ -4244,22 +4238,22 @@ NotationView::slotUpdateInsertModeStatus()
TQString message;
if (isInTripletMode()) {
- message = i18n("%1 %2").arg(message).arg(tripletMessage);
+ message = i18n("%1 %2").tqarg(message).tqarg(tripletMessage);
}
if (isInChordMode()) {
- message = i18n("%1 %2").arg(message).arg(chordMessage);
+ message = i18n("%1 %2").tqarg(message).tqarg(chordMessage);
}
if (isInGraceMode()) {
- message = i18n("%1 %2").arg(message).arg(graceMessage);
+ message = i18n("%1 %2").tqarg(message).tqarg(graceMessage);
}
m_insertModeLabel->setText(message);
}
void
-NotationView::slotUpdateAnnotationsStatus()
+NotationView::slotUpdateAnnotationstqStatus()
{
if (!areAnnotationsVisible()) {
for (int i = 0; i < getStaffCount(); ++i) {
@@ -4279,7 +4273,7 @@ NotationView::slotUpdateAnnotationsStatus()
}
void
-NotationView::slotUpdateLilyPondDirectivesStatus()
+NotationView::slotUpdateLilyPondDirectivestqStatus()
{
if (!areLilyPondDirectivesVisible()) {
for (int i = 0; i < getStaffCount(); ++i) {
@@ -4312,7 +4306,7 @@ NotationView::slotChangeSpacingFromStringValue(const TQString& spacingT)
void
NotationView::slotChangeSpacingFromAction()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
TQString name = s->name();
if (name.left(8) == "spacing_") {
@@ -4323,22 +4317,22 @@ NotationView::slotChangeSpacingFromAction()
} else {
KMessageBox::sorry
- (this, i18n("Unknown spacing action %1").arg(name));
+ (this, i18n("Unknown spacing action %1").tqarg(name));
}
}
void
NotationView::slotChangeSpacing(int spacing)
{
- if (m_hlayout->getSpacing() == spacing)
+ if (m_htqlayout->getSpacing() == spacing)
return ;
- m_hlayout->setSpacing(spacing);
+ m_htqlayout->setSpacing(spacing);
// m_spacingSlider->setSize(spacing);
KToggleAction *action = dynamic_cast<KToggleAction *>
- (actionCollection()->action(TQString("spacing_%1").arg(spacing)));
+ (actionCollection()->action(TQString("spacing_%1").tqarg(spacing)));
if (action)
action->setChecked(true);
else {
@@ -4363,7 +4357,7 @@ NotationView::slotChangeSpacing(int spacing)
void
NotationView::slotChangeProportionFromIndex(int n)
{
- std::vector<int> proportions = m_hlayout->getAvailableProportions();
+ std::vector<int> proportions = m_htqlayout->getAvailableProportions();
if (n >= (int)proportions.size())
n = proportions.size() - 1;
slotChangeProportion(proportions[n]);
@@ -4372,7 +4366,7 @@ NotationView::slotChangeProportionFromIndex(int n)
void
NotationView::slotChangeProportionFromAction()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
TQString name = s->name();
if (name.left(11) == "proportion_") {
@@ -4381,22 +4375,22 @@ NotationView::slotChangeProportionFromAction()
} else {
KMessageBox::sorry
- (this, i18n("Unknown proportion action %1").arg(name));
+ (this, i18n("Unknown proportion action %1").tqarg(name));
}
}
void
NotationView::slotChangeProportion(int proportion)
{
- if (m_hlayout->getProportion() == proportion)
+ if (m_htqlayout->getProportion() == proportion)
return ;
- m_hlayout->setProportion(proportion);
+ m_htqlayout->setProportion(proportion);
// m_proportionSlider->setSize(proportion);
KToggleAction *action = dynamic_cast<KToggleAction *>
- (actionCollection()->action(TQString("proportion_%1").arg(proportion)));
+ (actionCollection()->action(TQString("proportion_%1").tqarg(proportion)));
if (action)
action->setChecked(true);
else {
@@ -4421,21 +4415,21 @@ NotationView::slotChangeProportion(int proportion)
void
NotationView::slotChangeFontFromAction()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
TQString name = s->name();
if (name.left(10) == "note_font_") {
name = name.right(name.length() - 10);
slotChangeFont(name);
} else {
KMessageBox::sorry
- (this, i18n("Unknown font action %1").arg(name));
+ (this, i18n("Unknown font action %1").tqarg(name));
}
}
void
NotationView::slotChangeFontSizeFromAction()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
TQString name = s->name();
if (name.left(15) == "note_font_size_") {
@@ -4446,11 +4440,11 @@ NotationView::slotChangeFontSizeFromAction()
slotChangeFont(m_fontName, size);
else {
KMessageBox::sorry
- (this, i18n("Unknown font size %1").arg(name));
+ (this, i18n("Unknown font size %1").tqarg(name));
}
} else {
KMessageBox::sorry
- (this, i18n("Unknown font size action %1").arg(name));
+ (this, i18n("Unknown font size action %1").tqarg(name));
}
}
@@ -4587,7 +4581,7 @@ NotationView::slotChangeFont(std::string newName, int newSize)
int topMargin = 0, leftMargin = 0;
getPageMargins(leftMargin, topMargin);
- m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
+ m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
}
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@@ -4598,9 +4592,9 @@ NotationView::slotChangeFont(std::string newName, int newSize)
positionStaffs();
- bool layoutApplied = applyLayout();
- if (!layoutApplied)
- KMessageBox::sorry(0, "Couldn't apply layout");
+ bool tqlayoutApplied = applyLayout();
+ if (!tqlayoutApplied)
+ KMessageBox::sorry(0, "Couldn't apply tqlayout");
else {
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
m_staffs[i]->markChanged();
@@ -4619,7 +4613,7 @@ NotationView::slotFilePrint()
SetWaitCursor waitCursor;
NotationView printingView(getDocument(), m_segments,
- (TQWidget *)parent(), this);
+ (TQWidget *)tqparent(), this);
if (!printingView.isOK()) {
NOTATION_DEBUG << "Print : operation cancelled\n";
@@ -4636,7 +4630,7 @@ NotationView::slotFilePrintPreview()
SetWaitCursor waitCursor;
NotationView printingView(getDocument(), m_segments,
- (TQWidget *)parent(), this);
+ (TQWidget *)tqparent(), this);
if (!printingView.isOK()) {
NOTATION_DEBUG << "Print preview : operation cancelled\n";
@@ -4651,7 +4645,7 @@ std::map<KProcess *, KTempFile *> NotationView::m_lilyTempFileMap;
void NotationView::slotPrintLilyPond()
{
KTmpStatusMsg msg(i18n("Printing LilyPond file..."), this);
- KTempFile *file = new KTempFile(TQString::null, ".ly");
+ KTempFile *file = new KTempFile(TQString(), ".ly");
file->setAutoDelete(true);
if (!file->name()) {
// CurrentProgressDialog::freeze();
@@ -4675,7 +4669,7 @@ void NotationView::slotPrintLilyPond()
void NotationView::slotPreviewLilyPond()
{
KTmpStatusMsg msg(i18n("Previewing LilyPond file..."), this);
- KTempFile *file = new KTempFile(TQString::null, ".ly");
+ KTempFile *file = new KTempFile(TQString(), ".ly");
file->setAutoDelete(true);
if (!file->name()) {
// CurrentProgressDialog::freeze();
@@ -5363,7 +5357,7 @@ void NotationView::slotAddIndication(std::string type, TQString desc)
setSingleSelectedEvent(m_currentEventSelection->getSegment(),
command->getLastInsertedEvent());
} else {
- KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").arg(desc)); // TODO PLURAL - how many 'indications' ?
+ KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").tqarg(desc)); // TODO PLURAL - how many 'indications' ?
delete command;
}
}
@@ -5565,7 +5559,7 @@ void NotationView::slotTransformsRemoveQuantization()
void NotationView::slotSetStyleFromAction()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
TQString name = s->name();
if (!m_currentEventSelection)
@@ -5574,7 +5568,7 @@ void NotationView::slotSetStyleFromAction()
if (name.left(6) == "style_") {
name = name.right(name.length() - 6);
- KTmpStatusMsg msg(i18n("Changing to %1 style...").arg(name),
+ KTmpStatusMsg msg(i18n("Changing to %1 style...").tqarg(name),
this);
addCommandToHistory(new ChangeStyleCommand
@@ -5582,13 +5576,13 @@ void NotationView::slotSetStyleFromAction()
*m_currentEventSelection));
} else {
KMessageBox::sorry
- (this, i18n("Unknown style action %1").arg(name));
+ (this, i18n("Unknown style action %1").tqarg(name));
}
}
void NotationView::slotInsertNoteFromAction()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
TQString name = s->name();
Segment &segment = m_staffs[m_currentStaff]->getSegment();
@@ -5614,7 +5608,7 @@ void NotationView::slotInsertNoteFromAction()
} catch (...) {
KMessageBox::sorry
- (this, i18n("Unknown note insert action %1").arg(name));
+ (this, i18n("Unknown note insert action %1").tqarg(name));
return ;
}
@@ -5664,7 +5658,7 @@ void NotationView::slotSwitchFromRestToNote()
Note note(restInserter->getCurrentNote());
TQString actionName = NotationStrings::getReferenceName(note, false);
- actionName = actionName.replace("-", "_");
+ actionName = actionName.tqreplace("-", "_");
KRadioAction *action = dynamic_cast<KRadioAction *>
(actionCollection()->action(actionName));
@@ -5699,7 +5693,7 @@ void NotationView::slotSwitchFromNoteToRest()
Note note(noteInserter->getCurrentNote());
TQString actionName = NotationStrings::getReferenceName(note, true);
- actionName = actionName.replace("-", "_");
+ actionName = actionName.tqreplace("-", "_");
KRadioAction *action = dynamic_cast<KRadioAction *>
(actionCollection()->action(actionName));
@@ -5915,7 +5909,7 @@ void NotationView::slotAddDotNotationOnly()
void NotationView::slotAddSlashes()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
if (!m_currentEventSelection)
return ;
@@ -5956,7 +5950,7 @@ void NotationView::slotMarksAddFingeringMark()
void NotationView::slotMarksAddFingeringMarkFromAction()
{
- const TQObject *s = sender();
+ const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
TQString name = s->name();
if (name.left(14) == "add_fingering_") {
@@ -6033,9 +6027,9 @@ NotationView::slotMakeOrnament()
TQString name;
int barNo = segment.getComposition()->getBarNumber(absTime);
if (track) {
- name = TQString(i18n("Ornament track %1 bar %2").arg(track->getPosition() + 1).arg(barNo + 1));
+ name = TQString(i18n("Ornament track %1 bar %2").tqarg(track->getPosition() + 1).tqarg(barNo + 1));
} else {
- name = TQString(i18n("Ornament bar %1").arg(barNo + 1));
+ name = TQString(i18n("Ornament bar %1").tqarg(barNo + 1));
}
MakeOrnamentDialog dialog(this, name, basePitch);
@@ -6061,7 +6055,7 @@ NotationView::slotMakeOrnament()
style->getName(),
getDocument()->getComposition().getNextTriggerSegmentId(),
true,
- BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH,
+ BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH,
Marks::NoMark)); //!!!
addCommandToHistory(command);
@@ -6266,7 +6260,7 @@ void NotationView::slotEditSwitchPreset()
// wrong, or just mildly wrong, but I'm betting somebody will tell me
// about it if this was inappropriate
Track *track = comp.getTrackById(selectedTrack);
- track->setPresetLabel(dialog.getName());
+ track->setPresetLabel(dialog.getName().ascii());
track->setClef(dialog.getClef());
track->setTranspose(dialog.getTranspose());
track->setLowestPlayable(dialog.getLowRange());
@@ -6444,22 +6438,22 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
- double layoutX = m_hlayout->getXForTimeByEvent(time);
+ double tqlayoutX = m_htqlayout->getXForTimeByEvent(time);
Segment &seg = m_staffs[i]->getSegment();
bool good = true;
- if (barNo >= m_hlayout->getLastVisibleBarOnStaff(*m_staffs[i])) {
+ if (barNo >= m_htqlayout->getLastVisibleBarOnStaff(*m_staffs[i])) {
if (seg.isRepeating() && time < seg.getRepeatEndTime()) {
timeT mappedTime =
seg.getStartTime() +
((time - seg.getStartTime()) %
(seg.getEndMarkerTime() - seg.getStartTime()));
- layoutX = m_hlayout->getXForTimeByEvent(mappedTime);
+ tqlayoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
} else {
good = false;
}
- } else if (barNo < m_hlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) {
+ } else if (barNo < m_htqlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) {
good = false;
}
@@ -6469,7 +6463,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
} else {
- m_staffs[i]->setPointerPosition(layoutX);
+ m_staffs[i]->setPointerPosition(tqlayoutX);
int cy;
m_staffs[i]->getPointerPosition(cx, cy);
@@ -6542,7 +6536,7 @@ NotationView::slotSetCurrentStaff(int staffNo)
m_chordNameRuler->setCurrentSegment(segment);
m_rawNoteRuler->setCurrentSegment(segment);
- m_rawNoteRuler->repaint();
+ m_rawNoteRuler->tqrepaint();
setControlRulersCurrentSegment();
updateView();
@@ -6756,7 +6750,7 @@ NotationView::doDeferredCursorMove()
t == segment.getEndTime() ||
t == segment.getBarStartForTime(t)) {
- staff->setInsertCursorPosition(*m_hlayout, t);
+ staff->setInsertCursorPosition(*m_htqlayout, t);
if (type == CursorMoveAndMakeVisible) {
double cx;
@@ -6898,7 +6892,7 @@ void NotationView::slotDoubleFlat()
void NotationView::slotTrebleClef()
{
m_currentNotePixmap->setPixmap
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble")));
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble")));
setTool(m_toolBox->getTool(ClefInserter::ToolName));
dynamic_cast<ClefInserter*>(m_tool)->setClef(Clef::Treble);
@@ -6908,7 +6902,7 @@ void NotationView::slotTrebleClef()
void NotationView::slotAltoClef()
{
m_currentNotePixmap->setPixmap
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto")));
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto")));
setTool(m_toolBox->getTool(ClefInserter::ToolName));
dynamic_cast<ClefInserter*>(m_tool)->setClef(Clef::Alto);
@@ -6918,7 +6912,7 @@ void NotationView::slotAltoClef()
void NotationView::slotTenorClef()
{
m_currentNotePixmap->setPixmap
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor")));
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor")));
setTool(m_toolBox->getTool(ClefInserter::ToolName));
dynamic_cast<ClefInserter*>(m_tool)->setClef(Clef::Tenor);
@@ -6928,7 +6922,7 @@ void NotationView::slotTenorClef()
void NotationView::slotBassClef()
{
m_currentNotePixmap->setPixmap
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass")));
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass")));
setTool(m_toolBox->getTool(ClefInserter::ToolName));
dynamic_cast<ClefInserter*>(m_tool)->setClef(Clef::Bass);
@@ -6938,7 +6932,7 @@ void NotationView::slotBassClef()
void NotationView::slotText()
{
m_currentNotePixmap->setPixmap
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("text")));
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("text")));
setTool(m_toolBox->getTool(TextInserter::ToolName));
setMenuStates();
}
@@ -6946,7 +6940,7 @@ void NotationView::slotText()
void NotationView::slotGuitarChord()
{
m_currentNotePixmap->setPixmap
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord")));
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord")));
setTool(m_toolBox->getTool(GuitarChordInserter::ToolName));
setMenuStates();
}
@@ -6982,21 +6976,21 @@ void NotationView::slotMultiPageMode()
void NotationView::slotToggleChordsRuler()
{
- if (m_hlayout->isPageMode())
+ if (m_htqlayout->isPageMode())
return ;
toggleWidget(m_chordNameRuler, "show_chords_ruler");
}
void NotationView::slotToggleRawNoteRuler()
{
- if (m_hlayout->isPageMode())
+ if (m_htqlayout->isPageMode())
return ;
toggleWidget(m_rawNoteRuler, "show_raw_note_ruler");
}
void NotationView::slotToggleTempoRuler()
{
- if (m_hlayout->isPageMode())
+ if (m_htqlayout->isPageMode())
return ;
toggleWidget(m_tempoRuler, "show_tempo_ruler");
}
@@ -7004,7 +6998,7 @@ void NotationView::slotToggleTempoRuler()
void NotationView::slotToggleAnnotations()
{
m_annotationsVisible = !m_annotationsVisible;
- slotUpdateAnnotationsStatus();
+ slotUpdateAnnotationstqStatus();
//!!! use refresh mechanism
refreshSegment(0, 0, 0);
}
@@ -7012,7 +7006,7 @@ void NotationView::slotToggleAnnotations()
void NotationView::slotToggleLilyPondDirectives()
{
m_lilyPondDirectivesVisible = !m_lilyPondDirectivesVisible;
- slotUpdateLilyPondDirectivesStatus();
+ slotUpdateLilyPondDirectivestqStatus();
//!!! use refresh mechanism
refreshSegment(0, 0, 0);
}
@@ -7101,7 +7095,7 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it)
getTrackById(staff->getSegment().getTrack())->getLabel();
bool ok = false;
- TQRegExpValidator validator(TQRegExp(".*"), this); // empty is OK
+ TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this)); // empty is OK
TQString newText = KLineEditDlg::getText(TQString("Change staff name"),
TQString("Enter new staff name"),
@@ -7119,10 +7113,10 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it)
emit staffLabelChanged(staff->getSegment().getTrack(), newText);
}
- } else if (dynamic_cast<QCanvasTimeSigSprite *>(it)) {
+ } else if (dynamic_cast<TQCanvasTimeSigSprite *>(it)) {
- double layoutX = (dynamic_cast<QCanvasTimeSigSprite *>(it))->getLayoutX();
- emit editTimeSignature(m_hlayout->getTimeForX(layoutX));
+ double tqlayoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
+ emit editTimeSignature(m_htqlayout->getTimeForX(tqlayoutX));
}
}
@@ -7200,17 +7194,17 @@ NotationView::slotHoveredOverAbsoluteTimeChanged(unsigned int time)
// TQString message;
// TQString format("%ld (%ld.%03lds)");
- // format = i18n("Time: %1").arg(format);
+ // format = i18n("Time: %1").tqarg(format);
// message.sprintf(format, t, rt.sec, ms);
TQString message = i18n("Time: %1 (%2.%3s)")
- .arg(TQString("%1-%2-%3-%4")
- .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0'))
- .arg(TQString("%1").arg(beat).rightJustify(2, '0'))
- .arg(TQString("%1").arg(fraction).rightJustify(2, '0'))
- .arg(TQString("%1").arg(remainder).rightJustify(2, '0')))
- .arg(rt.sec)
- .arg(TQString("%1").arg(ms).rightJustify(3, '0'));
+ .tqarg(TQString("%1-%2-%3-%4")
+ .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0'))
+ .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0'))
+ .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0'))
+ .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0')))
+ .tqarg(rt.sec)
+ .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0'));
m_hoveredOverAbsoluteTime->setText(message);
}
@@ -7367,7 +7361,7 @@ NotationView::slotToggleStepByStep()
return ;
}
if (action->isChecked()) { // after toggling, that is
- emit stepByStepTargetRequested(this);
+ emit stepByStepTargetRequested(TQT_TQOBJECT(this));
} else {
emit stepByStepTargetRequested(0);
}
@@ -7382,7 +7376,7 @@ NotationView::slotStepByStepTargetRequested(TQObject *obj)
NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl;
return ;
}
- action->setChecked(obj == this);
+ action->setChecked(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this));
}
void
@@ -7402,8 +7396,8 @@ NotationView::slotCheckRendered(double cx0, double cx1)
LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
(cx1, staff->getTotalHeight() + staff->getY());
- timeT t0 = m_hlayout->getTimeForX(cc0.first);
- timeT t1 = m_hlayout->getTimeForX(cc1.first);
+ timeT t0 = m_htqlayout->getTimeForX(cc0.first);
+ timeT t1 = m_htqlayout->getTimeForX(cc1.first);
if (dynamic_cast<NotationStaff *>(staff)->checkRendered(t0, t1)) {
something = true; //!!!
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 356960c..1288b04 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -109,22 +109,23 @@ class NotationView : public EditView,
friend class LilyPondExporter;
Q_OBJECT
+ TQ_OBJECT
public:
explicit NotationView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *parent,
+ TQWidget *tqparent,
bool showProgressive); // update during initial render?
/**
- * Constructor for printing only. If parent is provided, a
+ * Constructor for printing only. If tqparent is provided, a
* progress dialog will be shown -- otherwise not. If another
* NotationView is provided, the fonts and other settings used
* for printing will be taken from that view.
*/
explicit NotationView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
- TQWidget *parent,
+ TQWidget *tqparent,
NotationView *referenceView);
~NotationView();
@@ -261,7 +262,7 @@ public:
* the pitch for performance, so the two need not correspond (e.g.
* under ottava there may be octave differences).
*/
- void showPreviewNote(int staffNo, double layoutX,
+ void showPreviewNote(int staffNo, double tqlayoutX,
int pitch, int height,
const Note &note,
bool grace,
@@ -273,13 +274,13 @@ public:
/// Sound the given note
void playNote(Segment &segment, int pitch, int velocity = -1);
- /// Switches between page- and linear- layout modes
+ /// Switches between page- and linear- tqlayout modes
void setPageMode(LinedStaff::PageMode mode);
- /// Returns the page width according to the layout mode (page/linear)
+ /// Returns the page width according to the tqlayout mode (page/linear)
int getPageWidth();
- /// Returns the page height according to the layout mode (page/linear)
+ /// Returns the page height according to the tqlayout mode (page/linear)
int getPageHeight();
/// Returns the margins within the page (zero if not in MultiPageMode)
@@ -309,7 +310,7 @@ public:
/**
* Render segments on printing painter. This uses the current
- * font size and layout, rather than the optimal ones for the
+ * font size and tqlayout, rather than the optimal ones for the
* printer configuration (notation editing is not quite WYSIWYG,
* and we may be in a non-page mode).
*
@@ -445,7 +446,7 @@ public slots:
void slotToggleGroupToolBar();
/**
- * toggles the layout toolbar
+ * toggles the tqlayout toolbar
*/
void slotToggleLayoutToolBar();
@@ -493,9 +494,9 @@ public slots:
void slotToggleStepByStep();
/// status stuff
- void slotUpdateInsertModeStatus();
- void slotUpdateAnnotationsStatus();
- void slotUpdateLilyPondDirectivesStatus();
+ void slotUpdateInsertModetqStatus();
+ void slotUpdateAnnotationstqStatus();
+ void slotUpdateLilyPondDirectivestqStatus();
/// edit menu
void slotPreviewSelection();
@@ -638,7 +639,7 @@ public slots:
void slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *i);
/**
- * Called when a mouse press occurred on a QCanvasText
+ * Called when a mouse press occurred on a TQCanvasText
*/
void slotTextItemPressed(TQMouseEvent *e, TQCanvasItem *i);
@@ -772,22 +773,22 @@ public slots:
/// Changes to the next font size down
void slotZoomOut();
- /// Changes the hlayout spacing of the staffs on the view
+ /// Changes the htqlayout spacing of the staffs on the view
void slotChangeSpacing(int newSpacing);
- /// Changes the hlayout spacing of the staffs on the view
+ /// Changes the htqlayout spacing of the staffs on the view
void slotChangeSpacingFromStringValue(const TQString&);
- /// Changes the hlayout spacing of the staffs on the view
+ /// Changes the htqlayout spacing of the staffs on the view
void slotChangeSpacingFromAction();
- /// Changes the hlayout proportion of the staffs on the view
+ /// Changes the htqlayout proportion of the staffs on the view
void slotChangeProportion(int newProportion);
- /// Changes the hlayout proportion of the staffs on the view
+ /// Changes the htqlayout proportion of the staffs on the view
void slotChangeProportionFromIndex(int newProportionIndex);
- /// Changes the hlayout proportion of the staffs on the view
+ /// Changes the htqlayout proportion of the staffs on the view
void slotChangeProportionFromAction();
/// Note-on received asynchronously -- consider step-by-step editing
@@ -811,7 +812,7 @@ public slots:
/// Do some background rendering work.
void slotRenderSomething();
- void slotSetOperationNameAndStatus(TQString);
+ void slotSetOperationNameAndtqStatus(TQString);
// Update notation view based on track/staff name change
void slotUpdateStaffName();
@@ -875,7 +876,7 @@ protected:
protected slots:
/**
* save general Options like all bar positions and status as well
- * as the geometry and the recent file list to the configuration
+ * as the tqgeometry and the recent file list to the configuration
* file
*/
virtual void slotSaveOptions();
@@ -911,13 +912,13 @@ protected:
virtual void initStatusBar();
/**
- * Place the staffs at the correct x & y coordinates (before layout)
+ * Place the staffs at the correct x & y coordinates (before tqlayout)
*/
void positionStaffs();
/**
* Place the page pixmaps (if any) at the correct x & y
- * coordinates (after layout)
+ * coordinates (after tqlayout)
*/
void positionPages();
@@ -928,7 +929,7 @@ protected:
void updateThumbnails(bool complete);
/**
- * setup the layout/font toolbar
+ * setup the tqlayout/font toolbar
*/
void initLayoutToolbar();
@@ -939,15 +940,15 @@ protected:
*/
void toggleNamedToolBar(const TQString& toolBarName, bool* force = 0);
- /// Calls all the relevant preparse and layout methods
+ /// Calls all the relevant preparse and tqlayout methods
virtual bool applyLayout(int staffNo = -1,
timeT startTime = 0,
timeT endTime = 0);
/**
- * Readjust the size of the canvas after a layout
+ * Readjust the size of the canvas after a tqlayout
*
- * Checks the total width computed by the horizontal layout
+ * Checks the total width computed by the horizontal tqlayout
*
* @see NotationHLayout#getTotalWidth()
*/
@@ -1073,8 +1074,8 @@ protected:
NotePixmapFactory *m_notePixmapFactory;
- NotationHLayout* m_hlayout;
- NotationVLayout* m_vlayout;
+ NotationHLayout* m_htqlayout;
+ NotationVLayout* m_vtqlayout;
ChordNameRuler *m_chordNameRuler;
TQWidget *m_tempoRuler;
diff --git a/src/gui/editors/notation/NoteCharacter.cpp b/src/gui/editors/notation/NoteCharacter.cpp
index 2fcff18..e3beed2 100644
--- a/src/gui/editors/notation/NoteCharacter.cpp
+++ b/src/gui/editors/notation/NoteCharacter.cpp
@@ -84,7 +84,7 @@ NoteCharacter::getHeight() const
return m_pixmap->height();
}
-QPoint
+TQPoint
NoteCharacter::getHotspot() const
{
return m_hotspot;
diff --git a/src/gui/editors/notation/NoteCharacter.h b/src/gui/editors/notation/NoteCharacter.h
index 3b27e87..b5f3b84 100644
--- a/src/gui/editors/notation/NoteCharacter.h
+++ b/src/gui/editors/notation/NoteCharacter.h
@@ -37,7 +37,7 @@ class TQCanvasPixmap;
namespace Rosegarden
{
-class NoteCharacterDrawRep : public QPointArray
+class NoteCharacterDrawRep : public TQPointArray
{
public:
NoteCharacterDrawRep(int size = 0) : TQPointArray(size) { }
diff --git a/src/gui/editors/notation/NoteCharacterNames.cpp b/src/gui/editors/notation/NoteCharacterNames.cpp
index bcd450c..fb4f96e 100644
--- a/src/gui/editors/notation/NoteCharacterNames.cpp
+++ b/src/gui/editors/notation/NoteCharacterNames.cpp
@@ -45,8 +45,8 @@ const CharName SEMIBREVIS_WHITE = "MUSICAL SYMBOL SEMIBREVIS WHITE";
const CharName SEMIBREVIS_BLACK = "MUSICAL SYMBOL SEMIBREVIS BLACK";
const CharName TRIANGLE_NOTEHEAD_UP_WHITE = "MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE";
const CharName TRIANGLE_NOTEHEAD_UP_BLACK = "MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK";
-const CharName SQUARE_NOTEHEAD_WHITE = "MUSICAL SYMBOL SQUARE NOTEHEAD WHITE";
-const CharName SQUARE_NOTEHEAD_BLACK = "MUSICAL SYMBOL SQUARE NOTEHEAD BLACK";
+const CharName STQUARE_NOTEHEAD_WHITE = "MUSICAL SYMBOL STQUARE NOTEHEAD WHITE";
+const CharName STQUARE_NOTEHEAD_BLACK = "MUSICAL SYMBOL STQUARE NOTEHEAD BLACK";
// These two names are not valid Unicode names. They describe flags
// that should be used to compose multi-flag notes, rather than used
@@ -70,7 +70,7 @@ const CharName WHOLE_REST = "MUSICAL SYMBOL WHOLE REST"; // Unicode-4 glyph 1D13
const CharName WHOLE_REST_ON_STAFF = "MUSICAL SYMBOL WHOLE REST ON STAFF";
const CharName HALF_REST = "MUSICAL SYMBOL HALF REST"; // Unicode-4 glyph 1D13C
const CharName HALF_REST_ON_STAFF = "MUSICAL SYMBOL HALF REST ON STAFF";
-const CharName QUARTER_REST = "MUSICAL SYMBOL QUARTER REST";
+const CharName TQUARTER_REST = "MUSICAL SYMBOL TQUARTER REST";
const CharName EIGHTH_REST = "MUSICAL SYMBOL EIGHTH REST";
const CharName SIXTEENTH_REST = "MUSICAL SYMBOL SIXTEENTH REST";
const CharName THIRTY_SECOND_REST = "MUSICAL SYMBOL THIRTY-SECOND REST";
diff --git a/src/gui/editors/notation/NoteCharacterNames.h b/src/gui/editors/notation/NoteCharacterNames.h
index 9022ecd..be062df 100644
--- a/src/gui/editors/notation/NoteCharacterNames.h
+++ b/src/gui/editors/notation/NoteCharacterNames.h
@@ -49,8 +49,8 @@ extern const CharName SEMIBREVIS_WHITE;
extern const CharName SEMIBREVIS_BLACK;
extern const CharName TRIANGLE_NOTEHEAD_UP_WHITE;
extern const CharName TRIANGLE_NOTEHEAD_UP_BLACK;
-extern const CharName SQUARE_NOTEHEAD_WHITE;
-extern const CharName SQUARE_NOTEHEAD_BLACK;
+extern const CharName STQUARE_NOTEHEAD_WHITE;
+extern const CharName STQUARE_NOTEHEAD_BLACK;
extern const CharName FLAG_PARTIAL;
extern const CharName FLAG_PARTIAL_FINAL;
@@ -66,7 +66,7 @@ extern const CharName WHOLE_REST;
extern const CharName WHOLE_REST_ON_STAFF;
extern const CharName HALF_REST;
extern const CharName HALF_REST_ON_STAFF;
-extern const CharName QUARTER_REST;
+extern const CharName TQUARTER_REST;
extern const CharName EIGHTH_REST;
extern const CharName SIXTEENTH_REST;
extern const CharName THIRTY_SECOND_REST;
diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp
index 3a0ea18..e494169 100644
--- a/src/gui/editors/notation/NoteFont.cpp
+++ b/src/gui/editors/notation/NoteFont.cpp
@@ -66,7 +66,7 @@ NoteFont::NoteFont(std::string fontName, int size) :
if (size > 0) {
if (sizes.find(size) == sizes.end()) {
- throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").arg(strtoqstr(fontName)).arg(size)));
+ throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").tqarg(strtoqstr(fontName)).tqarg(size)));
} else {
m_size = size;
}
@@ -86,8 +86,8 @@ NoteFont::NoteFont(std::string fontName, int size) :
// Locate our font's pixmap map in the font map, create if necessary
std::string fontKey = qstrtostr(TQString("__%1__%2__")
- .arg(strtoqstr(m_fontMap.getName()))
- .arg(m_size));
+ .tqarg(strtoqstr(m_fontMap.getName()))
+ .tqarg(m_size));
FontPixmapMap::iterator i = m_fontPixmapMap->find(fontKey);
if (i == m_fontPixmapMap->end()) {
@@ -231,7 +231,8 @@ NoteFont::lookupDrawRep(TQPixmap *pixmap) const
if (!pixel) {
if (startx < xi) {
- a->resize(a->size() + 2, TQGArray::SpeedOptim);
+ //a->resize(a->size() + 2, TQGArray::SpeedOptim);
+ a->resize(a->size() + 2);
a->setPoint(a->size() - 2, startx, yi);
a->setPoint(a->size() - 1, xi - 1, yi);
}
@@ -286,7 +287,7 @@ NoteFont::getPixmap(CharName charName, TQPixmap &pixmap, bool inverted) const
if (!found->isNull()) {
if (found->tqmask() == 0) {
- std::cerr << "NoteFont::getPixmap: Warning: No automatic mask "
+ std::cerr << "NoteFont::getPixmap: Warning: No automatic tqmask "
<< "for character \"" << charName << "\""
<< (inverted ? " (inverted)" : "") << " in font \""
<< m_fontMap.getName() << "-" << m_size
@@ -400,7 +401,7 @@ NoteFont::getColouredPixmap(CharName baseCharName, TQPixmap &pixmap,
return false;
}
- found = new QPixmap
+ found = new TQPixmap
(PixmapFunctions::colourPixmap(basePixmap, hue, minValue));
add(charName, inverted, found);
pixmap = *found;
@@ -443,13 +444,13 @@ NoteFont::getShadedPixmap(CharName baseCharName, TQPixmap &pixmap,
CharName
NoteFont::getNameWithColour(CharName base, int hue) const
{
- return qstrtostr(TQString("%1__%2").arg(hue).arg(strtoqstr(base)));
+ return qstrtostr(TQString("%1__%2").tqarg(hue).tqarg(strtoqstr(base)));
}
CharName
NoteFont::getNameShaded(CharName base) const
{
- return qstrtostr(TQString("shaded__%1").arg(strtoqstr(base)));
+ return qstrtostr(TQString("shaded__%1").tqarg(strtoqstr(base)));
}
bool
@@ -497,7 +498,7 @@ NoteFont::getHotspot(CharName charName, int &x, int &y, bool inverted) const
return ok;
}
-QPoint
+TQPoint
NoteFont::getHotspot(CharName charName, bool inverted) const
{
int x, y;
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index 9640087..3a77411 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -57,18 +57,18 @@ NoteFontMap::NoteFontMap(std::string name) :
TQString mapFileName;
TQString mapFileMixedName = TQString("%1/mappings/%2.xml")
- .arg(m_fontDirectory)
- .arg(strtoqstr(name));
+ .tqarg(m_fontDirectory)
+ .tqarg(strtoqstr(name));
TQFileInfo mapFileMixedInfo(mapFileMixedName);
if (!mapFileMixedInfo.isReadable()) {
TQString lowerName = strtoqstr(name).lower();
- lowerName.replace(TQRegExp(" "), "_");
+ lowerName.tqreplace(TQRegExp(" "), "_");
TQString mapFileLowerName = TQString("%1/mappings/%2.xml")
- .arg(m_fontDirectory)
- .arg(lowerName);
+ .tqarg(m_fontDirectory)
+ .tqarg(lowerName);
TQFileInfo mapFileLowerInfo(mapFileLowerName);
@@ -76,11 +76,11 @@ NoteFontMap::NoteFontMap(std::string name) :
if (mapFileLowerName != mapFileMixedName) {
throw MappingFileReadFailed
(qstrtostr(i18n("Can't open font mapping file %1 or %2").
- arg(mapFileMixedName).arg(mapFileLowerName)));
+ tqarg(mapFileMixedName).tqarg(mapFileLowerName)));
} else {
throw MappingFileReadFailed
(qstrtostr(i18n("Can't open font mapping file %1").
- arg(mapFileMixedName)));
+ tqarg(mapFileMixedName)));
}
} else {
mapFileName = mapFileLowerName;
@@ -287,14 +287,14 @@ NoteFontMap::startElement(const TQString &, const TQString &,
fontId = s.toInt();
//!!! need to be able to calculate max size -- checkFont needs
- //to take a size argument; unfortunately Qt doesn't seem to be
+ //to take a size argument; unfortunately TQt doesn't seem to be
//able to report to us when a scalable font was loaded in the
//wrong size, so large sizes might be significantly inaccurate
//as it just stops scaling up any further at somewhere around
//120px. We could test whether the metric for the black
//notehead is noticeably smaller than the notehead should be,
//and reject if so? [update -- no, that doesn't work either,
- //Qt just returns the correct metric even if drawing the
+ //TQt just returns the correct metric even if drawing the
//incorrect size]
for (int sz = 1; sz <= 30; sz += (sz == 1 ? 1 : 2)) {
@@ -595,7 +595,7 @@ NoteFontMap::startElement(const TQString &, const TQString &,
m_systemFontNames[n] = name;
delete font;
} else {
- std::cerr << TQString("Warning: Unable to load font \"%1\"").arg(name) << std::endl;
+ std::cerr << TQString("Warning: Unable to load font \"%1\"").tqarg(name) << std::endl;
m_ok = false;
}
@@ -615,7 +615,7 @@ NoteFontMap::startElement(const TQString &, const TQString &,
}
if (!have) {
std::cerr << TQString("Warning: Unable to load any of the fonts in \"%1\"").
- arg(names) << std::endl;
+ tqarg(names) << std::endl;
m_ok = false;
}
@@ -657,10 +657,10 @@ bool
NoteFontMap::error(const TQXmlParseException& exception)
{
m_errorString = TQString("%1 at line %2, column %3: %4")
- .arg(exception.message())
- .arg(exception.lineNumber())
- .arg(exception.columnNumber())
- .arg(m_errorString);
+ .tqarg(exception.message())
+ .tqarg(exception.lineNumber())
+ .tqarg(exception.columnNumber())
+ .tqarg(m_errorString);
return TQXmlDefaultHandler::error(exception);
}
@@ -668,10 +668,10 @@ bool
NoteFontMap::fatalError(const TQXmlParseException& exception)
{
m_errorString = TQString("%1 at line %2, column %3: %4")
- .arg(exception.message())
- .arg(exception.lineNumber())
- .arg(exception.columnNumber())
- .arg(m_errorString);
+ .tqarg(exception.message())
+ .tqarg(exception.lineNumber())
+ .tqarg(exception.columnNumber())
+ .tqarg(m_errorString);
return TQXmlDefaultHandler::fatalError(exception);
}
@@ -705,20 +705,20 @@ bool
NoteFontMap::checkFile(int size, std::string &src) const
{
TQString pixmapFileMixedName = TQString("%1/%2/%3/%4.xpm")
- .arg(m_fontDirectory)
- .arg(strtoqstr(m_srcDirectory))
- .arg(size)
- .arg(strtoqstr(src));
+ .tqarg(m_fontDirectory)
+ .tqarg(strtoqstr(m_srcDirectory))
+ .tqarg(size)
+ .tqarg(strtoqstr(src));
TQFileInfo pixmapFileMixedInfo(pixmapFileMixedName);
if (!pixmapFileMixedInfo.isReadable()) {
TQString pixmapFileLowerName = TQString("%1/%2/%3/%4.xpm")
- .arg(m_fontDirectory)
- .arg(strtoqstr(m_srcDirectory).lower())
- .arg(size)
- .arg(strtoqstr(src));
+ .tqarg(m_fontDirectory)
+ .tqarg(strtoqstr(m_srcDirectory).lower())
+ .tqarg(size)
+ .tqarg(strtoqstr(src));
TQFileInfo pixmapFileLowerInfo(pixmapFileLowerName);
@@ -991,7 +991,7 @@ NoteFontMap::HotspotData::getHotspot(int size, int width, int height,
return true;
}
-QStringList
+TQStringList
NoteFontMap::getSystemFontNames() const
{
TQStringList names;
diff --git a/src/gui/editors/notation/NoteFontMap.h b/src/gui/editors/notation/NoteFontMap.h
index 52d87fa..9dac3f1 100644
--- a/src/gui/editors/notation/NoteFontMap.h
+++ b/src/gui/editors/notation/NoteFontMap.h
@@ -47,7 +47,7 @@ namespace Rosegarden
-class NoteFontMap : public QXmlDefaultHandler
+class NoteFontMap : public TQXmlDefaultHandler
{
public:
typedef Exception MappingFileReadFailed;
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index d3dc2a3..918c7ac 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -50,7 +50,7 @@ NoteFontViewer::slotViewChanged(int i)
for (int r = 0; r < 256; ++r) {
if (m_frame->hasRow(r)) {
- m_rows->insertItem(TQString("%1").arg(r));
+ m_rows->insertItem(TQString("%1").tqarg(r));
if (firstRow < 0)
firstRow = r;
}
@@ -81,10 +81,10 @@ NoteFontViewer::slotFontChanged(const TQString &s)
slotViewChanged(m_view->currentItem());
}
-NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName,
+NoteFontViewer::NoteFontViewer(TQWidget *tqparent, TQString noteFontName,
TQStringList fontNames, int pixelSize) :
- KDialogBase(parent, 0, true,
- i18n("Note Font Viewer: %1").arg(noteFontName), Close)
+ KDialogBase(tqparent, 0, true,
+ i18n("Note Font Viewer: %1").tqarg(noteFontName), Close)
{
TQVBox *box = makeVBoxMainWidget();
KToolBar* controls = new KToolBar(box);
diff --git a/src/gui/editors/notation/NoteFontViewer.h b/src/gui/editors/notation/NoteFontViewer.h
index b31df03..17b41a7 100644
--- a/src/gui/editors/notation/NoteFontViewer.h
+++ b/src/gui/editors/notation/NoteFontViewer.h
@@ -44,9 +44,10 @@ class FontViewFrame;
class NoteFontViewer : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- NoteFontViewer(TQWidget *parent, TQString noteFontName,
+ NoteFontViewer(TQWidget *tqparent, TQString noteFontName,
TQStringList systemFontNames, int pixelSize);
protected slots:
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index c2533e5..7827761 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -86,8 +86,8 @@ NoteInserter::NoteInserter(NotationView* view)
for (unsigned int i = 0; i < 6; ++i) {
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap(m_actionsAccidental[i][3])));
KRadioAction* noteAction = new KRadioAction(i18n(m_actionsAccidental[i][0]),
icon, 0, this,
@@ -97,14 +97,14 @@ NoteInserter::NoteInserter(NotationView* view)
noteAction->setExclusiveGroup("accidentals");
}
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("dotted-crotchet")));
new KToggleAction(i18n("Dotted note"), icon, 0, this,
TQT_SLOT(slotToggleDot()), actionCollection(),
"toggle_dot");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
TQT_SLOT(slotSelectSelected()), actionCollection(),
@@ -114,8 +114,8 @@ NoteInserter::NoteInserter(NotationView* view)
TQT_SLOT(slotEraseSelected()), actionCollection(),
"erase");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("rest-crotchet")));
new KAction(i18n("Switch to Inserting Rests"), icon, 0, this,
TQT_SLOT(slotRestsSelected()), actionCollection(),
@@ -123,7 +123,7 @@ NoteInserter::NoteInserter(NotationView* view)
createMenu("noteinserter.rc");
- connect(m_parentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
+ connect(m_tqparentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
this, TQT_SLOT(slotSetAccidental(Accidental, bool)));
}
@@ -137,7 +137,7 @@ NoteInserter::NoteInserter(const TQString& menuName, NotationView* view)
m_lastAccidental(Accidentals::NoAccidental),
m_followAccidental(false)
{
- connect(m_parentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
+ connect(m_tqparentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
this, TQT_SLOT(slotSetAccidental(Accidental, bool)));
}
@@ -147,7 +147,7 @@ NoteInserter::~NoteInserter()
void NoteInserter::ready()
{
m_clickHappened = false;
- m_nParentView->setCanvasCursor(Qt::crossCursor);
+ m_nParentView->setCanvasCursor(TQt::crossCursor);
m_nParentView->setHeightTracking(true);
}
@@ -623,37 +623,37 @@ void NoteInserter::slotSetAccidental(Accidental accidental,
void NoteInserter::slotNoAccidental()
{
- m_parentView->actionCollection()->action("no_accidental")->activate();
+ m_tqparentView->actionCollection()->action("no_accidental")->activate();
}
void NoteInserter::slotFollowAccidental()
{
- m_parentView->actionCollection()->action("follow_accidental")->activate();
+ m_tqparentView->actionCollection()->action("follow_accidental")->activate();
}
void NoteInserter::slotSharp()
{
- m_parentView->actionCollection()->action("sharp_accidental")->activate();
+ m_tqparentView->actionCollection()->action("sharp_accidental")->activate();
}
void NoteInserter::slotFlat()
{
- m_parentView->actionCollection()->action("flat_accidental")->activate();
+ m_tqparentView->actionCollection()->action("flat_accidental")->activate();
}
void NoteInserter::slotNatural()
{
- m_parentView->actionCollection()->action("natural_accidental")->activate();
+ m_tqparentView->actionCollection()->action("natural_accidental")->activate();
}
void NoteInserter::slotDoubleSharp()
{
- m_parentView->actionCollection()->action("double_sharp_accidental")->activate();
+ m_tqparentView->actionCollection()->action("double_sharp_accidental")->activate();
}
void NoteInserter::slotDoubleFlat()
{
- m_parentView->actionCollection()->action("double_flat_accidental")->activate();
+ m_tqparentView->actionCollection()->action("double_flat_accidental")->activate();
}
void NoteInserter::slotToggleDot()
@@ -661,8 +661,8 @@ void NoteInserter::slotToggleDot()
m_noteDots = (m_noteDots) ? 0 : 1;
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note));
- actionName.replace(TQRegExp("-"), "_");
- KAction *action = m_parentView->actionCollection()->action(actionName);
+ actionName.tqreplace(TQRegExp("-"), "_");
+ KAction *action = m_tqparentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
} else {
@@ -677,20 +677,20 @@ void NoteInserter::slotToggleAutoBeam()
void NoteInserter::slotEraseSelected()
{
- m_parentView->actionCollection()->action("erase")->activate();
+ m_tqparentView->actionCollection()->action("erase")->activate();
}
void NoteInserter::slotSelectSelected()
{
- m_parentView->actionCollection()->action("select")->activate();
+ m_tqparentView->actionCollection()->action("select")->activate();
}
void NoteInserter::slotRestsSelected()
{
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note, true));
- actionName.replace(TQRegExp("-"), "_");
- KAction *action = m_parentView->actionCollection()->action(actionName);
+ actionName.tqreplace(TQRegExp("-"), "_");
+ KAction *action = m_tqparentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
} else {
diff --git a/src/gui/editors/notation/NoteInserter.h b/src/gui/editors/notation/NoteInserter.h
index a2467a1..81f035d 100644
--- a/src/gui/editors/notation/NoteInserter.h
+++ b/src/gui/editors/notation/NoteInserter.h
@@ -52,6 +52,7 @@ class Event;
class NoteInserter : public NotationTool
{
Q_OBJECT
+ TQ_OBJECT
friend class NotationToolBox;
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index b41ecae..e02e14e 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -289,8 +289,8 @@ NotePixmapFactory::getSize() const
return m_font->getSize();
}
-QPixmap
-NotePixmapFactory::toQPixmap(TQCanvasPixmap* cp)
+TQPixmap
+NotePixmapFactory::toTQPixmap(TQCanvasPixmap* cp)
{
TQPixmap p = *cp;
delete cp;
@@ -330,8 +330,8 @@ NotePixmapFactory::makeNotePixmap(const NotePixmapParameters &params)
//#define ROSE_DEBUG_NOTE_PIXMAP_FACTORY
#ifdef ROSE_DEBUG_NOTE_PIXMAP_FACTORY
- m_p->painter().setPen(Qt::red);
- m_p->painter().setBrush(Qt::red);
+ m_p->painter().setPen(TQt::red);
+ m_p->painter().setBrush(TQt::red);
m_p->drawLine(0, 0, 0, m_generatedHeight - 1);
m_p->drawLine(m_generatedWidth - 1, 0,
@@ -570,7 +570,7 @@ NotePixmapFactory::drawNoteAux(const NotePixmapParameters &params,
if (m_selected)
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
else
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
// If we draw stems after beams, instead of beams after stems,
// beam anti-aliasing won't damage stems but we have to shorten the
@@ -893,7 +893,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
m_p->painter().setFont(m_textMarkFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(m_textMarkFont);
+ m_p->tqmaskPainter().setFont(m_textMarkFont);
int x = m_left + m_noteBodyWidth / 2 - bounds.width() / 2;
int y = (normalMarksAreAbove ?
@@ -923,7 +923,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
if (m_selected)
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
else
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
if (!Marks::isFingeringMark(*i)) {
int x = m_left + m_noteBodyWidth / 2;
@@ -978,7 +978,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
m_p->painter().setFont(m_fingeringFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(m_fingeringFont);
+ m_p->tqmaskPainter().setFont(m_fingeringFont);
int x = m_left + m_noteBodyWidth / 2 - bounds.width() / 2;
int y = m_above - dy - 3;
@@ -1025,7 +1025,7 @@ NotePixmapFactory::drawLegerLines(const NotePixmapParameters &params)
if (m_selected)
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
else
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
}
x0 = m_left - m_noteBodyWidth / 5 - 1;
x1 = m_left + m_noteBodyWidth + m_noteBodyWidth / 5 /* + 1 */;
@@ -1257,11 +1257,11 @@ NotePixmapFactory::drawFlags(int flagCount,
y,
*flagChar.getPixmap());
- m_p->begin(m_generatedPixmap, m_generatedMask);
+ m_p->begin(TQT_TQPAINTDEVICE(m_generatedPixmap), TQT_TQPAINTDEVICE(m_generatedMask));
} else {
- // No problem with mask here
+ // No problem with tqmask here
m_p->drawNoteCharacter(m_left + s1.x() - hotspot.x(),
y,
flagChar);
@@ -1328,7 +1328,7 @@ NotePixmapFactory::drawShallowLine(int x0, int y0, int x1, int y1,
if (m_selected)
m_p->painter().setBrush(GUIPalette::getColour(GUIPalette::SelectedElement));
else
- m_p->painter().setBrush(Qt::black);
+ m_p->painter().setBrush(TQt::black);
}
if (thickness < 4) {
for (int i = 0; i < thickness; ++i) {
@@ -1400,7 +1400,7 @@ NotePixmapFactory::drawShallowLine(int x0, int y0, int x1, int y1,
<< ", g = " << g << ", dg1 = " << dg1 << ", dg2 = " << dg2
<< ", seg = " << segment << ", q = " << quartile << endl;
*/
- // I don't know enough about Qt to be sure of this, but I
+ // I don't know enough about TQt to be sure of this, but I
// suspect this may be some of the most inefficient code ever
// written:
@@ -1419,7 +1419,7 @@ NotePixmapFactory::drawShallowLine(int x0, int y0, int x1, int y1,
if (m_selected) {
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
} else {
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
}
}
@@ -1440,7 +1440,7 @@ NotePixmapFactory::drawShallowLine(int x0, int y0, int x1, int y1,
++cx;
}
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
}
void
@@ -1630,7 +1630,7 @@ NotePixmapFactory::drawTuplingLine(const NotePixmapParameters &params)
m_p->painter().setFont(m_tupletCountFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(m_tupletCountFont);
+ m_p->tqmaskPainter().setFont(m_tupletCountFont);
int textX = endX + countSpace;
int textY = endY + cr.height() / 2;
@@ -1758,7 +1758,7 @@ NotePixmapFactory::makeRestPixmap(const NotePixmapParameters &params)
} else {
NotePixmapCache::iterator ci(m_dottedRestCache->find(charName));
if (ci != m_dottedRestCache->end())
- return new QCanvasPixmap
+ return new TQCanvasPixmap
(*ci->second, TQPoint(ci->second->offsetX(),
ci->second->offsetY()));
else
@@ -1772,7 +1772,7 @@ NotePixmapFactory::makeRestPixmap(const NotePixmapParameters &params)
TQCanvasPixmap* canvasMap = makeCanvasPixmap(hotspot);
if (encache) {
m_dottedRestCache->insert(std::pair<CharName, TQCanvasPixmap*>
- (charName, new QCanvasPixmap
+ (charName, new TQCanvasPixmap
(*canvasMap, hotspot)));
}
return canvasMap;
@@ -1880,7 +1880,7 @@ NotePixmapFactory::makeClefPixmap(const Clef &clef)
else if (adjustedOctave < 8)
adjustedOctave++;
- TQString text = TQString("%1").arg(adjustedOctave);
+ TQString text = TQString("%1").tqarg(adjustedOctave);
TQRect rect = m_clefOttavaFontMetrics.boundingRect(text);
createPixmapAndMask(plain.getWidth(),
@@ -1894,13 +1894,13 @@ NotePixmapFactory::makeClefPixmap(const Clef &clef)
m_p->painter().setFont(m_clefOttavaFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(m_clefOttavaFont);
+ m_p->tqmaskPainter().setFont(m_clefOttavaFont);
m_p->drawText(plain.getWidth() / 2 - rect.width() / 2,
oct < 0 ? plain.getHeight() + rect.height() - 1 :
rect.height(), text);
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
TQPoint hotspot(plain.getHotspot());
if (oct > 0) hotspot.setY(hotspot.y() + rect.height());
return makeCanvasPixmap(hotspot, true);
@@ -2195,7 +2195,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
int offset = (height - 10 * lw -1) / 2;
// Draw staff lines
- m_p->painter().setPen(TQPen(Qt::black, getStaffLineThickness()));
+ m_p->painter().setPen(TQPen(TQt::black, getStaffLineThickness()));
for (h = 0; h <= 8; h += 2) {
int y = (lw * 3) + ((8 - h) * lw) / 2;
m_p->drawLine(maxDelta/2, y + offset, m_generatedWidth - maxDelta/2, y + offset);
@@ -2204,7 +2204,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
if (header->isAClefToDraw()) {
const Clef &clef = header->getClef();
// TODO : use colours from GUIPalette
- colour = header->isClefInconsistent() ? Qt::red : Qt::black;
+ colour = header->isClefInconsistent() ? TQt::red : TQt::black;
int hue, sat, val;
colour.getHsv(&hue, &sat, &val);
@@ -2228,13 +2228,13 @@ NotePixmapFactory::makeTrackHeaderPixmap(
else if (adjustedOctave < 8)
adjustedOctave++;
- TQString text = TQString("%1").arg(adjustedOctave);
+ TQString text = TQString("%1").tqarg(adjustedOctave);
TQRect rect = m_clefOttavaFontMetrics.boundingRect(text);
m_p->painter().setPen(colour);
m_p->painter().setFont(m_clefOttavaFont);
- // m_p->maskPainter().setFont(m_clefOttavaFont);
+ // m_p->tqmaskPainter().setFont(m_clefOttavaFont);
int xpos = maxDelta + clefChar.getWidth() / 2 - rect.width() / 2;
int ypos = y - clefChar.getHotspot().y() + offset
+ (oct < 0 ? clefChar.getHeight() + rect.height() - 1 : - rect.height() / 3);
@@ -2242,7 +2242,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
}
// TODO : use colours from GUIPalette
- colour = header->isKeyInconsistent() ? Qt::red : Qt::black;
+ colour = header->isKeyInconsistent() ? TQt::red : TQt::black;
// Draw the key signature if any
@@ -2273,7 +2273,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
}
m_p->painter().setFont(m_trackHeaderFont);
- // m_p->maskPainter().setFont(m_trackHeaderFont);
+ // m_p->tqmaskPainter().setFont(m_trackHeaderFont);
TQString text;
TQString textLine;
@@ -2288,7 +2288,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
// Write upper text (track name and track label)
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
text = header->getUpperText();
int numberOfTextLines = header->getNumberOfTextLines();
@@ -2300,7 +2300,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
if (!text.isEmpty()) {
// String too long : cut it and replace last character by dots
int len = textLine.length();
- if (len > 1) textLine.replace(len - 1, 1, i18n("..."));
+ if (len > 1) textLine.tqreplace(len - 1, 1, i18n("..."));
}
} else {
textLine = getOneLine(text, width - charWidth / 2);
@@ -2313,9 +2313,9 @@ NotePixmapFactory::makeTrackHeaderPixmap(
// Write transposition text
// TODO : use colours from GUIPalette
- colour = header->isTransposeInconsistent() ? Qt::red : Qt::black;
+ colour = header->isTransposeInconsistent() ? TQt::red : TQt::black;
m_p->painter().setFont(m_trackHeaderBoldFont);
- // m_p->maskPainter().setFont(m_trackHeaderBoldFont);
+ // m_p->tqmaskPainter().setFont(m_trackHeaderBoldFont);
m_p->painter().setPen(colour);
m_p->drawText(width - transposeWidth - charWidth / 4,
@@ -2327,9 +2327,9 @@ NotePixmapFactory::makeTrackHeaderPixmap(
// Write lower text (segment label)
// TODO : use colours from GUIPalette
- colour = header->isLabelInconsistent() ? Qt::red : Qt::black;
+ colour = header->isLabelInconsistent() ? TQt::red : TQt::black;
m_p->painter().setFont(m_trackHeaderFont);
- // m_p->maskPainter().setFont(m_trackHeaderFont);
+ // m_p->tqmaskPainter().setFont(m_trackHeaderFont);
m_p->painter().setPen(colour);
text = header->getLowerText();
@@ -2344,7 +2344,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
if ((l == numberOfTextLines) && !text.isEmpty()) {
// String too long : cut it and replace last character by dots
int len = textLine.length();
- if (len > 1) textLine.replace(len - 1, 1, i18n("..."));
+ if (len > 1) textLine.tqreplace(len - 1, 1, i18n("..."));
}
m_p->drawText(charWidth / 4, lowerTextY, textLine);
@@ -2376,7 +2376,7 @@ NotePixmapFactory::getTrackHeaderTextLineSpacing()
return m_trackHeaderFont.pixelSize() * 3 / 2;
}
-QString
+TQString
NotePixmapFactory::getOneLine(TQString &text, int width)
{
TQString str;
@@ -2603,7 +2603,7 @@ NotePixmapFactory::drawHairpinAux(int length, bool isCrescendo,
right, height / 2 - 1, thickness, smooth);
}
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
if (painter) {
painter->restore();
@@ -2638,14 +2638,14 @@ NotePixmapFactory::makeSlurPixmap(int length, int dy, bool above, bool phrasing)
TQPixmap newPixmap(i);
TQCanvasPixmap *p = new TQCanvasPixmap(newPixmap, hotspot);
p->setMask(PixmapFunctions::generateMask(newPixmap,
- Qt::white.rgb()));
+ TQt::white.rgb()));
return p;
} else {
TQCanvasPixmap *p = new TQCanvasPixmap(*m_generatedPixmap, hotspot);
p->setMask(PixmapFunctions::generateMask(*m_generatedPixmap,
- Qt::white.rgb()));
+ TQt::white.rgb()));
delete m_generatedPixmap;
delete m_generatedMask;
return p;
@@ -2759,12 +2759,12 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
painter->rotate(theta);
} else {
m_p->painter().save();
- m_p->maskPainter().save();
+ m_p->tqmaskPainter().save();
m_p->painter().translate(x, y);
- m_p->maskPainter().translate(x, y);
+ m_p->tqmaskPainter().translate(x, y);
if (rotate) {
m_p->painter().rotate(theta);
- m_p->maskPainter().rotate(theta);
+ m_p->tqmaskPainter().rotate(theta);
}
}
@@ -2780,13 +2780,13 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
m.translate(hotspot.x(), hotspot.y());
m.rotate(theta);
m_p->painter().setWorldMatrix(m);
- m_p->maskPainter().setWorldMatrix(m);
+ m_p->tqmaskPainter().setWorldMatrix(m);
}
if (m_selected)
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
else if (m_shaded) {
- m_p->painter().setPen(Qt::gray);
+ m_p->painter().setPen(TQt::gray);
}
havePixmap = true;
}
@@ -2835,7 +2835,7 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
}
if (m_selected) {
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
}
TQWMatrix::setTransformationMode(mode);
@@ -2843,7 +2843,7 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
if (painter) {
painter->restore();
if (!m_inPrinterMethod)
- m_p->maskPainter().restore();
+ m_p->tqmaskPainter().restore();
}
}
@@ -2890,29 +2890,29 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
m_p->beginExternal(painter);
painter->translate(x - backpedal, y - height);
} else {
- NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and mask " << width << "x" << height << endl;
+ NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and tqmask " << width << "x" << height << endl;
createPixmapAndMask(width, height);
}
int thickness = getStemThickness();
- TQPen pen(Qt::black, thickness, Qt::DotLine);
+ TQPen pen(TQt::black, thickness, TQt::DotLine);
if (m_selected) {
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
pen.setColor(GUIPalette::getColour(GUIPalette::SelectedElement));
} else if (m_shaded) {
- m_p->painter().setPen(Qt::gray);
- pen.setColor(Qt::gray);
+ m_p->painter().setPen(TQt::gray);
+ pen.setColor(TQt::gray);
}
m_p->painter().setFont(m_ottavaFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(m_ottavaFont);
+ m_p->tqmaskPainter().setFont(m_ottavaFont);
m_p->drawText(0, m_ottavaFontMetrics.ascent(), label);
m_p->painter().setPen(pen);
- // if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen);
+ // if (!m_inPrinterMethod) m_p->tqmaskPainter().setPen(pen);
int x0 = m_ottavaFontMetrics.width(label) + thickness;
int x1 = width - thickness;
@@ -2925,7 +2925,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
pen.setStyle(Qt::SolidLine);
m_p->painter().setPen(pen);
- // if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen);
+ // if (!m_inPrinterMethod) m_p->tqmaskPainter().setPen(pen);
NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: drawing " << x1 << "," << y0 << " to " << x1 << "," << y1 << ", thickness " << thickness << endl;
@@ -2933,7 +2933,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
m_p->painter().setPen(TQPen());
if (!m_inPrinterMethod)
- m_p->maskPainter().setPen(TQPen());
+ m_p->tqmaskPainter().setPen(TQPen());
if (painter) {
painter->restore();
@@ -3038,12 +3038,12 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
if (m_selected) {
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
} else if (m_shaded) {
- m_p->painter().setPen(Qt::gray);
+ m_p->painter().setPen(TQt::gray);
}
m_p->painter().setFont(m_bigTimeSigFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(m_bigTimeSigFont);
+ m_p->tqmaskPainter().setFont(m_bigTimeSigFont);
m_p->drawText(0, r.height() + dy, c);
@@ -3056,7 +3056,7 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
}
}
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
return makeCanvasPixmap(TQPoint(0, r.height() / 2 + dy));
} else {
@@ -3117,12 +3117,12 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
if (m_selected) {
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
} else if (m_shaded) {
- m_p->painter().setPen(Qt::gray);
+ m_p->painter().setPen(TQt::gray);
}
m_p->painter().setFont(m_timeSigFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(m_timeSigFont);
+ m_p->tqmaskPainter().setFont(m_timeSigFont);
x = (width - numR.width()) / 2 - 1;
m_p->drawText(x, denomR.height(), numS);
@@ -3130,7 +3130,7 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
x = (width - denomR.width()) / 2 - 1;
m_p->drawText(x, denomR.height() * 2 + (getNoteBodyHeight() / 2) - 1, denomS);
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
return makeCanvasPixmap(TQPoint(0, denomR.height() +
(getNoteBodyHeight() / 4) - 1),
@@ -3163,7 +3163,7 @@ int NotePixmapFactory::getTimeSigWidth(const TimeSignature &sig) const
}
}
-QFont
+TQFont
NotePixmapFactory::getTextFont(const Text &text) const
{
std::string type(text.getTextType());
@@ -3253,7 +3253,7 @@ NotePixmapFactory::getTextFont(const Text &text) const
<< " for type " << type << endl;
NOTATION_DEBUG << "NotePixmapFactory::getTextFont: returning font '"
- << textFont.toString() << "' for type " << type.c_str()
+ << TQString(textFont.toString()).ascii() << "' for type " << type.c_str()
<< " text : " << text.getText().c_str() << endl;
m_textFontCache[type.c_str()] = textFont;
@@ -3293,8 +3293,8 @@ NotePixmapFactory::makeGuitarChordPixmap(const Guitar::Fingering &fingering,
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
m_p->painter().setBrush(GUIPalette::getColour(GUIPalette::SelectedElement));
} else {
- m_p->painter().setPen(Qt::black);
- m_p->painter().setBrush(Qt::black);
+ m_p->painter().setPen(TQt::black);
+ m_p->painter().setBrush(TQt::black);
}
Guitar::NoteSymbols ns(Guitar::Fingering::DEFAULT_NB_STRINGS, FingeringBox::DEFAULT_NB_DISPLAYED_FRETS);
@@ -3349,15 +3349,15 @@ NotePixmapFactory::drawTextAux(const Text &text,
if (m_selected)
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
else if (m_shaded)
- m_p->painter().setPen(Qt::gray);
+ m_p->painter().setPen(TQt::gray);
m_p->painter().setFont(textFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(textFont);
+ m_p->tqmaskPainter().setFont(textFont);
m_p->drawText(offset, textMetrics.ascent() + offset, s);
- m_p->painter().setPen(Qt::black);
+ m_p->painter().setPen(TQt::black);
if (painter) {
painter->restore();
@@ -3386,7 +3386,7 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
int sideGap = getLineSpacing() / 4 + 1;
TQRect r = textMetrics.boundingRect
- (0, 0, annotationWidth, annotationHeight, Qt::WordBreak, s);
+ (0, 0, annotationWidth, annotationHeight, TQt::WordBreak, s);
int pixmapWidth = r.width() + sideGap * 2;
int pixmapHeight = r.height() + topGap + bottomGap;
@@ -3396,11 +3396,11 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
if (m_selected)
m_p->painter().setPen(GUIPalette::getColour(GUIPalette::SelectedElement));
else if (m_shaded)
- m_p->painter().setPen(Qt::gray);
+ m_p->painter().setPen(TQt::gray);
m_p->painter().setFont(textFont);
if (!m_inPrinterMethod)
- m_p->maskPainter().setFont(textFont);
+ m_p->tqmaskPainter().setFont(textFont);
if (isLilyPondDirective) {
m_p->painter().setBrush(GUIPalette::getColour(GUIPalette::TextLilyPondDirectiveBackground));
@@ -3410,16 +3410,16 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
m_p->drawRect(0, 0, pixmapWidth, pixmapHeight);
- m_p->painter().setBrush(Qt::black);
+ m_p->painter().setBrush(TQt::black);
m_p->painter().drawText(TQRect(sideGap, topGap,
annotationWidth + sideGap,
pixmapHeight - bottomGap),
- Qt::WordBreak, s);
+ TQt::WordBreak, s);
/* unnecessary following the rectangle draw
m_pm.drawText(TQRect(sideGap, topGap,
annotationWidth + sideGap, annotationHeight + topGap),
- Qt::WordBreak, s);
+ TQt::WordBreak, s);
*/
return makeCanvasPixmap(TQPoint(0, 0));
@@ -3427,33 +3427,33 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
void
NotePixmapFactory::createPixmapAndMask(int width, int height,
- int maskWidth, int maskHeight)
+ int tqmaskWidth, int tqmaskHeight)
{
- if (maskWidth < 0)
- maskWidth = width;
- if (maskHeight < 0)
- maskHeight = height;
+ if (tqmaskWidth < 0)
+ tqmaskWidth = width;
+ if (tqmaskHeight < 0)
+ tqmaskHeight = height;
m_generatedWidth = width;
m_generatedHeight = height;
m_generatedPixmap = new TQPixmap(width, height);
- m_generatedMask = new TQBitmap(maskWidth, maskHeight);
+ m_generatedMask = new TQBitmap(tqmaskWidth, tqmaskHeight);
static unsigned long total = 0;
total += width * height;
// NOTATION_DEBUG << "createPixmapAndMask: " << width << "x" << height << " (" << (width*height) << " px, " << total << " total)" << endl;
- // clear up pixmap and mask
+ // clear up pixmap and tqmask
m_generatedPixmap->fill();
- m_generatedMask->fill(Qt::color0);
+ m_generatedMask->fill(TQt::color0);
// initiate painting
- m_p->begin(m_generatedPixmap, m_generatedMask);
+ m_p->begin(TQT_TQPAINTDEVICE(m_generatedPixmap), TQT_TQPAINTDEVICE(m_generatedMask));
- m_p->painter().setPen(Qt::black);
- m_p->painter().setBrush(Qt::black);
- m_p->maskPainter().setPen(Qt::white);
- m_p->maskPainter().setBrush(Qt::white);
+ m_p->painter().setPen(TQt::black);
+ m_p->painter().setBrush(TQt::black);
+ m_p->tqmaskPainter().setPen(TQt::white);
+ m_p->tqmaskPainter().setBrush(TQt::white);
}
TQCanvasPixmap*
@@ -3538,7 +3538,7 @@ NotePixmapFactory::getCharacter(CharName name, NoteCharacter &ch,
return m_font->getCharacter(name, ch, charType, inverted);
}
-QPoint
+TQPoint
NotePixmapFactory::m_pointZero;
diff --git a/src/gui/editors/notation/NotePixmapFactory.h b/src/gui/editors/notation/NotePixmapFactory.h
index 20d2ae6..cfc93dc 100644
--- a/src/gui/editors/notation/NotePixmapFactory.h
+++ b/src/gui/editors/notation/NotePixmapFactory.h
@@ -58,7 +58,7 @@ class Clef;
class TrackHeader;
/**
- * Generates QCanvasPixmaps for various notation items.
+ * Generates TQCanvasPixmaps for various notation items.
*/
class NotePixmapFactory
@@ -140,7 +140,7 @@ public:
TQCanvasPixmap* makeTrackHeaderPixmap(int width, int height,
TrackHeader *header);
- // Bounding box and other geometry methods:
+ // Bounding box and other tqgeometry methods:
int getNoteBodyWidth (Note::Type =
Note::Crotchet) const;
@@ -199,7 +199,7 @@ public:
/**
- * We need this function because as of Qt 3.1, QCanvasPixmap
+ * We need this function because as of TQt 3.1, TQCanvasPixmap
* is no longer copyable by value, while TQPixmap still is.
*
* So all the makeXXPixmap are now returning TQCanvasPixmap*
@@ -207,7 +207,7 @@ public:
* convert them to TQPixmap, since we use them that
* way quite often (to generate toolbar button icons for instance).
*/
- static TQPixmap toQPixmap(TQCanvasPixmap*);
+ static TQPixmap toTQPixmap(TQCanvasPixmap*);
static void dumpStats(std::ostream &);
@@ -276,8 +276,8 @@ protected:
TQCanvasPixmap* makeAnnotationPixmap(const Text &text, const bool isLilyPondDirective);
void createPixmapAndMask(int width, int height,
- int maskWidth = -1,
- int maskHeight = -1);
+ int tqmaskWidth = -1,
+ int tqmaskHeight = -1);
TQCanvasPixmap* makeCanvasPixmap(TQPoint hotspot, bool generateMask = false);
enum ColourType {
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index ff8edae..51918ec 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/src/gui/editors/notation/NotePixmapPainter.h
@@ -33,7 +33,7 @@ namespace Rosegarden {
class NotePixmapPainter
{
// Just a trivial class that instructs two painters to do the
- // same thing (one for the pixmap, one for the mask). We only
+ // same thing (one for the pixmap, one for the tqmask). We only
// duplicate those methods we actually use in NotePixmapFactory
public:
@@ -55,23 +55,23 @@ public:
}
}
- bool begin(TQPaintDevice *device, TQPaintDevice *mask = 0, bool unclipped = false) {
+ bool begin(TQPaintDevice *device, TQPaintDevice *tqmask = 0, bool unclipped = false) {
m_externalPainter = 0;
- if (mask) {
+ if (tqmask) {
m_useMask = true;
- m_maskPainter.begin(mask, unclipped);
+ m_tqmaskPainter.tqbegin(tqmask, unclipped);
} else {
m_useMask = false;
}
m_painter = &m_myPainter;
- return m_painter->begin(device, unclipped);
+ return m_painter->tqbegin(device, unclipped);
}
bool end() {
- if (m_useMask) m_maskPainter.end();
+ if (m_useMask) m_tqmaskPainter.end();
return m_painter->end();
}
@@ -79,66 +79,66 @@ public:
return *m_painter;
}
- TQPainter &maskPainter() {
- return m_maskPainter;
+ TQPainter &tqmaskPainter() {
+ return m_tqmaskPainter;
}
void drawPoint(int x, int y) {
m_painter->drawPoint(x, y);
- if (m_useMask) m_maskPainter.drawPoint(x, y);
+ if (m_useMask) m_tqmaskPainter.drawPoint(x, y);
}
void drawLine(int x1, int y1, int x2, int y2) {
m_painter->drawLine(x1, y1, x2, y2);
- if (m_useMask) m_maskPainter.drawLine(x1, y1, x2, y2);
+ if (m_useMask) m_tqmaskPainter.drawLine(x1, y1, x2, y2);
}
void drawRect(int x, int y, int w, int h) {
m_painter->drawRect(x, y, w, h);
- if (m_useMask) m_maskPainter.drawRect(x, y, w, h);
+ if (m_useMask) m_tqmaskPainter.drawRect(x, y, w, h);
}
void drawArc(int x, int y, int w, int h, int a, int alen) {
m_painter->drawArc(x, y, w, h, a, alen);
- if (m_useMask) m_maskPainter.drawArc(x, y, w, h, a, alen);
+ if (m_useMask) m_tqmaskPainter.drawArc(x, y, w, h, a, alen);
}
void drawPolygon(const TQPointArray &a, bool winding = false,
int index = 0, int n = -1) {
- m_painter->drawPolygon(a, winding, index, n);
- if (m_useMask) m_maskPainter.drawPolygon(a, winding, index, n);
+ m_painter->tqdrawPolygon(a, winding, index, n);
+ if (m_useMask) m_tqmaskPainter.tqdrawPolygon(a, winding, index, n);
}
void drawPolyline(const TQPointArray &a, int index = 0, int n = -1) {
- m_painter->drawPolyline(a, index, n);
- if (m_useMask) m_maskPainter.drawPolyline(a, index, n);
+ m_painter->tqdrawPolyline(a, index, n);
+ if (m_useMask) m_tqmaskPainter.tqdrawPolyline(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->drawPixmap(x, y, pm, sx, sy, sw, sh);
- if (m_useMask) m_maskPainter.drawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
+ m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
+ if (m_useMask) m_tqmaskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh);
}
void drawText(int x, int y, const TQString &string) {
m_painter->drawText(x, y, string);
- if (m_useMask) m_maskPainter.drawText(x, y, string);
+ if (m_useMask) m_tqmaskPainter.drawText(x, y, string);
}
void drawNoteCharacter(int x, int y, const NoteCharacter &character) {
character.draw(m_painter, x, y);
- if (m_useMask) character.drawMask(&m_maskPainter, x, y);
+ if (m_useMask) character.drawMask(&m_tqmaskPainter, x, y);
}
void drawEllipse(int x, int y, int w, int h) {
m_painter->drawEllipse(x, y, w, h);
- if (m_useMask) m_maskPainter.drawEllipse(x, y, w, h);
+ if (m_useMask) m_tqmaskPainter.drawEllipse(x, y, w, h);
}
private:
bool m_useMask;
TQPainter m_myPainter;
- TQPainter m_maskPainter;
+ TQPainter m_tqmaskPainter;
TQPainter *m_externalPainter;
TQPainter *m_painter;
};
diff --git a/src/gui/editors/notation/NoteStyle.cpp b/src/gui/editors/notation/NoteStyle.cpp
index 0b3332d..00ce956 100644
--- a/src/gui/editors/notation/NoteStyle.cpp
+++ b/src/gui/editors/notation/NoteStyle.cpp
@@ -70,12 +70,12 @@ NoteStyle::getShape(Note::Type type)
if (m_baseStyle)
return m_baseStyle->getShape(type);
std::cerr
- << "WARNING: NoteStyle::getShape: No shape defined for note type "
+ << "WARNING: NoteStyle::getShape: No tqshape defined for note type "
<< type << ", defaulting to AngledOval" << std::endl;
return AngledOval;
}
- return i->second.shape;
+ return i->second.tqshape;
}
bool
@@ -183,57 +183,57 @@ NoteStyle::getNoteHeadCharName(Note::Type type)
CharName name = NoteCharacterNames::UNKNOWN;
bool inverted = false;
- if (desc.shape == AngledOval) {
+ if (desc.tqshape == AngledOval) {
name = desc.filled ? NoteCharacterNames::NOTEHEAD_BLACK
: NoteCharacterNames::VOID_NOTEHEAD;
- } else if (desc.shape == LevelOval) {
+ } else if (desc.tqshape == LevelOval) {
if (desc.filled) {
std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled level oval head" << std::endl;
}
name = NoteCharacterNames::WHOLE_NOTE;
- } else if (desc.shape == Breve) {
+ } else if (desc.tqshape == Breve) {
if (desc.filled) {
std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled breve head" << std::endl;
}
name = NoteCharacterNames::BREVE;
- } else if (desc.shape == Cross) {
+ } else if (desc.tqshape == Cross) {
name = desc.filled ? NoteCharacterNames::X_NOTEHEAD
: NoteCharacterNames::CIRCLE_X_NOTEHEAD;
- } else if (desc.shape == TriangleUp) {
+ } else if (desc.tqshape == TriangleUp) {
name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
: NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
- } else if (desc.shape == TriangleDown) {
+ } else if (desc.tqshape == TriangleDown) {
name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK
: NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE;
inverted = true;
- } else if (desc.shape == Diamond) {
+ } else if (desc.tqshape == Diamond) {
name = desc.filled ? NoteCharacterNames::SEMIBREVIS_BLACK
: NoteCharacterNames::SEMIBREVIS_WHITE;
- } else if (desc.shape == Rectangle) {
+ } else if (desc.tqshape == Rectangle) {
- name = desc.filled ? NoteCharacterNames::SQUARE_NOTEHEAD_BLACK
- : NoteCharacterNames::SQUARE_NOTEHEAD_WHITE;
+ name = desc.filled ? NoteCharacterNames::STQUARE_NOTEHEAD_BLACK
+ : NoteCharacterNames::STQUARE_NOTEHEAD_WHITE;
- } else if (desc.shape == Number) {
+ } else if (desc.tqshape == Number) {
std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: Number not yet implemented" << std::endl;
name = NoteCharacterNames::UNKNOWN; //!!!
- } else if (desc.shape == CustomCharName) {
+ } else if (desc.tqshape == CustomCharName) {
name = desc.charName;
@@ -327,7 +327,7 @@ NoteStyle::getRestCharName(Note::Type type, bool restOutsideStave)
case Note::Quaver:
return NoteCharacterNames::EIGHTH_REST;
case Note::Crotchet:
- return NoteCharacterNames::QUARTER_REST;
+ return NoteCharacterNames::TQUARTER_REST;
case Note::Minim:
return restOutsideStave ?
NoteCharacterNames::HALF_REST
@@ -433,10 +433,10 @@ NoteStyle::checkDescription(Note::Type note)
}
void
-NoteStyle::setShape(Note::Type note, NoteHeadShape shape)
+NoteStyle::setShape(Note::Type note, NoteHeadShape tqshape)
{
checkDescription(note);
- m_notes[note].shape = shape;
+ m_notes[note].tqshape = tqshape;
}
void
diff --git a/src/gui/editors/notation/NoteStyle.h b/src/gui/editors/notation/NoteStyle.h
index 3959e01..4431c16 100644
--- a/src/gui/editors/notation/NoteStyle.h
+++ b/src/gui/editors/notation/NoteStyle.h
@@ -99,8 +99,8 @@ public:
protected:
struct NoteDescription {
- NoteHeadShape shape; // if CustomCharName, use charName
- CharName charName; // only used if shape == CustomCharName
+ NoteHeadShape tqshape; // if CustomCharName, use charName
+ CharName charName; // only used if tqshape == CustomCharName
bool filled;
bool stem;
int flags;
@@ -109,14 +109,14 @@ protected:
VFixPoint vfix;
NoteDescription() :
- shape(AngledOval), charName(NoteCharacterNames::UNKNOWN),
+ tqshape(AngledOval), charName(NoteCharacterNames::UNKNOWN),
filled(true), stem(true), flags(0), slashes(0),
hfix(Normal), vfix(Middle) { }
- NoteDescription(NoteHeadShape _shape, CharName _charName,
+ NoteDescription(NoteHeadShape _tqshape, CharName _charName,
bool _filled, bool _stem, int _flags, int _slashes,
HFixPoint _hfix, VFixPoint _vfix) :
- shape(_shape), charName(_charName),
+ tqshape(_tqshape), charName(_charName),
filled(_filled), stem(_stem), flags(_flags), slashes(_slashes),
hfix(_hfix), vfix(_vfix) { }
};
diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp
index f585117..d394e8b 100644
--- a/src/gui/editors/notation/NoteStyleFactory.cpp
+++ b/src/gui/editors/notation/NoteStyleFactory.cpp
@@ -63,7 +63,7 @@ NoteStyleFactory::getAvailableStyleNames()
for (TQStringList::Iterator i = files.begin(); i != files.end(); ++i) {
if ((*i).length() > 4 && (*i).right(4) == ".xml") {
- TQFileInfo fileInfo(TQString("%1/%2").arg(styleDir).arg(*i));
+ TQFileInfo fileInfo(TQString("%1/%2").tqarg(styleDir).tqarg(*i));
if (fileInfo.exists() && fileInfo.isReadable()) {
std::string styleName = qstrtostr((*i).left((*i).length() - 4));
if (styleName == DefaultStyle)
diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp
index 41da5ed..b7e04ef 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.cpp
+++ b/src/gui/editors/notation/NoteStyleFileReader.cpp
@@ -48,13 +48,13 @@ NoteStyleFileReader::NoteStyleFileReader(std::string name) :
KGlobal::dirs()->findResource("appdata", "styles/");
TQString styleFileName =
- TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name));
+ TQString("%1/%2.xml").tqarg(styleDirectory).tqarg(strtoqstr(name));
TQFileInfo fileInfo(styleFileName);
if (!fileInfo.isReadable()) {
throw StyleFileReadFailed
- (qstrtostr(i18n("Can't open style file %1").arg(styleFileName)));
+ (qstrtostr(i18n("Can't open style file %1").tqarg(styleFileName)));
}
TQFile styleFile(styleFileName);
@@ -98,7 +98,7 @@ NoteStyleFileReader::startElement(const TQString &, const TQString &,
if (!setFromAttributes(type, attributes)) return false;
} catch (NotationStrings::MalformedNoteName n) {
- m_errorString = i18n("Unrecognised note name %1").arg(s);
+ m_errorString = i18n("Unrecognised note name %1").tqarg(s);
return false;
}
@@ -125,7 +125,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
TQString s;
bool haveShape = false;
- s = attributes.value("shape");
+ s = attributes.value("tqshape");
if (s) {
m_style->setShape(type, qstrtostr(s.lower()));
haveShape = true;
@@ -134,7 +134,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
s = attributes.value("charname");
if (s) {
if (haveShape) {
- m_errorString = i18n("global and note elements may have shape "
+ m_errorString = i18n("global and note elements may have tqshape "
"or charname attribute, but not both");
return false;
}
diff --git a/src/gui/editors/notation/NoteStyleFileReader.h b/src/gui/editors/notation/NoteStyleFileReader.h
index 8584ce8..d44c832 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.h
+++ b/src/gui/editors/notation/NoteStyleFileReader.h
@@ -31,7 +31,7 @@
namespace Rosegarden {
-class NoteStyleFileReader : public QXmlDefaultHandler
+class NoteStyleFileReader : public TQXmlDefaultHandler
{
public:
NoteStyleFileReader(NoteStyleName name);
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index e9b6bdb..faef304 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -56,14 +56,14 @@ RestInserter::RestInserter(NotationView* view)
{
TQIconSet icon;
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("dotted-rest-crotchet")));
new KToggleAction(i18n("Dotted rest"), icon, 0, this,
TQT_SLOT(slotToggleDot()), actionCollection(),
"toggle_dot");
- icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
TQT_SLOT(slotSelectSelected()), actionCollection(),
@@ -73,8 +73,8 @@ RestInserter::RestInserter(NotationView* view)
TQT_SLOT(slotEraseSelected()), actionCollection(),
"erase");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new KAction(i18n("Switch to Inserting Notes"), icon, 0, this,
TQT_SLOT(slotNotesSelected()), actionCollection(),
@@ -127,8 +127,8 @@ void RestInserter::slotToggleDot()
m_noteDots = (m_noteDots) ? 0 : 1;
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note, true));
- actionName.replace(TQRegExp("-"), "_");
- KAction *action = m_parentView->actionCollection()->action(actionName);
+ actionName.tqreplace(TQRegExp("-"), "_");
+ KAction *action = m_tqparentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
} else {
@@ -140,8 +140,8 @@ void RestInserter::slotNotesSelected()
{
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note));
- actionName.replace(TQRegExp(" "), "_");
- m_parentView->actionCollection()->action(actionName)->activate();
+ actionName.tqreplace(TQRegExp(" "), "_");
+ m_tqparentView->actionCollection()->action(actionName)->activate();
}
const TQString RestInserter::ToolName = "restinserter";
diff --git a/src/gui/editors/notation/RestInserter.h b/src/gui/editors/notation/RestInserter.h
index 94834d2..3cac3d3 100644
--- a/src/gui/editors/notation/RestInserter.h
+++ b/src/gui/editors/notation/RestInserter.h
@@ -48,6 +48,7 @@ class Event;
class RestInserter : public NoteInserter
{
Q_OBJECT
+ TQ_OBJECT
friend class NotationToolBox;
diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp
index 62b4280..77d3341 100644
--- a/src/gui/editors/notation/SystemFont.cpp
+++ b/src/gui/editors/notation/SystemFont.cpp
@@ -130,11 +130,11 @@ qfont:
TQFontInfo info(qfont);
- NOTATION_DEBUG << "SystemFont::loadSystemFont[Qt]: have family " << info.family() << " (exactMatch " << info.exactMatch() << ")" << endl;
+ NOTATION_DEBUG << "SystemFont::loadSystemFont[TQt]: have family " << TQString(info.family()).ascii() << " (exactMatch " << info.exactMatch() << ")" << endl;
// return info.exactMatch();
- // The Qt documentation says:
+ // The TQt documentation says:
//
// bool TQFontInfo::exactMatch() const
// Returns TRUE if the matched window system font is exactly the
@@ -143,23 +143,23 @@ qfont:
// My arse. I specify "feta", I get "Verdana", and exactMatch
// returns true. Uh huh.
//
- // UPDATE: in newer versions of Qt, I specify "fughetta", I get
+ // UPDATE: in newer versions of TQt, I specify "fughetta", I get
// "Fughetta [macromedia]", and exactMatch returns false. Just as
// useless, but in a different way.
- TQString family = info.family().lower();
+ TQString family = TQString(info.family()).lower();
if (family == name.lower())
return new SystemFontQt(qfont);
else {
- int bracket = family.find(" [");
+ int bracket = family.tqfind(" [");
if (bracket > 1)
family = family.left(bracket);
if (family == name.lower())
return new SystemFontQt(qfont);
}
- NOTATION_DEBUG << "SystemFont::loadSystemFont[Qt]: Wrong family returned, failing" << endl;
+ NOTATION_DEBUG << "SystemFont::loadSystemFont[TQt]: Wrong family returned, failing" << endl;
return 0;
}
diff --git a/src/gui/editors/notation/SystemFontQt.cpp b/src/gui/editors/notation/SystemFontQt.cpp
index ad969e8..5d90632 100644
--- a/src/gui/editors/notation/SystemFontQt.cpp
+++ b/src/gui/editors/notation/SystemFontQt.cpp
@@ -34,19 +34,19 @@
namespace Rosegarden {
-QPixmap
+TQPixmap
SystemFontQt::renderChar(CharName charName, int glyph, int code,
Strategy strategy, bool &success)
{
success = false;
if (strategy == OnlyGlyphs) {
- NOTATION_DEBUG << "SystemFontQt::renderChar: OnlyGlyphs strategy not supported by Qt renderer, can't render character " << charName.getName() << " (glyph " << glyph << ")" << endl;
+ NOTATION_DEBUG << "SystemFontQt::renderChar: OnlyGlyphs strategy not supported by TQt renderer, can't render character " << charName.getName() << " (glyph " << glyph << ")" << endl;
return TQPixmap();
}
if (code < 0) {
- NOTATION_DEBUG << "SystemFontQt::renderChar: Can't render using Qt with only glyph value (" << glyph << ") for character " << charName.getName() << ", need a code point" << endl;
+ NOTATION_DEBUG << "SystemFontQt::renderChar: Can't render using TQt with only glyph value (" << glyph << ") for character " << charName.getName() << ", need a code point" << endl;
return TQPixmap();
}
@@ -60,16 +60,16 @@ SystemFontQt::renderChar(CharName charName, int glyph, int code,
TQPainter painter;
painter.begin(&map);
painter.setFont(m_font);
- painter.setPen(Qt::black);
+ painter.setPen(TQt::black);
NOTATION_DEBUG << "NoteFont: Drawing character code "
<< code << " for " << charName.getName()
<< " using TQFont" << endl;
- painter.drawText(0, metrics.ascent(), qc);
+ painter.drawText(0, metrics.ascent(), TQString(qc));
painter.end();
- map.setMask(PixmapFunctions::generateMask(map, Qt::white.rgb()));
+ map.setMask(PixmapFunctions::generateMask(map, TQt::white.rgb()));
success = true;
return map;
diff --git a/src/gui/editors/notation/SystemFontQt.h b/src/gui/editors/notation/SystemFontQt.h
index a3698f9..d7dff7f 100644
--- a/src/gui/editors/notation/SystemFontQt.h
+++ b/src/gui/editors/notation/SystemFontQt.h
@@ -22,8 +22,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef _RG_SYSTEMFONQT_H_
-#define _RG_SYSTEMFONQT_H_
+#ifndef _RG_SYSTEMFONTQT_H_
+#define _RG_SYSTEMFONTQT_H_
#include "SystemFont.h"
diff --git a/src/gui/editors/notation/SystemFontXft.cpp b/src/gui/editors/notation/SystemFontXft.cpp
index 6388167..75f9406 100644
--- a/src/gui/editors/notation/SystemFontXft.cpp
+++ b/src/gui/editors/notation/SystemFontXft.cpp
@@ -65,7 +65,7 @@ staticCubicTo(FT_Vector *control1, FT_Vector *control2, FT_Vector *to, void *)
*/
-QPixmap
+TQPixmap
SystemFontXft::renderChar(CharName charName, int glyph, int code,
Strategy strategy, bool &success)
{
@@ -120,7 +120,7 @@ SystemFontXft::renderChar(CharName charName, int glyph, int code,
Drawable drawable = (Drawable)map.handle();
if (!drawable) {
- std::cerr << "ERROR: SystemFontXft::renderChar: No drawable in QPixmap!" << std::endl;
+ std::cerr << "ERROR: SystemFontXft::renderChar: No drawable in TQPixmap!" << std::endl;
return map;
}
@@ -129,7 +129,7 @@ SystemFontXft::renderChar(CharName charName, int glyph, int code,
(Visual *)map.x11Visual(),
map.x11Colormap());
- TQColor pen(Qt::black);
+ TQColor pen(TQt::black);
XftColor col;
col.color.red = pen.red () | pen.red() << 8;
col.color.green = pen.green () | pen.green() << 8;
@@ -153,7 +153,7 @@ SystemFontXft::renderChar(CharName charName, int glyph, int code,
XftDrawDestroy(draw);
- map.setMask(PixmapFunctions::generateMask(map, Qt::white.rgb()));
+ map.setMask(PixmapFunctions::generateMask(map, TQt::white.rgb()));
success = true;
diff --git a/src/gui/editors/notation/TextInserter.cpp b/src/gui/editors/notation/TextInserter.cpp
index f862b88..6b5f595 100644
--- a/src/gui/editors/notation/TextInserter.cpp
+++ b/src/gui/editors/notation/TextInserter.cpp
@@ -52,7 +52,7 @@ TextInserter::TextInserter(NotationView* view)
: NotationTool("TextInserter", view),
m_text("", Text::Dynamic)
{
- TQIconSet icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("select")));
new KAction(i18n("Switch to Select Tool"), icon, 0, this,
TQT_SLOT(slotSelectSelected()), actionCollection(),
@@ -62,8 +62,8 @@ TextInserter::TextInserter(NotationView* view)
TQT_SLOT(slotEraseSelected()), actionCollection(),
"erase");
- icon = QIconSet
- (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+ icon = TQIconSet
+ (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
makeToolbarPixmap("crotchet")));
new KAction(i18n("Switch to Inserting Notes"), icon, 0, this,
TQT_SLOT(slotNotesSelected()), actionCollection(),
@@ -79,17 +79,17 @@ void TextInserter::slotNotesSelected()
void TextInserter::slotEraseSelected()
{
- m_parentView->actionCollection()->action("erase")->activate();
+ m_tqparentView->actionCollection()->action("erase")->activate();
}
void TextInserter::slotSelectSelected()
{
- m_parentView->actionCollection()->action("select")->activate();
+ m_tqparentView->actionCollection()->action("select")->activate();
}
void TextInserter::ready()
{
- m_nParentView->setCanvasCursor(Qt::crossCursor);
+ m_nParentView->setCanvasCursor(TQt::crossCursor);
m_nParentView->setHeightTracking(false);
}
diff --git a/src/gui/editors/notation/TextInserter.h b/src/gui/editors/notation/TextInserter.h
index f71ddc7..b00c4ae 100644
--- a/src/gui/editors/notation/TextInserter.h
+++ b/src/gui/editors/notation/TextInserter.h
@@ -48,6 +48,7 @@ class NotationView;
class TextInserter : public NotationTool
{
Q_OBJECT
+ TQ_OBJECT
friend class NotationToolBox;
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index f2793ab..de5bf5f 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -65,7 +65,7 @@ namespace Rosegarden
{
-// Status bits
+// tqStatus bits
const int TrackHeader::SEGMENT_HERE = 1 << 0;
const int TrackHeader::SUPERIMPOSED_SEGMENTS = 1 << 1;
const int TrackHeader::INCONSISTENT_CLEFS = 1 << 2;
@@ -75,8 +75,8 @@ const int TrackHeader::INCONSISTENT_TRANSPOSITIONS = 1 << 5;
const int TrackHeader::BEFORE_FIRST_SEGMENT = 1 << 6;
-TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos) :
- TQLabel(parent),
+TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos) :
+ TQLabel(tqparent),
m_track(trackId),
m_height(height),
m_ypos(ypos),
@@ -96,7 +96,7 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
m_current(false)
{
- m_notationView = static_cast<HeadersGroup *>(parent)->getNotationView();
+ m_notationView = static_cast<HeadersGroup *>(tqparent)->getNotationView();
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setCurrent(false);
@@ -106,17 +106,17 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
// Tooltip text creation
Composition *comp =
- static_cast<HeadersGroup *>(parent)->getComposition();
+ static_cast<HeadersGroup *>(tqparent)->getComposition();
Track *track = comp->getTrackById(m_track);
int trackPos = comp->getTrackPositionById(m_track);
TQString toolTipText = TQString(i18n("Track %1 : \"%2\"")
- .arg(trackPos + 1)
- .arg(strtoqstr(track->getLabel())));
+ .tqarg(trackPos + 1)
+ .tqarg(strtoqstr(track->getLabel())));
- TQString preset = track->getPresetLabel();
+ TQString preset = track->getPresetLabel().c_str();
if (preset != TQString(""))
- toolTipText += TQString(i18n("\nNotate for: %1").arg(preset));
+ toolTipText += TQString(i18n("\nNotate for: %1").tqarg(preset));
TQString notationSize = i18n("normal");
switch (track->getStaffSize()) {
@@ -154,8 +154,8 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
}
toolTipText += TQString(i18n("\nSize: %1, Bracket: %2 "))
- .arg(notationSize)
- .arg(bracketText);
+ .tqarg(notationSize)
+ .tqarg(bracketText);
// Sort segments by position on the track
SortedSegments segments;
@@ -181,17 +181,17 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos
TQString transposeName;
transposeValueToName(transpose, transposeName);
toolTipText += TQString(i18n("\nbars [%1-%2] in %3 (tr=%4) : \"%5\""))
- .arg(barStart)
- .arg(barEnd)
- .arg(transposeName)
- .arg(transpose)
- .arg(strtoqstr((*i)->getLabel()));
+ .tqarg(barStart)
+ .tqarg(barEnd)
+ .tqarg(transposeName)
+ .tqarg(transpose)
+ .tqarg(strtoqstr((*i)->getLabel()));
} else {
toolTipText += TQString(i18n("\nbars [%1-%2] (tr=%3) : \"%4\""))
- .arg(barStart)
- .arg(barEnd)
- .arg(transpose)
- .arg(strtoqstr((*i)->getLabel()));
+ .tqarg(barStart)
+ .tqarg(barEnd)
+ .tqarg(transpose)
+ .tqarg(strtoqstr((*i)->getLabel()));
}
}
@@ -274,7 +274,7 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
int staff;
Composition *comp =
- static_cast<HeadersGroup *>(parent())->getComposition();
+ static_cast<HeadersGroup *>(TQT_TQWIDGET(tqparent()))->getComposition();
Track *track = comp->getTrackById(m_track);
int trackPos = comp->getTrackPositionById(m_track);
@@ -350,9 +350,9 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
transposeValueToName(m_transpose, noteName);
m_upperText = TQString(i18n("%1: %2")
- .arg(trackPos + 1)
- .arg(strtoqstr(track->getLabel())));
- if (m_transpose) m_transposeText = i18n(" in %1").arg(noteName);
+ .tqarg(trackPos + 1)
+ .tqarg(strtoqstr(track->getLabel())));
+ if (m_transpose) m_transposeText = i18n(" in %1").tqarg(noteName);
else m_transposeText = TQString("");
NotePixmapFactory * npf = m_notationView->getNotePixmapFactory();
@@ -414,15 +414,15 @@ TrackHeader::updateHeader(int width)
TQColor clefColour;
if (m_status & (SEGMENT_HERE | BEFORE_FIRST_SEGMENT)) {
if (m_status & (INCONSISTENT_CLEFS | INCONSISTENT_KEYS))
- clefColour = Qt::red;
+ clefColour = TQt::red;
else
- clefColour = Qt::black;
+ clefColour = TQt::black;
} else {
drawClef = false;
}
NotePixmapFactory * npf = m_notationView->getNotePixmapFactory();
- TQPixmap pmap = NotePixmapFactory::toQPixmap(
+ TQPixmap pmap = NotePixmapFactory::toTQPixmap(
npf->makeTrackHeaderPixmap(width, m_height, this));
setPixmap(pmap);
diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h
index 1cb4f1e..0b8a0a6 100644
--- a/src/gui/editors/notation/TrackHeader.h
+++ b/src/gui/editors/notation/TrackHeader.h
@@ -50,16 +50,17 @@ class NotationView;
class ColourMap;
class Segment;
-class TrackHeader : public QLabel
+class TrackHeader : public TQLabel
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Create a new track header for track of id trackId.
- * *parent is the parent widget, height the height of staff and
+ * *tqparent is the tqparent widget, height the height of staff and
* ypos is the staff y position on canvas.
*/
- TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos);
+ TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos);
/**
* Draw a blue line around header when current is true
@@ -168,7 +169,7 @@ private :
void transposeValueToName(int transpose, TQString &transposeName);
- // Status bits
+ // tqStatus bits
static const int SEGMENT_HERE;
static const int SUPERIMPOSED_SEGMENTS;
static const int INCONSISTENT_CLEFS;