From ef191f3bc1cff2f36d2c654b7160e5b3b6117e52 Mon Sep 17 00:00:00 2001 From: reionwong Date: Wed, 15 Sep 2021 15:47:37 +0800 Subject: [PATCH] Update interface name --- CMakeLists.txt | 2 +- src/appearance.cpp | 36 +++++++++---------- src/application.cpp | 4 +-- src/background.cpp | 4 +-- src/battery.cpp | 10 +++--- src/brightness.cpp | 4 +-- ...ingsUI.xml => com.cutefish.SettingsUI.xml} | 2 +- src/cursor/cursorthememodel.cpp | 4 +-- src/cursor/mouse.cpp | 4 +-- src/fonts/fonts.cpp | 4 +-- src/language.cpp | 4 +-- src/powermanager.cpp | 4 +-- 12 files changed, 41 insertions(+), 41 deletions(-) rename src/{org.cutefish.SettingsUI.xml => com.cutefish.SettingsUI.xml} (83%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 412bdea..63ecc59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ set(RESOURCES ) qt5_add_dbus_adaptor(DBUS_SOURCES - src/org.cutefish.SettingsUI.xml + src/com.cutefish.SettingsUI.xml src/application.h Application) set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON) diff --git a/src/appearance.cpp b/src/appearance.cpp index 926cc22..f3381db 100644 --- a/src/appearance.cpp +++ b/src/appearance.cpp @@ -30,9 +30,9 @@ Appearance::Appearance(QObject *parent) : QObject(parent) - , m_interface("org.cutefish.Settings", + , m_interface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus()) , m_dockSettings(new QSettings(QSettings::UserScope, "cutefishos", "dock")) , m_kwinSettings(new QSettings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/kwinrc", @@ -87,9 +87,9 @@ int Appearance::dockIconSize() const void Appearance::setDockIconSize(int dockIconSize) { if (m_dockIconSize != dockIconSize) { - QDBusInterface iface("org.cutefish.Dock", + QDBusInterface iface("com.cutefish.Dock", "/Dock", - "org.cutefish.Dock", + "com.cutefish.Dock", QDBusConnection::sessionBus()); if (iface.isValid()) { iface.call("setIconSize", dockIconSize); @@ -108,9 +108,9 @@ int Appearance::dockDirection() const void Appearance::setDockDirection(int dockDirection) { if (m_dockDirection != dockDirection) { - QDBusInterface iface("org.cutefish.Dock", + QDBusInterface iface("com.cutefish.Dock", "/Dock", - "org.cutefish.Dock", + "com.cutefish.Dock", QDBusConnection::sessionBus()); if (iface.isValid()) { iface.call("setDirection", dockDirection); @@ -131,9 +131,9 @@ void Appearance::setDockVisibility(int visibility) if (m_dockVisibility != visibility) { m_dockVisibility = visibility; - QDBusInterface iface("org.cutefish.Dock", + QDBusInterface iface("com.cutefish.Dock", "/Dock", - "org.cutefish.Dock", + "com.cutefish.Dock", QDBusConnection::sessionBus()); if (iface.isValid()) { iface.call("setVisibility", visibility); @@ -162,9 +162,9 @@ void Appearance::setGenericFontFamily(const QString &name) if (name.isEmpty()) return; - QDBusInterface iface("org.cutefish.Settings", + QDBusInterface iface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus(), this); if (iface.isValid()) { iface.call("setSystemFont", name); @@ -176,9 +176,9 @@ void Appearance::setFixedFontFamily(const QString &name) if (name.isEmpty()) return; - QDBusInterface iface("org.cutefish.Settings", + QDBusInterface iface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus(), this); if (iface.isValid()) { iface.call("setSystemFixedFont", name); @@ -194,9 +194,9 @@ void Appearance::setFontPointSize(int fontPointSize) { m_fontPointSize = fontPointSize; - QDBusInterface iface("org.cutefish.Settings", + QDBusInterface iface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus(), this); if (iface.isValid()) { iface.call("setSystemFontPointSize", m_fontPointSize * 1.0); @@ -205,9 +205,9 @@ void Appearance::setFontPointSize(int fontPointSize) void Appearance::setAccentColor(int accentColor) { - QDBusInterface iface("org.cutefish.Settings", + QDBusInterface iface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus(), this); if (iface.isValid()) { iface.call("setAccentColor", accentColor); @@ -221,9 +221,9 @@ double Appearance::devicePixelRatio() const void Appearance::setDevicePixelRatio(double value) { - QDBusInterface iface("org.cutefish.Settings", + QDBusInterface iface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus(), this); if (iface.isValid()) { iface.call("setDevicePixelRatio", value); diff --git a/src/application.cpp b/src/application.cpp index a49bb1b..8e14a5a 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -49,8 +49,8 @@ Application::Application(int &argc, char **argv) const QString module = parser.value(moduleOption); - if (!QDBusConnection::sessionBus().registerService("org.cutefish.SettingsUI")) { - QDBusInterface iface("org.cutefish.SettingsUI", "/SettingsUI", "org.cutefish.SettingsUI", QDBusConnection::sessionBus()); + if (!QDBusConnection::sessionBus().registerService("com.cutefish.SettingsUI")) { + QDBusInterface iface("com.cutefish.SettingsUI", "/SettingsUI", "com.cutefish.SettingsUI", QDBusConnection::sessionBus()); if (iface.isValid()) iface.call("switchToPage", module); return; diff --git a/src/background.cpp b/src/background.cpp index ce47a30..9ceae86 100644 --- a/src/background.cpp +++ b/src/background.cpp @@ -15,9 +15,9 @@ static QVariantList getBackgroundPaths() Background::Background(QObject *parent) : QObject(parent) - , m_interface("org.cutefish.Settings", + , m_interface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus(), this) { if (m_interface.isValid()) { diff --git a/src/battery.cpp b/src/battery.cpp index d57b207..7d66389 100644 --- a/src/battery.cpp +++ b/src/battery.cpp @@ -24,9 +24,9 @@ #include #include -static const QString s_sServer = "org.cutefish.Settings"; +static const QString s_sServer = "com.cutefish.Settings"; static const QString s_sPath = "/PrimaryBattery"; -static const QString s_sInterface = "org.cutefish.PrimaryBattery"; +static const QString s_sInterface = "com.cutefish.PrimaryBattery"; //DBus Battery Info Structure struct BatteryInfo { @@ -55,9 +55,9 @@ Battery::Battery(QObject *parent) "/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus()) - , m_interface("org.cutefish.Settings", + , m_interface("com.cutefish.Settings", "/PrimaryBattery", - "org.cutefish.PrimaryBattery", + "com.cutefish.PrimaryBattery", QDBusConnection::sessionBus()) , m_available(false) , m_onBattery(false) @@ -176,7 +176,7 @@ bool Battery::showPercent() void Battery::setPercentEnabled(bool value) { - QDBusInterface("org.cutefish.Statusbar", "/Statusbar").call("setBatteryPercentage", value); + QDBusInterface("com.cutefish.Statusbar", "/Statusbar").call("setBatteryPercentage", value); } QString Battery::udi() const diff --git a/src/brightness.cpp b/src/brightness.cpp index 0d6d3e2..400ed4b 100644 --- a/src/brightness.cpp +++ b/src/brightness.cpp @@ -23,9 +23,9 @@ Brightness::Brightness(QObject *parent) : QObject(parent) , m_dbusConnection(QDBusConnection::sessionBus()) - , m_iface("org.cutefish.Settings", + , m_iface("com.cutefish.Settings", "/Brightness", - "org.cutefish.Brightness", m_dbusConnection) + "com.cutefish.Brightness", m_dbusConnection) , m_value(0) , m_enabled(false) { diff --git a/src/org.cutefish.SettingsUI.xml b/src/com.cutefish.SettingsUI.xml similarity index 83% rename from src/org.cutefish.SettingsUI.xml rename to src/com.cutefish.SettingsUI.xml index 82f3c57..0577201 100644 --- a/src/org.cutefish.SettingsUI.xml +++ b/src/com.cutefish.SettingsUI.xml @@ -1,6 +1,6 @@ - + diff --git a/src/cursor/cursorthememodel.cpp b/src/cursor/cursorthememodel.cpp index b29c40f..8dde6a6 100644 --- a/src/cursor/cursorthememodel.cpp +++ b/src/cursor/cursorthememodel.cpp @@ -98,9 +98,9 @@ void CursorThemeModel::setCurrentTheme(const QString &theme) m_currentTheme = theme; emit currentThemeChanged(); - QDBusInterface interface("org.cutefish.Settings", + QDBusInterface interface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus()); if (interface.isValid()) interface.asyncCall("setCursorTheme", m_currentTheme); diff --git a/src/cursor/mouse.cpp b/src/cursor/mouse.cpp index adfded9..a4fce71 100644 --- a/src/cursor/mouse.cpp +++ b/src/cursor/mouse.cpp @@ -22,9 +22,9 @@ Mouse::Mouse(QObject *parent) : QObject(parent) - , m_interface("org.cutefish.Settings", + , m_interface("com.cutefish.Settings", "/Mouse", - "org.cutefish.Mouse", + "com.cutefish.Mouse", QDBusConnection::sessionBus()) { if (m_interface.isValid()) { diff --git a/src/fonts/fonts.cpp b/src/fonts/fonts.cpp index 50ced19..03f9221 100644 --- a/src/fonts/fonts.cpp +++ b/src/fonts/fonts.cpp @@ -104,9 +104,9 @@ void Fonts::save() m_settings.setValue("XftHintStyle", KXftConfig::toStr(m_hinting)); m_settings.sync(); - QDBusInterface interface("org.cutefish.Settings", + QDBusInterface interface("com.cutefish.Settings", "/Theme", - "org.cutefish.Theme", + "com.cutefish.Theme", QDBusConnection::sessionBus()); if (interface.isValid()) interface.asyncCall("applyXResources"); diff --git a/src/language.cpp b/src/language.cpp index 2f8db38..3fbdc86 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -42,9 +42,9 @@ static const QMap s_displayName = {{"zh_CN", "简体中文"}, Language::Language(QObject *parent) : QObject(parent) - , m_interface("org.cutefish.Settings", + , m_interface("com.cutefish.Settings", "/Language", - "org.cutefish.Language", + "com.cutefish.Language", QDBusConnection::sessionBus()) , m_currentLanguage(-1) { diff --git a/src/powermanager.cpp b/src/powermanager.cpp index 298cf57..7dc87f6 100644 --- a/src/powermanager.cpp +++ b/src/powermanager.cpp @@ -22,8 +22,8 @@ PowerManager::PowerManager(QObject *parent) : QObject(parent) - , m_iface("org.cutefish.PowerManager", - "/CPUManagement", "org.cutefish.CPUManagement", + , m_iface("com.cutefish.PowerManager", + "/CPUManagement", "com.cutefish.CPUManagement", QDBusConnection::sessionBus()) , m_mode(-1) {