3 files changed, 17 insertions, 17 deletions
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 919d75f..d1e278e 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -63,7 +63,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
                            (1, Qt::Horizontal,
                             i18n("Printable headers"), this);
     TQFrame *frameHeaders = new TQFrame(headersBox);
-    TQGridLayout *tqlayoutHeaders = new TQGridLayout(frameHeaders, 10, 6, 10, 5);
+    TQGridLayout *layoutHeaders = new TQGridLayout(frameHeaders, 10, 6, 10, 5);
 
     // grab user headers from metadata
     Configuration metadata = (&m_doc->getComposition())->getMetadata();
@@ -143,7 +143,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
 	// editHeader->setReadOnly( true );
 	editHeader->tqsetAlignment( (col == 0 ? TQt::AlignLeft : (col >= 3 ? TQt::AlignRight : TQt::AlignCenter) ));
 
-	tqlayoutHeaders->addMultiCellWidget(editHeader, row, row, col, col+(width-1) );
+	layoutHeaders->addMultiCellWidget(editHeader, row, row, col, col+(width-1) );
 
 	//
 	// ToolTips
@@ -154,7 +154,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
     }
     TQLabel *separator = new TQLabel(i18n("The composition comes here."), frameHeaders);
     separator->tqsetAlignment( TQt::AlignCenter );
-    tqlayoutHeaders->addMultiCellWidget(separator, 7, 7, 1, 4 );
+    layoutHeaders->addMultiCellWidget(separator, 7, 7, 1, 4 );
 
     //
     // LilyPond export: Non-printable headers
@@ -177,7 +177,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
     otherHeadersBox->setFont(font);
     otherHeadersBox->setWidget(frameOtherHeaders);
 
-    TQGridLayout *tqlayoutOtherHeaders = new TQGridLayout(frameOtherHeaders, 2, 2, 10, 5);
+    TQGridLayout *layoutOtherHeaders = new TQGridLayout(frameOtherHeaders, 2, 2, 10, 5);
 
     m_metadata = new KListView(frameOtherHeaders);
     m_metadata->addColumn(i18n("Name"));
@@ -208,15 +208,15 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
         shown.insert(names[i]);
     }
 
-    tqlayoutOtherHeaders->addMultiCellWidget(m_metadata, 0, 0, 0, 1);
+    layoutOtherHeaders->addMultiCellWidget(m_metadata, 0, 0, 0, 1);
 
     TQPushButton* addPropButton = new TQPushButton(i18n("Add New Property"),
                                  frameOtherHeaders);
-    tqlayoutOtherHeaders->addWidget(addPropButton, 1, 0, TQt::AlignHCenter);
+    layoutOtherHeaders->addWidget(addPropButton, 1, 0, TQt::AlignHCenter);
 
     TQPushButton* deletePropButton = new TQPushButton(i18n("Delete Property"),
                                     frameOtherHeaders);
-    tqlayoutOtherHeaders->addWidget(deletePropButton, 1, 1, TQt::AlignHCenter);
+    layoutOtherHeaders->addWidget(deletePropButton, 1, 1, TQt::AlignHCenter);
 
     connect(addPropButton, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotAddNewProperty()));
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index c0b6f18..990ca26 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -86,16 +86,16 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
     tqlayout->addWidget(new TQLabel(i18n("Default tqlayout mode"), frame), row, 0);
 
-    m_tqlayoutMode = new KComboBox(frame);
-    m_tqlayoutMode->setEditable(false);
-    m_tqlayoutMode->insertItem(i18n("Linear tqlayout"));
-    m_tqlayoutMode->insertItem(i18n("Continuous page tqlayout"));
-    m_tqlayoutMode->insertItem(i18n("Multiple page tqlayout"));
-    int defaultLayoutMode = m_cfg->readNumEntry("tqlayoutmode", 0);
+    m_layoutMode = new KComboBox(frame);
+    m_layoutMode->setEditable(false);
+    m_layoutMode->insertItem(i18n("Linear tqlayout"));
+    m_layoutMode->insertItem(i18n("Continuous page tqlayout"));
+    m_layoutMode->insertItem(i18n("Multiple page tqlayout"));
+    int defaultLayoutMode = m_cfg->readNumEntry("layoutmode", 0);
     if (defaultLayoutMode >= 0 && defaultLayoutMode <= 2) {
-        m_tqlayoutMode->setCurrentItem(defaultLayoutMode);
+        m_layoutMode->setCurrentItem(defaultLayoutMode);
     }
-    tqlayout->addMultiCellWidget(m_tqlayoutMode, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_layoutMode, row, row, 1, 2);
     ++row;
 
     tqlayout->addWidget(new TQLabel(i18n("Default spacing"), frame), row, 0);
@@ -715,7 +715,7 @@ NotationConfigurationPage::apply()
     s = NotationHLayout::getAvailableProportions();
     m_cfg->writeEntry("proportion", s[m_proportion->currentItem()]);
 
-    m_cfg->writeEntry("tqlayoutmode", m_tqlayoutMode->currentItem());
+    m_cfg->writeEntry("layoutmode", m_layoutMode->currentItem());
     m_cfg->writeEntry("colourquantize", m_colourQuantize->isChecked());
     m_cfg->writeEntry("showunknowns", m_showUnknowns->isChecked());
     m_cfg->writeEntry("showinvisibles", m_showInvisibles->isChecked());
diff --git a/src/gui/configuration/NotationConfigurationPage.h b/src/gui/configuration/NotationConfigurationPage.h
index a9b6b63..c43de4f 100644
--- a/src/gui/configuration/NotationConfigurationPage.h
+++ b/src/gui/configuration/NotationConfigurationPage.h
@@ -87,7 +87,7 @@ protected:
     TQLabel *m_fontCopyrightLabel;
     TQLabel *m_fontMappedByLabel;
     TQLabel *m_fontTypeLabel;
-    TQComboBox *m_tqlayoutMode;
+    TQComboBox *m_layoutMode;
     TQComboBox *m_spacing;
     TQComboBox *m_proportion;
     TQCheckBox *m_colourQuantize;