author | ar <ar> | 2004-01-10 13:54:11 (UTC) |
---|---|---|
committer | ar <ar> | 2004-01-10 13:54:11 (UTC) |
commit | bf9988d771a03bc6a1d97a11ce3794d8b429b534 (patch) (side-by-side diff) | |
tree | 2537aae850a32b9d3ff6d82d8fb0906c3cead7fd | |
parent | 53f1f3a01c088346231fcf2ca8bf6bf62351f37f (diff) | |
download | opie-bf9988d771a03bc6a1d97a11ce3794d8b429b534.zip opie-bf9988d771a03bc6a1d97a11ce3794d8b429b534.tar.gz opie-bf9988d771a03bc6a1d97a11ce3794d8b429b534.tar.bz2 |
- remove
QString getCfPath();
QString getSdPath();
QString getMmcPath();
-rw-r--r-- | library/storage.cpp | 60 | ||||
-rw-r--r-- | library/storage.h | 4 |
2 files changed, 0 insertions, 64 deletions
diff --git a/library/storage.cpp b/library/storage.cpp index 657fb71..d98139b 100644 --- a/library/storage.cpp +++ b/library/storage.cpp @@ -293,108 +293,48 @@ bool StorageInfo::hasCf() * @fn static bool StorageInfo::hasSd() * @brief returns whether device has SD mounted * */ bool StorageInfo::hasSd() { return deviceTab("/dev/mmcd"); } /*! * @fn static bool StorageInfo::hasMmc() * @brief returns whether device has mmc mounted * */ bool StorageInfo::hasMmc() { bool hasMmc=false; if( deviceTab("/dev/mmc/part")) hasMmc=true; if( deviceTab("/dev/mmcd")) hasMmc=true; return hasMmc; } -/*! -* @fn QString StorageInfo::getCfPath() -* @brief returns the Mount-Path of Cf Card -* -*/ -QString StorageInfo::getCfPath() -{ - QString r = ""; - - for (QListIterator<FileSystem> i(mFileSystems); 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 StorageInfo::getSdPath() -{ - QString r = ""; - - for (QListIterator<FileSystem> i(mFileSystems); 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 StorageInfo::getMmcPath() -{ - QString r = ""; - - for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) - { - if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1" ) - { - r = (*i)->path(); - break; - } - } - return r; -} - /*! \fn const QList<FileSystem> &StorageInfo::fileSystems() const Returns a list of all available mounted file systems. \warning This may change in Qtopia 3.x to return only relevant Qtopia file systems (and ignore mount points such as /tmp) */ /*! \fn void StorageInfo::disksChanged() Gets emitted when a disk has been mounted or unmounted, such as when a CF c */ //--------------------------------------------------------------------------- FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o ) : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o ) { update(); } void FileSystem::update() { #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) struct statfs fs; if ( !statfs( fspath.latin1(), &fs ) ) { diff --git a/library/storage.h b/library/storage.h index 35a1109..4c29288 100644 --- a/library/storage.h +++ b/library/storage.h @@ -16,52 +16,48 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #ifndef __storage_h__ #define __storage_h__ #include <qobject.h> #include <qlist.h> class FileSystem; class QCopChannel; class StorageInfo : public QObject { Q_OBJECT public: StorageInfo( QObject *parent=0 ); const QList<FileSystem> &fileSystems() const { return mFileSystems; } const FileSystem *fileSystemOf( const QString &filename ); static bool hasCf(); static bool hasSd(); static bool hasMmc(); - - QString getCfPath(); - QString getSdPath(); - QString getMmcPath(); signals: void disksChanged(); public slots: void update(); private slots: void cardMessage( const QCString& msg, const QByteArray& data ); private: QList<FileSystem> mFileSystems; QCopChannel *channel; }; class FileSystem { public: const QString &disk() const { return fsdisk; } const QString &path() const { return fspath; } const QString &name() const { return humanname; } const QString &options() const { return opts; } long blockSize() const { return blkSize; } long totalBlocks() const { return totalBlks; } long availBlocks() const { return availBlks; } bool isRemovable() const { return removable; } |