summaryrefslogtreecommitdiffstats
path: root/src/gui/general/EditView.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/general/EditView.cpp')
-rw-r--r--src/gui/general/EditView.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index f1f5dbf..0e66133 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -24,7 +24,7 @@
#include "EditView.h"
-#include <tqlayout.h>
+#include <layout.h>
#include "base/BaseProperties.h"
#include <klocale.h>
@@ -138,7 +138,7 @@ EditView::EditView(RosegardenGUIDoc *doc,
connect(m_controlRulers, TQT_SIGNAL(closeRequest(TQWidget*)),
this, TQT_SLOT(slotRemoveControlRuler(TQWidget*)));
- (dynamic_cast<TQBoxLayout*>(m_bottomBox->tqlayout()))->setDirection(TQBoxLayout::BottomToTop);
+ (dynamic_cast<TQBoxLayout*>(m_bottomBox->layout()))->setDirection(TQBoxLayout::BottomToTop);
// m_rulerBoxFiller is a white label used to keep m_rulerBox exactly
// above the scrolling part of the view (and never above the
@@ -154,7 +154,7 @@ EditView::EditView(RosegardenGUIDoc *doc,
m_grid->addLayout(gl, RULERS_ROW, m_mainCol);
m_grid->addMultiCellLayout(m_controlBox, CONTROLS_ROW, CONTROLS_ROW, 0, 1);
- m_controlBox->tqsetAlignment(AlignRight);
+ m_controlBox->setAlignment(AlignRight);
// m_grid->addWidget(m_controlRulers, CONTROLRULER_ROW, 2);
m_controlRulers->hide();
@@ -169,7 +169,7 @@ EditView::~EditView()
void EditView::updateBottomWidgetGeometry()
{
- getBottomWidget()->tqlayout()->tqinvalidate();
+ getBottomWidget()->layout()->invalidate();
getBottomWidget()->updateGeometry();
getCanvasView()->updateBottomWidgetGeometry();
}
@@ -891,9 +891,9 @@ EditView::setupAddControlRulerMenu()
TQString hexValue;
hexValue.sprintf("(0x%x)", it->getControllerValue());
- itemStr = i18n("%1 Controller %2 %3").tqarg(strtoqstr(it->getName()))
- .tqarg(it->getControllerValue())
- .tqarg(hexValue);
+ itemStr = i18n("%1 Controller %2 %3").arg(strtoqstr(it->getName()))
+ .arg(it->getControllerValue())
+ .arg(hexValue);
} else if (it->getType() == PitchBend::EventType)
itemStr = i18n("Pitch Bend");
@@ -1114,10 +1114,10 @@ EditView::createInsertPitchActionMenu()
insertPitchAction =
new KAction
- (flat.tqarg(notePitchNames[i]),
+ (flat.arg(notePitchNames[i]),
CTRL + SHIFT + notePitchKeys[octave][i],
TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
- TQString("insert_%1_flat%2").tqarg(i).tqarg(octaveSuffix).ascii());
+ TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
}
@@ -1127,7 +1127,7 @@ EditView::createInsertPitchActionMenu()
(notePitchNames[i],
notePitchKeys[octave][i],
TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
- TQString("insert_%1%2").tqarg(i).tqarg(octaveSuffix).ascii());
+ TQString("insert_%1%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
@@ -1137,10 +1137,10 @@ EditView::createInsertPitchActionMenu()
insertPitchAction =
new KAction
- (sharp.tqarg(notePitchNames[i]),
+ (sharp.arg(notePitchNames[i]),
SHIFT + notePitchKeys[octave][i],
TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
- TQString("insert_%1_sharp%2").tqarg(i).tqarg(octaveSuffix).ascii());
+ TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii());
menu->insert(insertPitchAction);
}