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

@@ -139,7 +139,7 @@ namespace swift::misc
* When a derived class and a base class both inherit from mixin::DataStreamByMetaClass,
* the derived class uses this macro to disambiguate the inherited members.
*/
#define SWIFT_MISC_DECLARE_USING_MIXIN_DATASTREAM(DERIVED) \
#define SWIFT_MISC_DECLARE_USING_MIXIN_DATASTREAM(DERIVED) \
using ::swift::misc::mixin::DataStreamByMetaClass<DERIVED>::marshalToDataStream; \
using ::swift::misc::mixin::DataStreamByMetaClass<DERIVED>::unmarshalFromDataStream;
}

View File

@@ -173,9 +173,9 @@ namespace swift::misc
* When a derived class and a base class both inherit from mixin::DBusByTuple,
* the derived class uses this macro to disambiguate the inherited members.
*/
#define SWIFT_MISC_DECLARE_USING_MIXIN_DBUS(DERIVED, ...) \
using ::swift::misc::mixin::DBusByMetaClass<DERIVED BLACK_TRAILING_VA_ARGS(__VA_ARGS__)>::marshallToDbus; \
using ::swift::misc::mixin::DBusByMetaClass<DERIVED BLACK_TRAILING_VA_ARGS(__VA_ARGS__)>::unmarshallFromDbus;
#define SWIFT_MISC_DECLARE_USING_MIXIN_DBUS(DERIVED, ...) \
using ::swift::misc::mixin::DBusByMetaClass<DERIVED SWIFT_TRAILING_VA_ARGS(__VA_ARGS__)>::marshallToDbus; \
using ::swift::misc::mixin::DBusByMetaClass<DERIVED SWIFT_TRAILING_VA_ARGS(__VA_ARGS__)>::unmarshallFromDbus;
// *INDENT-ON*
} // Mixin

View File

@@ -39,7 +39,7 @@ namespace swift::misc
/*!
* CRTP class template from which a derived class can inherit common methods dealing with hashing instances by metaclass.
*
* \tparam Derived Must be registered with BLACK_DECLARE_TUPLE_CONVERSION.
* \tparam Derived Must be registered with SWIFT_DECLARE_TUPLE_CONVERSION.
*/
template <class Derived>
class HashByMetaClass

View File

@@ -145,7 +145,7 @@ namespace swift::misc
* the derived class uses this macro to disambiguate the inherited members.
*/
// *INDENT-OFF*
#define SWIFT_MISC_DECLARE_USING_MIXIN_INDEX(DERIVED) \
#define SWIFT_MISC_DECLARE_USING_MIXIN_INDEX(DERIVED) \
using ::swift::misc::mixin::Index<DERIVED>::apply; \
using ::swift::misc::mixin::Index<DERIVED>::setPropertyByIndex; \
using ::swift::misc::mixin::Index<DERIVED>::propertyByIndex; \

View File

@@ -267,7 +267,7 @@ namespace swift::misc
* When a derived class and a base class both inherit from mixin::JsonByTuple,
* the derived class uses this macro to disambiguate the inherited members.
*/
#define SWIFT_MISC_DECLARE_USING_MIXIN_JSON(DERIVED) \
#define SWIFT_MISC_DECLARE_USING_MIXIN_JSON(DERIVED) \
using ::swift::misc::mixin::JsonByMetaClass<DERIVED>::toJson; \
using ::swift::misc::mixin::JsonByMetaClass<DERIVED>::convertFromJson;
} // Mixin ns

View File

@@ -104,7 +104,7 @@ namespace swift::misc
* When a derived class and a base class both inherit from mixin::MetaType,
* the derived class uses this macro to disambiguate the inherited members.
*/
#define SWIFT_MISC_DECLARE_USING_MIXIN_METATYPE(DERIVED) \
#define SWIFT_MISC_DECLARE_USING_MIXIN_METATYPE(DERIVED) \
using ::swift::misc::mixin::MetaType<DERIVED>::registerMetadata; \
using ::swift::misc::mixin::MetaType<DERIVED>::getMetaTypeId; \
using ::swift::misc::mixin::MetaType<DERIVED>::getClassName; \

View File

@@ -106,7 +106,7 @@ namespace swift::misc::mixin
* When a derived class and a base class both inherit from mixin::String,
* the derived class uses this macro to disambiguate the inherited members.
*/
#define SWIFT_MISC_DECLARE_USING_MIXIN_STRING(DERIVED) \
#define SWIFT_MISC_DECLARE_USING_MIXIN_STRING(DERIVED) \
using ::swift::misc::mixin::String<DERIVED>::toQString; \
using ::swift::misc::mixin::String<DERIVED>::toStdString; \
using ::swift::misc::mixin::String<DERIVED>::stringForStreaming;