summaryrefslogtreecommitdiff
Unidiff
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)
49 fd = socket(AF_UNIX, SOCK_STREAM, 0); 49 fd = socket(AF_UNIX, SOCK_STREAM, 0);
50 if(fd == -1) 50 if(fd == -1)
51 { 51 {
52 QMessageBox *mb = new QMessageBox(QObject::tr("Error"), 52 QMessageBox mb(QObject::tr("Error"),
53 QObject::tr("Unable to create socket"), 53 QObject::tr("Unable to create socket"),
54 QMessageBox::Critical, 54 QMessageBox::Critical,
55 QMessageBox::Ok, 55 QMessageBox::Ok,
56 QMessageBox::NoButton, 56 QMessageBox::NoButton,
57 QMessageBox::NoButton); 57 QMessageBox::NoButton);
58 mb->exec(); 58 mb.exec();
59 perror("LircHandler::connectLirc"); 59 perror("LircHandler::connectLirc");
60 return false; 60 return false;
61 } 61 }
62 62
63 if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) 63 if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
64 { 64 {
65 QMessageBox *mb = new QMessageBox(QObject::tr("Error"), 65 QMessageBox mb(QObject::tr("Error"),
66 QObject::tr("Could not connect to lircd"), 66 QObject::tr("Could not connect to lircd"),
67 QMessageBox::Critical, 67 QMessageBox::Critical,
68 QMessageBox::Ok, 68 QMessageBox::Ok,
69 QMessageBox::NoButton, 69 QMessageBox::NoButton,
70 QMessageBox::NoButton); 70 QMessageBox::NoButton);
71 mb->exec(); 71 mb.exec();
72 perror("LircHandler::connectLirc"); 72 perror("LircHandler::connectLirc");
73 return false; 73 return false;
74 } 74 }
@@ -157,13 +157,13 @@ QStringList LircHandler::getRemotes(void)
157 157
158 if(strcasecmp(readPacket(), "END") != 0) 158 if(strcasecmp(readPacket(), "END") != 0)
159 { 159 {
160 QMessageBox *mb = new QMessageBox(QObject::tr("Error"), 160 QMessageBox mb(QObject::tr("Error"),
161 QObject::tr("Bad packet while communicating with lircd"), 161 QObject::tr("Bad packet while communicating with lircd"),
162 QMessageBox::Critical, 162 QMessageBox::Critical,
163 QMessageBox::Ok, 163 QMessageBox::Ok,
164 QMessageBox::NoButton, 164 QMessageBox::NoButton,
165 QMessageBox::NoButton); 165 QMessageBox::NoButton);
166 mb->exec(); 166 mb.exec();
167 perror("LircHandler::getRemotes"); 167 perror("LircHandler::getRemotes");
168 return NULL; 168 return NULL;
169 } 169 }
@@ -208,13 +208,13 @@ QStringList LircHandler::getButtons(const char *remoteName)
208 208
209 if(strcasecmp(readPacket(), "END") != 0) 209 if(strcasecmp(readPacket(), "END") != 0)
210 { 210 {
211 QMessageBox *mb = new QMessageBox(QObject::tr("Error"), 211 QMessageBox mb(QObject::tr("Error"),
212 QObject::tr("Bad packet while communicating with lircd"), 212 QObject::tr("Bad packet while communicating with lircd"),
213 QMessageBox::Critical, 213 QMessageBox::Critical,
214 QMessageBox::Ok, 214 QMessageBox::Ok,
215 QMessageBox::NoButton, 215 QMessageBox::NoButton,
216 QMessageBox::NoButton); 216 QMessageBox::NoButton);
217 mb->exec(); 217 mb.exec();
218 perror("LircHandler::getRemotes"); 218 perror("LircHandler::getRemotes");
219 return NULL; 219 return NULL;
220 } 220 }
@@ -225,17 +225,17 @@ QStringList LircHandler::getButtons(const char *remoteName)
225 return list; 225 return list;
226} 226}
227 227
228int LircHandler::sendIR(const char *irbutton) 228int LircHandler::sendIR(const char *lircaction)
229{ 229{
230 const char *read_buffer; 230 const char *read_buffer;
231 bool done=false; 231 bool done=false;
232 232
233 if(connectLirc()) { 233 if(connectLirc()) {
234 printf("fd2: %d\n", fd); 234 printf("fd2: %d\n", fd);
235 printf("%s", irbutton); 235 printf("%s", lircaction);
236 236
237 printf("1\n"); 237 printf("1\n");
238 printf("%d\n", write(fd, irbutton, strlen(irbutton) ) ); 238 printf("%d\n", write(fd, lircaction, strlen(lircaction) ) );
239 printf("2\n"); 239 printf("2\n");
240 while(!done) 240 while(!done)
241 { 241 {
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:
29 LircHandler(void); 29 LircHandler(void);
30 QStringList getRemotes(void); 30 QStringList getRemotes(void);
31 QStringList getButtons(const char *remoteName); 31 QStringList getButtons(const char *remoteName);
32 int sendIR(const char *irbutton); 32 int sendIR(const char *lircaction);
33 bool startLircd(void); 33 bool startLircd(void);
34 bool stopLircd(void); 34 bool stopLircd(void);
35 bool isLircdRunning(void); 35 bool isLircdRunning(void);