From d4ad38145541b8aabb0623e9a81d72f4d4310c90 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:22:34 -0600 Subject: Rename obsolete tq methods to standard names --- noatun/modules/infrared/irprefs.cpp | 18 +++++++++--------- noatun/modules/keyz/keyz.cpp | 4 ++-- noatun/modules/splitplaylist/find.cpp | 10 +++++----- noatun/modules/systray/yhconfigwidget.ui | 2 +- noatun/modules/winskin/winSkinConfig.cpp | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'noatun/modules') diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 98150f40..4e3a0711 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -54,35 +54,35 @@ TQMap IRPrefs::s_commands; IRPrefs::IRPrefs(TQObject *parent) : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent) { - TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setColStretch(1, 1); + TQGridLayout *layout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); + layout->setColStretch(1, 1); TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this); - tqlayout->addMultiCellWidget(label, 0, 0, 0, 4); + layout->addMultiCellWidget(label, 0, 0, 0, 4); label->setBuddy(m_commands = new KListView(this)); - tqlayout->addMultiCellWidget(m_commands, 1, 1, 0, 4); + layout->addMultiCellWidget(m_commands, 1, 1, 0, 4); label = new TQLabel(i18n("&Action:"), this); - tqlayout->addWidget(label, 2, 0); + layout->addWidget(label, 2, 0); label->setBuddy(m_action = new KComboBox(this)); m_action->setEnabled(false); - tqlayout->addWidget(m_action, 2, 1); + layout->addWidget(m_action, 2, 1); m_repeat = new TQCheckBox(i18n("&Repeat"), this); m_repeat->setEnabled(false); - tqlayout->addWidget(m_repeat, 2, 2); + layout->addWidget(m_repeat, 2, 2); label = new TQLabel(i18n("&Interval:"), this); - tqlayout->addWidget(label, 2, 3); + layout->addWidget(label, 2, 3); label->setBuddy(m_interval = new KIntSpinBox(this)); m_interval->setMinValue(1); m_interval->setMaxValue(0xff); m_interval->setValue(10); m_interval->setEnabled(false); - tqlayout->addWidget(m_interval, 2, 4); + layout->addWidget(m_interval, 2, 4); connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen())); connect(m_commands, diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index e1f2286a..143be362 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -174,9 +174,9 @@ KeyzPrefs::KeyzPrefs( TQObject *parent ) : CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings", parent ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); m_chooser = new KKeyChooser( Keyz::accel(), this ); - tqlayout->addWidget( m_chooser ); + layout->addWidget( m_chooser ); } void KeyzPrefs::save() diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index d167e02e..5d378a79 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -11,8 +11,8 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C mainWidget->setMinimumWidth(320); setMainWidget(mainWidget); - TQGridLayout *tqlayout=new TQGridLayout(mainWidget); - tqlayout->setSpacing(KDialog::spacingHint()); + TQGridLayout *layout=new TQGridLayout(mainWidget); + layout->setSpacing(KDialog::spacingHint()); mText=new KHistoryCombo(mainWidget); mText->setMaxCount(10); @@ -22,9 +22,9 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C mRegexp=new TQCheckBox(i18n("&Regular expression"), mainWidget); mBackwards=new TQCheckBox(i18n("Find &backwards"), mainWidget); - tqlayout->addMultiCellWidget(mText, 0, 0, 0, 1); - tqlayout->addWidget(mRegexp, 1, 0); - tqlayout->addWidget(mBackwards, 1, 1); + layout->addMultiCellWidget(mText, 0, 0, 0, 1); + layout->addWidget(mRegexp, 1, 0); + layout->addWidget(mBackwards, 1, 1); connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked())); diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui index 3c14d3df..02ea0a1c 100644 --- a/noatun/modules/systray/yhconfigwidget.ui +++ b/noatun/modules/systray/yhconfigwidget.ui @@ -231,7 +231,7 @@ - tqlayout1 + layout1 diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 43940bb7..70a22ea5 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -29,7 +29,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : "style", TQT_TQOBJECT(parent)) { - // Make a token horizontal tqlayout box + // Make a token horizontal layout box vbox = new TQVBoxLayout(this); vbox->setSpacing( 6 ); vbox->setMargin( 0 ); -- cgit v1.2.1