From 458efa7b0c935cbaafa2791021a5f8f7241aa876 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 2 May 2011 22:38:52 +0000
Subject: Initial TQt4 port of Rosegarden This enables compilation under both
 Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/gui/dialogs/LyricEditDialog.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/gui/dialogs/LyricEditDialog.cpp')

diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp
index 691f046..faae635 100644
--- a/src/gui/dialogs/LyricEditDialog.cpp
+++ b/src/gui/dialogs/LyricEditDialog.cpp
@@ -48,9 +48,9 @@
 namespace Rosegarden
 {
 
-LyricEditDialog::LyricEditDialog(TQWidget *parent,
+LyricEditDialog::LyricEditDialog(TQWidget *tqparent,
                                  Segment *segment) :
-    KDialogBase(parent, 0, true, i18n("Edit Lyrics"), Ok | Cancel | Help),
+    KDialogBase(tqparent, 0, true, i18n("Edit Lyrics"), Ok | Cancel | Help),
     m_segment(segment),
     m_verseCount(0)
 {
@@ -58,8 +58,8 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent,
 
     TQVBox *vbox = makeVBoxMainWidget();
 
-    TQGroupBox *groupBox = new QGroupBox
-                          (1, Horizontal, i18n("Lyrics for this segment"), vbox);
+    TQGroupBox *groupBox = new TQGroupBox
+                          (1, Qt::Horizontal, i18n("Lyrics for this segment"), vbox);
 
     TQHBox *hbox = new TQHBox(groupBox);
     hbox->setSpacing(5);
@@ -73,7 +73,7 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent,
     hbox->setStretchFactor(f, 10);
 
     m_textEdit = new TQTextEdit(groupBox);
-    m_textEdit->setTextFormat(Qt::PlainText);
+    m_textEdit->setTextFormat(TQt::PlainText);
 
     m_textEdit->setMinimumWidth(300);
     m_textEdit->setMinimumHeight(200);
@@ -81,7 +81,7 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent,
     unparse();
     
     for (int i = 0; i < m_verseCount; ++i) {
-        m_verseNumber->insertItem(i18n("Verse %1").arg(i + 1));
+        m_verseNumber->insertItem(i18n("Verse %1").tqarg(i + 1));
     }
     m_currentVerse = 0;
     if (m_verseCount == 12) m_verseAddButton->setEnabled(false);
@@ -103,7 +103,7 @@ LyricEditDialog::slotAddVerse()
     NOTATION_DEBUG << "LyricEditDialog::slotAddVerse" << endl;
     m_verseCount++;
     m_texts.push_back(m_skeleton);
-    m_verseNumber->insertItem(i18n("Verse %1").arg(m_verseCount));
+    m_verseNumber->insertItem(i18n("Verse %1").tqarg(m_verseCount));
     m_verseNumber->setCurrentItem(m_verseCount - 1);
     slotVerseNumberChanged(m_verseCount - 1);
     if (m_verseCount == 12) m_verseAddButton->setEnabled(false);
@@ -148,7 +148,7 @@ LyricEditDialog::unparse()
     int lastBarNo = comp->getBarNumber(lastTime);
     std::map<int, bool> haveLyric;
 
-    TQString fragment = TQString("[%1] ").arg(lastBarNo + 1);
+    TQString fragment = TQString("[%1] ").tqarg(lastBarNo + 1);
 
     m_skeleton = fragment;
     m_texts.clear();
@@ -192,7 +192,7 @@ LyricEditDialog::unparse()
                 ++lastBarNo;
             }
 
-            fragment += TQString("\n[%1] ").arg(myBarNo + 1);
+            fragment += TQString("\n[%1] ").tqarg(myBarNo + 1);
 
             m_skeleton += fragment;
             for (size_t v = 0; v < m_verseCount; ++v) m_texts[v] += fragment;
@@ -219,7 +219,7 @@ LyricEditDialog::unparse()
             (*i)->get<Int>(Text::LyricVersePropertyName, verse);
 
             TQString syllable(strtoqstr(ssyllable));
-            syllable.replace(TQRegExp("\\s+"), "~");
+            syllable.tqreplace(TQRegExp("\\s+"), "~");
 
             m_texts[verse] += " " + syllable;
             haveLyric[verse] = true;
@@ -239,7 +239,7 @@ LyricEditDialog::getVerseCount() const
     return m_verseCount;
 }
 
-QString
+TQString
 LyricEditDialog::getLyricData(int verse) const
 {
     if (verse == m_verseNumber->currentItem()) {
-- 
cgit v1.2.1