diff options
Diffstat (limited to 'src/designer/src/designer/qdesigner_server.cpp')
| -rw-r--r-- | src/designer/src/designer/qdesigner_server.cpp | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/src/designer/src/designer/qdesigner_server.cpp b/src/designer/src/designer/qdesigner_server.cpp index e223f0b2c..5fd5c63ba 100644 --- a/src/designer/src/designer/qdesigner_server.cpp +++ b/src/designer/src/designer/qdesigner_server.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 GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <QtCore/qfileinfo.h> #include <QtCore/qstringlist.h> @@ -40,12 +15,13 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + // ### review QDesignerServer::QDesignerServer(QObject *parent) : QObject(parent) { - m_socket = nullptr; m_server = new QTcpServer(this); if (m_server->listen(QHostAddress::LocalHost, 0)) { connect(m_server, &QTcpServer::newConnection, @@ -81,8 +57,8 @@ void QDesignerServer::readFromClient() while (m_socket->canReadLine()) { QString file = QString::fromUtf8(m_socket->readLine()); if (!file.isNull()) { - file.remove(QLatin1Char('\n')); - file.remove(QLatin1Char('\r')); + file.remove(u'\n'); + file.remove(u'\r'); qDesigner->postEvent(qDesigner, new QFileOpenEvent(file)); } } @@ -127,8 +103,8 @@ void QDesignerClient::readFromSocket() while (m_socket->canReadLine()) { QString file = QString::fromUtf8(m_socket->readLine()); if (!file.isNull()) { - file.remove(QLatin1Char('\n')); - file.remove(QLatin1Char('\r')); + file.remove(u'\n'); + file.remove(u'\r'); if (QFile::exists(file)) qDesigner->postEvent(qDesigner, new QFileOpenEvent(file)); } |