Rename old tq methods that no longer need a unique name

4 files changed, 21 insertions, 21 deletions

diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index f1f5dbf..0ab943b 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -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();
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index dda2c76..d618a68 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -374,10 +374,10 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
 
         Segment* segment = m_segments[i];
         unsigned int refreshStatusId = m_segmentsRefreshStatusIds[i];
-        SegmentRefreshtqStatus &refreshtqStatus =
-            segment->getRefreshtqStatus(refreshStatusId);
+        SegmentRefreshStatus &refreshStatus =
+            segment->getRefreshStatus(refreshStatusId);
 
-        if (refreshtqStatus.needsRefresh() && isCompositionModified()) {
+        if (refreshStatus.needsRefresh() && isCompositionModified()) {
 
             // if composition is also modified, retqlayout everything
             refreshSegment(0);
@@ -392,10 +392,10 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
             m_timeSigNotifier->reset();
             break;
 
-        } else if (refreshtqStatus.needsRefresh()) {
+        } else if (refreshStatus.needsRefresh()) {
 
-            timeT startTime = refreshtqStatus.from(),
-                              endTime = refreshtqStatus.to();
+            timeT startTime = refreshStatus.from(),
+                              endTime = refreshStatus.to();
 
             if (segmentsToUpdate == 0 || startTime < updateStart) {
                 updateStart = startTime;
@@ -406,7 +406,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
             singleSegment = segment;
             ++segmentsToUpdate;
 
-            refreshtqStatus.setNeedsRefresh(false);
+            refreshStatus.setNeedsRefresh(false);
             m_needUpdate = true;
         }
     }
@@ -518,13 +518,13 @@ void EditViewBase::initSegmentRefreshStatusIds()
 
 bool EditViewBase::isCompositionModified()
 {
-    return getDocument()->getComposition().getRefreshtqStatus
+    return getDocument()->getComposition().getRefreshStatus
            (m_compositionRefreshStatusId).needsRefresh();
 }
 
 void EditViewBase::setCompositionModified(bool c)
 {
-    getDocument()->getComposition().getRefreshtqStatus
+    getDocument()->getComposition().getRefreshStatus
     (m_compositionRefreshStatusId).setNeedsRefresh(c);
 }
 
diff --git a/src/gui/general/RosegardenCanvasView.cpp b/src/gui/general/RosegardenCanvasView.cpp
index a806e8a..4893147 100644
--- a/src/gui/general/RosegardenCanvasView.cpp
+++ b/src/gui/general/RosegardenCanvasView.cpp
@@ -84,10 +84,10 @@ void RosegardenCanvasView::setBottomFixedWidget(TQWidget* w)
 {
     m_bottomWidget = w;
     if (m_bottomWidget) {
-        int lww = m_leftWidget ? m_leftWidget->tqsizeHint().width() : 0;
+        int lww = m_leftWidget ? m_leftWidget->sizeHint().width() : 0;
         m_bottomWidget->reparent(this, 0, TQPoint(0, 0));
-        m_bottomWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-        setMargins(lww, 0, 0, m_bottomWidget->tqsizeHint().height());
+        m_bottomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+        setMargins(lww, 0, 0, m_bottomWidget->sizeHint().height());
     }
 }
 
@@ -399,7 +399,7 @@ void RosegardenCanvasView::updateBottomWidgetGeometry()
     if (!m_bottomWidget)
         return ;
 
-    int bottomWidgetHeight = m_bottomWidget->tqsizeHint().height();
+    int bottomWidgetHeight = m_bottomWidget->sizeHint().height();
 
     int leftWidgetWidth = 0;
     if (m_leftWidget && m_leftWidget->isVisible()) {
@@ -447,10 +447,10 @@ void RosegardenCanvasView::setLeftFixedWidget(TQWidget* w)
 {
     m_leftWidget = w;
     if (m_leftWidget) {
-        int bwh = m_bottomWidget ? m_bottomWidget->tqsizeHint().height() : 0;
+        int bwh = m_bottomWidget ? m_bottomWidget->sizeHint().height() : 0;
         m_leftWidget->reparent(this, 0, TQPoint(0, 0));
-        m_leftWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
-        setMargins(m_leftWidget->tqsizeHint().width(), 0, 0, bwh);
+        m_leftWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
+        setMargins(m_leftWidget->sizeHint().width(), 0, 0, bwh);
     }
 }
 
@@ -467,7 +467,7 @@ void RosegardenCanvasView::updateLeftWidgetGeometry()
     m_leftWidget->setFixedWidth(leftWidgetWidth);
 
     int bottomWidgetHeight = m_bottomWidget ? 
-                                m_bottomWidget->tqsizeHint().height() : 0;
+                                m_bottomWidget->sizeHint().height() : 0;
 
     setMargins(leftWidgetWidth, 0, 0, bottomWidgetHeight);
 
diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp
index 815ab6b..c3184da 100644
--- a/src/gui/general/RosegardenScrollView.cpp
+++ b/src/gui/general/RosegardenScrollView.cpp
@@ -75,8 +75,8 @@ void RosegardenScrollView::setBottomFixedWidget(TQWidget* w)
     m_bottomWidget = w;
     if (m_bottomWidget) {
         m_bottomWidget->reparent(this, 0, TQPoint(0, 0));
-        m_bottomWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-        setMargins(0, 0, 0, m_bottomWidget->tqsizeHint().height());
+        m_bottomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+        setMargins(0, 0, 0, m_bottomWidget->sizeHint().height());
     }
 }
 
@@ -376,7 +376,7 @@ void RosegardenScrollView::updateBottomWidgetGeometry()
     if (!m_bottomWidget)
         return ;
 
-    int bottomWidgetHeight = m_bottomWidget->tqsizeHint().height();
+    int bottomWidgetHeight = m_bottomWidget->sizeHint().height();
 
     setMargins(0, 0, 0, bottomWidgetHeight);
     TQRect r = frameRect();