From 7a49c3ec647a93c50edc2b2744c148333ed75817 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Mon, 6 Jan 2014 02:47:26 +0100
Subject: Finish renaming klirc -> tdelirc

---
 tdelirc/irkick/CMakeLists.txt    |   2 +-
 tdelirc/irkick/Makefile.am       |   6 +-
 tdelirc/irkick/irkick.h          |   2 +-
 tdelirc/irkick/klircclient.cpp   | 241 ---------------------------------------
 tdelirc/irkick/klircclient.h     | 115 -------------------
 tdelirc/irkick/tdelircclient.cpp | 241 +++++++++++++++++++++++++++++++++++++++
 tdelirc/irkick/tdelircclient.h   | 115 +++++++++++++++++++
 7 files changed, 361 insertions(+), 361 deletions(-)
 delete mode 100644 tdelirc/irkick/klircclient.cpp
 delete mode 100644 tdelirc/irkick/klircclient.h
 create mode 100644 tdelirc/irkick/tdelircclient.cpp
 create mode 100644 tdelirc/irkick/tdelircclient.h

(limited to 'tdelirc')

diff --git a/tdelirc/irkick/CMakeLists.txt b/tdelirc/irkick/CMakeLists.txt
index d8d14d9..415c3b7 100644
--- a/tdelirc/irkick/CMakeLists.txt
+++ b/tdelirc/irkick/CMakeLists.txt
@@ -30,7 +30,7 @@ link_directories(
 
 tde_add_library( irkick_common STATIC_PIC AUTOMOC
   SOURCES irkick.cpp irkick.skel
-    irkick.stub klircclient.cpp
+    irkick.stub tdelircclient.cpp
   LINK tdeui-shared tdelirc-static
 )
 
diff --git a/tdelirc/irkick/Makefile.am b/tdelirc/irkick/Makefile.am
index c30b7bb..6e3e0d3 100644
--- a/tdelirc/irkick/Makefile.am
+++ b/tdelirc/irkick/Makefile.am
@@ -8,7 +8,7 @@ tdeinit_LTLIBRARIES = irkick.la
 CLEANFILES = dummy.cpp
 
 libirkick_common_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDESYCOCA) ../tdelirc/libtdelirc.la
-libirkick_common_la_SOURCES = main.cpp irkick.cpp irkick.skel irkick.stub klircclient.cpp
+libirkick_common_la_SOURCES = main.cpp irkick.cpp irkick.skel irkick.stub tdelircclient.cpp
 
 libirkick_common_la_LDFLAGS = $(all_libraries)
 
@@ -30,11 +30,11 @@ dummy.cpp:
 #kdedservicesdir = $(kde_servicesdir)/kded
 #kdedservices_DATA = irkick.desktop
 #lib_LTLIBRARIES = libkded_irkick.la
-#libkded_irkick_la_SOURCES = irkick.cpp irkick.skel irkick.stub klircclient.cpp
+#libkded_irkick_la_SOURCES = irkick.cpp irkick.skel irkick.stub tdelircclient.cpp
 #libkded_irkick_la_LDFLAGS = $(all_libraries) -module -avoid-version
 #libkded_irkick_la_LIBADD = $(LIB_TDECORE) ../tdelirc/libtdelirc.la
 
-noinst_HEADERS = irkick.h klircclient.h irkick_stub.h
+noinst_HEADERS = irkick.h tdelircclient.h irkick_stub.h
 
 INCLUDES = -I$(srcdir)/../tdelirc $(all_includes)
 
diff --git a/tdelirc/irkick/irkick.h b/tdelirc/irkick/irkick.h
index 786e100..cecc26b 100644
--- a/tdelirc/irkick/irkick.h
+++ b/tdelirc/irkick/irkick.h
@@ -24,7 +24,7 @@
 
 #include "modes.h"
 #include "iractions.h"
-#include "klircclient.h"
+#include "tdelircclient.h"
 
 class TQMouseEvent;
 
diff --git a/tdelirc/irkick/klircclient.cpp b/tdelirc/irkick/klircclient.cpp
deleted file mode 100644
index b7051fc..0000000
--- a/tdelirc/irkick/klircclient.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-//
-//
-// C++ Implementation: $MODULE$
-//
-// Description:
-//
-//
-// Author: (C) 2002 by Malte Starostik
-// Adaption : Gav Wood <gav@kde.org>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <cstring>
-#include <sys/un.h>
-#include <sys/socket.h>
-#include <errno.h>
-
-#include <tqwidget.h>
-#include <tqdialog.h>
-#include <tqtooltip.h>
-#include <tqsocket.h>
-#include <tqsocketnotifier.h>
-#include <tqfile.h>
-
-#include <tdeapplication.h>
-#include <ksystemtray.h>
-#include <kiconloader.h>
-#include <kpassivepopup.h>
-#include <tdemessagebox.h>
-#include <tdepopupmenu.h>
-#include <kdebug.h>
-#include <tdelocale.h>
-#include <tdeaboutdialog.h>
-#include <tdeabouttde.h>
-
-#include <dcopclient.h>
-#include <dcopref.h>
-
-#include "klircclient.h"
-
-
-KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(0), listIsUpToDate(false)
-{
-	connectToLirc();
-}
-
-bool KLircClient::connectToLirc()
-{
-	int sock = ::socket(PF_UNIX, SOCK_STREAM, 0);
-	if(sock == -1) return false;
-
-	sockaddr_un addr;
-	addr.sun_family = AF_UNIX;
-	strcpy(addr.sun_path, "/dev/lircd");
-	if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
-	{	::close(sock);
-		// in case of mandrake...
-		strcpy(addr.sun_path, "/tmp/.lircd");
-		if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
-		{	::close(sock);
-			return false;
-		}
-	}
-
-	theSocket = new TQSocket;
-	theSocket->setSocket(sock);
-	connect(theSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead()));
-	connect(theSocket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotClosed()));
-	updateRemotes();
-	return true;
-}
-
-KLircClient::~KLircClient()
-{
-//	if(theSocket)
-		delete theSocket;
-}
-
-void KLircClient::slotClosed()
-{
-	delete theSocket;
-	theSocket = 0;
-	emit connectionClosed();
-}
-
-const TQStringList KLircClient::remotes() const
-{
-	TQStringList remotes;
-	for(TQMap<TQString, TQStringList>::ConstIterator i = theRemotes.begin(); i != theRemotes.end(); ++i)
-		remotes.append(i.key());
-	remotes.sort();
-	return remotes;
-}
-
-const TQStringList KLircClient::buttons(const TQString &theRemote) const
-{
-	return theRemotes[theRemote];
-}
-
-void KLircClient::slotRead()
-{
-	while (theSocket->bytesAvailable())
-	{
-		TQString line = readLine();
-		if (line == "BEGIN")
-		{
-			// BEGIN
-			// <command>
-			// [SUCCESS|ERROR]
-			// [DATA
-			// n
-			// n lines of data]
-			// END
-			line = readLine();
-			if (line == "SIGHUP")
-			{
-				// Configuration changed
-				do line = readLine();
-				while (!line.isEmpty() && line != "END");
-				updateRemotes();
-				return;
-			}
-			else if (line == "LIST")
-			{
-				// remote control list
-				if (readLine() != "SUCCESS" || readLine() != "DATA")
-				{
-					do line = readLine();
-					while (!line.isEmpty() && line != "END");
-					return;
-				}
-				TQStringList remotes;
-				int count = readLine().toInt();
-				for (int i = 0; i < count; ++i)
-					remotes.append(readLine());
-				do line = readLine();
-				while (!line.isEmpty() && line != "END");
-				if (line.isEmpty())
-					return; // abort on corrupt data
-				for (TQStringList::ConstIterator it = remotes.begin(); it != remotes.end(); ++it)
-					sendCommand("LIST " + *it);
-				return;
-			}
-			else if (line.left(4) == "LIST")
-			{
-				// button list
-				if (readLine() != "SUCCESS" || readLine() != "DATA")
-				{
-					do line = readLine();
-					while (!line.isEmpty() && line != "END");
-					return;
-				}
-				TQString remote = line.mid(5);
-				TQStringList buttons;
-				int count = readLine().toInt();
-				for (int i = 0; i < count; ++i)
-				{
-					// <code> <name>
-					TQString btn = readLine().mid(17);
-					if(btn.isNull()) break;
-					if(btn.startsWith("'") && btn.endsWith("'"))
-						btn = btn.mid(1, btn.length() - 2);
-					buttons.append(btn);
-				}
-				theRemotes.insert(remote, buttons);
-			}
-			do line = readLine();
-			while (!line.isEmpty() && line != "END");
-			listIsUpToDate = true;
-			emit remotesRead();
-		}
-		else
-		{
-			// <code> <repeat> <button name> <remote control name>
-			line.remove(0, 17); // strip code
-			int pos = line.find(' ');
-			if (pos < 0) return;
-			bool ok;
-			int repeat = line.left(pos).toInt(&ok, 16);
-			if (!ok) return;
-			line.remove(0, pos + 1);
-
-			pos = line.find(' ');
-			if (pos < 0) return;
-			TQString btn = line.left(pos);
-			if(btn.startsWith("'") && btn.endsWith("'"))
-				btn = btn.mid(1, btn.length() - 2);
-			line.remove(0, pos + 1);
-
-			emit commandReceived(line, btn, repeat);
-		}
-	}
-}
-
-void KLircClient::updateRemotes()
-{
-	listIsUpToDate = false;
-	theRemotes.clear();
-	sendCommand("LIST");
-}
-
-bool KLircClient::isConnected() const
-{
-	if(!theSocket) return false;
-	return theSocket->state() == TQSocket::Connected;
-}
-
-bool KLircClient::haveFullList() const
-{
-	return listIsUpToDate;
-}
-
-const TQString KLircClient::readLine()
-{
-	if (!theSocket->canReadLine())
-	{	bool timeout;
-		// FIXME: possible race condition -
-		// more might have arrived between canReadLine and waitForMore
-		theSocket->waitForMore(500, &timeout);
-		if (timeout)
-		{	// something's wrong. there ain't no line comin!
-			return TQString();
-		}
-	}
-	TQString line = theSocket->readLine();
-	line.truncate(line.length() - 1);
-	return line;
-}
-
-void KLircClient::sendCommand(const TQString &command)
-{
-	TQString cmd = command + "\n";
-	theSocket->writeBlock(TQFile::encodeName( cmd ), cmd.length());
-}
-
-
-#include "klircclient.moc"
diff --git a/tdelirc/irkick/klircclient.h b/tdelirc/irkick/klircclient.h
deleted file mode 100644
index 3af4637..0000000
--- a/tdelirc/irkick/klircclient.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-//
-// C++ Interface: $MODULE$
-//
-// Description:
-//
-//
-// Author: Gav Wood <gav@kde.org>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-#ifndef KLIRCCLIENT_H
-#define KLIRCCLIENT_H
-
-#include <tqobject.h>
-#include <tqmap.h>
-#include <tqstring.h>
-#include <tqstringlist.h>
-
-class TQSocket;
-class TQSocketNotifier;
-
-/**
-@author Malte Starostik
-@author Gav Wood
-*/
-
-class KLircClient: public TQObject
-{
-	Q_OBJECT
-  
-
-private:
-	struct lirc_config *theConfig;
-	TQSocket *theSocket;
-	TQSocketNotifier *theNotifier;
-	TQMap<TQString, TQStringList> theRemotes;
-	bool listIsUpToDate;
-
-	void updateRemotes();
-	void sendCommand(const TQString &command);
-	const TQString readLine();
-
-private slots:
-	void slotRead();
-	void slotClosed();
-
-signals:
-	/**
-	 * Emitted when the list of controls / buttons was completely read
-	 */
-	void remotesRead();
-
-	/**
-	 * Emitted when a IR command was received
-	 *
-	 * The arguments are the name of the remote control used,
-	 * the name of the button pressed and the repeat counter.
-	 *
-	 * The signal is emitted repeatedly as long as the button
-	 * on the remote control remains pressed.
-	 * The repeat counter starts with 0 and increases
-	 * every time this signal is emitted.
-	 */
-	void commandReceived(const TQString &remote, const TQString &button, int repeatCounter);
-
-	/**
-	 * Emitted when the Lirc connection is closed.
-	 */
-	void connectionClosed();
-
-public:
-	/**
-	 * Query status of connection.
-	 *
-	 * @returns true if connected to lircd.
-	 */
-	bool isConnected() const;
-
-	/**
-	 * Query status of remote list.
-	 *
-	 * Make sure this is true before calling remotes()/buttons(...).
-	 *
-	 * @returns true if up to date.
-	 */
-	bool haveFullList() const;
-
-	/**
-	 * Retrieve list of remote controls.
-	 *
-	 * @returns said list.
-	 */
-	const TQStringList remotes() const;
-
-	/**
-	 * Retrieve list of buttons of a praticular remote control.
-	 *
-	 * @returns said list.
-	 */
-	const TQStringList buttons(const TQString &theRemote) const;
-
-	/**
-	 * Connects to lirc.
-	 *
-	 * @returns true if connection is made.
-	 */
-	bool connectToLirc();
-
-	KLircClient(TQWidget *parent = 0, const char *name = 0);
-	~KLircClient();
-};
-
-#endif
diff --git a/tdelirc/irkick/tdelircclient.cpp b/tdelirc/irkick/tdelircclient.cpp
new file mode 100644
index 0000000..feb69cb
--- /dev/null
+++ b/tdelirc/irkick/tdelircclient.cpp
@@ -0,0 +1,241 @@
+//
+//
+// C++ Implementation: $MODULE$
+//
+// Description:
+//
+//
+// Author: (C) 2002 by Malte Starostik
+// Adaption : Gav Wood <gav@kde.org>, (C) 2003
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <cstring>
+#include <sys/un.h>
+#include <sys/socket.h>
+#include <errno.h>
+
+#include <tqwidget.h>
+#include <tqdialog.h>
+#include <tqtooltip.h>
+#include <tqsocket.h>
+#include <tqsocketnotifier.h>
+#include <tqfile.h>
+
+#include <tdeapplication.h>
+#include <ksystemtray.h>
+#include <kiconloader.h>
+#include <kpassivepopup.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
+#include <kdebug.h>
+#include <tdelocale.h>
+#include <tdeaboutdialog.h>
+#include <tdeabouttde.h>
+
+#include <dcopclient.h>
+#include <dcopref.h>
+
+#include "tdelircclient.h"
+
+
+KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(0), listIsUpToDate(false)
+{
+	connectToLirc();
+}
+
+bool KLircClient::connectToLirc()
+{
+	int sock = ::socket(PF_UNIX, SOCK_STREAM, 0);
+	if(sock == -1) return false;
+
+	sockaddr_un addr;
+	addr.sun_family = AF_UNIX;
+	strcpy(addr.sun_path, "/dev/lircd");
+	if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
+	{	::close(sock);
+		// in case of mandrake...
+		strcpy(addr.sun_path, "/tmp/.lircd");
+		if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
+		{	::close(sock);
+			return false;
+		}
+	}
+
+	theSocket = new TQSocket;
+	theSocket->setSocket(sock);
+	connect(theSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead()));
+	connect(theSocket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotClosed()));
+	updateRemotes();
+	return true;
+}
+
+KLircClient::~KLircClient()
+{
+//	if(theSocket)
+		delete theSocket;
+}
+
+void KLircClient::slotClosed()
+{
+	delete theSocket;
+	theSocket = 0;
+	emit connectionClosed();
+}
+
+const TQStringList KLircClient::remotes() const
+{
+	TQStringList remotes;
+	for(TQMap<TQString, TQStringList>::ConstIterator i = theRemotes.begin(); i != theRemotes.end(); ++i)
+		remotes.append(i.key());
+	remotes.sort();
+	return remotes;
+}
+
+const TQStringList KLircClient::buttons(const TQString &theRemote) const
+{
+	return theRemotes[theRemote];
+}
+
+void KLircClient::slotRead()
+{
+	while (theSocket->bytesAvailable())
+	{
+		TQString line = readLine();
+		if (line == "BEGIN")
+		{
+			// BEGIN
+			// <command>
+			// [SUCCESS|ERROR]
+			// [DATA
+			// n
+			// n lines of data]
+			// END
+			line = readLine();
+			if (line == "SIGHUP")
+			{
+				// Configuration changed
+				do line = readLine();
+				while (!line.isEmpty() && line != "END");
+				updateRemotes();
+				return;
+			}
+			else if (line == "LIST")
+			{
+				// remote control list
+				if (readLine() != "SUCCESS" || readLine() != "DATA")
+				{
+					do line = readLine();
+					while (!line.isEmpty() && line != "END");
+					return;
+				}
+				TQStringList remotes;
+				int count = readLine().toInt();
+				for (int i = 0; i < count; ++i)
+					remotes.append(readLine());
+				do line = readLine();
+				while (!line.isEmpty() && line != "END");
+				if (line.isEmpty())
+					return; // abort on corrupt data
+				for (TQStringList::ConstIterator it = remotes.begin(); it != remotes.end(); ++it)
+					sendCommand("LIST " + *it);
+				return;
+			}
+			else if (line.left(4) == "LIST")
+			{
+				// button list
+				if (readLine() != "SUCCESS" || readLine() != "DATA")
+				{
+					do line = readLine();
+					while (!line.isEmpty() && line != "END");
+					return;
+				}
+				TQString remote = line.mid(5);
+				TQStringList buttons;
+				int count = readLine().toInt();
+				for (int i = 0; i < count; ++i)
+				{
+					// <code> <name>
+					TQString btn = readLine().mid(17);
+					if(btn.isNull()) break;
+					if(btn.startsWith("'") && btn.endsWith("'"))
+						btn = btn.mid(1, btn.length() - 2);
+					buttons.append(btn);
+				}
+				theRemotes.insert(remote, buttons);
+			}
+			do line = readLine();
+			while (!line.isEmpty() && line != "END");
+			listIsUpToDate = true;
+			emit remotesRead();
+		}
+		else
+		{
+			// <code> <repeat> <button name> <remote control name>
+			line.remove(0, 17); // strip code
+			int pos = line.find(' ');
+			if (pos < 0) return;
+			bool ok;
+			int repeat = line.left(pos).toInt(&ok, 16);
+			if (!ok) return;
+			line.remove(0, pos + 1);
+
+			pos = line.find(' ');
+			if (pos < 0) return;
+			TQString btn = line.left(pos);
+			if(btn.startsWith("'") && btn.endsWith("'"))
+				btn = btn.mid(1, btn.length() - 2);
+			line.remove(0, pos + 1);
+
+			emit commandReceived(line, btn, repeat);
+		}
+	}
+}
+
+void KLircClient::updateRemotes()
+{
+	listIsUpToDate = false;
+	theRemotes.clear();
+	sendCommand("LIST");
+}
+
+bool KLircClient::isConnected() const
+{
+	if(!theSocket) return false;
+	return theSocket->state() == TQSocket::Connected;
+}
+
+bool KLircClient::haveFullList() const
+{
+	return listIsUpToDate;
+}
+
+const TQString KLircClient::readLine()
+{
+	if (!theSocket->canReadLine())
+	{	bool timeout;
+		// FIXME: possible race condition -
+		// more might have arrived between canReadLine and waitForMore
+		theSocket->waitForMore(500, &timeout);
+		if (timeout)
+		{	// something's wrong. there ain't no line comin!
+			return TQString();
+		}
+	}
+	TQString line = theSocket->readLine();
+	line.truncate(line.length() - 1);
+	return line;
+}
+
+void KLircClient::sendCommand(const TQString &command)
+{
+	TQString cmd = command + "\n";
+	theSocket->writeBlock(TQFile::encodeName( cmd ), cmd.length());
+}
+
+
+#include "tdelircclient.moc"
diff --git a/tdelirc/irkick/tdelircclient.h b/tdelirc/irkick/tdelircclient.h
new file mode 100644
index 0000000..68c1906
--- /dev/null
+++ b/tdelirc/irkick/tdelircclient.h
@@ -0,0 +1,115 @@
+//
+//
+// C++ Interface: $MODULE$
+//
+// Description:
+//
+//
+// Author: Gav Wood <gav@kde.org>, (C) 2003
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#ifndef TDELIRCCLIENT_H
+#define TDELIRCCLIENT_H
+
+#include <tqobject.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+
+class TQSocket;
+class TQSocketNotifier;
+
+/**
+@author Malte Starostik
+@author Gav Wood
+*/
+
+class KLircClient: public TQObject
+{
+	Q_OBJECT
+  
+
+private:
+	struct lirc_config *theConfig;
+	TQSocket *theSocket;
+	TQSocketNotifier *theNotifier;
+	TQMap<TQString, TQStringList> theRemotes;
+	bool listIsUpToDate;
+
+	void updateRemotes();
+	void sendCommand(const TQString &command);
+	const TQString readLine();
+
+private slots:
+	void slotRead();
+	void slotClosed();
+
+signals:
+	/**
+	 * Emitted when the list of controls / buttons was completely read
+	 */
+	void remotesRead();
+
+	/**
+	 * Emitted when a IR command was received
+	 *
+	 * The arguments are the name of the remote control used,
+	 * the name of the button pressed and the repeat counter.
+	 *
+	 * The signal is emitted repeatedly as long as the button
+	 * on the remote control remains pressed.
+	 * The repeat counter starts with 0 and increases
+	 * every time this signal is emitted.
+	 */
+	void commandReceived(const TQString &remote, const TQString &button, int repeatCounter);
+
+	/**
+	 * Emitted when the Lirc connection is closed.
+	 */
+	void connectionClosed();
+
+public:
+	/**
+	 * Query status of connection.
+	 *
+	 * @returns true if connected to lircd.
+	 */
+	bool isConnected() const;
+
+	/**
+	 * Query status of remote list.
+	 *
+	 * Make sure this is true before calling remotes()/buttons(...).
+	 *
+	 * @returns true if up to date.
+	 */
+	bool haveFullList() const;
+
+	/**
+	 * Retrieve list of remote controls.
+	 *
+	 * @returns said list.
+	 */
+	const TQStringList remotes() const;
+
+	/**
+	 * Retrieve list of buttons of a praticular remote control.
+	 *
+	 * @returns said list.
+	 */
+	const TQStringList buttons(const TQString &theRemote) const;
+
+	/**
+	 * Connects to lirc.
+	 *
+	 * @returns true if connection is made.
+	 */
+	bool connectToLirc();
+
+	KLircClient(TQWidget *parent = 0, const char *name = 0);
+	~KLircClient();
+};
+
+#endif
-- 
cgit v1.2.1