diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-10-18 11:06:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 22:27:09 +0200 |
| commit | b1b843dcf5165f5b204adbd3cf36c0c8fa3605c0 (patch) | |
| tree | 59287974e217a15472e9ada34013f0b57c58caa2 /src/corelib/kernel/qmetaobject.h | |
| parent | 15fee6e744a85672c4213fbd396e5f9a43483ffc (diff) | |
Update keyToValue and keysToValue in QMetaEnum
Add a ok return value for whether found or not.
Task-number: QTBUG-21672
Reviewed-by: Olivier Goffart
Change-Id: Ic0ea7455dccf1ac91705bcc1479444eb4091ded3
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qmetaobject.h')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index df6afa8860..47ccc9e2b7 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -158,9 +158,9 @@ public: const char *scope() const; - int keyToValue(const char *key) const; + int keyToValue(const char *key, bool *ok = 0) const; const char* valueToKey(int value) const; - int keysToValue(const char * keys) const; + int keysToValue(const char * keys, bool *ok = 0) const; QByteArray valueToKeys(int value) const; inline const QMetaObject *enclosingMetaObject() const { return mobj; } |