diff --git a/api/dbus/org.desktopspec.ApplicationManager1.Application.xml b/api/dbus/org.desktopspec.ApplicationManager1.Application.xml index 1625ab4..472d903 100644 --- a/api/dbus/org.desktopspec.ApplicationManager1.Application.xml +++ b/api/dbus/org.desktopspec.ApplicationManager1.Application.xml @@ -34,33 +34,6 @@ /> - - - - - - + icons(); - } - return {}; -} - -IconMap &ApplicationService::iconsRef() -{ - return m_Icons->iconsRef(); -} - bool ApplicationService::isAutoStart() const noexcept { return m_AutoStart; diff --git a/src/dbus/applicationservice.h b/src/dbus/applicationservice.h index c8f5a15..0b24212 100644 --- a/src/dbus/applicationservice.h +++ b/src/dbus/applicationservice.h @@ -20,7 +20,6 @@ #include "dbus/instanceservice.h" #include "global.h" #include "desktopentry.h" -#include "desktopicons.h" #include "dbus/jobmanager1service.h" class ApplicationService : public QObject, public QDBusContext @@ -45,16 +44,12 @@ public: Q_PROPERTY(PropMap DisplayName READ displayName) [[nodiscard]] PropMap displayName() const noexcept; - Q_PROPERTY(PropMap IconName READ iconName) - [[nodiscard]] PropMap iconName() const noexcept; + Q_PROPERTY(PropMap Icons READ icons) + [[nodiscard]] PropMap icons() const noexcept; Q_PROPERTY(qulonglong LastLaunchedTime READ lastLaunchedTime) [[nodiscard]] qulonglong lastLaunchedTime() const noexcept; - Q_PROPERTY(IconMap Icons READ icons) - [[nodiscard]] IconMap icons() const; - IconMap &iconsRef(); - Q_PROPERTY(bool AutoStart READ isAutoStart WRITE setAutoStart) [[nodiscard]] bool isAutoStart() const noexcept; void setAutoStart(bool autostart) noexcept; @@ -98,7 +93,6 @@ private: QString m_launcher{getApplicationLauncherBinary()}; DesktopFile m_desktopSource; QSharedPointer m_entry{nullptr}; - QSharedPointer m_Icons{nullptr}; QMap> m_Instances; static QString userNameLookup(uid_t uid); [[nodiscard]] LaunchTask unescapeExec(const QString &str, const QStringList &fields); diff --git a/src/desktopicons.cpp b/src/desktopicons.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/src/desktopicons.h b/src/desktopicons.h deleted file mode 100644 index c8ec13f..0000000 --- a/src/desktopicons.h +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: LGPL-3.0-or-later - -#ifndef DESKTOPICONS_H -#define DESKTOPICONS_H - -#include "global.h" - -class DesktopIcons -{ -public: - DesktopIcons() = default; - const IconMap &icons() const noexcept { return m_icons; } - IconMap &iconsRef() noexcept { return m_icons; } - -private: - IconMap m_icons; -}; - -#endif