From 6ca08e7a881c0c97f338e0085f75af04ec08ad04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:35 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a. --- src/gui/configuration/ColourConfigurationPage.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/configuration/ColourConfigurationPage.cpp') 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 #include #include -#include +#include 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())); -- cgit v1.2.1