From e18b2ab437d1fff9b303c01a7f00557e88e28bfc Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sat, 10 Apr 2021 15:42:23 +0800
Subject: [PATCH] Regenerate D-Bus notifications related code

---
 src/gui/mainwindow.cpp             |  2 +-
 src/gui/qtnotify/notifications.cpp |  4 ++--
 src/gui/qtnotify/notifications.h   | 18 +++++++++---------
 src/gui/qtnotify/notifications.xml |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index b0dc2d842..170856b6e 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -1666,7 +1666,7 @@ void MainWindow::showNotificationBaloon(const QString &title, const QString &msg
 {
     if (!isNotificationsEnabled()) return;
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) && defined(QT_DBUS_LIB)
-    org::freedesktop::Notifications notifications("org.freedesktop.Notifications",
+    OrgFreedesktopNotificationsInterface notifications("org.freedesktop.Notifications",
                                                   "/org/freedesktop/Notifications",
                                                   QDBusConnection::sessionBus());
     // Testing for 'notifications.isValid()' isn't helpful here.
diff --git a/src/gui/qtnotify/notifications.cpp b/src/gui/qtnotify/notifications.cpp
index 59b4d9d8b..a91578b49 100644
--- a/src/gui/qtnotify/notifications.cpp
+++ b/src/gui/qtnotify/notifications.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p notifications.h:notifications.cpp notifications.xml
  *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/gui/qtnotify/notifications.h b/src/gui/qtnotify/notifications.h
index b042599d6..7317b443b 100644
--- a/src/gui/qtnotify/notifications.h
+++ b/src/gui/qtnotify/notifications.h
@@ -1,15 +1,15 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p notifications.h:notifications.cpp notifications.xml
  *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef NOTIFICATIONS_H_1301681398
-#define NOTIFICATIONS_H_1301681398
+#ifndef NOTIFICATIONS_H
+#define NOTIFICATIONS_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -40,24 +40,24 @@ public Q_SLOTS: // METHODS
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(id);
-        return asyncCallWithArgumentList(QLatin1String("CloseNotification"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("CloseNotification"), argumentList);
     }
 
     inline QDBusPendingReply<QStringList> GetCapabilities()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetCapabilities"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("GetCapabilities"), argumentList);
     }
 
     inline QDBusPendingReply<QString, QString, QString, QString> GetServerInformation()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetServerInformation"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("GetServerInformation"), argumentList);
     }
     inline QDBusReply<QString> GetServerInformation(QString &return_vendor, QString &return_version, QString &return_spec_version)
     {
         QList<QVariant> argumentList;
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("GetServerInformation"), argumentList);
+        QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("GetServerInformation"), argumentList);
         if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 4) {
             return_vendor = qdbus_cast<QString>(reply.arguments().at(1));
             return_version = qdbus_cast<QString>(reply.arguments().at(2));
@@ -70,7 +70,7 @@ public Q_SLOTS: // METHODS
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(app_name) << QVariant::fromValue(id) << QVariant::fromValue(icon) << QVariant::fromValue(summary) << QVariant::fromValue(body) << QVariant::fromValue(actions) << QVariant::fromValue(hints) << QVariant::fromValue(timeout);
-        return asyncCallWithArgumentList(QLatin1String("Notify"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("Notify"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/gui/qtnotify/notifications.xml b/src/gui/qtnotify/notifications.xml
index 41f733009..00e85ea53 100644
--- a/src/gui/qtnotify/notifications.xml
+++ b/src/gui/qtnotify/notifications.xml
@@ -22,7 +22,7 @@
       <arg name="body" type="s" direction="in"/>
       <arg name="actions" type="as" direction="in"/>
       <arg name="hints" type="a{sv}" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
       <arg name="timeout" type="i" direction="in"/>
       <arg name="return_id" type="u" direction="out"/>
     </method>