103 files changed, 1088 insertions, 1055 deletions
@@ -1,270 +1,270 @@ #!/bin/sh # # Configures to build the Qtopia Environment # # Copyright 1999-2000 Trolltech AS. All rights reserved. # PLATFORM=linux-generic-g++ SHARING=shared DEBUG= QCONFIGARG= touch .test.qpe. -if [ '!' -f ${QPEDIR}/.test.qpe. ]; +if [ '!' -f ${OPIEDIR}/.test.qpe. ]; then rm .test.qpe. echo echo - echo ' The environment variable $QPEDIR is not set correctly. It is currently' - echo ' set to "'$QPEDIR'", but it should be set to this directory,' + echo ' The environment variable $OPIEDIR is not set correctly. It is currently' + echo ' set to "'$OPIEDIR'", but it should be set to this directory,' echo ' which is "'`pwd`'".' echo - echo ' Please read the INSTALL file for instructions on how to set $QPEDIR' - echo ' correctly. If you have set $QPEDIR in your .profile or .login, you ' + echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR' + echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you ' echo ' will need to log out and log in again to make the setting effective.' echo echo exit 1 fi rm .test.qpe. mkdir -p include/qpe ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h) VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h) VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h) TOMAKE= if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h then QT3=yes else QT3=no fi # Parse the arguments, setting things to "yes" or "no". while [ -n "$1" ]; do case $1 in -platform|-xplatform) # No difference since we don't need to build moc, etc. shift; PLATFORM=$1 ;; -release) DEBUG= ;; -debug) DEBUG=-debug ;; -shared) SHARING=shared ;; -static) SHARING=static ;; -qconfig) # optional way to specify the qconfig-qpe.h is to pass -qconfig qpe shift; QCONFIGARG=DEFINES+=QCONFIG='\"'$1'\"' # Don't quote me on that. ;; -make) shift; TOMAKE="$TOMAKE $1" ;; -qt3) QT3=yes ;; *) HELP=yes;; esac shift done TARGET=configs/$PLATFORM-$SHARING$DEBUG if [ '!' -f $TARGET ] then if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ] then TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG else echo echo ' The specified platform/compiler not supported: ' $TARGET echo exit 2 fi fi # Next, emit a usage message if something failed. if [ "$HELP" = "yes" ]; then cat <<EOF Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] The defaults (*) are usually acceptable. Here is a short explanation of each option: * -release ........... Compile and link Qt with debugging turned off. -debug ............. Compile and link Qt with debugging turned on. * -shared ............ Create and use a shared Qt library (libqt.so) -static ............ Create and use a static Qt library (libqt.a) -qt3 ............... Configure for use with Qt 3.x -platform target ... The platform you are building on ($PLATFORM) EOF exit 0; fi echo Creating makefiles... sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v mv library/library.pro-v library/library.pro if [ "$QT3" = yes ] then VCONFIG="CONFIG+=qt3" else VCONFIG="CONFIG+=qt2" fi if [ -f $TMAKEPATH/tmake.conf ] then # You have tmake. We'll regenerate the file for you... echo "Makefiles will be regenerated." fi H=`pwd` if [ -z "$TOMAKE" ] then TOMAKE=`make showcomponents` fi for a in $TOMAKE ; do N=$a/Makefile M=$a/Makefile.in O=$a/Makefile.add f=`basename $a` if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] then ( cd $a; TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ -t $H/qt/tmake/propagate.t $f.pro | - sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$QPEDIR|\$(QPEDIR)|g" >Makefile.in; + sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; ) echo -n "." appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` if [ -n "$translation" -a -n "$appname" ] then if [ $appname != $translation ] then echo echo "Warning: translation and appname disagree in $a/$f.pro" fi fi fi cat > $N <<EOF ############################################################################# # Automatically generated from $M # Build options from $1 ############################################################################# EOF SED= PLATFORM_CFLAGS= if [ "$f" = "embeddedkonsole" ] then case $PLATFORM in *x86*|*generic*|*ipaq*) SED="$SED /^LIBS.*=/s/\$/ -lutil/;" PLATFORM_CFLAGS="-DHAVE_OPENPTY" ;; *) SED= esac elif [ "$f" = "libmpeg3" ] then # Patch our Makefile.in file with the platform specifics for the libmpeg3 library # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) SED='s/\$(CC)/\$(CXX)/;' case $PLATFORM in # For x86 turn on using floating point, compile mmx and css code *x86*) # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" # For generic turn on using floating point ;; *generic*) PLATFORM_CFLAGS="" # For the ipaq use fixed point maths, don't compile the mmx or css code ;; *ipaq*) PLATFORM_CFLAGS="-DUSE_FIXED_POINT" ;; *) # For 'other platforms', turn off optimizations and use fixed point PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" esac elif [ "$f" = "libmad" ] then # Patch our Makefile.in file with the platform specifics for the libmad library case $PLATFORM in # For x86 use intel optimizations *x86*) PLATFORM_CFLAGS="-DFPM_INTEL" # For the ipaq use ARM asm optimizations ;; *ipaq*) PLATFORM_CFLAGS="-DFPM_ARM" SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" # For generic platforms use the C 64-bit implementation ;; *generic*) PLATFORM_CFLAGS="-DFPM_64BIT" # For 'other platforms' use the ARM code ;; *) PLATFORM_CFLAGS="-DFPM_ARM" SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" esac fi if [ -n "$PLATFORM_CFLAGS" ] then # Append the addition c-flags we have defined SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" fi cat $TARGET >> $N if [ -n "$SED" ] then sed -e "$SED" $M >> $N else cat $M >> $N fi cat >> $N <<EOF lupdate: lupdate $f.pro lrelease: lrelease $f.pro EOF if [ -f "$O" ] then cat >> $N $O fi done MAKE=make echo echo "QPE is now configured for building. Just run $MAKE (or $MAKE single)." echo "To reconfigure, run $MAKE clean and configure." echo diff --git a/core/applets/batteryapplet/Makefile.in b/core/applets/batteryapplet/Makefile.in index 0493fd6..ccf997b 100644 --- a/core/applets/batteryapplet/Makefile.in +++ b/core/applets/batteryapplet/Makefile.in @@ -1,122 +1,122 @@ ############################################################################# ####### 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 +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/applets/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = batteryapplet TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = battery.h \ batterystatus.h \ batteryappletimpl.h SOURCES = battery.cpp \ batterystatus.cpp \ batteryappletimpl.cpp OBJECTS = battery.o \ batterystatus.o \ batteryappletimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_battery.cpp OBJMOC = moc_battery.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake batteryapplet.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 battery.o: battery.cpp \ battery.h \ batterystatus.h batterystatus.o: batterystatus.cpp \ batterystatus.h batteryappletimpl.o: batteryappletimpl.cpp \ battery.h \ batteryappletimpl.h moc_battery.o: moc_battery.cpp \ battery.h moc_battery.cpp: battery.h $(MOC) battery.h -o moc_battery.cpp diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro index fa0fca8..dcb606d 100644 --- a/core/applets/batteryapplet/batteryapplet.pro +++ b/core/applets/batteryapplet/batteryapplet.pro @@ -1,12 +1,12 @@ 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 -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libbatteryapplet.ts diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro index b0624ef..9832984 100644 --- a/core/applets/clipboardapplet/clipboardapplet.pro +++ b/core/applets/clipboardapplet/clipboardapplet.pro @@ -1,10 +1,10 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = clipboard.h clipboardappletimpl.h SOURCES = clipboard.cpp clipboardappletimpl.cpp TARGET = clipboardapplet DESTDIR = ../../plugins/applets -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 diff --git a/core/applets/clockapplet/Makefile.in b/core/applets/clockapplet/Makefile.in index fcf737e..742f25f 100644 --- a/core/applets/clockapplet/Makefile.in +++ b/core/applets/clockapplet/Makefile.in @@ -1,115 +1,115 @@ ############################################################################# ####### 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 +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/applets/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = clockapplet TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = clock.h \ clockappletimpl.h SOURCES = clock.cpp \ clockappletimpl.cpp OBJECTS = clock.o \ clockappletimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_clock.cpp OBJMOC = moc_clock.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake clockapplet.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 clock.o: clock.cpp \ clock.h clockappletimpl.o: clockappletimpl.cpp \ clock.h \ clockappletimpl.h moc_clock.o: moc_clock.cpp \ clock.h moc_clock.cpp: clock.h $(MOC) clock.h -o moc_clock.cpp diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro index 29a4e8b..1392680 100644 --- a/core/applets/clockapplet/clockapplet.pro +++ b/core/applets/clockapplet/clockapplet.pro @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = clock.h clockappletimpl.h SOURCES = clock.cpp clockappletimpl.cpp TARGET = clockapplet DESTDIR = ../../plugins/applets -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libclockapplet.ts diff --git a/core/applets/volumeapplet/Makefile.in b/core/applets/volumeapplet/Makefile.in index 7020cb7..49acf38 100644 --- a/core/applets/volumeapplet/Makefile.in +++ b/core/applets/volumeapplet/Makefile.in @@ -1,115 +1,115 @@ ############################################################################# ####### 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 +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/applets/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = volumeapplet TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = volume.h \ volumeappletimpl.h SOURCES = volume.cpp \ volumeappletimpl.cpp OBJECTS = volume.o \ volumeappletimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_volume.cpp OBJMOC = moc_volume.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake volumeapplet.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 volume.o: volume.cpp \ volume.h volumeappletimpl.o: volumeappletimpl.cpp \ volume.h \ volumeappletimpl.h moc_volume.o: moc_volume.cpp \ volume.h moc_volume.cpp: volume.h $(MOC) volume.h -o moc_volume.cpp diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index a33cf81..fedaed7 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = volume.h volumeappletimpl.h SOURCES = volume.cpp volumeappletimpl.cpp TARGET = volumeapplet DESTDIR = ../../plugins/applets -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in index b858cd4..8a69557 100644 --- a/core/apps/embeddedkonsole/Makefile.in +++ b/core/apps/embeddedkonsole/Makefile.in @@ -1,285 +1,286 @@ ############################################################################# ####### 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 = embeddedkonsole TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = TEWidget.h \ TEScreen.h \ TECommon.h \ TEHistory.h \ TEmulation.h \ TEmuVt102.h \ session.h \ keytrans.h \ konsole.h \ MyPty.h SOURCES = TEScreen.cpp \ TEWidget.cpp \ TEHistory.cpp \ TEmulation.cpp \ TEmuVt102.cpp \ session.cpp \ keytrans.cpp \ konsole.cpp \ main.cpp \ MyPty.cpp OBJECTS = TEScreen.o \ TEWidget.o \ TEHistory.o \ TEmulation.o \ TEmuVt102.o \ session.o \ keytrans.o \ konsole.o \ main.o \ MyPty.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_TEWidget.cpp \ moc_TEmulation.cpp \ moc_TEmuVt102.cpp \ moc_session.cpp \ moc_konsole.cpp \ moc_MyPty.cpp OBJMOC = moc_TEWidget.o \ moc_TEmulation.o \ moc_TEmuVt102.o \ moc_session.o \ moc_konsole.o \ moc_MyPty.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 embeddedkonsole.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=embeddedkonsole ####### Sub-libraries ###### Combined headers ####### Compile TEScreen.o: TEScreen.cpp \ TEScreen.h \ TECommon.h \ TEHistory.h TEWidget.o: TEWidget.cpp \ TEWidget.h \ TECommon.h \ session.h \ MyPty.h \ TEmuVt102.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h TEHistory.o: TEHistory.cpp \ TEHistory.h \ TECommon.h TEmulation.o: TEmulation.cpp \ TEmulation.h \ TEWidget.h \ TECommon.h \ TEScreen.h \ TEHistory.h \ keytrans.h TEmuVt102.o: TEmuVt102.cpp \ TEmuVt102.h \ TEWidget.h \ TECommon.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h session.o: session.cpp \ session.h \ MyPty.h \ TEWidget.h \ TECommon.h \ TEmuVt102.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h keytrans.o: keytrans.cpp \ keytrans.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ default.keytab.h konsole.o: konsole.cpp \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/config.h \ konsole.h \ MyPty.h \ TEWidget.h \ TECommon.h \ TEmuVt102.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h \ session.h main.o: main.cpp \ konsole.h \ MyPty.h \ TEWidget.h \ TECommon.h \ TEmuVt102.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h \ session.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h MyPty.o: MyPty.cpp \ MyPty.h moc_TEWidget.o: moc_TEWidget.cpp \ TEWidget.h \ TECommon.h moc_TEmulation.o: moc_TEmulation.cpp \ TEmulation.h \ TEWidget.h \ TECommon.h \ TEScreen.h \ TEHistory.h \ keytrans.h moc_TEmuVt102.o: moc_TEmuVt102.cpp \ TEmuVt102.h \ TEWidget.h \ TECommon.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h moc_session.o: moc_session.cpp \ session.h \ MyPty.h \ TEWidget.h \ TECommon.h \ TEmuVt102.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h moc_konsole.o: moc_konsole.cpp \ konsole.h \ MyPty.h \ TEWidget.h \ TECommon.h \ TEmuVt102.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h \ session.h moc_MyPty.o: moc_MyPty.cpp \ MyPty.h moc_TEWidget.cpp: TEWidget.h $(MOC) TEWidget.h -o moc_TEWidget.cpp moc_TEmulation.cpp: TEmulation.h $(MOC) TEmulation.h -o moc_TEmulation.cpp moc_TEmuVt102.cpp: TEmuVt102.h $(MOC) TEmuVt102.h -o moc_TEmuVt102.cpp moc_session.cpp: session.h $(MOC) session.h -o moc_session.cpp moc_konsole.cpp: konsole.h $(MOC) konsole.h -o moc_konsole.cpp moc_MyPty.cpp: MyPty.h $(MOC) MyPty.h -o moc_MyPty.cpp diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro index b757ea5..3452014 100755 --- a/core/apps/embeddedkonsole/embeddedkonsole.pro +++ b/core/apps/embeddedkonsole/embeddedkonsole.pro @@ -1,38 +1,38 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = TEWidget.h \ TEScreen.h \ TECommon.h \ TEHistory.h \ TEmulation.h \ TEmuVt102.h \ session.h \ keytrans.h \ konsole.h \ MyPty.h SOURCES = TEScreen.cpp \ TEWidget.cpp \ TEHistory.cpp \ TEmulation.cpp \ TEmuVt102.cpp \ session.cpp \ keytrans.cpp \ konsole.cpp \ main.cpp \ MyPty.cpp TARGET = embeddedkonsole -INCLUDEPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += $(QPEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe REQUIRES = embeddedkonsole diff --git a/core/apps/helpbrowser/Makefile.in b/core/apps/helpbrowser/Makefile.in index 8f0ce0e..ed3ea03 100644 --- a/core/apps/helpbrowser/Makefile.in +++ b/core/apps/helpbrowser/Makefile.in @@ -1,119 +1,119 @@ ############################################################################# ####### 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 = helpbrowser TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = helpbrowser.h SOURCES = helpbrowser.cpp \ main.cpp OBJECTS = helpbrowser.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_helpbrowser.cpp OBJMOC = moc_helpbrowser.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 helpbrowser.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 helpbrowser.o: helpbrowser.cpp \ helpbrowser.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h main.o: main.cpp \ helpbrowser.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_helpbrowser.o: moc_helpbrowser.cpp \ helpbrowser.h moc_helpbrowser.cpp: helpbrowser.h $(MOC) helpbrowser.h -o moc_helpbrowser.cpp diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro index 43230f1..f6ede8b 100644 --- a/core/apps/helpbrowser/helpbrowser.pro +++ b/core/apps/helpbrowser/helpbrowser.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = helpbrowser.h SOURCES = helpbrowser.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = TRANSLATIONS = ../i18n/de/helpbrowser.ts diff --git a/core/apps/qcop/Makefile.in b/core/apps/qcop/Makefile.in index 0a12320..fd543f5 100644 --- a/core/apps/qcop/Makefile.in +++ b/core/apps/qcop/Makefile.in @@ -1,102 +1,102 @@ ############################################################################# ####### 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 = ../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qcop TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = SOURCES = main.cpp OBJECTS = main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = OBJMOC = ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 qcop.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 \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro index b52bfd8..3ffe796 100644 --- a/core/apps/qcop/qcop.pro +++ b/core/apps/qcop/qcop.pro @@ -1,10 +1,10 @@ TEMPLATE = app CONFIG = qt warn_on release DESTDIR = ../bin HEADERS = SOURCES = main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = TARGET = qcop diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in index 84542bb..997f2a4 100644 --- a/core/apps/textedit/Makefile.in +++ b/core/apps/textedit/Makefile.in @@ -1,125 +1,125 @@ ############################################################################# ####### 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 = textedit TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = textedit.h SOURCES = main.cpp \ textedit.cpp OBJECTS = main.o \ textedit.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_textedit.cpp OBJMOC = moc_textedit.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 textedit.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 \ textedit.h \ - $(QPEDIR)/include/qpe/filemanager.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/filemanager.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h textedit.o: textedit.cpp \ textedit.h \ - $(QPEDIR)/include/qpe/filemanager.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/fileselector.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/filemanager.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/fileselector.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h moc_textedit.o: moc_textedit.cpp \ textedit.h \ - $(QPEDIR)/include/qpe/filemanager.h + $(OPIEDIR)/include/qpe/filemanager.h moc_textedit.cpp: textedit.h $(MOC) textedit.h -o moc_textedit.cpp diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro index 3f5473e..23b8d8d 100644 --- a/core/apps/textedit/textedit.pro +++ b/core/apps/textedit/textedit.pro @@ -1,16 +1,16 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = textedit.h SOURCES = main.cpp textedit.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = textedit TRANSLATIONS = ../i18n/de/textedit.ts diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in index e129fca..5e2dbe5 100644 --- a/core/launcher/Makefile.in +++ b/core/launcher/Makefile.in @@ -1,867 +1,876 @@ ############################################################################# ####### 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 -I$(QPEDIR)/calibrate -I$(QPEDIR)/rsync +INCPATH = -I$(OPIEDIR)/include -I$(OPIEDIR)/calibrate -I$(OPIEDIR)/rsync LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lcrypt $(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 = qpe TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = background.h \ desktop.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 \ startmenu.h \ transferserver.h \ qcopbridge.h \ packageslave.h \ irserver.h \ - $(QPEDIR)/rsync/buf.h \ - $(QPEDIR)/rsync/checksum.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/emit.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/prototab.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/search.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/types.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/whole.h \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/qrsync.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 SOURCES = background.cpp \ desktop.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 \ - $(QPEDIR)/calibrate/calibrate.cpp \ + $(OPIEDIR)/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.cpp \ - $(QPEDIR)/rsync/base64.c \ - $(QPEDIR)/rsync/buf.c \ - $(QPEDIR)/rsync/checksum.c \ - $(QPEDIR)/rsync/command.c \ - $(QPEDIR)/rsync/delta.c \ - $(QPEDIR)/rsync/emit.c \ - $(QPEDIR)/rsync/hex.c \ - $(QPEDIR)/rsync/job.c \ - $(QPEDIR)/rsync/mdfour.c \ - $(QPEDIR)/rsync/mksum.c \ - $(QPEDIR)/rsync/msg.c \ - $(QPEDIR)/rsync/netint.c \ - $(QPEDIR)/rsync/patch.c \ - $(QPEDIR)/rsync/prototab.c \ - $(QPEDIR)/rsync/readsums.c \ - $(QPEDIR)/rsync/scoop.c \ - $(QPEDIR)/rsync/search.c \ - $(QPEDIR)/rsync/stats.c \ - $(QPEDIR)/rsync/stream.c \ - $(QPEDIR)/rsync/sumset.c \ - $(QPEDIR)/rsync/trace.c \ - $(QPEDIR)/rsync/tube.c \ - $(QPEDIR)/rsync/util.c \ - $(QPEDIR)/rsync/version.c \ - $(QPEDIR)/rsync/whole.c \ - $(QPEDIR)/rsync/qrsync.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 OBJECTS = background.o \ desktop.o \ info.o \ appicons.o \ taskbar.o \ sidething.o \ mrulist.o \ stabmon.o \ inputmethods.o \ systray.o \ wait.o \ shutdownimpl.o \ launcher.o \ launcherview.o \ - $(QPEDIR)/calibrate/calibrate.o \ + $(OPIEDIR)/calibrate/calibrate.o \ transferserver.o \ packageslave.o \ irserver.o \ qcopbridge.o \ startmenu.o \ main.o \ - $(QPEDIR)/rsync/base64.o \ - $(QPEDIR)/rsync/buf.o \ - $(QPEDIR)/rsync/checksum.o \ - $(QPEDIR)/rsync/command.o \ - $(QPEDIR)/rsync/delta.o \ - $(QPEDIR)/rsync/emit.o \ - $(QPEDIR)/rsync/hex.o \ - $(QPEDIR)/rsync/job.o \ - $(QPEDIR)/rsync/mdfour.o \ - $(QPEDIR)/rsync/mksum.o \ - $(QPEDIR)/rsync/msg.o \ - $(QPEDIR)/rsync/netint.o \ - $(QPEDIR)/rsync/patch.o \ - $(QPEDIR)/rsync/prototab.o \ - $(QPEDIR)/rsync/readsums.o \ - $(QPEDIR)/rsync/scoop.o \ - $(QPEDIR)/rsync/search.o \ - $(QPEDIR)/rsync/stats.o \ - $(QPEDIR)/rsync/stream.o \ - $(QPEDIR)/rsync/sumset.o \ - $(QPEDIR)/rsync/trace.o \ - $(QPEDIR)/rsync/tube.o \ - $(QPEDIR)/rsync/util.o \ - $(QPEDIR)/rsync/version.o \ - $(QPEDIR)/rsync/whole.o \ - $(QPEDIR)/rsync/qrsync.o \ + $(OPIEDIR)/rsync/base64.o \ + $(OPIEDIR)/rsync/buf.o \ + $(OPIEDIR)/rsync/checksum.o \ + $(OPIEDIR)/rsync/command.o \ + $(OPIEDIR)/rsync/delta.o \ + $(OPIEDIR)/rsync/emit.o \ + $(OPIEDIR)/rsync/hex.o \ + $(OPIEDIR)/rsync/job.o \ + $(OPIEDIR)/rsync/mdfour.o \ + $(OPIEDIR)/rsync/mksum.o \ + $(OPIEDIR)/rsync/msg.o \ + $(OPIEDIR)/rsync/netint.o \ + $(OPIEDIR)/rsync/patch.o \ + $(OPIEDIR)/rsync/prototab.o \ + $(OPIEDIR)/rsync/readsums.o \ + $(OPIEDIR)/rsync/scoop.o \ + $(OPIEDIR)/rsync/search.o \ + $(OPIEDIR)/rsync/stats.o \ + $(OPIEDIR)/rsync/stream.o \ + $(OPIEDIR)/rsync/sumset.o \ + $(OPIEDIR)/rsync/trace.o \ + $(OPIEDIR)/rsync/tube.o \ + $(OPIEDIR)/rsync/util.o \ + $(OPIEDIR)/rsync/version.o \ + $(OPIEDIR)/rsync/whole.o \ + $(OPIEDIR)/rsync/qrsync.o \ shutdown.o \ syncdialog.o INTERFACES = shutdown.ui \ syncdialog.ui UICDECLS = shutdown.h \ syncdialog.h UICIMPLS = shutdown.cpp \ syncdialog.cpp SRCMOC = moc_background.cpp \ moc_desktop.cpp \ moc_info.cpp \ moc_appicons.cpp \ moc_taskbar.cpp \ moc_sidething.cpp \ moc_inputmethods.cpp \ moc_systray.cpp \ moc_shutdownimpl.cpp \ moc_launcher.cpp \ moc_launcherview.cpp \ ../calibrate/moc_calibrate.cpp \ moc_startmenu.cpp \ moc_transferserver.cpp \ moc_qcopbridge.cpp \ moc_packageslave.cpp \ moc_irserver.cpp \ appicons.moc \ moc_shutdown.cpp \ moc_syncdialog.cpp OBJMOC = moc_background.o \ moc_desktop.o \ moc_info.o \ moc_appicons.o \ moc_taskbar.o \ moc_sidething.o \ moc_inputmethods.o \ moc_systray.o \ moc_shutdownimpl.o \ moc_launcher.o \ moc_launcherview.o \ ../calibrate/moc_calibrate.o \ moc_startmenu.o \ moc_transferserver.o \ moc_qcopbridge.o \ moc_packageslave.o \ moc_irserver.o \ moc_shutdown.o \ moc_syncdialog.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 taskbar.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 background.o: background.cpp \ background.h \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/resource.h desktop.o: desktop.cpp \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ info.h \ background.h \ launcher.h \ launcherview.h \ - $(QPEDIR)/include/qpe/storage.h \ + $(OPIEDIR)/include/qpe/storage.h \ mrulist.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ qcopbridge.h \ startmenu.h \ taskbar.h \ - $(QPEDIR)/include/qpe/custom.h \ + $(OPIEDIR)/include/qpe/custom.h \ transferserver.h \ irserver.h \ packageslave.h \ - $(QPEDIR)/include/qpe/mimetype.h \ - $(QPEDIR)/include/qpe/password.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/power.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/global.h + $(OPIEDIR)/include/qpe/mimetype.h \ + $(OPIEDIR)/include/qpe/password.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/power.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/global.h info.o: info.cpp \ info.h \ background.h \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/version.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/version.h appicons.o: appicons.cpp \ appicons.moc \ appicons.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h taskbar.o: taskbar.cpp \ startmenu.h \ inputmethods.h \ - $(QPEDIR)/include/qpe/inputmethodinterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/inputmethodinterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mrulist.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ systray.h \ - $(QPEDIR)/include/qpe/taskbarappletinterface.h \ - $(QPEDIR)/calibrate/calibrate.h \ + $(OPIEDIR)/include/qpe/taskbarappletinterface.h \ + $(OPIEDIR)/calibrate/calibrate.h \ wait.h \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ appicons.h \ taskbar.h \ - $(QPEDIR)/include/qpe/custom.h \ + $(OPIEDIR)/include/qpe/custom.h \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/global.h \ ../taskbar/apps.h \ ../addressbook/addressbook.h \ ../datebook/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 \ ../helpbrowser/helpbrowser.h \ ../minesweep/minesweep.h \ ../textedit/textedit.h \ - $(QPEDIR)/include/qpe/filemanager.h \ + $(OPIEDIR)/include/qpe/filemanager.h \ ../todo/mainwindow.h \ ../citytime/citytime.h \ ../clock/clock.h \ ../calculator/calculatorimpl.h \ ../sysinfo/sysinfo.h \ ../settings/appearance/settings.h \ ../settings/systemtime/settime.h \ - $(QPEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/timestring.h \ ../filebrowser/filebrowser.h \ ../solitaire/canvascardwindow.h \ ../snake/interface.h \ ../parashoot/interface.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ ../mpegplayer/mediaplayer.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ ../embeddedkonsole/konsole.h \ ../wordgame/wordgame.h \ - $(QPEDIR)/include/qpe/qdawg.h + $(OPIEDIR)/include/qpe/qdawg.h sidething.o: sidething.cpp \ sidething.h \ startmenu.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h mrulist.o: mrulist.cpp \ mrulist.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/resource.h stabmon.o: stabmon.cpp \ stabmon.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h inputmethods.o: inputmethods.cpp \ inputmethods.h \ - $(QPEDIR)/include/qpe/inputmethodinterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qlibrary.h + $(OPIEDIR)/include/qpe/inputmethodinterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h systray.o: systray.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/config.h \ quicklauncher.h \ systray.h \ - $(QPEDIR)/include/qpe/taskbarappletinterface.h + $(OPIEDIR)/include/qpe/taskbarappletinterface.h wait.o: wait.cpp \ wait.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h shutdownimpl.o: shutdownimpl.cpp \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/global.h + $(OPIEDIR)/include/qpe/global.h launcher.o: launcher.cpp \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/mimetype.h \ - $(QPEDIR)/include/qpe/storage.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/mimetype.h \ + $(OPIEDIR)/include/qpe/storage.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ launcherview.h \ launcher.h \ - $(QPEDIR)/include/qpe/lnkproperties.h \ + syncdialog.h \ + desktop.h \ + shutdownimpl.h \ + shutdown.h \ + $(OPIEDIR)/include/qpe/lnkproperties.h \ mrulist.h \ - $(QPEDIR)/rsync/qrsync.h + $(OPIEDIR)/rsync/qrsync.h launcherview.o: launcherview.cpp \ launcherview.h \ - $(QPEDIR)/include/qpe/storage.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpedebug.h \ - $(QPEDIR)/include/qpe/categories.h \ - $(QPEDIR)/include/qpe/categoryselect.h \ - $(QPEDIR)/include/qpe/menubutton.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h - -$(QPEDIR)/calibrate/calibrate.o: $(QPEDIR)/calibrate/calibrate.cpp \ - $(QPEDIR)/calibrate/calibrate.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/storage.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpedebug.h \ + $(OPIEDIR)/include/qpe/categories.h \ + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/menubutton.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h + +$(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \ + $(OPIEDIR)/calibrate/calibrate.h \ + $(OPIEDIR)/include/qpe/resource.h transferserver.o: transferserver.cpp \ - $(QPEDIR)/include/qpe/qprocess.h \ - $(QPEDIR)/include/qpe/process.h \ + $(OPIEDIR)/include/qpe/qprocess.h \ + $(OPIEDIR)/include/qpe/process.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ transferserver.h packageslave.o: packageslave.cpp \ packageslave.h \ - $(QPEDIR)/include/qpe/process.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/process.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h irserver.o: irserver.cpp \ irserver.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ obexinterface.h qcopbridge.o: qcopbridge.cpp \ qcopbridge.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + transferserver.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h startmenu.o: startmenu.cpp \ startmenu.h \ sidething.h \ mrulist.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ info.h \ background.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/resource.h main.o: main.cpp \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ taskbar.h \ - $(QPEDIR)/include/qpe/custom.h \ + $(OPIEDIR)/include/qpe/custom.h \ stabmon.h \ - $(QPEDIR)/include/qpe/network.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/alarmserver.h \ + $(OPIEDIR)/include/qpe/network.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/alarmserver.h \ ../calibrate/calibrate.h \ ../login/qdmdialogimpl.h \ - $(QPEDIR)/include/qpe/global.h - -$(QPEDIR)/rsync/base64.o: $(QPEDIR)/rsync/base64.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h - -$(QPEDIR)/rsync/buf.o: $(QPEDIR)/rsync/buf.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/buf.h \ - $(QPEDIR)/rsync/util.h - -$(QPEDIR)/rsync/checksum.o: $(QPEDIR)/rsync/checksum.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/checksum.h - -$(QPEDIR)/rsync/command.o: $(QPEDIR)/rsync/command.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/command.h - -$(QPEDIR)/rsync/delta.o: $(QPEDIR)/rsync/delta.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/emit.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/checksum.h \ - $(QPEDIR)/rsync/search.h \ - $(QPEDIR)/rsync/types.h - -$(QPEDIR)/rsync/emit.o: $(QPEDIR)/rsync/emit.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/emit.h \ - $(QPEDIR)/rsync/prototab.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h - -$(QPEDIR)/rsync/hex.o: $(QPEDIR)/rsync/hex.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h - -$(QPEDIR)/rsync/job.o: $(QPEDIR)/rsync/job.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/mdfour.o: $(QPEDIR)/rsync/mdfour.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/types.h - -$(QPEDIR)/rsync/mksum.o: $(QPEDIR)/rsync/mksum.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/checksum.h - -$(QPEDIR)/rsync/msg.o: $(QPEDIR)/rsync/msg.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h - -$(QPEDIR)/rsync/netint.o: $(QPEDIR)/rsync/netint.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/stream.h - -$(QPEDIR)/rsync/patch.o: $(QPEDIR)/rsync/patch.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/prototab.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/job.h - -$(QPEDIR)/rsync/prototab.o: $(QPEDIR)/rsync/prototab.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/prototab.h - -$(QPEDIR)/rsync/readsums.o: $(QPEDIR)/rsync/readsums.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/stream.h - -$(QPEDIR)/rsync/scoop.o: $(QPEDIR)/rsync/scoop.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/util.h - -$(QPEDIR)/rsync/search.o: $(QPEDIR)/rsync/search.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/search.h \ - $(QPEDIR)/rsync/checksum.h - -$(QPEDIR)/rsync/stats.o: $(QPEDIR)/rsync/stats.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/stream.o: $(QPEDIR)/rsync/stream.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/sumset.o: $(QPEDIR)/rsync/sumset.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/trace.o: $(QPEDIR)/rsync/trace.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/tube.o: $(QPEDIR)/rsync/tube.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/stream.h - -$(QPEDIR)/rsync/util.o: $(QPEDIR)/rsync/util.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/version.o: $(QPEDIR)/rsync/version.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h - -$(QPEDIR)/rsync/whole.o: $(QPEDIR)/rsync/whole.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/fileutil.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/buf.h \ - $(QPEDIR)/rsync/whole.h \ - $(QPEDIR)/rsync/util.h - -$(QPEDIR)/rsync/qrsync.o: $(QPEDIR)/rsync/qrsync.cpp \ - $(QPEDIR)/rsync/qrsync.h \ - $(QPEDIR)/rsync/rsync.h + $(OPIEDIR)/include/qpe/global.h + +$(OPIEDIR)/rsync/base64.o: $(OPIEDIR)/rsync/base64.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h + +$(OPIEDIR)/rsync/buf.o: $(OPIEDIR)/rsync/buf.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/buf.h \ + $(OPIEDIR)/rsync/util.h + +$(OPIEDIR)/rsync/checksum.o: $(OPIEDIR)/rsync/checksum.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/checksum.h + +$(OPIEDIR)/rsync/command.o: $(OPIEDIR)/rsync/command.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/command.h + +$(OPIEDIR)/rsync/delta.o: $(OPIEDIR)/rsync/delta.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/emit.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/checksum.h \ + $(OPIEDIR)/rsync/search.h \ + $(OPIEDIR)/rsync/types.h + +$(OPIEDIR)/rsync/emit.o: $(OPIEDIR)/rsync/emit.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/command.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/emit.h \ + $(OPIEDIR)/rsync/prototab.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h + +$(OPIEDIR)/rsync/hex.o: $(OPIEDIR)/rsync/hex.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h + +$(OPIEDIR)/rsync/job.o: $(OPIEDIR)/rsync/job.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/mdfour.o: $(OPIEDIR)/rsync/mdfour.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/types.h + +$(OPIEDIR)/rsync/mksum.o: $(OPIEDIR)/rsync/mksum.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/checksum.h + +$(OPIEDIR)/rsync/msg.o: $(OPIEDIR)/rsync/msg.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h + +$(OPIEDIR)/rsync/netint.o: $(OPIEDIR)/rsync/netint.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/stream.h + +$(OPIEDIR)/rsync/patch.o: $(OPIEDIR)/rsync/patch.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/command.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/prototab.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/job.h + +$(OPIEDIR)/rsync/prototab.o: $(OPIEDIR)/rsync/prototab.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/command.h \ + $(OPIEDIR)/rsync/prototab.h + +$(OPIEDIR)/rsync/readsums.o: $(OPIEDIR)/rsync/readsums.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/stream.h + +$(OPIEDIR)/rsync/scoop.o: $(OPIEDIR)/rsync/scoop.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/util.h + +$(OPIEDIR)/rsync/search.o: $(OPIEDIR)/rsync/search.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/search.h \ + $(OPIEDIR)/rsync/checksum.h + +$(OPIEDIR)/rsync/stats.o: $(OPIEDIR)/rsync/stats.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/stream.o: $(OPIEDIR)/rsync/stream.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/sumset.o: $(OPIEDIR)/rsync/sumset.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/trace.o: $(OPIEDIR)/rsync/trace.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/tube.o: $(OPIEDIR)/rsync/tube.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/stream.h + +$(OPIEDIR)/rsync/util.o: $(OPIEDIR)/rsync/util.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/version.o: $(OPIEDIR)/rsync/version.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h + +$(OPIEDIR)/rsync/whole.o: $(OPIEDIR)/rsync/whole.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/fileutil.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/buf.h \ + $(OPIEDIR)/rsync/whole.h \ + $(OPIEDIR)/rsync/util.h + +$(OPIEDIR)/rsync/qrsync.o: $(OPIEDIR)/rsync/qrsync.cpp \ + $(OPIEDIR)/rsync/qrsync.h \ + $(OPIEDIR)/rsync/rsync.h shutdown.h: shutdown.ui $(UIC) shutdown.ui -o $(INTERFACE_DECL_PATH)/shutdown.h shutdown.cpp: shutdown.ui $(UIC) shutdown.ui -i shutdown.h -o shutdown.cpp syncdialog.h: syncdialog.ui $(UIC) syncdialog.ui -o $(INTERFACE_DECL_PATH)/syncdialog.h syncdialog.cpp: syncdialog.ui $(UIC) syncdialog.ui -i syncdialog.h -o syncdialog.cpp -shutdown.o: shutdown.cpp \ - shutdown.h +shutdown.o: shutdown.cpp syncdialog.o: syncdialog.cpp moc_background.o: moc_background.cpp \ background.h moc_desktop.o: moc_desktop.cpp \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_info.o: moc_info.cpp \ info.h \ background.h moc_appicons.o: moc_appicons.cpp \ appicons.h moc_taskbar.o: moc_taskbar.cpp \ taskbar.h \ - $(QPEDIR)/include/qpe/custom.h + $(OPIEDIR)/include/qpe/custom.h moc_sidething.o: moc_sidething.cpp \ sidething.h \ startmenu.h moc_inputmethods.o: moc_inputmethods.cpp \ inputmethods.h \ - $(QPEDIR)/include/qpe/inputmethodinterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h + $(OPIEDIR)/include/qpe/inputmethodinterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h moc_systray.o: moc_systray.cpp \ systray.h \ - $(QPEDIR)/include/qpe/taskbarappletinterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h + $(OPIEDIR)/include/qpe/taskbarappletinterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h moc_shutdownimpl.o: moc_shutdownimpl.cpp \ shutdownimpl.h \ shutdown.h moc_launcher.o: moc_launcher.cpp \ launcher.h \ launcherview.h \ - $(QPEDIR)/include/qpe/storage.h + $(OPIEDIR)/include/qpe/storage.h moc_launcherview.o: moc_launcherview.cpp \ launcherview.h \ - $(QPEDIR)/include/qpe/storage.h + $(OPIEDIR)/include/qpe/storage.h ../calibrate/moc_calibrate.o: ../calibrate/moc_calibrate.cpp \ ../calibrate/calibrate.h moc_startmenu.o: moc_startmenu.cpp \ startmenu.h moc_transferserver.o: moc_transferserver.cpp \ transferserver.h moc_qcopbridge.o: moc_qcopbridge.cpp \ qcopbridge.h moc_packageslave.o: moc_packageslave.cpp \ packageslave.h moc_irserver.o: moc_irserver.cpp \ irserver.h moc_shutdown.o: appicons.moc \ appicons.cpp \ appicons.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h moc_syncdialog.o: moc_shutdown.cpp \ shutdown.h moc_background.cpp: background.h $(MOC) background.h -o moc_background.cpp moc_desktop.cpp: desktop.h $(MOC) desktop.h -o moc_desktop.cpp moc_info.cpp: info.h $(MOC) info.h -o moc_info.cpp moc_appicons.cpp: appicons.h $(MOC) appicons.h -o moc_appicons.cpp moc_taskbar.cpp: taskbar.h $(MOC) taskbar.h -o moc_taskbar.cpp moc_sidething.cpp: sidething.h $(MOC) sidething.h -o moc_sidething.cpp moc_inputmethods.cpp: inputmethods.h $(MOC) inputmethods.h -o moc_inputmethods.cpp moc_systray.cpp: systray.h $(MOC) systray.h -o moc_systray.cpp moc_shutdownimpl.cpp: shutdownimpl.h $(MOC) shutdownimpl.h -o moc_shutdownimpl.cpp moc_launcher.cpp: launcher.h $(MOC) launcher.h -o moc_launcher.cpp moc_launcherview.cpp: launcherview.h $(MOC) launcherview.h -o moc_launcherview.cpp ../calibrate/moc_calibrate.cpp: ../calibrate/calibrate.h $(MOC) ../calibrate/calibrate.h -o ../calibrate/moc_calibrate.cpp moc_startmenu.cpp: startmenu.h $(MOC) startmenu.h -o moc_startmenu.cpp moc_transferserver.cpp: transferserver.h $(MOC) transferserver.h -o moc_transferserver.cpp moc_qcopbridge.cpp: qcopbridge.h $(MOC) qcopbridge.h -o moc_qcopbridge.cpp moc_packageslave.cpp: packageslave.h $(MOC) packageslave.h -o moc_packageslave.cpp moc_irserver.cpp: irserver.h $(MOC) irserver.h -o moc_irserver.cpp appicons.moc: appicons.cpp $(MOC) appicons.cpp -o appicons.moc moc_shutdown.cpp: shutdown.h $(MOC) shutdown.h -o moc_shutdown.cpp moc_syncdialog.cpp: syncdialog.h $(MOC) syncdialog.h -o moc_syncdialog.cpp diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index 7d7c9ac..0078faf 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro @@ -1,110 +1,110 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = background.h \ desktop.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 \ startmenu.h \ transferserver.h \ qcopbridge.h \ packageslave.h \ irserver.h \ - $(QPEDIR)/rsync/buf.h \ - $(QPEDIR)/rsync/checksum.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/emit.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/prototab.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/search.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/types.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/whole.h \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/qrsync.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 \ info.cpp \ appicons.cpp \ taskbar.cpp \ sidething.cpp \ mrulist.cpp \ stabmon.cpp \ inputmethods.cpp \ systray.cpp \ wait.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ - $(QPEDIR)/calibrate/calibrate.cpp \ + $(OPIEDIR)/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.cpp \ - $(QPEDIR)/rsync/base64.c \ - $(QPEDIR)/rsync/buf.c \ - $(QPEDIR)/rsync/checksum.c \ - $(QPEDIR)/rsync/command.c \ - $(QPEDIR)/rsync/delta.c \ - $(QPEDIR)/rsync/emit.c \ - $(QPEDIR)/rsync/hex.c \ - $(QPEDIR)/rsync/job.c \ - $(QPEDIR)/rsync/mdfour.c \ - $(QPEDIR)/rsync/mksum.c \ - $(QPEDIR)/rsync/msg.c \ - $(QPEDIR)/rsync/netint.c \ - $(QPEDIR)/rsync/patch.c \ - $(QPEDIR)/rsync/prototab.c \ - $(QPEDIR)/rsync/readsums.c \ - $(QPEDIR)/rsync/scoop.c \ - $(QPEDIR)/rsync/search.c \ - $(QPEDIR)/rsync/stats.c \ - $(QPEDIR)/rsync/stream.c \ - $(QPEDIR)/rsync/sumset.c \ - $(QPEDIR)/rsync/trace.c \ - $(QPEDIR)/rsync/tube.c \ - $(QPEDIR)/rsync/util.c \ - $(QPEDIR)/rsync/version.c \ - $(QPEDIR)/rsync/whole.c \ - $(QPEDIR)/rsync/qrsync.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 += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include . +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include . -INCLUDEPATH += $(QPEDIR)/calibrate -DEPENDPATH += $(QPEDIR)/calibrate +INCLUDEPATH += $(OPIEDIR)/calibrate +DEPENDPATH += $(OPIEDIR)/calibrate -INCLUDEPATH += $(QPEDIR)/rsync -DEPENDPATH += $(QPEDIR)/rsync +INCLUDEPATH += $(OPIEDIR)/rsync +DEPENDPATH += $(OPIEDIR)/rsync TARGET = qpe LIBS += -lqpe -lcrypt TRANSLATIONS = ../i18n/de/qpe.ts diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 024f9cc..12c2a7c 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -1,276 +1,276 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "desktop.h" #include "taskbar.h" #include "stabmon.h" #include <qpe/qpeapplication.h> #include <qpe/network.h> #include <qpe/config.h> #ifdef QT_QWS_CUSTOM #include <qpe/custom.h> #endif #include <qfile.h> #include <qwindowsystem_qws.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/alarmserver.h> #include <stdlib.h> #include <stdio.h> #include <signal.h> #include <unistd.h> #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) #include "../calibrate/calibrate.h" #endif #ifdef QT_QWS_LOGIN #include "../login/qdmdialogimpl.h" #endif #ifdef QT_QWS_CASSIOPEIA static void ignoreMessage( QtMsgType, const char * ) { } #include <sys/mount.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> #include <qdatetime.h> void initCassiopeia() { // MIPSEL-specific init - make sure /proc exists for shm /* if ( mount("/dev/ram0", "/", "ext2", MS_REMOUNT | MS_MGC_VAL, 0 ) ) { perror("Remounting - / read/write"); } */ if ( mount("none", "/tmp", "ramfs", 0, 0 ) ) { perror("mounting ramfs /tmp"); } else { fprintf( stderr, "mounted /tmp\n" ); } if ( mount("none", "/home", "ramfs", 0, 0 ) ) { perror("mounting ramfs /home"); } else { fprintf( stderr, "mounted /home\n" ); } if ( mount("none","/proc","proc",0,0) ) { perror("Mounting - /proc"); } else { fprintf( stderr, "mounted /proc\n" ); } if ( mount("none","/mnt","shm",0,0) ) { perror("Mounting - shm"); } setenv( "QTDIR", "/", 1 ); - setenv( "QPEDIR", "/", 1 ); + setenv( "OPIEDIR", "/", 1 ); setenv( "HOME", "/home", 1 ); mkdir( "/home/Documents", 0755 ); // set a reasonable starting date QDateTime dt( QDate( 2001, 3, 15 ) ); QDateTime now = QDateTime::currentDateTime(); int change = now.secsTo( dt ); time_t t = ::time(0); t += change; stime(&t); qInstallMsgHandler(ignoreMessage); } #endif #ifdef QPE_OWNAPM #include <sys/ioctl.h> #include <sys/types.h> #include <fcntl.h> #include <unistd.h> #include <errno.h> #include <linux/ioctl.h> #include <qpe/global.h> static void disableAPM() { int fd, cur_val, ret; char *device = "/dev/apm_bios"; fd = open (device, O_WRONLY); if (fd == -1) { perror(device); return; } cur_val = ioctl(fd, APM_IOCGEVTSRC, 0); if (cur_val == -1) { perror("ioctl"); exit(errno); } ret = ioctl(fd, APM_IOCSEVTSRC, cur_val & ~APM_EVT_POWER_BUTTON); if (ret == -1) { perror("ioctl"); return; } close(fd); } static void initAPM() { // So that we have to do it ourself, but better. disableAPM(); } #endif #ifdef QT_DEMO_SINGLE_FLOPPY #include <sys/mount.h> void initFloppy() { mount("none","/proc","proc",0,0); setenv( "QTDIR", "/", 0 ); setenv( "HOME", "/root", 0 ); setenv( "QWS_SIZE", "240x320", 0 ); } #endif void initEnvironment() { Config config("locale"); config.setGroup( "Location" ); QString tz = config.readEntry( "Timezone", getenv("TZ") ); // if not timezone set, pick New York if (tz.isNull()) tz = "America/New_York"; setenv( "TZ", tz, 1 ); config.writeEntry( "Timezone", tz); config.setGroup( "Language" ); QString lang = config.readEntry( "Language", getenv("LANG") ); if ( !lang.isNull() ) setenv( "LANG", lang, 1 ); } static void initBacklight() { QCopEnvelope e("QPE/System", "setBacklight(int)" ); e << -3; // Forced on } int initApplication( int argc, char ** argv ) { #ifdef QT_QWS_CASSIOPEIA initCassiopeia(); #endif #ifdef QPE_OWNAPM initAPM(); #endif #ifdef QT_DEMO_SINGLE_FLOPPY initFloppy(); #endif initEnvironment(); #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX) setenv( "QWS_SIZE", "240x320", 0 ); #endif //Don't flicker at startup: QWSServer::setDesktopBackground( QImage() ); DesktopApplication a( argc, argv, QApplication::GuiServer ); initBacklight(); AlarmServer::initialize(); #if defined(QT_QWS_LOGIN) for( int i=0; i<a.argc(); i++ ) if( strcmp( a.argv()[i], "-login" ) == 0 ) { QDMDialogImpl::login( ); return 0; } #endif Desktop *d = new Desktop(); QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); (void)new SysFileMonitor(d); Network::createServer(d); #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) if ( !QFile::exists( "/etc/pointercal" ) ) { // Make sure calibration widget starts on top. Calibrate *cal = new Calibrate; cal->exec(); delete cal; } #endif d->show(); int rv = a.exec(); delete d; return rv; } int main( int argc, char ** argv ) { #ifndef SINGLE_APP signal( SIGCHLD, SIG_IGN ); #endif int retVal = initApplication( argc, argv ); #ifndef SINGLE_APP // Kill them. Kill them all. setpgid( getpid(), getppid() ); killpg( getpid(), SIGTERM ); sleep( 1 ); killpg( getpid(), SIGKILL ); #endif return retVal; } diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in index 5fca66e..6e007ec 100644 --- a/core/multimedia/opieplayer/Makefile.in +++ b/core/multimedia/opieplayer/Makefile.in @@ -1,280 +1,280 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include +CFLAGS = $(SYSCONF_CFLAGS) +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lpthread $(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 = mpegplayer TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = loopcontrol.h \ mediaplayerplugininterface.h \ playlistselection.h \ mediaplayerstate.h \ videowidget.h \ audiowidget.h \ playlistwidget.h \ mediaplayer.h \ audiodevice.h SOURCES = main.cpp \ loopcontrol.cpp \ playlistselection.cpp \ mediaplayerstate.cpp \ videowidget.cpp \ audiowidget.cpp \ playlistwidget.cpp \ mediaplayer.cpp \ audiodevice.cpp OBJECTS = main.o \ loopcontrol.o \ playlistselection.o \ mediaplayerstate.o \ videowidget.o \ audiowidget.o \ playlistwidget.o \ mediaplayer.o \ audiodevice.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_loopcontrol.cpp \ moc_playlistselection.cpp \ moc_mediaplayerstate.cpp \ moc_videowidget.cpp \ moc_audiowidget.cpp \ moc_playlistwidget.cpp \ moc_mediaplayer.cpp \ moc_audiodevice.cpp OBJMOC = moc_loopcontrol.o \ moc_playlistselection.o \ moc_mediaplayerstate.o \ moc_videowidget.o \ moc_audiowidget.o \ moc_playlistwidget.o \ moc_mediaplayer.o \ moc_audiodevice.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 mpegplayer.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 \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ mediaplayerstate.h \ playlistwidget.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ videowidget.h \ loopcontrol.h \ mediaplayer.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerplugininterface.h loopcontrol.o: loopcontrol.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ loopcontrol.h \ videowidget.h \ audiodevice.h \ mediaplayerplugininterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h playlistselection.o: playlistselection.cpp \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/resource.h \ playlistselection.h mediaplayerstate.o: mediaplayerstate.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/config.h \ mediaplayerplugininterface.h \ mediaplayerstate.h \ libmad/libmadpluginimpl.h \ libmpeg3/libmpeg3pluginimpl.h \ wavplugin/wavpluginimpl.h videowidget.o: videowidget.cpp \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ videowidget.h \ mediaplayerplugininterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h audiowidget.o: audiowidget.cpp \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ audiowidget.h \ mediaplayerstate.h playlistwidget.o: playlistwidget.cpp \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/fileselector.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/fileselector.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/resource.h \ playlistselection.h \ playlistwidget.h \ mediaplayerstate.h mediaplayer.o: mediaplayer.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ mediaplayer.h \ mediaplayerplugininterface.h \ playlistwidget.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ loopcontrol.h \ audiodevice.h \ mediaplayerstate.h audiodevice.o: audiodevice.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ audiodevice.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h moc_loopcontrol.o: moc_loopcontrol.cpp \ loopcontrol.h moc_playlistselection.o: moc_playlistselection.cpp \ playlistselection.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/applnk.h moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ mediaplayerstate.h moc_videowidget.o: moc_videowidget.cpp \ videowidget.h moc_audiowidget.o: moc_audiowidget.cpp \ audiowidget.h moc_playlistwidget.o: moc_playlistwidget.cpp \ playlistwidget.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/applnk.h moc_mediaplayer.o: moc_mediaplayer.cpp \ mediaplayer.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerplugininterface.h moc_audiodevice.o: moc_audiodevice.cpp \ audiodevice.h moc_loopcontrol.cpp: loopcontrol.h $(MOC) loopcontrol.h -o moc_loopcontrol.cpp moc_playlistselection.cpp: playlistselection.h $(MOC) playlistselection.h -o moc_playlistselection.cpp moc_mediaplayerstate.cpp: mediaplayerstate.h $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp moc_videowidget.cpp: videowidget.h $(MOC) videowidget.h -o moc_videowidget.cpp moc_audiowidget.cpp: audiowidget.h $(MOC) audiowidget.h -o moc_audiowidget.cpp moc_playlistwidget.cpp: playlistwidget.h $(MOC) playlistwidget.h -o moc_playlistwidget.cpp moc_mediaplayer.cpp: mediaplayer.h $(MOC) mediaplayer.h -o moc_mediaplayer.cpp moc_audiodevice.cpp: audiodevice.h $(MOC) audiodevice.h -o moc_audiodevice.cpp diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro index d144f0b..bf97fbf 100644 --- a/core/multimedia/opieplayer/libflash/libflash.pro +++ b/core/multimedia/opieplayer/libflash/libflash.pro @@ -1,15 +1,15 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = libflashplugin.h libflashpluginimpl.h SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \ adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \ sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \ shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \ program.cc sound.cc text.cc TARGET = flashplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in index 9e17769..19ded26 100644 --- a/core/multimedia/opieplayer/libmad/Makefile.in +++ b/core/multimedia/opieplayer/libmad/Makefile.in @@ -1,226 +1,226 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include -I.. +CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) +INCPATH = -I$(OPIEDIR)/include -I.. LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/codecs/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = madplugin TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = libmad_version.h \ fixed.h \ bit.h \ timer.h \ stream.h \ frame.h \ synth.h \ decoder.h \ layer12.h \ layer3.h \ huffman.h \ libmad_global.h \ mad.h \ libmadplugin.h \ libmadpluginimpl.h SOURCES = version.c \ fixed.c \ bit.c \ timer.c \ stream.c \ frame.c \ synth.c \ decoder.c \ layer12.c \ layer3.c \ huffman.c \ libmadplugin.cpp \ libmadpluginimpl.cpp OBJECTS = version.o \ fixed.o \ bit.o \ timer.o \ stream.o \ frame.o \ synth.o \ decoder.o \ layer12.o \ layer3.o \ huffman.o \ libmadplugin.o \ libmadpluginimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = OBJMOC = ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake libmad.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 version.o: version.c \ libmad_global.h \ libmad_version.h fixed.o: fixed.c \ libmad_global.h \ fixed.h bit.o: bit.c \ libmad_global.h \ bit.h timer.o: timer.c \ libmad_global.h \ timer.h stream.o: stream.c \ libmad_global.h \ bit.h \ stream.h frame.o: frame.c \ libmad_global.h \ bit.h \ stream.h \ frame.h \ fixed.h \ timer.h \ layer12.h \ layer3.h synth.o: synth.c \ libmad_global.h \ fixed.h \ frame.h \ timer.h \ stream.h \ bit.h \ synth.h \ D.dat decoder.o: decoder.c \ libmad_global.h \ stream.h \ bit.h \ frame.h \ fixed.h \ timer.h \ synth.h \ decoder.h layer12.o: layer12.c \ libmad_global.h \ fixed.h \ bit.h \ stream.h \ frame.h \ timer.h \ layer12.h \ sf_table.dat \ qc_table.dat layer3.o: layer3.c \ libmad_global.h \ fixed.h \ bit.h \ stream.h \ frame.h \ timer.h \ huffman.h \ layer3.h \ rq_table.dat \ imdct_s.dat huffman.o: huffman.c \ libmad_global.h \ huffman.h libmadplugin.o: libmadplugin.cpp \ libmadplugin.h \ ../mediaplayerplugininterface.h \ mad.h libmadpluginimpl.o: libmadpluginimpl.cpp \ libmadplugin.h \ ../mediaplayerplugininterface.h \ libmadpluginimpl.h \ ../mediaplayerplugininterface.h diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index e3f75b7..6c40a15 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp TARGET = madplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lm VERSION = 1.0.0 diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index 1817902..9881815 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in @@ -1,774 +1,774 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include -I.. +CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) +INCPATH = -I$(OPIEDIR)/include -I.. LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/codecs/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = mpeg3plugin TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = libmpeg3plugin.h \ libmpeg3pluginimpl.h SOURCES = libmpeg3plugin.cpp \ libmpeg3pluginimpl.cpp \ bitstream.c \ libmpeg3.c \ mpeg3atrack.c \ mpeg3css.c \ mpeg3demux.c \ mpeg3io.c \ mpeg3title.c \ mpeg3vtrack.c \ audio/ac3.c \ audio/bit_allocation.c \ audio/dct.c \ audio/exponents.c \ audio/header.c \ audio/layer2.c \ audio/layer3.c \ audio/mantissa.c \ audio/mpeg3audio.c \ audio/pcm.c \ audio/synthesizers.c \ audio/tables.c \ video/getpicture.c \ video/headers.c \ video/idct.c \ video/macroblocks.c \ video/mmxtest.c \ video/motion.c \ video/mpeg3video.c \ video/output.c \ video/reconstruct.c \ video/seek.c \ video/slice.c \ video/vlc.c OBJECTS = libmpeg3plugin.o \ libmpeg3pluginimpl.o \ bitstream.o \ libmpeg3.o \ mpeg3atrack.o \ mpeg3css.o \ mpeg3demux.o \ mpeg3io.o \ mpeg3title.o \ mpeg3vtrack.o \ audio/ac3.o \ audio/bit_allocation.o \ audio/dct.o \ audio/exponents.o \ audio/header.o \ audio/layer2.o \ audio/layer3.o \ audio/mantissa.o \ audio/mpeg3audio.o \ audio/pcm.o \ audio/synthesizers.o \ audio/tables.o \ video/getpicture.o \ video/headers.o \ video/idct.o \ video/macroblocks.o \ video/mmxtest.o \ video/motion.o \ video/mpeg3video.o \ video/output.o \ video/reconstruct.o \ video/seek.o \ video/slice.o \ video/vlc.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = OBJMOC = ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake libmpeg3.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 libmpeg3plugin.o: libmpeg3plugin.cpp \ libmpeg3plugin.h \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h \ ../mediaplayerplugininterface.h libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ libmpeg3plugin.h \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h \ ../mediaplayerplugininterface.h \ libmpeg3pluginimpl.h \ ../mediaplayerplugininterface.h bitstream.o: bitstream.c \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h libmpeg3.o: libmpeg3.c \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h mpeg3atrack.o: mpeg3atrack.c \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h mpeg3css.o: mpeg3css.c \ mpeg3css.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h mpeg3demux.o: mpeg3demux.c \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h mpeg3io.o: mpeg3io.c \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h mpeg3title.o: mpeg3title.c \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h mpeg3vtrack.o: mpeg3vtrack.c \ libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ mpeg3protos.h audio/ac3.o: audio/ac3.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h audio/bit_allocation.o: audio/bit_allocation.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h audio/dct.o: audio/dct.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h \ audio/tables.h \ audio/fptables.h audio/exponents.o: audio/exponents.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h audio/header.o: audio/header.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/tables.h \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h audio/layer2.o: audio/layer2.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h \ audio/tables.h audio/layer3.o: audio/layer3.c \ audio/huffman.h \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h \ audio/tables.h audio/mantissa.o: audio/mantissa.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h audio/mpeg3audio.o: audio/mpeg3audio.c \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h \ audio/mpeg3audio.h \ audio/tables.h audio/pcm.o: audio/pcm.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h audio/synthesizers.o: audio/synthesizers.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h \ audio/tables.h audio/tables.o: audio/tables.c \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ mpeg3vtrack.h \ video/mpeg3video.h \ audio/../mpeg3protos.h \ audio/tables.h \ audio/fptables.h video/getpicture.o: video/getpicture.c \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h \ video/mpeg3video.h \ video/vlc.h video/headers.o: video/headers.c \ video/../mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h \ video/mpeg3video.h video/idct.o: video/idct.c \ video/idct.h video/macroblocks.o: video/macroblocks.c \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h \ video/mpeg3video.h \ video/vlc.h video/mmxtest.o: video/mmxtest.c \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h video/motion.o: video/motion.c \ video/mpeg3video.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3protos.h \ video/vlc.h video/mpeg3video.o: video/mpeg3video.c \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h \ video/mpeg3video.h \ video/mpeg3videoprotos.h video/output.o: video/output.c \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h \ video/mpeg3video.h video/reconstruct.o: video/reconstruct.c \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h \ video/mpeg3video.h video/seek.o: video/seek.c \ video/../mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h \ video/mpeg3video.h video/slice.o: video/slice.c \ audio/../libmpeg3.h \ mpeg3private.h \ mpeg3atrack.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ audio/mpeg3audio.h \ audio/ac3.h \ audio/mpeg3real.h \ audio/../bitstream.h \ mpeg3vtrack.h \ video/mpeg3video.h \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/../mpeg3protos.h \ video/mpeg3video.h \ video/mpeg3videoprotos.h video/vlc.o: video/vlc.c \ video/mpeg3video.h \ audio/../bitstream.h \ mpeg3demux.h \ mpeg3title.h \ mpeg3io.h \ mpeg3css.h \ mpeg3private.inc \ video/../mpeg3private.inc \ video/idct.h \ video/slice.h \ video/../timecode.h \ video/vlc.h diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro index e2c35d3..b1426d1 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro @@ -1,42 +1,42 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ bitstream.c \ libmpeg3.c \ mpeg3atrack.c \ mpeg3css.c \ mpeg3demux.c \ mpeg3io.c \ mpeg3title.c \ mpeg3vtrack.c \ audio/ac3.c \ audio/bit_allocation.c \ audio/dct.c \ audio/exponents.c \ audio/header.c \ audio/layer2.c \ audio/layer3.c \ audio/mantissa.c \ audio/mpeg3audio.c \ audio/pcm.c \ audio/synthesizers.c \ audio/tables.c \ video/getpicture.c \ video/headers.c \ video/idct.c \ video/macroblocks.c \ video/mmxtest.c \ video/motion.c \ video/mpeg3video.c \ video/output.c \ video/reconstruct.c \ video/seek.c \ video/slice.c \ video/vlc.c TARGET = mpeg3plugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lpthread -lm VERSION = 1.0.0 diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro index d6952f8..3b8d4b0 100644 --- a/core/multimedia/opieplayer/mpegplayer.pro +++ b/core/multimedia/opieplayer/mpegplayer.pro @@ -1,21 +1,21 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h SOURCES = main.cpp \ loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \ videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp TARGET = mpegplayer -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lpthread # INTERFACES = -# INCLUDEPATH += $(QPEDIR)/include +# INCLUDEPATH += $(OPIEDIR)/include # CONFIG+=static # TMAKE_CXXFLAGS += -DQPIM_STANDALONE # LIBS += libmpeg3/libmpeg3.a -lpthread -# LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so +# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so TRANSLATIONS = ../i18n/de/mpegplayer.ts diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in index c9203f8..e9fec6c 100644 --- a/core/multimedia/opieplayer/wavplugin/Makefile.in +++ b/core/multimedia/opieplayer/wavplugin/Makefile.in @@ -1,112 +1,112 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include -I.. +CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) +INCPATH = -I$(OPIEDIR)/include -I.. LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/codecs/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = wavplugin TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = wavplugin.h \ wavpluginimpl.h SOURCES = wavplugin.cpp \ wavpluginimpl.cpp OBJECTS = wavplugin.o \ wavpluginimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = OBJMOC = ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake wavplugin.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 wavplugin.o: wavplugin.cpp \ wavplugin.h \ ../mediaplayerplugininterface.h wavpluginimpl.o: wavpluginimpl.cpp \ wavplugin.h \ ../mediaplayerplugininterface.h \ wavpluginimpl.h \ ../mediaplayerplugininterface.h diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro index 4663813..2160431 100644 --- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro +++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro @@ -1,10 +1,10 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = wavplugin.h wavpluginimpl.h SOURCES = wavplugin.cpp wavpluginimpl.cpp TARGET = wavplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 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,244 +1,244 @@ ############################################################################# ####### 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 \ addresssettings.o \ addresssettingsbase.o INTERFACES = addresssettingsbase.ui UICDECLS = addresssettingsbase.h UICIMPLS = addresssettingsbase.cpp SRCMOC = moc_addressbook.cpp \ moc_abeditor.cpp \ moc_ablabel.cpp \ moc_abtable.cpp \ moc_addresssettings.cpp \ moc_addresssettingsbase.cpp OBJMOC = moc_addressbook.o \ moc_abeditor.o \ moc_ablabel.o \ moc_abtable.o \ moc_addresssettings.o \ moc_addresssettingsbase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 $(MOC) addresssettingsbase.h -o moc_addresssettingsbase.cpp 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,385 +1,408 @@ ############################################################################# ####### 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 \ repeatentry.cpp OBJECTS = main.o \ datebookday.o \ datebook.o \ dateentryimpl.o \ datebookdayheaderimpl.o \ datebooksettings.o \ datebookweek.o \ datebookweekheaderimpl.o \ repeatentry.o \ dateentry.o \ datebookdayheader.o \ datebooksettingsbase.o \ datebookweekheader.o \ repeatentrybase.o INTERFACES = dateentry.ui \ datebookdayheader.ui \ datebooksettingsbase.ui \ datebookweekheader.ui \ repeatentrybase.ui UICDECLS = dateentry.h \ datebookdayheader.h \ datebooksettingsbase.h \ datebookweekheader.h \ repeatentrybase.h UICIMPLS = dateentry.cpp \ datebookdayheader.cpp \ datebooksettingsbase.cpp \ datebookweekheader.cpp \ repeatentrybase.cpp SRCMOC = moc_datebookday.cpp \ moc_datebook.cpp \ moc_dateentryimpl.cpp \ moc_datebookdayheaderimpl.cpp \ moc_datebookweek.cpp \ moc_datebookweekheaderimpl.cpp \ moc_repeatentry.cpp \ moc_dateentry.cpp \ moc_datebookdayheader.cpp \ moc_datebooksettingsbase.cpp \ moc_datebookweekheader.cpp \ moc_repeatentrybase.cpp OBJMOC = moc_datebookday.o \ moc_datebook.o \ moc_dateentryimpl.o \ moc_datebookdayheaderimpl.o \ moc_datebookweek.o \ moc_datebookweekheaderimpl.o \ moc_repeatentry.o \ moc_dateentry.o \ moc_datebookdayheader.o \ moc_datebooksettingsbase.o \ moc_datebookweekheader.o \ moc_repeatentrybase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 datebook.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 \ 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 moc_datebookdayheaderimpl.cpp: datebookdayheaderimpl.h $(MOC) datebookdayheaderimpl.h -o moc_datebookdayheaderimpl.cpp moc_datebookweek.cpp: datebookweek.h $(MOC) datebookweek.h -o moc_datebookweek.cpp moc_datebookweekheaderimpl.cpp: datebookweekheaderimpl.h $(MOC) datebookweekheaderimpl.h -o moc_datebookweekheaderimpl.cpp moc_repeatentry.cpp: repeatentry.h $(MOC) repeatentry.h -o moc_repeatentry.cpp moc_dateentry.cpp: dateentry.h $(MOC) dateentry.h -o moc_dateentry.cpp moc_datebookdayheader.cpp: datebookdayheader.h $(MOC) datebookdayheader.h -o moc_datebookdayheader.cpp moc_datebooksettingsbase.cpp: datebooksettingsbase.h $(MOC) datebooksettingsbase.h -o moc_datebooksettingsbase.cpp moc_datebookweekheader.cpp: datebookweekheader.h $(MOC) datebookweekheader.h -o moc_datebookweekheader.cpp moc_repeatentrybase.cpp: repeatentrybase.h $(MOC) repeatentrybase.h -o moc_repeatentrybase.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,201 +1,203 @@ ############################################################################# ####### 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 \ moc_todotable.cpp \ moc_todoentryimpl.cpp \ moc_todoentry.cpp OBJMOC = moc_mainwindow.o \ moc_todotable.o \ moc_todoentryimpl.o \ moc_todoentry.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 todo.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 \ 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 diff --git a/core/settings/citytime/Makefile.in b/core/settings/citytime/Makefile.in index b058021..4112a68 100644 --- a/core/settings/citytime/Makefile.in +++ b/core/settings/citytime/Makefile.in @@ -1,184 +1,184 @@ ############################################################################# ####### 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 = citytime TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = citytime.h \ zonemap.h \ sun.h \ stylusnormalizer.h SOURCES = citytime.cpp \ zonemap.cpp \ main.cpp \ sun.c \ stylusnormalizer.cpp OBJECTS = citytime.o \ zonemap.o \ main.o \ sun.o \ stylusnormalizer.o \ citytimebase.o INTERFACES = citytimebase.ui UICDECLS = citytimebase.h UICIMPLS = citytimebase.cpp SRCMOC = moc_citytime.cpp \ moc_zonemap.cpp \ moc_stylusnormalizer.cpp \ moc_citytimebase.cpp OBJMOC = moc_citytime.o \ moc_zonemap.o \ moc_stylusnormalizer.o \ moc_citytimebase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 citytime.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 citytime.o: citytime.cpp \ zonemap.h \ stylusnormalizer.h \ citytime.h \ citytimebase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/tzselect.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/tzselect.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h zonemap.o: zonemap.cpp \ sun.h \ zonemap.h \ stylusnormalizer.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h main.o: main.cpp \ citytime.h \ citytimebase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h sun.o: sun.c \ sun.h \ - $(QPEDIR)/include/qpe/qmath.h + $(OPIEDIR)/include/qpe/qmath.h stylusnormalizer.o: stylusnormalizer.cpp \ stylusnormalizer.h citytimebase.h: citytimebase.ui $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h citytimebase.cpp: citytimebase.ui $(UIC) citytimebase.ui -i citytimebase.h -o citytimebase.cpp citytimebase.o: citytimebase.cpp \ citytimebase.h \ citytimebase.ui moc_citytime.o: moc_citytime.cpp \ citytime.h \ citytimebase.h moc_zonemap.o: moc_zonemap.cpp \ zonemap.h \ stylusnormalizer.h moc_stylusnormalizer.o: moc_stylusnormalizer.cpp \ stylusnormalizer.h moc_citytimebase.o: moc_citytimebase.cpp \ citytimebase.h moc_citytime.cpp: citytime.h $(MOC) citytime.h -o moc_citytime.cpp moc_zonemap.cpp: zonemap.h $(MOC) zonemap.h -o moc_zonemap.cpp moc_stylusnormalizer.cpp: stylusnormalizer.h $(MOC) stylusnormalizer.h -o moc_stylusnormalizer.cpp moc_citytimebase.cpp: citytimebase.h $(MOC) citytimebase.h -o moc_citytimebase.cpp diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro index d988b48..3420499 100644 --- a/core/settings/citytime/citytime.pro +++ b/core/settings/citytime/citytime.pro @@ -1,13 +1,13 @@ # $Id$ CONFIG += qt warn_on release TEMPLATE = app -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin INTERFACES = citytimebase.ui HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp TARGET = citytime -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/citytime.ts diff --git a/core/settings/light-and-power/Makefile.in b/core/settings/light-and-power/Makefile.in index 8236ed0..5caa249 100644 --- a/core/settings/light-and-power/Makefile.in +++ b/core/settings/light-and-power/Makefile.in @@ -1,135 +1,135 @@ ############################################################################# ####### 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 = ../../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = light-and-power TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = settings.h SOURCES = light.cpp \ main.cpp OBJECTS = light.o \ main.o \ lightsettingsbase.o INTERFACES = lightsettingsbase.ui UICDECLS = lightsettingsbase.h UICIMPLS = lightsettingsbase.cpp SRCMOC = moc_settings.cpp \ moc_lightsettingsbase.cpp OBJMOC = moc_settings.o \ moc_lightsettingsbase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 light-and-power.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 light.o: light.cpp \ settings.h \ lightsettingsbase.h main.o: main.cpp \ settings.h \ lightsettingsbase.h lightsettingsbase.h: lightsettingsbase.ui $(UIC) lightsettingsbase.ui -o $(INTERFACE_DECL_PATH)/lightsettingsbase.h lightsettingsbase.cpp: lightsettingsbase.ui $(UIC) lightsettingsbase.ui -i lightsettingsbase.h -o lightsettingsbase.cpp lightsettingsbase.o: lightsettingsbase.cpp \ lightsettingsbase.h \ lightsettingsbase.ui moc_settings.o: moc_settings.cpp \ settings.h \ lightsettingsbase.h moc_lightsettingsbase.o: moc_lightsettingsbase.cpp \ lightsettingsbase.h moc_settings.cpp: settings.h $(MOC) settings.h -o moc_settings.cpp moc_lightsettingsbase.cpp: lightsettingsbase.h $(MOC) lightsettingsbase.h -o moc_lightsettingsbase.cpp diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 87bb111..35b51a7 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = settings.h SOURCES = light.cpp main.cpp INTERFACES = lightsettingsbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = light-and-power TRANSLATIONS = ../../i18n/de/light-and-power.ts diff --git a/core/settings/security/Makefile.in b/core/settings/security/Makefile.in index 803edc5..f190e79 100644 --- a/core/settings/security/Makefile.in +++ b/core/settings/security/Makefile.in @@ -1,135 +1,135 @@ ############################################################################# ####### 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 = ../../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = security TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = security.h SOURCES = security.cpp \ main.cpp OBJECTS = security.o \ main.o \ securitybase.o INTERFACES = securitybase.ui UICDECLS = securitybase.h UICIMPLS = securitybase.cpp SRCMOC = moc_security.cpp \ moc_securitybase.cpp OBJMOC = moc_security.o \ moc_securitybase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 security.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 security.o: security.cpp \ security.h \ securitybase.h main.o: main.cpp \ security.h \ securitybase.h securitybase.h: securitybase.ui $(UIC) securitybase.ui -o $(INTERFACE_DECL_PATH)/securitybase.h securitybase.cpp: securitybase.ui $(UIC) securitybase.ui -i securitybase.h -o securitybase.cpp securitybase.o: securitybase.cpp \ securitybase.h \ securitybase.ui moc_security.o: moc_security.cpp \ security.h \ securitybase.h moc_securitybase.o: moc_securitybase.cpp \ securitybase.h moc_security.cpp: security.h $(MOC) security.h -o moc_security.cpp moc_securitybase.cpp: securitybase.h $(MOC) securitybase.h -o moc_securitybase.cpp diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index 282127e..f22e7a6 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = security.h SOURCES = security.cpp main.cpp INTERFACES = securitybase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = security TRANSLATIONS = ../../i18n/de/security.ts diff --git a/docs/qcop.doc b/docs/qcop.doc index 6fe4c71..e62f91d 100644 --- a/docs/qcop.doc +++ b/docs/qcop.doc @@ -1,179 +1,179 @@ /*! \page qcop.html \title QCop Messages QCop messages allow applications to communicate with each other. These messages are send using QCopEnvelope, and received by connecting to a QCopChannel. The <tt>channelname</tt> of channels within Qtopia all start with "QPE/". The <tt>messagename</tt> is a function identifier followed by a list of types in parentheses. There are no spaces in the message name. The variable names shown in this documentation are purely for information purposes. A message shown as "messageName(Type1 varname1, Type2 varname2, Type2 varname3)" would be used in program code as: \code QCopEnvelope e(channelname, "messageName(Type1,Type2,Type2)"); e << parameter1 << parameter2 << parameter3; \endcode The system-wide channels and messages. <dl> <dt><b>QPE/System</b> <dd> <ul> <li>busy() <br> Causes a wait indicator to be shown to the user. <li>notBusy() <br> Cancels the wait indicator. <li>linkChanged(QString) <br> Sent whenever a link is changed. It is sent by FileManager::saveFile() and others, and received by the Launcher. <li>applyStyle() <br> Sent when user changes style. It is received by QPEApplication and the application will redraw accordingly. <li>quit() <br> Terminates the Qtopia environment. <li>shutdown() <br> Terminates the system. <li>restart() <br> Restarts the Qtopia environment. <li>execute(QString) <br> Executes or raises the given application. <li>execute(QString,QString) <br> Executes or raises the given application, passing an argument. Note that you should consider using the <b>QPE/Application/<i>appname</i></b> channels described below. <li>addAlarm(QDateTime,QCString,QCString,int) <br> Internal. See AlarmServer::addAlarm() <li>deleteAlarm(QDateTime,QCString,QCString,int) <br> Internal. See AlarmServer::deleteAlarm() <li>setDefaultRotation(int) <br> Internal. <li>grabKeyboard(QString) <br> Internal. <li>timeChange(QString) <br> Internal. <li>clockChange(bool) <br> Internal. <li>setScreenSaverInterval(int) <br> Internal. <li>language(QString) <br> Internal. </ul> <dt><b>QPE/Sync</b> <ul> <li>flush() <br> Sent at the start of synchronization. Synchable applications should save any synchable data to disk. <i>Note: this message is currently asynchronous. Stay tuned to discussions regarding synchronization, as this message may become synchronous, requiring slight midification to your code. For now, just respond in a timely fashion, since the sync server merely waits a small time.</i> <li>reload() <br> Sent at the end of synchronization. Synchable applications should reload any synchable data from disk. </ul> <dt><b>QPE/TaskBar</b> <ul> <li>message(QString) <br> Internal. See Global::statusMessage() <li>showInputMethod() <br> Internal. <li>hideInputMethod() <br> Internal. <li>reloadInputMethods() <br> Internal. <li>reloadApplets() <br> Internal. </ul> <dt><b>QPE/Card</b> <ul> <li>stabChanged() <br> Sent when <tt>/var/run/stab</tt>, <tt>/var/state/pcmcia/stab</tt>, or <tt>/var/lib/pcmcia/stab</tt> may have changed. <li>netUp() <br> Sent when a network connection is running. <li>netDown() <br> Sent when a network connection is available, but not running. <li>netUnavailable() <br> Sent when a network connection is not available. </ul> <dt><b>Qt/Tray</b> This channel allows Qt applications (not just Qtopia applications) to show system-tray status in a cross-platform manner, but it is not currently supported. See TaskbarAppletInterface for a more powerful alternative for system tray applications. <ul> <li>popup(int,QPoint) <li>remove(int) <li>setIcon(int,QPixmap) <li>setToolTip(int,QString) <li>doubleClicked(int,QPoint) <li>clicked(int,QPoint) </ul> </dl> Each application listens on a channel called <b>QPE/Application/<i>appname</i></b>, where <b><i>appname</i></b> is the executable name (the application identifier). Standard messages on this channel are: <dl> <dt><b>QPE/Application/<i>appname</i></b> <ul> <li>setDocument(QString) <br>Internal. Causes the setDocument(const QString&) slot of <a href=docwidget.html>the main document widget</a> to be called. <li>nextView() <br>Applications connected to hardware buttons will receive this message if they are already visible. <li>raise() <br>Internal. Causes the the main document widget and the current modal widget to be raised. <li>quit() <br>Internal. Terminates the application. <li>quitIfInvisible() <br>Internal. Terminates the application if it is not shown. </ul> </dl> The QPE/Application/<i>appname</i> channel has a special property: when messages are sent to these channels vie QCopEnvelope, the message is delivered even if the application is not yet running (the application is run and the message is then sent). Applications also respond to messages specific to the application. Such messages in the base Qtopia applications are: <dl> <dt><b>QPE/Application/helpbrowser</b> <ul> <li>showFile(QString <i>file</i>) <br>Send this message to have the Help Browser show a file. The <i>file</i> may be an absolute filename or relative - to the system HTML documentation directory ($QPEDIR/help/html). + to the system HTML documentation directory ($OPIEDIR/help/html). </ul> <dt><b>QPE/Application/datebook</b> <ul> <li>alarm(QDateTime,int) <br>Internal. Causes the Calendar application to sound alarms. </ul> </dl> */ diff --git a/docs/start.doc b/docs/start.doc index 9745d9a..01b6ab1 100644 --- a/docs/start.doc +++ b/docs/start.doc @@ -1,191 +1,191 @@ /*! \page start.html \title Getting Started <html> <title>Qtopia - The Qt palmtop environment</title> <body> <h1><i>Qtopia</i> - The Qt palmtop environment</h1> <p> <i>Qtopia</i> is a windowing system for handheld devices. It offers developers the powerful Qt API, and provides users with fast and intuitive interaction. <h2>Developing for <i>Qtopia</i></h2> <p> The Qt API includes rich GUI functionality, and is suitable for both large and small applications. <p> Since <i>Qtopia</i> offers the complete Qt API, you can do much of your development on any of the other platforms for which Qt is available - Windows, Unix/X11, or Mac OS X. However, for optimal tailoring of your application to the smaller screen and other demands of a handheld environment, you should use the <i>Qtopia SDK</i>. <p> The <i>Qtopia SDK</i> allows you to develop <i>Qtopia</i> applications under the Linux desktop environment using the Qt Virtual Framebuffer, which completely emulates the handheld <i>Qtopia</i> environment. It also includes cross-compiler software so that you can compile your application to run on the target handheld device. If you do not already have the Qtopia SDK (this document is normally part of the SDK), contact info@trolltech.com, or see the <a href=http://www.trolltech.com>Trolltech</a> web site. <p>To build applications for the SHARP SL5000 or similar StrongARM-based devices, you will also need a StrongARM cross compiler. Entrants in the programming contest for this device will have received both the SDK and a cross-compiler. <p> The SDK includes an example program. We recommend that you compile and run this example to learn how things work, before tackling your own projects. <p> To compile the example program for running on the Linux desktop: <ol> <li> <p> Check the environment is correct: <p> <pre> - export QPEDIR=/opt/Qtopia + export OPIEDIR=/opt/Qtopia export QTDIR=/opt/Qtopia export PATH=$QTDIR/bin:$PATH export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++ export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH </pre> <li> Take a copy of the example: <pre> cd somewhere - cp -r $QPEDIR/example . + cp -r $OPIEDIR/example . cd example </pre> <li> Generate a Makefile: <pre> tmake -o Makefile example.pro </pre> <li> Build the example: <pre> make </pre> <li> Install it: <pre> su # root privileges required to install - cp example.desktop $QPEDIR/apps/Applications - cp Example.png $QPEDIR/pics - cp example $QPEDIR/bin + cp example.desktop $OPIEDIR/apps/Applications + cp Example.png $OPIEDIR/pics + cp example $OPIEDIR/bin exit # no need to be root anymore </pre> <li> To run it, first run the Qt Virtual Framebuffer: <pre> qvfb & </pre> <li> Then run the <i>Qtopia</i> environment: <pre> qpe </pre> <p> Your application should be available in the Applications tab visible inside the Qt Virtual Framebuffer window. </p> <li> If you want to distribute your applications to others, build an RPM package, e.g.: <pre> mkipks -rpm -arch i386 example.control </pre> </ol> <p> To make your own application, use the example program as a model. Make sure that when you add files to your project, you also add them to your project file (e.g. <tt>example.pro</tt>) and rerun the <tt>tmake</tt> command to update the <tt>Makefile</tt>. <p> To build you application for the SHARP SL5000 rather than just running on the desktop, the process is similar: <ol> <li> <p> Check the environment is correctly set for the SHARP SL5000: <p> <pre> - export QPEDIR=/opt/Qtopia/sharp + export OPIEDIR=/opt/Qtopia/sharp export QTDIR=/opt/Qtopia/sharp export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ </pre> <li> Build and install exactly the same as you did for the desktop (note that the generated Makefile is different): <pre> make clean tmake -o Makefile example.pro ... <i>etc.</i> </pre> <li> To install it on a device, build an ipk package file (you should be root to do this, since then it will strip the executable for you): <pre> mkipks example.control </pre> <p> The resulting <tt>example-1.0.0.ipk</tt> can be installed on the SL5000 by using <i>Qtopia Desktop</i>. </p> </ol> <h3>Building Your Own Applications</h3> Once you have built the example, you can proceed with writing your own applicatons. If you are not familiar with Qt, you should consult the Qt documentation by pointing your web browser at <a href=file:/opt/Qtopia/doc/html/index.html><tt>/opt/Qtopia/doc/html/index.html</tt></a> when you have installed the SDK, or use the online <a href=http://doc.trolltech.com/>Trolltech Documentation Site</a>. The <a href="http://www.trolltech.com/products/qt/whitepaper.html">Qt Whitepaper</a> provides a good overview of, and introduction to, the Qt API. <p> When you add more files to your application, just edit the project file (e.g. <tt>example.pro</tt>) and rerun the <tt>tmake</tt> command. <p> The <tt>.ui</tt> files are <i>Qt Designer</i> user interface files. You can create and edit these using <i>Qt Designer</i>: <pre> designer example.ui </pre> <i>Qt Designer</i>'s online documentation includes a complete tutorial. */ diff --git a/etc/init.d/qpe b/etc/init.d/qpe index 12bb1df..8791e73 100755 --- a/etc/init.d/qpe +++ b/etc/init.d/qpe @@ -1,39 +1,39 @@ #!/bin/sh # export LOGNAME=root export HOME=/$LOGNAME export QWS_DISPLAY=Transformed:Rot270:0 export QTDIR=/usr -export QPEDIR=/opt/QtPalmtop -if [ ! -x $QPEDIR/bin/qpe ] ; then exit 0 ; fi +export OPIEDIR=/opt/QtPalmtop +if [ ! -x $OPIEDIR/bin/qpe ] ; then exit 0 ; fi -$QPEDIR/bin/qpe-reorgfiles +$OPIEDIR/bin/qpe-reorgfiles . /etc/profile killproc() { pid=`/bin/ps -e | /bin/sed -n -e '/\<'$1'\>/ s/^ *\([0-9][0-9]*\).*/\1/p'` [ "$pid" != "" ] && kill $pid } case $1 in 'start') echo "Starting QPE..." cd $HOME rm -f /etc/rc2.d/S99x # Can't have both running! - $QPEDIR/bin/qpe 2>/dev/null >/dev/null & + $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & ;; 'stop') echo "Killing QPE..." killproc qpe ;; *) echo "usage: $0 { start | stop }" ;; esac diff --git a/example/example.pro b/example/example.pro index 2d89311..d150b1c 100644 --- a/example/example.pro +++ b/example/example.pro @@ -1,10 +1,10 @@ TEMPLATE = app #CONFIG = qt warn_on debug CONFIG = qt warn_on release HEADERS = example.h SOURCES = main.cpp example.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = examplebase.ui TARGET = example diff --git a/freetype/freetype.pro b/freetype/freetype.pro index 841f6d4..f63a087 100644 --- a/freetype/freetype.pro +++ b/freetype/freetype.pro @@ -1,13 +1,13 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = fontfactoryttf_qws.h freetypefactoryimpl.h SOURCES = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp qt2:HEADERS += qfontdata_p.h TARGET = freetypefactory DESTDIR = ../plugins/fontfactories -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include -#INCLUDEPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +#INCLUDEPATH += $(OPIEDIR)/include #DEPENDPATH += /usr/local/include/freetype2 LIBS += -lqpe -lfreetype VERSION = 1.0.0 diff --git a/inputmethods/handwriting/Makefile.in b/inputmethods/handwriting/Makefile.in index aabb5aa..cd2b47c 100644 --- a/inputmethods/handwriting/Makefile.in +++ b/inputmethods/handwriting/Makefile.in @@ -1,281 +1,281 @@ ############################################################################# ####### 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 +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/inputmethods/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qhandwriting TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = qimpenchar.h \ qimpenprofile.h \ qimpencombining.h \ qimpenhelp.h \ qimpeninput.h \ qimpenmatch.h \ qimpensetup.h \ qimpenstroke.h \ qimpenwidget.h \ qimpenwordpick.h \ handwritingimpl.h SOURCES = qimpenchar.cpp \ qimpenprofile.cpp \ qimpencombining.cpp \ qimpenhelp.cpp \ qimpeninput.cpp \ qimpenmatch.cpp \ qimpensetup.cpp \ qimpenstroke.cpp \ qimpenwidget.cpp \ qimpenwordpick.cpp \ handwritingimpl.cpp OBJECTS = qimpenchar.o \ qimpenprofile.o \ qimpencombining.o \ qimpenhelp.o \ qimpeninput.o \ qimpenmatch.o \ qimpensetup.o \ qimpenstroke.o \ qimpenwidget.o \ qimpenwordpick.o \ handwritingimpl.o \ qimpenprefbase.o INTERFACES = qimpenprefbase.ui UICDECLS = qimpenprefbase.h UICIMPLS = qimpenprefbase.cpp SRCMOC = moc_qimpenhelp.cpp \ moc_qimpeninput.cpp \ moc_qimpenmatch.cpp \ moc_qimpensetup.cpp \ moc_qimpenwidget.cpp \ moc_qimpenwordpick.cpp \ moc_qimpenprefbase.cpp OBJMOC = moc_qimpenhelp.o \ moc_qimpeninput.o \ moc_qimpenmatch.o \ moc_qimpensetup.o \ moc_qimpenwidget.o \ moc_qimpenwordpick.o \ moc_qimpenprefbase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake handwriting.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 qimpenchar.o: qimpenchar.cpp \ qimpencombining.h \ qimpenchar.h \ qimpenstroke.h qimpenprofile.o: qimpenprofile.cpp \ qimpencombining.h \ qimpenchar.h \ qimpenstroke.h \ qimpenprofile.h qimpencombining.o: qimpencombining.cpp \ qimpencombining.h \ qimpenchar.h \ qimpenstroke.h qimpenhelp.o: qimpenhelp.cpp \ qimpenwidget.h \ qimpenchar.h \ qimpenstroke.h \ qimpencombining.h \ qimpenmatch.h \ qimpenhelp.h \ qimpenprofile.h qimpeninput.o: qimpeninput.cpp \ qimpenwidget.h \ qimpenchar.h \ qimpenstroke.h \ qimpensetup.h \ qimpenprofile.h \ qimpeninput.h \ qimpencombining.h \ qimpenwordpick.h \ qimpenmatch.h \ qimpenhelp.h qimpenmatch.o: qimpenmatch.cpp \ qimpenmatch.h \ qimpenchar.h \ qimpenstroke.h qimpensetup.o: qimpensetup.cpp \ qimpenwidget.h \ qimpenchar.h \ qimpenstroke.h \ qimpenprefbase.h \ qimpensetup.h \ qimpenprofile.h qimpenstroke.o: qimpenstroke.cpp \ qimpenstroke.h qimpenwidget.o: qimpenwidget.cpp \ qimpenchar.h \ qimpenstroke.h \ qimpenwidget.h qimpenwordpick.o: qimpenwordpick.cpp \ qimpenwordpick.h \ qimpenmatch.h \ qimpenchar.h \ qimpenstroke.h handwritingimpl.o: handwritingimpl.cpp \ qimpeninput.h \ qimpenprofile.h \ qimpenchar.h \ qimpenstroke.h \ handwritingimpl.h qimpenprefbase.h: qimpenprefbase.ui $(UIC) qimpenprefbase.ui -o $(INTERFACE_DECL_PATH)/qimpenprefbase.h qimpenprefbase.cpp: qimpenprefbase.ui $(UIC) qimpenprefbase.ui -i qimpenprefbase.h -o qimpenprefbase.cpp qimpenprefbase.o: qimpenprefbase.cpp \ qimpenprefbase.h \ qimpenprefbase.ui moc_qimpenhelp.o: moc_qimpenhelp.cpp \ qimpenhelp.h \ qimpenchar.h \ qimpenstroke.h \ qimpenprofile.h moc_qimpeninput.o: moc_qimpeninput.cpp \ qimpeninput.h \ qimpenprofile.h \ qimpenchar.h \ qimpenstroke.h moc_qimpenmatch.o: moc_qimpenmatch.cpp \ qimpenmatch.h \ qimpenchar.h \ qimpenstroke.h moc_qimpensetup.o: moc_qimpensetup.cpp \ qimpensetup.h \ qimpenprofile.h \ qimpenchar.h \ qimpenstroke.h moc_qimpenwidget.o: moc_qimpenwidget.cpp \ qimpenwidget.h \ qimpenchar.h \ qimpenstroke.h moc_qimpenwordpick.o: moc_qimpenwordpick.cpp \ qimpenwordpick.h \ qimpenmatch.h \ qimpenchar.h \ qimpenstroke.h moc_qimpenprefbase.o: moc_qimpenprefbase.cpp \ qimpenprefbase.h moc_qimpenhelp.cpp: qimpenhelp.h $(MOC) qimpenhelp.h -o moc_qimpenhelp.cpp moc_qimpeninput.cpp: qimpeninput.h $(MOC) qimpeninput.h -o moc_qimpeninput.cpp moc_qimpenmatch.cpp: qimpenmatch.h $(MOC) qimpenmatch.h -o moc_qimpenmatch.cpp moc_qimpensetup.cpp: qimpensetup.h $(MOC) qimpensetup.h -o moc_qimpensetup.cpp moc_qimpenwidget.cpp: qimpenwidget.h $(MOC) qimpenwidget.h -o moc_qimpenwidget.cpp moc_qimpenwordpick.cpp: qimpenwordpick.h $(MOC) qimpenwordpick.h -o moc_qimpenwordpick.cpp moc_qimpenprefbase.cpp: qimpenprefbase.h $(MOC) qimpenprefbase.h -o moc_qimpenprefbase.cpp diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro index 999552b..9bccbb9 100644 --- a/inputmethods/handwriting/handwriting.pro +++ b/inputmethods/handwriting/handwriting.pro @@ -1,33 +1,33 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = qimpenchar.h \ qimpenprofile.h \ qimpencombining.h \ qimpenhelp.h \ qimpeninput.h \ qimpenmatch.h \ qimpensetup.h \ qimpenstroke.h \ qimpenwidget.h \ qimpenwordpick.h \ handwritingimpl.h SOURCES = qimpenchar.cpp \ qimpenprofile.cpp \ qimpencombining.cpp \ qimpenhelp.cpp \ qimpeninput.cpp \ qimpenmatch.cpp \ qimpensetup.cpp \ qimpenstroke.cpp \ qimpenwidget.cpp \ qimpenwordpick.cpp \ handwritingimpl.cpp INTERFACES = qimpenprefbase.ui TARGET = qhandwriting DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqhandwriting.ts diff --git a/inputmethods/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in index 3631807..16fdcb7 100644 --- a/inputmethods/keyboard/Makefile.in +++ b/inputmethods/keyboard/Makefile.in @@ -1,151 +1,151 @@ ############################################################################# ####### 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 +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/inputmethods/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qkeyboard TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = keyboard.h \ ../pickboard/pickboardcfg.h \ ../pickboard/pickboardpicks.h \ keyboardimpl.h SOURCES = keyboard.cpp \ ../pickboard/pickboardcfg.cpp \ ../pickboard/pickboardpicks.cpp \ keyboardimpl.cpp OBJECTS = keyboard.o \ ../pickboard/pickboardcfg.o \ ../pickboard/pickboardpicks.o \ keyboardimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_keyboard.cpp \ ../pickboard/moc_pickboardcfg.cpp \ ../pickboard/moc_pickboardpicks.cpp OBJMOC = moc_keyboard.o \ ../pickboard/moc_pickboardcfg.o \ ../pickboard/moc_pickboardpicks.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake keyboard.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 keyboard.o: keyboard.cpp \ keyboard.h \ ../pickboard/pickboardcfg.h \ ../pickboard/pickboardpicks.h ../pickboard/pickboardcfg.o: ../pickboard/pickboardcfg.cpp \ ../pickboard/pickboardcfg.h \ ../pickboard/pickboardpicks.h ../pickboard/pickboardpicks.o: ../pickboard/pickboardpicks.cpp \ ../pickboard/pickboardpicks.h \ ../pickboard/pickboardcfg.h keyboardimpl.o: keyboardimpl.cpp \ keyboard.h \ ../pickboard/pickboardcfg.h \ ../pickboard/pickboardpicks.h \ keyboardimpl.h moc_keyboard.o: moc_keyboard.cpp \ keyboard.h \ ../pickboard/pickboardcfg.h \ ../pickboard/pickboardpicks.h ../pickboard/moc_pickboardcfg.o: ../pickboard/moc_pickboardcfg.cpp \ ../pickboard/pickboardcfg.h ../pickboard/moc_pickboardpicks.o: ../pickboard/moc_pickboardpicks.cpp \ ../pickboard/pickboardpicks.h moc_keyboard.cpp: keyboard.h $(MOC) keyboard.h -o moc_keyboard.cpp ../pickboard/moc_pickboardcfg.cpp: ../pickboard/pickboardcfg.h $(MOC) ../pickboard/pickboardcfg.h -o ../pickboard/moc_pickboardcfg.cpp ../pickboard/moc_pickboardpicks.cpp: ../pickboard/pickboardpicks.h $(MOC) ../pickboard/pickboardpicks.h -o ../pickboard/moc_pickboardpicks.cpp diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro index 87c838e..6e9df79 100644 --- a/inputmethods/keyboard/keyboard.pro +++ b/inputmethods/keyboard/keyboard.pro @@ -1,18 +1,18 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = keyboard.h \ ../pickboard/pickboardcfg.h \ ../pickboard/pickboardpicks.h \ keyboardimpl.h SOURCES = keyboard.cpp \ ../pickboard/pickboardcfg.cpp \ ../pickboard/pickboardpicks.cpp \ keyboardimpl.cpp TARGET = qkeyboard DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqkeyboard.ts diff --git a/inputmethods/pickboard/Makefile.in b/inputmethods/pickboard/Makefile.in index d72e82d..44310a4 100644 --- a/inputmethods/pickboard/Makefile.in +++ b/inputmethods/pickboard/Makefile.in @@ -1,147 +1,147 @@ ############################################################################# ####### 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 +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/inputmethods/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qpickboard TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = pickboard.h \ pickboardcfg.h \ pickboardimpl.h \ pickboardpicks.h SOURCES = pickboard.cpp \ pickboardcfg.cpp \ pickboardimpl.cpp \ pickboardpicks.cpp OBJECTS = pickboard.o \ pickboardcfg.o \ pickboardimpl.o \ pickboardpicks.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_pickboard.cpp \ moc_pickboardcfg.cpp \ moc_pickboardpicks.cpp OBJMOC = moc_pickboard.o \ moc_pickboardcfg.o \ moc_pickboardpicks.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake pickboard.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 pickboard.o: pickboard.cpp \ pickboard.h \ pickboardpicks.h \ pickboardcfg.h pickboardcfg.o: pickboardcfg.cpp \ pickboardcfg.h \ pickboardpicks.h pickboardimpl.o: pickboardimpl.cpp \ pickboard.h \ pickboardimpl.h pickboardpicks.o: pickboardpicks.cpp \ pickboardpicks.h \ pickboardcfg.h moc_pickboard.o: moc_pickboard.cpp \ pickboard.h moc_pickboardcfg.o: moc_pickboardcfg.cpp \ pickboardcfg.h moc_pickboardpicks.o: moc_pickboardpicks.cpp \ pickboardpicks.h moc_pickboard.cpp: pickboard.h $(MOC) pickboard.h -o moc_pickboard.cpp moc_pickboardcfg.cpp: pickboardcfg.h $(MOC) pickboardcfg.h -o moc_pickboardcfg.cpp moc_pickboardpicks.cpp: pickboardpicks.h $(MOC) pickboardpicks.h -o moc_pickboardpicks.cpp diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro index 50bc342..ad86370 100644 --- a/inputmethods/pickboard/pickboard.pro +++ b/inputmethods/pickboard/pickboard.pro @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h SOURCES = pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp TARGET = qpickboard DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqpickboard.ts diff --git a/inputmethods/unikeyboard/Makefile.in b/inputmethods/unikeyboard/Makefile.in index ebbab50..f64d6c8 100644 --- a/inputmethods/unikeyboard/Makefile.in +++ b/inputmethods/unikeyboard/Makefile.in @@ -1,115 +1,115 @@ ############################################################################# ####### 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 +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/inputmethods/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qunikeyboard TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = unikeyboard.h \ unikeyboardimpl.h SOURCES = unikeyboard.cpp \ unikeyboardimpl.cpp OBJECTS = unikeyboard.o \ unikeyboardimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_unikeyboard.cpp OBJMOC = moc_unikeyboard.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake unikeyboard.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 unikeyboard.o: unikeyboard.cpp \ unikeyboard.h unikeyboardimpl.o: unikeyboardimpl.cpp \ unikeyboard.h \ unikeyboardimpl.h moc_unikeyboard.o: moc_unikeyboard.cpp \ unikeyboard.h moc_unikeyboard.cpp: unikeyboard.h $(MOC) unikeyboard.h -o moc_unikeyboard.cpp diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro index c0aad42..509db07 100644 --- a/inputmethods/unikeyboard/unikeyboard.pro +++ b/inputmethods/unikeyboard/unikeyboard.pro @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = unikeyboard.h unikeyboardimpl.h SOURCES = unikeyboard.cpp unikeyboardimpl.cpp TARGET = qunikeyboard DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts diff --git a/library/Makefile.in b/library/Makefile.in index c89390f..b74b818 100644 --- a/library/Makefile.in +++ b/library/Makefile.in @@ -1,905 +1,903 @@ ############################################################################# ####### 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 TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = calendar.h \ global.h \ resource.h \ xmlreader.h \ mimetype.h \ menubutton.h \ network.h \ networkinterface.h \ proxies.h \ filemanager.h \ fontmanager.h \ qdawg.h \ datebookmonth.h \ fileselector.h \ imageedit.h \ qcopenvelope_qws.h \ qpedecoration_qws.h \ qpeapplication.h \ qpestyle.h \ qpedialog.h \ lightstyle.h \ config.h \ applnk.h \ sound.h \ tzselect.h \ qmath.h \ datebookdb.h \ alarmserver.h \ process.h \ password.h \ timestring.h \ fontfactoryinterface.h \ fontdatabase.h \ power.h \ storage.h \ qpemessagebox.h \ backend/timeconversion.h \ qpedebug.h \ qpemenubar.h \ qpetoolbar.h \ backend/categories.h \ backend/stringutil.h \ backend/palmtopuid.h \ backend/palmtoprecord.h \ backend/task.h \ backend/event.h \ backend/contact.h \ categorymenu.h \ categoryedit_p.h \ categoryselect.h \ categorywidget.h \ ir.h \ backend/vobject_p.h \ findwidget_p.h \ finddialog.h \ lnkproperties.h \ quuid.h \ qcom.h \ qlibrary.h \ qlibrary_p.h \ qprocess.h SOURCES = calendar.cpp \ global.cpp \ xmlreader.cpp \ mimetype.cpp \ menubutton.cpp \ network.cpp \ networkinterface.cpp \ proxies.cpp \ filemanager.cpp \ fontmanager.cpp \ qdawg.cpp \ datebookmonth.cpp \ fileselector.cpp \ imageedit.cpp \ resource.cpp \ qpedecoration_qws.cpp \ qcopenvelope_qws.cpp \ qpeapplication.cpp \ qpestyle.cpp \ qpedialog.cpp \ lightstyle.cpp \ config.cpp \ applnk.cpp \ sound.cpp \ tzselect.cpp \ qmath.c \ datebookdb.cpp \ alarmserver.cpp \ password.cpp \ process.cpp \ process_unix.cpp \ timestring.cpp \ fontdatabase.cpp \ power.cpp \ storage.cpp \ qpemessagebox.cpp \ backend/timeconversion.cpp \ qpedebug.cpp \ qpemenubar.cpp \ qpetoolbar.cpp \ backend/categories.cpp \ backend/stringutil.cpp \ backend/palmtoprecord.cpp \ backend/task.cpp \ backend/event.cpp \ backend/contact.cpp \ categorymenu.cpp \ categoryedit_p.cpp \ categoryselect.cpp \ categorywidget.cpp \ ir.cpp \ backend/vcc_yacc.cpp \ backend/vobject.cpp \ findwidget_p.cpp \ finddialog.cpp \ lnkproperties.cpp \ quuid.cpp \ qlibrary.cpp \ qlibrary_unix.cpp \ qprocess.cpp \ qprocess_unix.cpp OBJECTS = calendar.o \ global.o \ xmlreader.o \ mimetype.o \ menubutton.o \ network.o \ networkinterface.o \ proxies.o \ filemanager.o \ fontmanager.o \ qdawg.o \ datebookmonth.o \ fileselector.o \ imageedit.o \ resource.o \ qpedecoration_qws.o \ qcopenvelope_qws.o \ qpeapplication.o \ qpestyle.o \ qpedialog.o \ lightstyle.o \ config.o \ applnk.o \ sound.o \ tzselect.o \ qmath.o \ datebookdb.o \ alarmserver.o \ password.o \ process.o \ process_unix.o \ timestring.o \ fontdatabase.o \ power.o \ storage.o \ qpemessagebox.o \ backend/timeconversion.o \ qpedebug.o \ qpemenubar.o \ qpetoolbar.o \ backend/categories.o \ backend/stringutil.o \ backend/palmtoprecord.o \ backend/task.o \ backend/event.o \ backend/contact.o \ categorymenu.o \ categoryedit_p.o \ categoryselect.o \ categorywidget.o \ ir.o \ backend/vcc_yacc.o \ backend/vobject.o \ findwidget_p.o \ finddialog.o \ lnkproperties.o \ quuid.o \ qlibrary.o \ qlibrary_unix.o \ qprocess.o \ qprocess_unix.o \ passwordbase_p.o \ proxiesbase_p.o \ categoryeditbase_p.o \ findwidgetbase_p.o \ lnkpropertiesbase_p.o INTERFACES = passwordbase_p.ui \ proxiesbase_p.ui \ categoryeditbase_p.ui \ findwidgetbase_p.ui \ lnkpropertiesbase_p.ui UICDECLS = passwordbase_p.h \ proxiesbase_p.h \ categoryeditbase_p.h \ findwidgetbase_p.h \ lnkpropertiesbase_p.h UICIMPLS = passwordbase_p.cpp \ proxiesbase_p.cpp \ categoryeditbase_p.cpp \ findwidgetbase_p.cpp \ lnkpropertiesbase_p.cpp SRCMOC = moc_menubutton.cpp \ moc_proxies.cpp \ moc_datebookmonth.cpp \ moc_fileselector.cpp \ moc_imageedit.cpp \ moc_qpedecoration_qws.cpp \ moc_qpeapplication.cpp \ moc_qpedialog.cpp \ moc_tzselect.cpp \ moc_process.cpp \ moc_storage.cpp \ moc_qpemenubar.cpp \ moc_qpetoolbar.cpp \ backend/moc_categories.cpp \ moc_categorymenu.cpp \ moc_categoryedit_p.cpp \ moc_categoryselect.cpp \ moc_ir.cpp \ moc_findwidget_p.cpp \ moc_finddialog.cpp \ moc_lnkproperties.cpp \ moc_qlibrary_p.cpp \ moc_qprocess.cpp \ global.moc \ network.moc \ password.moc \ process_unix.moc \ timestring.moc \ qprocess_unix.moc \ moc_passwordbase_p.cpp \ moc_proxiesbase_p.cpp \ moc_categoryeditbase_p.cpp \ moc_findwidgetbase_p.cpp \ moc_lnkpropertiesbase_p.cpp OBJMOC = moc_menubutton.o \ moc_proxies.o \ moc_datebookmonth.o \ moc_fileselector.o \ moc_imageedit.o \ moc_qpedecoration_qws.o \ moc_qpeapplication.o \ moc_qpedialog.o \ moc_tzselect.o \ moc_process.o \ moc_storage.o \ moc_qpemenubar.o \ moc_qpetoolbar.o \ backend/moc_categories.o \ moc_categorymenu.o \ moc_categoryedit_p.o \ moc_categoryselect.o \ moc_ir.o \ moc_findwidget_p.o \ moc_finddialog.o \ moc_lnkproperties.o \ moc_qlibrary_p.o \ moc_qprocess.o \ moc_passwordbase_p.o \ moc_proxiesbase_p.o \ moc_categoryeditbase_p.o \ moc_findwidgetbase_p.o \ moc_lnkpropertiesbase_p.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake library.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 calendar.o: calendar.cpp \ calendar.h global.o: global.cpp \ global.moc xmlreader.o: xmlreader.cpp \ xmlreader.h mimetype.o: mimetype.cpp \ mimetype.h \ applnk.h \ resource.h \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h menubutton.o: menubutton.cpp \ menubutton.h network.o: network.cpp \ network.moc networkinterface.o: networkinterface.cpp \ networkinterface.h \ network.h \ config.h proxies.o: proxies.cpp \ proxies.h \ config.h \ proxiesbase_p.h filemanager.o: filemanager.cpp \ filemanager.h \ applnk.h fontmanager.o: fontmanager.cpp \ fontmanager.h qdawg.o: qdawg.cpp \ qdawg.h datebookmonth.o: datebookmonth.cpp \ config.h \ datebookmonth.h \ calendar.h \ timestring.h \ datebookdb.h \ resource.h \ qpeapplication.h \ qpedecoration_qws.h fileselector.o: fileselector.cpp \ fileselector.h \ filemanager.h \ applnk.h \ global.h \ resource.h \ config.h \ storage.h \ qpemenubar.h \ lnkproperties.h \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h \ categorymenu.h imageedit.o: imageedit.cpp \ imageedit.h resource.o: resource.cpp \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h \ resource.h \ inlinepics_p.h qpedecoration_qws.o: qpedecoration_qws.cpp \ qcopenvelope_qws.h \ qpedecoration_qws.h \ qpeapplication.h \ timestring.h \ resource.h \ global.h qcopenvelope_qws.o: qcopenvelope_qws.cpp \ qcopenvelope_qws.h \ global.h qpeapplication.o: qpeapplication.cpp \ qcopenvelope_qws.h \ 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 lightstyle.o: lightstyle.cpp \ lightstyle.h config.o: config.cpp \ config.h applnk.o: applnk.cpp \ applnk.h sound.o: sound.cpp tzselect.o: tzselect.cpp \ tzselect.h \ resource.h \ global.h \ config.h qmath.o: qmath.c \ qmath.h datebookdb.o: datebookdb.cpp \ datebookdb.h alarmserver.o: alarmserver.cpp \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h \ global.h \ resource.h \ qcopenvelope_qws.h \ alarmserver.h password.o: password.cpp \ password.moc \ password.h \ config.h \ global.h \ backend/contact.h \ passwordbase_p.h process.o: process.cpp \ process.h process_unix.o: process_unix.cpp \ process_unix.moc \ process.h timestring.o: timestring.cpp \ timestring.moc \ timestring.h \ 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 qpemenubar.o: qpemenubar.cpp \ qpemenubar.h qpetoolbar.o: qpetoolbar.cpp \ qpetoolbar.h \ qpemenubar.h backend/categories.o: backend/categories.cpp \ backend/categories.h \ backend/qpcglobal.h \ backend/palmtopuidgen.h \ backend/stringutil.h backend/stringutil.o: backend/stringutil.cpp \ backend/stringutil.h \ backend/qpcglobal.h backend/palmtoprecord.o: backend/palmtoprecord.cpp \ backend/palmtoprecord.h \ backend/qpcglobal.h \ backend/palmtopuidgen.h \ backend/stringutil.h backend/task.o: backend/task.cpp \ backend/vobject_p.h \ backend/timeconversion.h \ backend/qfiledirect_p.h backend/event.o: backend/event.cpp \ backend/event.h \ backend/qfiledirect_p.h \ backend/vobject_p.h backend/contact.o: backend/contact.cpp \ backend/contact.h \ backend/vobject_p.h \ backend/qfiledirect_p.h categorymenu.o: categorymenu.cpp \ categorymenu.h \ backend/categories.h \ backend/qpcglobal.h \ backend/palmtopuidgen.h \ categoryselect.h categoryedit_p.o: categoryedit_p.cpp \ categoryedit_p.h \ categoryeditbase_p.h categoryselect.o: categoryselect.cpp \ categorywidget.h \ categoryselect.h 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 \ findwidgetbase_p.h lnkproperties.o: lnkproperties.cpp \ lnkproperties.h \ lnkpropertiesbase_p.h \ ir.h quuid.o: quuid.cpp \ quuid.h qlibrary.o: qlibrary.cpp \ qlibrary_p.h \ qlibrary.h qlibrary_unix.o: qlibrary_unix.cpp \ qlibrary_p.h \ qlibrary.h qprocess.o: qprocess.cpp \ qprocess.h qprocess_unix.o: qprocess_unix.cpp \ qprocess_unix.moc \ qprocess.h \ qcleanuphandler_p.h passwordbase_p.h: passwordbase_p.ui $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h passwordbase_p.cpp: passwordbase_p.ui $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp proxiesbase_p.h: proxiesbase_p.ui $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h proxiesbase_p.cpp: proxiesbase_p.ui $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp categoryeditbase_p.h: categoryeditbase_p.ui $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h categoryeditbase_p.cpp: categoryeditbase_p.ui $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp 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 moc_fileselector.o: moc_fileselector.cpp \ fileselector.h \ filemanager.h \ applnk.h moc_imageedit.o: moc_imageedit.cpp \ imageedit.h moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ qpedecoration_qws.h moc_qpeapplication.o: moc_qpeapplication.cpp \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h moc_qpedialog.o: moc_qpedialog.cpp \ qpedialog.h moc_tzselect.o: moc_tzselect.cpp \ tzselect.h moc_process.o: moc_process.cpp \ process.h moc_storage.o: moc_storage.cpp \ storage.h moc_qpemenubar.o: moc_qpemenubar.cpp \ qpemenubar.h moc_qpetoolbar.o: moc_qpetoolbar.cpp \ qpetoolbar.h backend/moc_categories.o: backend/moc_categories.cpp \ backend/categories.h \ backend/qpcglobal.h \ backend/palmtopuidgen.h moc_categorymenu.o: moc_categorymenu.cpp \ categorymenu.h moc_categoryedit_p.o: moc_categoryedit_p.cpp \ categoryedit_p.h \ categoryeditbase_p.h moc_categoryselect.o: moc_categoryselect.cpp \ categoryselect.h moc_ir.o: moc_ir.cpp \ ir.h moc_findwidget_p.o: moc_findwidget_p.cpp \ findwidget_p.h \ findwidgetbase_p.h moc_finddialog.o: moc_finddialog.cpp \ finddialog.h moc_lnkproperties.o: moc_lnkproperties.cpp \ lnkproperties.h moc_qlibrary_p.o: moc_qlibrary_p.cpp \ qlibrary_p.h \ qlibrary.h moc_qprocess.o: moc_qprocess.cpp \ qprocess.h moc_passwordbase_p.o: global.moc \ global.cpp moc_proxiesbase_p.o: network.moc \ network.cpp moc_categoryeditbase_p.o: password.moc \ password.cpp \ password.h \ config.h \ global.h \ backend/contact.h \ passwordbase_p.h moc_findwidgetbase_p.o: process_unix.moc \ process_unix.cpp \ process.h moc_lnkpropertiesbase_p.o: timestring.moc \ timestring.cpp \ timestring.h \ qpeapplication.h \ qpedecoration_qws.h \ config.h moc_menubutton.cpp: menubutton.h $(MOC) menubutton.h -o moc_menubutton.cpp moc_proxies.cpp: proxies.h $(MOC) proxies.h -o moc_proxies.cpp moc_datebookmonth.cpp: datebookmonth.h $(MOC) datebookmonth.h -o moc_datebookmonth.cpp moc_fileselector.cpp: fileselector.h $(MOC) fileselector.h -o moc_fileselector.cpp moc_imageedit.cpp: imageedit.h $(MOC) imageedit.h -o moc_imageedit.cpp moc_qpedecoration_qws.cpp: qpedecoration_qws.h $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp moc_qpeapplication.cpp: qpeapplication.h $(MOC) qpeapplication.h -o moc_qpeapplication.cpp moc_qpedialog.cpp: qpedialog.h $(MOC) qpedialog.h -o moc_qpedialog.cpp moc_tzselect.cpp: tzselect.h $(MOC) tzselect.h -o moc_tzselect.cpp moc_process.cpp: process.h $(MOC) process.h -o moc_process.cpp moc_storage.cpp: storage.h $(MOC) storage.h -o moc_storage.cpp moc_qpemenubar.cpp: qpemenubar.h $(MOC) qpemenubar.h -o moc_qpemenubar.cpp moc_qpetoolbar.cpp: qpetoolbar.h $(MOC) qpetoolbar.h -o moc_qpetoolbar.cpp backend/moc_categories.cpp: backend/categories.h $(MOC) backend/categories.h -o backend/moc_categories.cpp moc_categorymenu.cpp: categorymenu.h $(MOC) categorymenu.h -o moc_categorymenu.cpp moc_categoryedit_p.cpp: categoryedit_p.h $(MOC) categoryedit_p.h -o moc_categoryedit_p.cpp moc_categoryselect.cpp: categoryselect.h $(MOC) categoryselect.h -o moc_categoryselect.cpp moc_ir.cpp: ir.h $(MOC) ir.h -o moc_ir.cpp moc_findwidget_p.cpp: findwidget_p.h $(MOC) findwidget_p.h -o moc_findwidget_p.cpp moc_finddialog.cpp: finddialog.h $(MOC) finddialog.h -o moc_finddialog.cpp moc_lnkproperties.cpp: lnkproperties.h $(MOC) lnkproperties.h -o moc_lnkproperties.cpp moc_qlibrary_p.cpp: qlibrary_p.h $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp moc_qprocess.cpp: qprocess.h $(MOC) qprocess.h -o moc_qprocess.cpp global.moc: global.cpp $(MOC) global.cpp -o global.moc network.moc: network.cpp $(MOC) network.cpp -o network.moc password.moc: password.cpp $(MOC) password.cpp -o password.moc process_unix.moc: process_unix.cpp $(MOC) process_unix.cpp -o process_unix.moc timestring.moc: timestring.cpp $(MOC) timestring.cpp -o timestring.moc qprocess_unix.moc: qprocess_unix.cpp $(MOC) qprocess_unix.cpp -o qprocess_unix.moc moc_passwordbase_p.cpp: passwordbase_p.h $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp moc_proxiesbase_p.cpp: proxiesbase_p.h $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp moc_categoryeditbase_p.cpp: categoryeditbase_p.h $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp moc_findwidgetbase_p.cpp: findwidgetbase_p.h $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp diff --git a/library/global.cpp b/library/global.cpp index e1bbf3e..e5fc2b3 100644 --- a/library/global.cpp +++ b/library/global.cpp @@ -1,644 +1,644 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include <qpe/qpedebug.h> #include <qpe/global.h> #include <qpe/qdawg.h> #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qpe/storage.h> #include <qpe/applnk.h> #if defined(Q_WS_QWS) && !defined(QT_NO_COP) #include "qpe/qcopenvelope_qws.h" #endif #include <qfile.h> #include <qlabel.h> #include <qtimer.h> #include <qmap.h> #include <qdict.h> #include <qdir.h> #include <qmessagebox.h> #include <qregexp.h> #include <stdlib.h> #include <sys/stat.h> #include <sys/wait.h> #include <sys/types.h> #include <fcntl.h> #include <unistd.h> #include <qwindowsystem_qws.h> // for qwsServer #include <qdatetime.h> //#include "quickexec_p.h" class Emitter : public QObject { Q_OBJECT public: Emitter( QWidget* receiver, const QString& document ) { connect(this, SIGNAL(setDocument(const QString&)), receiver, SLOT(setDocument(const QString&))); emit setDocument(document); disconnect(this, SIGNAL(setDocument(const QString&)), receiver, SLOT(setDocument(const QString&))); } signals: void setDocument(const QString&); }; class StartingAppList : public QObject { Q_OBJECT public: static void add( const QString& name ); static bool isStarting( const QString name ); private slots: void handleNewChannel( const QString &); private: StartingAppList( QObject *parent=0, const char* name=0 ) ; QDict<QTime> dict; static StartingAppList *appl; }; StartingAppList* StartingAppList::appl = 0; StartingAppList::StartingAppList( QObject *parent, const char* name ) :QObject( parent, name ) { #if QT_VERSION >= 232 && !defined(QT_NO_COP) connect( qwsServer, SIGNAL( newChannel(const QString&)), this, SLOT( handleNewChannel(const QString&)) ); dict.setAutoDelete( TRUE ); #endif } void StartingAppList::add( const QString& name ) { #if QT_VERSION >= 232 && !defined(QT_NO_COP) if ( !appl ) appl = new StartingAppList; QTime *t = new QTime; t->start(); appl->dict.insert( "QPE/Application/" + name, t ); #endif } bool StartingAppList::isStarting( const QString name ) { #if QT_VERSION >= 232 && !defined(QT_NO_COP) if ( appl ) { QTime *t = appl->dict.find( "QPE/Application/" + name ); if ( !t ) return FALSE; if ( t->elapsed() > 10000 ) { // timeout in case of crash or something appl->dict.remove( "QPE/Application/" + name ); return FALSE; } return TRUE; } #endif return FALSE; } 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. */ /*! \internal */ Global::Global() { } /*! Returns the unchangeable QDawg that contains general words for the current locale. \sa addedDawg() */ const QDawg& Global::fixedDawg() { if ( !fixed_dawg ) { if ( !docDirCreated ) createDocDir(); fixed_dawg = new QDawg; QString dawgfilename = dictDir() + "/dawg"; QString lang = getenv( "LANG" ); QString dawgfilename_lang = dawgfilename + "." + lang; QString words_lang = dictDir() + "/words." + lang; if ( QFile::exists(dawgfilename_lang) || QFile::exists(words_lang) ) dawgfilename = dawgfilename_lang; QFile dawgfile(dawgfilename); if ( !dawgfile.exists() ) { QString fn = dictDir() + "/words"; if ( QFile::exists(words_lang) ) fn = words_lang; QFile in(fn); if ( in.open(IO_ReadOnly) ) { fixed_dawg->createFromWords(&in); dawgfile.open(IO_WriteOnly); fixed_dawg->write(&dawgfile); dawgfile.close(); } } else { fixed_dawg->readFile(dawgfilename); } } return *fixed_dawg; } /*! Returns the changeable QDawg that contains general words for the current locale. \sa fixedDawg() */ const QDawg& Global::addedDawg() { return dawg("local"); } /*! Returns the QDawg with the given \a name. This is an application-specific word list. \a name should not contain "/". */ const QDawg& Global::dawg(const QString& name) { createDocDir(); if ( !named_dawg ) named_dawg = new QDict<QDawg>; QDawg* r = named_dawg->find(name); if ( !r ) { r = new QDawg; named_dawg->insert(name,r); QString dawgfilename = dictDir() + "/" + name + ".dawg"; QFile dawgfile(dawgfilename); if ( dawgfile.open(IO_ReadOnly) ) r->readFile(dawgfilename); } return *r; } /*! Adds \a wordlist to the addedDawg(). */ void Global::addWords(const QStringList& wordlist) { addWords("local",wordlist); } /*! Adds \a wordlist to the dawg() named \a dictname. */ void Global::addWords(const QString& dictname, const QStringList& wordlist) { QDawg& d = (QDawg&)dawg(dictname); QStringList all = d.allWords() + wordlist; d.createFromWords(all); QString dawgfilename = dictDir() + "/" + dictname + ".dawg"; QFile dawgfile(dawgfilename); if ( dawgfile.open(IO_WriteOnly) ) { d.write(&dawgfile); dawgfile.close(); } // #### Re-read the dawg here if we use mmap(). // #### Signal other processes to re-read. } /*! Returns a full path for the application named \a appname, with the given \a filename or QString::null if there was a problem creating the directory tree for \a appname. If \a filename contains "/", it is the caller's responsibility to ensure those directories exist. */ QString Global::applicationFileName(const QString& appname, const QString& filename) { QDir d; QString r = getenv("HOME"); r += "/Applications/"; if ( !QFile::exists( r ) ) if ( d.mkdir(r) == false ) return QString::null; r += appname; if ( !QFile::exists( r ) ) if ( d.mkdir(r) == false ) return QString::null; r += "/"; r += filename; return r; } /*! \internal */ void Global::createDocDir() { if ( !docDirCreated ) { docDirCreated = TRUE; mkdir( QPEApplication::documentDir().latin1(), 0755 ); } } /*! Displays a status \a message to the user. This generally appears in the taskbar for some amount of time, then disappears. */ void Global::statusMessage(const QString& message) { #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopEnvelope e( "QPE/TaskBar", "message(QString)" ); e << message; #endif } /*! \internal */ void Global::applyStyle() { #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "applyStyle()" ); #else ((QPEApplication *)qApp)->applyStyle(); // apply without needing QCop for floppy version #endif } /*! \internal */ QWidget *Global::shutdown( bool ) { #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "shutdown()" ); #endif return 0; } /*! \internal */ QWidget *Global::restart( bool ) { #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopChannel::send( "QPE/System", "restart()" ); #endif return 0; } /*! Explicitly show the current input method. */ void Global::showInputMethod() { #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopChannel::send( "QPE/TaskBar", "showInputMethod()" ); #endif } /*! Explicitly hide the current input method. */ void Global::hideInputMethod() { #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" ); #endif } /*! \internal */ bool Global::isBuiltinCommand( const QString &name ) { if(!builtin) return FALSE; // yes, it can happen for (int i = 0; builtin[i].file; i++) { if ( builtin[i].file == name ) { return TRUE; } } return FALSE; } Global::Command* Global::builtin=0; QGuardedPtr<QWidget> *Global::running=0; /*! \class Global::Command \brief The Global::Command class is internal. \internal */ /*! \internal */ void Global::setBuiltinCommands( Command* list ) { if ( running ) delete [] running; builtin = list; int count = 0; if (!builtin) return; while ( builtin[count].file ) count++; running = new QGuardedPtr<QWidget> [ count ]; } /*! \internal */ void Global::setDocument( QWidget* receiver, const QString& document ) { Emitter emitter(receiver,document); } /*! \internal */ bool Global::terminateBuiltin( const QString& n ) { if (!builtin) return FALSE; for (int i = 0; builtin[i].file; i++) { if ( builtin[i].file == n ) { delete running[i]; return TRUE; } } return FALSE; } /*! \internal */ void Global::terminate( const AppLnk* app ) { //if ( terminateBuiltin(app->exec()) ) return; // maybe? haven't tried this QCString channel = "QPE/Application/" + app->exec().utf8(); if ( QCopChannel::isRegistered(channel) ) { QCopEnvelope e(channel, "quit()"); } } /*! Low-level function to run command \a c. Not recommended. */ void Global::invoke(const QString &c) { // Convert the command line in to a list of arguments QStringList list = QStringList::split(QRegExp(" *"),c); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QString ap=list[0]; // see if the application is already running // XXX should lock file /tmp/qcop-msg-ap if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) { QCopEnvelope e("QPE/System", "notBusy(QString)" ); e << ap; return; } // XXX should unlock file /tmp/qcop-msg-ap //see if it is being started if ( StartingAppList::isStarting( ap ) ) { QCopEnvelope e("QPE/System", "notBusy(QString)" ); e << ap; return; } #endif #ifdef QT_NO_QWS_MULTIPROCESS QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 ); #else QStrList slist; unsigned int j; for ( j = 0; j < list.count(); j++ ) slist.append( list[j].utf8() ); const char **args = new (const char *)[slist.count() + 1]; for ( j = 0; j < slist.count(); j++ ) args[j] = slist.at(j); args[j] = NULL; #if defined(Q_WS_QWS) && !defined(QT_NO_COP) // an attempt to show a wait... // more logic should be used, but this will be fine for the moment... QCopEnvelope ( "QPE/System", "busy()" ); #endif #ifdef HAVE_QUICKEXEC QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so"; qDebug("libfile = %s", libexe.latin1() ); if ( QFile::exists( libexe ) ) { qDebug("calling quickexec %s", libexe.latin1() ); quickexecv( libexe.utf8().data(), (const char **)args ); } else #endif { if ( !::vfork() ) { for ( int fd = 3; fd < 100; fd++ ) ::close( fd ); ::setpgid( ::getpid(), ::getppid() ); // Try bindir first, so that foo/bar works too ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args ); ::execvp( args[0], (char * const *)args ); exit( -1 ); } } StartingAppList::add( list[0] ); #endif //QT_NO_QWS_MULTIPROCESS } /*! Executes application identfied by \a c, passing \a document. Note that you might be better off sending a QCop message to the application's QPE/Application/<i>appname</i> channel. */ void Global::execute( const QString &c, const QString& document ) { if ( qApp->type() != QApplication::GuiServer ) { // ask the server to do the work #if defined(Q_WS_QWS) && !defined(QT_NO_COP) if ( document.isNull() ) { QCopEnvelope e( "QPE/System", "execute(QString)" ); e << c; } else { QCopEnvelope e( "QPE/System", "execute(QString,QString)" ); e << c << document; } #endif return; } // Attempt to execute the app using a builtin class for the app first // else try and find it in the bin directory if (builtin) { for (int i = 0; builtin[i].file; i++) { if ( builtin[i].file == c ) { if ( running[i] ) { if ( !document.isNull() && builtin[i].documentary ) setDocument(running[i], document); running[i]->raise(); running[i]->show(); running[i]->setActiveWindow(); } else { running[i] = builtin[i].func( builtin[i].maximized ); } QCopEnvelope e("QPE/System", "notBusy(QString)" ); e << c; // that was quick ;-) return; } } } //Global::invoke(c, document); // Convert the command line in to a list of arguments QStringList list = QStringList::split(QRegExp(" *"),c); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QString ap=list[0]; qDebug("executing %s", ap.latin1() ); if ( ap == "suspend" ) { QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); return; } /* if need be, sending a qcop message will result in an invoke, see preceeding function */ { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); } if ( !document.isEmpty() ) { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "setDocument(QString)" ); env << document; } #endif } /*! Returns the string \a s with the characters backslash, ", and $ quoted by a preceeding backslash. */ QString Global::shellQuote(const QString& s) { QString r="\""; for (int i=0; i<(int)s.length(); i++) { char c = s[i].latin1(); switch (c) { case '\\': case '"': case '$': r+="\\"; } r += s[i]; } r += "\""; return r; } /*! Returns the string \a s with the characters backslash and " quoted by a preceeding backslash. */ QString Global::stringQuote(const QString& s) { QString r="\""; for (int i=0; i<(int)s.length(); i++) { char c = s[i].latin1(); switch (c) { case '\\': case '"': r+="\\"; } r += s[i]; } r += "\""; return r; } /*! Finds all documents on the system's document directories which match the filter \a mimefilter, and appends the resulting DocLnk objects to \a folder. */ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter) { QString homedocs = QString(getenv("HOME")) + "/Documents"; DocLnkSet d(homedocs,mimefilter); folder->appendFrom(d); StorageInfo storage; const QList<FileSystem> &fs = storage.fileSystems(); QListIterator<FileSystem> it ( fs ); for ( ; it.current(); ++it ) { if ( (*it)->isRemovable() ) { QString path = (*it)->path(); DocLnkSet ide( path, mimefilter ); folder->appendFrom(ide); } } } #include "global.moc" diff --git a/library/library.pro b/library/library.pro index 06dfc8f..058d216 100644 --- a/library/library.pro +++ b/library/library.pro @@ -1,132 +1,132 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = calendar.h \ global.h \ resource.h \ xmlreader.h \ mimetype.h \ menubutton.h \ network.h \ networkinterface.h \ proxies.h \ filemanager.h \ fontmanager.h \ qdawg.h \ datebookmonth.h \ fileselector.h \ imageedit.h \ qcopenvelope_qws.h \ qpedecoration_qws.h \ qpeapplication.h \ qpestyle.h \ qpedialog.h \ lightstyle.h \ config.h \ applnk.h \ sound.h \ tzselect.h \ qmath.h \ datebookdb.h \ alarmserver.h \ process.h \ password.h \ timestring.h \ fontfactoryinterface.h \ fontdatabase.h \ power.h \ storage.h \ qpemessagebox.h \ backend/timeconversion.h \ qpedebug.h \ qpemenubar.h \ qpetoolbar.h \ backend/categories.h \ backend/stringutil.h \ backend/palmtopuid.h \ backend/palmtoprecord.h \ backend/task.h \ backend/event.h \ backend/contact.h\ categorymenu.h \ categoryedit_p.h \ categoryselect.h \ categorywidget.h \ ir.h \ backend/vobject_p.h \ findwidget_p.h \ finddialog.h \ lnkproperties.h SOURCES = calendar.cpp \ global.cpp \ xmlreader.cpp \ mimetype.cpp \ menubutton.cpp \ network.cpp \ networkinterface.cpp \ proxies.cpp \ filemanager.cpp \ fontmanager.cpp \ qdawg.cpp \ datebookmonth.cpp \ fileselector.cpp \ imageedit.cpp \ resource.cpp \ qpedecoration_qws.cpp \ qcopenvelope_qws.cpp \ qpeapplication.cpp \ qpestyle.cpp \ qpedialog.cpp \ lightstyle.cpp \ config.cpp \ applnk.cpp \ sound.cpp \ tzselect.cpp \ qmath.c \ datebookdb.cpp \ alarmserver.cpp \ password.cpp \ process.cpp \ process_unix.cpp \ timestring.cpp \ fontdatabase.cpp \ power.cpp \ storage.cpp \ qpemessagebox.cpp \ backend/timeconversion.cpp \ qpedebug.cpp \ qpemenubar.cpp \ qpetoolbar.cpp \ backend/categories.cpp \ backend/stringutil.cpp \ backend/palmtoprecord.cpp \ backend/task.cpp \ backend/event.cpp \ backend/contact.cpp \ categorymenu.cpp \ categoryedit_p.cpp \ categoryselect.cpp \ categorywidget.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 @@ -1,1597 +1,1597 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** ** $Id$ ** **********************************************************************/ #include <stdlib.h> #include <unistd.h> #include <qfile.h> #ifdef Q_WS_QWS #ifndef QT_NO_COP #if QT_VERSION <= 231 #define private public #define sendLocally processEvent #include "qcopenvelope_qws.h" #undef private #else #include "qcopenvelope_qws.h" #endif #endif #include <qwindowsystem_qws.h> #endif #include <qtextstream.h> #include <qpalette.h> #include <qbuffer.h> #include <qptrdict.h> #include <qregexp.h> #include <qdir.h> #include <qlabel.h> #include <qdialog.h> #include <qdragobject.h> #include <qevent.h> #include <qtooltip.h> #include <qsignal.h> #include "qpeapplication.h" #include "qpestyle.h" #if QT_VERSION >= 300 #include <qstylefactory.h> #else #include <qplatinumstyle.h> #include <qwindowsstyle.h> #include <qmotifstyle.h> #include <qmotifplusstyle.h> #include "lightstyle.h" #endif #include "global.h" #include "resource.h" #if QT_VERSION <= 230 && defined(QT_NO_CODECS) #include "qutfcodec.h" #endif #include "config.h" #include "network.h" #include "fontmanager.h" #include "power.h" #include "alarmserver.h" #include "applnk.h" #include "qpemenubar.h" #include <unistd.h> #include <sys/file.h> #include <sys/ioctl.h> #include <sys/soundcard.h> // for setBacklight() #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) #include <linux/fb.h> #include <sys/types.h> #include <sys/stat.h> #endif #include <stdlib.h> class QPEApplicationData { public: QPEApplicationData() : presstimer(0), presswidget(0), rightpressed(FALSE), kbgrabber(0), kbregrab(FALSE), notbusysent(FALSE), preloaded(FALSE), forceshow(FALSE), nomaximize(FALSE), qpe_main_widget(0), keep_running(TRUE) { qcopq.setAutoDelete(TRUE); } int presstimer; QWidget* presswidget; QPoint presspos; bool rightpressed; int kbgrabber; bool kbregrab; bool notbusysent; QString appName; struct QCopRec { QCopRec(const QCString &ch, const QCString &msg, const QByteArray &d) : channel(ch), message(msg), data(d) { } QCString channel; QCString message; QByteArray data; }; bool preloaded; bool forceshow; bool nomaximize; QWidget* qpe_main_widget; bool keep_running; QList<QCopRec> qcopq; void enqueueQCop(const QCString &ch, const QCString &msg, const QByteArray &data) { qcopq.append(new QCopRec(ch,msg,data)); } void sendQCopQ() { QCopRec* r; for (QListIterator<QCopRec> it(qcopq); (r=it.current()); ++it) QCopChannel::sendLocally(r->channel,r->message,r->data); qcopq.clear(); } }; class ResourceMimeFactory : public QMimeSourceFactory { public: ResourceMimeFactory() { QStringList path; QString lang = getenv("LANG"); if ( !lang.isEmpty() ) path += QPEApplication::qpeDir() + "/help/" + lang + "/html"; path += QPEApplication::qpeDir() + "/pics"; path += QPEApplication::qpeDir() + "/help/en/html"; path += QPEApplication::qpeDir() + "/docs"; QString dir = QDir::current().canonicalPath(); if ( dir == "/" ) dir += "/docs"; else { path += dir + "/../pics"; dir += "/../docs"; path += dir; } setFilePath( path ); setExtensionType("html","text/html;charset=UTF-8"); } const QMimeSource* data(const QString& abs_name) const { const QMimeSource* r = QMimeSourceFactory::data(abs_name); if ( !r ) { int sl = abs_name.length(); do { sl = abs_name.findRev('/',sl-1); QString name = sl>=0 ? abs_name.mid(sl+1) : abs_name; int dot = name.findRev('.'); if ( dot >= 0 ) name = name.left(dot); QImage img = Resource::loadImage(name); if ( !img.isNull() ) r = new QImageDrag(img); } while (!r && sl>0); } return r; } }; static int muted=0; static void setVolume(int t=0, int percent=-1) { switch (t) { case 0: { Config cfg("Sound"); cfg.setGroup("System"); if ( percent < 0 ) percent = cfg.readNumEntry("Volume",50); int fd = 0; if ((fd = open("/dev/mixer", O_RDWR))>=0) { int vol = muted ? 0 : percent; // set both channels to same volume vol |= vol << 8; ioctl(fd, MIXER_WRITE(0), &vol); ::close(fd); } } break; } } int qpe_sysBrightnessSteps() { #if defined(QT_QWS_IPAQ) return 255; #elif defined(QT_QWS_EBX) return 4; #else return 255; // ? #endif } static int& hack(int& i) { #if QT_VERSION <= 230 && defined(QT_NO_CODECS) // These should be created, but aren't in Qt 2.3.0 (void)new QUtf8Codec; (void)new QUtf16Codec; #endif return i; } static bool forced_off = FALSE; static int curbl=-1; static int backlight() { if ( curbl == -1 ) { // Read from config Config config( "qpe" ); config.setGroup( "Screensaver" ); curbl = config.readNumEntry("Brightness",255); } return curbl; } static void setBacklight(int bright) { if ( bright == -3 ) { // Forced on forced_off = FALSE; bright = -1; } if ( forced_off && bright != -2 ) return; if ( bright == -2 ) { // Toggle between off and on bright = curbl ? 0 : -1; forced_off = !bright; } if ( bright == -1 ) { // Read from config Config config( "qpe" ); config.setGroup( "Screensaver" ); bright = config.readNumEntry("Brightness",255); } #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) if ( QFile::exists("/usr/bin/bl") ) { QString cmd = "/usr/bin/bl 1 "; cmd += bright<=0 ? "0 " : "1 "; cmd += QString::number(bright); system(cmd.latin1()); #if defined(QT_QWS_EBX) } else if ( QFile::exists("/dev/fl") ) { #define FL_IOCTL_STEP_CONTRAST 100 int fd = open("/dev/fl", O_WRONLY); if (fd >= 0 ) { int steps = qpe_sysBrightnessSteps(); int bl = ( bright * steps + 127 ) / 255; if ( bright && !bl ) bl = 1; bl = ioctl(fd, FL_IOCTL_STEP_CONTRAST, bl); close(fd); } } #elif defined(QT_QWS_IPAQ) } else if ( QFile::exists("/dev/ts") || QFile::exists("/dev/h3600_ts") ) { typedef struct { unsigned char mode; unsigned char pwr; unsigned char brightness; } FLITE_IN; # ifndef FLITE_ON # ifndef _LINUX_IOCTL_H # include <linux/ioctl.h> # endif # define FLITE_ON _IOW('f', 7, FLITE_IN) # endif int fd; if ( QFile::exists("/dev/ts") ) fd = open("/dev/ts", O_WRONLY); else fd = open("/dev/h3600_ts", O_WRONLY); if (fd >= 0 ) { FLITE_IN bl; bl.mode = 1; bl.pwr = bright ? 1 : 0; bl.brightness = bright; ioctl(fd, FLITE_ON, &bl); close(fd); } } #endif #endif curbl = bright; } void qpe_setBacklight(int bright) { setBacklight(bright); } static bool dim_on = FALSE; static bool lightoff_on = FALSE; static int disable_suspend = 100; static bool powerOnline() { return PowerStatusManager::readStatus().acStatus() == PowerStatus::Online; } static bool networkOnline() { return Network::networkOnline(); } class QPEScreenSaver : public QWSScreenSaver { public: QPEScreenSaver() { } void restore() { setBacklight(-1); } bool save(int level) { switch ( level ) { case 0: if ( disable_suspend > 0 && dim_on ) { if (backlight() > 1) setBacklight(1); // lowest non-off } return TRUE; break; case 1: if ( disable_suspend > 1 && lightoff_on ) { setBacklight(0); // off } return TRUE; break; case 2: if ( disable_suspend > 2 && !powerOnline() && !networkOnline() ) { QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); return TRUE; } break; } return FALSE; } }; static int ssi(int interval, Config &config, const QString &enable, const QString& value, int def) { if ( !enable.isEmpty() && config.readNumEntry(enable,0) == 0 ) return 0; if ( interval < 0 ) { // Restore screen blanking and power saving state interval = config.readNumEntry( value, def ); } return interval; } static void setScreenSaverIntervals(int i1, int i2, int i3) { Config config( "qpe" ); config.setGroup( "Screensaver" ); int v[4]; i1 = ssi(i1, config, "Dim","Interval_Dim", 30); i2 = ssi(i2, config, "LightOff","Interval_LightOff", 20); i3 = ssi(i3, config, "","Interval", 60); //qDebug("screen saver intervals: %d %d %d", i1, i2, i3); v[0] = QMAX( 1000*i1, 100); v[1] = QMAX( 1000*i2, 100); v[2] = QMAX( 1000*i3, 100); v[3] = 0; dim_on = ( (i1 != 0) ? config.readNumEntry("Dim",1) : FALSE ); lightoff_on = ( (i2 != 0 ) ? config.readNumEntry("LightOff",1) : FALSE ); if ( !i1 && !i2 && !i3 ) QWSServer::setScreenSaverInterval(0); else QWSServer::setScreenSaverIntervals(v); } static void setScreenSaverInterval(int interval) { setScreenSaverIntervals(-1,-1,interval); } /*! \class QPEApplication qpeapplication.h \brief The QPEApplication class implements various system services that are available to all Qtopia applications. Simply by using QPEApplication instead of QApplication, a plain Qt application becomes a Qtopia application. It automatically follows style changes, quits and raises, and in the case of \link docwidget.html document-oriented\endlink applications, changes the current displayed document in response to the environment. */ /*! \fn void QPEApplication::clientMoused() \internal */ /*! \fn void QPEApplication::timeChanged(); This signal is emitted when the time jumps forward or backwards by more than the normal passage of time. */ /*! \fn void QPEApplication::clockChanged( bool ampm ); This signal is emitted when the user changes the style of clock. If \a ampm is TRUE, the user wants a 12-hour AM/PM close, otherwise, they want a 24-hour clock. */ /*! \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data ) This signal is emitted when a message is received on the QPE/Application/<i>appname</i> QCop channel for this application. The slot to which you connect this signal uses \a msg and \a data in the following way: \code void MyWidget::receive( const QCString& msg, const QByteArray& data ) { QDataStream stream( data, IO_ReadOnly ); if ( msg == "someMessage(int,int,int)" ) { int a,b,c; stream >> a >> b >> c; ... } else if ( msg == "otherMessage(QString)" ) { ... } } \endcode \sa qcop.html */ /*! Constructs a QPEApplication just as you would construct a QApplication, passing \a argc, \a argv, and \a t. */ QPEApplication::QPEApplication( int& argc, char **argv, Type t ) : QApplication( hack(argc), argv, t ) { int dw = desktop()->width(); if ( dw < 200 ) { setFont( QFont( "helvetica", 8 ) ); AppLnk::setSmallIconSize(10); AppLnk::setBigIconSize(28); } d = new QPEApplicationData; QMimeSourceFactory::setDefaultFactory(new ResourceMimeFactory); connect(this, SIGNAL(lastWindowClosed()), this, SLOT(hideOrQuit())); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) QString qcopfn("/tmp/qcop-msg-"); qcopfn += QString(argv[0]); // append command name QFile f(qcopfn); if ( f.open(IO_ReadOnly) ) { flock(f.handle(), LOCK_EX); } sysChannel = new QCopChannel( "QPE/System", this ); connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(systemMessage( const QCString &, const QByteArray &)) ); QCString channel = QCString(argv[0]); channel.replace(QRegExp(".*/"),""); d->appName = channel; channel = "QPE/Application/" + channel; pidChannel = new QCopChannel( channel, this); connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(pidMessage(const QCString &, const QByteArray &))); if ( f.isOpen() ) { d->keep_running = FALSE; QDataStream ds(&f); QCString channel, message; QByteArray data; while(!ds.atEnd()) { ds >> channel >> message >> data; d->enqueueQCop(channel,message,data); } flock(f.handle(), LOCK_UN); f.close(); f.remove(); } for (int a=0; a<argc; a++) { if ( qstrcmp(argv[a],"-preload")==0 ) { argv[a] = argv[a+1]; a++; d->preloaded = TRUE; argc-=1; } else if ( qstrcmp(argv[a],"-preload-show")==0 ) { argv[a] = argv[a+1]; a++; d->preloaded = TRUE; d->forceshow = TRUE; argc-=1; } } /* overide stored arguments */ setArgs(argc, argv); #endif qwsSetDecoration( new QPEDecoration() ); #ifndef QT_NO_TRANSLATION char *l = getenv( "LANG" ); QString lang; if ( l ) { lang = l; /* Config config("qpe"); config.setGroup( "Appearance" ); lang = config.readEntry( "Language", lang ); */ QTranslator * trans = new QTranslator(this); QString tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; if ( trans->load( tfn )) installTranslator( trans ); else delete trans; trans = new QTranslator(this); tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; if ( trans->load( tfn )) installTranslator( trans ); else delete trans; //###language/font hack; should look it up somewhere if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { QFont fn = FontManager::unicodeFont( FontManager::Proportional ); setFont( fn ); } } #endif applyStyle(); if ( type() == GuiServer ) { setScreenSaverInterval(-1); setVolume(); QWSServer::setScreenSaver(new QPEScreenSaver); } installEventFilter( this ); QPEMenuToolFocusManager::initialize(); #ifdef QT_NO_QWS_CURSOR // if we have no cursor, probably don't want tooltips QToolTip::setEnabled( FALSE ); #endif } static QPtrDict<void>* inputMethodDict=0; static void createInputMethodDict() { if ( !inputMethodDict ) inputMethodDict = new QPtrDict<void>; } /*! Returns the currently set hint to the system as to whether \a w has any use for text input methods. \sa setInputMethodHint() */ QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget* w ) { if ( inputMethodDict && w ) return (InputMethodHint)(int)inputMethodDict->find(w); return Normal; } /*! \enum QPEApplication::InputMethodHint \value Normal the application sometimes needs text input (the default). \value AlwaysOff the application never needs text input. \value AlwaysOn the application always needs text input. */ /*! Hints to the system that \a w has use for text input methods as specified by \a mode. \sa inputMethodHint() */ void QPEApplication::setInputMethodHint( QWidget* w, InputMethodHint mode ) { createInputMethodDict(); if ( mode == Normal ) { inputMethodDict->remove(w); } else { inputMethodDict->insert(w,(void*)mode); } } class HackDialog : public QDialog { public: void acceptIt() { accept(); } void rejectIt() { reject(); } }; void QPEApplication::mapToDefaultAction( QWSKeyEvent *ke, int key ) { // specialised actions for certain widgets. May want to // add more stuff here. if ( activePopupWidget() && activePopupWidget()->inherits( "QListBox" ) && activePopupWidget()->parentWidget() && activePopupWidget()->parentWidget()->inherits( "QComboBox" ) ) key = Qt::Key_Return; if ( activePopupWidget() && activePopupWidget()->inherits( "QPopupMenu" ) ) key = Qt::Key_Return; ke->simpleData.keycode = key; } class HackWidget : public QWidget { public: bool needsOk() { return (getWState() & WState_Reserved1 ); } }; /*! \internal */ bool QPEApplication::qwsEventFilter( QWSEvent *e ) { if ( !d->notbusysent && e->type == QWSEvent::Focus ) { if ( qApp->type() != QApplication::GuiServer ) { QCopEnvelope e("QPE/System", "notBusy(QString)" ); e << d->appName; } d->notbusysent=TRUE; } if ( type() == GuiServer ) { switch ( e->type ) { case QWSEvent::Mouse: if ( e->asMouse()->simpleData.state && !QWidget::find(e->window()) ) emit clientMoused(); } } if ( e->type == QWSEvent::Key ) { if ( d->kbgrabber == 1 ) return TRUE; QWSKeyEvent *ke = (QWSKeyEvent *)e; if ( ke->simpleData.keycode == Qt::Key_F33 ) { // Use special "OK" key to press "OK" on top level widgets QWidget *active = activeWindow(); QWidget *popup = 0; if ( active && active->isPopup() ) { popup = active; active = active->parentWidget(); } if ( active && (int)active->winId() == ke->simpleData.window && !active->testWFlags( WStyle_Customize|WType_Popup|WType_Desktop )) { if ( ke->simpleData.is_press ) { if ( popup ) popup->close(); if ( active->inherits( "QDialog" ) ) { HackDialog *d = (HackDialog *)active; d->acceptIt(); return TRUE; } else if ( ((HackWidget *)active)->needsOk() ) { QSignal s; s.connect( active, SLOT( accept() ) ); s.activate(); } else { // do the same as with the select key: Map to the default action of the widget: mapToDefaultAction( ke, Qt::Key_Return ); } } } } else if ( ke->simpleData.keycode == Qt::Key_F30 ) { // Use special "select" key to do whatever default action a widget has mapToDefaultAction( ke, Qt::Key_Space ); } else if ( ke->simpleData.keycode == Qt::Key_Escape && ke->simpleData.is_press ) { // Escape key closes app if focus on toplevel QWidget *active = activeWindow(); if ( active && active->testWFlags( WType_TopLevel ) && (int)active->winId() == ke->simpleData.window && !active->testWFlags( WStyle_Dialog|WStyle_Customize|WType_Popup|WType_Desktop )) { if ( active->inherits( "QDialog" ) ) { HackDialog *d = (HackDialog *)active; d->rejectIt(); return TRUE; } else if ( strcmp( argv()[0], "embeddedkonsole") != 0 ) { active->close(); } } } #if QT_VERSION < 231 // Filter out the F4/Launcher key from apps // ### The launcher key may not always be F4 on all devices if ( ((QWSKeyEvent *)e)->simpleData.keycode == Qt::Key_F4 ) return TRUE; #endif } if ( e->type == QWSEvent::Focus ) { QWSFocusEvent *fe = (QWSFocusEvent*)e; QWidget* nfw = QWidget::find(e->window()); if ( !fe->simpleData.get_focus ) { QWidget *active = activeWindow(); while ( active && active->isPopup() ) { active->close(); active = activeWindow(); } if ( !nfw && d->kbgrabber == 2 ) { ungrabKeyboard(); d->kbregrab = TRUE; // want kb back when we're active } } else { // make sure our modal widget is ALWAYS on top QWidget *topm = activeModalWidget(); if ( topm ) { topm->raise(); } if ( d->kbregrab ) { grabKeyboard(); d->kbregrab = FALSE; } } if ( fe->simpleData.get_focus && inputMethodDict ) { InputMethodHint m = inputMethodHint( QWidget::find(e->window()) ); if ( m == AlwaysOff ) Global::hideInputMethod(); if ( m == AlwaysOn ) Global::showInputMethod(); } } return QApplication::qwsEventFilter( e ); } /*! Destroys the QPEApplication. */ 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" ); if ( base ) return QString( base ) + "/Documents/"; return QString( "../Documents/" ); } static int deforient=-1; /*! \internal */ int QPEApplication::defaultRotation() { if ( deforient < 0 ) { QString d = getenv("QWS_DISPLAY"); if ( d.contains("Rot90") ) { deforient = 90; } else if ( d.contains("Rot180") ) { deforient = 180; } else if ( d.contains("Rot270") ) { deforient = 270; } else { deforient=0; } } return deforient; } /*! \internal */ void QPEApplication::setDefaultRotation(int r) { if ( qApp->type() == GuiServer ) { deforient = r; setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(r).latin1(), 1); } else { QCopEnvelope("QPE/System", "setDefaultRotation(int)") << r; } } /*! \internal */ void QPEApplication::applyStyle() { Config config( "qpe" ); config.setGroup( "Appearance" ); // Widget style QString style = config.readEntry( "Style", "Light" ); internalSetStyle( style ); // Colors QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) ); QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) ); QPalette pal( btncolor, bgcolor ); QString color = config.readEntry( "Highlight", "#800000" ); pal.setColor( QColorGroup::Highlight, QColor(color) ); color = config.readEntry( "HighlightedText", "#FFFFFF" ); pal.setColor( QColorGroup::HighlightedText, QColor(color) ); color = config.readEntry( "Text", "#000000" ); pal.setColor( QColorGroup::Text, QColor(color) ); color = config.readEntry( "ButtonText", "#000000" ); pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor(color) ); color = config.readEntry( "Base", "#FFFFFF" ); pal.setColor( QColorGroup::Base, QColor(color) ); pal.setColor( QPalette::Disabled, QColorGroup::Text, pal.color(QPalette::Active, QColorGroup::Background).dark() ); setPalette( pal, TRUE ); } void QPEApplication::systemMessage( const QCString &msg, const QByteArray &data) { #ifdef Q_WS_QWS QDataStream stream( data, IO_ReadOnly ); if ( msg == "applyStyle()" ) { applyStyle(); } else if ( msg == "setScreenSaverInterval(int)" ) { if ( type() == GuiServer ) { int time; stream >> time; setScreenSaverInterval(time); } } else if ( msg == "setScreenSaverIntervals(int,int,int)" ) { if ( type() == GuiServer ) { int t1,t2,t3; stream >> t1 >> t2 >> t3; setScreenSaverIntervals(t1,t2,t3); } } else if ( msg == "setBacklight(int)" ) { if ( type() == GuiServer ) { int bright; stream >> bright; setBacklight(bright); } } else if ( msg == "setDefaultRotation(int)" ) { if ( type() == GuiServer ) { int r; stream >> r; setDefaultRotation(r); } } else if ( msg == "shutdown()" ) { if ( type() == GuiServer ) shutdown(); } else if ( msg == "quit()" ) { if ( type() != GuiServer ) tryQuit(); } else if ( msg == "forceQuit()" ) { if ( type() != GuiServer ) quit(); } else if ( msg == "restart()" ) { if ( type() == GuiServer ) restart(); } else if ( msg == "grabKeyboard(QString)" ) { QString who; stream >> who; if ( who.isEmpty() ) d->kbgrabber = 0; else if ( who != d->appName ) d->kbgrabber = 1; else d->kbgrabber = 2; } else if ( msg == "language(QString)" ) { if ( type() == GuiServer ) { QString l; stream >> l; QString cl = getenv("LANG"); if ( cl != l ) { if ( l.isNull() ) unsetenv( "LANG" ); else setenv( "LANG", l.latin1(), 1 ); restart(); } } } else if ( msg == "timeChange(QString)" ) { QString t; stream >> t; if ( t.isNull() ) unsetenv( "TZ" ); else setenv( "TZ", t.latin1(), 1 ); // emit the signal so everyone else knows... emit timeChanged(); } else if ( msg == "execute(QString)" ) { if ( type() == GuiServer ) { QString t; stream >> t; Global::execute( t ); } } else if ( msg == "execute(QString,QString)" ) { if ( type() == GuiServer ) { QString t,d; stream >> t >> d; Global::execute( t, d ); } } else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) { if ( type() == GuiServer ) { QDateTime when; QCString channel, message; int data; stream >> when >> channel >> message >> data; AlarmServer::addAlarm( when, channel, message, data ); } } else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) { if ( type() == GuiServer ) { QDateTime when; QCString channel, message; int data; stream >> when >> channel >> message >> data; AlarmServer::deleteAlarm( when, channel, message, data ); } } else if ( msg == "clockChange(bool)" ) { int tmp; stream >> tmp; emit clockChanged( tmp ); } else if ( msg == "weekChange(bool)" ) { int tmp; stream >> tmp; emit weekChanged( tmp ); } else if ( msg == "setDateFormat(DateFormat)" ) { DateFormat tmp; stream >> tmp; emit dateFormatChanged( tmp ); } else if ( msg == "setVolume(int,int)" ) { int t,v; stream >> t >> v; setVolume(t,v); emit volumeChanged( muted ); } else if ( msg == "volumeChange(bool)" ) { stream >> muted; setVolume(); emit volumeChanged( muted ); } else if ( msg == "setScreenSaverMode(int)" ) { if ( type() == GuiServer ) { int old = disable_suspend; stream >> disable_suspend; //qDebug("setScreenSaverMode(%d)", disable_suspend ); if ( disable_suspend > old ) setScreenSaverInterval( -1 ); } } #endif } /*! \internal */ bool QPEApplication::raiseAppropriateWindow() { bool r=FALSE; // ########## raise()ing main window should raise and set active // ########## it and then all childen. This belongs in Qt/Embedded QWidget *top = d->qpe_main_widget; if ( !top ) top =mainWidget(); if ( top && d->keep_running ) { if ( top->isVisible() ) r = TRUE; #ifdef Q_WS_QWS if ( !d->nomaximize ) top->showMaximized(); else #endif top->show(); top->raise(); top->setActiveWindow(); } QWidget *topm = activeModalWidget(); if ( topm && topm != top ) { topm->show(); topm->raise(); topm->setActiveWindow(); r = FALSE; } return r; } void QPEApplication::pidMessage( const QCString &msg, const QByteArray & data) { #ifdef Q_WS_QWS if ( msg == "quit()" ) { tryQuit(); } else if ( msg == "quitIfInvisible()" ) { if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() ) quit(); } else if ( msg == "close()" ) { hideOrQuit(); } else if ( msg == "disablePreload()" ) { d->preloaded = FALSE; d->keep_running = TRUE; /* so that quit will quit */ } else if ( msg == "enablePreload()" ) { d->preloaded = TRUE; d->keep_running = TRUE; /* so next quit won't quit */ } else if ( msg == "raise()" ) { d->keep_running = TRUE; d->notbusysent = FALSE; raiseAppropriateWindow(); } else if ( msg == "flush()" ) { emit flush(); // we need to tell the desktop QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" ); e << d->appName; } else if ( msg == "reload()" ) { emit reload(); } else if ( msg == "setDocument(QString)" ) { d->keep_running = TRUE; QDataStream stream( data, IO_ReadOnly ); QString doc; stream >> doc; QWidget *mw = mainWidget(); if ( !mw ) mw = d->qpe_main_widget; if ( mw ) Global::setDocument( mw, doc ); } else if ( msg == "nextView()" ) { if ( raiseAppropriateWindow() ) emit appMessage( msg, data); } else { emit appMessage( msg, data); } #endif } static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) { /* // This works but disable it for now until it is safe to apply // What is does is scan the .desktop files of all the apps for // the applnk that has the corresponding argv[0] as this program // then it uses the name stored in the .desktop file as the caption // for the main widget. This saves duplicating translations for // the app name in the program and in the .desktop files. AppLnkSet apps( appsPath ); QList<AppLnk> appsList = apps.children(); for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) { if ( (*it)->exec() == appName ) { mw->setCaption( (*it)->name() ); return TRUE; } } */ return FALSE; } /*! Sets \a mw as the mainWidget() and shows it. For small windows, consider passing TRUE for \a nomaximize rather than the default FALSE. \sa showMainDocumentWidget() */ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) { setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" ); d->nomaximize = nomaximize; d->qpe_main_widget = mw; d->sendQCopQ(); if ( d->preloaded ) { if(d->forceshow) { #ifdef Q_WS_QWS if ( !nomaximize ) mw->showMaximized(); else #endif mw->show(); } } else if ( d->keep_running ) { #ifdef Q_WS_QWS if ( !nomaximize ) mw->showMaximized(); else #endif mw->show(); } } /*! Sets \a mw as the mainWidget() and shows it. For small windows, consider passing TRUE for \a nomaximize rather than the default FALSE. This calls designates the application as a \link docwidget.html document-oriented\endlink application. The \a mw widget must have a slot: setDocument(const QString&). \sa showMainWidget() */ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize ) { setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" ); if ( mw && argc() == 2 ) Global::setDocument( mw, QString::fromUtf8(argv()[1]) ); d->nomaximize = nomaximize; d->qpe_main_widget = mw; d->sendQCopQ(); if ( d->preloaded ) { if(d->forceshow) { #ifdef Q_WS_QWS if ( !nomaximize ) mw->showMaximized(); else #endif mw->show(); } } else if ( d->keep_running ) { #ifdef Q_WS_QWS if ( !nomaximize ) mw->showMaximized(); else #endif mw->show(); } } /*! Sets that the application should continue running after processing qcop messages. Normally if an application is started via a qcop message, the application will process the qcop message and then quit. If while processing the qcop message it calls this function, then the application will show and start proper once it has finished processing qcop messages. \sa keepRunning() */ void QPEApplication::setKeepRunning() { if ( qApp && qApp->inherits( "QPEApplication" ) ) { QPEApplication *qpeApp = (QPEApplication*)qApp; qpeApp->d->keep_running = TRUE; } } /*! Returns whether the application will quit after processing the current list of qcop messages. \sa setKeepRunning() */ bool QPEApplication::keepRunning() const { return d->keep_running; } /*! \internal */ void QPEApplication::internalSetStyle( const QString &style ) { #if QT_VERSION >= 300 if ( style == "QPE" ) { setStyle( new QPEStyle ); } else { QStyle *s = QStyleFactory::create(style); if ( s ) setStyle(s); } #else if ( style == "Windows" ) { setStyle( new QWindowsStyle ); } else if ( style == "QPE" ) { setStyle( new QPEStyle ); } else if ( style == "Light" ) { setStyle( new LightStyle ); } #ifndef QT_NO_STYLE_PLATINUM else if ( style == "Platinum" ) { setStyle( new QPlatinumStyle ); } #endif #ifndef QT_NO_STYLE_MOTIF else if ( style == "Motif" ) { setStyle( new QMotifStyle ); } #endif #ifndef QT_NO_STYLE_MOTIFPLUS else if ( style == "MotifPlus" ) { setStyle( new QMotifPlusStyle ); } #endif #endif } /*! \internal */ void QPEApplication::prepareForTermination(bool willrestart) { if ( willrestart ) { // Draw a big wait icon, the image can be altered in later revisions // QWidget *d = QApplication::desktop(); QImage img = Resource::loadImage( "wait" ); QPixmap pix; pix.convertFromImage(img.smoothScale(3*img.width(), 3*img.height())); QLabel *lblWait = new QLabel(0, "wait hack!", QWidget::WStyle_Customize | QWidget::WStyle_NoBorder | QWidget::WStyle_Tool ); lblWait->setPixmap( pix ); lblWait->setAlignment( QWidget::AlignCenter ); lblWait->show(); lblWait->showMaximized(); } #ifndef SINGLE_APP { QCopEnvelope envelope("QPE/System", "forceQuit()"); } processEvents(); // ensure the message goes out. sleep(1); // You have 1 second to comply. #endif } /*! \internal */ void QPEApplication::shutdown() { // Implement in server's QPEApplication subclass } /*! \internal */ void QPEApplication::restart() { // Implement in server's QPEApplication subclass } static QPtrDict<void>* stylusDict=0; static void createDict() { if ( !stylusDict ) stylusDict = new QPtrDict<void>; } /*! Returns the current StylusMode for \a w. \sa setStylusOperation() */ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w ) { if ( stylusDict ) return (StylusMode)(int)stylusDict->find(w); return LeftOnly; } /*! \enum QPEApplication::StylusMode \value LeftOnly the stylus only generates LeftButton events (the default). \value RightOnHold the stylus generates RightButton events if the user uses the press-and-hold gesture. See setStylusOperation(). */ /*! Causes \a w to receive mouse events according to \a mode. \sa stylusOperation() */ void QPEApplication::setStylusOperation( QWidget* w, StylusMode mode ) { createDict(); if ( mode == LeftOnly ) { stylusDict->remove(w); w->removeEventFilter(qApp); } else { stylusDict->insert(w,(void*)mode); connect(w,SIGNAL(destroyed()),qApp,SLOT(removeSenderFromStylusDict())); w->installEventFilter(qApp); } } /*! \reimp */ bool QPEApplication::eventFilter( QObject *o, QEvent *e ) { if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) { QMouseEvent* me = (QMouseEvent*)e; if ( me->button() == LeftButton ) { StylusMode mode = (StylusMode)(int)stylusDict->find(o); switch (mode) { case RightOnHold: switch ( me->type() ) { case QEvent::MouseButtonPress: d->presstimer = startTimer(500); // #### pref. d->presswidget = (QWidget*)o; d->presspos = me->pos(); d->rightpressed = FALSE; break; case QEvent::MouseButtonRelease: if ( d->presstimer ) { killTimer(d->presstimer); d->presstimer = 0; } if ( d->rightpressed && d->presswidget ) { // Right released postEvent( d->presswidget, new QMouseEvent( QEvent::MouseButtonRelease, me->pos(), RightButton, LeftButton+RightButton ) ); // Left released, off-widget postEvent( d->presswidget, new QMouseEvent( QEvent::MouseMove, QPoint(-1,-1), LeftButton, LeftButton ) ); postEvent( d->presswidget, new QMouseEvent( QEvent::MouseButtonRelease, QPoint(-1,-1), LeftButton, LeftButton ) ); d->rightpressed = FALSE; return TRUE; // don't send the real Left release } break; default: break; } break; default: ; } } } else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { QKeyEvent *ke = (QKeyEvent *)e; if ( ke->key() == Key_Enter ) { if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) { postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ', ke->state(), " ", ke->isAutoRepeat(), ke->count() ) ); return TRUE; } } } return FALSE; } /*! \reimp */ void QPEApplication::timerEvent( QTimerEvent *e ) { if ( e->timerId() == d->presstimer && d->presswidget ) { // Right pressed postEvent( d->presswidget, new QMouseEvent( QEvent::MouseButtonPress, d->presspos, RightButton, LeftButton ) ); killTimer( d->presstimer ); d->presstimer = 0; d->rightpressed = TRUE; } } void QPEApplication::removeSenderFromStylusDict() { stylusDict->remove((void*)sender()); if ( d->presswidget == sender() ) d->presswidget = 0; } /*! \internal */ bool QPEApplication::keyboardGrabbed() const { return d->kbgrabber; } /*! Reverses the effect of grabKeyboard(). This is called automatically on program exit. */ void QPEApplication::ungrabKeyboard() { QPEApplicationData* d = ((QPEApplication*)qApp)->d; if ( d->kbgrabber == 2 ) { QCopEnvelope e("QPE/System", "grabKeyboard(QString)" ); e << QString::null; d->kbregrab = FALSE; d->kbgrabber = 0; } } /*! Grabs the keyboard such that the system's application launching keys no longer work, and instead they are receivable by this application. \sa ungrabKeyboard() */ void QPEApplication::grabKeyboard() { QPEApplicationData* d = ((QPEApplication*)qApp)->d; if ( qApp->type() == QApplication::GuiServer ) d->kbgrabber = 0; else { QCopEnvelope e("QPE/System", "grabKeyboard(QString)" ); e << d->appName; d->kbgrabber = 2; // me } } /*! \reimp */ int QPEApplication::exec() { d->sendQCopQ(); if ( d->keep_running) //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() ) return QApplication::exec(); { QCopEnvelope e("QPE/System", "closing(QString)" ); e << d->appName; } processEvents(); return 0; } /*! \internal External request for application to quit. Quits if possible without loosing state. */ void QPEApplication::tryQuit() { if ( activeModalWidget() || strcmp( argv()[0], "embeddedkonsole") == 0 ) return; // Inside modal loop or konsole. Too hard to save state. { QCopEnvelope e("QPE/System", "closing(QString)" ); e << d->appName; } processEvents(); quit(); } /*! \internal User initiated quit. Makes the window 'Go Away'. If preloaded this means hiding the window. If not it means quitting the application. As this is user initiated we don't need to check state. */ void QPEApplication::hideOrQuit() { // notify of our demise :) { QCopEnvelope e("QPE/System", "closing(QString)" ); e << d->appName; } processEvents(); if ( d->preloaded && d->qpe_main_widget ) d->qpe_main_widget->hide(); else quit(); } #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) // The libraries with the skiff package (and possibly others) have // completely useless implementations of builtin new and delete that // use about 50% of your CPU. Here we revert to the simple libc // functions. void* operator new[](size_t size) { return malloc(size); } void* operator new(size_t size) { return malloc(size); } void operator delete[](void* p) { free(p); } void operator delete[](void* p, size_t /*size*/) { free(p); } void operator delete(void* p) { free(p); } void operator delete(void* p, size_t /*size*/) { free(p); } #endif #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP) #include <qwidgetlist.h> #include <qgfx_qws.h> extern QRect qt_maxWindowRect; void qt_setMaxWindowRect(const QRect& r) { qt_maxWindowRect = qt_screen->mapFromDevice(r, qt_screen->mapToDevice(QSize(qt_screen->width(),qt_screen->height()))); // Re-resize any maximized windows QWidgetList* l = QApplication::topLevelWidgets(); if ( l ) { QWidget *w = l->first(); while ( w ) { if ( w->isVisible() && w->isMaximized() ) { w->showMaximized(); } w = l->next(); } delete l; } } #endif @@ -1,220 +1,220 @@ #!/bin/sh QTE_VERSION=2.3.2 DEB_VERSION=2.0 # Have to do this here, since CVS can't store symlinks mkdir -p etc/rc2.d rm -f etc/rc2.d/S98qpe ln -s ../init.d/qpe etc/rc2.d/S98qpe -VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) -VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) -VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$QPEDIR/include/qpe/version.h) -if grep -q 'QPE_VERSION .*snapshot' $QPEDIR/include/qpe/version.h +VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) +VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) +VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) +if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h then VERSION_CVS="_$(date +%Y%m%d)" else VERSION_CVS="" fi QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT ARCH=arm STRIP=arm-linux-strip STRIP_FILES="*Advanced RISC Machines ARM*not stripped" TDIR=/tmp/ipk$$ DATADIR=$TDIR/data CTRLDIR=$TDIR/control IMAGEDIR= VERB= LIST= RPM= while [ $# -ne 0 ] do case "$1" in -v) VERB=1 echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS" ;; -l) LIST=1 ;; -i) shift IMAGEDIR=$1 DATADIR=$IMAGEDIR mkdir -p $IMAGEDIR ;; -rpm) - if [ "$QPEDIR" != "/opt/Qtopia" ] + if [ "$OPIEDIR" != "/opt/Qtopia" ] then - echo >&2 '$QPEDIR is not the standard /usr/Qtopia directory.' + echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.' sleep 1 #exit 1 fi RPM=1 ;; -arch) shift ARCH=$1 STRIP= STRIP_FILES= ;; /*) FILES="$FILES $1" ;; *) FILES="$FILES $PWD/$1" esac shift done if [ -z "$FILES" ] then - FILES=`find $QPEDIR -name "*.control" -print` + FILES=`find $OPIEDIR -name "*.control" -print` fi RDIR=$PWD -cd $QPEDIR +cd $OPIEDIR for i in $FILES do rm -rf $TDIR mkdir -p $DATADIR mkdir -p $CTRLDIR packagename=${i##*/}; packagename=${packagename%.control} version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"') depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"') files=$(eval echo $(sed -n -e "s/^Files://p" $i)) arch=$(eval echo $(sed -n -e "s/^Arch://p" $i)) section=$(sed -n -e "s/^Section: *//p" $i) license=$(sed -n -e "s/^License: *//p" $i) summary=$(sed -n -e "s/^Description: *//p" $i) package=${packagename}_${version}_$ARCH ERROR= if [ -z "$files" ] then mkdir -p $DATADIR/usr/share/doc/$packagename else for f in $files do if [ -d $f ] then ffiles=$(find $f -type f -o -type b -o -type c -o -type l) else ffiles=$f fi for ff in $ffiles do case $ff in */CVS/*) continue ;; *~) continue ;; *.control) continue ;; $QTDIR/*) BASE=$(dirname /usr/${ff#$QTDIR/}) ;; etc/*.d/*) BASE=$(dirname /$ff) ;; ipaq/*) BASE=$(dirname ${ff#ipaq}) ;; *) # For SHARP ROM compatibility. Should change to Qtopia. BASE=/opt/QtPalmtop/$(dirname $ff) esac if [ -f $ff -o -b $ff -o -c $ff ] then D=$DATADIR$BASE if [ -x $ff -a -n "$STRIP" ] then case $(file $ff) in $STRIP_FILES) $STRIP $ff ;; *) esac fi if [ -n "$RPM" ] then case "$ff" in /*) RPMFILES="$RPMFILES $ff" - ;; *) RPMFILES="$RPMFILES $QPEDIR/$ff" + ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" esac else mkdir -p $D if cp -a $ff $D then true else ERROR=1 fi fi else echo >&2 "$0: $i: No such file: $ff" ERROR=1 fi done done fi if [ -z "$ERROR" ] then if [ -n "$RPM" ] then SPEC=/tmp/mkipks-rpm-$$.spec echo >$SPEC "Summary: $summary" echo >>$SPEC "Name: $packagename" echo >>$SPEC "Group: $section" ########## echo >>$SPEC "License: $license" echo >>$SPEC "Version: ${version%-*}" echo >>$SPEC "Release: ${version#*-}" echo >>$SPEC "%description" sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC echo >>$SPEC "%files" echo >>$SPEC "%defattr(-,root,root)" /bin/ls $RPMFILES >>$SPEC rpm -bb $SPEC --target $ARCH-unknown-linux # rm $SPEC elif [ -z "$IMAGEDIR" ] then #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') size=$(mkfs.jffs2 -r $DATADIR | wc -c) echo "Package: $packagename" >$CTRLDIR/control echo "Installed-Size: $size" >>$CTRLDIR/control echo "Filename: ./$package.ipk" >>$CTRLDIR/control echo "Version: $version" >>$CTRLDIR/control echo "Depends: $depends" >>$CTRLDIR/control egrep -v "^(Files|Version|Depends):" >>$CTRLDIR/control $i echo "$DEB_VERSION" >$TDIR/debian-binary base=${i%.control} scripts="preinst postinst prerm postrm" for pf in $scripts do if [ -x ${base}.$pf ] then cp ${base}.$pf $CTRLDIR/$pf fi done if [ "$UID" = 0 ] then chown -R root.root $TDIR fi ( cd $CTRLDIR; tar cfz ../control.tar.gz ./*; ) ( cd $DATADIR; tar cfz ../data.tar.gz ./*; ) ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk RESULT=$package.ipk if [ -n "$VERB" ] then echo >&2 "Built $RESULT ($size)" fi if [ -n "$LIST" ] then echo $RESULT fi fi else echo >&2 "Not building $package package" fi done diff --git a/noncore/apps/dictionary/dictionary.pro b/noncore/apps/dictionary/dictionary.pro index e829e68..fc89411 100644 --- a/noncore/apps/dictionary/dictionary.pro +++ b/noncore/apps/dictionary/dictionary.pro @@ -1,14 +1,14 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../bin HEADERS = dicttool.h SOURCES = dicttool.cpp main.cpp INTERFACES = dicttoolbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = dictionary diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro index edd41c5..c9d068e 100644 --- a/noncore/apps/tableviewer/tableviewer.pro +++ b/noncore/apps/tableviewer/tableviewer.pro @@ -1,36 +1,36 @@ TEMPLATE = app CONFIG = qt warn_on debug DESTDIR = ../bin SUBDIRS = db ui HEADERS = tableviewer.h \ ui/commonwidgets.h \ ui/tvbrowseview.h \ ui/tvlistview.h \ ui/tvfilterview.h \ ui/tveditview.h \ ui/browsekeyentry.h \ ui/filterkeyentry.h \ ui/tvkeyedit.h \ db/datacache.h \ db/common.h \ db/xmlsource.h \ db/csvsource.h SOURCES = main.cpp \ tableviewer.cpp \ ui/commonwidgets.cpp \ ui/tvbrowseview.cpp \ ui/tvfilterview.cpp \ ui/browsekeyentry.cpp \ ui/filterkeyentry.cpp \ ui/tvlistview.cpp \ ui/tveditview.cpp \ ui/tvkeyedit.cpp \ db/datacache.cpp \ db/xmlsource.cpp \ db/csvsource.cpp \ db/common.cpp INTERFACES = ui/tvkeyedit_gen.ui TARGET = tableviewer -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe diff --git a/noncore/comm/keypebble/Makefile.in b/noncore/comm/keypebble/Makefile.in index 1dbd5d2..18c43e8 100644 --- a/noncore/comm/keypebble/Makefile.in +++ b/noncore/comm/keypebble/Makefile.in @@ -1,286 +1,286 @@ ############################################################################# ####### 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 = ../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = keypebble TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = d3des.h \ krfbbuffer.h \ krfbcanvas.h \ krfbconnection.h \ krfbdecoder.h \ krfblogin.h \ krfboptions.h \ krfbserverinfo.h \ kvnc.h \ kvncconnectdlg.h \ kvncoptionsdlg.h \ version.h \ vncauth.h SOURCES = d3des.c \ vncauth.c \ krfbbuffer.cpp \ krfbcanvas.cpp \ krfbconnection.cpp \ krfbdecoder.cpp \ krfblogin.cpp \ krfboptions.cpp \ kvnc.cpp \ kvncconnectdlg.cpp \ kvncoptionsdlg.cpp \ main.cpp OBJECTS = d3des.o \ vncauth.o \ krfbbuffer.o \ krfbcanvas.o \ krfbconnection.o \ krfbdecoder.o \ krfblogin.o \ krfboptions.o \ kvnc.o \ kvncconnectdlg.o \ kvncoptionsdlg.o \ main.o \ vncoptionsbase.o INTERFACES = vncoptionsbase.ui UICDECLS = vncoptionsbase.h UICIMPLS = vncoptionsbase.cpp SRCMOC = moc_krfbbuffer.cpp \ moc_krfbcanvas.cpp \ moc_krfbconnection.cpp \ moc_krfbdecoder.cpp \ moc_krfblogin.cpp \ moc_kvnc.cpp \ moc_kvncconnectdlg.cpp \ moc_kvncoptionsdlg.cpp \ moc_vncoptionsbase.cpp OBJMOC = moc_krfbbuffer.o \ moc_krfbcanvas.o \ moc_krfbconnection.o \ moc_krfbdecoder.o \ moc_krfblogin.o \ moc_kvnc.o \ moc_kvncconnectdlg.o \ moc_kvncoptionsdlg.o \ moc_vncoptionsbase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 keypebble.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 d3des.o: d3des.c \ d3des.h vncauth.o: vncauth.c \ vncauth.h \ d3des.h krfbbuffer.o: krfbbuffer.cpp \ krfbdecoder.h \ krfbbuffer.h \ krfbserverinfo.h krfbcanvas.o: krfbcanvas.cpp \ kvncconnectdlg.h \ krfbconnection.h \ krfbcanvas.h \ krfboptions.h \ krfbbuffer.h \ - $(QPEDIR)/include/qpe/config.h + $(OPIEDIR)/include/qpe/config.h krfbconnection.o: krfbconnection.cpp \ krfbconnection.h \ krfblogin.h \ krfboptions.h \ krfbdecoder.h \ krfbbuffer.h krfbdecoder.o: krfbdecoder.cpp \ krfbconnection.h \ krfboptions.h \ krfbserverinfo.h \ krfbdecoder.h \ krfbbuffer.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h krfblogin.o: krfblogin.cpp \ vncauth.h \ krfblogin.h \ krfbconnection.h krfboptions.o: krfboptions.cpp \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ krfboptions.h kvnc.o: kvnc.cpp \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/global.h \ kvnc.h \ krfbcanvas.h \ kvncoptionsdlg.h \ vncoptionsbase.h \ krfbconnection.h kvncconnectdlg.o: kvncconnectdlg.cpp \ krfbconnection.h \ kvncoptionsdlg.h \ vncoptionsbase.h \ kvncconnectdlg.h kvncoptionsdlg.o: kvncoptionsdlg.cpp \ krfboptions.h \ kvncoptionsdlg.h \ vncoptionsbase.h main.o: main.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ kvnc.h vncoptionsbase.h: vncoptionsbase.ui $(UIC) vncoptionsbase.ui -o $(INTERFACE_DECL_PATH)/vncoptionsbase.h vncoptionsbase.cpp: vncoptionsbase.ui $(UIC) vncoptionsbase.ui -i vncoptionsbase.h -o vncoptionsbase.cpp vncoptionsbase.o: vncoptionsbase.cpp \ vncoptionsbase.h \ vncoptionsbase.ui moc_krfbbuffer.o: moc_krfbbuffer.cpp \ krfbbuffer.h moc_krfbcanvas.o: moc_krfbcanvas.cpp \ krfbcanvas.h moc_krfbconnection.o: moc_krfbconnection.cpp \ krfbconnection.h moc_krfbdecoder.o: moc_krfbdecoder.cpp \ krfbdecoder.h moc_krfblogin.o: moc_krfblogin.cpp \ krfblogin.h moc_kvnc.o: moc_kvnc.cpp \ kvnc.h moc_kvncconnectdlg.o: moc_kvncconnectdlg.cpp \ kvncconnectdlg.h moc_kvncoptionsdlg.o: moc_kvncoptionsdlg.cpp \ kvncoptionsdlg.h \ vncoptionsbase.h moc_vncoptionsbase.o: moc_vncoptionsbase.cpp \ vncoptionsbase.h moc_krfbbuffer.cpp: krfbbuffer.h $(MOC) krfbbuffer.h -o moc_krfbbuffer.cpp moc_krfbcanvas.cpp: krfbcanvas.h $(MOC) krfbcanvas.h -o moc_krfbcanvas.cpp moc_krfbconnection.cpp: krfbconnection.h $(MOC) krfbconnection.h -o moc_krfbconnection.cpp moc_krfbdecoder.cpp: krfbdecoder.h $(MOC) krfbdecoder.h -o moc_krfbdecoder.cpp moc_krfblogin.cpp: krfblogin.h $(MOC) krfblogin.h -o moc_krfblogin.cpp moc_kvnc.cpp: kvnc.h $(MOC) kvnc.h -o moc_kvnc.cpp moc_kvncconnectdlg.cpp: kvncconnectdlg.h $(MOC) kvncconnectdlg.h -o moc_kvncconnectdlg.cpp moc_kvncoptionsdlg.cpp: kvncoptionsdlg.h $(MOC) kvncoptionsdlg.h -o moc_kvncoptionsdlg.cpp moc_vncoptionsbase.cpp: vncoptionsbase.h $(MOC) vncoptionsbase.h -o moc_vncoptionsbase.cpp diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro index 6b11801..c0efc4f 100644 --- a/noncore/comm/keypebble/keypebble.pro +++ b/noncore/comm/keypebble/keypebble.pro @@ -1,38 +1,38 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../bin HEADERS = d3des.h \ krfbbuffer.h \ krfbcanvas.h \ krfbconnection.h \ krfbdecoder.h \ krfblogin.h \ krfboptions.h \ krfbserverinfo.h \ kvnc.h \ kvncconnectdlg.h \ kvncoptionsdlg.h \ version.h \ vncauth.h SOURCES = d3des.c \ vncauth.c \ krfbbuffer.cpp \ krfbcanvas.cpp \ krfbconnection.cpp \ krfbdecoder.cpp \ krfblogin.cpp \ krfboptions.cpp \ kvnc.cpp \ kvncconnectdlg.cpp \ kvncoptionsdlg.cpp \ main.cpp INTERFACES = vncoptionsbase.ui TARGET = keypebble -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe diff --git a/noncore/games/chess/chess.pro b/noncore/games/chess/chess.pro index f6650a0..9053809 100644 --- a/noncore/games/chess/chess.pro +++ b/noncore/games/chess/chess.pro @@ -1,14 +1,14 @@ SOURCES += chess.cpp main.cpp HEADERS += chess.h DESTDIR = ../bin TARGET = chess -DEPENDPATH += $(QPEDIR)/include +DEPENDPATH += $(OPIEDIR)/include INTERFACES = mainwindow.ui IMAGES = images/new.png images/repeat.png images/txt.png images/back.png TEMPLATE =app CONFIG += qt warn_on release -INCLUDEPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include LIBS += -lqpe DBFILE = chess.db LANGUAGE = C++ CPP_ALWAYS_CREATE_SOURCE = TRUE diff --git a/noncore/games/fifteen/Makefile.in b/noncore/games/fifteen/Makefile.in index 23c7334..1cae722 100644 --- a/noncore/games/fifteen/Makefile.in +++ b/noncore/games/fifteen/Makefile.in @@ -1,118 +1,118 @@ ############################################################################# ####### 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 = ../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = fifteen TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = fifteen.h SOURCES = fifteen.cpp \ main.cpp OBJECTS = fifteen.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_fifteen.cpp OBJMOC = moc_fifteen.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 fifteen.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 fifteen.o: fifteen.cpp \ fifteen.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h main.o: main.cpp \ fifteen.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_fifteen.o: moc_fifteen.cpp \ fifteen.h moc_fifteen.cpp: fifteen.h $(MOC) fifteen.h -o moc_fifteen.cpp diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro index 167f4f8..92072ab 100644 --- a/noncore/games/fifteen/fifteen.pro +++ b/noncore/games/fifteen/fifteen.pro @@ -1,10 +1,10 @@ DESTDIR = ../bin TEMPLATE = app CONFIG = qt warn_on release HEADERS = fifteen.h SOURCES = fifteen.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = fifteen diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in index 27304f1..985eff0 100644 --- a/noncore/games/go/Makefile.in +++ b/noncore/games/go/Makefile.in @@ -1,158 +1,158 @@ ############################################################################# ####### 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 = ../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = go TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = amigo.h \ go.h \ goplayutils.h \ gowidget.h SOURCES = amigo.c \ goplayer.c \ goplayutils.c \ killable.c \ gowidget.cpp \ main.cpp OBJECTS = amigo.o \ goplayer.o \ goplayutils.o \ killable.o \ gowidget.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_gowidget.cpp OBJMOC = moc_gowidget.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 go.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 amigo.o: amigo.c \ go.h \ goplayutils.h \ amigo.h goplayer.o: goplayer.c \ go.h \ goplayutils.h \ amigo.h goplayutils.o: goplayutils.c \ goplayutils.h \ amigo.h \ go.h killable.o: killable.c \ go.h \ goplayutils.h \ amigo.h gowidget.o: gowidget.cpp \ gowidget.h \ amigo.h \ go.h \ goplayutils.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h main.o: main.cpp \ gowidget.h \ amigo.h \ go.h \ goplayutils.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_gowidget.o: moc_gowidget.cpp \ gowidget.h \ amigo.h \ go.h \ goplayutils.h moc_gowidget.cpp: gowidget.h $(MOC) gowidget.h -o moc_gowidget.cpp diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro index deb90c5..b39b5b4 100644 --- a/noncore/games/go/go.pro +++ b/noncore/games/go/go.pro @@ -1,19 +1,19 @@ DESTDIR = ../bin TEMPLATE = app CONFIG = qt warn_on release HEADERS = amigo.h \ go.h \ goplayutils.h \ gowidget.h SOURCES = amigo.c \ goplayer.c \ goplayutils.c \ killable.c \ gowidget.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = go TRANSLATIONS = ../i18n/de/go.ts
\ No newline at end of file diff --git a/noncore/games/mindbreaker/Makefile.in b/noncore/games/mindbreaker/Makefile.in index 88f6fb1..ff29d19 100644 --- a/noncore/games/mindbreaker/Makefile.in +++ b/noncore/games/mindbreaker/Makefile.in @@ -1,117 +1,117 @@ ############################################################################# ####### 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 = mindbreaker TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = mindbreaker.h SOURCES = main.cpp \ mindbreaker.cpp OBJECTS = main.o \ mindbreaker.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_mindbreaker.cpp OBJMOC = moc_mindbreaker.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 mindbreaker.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 \ mindbreaker.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h mindbreaker.o: mindbreaker.cpp \ mindbreaker.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h moc_mindbreaker.o: moc_mindbreaker.cpp \ mindbreaker.h moc_mindbreaker.cpp: mindbreaker.h $(MOC) mindbreaker.h -o moc_mindbreaker.cpp diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro index 12944d1..fa7dc0c 100644 --- a/noncore/games/mindbreaker/mindbreaker.pro +++ b/noncore/games/mindbreaker/mindbreaker.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = mindbreaker.h SOURCES = main.cpp \ mindbreaker.cpp TARGET = mindbreaker -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/mindbreaker.ts diff --git a/noncore/games/minesweep/Makefile.in b/noncore/games/minesweep/Makefile.in index 9ed6234..67ea94c 100644 --- a/noncore/games/minesweep/Makefile.in +++ b/noncore/games/minesweep/Makefile.in @@ -1,134 +1,134 @@ ############################################################################# ####### 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 = minesweep TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = minefield.h \ minesweep.h SOURCES = main.cpp \ minefield.cpp \ minesweep.cpp OBJECTS = main.o \ minefield.o \ minesweep.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_minefield.cpp \ moc_minesweep.cpp OBJMOC = moc_minefield.o \ moc_minesweep.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 minesweep.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 \ minesweep.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h minefield.o: minefield.cpp \ minefield.h \ - $(QPEDIR)/include/qpe/config.h + $(OPIEDIR)/include/qpe/config.h minesweep.o: minesweep.cpp \ minesweep.h \ minefield.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h moc_minefield.o: moc_minefield.cpp \ minefield.h moc_minesweep.o: moc_minesweep.cpp \ minesweep.h moc_minefield.cpp: minefield.h $(MOC) minefield.h -o moc_minefield.cpp moc_minesweep.cpp: minesweep.h $(MOC) minesweep.h -o moc_minesweep.cpp diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro index 87484bc..85f626a 100644 --- a/noncore/games/minesweep/minesweep.pro +++ b/noncore/games/minesweep/minesweep.pro @@ -1,14 +1,14 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = minefield.h \ minesweep.h SOURCES = main.cpp \ minefield.cpp \ minesweep.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = TRANSLATIONS = ../i18n/de/minesweep.ts diff --git a/noncore/games/parashoot/Makefile.in b/noncore/games/parashoot/Makefile.in index ff7397e..254bcd2 100644 --- a/noncore/games/parashoot/Makefile.in +++ b/noncore/games/parashoot/Makefile.in @@ -1,203 +1,203 @@ ############################################################################# ####### 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 = parashoot TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = interface.h \ man.h \ cannon.h \ base.h \ bullet.h \ helicopter.h SOURCES = main.cpp \ interface.cpp \ man.cpp \ cannon.cpp \ base.cpp \ bullet.cpp \ helicopter.cpp OBJECTS = main.o \ interface.o \ man.o \ cannon.o \ base.o \ bullet.o \ helicopter.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_interface.cpp \ moc_cannon.cpp \ moc_bullet.cpp OBJMOC = moc_interface.o \ moc_cannon.o \ moc_bullet.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 parashoot.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 \ interface.h \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ base.h \ helicopter.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h interface.o: interface.cpp \ interface.h \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ base.h \ helicopter.h \ man.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h man.o: man.cpp \ codes.h \ man.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ base.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h cannon.o: cannon.cpp \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ codes.h \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h + $(OPIEDIR)/include/qpe/sound.h base.o: base.cpp \ codes.h \ base.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ man.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h bullet.o: bullet.cpp \ codes.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ man.h \ helicopter.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qmath.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qmath.h helicopter.o: helicopter.cpp \ helicopter.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ man.h \ codes.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h moc_interface.o: moc_interface.cpp \ interface.h \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ base.h \ helicopter.h moc_cannon.o: moc_cannon.cpp \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h + $(OPIEDIR)/include/qpe/sound.h moc_bullet.o: moc_bullet.cpp \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h + $(OPIEDIR)/include/qpe/sound.h moc_interface.cpp: interface.h $(MOC) interface.h -o moc_interface.cpp moc_cannon.cpp: cannon.h $(MOC) cannon.h -o moc_cannon.cpp moc_bullet.cpp: bullet.h $(MOC) bullet.h -o moc_bullet.cpp diff --git a/noncore/games/parashoot/parashoot.pro b/noncore/games/parashoot/parashoot.pro index 631560b..a7a01b2 100644 --- a/noncore/games/parashoot/parashoot.pro +++ b/noncore/games/parashoot/parashoot.pro @@ -1,11 +1,11 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp TARGET = parashoot -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/parashoot.ts diff --git a/noncore/games/qasteroids/Makefile.in b/noncore/games/qasteroids/Makefile.in index 7312743..0dbd9bc 100644 --- a/noncore/games/qasteroids/Makefile.in +++ b/noncore/games/qasteroids/Makefile.in @@ -1,155 +1,155 @@ ############################################################################# ####### 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 = qasteroids TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = ledmeter.h \ sprites.h \ toplevel.h \ view.h SOURCES = ledmeter.cpp \ toplevel.cpp \ view.cpp \ main.cpp OBJECTS = ledmeter.o \ toplevel.o \ view.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_ledmeter.cpp \ moc_toplevel.cpp \ moc_view.cpp OBJMOC = moc_ledmeter.o \ moc_toplevel.o \ moc_view.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 qasteroids.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 ledmeter.o: ledmeter.cpp \ ledmeter.h toplevel.o: toplevel.cpp \ toplevel.h \ view.h \ sprites.h \ ledmeter.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/resource.h view.o: view.cpp \ view.h \ sprites.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h main.o: main.cpp \ toplevel.h \ view.h \ sprites.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_ledmeter.o: moc_ledmeter.cpp \ ledmeter.h moc_toplevel.o: moc_toplevel.cpp \ toplevel.h \ view.h \ sprites.h moc_view.o: moc_view.cpp \ view.h \ sprites.h moc_ledmeter.cpp: ledmeter.h $(MOC) ledmeter.h -o moc_ledmeter.cpp moc_toplevel.cpp: toplevel.h $(MOC) toplevel.h -o moc_toplevel.cpp moc_view.cpp: view.h $(MOC) view.h -o moc_view.cpp diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro index 14a0901..2f5b2e4 100644 --- a/noncore/games/qasteroids/qasteroids.pro +++ b/noncore/games/qasteroids/qasteroids.pro @@ -1,11 +1,11 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = ledmeter.h sprites.h toplevel.h view.h SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp TARGET = qasteroids -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/qasteroids.ts diff --git a/noncore/games/snake/Makefile.in b/noncore/games/snake/Makefile.in index 8179b6f..0801db3 100644 --- a/noncore/games/snake/Makefile.in +++ b/noncore/games/snake/Makefile.in @@ -1,159 +1,159 @@ ############################################################################# ####### 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 = snake TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = snake.h \ target.h \ obstacle.h \ interface.h \ codes.h SOURCES = snake.cpp \ target.cpp \ obstacle.cpp \ interface.cpp \ main.cpp OBJECTS = snake.o \ target.o \ obstacle.o \ interface.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_snake.cpp \ moc_interface.cpp OBJMOC = moc_snake.o \ moc_interface.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 snake.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 snake.o: snake.cpp \ snake.h \ target.h \ codes.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h target.o: target.cpp \ target.h \ codes.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h obstacle.o: obstacle.cpp \ obstacle.h \ codes.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h interface.o: interface.cpp \ interface.h \ snake.h \ target.h \ obstacle.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h main.o: main.cpp \ interface.h \ snake.h \ target.h \ obstacle.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_snake.o: moc_snake.cpp \ snake.h moc_interface.o: moc_interface.cpp \ interface.h \ snake.h \ target.h \ obstacle.h moc_snake.cpp: snake.h $(MOC) snake.h -o moc_snake.cpp moc_interface.cpp: interface.h $(MOC) interface.h -o moc_interface.cpp diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro index 6dacdbd..38b4023 100644 --- a/noncore/games/snake/snake.pro +++ b/noncore/games/snake/snake.pro @@ -1,11 +1,11 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = snake.h target.h obstacle.h interface.h codes.h SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp TARGET = snake -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/snake.ts diff --git a/noncore/games/solitaire/Makefile.in b/noncore/games/solitaire/Makefile.in index 3c50345..a0a64fb 100644 --- a/noncore/games/solitaire/Makefile.in +++ b/noncore/games/solitaire/Makefile.in @@ -1,235 +1,235 @@ ############################################################################# ####### 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 = patience TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = canvascard.h \ canvasshapes.h \ cardgame.h \ cardgamelayout.h \ cardpile.h \ card.h \ carddeck.h \ canvascardgame.h \ freecellcardgame.h \ patiencecardgame.h \ canvascardwindow.h SOURCES = canvascard.cpp \ canvasshapes.cpp \ cardgame.cpp \ cardgamelayout.cpp \ cardpile.cpp \ card.cpp \ carddeck.cpp \ canvascardgame.cpp \ freecellcardgame.cpp \ patiencecardgame.cpp \ canvascardwindow.cpp \ main.cpp OBJECTS = canvascard.o \ canvasshapes.o \ cardgame.o \ cardgamelayout.o \ cardpile.o \ card.o \ carddeck.o \ canvascardgame.o \ freecellcardgame.o \ patiencecardgame.o \ canvascardwindow.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_canvascardwindow.cpp OBJMOC = moc_canvascardwindow.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 solitaire.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=patience ####### Sub-libraries ###### Combined headers ####### Compile canvascard.o: canvascard.cpp \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvascard.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h canvasshapes.o: canvasshapes.cpp \ canvasshapes.h cardgame.o: cardgame.cpp \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h cardgamelayout.o: cardgamelayout.cpp \ cardgamelayout.h \ cardpile.h cardpile.o: cardpile.cpp \ cardpile.h \ card.h \ - $(QPEDIR)/include/qpe/config.h + $(OPIEDIR)/include/qpe/config.h card.o: card.cpp \ card.h \ - $(QPEDIR)/include/qpe/config.h + $(OPIEDIR)/include/qpe/config.h carddeck.o: carddeck.cpp \ card.h \ carddeck.h canvascardgame.o: canvascardgame.cpp \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvasshapes.h \ canvascard.h \ canvascardgame.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h freecellcardgame.o: freecellcardgame.cpp \ freecellcardgame.h \ patiencecardgame.h \ canvascardgame.h \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvasshapes.h \ canvascard.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h patiencecardgame.o: patiencecardgame.cpp \ patiencecardgame.h \ canvascardgame.h \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvasshapes.h \ canvascard.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h canvascardwindow.o: canvascardwindow.cpp \ canvascardwindow.h \ patiencecardgame.h \ canvascardgame.h \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvasshapes.h \ canvascard.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ freecellcardgame.h main.o: main.cpp \ canvascardwindow.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_canvascardwindow.o: moc_canvascardwindow.cpp \ canvascardwindow.h moc_canvascardwindow.cpp: canvascardwindow.h $(MOC) canvascardwindow.h -o moc_canvascardwindow.cpp diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro index 8617cab..1c90c94 100755 --- a/noncore/games/solitaire/solitaire.pro +++ b/noncore/games/solitaire/solitaire.pro @@ -1,18 +1,18 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp patiencecardgame.cpp canvascardwindow.cpp main.cpp TARGET = patience -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe REQUIRES = patience TRANSLATIONS = ../i18n/de/patience.ts diff --git a/noncore/games/tetrix/Makefile.in b/noncore/games/tetrix/Makefile.in index 3a74fdc..59e172c 100644 --- a/noncore/games/tetrix/Makefile.in +++ b/noncore/games/tetrix/Makefile.in @@ -1,157 +1,157 @@ ############################################################################# ####### 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 = ../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = tetrix TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = minefield.h \ gtetrix.h \ qtetrix.h \ qtetrixb.h \ tpiece.h SOURCES = main.cpp \ gtetrix.cpp \ qtetrix.cpp \ qtetrixb.cpp \ tpiece.cpp OBJECTS = main.o \ gtetrix.o \ qtetrix.o \ qtetrixb.o \ tpiece.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_qtetrix.cpp \ moc_qtetrixb.cpp OBJMOC = moc_qtetrix.o \ moc_qtetrixb.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 tetrix.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 \ qtetrix.h \ qtetrixb.h \ gtetrix.h \ tpiece.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h gtetrix.o: gtetrix.cpp \ gtetrix.h \ tpiece.h qtetrix.o: qtetrix.cpp \ qtetrix.h \ qtetrixb.h \ gtetrix.h \ tpiece.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h qtetrixb.o: qtetrixb.cpp \ qtetrixb.h \ gtetrix.h \ tpiece.h \ qtetrix.h tpiece.o: tpiece.cpp \ tpiece.h moc_qtetrix.o: moc_qtetrix.cpp \ qtetrix.h \ qtetrixb.h \ gtetrix.h \ tpiece.h moc_qtetrixb.o: moc_qtetrixb.cpp \ qtetrixb.h \ gtetrix.h \ tpiece.h moc_qtetrix.cpp: qtetrix.h $(MOC) qtetrix.h -o moc_qtetrix.cpp moc_qtetrixb.cpp: qtetrixb.h $(MOC) qtetrixb.h -o moc_qtetrixb.cpp diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro index 1160585..533fab0 100644 --- a/noncore/games/tetrix/tetrix.pro +++ b/noncore/games/tetrix/tetrix.pro @@ -1,17 +1,17 @@ TEMPLATE = app CONFIG = qt warn_on release DESTDIR = ../bin HEADERS = minefield.h \ gtetrix.h \ qtetrix.h \ qtetrixb.h \ tpiece.h SOURCES = main.cpp \ gtetrix.cpp \ qtetrix.cpp \ qtetrixb.cpp \ tpiece.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = diff --git a/noncore/games/wordgame/Makefile.in b/noncore/games/wordgame/Makefile.in index 5627414..2e0a47c 100644 --- a/noncore/games/wordgame/Makefile.in +++ b/noncore/games/wordgame/Makefile.in @@ -1,168 +1,168 @@ ############################################################################# ####### 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 = wordgame TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = wordgame.h SOURCES = main.cpp \ wordgame.cpp OBJECTS = main.o \ wordgame.o \ newgamebase.o \ rulesbase.o INTERFACES = newgamebase.ui \ rulesbase.ui UICDECLS = newgamebase.h \ rulesbase.h UICIMPLS = newgamebase.cpp \ rulesbase.cpp SRCMOC = moc_wordgame.cpp \ moc_newgamebase.cpp \ moc_rulesbase.cpp OBJMOC = moc_wordgame.o \ moc_newgamebase.o \ moc_rulesbase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 wordgame.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 \ wordgame.h \ newgamebase.h \ rulesbase.h \ - $(QPEDIR)/include/qpe/qdawg.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qdawg.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h wordgame.o: wordgame.cpp \ wordgame.h \ newgamebase.h \ rulesbase.h \ - $(QPEDIR)/include/qpe/qdawg.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/filemanager.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/qdawg.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/filemanager.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h newgamebase.h: newgamebase.ui $(UIC) newgamebase.ui -o $(INTERFACE_DECL_PATH)/newgamebase.h newgamebase.cpp: newgamebase.ui $(UIC) newgamebase.ui -i newgamebase.h -o newgamebase.cpp rulesbase.h: rulesbase.ui $(UIC) rulesbase.ui -o $(INTERFACE_DECL_PATH)/rulesbase.h rulesbase.cpp: rulesbase.ui $(UIC) rulesbase.ui -i rulesbase.h -o rulesbase.cpp newgamebase.o: newgamebase.cpp rulesbase.o: rulesbase.cpp moc_wordgame.o: moc_wordgame.cpp \ wordgame.h \ newgamebase.h \ rulesbase.h \ - $(QPEDIR)/include/qpe/qdawg.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/qdawg.h \ + $(OPIEDIR)/include/qpe/applnk.h moc_newgamebase.o: moc_newgamebase.cpp \ newgamebase.h moc_rulesbase.o: moc_rulesbase.cpp \ rulesbase.h moc_wordgame.cpp: wordgame.h $(MOC) wordgame.h -o moc_wordgame.cpp moc_newgamebase.cpp: newgamebase.h $(MOC) newgamebase.h -o moc_newgamebase.cpp moc_rulesbase.cpp: rulesbase.h $(MOC) rulesbase.h -o moc_rulesbase.cpp diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro index 7feacf9..64f4832 100644 --- a/noncore/games/wordgame/wordgame.pro +++ b/noncore/games/wordgame/wordgame.pro @@ -1,13 +1,13 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = wordgame.h SOURCES = main.cpp \ wordgame.cpp INTERFACES = newgamebase.ui rulesbase.ui TARGET = wordgame -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/wordgame.ts diff --git a/noncore/multimedia/showimg/Makefile.in b/noncore/multimedia/showimg/Makefile.in index 9255b2d..7c58da1 100644 --- a/noncore/multimedia/showimg/Makefile.in +++ b/noncore/multimedia/showimg/Makefile.in @@ -1,119 +1,119 @@ ############################################################################# ####### 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 = showimg TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = showimg.h SOURCES = main.cpp \ showimg.cpp OBJECTS = main.o \ showimg.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_showimg.cpp OBJMOC = moc_showimg.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 showimg.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=showimg ####### Sub-libraries ###### Combined headers ####### Compile main.o: main.cpp \ showimg.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h showimg.o: showimg.cpp \ showimg.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/fileselector.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/fileselector.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h moc_showimg.o: moc_showimg.cpp \ showimg.h moc_showimg.cpp: showimg.h $(MOC) showimg.h -o moc_showimg.cpp diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro index a372f62..29da458 100644 --- a/noncore/multimedia/showimg/showimg.pro +++ b/noncore/multimedia/showimg/showimg.pro @@ -1,19 +1,19 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = showimg.h SOURCES = main.cpp \ showimg.cpp TARGET = showimg -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe REQUIRES = showimg TRANSLATIONS = ../i18n/de/showimg.ts diff --git a/noncore/settings/language/Makefile.in b/noncore/settings/language/Makefile.in index 2babf6e..d1a602d 100644 --- a/noncore/settings/language/Makefile.in +++ b/noncore/settings/language/Makefile.in @@ -1,135 +1,135 @@ ############################################################################# ####### 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 = ../../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = language TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = settings.h SOURCES = language.cpp \ main.cpp OBJECTS = language.o \ main.o \ languagesettingsbase.o INTERFACES = languagesettingsbase.ui UICDECLS = languagesettingsbase.h UICIMPLS = languagesettingsbase.cpp SRCMOC = moc_settings.cpp \ moc_languagesettingsbase.cpp OBJMOC = moc_settings.o \ moc_languagesettingsbase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 language.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 language.o: language.cpp \ settings.h \ languagesettingsbase.h main.o: main.cpp \ settings.h \ languagesettingsbase.h languagesettingsbase.h: languagesettingsbase.ui $(UIC) languagesettingsbase.ui -o $(INTERFACE_DECL_PATH)/languagesettingsbase.h languagesettingsbase.cpp: languagesettingsbase.ui $(UIC) languagesettingsbase.ui -i languagesettingsbase.h -o languagesettingsbase.cpp languagesettingsbase.o: languagesettingsbase.cpp \ languagesettingsbase.h \ languagesettingsbase.ui moc_settings.o: moc_settings.cpp \ settings.h \ languagesettingsbase.h moc_languagesettingsbase.o: moc_languagesettingsbase.cpp \ languagesettingsbase.h moc_settings.cpp: settings.h $(MOC) settings.h -o moc_settings.cpp moc_languagesettingsbase.cpp: languagesettingsbase.h $(MOC) languagesettingsbase.h -o moc_languagesettingsbase.cpp diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro index d1f1bf0..c01ffc8 100644 --- a/noncore/settings/language/language.pro +++ b/noncore/settings/language/language.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = settings.h SOURCES = language.cpp main.cpp INTERFACES = languagesettingsbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = language TRANSLATIONS = ../../i18n/de/language.ts diff --git a/noncore/settings/sound/Makefile.in b/noncore/settings/sound/Makefile.in index 1772e12..b42f2e9 100644 --- a/noncore/settings/sound/Makefile.in +++ b/noncore/settings/sound/Makefile.in @@ -1,135 +1,135 @@ ############################################################################# ####### 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 = ../../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = sound TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = soundsettings.h SOURCES = soundsettings.cpp \ main.cpp OBJECTS = soundsettings.o \ main.o \ soundsettingsbase.o INTERFACES = soundsettingsbase.ui UICDECLS = soundsettingsbase.h UICIMPLS = soundsettingsbase.cpp SRCMOC = moc_soundsettings.cpp \ moc_soundsettingsbase.cpp OBJMOC = moc_soundsettings.o \ moc_soundsettingsbase.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 sound.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 soundsettings.o: soundsettings.cpp \ soundsettings.h \ soundsettingsbase.h main.o: main.cpp \ soundsettings.h \ soundsettingsbase.h soundsettingsbase.h: soundsettingsbase.ui $(UIC) soundsettingsbase.ui -o $(INTERFACE_DECL_PATH)/soundsettingsbase.h soundsettingsbase.cpp: soundsettingsbase.ui $(UIC) soundsettingsbase.ui -i soundsettingsbase.h -o soundsettingsbase.cpp soundsettingsbase.o: soundsettingsbase.cpp \ soundsettingsbase.h \ soundsettingsbase.ui moc_soundsettings.o: moc_soundsettings.cpp \ soundsettings.h \ soundsettingsbase.h moc_soundsettingsbase.o: moc_soundsettingsbase.cpp \ soundsettingsbase.h moc_soundsettings.cpp: soundsettings.h $(MOC) soundsettings.h -o moc_soundsettings.cpp moc_soundsettingsbase.cpp: soundsettingsbase.h $(MOC) soundsettingsbase.h -o moc_soundsettingsbase.cpp diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 9028a44..44eff44 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro @@ -1,10 +1,10 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = soundsettings.h SOURCES = soundsettings.cpp main.cpp INTERFACES = soundsettingsbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = sound diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in index 1149304..fb9d15e 100644 --- a/noncore/settings/sysinfo/Makefile.in +++ b/noncore/settings/sysinfo/Makefile.in @@ -1,193 +1,193 @@ ############################################################################# ####### 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 = sysinfo TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = memory.h \ graph.h \ load.h \ storage.h \ versioninfo.h \ sysinfo.h SOURCES = main.cpp \ memory.cpp \ graph.cpp \ load.cpp \ storage.cpp \ versioninfo.cpp \ sysinfo.cpp OBJECTS = main.o \ memory.o \ graph.o \ load.o \ storage.o \ versioninfo.o \ sysinfo.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_memory.cpp \ moc_graph.cpp \ moc_load.cpp \ moc_storage.cpp \ moc_versioninfo.cpp \ moc_sysinfo.cpp OBJMOC = moc_memory.o \ moc_graph.o \ moc_load.o \ moc_storage.o \ moc_versioninfo.o \ moc_sysinfo.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 sysinfo.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 \ sysinfo.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h memory.o: memory.cpp \ graph.h \ memory.h graph.o: graph.cpp \ graph.h load.o: load.cpp \ load.h storage.o: storage.cpp \ graph.h \ storage.h versioninfo.o: versioninfo.cpp \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/version.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/version.h \ versioninfo.h sysinfo.o: sysinfo.cpp \ memory.h \ load.h \ storage.h \ versioninfo.h \ sysinfo.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h moc_memory.o: moc_memory.cpp \ memory.h moc_graph.o: moc_graph.cpp \ graph.h moc_load.o: moc_load.cpp \ load.h moc_storage.o: moc_storage.cpp \ storage.h moc_versioninfo.o: moc_versioninfo.cpp \ versioninfo.h moc_sysinfo.o: moc_sysinfo.cpp \ sysinfo.h moc_memory.cpp: memory.h $(MOC) memory.h -o moc_memory.cpp moc_graph.cpp: graph.h $(MOC) graph.h -o moc_graph.cpp moc_load.cpp: load.h $(MOC) load.h -o moc_load.cpp moc_storage.cpp: storage.h $(MOC) storage.h -o moc_storage.cpp moc_versioninfo.cpp: versioninfo.h $(MOC) versioninfo.h -o moc_versioninfo.cpp moc_sysinfo.cpp: sysinfo.h $(MOC) sysinfo.h -o moc_sysinfo.cpp diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro index 0c7d907..3393a12 100644 --- a/noncore/settings/sysinfo/sysinfo.pro +++ b/noncore/settings/sysinfo/sysinfo.pro @@ -1,25 +1,25 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = memory.h \ graph.h \ load.h \ storage.h \ versioninfo.h \ sysinfo.h SOURCES = main.cpp \ memory.cpp \ graph.cpp \ load.cpp \ storage.cpp \ versioninfo.cpp \ sysinfo.cpp INTERFACES = -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = sysinfo TRANSLATIONS = ../i18n/de/sysinfo.ts diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro index 01ba6a4..2e9ed78 100644 --- a/noncore/tools/calc2/binary/binary.pro +++ b/noncore/tools/calc2/binary/binary.pro @@ -1,16 +1,16 @@ TEMPLATE = lib CONFIG -= moc CONFIG += qt release # Input INTERFACES += binary.ui HEADERS = binaryimpl.h \ binaryfactory.h SOURCES = binaryimpl.cpp \ binaryfactory.cpp -INCLUDEPATH += $(QPEDIR)/include \ - $(QPEDIR)/calc2 -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include \ + $(OPIEDIR)/calc2 +DEPENDPATH += $(OPIEDIR)/include -DESTDIR = $(QPEDIR)/plugins/calculator +DESTDIR = $(OPIEDIR)/plugins/calculator diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro index c10232a..00e13b7 100644 --- a/noncore/tools/calc2/calc.pro +++ b/noncore/tools/calc2/calc.pro @@ -1,11 +1,11 @@ TEMPLATE = app CONFIG += qt release # Input HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h SOURCES += calc.cpp main.cpp engine.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -Wl,-export-dynamic diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro index 92378a6..9e5d4e0 100644 --- a/noncore/tools/calc2/simple/simple.pro +++ b/noncore/tools/calc2/simple/simple.pro @@ -1,14 +1,14 @@ TEMPLATE = lib CONFIG -= moc CONFIG += qt release # Input INTERFACES += simple.ui HEADERS = simpleimpl.h simplefactory.h stdinstructions.h SOURCES = simpleimpl.cpp simplefactory.cpp -INCLUDEPATH += $(QPEDIR)/include \ - $(QPEDIR)/calc2 -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include \ + $(OPIEDIR)/calc2 +DEPENDPATH += $(OPIEDIR)/include -DESTDIR = $(QPEDIR)/plugins/calculator +DESTDIR = $(OPIEDIR)/plugins/calculator diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in index d62b046..ba78df5 100644 --- a/noncore/tools/calculator/Makefile.in +++ b/noncore/tools/calculator/Makefile.in @@ -1,139 +1,139 @@ ############################################################################# ####### 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 = calculator TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = calculatorimpl.h SOURCES = calculatorimpl.cpp \ main.cpp OBJECTS = calculatorimpl.o \ main.o \ calculator.o INTERFACES = calculator.ui UICDECLS = calculator.h UICIMPLS = calculator.cpp SRCMOC = moc_calculatorimpl.cpp \ moc_calculator.cpp OBJMOC = moc_calculatorimpl.o \ moc_calculator.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 calculator.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 calculatorimpl.o: calculatorimpl.cpp \ calculatorimpl.h \ calculator.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qmath.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qmath.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h main.o: main.cpp \ calculatorimpl.h \ calculator.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h calculator.h: calculator.ui - $(UIC) calculator.ui -o calculator.h + $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h calculator.cpp: calculator.ui $(UIC) calculator.ui -i calculator.h -o calculator.cpp calculator.o: calculator.cpp \ calculator.h \ calculator.ui moc_calculatorimpl.o: moc_calculatorimpl.cpp \ calculatorimpl.h \ calculator.h moc_calculator.o: moc_calculator.cpp \ calculator.h moc_calculatorimpl.cpp: calculatorimpl.h $(MOC) calculatorimpl.h -o moc_calculatorimpl.cpp moc_calculator.cpp: calculator.h $(MOC) calculator.h -o moc_calculator.cpp diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro index 1281fd5..9554d2a 100644 --- a/noncore/tools/calculator/calculator.pro +++ b/noncore/tools/calculator/calculator.pro @@ -1,13 +1,13 @@ -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin TEMPLATE = app CONFIG = qt warn_on release HEADERS = calculatorimpl.h SOURCES = calculatorimpl.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = calculator.ui TARGET = calculator TRANSLATIONS = ../i18n/de/calculator.ts diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in index adda9e6..efa7808 100644 --- a/noncore/tools/clock/Makefile.in +++ b/noncore/tools/clock/Makefile.in @@ -1,118 +1,118 @@ ############################################################################# ####### 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 = clock TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = clock.h SOURCES = clock.cpp \ main.cpp OBJECTS = clock.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_clock.cpp OBJMOC = moc_clock.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 clock.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 clock.o: clock.cpp \ clock.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/timestring.h main.o: main.cpp \ clock.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_clock.o: moc_clock.cpp \ clock.h moc_clock.cpp: clock.h $(MOC) clock.h -o moc_clock.cpp diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro index 97f4d2c..ec27adc 100644 --- a/noncore/tools/clock/clock.pro +++ b/noncore/tools/clock/clock.pro @@ -1,13 +1,13 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = clock.h SOURCES = clock.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = TARGET = clock TRANSLATIONS = ../i18n/de/clock.ts diff --git a/noncore/unsupported/filebrowser/Makefile.in b/noncore/unsupported/filebrowser/Makefile.in index c7238ea..c00d0f5 100644 --- a/noncore/unsupported/filebrowser/Makefile.in +++ b/noncore/unsupported/filebrowser/Makefile.in @@ -1,136 +1,136 @@ ############################################################################# ####### 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 = filebrowser TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = inlineedit.h \ filebrowser.h SOURCES = filebrowser.cpp \ inlineedit.cpp \ main.cpp OBJECTS = filebrowser.o \ inlineedit.o \ main.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_inlineedit.cpp \ moc_filebrowser.cpp OBJMOC = moc_inlineedit.o \ moc_filebrowser.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 filebrowser.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 filebrowser.o: filebrowser.cpp \ inlineedit.h \ filebrowser.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/mimetype.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/mimetype.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h inlineedit.o: inlineedit.cpp \ inlineedit.h main.o: main.cpp \ filebrowser.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/mimetype.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/mimetype.h moc_inlineedit.o: moc_inlineedit.cpp \ inlineedit.h moc_filebrowser.o: moc_filebrowser.cpp \ filebrowser.h moc_inlineedit.cpp: inlineedit.h $(MOC) inlineedit.h -o moc_inlineedit.cpp moc_filebrowser.cpp: filebrowser.h $(MOC) filebrowser.h -o moc_filebrowser.cpp diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro index 34df79a..5d8f140 100644 --- a/noncore/unsupported/filebrowser/filebrowser.pro +++ b/noncore/unsupported/filebrowser/filebrowser.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = inlineedit.h \ filebrowser.h SOURCES = filebrowser.cpp \ inlineedit.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = diff --git a/noncore/unsupported/oipkg/Makefile.in b/noncore/unsupported/oipkg/Makefile.in index 8dd7edb..a7e22ef 100644 --- a/noncore/unsupported/oipkg/Makefile.in +++ b/noncore/unsupported/oipkg/Makefile.in @@ -1,203 +1,203 @@ ############################################################################# ####### 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 = qipkg TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = packagemanager.h SOURCES = packagemanager.cpp \ main.cpp OBJECTS = packagemanager.o \ main.o \ packagemanagerbase.o \ pkdesc.o \ pkfind.o \ pksettings.o INTERFACES = packagemanagerbase.ui \ pkdesc.ui \ pkfind.ui \ pksettings.ui UICDECLS = packagemanagerbase.h \ pkdesc.h \ pkfind.h \ pksettings.h UICIMPLS = packagemanagerbase.cpp \ pkdesc.cpp \ pkfind.cpp \ pksettings.cpp SRCMOC = moc_packagemanager.cpp \ moc_packagemanagerbase.cpp \ moc_pkdesc.cpp \ moc_pkfind.cpp \ moc_pksettings.cpp OBJMOC = moc_packagemanager.o \ moc_packagemanagerbase.o \ moc_pkdesc.o \ moc_pkfind.o \ moc_pksettings.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -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 qipkg.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 packagemanager.o: packagemanager.cpp \ packagemanager.h \ packagemanagerbase.h \ pkdesc.h \ pkfind.h \ pksettings.h \ - $(QPEDIR)/include/qpe/process.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/stringutil.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/process.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/stringutil.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/applnk.h main.o: main.cpp \ packagemanager.h \ packagemanagerbase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h packagemanagerbase.h: packagemanagerbase.ui $(UIC) packagemanagerbase.ui -o $(INTERFACE_DECL_PATH)/packagemanagerbase.h packagemanagerbase.cpp: packagemanagerbase.ui $(UIC) packagemanagerbase.ui -i packagemanagerbase.h -o packagemanagerbase.cpp pkdesc.h: pkdesc.ui $(UIC) pkdesc.ui -o $(INTERFACE_DECL_PATH)/pkdesc.h pkdesc.cpp: pkdesc.ui $(UIC) pkdesc.ui -i pkdesc.h -o pkdesc.cpp pkfind.h: pkfind.ui $(UIC) pkfind.ui -o $(INTERFACE_DECL_PATH)/pkfind.h pkfind.cpp: pkfind.ui $(UIC) pkfind.ui -i pkfind.h -o pkfind.cpp pksettings.h: pksettings.ui $(UIC) pksettings.ui -o $(INTERFACE_DECL_PATH)/pksettings.h pksettings.cpp: pksettings.ui $(UIC) pksettings.ui -i pksettings.h -o pksettings.cpp packagemanagerbase.o: packagemanagerbase.cpp pkdesc.o: pkdesc.cpp pkfind.o: pkfind.cpp pksettings.o: pksettings.cpp moc_packagemanager.o: moc_packagemanager.cpp \ packagemanager.h \ packagemanagerbase.h moc_packagemanagerbase.o: moc_packagemanagerbase.cpp \ packagemanagerbase.h moc_pkdesc.o: moc_pkdesc.cpp \ pkdesc.h moc_pkfind.o: moc_pkfind.cpp \ pkfind.h moc_pksettings.o: moc_pksettings.cpp \ pksettings.h moc_packagemanager.cpp: packagemanager.h $(MOC) packagemanager.h -o moc_packagemanager.cpp moc_packagemanagerbase.cpp: packagemanagerbase.h $(MOC) packagemanagerbase.h -o moc_packagemanagerbase.cpp moc_pkdesc.cpp: pkdesc.h $(MOC) pkdesc.h -o moc_pkdesc.cpp moc_pkfind.cpp: pkfind.h $(MOC) pkfind.h -o moc_pkfind.cpp moc_pksettings.cpp: pksettings.h $(MOC) pksettings.h -o moc_pksettings.cpp diff --git a/noncore/unsupported/oipkg/qipkg.pro b/noncore/unsupported/oipkg/qipkg.pro index 90d8703..22a37ee 100644 --- a/noncore/unsupported/oipkg/qipkg.pro +++ b/noncore/unsupported/oipkg/qipkg.pro @@ -1,13 +1,13 @@ -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin TEMPLATE = app CONFIG = qt warn_on release HEADERS = packagemanager.h SOURCES = packagemanager.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui TARGET = qipkg TRANSLATIONS = ../i18n/de/qipkg.ts diff --git a/scripts/q_functions b/scripts/q_functions index cf2c2e1..0705cc2 100755 --- a/scripts/q_functions +++ b/scripts/q_functions @@ -1,232 +1,232 @@ #!/bin/sh # # Common helper functions used by the other scripts # # Copyright 1999-2000 Trolltech AS. All rights reserved. # function print_example_usage { cat << END Example of what you do: ~/qpe$ q_add_application foo Foo MyFooBarApp "A FooBar Application" ~/qpe$ cd foo ~/qpe/foo$ q_add_class foo Bar ~/qpe/foo$ q_add_function public: void Bar::barFoo "( int a, int b )" ~/qpe/foo$ q_add_variable private: int Bar::fooBarInt END } function print_copyright_header { cat << END /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ END } function print_main_file { print_copyright_header cat << END #include <qpeapplication.h> #include <qmainwindow.h> #include "$NEW_CLASS_HEADER_FILE" int main( int argc, char ** argv ) { QPEApplication a( argc, argv ); $NEW_CLASS_NAME *m = new $NEW_CLASS_NAME(); a.setMainWidget( m ); m->show(); return a.exec(); } END } function print_source_file { print_copyright_header cat << END #include <qwidget.h> #include <pixmaploader.h> #include "$NEW_CLASS_HEADER_FILE" $NEW_CLASS_NAME::$NEW_CLASS_NAME( QWidget *parent=0, const char *name=0, WFlags f = 0) : QWidget( parent, name, f ) { } void $NEW_CLASS_NAME::exampleFunction( ) { } END } function print_header_file { print_copyright_header cat << END #ifndef $NEW_CLASS_HEADER_DEFINE #define $NEW_CLASS_HEADER_DEFINE #include <qwidget.h> class $NEW_CLASS_NAME : public QWidget { Q_OBJECT public: $NEW_CLASS_NAME( QWidget *parent=0, const char *name=0, WFlags f = 0); protected: void exampleFunction( ); private: int exampleVariable; }; #endif // $NEW_CLASS_HEADER_DEFINE END } function print_pro_file { cat << END TEMPLATE = app CONFIG = qt warn_on release DESTDIR = ../bin HEADERS = $NEW_CLASS_HEADER_FILE SOURCES = $NEW_CLASS_SOURCE_FILE $NEW_APP_MAIN_FILE INTERFACES = INCLUDEPATH += ../library DEPENDPATH += ../library LIBS += -lqpe TARGET = $NEW_APP_NAME END } function print_install_file { cat << END #!/bin/sh -if [ a\$QPEDIR = a ] +if [ a\$OPIEDIR = a ] then -echo QPEDIR must be set +echo OPIEDIR must be set exit fi -[ -f \$QPEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$QPEDIR/pics/ -[ -f \$QPEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$QPEDIR/apps/ -mv \$QPEDIR/Makefile \$QPEDIR/Makefile.orig +[ -f \$OPIEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$OPIEDIR/pics/ +[ -f \$OPIEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$OPIEDIR/apps/ +mv \$OPIEDIR/Makefile \$OPIEDIR/Makefile.orig sed "s/APPS=/&$NEW_APP_NAME \\\\\\\\ \\\\ - /" \$QPEDIR/Makefile.orig >> \$QPEDIR/Makefile + /" \$OPIEDIR/Makefile.orig >> \$OPIEDIR/Makefile echo You may wish to move the desktop file in to echo an appropriate subdirectory of the menus. END } function print_desktop_file { cat << END [Desktop Entry] Type=Application Exec=$NEW_APP_NAME Icon=$NEW_APP_ICON_FILE Name=$NEW_APP_MENU_NAME Comment=$NEW_APP_DESCRIPTION END } function print_icon_file { XPM_NAME="$NEW_APP_NAME"_xpm cat << END /* XPM */ static char *$XPM_NAME[] = { "14 14 3 1", " c None", ". c #000000", "a c #FFFFFF", " ", " aaaaaaaaaaaa ", " a..........a ", " a..aaaaaa..a ", " a.a.aaaa.a.a ", " a.aa.aa.aa.a ", " a.aaa..aaa.a ", " a.aaa..aaa.a ", " a.aa.aa.aa.a ", " a.a.aaaa.a.a ", " a..aaaaaa..a ", " a..........a ", " aaaaaaaaaaaa ", " "}; END } function add_class_to_pro_file { cat << END HEADERS += $NEW_CLASS_HEADER_FILE SOURCES += $NEW_CLASS_SOURCE_FILE END } function get_number_of_lines { # Get the number of lines in the file LINES=`wc -l $ORIGINAL_CLASS_HEADER_FILE | cut -d " " -f 6` } function get_first_line_of_class_definition { # First look for class definition with Q_OBJECT a few lines below LINE=`grep -n -A 3 "class $EXISTING_CLASS_NAME " $ORIGINAL_CLASS_HEADER_FILE | grep "Q_OBJECT" | cut -d "-" -f 1` if [ -z "$LINE" ] then # else look for class definition with open brace on same line LINE=`grep -n "class $EXISTING_CLASS_NAME.*[{]" $ORIGINAL_CLASS_HEADER_FILE | cut -d ":" -f 1` #elif doesn't work here fi;if [ -z "$LINE" ] then # else look for class with open brace a few lines below LINE=`grep -n -A 3 "class $EXISTING_CLASS_NAME " $ORIGINAL_CLASS_HEADER_FILE | grep "\-.*[{]" | cut -d "-" -f 1` #elif doesn't work here fi } |