Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 26 insertions, 26 deletions

diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index 9fc183e..ce53b5b 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -107,9 +107,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     generalGrid->addWidget(basicOptionsBox, 0, 0);
 
     TQFrame *frameBasic = new TQFrame(basicOptionsBox);
-    TQGridLayout *tqlayoutBasic = new TQGridLayout(frameBasic, 3, 2, 10, 5);
+    TQGridLayout *layoutBasic = new TQGridLayout(frameBasic, 3, 2, 10, 5);
 
-    tqlayoutBasic->addWidget(new TQLabel(
+    layoutBasic->addWidget(new TQLabel(
                           i18n("Compatibility level"), frameBasic), 0, 0);
 
     m_lilyLanguage = new KComboBox(frameBasic);
@@ -119,9 +119,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.10"));
     m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.12"));
     m_lilyLanguage->setCurrentItem(config->readUnsignedNumEntry("lilylanguage", 0));
-    tqlayoutBasic->addWidget(m_lilyLanguage, 0, 1);
+    layoutBasic->addWidget(m_lilyLanguage, 0, 1);
 
-    tqlayoutBasic->addWidget(new TQLabel(
+    layoutBasic->addWidget(new TQLabel(
                           i18n("Paper size"), frameBasic), 1, 0);
 
     TQHBoxLayout *hboxPaper = new TQHBoxLayout( frameBasic );
@@ -146,9 +146,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     hboxPaper->addWidget( m_lilyPaperSize );
     hboxPaper->addWidget( new TQLabel( " ", frameBasic ) ); // fixed-size spacer
     hboxPaper->addWidget( m_lilyPaperLandscape );
-    tqlayoutBasic->addLayout(hboxPaper, 1, 1);
+    layoutBasic->addLayout(hboxPaper, 1, 1);
 
-    tqlayoutBasic->addWidget(new TQLabel(
+    layoutBasic->addWidget(new TQLabel(
                           i18n("Font size"), frameBasic), 2, 0);
 
     m_lilyFontSize = new KComboBox(frameBasic);
@@ -158,7 +158,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     }
     m_lilyFontSize->setCurrentItem(config->readUnsignedNumEntry
                                    ("lilyfontsize", 4));
-    tqlayoutBasic->addWidget(m_lilyFontSize, 2, 1);
+    layoutBasic->addWidget(m_lilyFontSize, 2, 1);
 
     //
     // LilyPond export: Staff level options
@@ -170,9 +170,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     generalGrid->addWidget(staffOptionsBox, 1, 0);
 
     TQFrame *frameStaff = new TQFrame(staffOptionsBox);
-    TQGridLayout *tqlayoutStaff = new TQGridLayout(frameStaff, 2, 2, 10, 5);
+    TQGridLayout *layoutStaff = new TQGridLayout(frameStaff, 2, 2, 10, 5);
 
-    tqlayoutStaff->addWidget(new TQLabel(
+    layoutStaff->addWidget(new TQLabel(
                           i18n("Export content"), frameStaff), 0, 0);
 
     m_lilyExportSelection = new KComboBox(frameStaff);
@@ -182,12 +182,12 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     m_lilyExportSelection->insertItem(i18n("Selected segments"));
     m_lilyExportSelection->setCurrentItem(config->readUnsignedNumEntry("lilyexportselection", 1));
 
-    tqlayoutStaff->addWidget(m_lilyExportSelection, 0, 1);
+    layoutStaff->addWidget(m_lilyExportSelection, 0, 1);
 
     m_lilyExportStaffMerge = new TQCheckBox(
                                  i18n("Merge tracks that have the same name"), frameStaff);
     m_lilyExportStaffMerge->setChecked(config->readBoolEntry("lilyexportstaffmerge", false));
-    tqlayoutStaff->addMultiCellWidget(m_lilyExportStaffMerge, 1, 1, 0, 1);
+    layoutStaff->addMultiCellWidget(m_lilyExportStaffMerge, 1, 1, 0, 1);
 
     //
     // LilyPond export: Notation options
@@ -199,7 +199,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     generalGrid->addWidget(notationOptionsBox, 2, 0);
 
     TQFrame *frameNotation = new TQFrame(notationOptionsBox);
-    TQGridLayout *tqlayoutNotation = new TQGridLayout(frameNotation, 4, 2, 10, 5);
+    TQGridLayout *layoutNotation = new TQGridLayout(frameNotation, 4, 2, 10, 5);
 
     m_lilyTempoMarks = new KComboBox( frameNotation );
     m_lilyTempoMarks->insertItem(i18n("None"));
@@ -207,9 +207,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     m_lilyTempoMarks->insertItem(i18n("All"));
     m_lilyTempoMarks->setCurrentItem(config->readUnsignedNumEntry("lilyexporttempomarks", 0));
 
-    tqlayoutNotation->addWidget( new TQLabel( 
+    layoutNotation->addWidget( new TQLabel( 
 			 i18n("Export tempo marks "), frameNotation), 0, 0 );
-    tqlayoutNotation->addWidget(m_lilyTempoMarks, 0, 1);
+    layoutNotation->addWidget(m_lilyTempoMarks, 0, 1);
  
     m_lilyExportLyrics = new TQCheckBox(
                              i18n("Export lyrics"), frameNotation);
@@ -219,19 +219,19 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     // fixed, no "- - -" lyrics are generated for an empty lyrics
     // default again into lyrics - HJJ
     m_lilyExportLyrics->setChecked(config->readBoolEntry("lilyexportlyrics", true));
-    tqlayoutNotation->addMultiCellWidget(m_lilyExportLyrics, 1, 1, 0, 1);
+    layoutNotation->addMultiCellWidget(m_lilyExportLyrics, 1, 1, 0, 1);
 
     m_lilyExportBeams = new TQCheckBox(
                             i18n("Export beamings"), frameNotation);
     m_lilyExportBeams->setChecked(config->readBoolEntry("lilyexportbeamings", false));
-    tqlayoutNotation->addMultiCellWidget(m_lilyExportBeams, 2, 2, 0, 1);
+    layoutNotation->addMultiCellWidget(m_lilyExportBeams, 2, 2, 0, 1);
 
     // recycle this for a new option to ignore the track brackets (so it is less
     // obnoxious to print single parts where brackets are in place)
     m_lilyExportStaffGroup = new TQCheckBox(
                                  i18n("Export track staff brackets"), frameNotation);
     m_lilyExportStaffGroup->setChecked(config->readBoolEntry("lilyexportstaffbrackets", true));
-    tqlayoutNotation->addMultiCellWidget(m_lilyExportStaffGroup, 3, 3, 0, 1); 
+    layoutNotation->addMultiCellWidget(m_lilyExportStaffGroup, 3, 3, 0, 1); 
 
     generalGrid->setRowStretch(4, 10);
 
@@ -245,7 +245,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     advancedGrid->addWidget(advancedLayoutOptionsBox, 0, 0);
 
     TQFrame *frameAdvancedLayout = new TQFrame(advancedLayoutOptionsBox);
-    TQGridLayout *tqlayoutAdvancedLayout = new TQGridLayout(frameAdvancedLayout, 2, 2, 10, 5);
+    TQGridLayout *layoutAdvancedLayout = new TQGridLayout(frameAdvancedLayout, 2, 2, 10, 5);
 
     m_lilyLyricsHAlignment = new KComboBox( frameAdvancedLayout );
     m_lilyLyricsHAlignment->insertItem(i18n("Left"));
@@ -253,14 +253,14 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     m_lilyLyricsHAlignment->insertItem(i18n("Right"));
     m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshtqalignment", 0));
 
-    tqlayoutAdvancedLayout->addWidget(new TQLabel(
+    layoutAdvancedLayout->addWidget(new TQLabel(
                           i18n("Lyrics tqalignment"), frameAdvancedLayout), 0, 0);
-    tqlayoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1);
+    layoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1);
 
     m_lilyRaggedBottom = new TQCheckBox(
                            i18n("Ragged bottom (systems will not be spread vertically across the page)"), frameAdvancedLayout);
     m_lilyRaggedBottom->setChecked(config->readBoolEntry("lilyraggedbottom", false));
-    tqlayoutAdvancedLayout->addMultiCellWidget(m_lilyRaggedBottom, 1, 2, 0, 1);
+    layoutAdvancedLayout->addMultiCellWidget(m_lilyRaggedBottom, 1, 2, 0, 1);
 
     TQGroupBox *miscOptionsBox = new TQGroupBox
                            (1, Qt::Horizontal,
@@ -268,17 +268,17 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     advancedGrid->addWidget(miscOptionsBox, 1, 0);
 
     TQFrame *frameMisc = new TQFrame(miscOptionsBox);
-    TQGridLayout *tqlayoutMisc = new TQGridLayout(frameMisc, 2, 2, 10, 5);
+    TQGridLayout *layoutMisc = new TQGridLayout(frameMisc, 2, 2, 10, 5);
 
     m_lilyExportPointAndClick = new TQCheckBox(
                                     i18n("Enable \"point and click\" debugging"), frameMisc);
     m_lilyExportPointAndClick->setChecked(config->readBoolEntry("lilyexportpointandclick", false));
-    tqlayoutMisc->addMultiCellWidget(m_lilyExportPointAndClick, 0, 0, 0, 1);
+    layoutMisc->addMultiCellWidget(m_lilyExportPointAndClick, 0, 0, 0, 1);
 
     m_lilyExportMidi = new TQCheckBox(
                            i18n("Export \\midi block"), frameMisc);
     m_lilyExportMidi->setChecked(config->readBoolEntry("lilyexportmidi", false));
-    tqlayoutMisc->addMultiCellWidget(m_lilyExportMidi, 1, 1, 0, 1);
+    layoutMisc->addMultiCellWidget(m_lilyExportMidi, 1, 1, 0, 1);
 
     m_lilyMarkerMode = new KComboBox(frameMisc);
     m_lilyMarkerMode->insertItem(i18n("No markers"));
@@ -286,9 +286,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
     m_lilyMarkerMode->insertItem(i18n("Marker text"));
     m_lilyMarkerMode->setCurrentItem(config->readUnsignedNumEntry("lilyexportmarkermode", 0));
 
-    tqlayoutMisc->addWidget( new TQLabel( 
+    layoutMisc->addWidget( new TQLabel( 
                              i18n("Export markers"), frameMisc),2, 0 );
-    tqlayoutMisc->addWidget(m_lilyMarkerMode, 2, 1);
+    layoutMisc->addWidget(m_lilyMarkerMode, 2, 1);
     
     advancedGrid->setRowStretch(2, 10);