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/qtextdocumentlayout.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/qtextdocumentlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 163d51aec2..a96a8e18e6 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -383,12 +383,12 @@ struct QCheckPoint }; Q_DECLARE_TYPEINFO(QCheckPoint, Q_PRIMITIVE_TYPE); -Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCheckPoint &checkPoint, QFixed y) +static bool operator<(const QCheckPoint &checkPoint, QFixed y) { return checkPoint.y < y; } -Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCheckPoint &checkPoint, int pos) +static bool operator<(const QCheckPoint &checkPoint, int pos) { return checkPoint.positionInFrame < pos; } @@ -396,17 +396,17 @@ Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCheckPoint &checkPoint, int pos) #if defined(Q_CC_MSVC) && _MSC_VER < 1600 //The STL implementation of MSVC 2008 requires the definitions -Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCheckPoint &checkPoint1, const QCheckPoint &checkPoint2) +static bool operator<(const QCheckPoint &checkPoint1, const QCheckPoint &checkPoint2) { return checkPoint1.y < checkPoint2.y; } -Q_STATIC_GLOBAL_OPERATOR bool operator<(QFixed y, const QCheckPoint &checkPoint) +static bool operator<(QFixed y, const QCheckPoint &checkPoint) { return y < checkPoint.y; } -Q_STATIC_GLOBAL_OPERATOR bool operator<(int pos, const QCheckPoint &checkPoint) +static bool operator<(int pos, const QCheckPoint &checkPoint) { return pos < checkPoint.positionInFrame; } |