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

Timestamp:

May 5, 2011, 5:36:53 AM (15 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/qeventdispatcher_mac_p.h (modified) (5 diffs)

trunk/src/gui/kernel/qeventdispatcher_mac_p.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])
@@ -101 +101 @@
     QPointer<QWidget> widget;
     NSModalSession session;
+
 } QCocoaModalSessionInfo;
 #endif
@@ -175 +176 @@
     static bool currentExecIsNSAppRun;
     static bool nsAppRunCalledByQt;
+
     static NSModalSession currentModalSessionCached;
+
     static void updateChildrenWorksWhenModal();
-    static NSModalSession currentModalSession();
-    static int activeModalSessionCount();
     static void temporarilyStopAllModalSessions();
     static void beginModalSession(QWidget *widget);
     static void endModalSession(QWidget *widget);
+
+
+
 #endif
 
@@ -191 +195 @@
     QAtomicInt serialNumber;
     int lastSerial;
-    bool interrupt;
+    bool interrupt;
 private:
     static Boolean postedEventSourceEqualCallback(const void *info1, const void *info2);
@@ -212 +216 @@
     public:
     static void interruptLater();
+
 };
 #endif