summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -59,4 +59,5 @@
#include "documentlist.h"
+using namespace Opie::Core;
const 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
@@ -48,4 +48,5 @@
+using namespace Opie::Core;
AppLnkSet *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
@@ -63,5 +63,5 @@
#include <opie2/odevice.h>
-using namespace Opie;
+using namespace Opie::Core;
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
@@ -55,4 +55,5 @@
const int block_size = 51200;
+using namespace Opie::Core;
QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
const char* name )
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
@@ -8,5 +8,5 @@
-using namespace Opie;
+using namespace Opie::Core;
@@ -158,5 +158,5 @@ void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend )
m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false );
}
-
+
//qDebug("screen saver intervals: %d %d %d", dim, lightoff, suspend);
@@ -216,5 +216,5 @@ void OpieScreenSaver::setBacklight ( int bright )
if (( bright < 0 ) && m_use_light_sensor ) {
QStringList sl = config. readListEntry ( "LightSensorData", ';' );
-
+
m_sensordata [LS_SensorMin] = 40;
m_sensordata [LS_SensorMax] = 215;
@@ -222,6 +222,6 @@ void OpieScreenSaver::setBacklight ( int bright )
m_sensordata [LS_LightMax] = 255;
m_sensordata [LS_Steps] = 12;
- m_sensordata [LS_Interval] = 2000;
-
+ m_sensordata [LS_Interval] = 2000;
+
for ( uint i = 0; i < LS_Count; i++ ) {
if ( i < sl. count ( ))
@@ -280,5 +280,5 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * )
{
int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( );
-
+
if ( s < m_sensordata [LS_SensorMin] )
m_backlight_sensor = m_sensordata [LS_LightMax];
@@ -288,7 +288,7 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * )
int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin];
int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin];
-
+
int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0
-
+
m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 );
}
@@ -319,10 +319,10 @@ void OpieScreenSaver::powerStatusChanged ( PowerStatus ps )
{
bool newonac = ( ps. acStatus ( ) == PowerStatus::Online );
-
+
if ( newonac != m_on_ac ) {
m_on_ac = newonac;
setInterval ( -1 );
setBacklight ( -1 );
- restore ( );
+ restore ( );
}
}
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
@@ -64,6 +64,6 @@
extern QRect qt_maxWindowRect;
-using namespace Opie;
+using namespace Opie::Core;
static QWidget *calibrate(bool)
{
@@ -160,6 +160,6 @@ Server::Server() :
packageHandler = new PackageHandler( this );
- connect(qApp, SIGNAL(activate(const Opie::ODeviceButton*,bool)),
- this,SLOT(activate(const Opie::ODeviceButton*,bool)));
+ connect(qApp, SIGNAL(activate(const Opie::Core::ODeviceButton*,bool)),
+ this,SLOT(activate(const Opie::Core::ODeviceButton*,bool)));
setGeometry( -10, -10, 9, 9 );
@@ -222,8 +222,8 @@ static bool hasVisibleWindow(const QString& clientname, bool partial)
}
-void Server::activate(const Opie::ODeviceButton* button, bool held)
+void Server::activate(const ODeviceButton* button, bool held)
{
Global::terminateBuiltin("calibrate"); // No tr
- Opie::OQCopMessage om;
+ OQCopMessage om;
if ( held ) {
om = button->heldAction();
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
@@ -39,6 +39,8 @@ class DocumentList;
class ServerInterface;
namespace Opie {
+namespace Core {
class ODeviceButton;
}
+}
class Server : public QWidget {
@@ -61,5 +63,5 @@ public slots:
private slots:
- void activate(const Opie::ODeviceButton*,bool);
+ void activate(const Opie::Core::ODeviceButton*,bool);
void syncConnectionClosed( const QHostAddress & );
void applicationLaunched(int pid, const QString &app);
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
@@ -56,4 +56,5 @@ static int loggedin=0;
using namespace Opie;
+using namespace Opie::Core;
QCopKeyRegister::QCopKeyRegister()
: m_keyCode( 0 ) {
@@ -198,5 +199,5 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe
// First check to see if DeviceButtonManager knows something about this button:
- const Opie::ODeviceButton* button = Opie::ODevice::inst()->buttonForKeycode(keycode);
+ const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode);
if (button && !autoRepeat) {
if ( held_tid ) {
@@ -332,6 +333,6 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
connect( kf, SIGNAL(numLockStateToggle()), this,SIGNAL(numLockStateToggle()));
connect( kf, SIGNAL(capsLockStateToggle()), this,SIGNAL(capsLockStateToggle()));
- connect( kf, SIGNAL(activate(const Opie::ODeviceButton*,bool)),
- this,SIGNAL(activate(const Opie::ODeviceButton*,bool)));
+ connect( kf, SIGNAL(activate(const Opie::Core::ODeviceButton*,bool)),
+ this,SIGNAL(activate(const Opie::Core::ODeviceButton*,bool)));
@@ -349,5 +350,5 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
/* make sure the event filter is installed */
- const Opie::ODeviceButton* but = Opie::ODevice::inst()->buttonForKeycode( -1 );
+ const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 );
}
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
@@ -36,6 +36,8 @@ class DesktopPowerAlerter;
class OpieScreenSaver;
namespace Opie {
+namespace Core {
class ODeviceButton;
}
+}
struct QCopKeyRegister {
@@ -74,5 +76,5 @@ signals:
void numLockStateToggle();
void capsLockStateToggle();
- void activate(const Opie::ODeviceButton*,bool);
+ void activate(const Opie::Core::ODeviceButton*,bool);
@@ -80,5 +82,5 @@ private:
bool keyRegistered( int key );
int held_tid;
- const Opie::ODeviceButton* heldButton;
+ const Opie::Core::ODeviceButton* heldButton;
KeyRegisterList m_keys;
};
@@ -95,5 +97,5 @@ public:
static bool screenLocked();
static void login(bool at_poweron);
-
+
static bool isStarting();
@@ -114,5 +116,5 @@ signals:
void capsLockStateToggle();
void prepareForRestart();
- void activate(const Opie::ODeviceButton*,bool);
+ void activate(const Opie::Core::ODeviceButton*,bool);
public slots:
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
@@ -60,4 +60,5 @@
const int block_size = 51200;
+using namespace Opie::Core;
TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
const char* name)
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
@@ -30,4 +30,5 @@ Wait *lastWaitObject = NULL;
+using namespace Opie::Ui;
Wait::Wait( QWidget *parent ) : QWidget( parent ),
pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE )
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
@@ -28,5 +28,5 @@
#include <qpainter.h>
-class OWait;
+namespace Opie {namespace Ui {class OWait;}}
class Wait : public QWidget
{
@@ -39,5 +39,5 @@ private:
QPixmap pm;
bool waiting;
- OWait* m_centralWait;
+ Opie::Ui::OWait* m_centralWait;
};