| author | kergoth <kergoth> | 2002-03-28 23:34:43 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-03-28 23:34:43 (UTC) |
| commit | 6c6f578fa5ef1f83cf1ba4978015663360ac2e7e (patch) (side-by-side diff) | |
| 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 @@ w->showMaximized(); \ } else { \ w->resize( QSize( 300, 300 ) ); \ } \ } \ w->show(); \ return w; \ } #ifdef SINGLE_APP #define APP(a,b,c,d) FACTORY(b) -#include "../taskbar/apps.h" +#include "../launcher/apps.h" #undef APP #endif // SINGLE_APP static Global::Command builtins[] = { #ifdef SINGLE_APP #define APP(a,b,c,d) { a, new##b, c }, -#include "../taskbar/apps.h" +#include "../launcher/apps.h" #undef APP #endif #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX) { "calibrate", TaskBar::calibrate, 1, 0 }, #endif #if !defined(QT_QWS_CASSIOPEIA) { "shutdown", Global::shutdown, 1, 0 }, // { "run", run, 1, 0 }, #endif { 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: - QDM needs Linux-PAM (Pluggable Authentication Modules for Linux) for proper user validation. - the /dev/fb0 device has to writeable to everyone ;-( INSTALLATION: Per default this little add-on is not enabled. You have to do so yourself for now, by setting a compile option variable called QT_QWS_LOGIN . Furthermore there have to be made some changes in -taskbar/taskbar.pro : +launcher/taskbar.pro : At the section HEADERS insert a line: ../login/qdmdialogimpl.h \ At the section SOURCES insert a line: ../login/qdmdialogimpl.cpp \ furthermore serte these lines: INCLUDEPATH += ../login DEPENDPATH += ../login 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 @@ #if defined(QT_QWS_LOGIN_USEPAM) extern "C" { #include <security/pam_appl.h> } #else #define _XOPEN_SOURCE #include <unistd.h> #include <crypt.h> #endif #include "qdmdialogimpl.h" -#include "../taskbar/inputmethods.h" +#include "../launcher/inputmethods.h" //---------------------------------------------------------------------------- //-- taken from semctl man page #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) //-- union semun is defined by including <sys/sem.h> #else //-- according to X/OPEN we have to define it ourselves union semun { int val; // value for SETVAL struct semid_ds *buf; // buffer for IPC_STAT, IPC_SET |