Fix memleak and add OBEX receive support

2 files changed, 19 insertions, 9 deletions

diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index a197957..67e7f22 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -27,2 +27,4 @@
 #include <qpe/config.h>
+#include <qpe/ir.h>
+#include <qpe/qcopenvelope_qws.h>
 
@@ -151,5 +153,8 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
 
-        QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) );
+        if( Ir::supported() ){
+          menu->insertItem( tr("Enable Receive"), 4 );
+        }
+        QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) );
         ret = menu->exec(p, 2);
-
+          
         qDebug("ret was %d\n", ret);
@@ -171,5 +176,11 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
                 setIrdaDiscoveryStatus(1);
-                timerEvent(NULL);
+                timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
                 break;
-        case 4:
+        case 4: { // enable receive{
+          qWarning("Enable receive" );
+          QCopEnvelope e("QPE/Obex", "receive(bool)" );
+          e << true;
+          break;
+        }
+        case 6:
                 qDebug("FIXME: Bring up pretty menu...\n");
@@ -177,3 +188,3 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
         }
-
+        delete menu; // Can somebody explain why use a QPopupMenu* and not QPopupMenu nor QAction. with out delete we will leak cause QPopupMenu doesn't have a parent in this case
 }
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 2f84909..bb174e8 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -14,4 +14,4 @@
 
-#ifndef __SCREENSHOT_APPLET_H__
-#define __SCREENSHOT_APPLET_H__
+#ifndef SCREENSHOT_APPLET_H__
+#define SCREENSHOT_APPLET_H__
 
@@ -37,3 +37,2 @@ protected:
 
-public slots:
 private:
@@ -51,3 +50,3 @@ private:
     QPixmap irdaDiscoveryOnPixmap;
-    int irdaactive;
+    int irdaactive; // bool and bitfields later bool irdaactive :1 ;
     int irdaDiscoveryActive;