Update interface name

CMakeLists.txt

@@ -87,12 +87,12 @@ set_source_files_properties(src/libdbusmenuqt/com.canonical.dbusmenu.xml PROPERT
 ## appmenu
 qt5_add_dbus_adaptor(appmenu_SRCS src/appmenu/com.canonical.AppMenu.Registrar.xml
     src/appmenu/menuimporter.h MenuImporter menuimporteradaptor MenuImporterAdaptor)
-qt5_add_dbus_adaptor(appmenu_SRCS src/appmenu/org.cutefish.cappmenu.xml
+qt5_add_dbus_adaptor(appmenu_SRCS src/appmenu/com.cutefish.cappmenu.xml
     src/appmenu/appmenudbus.h AppmenuDBus appmenuadaptor AppmenuAdaptor)
 
 ## statusbar dbus
 qt5_add_dbus_adaptor(DBUS_SOURCES
-                     src/org.cutefish.Statusbar.xml
+                     src/com.cutefish.Statusbar.xml
                      src/statusbar.h StatusBar)
 
 add_executable(cutefish-statusbar ${SRCS} ${appmenu_SRCS} ${DBUS_SOURCES})

src/appearance.cpp

@@ -27,9 +27,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_dockConfigWacher(new QFileSystemWatcher(this))
@@ -108,9 +108,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);
@@ -122,9 +122,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);
@@ -140,9 +140,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);
@@ -151,9 +151,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);
@@ -167,9 +167,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);

src/appmenu/appmenu.cpp

@@ -57,7 +57,7 @@ AppMenu::AppMenu(QObject *parent)
     connect(this, &AppMenu::menuHidden, m_appmenuDBus, &AppmenuDBus::menuHidden);
     connect(this, &AppMenu::menuShown, m_appmenuDBus, &AppmenuDBus::menuShown);
 
-    m_menuViewWatcher = new QDBusServiceWatcher(QStringLiteral("org.cutefish.cappmenuview"),
+    m_menuViewWatcher = new QDBusServiceWatcher(QStringLiteral("com.cutefish.cappmenuview"),
                                                 QDBusConnection::sessionBus(),
                                                 QDBusServiceWatcher::WatchForRegistration | QDBusServiceWatcher::WatchForUnregistration,
                                                 this);

src/appmenu/appmenuapplet.cpp

@@ -36,7 +36,7 @@ int AppMenuApplet::s_refs = 0;
 
 static QString viewService()
 {
-    return QStringLiteral("org.cutefish.cappmenuview");
+    return QStringLiteral("com.cutefish.cappmenuview");
 }
 
 AppMenuApplet::AppMenuApplet(QObject *parent)

src/appmenu/appmenudbus.cpp

@@ -29,7 +29,7 @@
 #include <QDBusMessage>
 #include <QDBusServiceWatcher>
 
-static const char *DBUS_SERVICE = "org.cutefish.cappmenu";
+static const char *DBUS_SERVICE = "com.cutefish.cappmenu";
 static const char *DBUS_OBJECT_PATH = "/CAppMenu";
 
 AppmenuDBus::AppmenuDBus(QObject *parent)

src/appmenu/com.cutefish.cappmenu.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.cappmenu">
+  <interface name="com.cutefish.cappmenu">
     <method name="showMenu">
         <arg name="x" type="i" direction="in"/>
         <arg name="y" type="i" direction="in"/>

src/battery.cpp

@@ -21,9 +21,9 @@
 #include <QSettings>
 #include <QDBusPendingCall>
 
-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";
 
 static Battery *SELF = nullptr;
 
@@ -41,9 +41,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)

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)
 {

src/com.cutefish.Statusbar.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.cutefish.Statusbar">
+  <interface name="com.cutefish.Statusbar">
     <method name="setBatteryPercentage">
         <arg name="batteryPercentage" type="b" direction="in"/>
     </method>

src/main.cpp

@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
     StatusBar bar;
 
-    if (!QDBusConnection::sessionBus().registerService("org.cutefish.Statusbar")) {
+    if (!QDBusConnection::sessionBus().registerService("com.cutefish.Statusbar")) {
         return -1;
     }
 

src/volume.cpp

@@ -25,9 +25,9 @@
 #include <QDBusServiceWatcher>
 #include <QDBusPendingCall>
 
-static const QString Service = "org.cutefish.Settings";
+static const QString Service = "com.cutefish.Settings";
 static const QString ObjectPath = "/Audio";
-static const QString Interface = "org.cutefish.Audio";
+static const QString Interface = "com.cutefish.Audio";
 
 static VolumeManager *SELF = nullptr;