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

diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index 9f45c31..66f371a 100644
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@@ -55,9 +55,9 @@
 namespace Rosegarden
 {
 
-DeviceEditorDialog::DeviceEditorDialog(TQWidget *parent,
+DeviceEditorDialog::DeviceEditorDialog(TQWidget *tqparent,
                                        RosegardenGUIDoc *document) :
-        KDialogBase(parent, "deviceeditordialog", true,
+        KDialogBase(tqparent, "deviceeditordialog", true,
                     i18n("Manage MIDI Devices"), Ok | Apply | Close, Ok, true),
         m_document(document),
         m_studio(&document->getStudio()),
@@ -145,7 +145,7 @@ DeviceEditorDialog::populate()
         MidiDevice *md = static_cast<MidiDevice *>(*it);
 
         // if you change this string ("Device %1"), change test in slotApply
-        TQString deviceName = i18n("Device %1").arg(md->getId() + 1);
+        TQString deviceName = i18n("Device %1").tqarg(md->getId() + 1);
         TQString deviceLabel = strtoqstr(md->getName());
         TQString connectionName = strtoqstr(md->getConnection());
 
@@ -221,7 +221,7 @@ DeviceEditorDialog::makeConnectionList(unsigned int direction,
 
         TQDataStream reply(replyData, IO_ReadOnly);
         TQString connection;
-        if (replyType == "TQString") {
+        if (replyType == TQSTRING_OBJECT_NAME_STRING) {
             reply >> connection;
             list.append(connection);
         }