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

Cocoa: Remove unused QApplicationPrivate from QCocoaApplicationDelegate

Browse Source 
To avoid a QtWidget dependency, we should use QGuiApplicationPrivate
isntead, but instead of storing, we can use
QGuiAppliationPrivate::instance() instead.

Change-Id: If3f63fee804b7ad32fe8d612bf70c051b70f54c8
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Bradley T. Hughes 2012-06-08 13:13:23 +02:00 committed by Qt by Nokia
parent 4591f67e91
commit b0e0671152
4 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoaapplication.h
View File

@ -91,12 +91,10 @@
#include "qglobal.h"
#import <AppKit/AppKit.h>
QT_FORWARD_DECLARE_CLASS(QApplicationPrivate)
@class QT_MANGLE_NAMESPACE(QCocoaMenuLoader);
@interface NSApplication (QT_MANGLE_NAMESPACE(QApplicationIntegration))
- (void)QT_MANGLE_NAMESPACE(qt_setDockMenu):(NSMenu *)newMenu;
- (QApplicationPrivate *)QT_MANGLE_NAMESPACE(qt_qappPrivate);
- (QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *)QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader);
- (int)QT_MANGLE_NAMESPACE(qt_validModesForFontPanel):(NSFontPanel *)fontPanel;

5
src/plugins/platforms/cocoa/qcocoaapplication.mm
View File

@ -89,11 +89,6 @@ QT_USE_NAMESPACE
[[QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate] setDockMenu:newMenu];
}
- (QApplicationPrivate *)QT_MANGLE_NAMESPACE(qt_qappPrivate)
{
return [[QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate] qAppPrivate];
}
- (QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *)QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)
{
return [[QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate] menuLoader];

5
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
View File

@ -91,8 +91,6 @@
#include <qglobal.h>
QT_FORWARD_DECLARE_CLASS(QApplicationPrivate);
@class QT_MANGLE_NAMESPACE(QCocoaMenuLoader);
#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
@ -110,7 +108,6 @@ QT_FORWARD_DECLARE_CLASS(QApplicationPrivate);
@interface QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) : NSObject <NSApplicationDelegate> {
bool startedQuit;
QApplicationPrivate *qtPrivate;
NSMenu *dockMenu;
QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader;
NSObject <NSApplicationDelegate> *reflectionDelegate;
@ -118,8 +115,6 @@ QT_FORWARD_DECLARE_CLASS(QApplicationPrivate);
}
+ (QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate)*)sharedDelegate;
- (void)setDockMenu:(NSMenu *)newMenu;
- (void)setQtPrivate:(QApplicationPrivate *)value;
- (QApplicationPrivate *)qAppPrivate;
- (void)setMenuLoader:(QT_MANGLE_NAMESPACE(QCocoaMenuLoader)*)menuLoader;
- (QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *)menuLoader;
- (void)setReflectionDelegate:(NSObject <NSApplicationDelegate> *)oldDelegate;

10
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

@ -149,16 +149,6 @@ static void cleanupCocoaApplicationDelegate()
return [[dockMenu retain] autorelease];
}
- (QApplicationPrivate *)qAppPrivate
{
return qtPrivate;
}
- (void)setQtPrivate:(QApplicationPrivate *)value
{
qtPrivate = value;
}
- (void)setMenuLoader:(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *)menuLoader
{
[menuLoader retain];