summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/matrix
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/matrix')
-rw-r--r--src/gui/editors/matrix/MatrixCanvasView.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixSelector.cpp4
-rw-r--r--src/gui/editors/matrix/MatrixView.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/editors/matrix/MatrixCanvasView.cpp b/src/gui/editors/matrix/MatrixCanvasView.cpp
index 9c56805..a6d71c8 100644
--- a/src/gui/editors/matrix/MatrixCanvasView.cpp
+++ b/src/gui/editors/matrix/MatrixCanvasView.cpp
@@ -106,7 +106,7 @@ void MatrixCanvasView::contentsMousePressEvent(TQMouseEvent* e)
QCanvasMatrixRectangle *mRect = 0;
- if (item->active()) {
+ if (item->isActive()) {
activeItem = item;
break;
}
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 8d0f586..50a1692 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -520,7 +520,7 @@ void MatrixSelector::setViewCurrentSelection()
EventSelection* MatrixSelector::getSelection()
{
- if (!m_selectionRect->visible()) return 0;
+ if (!m_selectionRect->isVisible()) return 0;
Segment& originalSegment = m_currentStaff->getSegment();
EventSelection* selection = new EventSelection(originalSegment);
@@ -571,7 +571,7 @@ void MatrixSelector::setContextHelpFor(TQPoint p, bool ctrlPressed)
TQCanvasItem *item = *it;
QCanvasMatrixRectangle *mRect = 0;
- if (item->active()) {
+ if (item->isActive()) {
break;
}
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 568f70f..195da46 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -907,7 +907,7 @@ void MatrixView::setupActions()
if (d == (crotchetDuration * 3) / 2) actionName = "snap_3";
new KAction(i18n("Snap to %1").tqarg(label), pixmap, cut, TQT_TQOBJECT(this),
TQT_SLOT(slotSetSnapFromAction()), actionCollection(),
- actionName);
+ actionName.ascii());
}
}