Fix compilation with Qt 6.9

Remove hacky code for exposing enums to QML; re-implement logic in C++

Author: Martchus

plasmoid/lib/syncthingapplet.cpp

@@ -111,7 +111,6 @@ SyncthingApplet::SyncthingApplet(QObject *parent, const QVariantList &data)
 
     m_sortFilterDirModel.sort(0, Qt::AscendingOrder);
     m_sortFilterDevModel.sort(0, Qt::AscendingOrder);
-    qmlRegisterUncreatableMetaObject(Data::staticMetaObject, "martchus.syncthingplasmoid", 0, 6, "Data", QStringLiteral("only enums"));
 }
 
 SyncthingApplet::~SyncthingApplet()
@@ -226,6 +225,20 @@ QIcon SyncthingApplet::statusIcon() const
     return m_statusInfo.statusIcon();
 }
 
+QString SyncthingApplet::connectButtonState() const
+{
+    switch (m_connection.status()) {
+    case Data::SyncthingStatus::Disconnected:
+        return m_connection.isConnecting() ? QStringLiteral("connecting") : QStringLiteral("disconnected");
+    case Data::SyncthingStatus::Reconnecting:
+        return QStringLiteral("connecting");
+    case Data::SyncthingStatus::Paused:
+        return QStringLiteral("paused");
+    default:
+        return QStringLiteral("idle");
+    }
+}
+
 QString SyncthingApplet::incomingTraffic() const
 {
     return trafficString(m_connection.totalIncomingTraffic(), m_connection.totalIncomingRate());
@@ -347,6 +360,22 @@ void SyncthingApplet::updateStatusIconAndTooltip()
     emit connectionStatusChanged();
 }
 
+void SyncthingApplet::triggerConnectButtonAction()
+{
+    switch (m_connection.status()) {
+    case Data::SyncthingStatus::Disconnected:
+        m_connection.connect();
+        break;
+    case Data::SyncthingStatus::Reconnecting:
+        break;
+    case Data::SyncthingStatus::Paused:
+        m_connection.resumeAllDevs();
+        break;
+    default:
+        m_connection.pauseAllDevs();
+    }
+}
+
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void SyncthingApplet::handleRelevantControlsChanged(bool visible, int tabIndex)
 {

plasmoid/lib/syncthingapplet.h

@@ -68,6 +68,7 @@ class SyncthingApplet : public Plasma::Applet {
     Q_PROPERTY(QString statusText READ statusText NOTIFY connectionStatusChanged)
     Q_PROPERTY(QString additionalStatusText READ additionalStatusText NOTIFY connectionStatusChanged)
     Q_PROPERTY(QIcon statusIcon READ statusIcon NOTIFY connectionStatusChanged)
+    Q_PROPERTY(QString connectButtonState READ connectButtonState NOTIFY connectionStatusChanged)
     Q_PROPERTY(QString incomingTraffic READ incomingTraffic NOTIFY trafficChanged)
     Q_PROPERTY(bool hasIncomingTraffic READ hasIncomingTraffic NOTIFY trafficChanged)
     Q_PROPERTY(QString outgoingTraffic READ outgoingTraffic NOTIFY trafficChanged)
@@ -107,6 +108,7 @@ class SyncthingApplet : public Plasma::Applet {
     QString additionalStatusText() const;
     QIcon statusIcon() const;
     QIcon syncthingIcon() const;
+    QString connectButtonState() const;
     QString incomingTraffic() const;
     bool hasIncomingTraffic() const;
     QString outgoingTraffic() const;
@@ -153,6 +155,7 @@ public Q_SLOTS:
     void copyToClipboard(const QString &text);
     void openLocalFileOrDir(const QString &dirId, const QString &relativePath);
     void updateStatusIconAndTooltip();
+    void triggerConnectButtonAction();
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     void handleRelevantControlsChanged(bool visible, int index);
 #endif

plasmoid/package5/contents/ui/DirectoriesPage.qml

@@ -4,7 +4,6 @@ import QtQml.Models 2.2
 import org.kde.plasma.components 2.0 as PlasmaComponents  // for Menu and MenuItem
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.core 2.0 as PlasmaCore
-import martchus.syncthingplasmoid 0.6 as SyncthingPlasmoid
 
 ColumnLayout {
     property alias view: directoryView

plasmoid/package5/contents/ui/ToolBar.qml

@@ -4,7 +4,6 @@ import QtQuick.Layouts 1.2
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kquickcontrolsaddons 2.0
-import martchus.syncthingplasmoid 0.6 as SyncthingPlasmoid
 
 RowLayout {
     id: toolBar
@@ -55,33 +54,8 @@ RowLayout {
                 }
             }
         ]
-        state: {
-            switch (plasmoid.nativeInterface.connection.status) {
-            case SyncthingPlasmoid.Data.Disconnected:
-                return plasmoid.nativeInterface.connection.connecting ? "connecting" : "disconnected"
-            case SyncthingPlasmoid.Data.Reconnecting:
-                return "connecting";
-            case SyncthingPlasmoid.Data.Paused:
-                return "paused"
-            default:
-                return "idle"
-            }
-        }
-        onClicked: {
-            switch (plasmoid.nativeInterface.connection.status) {
-            case SyncthingPlasmoid.Data.Disconnected:
-                plasmoid.nativeInterface.connection.connect()
-                break
-            case SyncthingPlasmoid.Data.Reconnecting:
-                break
-            case SyncthingPlasmoid.Data.Paused:
-                plasmoid.nativeInterface.connection.resumeAllDevs()
-                break
-            default:
-                plasmoid.nativeInterface.connection.pauseAllDevs()
-                break
-            }
-        }
+        state: plasmoid.nativeInterface.connectButtonState
+        onClicked: plasmoid.nativeInterface.triggerConnectButtonAction()
         PlasmaComponents3.ToolTip {
             text: connectButton.text
         }

plasmoid/package6/contents/ui/ToolBar.qml

@@ -5,7 +5,6 @@ import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kirigami 2.20 as Kirigami
 import org.kde.kquickcontrolsaddons 2.0
-import martchus.syncthingplasmoid 0.6 as SyncthingPlasmoid
 
 RowLayout {
     id: toolBar
@@ -56,33 +55,8 @@ RowLayout {
                 }
             }
         ]
-        state: {
-            switch (plasmoid.connection.status) {
-            case SyncthingPlasmoid.Data.Disconnected:
-                return plasmoid.connection.connecting ? "connecting" : "disconnected"
-            case SyncthingPlasmoid.Data.Reconnecting:
-                return "connecting";
-            case SyncthingPlasmoid.Data.Paused:
-                return "paused"
-            default:
-                return "idle"
-            }
-        }
-        onClicked: {
-            switch (plasmoid.connection.status) {
-            case SyncthingPlasmoid.Data.Disconnected:
-                plasmoid.connection.connect()
-                break
-            case SyncthingPlasmoid.Data.Reconnecting:
-                break
-            case SyncthingPlasmoid.Data.Paused:
-                plasmoid.connection.resumeAllDevs()
-                break
-            default:
-                plasmoid.connection.pauseAllDevs()
-                break
-            }
-        }
+        state: plasmoid.connectButtonState
+        onClicked: plasmoid.triggerConnectButtonAction()
         PlasmaComponents3.ToolTip {
             text: connectButton.text
         }

syncthingconnector/syncthingconnectionstatus.h

@@ -6,11 +6,6 @@
 #include <QObject>
 
 namespace Data {
-#undef Q_NAMESPACE
-#define Q_NAMESPACE
-Q_NAMESPACE
-extern LIB_SYNCTHING_CONNECTOR_EXPORT const QMetaObject staticMetaObject;
-QT_ANNOTATE_CLASS(qt_qnamespace, "") /*end*/
 
 /*!
  * \brief The SyncthingStatus enum specifies the overall status of the connection to Syncthing via its REST-API.
@@ -32,9 +27,6 @@ enum class SyncthingStatus {
     RemoteNotInSync = 8, /**< connected, at least one directory of a connected remote device is not in sync (still synchronizing, error, …) */
     NoRemoteConnected = 9, /**< connected to Syncthing but Syncthing is not connected to any remote device */
 };
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
-Q_ENUM_NS(SyncthingStatus)
-#endif
 
 /*!
  * \brief The SyncthingErrorCategory enum classifies different errors related to the SyncthingConnection class.
@@ -45,9 +37,6 @@ enum class SyncthingErrorCategory {
     Parsing, /**< an error when parsing Syncthing's response as a JSON document */
     TLS, /**< a TLS error occurred */
 };
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
-Q_ENUM_NS(SyncthingErrorCategory)
-#endif
 
 } // namespace Data