Git: Some more QStringList cleanup

Change-Id: I0c6e8f768ee46985dab8ae14f88f2bc8d34fed26
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2016-07-24 10:10:44 +03:00
committed by Orgad Shaneh
parent fedf5de551
commit cfc8ed41c7
8 changed files with 13 additions and 17 deletions
+1 -1
View File
@@ -336,7 +336,7 @@ void BranchDialog::log()
QString branchName = m_model->fullName(selectedIndex(), true); QString branchName = m_model->fullName(selectedIndex(), true);
if (branchName.isEmpty()) if (branchName.isEmpty())
return; return;
GitPlugin::client()->log(m_repository, QString(), false, QStringList(branchName)); GitPlugin::client()->log(m_repository, QString(), false, { branchName });
} }
void BranchDialog::reset() void BranchDialog::reset()
+1 -1
View File
@@ -172,7 +172,7 @@ public:
} }
return names; return names;
} }
return QStringList(fullName().join('/')); return { fullName().join('/') };
} }
int rowOf(BranchNode *node) int rowOf(BranchNode *node)
+1 -1
View File
@@ -93,7 +93,7 @@ GerritOptionsWidget::GerritOptionsWidget(QWidget *parent)
formLayout->addRow(tr("&Host:"), m_hostLineEdit); formLayout->addRow(tr("&Host:"), m_hostLineEdit);
formLayout->addRow(tr("&User:"), m_userLineEdit); formLayout->addRow(tr("&User:"), m_userLineEdit);
m_sshChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); m_sshChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
m_sshChooser->setCommandVersionArguments(QStringList("-V")); m_sshChooser->setCommandVersionArguments({ "-V" });
m_sshChooser->setHistoryCompleter("Git.SshCommand.History"); m_sshChooser->setHistoryCompleter("Git.SshCommand.History");
formLayout->addRow(tr("&ssh:"), m_sshChooser); formLayout->addRow(tr("&ssh:"), m_sshChooser);
m_portSpinBox->setMinimum(1); m_portSpinBox->setMinimum(1);
+2 -5
View File
@@ -72,7 +72,7 @@ void GerritParameters::setPortFlagBySshType()
{ {
bool isPlink = false; bool isPlink = false;
if (!ssh.isEmpty()) { if (!ssh.isEmpty()) {
const QString version = Utils::PathChooser::toolVersion(ssh, QStringList("-V")); const QString version = Utils::PathChooser::toolVersion(ssh, { "-V" });
isPlink = version.contains("plink", Qt::CaseInsensitive); isPlink = version.contains("plink", Qt::CaseInsensitive);
} }
portFlag = QLatin1String(isPlink ? "-P" : defaultPortFlag); portFlag = QLatin1String(isPlink ? "-P" : defaultPortFlag);
@@ -88,10 +88,7 @@ GerritParameters::GerritParameters()
QStringList GerritParameters::baseCommandArguments() const QStringList GerritParameters::baseCommandArguments() const
{ {
QStringList result; return { ssh, portFlag, QString::number(port), sshHostArgument(), "gerrit" };
result << ssh << portFlag << QString::number(port)
<< sshHostArgument() << "gerrit";
return result;
} }
QString GerritParameters::sshHostArgument() const QString GerritParameters::sshHostArgument() const
+3 -4
View File
@@ -754,8 +754,7 @@ void GitClient::diffProject(const QString &workingDirectory, const QString &proj
workingDirectory, tr("Git Diff Project"), workingDirectory, tr("Git Diff Project"),
[this, workingDirectory, projectDirectory] [this, workingDirectory, projectDirectory]
(IDocument *doc) -> DiffEditorController* { (IDocument *doc) -> DiffEditorController* {
return new ProjectDiffController(doc, workingDirectory, return new ProjectDiffController(doc, workingDirectory, { projectDirectory });
QStringList(projectDirectory));
}); });
} }
@@ -905,7 +904,7 @@ VcsBaseEditorWidget *GitClient::annotate(
int lineNumber, const QStringList &extraOptions) int lineNumber, const QStringList &extraOptions)
{ {
const Id editorId = Git::Constants::GIT_BLAME_EDITOR_ID; const Id editorId = Git::Constants::GIT_BLAME_EDITOR_ID;
const QString id = VcsBaseEditor::getTitleId(workingDir, QStringList(file), revision); const QString id = VcsBaseEditor::getTitleId(workingDir, { file }, revision);
const QString title = tr("Git Blame \"%1\"").arg(id); const QString title = tr("Git Blame \"%1\"").arg(id);
const QString sourceFile = VcsBaseEditor::getSource(workingDir, file); const QString sourceFile = VcsBaseEditor::getSource(workingDir, file);
@@ -2154,7 +2153,7 @@ void GitClient::launchRepositoryBrowser(const QString &workingDirectory)
{ {
const QString repBrowserBinary = settings().stringValue(GitSettings::repositoryBrowserCmd); const QString repBrowserBinary = settings().stringValue(GitSettings::repositoryBrowserCmd);
if (!repBrowserBinary.isEmpty()) if (!repBrowserBinary.isEmpty())
QProcess::startDetached(repBrowserBinary, QStringList(workingDirectory), workingDirectory); QProcess::startDetached(repBrowserBinary, { workingDirectory }, workingDirectory);
} }
bool GitClient::tryLauchingGitK(const QProcessEnvironment &env, bool GitClient::tryLauchingGitK(const QProcessEnvironment &env,
+1 -1
View File
@@ -212,7 +212,7 @@ void GitEditorWidget::revertChange()
void GitEditorWidget::logChange() void GitEditorWidget::logChange()
{ {
GitPlugin::client()->log( GitPlugin::client()->log(
sourceWorkingDirectory(), QString(), false, QStringList(m_currentChange)); sourceWorkingDirectory(), QString(), false, { m_currentChange });
} }
void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert) void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert)
+2 -2
View File
@@ -724,7 +724,7 @@ void GitPlugin::undoFileChanges(bool revertStaging)
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return); QTC_ASSERT(state.hasFile(), return);
FileChangeBlocker fcb(state.currentFile()); FileChangeBlocker fcb(state.currentFile());
m_gitClient->revert(QStringList(state.currentFile()), revertStaging); m_gitClient->revert({ state.currentFile() }, revertStaging);
} }
class ResetItemDelegate : public LogItemDelegate class ResetItemDelegate : public LogItemDelegate
@@ -839,7 +839,7 @@ void GitPlugin::unstageFile()
{ {
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return); QTC_ASSERT(state.hasFile(), return);
m_gitClient->synchronousReset(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); m_gitClient->synchronousReset(state.currentFileTopLevel(), { state.relativeCurrentFile() });
} }
void GitPlugin::gitkForCurrentFile() void GitPlugin::gitkForCurrentFile()
+2 -2
View File
@@ -105,13 +105,13 @@ bool GitVersionControl::vcsOpen(const QString & /*fileName*/)
bool GitVersionControl::vcsAdd(const QString & fileName) bool GitVersionControl::vcsAdd(const QString & fileName)
{ {
const QFileInfo fi(fileName); const QFileInfo fi(fileName);
return m_client->synchronousAdd(fi.absolutePath(), QStringList(fi.fileName())); return m_client->synchronousAdd(fi.absolutePath(), { fi.fileName() });
} }
bool GitVersionControl::vcsDelete(const QString & fileName) bool GitVersionControl::vcsDelete(const QString & fileName)
{ {
const QFileInfo fi(fileName); const QFileInfo fi(fileName);
return m_client->synchronousDelete(fi.absolutePath(), true, QStringList(fi.fileName())); return m_client->synchronousDelete(fi.absolutePath(), true, { fi.fileName() });
} }
bool GitVersionControl::vcsMove(const QString &from, const QString &to) bool GitVersionControl::vcsMove(const QString &from, const QString &to)