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, 10 insertions, 10 deletions

diff --git a/src/gui/general/RosegardenCanvasView.cpp b/src/gui/general/RosegardenCanvasView.cpp
index 4893147..0798140 100644
--- a/src/gui/general/RosegardenCanvasView.cpp
+++ b/src/gui/general/RosegardenCanvasView.cpp
@@ -42,9 +42,9 @@ namespace Rosegarden
 {
 
 RosegardenCanvasView::RosegardenCanvasView(TQCanvas* canvas,
-        TQWidget* parent,
+        TQWidget* tqparent,
         const char* name, WFlags f)
-        : TQCanvasView(canvas, parent, name, f),
+        : TQCanvasView(canvas, tqparent, name, f),
         m_bottomWidget(0),
         m_currentBottomWidgetHeight( -1),
         m_leftWidget(0),
@@ -84,10 +84,10 @@ void RosegardenCanvasView::setBottomFixedWidget(TQWidget* w)
 {
     m_bottomWidget = w;
     if (m_bottomWidget) {
-        int lww = m_leftWidget ? m_leftWidget->sizeHint().width() : 0;
+        int lww = m_leftWidget ? m_leftWidget->tqsizeHint().width() : 0;
         m_bottomWidget->reparent(this, 0, TQPoint(0, 0));
-        m_bottomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-        setMargins(lww, 0, 0, m_bottomWidget->sizeHint().height());
+        m_bottomWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+        setMargins(lww, 0, 0, m_bottomWidget->tqsizeHint().height());
     }
 }
 
@@ -399,7 +399,7 @@ void RosegardenCanvasView::updateBottomWidgetGeometry()
     if (!m_bottomWidget)
         return ;
 
-    int bottomWidgetHeight = m_bottomWidget->sizeHint().height();
+    int bottomWidgetHeight = m_bottomWidget->tqsizeHint().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->sizeHint().height() : 0;
+        int bwh = m_bottomWidget ? m_bottomWidget->tqsizeHint().height() : 0;
         m_leftWidget->reparent(this, 0, TQPoint(0, 0));
-        m_leftWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
-        setMargins(m_leftWidget->sizeHint().width(), 0, 0, bwh);
+        m_leftWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
+        setMargins(m_leftWidget->tqsizeHint().width(), 0, 0, bwh);
     }
 }
 
@@ -467,7 +467,7 @@ void RosegardenCanvasView::updateLeftWidgetGeometry()
     m_leftWidget->setFixedWidth(leftWidgetWidth);
 
     int bottomWidgetHeight = m_bottomWidget ? 
-                                m_bottomWidget->sizeHint().height() : 0;
+                                m_bottomWidget->tqsizeHint().height() : 0;
 
     setMargins(leftWidgetWidth, 0, 0, bottomWidgetHeight);