mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 14:21:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added modernize-use-equals-default, modernize-use-equals-delete

Browse Source 
Fixed formatting issues per review


Implemented copy constructor since operator= is implemented


Reverted operator=, add NOLINT for copy constructor per review


Fixed clang-tidy escape in examples


Fixed OSX clang-tidy escapes
This commit is contained in:
Norm Evangelista 2023-01-11 23:27:56 -08:00 committed by Chris Thrasher
parent f0119145c2
commit a4bca20567
9 changed files with 67 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-tidy
View File

@ -2,6 +2,8 @@ Checks: >
-*,
clang-analyzer-*,
modernize-concat-nested-namespaces,
modernize-use-equals-default,
modernize-use-equals-delete,
modernize-use-nullptr,
readability-identifier-naming,
-clang-analyzer-core.NonNullParamChecker,

4
examples/shader/Effect.hpp
View File

@ -15,9 +15,7 @@
class Effect : public sf::Drawable
{
public:
~Effect() override
{
}
~Effect() override = default;
static void setFont(const sf::Font& font)
{

1
src/SFML/Graphics/Font.cpp
View File

@ -124,6 +124,7 @@ Font::Font() = default;
////////////////////////////////////////////////////////////
// NOLINTNEXTLINE(modernize-use-equals-default)
Font::Font(const Font& copy) :
m_fontHandles(copy.m_fontHandles),
m_isSmooth(copy.m_isSmooth),

24
src/SFML/Graphics/ImageLoader.hpp
View File

@ -49,6 +49,18 @@ namespace priv
class ImageLoader
{
public:
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
ImageLoader(const ImageLoader&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
ImageLoader& operator=(const ImageLoader&) = delete;
////////////////////////////////////////////////////////////
/// \brief Get the unique instance of the class
///
@ -128,18 +140,6 @@ private:
///
////////////////////////////////////////////////////////////
ImageLoader();
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
ImageLoader(const ImageLoader&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
ImageLoader& operator=(const ImageLoader&) = delete;
};
} // namespace priv

10
src/SFML/System/String.cpp
View File

@ -120,9 +120,7 @@ String::String(const std::basic_string<std::uint32_t>& utf32String) : m_string(u
////////////////////////////////////////////////////////////
String::String(const String& copy) : m_string(copy.m_string)
{
}
String::String(const String& copy) = default;
////////////////////////////////////////////////////////////
@ -211,11 +209,7 @@ std::basic_string<std::uint32_t> String::toUtf32() const
////////////////////////////////////////////////////////////
String& String::operator=(const String& right)
{
m_string = right.m_string;
return *this;
}
String& String::operator=(const String& right) = default;
////////////////////////////////////////////////////////////

24
src/SFML/Window/JoystickManager.hpp
View File

@ -40,6 +40,18 @@ namespace sf::priv
class JoystickManager
{
public:
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
JoystickManager(const JoystickManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
JoystickManager& operator=(const JoystickManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Get the global unique instance of the manager
///
@ -97,18 +109,6 @@ private:
////////////////////////////////////////////////////////////
~JoystickManager();
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
JoystickManager(const JoystickManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
JoystickManager& operator=(const JoystickManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Joystick information and state
///

24
src/SFML/Window/OSX/HIDInputManager.hpp
View File

@ -51,6 +51,18 @@ using IOHIDElements = std::vector<IOHIDElementRef>;
class HIDInputManager
{
public:
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
HIDInputManager(const HIDInputManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
HIDInputManager& operator=(const HIDInputManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Get the unique instance of the class
///
@ -127,18 +139,6 @@ private:
////////////////////////////////////////////////////////////
~HIDInputManager();
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
HIDInputManager(const HIDInputManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
HIDInputManager& operator=(const HIDInputManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Initialize the keyboard part of this class
///

25
src/SFML/Window/OSX/HIDJoystickManager.hpp
View File

@ -43,6 +43,19 @@ namespace sf::priv
class HIDJoystickManager
{
public:
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
HIDJoystickManager(const HIDJoystickManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
HIDJoystickManager& operator=(const HIDJoystickManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Get the unique instance of the class
///
@ -81,18 +94,6 @@ private:
////////////////////////////////////////////////////////////
~HIDJoystickManager();
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
HIDJoystickManager(const HIDJoystickManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
HIDJoystickManager& operator=(const HIDJoystickManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Make sure all event have been processed in the run loop
///

24
src/SFML/Window/SensorManager.hpp
View File

@ -40,6 +40,18 @@ namespace sf::priv
class SensorManager
{
public:
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
SensorManager(const SensorManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
SensorManager& operator=(const SensorManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Get the global unique instance of the manager
///
@ -106,18 +118,6 @@ private:
////////////////////////////////////////////////////////////
~SensorManager();
////////////////////////////////////////////////////////////
/// \brief Deleted copy constructor
///
////////////////////////////////////////////////////////////
SensorManager(const SensorManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Deleted copy assignment
///
////////////////////////////////////////////////////////////
SensorManager& operator=(const SensorManager&) = delete;
////////////////////////////////////////////////////////////
/// \brief Sensor information and state
///