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 )
         return;
 
     if ( on ) {
         dapp-> m_screensaver-> setDisplayState ( true );
         dapp-> m_screensaver-> setBacklight ( -3 );
     } else
         dapp-> m_screensaver-> setDisplayState ( false );
 
 
 }
 
 ServerApplication::ServerApplication( int& argc, char **argv, Type t )
-    : QPEApplication( argc, argv, t )
+    : Opie::Core::OApplication( argc, argv, t )
 {
     ms_is_starting = true;
 
     // We know we'll have lots of cached pixmaps due to App/DocLnks
     QPixmapCache::setCacheLimit(512);
 
     m_ps = new PowerStatus;
     m_ps_last = new PowerStatus;
     pa = new DesktopPowerAlerter( 0 );
 
     m_apm_timer = new QTimer( this );
     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 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef SERVERAPP_H
 #define SERVERAPP_H
 
-#include <qtopia/qpeapplication.h>
+#include <opie2/oapplication.h>
 
 #include <qwidget.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #endif
 
 #include "shutdownimpl.h"
 
 class PowerStatus;
 class DesktopPowerAlerter;
 
 class OpieScreenSaver;
@@ -76,25 +76,25 @@ signals:
     void numLockStateToggle();
     void capsLockStateToggle();
     void activate(const Opie::Core::ODeviceButton*,bool);
 
 
 private:
     bool keyRegistered( int key );
     int held_tid;
     const Opie::Core::ODeviceButton* heldButton;
     KeyRegisterList m_keys;
 };
 
-class ServerApplication : public QPEApplication
+class ServerApplication : public Opie::Core::OApplication
 {
     Q_OBJECT
 public:
     ServerApplication( int& argc, char **argv, Type t );
     ~ServerApplication();
 
     static bool doRestart;
     static bool allowRestart;
     static bool screenLocked();
     static void login(bool at_poweron);
 
     static bool isStarting();