summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-13 21:27:29 (UTC)
committer zecke <zecke>2004-03-13 21:27:29 (UTC)
commit184a0cd9935d0a249038cdbe05488c181b273d64 (patch) (unidiff)
treec8f3508ab1be012083d9e2140221cfeb9a9ab83a
parenta3304e23c7f8576a4584475ef0cf49d0e588671e (diff)
downloadopie-184a0cd9935d0a249038cdbe05488c181b273d64.zip
opie-184a0cd9935d0a249038cdbe05488c181b273d64.tar.gz
opie-184a0cd9935d0a249038cdbe05488c181b273d64.tar.bz2
Fix namespaces in the launcher.. and found a problem with my script
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
@@ -60,2 +60,3 @@
60 60
61using namespace Opie::Core;
61const int AppLauncher::RAISE_TIMEOUT_MS = 5000; 62const int AppLauncher::RAISE_TIMEOUT_MS = 5000;
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
@@ -49,2 +49,3 @@
49 49
50using namespace Opie::Core;
50AppLnkSet *DocumentList::appLnkSet = 0; 51AppLnkSet *DocumentList::appLnkSet = 0;
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
@@ -64,3 +64,3 @@
64 64
65using namespace Opie; 65using namespace Opie::Core;
66 66
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
@@ -56,2 +56,3 @@ const int block_size = 51200;
56 56
57using namespace Opie::Core;
57QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent, 58QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
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
@@ -9,3 +9,3 @@
9 9
10using namespace Opie; 10using namespace Opie::Core;
11 11
@@ -159,3 +159,3 @@ void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend )
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);
@@ -217,3 +217,3 @@ void OpieScreenSaver::setBacklight ( int bright )
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;
@@ -223,4 +223,4 @@ void OpieScreenSaver::setBacklight ( int bright )
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++ ) {
@@ -281,3 +281,3 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * )
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] )
@@ -289,5 +289,5 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * )
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 );
@@ -320,3 +320,3 @@ void OpieScreenSaver::powerStatusChanged ( PowerStatus ps )
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 ) {
@@ -325,3 +325,3 @@ void OpieScreenSaver::powerStatusChanged ( PowerStatus ps )
325 setBacklight ( -1 ); 325 setBacklight ( -1 );
326 restore ( ); 326 restore ( );
327 } 327 }
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
@@ -65,4 +65,4 @@ extern QRect qt_maxWindowRect;
65 65
66using namespace Opie;
67 66
67using namespace Opie::Core;
68static QWidget *calibrate(bool) 68static QWidget *calibrate(bool)
@@ -161,4 +161,4 @@ Server::Server() :
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
@@ -223,6 +223,6 @@ static bool hasVisibleWindow(const QString& clientname, bool partial)
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 ) {
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
@@ -40,4 +40,6 @@ class ServerInterface;
40namespace Opie { 40namespace Opie {
41namespace Core {
41 class ODeviceButton; 42 class ODeviceButton;
42} 43}
44}
43 45
@@ -62,3 +64,3 @@ public slots:
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 & );
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
@@ -57,2 +57,3 @@ using namespace Opie;
57 57
58using namespace Opie::Core;
58QCopKeyRegister::QCopKeyRegister() 59QCopKeyRegister::QCopKeyRegister()
@@ -199,3 +200,3 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe
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) {
@@ -333,4 +334,4 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
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
@@ -350,3 +351,3 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
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}
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
@@ -37,4 +37,6 @@ class OpieScreenSaver;
37namespace Opie { 37namespace Opie {
38namespace Core {
38 class ODeviceButton; 39 class ODeviceButton;
39} 40}
41}
40 42
@@ -75,3 +77,3 @@ signals:
75 void capsLockStateToggle(); 77 void capsLockStateToggle();
76 void activate(const Opie::ODeviceButton*,bool); 78 void activate(const Opie::Core::ODeviceButton*,bool);
77 79
@@ -81,3 +83,3 @@ private:
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;
@@ -96,3 +98,3 @@ public:
96 static void login(bool at_poweron); 98 static void login(bool at_poweron);
97 99
98 static bool isStarting(); 100 static bool isStarting();
@@ -115,3 +117,3 @@ signals:
115 void prepareForRestart(); 117 void prepareForRestart();
116 void activate(const Opie::ODeviceButton*,bool); 118 void activate(const Opie::Core::ODeviceButton*,bool);
117 119
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
@@ -61,2 +61,3 @@ const int block_size = 51200;
61 61
62using namespace Opie::Core;
62TransferServer::TransferServer( Q_UINT16 port, QObject *parent, 63TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
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
@@ -31,2 +31,3 @@ Wait *lastWaitObject = NULL;
31 31
32using namespace Opie::Ui;
32Wait::Wait( QWidget *parent ) : QWidget( parent ), 33Wait::Wait( QWidget *parent ) : QWidget( parent ),
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
@@ -29,3 +29,3 @@
29 29
30class OWait; 30namespace Opie {namespace Ui {class OWait;}}
31class Wait : public QWidget 31class Wait : public QWidget
@@ -40,3 +40,3 @@ private:
40 bool waiting; 40 bool waiting;
41 OWait* m_centralWait; 41 Opie::Ui::OWait* m_centralWait;
42}; 42};