Code police and simplify function a bit.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15089 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2007-10-12 16:54:51 +00:00
parent 79d358baca
commit abd8c39a4d

View file

@ -24,22 +24,21 @@
// recursive function to delete a dir with files // recursive function to delete a dir with files
bool recRmdir( const QString &dirName ) bool recRmdir( const QString &dirName )
{ {
QString dirN = dirName; QString dirN = dirName;
QDir dir(dirN); QDir dir(dirN);
QStringList list = dir.entryList(QDir::AllEntries); // make list of entries in directory // make list of entries in directory
QFileInfo fileInfo; QStringList list = dir.entryList(QDir::AllEntries | QDir::NoDotAndDotDot);
QString curItem, lstAt; QFileInfo fileInfo;
for(int i = 0; i < list.size(); i++){ // loop through all items of list QString curItem, lstAt;
QString name = list.at(i); for(int i = 0; i < list.size(); i++){ // loop through all items of list
if(!(name == ".") && !(name == "..")){ QString name = list.at(i);
curItem = dirN + "/" + name; curItem = dirN + "/" + name;
fileInfo.setFile(curItem); fileInfo.setFile(curItem);
if(fileInfo.isDir()) // is directory if(fileInfo.isDir()) // is directory
recRmdir(curItem); // call recRmdir() recursively for deleting subdirectory recRmdir(curItem); // call recRmdir() recursively for deleting subdirectory
else // is file else // is file
QFile::remove(curItem); // ok, delete file QFile::remove(curItem); // ok, delete file
} }
} dir.cdUp();
dir.cdUp(); return dir.rmdir(dirN); // delete empty dir and return if (now empty) dir-removing was successfull
return dir.rmdir(dirN); // delete empty dir and return if (now empty) dir-removing was successfull
} }