author | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
commit | f7b3193e5d2d9a211ce0b963dca571d82adecb71 (patch) (side-by-side diff) | |
tree | 44f49bdc076dc299bba1a4dc8d5d517114be5701 /library | |
parent | 77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff) | |
download | opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2 |
Committing in .
Modified Files:
configure mkipks addressbook/Makefile.in
addressbook/addressbook.pro calc2/calc.pro
calc2/binary/binary.pro calc2/simple/simple.pro
calculator/Makefile.in calculator/calculator.pro
cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
clock/clock.pro datebook/Makefile.in datebook/datebook.pro
dictionary/dictionary.pro doc/qcop.doc doc/start.doc
embeddedkonsole/Makefile.in
embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
filebrowser/Makefile.in filebrowser/filebrowser.pro
freetype/freetype.pro go/Makefile.in go/go.pro
helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
inputmethods/handwriting/Makefile.in
inputmethods/handwriting/handwriting.pro
inputmethods/keyboard/Makefile.in
inputmethods/keyboard/keyboard.pro
inputmethods/pickboard/Makefile.in
inputmethods/pickboard/pickboard.pro
inputmethods/unikeyboard/Makefile.in
inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
keypebble/keypebble.pro library/Makefile.in library/global.cpp
library/library.pro library/qpeapplication.cpp
mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
minesweep/Makefile.in minesweep/minesweep.pro
mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
mpegplayer/libmpeg3/libmpeg3.pro
mpegplayer/libmpeg3/audio/Makefile
mpegplayer/libmpeg3/video/Makefile
mpegplayer/wavplugin/Makefile.in
mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
netsetup/README netsetup/netsetup.pro
netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
netsetup/lan/Makefile.in netsetup/lan/lan.pro
parashoot/Makefile.in parashoot/parashoot.pro
qasteroids/Makefile.in qasteroids/qasteroids.pro
qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
qipkg/qipkg.pro scripts/q_functions
settings/appearance/Makefile.in
settings/appearance/appearance.pro
settings/language/Makefile.in settings/language/language.pro
settings/light-and-power/Makefile.in
settings/light-and-power/light-and-power.pro
settings/rotation/Makefile.in settings/rotation/rotation.pro
settings/security/Makefile.in settings/security/security.pro
settings/sound/Makefile.in settings/sound/sound.pro
settings/systemtime/Makefile.in
settings/systemtime/systemtime.pro showimg/Makefile.in
showimg/showimg.pro single/Makefile.in single/single.pro
snake/Makefile.in snake/snake.pro solitaire/Makefile.in
solitaire/solitaire.pro spreadsheet/Makefile.in
spreadsheet/spreadsheet.pro sysinfo/Makefile.in
sysinfo/sysinfo.pro tableviewer/tableviewer.pro
taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
taskbar/batteryapplet/Makefile.in
taskbar/batteryapplet/batteryapplet.pro
taskbar/clipboardapplet/clipboardapplet.pro
taskbar/clockapplet/Makefile.in
taskbar/clockapplet/clockapplet.pro
taskbar/netmonapplet/Makefile.in
taskbar/netmonapplet/netmonapplet.pro
taskbar/volumeapplet/Makefile.in
taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
website/htdocs/build.html website/htdocs/development.html
website/htdocs/refman/qcop.html
website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
wordgame/wordgame.pro
Log Message:
Changed QPEDIR to OPIEDIR in .pro files, and documentation,
and regenerated all Makefile.in's that were affected.
-rw-r--r-- | library/Makefile.in | 26 | ||||
-rw-r--r-- | library/global.cpp | 2 | ||||
-rw-r--r-- | library/library.pro | 4 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 4 |
4 files changed, 17 insertions, 19 deletions
diff --git a/library/Makefile.in b/library/Makefile.in index c89390f..b74b818 100644 --- a/library/Makefile.in +++ b/library/Makefile.in @@ -1,57 +1,57 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include -Ibackend +INCPATH = -I$(OPIEDIR)/include -Ibackend LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = $(QTDIR)/lib$(PROJMAK)/ VER_MAJ = 1 VER_MIN = 5 VER_PATCH = 0 TARGET = qpe TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = calendar.h \ global.h \ resource.h \ xmlreader.h \ mimetype.h \ menubutton.h \ network.h \ networkinterface.h \ proxies.h \ filemanager.h \ fontmanager.h \ qdawg.h \ datebookmonth.h \ fileselector.h \ imageedit.h \ qcopenvelope_qws.h \ qpedecoration_qws.h \ qpeapplication.h \ qpestyle.h \ qpedialog.h \ lightstyle.h \ config.h \ applnk.h \ sound.h \ tzselect.h \ qmath.h \ datebookdb.h \ alarmserver.h \ process.h \ password.h \ timestring.h \ fontfactoryinterface.h \ @@ -412,332 +412,330 @@ fileselector.o: fileselector.cpp \ applnk.h \ global.h \ resource.h \ config.h \ storage.h \ qpemenubar.h \ lnkproperties.h \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h \ categorymenu.h imageedit.o: imageedit.cpp \ imageedit.h resource.o: resource.cpp \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h \ resource.h \ inlinepics_p.h qpedecoration_qws.o: qpedecoration_qws.cpp \ qcopenvelope_qws.h \ qpedecoration_qws.h \ qpeapplication.h \ timestring.h \ resource.h \ global.h qcopenvelope_qws.o: qcopenvelope_qws.cpp \ qcopenvelope_qws.h \ global.h qpeapplication.o: qpeapplication.cpp \ qcopenvelope_qws.h \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h \ qpestyle.h \ lightstyle.h \ global.h \ resource.h \ config.h \ network.h \ fontmanager.h \ power.h \ alarmserver.h \ - applnk.h + applnk.h \ + qpemenubar.h qpestyle.o: qpestyle.cpp \ qpestyle.h \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h qpedialog.o: qpedialog.cpp \ qpedialog.h \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h lightstyle.o: lightstyle.cpp \ lightstyle.h config.o: config.cpp \ config.h applnk.o: applnk.cpp \ applnk.h sound.o: sound.cpp tzselect.o: tzselect.cpp \ tzselect.h \ resource.h \ global.h \ config.h qmath.o: qmath.c \ qmath.h datebookdb.o: datebookdb.cpp \ datebookdb.h alarmserver.o: alarmserver.cpp \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h \ global.h \ resource.h \ qcopenvelope_qws.h \ alarmserver.h password.o: password.cpp \ password.moc \ password.h \ config.h \ global.h \ backend/contact.h \ passwordbase_p.h process.o: process.cpp \ process.h process_unix.o: process_unix.cpp \ process_unix.moc \ process.h timestring.o: timestring.cpp \ timestring.moc \ timestring.h \ qpeapplication.h \ qpedecoration_qws.h \ config.h fontdatabase.o: fontdatabase.cpp \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h \ fontfactoryinterface.h \ fontdatabase.h power.o: power.cpp \ - power.h + power.h \ + custom.h storage.o: storage.cpp qpemessagebox.o: qpemessagebox.cpp \ qpemessagebox.h backend/timeconversion.o: backend/timeconversion.cpp \ backend/timeconversion.h qpedebug.o: qpedebug.cpp \ qpedebug.h qpemenubar.o: qpemenubar.cpp \ qpemenubar.h qpetoolbar.o: qpetoolbar.cpp \ qpetoolbar.h \ qpemenubar.h backend/categories.o: backend/categories.cpp \ backend/categories.h \ backend/qpcglobal.h \ backend/palmtopuidgen.h \ backend/stringutil.h backend/stringutil.o: backend/stringutil.cpp \ backend/stringutil.h \ backend/qpcglobal.h backend/palmtoprecord.o: backend/palmtoprecord.cpp \ backend/palmtoprecord.h \ backend/qpcglobal.h \ backend/palmtopuidgen.h \ backend/stringutil.h backend/task.o: backend/task.cpp \ backend/vobject_p.h \ backend/timeconversion.h \ backend/qfiledirect_p.h backend/event.o: backend/event.cpp \ backend/event.h \ backend/qfiledirect_p.h \ backend/vobject_p.h backend/contact.o: backend/contact.cpp \ backend/contact.h \ backend/vobject_p.h \ backend/qfiledirect_p.h categorymenu.o: categorymenu.cpp \ categorymenu.h \ backend/categories.h \ backend/qpcglobal.h \ backend/palmtopuidgen.h \ categoryselect.h categoryedit_p.o: categoryedit_p.cpp \ categoryedit_p.h \ categoryeditbase_p.h categoryselect.o: categoryselect.cpp \ categorywidget.h \ categoryselect.h categorywidget.o: categorywidget.cpp \ categoryedit_p.h \ categoryeditbase_p.h \ categorywidget.h ir.o: ir.cpp \ ir.h \ qcopenvelope_qws.h \ applnk.h backend/vcc_yacc.o: backend/vcc_yacc.cpp \ - backend/vobject_p.h + backend/vobject_p.h \ + backend/qfiledirect_p.h backend/vobject.o: backend/vobject.cpp \ backend/vobject_p.h \ backend/qfiledirect_p.h findwidget_p.o: findwidget_p.cpp \ findwidget_p.h \ findwidgetbase_p.h finddialog.o: finddialog.cpp \ finddialog.h \ findwidget_p.h \ findwidgetbase_p.h lnkproperties.o: lnkproperties.cpp \ lnkproperties.h \ lnkpropertiesbase_p.h \ ir.h quuid.o: quuid.cpp \ quuid.h qlibrary.o: qlibrary.cpp \ qlibrary_p.h \ qlibrary.h qlibrary_unix.o: qlibrary_unix.cpp \ qlibrary_p.h \ qlibrary.h qprocess.o: qprocess.cpp \ qprocess.h qprocess_unix.o: qprocess_unix.cpp \ qprocess_unix.moc \ qprocess.h \ qcleanuphandler_p.h passwordbase_p.h: passwordbase_p.ui $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h passwordbase_p.cpp: passwordbase_p.ui $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp proxiesbase_p.h: proxiesbase_p.ui $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h proxiesbase_p.cpp: proxiesbase_p.ui $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp categoryeditbase_p.h: categoryeditbase_p.ui $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h categoryeditbase_p.cpp: categoryeditbase_p.ui $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp findwidgetbase_p.h: findwidgetbase_p.ui $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h findwidgetbase_p.cpp: findwidgetbase_p.ui $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp -passwordbase_p.o: passwordbase_p.cpp \ - passwordbase_p.h +passwordbase_p.o: passwordbase_p.cpp -proxiesbase_p.o: proxiesbase_p.cpp \ - proxiesbase_p.h +proxiesbase_p.o: proxiesbase_p.cpp -categoryeditbase_p.o: categoryeditbase_p.cpp \ - categoryeditbase_p.h +categoryeditbase_p.o: categoryeditbase_p.cpp -findwidgetbase_p.o: findwidgetbase_p.cpp \ - findwidgetbase_p.h +findwidgetbase_p.o: findwidgetbase_p.cpp -lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \ - lnkpropertiesbase_p.h +lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp moc_menubutton.o: moc_menubutton.cpp \ menubutton.h moc_proxies.o: moc_proxies.cpp \ proxies.h \ config.h moc_datebookmonth.o: moc_datebookmonth.cpp \ datebookmonth.h \ calendar.h \ timestring.h moc_fileselector.o: moc_fileselector.cpp \ fileselector.h \ filemanager.h \ applnk.h moc_imageedit.o: moc_imageedit.cpp \ imageedit.h moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ qpedecoration_qws.h moc_qpeapplication.o: moc_qpeapplication.cpp \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h moc_qpedialog.o: moc_qpedialog.cpp \ qpedialog.h moc_tzselect.o: moc_tzselect.cpp \ tzselect.h moc_process.o: moc_process.cpp \ process.h moc_storage.o: moc_storage.cpp \ storage.h moc_qpemenubar.o: moc_qpemenubar.cpp \ qpemenubar.h moc_qpetoolbar.o: moc_qpetoolbar.cpp \ qpetoolbar.h backend/moc_categories.o: backend/moc_categories.cpp \ diff --git a/library/global.cpp b/library/global.cpp index e1bbf3e..e5fc2b3 100644 --- a/library/global.cpp +++ b/library/global.cpp @@ -89,97 +89,97 @@ StartingAppList::StartingAppList( QObject *parent, const char* name ) connect( qwsServer, SIGNAL( newChannel(const QString&)), this, SLOT( handleNewChannel(const QString&)) ); dict.setAutoDelete( TRUE ); #endif } void StartingAppList::add( const QString& name ) { #if QT_VERSION >= 232 && !defined(QT_NO_COP) if ( !appl ) appl = new StartingAppList; QTime *t = new QTime; t->start(); appl->dict.insert( "QPE/Application/" + name, t ); #endif } bool StartingAppList::isStarting( const QString name ) { #if QT_VERSION >= 232 && !defined(QT_NO_COP) if ( appl ) { QTime *t = appl->dict.find( "QPE/Application/" + name ); if ( !t ) return FALSE; if ( t->elapsed() > 10000 ) { // timeout in case of crash or something appl->dict.remove( "QPE/Application/" + name ); return FALSE; } return TRUE; } #endif return FALSE; } void StartingAppList::handleNewChannel( const QString & name ) { #if QT_VERSION >= 232 && !defined(QT_NO_COP) dict.remove( name ); #endif } static bool docDirCreated = FALSE; static QDawg* fixed_dawg = 0; static QDict<QDawg> *named_dawg = 0; static QString qpeDir() { - QString dir = getenv("QPEDIR"); + QString dir = getenv("OPIEDIR"); if ( dir.isEmpty() ) dir = ".."; return dir; } static QString dictDir() { return qpeDir() + "/etc/dict"; } /*! \class Global global.h \brief The Global class collects application-wide global functions. */ /*! \internal */ Global::Global() { } /*! Returns the unchangeable QDawg that contains general words for the current locale. \sa addedDawg() */ const QDawg& Global::fixedDawg() { if ( !fixed_dawg ) { if ( !docDirCreated ) createDocDir(); fixed_dawg = new QDawg; QString dawgfilename = dictDir() + "/dawg"; QString lang = getenv( "LANG" ); QString dawgfilename_lang = dawgfilename + "." + lang; QString words_lang = dictDir() + "/words." + lang; if ( QFile::exists(dawgfilename_lang) || QFile::exists(words_lang) ) dawgfilename = dawgfilename_lang; QFile dawgfile(dawgfilename); if ( !dawgfile.exists() ) { QString fn = dictDir() + "/words"; if ( QFile::exists(words_lang) ) fn = words_lang; QFile in(fn); diff --git a/library/library.pro b/library/library.pro index 06dfc8f..058d216 100644 --- a/library/library.pro +++ b/library/library.pro @@ -74,59 +74,59 @@ SOURCES = calendar.cpp \ resource.cpp \ qpedecoration_qws.cpp \ qcopenvelope_qws.cpp \ qpeapplication.cpp \ qpestyle.cpp \ qpedialog.cpp \ lightstyle.cpp \ config.cpp \ applnk.cpp \ sound.cpp \ tzselect.cpp \ qmath.c \ datebookdb.cpp \ alarmserver.cpp \ password.cpp \ process.cpp \ process_unix.cpp \ timestring.cpp \ fontdatabase.cpp \ power.cpp \ storage.cpp \ qpemessagebox.cpp \ backend/timeconversion.cpp \ qpedebug.cpp \ qpemenubar.cpp \ qpetoolbar.cpp \ backend/categories.cpp \ backend/stringutil.cpp \ backend/palmtoprecord.cpp \ backend/task.cpp \ backend/event.cpp \ backend/contact.cpp \ categorymenu.cpp \ categoryedit_p.cpp \ categoryselect.cpp \ categorywidget.cpp \ ir.cpp \ backend/vcc_yacc.cpp \ backend/vobject.cpp \ findwidget_p.cpp \ finddialog.cpp \ lnkproperties.cpp # Qt 3 compatibility qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ qprocess_unix.cpp -INCLUDEPATH += $(QPEDIR)/include backend +INCLUDEPATH += $(OPIEDIR)/include backend LIBS += -ldl -lcrypt -lm INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui TARGET = qpe DESTDIR = $(QTDIR)/lib$(PROJMAK) -# This is set by configure$(QPEDIR). +# This is set by configure$(OPIEDIR). VERSION = 1.5.0 TRANSLATIONS = ../i18n/de/libqpe.ts diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f0a68cf..70ffec1 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -745,101 +745,101 @@ bool QPEApplication::qwsEventFilter( QWSEvent *e ) if ( !fe->simpleData.get_focus ) { QWidget *active = activeWindow(); while ( active && active->isPopup() ) { active->close(); active = activeWindow(); } if ( !nfw && d->kbgrabber == 2 ) { ungrabKeyboard(); d->kbregrab = TRUE; // want kb back when we're active } } else { // make sure our modal widget is ALWAYS on top QWidget *topm = activeModalWidget(); if ( topm ) { topm->raise(); } if ( d->kbregrab ) { grabKeyboard(); d->kbregrab = FALSE; } } if ( fe->simpleData.get_focus && inputMethodDict ) { InputMethodHint m = inputMethodHint( QWidget::find(e->window()) ); if ( m == AlwaysOff ) Global::hideInputMethod(); if ( m == AlwaysOn ) Global::showInputMethod(); } } return QApplication::qwsEventFilter( e ); } /*! Destroys the QPEApplication. */ QPEApplication::~QPEApplication() { ungrabKeyboard(); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) // Need to delete QCopChannels early, since the display will // be gone by the time we get to ~QObject(). delete sysChannel; delete pidChannel; #endif delete d; } /*! - Returns <tt>$QPEDIR/</tt>. + Returns <tt>$OPIEDIR/</tt>. */ QString QPEApplication::qpeDir() { - const char *base = getenv( "QPEDIR" ); + const char *base = getenv( "OPIEDIR" ); if ( base ) return QString( base ) + "/"; return QString( "../" ); } /*! Returns the user's current Document directory. There is a trailing "/". */ QString QPEApplication::documentDir() { const char *base = getenv( "HOME" ); if ( base ) return QString( base ) + "/Documents/"; return QString( "../Documents/" ); } static int deforient=-1; /*! \internal */ int QPEApplication::defaultRotation() { if ( deforient < 0 ) { QString d = getenv("QWS_DISPLAY"); if ( d.contains("Rot90") ) { deforient = 90; } else if ( d.contains("Rot180") ) { deforient = 180; } else if ( d.contains("Rot270") ) { deforient = 270; } else { deforient=0; } } return deforient; } /*! \internal */ void QPEApplication::setDefaultRotation(int r) { if ( qApp->type() == GuiServer ) { deforient = r; setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(r).latin1(), 1); |