-rw-r--r-- | core/launcher/applauncher.cpp | 1 | ||||
-rw-r--r-- | core/launcher/documentlist.cpp | 1 | ||||
-rw-r--r-- | core/launcher/main.cpp | 2 | ||||
-rw-r--r-- | core/launcher/qcopbridge.cpp | 1 | ||||
-rw-r--r-- | core/launcher/screensaver.cpp | 2 | ||||
-rw-r--r-- | core/launcher/server.cpp | 10 | ||||
-rw-r--r-- | core/launcher/server.h | 4 | ||||
-rw-r--r-- | core/launcher/serverapp.cpp | 9 | ||||
-rw-r--r-- | core/launcher/serverapp.h | 8 | ||||
-rw-r--r-- | core/launcher/transferserver.cpp | 1 | ||||
-rw-r--r-- | core/launcher/wait.cpp | 1 | ||||
-rw-r--r-- | core/launcher/wait.h | 4 |
12 files changed, 27 insertions, 17 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 @@ #include <qtopia/qcopenvelope_qws.h> #include <qtopia/qpeapplication.h> #include "applauncher.h" #include "documentlist.h" +using namespace Opie::Core; const int AppLauncher::RAISE_TIMEOUT_MS = 5000; //--------------------------------------------------------------------------- static AppLauncher* appLauncherPtr; 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 @@ #include <qcopchannel_qws.h> #include <qlistview.h> #include <qlist.h> #include <qpixmap.h> +using namespace Opie::Core; AppLnkSet *DocumentList::appLnkSet = 0; static const int MAX_SEARCH_DEPTH = 10; class 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 @@ #include <qkeyboard_qws.h> #endif #include <qmessagebox.h> #include <opie2/odevice.h> -using namespace Opie; +using namespace Opie::Core; static void cleanup() { QDir dir( "/tmp", "qcop-msg-*" ); 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 @@ //#define INSECURE const int block_size = 51200; +using namespace Opie::Core; QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent, const char* name ) : QServerSocket( port, 1, parent, name ), desktopChannel( 0 ), cardChannel( 0 ) { 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 @@ #include <qpe/config.h> #include <qpe/network.h> #include <opie2/odevice.h> -using namespace Opie; +using namespace Opie::Core; OpieScreenSaver::OpieScreenSaver ( ) : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) { 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 @@ #include <qtextstream.h> #include <stdlib.h> extern QRect qt_maxWindowRect; -using namespace Opie; +using namespace Opie::Core; static QWidget *calibrate(bool) { #ifdef Q_WS_QWS Calibrate *c = new Calibrate; c->show(); return c; @@ -156,14 +156,14 @@ Server::Server() : // start services startTransferServer(); (void) new IrServer( this ); 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 ); QCopChannel *channel = new QCopChannel("QPE/System", this); connect(channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(systemMsg(const QCString&,const QByteArray&)) ); @@ -218,16 +218,16 @@ static bool hasVisibleWindow(const QString& clientname, bool partial) } } #endif return FALSE; } -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(); } else { om = button->pressedAction(); } 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; class AppLnkSet; class StorageInfo; class SyncDialog; class DocumentList; class ServerInterface; namespace Opie { +namespace Core { class ODeviceButton; } +} class Server : public QWidget { Q_OBJECT public: Server(); ~Server(); @@ -57,13 +59,13 @@ public slots: void systemMsg(const QCString &, const QByteArray &); void receiveTaskBar(const QCString &msg, const QByteArray &data); void terminateServers(); void pokeTimeMonitors(); 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); void applicationTerminated(int pid, const QString &app); void applicationConnected(const QString &app); void storageChanged(); 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 @@ static ServerApplication *serverApp = 0; static int loggedin=0; using namespace Opie; +using namespace Opie::Core; QCopKeyRegister::QCopKeyRegister() : m_keyCode( 0 ) { } QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m ) :m_keyCode( k ), m_channel( c ), m_message( m ) { @@ -194,13 +195,13 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) ) return true; }else { // 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 ) { killTimer(held_tid); held_tid = 0; } if ( button->heldAction().isNull() ) { @@ -328,14 +329,14 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) connect( kf, SIGNAL(launch()), this, SIGNAL(launch()) ); connect( kf, SIGNAL(power()), this, SIGNAL(power()) ); connect( kf, SIGNAL(backlight()), this, SIGNAL(backlight()) ); connect( kf, SIGNAL(symbol()), this, SIGNAL(symbol())); 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))); connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) ); connect( this, SIGNAL(power() ), SLOT(togglePower() ) ); @@ -345,13 +346,13 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) serverApp = this; apmTimeout(); grabKeyboard(); /* make sure the event filter is installed */ - const Opie::ODeviceButton* but = Opie::ODevice::inst()->buttonForKeycode( -1 ); + const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); } ServerApplication::~ServerApplication() { 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 @@ class PowerStatus; class DesktopPowerAlerter; class OpieScreenSaver; namespace Opie { +namespace Core { class ODeviceButton; } +} struct QCopKeyRegister { QCopKeyRegister(); QCopKeyRegister( int k, const QCString&, const QCString& ); int keyCode()const; QCString channel()const; @@ -70,19 +72,19 @@ signals: void launch(); void power(); void backlight(); void symbol(); void numLockStateToggle(); void capsLockStateToggle(); - void activate(const Opie::ODeviceButton*,bool); + void activate(const Opie::Core::ODeviceButton*,bool); private: bool keyRegistered( int key ); int held_tid; - const Opie::ODeviceButton* heldButton; + const Opie::Core::ODeviceButton* heldButton; KeyRegisterList m_keys; }; class ServerApplication : public QPEApplication { Q_OBJECT @@ -110,13 +112,13 @@ signals: void power(); void backlight(); void symbol(); void numLockStateToggle(); void capsLockStateToggle(); void prepareForRestart(); - void activate(const Opie::ODeviceButton*,bool); + void activate(const Opie::Core::ODeviceButton*,bool); public slots: virtual void systemMessage( const QCString& msg, const QByteArray& ); virtual void launcherMessage( const QCString& msg, const QByteArray& ); void rereadVolumes(); 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 @@ #include "transferserver.h" #include <qtopia/qprocess.h> const int block_size = 51200; +using namespace Opie::Core; TransferServer::TransferServer( Q_UINT16 port, QObject *parent, const char* name) : QServerSocket( port, 1, parent, name ) { connections.setAutoDelete( TRUE ); 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 @@ Wait *lastWaitObject = NULL; +using namespace Opie::Ui; Wait::Wait( QWidget *parent ) : QWidget( parent ), pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE ) { setFixedSize( pm.size() ); lastWaitObject = this; 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 @@ #include <qtopia/resource.h> #include <qwidget.h> #include <qpixmap.h> #include <qpainter.h> -class OWait; +namespace Opie {namespace Ui {class OWait;}} class Wait : public QWidget { public: Wait( QWidget *parent ); void setWaiting( bool w ); void paintEvent( QPaintEvent * ); static Wait *getWaitObject(); private: QPixmap pm; bool waiting; - OWait* m_centralWait; + Opie::Ui::OWait* m_centralWait; }; #endif // __WAIT_H__ |