diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-09-29 11:50:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 18:57:38 +0200 |
| commit | 6476ac738ca029af95932f53b53f0705808eb80e (patch) | |
| tree | d1884397040eb65d23a48a0e1a56dad3f476cf34 /src/gui/text/qfontengine.cpp | |
| parent | 434824aede28e8c36d6991aa218f89daf2cc22fa (diff) | |
Replace implicit QAtomic* casts with explicit load()/store()
Change-Id: Ia7ef1a8e01001f203e409c710c977d6f4686342e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 3f008064e2..067a630d4d 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -168,9 +168,8 @@ static HB_Error hb_getSFntTable(void *font, HB_Tag tableTag, HB_Byte *buffer, HB // QFontEngine QFontEngine::QFontEngine() - : QObject() + : QObject(), ref(0) { - ref = 0; cache_count = 0; fsType = 0; symbol = false; @@ -1360,7 +1359,7 @@ QFontEngineMulti::~QFontEngineMulti() QFontEngine *fontEngine = engines.at(i); if (fontEngine) { fontEngine->ref.deref(); - if (fontEngine->cache_count == 0 && fontEngine->ref == 0) + if (fontEngine->cache_count == 0 && fontEngine->ref.load() == 0) delete fontEngine; } } |