diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qnswindow.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qnswindow.h | 58 |
1 files changed, 14 insertions, 44 deletions
diff --git a/src/plugins/platforms/cocoa/qnswindow.h b/src/plugins/platforms/cocoa/qnswindow.h index 5fc48d826f..8f842eba85 100644 --- a/src/plugins/platforms/cocoa/qnswindow.h +++ b/src/plugins/platforms/cocoa/qnswindow.h @@ -1,53 +1,20 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins 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) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QNSWINDOW_H #define QNSWINDOW_H #include <qglobal.h> #include <QPointer> -#include "qt_mac_p.h" +#include <QtCore/private/qcore_mac_p.h> -#include <AppKit/AppKit.h> +#include <AppKit/NSWindow.h> +#include <AppKit/NSPanel.h> QT_FORWARD_DECLARE_CLASS(QCocoaWindow) +#if defined(__OBJC__) + // @compatibility_alias doesn't work with categories or their methods #define FullScreenProperty QT_MANGLE_NAMESPACE(FullScreenProperty) #define qt_fullScreen QT_MANGLE_NAMESPACE(qt_fullScreen) @@ -69,10 +36,13 @@ QT_FORWARD_DECLARE_CLASS(QCocoaWindow) typedef NSWindow<QNSWindowProtocol> QCocoaNSWindow; -@interface QT_MANGLE_NAMESPACE(QNSWindow) : NSWindow<QNSWindowProtocol> @end -QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSWindow); +QCocoaNSWindow *qnswindow_cast(NSWindow *window); + +#else +class QCocoaNSWindow; +#endif // __OBJC__ -@interface QT_MANGLE_NAMESPACE(QNSPanel) : NSPanel<QNSWindowProtocol> @end -QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSPanel); +QT_DECLARE_NAMESPACED_OBJC_INTERFACE(QNSWindow, NSWindow <QNSWindowProtocol>) +QT_DECLARE_NAMESPACED_OBJC_INTERFACE(QNSPanel, NSPanel <QNSWindowProtocol>) #endif // QNSWINDOW_H |