summaryrefslogtreecommitdiff
authorpaule <paule>2007-01-28 13:09:39 (UTC)
committer paule <paule>2007-01-28 13:09:39 (UTC)
commit7c04a4a9ceb843a3ca52b27840145ed598210068 (patch) (side-by-side diff)
tree882c0fbca1340d9835074a502552ddf166ca497f
parent0db6862d81bd0444362fa6cd1edf0ae579639daa (diff)
downloadopie-7c04a4a9ceb843a3ca52b27840145ed598210068.zip
opie-7c04a4a9ceb843a3ca52b27840145ed598210068.tar.gz
opie-7c04a4a9ceb843a3ca52b27840145ed598210068.tar.bz2
Change to not use new for message boxes; rename sendIR parameter to a more appropriate name
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
@@ -49,26 +49,26 @@ 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;
}
@@ -157,13 +157,13 @@ 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,
QMessageBox::Ok,
QMessageBox::NoButton,
QMessageBox::NoButton);
- mb->exec();
+ mb.exec();
perror("LircHandler::getRemotes");
return NULL;
}
@@ -208,13 +208,13 @@ 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,
QMessageBox::Ok,
QMessageBox::NoButton,
QMessageBox::NoButton);
- mb->exec();
+ mb.exec();
perror("LircHandler::getRemotes");
return NULL;
}
@@ -225,17 +225,17 @@ QStringList LircHandler::getButtons(const char *remoteName)
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)
{
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
@@ -29,7 +29,7 @@ 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);