summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/remote/lirchandler.cpp22
-rw-r--r--noncore/tools/remote/lirchandler.h2
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
@@ -50,5 +50,5 @@ bool LircHandler::connectLirc(void)
if(fd == -1)
{
- QMessageBox *mb = new QMessageBox(QObject::tr("Error"),
+ QMessageBox mb(QObject::tr("Error"),
QObject::tr("Unable to create socket"),
QMessageBox::Critical,
@@ -56,5 +56,5 @@ bool LircHandler::connectLirc(void)
QMessageBox::NoButton,
QMessageBox::NoButton);
- mb->exec();
+ mb.exec();
perror("LircHandler::connectLirc");
return false;
@@ -63,5 +63,5 @@ bool LircHandler::connectLirc(void)
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,
@@ -69,5 +69,5 @@ bool LircHandler::connectLirc(void)
QMessageBox::NoButton,
QMessageBox::NoButton);
- mb->exec();
+ mb.exec();
perror("LircHandler::connectLirc");
return false;
@@ -158,5 +158,5 @@ QStringList LircHandler::getRemotes(void)
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,
@@ -164,5 +164,5 @@ QStringList LircHandler::getRemotes(void)
QMessageBox::NoButton,
QMessageBox::NoButton);
- mb->exec();
+ mb.exec();
perror("LircHandler::getRemotes");
return NULL;
@@ -209,5 +209,5 @@ QStringList LircHandler::getButtons(const char *remoteName)
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,
@@ -215,5 +215,5 @@ QStringList LircHandler::getButtons(const char *remoteName)
QMessageBox::NoButton,
QMessageBox::NoButton);
- mb->exec();
+ mb.exec();
perror("LircHandler::getRemotes");
return NULL;
@@ -226,5 +226,5 @@ QStringList LircHandler::getButtons(const char *remoteName)
}
-int LircHandler::sendIR(const char *irbutton)
+int LircHandler::sendIR(const char *lircaction)
{
const char *read_buffer;
@@ -233,8 +233,8 @@ int LircHandler::sendIR(const char *irbutton)
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)
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
@@ -30,5 +30,5 @@ public:
QStringList getRemotes(void);
QStringList getButtons(const char *remoteName);
- int sendIR(const char *irbutton);
+ int sendIR(const char *lircaction);
bool startLircd(void);
bool stopLircd(void);