From 60f696f83cca84cc47047e5ebcb2c8c1e6e1594f Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 5 Jan 2026 10:24:49 +0800 Subject: [PATCH] Revert "chore: temporary disable TreelandUserConfig smart pointer" This reverts commit 779832f52af2156517da777bcac1d4c69a3a1373. --- src/seat/helper.cpp | 10 +++++----- src/seat/helper.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/seat/helper.cpp b/src/seat/helper.cpp index f2fb45bc..c7b38860 100644 --- a/src/seat/helper.cpp +++ b/src/seat/helper.cpp @@ -212,9 +212,9 @@ Helper::Helper(QObject *parent) m_instance = this; Q_ASSERT(!m_config); - m_config = TreelandUserConfig::createByName("org.deepin.dde.treeland.user", + m_config.reset(TreelandUserConfig::createByName("org.deepin.dde.treeland.user", "org.deepin.dde.treeland", - "/dde"); // will update user path in Helper::init + "/dde")); // will update user path in Helper::init m_globalConfig.reset(TreelandConfig::create("org.deepin.dde.treeland", QString())); @@ -310,7 +310,7 @@ Helper *Helper::instance() TreelandUserConfig *Helper::config() { - return m_config; + return m_config.get(); } TreelandConfig *Helper::globalConfig() @@ -1324,9 +1324,9 @@ void Helper::init(Treeland::Treeland *treeland) m_personalization = m_server->attach(); auto updateCurrentUser = [this] { - m_config = TreelandUserConfig::createByName("org.deepin.dde.treeland.user", + m_config.reset(TreelandUserConfig::createByName("org.deepin.dde.treeland.user", "org.deepin.dde.treeland", - "/" + m_userModel->currentUserName()); + "/" + m_userModel->currentUserName())); auto user = m_userModel->currentUser(); m_personalization->setUserId(user ? user->UID() : getuid()); }; diff --git a/src/seat/helper.h b/src/seat/helper.h index 7ab2d8cf..073914d3 100644 --- a/src/seat/helper.h +++ b/src/seat/helper.h @@ -356,7 +356,7 @@ private Q_SLOTS: bool isXWaylandClient(WClient *client); static Helper *m_instance; - TreelandUserConfig *m_config = nullptr; + std::unique_ptr m_config; std::unique_ptr m_globalConfig; Treeland::Treeland *m_treeland = nullptr; FpsDisplayManager *m_fpsManager = nullptr;