diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 16:05:01 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-16 11:18:04 (GMT) |
| commit | 1d45cf765ab467e6a0f9302eaf65b18419858aac (patch) | |
| tree | 9da093eccc643f3d903eeb5d7a9a499d0a835b7d /src/corelib/tools | |
| parent | b49a69f58346bcdf395840d5345ea32a144bfb50 (diff) | |
| download | Qt-1d45cf765ab467e6a0f9302eaf65b18419858aac.zip Qt-1d45cf765ab467e6a0f9302eaf65b18419858aac.tar.gz Qt-1d45cf765ab467e6a0f9302eaf65b18419858aac.tar.bz2 | |
Fix warnings for mingw
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index d43be3e..1e502ff 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -1488,9 +1488,8 @@ int QRegExpEngine::anchorAlternation(int a, int b) return Anchor_Alternation | (n - 1); #endif - aa.resize(n + 1); - aa[n].a = a; - aa[n].b = b; + QRegExpAnchorAlternation element = {a, b}; + aa.append(element); return Anchor_Alternation | n; } diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 80c2e24..b97ba45 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6473,7 +6473,7 @@ QString QString::arg(qlonglong a, int fieldWidth, int base, const QChar &fillCha ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { - qWarning("QString::arg: Argument missing: %s, %lld", toLocal8Bit().data(), a); + qWarning() << "QString::arg: Argument missing:" << *this << ',' << a; return *this; } @@ -6516,7 +6516,7 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, const QChar &fillCh ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { - qWarning("QString::arg: Argument missing: %s, %llu", toLocal8Bit().data(), a); + qWarning() << "QString::arg: Argument missing:" << *this << ',' << a; return *this; } |