- rename files ostorage.cpp .h in ostorageinfo.cpp .h

3 files changed, 5 insertions, 5 deletions

diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index a8769e5..237a5ed 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,35 +1,35 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = oapplication.h            \
               oconfig.h                 \
               odebug.h                  \
               oglobal.h                 \
               oglobalsettings.h         \
-              ostorage.h
+              ostorageinfo.h
 
 SOURCES     = oapplication.cpp          \
               oconfig.cpp               \
               odebug.cpp                \
               oglobal.cpp               \
               oglobalsettings.cpp       \
-              ostorage.cpp
+              ostorageinfo.cpp
 
 INTERFACES  =
 TARGET      = opiecore2
 VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
 
 !contains( platform, x11 ) {
   LIBS        = -lqpe
   include ( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
-  LIBS        = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
+  LIBS        = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
 }
 
diff --git a/libopie2/opiecore/ostorageinfo.cpp b/libopie2/opiecore/ostorageinfo.cpp
index 6712282..a45fcb6 100644
--- a/libopie2/opiecore/ostorageinfo.cpp
+++ b/libopie2/opiecore/ostorageinfo.cpp
@@ -1,92 +1,92 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2004 Andreas 'ar' Richter <ar@oszine.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
-#include <opie2/ostorage.h>
+#include <opie2/ostorageinfo.h>
 
 OStorageInfo::OStorageInfo( QObject *parent )
         : StorageInfo( parent )
 {
 }
 
 OStorageInfo::~OStorageInfo()
 {
 }
 
 QString OStorageInfo::cfPath()const
 {
     QString r = "";
 
     for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i)
     {
         if ( (*i)->disk().left( 8 ) == "/dev/hda"  )
         {
             r = (*i)->path();
             break;
         }
     }
     return r;
 }
 
 /*!
 * @brief returns the Mount-Path of Sd Card
 *
 */
 QString OStorageInfo::sdPath()const
 {
     QString r = "";
 
     for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i)
     {
         if ( (*i)->disk().left( 9 ) == "/dev/mmcd" )
         {
             r = (*i)->path();
             break;
         }
     }
     return r;
 }
 
 /*!
 * @brief returns the Mount-Path of Mmc Card
 *
 */
 QString OStorageInfo::mmcPath()const
 {
     QString r = "";
 
     for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i)
     {
         if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1" )
         {
             r = (*i)->path();
             break;
         }
     }
     return r;
 }
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 2d79384..3500403 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,88 +1,88 @@
 
 #include "backuprestore.h"
 //#include "output.h"
 #include "errordialog.h"
 
 #include <qapplication.h>
 #include <qmultilineedit.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qheader.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qlist.h>
 #include <stdlib.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 #include <qtextview.h>
-#include <opie2/ostorage.h>
+#include <opie2/ostorageinfo.h>
 
 #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)
 {
     this->showMaximized();
     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;
 
     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