diff options
Diffstat (limited to 'src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp')
| -rw-r--r-- | src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp index 97594473b..03e2bcc8b 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp @@ -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 LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qaxwidgettaskmenu.h" #include "qdesigneraxwidget.h" @@ -49,6 +24,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /* SetControlCommand: An undo commands that sets a control bypassing Designer's property system which cannot handle the changing of the 'control' property's index and other cached information @@ -59,8 +36,8 @@ class SetControlCommand : public QUndoCommand public: SetControlCommand(QDesignerAxWidget *ax, QDesignerFormWindowInterface *core, const QString &newClsid = QString()); - virtual void redo() { apply(m_newClsid); } - virtual void undo() { apply(m_oldClsid); } + virtual void redo() override { apply(m_newClsid); } + virtual void undo() override { apply(m_oldClsid); } private: bool apply(const QString &clsid); @@ -163,10 +140,8 @@ void QAxWidgetTaskMenu::setActiveXControl() Q_ASSERT(formWin != nullptr); QString value = clsid.toString(); - if (!key.isEmpty()) { - value += QLatin1Char(':'); - value += key; - } + if (!key.isEmpty()) + value += u':' + key; formWin->commandHistory()->push(new SetControlCommand(m_axwidget, formWin, value)); } |