summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -5,22 +5,22 @@ all: default docs
LIBS=library libopie
COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
inputmethods/pickboard \
inputmethods/handwriting \
inputmethods/unikeyboard \
inputmethods/jumpx \
inputmethods/dvorak \
- taskbar/batteryapplet \
- taskbar/volumeapplet \
- taskbar/clockapplet \
- taskbar/netmonapplet \
- taskbar/screenshotapplet \
- taskbar/vmemo \
+ launcher/batteryapplet \
+ launcher/volumeapplet \
+ launcher/clockapplet \
+ launcher/netmonapplet \
+ launcher/screenshotapplet \
+ launcher/vmemo \
netsetup/dialup \
netsetup/lan \
opiemail/ifaces/pop3 opiemail/ifaces/smtp \
mpegplayer/libmpeg3 \
mpegplayer/libmad \
mpegplayer/wavplugin \
cardmon \
sdmon
@@ -30,17 +30,17 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
settings/light-and-power \
settings/language \
settings/rotation \
settings/appearance \
settings/security \
settings/sound \
settings/systemtime \
solitaire spreadsheet tetrix textedit \
- todo wordgame embeddedkonsole taskbar sysinfo \
+ todo wordgame embeddedkonsole launcher sysinfo \
parashoot snake citytime showimg netsetup tableviewer \
qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \
noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers
DOCS = docs/src/opie-policy
single: mpegplayer/libmpeg3
dynamic: $(APPS)
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
@@ -60,25 +60,25 @@
} \
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 },
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
@@ -27,17 +27,17 @@ REQUIREMENTS:
- 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:
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
@@ -63,17 +63,17 @@ extern "C" {
#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