all: include type namespaces in MOC'd members

src/bluetooth/adapter.hpp

@@ -32,7 +32,7 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(BluetoothAdapterState::Enum state);
+	Q_INVOKABLE static QString toString(qs::bluetooth::BluetoothAdapterState::Enum state);
 };
 
 } // namespace qs::bluetooth
@@ -64,7 +64,7 @@ class BluetoothAdapter: public QObject {
 	/// True if the adapter is currently enabled. More detailed state is available from @@state.
 	Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged);
 	/// Detailed power state of the adapter.
-	Q_PROPERTY(BluetoothAdapterState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
+	Q_PROPERTY(qs::bluetooth::BluetoothAdapterState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
 	/// True if the adapter can be discovered by other bluetooth devices.
 	Q_PROPERTY(bool discoverable READ discoverable WRITE setDiscoverable NOTIFY discoverableChanged);
 	/// Timeout in seconds for how long the adapter stays discoverable after @@discoverable is set to true.

src/bluetooth/bluez.hpp

@@ -66,7 +66,7 @@ class BluezQml: public QObject {
 	QML_SINGLETON;
 	// clang-format off
 	/// The default bluetooth adapter. Usually there is only one.
-	Q_PROPERTY(BluetoothAdapter* defaultAdapter READ default NOTIFY defaultAdapterChanged BINDABLE bindableDefaultAdapter);
+	Q_PROPERTY(qs::bluetooth::BluetoothAdapter* defaultAdapter READ default NOTIFY defaultAdapterChanged BINDABLE bindableDefaultAdapter);
 	QSDOC_TYPE_OVERRIDE(ObjectModel<qs::bluetooth::BluetoothAdapter>*);
 	/// A list of all bluetooth adapters. See @@defaultAdapter for the default.
 	Q_PROPERTY(UntypedObjectModel* adapters READ adapters CONSTANT);

src/bluetooth/device.hpp

@@ -29,7 +29,7 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(BluetoothDeviceState::Enum state);
+	Q_INVOKABLE static QString toString(qs::bluetooth::BluetoothDeviceState::Enum state);
 };
 
 struct BatteryPercentage {};
@@ -70,7 +70,7 @@ class BluetoothDevice: public QObject {
 	/// System icon representing the device type. Use @@Quickshell.Quickshell.iconPath() to display this in an image.
 	Q_PROPERTY(QString icon READ default NOTIFY iconChanged BINDABLE bindableIcon);
 	/// Connection state of the device.
-	Q_PROPERTY(BluetoothDeviceState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
+	Q_PROPERTY(qs::bluetooth::BluetoothDeviceState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
 	/// True if the device is currently connected to the computer.
 	///
 	/// Setting this property is equivalent to calling @@connect() and @@disconnect().
@@ -100,7 +100,7 @@ class BluetoothDevice: public QObject {
 	/// Battery level of the connected device, from `0.0` to `1.0`. Only valid if @@batteryAvailable is true.
 	Q_PROPERTY(qreal battery READ default NOTIFY batteryChanged BINDABLE bindableBattery);
 	/// The Bluetooth adapter this device belongs to.
-	Q_PROPERTY(BluetoothAdapter* adapter READ adapter NOTIFY adapterChanged);
+	Q_PROPERTY(qs::bluetooth::BluetoothAdapter* adapter READ adapter NOTIFY adapterChanged);
 	/// DBus path of the device under the `org.bluez` system service.
 	Q_PROPERTY(QString dbusPath READ path CONSTANT);
 	// clang-format on

src/core/logging_p.hpp

@@ -120,7 +120,7 @@ public slots:
 	void initFs();
 
 private slots:
-	void onMessage(const LogMessage& msg, bool showInSparse);
+	void onMessage(const qs::log::LogMessage& msg, bool showInSparse);
 
 private:
 	QFile* file = nullptr;

src/io/fileview.hpp

@@ -227,7 +227,7 @@ class FileView: public QObject {
 	/// Its state may be saved with @@writeAdapter().
 	///
 	/// Currently the only adapter is @@JsonAdapter.
-	Q_PROPERTY(FileViewAdapter* adapter READ adapter WRITE setAdapter NOTIFY adapterChanged);
+	Q_PROPERTY(qs::io::FileViewAdapter* adapter READ adapter WRITE setAdapter NOTIFY adapterChanged);
 
 	QSDOC_HIDE Q_PROPERTY(QString __path READ path WRITE setPath NOTIFY pathChanged);
 	QSDOC_HIDE Q_PROPERTY(QString __text READ text NOTIFY internalTextChanged);

src/network/device.hpp

@@ -25,7 +25,7 @@ class NetworkDevice: public QObject {
 	/// When the device type is `Wifi`, the device object is a @@WifiDevice.
 	/// When the device type is `Wired`, the device object is a @@WiredDevice.
 	/// connection and scanning.
-	Q_PROPERTY(DeviceType::Enum type READ type CONSTANT);
+	Q_PROPERTY(qs::network::DeviceType::Enum type READ type CONSTANT);
 	/// The name of the device's control interface.
 	Q_PROPERTY(QString name READ name NOTIFY nameChanged BINDABLE bindableName);
 	/// A list of available or connected networks for this device.

src/network/enums.hpp

@@ -27,7 +27,7 @@ public:
 		Full = 4,
 	};
 	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(NetworkConnectivity::Enum conn);
+	Q_INVOKABLE static QString toString(qs::network::NetworkConnectivity::Enum conn);
 };
 
 ///! The backend supplying the Network service.
@@ -42,7 +42,7 @@ public:
 		NetworkManager = 1,
 	};
 	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(NetworkBackendType::Enum type);
+	Q_INVOKABLE static QString toString(qs::network::NetworkBackendType::Enum type);
 };
 
 ///! The connection state of a device or network.
@@ -60,7 +60,7 @@ public:
 		Disconnected = 4,
 	};
 	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(ConnectionState::Enum state);
+	Q_INVOKABLE static QString toString(qs::network::ConnectionState::Enum state);
 };
 
 ///! The reason a connection failed.
@@ -85,7 +85,7 @@ public:
 		WifiNetworkLost = 5,
 	};
 	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(ConnectionFailReason::Enum reason);
+	Q_INVOKABLE static QString toString(qs::network::ConnectionFailReason::Enum reason);
 };
 
 ///! Type of a @@NetworkDevice.
@@ -101,7 +101,7 @@ public:
 		Wired = 2,
 	};
 	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(DeviceType::Enum type);
+	Q_INVOKABLE static QString toString(qs::network::DeviceType::Enum type);
 };
 
 ///! The security type of a @@WifiNetwork.
@@ -126,7 +126,7 @@ public:
 		Unknown = 11,
 	};
 	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(WifiSecurityType::Enum type);
+	Q_INVOKABLE static QString toString(qs::network::WifiSecurityType::Enum type);
 };
 
 ///! The 802.11 mode of a @@WifiDevice.
@@ -149,7 +149,7 @@ public:
 		Unknown = 4,
 	};
 	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(WifiDeviceMode::Enum mode);
+	Q_INVOKABLE static QString toString(qs::network::WifiDeviceMode::Enum mode);
 };
 
 } // namespace qs::network

src/network/network.hpp

@@ -27,17 +27,17 @@ class Network: public QObject {
 	/// The name of the network.
 	Q_PROPERTY(QString name READ default NOTIFY nameChanged BINDABLE bindableName);
 	/// The device this network belongs to.
-	Q_PROPERTY(NetworkDevice* device READ device CONSTANT);
+	Q_PROPERTY(qs::network::NetworkDevice* device READ device CONSTANT);
 	/// A list of NetworkManager connection settings profiles for this network.
 	///
 	/// > [!WARNING] Only valid for the NetworkManager backend. 
-	Q_PROPERTY(QList<NMSettings*> nmSettings READ default NOTIFY nmSettingsChanged BINDABLE bindableNmSettings);
+	Q_PROPERTY(QList<qs::network::NMSettings*> nmSettings READ default NOTIFY nmSettingsChanged BINDABLE bindableNmSettings);
 	/// True if the network is connected.
 	Q_PROPERTY(bool connected READ default NOTIFY connectedChanged BINDABLE bindableConnected);
 	/// True if the wifi network has known connection settings saved.
 	Q_PROPERTY(bool known READ default NOTIFY knownChanged BINDABLE bindableKnown);
 	/// The connectivity state of the network.
-	Q_PROPERTY(ConnectionState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
+	Q_PROPERTY(qs::network::ConnectionState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
 	/// If the network is currently connecting or disconnecting. Shorthand for checking @@state.
 	Q_PROPERTY(bool stateChanging READ default NOTIFY stateChangingChanged BINDABLE bindableStateChanging);
 	// clang-format on
@@ -53,7 +53,7 @@ public:
 	/// Attempt to connect to the network with a specific @@nmSettings entry.
 	///
 	/// > [!WARNING] Only valid for the NetworkManager backend.
-	Q_INVOKABLE void connectWithSettings(NMSettings* settings);
+	Q_INVOKABLE void connectWithSettings(qs::network::NMSettings* settings);
 	/// Disconnect from the network.
 	Q_INVOKABLE void disconnect();
 	/// Forget all connection settings for this network.
@@ -77,7 +77,7 @@ public:
 
 signals:
 	/// Signals that a connection to the network has failed because of the given @@ConnectionFailReason.
-	void connectionFailed(ConnectionFailReason::Enum reason);
+	void connectionFailed(qs::network::ConnectionFailReason::Enum reason);
 
 	void nameChanged();
 	void connectedChanged();
@@ -86,7 +86,7 @@ signals:
 	void stateChangingChanged();
 	void nmSettingsChanged();
 	QSDOC_HIDE void requestConnect();
-	QSDOC_HIDE void requestConnectWithSettings(NMSettings* settings);
+	QSDOC_HIDE void requestConnectWithSettings(qs::network::NMSettings* settings);
 	QSDOC_HIDE void requestDisconnect();
 	QSDOC_HIDE void requestForget();
 

src/network/nm/accesspoint.hpp

@@ -61,11 +61,11 @@ signals:
 	void loaded();
 	void ssidChanged(const QByteArray& ssid);
 	void signalStrengthChanged(quint8 signal);
-	void flagsChanged(NM80211ApFlags::Enum flags);
-	void wpaFlagsChanged(NM80211ApSecurityFlags::Enum wpaFlags);
-	void rsnFlagsChanged(NM80211ApSecurityFlags::Enum rsnFlags);
-	void modeChanged(NM80211Mode::Enum mode);
-	void securityChanged(WifiSecurityType::Enum security);
+	void flagsChanged(qs::network::NM80211ApFlags::Enum flags);
+	void wpaFlagsChanged(qs::network::NM80211ApSecurityFlags::Enum wpaFlags);
+	void rsnFlagsChanged(qs::network::NM80211ApSecurityFlags::Enum rsnFlags);
+	void modeChanged(qs::network::NM80211Mode::Enum mode);
+	void securityChanged(qs::network::WifiSecurityType::Enum security);
 
 private:
 	// clang-format off

src/network/nm/active_connection.hpp

@@ -43,8 +43,8 @@ public:
 signals:
 	void loaded();
 	void connectionChanged(QDBusObjectPath path);
-	void stateChanged(NMConnectionState::Enum state);
-	void stateReasonChanged(NMConnectionStateReason::Enum reason);
+	void stateChanged(qs::network::NMConnectionState::Enum state);
+	void stateReasonChanged(qs::network::NMConnectionStateReason::Enum reason);
 
 private slots:
 	void onStateChanged(quint32 state, quint32 reason);

src/network/nm/backend.hpp

@@ -44,11 +44,11 @@ public:
 	[[nodiscard]] NMConnectivityState::Enum connectivity() const { return this->bConnectivity; }
 
 signals:
-	void deviceAdded(NetworkDevice* device);
-	void deviceRemoved(NetworkDevice* device);
+	void deviceAdded(qs::network::NetworkDevice* device);
+	void deviceRemoved(qs::network::NetworkDevice* device);
 	void wifiEnabledChanged(bool enabled);
 	void wifiHardwareEnabledChanged(bool enabled);
-	void connectivityStateChanged(NMConnectivityState::Enum state);
+	void connectivityStateChanged(qs::network::NMConnectivityState::Enum state);
 	void connectivityCheckAvailableChanged(bool available);
 	void connectivityCheckEnabledChanged(bool enabled);
 
@@ -64,7 +64,7 @@ private slots:
 	void onServiceUnregistered();
 	void activateConnection(const QDBusObjectPath& connPath, const QDBusObjectPath& devPath);
 	void addAndActivateConnection(
-	    const NMSettingsMap& settings,
+	    const qs::network::NMSettingsMap& settings,
 	    const QDBusObjectPath& devPath,
 	    const QDBusObjectPath& specificObjectPath
 	);

src/network/nm/device.hpp

@@ -64,25 +64,25 @@ signals:
 	void loaded();
 	void activateConnection(const QDBusObjectPath& connPath, const QDBusObjectPath& devPath);
 	void addAndActivateConnection(
-	    const NMSettingsMap& settings,
+	    const qs::network::NMSettingsMap& settings,
 	    const QDBusObjectPath& devPath,
 	    const QDBusObjectPath& specificObjectPath
 	);
-	void networkAdded(Network* net);
-	void networkRemoved(Network* net);
-	void settingsLoaded(NMSettings* settings);
-	void settingsRemoved(NMSettings* settings);
+	void networkAdded(qs::network::Network* net);
+	void networkRemoved(qs::network::Network* net);
+	void settingsLoaded(qs::network::NMSettings* settings);
+	void settingsRemoved(qs::network::NMSettings* settings);
 	void availableSettingsPathsChanged(QList<QDBusObjectPath> paths);
 	void activeConnectionPathChanged(const QDBusObjectPath& connection);
-	void activeConnectionLoaded(NMActiveConnection* active);
+	void activeConnectionLoaded(qs::network::NMActiveConnection* active);
 	void interfaceChanged(const QString& interface);
 	void hwAddressChanged(const QString& hwAddress);
 	void managedChanged(bool managed);
-	void stateChanged(NMDeviceState::Enum state);
-	void stateReasonChanged(NMDeviceStateReason::Enum reason);
-	void lastFailReasonChanged(NMDeviceStateReason::Enum reason);
+	void stateChanged(qs::network::NMDeviceState::Enum state);
+	void stateReasonChanged(qs::network::NMDeviceStateReason::Enum reason);
+	void lastFailReasonChanged(qs::network::NMDeviceStateReason::Enum reason);
 	void autoconnectChanged(bool autoconnect);
-	void interfaceFlagsChanged(NMDeviceInterfaceFlags::Enum flags);
+	void interfaceFlagsChanged(qs::network::NMDeviceInterfaceFlags::Enum flags);
 
 public slots:
 	void disconnect();

src/network/nm/network.hpp

@@ -41,16 +41,18 @@ public:
 signals:
 	void requestDisconnect();
 	void requestActivateConnection(const QString& settingsPath);
-	void
-	requestAddAndActivateConnection(const NMSettingsMap& settingsMap, const QString& specificObject);
+	void requestAddAndActivateConnection(
+	    const qs::network::NMSettingsMap& settingsMap,
+	    const QString& specificObject
+	);
 
-	void settingsAdded(NMSettings* settings);
-	void settingsRemoved(NMSettings* settings);
-	void stateChanged(NMConnectionState::Enum state);
+	void settingsAdded(qs::network::NMSettings* settings);
+	void settingsRemoved(qs::network::NMSettings* settings);
+	void stateChanged(qs::network::NMConnectionState::Enum state);
 	void knownChanged(bool known);
-	void reasonChanged(NMConnectionStateReason::Enum reason);
-	void deviceFailReasonChanged(NMDeviceStateReason::Enum reason);
-	void referenceSettingsChanged(NMSettings* settings);
+	void reasonChanged(qs::network::NMConnectionStateReason::Enum reason);
+	void deviceFailReasonChanged(qs::network::NMDeviceStateReason::Enum reason);
+	void referenceSettingsChanged(qs::network::NMSettings* settings);
 	void visibilityChanged(bool visible);
 
 protected:
@@ -113,11 +115,11 @@ public:
 signals:
 	void disappeared();
 	void signalStrengthChanged(quint8 signal);
-	void securityChanged(WifiSecurityType::Enum security);
+	void securityChanged(qs::network::WifiSecurityType::Enum security);
 	void activeApPathChanged(QString path);
-	void referenceApChanged(NMAccessPoint* ap);
-	void capabilitiesChanged(NMWirelessCapabilities::Enum caps);
-	void apRemoved(NMAccessPoint* ap);
+	void referenceApChanged(qs::network::NMAccessPoint* ap);
+	void capabilitiesChanged(qs::network::NMWirelessCapabilities::Enum caps);
+	void apRemoved(qs::network::NMAccessPoint* ap);
 
 private:
 	void updateReferenceAp();

src/network/nm/settings.hpp

@@ -61,7 +61,7 @@ public:
 
 signals:
 	void loaded();
-	void settingsChanged(NMSettingsMap settings);
+	void settingsChanged(qs::network::NMSettingsMap settings);
 	void idChanged(QString id);
 	void uuidChanged(QString uuid);
 

src/network/nm/wired.hpp

@@ -32,8 +32,8 @@ signals:
 	void speedChanged(quint32 speed);
 
 private slots:
-	void onSettingsLoaded(NMSettings* settings);
-	void onActiveConnectionLoaded(NMActiveConnection* active);
+	void onSettingsLoaded(qs::network::NMSettings* settings);
+	void onActiveConnectionLoaded(qs::network::NMActiveConnection* active);
 
 private:
 	void initWired();

src/network/nm/wireless.hpp

@@ -51,20 +51,20 @@ public:
 	[[nodiscard]] WifiDevice* frontend() override { return this->mFrontend; };
 
 signals:
-	void accessPointLoaded(NMAccessPoint* ap);
-	void accessPointRemoved(NMAccessPoint* ap);
+	void accessPointLoaded(qs::network::NMAccessPoint* ap);
+	void accessPointRemoved(qs::network::NMAccessPoint* ap);
 	void lastScanChanged(QDateTime lastScan);
 	void scanningChanged(bool scanning);
-	void capabilitiesChanged(NMWirelessCapabilities::Enum caps);
+	void capabilitiesChanged(qs::network::NMWirelessCapabilities::Enum caps);
 	void activeAccessPointChanged(const QDBusObjectPath& path);
-	void modeChanged(NM80211Mode::Enum mode);
+	void modeChanged(qs::network::NM80211Mode::Enum mode);
 
 private slots:
 	void onAccessPointAdded(const QDBusObjectPath& path);
 	void onAccessPointRemoved(const QDBusObjectPath& path);
-	void onAccessPointLoaded(NMAccessPoint* ap);
-	void onSettingsLoaded(NMSettings* settings);
-	void onActiveConnectionLoaded(NMActiveConnection* active);
+	void onAccessPointLoaded(qs::network::NMAccessPoint* ap);
+	void onSettingsLoaded(qs::network::NMSettings* settings);
+	void onActiveConnectionLoaded(qs::network::NMActiveConnection* active);
 	void onScanTimeout();
 	void onScanningChanged(bool scanning);
 

src/network/qml.hpp

@@ -55,8 +55,8 @@ signals:
 	void connectivityChanged();
 
 private slots:
-	void deviceAdded(NetworkDevice* dev);
-	void deviceRemoved(NetworkDevice* dev);
+	void deviceAdded(qs::network::NetworkDevice* dev);
+	void deviceRemoved(qs::network::NetworkDevice* dev);
 
 private:
 	explicit Networking(QObject* parent = nullptr);

src/network/wifi.hpp

@@ -22,7 +22,7 @@ class WifiNetwork: public Network {
 	/// The current signal strength of the network, from 0.0 to 1.0.
 	Q_PROPERTY(qreal signalStrength READ default NOTIFY signalStrengthChanged BINDABLE bindableSignalStrength);
 	/// The security type of the wifi network.
-	Q_PROPERTY(WifiSecurityType::Enum security READ default NOTIFY securityChanged BINDABLE bindableSecurity);
+	Q_PROPERTY(qs::network::WifiSecurityType::Enum security READ default NOTIFY securityChanged BINDABLE bindableSecurity);
 	// clang-format on
 
 public:
@@ -64,7 +64,7 @@ class WifiDevice: public NetworkDevice {
 	/// When enabled, the scanner populates the device with an active list of available wifi networks.
 	Q_PROPERTY(bool scannerEnabled READ scannerEnabled WRITE setScannerEnabled NOTIFY scannerEnabledChanged BINDABLE bindableScannerEnabled);
 	/// The 802.11 mode the device is in.
-	Q_PROPERTY(WifiDeviceMode::Enum mode READ default NOTIFY modeChanged BINDABLE bindableMode);
+	Q_PROPERTY(qs::network::WifiDeviceMode::Enum mode READ default NOTIFY modeChanged BINDABLE bindableMode);
 	// clang-format on
 
 public:

src/network/wired.hpp

@@ -20,7 +20,9 @@ class WiredDevice: public NetworkDevice {
 	/// The wired network for this device or `null`.
 	///
 	/// > [!NOTE] This network is only available when @@hasLink is `true`.
-	Q_PROPERTY(Network* network READ network NOTIFY networkChanged BINDABLE bindableNetwork);
+	Q_PROPERTY(
+	    qs::network::Network* network READ network NOTIFY networkChanged BINDABLE bindableNetwork
+	);
 	/// The maximum speed of the physical device link, in megabits per second.
 	Q_PROPERTY(quint32 linkSpeed READ default NOTIFY linkSpeedChanged BINDABLE bindableLinkSpeed);
 	/// True if the wired device has a physical link (cable plugged in).

src/services/pipewire/defaults.hpp

@@ -41,9 +41,9 @@ signals:
 	void defaultConfiguredSourceNameChanged();
 
 private slots:
-	void onMetadataAdded(PwMetadata* metadata);
+	void onMetadataAdded(qs::service::pipewire::PwMetadata* metadata);
 	void onMetadataProperty(const char* key, const char* type, const char* value);
-	void onNodeAdded(PwNode* node);
+	void onNodeAdded(qs::service::pipewire::PwNode* node);
 	void onDefaultSinkDestroyed();
 	void onDefaultSourceDestroyed();
 	void onDefaultConfiguredSinkDestroyed();

src/services/pipewire/device.hpp

@@ -39,7 +39,8 @@ public:
 
 signals:
 	void deviceReady();
-	void routeVolumesChanged(qint32 routeDevice, const PwVolumeProps& volumeProps);
+	void
+	routeVolumesChanged(qint32 routeDevice, const qs::service::pipewire::PwVolumeProps& volumeProps);
 
 private slots:
 	void polled();

src/services/pipewire/node.hpp

@@ -209,7 +209,8 @@ signals:
 
 private slots:
 	void onDeviceReady();
-	void onDeviceVolumesChanged(qint32 routeDevice, const PwVolumeProps& props);
+	void
+	onDeviceVolumesChanged(qint32 routeDevice, const qs::service::pipewire::PwVolumeProps& props);
 
 private:
 	void updateVolumeProps(const PwVolumeProps& volumeProps);

src/services/pipewire/qml.hpp

@@ -158,11 +158,11 @@ signals:
 	void readyChanged();
 
 private slots:
-	void onNodeAdded(PwNode* node);
+	void onNodeAdded(qs::service::pipewire::PwNode* node);
 	void onNodeRemoved(QObject* object);
-	void onLinkAdded(PwLink* link);
+	void onLinkAdded(qs::service::pipewire::PwLink* link);
 	void onLinkRemoved(QObject* object);
-	void onLinkGroupAdded(PwLinkGroup* group);
+	void onLinkGroupAdded(qs::service::pipewire::PwLinkGroup* group);
 	void onLinkGroupRemoved(QObject* object);
 
 private:
@@ -199,7 +199,7 @@ signals:
 
 private slots:
 	void onNodeDestroyed();
-	void onLinkGroupCreated(PwLinkGroup* linkGroup);
+	void onLinkGroupCreated(qs::service::pipewire::PwLinkGroup* linkGroup);
 	void onLinkGroupDestroyed(QObject* object);
 
 private:
@@ -361,7 +361,7 @@ class PwLinkIface: public PwObjectIface {
 	/// The current state of the link.
 	///
 	/// > [!WARNING] This property is invalid unless the node is bound using @@PwObjectTracker.
-	Q_PROPERTY(PwLinkState::Enum state READ state NOTIFY stateChanged);
+	Q_PROPERTY(qs::service::pipewire::PwLinkState::Enum state READ state NOTIFY stateChanged);
 	QML_NAMED_ELEMENT(PwLink);
 	QML_UNCREATABLE("PwLinks cannot be created directly");
 

src/services/pipewire/registry.hpp

@@ -49,7 +49,7 @@ public:
 
 signals:
 	// goes with safeDestroy
-	void destroying(PwBindableObject* self);
+	void destroying(qs::service::pipewire::PwBindableObject* self);
 
 protected:
 	void registryBind(const char* interface, quint32 version);
@@ -132,10 +132,10 @@ public:
 	[[nodiscard]] PwNode* findNodeByName(QStringView name) const;
 
 signals:
-	void nodeAdded(PwNode* node);
-	void linkAdded(PwLink* link);
-	void linkGroupAdded(PwLinkGroup* group);
-	void metadataAdded(PwMetadata* metadata);
+	void nodeAdded(qs::service::pipewire::PwNode* node);
+	void linkAdded(qs::service::pipewire::PwLink* link);
+	void linkGroupAdded(qs::service::pipewire::PwLinkGroup* group);
+	void metadataAdded(qs::service::pipewire::PwMetadata* metadata);
 	void initialized();
 	void cleared();
 

src/services/polkit/flow.hpp

@@ -45,12 +45,12 @@ class AuthFlow
 	/// Each identity may be a user or a group. You may select any of them to
 	/// authenticate by setting @@selectedIdentity. By default, the first identity
 	/// in the list is selected.
-	Q_PROPERTY(QList<Identity*> identities READ identities CONSTANT);
+	Q_PROPERTY(QList<qs::service::polkit::Identity*> identities READ identities CONSTANT);
 
 	/// The identity that will be used to authenticate.
 	///
 	/// Changing this will abort any ongoing authentication conversations and start a new one.
-	Q_PROPERTY(Identity* selectedIdentity READ default WRITE setSelectedIdentity NOTIFY selectedIdentityChanged BINDABLE selectedIdentity);
+	Q_PROPERTY(qs::service::polkit::Identity* selectedIdentity READ default WRITE setSelectedIdentity NOTIFY selectedIdentityChanged BINDABLE selectedIdentity);
 
 	/// Indicates that a response from the user is required from the user,
 	/// typically a password.

src/services/polkit/qml.hpp

@@ -47,7 +47,7 @@ class PolkitAgent
 	/// The current authentication state if an authentication request is active.
 	///
 	/// Null when no authentication request is active.
-	Q_PROPERTY(AuthFlow* flow READ default NOTIFY flowChanged BINDABLE flow);
+	Q_PROPERTY(qs::service::polkit::AuthFlow* flow READ default NOTIFY flowChanged BINDABLE flow);
 
 public:
 	explicit PolkitAgent(QObject* parent = nullptr): QObject(parent) {};

src/services/status_notifier/host.hpp

@@ -29,9 +29,9 @@ public:
 	static StatusNotifierHost* instance();
 
 signals:
-	void itemRegistered(StatusNotifierItem* item);
-	void itemReady(StatusNotifierItem* item);
-	void itemUnregistered(StatusNotifierItem* item);
+	void itemRegistered(qs::service::sni::StatusNotifierItem* item);
+	void itemReady(qs::service::sni::StatusNotifierItem* item);
+	void itemUnregistered(qs::service::sni::StatusNotifierItem* item);
 
 private slots:
 	void onWatcherRegistered();

src/wayland/hyprland/ipc/connection.hpp

@@ -112,7 +112,7 @@ public:
 
 signals:
 	void connected();
-	void rawEvent(HyprlandIpcEvent* event);
+	void rawEvent(qs::hyprland::ipc::HyprlandIpcEvent* event);
 
 	void usingLuaChanged();
 	void focusedMonitorChanged();

src/wayland/hyprland/ipc/hyprland_toplevel.hpp

@@ -28,7 +28,7 @@ class HyprlandToplevel: public QObject {
 	Q_PROPERTY(QString address READ addressStr NOTIFY addressChanged);
 	/// The toplevel handle, exposing the Hyprland toplevel.
 	/// Will be null until the address is reported
-	Q_PROPERTY(HyprlandToplevel* handle READ hyprlandHandle NOTIFY hyprlandHandleChanged);
+	Q_PROPERTY(qs::hyprland::ipc::HyprlandToplevel* handle READ hyprlandHandle NOTIFY hyprlandHandleChanged);
 	/// The wayland toplevel handle. Will be null intil the address is reported
 	Q_PROPERTY(qs::wayland::toplevel::Toplevel* wayland READ waylandHandle NOTIFY waylandHandleChanged);
 	/// The title of the toplevel

src/wayland/hyprland/ipc/qml.hpp

@@ -52,7 +52,7 @@ public:
 	Q_INVOKABLE static void dispatch(const QString& request);
 
 	/// Get the HyprlandMonitor object that corresponds to a quickshell screen.
-	Q_INVOKABLE static HyprlandMonitor* monitorFor(QuickshellScreenInfo* screen);
+	Q_INVOKABLE static qs::hyprland::ipc::HyprlandMonitor* monitorFor(QuickshellScreenInfo* screen);
 
 	/// Refresh monitor information.
 	///

src/wayland/toplevel/wlr_toplevel.hpp

@@ -94,7 +94,7 @@ public:
 	static ToplevelManager* instance();
 
 signals:
-	void toplevelReady(ToplevelHandle* toplevel);
+	void toplevelReady(qs::wayland::toplevel::wlr::ToplevelHandle* toplevel);
 
 protected:
 	explicit ToplevelManager();

src/wayland/windowmanager/ext_workspace.hpp

@@ -33,10 +33,10 @@ public:
 
 signals:
 	void serverCommit();
-	void workspaceCreated(Workspace* workspace);
-	void workspaceDestroyed(Workspace* workspace);
-	void groupCreated(WorkspaceGroup* group);
-	void groupDestroyed(WorkspaceGroup* group);
+	void workspaceCreated(qs::wayland::workspace::Workspace* workspace);
+	void workspaceDestroyed(qs::wayland::workspace::Workspace* workspace);
+	void groupCreated(qs::wayland::workspace::WorkspaceGroup* group);
+	void groupDestroyed(qs::wayland::workspace::WorkspaceGroup* group);
 
 protected:
 	void ext_workspace_manager_v1_workspace_group(::ext_workspace_group_handle_v1* handle) override;

src/windowmanager/windowmanager.hpp

@@ -23,7 +23,7 @@ public:
 	static void setProvider(std::function<WindowManager*()> provider);
 	static WindowManager* instance();
 
-	Q_INVOKABLE ScreenProjection* screenProjection(QuickshellScreenInfo* screen);
+	Q_INVOKABLE qs::wm::ScreenProjection* screenProjection(QuickshellScreenInfo* screen);
 
 	[[nodiscard]] QBindable<QList<Windowset*>> bindableWindowsets() const {
 		return &this->bWindowsets;
@@ -64,10 +64,10 @@ class WindowManagerQml: public QObject {
 	QML_SINGLETON;
 	// clang-format off
 	/// All windowsets tracked by the WM across all projections.
-	Q_PROPERTY(QList<Windowset*> windowsets READ default BINDABLE bindableWindowsets);
+	Q_PROPERTY(QList<qs::wm::Windowset*> windowsets READ default BINDABLE bindableWindowsets);
 	/// All windowset projections tracked by the WM. Does not include
 	/// internal projections from @@screenProjection().
-	Q_PROPERTY(QList<WindowsetProjection*> windowsetProjections READ default BINDABLE bindableWindowsetProjections);
+	Q_PROPERTY(QList<qs::wm::WindowsetProjection*> windowsetProjections READ default BINDABLE bindableWindowsetProjections);
 	// clang-format on
 
 public:
@@ -75,7 +75,7 @@ public:
 	/// windowsets on that screen, regardless of the WM-specified projection. Depending on
 	/// how the WM lays out its actual projections, multiple ScreenProjections may contain
 	/// the same Windowsets.
-	Q_INVOKABLE static ScreenProjection* screenProjection(QuickshellScreenInfo* screen) {
+	Q_INVOKABLE static qs::wm::ScreenProjection* screenProjection(QuickshellScreenInfo* screen) {
 		return WindowManager::instance()->screenProjection(screen);
 	}
 

src/windowmanager/windowset.hpp

@@ -41,7 +41,7 @@ class Windowset: public QObject {
 	Q_PROPERTY(bool active READ default NOTIFY activeChanged BINDABLE bindableActive);
 	/// The projection this windowset is a member of. A projection is the set of screens covered by
 	/// a windowset.
-	Q_PROPERTY(WindowsetProjection* projection READ default NOTIFY projectionChanged BINDABLE bindableProjection);
+	Q_PROPERTY(qs::wm::WindowsetProjection* projection READ default NOTIFY projectionChanged BINDABLE bindableProjection);
 	/// If false, this windowset should generally be hidden from workspace pickers.
 	Q_PROPERTY(bool shouldDisplay READ default NOTIFY shouldDisplayChanged BINDABLE bindableShouldDisplay);
 	/// If true, a window in this windowset has been marked as urgent.
@@ -70,7 +70,7 @@ public:
 	Q_INVOKABLE virtual void remove();
 	/// Move the windowset to a different projection. A projection represents the set of screens
 	/// a workspace spans. Requires @@canSetProjection.
-	Q_INVOKABLE virtual void setProjection(WindowsetProjection* projection);
+	Q_INVOKABLE virtual void setProjection(qs::wm::WindowsetProjection* projection);
 
 	[[nodiscard]] QBindable<QString> bindableId() const { return &this->bId; }
 	[[nodiscard]] QBindable<QString> bindableName() const { return &this->bName; }
@@ -134,7 +134,7 @@ class WindowsetProjection: public QObject {
 	/// Screens the windowset projection spans, often a single screen or all screens.
 	Q_PROPERTY(QList<QuickshellScreenInfo*> screens READ screens NOTIFY screensChanged);
 	/// Windowsets that are currently present on the projection.
-	Q_PROPERTY(QList<Windowset*> windowsets READ default NOTIFY windowsetsChanged BINDABLE bindableWindowsets);
+	Q_PROPERTY(QList<qs::wm::Windowset*> windowsets READ default NOTIFY windowsetsChanged BINDABLE bindableWindowsets);
 	// clang-format on
 
 public:

src/x11/i3/ipc/connection.hpp

@@ -80,7 +80,7 @@ public:
 
 signals:
 	void connected();
-	void rawEvent(I3IpcEvent* event);
+	void rawEvent(qs::i3::ipc::I3IpcEvent* event);
 
 protected slots:
 	void eventSocketError(QLocalSocket::LocalSocketError error) const;

src/x11/i3/ipc/controller.hpp

@@ -56,7 +56,7 @@ signals:
 private slots:
 	void onFocusedMonitorDestroyed();
 
-	void onEvent(I3IpcEvent* event);
+	void onEvent(qs::i3::ipc::I3IpcEvent* event);
 	void onConnected();
 
 private:

src/x11/i3/ipc/listener.hpp

@@ -52,7 +52,7 @@ public:
 	void setSubscriptions(QList<QString> subscriptions);
 
 signals:
-	void ipcEvent(I3IpcEvent* event);
+	void ipcEvent(qs::i3::ipc::I3IpcEvent* event);
 	void subscriptionsChanged();
 
 private:

src/x11/i3/ipc/qml.hpp

@@ -43,13 +43,13 @@ public:
 	Q_INVOKABLE static void refreshWorkspaces();
 
 	/// Find an I3Workspace using its name, returns null if the workspace doesn't exist.
-	Q_INVOKABLE static I3Workspace* findWorkspaceByName(const QString& name);
+	Q_INVOKABLE static qs::i3::ipc::I3Workspace* findWorkspaceByName(const QString& name);
 
 	/// Find an I3Monitor using its name, returns null if the monitor doesn't exist.
-	Q_INVOKABLE static I3Monitor* findMonitorByName(const QString& name);
+	Q_INVOKABLE static qs::i3::ipc::I3Monitor* findMonitorByName(const QString& name);
 
 	/// Return the i3/Sway monitor associated with `screen`
-	Q_INVOKABLE static I3Monitor* monitorFor(QuickshellScreenInfo* screen);
+	Q_INVOKABLE static qs::i3::ipc::I3Monitor* monitorFor(QuickshellScreenInfo* screen);
 
 	/// The path to the I3 or Sway socket currently being used
 	[[nodiscard]] static QString socketPath();
@@ -67,7 +67,7 @@ public:
 	[[nodiscard]] static QBindable<I3Monitor*> bindableFocusedMonitor();
 
 signals:
-	void rawEvent(I3IpcEvent* event);
+	void rawEvent(qs::i3::ipc::I3IpcEvent* event);
 	void connected();
 	void focusedWorkspaceChanged();
 	void focusedMonitorChanged();