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

1 files changed, 15 insertions, 15 deletions

diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 54ec010..919d75f 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -50,20 +50,20 @@
 namespace Rosegarden
 {
 
-HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
+HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
 	RosegardenGUIDoc *doc) :
-	TQVBox(parent),
+	TQVBox(tqparent),
 	m_doc(doc)
 {
     //
     // LilyPond export: Printable headers
     //
 
-    TQGroupBox *headersBox = new QGroupBox
-                           (1, Horizontal,
+    TQGroupBox *headersBox = new TQGroupBox
+                           (1, Qt::Horizontal,
                             i18n("Printable headers"), this);
     TQFrame *frameHeaders = new TQFrame(headersBox);
-    TQGridLayout *layoutHeaders = new TQGridLayout(frameHeaders, 10, 6, 10, 5);
+    TQGridLayout *tqlayoutHeaders = new TQGridLayout(frameHeaders, 10, 6, 10, 5);
 
     // grab user headers from metadata
     Configuration metadata = (&m_doc->getComposition())->getMetadata();
@@ -141,9 +141,9 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
 	}
 
 	// editHeader->setReadOnly( true );
-	editHeader->setAlignment( (col == 0 ? Qt::AlignLeft : (col >= 3 ? Qt::AlignRight : Qt::AlignCenter) ));
+	editHeader->tqsetAlignment( (col == 0 ? TQt::AlignLeft : (col >= 3 ? TQt::AlignRight : TQt::AlignCenter) ));
 
-	layoutHeaders->addMultiCellWidget(editHeader, row, row, col, col+(width-1) );
+	tqlayoutHeaders->addMultiCellWidget(editHeader, row, row, col, col+(width-1) );
 
 	//
 	// ToolTips
@@ -153,8 +153,8 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
 	shown.insert(key);
     }
     TQLabel *separator = new TQLabel(i18n("The composition comes here."), frameHeaders);
-    separator->setAlignment( Qt::AlignCenter );
-    layoutHeaders->addMultiCellWidget(separator, 7, 7, 1, 4 );
+    separator->tqsetAlignment( TQt::AlignCenter );
+    tqlayoutHeaders->addMultiCellWidget(separator, 7, 7, 1, 4 );
 
     //
     // LilyPond export: Non-printable headers
@@ -177,7 +177,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
     otherHeadersBox->setFont(font);
     otherHeadersBox->setWidget(frameOtherHeaders);
 
-    TQGridLayout *layoutOtherHeaders = new TQGridLayout(frameOtherHeaders, 2, 2, 10, 5);
+    TQGridLayout *tqlayoutOtherHeaders = new TQGridLayout(frameOtherHeaders, 2, 2, 10, 5);
 
     m_metadata = new KListView(frameOtherHeaders);
     m_metadata->addColumn(i18n("Name"));
@@ -208,15 +208,15 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
         shown.insert(names[i]);
     }
 
-    layoutOtherHeaders->addMultiCellWidget(m_metadata, 0, 0, 0, 1);
+    tqlayoutOtherHeaders->addMultiCellWidget(m_metadata, 0, 0, 0, 1);
 
     TQPushButton* addPropButton = new TQPushButton(i18n("Add New Property"),
                                  frameOtherHeaders);
-    layoutOtherHeaders->addWidget(addPropButton, 1, 0, Qt::AlignHCenter);
+    tqlayoutOtherHeaders->addWidget(addPropButton, 1, 0, TQt::AlignHCenter);
 
     TQPushButton* deletePropButton = new TQPushButton(i18n("Delete Property"),
                                     frameOtherHeaders);
-    layoutOtherHeaders->addWidget(deletePropButton, 1, 1, Qt::AlignHCenter);
+    tqlayoutOtherHeaders->addWidget(deletePropButton, 1, 1, TQt::AlignHCenter);
 
     connect(addPropButton, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotAddNewProperty()));
@@ -233,9 +233,9 @@ HeadersConfigurationPage::slotAddNewProperty()
 
     while (1) {
         propertyName =
-            (i > 0 ? i18n("{new property %1}").arg(i) : i18n("{new property}"));
+            (i > 0 ? i18n("{new property %1}").tqarg(i) : i18n("{new property}"));
         if (!m_doc->getComposition().getMetadata().has(qstrtostr(propertyName)) &&
-	    m_metadata->findItem(qstrtostr(propertyName),0) == 0)
+	    m_metadata->tqfindItem(propertyName,0) == 0)
             break;
         ++i;
     }