author | mickeyl <mickeyl> | 2003-10-27 19:51:32 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 19:51:32 (UTC) |
commit | 951d1d4125a80dc814f95d2956853bf53ca52e9a (patch) (side-by-side diff) | |
tree | 46c7a70b80a7eebb54cd59c46204c28335f3821c /noncore/settings/sysinfo/storage.cpp | |
parent | f0a15a9866f9eddfe10596e63a1e6300b92b9e3f (diff) | |
download | opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.zip opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.tar.gz opie-951d1d4125a80dc814f95d2956853bf53ca52e9a.tar.bz2 |
merge noncore/apps/* except
- advancedfm (ljp, please...)
- odict (tille, please...)
Diffstat (limited to 'noncore/settings/sysinfo/storage.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/storage.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp index c4474d5..4ef7122 100644 --- a/noncore/settings/sysinfo/storage.cpp +++ b/noncore/settings/sysinfo/storage.cpp @@ -52,3 +52,3 @@ FileSysInfo::FileSysInfo( QWidget *parent, const char *name ) connect( storage, SIGNAL( disksChanged() ), this, SLOT( disksChanged() ) ); - + lines.setAutoDelete(TRUE); @@ -60,2 +60,3 @@ FileSysInfo::FileSysInfo( QWidget *parent, const char *name ) + void FileSysInfo::timerEvent(QTimerEvent*) @@ -68,17 +69,8 @@ void FileSysInfo::updateMounts() storage->update(); - + if ( rebuildDisks ) { - // Cannot auto delete QDict<MountInfo> disks because it seems to delete - // the filesystem object as well causing a segfault - MountInfo *mi; - for ( QDictIterator<MountInfo> delit(disks); delit.current(); ++delit ) - { - mi = delit.current(); - mi->fs = 0x0; - delete mi; - } disks.clear(); lines.clear(); - + delete vb; @@ -87,3 +79,3 @@ void FileSysInfo::updateMounts() bool frst=TRUE; - + FileSystem *fs; @@ -92,3 +84,3 @@ void FileSysInfo::updateMounts() fs = it.current(); - + if ( !frst ) @@ -102,3 +94,3 @@ void FileSysInfo::updateMounts() frst = FALSE; - + MountInfo *mi = new MountInfo( fs, container ); @@ -128,3 +120,3 @@ void FileSysInfo::updateMounts() } - + rebuildDisks = FALSE; @@ -147,3 +139,3 @@ MountInfo::MountInfo( FileSystem *filesys, QWidget *parent, const char *name ) title = fs->name(); - + data = new GraphData(); @@ -165,3 +157,2 @@ MountInfo::~MountInfo() delete data; - delete fs; } |