From 458efa7b0c935cbaafa2791021a5f8f7241aa876 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 2 May 2011 22:38:52 +0000
Subject: 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
---
 src/gui/application/RosegardenGUIView.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/gui/application/RosegardenGUIView.cpp')

diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index 9eb7969..e336c2e 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -98,7 +98,7 @@ namespace Rosegarden
 
 // Use this to define the basic unit of the main TQCanvas size.
 //
-// This apparently arbitrary figure is what we think is an
+// This aptqparently arbitrary figure is what we think is an
 // appropriate width in pixels for a 4/4 bar.  Beware of making it
 // too narrow, as shorter bars will be proportionally smaller --
 // the visual difference between 2/4 and 4/4 is perhaps greater
@@ -118,9 +118,9 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
                                      SegmentParameterBox* segmentParameterBox,
                                      InstrumentParameterBox* instrumentParameterBox,
                                      TrackParameterBox* trackParameterBox,
-                                     TQWidget *parent,
+                                     TQWidget *tqparent,
                                      const char* /*name*/)
-        : TQVBox(parent),
+        : TQVBox(tqparent),
         m_rulerScale(0),
         m_trackEditor(0),
         m_segmentParameterBox(segmentParameterBox),
@@ -174,7 +174,7 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
 
     connect(m_trackEditor,
             TQT_SIGNAL(droppedDocument(TQString)),
-            parent,
+            tqparent,
             TQT_SLOT(slotOpenDroppedURL(TQString)));
 
     connect(m_trackEditor,
@@ -870,7 +870,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment)
     }
 
     // wait cursor
-    TQApplication::setOverrideCursor(TQCursor(Qt::waitCursor));
+    TQApplication::setOverrideCursor(TQCursor(TQt::waitCursor));
 
     // Prepare the process
     //
@@ -907,19 +907,19 @@ void RosegardenGUIView::setZoomSize(double size)
     m_trackEditor->getSegmentCanvas()->slotUpdateSegmentsDrawBuffer();
 
     if (m_trackEditor->getTempoRuler()) {
-        m_trackEditor->getTempoRuler()->repaint();
+        m_trackEditor->getTempoRuler()->tqrepaint();
     }
 
     if (m_trackEditor->getChordNameRuler()) {
-        m_trackEditor->getChordNameRuler()->repaint();
+        m_trackEditor->getChordNameRuler()->tqrepaint();
     }
 
     if (m_trackEditor->getTopStandardRuler()) {
-        m_trackEditor->getTopStandardRuler()->repaint();
+        m_trackEditor->getTopStandardRuler()->tqrepaint();
     }
 
     if (m_trackEditor->getBottomStandardRuler()) {
-        m_trackEditor->getBottomStandardRuler()->repaint();
+        m_trackEditor->getBottomStandardRuler()->tqrepaint();
     }
 }
 
@@ -1196,7 +1196,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
             bool toSet = false;
 
             if (states[instrumentId] == newState &&
-                    (getDocument()->getSequenceManager()->getTransportStatus()
+                    (getDocument()->getSequenceManager()->getTransporttqStatus()
                      != STOPPED)) {
 
                 if (info.level != 0 || info.levelRight != 0) {
@@ -1212,7 +1212,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
 
             if (recStates[instrumentId] == newState &&
                     instrument->getType() == Instrument::Audio &&
-                    (getDocument()->getSequenceManager()->getTransportStatus()
+                    (getDocument()->getSequenceManager()->getTransporttqStatus()
                      != PLAYING)) {
 
                 if (recInfo.level != 0 || recInfo.levelRight != 0) {
@@ -1238,7 +1238,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
             if (info.level == 0)
                 continue;
 
-            if (getDocument()->getSequenceManager()->getTransportStatus()
+            if (getDocument()->getSequenceManager()->getTransporttqStatus()
                     != STOPPED) {
 
 				// The information in 'info' is specific for this instrument, not
@@ -2028,7 +2028,7 @@ RosegardenGUIView::createEventView(std::vector<Segment *> segmentsToEdit)
 
     // create keyboard accelerators on view
     //
-    RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(parent());
+    RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(tqparent());
 
     if (par) {
         par->plugAccelerators(eventView, eventView->getAccelerators());
-- 
cgit v1.2.1