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, 10 insertions, 10 deletions

diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index cde1cac..53f98bc 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -54,8 +54,8 @@
 namespace Rosegarden
 {
 
-ImportDeviceDialog::ImportDeviceDialog(TQWidget *parent, KURL url) :
-        KDialogBase(parent, "importdevicedialog", true,
+ImportDeviceDialog::ImportDeviceDialog(TQWidget *tqparent, KURL url) :
+        KDialogBase(tqparent, "importdevicedialog", true,
                     i18n("Import from Device..."),
                     Ok | Cancel, Ok),
         m_url(url),
@@ -84,26 +84,26 @@ ImportDeviceDialog::doImport()
 
     TQString target;
     if (KIO::NetAccess::download(m_url, target) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").arg(m_url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(m_url.prettyURL()));
         return false;
     }
 
     bool fileRead = false;
-    if (SF2PatchExtractor::isSF2File(target.data())) {
+    if (SF2PatchExtractor::isSF2File(target.ascii())) {
         fileRead = importFromSF2(target);
     } else {
         fileRead = importFromRG(target);
     }
     if (!fileRead) {
         KMessageBox::error
-        (this, i18n("Cannot open file %1").arg(m_url.prettyURL()));
+        (this, i18n("Cannot open file %1").tqarg(m_url.prettyURL()));
         reject();
         close();
         return false;
     }
     if (m_devices.size() == 0) {
         KMessageBox::sorry
-        (this, i18n("No devices found in file %1").arg(m_url.prettyURL()));
+        (this, i18n("No devices found in file %1").tqarg(m_url.prettyURL()));
         reject();
         close();
         return false;
@@ -137,7 +137,7 @@ ImportDeviceDialog::doImport()
         if ((*i)->getName() != "") {
             showRenameOption = true;
         } else {
-            (*i)->setName(qstrtostr(i18n("Device %1").arg(count)));
+            (*i)->setName(qstrtostr(i18n("Device %1").tqarg(count)));
         }
         if (m_devices.size() > 1) {
             m_deviceCombo->insertItem(strtoqstr((*i)->getName()));
@@ -149,7 +149,7 @@ ImportDeviceDialog::doImport()
 
     TQHBox *optionsBox = new TQHBox(mainFrame);
 
-    TQGroupBox *gb = new TQGroupBox(1, Horizontal, i18n("Options"),
+    TQGroupBox *gb = new TQGroupBox(1, Qt::Horizontal, i18n("Options"),
                                   optionsBox);
 
     m_importBanks = new TQCheckBox(i18n("Import banks"), gb);
@@ -340,7 +340,7 @@ ImportDeviceDialog::importFromSF2(TQString filename)
 {
     SF2PatchExtractor::Device sf2device;
     try {
-        sf2device = SF2PatchExtractor::read(filename.data());
+        sf2device = SF2PatchExtractor::read(filename.ascii());
 
         // These exceptions shouldn't happen -- the isSF2File call before this
         // one should have weeded them out
@@ -364,7 +364,7 @@ ImportDeviceDialog::importFromSF2(TQString filename)
 
         MidiBank bank
         (msb == 1, msb, lsb,
-         qstrtostr(i18n("Bank %1:%2").arg(msb).arg(lsb)));
+         qstrtostr(i18n("Bank %1:%2").tqarg(msb).tqarg(lsb)));
 
         banks.push_back(bank);