- New class OStorageInfo

- OStorageInfo implements following functions instead of StorageInfo
  QString getCfPath();
  QString getSdPath();
  QString getMmcPath();

3 files changed, 148 insertions, 3 deletions

diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index 4f70db7..a8769e5 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,27 +1,29 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = oapplication.h            \
               oconfig.h                 \
               odebug.h                  \
               oglobal.h                 \
-              oglobalsettings.h                       
+              oglobalsettings.h         \
+              ostorage.h
 
 SOURCES     = oapplication.cpp          \
               oconfig.cpp               \
               odebug.cpp                \
               oglobal.cpp               \
-              oglobalsettings.cpp      
-              
+              oglobalsettings.cpp       \
+              ostorage.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 )
diff --git a/libopie2/opiecore/ostorageinfo.cpp b/libopie2/opiecore/ostorageinfo.cpp
new file mode 100644
index 0000000..cf9dc6c
--- a/dev/null
+++ b/libopie2/opiecore/ostorageinfo.cpp
@@ -0,0 +1,94 @@
+/*
+                             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 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 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 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
new file mode 100644
index 0000000..ba87ff4
--- a/dev/null
+++ b/libopie2/opiecore/ostorageinfo.h
@@ -0,0 +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();
+};
+
+#endif // OSTORAGE_H