diff -r 93b982ccede2 -r 5daf16870df6 src/gui/kernel/qkeysequence.h --- a/src/gui/kernel/qkeysequence.h Mon Jun 21 22:38:13 2010 +0100 +++ b/src/gui/kernel/qkeysequence.h Thu Jul 22 16:41:55 2010 +0100 @@ -141,8 +141,14 @@ Quit }; + enum SequenceFormat { + NativeText, + PortableText + }; + QKeySequence(); QKeySequence(const QString &key); + QKeySequence(const QString &key, SequenceFormat format); QKeySequence(int k1, int k2 = 0, int k3 = 0, int k4 = 0); QKeySequence(const QKeySequence &ks); QKeySequence(StandardKey key); @@ -160,11 +166,6 @@ #endif }; - enum SequenceFormat { - NativeText, - PortableText - }; - QString toString(SequenceFormat format = PortableText) const; static QKeySequence fromString(const QString &str, SequenceFormat format = PortableText); @@ -194,6 +195,7 @@ static int decodeString(const QString &ks); static QString encodeString(int key); int assign(const QString &str); + int assign(const QString &str, SequenceFormat format); void setKey(int key, int index); QKeySequencePrivate *d;