Fix compilation

12 files changed, 16 insertions, 16 deletions

diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index 9cf7556..b854b89 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -1,22 +1,22 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   battery.h batterystatus.h batteryappletimpl.h
 SOURCES	=   battery.cpp batterystatus.cpp batteryappletimpl.cpp
 TARGET		= batteryapplet
-DESTDIR		= ../../plugins/applets
+DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
 TRANSLATIONS = ../../i18n/de/libbatteryapplet.ts
 TRANSLATIONS += ../../i18n/es/libbatteryapplet.ts
 TRANSLATIONS += ../../i18n/pt/libbatteryapplet.ts
 TRANSLATIONS += ../../i18n/pt_BR/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/en/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/hu/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/ja/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/ko/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/no/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/zh_CN/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/zh_TW/libbatteryapplet.ts
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index 71e2bbe..36fbc49 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   clipboard.h clipboardappletimpl.h
 SOURCES	=   clipboard.cpp clipboardappletimpl.cpp
 TARGET		= clipboardapplet
-DESTDIR		= ../../plugins/applets
+DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
 TRANSLATIONS = ../../i18n/pt_BR/libclipboardapplet.ts
 TRANSLATIONS += ../../i18n/es/libclipboardapplet.ts
 TRANSLATIONS += ../../i18n/pt/libclipboardapplet.ts
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 85e3316..2dc1784 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,15 +1,15 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   clock.h clockappletimpl.h
 SOURCES	=   clock.cpp clockappletimpl.cpp
 TARGET		= clockapplet
-DESTDIR		= ../../plugins/applets
+DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
 TRANSLATIONS = ../../i18n/de/libclockapplet.ts
 TRANSLATIONS += ../../i18n/es/libclockapplet.ts
 TRANSLATIONS += ../../i18n/pt/libclockapplet.ts
 TRANSLATIONS += ../../i18n/pt_BR/libclockapplet.ts
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index bfcfc3f..035b0c1 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -1,25 +1,25 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   irda.h irdaappletimpl.h
 SOURCES =   irda.cpp irdaappletimpl.cpp
 TARGET    = irdaapplet
-DESTDIR   = ../../plugins/applets
+DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
 TRANSLATIONS = ../../i18n/de/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/en/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/es/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/fr/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/hu/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/ja/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/ko/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/no/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/pl/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/pt/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/pt_BR/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/sl/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/zh_CN/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/zh_TW/libirdaapplet.ts
diff --git a/core/applets/obex/obex.pro b/core/applets/obex/obex.pro
index 6915737..a8c2340 100644
--- a/core/applets/obex/obex.pro
+++ b/core/applets/obex/obex.pro
@@ -1,12 +1,12 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   obex.h obeximpl.h
 SOURCES	=   obex.cc obeximpl.cc
 TARGET		= opieobex
-DESTDIR		= ../../plugins/obex
-INCLUDEPATH += $(OPIEDIR)/include
+DESTDIR		= $(OPIEDIR)/plugins/obex
+INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
 DEPENDPATH      += ../$(OPIEDIR)/include
 INTERFACES      = obexinc.ui obexdlg.ui
 LIBS            += -lqpe -lopie
 VERSION		= 0.0.1
 
diff --git a/core/applets/obex/obeximpl.h b/core/applets/obex/obeximpl.h
index 8d10cf1..78d5b25 100644
--- a/core/applets/obex/obeximpl.h
+++ b/core/applets/obex/obeximpl.h
@@ -1,38 +1,38 @@
 
 #ifndef OpieObexImpl_H
 #define OpieObexImpl_H
 
 #include <qobject.h>
-#include "../obexinterface.h"
+#include <obexinterface.h>
 #include "obexdlg.h"
 #include "obexinc.h"
 #include <qpe/qcopenvelope_qws.h>
 
 namespace OpieObex {
   class Obex;
   class ObexImpl  :  public QObject, public ObexInterface {
     Q_OBJECT
   public:
     ObexImpl();
     virtual ~ObexImpl();
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT // for reference counting (macro )
   private:
     ulong ref;
     Obex* m_obex; // obex lib
     QCopChannel *m_chan;
     ObexDlg *m_sendgui;
     ObexInc *m_recvgui;
     QString m_name;
    private slots:
      void slotCancelSend();
      void slotMessage( const QCString&, const QByteArray& );
      void slotError(int );
       //  void slotCurrentTry( unsigned int ); */
       void slotDone(bool);
       void slotReceivedFile(const QString & );
       void slotSent();
 
   };
 };
 #endif
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index e3c5440..6b97a2d 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -1,27 +1,27 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   screenshot.h screenshotappletimpl.h
 SOURCES =   screenshot.cpp screenshotappletimpl.cpp
 TARGET    = screenshotapplet
-DESTDIR   = ../../plugins/applets
+DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
 TRANSLATIONS = ../../i18n/pt_BR/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/pt/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/de/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/en/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/es/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/fr/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/hu/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/ja/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/ko/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/no/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/pl/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/sl/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/zh_CN/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/zh_TW/libscreenshotapplet.ts
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index f7cc439..298d989 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   vmemo.h vmemoimpl.h
 SOURCES	=   vmemo.cpp vmemoimpl.cpp
 TARGET		= vmemoapplet
-DESTDIR		= ../../plugins/applets
+DESTDIR		=$(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
 TRANSLATIONS = ../../i18n/pt_BR/libvmemoapplet.ts
 TRANSLATIONS += ../../i18n/es/libvmemoapplet.ts
 TRANSLATIONS += ../../i18n/pt/libvmemoapplet.ts
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index 54404bf..f89eea2 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,15 +1,15 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   volume.h volumeappletimpl.h
 SOURCES	=   volume.cpp volumeappletimpl.cpp
 TARGET		= volumeapplet
-DESTDIR		= ../../plugins/applets
+DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION		= 1.0.0
 
 TRANSLATIONS = ../../i18n/de/libvolumeapplet.ts
 TRANSLATIONS += ../../i18n/es/libvolumeapplet.ts
 TRANSLATIONS += ../../i18n/pt/libvolumeapplet.ts
 TRANSLATIONS += ../../i18n/pt_BR/libvolumeapplet.ts
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index b8e9236..182cd1f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -1,125 +1,125 @@
 TEMPLATE	= app
 
 CONFIG		= qt warn_on release
 
 DESTDIR		= $(OPIEDIR)/bin
 
 HEADERS		= background.h \
 		  desktop.h \
 		  qprocess.h \
 		  mediummountgui.h \
 		  info.h \
 		  appicons.h \
 		  taskbar.h \
 		  sidething.h \
 		  mrulist.h \
 		  stabmon.h \
 		  inputmethods.h \
 		  systray.h \
 		  wait.h \
 		  shutdownimpl.h \
 		  launcher.h \
 		  launcherview.h \
-		  ../calibrate/calibrate.h \
+		  $(OPIEDIR)/core/apps/calibrate/calibrate.h \
 		  startmenu.h \
 		  transferserver.h \
 		  qcopbridge.h \
 		  packageslave.h \
 		irserver.h \
 	$(OPIEDIR)/rsync/buf.h \
 	$(OPIEDIR)/rsync/checksum.h \
 	$(OPIEDIR)/rsync/command.h \
 	$(OPIEDIR)/rsync/emit.h \
 	$(OPIEDIR)/rsync/job.h \
 	$(OPIEDIR)/rsync/netint.h \
 	$(OPIEDIR)/rsync/protocol.h \
 	$(OPIEDIR)/rsync/prototab.h \
 	$(OPIEDIR)/rsync/rsync.h \
 	$(OPIEDIR)/rsync/search.h \
 	$(OPIEDIR)/rsync/stream.h \
 	$(OPIEDIR)/rsync/sumset.h \
 	$(OPIEDIR)/rsync/trace.h \
 	$(OPIEDIR)/rsync/types.h \
 	$(OPIEDIR)/rsync/util.h \
 	$(OPIEDIR)/rsync/whole.h \
 	$(OPIEDIR)/rsync/config_rsync.h \
 	$(OPIEDIR)/rsync/qrsync.h
 #		  quicklauncher.h \
 
 SOURCES		= background.cpp \
 		  desktop.cpp \
 		  mediummountgui.cpp \
 		  qprocess.cpp qprocess_unix.cpp \
 		  info.cpp \
 		  appicons.cpp \
 		  taskbar.cpp \
 		  sidething.cpp \
 		  mrulist.cpp \
 		  stabmon.cpp \
 		  inputmethods.cpp \
 		  systray.cpp \
 		  wait.cpp \
 		  shutdownimpl.cpp \
 		  launcher.cpp \
 		  launcherview.cpp \
-		  $(OPIEDIR)/calibrate/calibrate.cpp \
+		  $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
 		  transferserver.cpp \
 		  packageslave.cpp \
 		irserver.cpp \
 		  qcopbridge.cpp \
 		  startmenu.cpp \
 		  main.cpp \
 	$(OPIEDIR)/rsync/base64.c \
 	$(OPIEDIR)/rsync/buf.c \
 	$(OPIEDIR)/rsync/checksum.c \
 	$(OPIEDIR)/rsync/command.c \
 	$(OPIEDIR)/rsync/delta.c \
 	$(OPIEDIR)/rsync/emit.c \
 	$(OPIEDIR)/rsync/hex.c \
 	$(OPIEDIR)/rsync/job.c \
 	$(OPIEDIR)/rsync/mdfour.c \
 	$(OPIEDIR)/rsync/mksum.c \
 	$(OPIEDIR)/rsync/msg.c \
 	$(OPIEDIR)/rsync/netint.c \
 	$(OPIEDIR)/rsync/patch.c \
 	$(OPIEDIR)/rsync/prototab.c \
 	$(OPIEDIR)/rsync/readsums.c \
 	$(OPIEDIR)/rsync/scoop.c \
 	$(OPIEDIR)/rsync/search.c \
 	$(OPIEDIR)/rsync/stats.c \
 	$(OPIEDIR)/rsync/stream.c \
 	$(OPIEDIR)/rsync/sumset.c \
 	$(OPIEDIR)/rsync/trace.c \
 	$(OPIEDIR)/rsync/tube.c \
 	$(OPIEDIR)/rsync/util.c \
 	$(OPIEDIR)/rsync/version.c \
 	$(OPIEDIR)/rsync/whole.c \
 	$(OPIEDIR)/rsync/qrsync.cpp
 
 INTERFACES	= shutdown.ui syncdialog.ui
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include .
 
-INCLUDEPATH += $(OPIEDIR)/calibrate
-DEPENDPATH	+= $(OPIEDIR)/calibrate
+INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
+DEPENDPATH	+= $(OPIEDIR)/core/apps/calibrate
 
 INCLUDEPATH += $(OPIEDIR)/rsync
 DEPENDPATH	+= $(OPIEDIR)/rsync
 
 TARGET		= qpe
 
 LIBS		+= -lqpe -lcrypt -lopie
 
 TRANSLATIONS = ../i18n/de/qpe.ts
 TRANSLATIONS += ../i18n/es/qpe.ts
 TRANSLATIONS += ../i18n/pt/qpe.ts
 TRANSLATIONS += ../i18n/pt_BR/qpe.ts
 TRANSLATIONS   += ../i18n/en/qpe.ts
 TRANSLATIONS   += ../i18n/hu/qpe.ts
 TRANSLATIONS   += ../i18n/ja/qpe.ts
 TRANSLATIONS   += ../i18n/fr/qpe.ts
 TRANSLATIONS   += ../i18n/ko/qpe.ts
 TRANSLATIONS   += ../i18n/no/qpe.ts
 TRANSLATIONS   += ../i18n/zh_CN/qpe.ts
 TRANSLATIONS   += ../i18n/zh_TW/qpe.ts
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 7e2afed..eb4a0db 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,17 +1,17 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on release
-DESTDIR		= ../../bin
+DESTDIR		= $(OPIEDIR)/bin
 HEADERS		= settings.h
 SOURCES		= light.cpp main.cpp
 INTERFACES	= lightsettingsbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET		= light-and-power
 
 TRANSLATIONS   = ../../i18n/de/light-and-power.ts
 TRANSLATIONS   += ../../i18n/es/light-and-power.ts
 TRANSLATIONS   += ../../i18n/pt/light-and-power.ts
 TRANSLATIONS   += ../../i18n/pt_BR/light-and-power.ts
 TRANSLATIONS   += ../../i18n/pl/light-and-power.ts
 TRANSLATIONS   += ../../i18n/fr/light-and-power.ts
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 1e815ac..6b28485 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,25 +1,25 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on release
-DESTDIR		= ../../bin
+DESTDIR		= $(OPIEDIR)/bin
 HEADERS		= security.h
 SOURCES		= security.cpp main.cpp
 INTERFACES	= securitybase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET		= security
 
 TRANSLATIONS    = ../../i18n/pt_BR/security.ts
 TRANSLATIONS    += ../../i18n/es/security.ts
 TRANSLATIONS    += ../../i18n/pt/security.ts
 TRANSLATIONS   += ../../i18n/de/security.ts
 TRANSLATIONS   += ../../i18n/en/security.ts
 TRANSLATIONS   += ../../i18n/hu/security.ts
 TRANSLATIONS   += ../../i18n/sl/security.ts
 TRANSLATIONS   += ../../i18n/ja/security.ts
 TRANSLATIONS   += ../../i18n/ko/security.ts
 TRANSLATIONS   += ../../i18n/pl/security.ts
 TRANSLATIONS   += ../../i18n/no/security.ts
 TRANSLATIONS   += ../../i18n/zh_CN/security.ts
 TRANSLATIONS   += ../../i18n/zh_TW/security.ts
 TRANSLATIONS   += ../../i18n/fr/security.ts