From ef6e004b46469da3419554758bd0c0ed47df286f Mon Sep 17 00:00:00 2001 From: Dmitry Zhulanov Date: Tue, 27 Sep 2016 21:38:32 +0700 Subject: no need to FileQuit verb checking (bzr r15136.1.5) --- src/main-cmdlineact.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/main-cmdlineact.cpp') diff --git a/src/main-cmdlineact.cpp b/src/main-cmdlineact.cpp index cea1291c7..fc0f50cd4 100644 --- a/src/main-cmdlineact.cpp +++ b/src/main-cmdlineact.cpp @@ -23,7 +23,6 @@ namespace Inkscape { std::list CmdLineAction::_list; -bool CmdLineAction::_requestQuit = false; CmdLineAction::CmdLineAction (bool isVerb, gchar const * arg) : _isVerb(isVerb), _arg(NULL) { if (arg != NULL) { @@ -64,11 +63,6 @@ CmdLineAction::doIt (ActionContext const & context) { return; } - static std::string quit_verb_name = "FileQuit"; - if (quit_verb_name == _arg) { - _requestQuit = true; - return; - } Inkscape::Verb * verb = Inkscape::Verb::getbyid(_arg); if (verb == NULL) { printf(_("Unable to find verb ID '%s' specified on the command line.\n"), _arg); @@ -95,19 +89,10 @@ CmdLineAction::doIt (ActionContext const & context) { bool CmdLineAction::doList (ActionContext const & context) { bool hasActions = !_list.empty(); - if (!hasActions && _requestQuit) { - sp_file_exit(); - return true; - } - for (std::list::iterator i = _list.begin(); i != _list.end(); ++i) { CmdLineAction * entry = *i; entry->doIt(context); - if (_requestQuit) { - sp_file_exit(); - return true; - } } return hasActions; } -- cgit v1.2.3