Committing in .

Modified Files:
	configure mkipks addressbook/Makefile.in
	addressbook/addressbook.pro calc2/calc.pro
	calc2/binary/binary.pro calc2/simple/simple.pro
	calculator/Makefile.in calculator/calculator.pro
	cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
	citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
	clock/clock.pro datebook/Makefile.in datebook/datebook.pro
	dictionary/dictionary.pro doc/qcop.doc doc/start.doc
	embeddedkonsole/Makefile.in
	embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
	example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
	filebrowser/Makefile.in filebrowser/filebrowser.pro
	freetype/freetype.pro go/Makefile.in go/go.pro
	helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
	inputmethods/handwriting/Makefile.in
	inputmethods/handwriting/handwriting.pro
	inputmethods/keyboard/Makefile.in
	inputmethods/keyboard/keyboard.pro
	inputmethods/pickboard/Makefile.in
	inputmethods/pickboard/pickboard.pro
	inputmethods/unikeyboard/Makefile.in
	inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
	keypebble/keypebble.pro library/Makefile.in library/global.cpp
	library/library.pro library/qpeapplication.cpp
	mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
	minesweep/Makefile.in minesweep/minesweep.pro
	mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
	mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
	mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
	mpegplayer/libmpeg3/libmpeg3.pro
	mpegplayer/libmpeg3/audio/Makefile
	mpegplayer/libmpeg3/video/Makefile
	mpegplayer/wavplugin/Makefile.in
	mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
	netsetup/README netsetup/netsetup.pro
	netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
	netsetup/lan/Makefile.in netsetup/lan/lan.pro
	parashoot/Makefile.in parashoot/parashoot.pro
	qasteroids/Makefile.in qasteroids/qasteroids.pro
	qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
	qipkg/qipkg.pro scripts/q_functions
	settings/appearance/Makefile.in
	settings/appearance/appearance.pro
	settings/language/Makefile.in settings/language/language.pro
	settings/light-and-power/Makefile.in
	settings/light-and-power/light-and-power.pro
	settings/rotation/Makefile.in settings/rotation/rotation.pro
	settings/security/Makefile.in settings/security/security.pro
	settings/sound/Makefile.in settings/sound/sound.pro
	settings/systemtime/Makefile.in
	settings/systemtime/systemtime.pro showimg/Makefile.in
	showimg/showimg.pro single/Makefile.in single/single.pro
	snake/Makefile.in snake/snake.pro solitaire/Makefile.in
	solitaire/solitaire.pro spreadsheet/Makefile.in
	spreadsheet/spreadsheet.pro sysinfo/Makefile.in
	sysinfo/sysinfo.pro tableviewer/tableviewer.pro
	taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
	taskbar/batteryapplet/Makefile.in
	taskbar/batteryapplet/batteryapplet.pro
	taskbar/clipboardapplet/clipboardapplet.pro
	taskbar/clockapplet/Makefile.in
	taskbar/clockapplet/clockapplet.pro
	taskbar/netmonapplet/Makefile.in
	taskbar/netmonapplet/netmonapplet.pro
	taskbar/volumeapplet/Makefile.in
	taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
	tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
	todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
	website/htdocs/build.html website/htdocs/development.html
	website/htdocs/refman/qcop.html
	website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
	wordgame/wordgame.pro
Log Message:
	Changed QPEDIR to OPIEDIR in .pro files, and documentation,
	and regenerated all Makefile.in's that were affected.

6 files changed, 189 insertions, 164 deletions

diff --git a/core/pim/addressbook/Makefile.in b/core/pim/addressbook/Makefile.in
index 93c73c3..c46d0e5 100644
--- a/core/pim/addressbook/Makefile.in
+++ b/core/pim/addressbook/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
-INCPATH =	-I$(QPEDIR)/include
+INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -90,3 +90,3 @@ moc: $(SRCMOC)
 tmake:
-	tmake p4addressbook.pro
+	tmake addressbook.pro
 
@@ -125,4 +125,4 @@ main.o: main.cpp \
 		addressbook.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/qcopenvelope_qws.h
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
@@ -130,8 +130,8 @@ addressbook.o: addressbook.cpp \
 		abeditor.h \
-		$(QPEDIR)/include/qpe/contact.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/recordfields.h \
+		$(OPIEDIR)/include/qpe/contact.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/recordfields.h \
 		ablabel.h \
 		abtable.h \
-		$(QPEDIR)/include/qpe/categories.h \
+		$(OPIEDIR)/include/qpe/categories.h \
 		addresssettings.h \
@@ -139,12 +139,12 @@ addressbook.o: addressbook.cpp \
 		addressbook.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/config.h \
-		$(QPEDIR)/include/qpe/finddialog.h \
-		$(QPEDIR)/include/qpe/global.h \
-		$(QPEDIR)/include/qpe/resource.h \
-		$(QPEDIR)/include/qpe/ir.h \
-		$(QPEDIR)/include/qpe/qpemessagebox.h \
-		$(QPEDIR)/include/qpe/qcopenvelope_qws.h \
-		$(QPEDIR)/include/qpe/qpemenubar.h \
-		$(QPEDIR)/include/qpe/qpetoolbar.h
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/finddialog.h \
+		$(OPIEDIR)/include/qpe/global.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/ir.h \
+		$(OPIEDIR)/include/qpe/qpemessagebox.h \
+		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+		$(OPIEDIR)/include/qpe/qpemenubar.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -152,9 +152,9 @@ abeditor.o: abeditor.cpp \
 		abeditor.h \
-		$(QPEDIR)/include/qpe/contact.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/recordfields.h \
+		$(OPIEDIR)/include/qpe/contact.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/recordfields.h \
 		addresspicker.h \
-		$(QPEDIR)/include/qpe/categoryselect.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/qpedialog.h
+		$(OPIEDIR)/include/qpe/categoryselect.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/qpedialog.h
 
@@ -162,17 +162,17 @@ ablabel.o: ablabel.cpp \
 		ablabel.h \
-		$(QPEDIR)/include/qpe/contact.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/recordfields.h \
-		$(QPEDIR)/include/qpe/stringutil.h
+		$(OPIEDIR)/include/qpe/contact.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/recordfields.h \
+		$(OPIEDIR)/include/qpe/stringutil.h
 
 abtable.o: abtable.cpp \
-		$(QPEDIR)/include/qpe/categoryselect.h \
-		$(QPEDIR)/include/qpe/config.h \
-		$(QPEDIR)/include/qpe/stringutil.h \
-		$(QPEDIR)/include/qpe/qcopenvelope_qws.h \
+		$(OPIEDIR)/include/qpe/categoryselect.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/stringutil.h \
+		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		abtable.h \
-		$(QPEDIR)/include/qpe/categories.h \
-		$(QPEDIR)/include/qpe/contact.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/recordfields.h
+		$(OPIEDIR)/include/qpe/categories.h \
+		$(OPIEDIR)/include/qpe/contact.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/recordfields.h
 
@@ -181,6 +181,6 @@ addresssettings.o: addresssettings.cpp \
 		addresssettingsbase.h \
-		$(QPEDIR)/include/qpe/config.h \
-		$(QPEDIR)/include/qpe/contact.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/recordfields.h
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/contact.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/recordfields.h
 
@@ -201,5 +201,5 @@ moc_abeditor.o: moc_abeditor.cpp \
 		abeditor.h \
-		$(QPEDIR)/include/qpe/contact.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/recordfields.h
+		$(OPIEDIR)/include/qpe/contact.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/recordfields.h
 
@@ -207,5 +207,5 @@ moc_ablabel.o: moc_ablabel.cpp \
 		ablabel.h \
-		$(QPEDIR)/include/qpe/contact.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/recordfields.h
+		$(OPIEDIR)/include/qpe/contact.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/recordfields.h
 
@@ -213,6 +213,6 @@ moc_abtable.o: moc_abtable.cpp \
 		abtable.h \
-		$(QPEDIR)/include/qpe/categories.h \
-		$(QPEDIR)/include/qpe/contact.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/recordfields.h
+		$(OPIEDIR)/include/qpe/categories.h \
+		$(OPIEDIR)/include/qpe/contact.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/recordfields.h
 
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 8d3401d..32e21a2 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
 CONFIG		= qt warn_on release
-DESTDIR		= $(QPEDIR)/bin
+DESTDIR		= $(OPIEDIR)/bin
 HEADERS	= addressbook.h \
@@ -17,4 +17,4 @@ INTERFACES	= addresssettingsbase.ui
 TARGET		= addressbook
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH	+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index bdc69dc..0c3282e 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
-INCPATH =	-I$(QPEDIR)/include
+INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -162,6 +162,8 @@ main.o: main.cpp \
 		datebook.h \
-		$(QPEDIR)/include/qpe/datebookdb.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -169,11 +171,13 @@ datebookday.o: datebookday.cpp \
 		datebookday.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookdayheaderimpl.h \
 		datebookdayheader.h \
-		$(QPEDIR)/include/qpe/datebookdb.h \
-		$(QPEDIR)/include/qpe/resource.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/timestring.h \
-		$(QPEDIR)/include/qpe/qpedebug.h
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/timestring.h \
+		$(OPIEDIR)/include/qpe/qpedebug.h
 
@@ -181,5 +185,7 @@ datebook.o: datebook.cpp \
 		datebook.h \
-		$(QPEDIR)/include/qpe/datebookdb.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookday.h \
@@ -190,16 +196,16 @@ datebook.o: datebook.cpp \
 		dateentry.h \
-		$(QPEDIR)/include/qpe/datebookmonth.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/config.h \
-		$(QPEDIR)/include/qpe/qpedebug.h \
-		$(QPEDIR)/include/qpe/finddialog.h \
-		$(QPEDIR)/include/qpe/ir.h \
-		$(QPEDIR)/include/qpe/qpemenubar.h \
-		$(QPEDIR)/include/qpe/qpemessagebox.h \
-		$(QPEDIR)/include/qpe/resource.h \
-		$(QPEDIR)/include/qpe/sound.h \
-		$(QPEDIR)/include/qpe/timestring.h \
-		$(QPEDIR)/include/qpe/qpetoolbar.h \
-		$(QPEDIR)/include/qpe/tzselect.h \
-		$(QPEDIR)/include/qpe/xmlreader.h
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/qpedebug.h \
+		$(OPIEDIR)/include/qpe/finddialog.h \
+		$(OPIEDIR)/include/qpe/ir.h \
+		$(OPIEDIR)/include/qpe/qpemenubar.h \
+		$(OPIEDIR)/include/qpe/qpemessagebox.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/sound.h \
+		$(OPIEDIR)/include/qpe/timestring.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
+		$(OPIEDIR)/include/qpe/tzselect.h \
+		$(OPIEDIR)/include/qpe/xmlreader.h
 
@@ -208,13 +214,14 @@ dateentryimpl.o: dateentryimpl.cpp \
 		dateentry.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		repeatentry.h \
 		repeatentrybase.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/categoryselect.h \
-		$(QPEDIR)/include/qpe/datebookmonth.h \
-		$(QPEDIR)/include/qpe/global.h \
-		$(QPEDIR)/include/qpe/timeconversion.h \
-		$(QPEDIR)/include/qpe/timestring.h \
-		$(QPEDIR)/include/qpe/tzselect.h
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/categoryselect.h \
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/global.h \
+		$(OPIEDIR)/include/qpe/timestring.h \
+		$(OPIEDIR)/include/qpe/tzselect.h
 
@@ -223,6 +230,8 @@ datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
 		datebookdayheader.h \
-		$(QPEDIR)/include/qpe/datebookmonth.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/timestring.h
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
+		$(OPIEDIR)/include/qpe/timestring.h
 
@@ -231,3 +240,3 @@ datebooksettings.o: datebooksettings.cpp \
 		datebooksettingsbase.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -235,10 +244,12 @@ datebookweek.o: datebookweek.cpp \
 		datebookweek.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookweekheaderimpl.h \
 		datebookweekheader.h \
-		$(QPEDIR)/include/qpe/calendar.h \
-		$(QPEDIR)/include/qpe/datebookdb.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/timestring.h
+		$(OPIEDIR)/include/qpe/calendar.h \
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/timestring.h
 
@@ -251,7 +262,9 @@ repeatentry.o: repeatentry.cpp \
 		repeatentrybase.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/datebookmonth.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/timestring.h
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/timestring.h
 
@@ -299,4 +312,6 @@ moc_datebookday.o: moc_datebookday.cpp \
 		datebookday.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
@@ -304,5 +319,7 @@ moc_datebook.o: moc_datebook.cpp \
 		datebook.h \
-		$(QPEDIR)/include/qpe/datebookdb.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
@@ -311,4 +328,6 @@ moc_dateentryimpl.o: moc_dateentryimpl.cpp \
 		dateentry.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
@@ -320,4 +339,6 @@ moc_datebookweek.o: moc_datebookweek.cpp \
 		datebookweek.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
@@ -330,4 +351,6 @@ moc_repeatentry.o: moc_repeatentry.cpp \
 		repeatentrybase.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 17c02ec..fae5d2b 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
 CONFIG		+= qt warn_on release
-DESTDIR		= $(QPEDIR)/bin
+DESTDIR		= $(OPIEDIR)/bin
 
@@ -29,4 +29,4 @@ INTERFACES	= dateentry.ui \
 
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH	+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/pim/todo/Makefile.in b/core/pim/todo/Makefile.in
index f3c5f0e..efe6a35 100644
--- a/core/pim/todo/Makefile.in
+++ b/core/pim/todo/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
-INCPATH =	-I$(QPEDIR)/include
+INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
@@ -115,3 +115,3 @@ main.o: main.cpp \
 		mainwindow.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
@@ -121,16 +121,16 @@ mainwindow.o: mainwindow.cpp \
 		todoentry.h \
-		$(QPEDIR)/include/qpe/task.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/stringutil.h \
+		$(OPIEDIR)/include/qpe/task.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/stringutil.h \
 		todotable.h \
-		$(QPEDIR)/include/qpe/categories.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h \
-		$(QPEDIR)/include/qpe/config.h \
-		$(QPEDIR)/include/qpe/finddialog.h \
-		$(QPEDIR)/include/qpe/global.h \
-		$(QPEDIR)/include/qpe/ir.h \
-		$(QPEDIR)/include/qpe/qpemenubar.h \
-		$(QPEDIR)/include/qpe/qpemessagebox.h \
-		$(QPEDIR)/include/qpe/resource.h \
-		$(QPEDIR)/include/qpe/qpetoolbar.h
+		$(OPIEDIR)/include/qpe/categories.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/finddialog.h \
+		$(OPIEDIR)/include/qpe/global.h \
+		$(OPIEDIR)/include/qpe/ir.h \
+		$(OPIEDIR)/include/qpe/qpemenubar.h \
+		$(OPIEDIR)/include/qpe/qpemessagebox.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h
 
@@ -138,8 +138,8 @@ todotable.o: todotable.cpp \
 		todotable.h \
-		$(QPEDIR)/include/qpe/categories.h \
-		$(QPEDIR)/include/qpe/task.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/stringutil.h \
-		$(QPEDIR)/include/qpe/categoryselect.h \
-		$(QPEDIR)/include/qpe/xmlreader.h
+		$(OPIEDIR)/include/qpe/categories.h \
+		$(OPIEDIR)/include/qpe/stringutil.h \
+		$(OPIEDIR)/include/qpe/task.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/categoryselect.h \
+		$(OPIEDIR)/include/qpe/xmlreader.h
 
@@ -148,11 +148,13 @@ todoentryimpl.o: todoentryimpl.cpp \
 		todoentry.h \
-		$(QPEDIR)/include/qpe/task.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/stringutil.h \
-		$(QPEDIR)/include/qpe/categoryselect.h \
-		$(QPEDIR)/include/qpe/datebookmonth.h \
-		$(QPEDIR)/include/qpe/event.h \
-		$(QPEDIR)/include/qpe/global.h \
-		$(QPEDIR)/include/qpe/imageedit.h \
-		$(QPEDIR)/include/qpe/timestring.h
+		$(OPIEDIR)/include/qpe/task.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/stringutil.h \
+		$(OPIEDIR)/include/qpe/categoryselect.h \
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
+		$(OPIEDIR)/include/qpe/global.h \
+		$(OPIEDIR)/include/qpe/imageedit.h \
+		$(OPIEDIR)/include/qpe/timestring.h
 
@@ -173,6 +175,6 @@ moc_todotable.o: moc_todotable.cpp \
 		todotable.h \
-		$(QPEDIR)/include/qpe/categories.h \
-		$(QPEDIR)/include/qpe/task.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/stringutil.h
+		$(OPIEDIR)/include/qpe/categories.h \
+		$(OPIEDIR)/include/qpe/stringutil.h \
+		$(OPIEDIR)/include/qpe/task.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h
 
@@ -181,5 +183,5 @@ moc_todoentryimpl.o: moc_todoentryimpl.cpp \
 		todoentry.h \
-		$(QPEDIR)/include/qpe/task.h \
-		$(QPEDIR)/include/qpe/palmtoprecord.h \
-		$(QPEDIR)/include/qpe/stringutil.h
+		$(OPIEDIR)/include/qpe/task.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/stringutil.h
 
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index e28ea1c..5eb02a2 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -2,3 +2,3 @@ TEMPLATE	= app
 CONFIG		= qt warn_on release
-DESTDIR		= $(QPEDIR)/bin
+DESTDIR		= $(OPIEDIR)/bin
 HEADERS	= mainwindow.h \
@@ -14,4 +14,4 @@ INTERFACES	= todoentry.ui
 TARGET		= todolist
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH	+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe