AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge an overloaded QKeySequence constructor.

Browse Source 
Change-Id: I14dc9234b9a4822f65338b75482cab05a017dc69
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Stephen Kelly 2012-03-06 01:24:19 +01:00 committed by Qt by Nokia
parent eb24dfcccb
commit f5433b9666
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/kernel/qkeysequence.cpp
View File

@ -934,16 +934,6 @@ QKeySequence::QKeySequence()
Note the "File|Open" translator comment. It is by no means
necessary, but it provides some context for the human translator.
*/
QKeySequence::QKeySequence(const QString &key)
{
d = new QKeySequencePrivate();
assign(key);
}
/*!
\since 4.7
Creates a key sequence from the \a key string based on \a format.
*/
QKeySequence::QKeySequence(const QString &key, QKeySequence::SequenceFormat format)
{
d = new QKeySequencePrivate();

3
src/gui/kernel/qkeysequence.h
View File

@ -146,8 +146,7 @@ public:
};
QKeySequence();
QKeySequence(const QString &key);
QKeySequence(const QString &key, SequenceFormat format);
QKeySequence(const QString &key, SequenceFormat format = NativeText);
QKeySequence(int k1, int k2 = 0, int k3 = 0, int k4 = 0);
QKeySequence(const QKeySequence &ks);
QKeySequence(StandardKey key);