Fix build with Qt 6

desktop-app · Oct 24, 2021 · af9fa00 · af9fa00
1 parent 75afa10
commit af9fa00
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/src/dbusmenuexporter.cpp b/src/dbusmenuexporter.cpp
@@ -29,6 +29,7 @@
 #include <QTimer>
 #include <QToolButton>
 #include <QWidgetAction>
+#include <QActionGroup>
 
 // Local
 #include "dbusmenu_config.h"
@@ -484,7 +485,7 @@ void DBusMenuExporter::activateAction(QAction *action)
 {
     int id = d->idForAction(action);
     DMRETURN_IF_FAIL(id >= 0);
-    uint timeStamp = QDateTime::currentDateTime().toTime_t();
+    uint timeStamp = QDateTime::currentDateTime().toSecsSinceEpoch();
     d->m_dbusObject->ItemActivationRequested(id, timeStamp);
 }
 

diff --git a/src/dbusmenuimporter.cpp b/src/dbusmenuimporter.cpp
@@ -34,6 +34,7 @@
 #include <QTimer>
 #include <QToolButton>
 #include <QWidgetAction>
+#include <QActionGroup>
 
 // Local
 #include "dbusmenutypes_p.h"

diff --git a/src/dbusmenushortcut_p.cpp b/src/dbusmenushortcut_p.cpp
@@ -22,6 +22,7 @@
 
 // Qt
 #include <QtGui/QKeySequence>
+#include <QtDBus/QDBusArgument>
 
 // Local
 #include "debug_p.h"
@@ -83,3 +84,29 @@ QKeySequence DBusMenuShortcut::toKeySequence() const
     QString string = tmp.join(QLatin1String(", "));
     return QKeySequence::fromString(string);
 }
+
+QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &obj)
+{
+    int id = qMetaTypeId<QStringList>();
+    argument.beginArray(id);
+    typename DBusMenuShortcut::ConstIterator it = obj.constBegin();
+    typename DBusMenuShortcut::ConstIterator end = obj.constEnd();
+    for ( ; it != end; ++it)
+        argument << *it;
+    argument.endArray();
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &obj)
+{
+    argument.beginArray();
+    obj.clear();
+    while (!argument.atEnd()) {
+        QStringList item;
+        argument >> item;
+        obj.push_back(item);
+    }
+    argument.endArray();
+
+    return argument;
+}
diff --git a/src/dbusmenushortcut_p.h b/src/dbusmenushortcut_p.h
@@ -30,6 +30,7 @@
 
 
 class QKeySequence;
+class QDBusArgument;
 
 class DBUSMENU_EXPORT DBusMenuShortcut : public QList<QStringList>
 {
@@ -40,4 +41,7 @@ class DBUSMENU_EXPORT DBusMenuShortcut : public QList<QStringList>
 
 Q_DECLARE_METATYPE(DBusMenuShortcut)
 
+DBUSMENU_EXPORT QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &);
+DBUSMENU_EXPORT const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &);
+
 #endif /* DBUSMENUSHORTCUT_H */