Diffstat (limited to 'core/launcher/documentlist.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/launcher/documentlist.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp index ece6931..440bf1e 100644 --- a/core/launcher/documentlist.cpp +++ b/core/launcher/documentlist.cpp | |||
@@ -16,18 +16,18 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "documentlist.h" | 20 | #include "documentlist.h" |
21 | #include "serverinterface.h" | 21 | #include "serverinterface.h" |
22 | #include "launcherglobal.h" | 22 | |
23 | #include <opie2/oglobal.h> | ||
23 | 24 | ||
24 | #include <qtopia/config.h> | 25 | #include <qtopia/config.h> |
25 | #include <qtopia/mimetype.h> | 26 | #include <qtopia/mimetype.h> |
26 | #include <qtopia/resource.h> | 27 | #include <qtopia/resource.h> |
27 | #include <qtopia/global.h> | ||
28 | #include <qtopia/private/categories.h> | 28 | #include <qtopia/private/categories.h> |
29 | #include <qtopia/qpeapplication.h> | 29 | #include <qtopia/qpeapplication.h> |
30 | #include <qtopia/applnk.h> | 30 | #include <qtopia/applnk.h> |
31 | #include <qtopia/storage.h> | 31 | #include <qtopia/storage.h> |
32 | #ifdef Q_WS_QWS | 32 | #ifdef Q_WS_QWS |
33 | #include <qtopia/qcopenvelope_qws.h> | 33 | #include <qtopia/qcopenvelope_qws.h> |
@@ -87,13 +87,16 @@ public: | |||
87 | bool sendAppLnks; | 87 | bool sendAppLnks; |
88 | bool sendDocLnks; | 88 | bool sendDocLnks; |
89 | bool scanDocs; | 89 | bool scanDocs; |
90 | }; | 90 | }; |
91 | 91 | ||
92 | 92 | ||
93 | DocumentList::DocumentList( ServerInterface *serverGui, bool scanDocs, | 93 | /* |
94 | * scandocs will be read from Config | ||
95 | */ | ||
96 | DocumentList::DocumentList( ServerInterface *serverGui, bool /*scanDocs*/, | ||
94 | QObject *parent, const char *name ) | 97 | QObject *parent, const char *name ) |
95 | : QObject( parent, name ) | 98 | : QObject( parent, name ) |
96 | { | 99 | { |
97 | appLnkSet = new AppLnkSet( MimeType::appsFolderName() ); | 100 | appLnkSet = new AppLnkSet( MimeType::appsFolderName() ); |
98 | d = new DocumentListPrivate( serverGui ); | 101 | d = new DocumentListPrivate( serverGui ); |
99 | d->needToSendAllDocLinks = false; | 102 | d->needToSendAllDocLinks = false; |
@@ -266,13 +269,13 @@ void DocumentList::reloadDocLnks() | |||
266 | } | 269 | } |
267 | 270 | ||
268 | void DocumentList::linkChanged( QString arg ) | 271 | void DocumentList::linkChanged( QString arg ) |
269 | { | 272 | { |
270 | //qDebug( "linkchanged( %s )", arg.latin1() ); | 273 | //qDebug( "linkchanged( %s )", arg.latin1() ); |
271 | 274 | ||
272 | if ( arg.isNull() || Opie::Global::isAppLnkFileName( arg ) ) { | 275 | if ( arg.isNull() || OGlobal::isAppLnkFileName( arg ) ) { |
273 | reloadAppLnks(); | 276 | reloadAppLnks(); |
274 | } else { | 277 | } else { |
275 | 278 | ||
276 | const QList<DocLnk> &list = d->dls.children(); | 279 | const QList<DocLnk> &list = d->dls.children(); |
277 | QListIterator<DocLnk> it( list ); | 280 | QListIterator<DocLnk> it( list ); |
278 | while ( it.current() ) { | 281 | while ( it.current() ) { |