summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile14
-rw-r--r--core/launcher/taskbar.cpp4
-rw-r--r--core/opie-login/README2
-rw-r--r--core/opie-login/qdmdialogimpl.cpp2
4 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 24a9050..01aba30 100644
--- a/Makefile
+++ b/Makefile
@@ -10,12 +10,12 @@ COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
10 inputmethods/unikeyboard \ 10 inputmethods/unikeyboard \
11 inputmethods/jumpx \ 11 inputmethods/jumpx \
12 inputmethods/dvorak \ 12 inputmethods/dvorak \
13 taskbar/batteryapplet \ 13 launcher/batteryapplet \
14 taskbar/volumeapplet \ 14 launcher/volumeapplet \
15 taskbar/clockapplet \ 15 launcher/clockapplet \
16 taskbar/netmonapplet \ 16 launcher/netmonapplet \
17 taskbar/screenshotapplet \ 17 launcher/screenshotapplet \
18 taskbar/vmemo \ 18 launcher/vmemo \
19 netsetup/dialup \ 19 netsetup/dialup \
20 netsetup/lan \ 20 netsetup/lan \
21 opiemail/ifaces/pop3 opiemail/ifaces/smtp \ 21 opiemail/ifaces/pop3 opiemail/ifaces/smtp \
@@ -35,7 +35,7 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
35 settings/sound \ 35 settings/sound \
36 settings/systemtime \ 36 settings/systemtime \
37 solitaire spreadsheet tetrix textedit \ 37 solitaire spreadsheet tetrix textedit \
38 todo wordgame embeddedkonsole taskbar sysinfo \ 38 todo wordgame embeddedkonsole launcher sysinfo \
39 parashoot snake citytime showimg netsetup tableviewer \ 39 parashoot snake citytime showimg netsetup tableviewer \
40 qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \ 40 qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \
41 noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers 41 noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers
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
@@ -65,7 +65,7 @@
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
@@ -73,7 +73,7 @@ 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
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
@@ -32,7 +32,7 @@ INSTALLATION:
32Per default this little add-on is not enabled. You have to do so 32Per default this little add-on is not enabled. You have to do so
33yourself for now, by setting a compile option variable called 33yourself for now, by setting a compile option variable called
34QT_QWS_LOGIN . Furthermore there have to be made some changes in 34QT_QWS_LOGIN . Furthermore there have to be made some changes in
35taskbar/taskbar.pro : 35launcher/taskbar.pro :
36 36
37At the section HEADERS insert a line: 37At the section HEADERS insert a line:
38 ../login/qdmdialogimpl.h \ 38 ../login/qdmdialogimpl.h \
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
@@ -68,7 +68,7 @@ extern "C" {
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//----------------------------------------------------------------------------