| -rw-r--r-- | core/launcher/documentlist.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp index 033dd10..7f9366e 100644 --- a/core/launcher/documentlist.cpp +++ b/core/launcher/documentlist.cpp @@ -18,13 +18,14 @@ ** **********************************************************************/ #include "documentlist.h" #include "serverinterface.h" +#include "launcherglobal.h" #include <qtopia/mimetype.h> #include <qtopia/resource.h> #include <qtopia/global.h> -#include <qtopia/categories.h> +#include <qtopia/private/categories.h> #include <qtopia/qpeapplication.h> #include <qtopia/applnk.h> #include <qtopia/storage.h> #ifdef Q_WS_QWS @@ -241,9 +242,9 @@ void DocumentList::reloadAppLnks() if ( d->sendAppLnks && d->serverGui ) d->serverGui->applicationAdded( l->type(), *l ); } - if ( d->sendAppLnks && d->serverGui ) + if ( d->sendAppLnks && d->serverGui ) d->serverGui->applicationScanningProgress( 100 ); } void DocumentList::reloadDocLnks() @@ -262,18 +263,18 @@ void DocumentList::reloadDocLnks() void DocumentList::linkChanged( QString arg ) { //qDebug( "linkchanged( %s )", arg.latin1() ); - if ( arg.isNull() || Global::isAppLnkFileName( arg ) ) { + if ( arg.isNull() || Opie::Global::isAppLnkFileName( arg ) ) { reloadAppLnks(); } else { const QList<DocLnk> &list = d->dls.children(); QListIterator<DocLnk> it( list ); while ( it.current() ) { DocLnk *doc = it.current(); ++it; - if ( ( doc->linkFileKnown() && doc->linkFile() == arg ) + if ( ( doc->linkFileKnown() && doc->linkFile() == arg ) || ( doc->fileKnown() && doc->file() == arg ) ) { //qDebug( "found old link" ); DocLnk* dl = new DocLnk( arg ); // add new one if it exists and matches the mimetype @@ -455,10 +456,10 @@ void DocumentListPrivate::initialize() DocumentListPrivate::~DocumentListPrivate() { - for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) - if ( listDirs[i] ) + for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) + if ( listDirs[i] ) delete listDirs[i]; delete dit; } @@ -621,9 +622,9 @@ const DocLnk *DocumentListPrivate::iterate() dl->setName( fi.baseName() ); if ( store(dl) ) { ++*dit; iterationI++; - if ( serverGui ) + if ( serverGui ) serverGui->documentScanningProgress( 75 + (25*iterationI)/iterationCount ); return dl; } } |