From 360366ae080309217b05e44647fd082126f86e4c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 17 Jul 2013 22:26:50 +0300 Subject: [PATCH] VCS: Remove unused termination mode Defaults to NoReport and nobody sets other values Change-Id: I3def23bd350fcef45df9eb8d3a0e86baac192bd9 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 1 - src/plugins/vcsbase/command.cpp | 34 --------------------------------- src/plugins/vcsbase/command.h | 12 ------------ 3 files changed, 47 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index e2d315427ff..38211a706e1 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2239,7 +2239,6 @@ VcsBase::Command *GitClient::executeGit(const QString &workingDirectory, outputWindow()->appendCommand(workingDirectory, settings()->stringValue(GitSettings::binaryPathKey), arguments); VcsBase::Command *command = createCommand(workingDirectory, editor, useOutputToWindow, editorLineNumber); command->addJob(arguments, settings()->intValue(GitSettings::timeoutKey)); - command->setTerminationReportMode(VcsBase::Command::NoReport); command->setUnixTerminalDisabled(false); command->setExpectChanges(expectChanges); command->execute(); diff --git a/src/plugins/vcsbase/command.cpp b/src/plugins/vcsbase/command.cpp index cce4267348f..7282ba999a4 100644 --- a/src/plugins/vcsbase/command.cpp +++ b/src/plugins/vcsbase/command.cpp @@ -47,18 +47,6 @@ Q_DECLARE_METATYPE(QVariant) -static QString msgTermination(int exitCode, const QString &binaryPath, const QStringList &args) -{ - QString cmd = QFileInfo(binaryPath).baseName(); - if (!args.empty()) { - cmd += QLatin1Char(' '); - cmd += args.front(); - } - return exitCode ? - QCoreApplication::translate("VcsCommand", "\n'%1' failed (exit code %2).\n").arg(cmd).arg(exitCode) : - QCoreApplication::translate("VcsCommand", "\n'%1' completed (exit code %2).\n").arg(cmd).arg(exitCode); -} - namespace VcsBase { namespace Internal { @@ -86,7 +74,6 @@ public: QTextCodec *m_codec; QList m_jobs; - Command::TerminationReportMode m_reportTerminationMode; bool m_lastExecSuccess; int m_lastExecExitCode; @@ -102,7 +89,6 @@ CommandPrivate::CommandPrivate(const QString &binary, m_defaultTimeout(10), m_expectChanges(false), m_codec(0), - m_reportTerminationMode(Command::NoReport), m_lastExecSuccess(false), m_lastExecExitCode(-1) { @@ -146,16 +132,6 @@ const QProcessEnvironment &Command::processEnvironment() const return d->m_environment; } -Command::TerminationReportMode Command::reportTerminationMode() const -{ - return d->m_reportTerminationMode; -} - -void Command::setTerminationReportMode(TerminationReportMode m) -{ - d->m_reportTerminationMode = m; -} - int Command::defaultTimeout() const { return d->m_defaultTimeout; @@ -275,16 +251,6 @@ void Command::run() error += QString::fromLocal8Bit(stdErr); exitCode = process->exitCode(); - switch (reportTerminationMode()) { - case NoReport: - break; - case ReportStdout: - stdOut += msgTermination(exitCode, binaryPath(), d->m_jobs.at(j).arguments).toUtf8(); - break; - case ReportStderr: - error += msgTermination(exitCode, binaryPath(), d->m_jobs.at(j).arguments); - break; - } } QString stdOutS = d->m_codec ? d->m_codec->toUnicode(stdOut) diff --git a/src/plugins/vcsbase/command.h b/src/plugins/vcsbase/command.h index 91a69a8e08b..2b513636a12 100644 --- a/src/plugins/vcsbase/command.h +++ b/src/plugins/vcsbase/command.h @@ -47,14 +47,6 @@ class VCSBASE_EXPORT Command : public QObject Q_OBJECT public: - // Where to report command termination with exit code if desired - enum TerminationReportMode - { - NoReport, - ReportStdout, // This assumes UTF8 - ReportStderr - }; - Command(const QString &binary, const QString &workingDirectory, const QProcessEnvironment &environment); @@ -70,10 +62,6 @@ public: const QString &workingDirectory() const; const QProcessEnvironment &processEnvironment() const; - // Report command termination with exit code - TerminationReportMode reportTerminationMode() const; - void setTerminationReportMode(TerminationReportMode m); - int defaultTimeout() const; void setDefaultTimeout(int timeout);