diff options
Diffstat (limited to 'src/widgets/dialogs/qcolordialog.h')
-rw-r--r-- | src/widgets/dialogs/qcolordialog.h | 56 |
1 files changed, 4 insertions, 52 deletions
diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index cdbe0e7fb4..824efa8f8c 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets 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) 2016 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 QCOLORDIALOG_H #define QCOLORDIALOG_H @@ -62,7 +26,8 @@ public: enum ColorDialogOption { ShowAlphaChannel = 0x00000001, NoButtons = 0x00000002, - DontUseNativeDialog = 0x00000004 + DontUseNativeDialog = 0x00000004, + NoEyeDropperButton = 0x00000008, }; Q_ENUM(ColorDialogOption) @@ -92,10 +57,6 @@ public: const QString &title = QString(), ColorDialogOptions options = ColorDialogOptions()); -#if QT_DEPRECATED_SINCE(5, 12) - QT_DEPRECATED_X("Use getColor()") static QRgb getRgba(QRgb rgba = 0xffffffff, bool *ok = nullptr, QWidget *parent = nullptr); -#endif - static int customCount(); static QColor customColor(int index); static void setCustomColor(int index, QColor color); @@ -112,15 +73,6 @@ protected: private: Q_DISABLE_COPY(QColorDialog) - - Q_PRIVATE_SLOT(d_func(), void _q_addCustom()) - Q_PRIVATE_SLOT(d_func(), void _q_newHsv(int h, int s, int v)) - Q_PRIVATE_SLOT(d_func(), void _q_newColorTypedIn(QRgb rgb)) - Q_PRIVATE_SLOT(d_func(), void _q_nextCustom(int, int)) - Q_PRIVATE_SLOT(d_func(), void _q_newCustom(int, int)) - Q_PRIVATE_SLOT(d_func(), void _q_newStandard(int, int)) - Q_PRIVATE_SLOT(d_func(), void _q_pickScreenColor()) - Q_PRIVATE_SLOT(d_func(), void _q_updateColorPicking()) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QColorDialog::ColorDialogOptions) |