diff options
Diffstat (limited to 'src/designer/src/designer/qdesigner_appearanceoptions.h')
| -rw-r--r-- | src/designer/src/designer/qdesigner_appearanceoptions.h | 52 |
1 files changed, 13 insertions, 39 deletions
diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.h b/src/designer/src/designer/qdesigner_appearanceoptions.h index b0b87c796..1b37750c6 100644 --- a/src/designer/src/designer/qdesigner_appearanceoptions.h +++ b/src/designer/src/designer/qdesigner_appearanceoptions.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef QDESIGNER_APPEARANCEOPTIONS_H #define QDESIGNER_APPEARANCEOPTIONS_H @@ -34,6 +9,7 @@ #include <QtDesigner/abstractoptionspage.h> +#include <QtCore/qcompare.h> #include <QtCore/qobject.h> #include <QtCore/qpointer.h> #include <QtWidgets/qwidget.h> @@ -48,24 +24,22 @@ namespace Ui { } /* AppearanceOptions data */ -struct AppearanceOptions { - bool equals(const AppearanceOptions&) const; +struct AppearanceOptions +{ void toSettings(QDesignerSettings &) const; void fromSettings(const QDesignerSettings &); UIMode uiMode{DockedMode}; ToolWindowFontSettings toolWindowFontSettings; -}; - -inline bool operator==(const AppearanceOptions &ao1, const AppearanceOptions &ao2) -{ - return ao1.equals(ao2); -} -inline bool operator!=(const AppearanceOptions &ao1, const AppearanceOptions &ao2) -{ - return !ao1.equals(ao2); -} + friend bool comparesEqual(const AppearanceOptions &lhs, + const AppearanceOptions &rhs) noexcept + { + return lhs.uiMode == rhs.uiMode + && lhs.toolWindowFontSettings == rhs.toolWindowFontSettings; + } + Q_DECLARE_EQUALITY_COMPARABLE(AppearanceOptions) +}; /* QDesignerAppearanceOptionsWidget: Let the user edit AppearanceOptions */ class QDesignerAppearanceOptionsWidget : public QWidget |