aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlessandro Portale <[email protected]>2018-11-04 22:49:24 +0100
committerAlessandro Portale <[email protected]>2018-11-05 10:12:42 +0000
commit4979c384ceed152323411fb8822dfb60a1fde023 (patch)
tree9986e22ef4e9745f2c86c73bc2a4c9595a84fec5 /src
parentadf5305af620e2a70aa66780c5440344667c3c45 (diff)
ClearCase: Modernize
modernize-use-using Turn a parameter of ClearCaseSync::updateTotalFilesCount into a &. Change-Id: I1ee95b64374c77abb228e586544c8675ec74433a Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/clearcase/clearcaseplugin.cpp4
-rw-r--r--src/plugins/clearcase/clearcaseplugin.h4
-rw-r--r--src/plugins/clearcase/clearcasesettings.cpp2
-rw-r--r--src/plugins/clearcase/clearcasesubmiteditor.cpp2
-rw-r--r--src/plugins/clearcase/clearcasesync.cpp2
-rw-r--r--src/plugins/clearcase/clearcasesync.h3
6 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index a628593b45d..96d17c23749 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -1058,7 +1058,7 @@ void ClearCasePlugin::rmdir(const QString &path)
void ClearCasePlugin::diffActivity()
{
- typedef QMap<QString, QStringPair>::Iterator FileVerIt;
+ using FileVerIt = QMap<QString, QStringPair>::Iterator;
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
@@ -1649,7 +1649,7 @@ bool ClearCasePlugin::vcsCheckIn(const QString &messageFile, const QStringList &
if (files.isEmpty())
return true;
const QString title = QString::fromLatin1("Checkin %1").arg(files.join(QLatin1String("; ")));
- typedef QSharedPointer<FileChangeBlocker> FCBPointer;
+ using FCBPointer = QSharedPointer<FileChangeBlocker>;
replaceActivity &= (activity != QLatin1String(Constants::KEEP_ACTIVITY));
if (replaceActivity && !vcsSetActivity(m_checkInView, title, activity))
return false;
diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h
index 2aae2748be7..5c9fdaaf0fa 100644
--- a/src/plugins/clearcase/clearcaseplugin.h
+++ b/src/plugins/clearcase/clearcaseplugin.h
@@ -43,7 +43,7 @@ class QAction;
template <typename T>
class QFutureInterface;
class QMutex;
-typedef QPair<QString, QString> QStringPair;
+using QStringPair = QPair<QString, QString>;
class QTextCodec;
QT_END_NAMESPACE
@@ -93,7 +93,7 @@ public:
{ }
};
-typedef QHash<QString, FileStatus> StatusMap;
+using StatusMap = QHash<QString, FileStatus>;
class ViewData
{
diff --git a/src/plugins/clearcase/clearcasesettings.cpp b/src/plugins/clearcase/clearcasesettings.cpp
index 4f44acbd5ef..be57ebcd4a7 100644
--- a/src/plugins/clearcase/clearcasesettings.cpp
+++ b/src/plugins/clearcase/clearcasesettings.cpp
@@ -96,7 +96,7 @@ void ClearCaseSettings::fromSettings(QSettings *settings)
void ClearCaseSettings::toSettings(QSettings *settings) const
{
- typedef QHash<QString, int>::ConstIterator FilesConstIt;
+ using FilesConstIt = QHash<QString, int>::ConstIterator;
settings->beginGroup(QLatin1String(groupC));
settings->setValue(QLatin1String(commandKeyC), ccCommand);
diff --git a/src/plugins/clearcase/clearcasesubmiteditor.cpp b/src/plugins/clearcase/clearcasesubmiteditor.cpp
index f96c35f958e..eed9cf193ce 100644
--- a/src/plugins/clearcase/clearcasesubmiteditor.cpp
+++ b/src/plugins/clearcase/clearcasesubmiteditor.cpp
@@ -51,7 +51,7 @@ void ClearCaseSubmitEditor::setIsUcm(bool isUcm)
void ClearCaseSubmitEditor::setStatusList(const QStringList &statusOutput)
{
- typedef QStringList::const_iterator ConstIterator;
+ using ConstIterator = QStringList::const_iterator;
auto model = new VcsBase::SubmitFileModel(this);
model->setRepositoryRoot(checkScriptWorkingDirectory());
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp
index 2a9c16dfd77..2b871a01339 100644
--- a/src/plugins/clearcase/clearcasesync.cpp
+++ b/src/plugins/clearcase/clearcasesync.cpp
@@ -111,7 +111,7 @@ void ClearCaseSync::processCleartoolLsLine(const QDir &viewRootDir, const QStrin
m_plugin->setStatus(absFile, FileStatus::CheckedIn, true);
}
-void ClearCaseSync::updateTotalFilesCount(const QString view, ClearCaseSettings settings,
+void ClearCaseSync::updateTotalFilesCount(const QString &view, ClearCaseSettings settings,
const int processed)
{
settings = m_plugin->settings(); // Might have changed while task was running
diff --git a/src/plugins/clearcase/clearcasesync.h b/src/plugins/clearcase/clearcasesync.h
index 179c3c6a232..e5aeda92587 100644
--- a/src/plugins/clearcase/clearcasesync.h
+++ b/src/plugins/clearcase/clearcasesync.h
@@ -41,7 +41,8 @@ public:
void invalidateStatus(const QDir &viewRootDir, const QStringList &files);
void invalidateStatusAllFiles();
void processCleartoolLsLine(const QDir &viewRootDir, const QString &buffer);
- void updateTotalFilesCount(const QString view, ClearCaseSettings settings, const int processed);
+ void updateTotalFilesCount(const QString &view, ClearCaseSettings settings,
+ const int processed);
void updateStatusForNotManagedFiles(const QStringList &files);
void syncDynamicView(QFutureInterface<void> &future,