Rename a number of old tq methods that are no longer tq specific

1 files changed, 16 insertions, 16 deletions

diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index c83326ad..fb81199d 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -1,5 +1,5 @@
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <noatun/app.h>
@@ -54,35 +54,35 @@ TQMap<TQString, IRPrefs::Command> 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,
@@ -109,9 +109,9 @@ void IRPrefs::save()
 	int i = 1;
 	for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it)
 	{
-		c->writePathEntry(TQString("Command_%1").tqarg(i), it.key());
-		c->writeEntry(TQString("Action_%1").tqarg(i), (int)((*it).action));
-		c->writeEntry(TQString("Interval_%1").tqarg(i), (*it).interval);
+		c->writePathEntry(TQString("Command_%1").arg(i), it.key());
+		c->writeEntry(TQString("Action_%1").arg(i), (int)((*it).action));
+		c->writeEntry(TQString("Interval_%1").arg(i), (*it).interval);
 		++i;
 	}
 }
@@ -288,9 +288,9 @@ void IRPrefs::readConfig()
 	for (int i = 1; i <= count; ++i)
 	{
 		Command cmd;
-		cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").tqarg(i)));
-		cmd.interval = c->readNumEntry(TQString("Interval_%1").tqarg(i));
-		s_commands.insert(c->readPathEntry(TQString("Command_%1").tqarg(i)), cmd);
+		cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").arg(i)));
+		cmd.interval = c->readNumEntry(TQString("Interval_%1").arg(i));
+		s_commands.insert(c->readPathEntry(TQString("Command_%1").arg(i)), cmd);
 	}
 	s_configRead = true;
 }