[sdk/kdiff3] /: Scrub unhandle --qall, fix man page to show noauto explaination

[Michael Reeves]

Git commit b68a00406ae18f426671e7fdc19587305f9b6544 by Michael Reeves.
Committed on 13/02/2021 at 17:40.
Pushed by mreeves into branch 'master'.

Scrub unhandle --qall, fix man page to show noauto explaination

M  +0    -1    doc/en/index.docbook
M  +2    -3    doc/en/man-kdiff3.1.docbook
M  +0    -2    src/kdiff3.cpp
M  +1    -3    src/kdiff3.h
M  +0    -1    src/main.cpp

https://invent.kde.org/sdk/kdiff3/commit/b68a00406ae18f426671e7fdc19587305f9b6544

diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 12adaf8..9ca3bf5 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -308,7 +308,6 @@ Options:
   --out file                Output file, again. (For compatibility with certain tools.)
   --noauto                  Ignore --auto and always show GUI.
   --auto                    No GUI if all conflicts are auto-solvable. (Needs -o file)
-  --qall                    Don't solve conflicts automatically. (For compatibility...)
   --L1 alias1               Visible name replacement for input file 1 (base).
   --L2 alias2               Visible name replacement for input file 2.
   --L3 alias3               Visible name replacement for input file 3.
diff --git a/doc/en/man-kdiff3.1.docbook b/doc/en/man-kdiff3.1.docbook
index 010507e..b2cebb5 100644
--- a/doc/en/man-kdiff3.1.docbook
+++ b/doc/en/man-kdiff3.1.docbook
@@ -37,7 +37,6 @@
 <arg choice="opt"><option>--out</option> <replaceable>file</replaceable></arg>
 <arg choice="opt"><option>--noauto</option></arg>
 <arg choice="opt"><option>--auto</option></arg>
-<arg choice="opt"><option>--qall</option></arg>
 <arg choice="opt"><option>--L1</option> <replaceable>alias1</replaceable></arg>
 <arg choice="opt"><option>--L2</option> <replaceable>alias2</replaceable></arg>
 <arg choice="opt"><option>--L3</option> <replaceable>alias3</replaceable></arg>
@@ -116,8 +115,8 @@
 </varlistentry>
 
 <varlistentry>
-<term><option>--qall</option></term>
-<listitem><para>Don't solve conflicts automatically.
+<term><option>--noauto</option></term>
+<listitem><para>Ignore --auto and always show GUI.
 </para></listitem>
 </varlistentry>
 
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index 26f62dc..cd94360 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -239,7 +239,6 @@ KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Part* pKDiff3P
             m_bDefaultFilename = false;
         }
 
-        m_bAutoSolve = !KDiff3Shell::getParser()->isSet("qall"); // Note that this is effective only once.
         QStringList args = KDiff3Shell::getParser()->positionalArguments();
 
         m_sd1->setFilename(KDiff3Shell::getParser()->value("base"));
@@ -292,7 +291,6 @@ KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Part* pKDiff3P
     else
     {
         m_bDefaultFilename = false;
-        m_bAutoSolve = false;
     }
     g_pProgressDialog->setStayHidden(m_bAutoMode);
 
diff --git a/src/kdiff3.h b/src/kdiff3.h
index 8eaa878..f504f59 100644
--- a/src/kdiff3.h
+++ b/src/kdiff3.h
@@ -98,7 +98,7 @@ class ReversibleScrollBar : public QScrollBar
 };
 
 /*
-  InitFlag 
+  InitFlag
 */
 
 enum class InitFlag
@@ -465,8 +465,6 @@ public Q_SLOTS:
     bool m_bAutoMode = false;
     bool m_bRecalcWordWrapPosted = false;
 
-    bool m_bAutoSolve = true;//TODO: Needed?
-
     int m_firstD3LIdx;                 // only needed during recalcWordWrap
     QPointer<QEventLoop> m_pEventLoopForPrinting;
 
diff --git a/src/main.cpp b/src/main.cpp
index 46532b8..275b420 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -121,7 +121,6 @@ int main(int argc, char* argv[])
     cmdLineParser->addOption(QCommandLineOption(QLatin1String("noauto"), i18n("Ignored.")));
     cmdLineParser->addOption(QCommandLineOption(QLatin1String("auto"), i18n("Ignored.")));
 #endif
-    cmdLineParser->addOption(QCommandLineOption(QLatin1String("qall"), i18n("Do not solve conflicts automatically.")));
     cmdLineParser->addOption(QCommandLineOption(QLatin1String("L1"), i18n("Visible name replacement for input file 1 (base)."), QLatin1String("alias1")));
     cmdLineParser->addOption(QCommandLineOption(QLatin1String("L2"), i18n("Visible name replacement for input file 2."), QLatin1String("alias2")));
     cmdLineParser->addOption(QCommandLineOption(QLatin1String("L3"), i18n("Visible name replacement for input file 3."), QLatin1String("alias3")));