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

macOS: Remove a bunch of dead (forward) declarations

Browse Source 
Change-Id: I402668a17b48c164658f775bacd832615a6d2587
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-04-01 16:12:18 +02:00
parent 1bee5937bc
commit 8138c812cb
20 changed files with 25 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@
#include <QtCore/qglobal.h>
#include "qt_mac_p.h"
#include <QtCore/private/qcore_mac_p.h>
#ifndef QT_NO_ACCESSIBILITY

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

@ -87,7 +87,6 @@
#include <qurl.h>
#include <qdebug.h>
#include <qguiapplication.h>
#include "qt_mac_p.h"
#include <qpa/qwindowsysteminterface.h>
#include <qwindowdefs.h>

1
src/plugins/platforms/cocoa/qcocoabackingstore.mm
View File

@ -43,6 +43,7 @@
#include "qcocoahelpers.h"
#include <QtCore/qmath.h>
#include <QtGui/qpainter.h>
#include <QuartzCore/CATransaction.h>

1
src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
View File

@ -48,7 +48,6 @@
#include <qguiapplication.h>
#include <private/qguiapplication_p.h>
#include "qt_mac_p.h"
#include "qcocoahelpers.h"
#include "qcocoaeventdispatcher.h"
#include <qbuffer.h>

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

@ -50,9 +50,12 @@
//
// We mean it.
//
#include "qt_mac_p.h"
#include <AppKit/AppKit.h>
#include <private/qguiapplication_p.h>
#include <QtCore/qoperatingsystemversion.h>
#include <QtCore/qloggingcategory.h>
#include <QtGui/qpalette.h>
#include <QtGui/qscreen.h>

1
src/plugins/platforms/cocoa/qcocoamenuitem.mm
View File

@ -46,7 +46,6 @@
#include "qcocoamenu.h"
#include "qcocoamenubar.h"
#include "qcocoahelpers.h"
#include "qt_mac_p.h"
#include "qcocoaapplication.h" // for custom application category
#include "qcocoamenuloader.h"
#include <QtGui/private/qcoregraphics_p.h>

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

@ -55,8 +55,6 @@
#ifndef QT_NO_PRINTER
#include "qt_mac_p.h"
#include <cups/ppd.h>
QT_BEGIN_NAMESPACE

4
src/plugins/platforms/cocoa/qcocoaprintdevice.mm
View File

@ -37,6 +37,8 @@
**
****************************************************************************/
#include <ApplicationServices/ApplicationServices.h>
#include "qcocoaprintdevice.h"
#if QT_CONFIG(mimetype)
@ -44,6 +46,8 @@
#endif
#include <qdebug.h>
#include <QtCore/private/qcore_mac_p.h>
QT_BEGIN_NAMESPACE
#ifndef QT_NO_PRINTER

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

@ -43,8 +43,6 @@
#include <qpa/qplatformprintersupport.h>
#ifndef QT_NO_PRINTER
#include "qt_mac_p.h"
QT_BEGIN_NAMESPACE
class QCocoaPrinterSupport : public QPlatformPrinterSupport

4
src/plugins/platforms/cocoa/qcocoaprintersupport.mm
View File

@ -41,6 +41,10 @@
#ifndef QT_NO_PRINTER
#include <AppKit/AppKit.h>
#include <QtCore/private/qcore_mac_p.h>
#include "qcocoaprintdevice.h"
#include "qprintengine_mac_p.h"

1
src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
View File

@ -84,7 +84,6 @@
#include "qcocoamenu.h"
#include "qt_mac_p.h"
#include "qcocoahelpers.h"
#include "qcocoaintegration.h"
#include "qcocoascreen.h"

1
src/plugins/platforms/cocoa/qcocoawindow.h
View File

@ -51,7 +51,6 @@
#endif
#include "qnsview.h"
#include "qnswindow.h"
#include "qt_mac_p.h"
#if QT_CONFIG(vulkan)
#include <MoltenVK/mvk_vulkan.h>

129
src/plugins/platforms/cocoa/qmacdefines_mac.h
View File

@ -1,129 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
/****************************************************************************
**
** Copyright (c) 2007-2008, Apple, Inc.
**
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are met:
**
** * Redistributions of source code must retain the above copyright notice,
** this list of conditions and the following disclaimer.
**
** * Redistributions in binary form must reproduce the above copyright notice,
** this list of conditions and the following disclaimer in the documentation
** and/or other materials provided with the distribution.
**
** * Neither the name of Apple, Inc. nor the names of its contributors
** may be used to endorse or promote products derived from this software
** without specific prior written permission.
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
****************************************************************************/
/*
* qmacdefines_mac_p.h
* All the defines you'll ever need for Qt/Mac :-)
*/
/* This is just many defines. Therefore it doesn't need things like:
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
Yes, it is an informative comment ;-)
*/
#include <QtCore/qglobal.h>
#ifdef __LP64__
typedef signed int OSStatus;
#else
typedef signed long OSStatus;
#endif
typedef struct OpaqueEventHandlerCallRef * EventHandlerCallRef;
typedef struct OpaqueEventRef * EventRef;
typedef struct OpaqueMenuRef * MenuRef;
typedef struct OpaquePasteboardRef* PasteboardRef;
typedef struct OpaqueRgnHandle * RgnHandle;
typedef const struct __HIShape *HIShapeRef;
typedef struct __HIShape *HIMutableShapeRef;
typedef struct CGRect CGRect;
typedef struct CGImage *CGImageRef;
typedef struct CGContext *CGContextRef;
typedef struct GDevice * GDPtr;
typedef GDPtr * GDHandle;
typedef struct OpaqueIconRef * IconRef;
#ifdef __OBJC__
typedef NSWindow* OSWindowRef;
typedef NSView *OSViewRef;
typedef NSMenu *OSMenuRef;
typedef NSEvent *OSEventRef;
#else
typedef void *OSWindowRef;
typedef void *OSViewRef;
typedef void *OSMenuRef;
typedef void *OSEventRef;
#endif
typedef PasteboardRef OSPasteboardRef;
typedef struct AEDesc AEDescList;
typedef AEDescList AERecord;
typedef AERecord AppleEvent;
#ifdef check
#undef check
#endif

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

@ -42,7 +42,7 @@
#include <qglobal.h>
#include <QPointer>
#include "qt_mac_p.h"
#include <QtCore/private/qcore_mac_p.h>
#include <AppKit/AppKit.h>

3
src/plugins/platforms/cocoa/qpaintengine_mac.mm
View File

@ -37,6 +37,9 @@
**
****************************************************************************/
#include <AppKit/AppKit.h>
#include <CoreGraphics/CoreGraphics.h>
#include "qpaintengine_mac_p.h"
#if defined(QT_PRINTSUPPORT_LIB)
#include "qprintengine_mac_p.h"

4
src/plugins/platforms/cocoa/qpaintengine_mac_p.h
View File

@ -57,9 +57,9 @@
#include <QtGui/private/qfont_p.h>
#include <QtCore/qhash.h>
#include "qt_mac_p.h"
typedef struct CGColorSpace *CGColorSpaceRef;
typedef struct CGContext *CGContextRef;
QT_BEGIN_NAMESPACE
class QCoreGraphicsPaintEnginePrivate;

4
src/plugins/platforms/cocoa/qprintengine_mac.mm
View File

@ -37,6 +37,9 @@
**
****************************************************************************/
#include <AppKit/AppKit.h>
#include <ApplicationServices/ApplicationServices.h>
#include "qprintengine_mac_p.h"
#include "qcocoaprintersupport.h"
#include <quuid.h>
@ -44,6 +47,7 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdebug.h>
#include <QtCore/private/qcore_mac_p.h>
#ifndef QT_NO_PRINTER

2
src/plugins/platforms/cocoa/qt_attribution.json
View File

@ -3,7 +3,7 @@
"Name": "Cocoa Platform Plugin",
"QDocModule": "qtgui",
"QtUsage": "Code used in the Qt Platform Abstraction (QPA) for macOS.",
"Files": "qcocoaapplication.h qcocoaapplication.mm qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm qcocoaeventdispatcher.h qcocoaeventdispatcher.mm qcocoaintrospection.h qcocoaintrospection.mm qcocoasystemtrayicon.mm qmacdefines_mac.h",
"Files": "qcocoaapplication.h qcocoaapplication.mm qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm qcocoaeventdispatcher.h qcocoaeventdispatcher.mm qcocoaintrospection.h qcocoaintrospection.mm qcocoasystemtrayicon.mm",
"Description": "Allows Qt to integrate into Apple's Cocoa API.",
"LicenseId": "BSD-3-Clause",

126
src/plugins/platforms/cocoa/qt_mac_p.h
View File

@ -1,126 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QT_MAC_P_H
#define QT_MAC_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#ifdef __OBJC__
#include <AppKit/AppKit.h>
#include <objc/runtime.h>
#endif
#include "qmacdefines_mac.h"
#include <CoreServices/CoreServices.h>
#include <QtCore/qglobal.h>
#include <QtCore/qvariant.h>
#include <QtCore/qmimedata.h>
#include <QtCore/qpointer.h>
#include <QtCore/qloggingcategory.h>
#include <QtCore/private/qcore_mac_p.h>
#include <QtGui/qpainter.h>
QT_BEGIN_NAMESPACE
class QWidget;
class QDragMoveEvent;
// Simple class to manage short-lived regions
class QMacSmartQuickDrawRegion
{
RgnHandle qdRgn;
Q_DISABLE_COPY(QMacSmartQuickDrawRegion)
public:
explicit QMacSmartQuickDrawRegion(RgnHandle rgn) : qdRgn(rgn) {}
~QMacSmartQuickDrawRegion() {
extern void qt_mac_dispose_rgn(RgnHandle); // qregion_mac.cpp
qt_mac_dispose_rgn(qdRgn);
}
operator RgnHandle() {
return qdRgn;
}
};
class QMacInternalPasteboardMime;
class QMimeData;
extern QPaintDevice *qt_mac_safe_pdev; //qapplication_mac.cpp
extern OSWindowRef qt_mac_window_for(const QWidget*); //qwidget_mac.mm
extern OSViewRef qt_mac_nativeview_for(const QWidget *); //qwidget_mac.mm
extern QPoint qt_mac_nativeMapFromParent(const QWidget *child, const QPoint &pt); //qwidget_mac.mm
#ifdef check
# undef check
#endif
struct QMacDndAnswerRecord {
QRect rect;
Qt::KeyboardModifiers modifiers;
Qt::MouseButtons buttons;
Qt::DropAction lastAction;
unsigned int lastOperation;
void clear() {
rect = QRect();
modifiers = Qt::NoModifier;
buttons = Qt::NoButton;
lastAction = Qt::IgnoreAction;
lastOperation = 0;
}
};
extern QMacDndAnswerRecord qt_mac_dnd_answer_rec;
void qt_mac_copy_answer_rect(const QDragMoveEvent &event);
bool qt_mac_mouse_inside_answer_rect(QPoint mouse);
QT_END_NAMESPACE
#endif // QT_MAC_P_H

1
tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm
View File

@ -26,7 +26,6 @@
**
****************************************************************************/
#include <private/qt_mac_p.h>
#include <AppKit/AppKit.h>
void click_cocoa_button()