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/qfontsubset.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/qfontsubset.cpp')
| -rw-r--r-- | src/gui/text/qfontsubset.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index 160472cb5d..521b44b839 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -36,7 +36,6 @@ #include <qendian.h> #include <qpainterpath.h> #include "private/qpdf_p.h" -#include "private/qfunctions_p.h" #include "qfontsubset_agl.cpp" @@ -979,7 +978,7 @@ static QTtfGlyph generateGlyph(int index, const QPainterPath &path, qreal advanc return glyph; } -Q_STATIC_GLOBAL_OPERATOR bool operator <(const QTtfGlyph &g1, const QTtfGlyph &g2) +static bool operator <(const QTtfGlyph &g1, const QTtfGlyph &g2) { return g1.index < g2.index; } @@ -1057,7 +1056,7 @@ static QList<QTtfTable> generateGlyphTables(qttf_font_tables &tables, const QLis return list; } -Q_STATIC_GLOBAL_OPERATOR bool operator <(const QTtfTable &t1, const QTtfTable &t2) +static bool operator <(const QTtfTable &t1, const QTtfTable &t2) { return t1.tag < t2.tag; } |