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
@@ -1,41 +1,41 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 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)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= addressbook
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	addressbook.h \
 		abeditor.h \
 		ablabel.h \
 		abtable.h \
 		addresssettings.h
 SOURCES =	main.cpp \
 		addressbook.cpp \
 		abeditor.cpp \
 		ablabel.cpp \
 		abtable.cpp \
 		addresssettings.cpp
 OBJECTS =	main.o \
 		addressbook.o \
 		abeditor.o \
 		ablabel.o \
 		abtable.o \
@@ -67,175 +67,175 @@ OBJMOC	=	moc_addressbook.o \
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
 tmake:
-	tmake p4addressbook.pro
+	tmake addressbook.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 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
 
 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 \
 		addresssettingsbase.h \
 		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
 
 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
 
 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
 
 addresssettings.o: addresssettings.cpp \
 		addresssettings.h \
 		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
 
 addresssettingsbase.h: addresssettingsbase.ui
 	$(UIC) addresssettingsbase.ui -o $(INTERFACE_DECL_PATH)/addresssettingsbase.h
 
 addresssettingsbase.cpp: addresssettingsbase.ui
 	$(UIC) addresssettingsbase.ui -i addresssettingsbase.h -o addresssettingsbase.cpp
 
 addresssettingsbase.o: addresssettingsbase.cpp \
 		addresssettingsbase.h \
 		addresssettingsbase.ui
 
 moc_addressbook.o: moc_addressbook.cpp \
 		addressbook.h
 
 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
 
 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
 
 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
 
 moc_addresssettings.o: moc_addresssettings.cpp \
 		addresssettings.h \
 		addresssettingsbase.h
 
 moc_addresssettingsbase.o: moc_addresssettingsbase.cpp \
 		addresssettingsbase.h
 
 moc_addressbook.cpp: addressbook.h
 	$(MOC) addressbook.h -o moc_addressbook.cpp
 
 moc_abeditor.cpp: abeditor.h
 	$(MOC) abeditor.h -o moc_abeditor.cpp
 
 moc_ablabel.cpp: ablabel.h
 	$(MOC) ablabel.h -o moc_ablabel.cpp
 
 moc_abtable.cpp: abtable.h
 	$(MOC) abtable.h -o moc_abtable.cpp
 
 moc_addresssettings.cpp: addresssettings.h
 	$(MOC) addresssettings.h -o moc_addresssettings.cpp
 
 moc_addresssettingsbase.cpp: addresssettingsbase.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
@@ -1,22 +1,22 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on release
-DESTDIR		= $(QPEDIR)/bin
+DESTDIR		= $(OPIEDIR)/bin
 HEADERS	= addressbook.h \
                   abeditor.h \
 		  ablabel.h \
 		  abtable.h \
 		  addresssettings.h
 SOURCES	= main.cpp \
 		  addressbook.cpp \
 		  abeditor.cpp \
 		  ablabel.cpp \
 		  abtable.cpp \
 		  addresssettings.cpp
 INTERFACES	= addresssettingsbase.ui
 
 TARGET		= addressbook
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH	+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TRANSLATIONS = ../i18n/de/addressbook.ts
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
@@ -1,41 +1,41 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 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)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= datebook
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	datebookday.h \
 		datebook.h \
 		dateentryimpl.h \
 		datebookdayheaderimpl.h \
 		datebooksettings.h \
 		datebookweek.h \
 		datebookweekheaderimpl.h \
 		repeatentry.h
 SOURCES =	main.cpp \
 		datebookday.cpp \
 		datebook.cpp \
 		dateentryimpl.cpp \
 		datebookdayheaderimpl.cpp \
 		datebooksettings.cpp \
 		datebookweek.cpp \
 		datebookweekheaderimpl.cpp \
@@ -139,218 +139,241 @@ listpromodules:
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 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
 
 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
 
 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 \
 		datebooksettings.h \
 		datebooksettingsbase.h \
 		datebookweek.h \
 		dateentryimpl.h \
 		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
 
 dateentryimpl.o: dateentryimpl.cpp \
 		dateentryimpl.h \
 		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
 
 datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
 		datebookdayheaderimpl.h \
 		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
 
 datebooksettings.o: datebooksettings.cpp \
 		datebooksettings.h \
 		datebooksettingsbase.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
 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
 
 datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
 		datebookweekheaderimpl.h \
 		datebookweekheader.h
 
 repeatentry.o: repeatentry.cpp \
 		repeatentry.h \
 		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
 
 dateentry.h: dateentry.ui
 	$(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
 
 dateentry.cpp: dateentry.ui
 	$(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp
 
 datebookdayheader.h: datebookdayheader.ui
 	$(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h
 
 datebookdayheader.cpp: datebookdayheader.ui
 	$(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp
 
 datebooksettingsbase.h: datebooksettingsbase.ui
 	$(UIC) datebooksettingsbase.ui -o $(INTERFACE_DECL_PATH)/datebooksettingsbase.h
 
 datebooksettingsbase.cpp: datebooksettingsbase.ui
 	$(UIC) datebooksettingsbase.ui -i datebooksettingsbase.h -o datebooksettingsbase.cpp
 
 datebookweekheader.h: datebookweekheader.ui
 	$(UIC) datebookweekheader.ui -o $(INTERFACE_DECL_PATH)/datebookweekheader.h
 
 datebookweekheader.cpp: datebookweekheader.ui
 	$(UIC) datebookweekheader.ui -i datebookweekheader.h -o datebookweekheader.cpp
 
 repeatentrybase.h: repeatentrybase.ui
 	$(UIC) repeatentrybase.ui -o $(INTERFACE_DECL_PATH)/repeatentrybase.h
 
 repeatentrybase.cpp: repeatentrybase.ui
 	$(UIC) repeatentrybase.ui -i repeatentrybase.h -o repeatentrybase.cpp
 
 dateentry.o: dateentry.cpp
 
 datebookdayheader.o: datebookdayheader.cpp
 
 datebooksettingsbase.o: datebooksettingsbase.cpp
 
 datebookweekheader.o: datebookweekheader.cpp
 
 repeatentrybase.o: repeatentrybase.cpp
 
 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
 
 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
 
 moc_dateentryimpl.o: moc_dateentryimpl.cpp \
 		dateentryimpl.h \
 		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
 
 moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
 		datebookdayheaderimpl.h \
 		datebookdayheader.h
 
 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
 
 moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
 		datebookweekheaderimpl.h \
 		datebookweekheader.h
 
 moc_repeatentry.o: moc_repeatentry.cpp \
 		repeatentry.h \
 		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
 
 moc_dateentry.o: moc_dateentry.cpp \
 		dateentry.h
 
 moc_datebookdayheader.o: moc_datebookdayheader.cpp \
 		datebookdayheader.h
 
 moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \
 		datebooksettingsbase.h
 
 moc_datebookweekheader.o: moc_datebookweekheader.cpp \
 		datebookweekheader.h
 
 moc_repeatentrybase.o: moc_repeatentrybase.cpp \
 		repeatentrybase.h
 
 moc_datebookday.cpp: datebookday.h
 	$(MOC) datebookday.h -o moc_datebookday.cpp
 
 moc_datebook.cpp: datebook.h
 	$(MOC) datebook.h -o moc_datebook.cpp
 
 moc_dateentryimpl.cpp: dateentryimpl.h
 	$(MOC) dateentryimpl.h -o moc_dateentryimpl.cpp
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
@@ -1,36 +1,36 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on release
-DESTDIR		= $(QPEDIR)/bin
+DESTDIR		= $(OPIEDIR)/bin
 
 HEADERS	= datebookday.h \
 		  datebook.h \
 		  dateentryimpl.h \
 		  datebookdayheaderimpl.h \
 		  datebooksettings.h \
 		  datebookweek.h \
 		  datebookweekheaderimpl.h \
 		  repeatentry.h
 
 SOURCES	= main.cpp \
 		  datebookday.cpp \
 		  datebook.cpp \
 		  dateentryimpl.cpp \
 		  datebookdayheaderimpl.cpp \
 		  datebooksettings.cpp \
 		  datebookweek.cpp \
 		  datebookweekheaderimpl.cpp \
 		  repeatentry.cpp
 
 INTERFACES	= dateentry.ui \
 		  datebookdayheader.ui \
 		  datebooksettingsbase.ui \
 		  datebookweekheader.ui \
 		  repeatentrybase.ui
 
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH	+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TARGET		= datebook
 
 TRANSLATIONS = ../i18n/de/datebook.ts
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
@@ -1,41 +1,41 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 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)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= todolist
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	mainwindow.h \
 		todotable.h \
 		todoentryimpl.h
 SOURCES =	main.cpp \
 		mainwindow.cpp \
 		todotable.cpp \
 		todoentryimpl.cpp
 OBJECTS =	main.o \
 		mainwindow.o \
 		todotable.o \
 		todoentryimpl.o \
 		todoentry.o
 INTERFACES =    todoentry.ui
 UICDECLS =      todoentry.h
 UICIMPLS =      todoentry.cpp
 SRCMOC	=	moc_mainwindow.cpp \
@@ -92,110 +92,112 @@ listpromodules:
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 main.o: main.cpp \
 		mainwindow.h \
-		$(QPEDIR)/include/qpe/qpeapplication.h
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
 mainwindow.o: mainwindow.cpp \
 		mainwindow.h \
 		todoentryimpl.h \
 		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
 
 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
 
 todoentryimpl.o: todoentryimpl.cpp \
 		todoentryimpl.h \
 		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
 
 todoentry.h: todoentry.ui
 	$(UIC) todoentry.ui -o $(INTERFACE_DECL_PATH)/todoentry.h
 
 todoentry.cpp: todoentry.ui
 	$(UIC) todoentry.ui -i todoentry.h -o todoentry.cpp
 
 todoentry.o: todoentry.cpp \
 		todoentry.h \
 		todoentry.ui
 
 moc_mainwindow.o: moc_mainwindow.cpp \
 		mainwindow.h
 
 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
 
 moc_todoentryimpl.o: moc_todoentryimpl.cpp \
 		todoentryimpl.h \
 		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
 
 moc_todoentry.o: moc_todoentry.cpp \
 		todoentry.h
 
 moc_mainwindow.cpp: mainwindow.h
 	$(MOC) mainwindow.h -o moc_mainwindow.cpp
 
 moc_todotable.cpp: todotable.h
 	$(MOC) todotable.h -o moc_todotable.cpp
 
 moc_todoentryimpl.cpp: todoentryimpl.h
 	$(MOC) todoentryimpl.h -o moc_todoentryimpl.cpp
 
 moc_todoentry.cpp: todoentry.h
 	$(MOC) todoentry.h -o moc_todoentry.cpp
 
 
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
@@ -1,19 +1,19 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on release
-DESTDIR		= $(QPEDIR)/bin
+DESTDIR		= $(OPIEDIR)/bin
 HEADERS	= mainwindow.h \
 		  todotable.h \
 		  todoentryimpl.h
 SOURCES	= main.cpp \
 		  mainwindow.cpp \
 		  todotable.cpp \
 		  todoentryimpl.cpp
 
 INTERFACES	= todoentry.ui
 
 TARGET		= todolist
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH	+= $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TRANSLATIONS = ../i18n/de/todolist.ts