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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 83 insertions, 83 deletions

diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 41d2deb..4296773 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -24,7 +24,7 @@
 
 
 #include "NotationConfigurationPage.h"
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "misc/Strings.h"
 #include "document/ConfigGroups.h"
@@ -74,31 +74,31 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     m_cfg->setGroup(NotationViewConfigGroup);
 
     TQFrame *frame;
-    TQGridLayout *layout;
+    TQGridLayout *tqlayout;
 
     frame = new TQFrame(m_tabWidget);
-    layout = new TQGridLayout(frame, 9, 3, 10, 5);
+    tqlayout = new TQGridLayout(frame, 9, 3, 10, 5);
 
     int row = 0;
 
-    layout->setRowSpacing(row, 15);
+    tqlayout->setRowSpacing(row, 15);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Default layout mode"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Default tqlayout mode"), frame), row, 0);
 
     m_layoutMode = new KComboBox(frame);
     m_layoutMode->setEditable(false);
-    m_layoutMode->insertItem(i18n("Linear layout"));
-    m_layoutMode->insertItem(i18n("Continuous page layout"));
-    m_layoutMode->insertItem(i18n("Multiple page layout"));
+    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_layoutMode->setCurrentItem(defaultLayoutMode);
     }
-    layout->addMultiCellWidget(m_layoutMode, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_layoutMode, row, row, 1, 2);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Default spacing"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Default spacing"), frame), row, 0);
 
     m_spacing = new KComboBox(frame);
     m_spacing->setEditable(false);
@@ -111,18 +111,18 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         TQString text("%1 %");
         if (*i == 100)
             text = "%1 % (normal)";
-        m_spacing->insertItem(text.arg(*i));
+        m_spacing->insertItem(text.tqarg(*i));
 
         if (*i == defaultSpacing) {
             m_spacing->setCurrentItem(m_spacing->count() - 1);
         }
     }
 
-    layout->addMultiCellWidget(m_spacing, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_spacing, row, row, 1, 2);
 
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Default duration factor"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Default duration factor"), frame), row, 0);
 
     m_proportion = new KComboBox(frame);
     m_proportion->setEditable(false);
@@ -132,7 +132,7 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
     for (std::vector<int>::iterator i = s.begin(); i != s.end(); ++i) {
 
-        TQString text = TQString("%1 %").arg(*i);
+        TQString text = TQString("%1 %").tqarg(*i);
         if (*i == 40)
             text = "40 % (normal)";
         else if (*i == 0)
@@ -146,10 +146,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         }
     }
 
-    layout->addMultiCellWidget(m_proportion, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_proportion, row, row, 1, 2);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Show track headers (linear layout only)"),
+    tqlayout->addWidget(new TQLabel(i18n("Show track headers (linear tqlayout only)"),
                                       frame), row, 0);
 
     m_showTrackHeaders = new KComboBox(frame);
@@ -167,76 +167,76 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         "\"When needed\" means \"when staves are too many to all fit"
         " in the current window\"")));
 
-    layout->addMultiCellWidget(m_showTrackHeaders, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_showTrackHeaders, row, row, 1, 2);
     ++row;
 
-    layout->setRowSpacing(row, 20);
+    tqlayout->setRowSpacing(row, 20);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel
          (i18n("Show non-notation events as question marks"), frame),
          row, row, 0, 1);
     m_showUnknowns = new TQCheckBox(frame);
     bool defaultShowUnknowns = m_cfg->readBoolEntry("showunknowns", false);
     m_showUnknowns->setChecked(defaultShowUnknowns);
-    layout->addWidget(m_showUnknowns, row, 2);
+    tqlayout->addWidget(m_showUnknowns, row, 2);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel
          (i18n("Show notation-quantized notes in a different color"), frame),
          row, row, 0, 1);
     m_colourQuantize = new TQCheckBox(frame);
     bool defaultColourQuantize = m_cfg->readBoolEntry("colourquantize", false);
     m_colourQuantize->setChecked(defaultColourQuantize);
-    layout->addWidget(m_colourQuantize, row, 2);
+    tqlayout->addWidget(m_colourQuantize, row, 2);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel
          (i18n("Show \"invisible\" events in grey"), frame),
          row, row, 0, 1);
     m_showInvisibles = new TQCheckBox(frame);
     bool defaultShowInvisibles = m_cfg->readBoolEntry("showinvisibles", true);
     m_showInvisibles->setChecked(defaultShowInvisibles);
-    layout->addWidget(m_showInvisibles, row, 2);
+    tqlayout->addWidget(m_showInvisibles, row, 2);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel
          (i18n("Show notes outside suggested playable range in red"), frame),
          row, row, 0, 1);
     m_showRanges = new TQCheckBox(frame);
     bool defaultShowRanges = m_cfg->readBoolEntry("showranges", true);
     m_showRanges->setChecked(defaultShowRanges);
-    layout->addWidget(m_showRanges, row, 2);
+    tqlayout->addWidget(m_showRanges, row, 2);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel
          (i18n("Highlight superimposed notes with a halo effect"), frame),
          row, row, 0, 1);
     m_showCollisions = new TQCheckBox(frame);
     bool defaultShowCollisions = m_cfg->readBoolEntry("showcollisions", true);
     m_showCollisions->setChecked(defaultShowCollisions);
-    layout->addWidget(m_showCollisions, row, 2);
+    tqlayout->addWidget(m_showCollisions, row, 2);
     ++row;
 
-    layout->setRowSpacing(row, 20);
+    tqlayout->setRowSpacing(row, 20);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel
          (i18n("When recording MIDI, split-and-tie long notes at barlines"), frame),
          row, row, 0, 1);
     m_splitAndTie = new TQCheckBox(frame);
     bool defaultSplitAndTie = m_cfg->readBoolEntry("quantizemakeviable", false);
     m_splitAndTie->setChecked(defaultSplitAndTie);
-    layout->addWidget(m_splitAndTie, row, 2);
+    tqlayout->addWidget(m_splitAndTie, row, 2);
     ++row;
 
-    layout->setRowStretch(row, 10);
+    tqlayout->setRowStretch(row, 10);
 
 
     addTab(frame, i18n("Layout"));
@@ -244,18 +244,18 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
 
     frame = new TQFrame(m_tabWidget);
-    layout = new TQGridLayout(frame, 6, 3, 10, 5);
+    tqlayout = new TQGridLayout(frame, 6, 3, 10, 5);
 
     row = 0;
 
-    layout->setRowSpacing(row, 15);
+    tqlayout->setRowSpacing(row, 15);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel(i18n("Default note style for new notes"), frame),
          row, row, 0, 1);
 
-    layout->setColStretch(2, 10);
+    tqlayout->setColStretch(2, 10);
 
     m_noteStyle = new KComboBox(frame);
     m_noteStyle->setEditable(false);
@@ -277,13 +277,13 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
         }
     }
 
-    layout->addWidget(m_noteStyle, row, 2);
+    tqlayout->addWidget(m_noteStyle, row, 2);
     ++row;
 
-    layout->setRowSpacing(row, 20);
+    tqlayout->setRowSpacing(row, 20);
     ++row;
 
-    layout->addWidget
+    tqlayout->addWidget
     (new TQLabel(i18n("When inserting notes..."), frame), row, 0);
 
     int defaultInsertType = m_cfg->readNumEntry("inserttype", 0);
@@ -295,36 +295,36 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     m_insertType->insertItem(i18n("Ignore existing durations"));
     m_insertType->setCurrentItem(defaultInsertType);
 
-    layout->addMultiCellWidget(m_insertType, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_insertType, row, row, 1, 2);
     ++row;
 
     bool autoBeam = m_cfg->readBoolEntry("autobeam", true);
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel
          (i18n("Auto-beam on insert when appropriate"), frame),
          row, row, 0, 1);
     m_autoBeam = new TQCheckBox(frame);
     m_autoBeam->setChecked(autoBeam);
-    layout->addMultiCellWidget(m_autoBeam, row, row, 2, 2);
+    tqlayout->addMultiCellWidget(m_autoBeam, row, row, 2, 2);
 
     ++row;
 
     bool collapse = m_cfg->readBoolEntry("collapse", false);
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel
          (i18n("Collapse rests after erase"), frame),
          row, row, 0, 1);
     m_collapseRests = new TQCheckBox(frame);
     m_collapseRests->setChecked(collapse);
-    layout->addMultiCellWidget(m_collapseRests, row, row, 2, 2);
+    tqlayout->addMultiCellWidget(m_collapseRests, row, row, 2, 2);
     ++row;
 
-    layout->setRowSpacing(row, 20);
+    tqlayout->setRowSpacing(row, 20);
     ++row;
 
-    layout->addWidget
+    tqlayout->addWidget
     (new TQLabel(i18n("Default paste type"), frame), row, 0);
 
     m_pasteType = new KComboBox(frame);
@@ -342,24 +342,24 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     }
 
     m_pasteType->setCurrentItem(defaultPasteType);
-    layout->addMultiCellWidget(m_pasteType, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_pasteType, row, row, 1, 2);
     ++row;
 
-    layout->setRowStretch(row, 10);
+    tqlayout->setRowStretch(row, 10);
 
     addTab(frame, i18n("Editing"));
 
 
 
     frame = new TQFrame(m_tabWidget);
-    layout = new TQGridLayout(frame, 4, 2, 10, 5);
+    tqlayout = new TQGridLayout(frame, 4, 2, 10, 5);
     
     row = 0;
 
-    layout->setRowSpacing(row, 15);
+    tqlayout->setRowSpacing(row, 15);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Accidentals in one octave..."), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Accidentals in one octave..."), frame), row, 0);
     m_accOctavePolicy = new KComboBox(frame);
     m_accOctavePolicy->insertItem(i18n("Affect only that octave"));
     m_accOctavePolicy->insertItem(i18n("Require cautionaries in other octaves"));
@@ -368,10 +368,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     if (accOctaveMode >= 0 && accOctaveMode < 3) {
         m_accOctavePolicy->setCurrentItem(accOctaveMode);
     }
-    layout->addWidget(m_accOctavePolicy, row, 1);
+    tqlayout->addWidget(m_accOctavePolicy, row, 1);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Accidentals in one bar..."), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Accidentals in one bar..."), frame), row, 0);
     m_accBarPolicy = new KComboBox(frame);
     m_accBarPolicy->insertItem(i18n("Affect only that bar"));
     m_accBarPolicy->insertItem(i18n("Require cautionary resets in following bar"));
@@ -380,10 +380,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     if (accBarMode >= 0 && accBarMode < 3) {
         m_accBarPolicy->setCurrentItem(accBarMode);
     }
-    layout->addWidget(m_accBarPolicy, row, 1);
+    tqlayout->addWidget(m_accBarPolicy, row, 1);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Key signature cancellation style"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Key signature cancellation style"), frame), row, 0);
     m_keySigCancelMode = new KComboBox(frame);
     m_keySigCancelMode->insertItem(i18n("Cancel only when entering C major or A minor"));
     m_keySigCancelMode->insertItem(i18n("Cancel whenever removing sharps or flats"));
@@ -392,10 +392,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     if (cancelMode >= 0 && cancelMode < 3) {
         m_keySigCancelMode->setCurrentItem(cancelMode);
     }
-    layout->addWidget(m_keySigCancelMode, row, 1);
+    tqlayout->addWidget(m_keySigCancelMode, row, 1);
     ++row;
 
-    layout->setRowStretch(row, 10);
+    tqlayout->setRowStretch(row, 10);
 
     addTab(frame, i18n("Accidentals"));
 
@@ -431,25 +431,25 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
 //    TQFrame *mainFrame = new TQFrame(m_tabWidget);
     frame = new TQFrame(m_tabWidget);
-    layout = new TQGridLayout(frame, 2, 4, 10, 5);
+    tqlayout = new TQGridLayout(frame, 2, 4, 10, 5);
 
 //    frame = new TQFrame(noteFontBox);
-//    layout = new TQGridLayout(frame, 5, 2, 10, 5);
+//    tqlayout = new TQGridLayout(frame, 5, 2, 10, 5);
 
     m_viewButton = 0;
 
-    layout->addWidget(new TQLabel(i18n("Notation font"), frame), 0, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Notation font"), frame), 0, 0);
 
     m_font = new KComboBox(frame);
 
 #ifdef HAVE_XFT
     m_viewButton = new TQPushButton(i18n("View"), frame);
-    layout->addMultiCellWidget(m_font, row, row, 1, 2);
-    layout->addWidget(m_viewButton, row, 3);
+    tqlayout->addMultiCellWidget(m_font, row, row, 1, 2);
+    tqlayout->addWidget(m_viewButton, row, 3);
     TQObject::connect(m_viewButton, TQT_SIGNAL(clicked()),
                      this, TQT_SLOT(slotViewButtonPressed()));
 #else
-    layout->addMultiCellWidget(m_font, row, row, 1, 3);
+    tqlayout->addMultiCellWidget(m_font, row, row, 1, 3);
 #endif
     m_font->setEditable(false);
     TQObject::connect(m_font, TQT_SIGNAL(activated(int)),
@@ -481,11 +481,11 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     subLayout->addWidget(typeLabel, 3, 0);
 
     m_fontOriginLabel = new TQLabel(subFrame);
-    m_fontOriginLabel->setAlignment(TQt::WordBreak);
+    m_fontOriginLabel->tqsetAlignment(TQt::WordBreak);
     m_fontOriginLabel->setFont(font);
 //    m_fontOriginLabel->setFixedWidth(250);
     m_fontCopyrightLabel = new TQLabel(subFrame);
-    m_fontCopyrightLabel->setAlignment(TQt::WordBreak);
+    m_fontCopyrightLabel->tqsetAlignment(TQt::WordBreak);
     m_fontCopyrightLabel->setFont(font);
 //    m_fontCopyrightLabel->setFixedWidth(250);
     m_fontMappedByLabel = new TQLabel(subFrame);
@@ -499,70 +499,70 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
 
     subLayout->setColStretch(1, 10);
 
-    layout->addMultiCellWidget(subFrame,
+    tqlayout->addMultiCellWidget(subFrame,
                                row, row,
                                0, 3);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel(i18n("Font size for single-staff views"), frame),
          row, row, 0, 1);
     m_singleStaffSize = new KComboBox(frame);
     m_singleStaffSize->setEditable(false);
-    layout->addMultiCellWidget(m_singleStaffSize, row, row, 2, 2);
+    tqlayout->addMultiCellWidget(m_singleStaffSize, row, row, 2, 2);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel(i18n("Font size for multi-staff views"), frame),
          row, row, 0, 1);
     m_multiStaffSize = new KComboBox(frame);
     m_multiStaffSize->setEditable(false);
-    layout->addMultiCellWidget(m_multiStaffSize, row, row, 2, 2);
+    tqlayout->addMultiCellWidget(m_multiStaffSize, row, row, 2, 2);
     ++row;
 
-    layout->addMultiCellWidget
+    tqlayout->addMultiCellWidget
         (new TQLabel(i18n("Font size for printing (pt)"), frame),
          row, row, 0, 1);
     m_printingSize = new KComboBox(frame);
     m_printingSize->setEditable(false);
-    layout->addMultiCellWidget(m_printingSize, row, row, 2, 2);
+    tqlayout->addMultiCellWidget(m_printingSize, row, row, 2, 2);
     ++row;
 
     slotPopulateFontCombo(false);
 
-    layout->setRowSpacing(row, 15);
+    tqlayout->setRowSpacing(row, 15);
     ++row;
 
     TQFont defaultTextFont(NotePixmapFactory::defaultSerifFontFamily),
         defaultSansFont(NotePixmapFactory::defaultSansSerifFontFamily),
         defaultTimeSigFont(NotePixmapFactory::defaultTimeSigFontFamily);
 
-    layout->addWidget
+    tqlayout->addWidget
         (new TQLabel(i18n("Text font"), frame), row, 0);
     m_textFont = new KFontRequester(frame);
     TQFont textFont = m_cfg->readFontEntry("textfont", &defaultTextFont);
     m_textFont->setFont(textFont);
-    layout->addMultiCellWidget(m_textFont, row, row, 1, 3);
+    tqlayout->addMultiCellWidget(m_textFont, row, row, 1, 3);
     ++row;
 
-    layout->addWidget
+    tqlayout->addWidget
         (new TQLabel(i18n("Sans-serif font"), frame), row, 0);
     m_sansFont = new KFontRequester(frame);
     TQFont sansFont = m_cfg->readFontEntry("sansfont", &defaultSansFont);
     m_sansFont->setFont(sansFont);
-    layout->addMultiCellWidget(m_sansFont, row, row, 1, 3);
+    tqlayout->addMultiCellWidget(m_sansFont, row, row, 1, 3);
     ++row;
 
 /*!!! No -- not much point in having the time sig font here: it's only
  * used if the time sig characters are not found in the notation font,
  * and our default notation font has all the characters we need
 
-    layout->addWidget
+    tqlayout->addWidget
         (new TQLabel(i18n("Time Signature font"), frame), row, 0);
     m_timeSigFont = new KFontRequester(frame);
     TQFont timeSigFont = m_cfg->readFontEntry("timesigfont", &defaultTimeSigFont);
     m_timeSigFont->setFont(timeSigFont);
-    layout->addMultiCellWidget(m_timeSigFont, row, row, 1, 3);
+    tqlayout->addMultiCellWidget(m_timeSigFont, row, row, 1, 3);
     ++row;
 */
 
@@ -646,7 +646,7 @@ NotationConfigurationPage::slotFontComboChanged(int index)
 
     int printpt = m_cfg->readUnsignedNumEntry("printingnotesize", 5);
     for (int i = 2; i < 16; ++i) {
-        m_printingSize->insertItem(TQString("%1").arg(i));
+        m_printingSize->insertItem(TQString("%1").tqarg(i));
         if (i == printpt) {
             m_printingSize->setCurrentItem(m_printingSize->count() - 1);
         }
@@ -661,10 +661,10 @@ NotationConfigurationPage::slotFontComboChanged(int index)
         m_fontMappedByLabel->setText(i18n(strtoqstr(map.getMappedBy()).ascii()));
         if (map.isSmooth()) {
             m_fontTypeLabel->setText(
-                i18n("%1 (smooth)").arg(i18n(strtoqstr(map.getType()).ascii())));
+                i18n("%1 (smooth)").tqarg(i18n(strtoqstr(map.getType()).ascii())));
         } else {
             m_fontTypeLabel->setText(
-                i18n("%1 (jaggy)").arg(i18n(strtoqstr(map.getType()).ascii())));
+                i18n("%1 (jaggy)").tqarg(i18n(strtoqstr(map.getType()).ascii())));
         }
         if (m_viewButton) {
             m_viewButton->setEnabled(map.getSystemFontNames().count() > 0);
@@ -683,7 +683,7 @@ NotationConfigurationPage::populateSizeCombo(TQComboBox *combo,
     combo->clear();
 
     for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) {
-        combo->insertItem(TQString("%1").arg(*i));
+        combo->insertItem(TQString("%1").tqarg(*i));
         if (*i == defaultSize)
             combo->setCurrentItem(combo->count() - 1);
     }