From 2af1e5b3b268a4c0fa0308cdb95cb80480df5275 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 23 Feb 2023 14:57:03 +0100 Subject: [PATCH] ADS: Fix warning for global allocation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icd1a5c7c43b68e55071c9ef2c582d314e616f02c Reviewed-by: Henning Gründl --- src/libs/advanceddockingsystem/dockmanager.cpp | 9 ++++++--- src/libs/advanceddockingsystem/dockmanager.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libs/advanceddockingsystem/dockmanager.cpp b/src/libs/advanceddockingsystem/dockmanager.cpp index d8622c2aa9f..a153a1c4be5 100644 --- a/src/libs/advanceddockingsystem/dockmanager.cpp +++ b/src/libs/advanceddockingsystem/dockmanager.cpp @@ -597,10 +597,13 @@ namespace ADS return d->m_settings->value(Constants::AUTO_RESTORE_WORKSPACE_SETTINGS_KEY).toBool(); } - const QString m_dirName = QLatin1String("workspaces"); - const QString m_fileExt = QLatin1String(".wrk"); // TODO + constexpr QStringView m_dirName{u"workspaces"}; + constexpr QStringView m_fileExt{u".wrk"}; // TODO - QString DockManager::workspaceFileExtension() const { return m_fileExt; } + QStringView DockManager::workspaceFileExtension() const + { + return m_fileExt; + } QStringList DockManager::workspaces() { diff --git a/src/libs/advanceddockingsystem/dockmanager.h b/src/libs/advanceddockingsystem/dockmanager.h index 9dbfc30cda3..9ef2a6f3f10 100644 --- a/src/libs/advanceddockingsystem/dockmanager.h +++ b/src/libs/advanceddockingsystem/dockmanager.h @@ -484,7 +484,7 @@ public: QString activeWorkspace() const; QString lastWorkspace() const; bool autoRestorLastWorkspace() const; - QString workspaceFileExtension() const; + QStringView workspaceFileExtension() const; QStringList workspaces(); QSet workspacePresets() const; QDateTime workspaceDateTime(const QString &workspace) const;