diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:35 -0600 |
| commit | 6ca08e7a881c0c97f338e0085f75af04ec08ad04 (patch) | |
| tree | 5462bef0f060df1c19e3fcb98250e5cfa24edc11 /src/gui/general/EditView.cpp | |
| parent | 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a (diff) | |
| download | rosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.tar.gz rosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.
Diffstat (limited to 'src/gui/general/EditView.cpp')
| -rw-r--r-- | src/gui/general/EditView.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index 0e66133..f1f5dbf 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -24,7 +24,7 @@ #include "EditView.h" -#include <layout.h> +#include <tqlayout.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->layout()))->setDirection(TQBoxLayout::BottomToTop); + (dynamic_cast<TQBoxLayout*>(m_bottomBox->tqlayout()))->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->setAlignment(AlignRight); + m_controlBox->tqsetAlignment(AlignRight); // m_grid->addWidget(m_controlRulers, CONTROLRULER_ROW, 2); m_controlRulers->hide(); @@ -169,7 +169,7 @@ EditView::~EditView() void EditView::updateBottomWidgetGeometry() { - getBottomWidget()->layout()->invalidate(); + getBottomWidget()->tqlayout()->tqinvalidate(); getBottomWidget()->updateGeometry(); getCanvasView()->updateBottomWidgetGeometry(); } @@ -891,9 +891,9 @@ EditView::setupAddControlRulerMenu() TQString hexValue; hexValue.sprintf("(0x%x)", it->getControllerValue()); - itemStr = i18n("%1 Controller %2 %3").arg(strtoqstr(it->getName())) - .arg(it->getControllerValue()) - .arg(hexValue); + itemStr = i18n("%1 Controller %2 %3").tqarg(strtoqstr(it->getName())) + .tqarg(it->getControllerValue()) + .tqarg(hexValue); } else if (it->getType() == PitchBend::EventType) itemStr = i18n("Pitch Bend"); @@ -1114,10 +1114,10 @@ EditView::createInsertPitchActionMenu() insertPitchAction = new KAction - (flat.arg(notePitchNames[i]), + (flat.tqarg(notePitchNames[i]), CTRL + SHIFT + notePitchKeys[octave][i], TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), - TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii()); + TQString("insert_%1_flat%2").tqarg(i).tqarg(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").arg(i).arg(octaveSuffix).ascii()); + TQString("insert_%1%2").tqarg(i).tqarg(octaveSuffix).ascii()); menu->insert(insertPitchAction); @@ -1137,10 +1137,10 @@ EditView::createInsertPitchActionMenu() insertPitchAction = new KAction - (sharp.arg(notePitchNames[i]), + (sharp.tqarg(notePitchNames[i]), SHIFT + notePitchKeys[octave][i], TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), - TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii()); + TQString("insert_%1_sharp%2").tqarg(i).tqarg(octaveSuffix).ascii()); menu->insert(insertPitchAction); } |