From f4487c4c6728ec315f133479c07ab04332bdeffc Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 12 Mar 2010 15:59:50 +0100
Subject: [PATCH] VCS[git]: Cleaning a repositories: Uncheck pro.user files as
well.
---
src/plugins/vcsbase/cleandialog.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/plugins/vcsbase/cleandialog.cpp b/src/plugins/vcsbase/cleandialog.cpp
index a8ed8a02309..c7159c03f87 100644
--- a/src/plugins/vcsbase/cleandialog.cpp
+++ b/src/plugins/vcsbase/cleandialog.cpp
@@ -166,18 +166,20 @@ void CleanDialog::setFileList(const QString &workingDirectory, const QStringList
const QIcon fileIcon = style->standardIcon(QStyle::SP_FileIcon);
const QString diffSuffix = QLatin1String(".diff");
const QString patchSuffix = QLatin1String(".patch");
+ const QString proUserSuffix = QLatin1String(".pro.user");
const QChar slash = QLatin1Char('/');
- // Do not initially check patches for deletion.
+ // Do not initially check patches or 'pro.user' files for deletion.
foreach(const QString &fileName, l) {
const QFileInfo fi(workingDirectory + slash + fileName);
const bool isDir = fi.isDir();
QStandardItem *nameItem = new QStandardItem(QDir::toNativeSeparators(fileName));
nameItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
nameItem->setIcon(isDir ? folderIcon : fileIcon);
- const bool isPatch = !isDir && (fileName.endsWith(diffSuffix)
- || fileName.endsWith(patchSuffix));
+ const bool saveFile = !isDir && (fileName.endsWith(diffSuffix)
+ || fileName.endsWith(patchSuffix)
+ || fileName.endsWith(proUserSuffix));
nameItem->setCheckable(true);
- nameItem->setCheckState(isPatch ? Qt::Unchecked : Qt::Checked);
+ nameItem->setCheckState(saveFile ? Qt::Unchecked : Qt::Checked);
nameItem->setData(QVariant(fi.absoluteFilePath()), fileNameRole);
nameItem->setData(QVariant(isDir), isDirectoryRole);
// Tooltip with size information
--
GitLab