aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@crimson.no>2017-03-13 18:19:33 +0100
committerRobin Burchell <robin.burchell@crimson.no>2017-03-21 15:22:50 +0000
commitb5903ba46e065b096d7bcc12b11cde32b1c0f0c7 (patch)
tree04dbff0e563b51bf1b2d3c6395ff32f779268b40 /src/quick/scenegraph/util/qsgdistancefieldutil_p.h
parent6825b37a48de6a69def38897b03ff7f9974226dd (diff)
QSGDistanceFieldUtil: Remove a layer of indirection
These mysterious setters appear to be unused (and always were, as far as I can see). How useful they are is not entirely clear (as opposed to a patch to the source for instance, and as it's private API anyway, you'd be touching internals to use this. Additionally, removing the indirection makes the code a bit cleaner and more self-contained in my opinion. This removal leaves the value of QSGDistanceFieldGlyphCacheManager in some question to me, given that it's basically a glorified wrapper around QHash. Change-Id: I6d18eb40d8cd00ebe389b4ed53448f3401962ae6 Reviewed-by: Gunnar Sletta <gunnar@crimson.no> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/quick/scenegraph/util/qsgdistancefieldutil_p.h')
-rw-r--r--src/quick/scenegraph/util/qsgdistancefieldutil_p.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
index ad366cb4d4..78e7ce15cd 100644
--- a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
+++ b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
@@ -57,9 +57,6 @@
QT_BEGIN_NAMESPACE
-typedef float (*ThresholdFunc)(float glyphScale);
-typedef float (*AntialiasingSpreadFunc)(float glyphScale);
-
class QOpenGLShaderProgram;
class QSGDistanceFieldGlyphCache;
class QSGContext;
@@ -73,17 +70,8 @@ public:
QSGDistanceFieldGlyphCache *cache(const QRawFont &font);
void insertCache(const QRawFont &font, QSGDistanceFieldGlyphCache *cache);
- ThresholdFunc thresholdFunc() const { return m_threshold_func; }
- void setThresholdFunc(ThresholdFunc func) { m_threshold_func = func; }
-
- AntialiasingSpreadFunc antialiasingSpreadFunc() const { return m_antialiasingSpread_func; }
- void setAntialiasingSpreadFunc(AntialiasingSpreadFunc func) { m_antialiasingSpread_func = func; }
-
private:
QHash<QRawFont, QSGDistanceFieldGlyphCache *> m_caches;
-
- ThresholdFunc m_threshold_func;
- AntialiasingSpreadFunc m_antialiasingSpread_func;
};
QT_END_NAMESPACE