summaryrefslogtreecommitdiff
authorleseb <leseb>2002-09-04 06:30:37 (UTC)
committer leseb <leseb>2002-09-04 06:30:37 (UTC)
commitab38f9c573c39be3c5ea909dd4eafed319fa9dff (patch) (side-by-side diff)
tree80864deb1c27595db388d0d37f2eab3345a8147e
parentcf317ab123c51fb957ec35d44431e77a8b76c279 (diff)
downloadopie-ab38f9c573c39be3c5ea909dd4eafed319fa9dff.zip
opie-ab38f9c573c39be3c5ea909dd4eafed319fa9dff.tar.gz
opie-ab38f9c573c39be3c5ea909dd4eafed319fa9dff.tar.bz2
Fix some storage name
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/storage.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/library/storage.cpp b/library/storage.cpp
index 13639fe..35e0255 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -124,59 +124,59 @@ void StorageInfo::update()
}
}
endmntent( mntfp );
}
if ( rebuild || n != (int)mFileSystems.count() ) {
mFileSystems.clear();
QStringList::ConstIterator it=curdisks.begin();
QStringList::ConstIterator fsit=curfs.begin();
QStringList::ConstIterator optsIt=curopts.begin();
for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) {
QString opts = *optsIt;
QString disk = *it;
QString humanname;
bool removable = FALSE;
if ( isCF(disk) ) {
humanname = tr("CF Card");
removable = TRUE;
} else if ( disk == "/dev/hda1" ) {
humanname = tr("Hard Disk");
} else if ( disk.left(9) == "/dev/mmcd" ) {
humanname = tr("SD Card");
removable = TRUE;
} else if ( disk.left(7) == "/dev/hd" )
- humanname = tr("Hard Disk") + " " + disk.mid(7);
+ humanname = tr("Hard Disk") + " " + disk;
else if ( disk.left(7) == "/dev/sd" )
- humanname = tr("SCSI Hard Disk") + " " + disk.mid(7);
+ humanname = tr("SCSI Hard Disk") + " " + disk;
else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs
humanname = tr("Internal Memory");
else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
humanname = tr("Internal Storage");
else if ( disk.left(14) == "/dev/mtdblock/" )
- humanname = tr("Internal Storage") + " " + disk.mid(14);
+ humanname = tr("Internal Storage") + " " + disk;
else if ( disk.left(13) == "/dev/mtdblock" )
- humanname = tr("Internal Storage") + " " + disk.mid(13);
+ humanname = tr("Internal Storage") + " " + disk;
else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs
humanname = tr("Internal Memory");
FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts );
mFileSystems.append( fs );
}
emit disksChanged();
} else {
// just update them
for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
i.current()->update();
}
#endif
}
//---------------------------------------------------------------------------
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()
{