From b497a34655fd238778059f6bf9223a902a85806f Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 24 Jun 2014 10:44:30 -0400 Subject: [PATCH] CppEditor: Fix always-false-condition The condition didn't make sense. tk.kind() can't be < T_FIRST_QT_KEYWORD *and* tk.kind() > T_LAST_KEYWORD at the same time. Change-Id: Id300ad84f37eeff5081b0389c00d574a9cb23f35 Reviewed-by: Orgad Shaneh --- src/libs/3rdparty/cplusplus/Token.h | 10 ++++++---- src/plugins/cppeditor/cppfollowsymbolundercursor.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libs/3rdparty/cplusplus/Token.h b/src/libs/3rdparty/cplusplus/Token.h index b9a4bc68cf8..03c2b141f7a 100644 --- a/src/libs/3rdparty/cplusplus/Token.h +++ b/src/libs/3rdparty/cplusplus/Token.h @@ -227,9 +227,8 @@ enum Kind { T_WCHAR_T, T_LAST_PRIMITIVE = T_WCHAR_T, - T_FIRST_QT_KEYWORD, - // Qt keywords + T_FIRST_QT_KEYWORD, T_EMIT = T_FIRST_QT_KEYWORD, T_SIGNAL, T_SLOT, @@ -251,8 +250,8 @@ enum Kind { T_Q_DECLARE_INTERFACE, T_Q_OBJECT, T_Q_GADGET, - - T_LAST_KEYWORD = T_Q_GADGET, + T_LAST_QT_KEYWORD = T_Q_GADGET, + T_LAST_KEYWORD = T_LAST_QT_KEYWORD, // aliases T_OR = T_PIPE_PIPE, @@ -330,6 +329,9 @@ public: inline bool isPrimitiveType() const { return f.kind >= T_FIRST_PRIMITIVE && f.kind <= T_LAST_PRIMITIVE; } + inline bool isQtKeyword() const + { return f.kind >= T_FIRST_QT_KEYWORD && f.kind <= T_LAST_QT_KEYWORD; } + inline bool isComment() const { return f.kind == T_COMMENT || f.kind == T_DOXY_COMMENT || f.kind == T_CPP_COMMENT || f.kind == T_CPP_DOXY_COMMENT; } diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp index 3fb2639ef2a..1090d8eec38 100644 --- a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp +++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp @@ -581,7 +581,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor & } } - if (tk.isNot(T_IDENTIFIER) && tk.kind() < T_FIRST_QT_KEYWORD && tk.kind() > T_LAST_KEYWORD) + if (tk.isNot(T_IDENTIFIER) && !tk.isQtKeyword()) return link; tc.setPosition(endOfToken);