3 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 8d25ec9..9436beb 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -1808,7 +1808,7 @@ void MatrixView::slotVerticalScrollPianoKeyboard(int y)
 
 void MatrixView::slotInsertNoteFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
 
     Segment &segment = *getCurrentSegment();
@@ -2015,7 +2015,7 @@ MatrixView::slotSetSnapFromIndex(int s)
 void
 MatrixView::slotSetSnapFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
 
     if (name.left(5) == "snap_") {
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index b140775..e78e44f 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -231,7 +231,7 @@ FontViewFrame::hasRow(int r) const
 
         for (int c = 0; c < 256; ++c) {
             FcChar32 ch = r * 256 + c;
-            if (XftCharExists(TQT_TQPAINTDEVICE_CONST(this)->x11AppDisplay(), (XftFont *)m_tableFont, ch)) {
+            if (XftCharExists(x11AppDisplay(), (XftFont *)m_tableFont, ch)) {
                 return true;
             }
         }
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index fa56c99..05c48c0 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -3950,7 +3950,7 @@ void NotationView::readjustCanvasSize()
 
 void NotationView::slotNoteAction()
 {
-    const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject* sigSender = sender();
 
     NoteActionDataMap::Iterator noteAct =
         m_noteActionDataMap->find(sigSender->name());
@@ -3981,7 +3981,7 @@ void NotationView::slotLastNoteAction()
 
 void NotationView::slotAddMark()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     if (!m_currentEventSelection)
         return ;
 
@@ -3995,7 +3995,7 @@ void NotationView::slotAddMark()
 
 void NotationView::slotNoteChangeAction()
 {
-    const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject* sigSender = sender();
 
     NoteChangeActionDataMap::Iterator noteAct =
         m_noteChangeActionDataMap->find(sigSender->name());
@@ -4304,7 +4304,7 @@ NotationView::slotChangeSpacingFromStringValue(const TQString& spacingT)
 void
 NotationView::slotChangeSpacingFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
 
     if (name.left(8) == "spacing_") {
@@ -4364,7 +4364,7 @@ NotationView::slotChangeProportionFromIndex(int n)
 void
 NotationView::slotChangeProportionFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
 
     if (name.left(11) == "proportion_") {
@@ -4413,7 +4413,7 @@ NotationView::slotChangeProportion(int proportion)
 void
 NotationView::slotChangeFontFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
     if (name.left(10) == "note_font_") {
         name = name.right(name.length() - 10);
@@ -4427,7 +4427,7 @@ NotationView::slotChangeFontFromAction()
 void
 NotationView::slotChangeFontSizeFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
 
     if (name.left(15) == "note_font_size_") {
@@ -5557,7 +5557,7 @@ void NotationView::slotTransformsRemoveQuantization()
 
 void NotationView::slotSetStyleFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
 
     if (!m_currentEventSelection)
@@ -5580,7 +5580,7 @@ void NotationView::slotSetStyleFromAction()
 
 void NotationView::slotInsertNoteFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
 
     Segment &segment = m_staffs[m_currentStaff]->getSegment();
@@ -5907,7 +5907,7 @@ void NotationView::slotAddDotNotationOnly()
 
 void NotationView::slotAddSlashes()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     if (!m_currentEventSelection)
         return ;
 
@@ -5948,7 +5948,7 @@ void NotationView::slotMarksAddFingeringMark()
 
 void NotationView::slotMarksAddFingeringMarkFromAction()
 {
-    const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
+    const TQObject *s = sender();
     TQString name = s->name();
 
     if (name.left(14) == "add_fingering_") {