Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 35938b8..8196125 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -45,7 +45,7 @@
 #include <tqstring.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 
 namespace Rosegarden
@@ -57,7 +57,7 @@ ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
         : TabbedConfigurationPage(doc, parent, 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, TQt::AlignHCenter);
+    tqlayout->addWidget(addColourButton, 1, 0, TQt::AlignHCenter);
 
     TQPushButton* deleteColourButton = new TQPushButton(i18n("Delete Color"),
                                       frame);
-    layout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
+    tqlayout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
 
     connect(addColourButton, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotAddNew()));