author | zecke <zecke> | 2002-06-12 15:59:45 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-12 15:59:45 (UTC) |
commit | 9b87f7a2f2de6b5c1bad4f35f76fc7a0fd1ad021 (patch) (unidiff) | |
tree | 3e1ccaae54d96ae3cbb25fba48814fb31c15105d /core | |
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 @@ | |||
26 | #include <qpe/applnk.h> | 26 | #include <qpe/applnk.h> |
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | #include <qpe/ir.h> | ||
29 | #include <qpe/qcopenvelope_qws.h> | ||
28 | 30 | ||
29 | #include <qdir.h> | 31 | #include <qdir.h> |
@@ -150,5 +152,8 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) | |||
150 | menu->insertItem( tr("Enable Discovery"), 3 ); | 152 | menu->insertItem( tr("Enable Discovery"), 3 ); |
151 | 153 | ||
152 | QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); | 154 | if( Ir::supported() ){ |
155 | menu->insertItem( tr("Enable Receive"), 4 ); | ||
156 | } | ||
157 | QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) ); | ||
153 | ret = menu->exec(p, 2); | 158 | ret = menu->exec(p, 2); |
154 | 159 | ||
@@ -170,11 +175,17 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) | |||
170 | case 3: | 175 | case 3: |
171 | setIrdaDiscoveryStatus(1); | 176 | setIrdaDiscoveryStatus(1); |
172 | timerEvent(NULL); | 177 | timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l |
178 | break; | ||
179 | case 4: { // enable receive{ | ||
180 | qWarning("Enable receive" ); | ||
181 | QCopEnvelope e("QPE/Obex", "receive(bool)" ); | ||
182 | e << true; | ||
173 | break; | 183 | break; |
174 | case 4: | 184 | } |
185 | case 6: | ||
175 | qDebug("FIXME: Bring up pretty menu...\n"); | 186 | qDebug("FIXME: Bring up pretty menu...\n"); |
176 | // With table of currently-detected devices. | 187 | // With table of currently-detected devices. |
177 | } | 188 | } |
178 | 189 | 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 | |
179 | } | 190 | } |
180 | 191 | ||
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 @@ | |||
13 | **********************************************************************/ | 13 | **********************************************************************/ |
14 | 14 | ||
15 | #ifndef __SCREENSHOT_APPLET_H__ | 15 | #ifndef SCREENSHOT_APPLET_H__ |
16 | #define __SCREENSHOT_APPLET_H__ | 16 | #define SCREENSHOT_APPLET_H__ |
17 | 17 | ||
18 | 18 | ||
@@ -36,5 +36,4 @@ protected: | |||
36 | void timerEvent(QTimerEvent *te ); | 36 | void timerEvent(QTimerEvent *te ); |
37 | 37 | ||
38 | public slots: | ||
39 | private: | 38 | private: |
40 | void mousePressEvent( QMouseEvent * ); | 39 | void mousePressEvent( QMouseEvent * ); |
@@ -50,5 +49,5 @@ private: | |||
50 | QPixmap irdaOffPixmap; | 49 | QPixmap irdaOffPixmap; |
51 | QPixmap irdaDiscoveryOnPixmap; | 50 | QPixmap irdaDiscoveryOnPixmap; |
52 | int irdaactive; | 51 | int irdaactive; // bool and bitfields later bool irdaactive :1 ; |
53 | int irdaDiscoveryActive; | 52 | int irdaDiscoveryActive; |
54 | 53 | ||