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

diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 975e00d..5ef9321 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -52,12 +52,12 @@ namespace Rosegarden
 {
 
 ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
-        TQWidget *parent,
+        TQWidget *tqparent,
         const char *name)
-        : TabbedConfigurationPage(doc, parent, name)
+        : TabbedConfigurationPage(doc, tqparent, name)
 {
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *layout = new TQGridLayout(frame, 2, 2,
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2,
                                           10, 5);
 
     m_map = m_doc->getComposition().getSegmentColourMap();
@@ -65,15 +65,15 @@ ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
     m_colourtable = new ColourTable(frame, m_map, m_listmap);
     m_colourtable->setFixedHeight(280);
 
-    layout->addMultiCellWidget(m_colourtable, 0, 0, 0, 1);
+    tqlayout->addMultiCellWidget(m_colourtable, 0, 0, 0, 1);
 
     TQPushButton* addColourButton = new TQPushButton(i18n("Add New Color"),
                                    frame);
-    layout->addWidget(addColourButton, 1, 0, Qt::AlignHCenter);
+    tqlayout->addWidget(addColourButton, 1, 0, TQt::AlignHCenter);
 
     TQPushButton* deleteColourButton = new TQPushButton(i18n("Delete Color"),
                                       frame);
-    layout->addWidget(deleteColourButton, 1, 1, Qt::AlignHCenter);
+    tqlayout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
 
     connect(addColourButton, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotAddNew()));