1 files changed, 21 insertions, 21 deletions

diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index eb40c77..84aa0ca 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -83,9 +83,9 @@ static const int RECORD_CURRENT_COL = 1;
 static const int RECORD_CONNECTION_COL = 2;
 
 
-DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
+DeviceManagerDialog::DeviceManagerDialog(TQWidget *tqparent,
             RosegardenGUIDoc *document) :
-            KMainWindow(parent, "deviceeditordialog"),
+            KMainWindow(tqparent, "deviceeditordialog"),
             m_document(document),
             m_studio(&document->getStudio())
     {
@@ -95,7 +95,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
         setCaption(i18n("Manage MIDI Devices"));
 
-        TQGroupBox *groupBox = new TQGroupBox(2, Horizontal, i18n("Play devices"), mainBox);
+        TQGroupBox *groupBox = new TQGroupBox(2, Qt::Horizontal, i18n("Play devices"), mainBox);
 
         m_playTable = new TQTable(0, 2, groupBox);
         m_playTable->setSorting(false);
@@ -110,16 +110,16 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         m_playTable->setSelectionMode(TQTable::SingleRow);
 
         TQFrame *frame = new TQFrame(groupBox);
-        TQVBoxLayout *vlayout = new TQVBoxLayout(frame);
-        TQGrid *buttons = new TQGrid(2, Horizontal, frame);
+        TQVBoxLayout *vtqlayout = new TQVBoxLayout(frame);
+        TQGrid *buttons = new TQGrid(2, Qt::Horizontal, frame);
         TQPushButton *addButton = new TQPushButton(i18n("New"), buttons);
         m_deletePlayButton = new TQPushButton(i18n("Delete"), buttons);
         m_importButton = new TQPushButton(i18n("Import..."), buttons);
         m_exportButton = new TQPushButton(i18n("Export..."), buttons);
         m_banksButton = new TQPushButton(i18n("Banks..."), buttons);
         m_controllersButton = new TQPushButton(i18n("Control Events..."), buttons);
-        vlayout->addWidget(buttons);
-        vlayout->addStretch(10);
+        vtqlayout->addWidget(buttons);
+        vtqlayout->addStretch(10);
 
         TQToolTip::add
             (addButton,
@@ -153,7 +153,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
                 this, TQT_SLOT(slotPlayDeviceSelected (int, int)));
 
         mainLayout->addWidget(groupBox);
-        groupBox = new TQGroupBox(2, Horizontal, i18n("Record devices"), mainBox);
+        groupBox = new TQGroupBox(2, Qt::Horizontal, i18n("Record devices"), mainBox);
 
         m_recordTable = new TQTable(0, 3, groupBox);
         m_recordTable->setSorting(false);
@@ -169,12 +169,12 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         m_recordTable->setSelectionMode(TQTable::SingleRow);
 
         frame = new TQFrame(groupBox);
-        vlayout = new TQVBoxLayout(frame);
-        buttons = new TQGrid(2, Horizontal, frame);
+        vtqlayout = new TQVBoxLayout(frame);
+        buttons = new TQGrid(2, Qt::Horizontal, frame);
         addButton = new TQPushButton(i18n("New"), buttons);
         m_deleteRecordButton = new TQPushButton(i18n("Delete"), buttons);
-        vlayout->addWidget(buttons);
-        vlayout->addStretch(10);
+        vtqlayout->addWidget(buttons);
+        vtqlayout->addStretch(10);
 
         TQToolTip::add
             (addButton,
@@ -204,17 +204,17 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
         TQFrame* btnBox = new TQFrame(mainBox);
 
-        btnBox->setSizePolicy(
+        btnBox->tqsetSizePolicy(
             TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
         TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox);
 
-        TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10);
-        layout->addStretch(10);
-        layout->addWidget(closeButton);
-        layout->addSpacing(5);
+        TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10);
+        tqlayout->addStretch(10);
+        tqlayout->addWidget(closeButton);
+        tqlayout->addSpacing(5);
 
-        KAction* close = KStdAction::close(this,
+        KAction* close = KStdAction::close(TQT_TQOBJECT(this),
                                            TQT_SLOT(slotClose()),
                                            actionCollection());
 
@@ -326,7 +326,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
             m_playTable->insertRows(deviceCount, 1);
 
-            TQString deviceName = i18n("%1").arg(deviceCount + 1);
+            TQString deviceName = i18n("%1").tqarg(deviceCount + 1);
             TQString connectionName = strtoqstr((*it)->getConnection());
 
             m_playTable->setText(deviceCount, PLAY_NAME_COL,
@@ -360,7 +360,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
             m_recordTable->insertRows(deviceCount, 1);
 
-            TQString deviceName = i18n("%1").arg(deviceCount + 1);
+            TQString deviceName = i18n("%1").tqarg(deviceCount + 1);
             TQString connectionName = strtoqstr((*it)->getConnection());
 
             m_recordTable->setText(deviceCount, RECORD_NAME_COL,
@@ -443,7 +443,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
             TQDataStream reply(replyData, IO_ReadOnly);
             TQString connection;
-            if (replyType == "TQString") {
+            if (replyType == TQSTRING_OBJECT_NAME_STRING) {
                 reply >> connection;
                 list.append(connection);
             }