Add != operator to FuncRequest and special value FuncRequest::prefix

Use this value (and `unknown' where relevant)

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 25ea41a82f4029034cb29fad64447200fa6a2f84..1597027311851e1dc1b7c9464a73c1f55a50695a 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -28,6 +28,7 @@ namespace lyx {
 
 FuncRequest const FuncRequest::unknown(LFUN_UNKNOWN_ACTION);
 FuncRequest const FuncRequest::noaction(LFUN_NOACTION);
+FuncRequest const FuncRequest::prefix(LFUN_COMMAND_PREFIX);
 
 FuncRequest::FuncRequest(Origin o)
        : origin_(o)
@@ -114,12 +115,19 @@ string FuncRequest::getLongArg(unsigned int i) const
        return i < args.size() ? args[i] : string();
 }
 
+
 bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 {
        return lhs.action() == rhs.action() && lhs.argument() == rhs.argument();
 }
 
 
+bool operator!=(FuncRequest const & lhs, FuncRequest const & rhs)
+{
+       return !(lhs == rhs);
+}
+
+
 ostream & operator<<(ostream & os, FuncRequest const & cmd)
 {
        return os

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index 52fb1434aa7b3f3912f67970216da2803d9563e3..efbe425f57fc25d609f91cc0b42163d0584ebf95 100644 (file)
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -98,6 +98,9 @@ public:
        static FuncRequest const unknown;
        ///
        static FuncRequest const noaction;
+       ///
+       static FuncRequest const prefix;
+
        ///
        bool allowAsync() const { return allow_async_; }
        ///
@@ -129,6 +132,8 @@ private:
 
 bool operator==(FuncRequest const & lhs, FuncRequest const & rhs);
 
+bool operator!=(FuncRequest const & lhs, FuncRequest const & rhs);
+
 std::ostream & operator<<(std::ostream &, FuncRequest const &);
 
 LyXErr & operator<<(LyXErr &, FuncRequest const &);

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 1fb82c2f195cbf7b39e70f51918d3d57fb89f83d..c530f5f1f2e93640960669da67f37265dffff1c9 100644 (file)
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -457,8 +457,7 @@ FuncRequest const & KeyMap::lookup(KeySymbol const &key,
                        if (cit->prefixes) {
                                // this is a prefix key - set new map
                                seq->curmap = cit->prefixes.get();
-                               static const FuncRequest prefix(LFUN_COMMAND_PREFIX);
-                               return prefix;
+                               return FuncRequest::prefix;
                        } else {
                                // final key - reset map
                                seq->reset();

diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index c72baee3379aade691e3d2f6179391bc92c89cf6..46baffdcfec811a3cab9956f3c5fcb724d299754 100644 (file)
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -3359,9 +3359,10 @@ docstring makeCmdString(FuncRequest const & f)
 FuncRequest PrefShortcuts::currentBinding(KeySequence const & k)
 {
        FuncRequest res = user_bind_.getBinding(k);
-       if (res.action() != LFUN_UNKNOWN_ACTION)
+       if (res != FuncRequest::unknown)
                return res;
        res = system_bind_.getBinding(k);
+
        // Check if it is unbound. Note: user_unbind_ can only unbind one
        // FuncRequest per key sequence.
        if (user_unbind_.getBinding(k) == res)