diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-02-24 00:15:06 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-02-24 08:03:51 +0000 |
| commit | 5a7165f2ea4057edaab212d61d5abaf8b3f1bd92 (patch) | |
| tree | 55ebd55b1020b8ec63d4042dc7e7988029309a88 /src/gui/painting | |
| parent | f4495d29e5ad46cacf4f30c6da1fcb96c8082d64 (diff) | |
| download | qtbase-5a7165f2ea4057edaab212d61d5abaf8b3f1bd92.tar.gz | |
QtGui: kill some unneeded relocations
Turn arrays of pointers into arrays of arrays.
Results on optimized GCC 6.1.1 Linux AMD64 builds:
text -264B
data -512B
relocs -43
Change-Id: I0b64615913d50c286596e66675e89758ce1ec2ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qtransform.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 06a820a859..cc3ee76f0d 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -1006,7 +1006,7 @@ bool QBrush::operator==(const QBrush &b) const */ QDebug operator<<(QDebug dbg, const QBrush &b) { - static const char *const BRUSH_STYLES[] = { + static const char BRUSH_STYLES[][24] = { "NoBrush", "SolidPattern", "Dense1Pattern", @@ -1025,7 +1025,7 @@ QDebug operator<<(QDebug dbg, const QBrush &b) "LinearGradientPattern", "RadialGradientPattern", "ConicalGradientPattern", - 0, 0, 0, 0, 0, 0, + "", "", "", "", "", "", "TexturePattern" // 24 }; diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 2d841b2953..673f64fbca 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1118,16 +1118,16 @@ QDataStream & operator>>(QDataStream &s, QTransform &t) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QTransform &m) { - static const char *const typeStr[] = + static const char typeStr[][12] = { "TxNone", "TxTranslate", "TxScale", - 0, + "", "TxRotate", - 0, 0, 0, + "", "", "", "TxShear", - 0, 0, 0, 0, 0, 0, 0, + "", "", "", "", "", "", "", "TxProject" }; |