Convert to ODP

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
@@ -1,4 +1,4 @@
   config OPIE-LOGIN
     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
@@ -39,82 +39,82 @@
 #include <qwindowsystem_qws.h>
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "loginwindowimpl.h"
 #include "loginapplication.h"
 #include "inputmethods.h"
 
-using namespace Opie;
+using namespace Opie::Core;
 
 
 LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose )
 {
 	QPopupMenu *pop = new QPopupMenu ( this );
 	pop-> insertItem ( tr( "Restart" ), this, SLOT( restart()));
 	pop-> insertItem ( tr( "Quit" ), this, SLOT( quit()));
 	m_menu-> setPopup ( pop );
 
 	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 );
 	m_input = new InputMethods ( m_taskbar );
  	connect ( m_input, SIGNAL( inputToggled(bool)), this, SLOT( calcMaxWindowRect()));
 	lay-> addWidget ( m_input );
 	lay-> addStretch ( 10 );
 
 	setActiveWindow ( );
 	m_password-> setFocus ( );
 
 	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" );
 	QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" );
 
 	if ( !bgpix. isNull ( )) {
 		setBackgroundPixmap ( bgpix );
 		m_caption-> setBackgroundPixmap ( bgpix);
 		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 ( )));
 
 	Config cfg ( "opie-login" );
 	cfg. setGroup ( "General" );
 	QString last = cfg. readEntry ( "LastLogin" );
 
 	if ( !last. isEmpty ( ))
 		m_user-> setEditText ( last );
-	
+
 	calcMaxWindowRect ( );
 }
 
 LoginWindowImpl::~LoginWindowImpl ( )
 {
 }
 
 
 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()" )
 		m_input-> showInputMethod ( );
 	else if ( msg == "reloadInputMethods()" )
 		m_input-> loadInputMethods ( );
 }
@@ -126,21 +126,21 @@ void LoginWindowImpl::calcMaxWindowRect ( )
 	int displayWidth = qApp-> desktop ( )-> width ( );
 	QRect ir = m_input-> inputRect ( );
 	if ( ir.isValid() )
 		wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 );
 	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 ( )));
 #endif
 
 	QWSServer::setMaxWindowRect( wr );
 #endif
 }
-                                        
+
 
 void LoginWindowImpl::keyPressEvent ( QKeyEvent *e )
 {
 	switch ( e-> key ( )) {
 		case HardKey_Suspend:   suspend ( );
 		                        break;
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
@@ -29,21 +29,21 @@
 #include "loginwindowimpl.h"
 #include "calibrate.h"
 
 /* OPIE */
 #include <opie2/odevice.h>
 #include <qpe/qpestyle.h>
-#include <qpe/power.h> 
+#include <qpe/power.h>
 #include <qpe/config.h>
 
 /* QT */
 #include <qwindowsystem_qws.h>
 #include <qmessagebox.h>
 #include <qlabel.h>
 #include <qtimer.h>
-#include <qfile.h> 
+#include <qfile.h>
 
 /* STD */
 #include <sys/types.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -53,13 +53,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <getopt.h>
 #include <string.h>
 
-using namespace Opie;
+using namespace Opie::Core;
 
 int login_main ( int argc, char **argv, pid_t ppid );
 void sigterm ( int sig );
 void sigint ( int sig );
 void exit_closelog ( );
 
@@ -185,21 +185,21 @@ int main ( int argc, char **argv )
 				cfg. setGroup ( "General" );
 				QString user = cfg. readEntry ( "AutoLogin" );
 
 				if ( !user. isEmpty ( ))
 					autolog = ::strdup ( user. latin1 ( ));
 			}
-		
+
 			if ( autolog && !userExited ) {
 
                 QWSServer::setDesktopBackground( QImage() );
                 ODevice::inst ( )-> setDisplayStatus ( true );
                 ODevice::inst ( )-> setSoftSuspend ( false );
                 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
                 LoginApplication::setLoginAs ( autolog );
-  
+
 
 				if ( LoginApplication::changeIdentity ( ))
 					::exit ( LoginApplication::login ( ));
 				else
 					::exit ( 0 );
 			}