-rwxr-xr-x | configure | 19 | ||||
-rw-r--r-- | core/applets/clipboardapplet/Makefile.in | 8 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/Makefile.in | 14 | ||||
-rw-r--r-- | core/launcher/launcher.pro | 2 | ||||
-rw-r--r-- | core/launcher/launcherview.cpp | 27 | ||||
-rw-r--r-- | core/multimedia/opieplayer/Makefile.in | 64 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libflash/Makefile.in | 9 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/Makefile.in | 11 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/Makefile.in | 13 | ||||
-rw-r--r-- | core/multimedia/opieplayer/wavplugin/Makefile.in | 13 | ||||
-rw-r--r-- | core/pim/datebook/Makefile.in | 119 | ||||
-rw-r--r-- | docs/start.doc | 51 | ||||
-rw-r--r-- | library/Makefile.in | 125 | ||||
-rw-r--r-- | library/global.cpp | 2 | ||||
-rw-r--r-- | library/library.pro | 10 | ||||
-rw-r--r-- | noncore/games/chess/Makefile.in | 16 | ||||
-rw-r--r-- | noncore/games/go/Makefile.in | 15 |
17 files changed, 159 insertions, 359 deletions
@@ -1,270 +1,275 @@ #!/bin/sh # # Configures to build the Qtopia Environment # # Copyright 1999-2000 Trolltech AS. All rights reserved. # -PLATFORM=linux-generic-g++ +PLATFORM=generic SHARING=shared DEBUG= QCONFIGARG= touch .test.qpe. if [ '!' -f ${OPIEDIR}/.test.qpe. ]; then rm .test.qpe. echo echo 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 $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) +VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h) +VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h) +VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/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 +if [ -f library/custom-$PLATFORM.h ] +then + rm -f library/custom.h + ln -s custom-$PLATFORM.h library/custom.h +fi + +mkdir -p include/qpe +( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) 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|$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/clipboardapplet/Makefile.in b/core/applets/clipboardapplet/Makefile.in index 2ddeb42..c42404e 100644 --- a/core/applets/clipboardapplet/Makefile.in +++ b/core/applets/clipboardapplet/Makefile.in @@ -1,115 +1,117 @@ ############################################################################# ####### 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 = clipboardapplet TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = clipboard.h \ clipboardappletimpl.h SOURCES = clipboard.cpp \ clipboardappletimpl.cpp OBJECTS = clipboard.o \ clipboardappletimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_clipboard.cpp OBJMOC = moc_clipboard.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 clipboardapplet.pro +tmake: Makefile.in + +Makefile.in: clipboardapplet.pro + tmake clipboardapplet.pro -o Makefile.in 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 clipboard.o: clipboard.cpp \ clipboard.h clipboardappletimpl.o: clipboardappletimpl.cpp \ clipboard.h \ clipboardappletimpl.h moc_clipboard.o: moc_clipboard.cpp \ clipboard.h moc_clipboard.cpp: clipboard.h $(MOC) clipboard.h -o moc_clipboard.cpp diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in index 8a69557..0da49d7 100644 --- a/core/apps/embeddedkonsole/Makefile.in +++ b/core/apps/embeddedkonsole/Makefile.in @@ -1,286 +1,282 @@ ############################################################################# ####### 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$(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 = $(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 +tmake: Makefile.in + +Makefile.in: embeddedkonsole.pro + tmake embeddedkonsole.pro -o Makefile.in 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 \ - $(OPIEDIR)/include/qpe/qpeapplication.h \ default.keytab.h konsole.o: konsole.cpp \ - $(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 \ - $(OPIEDIR)/include/qpe/qpeapplication.h + session.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/launcher/launcher.pro b/core/launcher/launcher.pro index 0078faf..32cb95f 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro @@ -1,110 +1,112 @@ TEMPLATE = app CONFIG = qt warn_on release DESTDIR = $(OPIEDIR)/bin HEADERS = background.h \ desktop.h \ + qprocess.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 \ $(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 \ + qprocess.cpp qprocess_unix.cpp \ info.cpp \ appicons.cpp \ taskbar.cpp \ sidething.cpp \ mrulist.cpp \ stabmon.cpp \ inputmethods.cpp \ systray.cpp \ wait.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ $(OPIEDIR)/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.cpp \ $(OPIEDIR)/rsync/base64.c \ $(OPIEDIR)/rsync/buf.c \ $(OPIEDIR)/rsync/checksum.c \ $(OPIEDIR)/rsync/command.c \ $(OPIEDIR)/rsync/delta.c \ $(OPIEDIR)/rsync/emit.c \ $(OPIEDIR)/rsync/hex.c \ $(OPIEDIR)/rsync/job.c \ $(OPIEDIR)/rsync/mdfour.c \ $(OPIEDIR)/rsync/mksum.c \ $(OPIEDIR)/rsync/msg.c \ $(OPIEDIR)/rsync/netint.c \ $(OPIEDIR)/rsync/patch.c \ $(OPIEDIR)/rsync/prototab.c \ $(OPIEDIR)/rsync/readsums.c \ $(OPIEDIR)/rsync/scoop.c \ $(OPIEDIR)/rsync/search.c \ $(OPIEDIR)/rsync/stats.c \ $(OPIEDIR)/rsync/stream.c \ $(OPIEDIR)/rsync/sumset.c \ $(OPIEDIR)/rsync/trace.c \ $(OPIEDIR)/rsync/tube.c \ $(OPIEDIR)/rsync/util.c \ $(OPIEDIR)/rsync/version.c \ $(OPIEDIR)/rsync/whole.c \ $(OPIEDIR)/rsync/qrsync.cpp INTERFACES = shutdown.ui syncdialog.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include . INCLUDEPATH += $(OPIEDIR)/calibrate DEPENDPATH += $(OPIEDIR)/calibrate INCLUDEPATH += $(OPIEDIR)/rsync DEPENDPATH += $(OPIEDIR)/rsync TARGET = qpe LIBS += -lqpe -lcrypt TRANSLATIONS = ../i18n/de/qpe.ts diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index ed39720..e8741a2 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp @@ -1,596 +1,603 @@ /********************************************************************** ** 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 "launcherview.h" #include <qpe/qpeapplication.h> #include <qpe/applnk.h> #include <qpe/qpedebug.h> #include <qpe/categories.h> #include <qpe/categoryselect.h> #include <qpe/menubutton.h> #include <qpe/resource.h> #include <qpe/qpetoolbar.h> #include <qtimer.h> #include <qdict.h> #include <qfile.h> #include <qfileinfo.h> #include <qhbox.h> #include <qiconview.h> #include <qpainter.h> #include <qregexp.h> #include <qtoolbutton.h> class LauncherIconView : public QIconView { public: LauncherIconView( QWidget* parent, const char* name=0 ) : QIconView(parent,name), tf(""), cf(0), bsy(0) { sortmeth = Name; hidden.setAutoDelete(TRUE); ike = FALSE; } ~LauncherIconView() { #if 0 // debuggery QListIterator<AppLnk> it(hidden); AppLnk* l; while ((l=it.current())) { ++it; //qDebug("%p: hidden (should remove)",l); } #endif } QIconViewItem* busyItem() const { return bsy; } void updateCategoriesAndMimeTypes(); void doAutoScroll() { // We don't want rubberbanding (yet) } void setBusy(bool on) { QIconViewItem *c = on ? currentItem() : 0; if ( bsy != c ) { QIconViewItem* o = bsy; bsy = c; if ( o ) o->repaint(); if ( c ) c->repaint(); } } bool inKeyEvent() const { return ike; } void keyPressEvent(QKeyEvent* e) { ike = TRUE; if ( e->key() == Key_F33 ) { // "OK" button returnPressed(currentItem()); } QIconView::keyPressEvent(e); ike = FALSE; } void addItem(AppLnk* app, bool resort=TRUE); bool removeLink(const QString& linkfile); QStringList mimeTypes() const; QStringList categories() const; void clear() { mimes.clear(); cats.clear(); QIconView::clear(); hidden.clear(); } void addCatsAndMimes(AppLnk* app) { // QStringList c = app->categories(); // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) { // cats.replace(*cit,(void*)1); // } QString maj=app->type(); int sl=maj.find('/'); if (sl>=0) { QString k = maj.left(sl); mimes.replace(k,(void*)1); } } void drawBackground( QPainter *p, const QRect &r ) { int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0; //int backgroundMode = 2; if ( backgroundMode == 1 ) { // Double buffer the background static QPixmap *bg = NULL; static QColor bgColor; if ( (bg == NULL) || (bgColor != colorGroup().button()) ) { // Create a new background double buffer if (bg == NULL) bg = new QPixmap( width(), height() ); bgColor = colorGroup().button(); QPainter painter( bg ); painter.fillRect( QRect( 0, 0, width(), height() ), colorGroup().background().light(110)); // Overlay the Qtopia logo in the center QImage logo = Resource::loadImage( "qpe-background" ); if ( !logo.isNull() ) painter.drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); } // Draw the double buffer to the widget (it is tiled for when the icon view is large) p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(), (r.y() + contentsY()) % bg->height() ) ); } else if ( backgroundMode == 2 ) { static QPixmap *bg = 0; static QColor bgColor; if ( !bg || (bgColor != colorGroup().background()) ) { bgColor = colorGroup().background(); bg = new QPixmap( width(), 9 ); QPainter painter( bg ); for ( int i = 0; i < 3; i++ ) { painter.setPen( colorGroup().background().light(130) ); painter.drawLine( 0, i*3, width()-1, i*3 ); painter.drawLine( 0, i*3+1, width()-1, i*3+1 ); painter.setPen( colorGroup().background().light(105) ); painter.drawLine( 0, i*3+2, width()-1, i*3+2 ); } } p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(), (r.y() + contentsY()) % bg->height() ) ); } else { p->fillRect( r, QBrush( colorGroup().background().light(110) ) ); } } void hideOrShowItems(bool resort); void setTypeFilter(const QString& typefilter, bool resort) { tf = QRegExp(typefilter,FALSE,TRUE); hideOrShowItems(resort); } void setCategoryFilter( int catfilter, bool resort ) { Categories cat; cat.load( categoryFileName() ); QString str; if ( catfilter == -2 ) cf = 0; else cf = catfilter; hideOrShowItems(resort); } enum SortMethod { Name, Date, Type }; void setSortMethod( SortMethod m ) { if ( sortmeth != m ) { sortmeth = m; sort(); } } int compare(const AppLnk* a, const AppLnk* b) { switch (sortmeth) { case Name: return a->name().compare(b->name()); case Date: { - QFileInfo fa(a->linkFile()); - if ( !fa.exists() ) fa.setFile(a->file()); - QFileInfo fb(b->linkFile()); - if ( !fb.exists() ) fb.setFile(b->file()); + QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file()); + QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file()); return fa.lastModified().secsTo(fb.lastModified()); } case Type: return a->type().compare(b->type()); } return 0; } protected: void styleChange( QStyle &old ) { QIconView::styleChange( old ); //### duplicated code from LauncherView constructor int dw = QApplication::desktop()->width(); setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240 } private: QList<AppLnk> hidden; QDict<void> mimes; QDict<void> cats; SortMethod sortmeth; QRegExp tf; int cf; QIconViewItem* bsy; bool ike; }; bool LauncherView::bsy=FALSE; void LauncherView::setBusy(bool on) { icons->setBusy(on); } class LauncherItem : public QIconViewItem { public: LauncherItem( QIconView *parent, AppLnk* applnk ); ~LauncherItem() { LauncherIconView* liv = (LauncherIconView*)iconView(); if ( liv->busyItem() == this ) liv->setBusy(FALSE); delete app; } AppLnk* appLnk() const { return app; } AppLnk* takeAppLnk() { AppLnk* r=app; app=0; return r; } virtual int compare ( QIconViewItem * i ) const; void paintItem( QPainter *p, const QColorGroup &cg ) { LauncherIconView* liv = (LauncherIconView*)iconView(); QBrush oldBrush( liv->itemTextBackground() ); QColorGroup mycg( cg ); if ( liv->currentItem() == this ) { liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) ); mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) ); } QIconViewItem::paintItem(p,mycg); if ( liv->currentItem() == this ) liv->setItemTextBackground( oldBrush ); if ( liv->busyItem() == this ) { static QPixmap* busypm=0; if ( !busypm ) busypm = new QPixmap(Resource::loadPixmap("launching")); p->drawPixmap(x()+(width()-busypm->width())/2, y(),*busypm); } } protected: AppLnk* app; }; LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk ) : QIconViewItem( parent, applnk->name(), applnk->bigPixmap() ), app(applnk) // Takes ownership { } int LauncherItem::compare ( QIconViewItem * i ) const { LauncherIconView* view = (LauncherIconView*)iconView(); return view->compare(app,((LauncherItem *)i)->appLnk()); } QStringList LauncherIconView::mimeTypes() const { QStringList r; QDictIterator<void> it(mimes); while (it.current()) { r.append(it.currentKey()); ++it; } r.sort(); return r; } void LauncherIconView::addItem(AppLnk* app, bool resort) { addCatsAndMimes(app); if ( (tf.isEmpty() || tf.match(app->type()) >= 0) && (cf == 0 || app->categories().contains(cf) || cf == -1 && app->categories().count() == 0 ) ) (void) new LauncherItem( this, app ); else hidden.append(app); if ( resort ) sort(); } void LauncherIconView::updateCategoriesAndMimeTypes() { mimes.clear(); cats.clear(); LauncherItem* item = (LauncherItem*)firstItem(); while (item) { addCatsAndMimes(item->appLnk()); item = (LauncherItem*)item->nextItem(); } QListIterator<AppLnk> it(hidden); AppLnk* l; while ((l=it.current())) { addCatsAndMimes(l); ++it; } } void LauncherIconView::hideOrShowItems(bool resort) { hidden.setAutoDelete(FALSE); QList<AppLnk> links=hidden; hidden.clear(); hidden.setAutoDelete(TRUE); LauncherItem* item = (LauncherItem*)firstItem(); while (item) { links.append(item->takeAppLnk()); item = (LauncherItem*)item->nextItem(); } + bool oldAutoArrange = autoArrange(); + setAutoArrange( FALSE ); clear(); QListIterator<AppLnk> it(links); AppLnk* l; while ((l=it.current())) { addItem(l,FALSE); ++it; } if ( resort ) sort(); + setAutoArrange( oldAutoArrange ); } bool LauncherIconView::removeLink(const QString& linkfile) { LauncherItem* item = (LauncherItem*)firstItem(); + AppLnk* l; + bool did = FALSE; + DocLnk dl(linkfile); while (item) { - if ( item->appLnk()->linkFile() == linkfile ) { + l = item->appLnk(); + if ( l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile + || dl.isValid() && dl.file() == l->file() ) { delete item; - return TRUE; + did = TRUE; } item = (LauncherItem*)item->nextItem(); } QListIterator<AppLnk> it(hidden); - AppLnk* l; while ((l=it.current())) { ++it; - if ( l->linkFile() == linkfile ) { + if ( l->linkFileKnown() && l->linkFile() == linkfile + || l->file() == linkfile + || dl.isValid() && dl.file() == l->file() ) { hidden.removeRef(l); - return TRUE; + did = TRUE; } } - return FALSE; + return did; } LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) : QVBox( parent, name, fl ) { icons = new LauncherIconView( this ); setFocusProxy(icons); QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold ); int dw = QApplication::desktop()->width(); icons->setItemsMovable( FALSE ); icons->setAutoArrange( TRUE ); icons->setSorting( TRUE ); icons->setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240 icons->setGridY( fontMetrics().height()*2+24 ); icons->setFrameStyle( QFrame::NoFrame ); icons->setSpacing( 4 ); icons->setMargin( 0 ); icons->setSelectionMode( QIconView::Multi ); icons->setBackgroundMode( PaletteBase ); connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)), SLOT(itemClicked(int, QIconViewItem *)) ); connect( icons, SIGNAL(selectionChanged()), SLOT(selectionChanged()) ); connect( icons, SIGNAL(returnPressed(QIconViewItem *)), SLOT(returnPressed(QIconViewItem *)) ); connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)), SLOT(itemPressed(int, QIconViewItem *)) ); tools = 0; } LauncherView::~LauncherView() { } void LauncherView::setToolsEnabled(bool y) { if ( !y != !tools ) { if ( y ) { tools = new QHBox(this); // Type filter typemb = new MenuButton(tools); typemb->setLabel(tr("Type: %1")); // Category filter catmb = new CategorySelect(tools); updateTools(); tools->show(); } else { delete tools; tools = 0; } } } void LauncherView::updateTools() { disconnect( typemb, SIGNAL(selected(const QString&)), this, SLOT(showType(const QString&)) ); disconnect( catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)) ); icons->updateCategoriesAndMimeTypes(); QString prev; // Type filter QStringList types; types << tr("All"); types << "--"; types += icons->mimeTypes(); prev = typemb->currentText(); typemb->clear(); typemb->insertItems(types); typemb->select(prev); Categories cats( 0 ); cats.load( categoryFileName() ); QArray<int> vl( 0 ); catmb->setCategories( vl, "Document View", tr("Document View") ); catmb->setRemoveCategoryEdit( TRUE ); catmb->setAllCategories( TRUE ); connect(typemb, SIGNAL(selected(const QString&)), this, SLOT(showType(const QString&))); connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int))); } void LauncherView::sortBy(int s) { icons->setSortMethod((LauncherIconView::SortMethod)s); } void LauncherView::showType(const QString& t) { if ( t == tr("All") ) { icons->setTypeFilter("",TRUE); } else { icons->setTypeFilter(t+"/*",TRUE); } } void LauncherView::showCategory( int c ) { icons->setCategoryFilter( c, TRUE ); } void LauncherView::resizeEvent(QResizeEvent *e) { QVBox::resizeEvent( e ); if ( e->size().width() != e->oldSize().width() ) sort(); } void LauncherView::populate( AppLnkSet *folder, const QString& typefilter ) { icons->clear(); internalPopulate( folder, typefilter ); } void LauncherView::selectionChanged() { QIconViewItem* item = icons->currentItem(); if ( item && item->isSelected() ) { AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); if ( icons->inKeyEvent() ) // not for mouse press emit clicked( appLnk ); item->setSelected(FALSE); } } void LauncherView::returnPressed( QIconViewItem *item ) { if ( item ) { AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); emit clicked( appLnk ); } } void LauncherView::itemClicked( int btn, QIconViewItem *item ) { if ( item ) { AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); if ( btn == LeftButton ) { // Make sure it's the item we execute that gets highlighted icons->setCurrentItem( item ); emit clicked( appLnk ); } item->setSelected(FALSE); } } void LauncherView::itemPressed( int btn, QIconViewItem *item ) { if ( item ) { AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); if ( btn == RightButton ) emit rightPressed( appLnk ); /* else if ( btn == LeftButton ) emit clicked( appLnk ); */ item->setSelected(FALSE); } } void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter ) { QListIterator<AppLnk> it( folder->children() ); icons->setTypeFilter(typefilter,FALSE); while ( it.current() ) { icons->addItem(*it,FALSE); ++it; } icons->sort(); } bool LauncherView::removeLink(const QString& linkfile) { return icons->removeLink(linkfile); } void LauncherView::sort() { icons->sort(); } void LauncherView::addItem(AppLnk* app, bool resort) { icons->addItem(app,resort); } void LauncherView::setFileSystems(const QList<FileSystem> &) { // ### does nothing now... } diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in index 6e007ec..3e1f9fc 100644 --- a/core/multimedia/opieplayer/Makefile.in +++ b/core/multimedia/opieplayer/Makefile.in @@ -1,280 +1,234 @@ ############################################################################# ####### 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$(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 = $(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 +tmake: Makefile.in + +Makefile.in: mpegplayer.pro + tmake mpegplayer.pro -o Makefile.in 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 \ - $(OPIEDIR)/include/qpe/qpeapplication.h \ mediaplayerstate.h \ playlistwidget.h \ - $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ videowidget.h \ loopcontrol.h \ - mediaplayer.h \ - $(OPIEDIR)/include/qpe/qlibrary.h \ - $(OPIEDIR)/include/qpe/qcom.h \ - $(OPIEDIR)/include/qpe/quuid.h \ - mediaplayerplugininterface.h + mediaplayer.h loopcontrol.o: loopcontrol.cpp \ - $(OPIEDIR)/include/qpe/qpeapplication.h \ - $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ loopcontrol.h \ videowidget.h \ audiodevice.h \ - mediaplayerplugininterface.h \ - $(OPIEDIR)/include/qpe/qcom.h \ - $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h playlistselection.o: playlistselection.cpp \ - $(OPIEDIR)/include/qpe/applnk.h \ - $(OPIEDIR)/include/qpe/resource.h \ playlistselection.h mediaplayerstate.o: mediaplayerstate.cpp \ - $(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 \ - $(OPIEDIR)/include/qpe/resource.h \ videowidget.h \ - mediaplayerplugininterface.h \ - $(OPIEDIR)/include/qpe/qcom.h \ - $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h audiowidget.o: audiowidget.cpp \ - $(OPIEDIR)/include/qpe/resource.h \ audiowidget.h \ mediaplayerstate.h playlistwidget.o: playlistwidget.cpp \ - $(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 \ - $(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 \ - $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ loopcontrol.h \ audiodevice.h \ mediaplayerstate.h audiodevice.o: audiodevice.cpp \ - $(OPIEDIR)/include/qpe/qpeapplication.h \ - $(OPIEDIR)/include/qpe/config.h \ - audiodevice.h \ - $(OPIEDIR)/include/qpe/qcopenvelope_qws.h + audiodevice.h moc_loopcontrol.o: moc_loopcontrol.cpp \ loopcontrol.h moc_playlistselection.o: moc_playlistselection.cpp \ - playlistselection.h \ - $(OPIEDIR)/include/qpe/applnk.h + playlistselection.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 \ - $(OPIEDIR)/include/qpe/applnk.h + playlistwidget.h moc_mediaplayer.o: moc_mediaplayer.cpp \ - mediaplayer.h \ - $(OPIEDIR)/include/qpe/qlibrary.h \ - $(OPIEDIR)/include/qpe/qcom.h \ - $(OPIEDIR)/include/qpe/quuid.h \ - mediaplayerplugininterface.h + mediaplayer.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/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in index 52c8557..0947454 100644 --- a/core/multimedia/opieplayer/libflash/Makefile.in +++ b/core/multimedia/opieplayer/libflash/Makefile.in @@ -1,644 +1,641 @@ ############################################################################# ####### 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 -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 = flashplugin TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files 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 OBJECTS = libflashplugin.o \ libflashpluginimpl.o \ adpcm.o \ character.o \ flash.o \ graphic16.o \ matrix.o \ script.o \ sprite.o \ bitmap.o \ cxform.o \ font.o \ graphic24.o \ movie.o \ shape.o \ sqrt.o \ button.o \ displaylist.o \ graphic.o \ graphic32.o \ program.o \ sound.o \ text.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: Makefile.in Makefile.in: libflash.pro tmake libflash.pro -o Makefile.in 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 libflashplugin.o: libflashplugin.cpp \ libflashplugin.h \ - flash.h \ - ../mediaplayerplugininterface.h + flash.h libflashpluginimpl.o: libflashpluginimpl.cpp \ libflashplugin.h \ flash.h \ - ../mediaplayerplugininterface.h \ - libflashpluginimpl.h \ - ../mediaplayerplugininterface.h + libflashpluginimpl.h adpcm.o: adpcm.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h character.o: character.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h flash.o: flash.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h \ graphic16.h \ graphic24.h \ graphic32.h graphic16.o: graphic16.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h \ graphic16.h matrix.o: matrix.cc \ matrix.h script.o: script.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h sprite.o: sprite.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h bitmap.o: bitmap.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h cxform.o: cxform.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h font.o: font.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h graphic24.o: graphic24.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h \ graphic24.h movie.o: movie.cc \ movie.h \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h shape.o: shape.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h sqrt.o: sqrt.cc button.o: button.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h displaylist.o: displaylist.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h graphic.o: graphic.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h graphic32.o: graphic32.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h \ graphic32.h program.o: program.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h sound.o: sound.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h text.o: text.cc \ swf.h \ flash.h \ matrix.h \ cxform.h \ rect.h \ jpeglib.h \ jconfig.h \ jmorecfg.h \ jerror.h \ graphic.h \ character.h \ bitmap.h \ shape.h \ displaylist.h \ sound.h \ button.h \ font.h \ text.h \ adpcm.h \ program.h \ sprite.h \ script.h \ movie.h diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in index 19ded26..d2e1cda 100644 --- a/core/multimedia/opieplayer/libmad/Makefile.in +++ b/core/multimedia/opieplayer/libmad/Makefile.in @@ -1,226 +1,225 @@ ############################################################################# ####### 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$(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 +tmake: Makefile.in + +Makefile.in: libmad.pro + tmake libmad.pro -o Makefile.in 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 + libmadpluginimpl.h diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index 9881815..4ccdb8c 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in @@ -1,774 +1,773 @@ ############################################################################# ####### 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$(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 +tmake: Makefile.in + +Makefile.in: libmpeg3.pro + tmake libmpeg3.pro -o Makefile.in 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 + mpeg3protos.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 + libmpeg3pluginimpl.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/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in index e9fec6c..560534e 100644 --- a/core/multimedia/opieplayer/wavplugin/Makefile.in +++ b/core/multimedia/opieplayer/wavplugin/Makefile.in @@ -1,112 +1,111 @@ ############################################################################# ####### 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$(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 +tmake: Makefile.in + +Makefile.in: wavplugin.pro + tmake wavplugin.pro -o Makefile.in 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 + wavplugin.h wavpluginimpl.o: wavpluginimpl.cpp \ wavplugin.h \ - ../mediaplayerplugininterface.h \ - wavpluginimpl.h \ - ../mediaplayerplugininterface.h + wavpluginimpl.h diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in index 0c3282e..cc31efe 100644 --- a/core/pim/datebook/Makefile.in +++ b/core/pim/datebook/Makefile.in @@ -1,408 +1,323 @@ ############################################################################# ####### 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$(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 = $(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 +tmake: Makefile.in + +Makefile.in: datebook.pro + tmake datebook.pro -o Makefile.in 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 \ - $(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 + datebook.h datebookday.o: datebookday.cpp \ datebookday.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 \ - $(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 + datebookdayheader.h datebook.o: datebook.cpp \ datebook.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 \ - $(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 + dateentry.h dateentryimpl.o: dateentryimpl.cpp \ dateentryimpl.h \ dateentry.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 \ - $(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 + repeatentrybase.h datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ datebookdayheaderimpl.h \ - datebookdayheader.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 + datebookdayheader.h datebooksettings.o: datebooksettings.cpp \ datebooksettings.h \ - datebooksettingsbase.h \ - $(OPIEDIR)/include/qpe/qpeapplication.h + datebooksettingsbase.h datebookweek.o: datebookweek.cpp \ datebookweek.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 \ - $(OPIEDIR)/include/qpe/calendar.h \ - $(OPIEDIR)/include/qpe/datebookdb.h \ - $(OPIEDIR)/include/qpe/qpeapplication.h \ - $(OPIEDIR)/include/qpe/timestring.h + datebookweekheader.h datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ datebookweekheaderimpl.h \ datebookweekheader.h repeatentry.o: repeatentry.cpp \ repeatentry.h \ - repeatentrybase.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 + repeatentrybase.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 \ - $(OPIEDIR)/include/qpe/event.h \ - $(OPIEDIR)/include/qpe/palmtoprecord.h \ - $(OPIEDIR)/include/qpe/timeconversion.h \ - $(OPIEDIR)/include/qpe/qpcglobal.h + datebookday.h moc_datebook.o: moc_datebook.cpp \ - datebook.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 + datebook.h moc_dateentryimpl.o: moc_dateentryimpl.cpp \ dateentryimpl.h \ - dateentry.h \ - $(OPIEDIR)/include/qpe/event.h \ - $(OPIEDIR)/include/qpe/palmtoprecord.h \ - $(OPIEDIR)/include/qpe/timeconversion.h \ - $(OPIEDIR)/include/qpe/qpcglobal.h + dateentry.h moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ datebookdayheaderimpl.h \ datebookdayheader.h moc_datebookweek.o: moc_datebookweek.cpp \ - datebookweek.h \ - $(OPIEDIR)/include/qpe/event.h \ - $(OPIEDIR)/include/qpe/palmtoprecord.h \ - $(OPIEDIR)/include/qpe/timeconversion.h \ - $(OPIEDIR)/include/qpe/qpcglobal.h + datebookweek.h moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ datebookweekheaderimpl.h \ datebookweekheader.h moc_repeatentry.o: moc_repeatentry.cpp \ repeatentry.h \ - repeatentrybase.h \ - $(OPIEDIR)/include/qpe/event.h \ - $(OPIEDIR)/include/qpe/palmtoprecord.h \ - $(OPIEDIR)/include/qpe/timeconversion.h \ - $(OPIEDIR)/include/qpe/qpcglobal.h + repeatentrybase.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/docs/start.doc b/docs/start.doc index 01b6ab1..53a4e36 100644 --- a/docs/start.doc +++ b/docs/start.doc @@ -1,191 +1,206 @@ /*! \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 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 + export QPEDIR=/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 $OPIEDIR/example . + cp -r $QPEDIR/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 $OPIEDIR/apps/Applications - cp Example.png $OPIEDIR/pics - cp example $OPIEDIR/bin + cp example.desktop $QPEDIR/apps/Applications + cp Example.png $QPEDIR/pics + cp example $QPEDIR/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 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++ + export QPEDIR=/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): + <li> Rebuild the makefile ($TMAKEPATH has changed) above: <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): + <li> Build it: <pre> + make +</pre> + + <li> Install it (note that this is now going into the /opt/Qtopia/sharp/ directory): +<pre> + su # root privileges required to install + cp example.desktop $QPEDIR/apps/Applications + cp Example.png $QPEDIR/pics + cp example $QPEDIR/bin + exit # no need to be root anymore +</pre> + +</pre> + + <li> To install it on a device, build an ipk package file: +<pre> + su # root privileges required to strip the executable mkipks example.control + exit # no need to be root anymore </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/library/Makefile.in b/library/Makefile.in index b74b818..b8fc1f6 100644 --- a/library/Makefile.in +++ b/library/Makefile.in @@ -1,903 +1,818 @@ ############################################################################# ####### 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$(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 \ + fileselector_p.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 + 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 \ - quuid.cpp \ - qlibrary.cpp \ - qlibrary_unix.cpp \ - qprocess.cpp \ - qprocess_unix.cpp + lnkproperties.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_fileselector_p.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_fileselector_p.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 +tmake: Makefile.in + +Makefile.in: library.pro + tmake library.pro -o Makefile.in 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 \ + fileselector_p.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 \ 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 \ - custom.h + power.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/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 -proxiesbase_p.o: proxiesbase_p.cpp - categoryeditbase_p.o: categoryeditbase_p.cpp findwidgetbase_p.o: findwidgetbase_p.cpp 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_fileselector_p.o: moc_fileselector_p.cpp \ + fileselector_p.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 \ +moc_categoryeditbase_p.o: network.moc \ network.cpp -moc_categoryeditbase_p.o: password.moc \ +moc_findwidgetbase_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 \ +moc_lnkpropertiesbase_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_fileselector_p.cpp: fileselector_p.h + $(MOC) fileselector_p.h -o moc_fileselector_p.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 e5fc2b3..fd7579a 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("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 ); + _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 058d216..e71e5a0 100644 --- a/library/library.pro +++ b/library/library.pro @@ -1,132 +1,130 @@ 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 \ + fileselector_p.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 +qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h +qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp INCLUDEPATH += $(OPIEDIR)/include backend LIBS += -ldl -lcrypt -lm -INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui +INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui TARGET = qpe DESTDIR = $(QTDIR)/lib$(PROJMAK) # This is set by configure$(OPIEDIR). VERSION = 1.5.0 TRANSLATIONS = ../i18n/de/libqpe.ts diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in index 7354d76..a1f2cd7 100644 --- a/noncore/games/chess/Makefile.in +++ b/noncore/games/chess/Makefile.in @@ -1,134 +1,134 @@ ############################################################################# ####### 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 $(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 = chess TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = chess.h SOURCES = chess.cpp \ main.cpp OBJECTS = chess.o \ main.o \ mainwindow.o INTERFACES = mainwindow.ui UICDECLS = mainwindow.h UICIMPLS = mainwindow.cpp SRCMOC = moc_chess.cpp \ moc_mainwindow.cpp OBJMOC = moc_chess.o \ moc_mainwindow.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 chess.pro +tmake: Makefile.in + +Makefile.in: chess.pro + tmake chess.pro -o Makefile.in 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 chess.o: chess.cpp \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/resource.h \ chess.h main.o: main.cpp \ - mainwindow.h + chess.h mainwindow.h: mainwindow.ui $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h mainwindow.cpp: mainwindow.ui $(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp mainwindow.o: mainwindow.cpp \ mainwindow.h \ mainwindow.ui moc_chess.o: moc_chess.cpp \ chess.h moc_mainwindow.o: moc_mainwindow.cpp \ mainwindow.h moc_chess.cpp: chess.h $(MOC) chess.h -o moc_chess.cpp moc_mainwindow.cpp: mainwindow.h $(MOC) mainwindow.h -o moc_mainwindow.cpp diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in index 985eff0..0395dff 100644 --- a/noncore/games/go/Makefile.in +++ b/noncore/games/go/Makefile.in @@ -1,158 +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$(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 +tmake: Makefile.in + +Makefile.in: go.pro + tmake go.pro -o Makefile.in 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 \ - $(OPIEDIR)/include/qpe/config.h \ - $(OPIEDIR)/include/qpe/resource.h \ - $(OPIEDIR)/include/qpe/qpetoolbar.h \ - $(OPIEDIR)/include/qpe/qpemenubar.h + goplayutils.h main.o: main.cpp \ gowidget.h \ amigo.h \ go.h \ - goplayutils.h \ - $(OPIEDIR)/include/qpe/qpeapplication.h + goplayutils.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 |