diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-05 22:25:45 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-12 04:23:50 +0000 |
| commit | ce30394686a4ac2cfbda560c5d7113432d84314e (patch) | |
| tree | cb9a52e376f3233e4c78d7e657f9243e454d955c /src/gui/text | |
| parent | 6025c36d014d77091d09271d68154261d1977761 (diff) | |
QtGui: Fix const correctness in old style casts
Found with GCC's -Wcast-qual.
Change-Id: Ia0aac2f09e9245339951ffff13c946844bc31eb8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontsubset.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qzip.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index 24dda422fc..9f652084be 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -420,7 +420,7 @@ static quint32 checksum(const QByteArray &table) { quint32 sum = 0; int offset = 0; - const uchar *d = (uchar *)table.constData(); + const uchar *d = (const uchar *)table.constData(); while (offset <= table.size()-3) { sum += qFromBigEndian<quint32>(d + offset); offset += 4; diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp index 321c7937f7..9f561dcb02 100644 --- a/src/gui/text/qzip.cpp +++ b/src/gui/text/qzip.cpp @@ -194,7 +194,7 @@ static int inflate(Bytef *dest, ulong *destLen, const Bytef *source, ulong sourc z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = const_cast<Bytef*>(source); stream.avail_in = (uInt)sourceLen; if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; @@ -229,7 +229,7 @@ static int deflate (Bytef *dest, ulong *destLen, const Bytef *source, ulong sour z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = const_cast<Bytef*>(source); stream.avail_in = (uInt)sourceLen; stream.next_out = dest; stream.avail_out = (uInt)*destLen; @@ -1008,7 +1008,7 @@ QByteArray QZipReader::fileData(const QString &fileName) const do { baunzip.resize(len); res = inflate((uchar*)baunzip.data(), &len, - (uchar*)compressed.constData(), compressed_size); + (const uchar*)compressed.constData(), compressed_size); switch (res) { case Z_OK: |