Initial TQt4 port of Rosegarden

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 30 insertions, 30 deletions

diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 84bdef0..15852c8 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -77,8 +77,8 @@ const unsigned int EditViewBase::NbLayoutRows = 6;
 EditViewBase::EditViewBase(RosegardenGUIDoc *doc,
                            std::vector<Segment *> segments,
                            unsigned int cols,
-                           TQWidget *parent, const char *name) :
-        KDockMainWindow(parent, name),
+                           TQWidget *tqparent, const char *name) :
+        KDockMainWindow(tqparent, name),
         m_viewNumber( -1),
         m_viewLocalPropertyPrefix(makeViewLocalPropertyPrefix()),
         m_config(kapp->config()),
@@ -158,33 +158,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
 
     // Actions all edit views will have
 
-    KStdAction::showToolbar(this, TQT_SLOT(slotToggleToolBar()),
+    KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolBar()),
                             actionCollection(), "options_show_toolbar");
 
-    KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()),
+    KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()),
                               actionCollection(), "options_show_statusbar");
 
-    KStdAction::preferences(this,
+    KStdAction::preferences(TQT_TQOBJECT(this),
                             TQT_SLOT(slotConfigure()),
                             actionCollection());
 
-    KStdAction::keyBindings(this,
+    KStdAction::keyBindings(TQT_TQOBJECT(this),
                             TQT_SLOT(slotEditKeys()),
                             actionCollection());
 
-    KStdAction::configureToolbars(this,
+    KStdAction::configureToolbars(TQT_TQOBJECT(this),
                                   TQT_SLOT(slotEditToolbars()),
                                   actionCollection());
 
 
     // File menu
-    KStdAction::save (this, TQT_SIGNAL(saveFile()), actionCollection());
-    KStdAction::close(this, TQT_SLOT(slotCloseWindow()), actionCollection());
+    KStdAction::save (TQT_TQOBJECT(this), TQT_SIGNAL(saveFile()), actionCollection());
+    KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotCloseWindow()), actionCollection());
 
     if (haveClipboard) {
-        KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection());
-        KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
-        KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
+        KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
+        KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
+        KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
     }
 
     new KToolBarPopupAction(i18n("Und&o"),
@@ -203,33 +203,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
 
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png");
     TQIconSet icon = TQIconSet(pixmap);
-    new KAction(i18n("Open in Matri&x Editor"), icon, 0, this,
+    new KAction(i18n("Open in Matri&x Editor"), icon, 0, TQT_TQOBJECT(this),
                 TQT_SLOT(slotOpenInMatrix()), actionCollection(),
                 "open_in_matrix");
 
     pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png");
     icon = TQIconSet(pixmap);
-    new KAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, this,
+    new KAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, TQT_TQOBJECT(this),
                 TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
                 "open_in_percussion_matrix");
 
     pixmap.load(pixmapDir + "/toolbar/notation.png");
     icon = TQIconSet(pixmap);
-    new KAction(i18n("Open in &Notation Editor"), icon, 0, this,
+    new KAction(i18n("Open in &Notation Editor"), icon, 0, TQT_TQOBJECT(this),
                 TQT_SLOT(slotOpenInNotation()), actionCollection(),
                 "open_in_notation");
 
     pixmap.load(pixmapDir + "/toolbar/eventlist.png");
     icon = TQIconSet(pixmap);
-    new KAction(i18n("Open in &Event List Editor"), icon, 0, this,
+    new KAction(i18n("Open in &Event List Editor"), icon, 0, TQT_TQOBJECT(this),
                 TQT_SLOT(slotOpenInEventList()), actionCollection(),
                 "open_in_event_list");
 
-    new KAction(i18n("Set Segment Start Time..."), 0, this,
+    new KAction(i18n("Set Segment Start Time..."), 0, TQT_TQOBJECT(this),
                 TQT_SLOT(slotSetSegmentStartTime()), actionCollection(),
                 "set_segment_start");
 
-    new KAction(i18n("Set Segment Duration..."), 0, this,
+    new KAction(i18n("Set Segment Duration..."), 0, TQT_TQOBJECT(this),
                 TQT_SLOT(slotSetSegmentDuration()), actionCollection(),
                 "set_segment_duration");
 
@@ -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);
 }