From 7b6e8623056840155b7d5530b161ed93f7b14aa0 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 4 Sep 2013 08:18:01 -0400 Subject: Privatise private headers and modules. Change-Id: Iaad9cdc897ba19acfdbfc136e4baf959cabc3f70 Reviewed-by: Stephen Kelly --- src/macextras/macextras-lib.pri | 4 +- src/macextras/macextras.pro | 3 +- src/macextras/qmacnativetoolbar.mm | 4 +- src/macextras/qmactoolbardelegate.h | 86 ----------------------------------- src/macextras/qmactoolbardelegate.mm | 2 +- src/macextras/qmactoolbardelegate_p.h | 86 +++++++++++++++++++++++++++++++++++ src/macextras/qnstoolbar.h | 62 ------------------------- src/macextras/qnstoolbar.mm | 2 +- src/macextras/qnstoolbar_p.h | 62 +++++++++++++++++++++++++ 9 files changed, 156 insertions(+), 155 deletions(-) delete mode 100644 src/macextras/qmactoolbardelegate.h create mode 100644 src/macextras/qmactoolbardelegate_p.h delete mode 100644 src/macextras/qnstoolbar.h create mode 100644 src/macextras/qnstoolbar_p.h diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri index 4a5dd94..245c4c5 100644 --- a/src/macextras/macextras-lib.pri +++ b/src/macextras/macextras-lib.pri @@ -18,8 +18,8 @@ mac { $$PWD/qmactoolbutton.h PRIVATE_HEADERS += \ - $$PWD/qmactoolbardelegate.h \ - $$PWD/qnstoolbar.h + $$PWD/qmactoolbardelegate_p.h \ + $$PWD/qnstoolbar_p.h OBJECTIVE_SOURCES += \ $$PWD/qmaccocoaviewcontainer.mm \ diff --git a/src/macextras/macextras.pro b/src/macextras/macextras.pro index fb39293..221dbdd 100644 --- a/src/macextras/macextras.pro +++ b/src/macextras/macextras.pro @@ -1,6 +1,7 @@ include($$PWD/macextras-lib.pri) load(qt_build_config) -QT += widgets gui-private core-private +QT += widgets +QT_PRIVATE += gui-private core-private TARGET = QtMacExtras load(qt_module) diff --git a/src/macextras/qmacnativetoolbar.mm b/src/macextras/qmacnativetoolbar.mm index e7d9fb3..69fe7fe 100644 --- a/src/macextras/qmacnativetoolbar.mm +++ b/src/macextras/qmacnativetoolbar.mm @@ -42,8 +42,8 @@ #import #include "qmacfunctions.h" #include "qmacnativetoolbar.h" -#include "qmactoolbardelegate.h" -#include "qnstoolbar.h" +#include "qmactoolbardelegate_p.h" +#include "qnstoolbar_p.h" #include #include #include diff --git a/src/macextras/qmactoolbardelegate.h b/src/macextras/qmactoolbardelegate.h deleted file mode 100644 index b40a6ed..0000000 --- a/src/macextras/qmactoolbardelegate.h +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtMacExtras 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QMACTOOLBARDELEGATE_H -#define QMACTOOLBARDELEGATE_H - -#import -#include "qmactoolbutton.h" -//#include -//#include - -#include -#include - -#include -#include - -@interface QT_MANGLE_NAMESPACE(QMacToolbarDelegate) : NSObject -{ -@public - QList items; - QList allowedItems; - -// QHash actions; -// QHash allowedActions; -} - -- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted; -- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar; -- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar; -- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar; - -- (QAction *)addActionWithText:(const QString *)text; -- (QAction *)addActionWithText:(const QString *)text icon:(const QIcon *)icon; -- (QAction *)addAction:(QAction *)action; -- (QAction *)addStandardItem:(QMacToolButton::StandardItem)standardItem; - -- (QAction *)addAllowedActionWithText:(const QString *)text; -- (QAction *)addAllowedActionWithText:(const QString *)text icon:(const QIcon *)icon; -- (QAction *)addAllowedAction:(QAction *)action; -- (QAction *)addAllowedStandardItem:(QMacToolButton::StandardItem)standardItem; - -- (IBAction)itemClicked:(id)sender; -@end - -QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacToolbarDelegate); - -#endif // QMACTOOLBARDELEGATE_H diff --git a/src/macextras/qmactoolbardelegate.mm b/src/macextras/qmactoolbardelegate.mm index 6620946..43fcfe8 100644 --- a/src/macextras/qmactoolbardelegate.mm +++ b/src/macextras/qmactoolbardelegate.mm @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmacfunctions.h" -#include "qmactoolbardelegate.h" +#include "qmactoolbardelegate_p.h" #include #include #include diff --git a/src/macextras/qmactoolbardelegate_p.h b/src/macextras/qmactoolbardelegate_p.h new file mode 100644 index 0000000..b40a6ed --- /dev/null +++ b/src/macextras/qmactoolbardelegate_p.h @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtMacExtras 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QMACTOOLBARDELEGATE_H +#define QMACTOOLBARDELEGATE_H + +#import +#include "qmactoolbutton.h" +//#include +//#include + +#include +#include + +#include +#include + +@interface QT_MANGLE_NAMESPACE(QMacToolbarDelegate) : NSObject +{ +@public + QList items; + QList allowedItems; + +// QHash actions; +// QHash allowedActions; +} + +- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted; +- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar; +- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar; +- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar; + +- (QAction *)addActionWithText:(const QString *)text; +- (QAction *)addActionWithText:(const QString *)text icon:(const QIcon *)icon; +- (QAction *)addAction:(QAction *)action; +- (QAction *)addStandardItem:(QMacToolButton::StandardItem)standardItem; + +- (QAction *)addAllowedActionWithText:(const QString *)text; +- (QAction *)addAllowedActionWithText:(const QString *)text icon:(const QIcon *)icon; +- (QAction *)addAllowedAction:(QAction *)action; +- (QAction *)addAllowedStandardItem:(QMacToolButton::StandardItem)standardItem; + +- (IBAction)itemClicked:(id)sender; +@end + +QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacToolbarDelegate); + +#endif // QMACTOOLBARDELEGATE_H diff --git a/src/macextras/qnstoolbar.h b/src/macextras/qnstoolbar.h deleted file mode 100644 index 9a0d784..0000000 --- a/src/macextras/qnstoolbar.h +++ /dev/null @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtMacExtras 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QNSTOOLBAR_H -#define QNSTOOLBAR_H - -#include - -#include -#include - -extern NSString *QtNSToolbarDisplayModeChangedNotification; -extern NSString *QtNSToolbarShowsBaselineSeparatorChangedNotification; -extern NSString *QtNSToolbarAllowsUserCustomizationChangedNotification; -extern NSString *QtNSToolbarSizeModeChangedNotification; -extern NSString *QtNSToolbarVisibilityChangedNotification; - -@interface QT_MANGLE_NAMESPACE(QtNSToolbar) : NSToolbar - -@end - -QT_NAMESPACE_ALIAS_OBJC_CLASS(QtNSToolbar); - -#endif // QNSTOOLBAR_H diff --git a/src/macextras/qnstoolbar.mm b/src/macextras/qnstoolbar.mm index d50ea2a..d80445d 100644 --- a/src/macextras/qnstoolbar.mm +++ b/src/macextras/qnstoolbar.mm @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#import "qnstoolbar.h" +#import "qnstoolbar_p.h" NSString *QtNSToolbarDisplayModeChangedNotification = @"QtNSToolbarDisplayModeChangedNotification"; NSString *QtNSToolbarShowsBaselineSeparatorChangedNotification = @"QtNSToolbarShowsBaselineSeparatorChangedNotification"; diff --git a/src/macextras/qnstoolbar_p.h b/src/macextras/qnstoolbar_p.h new file mode 100644 index 0000000..9a0d784 --- /dev/null +++ b/src/macextras/qnstoolbar_p.h @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtMacExtras 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QNSTOOLBAR_H +#define QNSTOOLBAR_H + +#include + +#include +#include + +extern NSString *QtNSToolbarDisplayModeChangedNotification; +extern NSString *QtNSToolbarShowsBaselineSeparatorChangedNotification; +extern NSString *QtNSToolbarAllowsUserCustomizationChangedNotification; +extern NSString *QtNSToolbarSizeModeChangedNotification; +extern NSString *QtNSToolbarVisibilityChangedNotification; + +@interface QT_MANGLE_NAMESPACE(QtNSToolbar) : NSToolbar + +@end + +QT_NAMESPACE_ALIAS_OBJC_CLASS(QtNSToolbar); + +#endif // QNSTOOLBAR_H -- cgit v1.2.3