diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2021-06-25 16:10:31 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2021-07-12 17:16:11 +0200 |
| commit | 82bc752497a261669dc22e028e87c043d99355a4 (patch) | |
| tree | d23c07f3d15772bbabbd8ae5d8ff95f71e8f033d /src/network/socket | |
| parent | 35528215515c880625d22e616514f02e59d61b2d (diff) | |
QLocalServer/Unix: don't allocate QTemporaryDir just to make it optional<>
Use std::optional<> instead.
Change-Id: Ic33ae2dd71f2b6c4347dac7c4be4dc6227edf425
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qlocalserver_unix.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp index 1695332d55..8272778d7f 100644 --- a/src/network/socket/qlocalserver_unix.cpp +++ b/src/network/socket/qlocalserver_unix.cpp @@ -52,6 +52,8 @@ #include <qdir.h> #include <qdatetime.h> +#include <optional> + #ifdef Q_OS_VXWORKS # include <selectLib.h> #endif @@ -113,11 +115,11 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName) QByteArray encodedTempPath; const QByteArray encodedFullServerName = QFile::encodeName(fullServerName); - QScopedPointer<QTemporaryDir> tempDir; + std::optional<QTemporaryDir> 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; |