From 11f31c37e5fa4889d9989f10272f44845449cb7b Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 6 Sep 2010 20:59:29 +0000
Subject: Initial TQt conversion

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

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

diff --git a/src/gui/dialogs/FileMergeDialog.cpp b/src/gui/dialogs/FileMergeDialog.cpp
index d997327..d7d48cf 100644
--- a/src/gui/dialogs/FileMergeDialog.cpp
+++ b/src/gui/dialogs/FileMergeDialog.cpp
@@ -28,29 +28,29 @@
 #include <klocale.h>
 #include <kcombobox.h>
 #include <kdialogbase.h>
-#include <qcheckbox.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qvbox.h>
-#include <qwidget.h>
+#include <tqcheckbox.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqstring.h>
+#include <tqvbox.h>
+#include <tqwidget.h>
 #include "document/RosegardenGUIDoc.h"
 
 
 namespace Rosegarden
 {
 
-FileMergeDialog::FileMergeDialog(QWidget *parent,
-                                 QString /*fileName*/,
+FileMergeDialog::FileMergeDialog(TQWidget *parent,
+                                 TQString /*fileName*/,
                                  bool timingsDiffer) :
         KDialogBase(parent, 0, true, i18n("Merge File"), Ok | Cancel | Help)
 {
     setHelp("file-merge");
 
-    QVBox *vbox = makeVBoxMainWidget();
+    TQVBox *vbox = makeVBoxMainWidget();
 
-    QHBox *hbox = new QHBox(vbox);
-    new QLabel(i18n("Merge new file  "), hbox);
+    TQHBox *hbox = new TQHBox(vbox);
+    new TQLabel(i18n("Merge new file  "), hbox);
 
     m_choice = new KComboBox(hbox);
     m_choice->insertItem(i18n("At start of existing composition"));
@@ -58,8 +58,8 @@ FileMergeDialog::FileMergeDialog(QWidget *parent,
     m_useTimings = 0;
 
     if (timingsDiffer) {
-        new QLabel(i18n("The file has different time signatures or tempos."), vbox);
-        m_useTimings = new QCheckBox(i18n("Import these as well"), vbox);
+        new TQLabel(i18n("The file has different time signatures or tempos."), vbox);
+        m_useTimings = new TQCheckBox(i18n("Import these as well"), vbox);
         m_useTimings->setChecked(false);
     }
 }
-- 
cgit v1.2.3