diff options
Diffstat (limited to 'src/designer/src/lib/shared/orderdialog_p.h')
| -rw-r--r-- | src/designer/src/lib/shared/orderdialog_p.h | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/src/designer/src/lib/shared/orderdialog_p.h b/src/designer/src/lib/shared/orderdialog_p.h index 5c28be6e5..2fb506f07 100644 --- a/src/designer/src/lib/shared/orderdialog_p.h +++ b/src/designer/src/lib/shared/orderdialog_p.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 // // W A R N I N G @@ -78,9 +53,9 @@ public: Format format() const { return m_format; } private slots: - void on_upButton_clicked(); - void on_downButton_clicked(); - void on_pageList_currentRowChanged(int row); + void upButtonClicked(); + void downButtonClicked(); + void pageListCurrentRowChanged(int row); void slotEnableButtonsAfterDnD(); void slotReset(); @@ -88,8 +63,7 @@ private: void buildList(); void enableButtons(int r); - typedef QMap<int, QWidget*> OrderMap; - OrderMap m_orderMap; + QMap<int, QWidget *> m_orderMap; Ui::OrderDialog* m_ui; Format m_format; }; |