Change to not use new for message boxes; rename sendIR parameter to a more appropriate name

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
@@ -40,44 +40,44 @@ 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;
@@ -148,31 +148,31 @@ QStringList LircHandler::getRemotes(void)
                         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)
 {
@@ -199,52 +199,52 @@ QStringList LircHandler::getButtons(const char *remoteName)
                 {
                         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);
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
@@ -20,19 +20,19 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 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