diff options
| author | Tobias Koenig <tokoe@kde.org> | 2009-06-04 18:44:12 (GMT) |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2009-06-04 18:44:12 (GMT) |
| commit | 5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd (patch) | |
| tree | a1fc7824b38c3b712893794cfe55fa285cd3c760 /src/corelib/tools/qbytearraymatcher.h | |
| parent | f7741b78c90abcb272345810d55e446a7f390032 (diff) | |
| parent | b1b09172aee658e085423ddf6abfea291a072c74 (diff) | |
| download | Qt-5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd.zip Qt-5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd.tar.gz Qt-5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd.tar.bz2 | |
Merge commit 'qt-mainline/master'
Diffstat (limited to 'src/corelib/tools/qbytearraymatcher.h')
| -rw-r--r-- | src/corelib/tools/qbytearraymatcher.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index 633e92c..970cbcc 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -70,7 +70,7 @@ public: inline QByteArray pattern() const { if (q_pattern.isNull()) - return QByteArray((const char*)p.p, p.l); + return QByteArray(reinterpret_cast<const char*>(p.p), p.l); return q_pattern; } |