diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-08 12:14:45 -0300 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-22 22:46:27 +0000 |
commit | af6467c5328492e34f7f346d6a5a32badd963431 (patch) | |
tree | cd84b38ab01a56b5053195084cd8e12a2eaf7485 /src/corelib/codecs/qeucjpcodec.cpp | |
parent | 3d7586b760550b7d89594c8d7462fc30b868ecc6 (diff) |
Fix some -Wcast-qual warnings
This is happening in code I don't usually test (32-bit, non-ICU, etc.)
KeccakF-1600-opt32.c:481:22: error: cast from type 'const unsigned char*' to type 'UINT32* {aka unsigned int*}' casts away qualifiers [-Werror=cast-qual]
KeccakF-1600-opt32.c:217:62: note: in definition of macro 'extractLanes'
Change-Id: I42e7ef1a481840699a8dffff140209823301a07a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/corelib/codecs/qeucjpcodec.cpp')
-rw-r--r-- | src/corelib/codecs/qeucjpcodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp index af218c1ab0..7b9665f1a0 100644 --- a/src/corelib/codecs/qeucjpcodec.cpp +++ b/src/corelib/codecs/qeucjpcodec.cpp @@ -92,7 +92,7 @@ QEucJpCodec::QEucJpCodec() : conv(QJpUnicodeConv::newConverter(QJpUnicodeConv::D */ QEucJpCodec::~QEucJpCodec() { - delete (QJpUnicodeConv*)conv; + delete (const QJpUnicodeConv*)conv; conv = 0; } @@ -139,7 +139,7 @@ QByteArray QEucJpCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt ++invalid; } } - rstr.resize(cursor - (uchar*)rstr.constData()); + rstr.resize(cursor - (const uchar*)rstr.constData()); if (state) { state->invalidChars += invalid; |