summaryrefslogtreecommitdiffstats
path: root/wsd/COOLWSD.cpp
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2023-08-01 07:21:20 -0400
committerSzymon Kłos <eszkadev@gmail.com>2023-08-03 08:40:20 +0200
commit75ae9894b96d768fb62a5ea7f0737d60fc81d8c6 (patch)
tree49098d101627bff3345094437823c440a06a174f /wsd/COOLWSD.cpp
parentwsd: correct assertion (diff)
downloadonline-75ae9894b96d768fb62a5ea7f0737d60fc81d8c6.tar.gz
online-75ae9894b96d768fb62a5ea7f0737d60fc81d8c6.zip
wsd: Util::make_unique -> std::make_unique
Change-Id: I1063913f91571ea6ad95386a3da6a4072574d155 Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
Diffstat (limited to 'wsd/COOLWSD.cpp')
-rw-r--r--wsd/COOLWSD.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/wsd/COOLWSD.cpp b/wsd/COOLWSD.cpp
index 01b5a8f9cd..c3ef7cd7c1 100644
--- a/wsd/COOLWSD.cpp
+++ b/wsd/COOLWSD.cpp
@@ -2700,21 +2700,22 @@ void COOLWSD::innerInitialize(Application& self)
const auto compress = getConfigValue<bool>(conf, "trace.path[@compress]", false);
const auto takeSnapshot = getConfigValue<bool>(conf, "trace.path[@snapshot]", false);
- TraceDumper = Util::make_unique<TraceFileWriter>(path, recordOutgoing, compress, takeSnapshot, filters);
+ TraceDumper = std::make_unique<TraceFileWriter>(path, recordOutgoing, compress,
+ takeSnapshot, filters);
}
#if !MOBILEAPP
- SavedClipboards = Util::make_unique<ClipboardCache>();
+ SavedClipboards = std::make_unique<ClipboardCache>();
LOG_TRC("Initialize FileServerRequestHandler");
FileServerRequestHandler::initialize(COOLWSD::FileServerRoot);
#endif
- WebServerPoll = Util::make_unique<TerminatingPoll>("websrv_poll");
+ WebServerPoll = std::make_unique<TerminatingPoll>("websrv_poll");
- PrisonerPoll = Util::make_unique<PrisonPoll>();
+ PrisonerPoll = std::make_unique<PrisonPoll>();
- Server = Util::make_unique<COOLWSDServer>();
+ Server = std::make_unique<COOLWSDServer>();
LOG_TRC("Initialize StorageBase");
StorageBase::initialize();
@@ -5749,7 +5750,7 @@ int COOLWSD::innerMain()
try
{
// Fetch font settings from server if configured
- remoteFontConfigThread = Util::make_unique<RemoteFontConfigPoll>(config());
+ remoteFontConfigThread = std::make_unique<RemoteFontConfigPoll>(config());
remoteFontConfigThread->start();
}
catch (const Poco::Exception&)