3 files changed, 3 insertions, 2 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 164055e..87b7966 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -22,97 +22,97 @@
 #include <qlist.h>
 #include <stdlib.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 #include <qtextview.h>
 
 /* STD */
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 
 #define HEADER_NAME 0
 #define HEADER_BACKUP 1
 #define BACKUP_LOCATION 2
 
 #define EXTENSION ".bck"
 
 const QString tempFileName = "/tmp/backup.err";
 
 
 BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags fl)
         : BackupAndRestoreBase(parent, name,  fl)
 {
     backupList->header()->hide();
     restoreList->header()->hide();
     connect(backupButton, SIGNAL(clicked()),
             this, SLOT(backup()));
     connect(restoreButton, SIGNAL(clicked()),
             this, SLOT(restore()));
     connect(backupList, SIGNAL(clicked(QListViewItem*)),
             this, SLOT(selectItem(QListViewItem*)));
     connect(restoreSource, SIGNAL(activated(int)),
             this, SLOT(sourceDirChanged(int)));
     connect(updateList, SIGNAL(clicked()),
             this, SLOT( fileListUpdate()));
 
     //add directorys for backing up
     applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
     selectItem(applicationSettings);
     applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
     selectItem(applicationSettings);
     documents= new QListViewItem(backupList, "Documents", "", "Documents/");
     selectItem(documents);
 
     scanForApplicationSettings();
 
-    OStorageInfo storage;
+    Opie::Core::OStorageInfo storage;
 
     backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
     if ( storage.hasCf() )
     {
         backupLocations.insert( "CF", storage.cfPath() );
         qDebug( "Cf Path: " + storage.cfPath() );
     }
     if ( storage.hasSd() )
     {
         backupLocations.insert( "SD", storage.sdPath() );
         qDebug( " Sd Path: " + storage.sdPath() );
     }
     if ( storage.hasMmc() )
     {
         backupLocations.insert( "MMC", storage.mmcPath() );
         qDebug( "Mmc Path: " + storage.mmcPath() );
     }
 
     Config config("BackupAndRestore");
     //read last locations
     config.setGroup("LastLocation");
     QString lastStoreLocation   = config.readEntry( "LastStoreLocation", "" );
     QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" );
     int locationIndex    = 0;
 
     QMap<QString, QString>::Iterator it;
     for( it = backupLocations.begin(); it != backupLocations.end(); ++it )
     {
         storeToLocation->insertItem(it.key());
         restoreSource->insertItem(it.key());
 
         //check for last locations
         if ( it.key() == lastStoreLocation )
             storeToLocation->setCurrentItem( locationIndex );
         if ( it.key() == lastRestoreLocation )
             restoreSource->setCurrentItem( locationIndex );
         locationIndex++;
     }
 
     // Read the list of items to ignore.
     QList<QString> dontBackupList;
     dontBackupList.setAutoDelete(true);
     config.setGroup("DontBackup");
     int total = config.readNumEntry("Total", 0);
     for(int i = 0; i < total; i++)
     {
         dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
     }
diff --git a/noncore/settings/backup/main.cpp b/noncore/settings/backup/main.cpp
index 7f03136..c254865 100644
--- a/noncore/settings/backup/main.cpp
+++ b/noncore/settings/backup/main.cpp
@@ -1,8 +1,8 @@
 #include "backuprestore.h"
 #include "qnetworkprotocol.h"
 #include <qpe/qpeapplication.h>
 #include <opie2/oapplicationfactory.h>
 
 
-OPIE_EXPORT_APP( OApplicationFactory<BackupAndRestore> )
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<BackupAndRestore> )
 
diff --git a/noncore/tools/calculator/main.cpp b/noncore/tools/calculator/main.cpp
index 145ba38..1e00358 100644
--- a/noncore/tools/calculator/main.cpp
+++ b/noncore/tools/calculator/main.cpp
@@ -1,25 +1,26 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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 "calculatorimpl.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<CalculatorImpl> )