Changeset 846 for trunk/src/gui/kernel/qcocoamenuloader_mac.mm

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/qcocoamenuloader_mac.mm (modified) (7 diffs)

trunk/src/gui/kernel/qcocoamenuloader_mac.mm

@@ -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])
@@ -47 +47 @@
 #include <private/qapplication_p.h>
 #include <private/qt_mac_p.h>
+
 #include <qmenubar.h>
+
 
 QT_FORWARD_DECLARE_CLASS(QCFString)
 QT_FORWARD_DECLARE_CLASS(QString)
 
+
+
+
+
+
+
 QT_USE_NAMESPACE
 
@@ -58 +66 @@
 - (void)awakeFromNib
 {
+
+
+
+
     // Get the names in the nib to match the app name set by Qt.
     NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
@@ -78 +90 @@
 {
     // The application menu is the menu in the menu bar that contains the
-    // 'Quit' item. When changing menu bar (e.g when swithing between
+    // 'Quit' item. When changing menu bar (e.g when swithing between
     // windows with different menu bars), we never recreate this menu, but
     // instead pull it out the current menu bar and place into the new one:
@@ -119 +131 @@
 - (void)dealloc
 {
+
+
+
+
     [lastAppSpecificItem release];
     [theMenu release];
@@ -207 +223 @@
 {
     [NSApp hide:sender];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -222 +256 @@
     }
 }
+
+
+
+
+
 @end
 #endif // QT_MAC_USE_COCOA