Browse Source

Regenerate D-Bus notifications related code

adaptive-webui-19844
Chocobo1 4 years ago
parent
commit
e18b2ab437
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 2
      src/gui/mainwindow.cpp
  2. 4
      src/gui/qtnotify/notifications.cpp
  3. 18
      src/gui/qtnotify/notifications.h
  4. 2
      src/gui/qtnotify/notifications.xml

2
src/gui/mainwindow.cpp

@ -1666,7 +1666,7 @@ void MainWindow::showNotificationBaloon(const QString &title, const QString &msg
{ {
if (!isNotificationsEnabled()) return; if (!isNotificationsEnabled()) return;
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) && defined(QT_DBUS_LIB) #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", "/org/freedesktop/Notifications",
QDBusConnection::sessionBus()); QDBusConnection::sessionBus());
// Testing for 'notifications.isValid()' isn't helpful here. // Testing for 'notifications.isValid()' isn't helpful here.

4
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 * 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 is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments * This file may have been hand-edited. Look for HAND-EDIT comments

18
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 * 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 is an auto-generated file.
* Do not edit! All changes made to it will be lost. * Do not edit! All changes made to it will be lost.
*/ */
#ifndef NOTIFICATIONS_H_1301681398 #ifndef NOTIFICATIONS_H
#define NOTIFICATIONS_H_1301681398 #define NOTIFICATIONS_H
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
@ -40,24 +40,24 @@ public Q_SLOTS: // METHODS
{ {
QList<QVariant> argumentList; QList<QVariant> argumentList;
argumentList << QVariant::fromValue(id); argumentList << QVariant::fromValue(id);
return asyncCallWithArgumentList(QLatin1String("CloseNotification"), argumentList); return asyncCallWithArgumentList(QStringLiteral("CloseNotification"), argumentList);
} }
inline QDBusPendingReply<QStringList> GetCapabilities() inline QDBusPendingReply<QStringList> GetCapabilities()
{ {
QList<QVariant> argumentList; QList<QVariant> argumentList;
return asyncCallWithArgumentList(QLatin1String("GetCapabilities"), argumentList); return asyncCallWithArgumentList(QStringLiteral("GetCapabilities"), argumentList);
} }
inline QDBusPendingReply<QString, QString, QString, QString> GetServerInformation() inline QDBusPendingReply<QString, QString, QString, QString> GetServerInformation()
{ {
QList<QVariant> argumentList; 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) inline QDBusReply<QString> GetServerInformation(QString &return_vendor, QString &return_version, QString &return_spec_version)
{ {
QList<QVariant> argumentList; 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) { if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 4) {
return_vendor = qdbus_cast<QString>(reply.arguments().at(1)); return_vendor = qdbus_cast<QString>(reply.arguments().at(1));
return_version = qdbus_cast<QString>(reply.arguments().at(2)); return_version = qdbus_cast<QString>(reply.arguments().at(2));
@ -70,7 +70,7 @@ public Q_SLOTS: // METHODS
{ {
QList<QVariant> argumentList; 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); 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 Q_SIGNALS: // SIGNALS

2
src/gui/qtnotify/notifications.xml

@ -22,7 +22,7 @@
<arg name="body" type="s" direction="in"/> <arg name="body" type="s" direction="in"/>
<arg name="actions" type="as" direction="in"/> <arg name="actions" type="as" direction="in"/>
<arg name="hints" type="a{sv}" 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="timeout" type="i" direction="in"/>
<arg name="return_id" type="u" direction="out"/> <arg name="return_id" type="u" direction="out"/>
</method> </method>

Loading…
Cancel
Save