Ref T552 Register value classes with qRegisterMetaTypeStreamOperators.

This commit is contained in:
Mat Sutcliffe
2019-02-27 22:32:25 +00:00
parent 6d9f9a286d
commit d29576b67a
15 changed files with 37 additions and 1 deletions

View File

@@ -43,6 +43,13 @@ namespace BlackCore
qDBusRegisterMetaType<INetwork::LoginMode>();
qDBusRegisterMetaType<IVoiceChannel::ConnectionStatus>();
qRegisterMetaTypeStreamOperators<Context::CLogSubscriptionHash>();
qRegisterMetaTypeStreamOperators<Context::CLogSubscriptionPair>();
qRegisterMetaTypeStreamOperators<Context::CSettingsDictionary>();
qRegisterMetaTypeStreamOperators<INetwork::ConnectionStatus>();
qRegisterMetaTypeStreamOperators<INetwork::LoginMode>();
qRegisterMetaTypeStreamOperators<IVoiceChannel::ConnectionStatus>();
Db::CDatabaseReaderConfig::registerMetadata();
Db::CDatabaseReaderConfigList::registerMetadata();
Data::CGlobalSetup::registerMetadata();

View File

@@ -27,6 +27,8 @@ namespace BlackMisc
// ENUMs
qDBusRegisterMetaType<CNotificationSounds::PlayMode>();
qDBusRegisterMetaType<CNotificationSounds::NotificationFlag>();
qRegisterMetaTypeStreamOperators<CNotificationSounds::PlayMode>();
qRegisterMetaTypeStreamOperators<CNotificationSounds::NotificationFlag>();
}
} // ns
} // ns

View File

@@ -57,10 +57,13 @@ namespace BlackMisc
{
qRegisterMetaType<BlackMisc::CSequence<CCallsign>>();
qDBusRegisterMetaType<BlackMisc::CSequence<CCallsign>>();
qRegisterMetaTypeStreamOperators<BlackMisc::CSequence<CCallsign>>();
qRegisterMetaType<BlackMisc::CCollection<CCallsign>>();
qDBusRegisterMetaType<BlackMisc::CCollection<CCallsign>>();
qRegisterMetaTypeStreamOperators<BlackMisc::CCollection<CCallsign>>();
qRegisterMetaType<CCallsignSet>();
qDBusRegisterMetaType<CCallsignSet>();
qRegisterMetaTypeStreamOperators<CCallsignSet>();
registerMetaValueType<CCallsignSet>();
}
} // namespace

View File

@@ -26,6 +26,8 @@ namespace BlackMisc
Mixin::MetaType<CComSystem>::registerMetadata();
qDBusRegisterMetaType<ChannelSpacing>();
qDBusRegisterMetaType<ComUnit>();
qRegisterMetaTypeStreamOperators<ChannelSpacing>();
qRegisterMetaTypeStreamOperators<ComUnit>();
}
void CComSystem::setFrequencyActiveMHz(double frequencyMHz)

View File

@@ -28,10 +28,13 @@ namespace BlackMisc
{
qRegisterMetaType<BlackMisc::CSequence<CIcon>>();
qDBusRegisterMetaType<BlackMisc::CSequence<CIcon>>();
qRegisterMetaTypeStreamOperators<BlackMisc::CSequence<CIcon>>();
qRegisterMetaType<BlackMisc::CCollection<CIcon>>();
qDBusRegisterMetaType<BlackMisc::CCollection<CIcon>>();
qRegisterMetaTypeStreamOperators<BlackMisc::CCollection<CIcon>>();
qRegisterMetaType<CIconList>();
qDBusRegisterMetaType<CIconList>();
qRegisterMetaTypeStreamOperators<CIconList>();
registerMetaValueType<CIconList>();
}

View File

@@ -25,6 +25,7 @@ namespace BlackMisc
CKeyboardKey::registerMetadata();
CKeyboardKeyList::registerMetadata();
qDBusRegisterMetaType<KeyCode>();
qRegisterMetaTypeStreamOperators<KeyCode>();
}
} // ns
} // ns

View File

@@ -69,6 +69,7 @@ namespace BlackMisc
{
qRegisterMetaType<CLogCategoryList>();
qDBusRegisterMetaType<CLogCategoryList>();
qRegisterMetaTypeStreamOperators<CLogCategoryList>();
registerMetaValueType<CLogCategoryList>();
}
}

View File

@@ -18,6 +18,7 @@ namespace BlackMisc
CAuthenticatedUser::registerMetadata();
CClient::registerMetadata();
qDBusRegisterMetaType<CClient::Capability>();
qRegisterMetaTypeStreamOperators<CClient::Capability>();
CClientList::registerMetadata();
CEcosystem::registerMetadata();
CEcosystemList::registerMetadata();

View File

@@ -71,10 +71,13 @@ namespace BlackMisc
{
qRegisterMetaType<BlackMisc::CSequence<CPlatform>>();
qDBusRegisterMetaType<BlackMisc::CSequence<CPlatform>>();
qRegisterMetaTypeStreamOperators<BlackMisc::CSequence<CPlatform>>();
qRegisterMetaType<BlackMisc::CCollection<CPlatform>>();
qDBusRegisterMetaType<BlackMisc::CCollection<CPlatform>>();
qRegisterMetaTypeStreamOperators<BlackMisc::CCollection<CPlatform>>();
qRegisterMetaType<CPlatformSet>();
qDBusRegisterMetaType<CPlatformSet>();
qRegisterMetaTypeStreamOperators<CPlatformSet>();
registerMetaValueType<CPlatformSet>();
}
} // namespace

View File

@@ -102,5 +102,6 @@ namespace BlackMisc
// needed by XSwiftBus proxy class
qDBusRegisterMetaType<CSequence<double>>();
qRegisterMetaTypeStreamOperators<CSequence<double>>();
}
} // ns

View File

@@ -67,6 +67,15 @@ namespace BlackMisc
qDBusRegisterMetaType<CAircraftMatcherSetup::PickSimilarStrategy>();
qDBusRegisterMetaType<ReverseLookupLoggingFlag>();
qDBusRegisterMetaType<ReverseLookupLogging>();
qRegisterMetaTypeStreamOperators<CInterpolationAndRenderingSetupBase::InterpolatorMode>();
qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::MatchingAlgorithm>();
qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::MatchingModeFlag>();
qRegisterMetaTypeStreamOperators<MatchingLogFlag>();
qRegisterMetaTypeStreamOperators<MatchingLog>();
qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::PickSimilarStrategy>();
qRegisterMetaTypeStreamOperators<ReverseLookupLoggingFlag>();
qRegisterMetaTypeStreamOperators<ReverseLookupLogging>();
}
} // ns
} // ns

View File

@@ -85,6 +85,7 @@ namespace BlackMisc
{
qRegisterMetaType<BlackMisc::Simulation::CSimulatorInternals>();
qDBusRegisterMetaType<BlackMisc::Simulation::CSimulatorInternals>();
qRegisterMetaTypeStreamOperators<BlackMisc::Simulation::CSimulatorInternals>();
registerMetaValueType<BlackMisc::Simulation::CSimulatorInternals>();
}

View File

@@ -350,6 +350,7 @@ namespace BlackMisc
CValueObject<CStatusMessage>::registerMetadata();
qRegisterMetaType<CStatusMessage::StatusSeverity>();
qDBusRegisterMetaType<CStatusMessage::StatusSeverity>();
qRegisterMetaTypeStreamOperators<CStatusMessage::StatusSeverity>();
}
CStatusMessage::StatusSeverity CStatusMessage::stringToSeverity(const QString &severity)

View File

@@ -150,6 +150,7 @@ namespace BlackMisc
{
MetaType::registerMetadata();
qDBusRegisterMetaType<value_type>();
qRegisterMetaTypeStreamOperators<value_type>();
}
////////////////////////////////

View File

@@ -238,7 +238,7 @@ namespace BlackMisc
struct MetaTypeHelperImpl
{
static constexpr int maybeGetMetaTypeId() { return qMetaTypeId<T>(); }
static void maybeRegisterMetaType() { qRegisterMetaType<T>(); qDBusRegisterMetaType<T>(); registerMetaValueType<T>(); }
static void maybeRegisterMetaType() { qRegisterMetaType<T>(); qDBusRegisterMetaType<T>(); qRegisterMetaTypeStreamOperators<T>(); registerMetaValueType<T>(); }
};
template <typename T>