From 82bc752497a261669dc22e028e87c043d99355a4 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 25 Jun 2021 16:10:31 +0200 Subject: [PATCH] QLocalServer/Unix: don't allocate QTemporaryDir just to make it optional<> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use std::optional<> instead. Change-Id: Ic33ae2dd71f2b6c4347dac7c4be4dc6227edf425 Reviewed-by: MÃ¥rten Nordheim --- src/network/socket/qlocalserver_unix.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp index 1695332d557..8272778d7f6 100644 --- a/src/network/socket/qlocalserver_unix.cpp +++ b/src/network/socket/qlocalserver_unix.cpp @@ -52,6 +52,8 @@ #include #include +#include + #ifdef Q_OS_VXWORKS # include #endif @@ -113,11 +115,11 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName) QByteArray encodedTempPath; const QByteArray encodedFullServerName = QFile::encodeName(fullServerName); - QScopedPointer tempDir; + std::optional tempDir; if (options & QLocalServer::WorldAccessOption) { QFileInfo serverNameFileInfo(fullServerName); - tempDir.reset(new QTemporaryDir(serverNameFileInfo.absolutePath() + QLatin1Char('/'))); + tempDir.emplace(serverNameFileInfo.absolutePath() + u'/'); if (!tempDir->isValid()) { setError(QLatin1String("QLocalServer::listen")); return false;