summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-28 23:34:43 (UTC)
committer kergoth <kergoth>2002-03-28 23:34:43 (UTC)
commit6c6f578fa5ef1f83cf1ba4978015663360ac2e7e (patch) (side-by-side diff)
tree64cc4c7dc96e9f7439368a696e46e561be79fa4c
parented6bcbba1164cc2235b6d21f20b1de416d36cac2 (diff)
downloadopie-6c6f578fa5ef1f83cf1ba4978015663360ac2e7e.zip
opie-6c6f578fa5ef1f83cf1ba4978015663360ac2e7e.tar.gz
opie-6c6f578fa5ef1f83cf1ba4978015663360ac2e7e.tar.bz2
moved taskbar/ to launcher/.
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
@@ -9,14 +9,14 @@ COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
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 \
@@ -34,9 +34,9 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
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
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
@@ -64,17 +64,17 @@
#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)
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
@@ -31,9 +31,9 @@ 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 \
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
@@ -67,9 +67,9 @@ extern "C" {
#endif
#include "qdmdialogimpl.h"
-#include "../taskbar/inputmethods.h"
+#include "../launcher/inputmethods.h"
//----------------------------------------------------------------------------