flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix clang-tidy errors (#4730)

Browse Source
This commit is contained in:
peterbell10 2020-05-09 02:38:17 +01:00 committed by GitHub
parent a5be5310af
commit bd54cb71e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/BlockTypeRegistry.cpp
View File

@ -15,11 +15,11 @@ BlockInfo::BlockInfo(
const std::map<AString, AString> & aHints,
const std::map<AString, BlockInfo::HintCallback> & aHintCallbacks
):
mPluginName(aPluginName),
mBlockTypeName(aBlockTypeName),
mHandler(aHandler),
mHints(aHints),
mHintCallbacks(aHintCallbacks)
m_PluginName(aPluginName),
m_BlockTypeName(aBlockTypeName),
m_Handler(aHandler),
m_Hints(aHints),
m_HintCallbacks(aHintCallbacks)
{
}
@ -33,16 +33,16 @@ AString BlockInfo::hintValue(
)
{
// Search the hint callbacks first:
auto itrC = mHintCallbacks.find(aHintName);
if (itrC != mHintCallbacks.end())
auto itrC = m_HintCallbacks.find(aHintName);
if (itrC != m_HintCallbacks.end())
{
// Hint callback found, use it:
return itrC->second(mBlockTypeName, aBlockState);
return itrC->second(m_BlockTypeName, aBlockState);
}
// Search the static hints:
auto itr = mHints.find(aHintName);
if (itr != mHints.end())
auto itr = m_Hints.find(aHintName);
if (itr != m_Hints.end())
{
// Hint found, use it:
return itr->second;
@ -58,14 +58,14 @@ AString BlockInfo::hintValue(
void BlockInfo::setHint(const AString & aHintKey, const AString & aHintValue)
{
mHints[aHintKey] = aHintValue;
m_Hints[aHintKey] = aHintValue;
// Warn if the hint is already provided by a callback (aHintValue will be ignored when evaluating the hint):
auto itrC = mHintCallbacks.find(aHintKey);
if (itrC != mHintCallbacks.end())
auto itrC = m_HintCallbacks.find(aHintKey);
if (itrC != m_HintCallbacks.end())
{
LOGINFO("Setting a static hint %s for block type %s, but there's already a callback for that hint. The static hint will be ignored.",
aHintKey.c_str(), mBlockTypeName.c_str()
aHintKey.c_str(), m_BlockTypeName.c_str()
);
}
}
@ -76,7 +76,7 @@ void BlockInfo::setHint(const AString & aHintKey, const AString & aHintValue)
void BlockInfo::removeHint(const AString & aHintKey)
{
mHints.erase(aHintKey);
m_Hints.erase(aHintKey);
}
@ -97,9 +97,9 @@ void BlockTypeRegistry::registerBlockType(
auto blockInfo = std::make_shared<BlockInfo>(aPluginName, aBlockTypeName, aHandler, aHints, aHintCallbacks);
// Check previous registrations:
cCSLock lock(mCSRegistry);
auto itr = mRegistry.find(aBlockTypeName);
if (itr != mRegistry.end())
cCSLock lock(m_CSRegistry);
auto itr = m_Registry.find(aBlockTypeName);
if (itr != m_Registry.end())
{
if (itr->second->pluginName() != aPluginName)
{
@ -108,7 +108,7 @@ void BlockTypeRegistry::registerBlockType(
}
// Store the registration:
mRegistry[aBlockTypeName] = blockInfo;
m_Registry[aBlockTypeName] = blockInfo;
}
@ -117,9 +117,9 @@ void BlockTypeRegistry::registerBlockType(
std::shared_ptr<BlockInfo> BlockTypeRegistry::blockInfo(const AString & aBlockTypeName)
{
cCSLock lock(mCSRegistry);
auto itr = mRegistry.find(aBlockTypeName);
if (itr == mRegistry.end())
cCSLock lock(m_CSRegistry);
auto itr = m_Registry.find(aBlockTypeName);
if (itr == m_Registry.end())
{
return nullptr;
}
@ -132,12 +132,12 @@ std::shared_ptr<BlockInfo> BlockTypeRegistry::blockInfo(const AString & aBlockTy
void BlockTypeRegistry::removeAllByPlugin(const AString & aPluginName)
{
cCSLock lock(mCSRegistry);
for (auto itr = mRegistry.begin(); itr != mRegistry.end();)
cCSLock lock(m_CSRegistry);
for (auto itr = m_Registry.begin(); itr != m_Registry.end();)
{
if (itr->second->pluginName() == aPluginName)
{
itr = mRegistry.erase(itr);
itr = m_Registry.erase(itr);
}
else
{
@ -156,9 +156,9 @@ void BlockTypeRegistry::setBlockTypeHint(
const AString & aHintValue
)
{
cCSLock lock(mCSRegistry);
auto blockInfo = mRegistry.find(aBlockTypeName);
if (blockInfo == mRegistry.end())
cCSLock lock(m_CSRegistry);
auto blockInfo = m_Registry.find(aBlockTypeName);
if (blockInfo == m_Registry.end())
{
throw NotRegisteredException(aBlockTypeName, aHintKey, aHintValue);
}
@ -174,9 +174,9 @@ void BlockTypeRegistry::removeBlockTypeHint(
const AString & aHintKey
)
{
cCSLock lock(mCSRegistry);
auto blockInfo = mRegistry.find(aBlockTypeName);
if (blockInfo == mRegistry.end())
cCSLock lock(m_CSRegistry);
auto blockInfo = m_Registry.find(aBlockTypeName);
if (blockInfo == m_Registry.end())
{
return;
}
@ -195,8 +195,8 @@ BlockTypeRegistry::AlreadyRegisteredException::AlreadyRegisteredException(
std::shared_ptr<BlockInfo> aNewRegistration
) :
Super(message(aPreviousRegistration, aNewRegistration)),
mPreviousRegistration(aPreviousRegistration),
mNewRegistration(aNewRegistration)
m_PreviousRegistration(aPreviousRegistration),
m_NewRegistration(aNewRegistration)
{
}

38
src/BlockTypeRegistry.h
View File

@ -50,9 +50,9 @@ public:
);
// Simple getters:
const AString & pluginName() const { return mPluginName; }
const AString & blockTypeName() const { return mBlockTypeName; }
std::shared_ptr<cBlockHandler> handler() const { return mHandler; }
const AString & pluginName() const { return m_PluginName; }
const AString & blockTypeName() const { return m_BlockTypeName; }
std::shared_ptr<cBlockHandler> handler() const { return m_Handler; }
/** Sets (creates or updates) a static hint.
Hints provided by callbacks are unaffected by this - callbacks are "higher priority", they overwrite anything set here.
@ -67,21 +67,21 @@ public:
private:
/** The name of the plugin that registered the block. */
AString mPluginName;
AString m_PluginName;
/** The name of the block type, such as "minecraft:redstone_lamp" */
AString mBlockTypeName;
AString m_BlockTypeName;
/** The callbacks to call for various interaction. */
std::shared_ptr<cBlockHandler> mHandler;
std::shared_ptr<cBlockHandler> m_Handler;
/** Optional static hints for any subsystem to use, such as "IsSnowable" -> "1".
Hint callbacks are of higher priority than mHints - if a hint is provided by a mHintCallback, its value in mHints is ignored. */
std::map<AString, AString> mHints;
Hint callbacks are of higher priority than m_Hints - if a hint is provided by a m_HintCallback, its value in m_Hints is ignored. */
std::map<AString, AString> m_Hints;
/** The callbacks for dynamic evaluation of hints, such as "LightValue" -> function(BlockTypeName, BlockState).
Hint callbacks are of higher priority than mHints - if a hint is provided by a mHintCallback, its value in mHints is ignored. */
std::map<AString, HintCallback> mHintCallbacks;
Hint callbacks are of higher priority than m_Hints - if a hint is provided by a m_HintCallback, its value in m_Hints is ignored. */
std::map<AString, HintCallback> m_HintCallbacks;
};
@ -144,10 +144,10 @@ private:
/** The actual block type registry.
Maps the BlockTypeName to the BlockInfo instance. */
std::map<AString, std::shared_ptr<BlockInfo>> mRegistry;
std::map<AString, std::shared_ptr<BlockInfo>> m_Registry;
/** The CS that protects mRegistry against multithreaded access. */
cCriticalSection mCSRegistry;
/** The CS that protects m_Registry against multithreaded access. */
cCriticalSection m_CSRegistry;
};
@ -169,14 +169,14 @@ public:
);
// Simple getters:
std::shared_ptr<BlockInfo> previousRegistration() const { return mPreviousRegistration; }
std::shared_ptr<BlockInfo> newRegistration() const { return mNewRegistration; }
std::shared_ptr<BlockInfo> previousRegistration() const { return m_PreviousRegistration; }
std::shared_ptr<BlockInfo> newRegistration() const { return m_NewRegistration; }
private:
std::shared_ptr<BlockInfo> mPreviousRegistration;
std::shared_ptr<BlockInfo> mNewRegistration;
std::shared_ptr<BlockInfo> m_PreviousRegistration;
std::shared_ptr<BlockInfo> m_NewRegistration;
/** Returns the general exception message formatted by the two registrations.
@ -207,10 +207,10 @@ public:
);
// Simple getters:
const AString & blockTypeName() const { return mBlockTypeName; }
const AString & blockTypeName() const { return m_BlockTypeName; }
private:
const AString mBlockTypeName;
const AString m_BlockTypeName;
};