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
@@ -6,37 +6,38 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #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
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 
 #include <qtimer.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qpainter.h>
 #include <qimage.h>
 #include <qcopchannel_qws.h>
 #include <qlistview.h>
@@ -229,63 +230,63 @@ void DocumentList::reloadAppLnks()
         }
         for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
             //qDebug("removing type %s", (*ittypes).latin1());
             d->serverGui->typeRemoved(*ittypes);
         }
         prevTypeList = types;
     }
 
     QListIterator<AppLnk> itapp( appLnkSet->children() );
     AppLnk* l;
     while ( (l=itapp.current()) ) {
         ++itapp;
         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()
 {
     if ( !d->scanDocs )
         return;
 
     if ( d->sendDocLnks && d->serverGui ) {
         d->serverGui->documentScanningProgress( 0 );
         d->serverGui->allDocumentsRemoved();
     }
 
     rescan();
 }
 
 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
                 if ( d->store( dl ) ) {
                     // Existing link has been changed, send old link ref and a ref
                     // to the new link
                     //qDebug( "change case" );
                     if ( d->serverGui )
                         d->serverGui->documentChanged( *doc, *dl );
 
                 } else {
                     // Link has been removed or doesn't match the mimetypes any more
                     // so we aren't interested in it, so take it away from the list
                     //qDebug( "removal case" );
                     if ( d->serverGui )
@@ -443,34 +444,34 @@ void DocumentListPrivate::initialize()
             delete listDirs[i];
             listDirs[i] = 0;
         }
         lists[i] = 0;
         listPositions[i] = 0;
     }
 
     docPathsSearched = 0;
     searchDepth = -1;
     state = Find;
     dit = 0;
 }
 
 
 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;
 }
 
 
 void DocumentListPrivate::estimatedPercentScanned()
 {
     double overallProgress = 0.0;
     double levelWeight = 75.0;
 
     int topCount = docPaths.count();
     if ( topCount > 1 ) {
         levelWeight = levelWeight / topCount;
         overallProgress += (docPathsSearched - 1) * levelWeight;
     }
 
@@ -609,33 +610,33 @@ const DocLnk *DocumentListPrivate::iterate()
 
         iterationI = 0;
         iterationCount = dit->count();
     }
 
     if ( state == MakeUnknownFiles ) {
         //qDebug("state MakeUnknownFiles");
         for (void* c; (c=dit->current()); ++(*dit) ) {
             if ( c == MAGIC_NUMBER ) {
                 DocLnk* dl = new DocLnk;
                 QFileInfo fi( dit->currentKey() );
                 dl->setFile( fi.filePath() );
                 dl->setName( fi.baseName() );
                 if ( store(dl) ) {
                     ++*dit;
                     iterationI++;
-                    if ( serverGui ) 
+                    if ( serverGui )
                         serverGui->documentScanningProgress( 75 + (25*iterationI)/iterationCount );
                     return dl;
                 }
             }
             iterationI++;
         }
 
         delete dit;
         dit = 0;
         state = Done;
     }
 
     //qDebug("state Done");
     return NULL;
 }