summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp8
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp2
-rw-r--r--core/applets/batteryapplet/config.in2
-rw-r--r--core/applets/cardmon/cardmon.cpp1
-rw-r--r--core/applets/cardmon/config.in2
-rw-r--r--core/applets/clipboardapplet/clipboard.cpp7
-rw-r--r--core/applets/clipboardapplet/config.in2
-rw-r--r--core/applets/clockapplet/clock.cpp7
-rw-r--r--core/applets/clockapplet/config.in2
-rw-r--r--core/applets/homeapplet/config.in2
-rw-r--r--core/applets/irdaapplet/config.in2
-rw-r--r--core/applets/irdaapplet/irda.cpp6
-rw-r--r--core/applets/logoutapplet/config.in2
-rw-r--r--core/applets/multikeyapplet/multikey.cpp7
-rw-r--r--core/applets/restartapplet/config.in2
-rw-r--r--core/applets/rotateapplet/config.in2
-rw-r--r--core/applets/rotateapplet/rotate.cpp4
-rw-r--r--core/applets/rotateapplet/rotateapplet.pro2
-rw-r--r--core/applets/screenshotapplet/config.in2
-rw-r--r--core/applets/screenshotapplet/inputDialog.cpp3
-rw-r--r--core/applets/screenshotapplet/screenshot.cpp7
-rw-r--r--core/applets/suspendapplet/config.in2
-rw-r--r--core/applets/vmemo/config.in2
-rw-r--r--core/applets/vmemo/vmemo.cpp7
-rw-r--r--core/applets/volumeapplet/config.in2
-rw-r--r--core/applets/volumeapplet/volume.cpp8
-rw-r--r--core/applets/volumeapplet/volumeapplet.pro2
-rw-r--r--core/applets/vtapplet/config.in2
-rw-r--r--core/obex/config.in2
-rw-r--r--core/obex/obex.cc19
-rw-r--r--core/obex/obex.h10
-rw-r--r--core/obex/obex.pro4
-rw-r--r--core/obex/obeximpl.cpp2
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
@@ -22,6 +22,8 @@
22 22
23/* OPIE */ 23/* OPIE */
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>
26#include <qpe/config.h> 28#include <qpe/config.h>
27#include <qpe/power.h> 29#include <qpe/power.h>
@@ -31,6 +33,7 @@
31#include <qtimer.h> 33#include <qtimer.h>
32 34
33 35
36using namespace Opie::Ui;
34BatteryMeter::BatteryMeter( QWidget *parent ) 37BatteryMeter::BatteryMeter( QWidget *parent )
35 : QWidget( parent ), charging(false) 38 : QWidget( parent ), charging(false)
36{ 39{
@@ -175,8 +178,5 @@ int BatteryMeter::position()
175 return 8; 178 return 8;
176} 179}
177 180
178Q_EXPORT_INTERFACE() 181EXPORT_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
@@ -13,7 +13,7 @@
13#include <qtextstream.h> 13#include <qtextstream.h>
14#include <qmessagebox.h> 14#include <qmessagebox.h>
15 15
16using namespace Opie; 16using namespace Opie::Core;
17 17
18BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) 18BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
19 : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { 19 : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
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
@@ -1,4 +1,4 @@
1 config BATTERYAPPLET 1 config BATTERYAPPLET
2 boolean "opie-batteryapplet (Applet to monitor battery status)" 2 boolean "opie-batteryapplet (Applet to monitor battery status)"
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
@@ -47,6 +47,7 @@
47using namespace Opie; 47using namespace Opie;
48 48
49using namespace Opie::Ui; 49using namespace Opie::Ui;
50using namespace Opie::Ui;
50using namespace Opie::Core; 51using namespace Opie::Core;
51 52
52CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ), 53CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
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
@@ -1,4 +1,4 @@
1 config CARDMON 1 config CARDMON
2 boolean "opie-cardmon (monitor cf/sd/mmc card status, and eject function)" 2 boolean "opie-cardmon (monitor cf/sd/mmc card status, and eject function)"
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
@@ -34,6 +34,7 @@
34//=========================================================================== 34//===========================================================================
35 35
36 36
37using namespace Opie::Ui;
37ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) 38ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
38{ 39{
39 setFixedWidth ( AppLnk::smallIconSize() ); 40 setFixedWidth ( AppLnk::smallIconSize() );
@@ -183,7 +184,5 @@ void ClipboardApplet::newData ( )
183 excllock = false; 184 excllock = false;
184} 185}
185 186
186Q_EXPORT_INTERFACE() 187EXPORT_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
@@ -1,4 +1,4 @@
1 config CLIPBOARDAPPLET 1 config CLIPBOARDAPPLET
2 boolean "opie-clipboardapplet (copy/cut/paste applet)" 2 boolean "opie-clipboardapplet (copy/cut/paste applet)"
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
@@ -25,6 +25,7 @@
25#include <qpe/qcopenvelope_qws.h> 25#include <qpe/qcopenvelope_qws.h>
26#include <qpe/config.h> 26#include <qpe/config.h>
27 27
28using namespace Opie::Ui;
28LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) 29LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
29{ 30{
30 // If you want a sunken border around the clock do this: 31 // If you want a sunken border around the clock do this:
@@ -114,8 +115,6 @@ void LauncherClock::slotClockChanged( bool pm )
114 updateTime(); 115 updateTime();
115} 116}
116 117
117Q_EXPORT_INTERFACE() 118
118{ 119EXPORT_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
@@ -1,4 +1,4 @@
1 config CLOCKAPPLET 1 config CLOCKAPPLET
2 boolean "opie-clockapplet (Digital clock applet)" 2 boolean "opie-clockapplet (Digital clock applet)"
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
@@ -1,4 +1,4 @@
1 config HOMEAPPLET 1 config HOMEAPPLET
2 boolean "Home" 2 boolean "Home"
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
@@ -1,4 +1,4 @@
1 config IRDAAPPLET 1 config IRDAAPPLET
2 boolean "opie-irdaapplet (applet for IR beaming/discovery)" 2 boolean "opie-irdaapplet (applet for IR beaming/discovery)"
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
@@ -37,6 +37,7 @@
37 37
38//=========================================================================== 38//===========================================================================
39 39
40using namespace Opie::Ui;
40IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) 41IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
41 : QWidget ( parent, name ) 42 : QWidget ( parent, name )
42{ 43{
@@ -359,7 +360,4 @@ void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
359 } 360 }
360} 361}
361 362
362Q_EXPORT_INTERFACE() 363EXPORT_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
@@ -1,4 +1,4 @@
1 config LOGOUTAPPLET 1 config LOGOUTAPPLET
2 boolean "Logout" 2 boolean "Logout"
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
@@ -17,10 +17,12 @@
17/* OPIE */ 17/* OPIE */
18#include <opie2/otaskbarapplet.h> 18#include <opie2/otaskbarapplet.h>
19#include <qpe/qcopenvelope_qws.h> 19#include <qpe/qcopenvelope_qws.h>
20#include <qpe/qpeapplication.h>
20 21
21/* QT */ 22/* QT */
22#include <qdir.h> 23#include <qdir.h>
23 24
25using namespace Opie::Ui;
24Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") 26Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN")
25{ 27{
26 QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this); 28 QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this);
@@ -137,7 +139,4 @@ int Multikey::position()
137 return 10; 139 return 10;
138} 140}
139 141
140Q_EXPORT_INTERFACE() 142EXPORT_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
@@ -1,4 +1,4 @@
1 config RESTARTAPPLET 1 config RESTARTAPPLET
2 boolean "opie-restartapplet (Restart Opie via taskbar)" 2 boolean "opie-restartapplet (Restart Opie via taskbar)"
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
@@ -1,4 +1,4 @@
1 config ROTATEAPPLET 1 config ROTATEAPPLET
2 boolean "Rotate" 2 boolean "Rotate"
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
@@ -31,12 +31,12 @@
31#include "rotate.h" 31#include "rotate.h"
32 32
33/* OPIE */ 33/* OPIE */
34#include <opie/odevice.h> 34#include <opie2/odevice.h>
35#include <qpe/config.h> 35#include <qpe/config.h>
36#include <qpe/power.h> 36#include <qpe/power.h>
37#include <qpe/qcopenvelope_qws.h> 37#include <qpe/qcopenvelope_qws.h>
38#include <qpe/resource.h> 38#include <qpe/resource.h>
39using namespace Opie; 39using namespace Opie::Core;
40 40
41/* QT */ 41/* QT */
42 42
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
@@ -6,7 +6,7 @@ TARGET = rotateapplet
6DESTDIR = $(OPIEDIR)/plugins/applets 6DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopiecore2
10VERSION = 1.0.0 10VERSION = 1.0.0
11 11
12include ( $(OPIEDIR)/include.pro ) 12include ( $(OPIEDIR)/include.pro )
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
@@ -1,4 +1,4 @@
1 config SCREENSHOTAPPLET 1 config SCREENSHOTAPPLET
2 boolean "opie-screenshotapplet (create images from your current display)" 2 boolean "opie-screenshotapplet (create images from your current display)"
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
@@ -15,6 +15,7 @@
15#include <qlineedit.h> 15#include <qlineedit.h>
16#include <qpushbutton.h> 16#include <qpushbutton.h>
17 17
18using namespace Opie::Ui;
18InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) 19InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
19 : QDialog( parent, name, modal, fl ) 20 : QDialog( parent, name, modal, fl )
20{ 21{
@@ -58,7 +59,7 @@ void InputDialog::browse() {
58 types.insert("Audio", audio ); 59 types.insert("Audio", audio );
59 types.insert("Video", video ); 60 types.insert("Video", video );
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);
63} 64}
64 65
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
@@ -39,6 +39,7 @@
39#include <unistd.h> 39#include <unistd.h>
40 40
41/* XPM */ 41/* XPM */
42using namespace Opie::Ui;
42static char * snapshot_xpm[] = { 43static char * snapshot_xpm[] = {
43"32 32 177 2", 44"32 32 177 2",
44 " c None", 45 " c None",
@@ -536,8 +537,6 @@ void ScreenshotApplet::paintEvent( QPaintEvent* )
536 p.drawPixmap( 0,0, m_icon ); 537 p.drawPixmap( 0,0, m_icon );
537} 538}
538 539
539Q_EXPORT_INTERFACE() 540
540{ 541EXPORT_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
@@ -1,4 +1,4 @@
1 config SUSPENDAPPLET 1 config SUSPENDAPPLET
2 boolean "Suspend" 2 boolean "Suspend"
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
@@ -1,4 +1,4 @@
1 config VMEMO 1 config VMEMO
2 boolean "opie-vmemo (take voice memos)" 2 boolean "opie-vmemo (take voice memos)"
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
@@ -193,6 +193,7 @@ static char * vmemo_xpm[] = {
193 " n n n n n n n n n "}; 193 " n n n n n n n n n "};
194 194
195 195
196using namespace Opie::Ui;
196VMemo::VMemo( QWidget *parent, const char *_name ) 197VMemo::VMemo( QWidget *parent, const char *_name )
197 : QWidget( parent, _name ) { 198 : QWidget( parent, _name ) {
198 setFixedHeight( 18 ); 199 setFixedHeight( 18 );
@@ -638,8 +639,6 @@ void VMemo::timerBreak() {
638 QMessageBox::message("Vmemo","Vmemo recording has ended"); 639 QMessageBox::message("Vmemo","Vmemo recording has ended");
639} 640}
640 641
641Q_EXPORT_INTERFACE() 642
642{ 643EXPORT_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
@@ -1,4 +1,4 @@
1 config VOLUMEAPPLET 1 config VOLUMEAPPLET
2 boolean "opie-volumeapplet (set volume for microphone and speaker)" 2 boolean "opie-volumeapplet (set volume for microphone and speaker)"
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
@@ -39,7 +39,7 @@
39 39
40#include <stdio.h> 40#include <stdio.h>
41 41
42using namespace Opie; 42using namespace Opie::Core;
43 43
44#define RATE_TIMER_INTERVAL 100 44#define RATE_TIMER_INTERVAL 100
45// Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time 45// Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time
@@ -47,6 +47,7 @@ using namespace Opie;
47 47
48 48
49/* XPM */ 49/* XPM */
50using namespace Opie::Ui;
50static const char * vol_xpm[] = { 51static const char * vol_xpm[] = {
51"20 20 3 1", 52"20 20 3 1",
52" c None", 53" c None",
@@ -777,7 +778,4 @@ void VolumeApplet::paintEvent ( QPaintEvent * )
777} 778}
778 779
779 780
780Q_EXPORT_INTERFACE() 781EXPORT_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
@@ -6,7 +6,7 @@ TARGET = volumeapplet
6 DESTDIR = $(OPIEDIR)/plugins/applets 6 DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopiecore2
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12include ( $(OPIEDIR)/include.pro ) 12include ( $(OPIEDIR)/include.pro )
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
@@ -1,4 +1,4 @@
1 config VTAPPLET 1 config VTAPPLET
2 boolean "VT (switch to another virtual terminal)" 2 boolean "VT (switch to another virtual terminal)"
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
@@ -1,4 +1,4 @@
1 config OBEX 1 config OBEX
2 boolean "libopieobex0 (library needed for beaming in Opie)" 2 boolean "libopieobex0 (library needed for beaming in Opie)"
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
@@ -2,11 +2,12 @@
2#include <qfileinfo.h> 2#include <qfileinfo.h>
3 3
4 4
5#include <opie/oprocess.h> 5#include <opie2/oprocess.h>
6#include "obex.h" 6#include "obex.h"
7 7
8using namespace OpieObex; 8using namespace OpieObex;
9 9
10using namespace Opie::Core;
10/* TRANSLATOR OpieObex::Obex */ 11/* TRANSLATOR OpieObex::Obex */
11 12
12Obex::Obex( QObject *parent, const char* name ) 13Obex::Obex( QObject *parent, const char* name )
@@ -32,11 +33,11 @@ void Obex::receive() {
32 m_rec = new OProcess(); 33 m_rec = new OProcess();
33 *m_rec << "irobex_palm3"; 34 *m_rec << "irobex_palm3";
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
41 if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { 42 if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
42 qWarning("could not start :("); 43 qWarning("could not start :(");
@@ -80,10 +81,10 @@ void Obex::sendNow(){
80 *m_send << QFile::encodeName(m_file); 81 *m_send << QFile::encodeName(m_file);
81 82
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
88 // now start it 89 // now start it
89 if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) { 90 if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) {
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
@@ -5,7 +5,7 @@
5 5
6#include <qobject.h> 6#include <qobject.h>
7 7
8class OProcess; 8namespace Opie {namespace Core {class OProcess;}}
9class QCopChannel; 9class QCopChannel;
10namespace OpieObex { 10namespace OpieObex {
11 class Obex : public QObject { 11 class Obex : public QObject {
@@ -53,8 +53,8 @@ namespace OpieObex {
53 uint m_count; 53 uint m_count;
54 QString m_file; 54 QString m_file;
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;
59 void shutDownReceive(); 59 void shutDownReceive();
60 60
@@ -67,8 +67,8 @@ private slots:
67 //void send(const QString&); 67 //void send(const QString&);
68 68
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();
73 73
74 private: 74 private:
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
@@ -1,7 +1,7 @@
1 TEMPLATE= lib 1 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
6 DESTDIR = $(OPIEDIR)/plugins/obex 6 DESTDIR = $(OPIEDIR)/plugins/obex
7INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher 7INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
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
@@ -1,6 +1,8 @@
1#include "obexhandler.h" 1#include "obexhandler.h"
2#include "obeximpl.h" 2#include "obeximpl.h"
3 3
4
5
4using namespace OpieObex; 6using namespace OpieObex;
5 7
6/* TRANSLATOR OpieObex::ObexImpl */ 8/* TRANSLATOR OpieObex::ObexImpl */