1 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 4318646..dda2c76 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -24,7 +24,7 @@
 
 
 #include "EditViewBase.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -311,7 +311,7 @@ EditViewBase::makeViewLocalPropertyPrefix()
 void EditViewBase::paintEvent(TQPaintEvent* e)
 {
     // It is possible for this function to be called re-entrantly,
-    // because a re-layout procedure may deliberately ask the event
+    // because a re-tqlayout procedure may deliberately ask the event
     // loop to process some more events so as to keep the GUI looking
     // responsive.  If that happens, we remember the events that came
     // in in the middle of one paintEvent call and process their union
@@ -362,7 +362,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
     //
     // If we have more than one segment modified, we need to update
     // them all at once with the same time range, otherwise we can run
-    // into problems when the layout of one depends on the others.  So
+    // into problems when the tqlayout of one depends on the others.  So
     // we use updateStart/End to calculate a bounding range for all
     // modifications.
 
@@ -374,12 +374,12 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
 
         Segment* segment = m_segments[i];
         unsigned int refreshStatusId = m_segmentsRefreshStatusIds[i];
-        SegmentRefreshStatus &refreshStatus =
-            segment->getRefreshStatus(refreshStatusId);
+        SegmentRefreshtqStatus &refreshtqStatus =
+            segment->getRefreshtqStatus(refreshStatusId);
 
-        if (refreshStatus.needsRefresh() && isCompositionModified()) {
+        if (refreshtqStatus.needsRefresh() && isCompositionModified()) {
 
-            // if composition is also modified, relayout everything
+            // if composition is also modified, retqlayout everything
             refreshSegment(0);
             segmentsToUpdate = 0;
             break;
@@ -392,10 +392,10 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
             m_timeSigNotifier->reset();
             break;
 
-        } else if (refreshStatus.needsRefresh()) {
+        } else if (refreshtqStatus.needsRefresh()) {
 
-            timeT startTime = refreshStatus.from(),
-                              endTime = refreshStatus.to();
+            timeT startTime = refreshtqStatus.from(),
+                              endTime = refreshtqStatus.to();
 
             if (segmentsToUpdate == 0 || startTime < updateStart) {
                 updateStart = startTime;
@@ -406,7 +406,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
             singleSegment = segment;
             ++segmentsToUpdate;
 
-            refreshStatus.setNeedsRefresh(false);
+            refreshtqStatus.setNeedsRefresh(false);
             m_needUpdate = true;
         }
     }
@@ -518,13 +518,13 @@ void EditViewBase::initSegmentRefreshStatusIds()
 
 bool EditViewBase::isCompositionModified()
 {
-    return getDocument()->getComposition().getRefreshStatus
+    return getDocument()->getComposition().getRefreshtqStatus
            (m_compositionRefreshStatusId).needsRefresh();
 }
 
 void EditViewBase::setCompositionModified(bool c)
 {
-    getDocument()->getComposition().getRefreshStatus
+    getDocument()->getComposition().getRefreshtqStatus
     (m_compositionRefreshStatusId).setNeedsRefresh(c);
 }