4 files changed, 17 insertions, 19 deletions

diff --git a/library/Makefile.in b/library/Makefile.in
index c89390f..b74b818 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -1,21 +1,21 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
         CXX     =$(SYSCONF_CXX) $(QT_CXX_MT)
         CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
         CC      =$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-        INCPATH =-I$(QPEDIR)/include -Ibackend
+        INCPATH =-I$(OPIEDIR)/include -Ibackend
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
         LIBS    =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
         MOC     =$(SYSCONF_MOC)
         UIC     =$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = $(QTDIR)/lib$(PROJMAK)/
 VER_MAJ = 1
 VER_MIN = 5
 VER_PATCH = 0
         TARGET= qpe
@@ -448,25 +448,26 @@ qpeapplication.o: qpeapplication.cpp \
                 qpeapplication.h \
                 qpedecoration_qws.h \
                 timestring.h \
                 qpestyle.h \
                 lightstyle.h \
                 global.h \
                 resource.h \
                 config.h \
                 network.h \
                 fontmanager.h \
                 power.h \
                 alarmserver.h \
-                applnk.h
+                applnk.h \
+                qpemenubar.h
 
 qpestyle.o: qpestyle.cpp \
                 qpestyle.h \
                 qpeapplication.h \
                 qpedecoration_qws.h \
                 timestring.h
 
 qpedialog.o: qpedialog.cpp \
                 qpedialog.h \
                 qpeapplication.h \
                 qpedecoration_qws.h \
                 timestring.h
@@ -524,25 +525,26 @@ timestring.o: timestring.cpp \
                 qpeapplication.h \
                 qpedecoration_qws.h \
                 config.h
 
 fontdatabase.o: fontdatabase.cpp \
                 qpeapplication.h \
                 qpedecoration_qws.h \
                 timestring.h \
                 fontfactoryinterface.h \
                 fontdatabase.h
 
 power.o: power.cpp \
-                power.h
+                power.h \
+                custom.h
 
 storage.o: storage.cpp
 
 qpemessagebox.o: qpemessagebox.cpp \
                 qpemessagebox.h
 
 backend/timeconversion.o: backend/timeconversion.cpp \
                 backend/timeconversion.h
 
 qpedebug.o: qpedebug.cpp \
                 qpedebug.h
 
@@ -601,25 +603,26 @@ categoryselect.o: categoryselect.cpp \
 
 categorywidget.o: categorywidget.cpp \
                 categoryedit_p.h \
                 categoryeditbase_p.h \
                 categorywidget.h
 
 ir.o: ir.cpp \
                 ir.h \
                 qcopenvelope_qws.h \
                 applnk.h
 
 backend/vcc_yacc.o: backend/vcc_yacc.cpp \
-                backend/vobject_p.h
+                backend/vobject_p.h \
+                backend/qfiledirect_p.h
 
 backend/vobject.o: backend/vobject.cpp \
                 backend/vobject_p.h \
                 backend/qfiledirect_p.h
 
 findwidget_p.o: findwidget_p.cpp \
                 findwidget_p.h \
                 findwidgetbase_p.h
 
 finddialog.o: finddialog.cpp \
                 finddialog.h \
                 findwidget_p.h \
@@ -670,38 +673,33 @@ categoryeditbase_p.cpp: categoryeditbase_p.ui
 findwidgetbase_p.h: findwidgetbase_p.ui
         $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h
 
 findwidgetbase_p.cpp: findwidgetbase_p.ui
         $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp
 
 lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
         $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h
 
 lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
         $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
 
-passwordbase_p.o: passwordbase_p.cpp \
-                passwordbase_p.h
+passwordbase_p.o: passwordbase_p.cpp
 
-proxiesbase_p.o: proxiesbase_p.cpp \
-                proxiesbase_p.h
+proxiesbase_p.o: proxiesbase_p.cpp
 
-categoryeditbase_p.o: categoryeditbase_p.cpp \
-                categoryeditbase_p.h
+categoryeditbase_p.o: categoryeditbase_p.cpp
 
-findwidgetbase_p.o: findwidgetbase_p.cpp \
-                findwidgetbase_p.h
+findwidgetbase_p.o: findwidgetbase_p.cpp
 
-lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \
-                lnkpropertiesbase_p.h
+lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
 
 moc_menubutton.o: moc_menubutton.cpp \
                 menubutton.h
 
 moc_proxies.o: moc_proxies.cpp \
                 proxies.h \
                 config.h
 
 moc_datebookmonth.o: moc_datebookmonth.cpp \
                 datebookmonth.h \
                 calendar.h \
                 timestring.h
diff --git a/library/global.cpp b/library/global.cpp
index e1bbf3e..e5fc2b3 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -125,25 +125,25 @@ void StartingAppList::handleNewChannel( const QString & name )
 {
 #if QT_VERSION >= 232  && !defined(QT_NO_COP)
     dict.remove( name );
 #endif
 }
 
 static bool docDirCreated = FALSE;
 static QDawg* fixed_dawg = 0;
 static QDict<QDawg> *named_dawg = 0;
 
 static QString qpeDir()
 {
-    QString dir = getenv("QPEDIR");
+    QString dir = getenv("OPIEDIR");
     if ( dir.isEmpty() ) dir = "..";
     return dir;
 }
 
 static QString dictDir()
 {
     return qpeDir() + "/etc/dict";
 }
 
 /*!
   \class Global global.h
   \brief The Global class collects application-wide global functions.
diff --git a/library/library.pro b/library/library.pro
index 06dfc8f..058d216 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -110,23 +110,23 @@ SOURCES	=   calendar.cpp \
         ir.cpp \
         backend/vcc_yacc.cpp \
         backend/vobject.cpp \
         findwidget_p.cpp \
         finddialog.cpp \
         lnkproperties.cpp
 
 # Qt 3 compatibility
 qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h
 qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
                qprocess_unix.cpp
 
-INCLUDEPATH += $(QPEDIR)/include backend
+INCLUDEPATH += $(OPIEDIR)/include backend
         LIBS    += -ldl -lcrypt -lm
 
 INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
 
         TARGET  = qpe
         DESTDIR         = $(QTDIR)/lib$(PROJMAK)
-# This is set by configure$(QPEDIR).
+# This is set by configure$(OPIEDIR).
         VERSION         = 1.5.0
 
 TRANSLATIONS = ../i18n/de/libqpe.ts
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f0a68cf..70ffec1 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -781,29 +781,29 @@ QPEApplication::~QPEApplication()
 {
     ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     // Need to delete QCopChannels early, since the display will
     // be gone by the time we get to ~QObject().
     delete sysChannel;
     delete pidChannel;
 #endif
     delete d;
 }
 
 /*!
-  Returns <tt>$QPEDIR/</tt>.
+  Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
-    const char *base = getenv( "QPEDIR" );
+    const char *base = getenv( "OPIEDIR" );
     if ( base )
         return QString( base ) + "/";
 
     return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
 */
 QString QPEApplication::documentDir()
 {
     const char *base = getenv( "HOME" );