| -rw-r--r-- | core/opie-login/config.in | 2 | ||||
| -rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 26 | ||||
| -rw-r--r-- | core/opie-login/main.cpp | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/core/opie-login/config.in b/core/opie-login/config.in index 339b589..a71319c 100644 --- a/core/opie-login/config.in +++ b/core/opie-login/config.in @@ -2,3 +2,3 @@ boolean "opie-login (Initial Login app, ala xdm/kdm/gdm)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp index e1b9360..32f98f3 100644 --- a/core/opie-login/loginwindowimpl.cpp +++ b/core/opie-login/loginwindowimpl.cpp @@ -43,5 +43,5 @@ #include <qpe/config.h> -#include <opie/odevice.h> +#include <opie2/odevice.h> #include <stdio.h> @@ -52,5 +52,5 @@ #include "inputmethods.h" -using namespace Opie; +using namespace Opie::Core; @@ -63,5 +63,5 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C QCopChannel *channel = new QCopChannel ( "QPE/TaskBar", this ); - connect ( channel, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( receive(const QCString&,const QByteArray&))); + connect ( channel, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( receive(const QCString&,const QByteArray&))); QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); @@ -75,9 +75,9 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C m_user-> insertStringList ( lApp-> allUsers ( )); - + //there is no point in displaying the IM for a zaurus - if (ODevice::inst ( )-> series ( ) != Model_Zaurus){ + if (ODevice::inst ( )-> series ( ) != Model_Zaurus){ QTimer::singleShot ( 0, this, SLOT( showIM())); - } + } QString opiedir = ::getenv ( "OPIEDIR" ); @@ -89,6 +89,6 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C TextLabel1-> setBackgroundPixmap ( bgpix); TextLabel2-> setBackgroundPixmap ( bgpix); - } - + } + m_caption-> setText ( tr("<center>Welcome to OPIE %1</center><center>& %2 %3</center>"). arg(QPE_VERSION). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( ))); @@ -99,5 +99,5 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C if ( !last. isEmpty ( )) m_user-> setEditText ( last ); - + calcMaxWindowRect ( ); } @@ -111,6 +111,6 @@ void LoginWindowImpl::receive ( const QCString &msg, const QByteArray &data ) { QDataStream stream ( data, IO_ReadOnly ); - - if ( msg == "hideInputMethod()" ) + + if ( msg == "hideInputMethod()" ) m_input-> hideInputMethod ( ); else if ( msg == "showInputMethod()" ) @@ -130,5 +130,5 @@ void LoginWindowImpl::calcMaxWindowRect ( ) else wr.setCoords( 0, 0, displayWidth-1, m_taskbar->y()-1 ); - + #if QT_VERSION < 300 wr = qt_screen-> mapToDevice ( wr, QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); @@ -138,5 +138,5 @@ void LoginWindowImpl::calcMaxWindowRect ( ) #endif } - + void LoginWindowImpl::keyPressEvent ( QKeyEvent *e ) diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 6aa7287..f0a8ba2 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp @@ -33,5 +33,5 @@ #include <opie2/odevice.h> #include <qpe/qpestyle.h> -#include <qpe/power.h> +#include <qpe/power.h> #include <qpe/config.h> @@ -41,5 +41,5 @@ #include <qlabel.h> #include <qtimer.h> -#include <qfile.h> +#include <qfile.h> /* STD */ @@ -57,5 +57,5 @@ #include <string.h> -using namespace Opie; +using namespace Opie::Core; int login_main ( int argc, char **argv, pid_t ppid ); @@ -189,5 +189,5 @@ int main ( int argc, char **argv ) autolog = ::strdup ( user. latin1 ( )); } - + if ( autolog && !userExited ) { @@ -197,5 +197,5 @@ int main ( int argc, char **argv ) LoginApplication *app = new LoginApplication ( argc, argv, ppid ); LoginApplication::setLoginAs ( autolog ); - + if ( LoginApplication::changeIdentity ( )) |