author | kergoth <kergoth> | 2002-01-31 18:35:48 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-31 18:35:48 (UTC) |
commit | 2802e5a2b474101a50bf95e707061ca5542876fd (patch) (side-by-side diff) | |
tree | a1015514ef9e48df091903cccf0d3174e272f663 /core | |
parent | 48a922e687e82dc8ebe2bc3cb17dcaa8dcae62bd (diff) | |
download | opie-2802e5a2b474101a50bf95e707061ca5542876fd.zip opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.gz opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.bz2 |
*** empty log message ***
-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 |
10 files changed, 75 insertions, 205 deletions
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 @@ -8,3 +8,3 @@ 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) @@ -67,4 +67,6 @@ moc: $(SRCMOC) -tmake: - tmake clipboardapplet.pro +tmake: Makefile.in + +Makefile.in: clipboardapplet.pro + tmake clipboardapplet.pro -o Makefile.in 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 @@ -101,4 +101,6 @@ moc: $(SRCMOC) -tmake: - tmake embeddedkonsole.pro +tmake: Makefile.in + +Makefile.in: embeddedkonsole.pro + tmake embeddedkonsole.pro -o Makefile.in @@ -185,3 +187,2 @@ keytrans.o: keytrans.cpp \ keytrans.h \ - $(OPIEDIR)/include/qpe/qpeapplication.h \ default.keytab.h @@ -189,6 +190,2 @@ keytrans.o: keytrans.cpp \ 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 \ @@ -214,4 +211,3 @@ main.o: main.cpp \ keytrans.h \ - session.h \ - $(OPIEDIR)/include/qpe/qpeapplication.h + session.h 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 @@ -8,2 +8,3 @@ HEADERS = background.h \ desktop.h \ + qprocess.h \ info.h \ @@ -48,2 +49,3 @@ SOURCES = background.cpp \ desktop.cpp \ + qprocess.cpp qprocess_unix.cpp \ info.cpp \ 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 @@ -214,6 +214,4 @@ public: 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()); @@ -364,2 +362,4 @@ void LauncherIconView::hideOrShowItems(bool resort) } + bool oldAutoArrange = autoArrange(); + setAutoArrange( FALSE ); clear(); @@ -373,2 +373,3 @@ void LauncherIconView::hideOrShowItems(bool resort) sort(); + setAutoArrange( oldAutoArrange ); } @@ -378,6 +379,11 @@ 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; } @@ -386,11 +392,12 @@ bool LauncherIconView::removeLink(const QString& linkfile) 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; } 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 @@ -102,4 +102,6 @@ moc: $(SRCMOC) -tmake: - tmake mpegplayer.pro +tmake: Makefile.in + +Makefile.in: mpegplayer.pro + tmake mpegplayer.pro -o Makefile.in @@ -137,6 +139,4 @@ REQUIRES= main.o: main.cpp \ - $(OPIEDIR)/include/qpe/qpeapplication.h \ mediaplayerstate.h \ playlistwidget.h \ - $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ @@ -144,11 +144,5 @@ main.o: main.cpp \ 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 \ @@ -156,5 +150,2 @@ loopcontrol.o: loopcontrol.cpp \ audiodevice.h \ - mediaplayerplugininterface.h \ - $(OPIEDIR)/include/qpe/qcom.h \ - $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h @@ -162,4 +153,2 @@ loopcontrol.o: loopcontrol.cpp \ playlistselection.o: playlistselection.cpp \ - $(OPIEDIR)/include/qpe/applnk.h \ - $(OPIEDIR)/include/qpe/resource.h \ playlistselection.h @@ -167,8 +156,2 @@ playlistselection.o: playlistselection.cpp \ 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 \ @@ -179,7 +162,3 @@ mediaplayerstate.o: mediaplayerstate.cpp \ 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 @@ -187,3 +166,2 @@ videowidget.o: videowidget.cpp \ audiowidget.o: audiowidget.cpp \ - $(OPIEDIR)/include/qpe/resource.h \ audiowidget.h \ @@ -192,9 +170,2 @@ audiowidget.o: audiowidget.cpp \ 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 \ @@ -204,12 +175,4 @@ playlistwidget.o: playlistwidget.cpp \ 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 \ @@ -220,6 +183,3 @@ mediaplayer.o: mediaplayer.cpp \ audiodevice.o: audiodevice.cpp \ - $(OPIEDIR)/include/qpe/qpeapplication.h \ - $(OPIEDIR)/include/qpe/config.h \ - audiodevice.h \ - $(OPIEDIR)/include/qpe/qcopenvelope_qws.h + audiodevice.h @@ -229,4 +189,3 @@ moc_loopcontrol.o: moc_loopcontrol.cpp \ moc_playlistselection.o: moc_playlistselection.cpp \ - playlistselection.h \ - $(OPIEDIR)/include/qpe/applnk.h + playlistselection.h @@ -242,11 +201,6 @@ moc_audiowidget.o: moc_audiowidget.cpp \ 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 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 @@ -8,3 +8,3 @@ 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) @@ -147,4 +147,3 @@ libflashplugin.o: libflashplugin.cpp \ libflashplugin.h \ - flash.h \ - ../mediaplayerplugininterface.h + flash.h @@ -153,5 +152,3 @@ libflashpluginimpl.o: libflashpluginimpl.cpp \ flash.h \ - ../mediaplayerplugininterface.h \ - libflashpluginimpl.h \ - ../mediaplayerplugininterface.h + libflashpluginimpl.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 @@ -102,4 +102,6 @@ moc: $(SRCMOC) -tmake: - tmake libmad.pro +tmake: Makefile.in + +Makefile.in: libmad.pro + tmake libmad.pro -o Makefile.in @@ -216,3 +218,2 @@ libmadplugin.o: libmadplugin.cpp \ libmadplugin.h \ - ../mediaplayerplugininterface.h \ mad.h @@ -221,5 +222,3 @@ 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 @@ -131,4 +131,6 @@ moc: $(SRCMOC) -tmake: - tmake libmpeg3.pro +tmake: Makefile.in + +Makefile.in: libmpeg3.pro + tmake libmpeg3.pro -o Makefile.in @@ -178,4 +180,3 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \ video/mpeg3video.h \ - mpeg3protos.h \ - ../mediaplayerplugininterface.h + mpeg3protos.h @@ -195,5 +196,3 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ mpeg3protos.h \ - ../mediaplayerplugininterface.h \ - libmpeg3pluginimpl.h \ - ../mediaplayerplugininterface.h + libmpeg3pluginimpl.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 @@ -67,4 +67,6 @@ moc: $(SRCMOC) -tmake: - tmake wavplugin.pro +tmake: Makefile.in + +Makefile.in: wavplugin.pro + tmake wavplugin.pro -o Makefile.in @@ -102,4 +104,3 @@ REQUIRES= wavplugin.o: wavplugin.cpp \ - wavplugin.h \ - ../mediaplayerplugininterface.h + wavplugin.h @@ -107,5 +108,3 @@ 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 @@ -126,4 +126,6 @@ moc: $(SRCMOC) -tmake: - tmake datebook.pro +tmake: Makefile.in + +Makefile.in: datebook.pro + tmake datebook.pro -o Makefile.in @@ -161,9 +163,3 @@ REQUIRES= 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 @@ -171,13 +167,4 @@ 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 @@ -185,7 +172,2 @@ 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 \ @@ -195,17 +177,3 @@ datebook.o: datebook.cpp \ 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 @@ -214,14 +182,4 @@ dateentryimpl.o: dateentryimpl.cpp \ 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 @@ -229,9 +187,3 @@ 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 @@ -239,4 +191,3 @@ datebooksettings.o: datebooksettings.cpp \ datebooksettings.h \ - datebooksettingsbase.h \ - $(OPIEDIR)/include/qpe/qpeapplication.h + datebooksettingsbase.h @@ -244,12 +195,4 @@ 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 @@ -261,10 +204,3 @@ 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 @@ -311,15 +247,6 @@ 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 @@ -327,7 +254,3 @@ 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 @@ -338,7 +261,3 @@ moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ 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 @@ -350,7 +269,3 @@ 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 |