6 files changed, 19 insertions, 19 deletions
diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp
index bd8a65bd..76b6dc73 100644
--- a/noatun/modules/infrared/infrared.cpp
+++ b/noatun/modules/infrared/infrared.cpp
@@ -14,7 +14,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new InfraRed();
 	}
@@ -28,12 +28,12 @@ InfraRed::InfraRed()
 	NOATUNPLUGINC(InfraRed);
 	m_lirc = new Lirc(this);
 	connect(m_lirc,
-	        TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)),
-	        TQT_SLOT(slotCommand(const TQString &, const TQString &, int)));
+	        TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)),
+	        TQ_SLOT(slotCommand(const TQString &, const TQString &, int)));
 
 	IRPrefs::s_lirc = m_lirc;
 	volume=0;
-	TQTimer::singleShot(0, this, TQT_SLOT(start()));
+	TQTimer::singleShot(0, this, TQ_SLOT(start()));
 }
 
 InfraRed::~InfraRed()
diff --git a/noatun/modules/infrared/infrared.h b/noatun/modules/infrared/infrared.h
index a8c9bd56..df3883d8 100644
--- a/noatun/modules/infrared/infrared.h
+++ b/noatun/modules/infrared/infrared.h
@@ -10,7 +10,7 @@ class Lirc;
 
 class InfraRed : public TQObject, public Plugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 NOATUNPLUGIND
 public:
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 06a1ade4..829f51aa 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -84,26 +84,26 @@ IRPrefs::IRPrefs(TQObject *parent)
 	m_interval->setEnabled(false);
 	layout->addWidget(m_interval, 2, 4);
 
-	connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen()));
+	connect(s_lirc, TQ_SIGNAL(remotesRead()), TQ_SLOT(reopen()));
 	connect(m_commands,
-	        TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-			TQT_SLOT(slotCommandSelected(TQListViewItem *)));
+	        TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+			TQ_SLOT(slotCommandSelected(TQListViewItem *)));
 	connect(m_action,
-	        TQT_SIGNAL(activated(int)),
-			TQT_SLOT(slotActionActivated(int)));
+	        TQ_SIGNAL(activated(int)),
+			TQ_SLOT(slotActionActivated(int)));
 	connect(m_repeat,
-	        TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotRepeatToggled(bool)));
+	        TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotRepeatToggled(bool)));
 	connect(m_interval,
-	        TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotIntervalChanged(int)));
+	        TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotIntervalChanged(int)));
 
 	reopen();
 }
 
 void IRPrefs::save()
 {
-	TDEConfig *c = kapp->config();
+	TDEConfig *c = tdeApp->config();
 	TDEConfigGroupSaver groupSaver(c, "Infrared");
 	c->writeEntry("CommandCount", s_commands.count());
 	int i = 1;
@@ -282,7 +282,7 @@ void IRPrefs::readConfig()
 {
 	if (s_configRead)
 		return;
-	TDEConfig *c = kapp->config();
+	TDEConfig *c = tdeApp->config();
 	TDEConfigGroupSaver groupSaver(c, "Infrared");
 	int count = c->readNumEntry("CommandCount");
 	for (int i = 1; i <= count; ++i)
diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h
index 6646456e..925cf638 100644
--- a/noatun/modules/infrared/irprefs.h
+++ b/noatun/modules/infrared/irprefs.h
@@ -14,7 +14,7 @@ class Lirc;
 
 class IRPrefs : public CModule
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	enum Action
diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp
index 2487278b..2a6e2ec5 100644
--- a/noatun/modules/infrared/lirc.cpp
+++ b/noatun/modules/infrared/lirc.cpp
@@ -34,7 +34,7 @@ Lirc::Lirc(TQObject *parent)
 	
 	m_socket = new TQSocket;
 	m_socket->setSocket(sock);
-	connect(m_socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead()));
 	update();
 }
 
diff --git a/noatun/modules/infrared/lirc.h b/noatun/modules/infrared/lirc.h
index c770cbac..4b455da5 100644
--- a/noatun/modules/infrared/lirc.h
+++ b/noatun/modules/infrared/lirc.h
@@ -12,7 +12,7 @@ typedef TQMap<TQString, TQStringList> Remotes;
 
 class Lirc : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	/**