diff options
Diffstat (limited to 'src/network/socket/qlocalserver_tcp.cpp')
-rw-r--r-- | src/network/socket/qlocalserver_tcp.cpp | 54 |
1 files changed, 10 insertions, 44 deletions
diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp index 1c46d75f52..4d52d2c23a 100644 --- a/src/network/socket/qlocalserver_tcp.cpp +++ b/src/network/socket/qlocalserver_tcp.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtNetwork 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 #include "qlocalserver.h" #include "qlocalserver_p.h" @@ -48,6 +12,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + void QLocalServerPrivate::init() { Q_Q(QLocalServer); @@ -61,13 +27,13 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName) if (!tcpServer.listen(QHostAddress::LocalHost)) return false; - const QLatin1String prefix("QLocalServer/"); + const auto prefix = "QLocalServer/"_L1; if (requestedServerName.startsWith(prefix)) fullServerName = requestedServerName; else fullServerName = prefix + requestedServerName; - QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); + QSettings settings("QtProject"_L1, "Qt"_L1); if (settings.contains(fullServerName)) { qWarning("QLocalServer::listen: server name is already in use."); tcpServer.close(); @@ -85,8 +51,8 @@ bool QLocalServerPrivate::listen(qintptr socketDescriptor) void QLocalServerPrivate::closeServer() { - QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); - if (fullServerName == QLatin1String("QLocalServer")) + QSettings settings("QtProject"_L1, "Qt"_L1); + if (fullServerName == "QLocalServer"_L1) settings.setValue(fullServerName, QVariant()); else settings.remove(fullServerName); @@ -117,14 +83,14 @@ void QLocalServerPrivate::_q_onNewConnection() bool QLocalServerPrivate::removeServer(const QString &name) { - const QLatin1String prefix("QLocalServer/"); + const auto prefix = "QLocalServer/"_L1; QString serverName; if (name.startsWith(prefix)) serverName = name; else serverName = prefix + name; - QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); + QSettings settings("QtProject"_L1, "Qt"_L1); if (settings.contains(serverName)) settings.remove(serverName); |