summaryrefslogtreecommitdiff
authorzecke <zecke>2004-11-03 22:35:36 (UTC)
committer zecke <zecke>2004-11-03 22:35:36 (UTC)
commit9a753348fd31dfb5309408c469cce8ea5eadf8ea (patch) (unidiff)
tree4945b66e2ff79c5961f29b53906edff644ad6f5e
parentda3c9206558e9b03be2270ab5e9b3406d9c3cad8 (diff)
downloadopie-9a753348fd31dfb5309408c469cce8ea5eadf8ea.zip
opie-9a753348fd31dfb5309408c469cce8ea5eadf8ea.tar.gz
opie-9a753348fd31dfb5309408c469cce8ea5eadf8ea.tar.bz2
Switch to OApplication
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp2
-rw-r--r--core/launcher/serverapp.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index be6b972..75d4ac1 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -287,25 +287,25 @@ void ServerApplication::switchLCD( bool on )
287 return; 287 return;
288 288
289 if ( on ) { 289 if ( on ) {
290 dapp-> m_screensaver-> setDisplayState ( true ); 290 dapp-> m_screensaver-> setDisplayState ( true );
291 dapp-> m_screensaver-> setBacklight ( -3 ); 291 dapp-> m_screensaver-> setBacklight ( -3 );
292 } else 292 } else
293 dapp-> m_screensaver-> setDisplayState ( false ); 293 dapp-> m_screensaver-> setDisplayState ( false );
294 294
295 295
296} 296}
297 297
298ServerApplication::ServerApplication( int& argc, char **argv, Type t ) 298ServerApplication::ServerApplication( int& argc, char **argv, Type t )
299 : QPEApplication( argc, argv, t ) 299 : Opie::Core::OApplication( argc, argv, t )
300{ 300{
301 ms_is_starting = true; 301 ms_is_starting = true;
302 302
303 // We know we'll have lots of cached pixmaps due to App/DocLnks 303 // We know we'll have lots of cached pixmaps due to App/DocLnks
304 QPixmapCache::setCacheLimit(512); 304 QPixmapCache::setCacheLimit(512);
305 305
306 m_ps = new PowerStatus; 306 m_ps = new PowerStatus;
307 m_ps_last = new PowerStatus; 307 m_ps_last = new PowerStatus;
308 pa = new DesktopPowerAlerter( 0 ); 308 pa = new DesktopPowerAlerter( 0 );
309 309
310 m_apm_timer = new QTimer( this ); 310 m_apm_timer = new QTimer( this );
311 connect(m_apm_timer, SIGNAL( timeout() ), 311 connect(m_apm_timer, SIGNAL( timeout() ),
diff --git a/core/launcher/serverapp.h b/core/launcher/serverapp.h
index 916d83c..27be28b 100644
--- a/core/launcher/serverapp.h
+++ b/core/launcher/serverapp.h
@@ -12,25 +12,25 @@
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#ifndef SERVERAPP_H 21#ifndef SERVERAPP_H
22#define SERVERAPP_H 22#define SERVERAPP_H
23 23
24#include <qtopia/qpeapplication.h> 24#include <opie2/oapplication.h>
25 25
26#include <qwidget.h> 26#include <qwidget.h>
27#ifdef QWS 27#ifdef QWS
28#include <qwindowsystem_qws.h> 28#include <qwindowsystem_qws.h>
29#endif 29#endif
30 30
31#include "shutdownimpl.h" 31#include "shutdownimpl.h"
32 32
33class PowerStatus; 33class PowerStatus;
34class DesktopPowerAlerter; 34class DesktopPowerAlerter;
35 35
36class OpieScreenSaver; 36class OpieScreenSaver;
@@ -76,25 +76,25 @@ signals:
76 void numLockStateToggle(); 76 void numLockStateToggle();
77 void capsLockStateToggle(); 77 void capsLockStateToggle();
78 void activate(const Opie::Core::ODeviceButton*,bool); 78 void activate(const Opie::Core::ODeviceButton*,bool);
79 79
80 80
81private: 81private:
82 bool keyRegistered( int key ); 82 bool keyRegistered( int key );
83 int held_tid; 83 int held_tid;
84 const Opie::Core::ODeviceButton* heldButton; 84 const Opie::Core::ODeviceButton* heldButton;
85 KeyRegisterList m_keys; 85 KeyRegisterList m_keys;
86}; 86};
87 87
88class ServerApplication : public QPEApplication 88class ServerApplication : public Opie::Core::OApplication
89{ 89{
90 Q_OBJECT 90 Q_OBJECT
91public: 91public:
92 ServerApplication( int& argc, char **argv, Type t ); 92 ServerApplication( int& argc, char **argv, Type t );
93 ~ServerApplication(); 93 ~ServerApplication();
94 94
95 static bool doRestart; 95 static bool doRestart;
96 static bool allowRestart; 96 static bool allowRestart;
97 static bool screenLocked(); 97 static bool screenLocked();
98 static void login(bool at_poweron); 98 static void login(bool at_poweron);
99 99
100 static bool isStarting(); 100 static bool isStarting();