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

ClearCase: Re-use FilePath::removeRecursively()

Browse Source 
Change-Id: Iac0e8fcd774c366289b0f854e8b4c310dd109901
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-11-25 14:19:36 +01:00
parent f9e373bba7
commit dbaade3b47
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -274,7 +274,6 @@ private:
void diffGraphical(const QString &file1, const QString &file2 = QString()); void diffGraphical(const QString &file1, const QString &file2 = QString());
QString diffExternal(QString file1, QString file2 = QString(), bool keep = false); QString diffExternal(QString file1, QString file2 = QString(), bool keep = false);
QString getFile(const QString &nativeFile, const QString &prefix); QString getFile(const QString &nativeFile, const QString &prefix);
static void rmdir(const QString &path);
QString runExtDiff(const FilePath &workingDir, const QStringList &arguments, int timeOutS, QString runExtDiff(const FilePath &workingDir, const QStringList &arguments, int timeOutS,
QTextCodec *outputCodec = nullptr); QTextCodec *outputCodec = nullptr);
static QString getDriveLetterOfPath(const QString &directory); static QString getDriveLetterOfPath(const QString &directory);
@@ -1207,20 +1206,6 @@ QStringList ClearCasePluginPrivate::ccGetActivityVersions(const FilePath &workin
return versions; return versions;
} }
void ClearCasePluginPrivate::rmdir(const QString &path)
{
QDir dir(path);
const auto fileInfoList = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
for (QFileInfo fi : fileInfoList) {
if (fi.isDir()) {
rmdir(fi.canonicalFilePath());
dir.rmdir(fi.baseName());
} else {
QFile::remove(fi.canonicalFilePath());
}
}
}
void ClearCasePluginPrivate::diffActivity() void ClearCasePluginPrivate::diffActivity()
{ {
using FileVerIt = QMap<QString, QStringPair>::Iterator; using FileVerIt = QMap<QString, QStringPair>::Iterator;
@@ -1270,8 +1255,8 @@ void ClearCasePluginPrivate::diffActivity()
diffGraphical(pair.first, pair.second); diffGraphical(pair.first, pair.second);
return; return;
} }
rmdir(TemporaryDirectory::masterDirectoryPath() + QLatin1String("/ccdiff/") + activity); TemporaryDirectory::masterDirectoryFilePath().pathAppended("ccdiff").pathAppended(activity)
QDir(TemporaryDirectory::masterDirectoryPath()).rmpath(QLatin1String("ccdiff/") + activity); .removeRecursively();
m_diffPrefix = activity; m_diffPrefix = activity;
const FileVerIt fend = filever.end(); const FileVerIt fend = filever.end();
for (FileVerIt it = filever.begin(); it != fend; ++it) { for (FileVerIt it = filever.begin(); it != fend; ++it) {