summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/applauncher.cpp1
-rw-r--r--core/launcher/documentlist.cpp1
-rw-r--r--core/launcher/main.cpp2
-rw-r--r--core/launcher/qcopbridge.cpp1
-rw-r--r--core/launcher/screensaver.cpp20
-rw-r--r--core/launcher/server.cpp10
-rw-r--r--core/launcher/server.h4
-rw-r--r--core/launcher/serverapp.cpp9
-rw-r--r--core/launcher/serverapp.h10
-rw-r--r--core/launcher/transferserver.cpp1
-rw-r--r--core/launcher/wait.cpp1
-rw-r--r--core/launcher/wait.h4
12 files changed, 37 insertions, 27 deletions
diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp
index efbf426..5a5517c 100644
--- a/core/launcher/applauncher.cpp
+++ b/core/launcher/applauncher.cpp
@@ -55,12 +55,13 @@
55#include <qtopia/qcopenvelope_qws.h> 55#include <qtopia/qcopenvelope_qws.h>
56#include <qtopia/qpeapplication.h> 56#include <qtopia/qpeapplication.h>
57 57
58#include "applauncher.h" 58#include "applauncher.h"
59#include "documentlist.h" 59#include "documentlist.h"
60 60
61using namespace Opie::Core;
61const int AppLauncher::RAISE_TIMEOUT_MS = 5000; 62const int AppLauncher::RAISE_TIMEOUT_MS = 5000;
62 63
63//--------------------------------------------------------------------------- 64//---------------------------------------------------------------------------
64 65
65static AppLauncher* appLauncherPtr; 66static AppLauncher* appLauncherPtr;
66 67
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 63f853e..3e0a96c 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -44,12 +44,13 @@
44#include <qcopchannel_qws.h> 44#include <qcopchannel_qws.h>
45#include <qlistview.h> 45#include <qlistview.h>
46#include <qlist.h> 46#include <qlist.h>
47#include <qpixmap.h> 47#include <qpixmap.h>
48 48
49 49
50using namespace Opie::Core;
50AppLnkSet *DocumentList::appLnkSet = 0; 51AppLnkSet *DocumentList::appLnkSet = 0;
51 52
52static const int MAX_SEARCH_DEPTH = 10; 53static const int MAX_SEARCH_DEPTH = 10;
53 54
54 55
55class DocumentListPrivate : public QObject { 56class DocumentListPrivate : public QObject {
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index c136bd9..3e7e0d2 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -59,13 +59,13 @@
59#include <qkeyboard_qws.h> 59#include <qkeyboard_qws.h>
60#endif 60#endif
61 61
62#include <qmessagebox.h> 62#include <qmessagebox.h>
63#include <opie2/odevice.h> 63#include <opie2/odevice.h>
64 64
65using namespace Opie; 65using namespace Opie::Core;
66 66
67 67
68static void cleanup() 68static void cleanup()
69{ 69{
70 QDir dir( "/tmp", "qcop-msg-*" ); 70 QDir dir( "/tmp", "qcop-msg-*" );
71 71
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index 53efba4..33df6c4 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -51,12 +51,13 @@
51 51
52 52
53//#define INSECURE 53//#define INSECURE
54 54
55const int block_size = 51200; 55const int block_size = 51200;
56 56
57using namespace Opie::Core;
57QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent, 58QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
58 const char* name ) 59 const char* name )
59 : QServerSocket( port, 1, parent, name ), 60 : QServerSocket( port, 1, parent, name ),
60 desktopChannel( 0 ), 61 desktopChannel( 0 ),
61 cardChannel( 0 ) 62 cardChannel( 0 )
62{ 63{
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index e544c61..6aaab3a 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -4,13 +4,13 @@
4#include <qpe/config.h> 4#include <qpe/config.h>
5#include <qpe/network.h> 5#include <qpe/network.h>
6 6
7#include <opie2/odevice.h> 7#include <opie2/odevice.h>
8 8
9 9
10using namespace Opie; 10using namespace Opie::Core;
11 11
12 12
13 13
14OpieScreenSaver::OpieScreenSaver ( ) 14OpieScreenSaver::OpieScreenSaver ( )
15 : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) 15 : QObject ( 0, "screensaver" ), QWSScreenSaver ( )
16{ 16{
@@ -154,13 +154,13 @@ void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend )
154 else { 154 else {
155 m_enable_dim = ( dim > 0 ); 155 m_enable_dim = ( dim > 0 );
156 m_enable_lightoff = ( lightoff > 0 ); 156 m_enable_lightoff = ( lightoff > 0 );
157 m_enable_suspend = ( suspend > 0 ); 157 m_enable_suspend = ( suspend > 0 );
158 m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false ); 158 m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false );
159 } 159 }
160 160
161 //qDebug("screen saver intervals: %d %d %d", dim, lightoff, suspend); 161 //qDebug("screen saver intervals: %d %d %d", dim, lightoff, suspend);
162 162
163 v [ 0 ] = QMAX( 1000 * dim, 100 ); 163 v [ 0 ] = QMAX( 1000 * dim, 100 );
164 v [ 1 ] = QMAX( 1000 * lightoff, 100 ); 164 v [ 1 ] = QMAX( 1000 * lightoff, 100 );
165 v [ 2 ] = QMAX( 1000 * suspend, 100 ); 165 v [ 2 ] = QMAX( 1000 * suspend, 100 );
166 v [ 3 ] = 0; 166 v [ 3 ] = 0;
@@ -212,20 +212,20 @@ void OpieScreenSaver::setBacklight ( int bright )
212 212
213 //qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 ); 213 //qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 );
214 214
215 killTimers ( ); 215 killTimers ( );
216 if (( bright < 0 ) && m_use_light_sensor ) { 216 if (( bright < 0 ) && m_use_light_sensor ) {
217 QStringList sl = config. readListEntry ( "LightSensorData", ';' ); 217 QStringList sl = config. readListEntry ( "LightSensorData", ';' );
218 218
219 m_sensordata [LS_SensorMin] = 40; 219 m_sensordata [LS_SensorMin] = 40;
220 m_sensordata [LS_SensorMax] = 215; 220 m_sensordata [LS_SensorMax] = 215;
221 m_sensordata [LS_LightMin] = 1; 221 m_sensordata [LS_LightMin] = 1;
222 m_sensordata [LS_LightMax] = 255; 222 m_sensordata [LS_LightMax] = 255;
223 m_sensordata [LS_Steps] = 12; 223 m_sensordata [LS_Steps] = 12;
224 m_sensordata [LS_Interval] = 2000; 224 m_sensordata [LS_Interval] = 2000;
225 225
226 for ( uint i = 0; i < LS_Count; i++ ) { 226 for ( uint i = 0; i < LS_Count; i++ ) {
227 if ( i < sl. count ( )) 227 if ( i < sl. count ( ))
228 m_sensordata [i] = sl [i]. toInt ( ); 228 m_sensordata [i] = sl [i]. toInt ( );
229 } 229 }
230 if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE 230 if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE
231 m_sensordata [LS_Steps] = 2; 231 m_sensordata [LS_Steps] = 2;
@@ -276,23 +276,23 @@ void OpieScreenSaver::setBacklightInternal ( int bright )
276 * Timer event used for automatic setting the backlight according to a light sensor 276 * Timer event used for automatic setting the backlight according to a light sensor
277 * and to set the default brightness 277 * and to set the default brightness
278 */ 278 */
279void OpieScreenSaver::timerEvent ( QTimerEvent * ) 279void OpieScreenSaver::timerEvent ( QTimerEvent * )
280{ 280{
281 int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( ); 281 int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( );
282 282
283 if ( s < m_sensordata [LS_SensorMin] ) 283 if ( s < m_sensordata [LS_SensorMin] )
284 m_backlight_sensor = m_sensordata [LS_LightMax]; 284 m_backlight_sensor = m_sensordata [LS_LightMax];
285 else if ( s >= m_sensordata [LS_SensorMax] ) 285 else if ( s >= m_sensordata [LS_SensorMax] )
286 m_backlight_sensor = m_sensordata [LS_LightMin]; 286 m_backlight_sensor = m_sensordata [LS_LightMin];
287 else { 287 else {
288 int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin]; 288 int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin];
289 int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin]; 289 int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin];
290 290
291 int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0 291 int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0
292 292
293 m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 ); 293 m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 );
294 } 294 }
295 295
296 //qDebug ( "f(%d) = %d [%d - %d] -> [%d - %d] / %d", s, m_backlight_sensor, m_sensordata [LS_SensorMin], m_sensordata [LS_SensorMax], m_sensordata [LS_LightMin], m_sensordata [LS_LightMax], m_sensordata [LS_Steps] ); 296 //qDebug ( "f(%d) = %d [%d - %d] -> [%d - %d] / %d", s, m_backlight_sensor, m_sensordata [LS_SensorMin], m_sensordata [LS_SensorMax], m_sensordata [LS_LightMin], m_sensordata [LS_LightMax], m_sensordata [LS_Steps] );
297 297
298 if ( m_level <= 0 ) 298 if ( m_level <= 0 )
@@ -315,14 +315,14 @@ void OpieScreenSaver::setDisplayState ( bool on )
315/** 315/**
316 * Set display to default ac/battery settings when power status changed. 316 * Set display to default ac/battery settings when power status changed.
317 */ 317 */
318void OpieScreenSaver::powerStatusChanged ( PowerStatus ps ) 318void OpieScreenSaver::powerStatusChanged ( PowerStatus ps )
319{ 319{
320 bool newonac = ( ps. acStatus ( ) == PowerStatus::Online ); 320 bool newonac = ( ps. acStatus ( ) == PowerStatus::Online );
321 321
322 if ( newonac != m_on_ac ) { 322 if ( newonac != m_on_ac ) {
323 m_on_ac = newonac; 323 m_on_ac = newonac;
324 setInterval ( -1 ); 324 setInterval ( -1 );
325 setBacklight ( -1 ); 325 setBacklight ( -1 );
326 restore ( ); 326 restore ( );
327 } 327 }
328} 328}
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index ea0b792..634082b 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -60,14 +60,14 @@
60#include <qtextstream.h> 60#include <qtextstream.h>
61 61
62#include <stdlib.h> 62#include <stdlib.h>
63 63
64extern QRect qt_maxWindowRect; 64extern QRect qt_maxWindowRect;
65 65
66using namespace Opie;
67 66
67using namespace Opie::Core;
68static QWidget *calibrate(bool) 68static QWidget *calibrate(bool)
69{ 69{
70#ifdef Q_WS_QWS 70#ifdef Q_WS_QWS
71 Calibrate *c = new Calibrate; 71 Calibrate *c = new Calibrate;
72 c->show(); 72 c->show();
73 return c; 73 return c;
@@ -156,14 +156,14 @@ Server::Server() :
156 156
157 // start services 157 // start services
158 startTransferServer(); 158 startTransferServer();
159 (void) new IrServer( this ); 159 (void) new IrServer( this );
160 160
161 packageHandler = new PackageHandler( this ); 161 packageHandler = new PackageHandler( this );
162 connect(qApp, SIGNAL(activate(const Opie::ODeviceButton*,bool)), 162 connect(qApp, SIGNAL(activate(const Opie::Core::ODeviceButton*,bool)),
163 this,SLOT(activate(const Opie::ODeviceButton*,bool))); 163 this,SLOT(activate(const Opie::Core::ODeviceButton*,bool)));
164 164
165 setGeometry( -10, -10, 9, 9 ); 165 setGeometry( -10, -10, 9, 9 );
166 166
167 QCopChannel *channel = new QCopChannel("QPE/System", this); 167 QCopChannel *channel = new QCopChannel("QPE/System", this);
168 connect(channel, SIGNAL(received(const QCString&,const QByteArray&)), 168 connect(channel, SIGNAL(received(const QCString&,const QByteArray&)),
169 this, SLOT(systemMsg(const QCString&,const QByteArray&)) ); 169 this, SLOT(systemMsg(const QCString&,const QByteArray&)) );
@@ -218,16 +218,16 @@ static bool hasVisibleWindow(const QString& clientname, bool partial)
218 } 218 }
219 } 219 }
220#endif 220#endif
221 return FALSE; 221 return FALSE;
222} 222}
223 223
224void Server::activate(const Opie::ODeviceButton* button, bool held) 224void Server::activate(const ODeviceButton* button, bool held)
225{ 225{
226 Global::terminateBuiltin("calibrate"); // No tr 226 Global::terminateBuiltin("calibrate"); // No tr
227 Opie::OQCopMessage om; 227 OQCopMessage om;
228 if ( held ) { 228 if ( held ) {
229 om = button->heldAction(); 229 om = button->heldAction();
230 } else { 230 } else {
231 om = button->pressedAction(); 231 om = button->pressedAction();
232 } 232 }
233 233
diff --git a/core/launcher/server.h b/core/launcher/server.h
index 91bf883..1dc5e7e 100644
--- a/core/launcher/server.h
+++ b/core/launcher/server.h
@@ -35,14 +35,16 @@ class AppLauncher;
35class AppLnkSet; 35class AppLnkSet;
36class StorageInfo; 36class StorageInfo;
37class SyncDialog; 37class SyncDialog;
38class DocumentList; 38class DocumentList;
39class ServerInterface; 39class ServerInterface;
40namespace Opie { 40namespace Opie {
41namespace Core {
41 class ODeviceButton; 42 class ODeviceButton;
42} 43}
44}
43 45
44class Server : public QWidget { 46class Server : public QWidget {
45 Q_OBJECT 47 Q_OBJECT
46public: 48public:
47 Server(); 49 Server();
48 ~Server(); 50 ~Server();
@@ -57,13 +59,13 @@ public slots:
57 void systemMsg(const QCString &, const QByteArray &); 59 void systemMsg(const QCString &, const QByteArray &);
58 void receiveTaskBar(const QCString &msg, const QByteArray &data); 60 void receiveTaskBar(const QCString &msg, const QByteArray &data);
59 void terminateServers(); 61 void terminateServers();
60 void pokeTimeMonitors(); 62 void pokeTimeMonitors();
61 63
62private slots: 64private slots:
63 void activate(const Opie::ODeviceButton*,bool); 65 void activate(const Opie::Core::ODeviceButton*,bool);
64 void syncConnectionClosed( const QHostAddress & ); 66 void syncConnectionClosed( const QHostAddress & );
65 void applicationLaunched(int pid, const QString &app); 67 void applicationLaunched(int pid, const QString &app);
66 void applicationTerminated(int pid, const QString &app); 68 void applicationTerminated(int pid, const QString &app);
67 void applicationConnected(const QString &app); 69 void applicationConnected(const QString &app);
68 void storageChanged(); 70 void storageChanged();
69 void cancelSync(); 71 void cancelSync();
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index d38dd97..e4e16f2 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -52,12 +52,13 @@
52 52
53static ServerApplication *serverApp = 0; 53static ServerApplication *serverApp = 0;
54static int loggedin=0; 54static int loggedin=0;
55 55
56using namespace Opie; 56using namespace Opie;
57 57
58using namespace Opie::Core;
58QCopKeyRegister::QCopKeyRegister() 59QCopKeyRegister::QCopKeyRegister()
59 : m_keyCode( 0 ) { 60 : m_keyCode( 0 ) {
60} 61}
61 62
62QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m ) 63QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m )
63 :m_keyCode( k ), m_channel( c ), m_message( m ) { 64 :m_keyCode( k ), m_channel( c ), m_message( m ) {
@@ -194,13 +195,13 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe
194 if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) ) 195 if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) )
195 return true; 196 return true;
196 }else { 197 }else {
197 198
198 199
199 // First check to see if DeviceButtonManager knows something about this button: 200 // First check to see if DeviceButtonManager knows something about this button:
200 const Opie::ODeviceButton* button = Opie::ODevice::inst()->buttonForKeycode(keycode); 201 const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode);
201 if (button && !autoRepeat) { 202 if (button && !autoRepeat) {
202 if ( held_tid ) { 203 if ( held_tid ) {
203 killTimer(held_tid); 204 killTimer(held_tid);
204 held_tid = 0; 205 held_tid = 0;
205 } 206 }
206 if ( button->heldAction().isNull() ) { 207 if ( button->heldAction().isNull() ) {
@@ -328,14 +329,14 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
328 connect( kf, SIGNAL(launch()), this, SIGNAL(launch()) ); 329 connect( kf, SIGNAL(launch()), this, SIGNAL(launch()) );
329 connect( kf, SIGNAL(power()), this, SIGNAL(power()) ); 330 connect( kf, SIGNAL(power()), this, SIGNAL(power()) );
330 connect( kf, SIGNAL(backlight()), this, SIGNAL(backlight()) ); 331 connect( kf, SIGNAL(backlight()), this, SIGNAL(backlight()) );
331 connect( kf, SIGNAL(symbol()), this, SIGNAL(symbol())); 332 connect( kf, SIGNAL(symbol()), this, SIGNAL(symbol()));
332 connect( kf, SIGNAL(numLockStateToggle()), this,SIGNAL(numLockStateToggle())); 333 connect( kf, SIGNAL(numLockStateToggle()), this,SIGNAL(numLockStateToggle()));
333 connect( kf, SIGNAL(capsLockStateToggle()), this,SIGNAL(capsLockStateToggle())); 334 connect( kf, SIGNAL(capsLockStateToggle()), this,SIGNAL(capsLockStateToggle()));
334 connect( kf, SIGNAL(activate(const Opie::ODeviceButton*,bool)), 335 connect( kf, SIGNAL(activate(const Opie::Core::ODeviceButton*,bool)),
335 this,SIGNAL(activate(const Opie::ODeviceButton*,bool))); 336 this,SIGNAL(activate(const Opie::Core::ODeviceButton*,bool)));
336 337
337 338
338 connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) ); 339 connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) );
339 340
340 connect( this, SIGNAL(power() ), 341 connect( this, SIGNAL(power() ),
341 SLOT(togglePower() ) ); 342 SLOT(togglePower() ) );
@@ -345,13 +346,13 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
345 serverApp = this; 346 serverApp = this;
346 347
347 apmTimeout(); 348 apmTimeout();
348 grabKeyboard(); 349 grabKeyboard();
349 350
350 /* make sure the event filter is installed */ 351 /* make sure the event filter is installed */
351 const Opie::ODeviceButton* but = Opie::ODevice::inst()->buttonForKeycode( -1 ); 352 const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 );
352} 353}
353 354
354 355
355ServerApplication::~ServerApplication() 356ServerApplication::~ServerApplication()
356{ 357{
357 ungrabKeyboard(); 358 ungrabKeyboard();
diff --git a/core/launcher/serverapp.h b/core/launcher/serverapp.h
index 4d9f808..916d83c 100644
--- a/core/launcher/serverapp.h
+++ b/core/launcher/serverapp.h
@@ -32,14 +32,16 @@
32 32
33class PowerStatus; 33class PowerStatus;
34class DesktopPowerAlerter; 34class DesktopPowerAlerter;
35 35
36class OpieScreenSaver; 36class OpieScreenSaver;
37namespace Opie { 37namespace Opie {
38namespace Core {
38 class ODeviceButton; 39 class ODeviceButton;
39} 40}
41}
40 42
41struct QCopKeyRegister { 43struct QCopKeyRegister {
42 QCopKeyRegister(); 44 QCopKeyRegister();
43 QCopKeyRegister( int k, const QCString&, const QCString& ); 45 QCopKeyRegister( int k, const QCString&, const QCString& );
44 int keyCode()const; 46 int keyCode()const;
45 QCString channel()const; 47 QCString channel()const;
@@ -70,19 +72,19 @@ signals:
70 void launch(); 72 void launch();
71 void power(); 73 void power();
72 void backlight(); 74 void backlight();
73 void symbol(); 75 void symbol();
74 void numLockStateToggle(); 76 void numLockStateToggle();
75 void capsLockStateToggle(); 77 void capsLockStateToggle();
76 void activate(const Opie::ODeviceButton*,bool); 78 void activate(const Opie::Core::ODeviceButton*,bool);
77 79
78 80
79private: 81private:
80 bool keyRegistered( int key ); 82 bool keyRegistered( int key );
81 int held_tid; 83 int held_tid;
82 const Opie::ODeviceButton* heldButton; 84 const Opie::Core::ODeviceButton* heldButton;
83 KeyRegisterList m_keys; 85 KeyRegisterList m_keys;
84}; 86};
85 87
86class ServerApplication : public QPEApplication 88class ServerApplication : public QPEApplication
87{ 89{
88 Q_OBJECT 90 Q_OBJECT
@@ -91,13 +93,13 @@ public:
91 ~ServerApplication(); 93 ~ServerApplication();
92 94
93 static bool doRestart; 95 static bool doRestart;
94 static bool allowRestart; 96 static bool allowRestart;
95 static bool screenLocked(); 97 static bool screenLocked();
96 static void login(bool at_poweron); 98 static void login(bool at_poweron);
97 99
98 static bool isStarting(); 100 static bool isStarting();
99 101
100 static void switchLCD ( bool on ); // only for togglePower in Desktop 102 static void switchLCD ( bool on ); // only for togglePower in Desktop
101 static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar 103 static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar
102 104
103 void restart(); 105 void restart();
@@ -110,13 +112,13 @@ signals:
110 void power(); 112 void power();
111 void backlight(); 113 void backlight();
112 void symbol(); 114 void symbol();
113 void numLockStateToggle(); 115 void numLockStateToggle();
114 void capsLockStateToggle(); 116 void capsLockStateToggle();
115 void prepareForRestart(); 117 void prepareForRestart();
116 void activate(const Opie::ODeviceButton*,bool); 118 void activate(const Opie::Core::ODeviceButton*,bool);
117 119
118public slots: 120public slots:
119 virtual void systemMessage( const QCString& msg, const QByteArray& ); 121 virtual void systemMessage( const QCString& msg, const QByteArray& );
120 virtual void launcherMessage( const QCString& msg, const QByteArray& ); 122 virtual void launcherMessage( const QCString& msg, const QByteArray& );
121 void rereadVolumes(); 123 void rereadVolumes();
122 124
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index a5e20b2..e32cf41 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -56,12 +56,13 @@
56 56
57#include "transferserver.h" 57#include "transferserver.h"
58#include <qtopia/qprocess.h> 58#include <qtopia/qprocess.h>
59 59
60const int block_size = 51200; 60const int block_size = 51200;
61 61
62using namespace Opie::Core;
62TransferServer::TransferServer( Q_UINT16 port, QObject *parent, 63TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
63 const char* name) 64 const char* name)
64 : QServerSocket( port, 1, parent, name ) 65 : QServerSocket( port, 1, parent, name )
65{ 66{
66 connections.setAutoDelete( TRUE ); 67 connections.setAutoDelete( TRUE );
67 if ( !ok() ) 68 if ( !ok() )
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp
index 4148e57..a5b329d 100644
--- a/core/launcher/wait.cpp
+++ b/core/launcher/wait.cpp
@@ -26,12 +26,13 @@
26 26
27 27
28 28
29Wait *lastWaitObject = NULL; 29Wait *lastWaitObject = NULL;
30 30
31 31
32using namespace Opie::Ui;
32Wait::Wait( QWidget *parent ) : QWidget( parent ), 33Wait::Wait( QWidget *parent ) : QWidget( parent ),
33 pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE ) 34 pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE )
34{ 35{
35 setFixedSize( pm.size() ); 36 setFixedSize( pm.size() );
36 lastWaitObject = this; 37 lastWaitObject = this;
37 m_centralWait = new OWait( 0l ); 38 m_centralWait = new OWait( 0l );
diff --git a/core/launcher/wait.h b/core/launcher/wait.h
index e7294d2..010fcc3 100644
--- a/core/launcher/wait.h
+++ b/core/launcher/wait.h
@@ -24,23 +24,23 @@
24#include <qtopia/resource.h> 24#include <qtopia/resource.h>
25 25
26#include <qwidget.h> 26#include <qwidget.h>
27#include <qpixmap.h> 27#include <qpixmap.h>
28#include <qpainter.h> 28#include <qpainter.h>
29 29
30class OWait; 30namespace Opie {namespace Ui {class OWait;}}
31class Wait : public QWidget 31class Wait : public QWidget
32{ 32{
33public: 33public:
34 Wait( QWidget *parent ); 34 Wait( QWidget *parent );
35 void setWaiting( bool w ); 35 void setWaiting( bool w );
36 void paintEvent( QPaintEvent * ); 36 void paintEvent( QPaintEvent * );
37 static Wait *getWaitObject(); 37 static Wait *getWaitObject();
38private: 38private:
39 QPixmap pm; 39 QPixmap pm;
40 bool waiting; 40 bool waiting;
41 OWait* m_centralWait; 41 Opie::Ui::OWait* m_centralWait;
42}; 42};
43 43
44 44
45#endif // __WAIT_H__ 45#endif // __WAIT_H__
46 46