2 files changed, 12 insertions, 12 deletions

diff --git a/noncore/tools/remote/lirchandler.cpp b/noncore/tools/remote/lirchandler.cpp
index f44806e..263b740 100644
--- a/noncore/tools/remote/lirchandler.cpp
+++ b/noncore/tools/remote/lirchandler.cpp
@@ -4,267 +4,267 @@ Copyright (C) 2007 Paul Eggleton & Thomas Stephens
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
 #include <errno.h>
 
 #include <qstring.h>
 #include <qmessagebox.h>
 #include <qobject.h>
 #include <opie2/oprocess.h>
 
 #include "lirchandler.h"
 
 #define PACKET_SIZE 256
 #define TIMEOUT 3
 #define LIRCD_SOCKET "/dev/lircd"
 #define LIRCD_SERVICECMD "/etc/init.d/lircd"
 
 using namespace Opie::Core;
 
 LircHandler::LircHandler(void)
 {
         fd = 0;
         addr.sun_family=AF_UNIX;
         strcpy(addr.sun_path, LIRCD_SOCKET);
 }
 
 bool LircHandler::connectLirc(void)
 {
         fd = socket(AF_UNIX, SOCK_STREAM, 0);
         if(fd == -1)
         {
-                QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+                QMessageBox mb(QObject::tr("Error"),
                                                                                         QObject::tr("Unable to create socket"),
                                                                                         QMessageBox::Critical,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
-                mb->exec();
+                mb.exec();
                 perror("LircHandler::connectLirc");
                 return false;
         }
         
         if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
         {
-                QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+                QMessageBox mb(QObject::tr("Error"),
                                                                                         QObject::tr("Could not connect to lircd"),
                                                                                         QMessageBox::Critical,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
-                mb->exec();
+                mb.exec();
                 perror("LircHandler::connectLirc");
                 return false;
         }
         
         return true;
 }
 
 //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html
 const char *LircHandler::readPacket()
 {
         static char buffer[PACKET_SIZE+1]="";
         char *end;
         static int ptr=0;
         ssize_t ret;
         int timeout = 0;
 
         if(ptr>0)
         {
                 memmove(buffer,buffer+ptr,strlen(buffer+ptr)+1);
                 ptr=strlen(buffer);
                 end=strchr(buffer,'\n');
         }
         else
         {
                 end=NULL;
         }
         alarm(TIMEOUT);
         while(end==NULL)
         {
                 if(PACKET_SIZE<=ptr)
                 {
                         fprintf(stderr,"readPacket: bad packet\n");
                         ptr=0;
                         return(NULL);
                 }
                 ret=read(fd,buffer+ptr,PACKET_SIZE-ptr);
 
                 if(ret<=0 || timeout)
                 {
                         if(timeout)
                         {
                                 fprintf(stderr,"readPacket: timeout\n");
                         }
                         else
                         {
                                 alarm(0);
                         }
                         ptr=0;
                         return(NULL);
                 }
                 buffer[ptr+ret]=0;
                 ptr=strlen(buffer);
                 end=strchr(buffer,'\n');
         }
         alarm(0);
 
         end[0]=0;
         ptr=strlen(buffer)+1;
 //#       ifdef DEBUG
         //printf("buffer: -%s-\n",buffer);
 //#       endif
         return(buffer);
 }
 
 QStringList LircHandler::getRemotes(void)
 {
         const char write_buffer[] = "LIST\n";
         const char *readbuffer;
         int i, numlines;
         QStringList list;
         
         if(connectLirc()) {
                 write(fd, write_buffer, strlen(write_buffer) );
         
                 for(i=0; i<5; i++)
                 {
                         readbuffer = readPacket();
                 }
         
                 numlines = atoi(readbuffer);
         
                 for(i=0; i<numlines; i++)
                 {
                         list+=readPacket();
                 }
         
                 if(strcasecmp(readPacket(), "END") != 0)
                 {
-                        QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+                        QMessageBox mb(QObject::tr("Error"),
                                                                                                 QObject::tr("Bad packet while communicating with lircd"),
                                                                                                 QMessageBox::Critical,
                                                                                                 QMessageBox::Ok,
                                                                                                 QMessageBox::NoButton,
                                                                                                 QMessageBox::NoButton);
-                        mb->exec();
+                        mb.exec();
                         perror("LircHandler::getRemotes");
                         return NULL;
                 }
         
                 ::close(fd);
         }
         
         return list;
 }
 
 QStringList LircHandler::getButtons(const char *remoteName)
 {
         QString write_buffer = "LIST ";
         const char *readbuffer;
         int i, j, numlines;
         QStringList list;
         QString string;
 
         write_buffer += remoteName;
         write_buffer += '\n';
 
         if(connectLirc()) {
                 write(fd, write_buffer.latin1(), strlen(write_buffer) );
         
                 for(i=0; i<5; i++)
                 {
                         readbuffer = readPacket();
                 }
         
                 numlines = atoi(readbuffer);
         
                 for(i=0; i<numlines; i++)
                 {
                         list+=readPacket();
                         for(j=0; j<list[i].length(); j++)
                         {
                                 if(list[i][j] == ' ')
                                         break;
                         }
                         list[i].remove(0, j+1);
                 }
 
                 if(strcasecmp(readPacket(), "END") != 0)
                 {
-                        QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+                        QMessageBox mb(QObject::tr("Error"),
                                                                                                 QObject::tr("Bad packet while communicating with lircd"),
                                                                                                 QMessageBox::Critical,
                                                                                                 QMessageBox::Ok,
                                                                                                 QMessageBox::NoButton,
                                                                                                 QMessageBox::NoButton);
-                        mb->exec();
+                        mb.exec();
                         perror("LircHandler::getRemotes");
                         return NULL;
                 }
                 
                 ::close(fd);
         }
                 
         return list;
 }
 
-int LircHandler::sendIR(const char *irbutton)
+int LircHandler::sendIR(const char *lircaction)
 {
         const char *read_buffer;
         bool done=false;
 
         if(connectLirc()) {
                 printf("fd2: %d\n", fd);
-                printf("%s", irbutton);
+                printf("%s", lircaction);
         
                 printf("1\n");
-                printf("%d\n", write(fd, irbutton, strlen(irbutton) ) );
+                printf("%d\n", write(fd, lircaction, strlen(lircaction) ) );
                 printf("2\n");
                 while(!done)
                 {
                         read_buffer=readPacket();
                         printf("%s\n", read_buffer);
                         if(strcasecmp(read_buffer, "END") == 0)
                         {
                                 printf("done reading packet\n");
                                 done=true;
                         }
                 }
                 ::close(fd);
                 return 1;
         }
         else
                 return 0;
 }
 
 bool LircHandler::startLircd(void)
 {
         return (system(LIRCD_SERVICECMD " start") == 0);
 }
 
 bool LircHandler::stopLircd(void)
 {
         return (system(LIRCD_SERVICECMD " stop") == 0);
 }
 
 bool LircHandler::isLircdRunning(void)
 {
         return (OProcess::processPID("lircd") != 0);
 }
diff --git a/noncore/tools/remote/lirchandler.h b/noncore/tools/remote/lirchandler.h
index 29894b4..c7665cb 100644
--- a/noncore/tools/remote/lirchandler.h
+++ b/noncore/tools/remote/lirchandler.h
@@ -1,38 +1,38 @@
 /*
 Opie-Remote.  emulates remote controls on an iPaq (and maybe a Zaurus) in Opie.
 Copyright (C) 2007 Paul Eggleton & Thomas Stephens
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #ifndef LIRCHANDLER_H
 #define LIRCHANDLER_H
 
 class LircHandler
 {
 private:
         bool connectLirc(void);
         const char *readPacket();
         
         struct sockaddr_un addr;
         int fd;
 public:
         LircHandler(void);
         QStringList getRemotes(void);
         QStringList getButtons(const char *remoteName);
-        int sendIR(const char *irbutton);
+        int sendIR(const char *lircaction);
         bool startLircd(void);
         bool stopLircd(void);
         bool isLircdRunning(void);
 };
 
 #endif