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
@@ -51,3 +51,3 @@ bool LircHandler::connectLirc(void)
         {
-                QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+                QMessageBox mb(QObject::tr("Error"),
                                                                                         QObject::tr("Unable to create socket"),
@@ -57,3 +57,3 @@ bool LircHandler::connectLirc(void)
                                                                                         QMessageBox::NoButton);
-                mb->exec();
+                mb.exec();
                 perror("LircHandler::connectLirc");
@@ -64,3 +64,3 @@ bool LircHandler::connectLirc(void)
         {
-                QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+                QMessageBox mb(QObject::tr("Error"),
                                                                                         QObject::tr("Could not connect to lircd"),
@@ -70,3 +70,3 @@ bool LircHandler::connectLirc(void)
                                                                                         QMessageBox::NoButton);
-                mb->exec();
+                mb.exec();
                 perror("LircHandler::connectLirc");
@@ -159,3 +159,3 @@ QStringList LircHandler::getRemotes(void)
                 {
-                        QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+                        QMessageBox mb(QObject::tr("Error"),
                                                                                                 QObject::tr("Bad packet while communicating with lircd"),
@@ -165,3 +165,3 @@ QStringList LircHandler::getRemotes(void)
                                                                                                 QMessageBox::NoButton);
-                        mb->exec();
+                        mb.exec();
                         perror("LircHandler::getRemotes");
@@ -210,3 +210,3 @@ QStringList LircHandler::getButtons(const char *remoteName)
                 {
-                        QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+                        QMessageBox mb(QObject::tr("Error"),
                                                                                                 QObject::tr("Bad packet while communicating with lircd"),
@@ -216,3 +216,3 @@ QStringList LircHandler::getButtons(const char *remoteName)
                                                                                                 QMessageBox::NoButton);
-                        mb->exec();
+                        mb.exec();
                         perror("LircHandler::getRemotes");
@@ -227,3 +227,3 @@ QStringList LircHandler::getButtons(const char *remoteName)
 
-int LircHandler::sendIR(const char *irbutton)
+int LircHandler::sendIR(const char *lircaction)
 {
@@ -234,6 +234,6 @@ int LircHandler::sendIR(const char *irbutton)
                 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");
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
@@ -31,3 +31,3 @@ public:
         QStringList getButtons(const char *remoteName);
-        int sendIR(const char *irbutton);
+        int sendIR(const char *lircaction);
         bool startLircd(void);