mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-31 04:25:35 +08:00
refs #247 All our value classes registered with our new custom metatype system.
This commit is contained in:
@@ -60,6 +60,7 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
qRegisterMetaType<CAudioDeviceList>();
|
qRegisterMetaType<CAudioDeviceList>();
|
||||||
qDBusRegisterMetaType<CAudioDeviceList>();
|
qDBusRegisterMetaType<CAudioDeviceList>();
|
||||||
|
registerMetaValueType<CAudioDeviceList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraft>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraft>>();
|
||||||
qRegisterMetaType<CAircraftList>();
|
qRegisterMetaType<CAircraftList>();
|
||||||
qDBusRegisterMetaType<CAircraftList>();
|
qDBusRegisterMetaType<CAircraftList>();
|
||||||
|
registerMetaValueType<CAircraftList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CAirport>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CAirport>>();
|
||||||
qRegisterMetaType<CAirportList>();
|
qRegisterMetaType<CAirportList>();
|
||||||
qDBusRegisterMetaType<CAirportList>();
|
qDBusRegisterMetaType<CAirportList>();
|
||||||
|
registerMetaValueType<CAirportList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CAtcStation>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CAtcStation>>();
|
||||||
qRegisterMetaType<CAtcStationList>();
|
qRegisterMetaType<CAtcStationList>();
|
||||||
qDBusRegisterMetaType<CAtcStationList>();
|
qDBusRegisterMetaType<CAtcStationList>();
|
||||||
|
registerMetaValueType<CAtcStationList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CCallsign>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CCallsign>>();
|
||||||
qRegisterMetaType<CCallsignList>();
|
qRegisterMetaType<CCallsignList>();
|
||||||
qDBusRegisterMetaType<CCallsignList>();
|
qDBusRegisterMetaType<CCallsignList>();
|
||||||
|
registerMetaValueType<CCallsignList>();
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CKeyboardKey>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CKeyboardKey>>();
|
||||||
qRegisterMetaType<CKeyboardKeyList>();
|
qRegisterMetaType<CKeyboardKeyList>();
|
||||||
qDBusRegisterMetaType<CKeyboardKeyList>();
|
qDBusRegisterMetaType<CKeyboardKeyList>();
|
||||||
|
registerMetaValueType<CKeyboardKeyList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CIcon>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CIcon>>();
|
||||||
qRegisterMetaType<CIconList>();
|
qRegisterMetaType<CIconList>();
|
||||||
qDBusRegisterMetaType<CIconList>();
|
qDBusRegisterMetaType<CIconList>();
|
||||||
|
registerMetaValueType<CIconList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
const CIconList &CIconList::allIcons()
|
const CIconList &CIconList::allIcons()
|
||||||
|
|||||||
@@ -54,5 +54,6 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
qRegisterMetaType<CLogCategoryList>();
|
qRegisterMetaType<CLogCategoryList>();
|
||||||
qDBusRegisterMetaType<CLogCategoryList>();
|
qDBusRegisterMetaType<CLogCategoryList>();
|
||||||
|
registerMetaValueType<CLogCategoryList>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,5 +58,6 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CNameVariantPair>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CNameVariantPair>>();
|
||||||
qRegisterMetaType<CNameVariantPairList>();
|
qRegisterMetaType<CNameVariantPairList>();
|
||||||
qDBusRegisterMetaType<CNameVariantPairList>();
|
qDBusRegisterMetaType<CNameVariantPairList>();
|
||||||
|
registerMetaValueType<CNameVariantPairList>();
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftMapping>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftMapping>>();
|
||||||
qRegisterMetaType<CAircraftMappingList>();
|
qRegisterMetaType<CAircraftMappingList>();
|
||||||
qDBusRegisterMetaType<CAircraftMappingList>();
|
qDBusRegisterMetaType<CAircraftMappingList>();
|
||||||
|
registerMetaValueType<CAircraftMappingList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftModel>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftModel>>();
|
||||||
qRegisterMetaType<CAircraftModelList>();
|
qRegisterMetaType<CAircraftModelList>();
|
||||||
qDBusRegisterMetaType<CAircraftModelList>();
|
qDBusRegisterMetaType<CAircraftModelList>();
|
||||||
|
registerMetaValueType<CAircraftModelList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CClient>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CClient>>();
|
||||||
qRegisterMetaType<CClientList>();
|
qRegisterMetaType<CClientList>();
|
||||||
qDBusRegisterMetaType<CClientList>();
|
qDBusRegisterMetaType<CClientList>();
|
||||||
|
registerMetaValueType<CClientList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CServer>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CServer>>();
|
||||||
qRegisterMetaType<CServerList>();
|
qRegisterMetaType<CServerList>();
|
||||||
qDBusRegisterMetaType<CServerList>();
|
qDBusRegisterMetaType<CServerList>();
|
||||||
|
registerMetaValueType<CServerList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -120,6 +120,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CTextMessage>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CTextMessage>>();
|
||||||
qRegisterMetaType<CTextMessageList>();
|
qRegisterMetaType<CTextMessageList>();
|
||||||
qDBusRegisterMetaType<CTextMessageList>();
|
qDBusRegisterMetaType<CTextMessageList>();
|
||||||
|
registerMetaValueType<CTextMessageList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
qRegisterMetaType<CUserList>();
|
qRegisterMetaType<CUserList>();
|
||||||
qDBusRegisterMetaType<CUserList>();
|
qDBusRegisterMetaType<CUserList>();
|
||||||
|
registerMetaValueType<CUserList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CPropertyIndex>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CPropertyIndex>>();
|
||||||
qRegisterMetaType<CPropertyIndexList>();
|
qRegisterMetaType<CPropertyIndexList>();
|
||||||
qDBusRegisterMetaType<CPropertyIndexList>();
|
qDBusRegisterMetaType<CPropertyIndexList>();
|
||||||
|
registerMetaValueType<CPropertyIndexList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CSettingKeyboardHotkey>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CSettingKeyboardHotkey>>();
|
||||||
qRegisterMetaType<CSettingKeyboardHotkeyList>();
|
qRegisterMetaType<CSettingKeyboardHotkeyList>();
|
||||||
qDBusRegisterMetaType<CSettingKeyboardHotkeyList>();
|
qDBusRegisterMetaType<CSettingKeyboardHotkeyList>();
|
||||||
|
registerMetaValueType<CSettingKeyboardHotkeyList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -46,5 +46,6 @@ namespace BlackMisc
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CStatusMessage>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CStatusMessage>>();
|
||||||
qRegisterMetaType<CStatusMessageList>();
|
qRegisterMetaType<CStatusMessageList>();
|
||||||
qDBusRegisterMetaType<CStatusMessageList>();
|
qDBusRegisterMetaType<CStatusMessageList>();
|
||||||
|
registerMetaValueType<CStatusMessageList>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,9 @@ namespace BlackMisc
|
|||||||
template <class>
|
template <class>
|
||||||
struct CValueObjectStdTuplePolicy;
|
struct CValueObjectStdTuplePolicy;
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
void registerMetaValueType();
|
||||||
|
|
||||||
namespace Policy
|
namespace Policy
|
||||||
{
|
{
|
||||||
namespace Private
|
namespace Private
|
||||||
@@ -40,7 +43,15 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
//! Register with QMetaType
|
//! Register with QMetaType
|
||||||
template <class T, class...>
|
template <class T, class...>
|
||||||
static void registerImpl() { qRegisterMetaType<T>(); qDBusRegisterMetaType<T>(); }
|
static void registerImpl() { qRegisterMetaType<T>(); qDBusRegisterMetaType<T>(); maybeRegisterMetaValueType<T>(); }
|
||||||
|
|
||||||
|
private:
|
||||||
|
template <class T>
|
||||||
|
static void maybeRegisterMetaValueType() { maybeRegisterMetaValueType<T>(std::is_base_of<CValueObject, T>()); }
|
||||||
|
template <class T>
|
||||||
|
static void maybeRegisterMetaValueType(std::true_type) { BlackMisc::registerMetaValueType<T>(); }
|
||||||
|
template <class T>
|
||||||
|
static void maybeRegisterMetaValueType(std::false_type) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
//! CValueObjectStdTuple registerMetadata policy which inherits the policy of the base class
|
//! CValueObjectStdTuple registerMetadata policy which inherits the policy of the base class
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
qRegisterMetaType<CVoiceRoomList>();
|
qRegisterMetaType<CVoiceRoomList>();
|
||||||
qDBusRegisterMetaType<CVoiceRoomList>();
|
qDBusRegisterMetaType<CVoiceRoomList>();
|
||||||
|
registerMetaValueType<CVoiceRoomList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -105,6 +105,7 @@ namespace BlackSim
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftCfgEntries>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftCfgEntries>>();
|
||||||
qRegisterMetaType<CAircraftCfgEntriesList>();
|
qRegisterMetaType<CAircraftCfgEntriesList>();
|
||||||
qDBusRegisterMetaType<CAircraftCfgEntriesList>();
|
qDBusRegisterMetaType<CAircraftCfgEntriesList>();
|
||||||
|
BlackMisc::registerMetaValueType<CAircraftCfgEntriesList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ namespace BlackSim
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftMapping>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftMapping>>();
|
||||||
qRegisterMetaType<CAircraftMappingList>();
|
qRegisterMetaType<CAircraftMappingList>();
|
||||||
qDBusRegisterMetaType<CAircraftMappingList>();
|
qDBusRegisterMetaType<CAircraftMappingList>();
|
||||||
|
BlackMisc::registerMetaValueType<CAircraftMappingList>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace BlackSim
|
|||||||
qDBusRegisterMetaType<BlackMisc::CCollection<CSimulatorInfo>>();
|
qDBusRegisterMetaType<BlackMisc::CCollection<CSimulatorInfo>>();
|
||||||
qRegisterMetaType<CSimulatorInfoList>();
|
qRegisterMetaType<CSimulatorInfoList>();
|
||||||
qDBusRegisterMetaType<CSimulatorInfoList>();
|
qDBusRegisterMetaType<CSimulatorInfoList>();
|
||||||
|
BlackMisc::registerMetaValueType<CSimulatorInfoList>();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace BlackSim
|
} // namespace BlackSim
|
||||||
|
|||||||
Reference in New Issue
Block a user