From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 11 Jun 2011 06:00:15 +0000
Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and
 Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 noatun/modules/infrared/lirc.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'noatun/modules/infrared/lirc.cpp')

diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp
index 363849c1..731bb5c1 100644
--- a/noatun/modules/infrared/lirc.cpp
+++ b/noatun/modules/infrared/lirc.cpp
@@ -12,8 +12,8 @@
 
 #include "lirc.h"
 
-Lirc::Lirc(TQObject *parent)
-	: TQObject(parent),
+Lirc::Lirc(TQObject *tqparent)
+	: TQObject(tqparent),
 	  m_socket(0)
 {
 	int sock = ::socket(PF_UNIX, SOCK_STREAM, 0);
@@ -124,7 +124,7 @@ void Lirc::slotRead()
 		{
 			// <code> <repeat> <button name> <remote control name>
 			line.remove(0, 17); // strip code
-			int pos = line.find(' ');
+			int pos = line.tqfind(' ');
 			if (pos < 0)
 				return;
 			bool ok;
@@ -133,7 +133,7 @@ void Lirc::slotRead()
 				return;
 			line.remove(0, pos + 1);
 			
-			pos = line.find(' ');
+			pos = line.tqfind(' ');
 			if (pos < 0)
 				return;
 			TQString btn = line.left(pos);
@@ -153,11 +153,11 @@ void Lirc::update()
 const TQString Lirc::readLine()
 {
 	if (!m_socket->bytesAvailable())
-		return TQString::null;
+		return TQString();
 
 	TQString line = m_socket->readLine();
 	if (line.isEmpty())
-		return TQString::null;
+		return TQString();
 
 	line.remove(line.length() - 1, 1);
 	return line;
-- 
cgit v1.2.1