kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: Replace C macros with lambda expression

Browse Source
This commit is contained in:
wmayer
2025-04-27 19:45:50 +02:00
committed by Ladislav Michl
parent 93ee3a3475
commit 8062fadbd4
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/App/PreCompiled.h
View File

@@ -50,6 +50,7 @@
#include <sstream>
// STL
#include <array>
#include <bitset>
#include <chrono>
#if defined(FC_OS_WIN32)

45
src/App/Property.cpp
View File

@@ -23,6 +23,8 @@
***************************************************************************/
#include <cassert>
#include <array>
#include <tuple>
#include <atomic>
#include <Base/Tools.h>
@@ -114,36 +116,35 @@ std::string Property::getFileName(const char* postfix, const char* prefix) const
return ss.str();
}
// clang-format off
static constexpr auto mapProps = std::to_array<std::tuple<Property::Status, PropertyType>>({
{App::Property::PropReadOnly, Prop_ReadOnly},
{App::Property::PropHidden, Prop_Hidden},
{App::Property::PropOutput, Prop_Output},
{App::Property::PropTransient, Prop_Transient},
{App::Property::PropNoRecompute, Prop_NoRecompute},
{App::Property::PropNoPersist, Prop_NoPersist}
});
// clang-format on
short Property::getType() const
{
short type = 0;
#define GET_PTYPE(_name) \
do { \
if (testStatus(App::Property::Prop##_name)) \
type |= Prop_##_name; \
} while (0)
GET_PTYPE(ReadOnly);
GET_PTYPE(Hidden);
GET_PTYPE(Output);
GET_PTYPE(Transient);
GET_PTYPE(NoRecompute);
GET_PTYPE(NoPersist);
for (const auto& [propertyStatus, propertyType] : mapProps) {
if (testStatus(propertyStatus)) {
type |= propertyType;
}
}
return type;
}
void Property::syncType(unsigned type)
{
#define SYNC_PTYPE(_name) \
do { \
if (type & Prop_##_name) \
StatusBits.set((size_t)Prop##_name); \
} while (0)
SYNC_PTYPE(ReadOnly);
SYNC_PTYPE(Transient);
SYNC_PTYPE(Hidden);
SYNC_PTYPE(Output);
SYNC_PTYPE(NoRecompute);
SYNC_PTYPE(NoPersist);
for (const auto& [propertyStatus, propertyType] : mapProps) {
if (type & propertyType) {
StatusBits.set((size_t)propertyStatus);
}
}
}
const char* Property::getGroup() const