summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/calibrate/calibrate.cpp2
-rw-r--r--core/opie-login/loginwindowimpl.cpp1
-rw-r--r--core/opie-login/main.cpp1
-rw-r--r--core/opie-login/opie-login.pro4
4 files changed, 6 insertions, 2 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index 1f4fb1b..b9ad73d 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -5,32 +5,34 @@
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include <math.h>
22
21#include "calibrate.h" 23#include "calibrate.h"
22 24
23#include <qpe/resource.h> 25#include <qpe/resource.h>
24 26
25#include <qapplication.h> 27#include <qapplication.h>
26 28
27#if defined(Q_WS_QWS) || defined(_WS_QWS_) 29#if defined(Q_WS_QWS) || defined(_WS_QWS_)
28 30
29#include <qpainter.h> 31#include <qpainter.h>
30#include <qtimer.h> 32#include <qtimer.h>
31#include <qwindowsystem_qws.h> 33#include <qwindowsystem_qws.h>
32#include <qgfx_qws.h> 34#include <qgfx_qws.h>
33 35
34 36
35Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) : 37Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) :
36 QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop ) 38 QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop )
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 3265b46..26d9225 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -8,32 +8,33 @@
8#include <qpixmap.h> 8#include <qpixmap.h>
9#include <qlabel.h> 9#include <qlabel.h>
10#include <qpopupmenu.h> 10#include <qpopupmenu.h>
11#include <qmessagebox.h> 11#include <qmessagebox.h>
12 12
13#include <qpe/qcopenvelope_qws.h> 13#include <qpe/qcopenvelope_qws.h>
14 14
15#include <opie/odevice.h> 15#include <opie/odevice.h>
16 16
17#include <stdio.h> 17#include <stdio.h>
18 18
19#include <pwd.h> 19#include <pwd.h>
20#include <grp.h> 20#include <grp.h>
21#include <unistd.h> 21#include <unistd.h>
22#include <stdlib.h> 22#include <stdlib.h>
23 23
24#undef USEPAM // FOR my toolchain
24#ifdef USEPAM 25#ifdef USEPAM
25extern "C" { 26extern "C" {
26#include <security/pam_appl.h> 27#include <security/pam_appl.h>
27} 28}
28#else 29#else
29#include <crypt.h> 30#include <crypt.h>
30#include <shadow.h> 31#include <shadow.h>
31#endif 32#endif
32 33
33#include "loginwindowimpl.h" 34#include "loginwindowimpl.h"
34#include "inputmethods.h" 35#include "inputmethods.h"
35 36
36LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) 37LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose )
37{ 38{
38 QPopupMenu *pop = new QPopupMenu ( this ); 39 QPopupMenu *pop = new QPopupMenu ( this );
39 pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( ))); 40 pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( )));
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 9d52b75..44d6f8d 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -1,23 +1,24 @@
1#include <sys/time.h> 1#include <sys/time.h>
2#include <sys/resource.h> 2#include <sys/resource.h>
3#include <unistd.h> 3#include <unistd.h>
4#include <syslog.h> 4#include <syslog.h>
5#include <sys/types.h> 5#include <sys/types.h>
6#include <sys/wait.h> 6#include <sys/wait.h>
7#include <stdio.h> 7#include <stdio.h>
8#include <stdlib.h>
8 9
9#include <qpe/qpeapplication.h> 10#include <qpe/qpeapplication.h>
10#include <qpe/qcopenvelope_qws.h> 11#include <qpe/qcopenvelope_qws.h>
11 12
12#include <opie/odevice.h> 13#include <opie/odevice.h>
13 14
14#include <qwindowsystem_qws.h> 15#include <qwindowsystem_qws.h>
15#include <qfile.h> 16#include <qfile.h>
16 17
17#include "loginwindowimpl.h" 18#include "loginwindowimpl.h"
18#include "calibrate.h" 19#include "calibrate.h"
19 20
20int login_main ( int argc, char **argv ); 21int login_main ( int argc, char **argv );
21 22
22 23
23int main ( int argc, char **argv ) 24int main ( int argc, char **argv )
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index 35c1ed0..ef449ab 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -4,22 +4,22 @@ CONFIG = qt warn_on debug usepam
4HEADERS = loginwindowimpl.h \ 4HEADERS = loginwindowimpl.h \
5 ../launcher/inputmethods.h \ 5 ../launcher/inputmethods.h \
6 ../apps/calibrate/calibrate.h 6 ../apps/calibrate/calibrate.h
7 7
8SOURCES = loginwindowimpl.cpp \ 8SOURCES = loginwindowimpl.cpp \
9 ../launcher/inputmethods.cpp \ 9 ../launcher/inputmethods.cpp \
10 ../apps/calibrate/calibrate.cpp \ 10 ../apps/calibrate/calibrate.cpp \
11 main.cpp 11 main.cpp
12 12
13INTERFACES = loginwindow.ui 13INTERFACES = loginwindow.ui
14 14
15INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 15INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
16DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 16DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
17 17
18LIBS += -lqpe -lopie 18LIBS += -lqpe -lopie
19 19
20usepam:LIBS += -lpam 20#usepam:LIBS += -lpam
21usepam:DEFINES += USEPAM 21#usepam:DEFINES += USEPAM
22 22
23DESTDIR = $(OPIEDIR)/bin 23DESTDIR = $(OPIEDIR)/bin
24TARGET = opie-login 24TARGET = opie-login
25 25