1 files changed, 14 insertions, 15 deletions

diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 682395ece6..e20b52cb65 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -54,7 +54,6 @@
 #include <QtGui/private/qtguiglobal_p.h>
 #include "QtCore/qatomic.h"
 #include <QtCore/qvarlengtharray.h>
-#include <QtCore/QLinkedList>
 #include <QtCore/qhashfunctions.h>
 #include "private/qtextengine_p.h"
 #include "private/qfont_p.h"
@@ -194,7 +193,7 @@ public:
     virtual QImage *lockedAlphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition,
                                            GlyphFormat neededFormat,
                                            const QTransform &t = QTransform(),
-                                           QPoint *offset = 0);
+                                           QPoint *offset = nullptr);
     virtual void unlockAlphaMapForGlyph();
     virtual bool hasInternalCaching() const { return false; }
 
@@ -224,7 +223,7 @@ public:
     virtual qreal minLeftBearing() const;
     virtual qreal minRightBearing() const;
 
-    virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0);
+    virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = nullptr, qreal *rightBearing = nullptr);
 
     inline bool canRender(uint ucs4) const { return glyphIndex(ucs4) != 0; }
     virtual bool canRender(const QChar *str, int len) const;
@@ -234,7 +233,7 @@ public:
     virtual int glyphCount() const;
     virtual int glyphMargin(GlyphFormat format) { return format == Format_A32 ? 2 : 0; }
 
-    virtual QFontEngine *cloneWithSize(qreal /*pixelSize*/) const { return 0; }
+    virtual QFontEngine *cloneWithSize(qreal /*pixelSize*/) const { return nullptr; }
 
     virtual Qt::HANDLE handle() const;
 
@@ -292,33 +291,33 @@ public:
         Holder() : ptr(nullptr), destroy_func(nullptr) {}
         explicit Holder(void *p, qt_destroy_func_t d) : ptr(p), destroy_func(d) {}
         ~Holder() { if (ptr && destroy_func) destroy_func(ptr); }
-        Holder(Holder &&other) Q_DECL_NOTHROW
+        Holder(Holder &&other) noexcept
             : ptr(other.ptr),
               destroy_func(other.destroy_func)
         {
             other.ptr = nullptr;
             other.destroy_func = nullptr;
         }
-        Holder &operator=(Holder &&other) Q_DECL_NOTHROW
+        Holder &operator=(Holder &&other) noexcept
         { swap(other); return *this; }
 
-        void swap(Holder &other) Q_DECL_NOTHROW
+        void swap(Holder &other) noexcept
         {
             qSwap(ptr, other.ptr);
             qSwap(destroy_func, other.destroy_func);
         }
 
-        void *get() const Q_DECL_NOTHROW { return ptr; }
-        void *release() Q_DECL_NOTHROW {
+        void *get() const noexcept { return ptr; }
+        void *release() noexcept {
             void *result = ptr;
             ptr = nullptr;
             destroy_func = nullptr;
             return result;
         }
-        void reset() Q_DECL_NOTHROW { Holder().swap(*this); }
-        qt_destroy_func_t get_deleter() const Q_DECL_NOTHROW { return destroy_func; }
+        void reset() noexcept { Holder().swap(*this); }
+        qt_destroy_func_t get_deleter() const noexcept { return destroy_func; }
 
-        bool operator!() const Q_DECL_NOTHROW { return !ptr; }
+        bool operator!() const noexcept { return !ptr; }
     };
 
     mutable Holder font_; // \ NOTE: Declared before m_glyphCaches, so font_, face_
@@ -370,7 +369,7 @@ private:
         QExplicitlySharedDataPointer<QFontEngineGlyphCache> cache;
         bool operator==(const GlyphCacheEntry &other) const { return cache == other.cache; }
     };
-    typedef QLinkedList<GlyphCacheEntry> GlyphCaches;
+    typedef std::list<GlyphCacheEntry> GlyphCaches;
     mutable QHash<const void *, GlyphCaches> m_glyphCaches;
 
 private:
@@ -390,7 +389,7 @@ inline bool operator ==(const QFontEngine::FaceId &f1, const QFontEngine::FaceId
 }
 
 inline uint qHash(const QFontEngine::FaceId &f, uint seed = 0)
-    Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(f.filename)))
+    noexcept(noexcept(qHash(f.filename)))
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, f.filename);
@@ -458,7 +457,7 @@ public:
     virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const override;
     virtual void doKerning(QGlyphLayout *, ShaperFlags) const override;
     virtual void addOutlineToPath(qreal, qreal, const QGlyphLayout &, QPainterPath *, QTextItem::RenderFlags flags) override;
-    virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) override;
+    virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = nullptr, qreal *rightBearing = nullptr) override;
 
     virtual QFixed ascent() const override;
     virtual QFixed capHeight() const override;