diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:35 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:35 -0600 |
commit | 6ca08e7a881c0c97f338e0085f75af04ec08ad04 (patch) | |
tree | 5462bef0f060df1c19e3fcb98250e5cfa24edc11 /src/gui/studio/DeviceManagerDialog.cpp | |
parent | 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a (diff) | |
download | rosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.tar.gz rosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.
Diffstat (limited to 'src/gui/studio/DeviceManagerDialog.cpp')
-rw-r--r-- | src/gui/studio/DeviceManagerDialog.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp index 8cc6499..6f5cbb4 100644 --- a/src/gui/studio/DeviceManagerDialog.cpp +++ b/src/gui/studio/DeviceManagerDialog.cpp @@ -62,7 +62,7 @@ #include <tqframe.h> #include <tqgrid.h> #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqsizepolicy.h> #include <tqstring.h> @@ -110,7 +110,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, m_playTable->setSelectionMode(TQTable::SingleRow); TQFrame *frame = new TQFrame(groupBox); - TQVBoxLayout *vlayout = new TQVBoxLayout(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); @@ -118,8 +118,8 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, 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, @@ -169,12 +169,12 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, m_recordTable->setSelectionMode(TQTable::SingleRow); frame = new TQFrame(groupBox); - vlayout = new TQVBoxLayout(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,15 +204,15 @@ 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(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), @@ -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, |