author | zecke <zecke> | 2002-06-12 15:59:45 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-12 15:59:45 (UTC) |
commit | 9b87f7a2f2de6b5c1bad4f35f76fc7a0fd1ad021 (patch) (side-by-side diff) | |
tree | 3e1ccaae54d96ae3cbb25fba48814fb31c15105d /core/applets | |
parent | 8a53908265672bd3feee0ace40f9e5e38de2f30e (diff) | |
download | opie-9b87f7a2f2de6b5c1bad4f35f76fc7a0fd1ad021.zip opie-9b87f7a2f2de6b5c1bad4f35f76fc7a0fd1ad021.tar.gz opie-9b87f7a2f2de6b5c1bad4f35f76fc7a0fd1ad021.tar.bz2 |
Fix memleak and add OBEX receive support
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 19 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.h | 7 |
2 files changed, 18 insertions, 8 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 @@ -26,4 +26,6 @@ #include <qpe/applnk.h> #include <qpe/config.h> +#include <qpe/ir.h> +#include <qpe/qcopenvelope_qws.h> #include <qdir.h> @@ -150,5 +152,8 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) menu->insertItem( tr("Enable Discovery"), 3 ); - 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); @@ -170,11 +175,17 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) case 3: setIrdaDiscoveryStatus(1); - timerEvent(NULL); + timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l + break; + case 4: { // enable receive{ + qWarning("Enable receive" ); + QCopEnvelope e("QPE/Obex", "receive(bool)" ); + e << true; break; - case 4: + } + case 6: qDebug("FIXME: Bring up pretty menu...\n"); // With table of currently-detected devices. } - + 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 @@ -13,6 +13,6 @@ **********************************************************************/ -#ifndef __SCREENSHOT_APPLET_H__ -#define __SCREENSHOT_APPLET_H__ +#ifndef SCREENSHOT_APPLET_H__ +#define SCREENSHOT_APPLET_H__ @@ -36,5 +36,4 @@ protected: void timerEvent(QTimerEvent *te ); -public slots: private: void mousePressEvent( QMouseEvent * ); @@ -50,5 +49,5 @@ private: QPixmap irdaOffPixmap; QPixmap irdaDiscoveryOnPixmap; - int irdaactive; + int irdaactive; // bool and bitfields later bool irdaactive :1 ; int irdaDiscoveryActive; |