summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/documentlist.cpp15
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
@@ -20,9 +20,10 @@
#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>
@@ -243,5 +244,5 @@ void DocumentList::reloadAppLnks()
}
- if ( d->sendAppLnks && d->serverGui )
+ if ( d->sendAppLnks && d->serverGui )
d->serverGui->applicationScanningProgress( 100 );
}
@@ -264,5 +265,5 @@ 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 {
@@ -273,5 +274,5 @@ void DocumentList::linkChanged( QString arg )
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" );
@@ -457,6 +458,6 @@ 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;
@@ -623,5 +624,5 @@ const DocLnk *DocumentListPrivate::iterate()
++*dit;
iterationI++;
- if ( serverGui )
+ if ( serverGui )
serverGui->documentScanningProgress( 75 + (25*iterationI)/iterationCount );
return dl;