[orca] Remove the now-redundant 'orca -q/--quit' and 'orca -f/--forcequit'.

[Joanmarie Diggs <joanied src gnome org>]

commit 79309618b957197d6adaf8c98fda81c430329aa1
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri May 11 23:40:31 2012 -0400

    Remove the now-redundant 'orca -q/--quit' and 'orca -f/--forcequit'.
    
    Now that Orca is a single process rather than two, and since pkill
    and pkill -9 accomplish the same thing, use pkill if you need to
    kill Orca.

 docs/man/orca.1          |    2 --
 help/C/introduction.page |   11 -----------
 src/orca/orca.py         |   26 +-------------------------
 3 files changed, 1 insertions(+), 38 deletions(-)
---
diff --git a/docs/man/orca.1 b/docs/man/orca.1
index 60d386a..31eb9f8 100644
--- a/docs/man/orca.1
+++ b/docs/man/orca.1
@@ -128,8 +128,6 @@ process and then start a new
 .BR orca
 in its place.
 .TP
-.B \-q, --quit
-Kill and cleanup after any existing Orca process.
 
 .SH KEYBOARD SETTINGS
 Orca provides two keyboard modes, Desktop and Laptop keyboard layout. The
diff --git a/help/C/introduction.page b/help/C/introduction.page
index bdce61c..3d85961 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -151,17 +151,6 @@
         </item>
         <item>
           <p>
-            <cmd>-q</cmd>, <cmd>--quit</cmd>: Quits <app>Orca</app>
-          </p>
-        </item>
-        <item>
-          <p>
-            <cmd>-f</cmd>, <cmd>--forcequit</cmd>: Forces <app>Orca</app>
-            to be terminated immediately.
-          </p>
-        </item>
-        <item>
-          <p>
             <cmd>--replace</cmd>: Replace a currently-running <app>Orca</app>
           </p>
         </item>
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 3cb4776..e7f2596 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -351,25 +351,6 @@ parser.add_argument(
     help = _("Import a profile from a given orca profile file"))
 
 parser.add_argument(
-    "-q", "--quit", action = "store_true", dest = "quit",
-    # Translators: this is the Orca command line option that will quit Orca.
-    # The user would run the Orca shell script again from a terminal window.
-    # If this command line option is specified, the script will quit any
-    # instances of Orca that are already running.
-    #
-    help = _("Quits Orca (if shell script used)"))
-
-parser.add_argument(
-    "-f", "--forcequit", action = "store_true", dest = "forceQuit",
-    # Translators: this is the Orca command line option that will force the
-    # termination of Orca.
-    # The user would run the Orca shell script again from a terminal window.
-    # If this command line option is specified, the script will quit any
-    # instances of Orca that are already running.
-    #
-    help = _("Forces orca to be terminated immediately."))
-
-parser.add_argument(
     "--replace", action = "store_true", dest = "replace",
     # Translators: this is the Orca command line option to tell Orca to replace
     # any existing Orca process(es) that might be running.
@@ -1398,7 +1379,7 @@ def main():
     if multipleOrcas():
         if presentInvalidOptions(invalidOpts):
             die(0)
-        elif options.replace or options.quit or options.forceQuit:
+        elif options.replace:
             cleanup(signal.SIGKILL)
         else:
             # Translators: This message is presented to the user when
@@ -1408,11 +1389,6 @@ def main():
                     'process with a new one.'))
             return 1
 
-    if options.quit:
-        die(signal.SIGTERM)
-    elif options.forceQuit:
-        die(signal.SIGKILL)
-
     _commandLineSettings.update(options.convertToSettings())
     for profile in options.profiles:
         # Translators: This message is what is presented to the user