feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Fix code redundancy.

Browse Source 
Recursively removing a directory was implmented twice.
This commit is contained in:
Christian Kandeler
2010-11-26 12:19:32 +01:00
parent ded9ed66ef
commit 7fd0b2dbb6
7 changed files with 46 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
View File

@@ -230,9 +230,10 @@ bool MaemoPackageCreationStep::copyDebianFiles(bool inSourceBuild)
.arg(QDir::toNativeSeparators(debianDirPath)));
return false;
}
if (!removeDirectory(debianDirPath)) {
QString error;
if (!MaemoGlobal::removeRecursively(debianDirPath, error)) {
raiseError(tr("Packaging failed."),
tr("Could not remove directory '%1'.").arg(debianDirPath));
tr("Could not remove directory '%1': %2").arg(debianDirPath, error));
return false;
}
QDir buildDir(buildDirectory());
@@ -271,29 +272,6 @@ bool MaemoPackageCreationStep::copyDebianFiles(bool inSourceBuild)
return true;
}
bool MaemoPackageCreationStep::removeDirectory(const QString &dirPath)
{
QDir dir(dirPath);
if (!dir.exists())
return true;
const QStringList &files
= dir.entryList(QDir::Files | QDir::Hidden | QDir::System);
foreach (const QString &fileName, files) {
if (!dir.remove(fileName))
return false;
}
const QStringList &subDirs
= dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
foreach (const QString &subDirName, subDirs) {
if (!removeDirectory(dirPath + QLatin1Char('/') + subDirName))
return false;
}
return dir.rmdir(dirPath);
}
bool MaemoPackageCreationStep::runCommand(QProcess *buildProc,
const QString &command)
{