author | kergoth <kergoth> | 2002-03-28 23:34:43 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-03-28 23:34:43 (UTC) |
commit | 6c6f578fa5ef1f83cf1ba4978015663360ac2e7e (patch) (unidiff) | |
tree | 64cc4c7dc96e9f7439368a696e46e561be79fa4c /core | |
parent | ed6bcbba1164cc2235b6d21f20b1de416d36cac2 (diff) | |
download | opie-6c6f578fa5ef1f83cf1ba4978015663360ac2e7e.zip opie-6c6f578fa5ef1f83cf1ba4978015663360ac2e7e.tar.gz opie-6c6f578fa5ef1f83cf1ba4978015663360ac2e7e.tar.bz2 |
moved taskbar/ to launcher/.
-rw-r--r-- | core/launcher/taskbar.cpp | 4 | ||||
-rw-r--r-- | core/opie-login/README | 2 | ||||
-rw-r--r-- | core/opie-login/qdmdialogimpl.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index d7f36bd..18d28cb 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp | |||
@@ -56,33 +56,33 @@ | |||
56 | w->showMaximized(); \ | 56 | w->showMaximized(); \ |
57 | } else { \ | 57 | } else { \ |
58 | w->resize( QSize( 300, 300 ) ); \ | 58 | w->resize( QSize( 300, 300 ) ); \ |
59 | } \ | 59 | } \ |
60 | } \ | 60 | } \ |
61 | w->show(); \ | 61 | w->show(); \ |
62 | return w; \ | 62 | return w; \ |
63 | } | 63 | } |
64 | 64 | ||
65 | 65 | ||
66 | #ifdef SINGLE_APP | 66 | #ifdef SINGLE_APP |
67 | #define APP(a,b,c,d) FACTORY(b) | 67 | #define APP(a,b,c,d) FACTORY(b) |
68 | #include "../taskbar/apps.h" | 68 | #include "../launcher/apps.h" |
69 | #undef APP | 69 | #undef APP |
70 | #endif // SINGLE_APP | 70 | #endif // SINGLE_APP |
71 | 71 | ||
72 | static Global::Command builtins[] = { | 72 | static Global::Command builtins[] = { |
73 | 73 | ||
74 | #ifdef SINGLE_APP | 74 | #ifdef SINGLE_APP |
75 | #define APP(a,b,c,d) { a, new##b, c }, | 75 | #define APP(a,b,c,d) { a, new##b, c }, |
76 | #include "../taskbar/apps.h" | 76 | #include "../launcher/apps.h" |
77 | #undef APP | 77 | #undef APP |
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX) | 80 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX) |
81 | { "calibrate", TaskBar::calibrate,1, 0 }, | 81 | { "calibrate", TaskBar::calibrate,1, 0 }, |
82 | #endif | 82 | #endif |
83 | #if !defined(QT_QWS_CASSIOPEIA) | 83 | #if !defined(QT_QWS_CASSIOPEIA) |
84 | { "shutdown", Global::shutdown, 1, 0 }, | 84 | { "shutdown", Global::shutdown, 1, 0 }, |
85 | // { "run", run, 1, 0 }, | 85 | // { "run", run, 1, 0 }, |
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | { 0, TaskBar::calibrate,0, 0 }, | 88 | { 0, TaskBar::calibrate,0, 0 }, |
diff --git a/core/opie-login/README b/core/opie-login/README index ad3b298..4a4234d 100644 --- a/core/opie-login/README +++ b/core/opie-login/README | |||
@@ -23,25 +23,25 @@ REQUIREMENTS: | |||
23 | 23 | ||
24 | - QDM needs Linux-PAM (Pluggable Authentication Modules for Linux) for | 24 | - QDM needs Linux-PAM (Pluggable Authentication Modules for Linux) for |
25 | proper user validation. | 25 | proper user validation. |
26 | 26 | ||
27 | - the /dev/fb0 device has to writeable to everyone ;-( | 27 | - the /dev/fb0 device has to writeable to everyone ;-( |
28 | 28 | ||
29 | 29 | ||
30 | INSTALLATION: | 30 | INSTALLATION: |
31 | 31 | ||
32 | Per default this little add-on is not enabled. You have to do so | 32 | Per default this little add-on is not enabled. You have to do so |
33 | yourself for now, by setting a compile option variable called | 33 | yourself for now, by setting a compile option variable called |
34 | QT_QWS_LOGIN . Furthermore there have to be made some changes in | 34 | QT_QWS_LOGIN . Furthermore there have to be made some changes in |
35 | taskbar/taskbar.pro : | 35 | launcher/taskbar.pro : |
36 | 36 | ||
37 | At the section HEADERS insert a line: | 37 | At the section HEADERS insert a line: |
38 | ../login/qdmdialogimpl.h \ | 38 | ../login/qdmdialogimpl.h \ |
39 | 39 | ||
40 | At the section SOURCES insert a line: | 40 | At the section SOURCES insert a line: |
41 | ../login/qdmdialogimpl.cpp \ | 41 | ../login/qdmdialogimpl.cpp \ |
42 | 42 | ||
43 | furthermore serte these lines: | 43 | furthermore serte these lines: |
44 | 44 | ||
45 | INCLUDEPATH+= ../login | 45 | INCLUDEPATH+= ../login |
46 | DEPENDPATH+= ../login | 46 | DEPENDPATH+= ../login |
47 | 47 | ||
diff --git a/core/opie-login/qdmdialogimpl.cpp b/core/opie-login/qdmdialogimpl.cpp index bb1b453..56f0fc0 100644 --- a/core/opie-login/qdmdialogimpl.cpp +++ b/core/opie-login/qdmdialogimpl.cpp | |||
@@ -59,25 +59,25 @@ | |||
59 | #if defined(QT_QWS_LOGIN_USEPAM) | 59 | #if defined(QT_QWS_LOGIN_USEPAM) |
60 | extern "C" { | 60 | extern "C" { |
61 | #include <security/pam_appl.h> | 61 | #include <security/pam_appl.h> |
62 | } | 62 | } |
63 | #else | 63 | #else |
64 | #define _XOPEN_SOURCE | 64 | #define _XOPEN_SOURCE |
65 | #include <unistd.h> | 65 | #include <unistd.h> |
66 | #include <crypt.h> | 66 | #include <crypt.h> |
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | 69 | ||
70 | #include "qdmdialogimpl.h" | 70 | #include "qdmdialogimpl.h" |
71 | #include "../taskbar/inputmethods.h" | 71 | #include "../launcher/inputmethods.h" |
72 | 72 | ||
73 | 73 | ||
74 | //---------------------------------------------------------------------------- | 74 | //---------------------------------------------------------------------------- |
75 | 75 | ||
76 | //-- taken from semctl man page | 76 | //-- taken from semctl man page |
77 | #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) | 77 | #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) |
78 | //-- union semun is defined by including <sys/sem.h> | 78 | //-- union semun is defined by including <sys/sem.h> |
79 | #else | 79 | #else |
80 | //-- according to X/OPEN we have to define it ourselves | 80 | //-- according to X/OPEN we have to define it ourselves |
81 | union semun { | 81 | union semun { |
82 | int val; // value for SETVAL | 82 | int val; // value for SETVAL |
83 | struct semid_ds *buf; // buffer for IPC_STAT, IPC_SET | 83 | struct semid_ds *buf; // buffer for IPC_STAT, IPC_SET |