diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-17 18:27:41 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-11 03:41:54 +0100 |
| commit | 79eef021cbd8d9789d3b2a63cca2b04c84a3ae05 (patch) | |
| tree | bfa46be01a382bbc1aa051335946cb43de6b5e4e /src/gui/text/qtexttable.cpp | |
| parent | 0f569f5900ea4cf3af551c90f79b80fc78dce9bf (diff) | |
Remove Q_STATIC_GLOBALxxx_OPERATOR macros
These macros existed for working around an RVCT compiler bug, but since
we stopped trying to work around it, the macros are no longer necessary.
Change-Id: I76cc88d863b41f74f60cd9975dcc1959778c2740
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/text/qtexttable.cpp')
| -rw-r--r-- | src/gui/text/qtexttable.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index c2cc822ad6..7bb7056395 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -37,7 +37,6 @@ #include <qdebug.h> #include "qtexttable_p.h" #include "qvarlengtharray.h" -#include "private/qfunctions_p.h" #include <algorithm> #include <stdlib.h> @@ -371,12 +370,12 @@ struct QFragmentFindHelper const QTextDocumentPrivate::FragmentMap &fragmentMap; }; -Q_STATIC_GLOBAL_INLINE_OPERATOR bool operator<(int fragment, const QFragmentFindHelper &helper) +static inline bool operator<(int fragment, const QFragmentFindHelper &helper) { return helper.fragmentMap.position(fragment) < helper.pos; } -Q_STATIC_GLOBAL_INLINE_OPERATOR bool operator<(const QFragmentFindHelper &helper, int fragment) +static inline bool operator<(const QFragmentFindHelper &helper, int fragment) { return helper.pos < helper.fragmentMap.position(fragment); } |