1 files changed, 17 insertions, 17 deletions

diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 518260d..096dfb9 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "BankEditorDialog.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 
 #include <klocale.h>
@@ -100,20 +100,20 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
 
     TQFrame* btnBox = new TQFrame(mainFrame);
 
-    btnBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    btnBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
+    TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
 
     m_closeButton = new TQPushButton(btnBox);
     m_applyButton = new TQPushButton(i18n("Apply"), btnBox);
     m_resetButton = new TQPushButton(i18n("Reset"), btnBox);
 
-    tqlayout->addStretch(10);
-    tqlayout->addWidget(m_applyButton);
-    tqlayout->addWidget(m_resetButton);
-    tqlayout->addSpacing(15);
-    tqlayout->addWidget(m_closeButton);
-    tqlayout->addSpacing(5);
+    layout->addStretch(10);
+    layout->addWidget(m_applyButton);
+    layout->addWidget(m_resetButton);
+    layout->addSpacing(15);
+    layout->addWidget(m_closeButton);
+    layout->addSpacing(5);
 
     connect(m_applyButton, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotApply()));
@@ -206,8 +206,8 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
     vboxLayout->addWidget(m_keyMappingEditor);
     m_keyMappingEditor->hide();
 
-    m_programEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
-    m_keyMappingEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
+    m_programEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
+    m_keyMappingEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
 
     m_optionBox = new TQVGroupBox(i18n("Options"), vbox);
     vboxLayout->addWidget(m_optionBox);
@@ -593,7 +593,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
 
     // delete banks which are no longer present
     //
-    std::vector<TQListViewItem*> tqchildrenToDelete;
+    std::vector<TQListViewItem*> childrenToDelete;
 
     TQListViewItem* child = deviceItem->firstChild();
 
@@ -603,7 +603,7 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
             dynamic_cast<MidiBankListViewItem *>(child);
         if (bankItem) {
             if (bankItem->getBank() >= int(banks.size()))
-                tqchildrenToDelete.push_back(child);
+                childrenToDelete.push_back(child);
             else { // update the banks MSB/LSB which might have changed
                 bankItem->setPercussion(banks[bankItem->getBank()].isPercussion());
                 bankItem->setMSB(banks[bankItem->getBank()].getMSB());
@@ -615,15 +615,15 @@ BankEditorDialog::updateDeviceItem(MidiDeviceListViewItem* deviceItem)
             dynamic_cast<MidiKeyMapListViewItem *>(child);
         if (keyItem) {
             if (!midiDevice->getKeyMappingByName(qstrtostr(keyItem->getName()))) {
-                tqchildrenToDelete.push_back(child);
+                childrenToDelete.push_back(child);
             }
         }
 
         child = child->nextSibling();
     }
 
-    for (unsigned int i = 0; i < tqchildrenToDelete.size(); ++i)
-        delete tqchildrenToDelete[i];
+    for (unsigned int i = 0; i < childrenToDelete.size(); ++i)
+        delete childrenToDelete[i];
 }
 
 bool
@@ -1045,7 +1045,7 @@ BankEditorDialog::slotAddKeyMapping()
             if (n == 1)
                 name = i18n("<new mapping>");
             else
-                name = i18n("<new mapping %1>").tqarg(n);
+                name = i18n("<new mapping %1>").arg(n);
         }
 
         MidiKeyMapping newKeyMapping(qstrtostr(name));