1 files changed, 14 insertions, 14 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 58e5c71..2eccdfe 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,13 +1,14 @@
-
 #include "backuprestore.h"
 #include "errordialog.h"
 
 /* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/ostorageinfo.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
 /* QT */
 #include <qapplication.h>
 #include <qmultilineedit.h>
 #include <qdir.h>
 #include <qfile.h>
@@ -37,13 +38,12 @@
 #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()),
@@ -70,23 +70,23 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
     Opie::Core::OStorageInfo storage;
 
     backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
     if ( storage.hasCf() )
     {
         backupLocations.insert( "CF", storage.cfPath() );
-        qDebug( "Cf Path: " + storage.cfPath() );
+        odebug << "Cf Path: " + storage.cfPath() << oendl; 
     }
     if ( storage.hasSd() )
     {
         backupLocations.insert( "SD", storage.sdPath() );
-        qDebug( " Sd Path: " + storage.sdPath() );
+        odebug << " Sd Path: " + storage.sdPath() << oendl; 
     }
     if ( storage.hasMmc() )
     {
         backupLocations.insert( "MMC", storage.mmcPath() );
-        qDebug( "Mmc Path: " + storage.mmcPath() );
+        odebug << "Mmc Path: " + storage.mmcPath() << oendl; 
     }
 
     Config config("BackupAndRestore");
     //read last locations
     config.setGroup("LastLocation");
     QString lastStoreLocation   = config.readEntry( "LastStoreLocation", "" );
@@ -200,13 +200,13 @@ void BackupAndRestore::scanForApplicationSettings()
     d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks );
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while ( (fi=it.current()) )
     {
-        //qDebug((d.path()+"/"+fi->fileName()).latin1());
+        //odebug << (d.path()+"/"+fi->fileName()).latin1() << oendl; 
         if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) )
         {
             QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName());
             selectItem(newItem);
         }
         ++it;
@@ -246,22 +246,22 @@ void BackupAndRestore::backup()
         c++;
     }
 
     // We execute tar and compressing its output with gzip..
     // The error output will be written into a temp-file which could be provided
     // for debugging..
-    qDebug( "Storing file: %s", outputFile.latin1() );
+    odebug << "Storing file: " << outputFile.latin1() << "" << oendl; 
     outputFile += EXTENSION;
 
     QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 Applications/backup/exclude -f %3 ) 2> %4" ).arg( QDir::homeDirPath() )
                           .arg( getExcludeFile() )
                           .arg( backupFiles )
                           .arg( outputFile.latin1() )
                           .arg( tempFileName.latin1() );
 
-    qDebug( commandLine );
+    odebug << commandLine << oendl; 
 
     int r = system( commandLine );
 
     if(r != 0)
     {
         perror("Error: ");
@@ -269,13 +269,13 @@ void BackupAndRestore::backup()
 
         switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n"
                                       + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) )
         {
 
         case 1:
-            qWarning("Details pressed !");
+            owarn << "Details pressed !" << oendl; 
             ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
             QFile errorFile( tempFileName );
             if ( errorFile.open(IO_ReadOnly) )
             {
                 QTextStream t( &errorFile );
                 QString s;
@@ -356,25 +356,25 @@ void BackupAndRestore::sourceDirChanged(int selection)
     restoreList->clear();
     rescanFolder(backupLocations[restoreSource->text(selection)]);
 }
 
 void BackupAndRestore::fileListUpdate()
 {
-    qWarning("void BackupAndRestore::fileListUpdate()");
+    owarn << "void BackupAndRestore::fileListUpdate()" << oendl; 
     restoreList->clear();
     rescanFolder( backupLocations[restoreSource->currentText()] );
 }
 
 /**
  * Scans directory for any backup files.  Will recursivly go down,
  * but will not follow symlinks.
  * @param directory - the directory to look in.
  */
 void BackupAndRestore::rescanFolder(QString directory)
 {
-    //qDebug(QString("rescanFolder: ") + directory.latin1());
+    //odebug << QString("rescanFolder: ") + directory.latin1() << oendl; 
     QDir d(directory);
     if(!d.exists())
         return;
 
     d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs);
     const QFileInfoList *list = d.entryInfoList();
@@ -416,13 +416,13 @@ void BackupAndRestore::restore()
     setCaption(tr("Backup and Restore... working..."));
 
     QString restoreFile = backupLocations[restoreSource->currentText()];
 
     restoreFile += "/" + restoreItem->text(0);
 
-    qDebug( restoreFile );
+    odebug << restoreFile << oendl; 
 
     //check if backup file come from opie 1.0.x
 
     QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() );
 
     int r = system( commandLine );
@@ -439,25 +439,25 @@ void BackupAndRestore::restore()
 
     //unpack backup file
     commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( startDir )
                   .arg( restoreFile.latin1() )
                   .arg( tempFileName.latin1() );
 
-    qDebug( commandLine );
+    odebug << commandLine << oendl; 
 
     r = system( commandLine );
 
     //error handling
     if(r != 0)
     {
         QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
         switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n"
                                       + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) )
         {
         case 1:
-            qWarning("Details pressed !");
+            owarn << "Details pressed !" << oendl; 
             ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
             QFile errorFile( tempFileName );
             if ( errorFile.open(IO_ReadOnly) )
             {
                 QTextStream t( &errorFile );
                 QString s;