33 files changed, 66 insertions, 70 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index b2cef55..18e368e 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp | |||
@@ -24,2 +24,4 @@ | |||
24 | #include <opie2/otaskbarapplet.h> | 24 | #include <opie2/otaskbarapplet.h> |
25 | |||
26 | #include <qpe/qpeapplication.h> | ||
25 | #include <qpe/applnk.h> | 27 | #include <qpe/applnk.h> |
@@ -33,2 +35,3 @@ | |||
33 | 35 | ||
36 | using namespace Opie::Ui; | ||
34 | BatteryMeter::BatteryMeter( QWidget *parent ) | 37 | BatteryMeter::BatteryMeter( QWidget *parent ) |
@@ -177,6 +180,3 @@ int BatteryMeter::position() | |||
177 | 180 | ||
178 | Q_EXPORT_INTERFACE() | 181 | EXPORT_OPIE_APPLET_v1( BatteryMeter ) |
179 | { | ||
180 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> ); | ||
181 | } | ||
182 | 182 | ||
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index ea11495..bd86f77 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp | |||
@@ -15,3 +15,3 @@ | |||
15 | 15 | ||
16 | using namespace Opie; | 16 | using namespace Opie::Core; |
17 | 17 | ||
diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in index 3067317..eca07e3 100644 --- a/core/applets/batteryapplet/config.in +++ b/core/applets/batteryapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 6090b68..ed4bfc7 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -49,2 +49,3 @@ using namespace Opie; | |||
49 | using namespace Opie::Ui; | 49 | using namespace Opie::Ui; |
50 | using namespace Opie::Ui; | ||
50 | using namespace Opie::Core; | 51 | using namespace Opie::Core; |
diff --git a/core/applets/cardmon/config.in b/core/applets/cardmon/config.in index f3d57fd..8626c75 100644 --- a/core/applets/cardmon/config.in +++ b/core/applets/cardmon/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp index 4fc8076..57a4088 100644 --- a/core/applets/clipboardapplet/clipboard.cpp +++ b/core/applets/clipboardapplet/clipboard.cpp | |||
@@ -36,2 +36,3 @@ | |||
36 | 36 | ||
37 | using namespace Opie::Ui; | ||
37 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) | 38 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) |
@@ -185,5 +186,3 @@ void ClipboardApplet::newData ( ) | |||
185 | 186 | ||
186 | Q_EXPORT_INTERFACE() | 187 | EXPORT_OPIE_APPLET_v1( ClipboardApplet ) |
187 | { | 188 | |
188 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ClipboardApplet> ); | ||
189 | } | ||
diff --git a/core/applets/clipboardapplet/config.in b/core/applets/clipboardapplet/config.in index 1205b26..e58d239 100644 --- a/core/applets/clipboardapplet/config.in +++ b/core/applets/clipboardapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp index 120a019..3b13d74 100644 --- a/core/applets/clockapplet/clock.cpp +++ b/core/applets/clockapplet/clock.cpp | |||
@@ -27,2 +27,3 @@ | |||
27 | 27 | ||
28 | using namespace Opie::Ui; | ||
28 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) | 29 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) |
@@ -116,6 +117,4 @@ void LauncherClock::slotClockChanged( bool pm ) | |||
116 | 117 | ||
117 | Q_EXPORT_INTERFACE() | 118 | |
118 | { | 119 | EXPORT_OPIE_APPLET_v1( LauncherClock ) |
119 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<LauncherClock> ); | ||
120 | } | ||
121 | 120 | ||
diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in index 20bd39d..6c32f79 100644 --- a/core/applets/clockapplet/config.in +++ b/core/applets/clockapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/homeapplet/config.in b/core/applets/homeapplet/config.in index 1828da0..53d7882 100644 --- a/core/applets/homeapplet/config.in +++ b/core/applets/homeapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in index 56ec664..0976e8f 100644 --- a/core/applets/irdaapplet/config.in +++ b/core/applets/irdaapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index dde8050..2196d18 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp | |||
@@ -39,2 +39,3 @@ | |||
39 | 39 | ||
40 | using namespace Opie::Ui; | ||
40 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) | 41 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) |
@@ -361,5 +362,2 @@ void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { | |||
361 | 362 | ||
362 | Q_EXPORT_INTERFACE() | 363 | EXPORT_OPIE_APPLET_v1( IrdaApplet ) |
363 | { | ||
364 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<IrdaApplet> ); | ||
365 | } | ||
diff --git a/core/applets/logoutapplet/config.in b/core/applets/logoutapplet/config.in index 385b02f..0d48c6a 100644 --- a/core/applets/logoutapplet/config.in +++ b/core/applets/logoutapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index fc5f093..195ada5 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp | |||
@@ -19,2 +19,3 @@ | |||
19 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
20 | #include <qpe/qpeapplication.h> | ||
20 | 21 | ||
@@ -23,2 +24,3 @@ | |||
23 | 24 | ||
25 | using namespace Opie::Ui; | ||
24 | Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") | 26 | Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") |
@@ -139,5 +141,2 @@ int Multikey::position() | |||
139 | 141 | ||
140 | Q_EXPORT_INTERFACE() | 142 | EXPORT_OPIE_APPLET_v1( Multikey ) |
141 | { | ||
142 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> ); | ||
143 | } | ||
diff --git a/core/applets/restartapplet/config.in b/core/applets/restartapplet/config.in index aa2580f..764ae58 100644 --- a/core/applets/restartapplet/config.in +++ b/core/applets/restartapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/rotateapplet/config.in b/core/applets/rotateapplet/config.in index 1a0d923..d3de89a 100644 --- a/core/applets/rotateapplet/config.in +++ b/core/applets/rotateapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index 0488c36..f621aa9 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp | |||
@@ -33,3 +33,3 @@ | |||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie/odevice.h> | 34 | #include <opie2/odevice.h> |
35 | #include <qpe/config.h> | 35 | #include <qpe/config.h> |
@@ -38,3 +38,3 @@ | |||
38 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
39 | using namespace Opie; | 39 | using namespace Opie::Core; |
40 | 40 | ||
diff --git a/core/applets/rotateapplet/rotateapplet.pro b/core/applets/rotateapplet/rotateapplet.pro index f24682c..7a4420f 100644 --- a/core/applets/rotateapplet/rotateapplet.pro +++ b/core/applets/rotateapplet/rotateapplet.pro | |||
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
diff --git a/core/applets/screenshotapplet/config.in b/core/applets/screenshotapplet/config.in index cafd470..98f2b61 100644 --- a/core/applets/screenshotapplet/config.in +++ b/core/applets/screenshotapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/screenshotapplet/inputDialog.cpp b/core/applets/screenshotapplet/inputDialog.cpp index 73ec773..ce03ec0 100644 --- a/core/applets/screenshotapplet/inputDialog.cpp +++ b/core/applets/screenshotapplet/inputDialog.cpp | |||
@@ -17,2 +17,3 @@ | |||
17 | 17 | ||
18 | using namespace Opie::Ui; | ||
18 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 19 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
@@ -60,3 +61,3 @@ void InputDialog::browse() { | |||
60 | 61 | ||
61 | QString str = Opie::OFileDialog::getOpenFileName( 1,"/","", types, 0 ); | 62 | QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/","", types, 0 ); |
62 | LineEdit1->setText(str); | 63 | LineEdit1->setText(str); |
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp index 20e1c9b..9aa012a 100644 --- a/core/applets/screenshotapplet/screenshot.cpp +++ b/core/applets/screenshotapplet/screenshot.cpp | |||
@@ -41,2 +41,3 @@ | |||
41 | /* XPM */ | 41 | /* XPM */ |
42 | using namespace Opie::Ui; | ||
42 | static char * snapshot_xpm[] = { | 43 | static char * snapshot_xpm[] = { |
@@ -538,6 +539,4 @@ void ScreenshotApplet::paintEvent( QPaintEvent* ) | |||
538 | 539 | ||
539 | Q_EXPORT_INTERFACE() | 540 | |
540 | { | 541 | EXPORT_OPIE_APPLET_v1( ScreenshotApplet ) |
541 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ScreenshotApplet> ); | ||
542 | } | ||
543 | 542 | ||
diff --git a/core/applets/suspendapplet/config.in b/core/applets/suspendapplet/config.in index fdbe8b3..d75f581 100644 --- a/core/applets/suspendapplet/config.in +++ b/core/applets/suspendapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/vmemo/config.in b/core/applets/vmemo/config.in index d13492d..356ab16 100644 --- a/core/applets/vmemo/config.in +++ b/core/applets/vmemo/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 27f6015..7dd5b4b 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -195,2 +195,3 @@ static char * vmemo_xpm[] = { | |||
195 | 195 | ||
196 | using namespace Opie::Ui; | ||
196 | VMemo::VMemo( QWidget *parent, const char *_name ) | 197 | VMemo::VMemo( QWidget *parent, const char *_name ) |
@@ -640,6 +641,4 @@ void VMemo::timerBreak() { | |||
640 | 641 | ||
641 | Q_EXPORT_INTERFACE() | 642 | |
642 | { | 643 | EXPORT_OPIE_APPLET_v1( VMemo ) |
643 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VMemo> ); | ||
644 | } | ||
645 | 644 | ||
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in index 1233d9f..f097591 100644 --- a/core/applets/volumeapplet/config.in +++ b/core/applets/volumeapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 942cebb..276f47f 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp | |||
@@ -41,3 +41,3 @@ | |||
41 | 41 | ||
42 | using namespace Opie; | 42 | using namespace Opie::Core; |
43 | 43 | ||
@@ -49,2 +49,3 @@ using namespace Opie; | |||
49 | /* XPM */ | 49 | /* XPM */ |
50 | using namespace Opie::Ui; | ||
50 | static const char * vol_xpm[] = { | 51 | static const char * vol_xpm[] = { |
@@ -779,5 +780,2 @@ void VolumeApplet::paintEvent ( QPaintEvent * ) | |||
779 | 780 | ||
780 | Q_EXPORT_INTERFACE() | 781 | EXPORT_OPIE_APPLET_v1( VolumeApplet ) |
781 | { | ||
782 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VolumeApplet> ); | ||
783 | } | ||
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index b14956e..b478ed1 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro | |||
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
diff --git a/core/applets/vtapplet/config.in b/core/applets/vtapplet/config.in index 85692a5..8fe4200 100644 --- a/core/applets/vtapplet/config.in +++ b/core/applets/vtapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/obex/config.in b/core/obex/config.in index ef09f7a..c0208d1 100644 --- a/core/obex/config.in +++ b/core/obex/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/obex/obex.cc b/core/obex/obex.cc index 50e5201..3c99af6 100644 --- a/core/obex/obex.cc +++ b/core/obex/obex.cc | |||
@@ -4,3 +4,3 @@ | |||
4 | 4 | ||
5 | #include <opie/oprocess.h> | 5 | #include <opie2/oprocess.h> |
6 | #include "obex.h" | 6 | #include "obex.h" |
@@ -9,2 +9,3 @@ using namespace OpieObex; | |||
9 | 9 | ||
10 | using namespace Opie::Core; | ||
10 | /* TRANSLATOR OpieObex::Obex */ | 11 | /* TRANSLATOR OpieObex::Obex */ |
@@ -34,7 +35,7 @@ void Obex::receive() { | |||
34 | // connect to the necessary slots | 35 | // connect to the necessary slots |
35 | connect(m_rec, SIGNAL(processExited(OProcess*) ), | 36 | connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ), |
36 | this, SLOT(slotExited(OProcess*) ) ); | 37 | this, SLOT(slotExited(Opie::Core::OProcess*) ) ); |
37 | 38 | ||
38 | connect(m_rec, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | 39 | connect(m_rec, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
39 | this, SLOT(slotStdOut(OProcess*, char*, int) ) ); | 40 | this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); |
40 | 41 | ||
@@ -82,6 +83,6 @@ void Obex::sendNow(){ | |||
82 | // connect to slots Exited and and StdOut | 83 | // connect to slots Exited and and StdOut |
83 | connect(m_send, SIGNAL(processExited(OProcess*) ), | 84 | connect(m_send, SIGNAL(processExited(Opie::Core::OProcess*) ), |
84 | this, SLOT(slotExited(OProcess*)) ); | 85 | this, SLOT(slotExited(Opie::Core::OProcess*)) ); |
85 | connect(m_send, SIGNAL(receivedStdout(OProcess*, char*, int )), | 86 | connect(m_send, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int )), |
86 | this, SLOT(slotStdOut(OProcess*, char*, int) ) ); | 87 | this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); |
87 | 88 | ||
diff --git a/core/obex/obex.h b/core/obex/obex.h index 60f5d28..284cb12 100644 --- a/core/obex/obex.h +++ b/core/obex/obex.h | |||
@@ -7,3 +7,3 @@ | |||
7 | 7 | ||
8 | class OProcess; | 8 | namespace Opie {namespace Core {class OProcess;}} |
9 | class QCopChannel; | 9 | class QCopChannel; |
@@ -55,4 +55,4 @@ namespace OpieObex { | |||
55 | QString m_outp; | 55 | QString m_outp; |
56 | OProcess *m_send; | 56 | Opie::Core::OProcess *m_send; |
57 | OProcess *m_rec; | 57 | Opie::Core::OProcess *m_rec; |
58 | bool m_receive : 1; | 58 | bool m_receive : 1; |
@@ -69,4 +69,4 @@ private slots: | |||
69 | // the process exited | 69 | // the process exited |
70 | void slotExited(OProcess* proc) ; | 70 | void slotExited(Opie::Core::OProcess* proc) ; |
71 | void slotStdOut(OProcess*, char*, int); | 71 | void slotStdOut(Opie::Core::OProcess*, char*, int); |
72 | void slotError(); | 72 | void slotError(); |
diff --git a/core/obex/obex.pro b/core/obex/obex.pro index a296b2c..51fa300 100644 --- a/core/obex/obex.pro +++ b/core/obex/obex.pro | |||
@@ -2,4 +2,4 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= obex.h obexhandler.h obexsend.h receiver.h | 3 | HEADERS= obex.h obexhandler.h obexsend.h receiver.h obeximpl.h |
4 | SOURCES= obex.cc obexsend.cpp obexhandler.cpp receiver.cpp | 4 | SOURCES= obex.cc obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp |
5 | TARGET = opieobex | 5 | TARGET = opieobex |
diff --git a/core/obex/obeximpl.cpp b/core/obex/obeximpl.cpp index 5b53644..ca6ce7b 100644 --- a/core/obex/obeximpl.cpp +++ b/core/obex/obeximpl.cpp | |||
@@ -3,2 +3,4 @@ | |||
3 | 3 | ||
4 | |||
5 | |||
4 | using namespace OpieObex; | 6 | using namespace OpieObex; |