refact!: change property IconName
to Icons
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
@ -248,7 +248,7 @@ PropMap ApplicationService::displayName() const noexcept
|
||||
return ret;
|
||||
}
|
||||
|
||||
PropMap ApplicationService::iconName() const noexcept
|
||||
PropMap ApplicationService::icons() const noexcept
|
||||
{
|
||||
PropMap ret;
|
||||
auto actionList = actions();
|
||||
@ -283,19 +283,6 @@ qulonglong ApplicationService::lastLaunchedTime() const noexcept
|
||||
return m_lastLaunch;
|
||||
}
|
||||
|
||||
IconMap ApplicationService::icons() const
|
||||
{
|
||||
if (m_Icons) {
|
||||
return m_Icons->icons();
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
IconMap &ApplicationService::iconsRef()
|
||||
{
|
||||
return m_Icons->iconsRef();
|
||||
}
|
||||
|
||||
bool ApplicationService::isAutoStart() const noexcept
|
||||
{
|
||||
return m_AutoStart;
|
||||
|
@ -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<DesktopEntry> m_entry{nullptr};
|
||||
QSharedPointer<DesktopIcons> m_Icons{nullptr};
|
||||
QMap<QDBusObjectPath, QSharedPointer<InstanceService>> m_Instances;
|
||||
static QString userNameLookup(uid_t uid);
|
||||
[[nodiscard]] LaunchTask unescapeExec(const QString &str, const QStringList &fields);
|
||||
|
@ -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
|
Reference in New Issue
Block a user