1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLocalServer/Unix: don't allocate QTemporaryDir just to make it optional<>

Browse Source 
Use std::optional<> instead.

Change-Id: Ic33ae2dd71f2b6c4347dac7c4be4dc6227edf425
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2021-06-25 16:10:31 +02:00
parent 3552821551
commit 82bc752497
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/socket/qlocalserver_unix.cpp
View File

@ -52,6 +52,8 @@
#include <qdir.h> #include <qdir.h>
#include <qdatetime.h> #include <qdatetime.h>
#include <optional>
#ifdef Q_OS_VXWORKS #ifdef Q_OS_VXWORKS
# include <selectLib.h> # include <selectLib.h>
#endif #endif
@ -113,11 +115,11 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
QByteArray encodedTempPath; QByteArray encodedTempPath;
const QByteArray encodedFullServerName = QFile::encodeName(fullServerName); const QByteArray encodedFullServerName = QFile::encodeName(fullServerName);
QScopedPointer<QTemporaryDir> tempDir; std::optional<QTemporaryDir> tempDir;
if (options & QLocalServer::WorldAccessOption) { if (options & QLocalServer::WorldAccessOption) {
QFileInfo serverNameFileInfo(fullServerName); QFileInfo serverNameFileInfo(fullServerName);
tempDir.reset(new QTemporaryDir(serverNameFileInfo.absolutePath() + QLatin1Char('/'))); tempDir.emplace(serverNameFileInfo.absolutePath() + u'/');
if (!tempDir->isValid()) { if (!tempDir->isValid()) {
setError(QLatin1String("QLocalServer::listen")); setError(QLatin1String("QLocalServer::listen"));
return false; return false;