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

diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index fdc351b..5835045 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -41,13 +41,13 @@
 namespace Rosegarden
 {
 
-CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n) :
-        TQFrame(parent, n),
+CollapsingFrame::CollapsingFrame(TQString label, TQWidget *tqparent, const char *n) :
+        TQFrame(tqparent, n),
         m_widget(0),
         m_fill(false),
         m_collapsed(false)
 {
-    m_layout = new TQGridLayout(this, 3, 3, 0, 0);
+    m_tqlayout = new TQGridLayout(this, 3, 3, 0, 0);
 
     m_toggleButton = new TQToolButton(this);
     m_toggleButton->setTextLabel(label);
@@ -66,7 +66,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
 
     connect(m_toggleButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggle()));
 
-    m_layout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
+    m_tqlayout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
 }
 
 CollapsingFrame::~CollapsingFrame()
@@ -78,7 +78,7 @@ CollapsingFrame::setWidgetFill(bool fill)
     m_fill = fill;
 }
 
-QFont
+TQFont
 CollapsingFrame::font() const
 {
     return m_toggleButton->font();
@@ -96,9 +96,9 @@ CollapsingFrame::setWidget(TQWidget *widget)
     assert(!m_widget);
     m_widget = widget;
     if (m_fill) {
-        m_layout->addMultiCellWidget(widget, 1, 1, 0, 2);
+        m_tqlayout->addMultiCellWidget(widget, 1, 1, 0, 2);
     } else {
-        m_layout->addWidget(widget, 1, 1);
+        m_tqlayout->addWidget(widget, 1, 1);
     }
 
     bool expanded = true;