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

vcs: s/VCS/Vcs/

Browse Source 
According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
This commit is contained in:
hjk
2012-01-07 12:31:48 +01:00
parent 641716bee3
commit 6681d3edee
167 changed files with 1588 additions and 1588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/vcsbase/cleandialog.cpp
View File

@@ -52,7 +52,7 @@
#include <QtCore/QFuture>
#include <QtCore/QtConcurrentRun>
namespace VCSBase {
namespace VcsBase {
namespace Internal {
enum { nameColumn, columnCount };
@@ -71,14 +71,14 @@ static void removeFileRecursion(const QFileInfo &f, QString *errorMessage)
removeFileRecursion(fi, errorMessage);
QDir parent = f.absoluteDir();
if (!parent.rmdir(f.fileName()))
errorMessage->append(VCSBase::CleanDialog::tr("The directory %1 could not be deleted.").
errorMessage->append(VcsBase::CleanDialog::tr("The directory %1 could not be deleted.").
arg(QDir::toNativeSeparators(f.absoluteFilePath())));
return;
}
if (!QFile::remove(f.absoluteFilePath())) {
if (!errorMessage->isEmpty())
errorMessage->append(QLatin1Char('\n'));
errorMessage->append(VCSBase::CleanDialog::tr("The file %1 could not be deleted.").
errorMessage->append(VcsBase::CleanDialog::tr("The file %1 could not be deleted.").
arg(QDir::toNativeSeparators(f.absoluteFilePath())));
}
}
@@ -145,7 +145,7 @@ CleanDialogPrivate::CleanDialogPrivate() :
} // namespace Internal
/*!
\class VCSBase::CleanDialog
\class VcsBase::CleanDialog
\brief File selector dialog for files not under version control.
@@ -258,14 +258,14 @@ bool CleanDialog::promptToDelete()
// Remove in background
Internal::CleanFilesTask *cleanTask = new Internal::CleanFilesTask(d->m_workingDirectory, selectedFiles);
connect(cleanTask, SIGNAL(error(QString)),
VCSBase::VCSBaseOutputWindow::instance(), SLOT(appendSilently(QString)),
VcsBase::VcsBaseOutputWindow::instance(), SLOT(appendSilently(QString)),
Qt::QueuedConnection);
QFuture<void> task = QtConcurrent::run(cleanTask, &Internal::CleanFilesTask::run);
const QString taskName = tr("Cleaning %1").
arg(QDir::toNativeSeparators(d->m_workingDirectory));
Core::ICore::instance()->progressManager()->addTask(task, taskName,
QLatin1String("VCSBase.cleanRepository"));
QLatin1String("VcsBase.cleanRepository"));
return true;
}
@@ -291,6 +291,6 @@ void CleanDialog::changeEvent(QEvent *e)
}
}
} // namespace VCSBase
} // namespace VcsBase
#include "cleandialog.moc"