refactor: Rename remaining "black" identifiers

This commit is contained in:
Lars Toenning
2024-11-10 21:50:35 +01:00
parent 6d1812b164
commit cc1e41fc59
579 changed files with 1758 additions and 1869 deletions

View File

@@ -12,7 +12,7 @@
#include <QAudioDevice>
#include <QMediaDevices>
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
namespace swift::misc::audio
{

View File

@@ -14,7 +14,7 @@
#include <QMetaType>
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
namespace swift::misc::audio
{
@@ -108,12 +108,11 @@ namespace swift::misc::audio
QString m_deviceName; //!< Device name
CIdentifier m_identifier; //!< We use a DBus based system. Hence an audio device can reside on a different computers, this here is its name
BLACK_METACLASS(
SWIFT_METACLASS(
CAudioDeviceInfo,
BLACK_METAMEMBER(type),
BLACK_METAMEMBER(deviceName),
BLACK_METAMEMBER(identifier)
);
SWIFT_METAMEMBER(type),
SWIFT_METAMEMBER(deviceName),
SWIFT_METAMEMBER(identifier));
};
} // namespace

View File

@@ -8,7 +8,7 @@
#include <QMediaDevices>
#include <algorithm>
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
namespace swift::misc::audio
{

View File

@@ -16,7 +16,7 @@
#include <QAudioDevice>
#include <QStringList>
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
namespace swift::misc::audio
{

View File

@@ -10,7 +10,7 @@
using namespace swift::misc::audio;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
namespace swift::misc::audio
{

View File

@@ -16,7 +16,7 @@
#include <QMetaType>
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
namespace swift::misc::audio
{
@@ -131,17 +131,16 @@ namespace swift::misc::audio
int m_inVolume = 50; //!< AFV range
bool m_audioEffects = true; //!< Audio effects en
BLACK_METACLASS(
SWIFT_METACLASS(
CSettings,
BLACK_METAMEMBER(notificationSoundDir),
BLACK_METAMEMBER(notification),
BLACK_METAMEMBER(notificationVolume),
BLACK_METAMEMBER(outVolume),
BLACK_METAMEMBER(outVolumeCom1),
BLACK_METAMEMBER(outVolumeCom2),
BLACK_METAMEMBER(inVolume),
BLACK_METAMEMBER(audioEffects)
);
SWIFT_METAMEMBER(notificationSoundDir),
SWIFT_METAMEMBER(notification),
SWIFT_METAMEMBER(notificationVolume),
SWIFT_METAMEMBER(outVolume),
SWIFT_METAMEMBER(outVolumeCom1),
SWIFT_METAMEMBER(outVolumeCom2),
SWIFT_METAMEMBER(inVolume),
SWIFT_METAMEMBER(audioEffects));
};
//! Audio related settings