use real filepaths instead of Sharps idiotic ones

1 files changed, 38 insertions, 24 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 5776f3c..fb892d9 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -18,38 +18,48 @@
 #define BACKUP_LOCATION 2
 
 #define EXTENSION ".bck"
 
-BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) : BackupAndRestoreBase(parent, name){
+BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
+        : BackupAndRestoreBase(parent, name){
   this->showMaximized();
   backupList->header()->hide();
   restoreList->header()->hide();
-  connect(backupButton, SIGNAL(clicked()), this, SLOT(backupPressed()));
-  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(backupButton, SIGNAL(clicked()),
+          this, SLOT(backupPressed()));
+  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))); 
 
-  systemSettings = new QListViewItem(backupList, "System Settings", "", "/home/etc");
+  systemSettings = new QListViewItem(backupList, "System Settings", "",
+                                     "/etc");
   selectItem(systemSettings);
-  applicationSettings = new QListViewItem(backupList, "Application Settings", "", QDir::homeDirPath() + "/Settings/");
+  applicationSettings = new QListViewItem(backupList, "Application Settings", "",
+                                          QDir::homeDirPath() + "/Settings/");
   selectItem(applicationSettings);
-  documents= new QListViewItem(backupList, "Documents", "", QDir::homeDirPath() + "/Documents/");
+  documents= new QListViewItem(backupList, "Documents", "",
+                               QDir::homeDirPath() + "/Documents/");
   selectItem(documents);
   
   scanForApplicationSettings();
   
   Config config("BackupAndRestore");
   config.setGroup("General");
   int totalLocations = config.readNumEntry("totalLocations",0);
   
+//todo make less static here and use Storage class to get infos
   if(totalLocations == 0){
-    backupLocations.insert("Documents", "/home/root/Documents");
+    backupLocations.insert("Documents", "/root/Documents");
     backupLocations.insert("CF", "/mnt/cf");
     backupLocations.insert("SD", "/mnt/card");
   }
   else{
     for(int i = 0; i < totalLocations; i++){
-      backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)), config.readEntry(QString("backupLocation_%1").arg(i)));
+      backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)),
+                             config.readEntry(QString("backupLocation_%1").arg(i)));
     }
   }
   QMap<QString, QString>::Iterator it;
   for( it = backupLocations.begin(); it != backupLocations.end(); ++it ){
@@ -67,9 +77,9 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) : BackupA
   }
 
   QList<QListViewItem> list;
   getAllItems(backupList->firstChild(), list);
-	
+  
   for(uint i = 0; i < list.count(); i++){
     QString text = list.at(i)->text(HEADER_NAME);
     for(uint i2 = 0;  i2 < dontBackupList.count(); i2++){
       if(*dontBackupList.at(i2) == text){
@@ -82,9 +92,9 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) : BackupA
 
 BackupAndRestore::~BackupAndRestore(){
   QList<QListViewItem> list;
   getAllItems(backupList->firstChild(), list);
-	
+  
   Config config("BackupAndRestore");
   config.setGroup("DontBackup");
   config.clearGroup();
   
@@ -149,10 +159,11 @@ void BackupAndRestore::scanForApplicationSettings(){
  */ 
 void BackupAndRestore::backupPressed(){
   QString backupFiles;
   if(getBackupFiles(backupFiles, NULL) == 0){
-    QMessageBox::critical(this, "Message", "No items selected.",QString("Ok") );
-    return;	  
+    QMessageBox::critical(this, "Message",
+                          "No items selected.",QString("Ok") );
+    return;   
   }
 
   QString outputFile = backupLocations[storeToLocation->currentText()];
 
@@ -170,9 +181,9 @@ void BackupAndRestore::backupPressed(){
   
   int r = system(QString("tar -c %1 | gzip --best > %2").arg(backupFiles).arg(outputFile).latin1());
   if(r != 0){
     QMessageBox::critical(this, "Message", "Backup Failed.",QString("Ok") );
-    return;	  
+    return;   
   }
   else{
     QMessageBox::critical(this, "Message", "Backup Successfull.",QString("Ok") );
   }
@@ -195,13 +206,13 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
   while( currentItem != 0 ){
     if(currentItem->text(HEADER_BACKUP) == "B" ){
       if(currentItem->childCount() == 0 ){
         if(parent == NULL)
-	  backupFiles += currentItem->text(BACKUP_LOCATION);
-	else
+    backupFiles += currentItem->text(BACKUP_LOCATION);
+  else
           backupFiles += currentHome + currentItem->text(HEADER_NAME);
-	backupFiles += " ";
-	count++;
+  backupFiles += " ";
+  count++;
       }
       else{
         count += getBackupFiles(backupFiles, currentItem);
       }
@@ -234,9 +245,9 @@ void BackupAndRestore::rescanFolder(QString directory){
   while ( (file=it.current()) ) {  // for each file...
     // If it is a dir and not .. or . then add it as a tab and go down.
     if(file->isDir()){
       if(file->fileName() != ".." && file->fileName() != ".") {
-	rescanFolder(directory + "/" + file->fileName());
+  rescanFolder(directory + "/" + file->fileName());
       }
     }
     else{
       // If it is a backup file add to list.
@@ -253,21 +264,24 @@ void BackupAndRestore::rescanFolder(QString directory){
  */ 
 void BackupAndRestore::restore(){
   QListViewItem *restoreItem = restoreList->currentItem();
   if(!restoreItem){
-    QMessageBox::critical(this, "Message", "Please select something to restore.",QString("Ok") );
-    return;	  
+    QMessageBox::critical(this, "Message",
+                          "Please select something to restore.",QString("Ok") );
+    return;   
   }
   QString restoreFile = backupLocations[restoreSource->currentText()];
   
   restoreFile += "/" + restoreItem->text(0);
   
   int r = system(QString("tar -C / -zxf %1").arg(restoreFile).latin1());
   if(r != 0){
-    QMessageBox::critical(this, "Message", "Restore Failed.",QString("Ok") );
+    QMessageBox::critical(this, "Message",
+                          "Restore Failed.",QString("Ok") );
   }
   else{
-    QMessageBox::critical(this, "Message", "Restore Successfull.",QString("Ok") );
+    QMessageBox::critical(this, "Message",
+                          "Restore Successfull.",QString("Ok") );
   }
 }
 
 // backuprestore.cpp