author | ar <ar> | 2004-01-10 13:54:11 (UTC) |
---|---|---|
committer | ar <ar> | 2004-01-10 13:54:11 (UTC) |
commit | bf9988d771a03bc6a1d97a11ce3794d8b429b534 (patch) (unidiff) | |
tree | 2537aae850a32b9d3ff6d82d8fb0906c3cead7fd /library/storage.cpp | |
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 |
1 files changed, 0 insertions, 60 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() | |||
293 | * @fn static bool StorageInfo::hasSd() | 293 | * @fn static bool StorageInfo::hasSd() |
294 | * @brief returns whether device has SD mounted | 294 | * @brief returns whether device has SD mounted |
295 | * | 295 | * |
296 | */ | 296 | */ |
297 | bool StorageInfo::hasSd() | 297 | bool StorageInfo::hasSd() |
298 | { | 298 | { |
299 | return deviceTab("/dev/mmcd"); | 299 | return deviceTab("/dev/mmcd"); |
300 | } | 300 | } |
301 | 301 | ||
302 | /*! | 302 | /*! |
303 | * @fn static bool StorageInfo::hasMmc() | 303 | * @fn static bool StorageInfo::hasMmc() |
304 | * @brief returns whether device has mmc mounted | 304 | * @brief returns whether device has mmc mounted |
305 | * | 305 | * |
306 | */ | 306 | */ |
307 | bool StorageInfo::hasMmc() | 307 | bool StorageInfo::hasMmc() |
308 | { | 308 | { |
309 | bool hasMmc=false; | 309 | bool hasMmc=false; |
310 | if( deviceTab("/dev/mmc/part")) | 310 | if( deviceTab("/dev/mmc/part")) |
311 | hasMmc=true; | 311 | hasMmc=true; |
312 | if( deviceTab("/dev/mmcd")) | 312 | if( deviceTab("/dev/mmcd")) |
313 | hasMmc=true; | 313 | hasMmc=true; |
314 | return hasMmc; | 314 | return hasMmc; |
315 | } | 315 | } |
316 | 316 | ||
317 | /*! | ||
318 | * @fn QString StorageInfo::getCfPath() | ||
319 | * @brief returns the Mount-Path of Cf Card | ||
320 | * | ||
321 | */ | ||
322 | QString StorageInfo::getCfPath() | ||
323 | { | ||
324 | QString r = ""; | ||
325 | |||
326 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) | ||
327 | { | ||
328 | if ( (*i)->disk().left( 8 ) == "/dev/hda" ) | ||
329 | { | ||
330 | r = (*i)->path(); | ||
331 | break; | ||
332 | } | ||
333 | } | ||
334 | return r; | ||
335 | } | ||
336 | |||
337 | /*! | ||
338 | * @fn QString StorageInfo::getSdPath() | ||
339 | * @brief returns the Mount-Path of Sd Card | ||
340 | * | ||
341 | */ | ||
342 | QString StorageInfo::getSdPath() | ||
343 | { | ||
344 | QString r = ""; | ||
345 | |||
346 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) | ||
347 | { | ||
348 | if ( (*i)->disk().left( 9 ) == "/dev/mmcd" ) | ||
349 | { | ||
350 | r = (*i)->path(); | ||
351 | break; | ||
352 | } | ||
353 | } | ||
354 | return r; | ||
355 | } | ||
356 | |||
357 | /*! | ||
358 | * @fn QString StorageInfo::getMmcPath() | ||
359 | * @brief returns the Mount-Path of Mmc Card | ||
360 | * | ||
361 | */ | ||
362 | QString StorageInfo::getMmcPath() | ||
363 | { | ||
364 | QString r = ""; | ||
365 | |||
366 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) | ||
367 | { | ||
368 | if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1" ) | ||
369 | { | ||
370 | r = (*i)->path(); | ||
371 | break; | ||
372 | } | ||
373 | } | ||
374 | return r; | ||
375 | } | ||
376 | |||
377 | /*! \fn const QList<FileSystem> &StorageInfo::fileSystems() const | 317 | /*! \fn const QList<FileSystem> &StorageInfo::fileSystems() const |
378 | Returns a list of all available mounted file systems. | 318 | Returns a list of all available mounted file systems. |
379 | 319 | ||
380 | \warning This may change in Qtopia 3.x to return only relevant Qtopia file systems (and ignore mount points such as /tmp) | 320 | \warning This may change in Qtopia 3.x to return only relevant Qtopia file systems (and ignore mount points such as /tmp) |
381 | */ | 321 | */ |
382 | 322 | ||
383 | /*! \fn void StorageInfo::disksChanged() | 323 | /*! \fn void StorageInfo::disksChanged() |
384 | Gets emitted when a disk has been mounted or unmounted, such as when | 324 | Gets emitted when a disk has been mounted or unmounted, such as when |
385 | a CF c | 325 | a CF c |
386 | */ | 326 | */ |
387 | //--------------------------------------------------------------------------- | 327 | //--------------------------------------------------------------------------- |
388 | 328 | ||
389 | FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o ) | 329 | FileSystem::FileSystem( const QString &disk, const QString &path, const QString &name, bool rem, const QString &o ) |
390 | : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o ) | 330 | : fsdisk( disk ), fspath( path ), humanname( name ), blkSize(512), totalBlks(0), availBlks(0), removable( rem ), opts( o ) |
391 | { | 331 | { |
392 | update(); | 332 | update(); |
393 | } | 333 | } |
394 | 334 | ||
395 | void FileSystem::update() | 335 | void FileSystem::update() |
396 | { | 336 | { |
397 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 337 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
398 | struct statfs fs; | 338 | struct statfs fs; |
399 | if ( !statfs( fspath.latin1(), &fs ) ) | 339 | if ( !statfs( fspath.latin1(), &fs ) ) |
400 | { | 340 | { |