-rw-r--r-- | core/launcher/serverapp.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index 3d88873..f1bce40 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp @@ -23,9 +23,10 @@ /* OPIE */ #include <opie2/odebug.h> #include <opie2/odevice.h> -#include <qtopia/password.h> +#include <opie2/multiauthpassword.h> + #include <qtopia/config.h> #include <qtopia/power.h> #ifdef Q_WS_QWS @@ -349,8 +350,9 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) grabKeyboard(); /* make sure the event filter is installed */ const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); + Q_CONST_UNUSED( but ) } ServerApplication::~ServerApplication() @@ -495,9 +497,9 @@ bool ServerApplication::screenLocked() void ServerApplication::login(bool at_poweron) { if ( !loggedin ) { Global::terminateBuiltin("calibrate"); // No tr - Password::authenticate(at_poweron); + Opie::Security::MultiauthPassword::authenticate(at_poweron); loggedin=1; #ifndef QT_NO_COP QCopEnvelope e( "QPE/Desktop", "unlocked()" ); #endif @@ -551,9 +553,9 @@ void ServerApplication::togglePower() m_suspendTime = QDateTime::currentDateTime(); #ifdef QWS - if ( Password::needToAuthenticate ( true ) && qt_screen ) { + if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { // Should use a big black window instead. // But this would not show up fast enough QGfx *g = qt_screen-> screenGfx ( ); g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( )); |