-rw-r--r-- | core/launcher/serverapp.h | 10 |
1 files changed, 6 insertions, 4 deletions
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 | |||
@@ -30,18 +30,20 @@ | |||
30 | 30 | ||
31 | #include "shutdownimpl.h" | 31 | #include "shutdownimpl.h" |
32 | 32 | ||
33 | class PowerStatus; | 33 | class PowerStatus; |
34 | class DesktopPowerAlerter; | 34 | class DesktopPowerAlerter; |
35 | 35 | ||
36 | class OpieScreenSaver; | 36 | class OpieScreenSaver; |
37 | namespace Opie { | 37 | namespace Opie { |
38 | namespace Core { | ||
38 | class ODeviceButton; | 39 | class ODeviceButton; |
39 | } | 40 | } |
41 | } | ||
40 | 42 | ||
41 | struct QCopKeyRegister { | 43 | struct 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; |
46 | QCString message()const; | 48 | QCString message()const; |
47 | inline bool send(); | 49 | inline bool send(); |
@@ -68,38 +70,38 @@ protected: | |||
68 | 70 | ||
69 | signals: | 71 | 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 | ||
79 | private: | 81 | private: |
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 | ||
86 | class ServerApplication : public QPEApplication | 88 | class ServerApplication : public QPEApplication |
87 | { | 89 | { |
88 | Q_OBJECT | 90 | Q_OBJECT |
89 | public: | 91 | public: |
90 | ServerApplication( int& argc, char **argv, Type t ); | 92 | ServerApplication( int& argc, char **argv, Type t ); |
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(); |
104 | int exec(); | 106 | int exec(); |
105 | 107 | ||
@@ -108,17 +110,17 @@ signals: | |||
108 | void home(); | 110 | void home(); |
109 | void launch(); | 111 | void launch(); |
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 | ||
118 | public slots: | 120 | public 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 | ||
123 | protected: | 125 | protected: |
124 | bool eventFilter( QObject*, QEvent* ); | 126 | bool eventFilter( QObject*, QEvent* ); |