-First follow Qt naming style

-use const
-Fix Doxygen comment. If above a method better skip the @fn
-Update backuprestore to use the new names

TODO: Alter filename to ostorageinfo

3 files changed, 12 insertions, 14 deletions

diff --git a/libopie2/opiecore/ostorageinfo.cpp b/libopie2/opiecore/ostorageinfo.cpp
index cf9dc6c..6712282 100644
--- a/libopie2/opiecore/ostorageinfo.cpp
+++ b/libopie2/opiecore/ostorageinfo.cpp
@@ -1,94 +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>
 
 OStorageInfo::OStorageInfo( QObject *parent )
         : StorageInfo( parent )
 {
 }
 
 OStorageInfo::~OStorageInfo()
 {
 }
 
-QString OStorageInfo::getCfPath()
+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;
 }
 
 /*!
-* @fn QString StorageInfo::getSdPath()
 * @brief returns the Mount-Path of Sd Card
 *
 */
-QString OStorageInfo::getSdPath()
+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;
 }
 
 /*!
-* @fn QString StorageInfo::getMmcPath()
 * @brief returns the Mount-Path of Mmc Card
 *
 */
-QString OStorageInfo::getMmcPath()
+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/libopie2/opiecore/ostorageinfo.h b/libopie2/opiecore/ostorageinfo.h
index ba87ff4..9b61a2e 100644
--- a/libopie2/opiecore/ostorageinfo.h
+++ b/libopie2/opiecore/ostorageinfo.h
@@ -1,49 +1,49 @@
 /*
                              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.
 */
 
 #ifndef OSTORAGE_H
 #define OSTORAGE_H
 
 #include <qpe/storage.h>
 
 class OStorageInfo : public StorageInfo
 {
   Q_OBJECT
 
   public:
 public:
     OStorageInfo( QObject *parent=0 );
     ~OStorageInfo();
 
-    QString getCfPath();
-    QString getSdPath();
-    QString getMmcPath();
+    QString cfPath()const;
+    QString sdPath()const;
+    QString mmcPath()const;
 };
 
 #endif // OSTORAGE_H
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index eb69a70..2d79384 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -25,108 +25,108 @@
 
 #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.getCfPath() );
-        qDebug( "Cf Path: " + storage.getCfPath() );
+        backupLocations.insert( "CF", storage.cfPath() );
+        qDebug( "Cf Path: " + storage.cfPath() );
     }
     if ( storage.hasSd() )
     {
-        backupLocations.insert( "SD", storage.getSdPath() );
-        qDebug( " Sd Path: " + storage.getSdPath() );
+        backupLocations.insert( "SD", storage.sdPath() );
+        qDebug( " Sd Path: " + storage.sdPath() );
     }
     if ( storage.hasMmc() )
     {
-        backupLocations.insert( "MMC", storage.getMmcPath() );
-        qDebug( "Mmc Path: " + storage.getMmcPath() );
+        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), "")));
     }
 
     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)
             {
                 selectItem(list.at(i));
                 break;
             }
         }
     }