diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-02 10:59:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-05 22:26:49 +0000 |
| commit | dbf7706413bb8d624ac17b24398eaf4ef542ed6b (patch) | |
| tree | eef2343e4e3b8cdab2d0c126496b2583f884393a /src/gui/text/qtextengine_p.h | |
| parent | 6b66108c1ffc48ee1dc06c4e25d9210bf2d41084 (diff) | |
Replace Q_DECL_NOEXCEPT with noexcept in QtGui
Change-Id: I43803b88fea8083782d73ce157c466b022208740
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
| -rw-r--r-- | src/gui/text/qtextengine_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index fb2e812183..fddda7f2f8 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -335,7 +335,7 @@ public: struct QScriptItem { - Q_DECL_CONSTEXPR QScriptItem(int p, QScriptAnalysis a) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR QScriptItem(int p, QScriptAnalysis a) noexcept : position(p), analysis(a), num_glyphs(0), descent(-1), ascent(-1), leading(-1), width(-1), glyph_data_offset(0) {} @@ -348,7 +348,7 @@ struct QScriptItem QFixed leading; QFixed width; int glyph_data_offset; - Q_DECL_CONSTEXPR QFixed height() const Q_DECL_NOTHROW { return ascent + descent; } + Q_DECL_CONSTEXPR QFixed height() const noexcept { return ascent + descent; } private: friend class QVector<QScriptItem>; QScriptItem() {}; // for QVector, don't use |