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

diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp
index c3184da..cc73afb 100644
--- a/src/gui/general/RosegardenScrollView.cpp
+++ b/src/gui/general/RosegardenScrollView.cpp
@@ -49,9 +49,9 @@ const int RosegardenScrollView::InitialScrollAccel = 5;
 const int RosegardenScrollView::MaxScrollDelta = 100;      // max a.scroll speed
 const double RosegardenScrollView::ScrollAccelValue = 1.04;// acceleration rate
 
-RosegardenScrollView::RosegardenScrollView(TQWidget* parent,
+RosegardenScrollView::RosegardenScrollView(TQWidget* tqparent,
         const char* name, WFlags f)
-        : TQScrollView(parent, name, f),
+        : TQScrollView(tqparent, name, f),
         m_bottomWidget(0),
         m_currentBottomWidgetHeight( -1),
         m_smoothScroll(true),
@@ -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->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-        setMargins(0, 0, 0, m_bottomWidget->sizeHint().height());
+        m_bottomWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+        setMargins(0, 0, 0, m_bottomWidget->tqsizeHint().height());
     }
 }
 
@@ -376,7 +376,7 @@ void RosegardenScrollView::updateBottomWidgetGeometry()
     if (!m_bottomWidget)
         return ;
 
-    int bottomWidgetHeight = m_bottomWidget->sizeHint().height();
+    int bottomWidgetHeight = m_bottomWidget->tqsizeHint().height();
 
     setMargins(0, 0, 0, bottomWidgetHeight);
     TQRect r = frameRect();