Commit 36081d6f authored by Joerg Bornemann's avatar Joerg Bornemann Committed by Oswald Buddenhagen
Browse files

add base parameter to ProString::toInt and ProString::toShort



Change-Id: I0c8b48e6491486ca829ce24ca2e284294ba0138a
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/9a1183b400748aa51132dd17d004d9d6e560b5b8)
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 26d04eaf
......@@ -131,8 +131,8 @@ public:
bool contains(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(s, 0, cs) >= 0; }
bool contains(const char *s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(QLatin1String(s), 0, cs) >= 0; }
bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(c, 0, cs) >= 0; }
int toInt(bool *ok = 0) const { return toQString().toInt(ok); } // XXX optimize
short toShort(bool *ok = 0) const { return toQString().toShort(ok); } // XXX optimize
int toInt(bool *ok = 0, int base = 10) const { return toQString().toInt(ok, base); } // XXX optimize
short toShort(bool *ok = 0, int base = 10) const { return toQString().toShort(ok, base); } // XXX optimize
static uint hash(const QChar *p, int n);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment