Changeset 846 for trunk/src/gui/kernel/qkeysequence.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qkeysequence.h (modified) (4 diffs)

trunk/src/gui/kernel/qkeysequence.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -142 +142 @@
      };
 
+
+
+
+
+
     QKeySequence();
     QKeySequence(const QString &key);
+
     QKeySequence(int k1, int k2 = 0, int k3 = 0, int k4 = 0);
     QKeySequence(const QKeySequence &ks);
@@ -159 +165 @@
         , Identical = ExactMatch
 #endif
-    };
-
-    enum SequenceFormat {
-        NativeText,
-        PortableText
     };
 
@@ -195 +196 @@
     static QString encodeString(int key);
     int assign(const QString &str);
+
     void setKey(int key, int index);