Remove the --force option

It hasn't been in use for a while now.

Change-Id: I85c22d44309727ee458414cad0fb42c312030a9b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

8 files changed, 1 insertions, 42 deletions

diff --git a/src/app/qbs/parser/commandlineoption.cpp b/src/app/qbs/parser/commandlineoption.cpp
index 8689b2032..011a2c891 100644
--- a/src/app/qbs/parser/commandlineoption.cpp
+++ b/src/app/qbs/parser/commandlineoption.cpp
@@ -422,20 +422,6 @@ void LogLevelOption::doParse(const QString &representation, QStringList &input)
                 .arg(representation, levelString, description(command())));
 }
 
-QString ForceOption::description(CommandType command) const
-{
-    Q_UNUSED(command);
-    return Tr::tr("%1\n\tDisregard objections.\n"
-                  "\tqbs might refuse to execute a given command because certain\n"
-                  "\tcircumstances make it seem dubious. This option switches the\n"
-                  "\trespective checks off.\n").arg(longRepresentation());
-}
-
-QString ForceOption::longRepresentation() const
-{
-    return QLatin1String("--force");
-}
-
 QString ForceTimeStampCheckOption::description(CommandType command) const
 {
     Q_UNUSED(command);
diff --git a/src/app/qbs/parser/commandlineoption.h b/src/app/qbs/parser/commandlineoption.h
index cf16b475f..f99ceb896 100644
--- a/src/app/qbs/parser/commandlineoption.h
+++ b/src/app/qbs/parser/commandlineoption.h
@@ -63,7 +63,6 @@ public:
         ProductsOptionType,
         NoInstallOptionType,
         InstallRootOptionType, RemoveFirstOptionType, NoBuildOptionType,
-        ForceOptionType,
         ForceTimestampCheckOptionType,
         ForceOutputCheckOptionType,
         BuildNonDefaultOptionType,
@@ -235,13 +234,6 @@ public:
     QString longRepresentation() const;
 };
 
-class ForceOption : public OnOffOption
-{
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
-};
-
 class ForceTimeStampCheckOption : public OnOffOption
 {
     QString description(CommandType command) const;
diff --git a/src/app/qbs/parser/commandlineoptionpool.cpp b/src/app/qbs/parser/commandlineoptionpool.cpp
index 2fc3e0e19..0e873c69a 100644
--- a/src/app/qbs/parser/commandlineoptionpool.cpp
+++ b/src/app/qbs/parser/commandlineoptionpool.cpp
@@ -98,9 +98,6 @@ CommandLineOption *CommandLineOptionPool::getOption(CommandLineOption::Type type
         case CommandLineOption::NoBuildOptionType:
             option = new NoBuildOption;
             break;
-        case CommandLineOption::ForceOptionType:
-            option = new ForceOption;
-            break;
         case CommandLineOption::ForceTimestampCheckOptionType:
             option = new ForceTimeStampCheckOption;
             break;
@@ -215,11 +212,6 @@ NoBuildOption *CommandLineOptionPool::noBuildOption() const
     return static_cast<NoBuildOption *>(getOption(CommandLineOption::NoBuildOptionType));
 }
 
-ForceOption *CommandLineOptionPool::forceOption() const
-{
-    return static_cast<ForceOption *>(getOption(CommandLineOption::ForceOptionType));
-}
-
 ForceTimeStampCheckOption *CommandLineOptionPool::forceTimestampCheckOption() const
 {
     return static_cast<ForceTimeStampCheckOption *>(
diff --git a/src/app/qbs/parser/commandlineoptionpool.h b/src/app/qbs/parser/commandlineoptionpool.h
index 74fd8e8c1..064911e32 100644
--- a/src/app/qbs/parser/commandlineoptionpool.h
+++ b/src/app/qbs/parser/commandlineoptionpool.h
@@ -67,7 +67,6 @@ public:
     InstallRootOption *installRootOption() const;
     RemoveFirstOption *removeFirstoption() const;
     NoBuildOption *noBuildOption() const;
-    ForceOption *forceOption() const;
     ForceTimeStampCheckOption *forceTimestampCheckOption() const;
     ForceOutputCheckOption *forceOutputCheckOption() const;
     BuildNonDefaultOption *buildNonDefaultOption() const;
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index 42eb30637..d57141a11 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -204,11 +204,6 @@ InstallOptions CommandLineParser::installOptions(const QString &profile) const
     return options;
 }
 
-bool CommandLineParser::force() const
-{
-    return d->optionPool.forceOption()->enabled();
-}
-
 bool CommandLineParser::forceTimestampCheck() const
 {
     return d->optionPool.forceTimestampCheckOption()->enabled();
diff --git a/src/app/qbs/parser/commandlineparser.h b/src/app/qbs/parser/commandlineparser.h
index da9bce31d..35f52ecad 100644
--- a/src/app/qbs/parser/commandlineparser.h
+++ b/src/app/qbs/parser/commandlineparser.h
@@ -70,7 +70,6 @@ public:
     CleanOptions cleanOptions(const QString &profile) const;
     GenerateOptions generateOptions() const;
     InstallOptions installOptions(const QString &profile) const;
-    bool force() const;
     bool forceTimestampCheck() const;
     bool forceOutputCheck() const;
     bool dryRun() const;
diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp
index a34d9a9e5..2ded8a458 100644
--- a/src/app/qbs/parser/parsercommand.cpp
+++ b/src/app/qbs/parser/parsercommand.cpp
@@ -202,8 +202,7 @@ static QList<CommandLineOption::Type> resolveOptions()
             << CommandLineOption::JobsOptionType
             << CommandLineOption::DryRunOptionType
             << CommandLineOption::ForceProbesOptionType
-            << CommandLineOption::LogTimeOptionType
-            << CommandLineOption::ForceOptionType;
+            << CommandLineOption::LogTimeOptionType;
 }
 
 QList<CommandLineOption::Type> ResolveCommand::supportedOptions() const
diff --git a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
index de8ecc0b6..3dbcb5cec 100644
--- a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
+++ b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
@@ -60,7 +60,6 @@ private slots:
         args.append("-v");
         args << "--products" << "blubb";
         args << "--changed-files" << "foo,bar" << fileArgs;
-        args << "--force";
         args << "--check-timestamps";
         args << "--check-outputs";
         CommandLineParser parser;
@@ -71,7 +70,6 @@ private slots:
         QCOMPARE(parser.products(), QStringList() << "blubb");
         QCOMPARE(parser.buildOptions(QString()).changedFiles().count(), 2);
         QVERIFY(parser.buildOptions(QString()).keepGoing());
-        QVERIFY(parser.force());
         QVERIFY(parser.forceTimestampCheck());
         QVERIFY(parser.forceOutputCheck());
         QVERIFY(!parser.logTime());
@@ -79,7 +77,6 @@ private slots:
 
         QVERIFY(parser.parseCommandLine(QStringList() << "-vvvqqq" << fileArgs));
         QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), defaultLogLevel());
-        QVERIFY(!parser.force());
 
         QVERIFY(parser.parseCommandLine(QStringList() << "-t" << fileArgs));
         QVERIFY(parser.logTime());