4 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 24a9050..01aba30 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
        inputmethods/dvorak \
-        taskbar/batteryapplet \
+        launcher/batteryapplet \
-        taskbar/volumeapplet \
+        launcher/volumeapplet \
-        taskbar/clockapplet \
+        launcher/clockapplet \
-        taskbar/netmonapplet \
+        launcher/netmonapplet \
-        taskbar/screenshotapplet \
+        launcher/screenshotapplet \
-        taskbar/vmemo \
+        launcher/vmemo \
        netsetup/dialup \
@@ -37,3 +37,3 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
    solitaire spreadsheet tetrix textedit \
-    todo wordgame embeddedkonsole taskbar sysinfo \
+    todo wordgame embeddedkonsole launcher sysinfo \
    parashoot snake citytime showimg netsetup tableviewer \
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
@@ -67,3 +67,3 @@
 #define APP(a,b,c,d) FACTORY(b)
-#include "../taskbar/apps.h"
+#include "../launcher/apps.h"
 #undef APP
@@ -75,3 +75,3 @@ static Global::Command builtins[] = {
 #define APP(a,b,c,d) { a, new##b, c },
-#include "../taskbar/apps.h"
+#include "../launcher/apps.h"
 #undef APP
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
@@ -34,3 +34,3 @@ 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 :
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
@@ -70,3 +70,3 @@ extern "C" {
 #include "qdmdialogimpl.h"
-#include "../taskbar/inputmethods.h"
+#include "../launcher/inputmethods.h"

diff --git a/Makefile b/Makefile index 24a9050..01aba30 100644 --- a/Makefile +++ b/Makefile
@@ -12,8 +12,8 @@ COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
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 \
@@ -37,3 +37,3 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
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 \


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
@@ -67,3 +67,3 @@
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
@@ -75,3 +75,3 @@ static Global::Command builtins[] = {
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


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
@@ -34,3 +34,3 @@ 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


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
@@ -70,3 +70,3 @@ extern "C" {
70	#include "qdmdialogimpl.h"	70	#include "qdmdialogimpl.h"
71	#include "../taskbar/inputmethods.h"	71	#include "../launcher/inputmethods.h"
72		72