| -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 @@ -3,2 +3,2 @@ 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 @@ -44,3 +44,3 @@ -#include <opie/odevice.h> +#include <opie2/odevice.h> @@ -53,3 +53,3 @@ -using namespace Opie; +using namespace Opie::Core; @@ -64,3 +64,3 @@ 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&))); @@ -76,7 +76,7 @@ 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())); - } + } @@ -90,4 +90,4 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C 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 ( ))); @@ -100,3 +100,3 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C m_user-> setEditText ( last ); - + calcMaxWindowRect ( ); @@ -112,4 +112,4 @@ void LoginWindowImpl::receive ( const QCString &msg, const QByteArray &data ) QDataStream stream ( data, IO_ReadOnly ); - - if ( msg == "hideInputMethod()" ) + + if ( msg == "hideInputMethod()" ) m_input-> hideInputMethod ( ); @@ -131,3 +131,3 @@ void LoginWindowImpl::calcMaxWindowRect ( ) wr.setCoords( 0, 0, displayWidth-1, m_taskbar->y()-1 ); - + #if QT_VERSION < 300 @@ -139,3 +139,3 @@ void LoginWindowImpl::calcMaxWindowRect ( ) } - + 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 @@ -34,3 +34,3 @@ #include <qpe/qpestyle.h> -#include <qpe/power.h> +#include <qpe/power.h> #include <qpe/config.h> @@ -42,3 +42,3 @@ #include <qtimer.h> -#include <qfile.h> +#include <qfile.h> @@ -58,3 +58,3 @@ -using namespace Opie; +using namespace Opie::Core; @@ -190,3 +190,3 @@ int main ( int argc, char **argv ) } - + if ( autolog && !userExited ) { @@ -198,3 +198,3 @@ int main ( int argc, char **argv ) LoginApplication::setLoginAs ( autolog ); - + |