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

Add clang-tidy modernize-loop-convert check

Browse Source
This commit is contained in:
Chris Thrasher 2023-01-07 13:57:58 -07:00
parent 8dc28909d3
commit 8c3f07de80
4 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-tidy
View File

@ -2,6 +2,7 @@ Checks: >
-*, -*,
clang-analyzer-*, clang-analyzer-*,
modernize-concat-nested-namespaces, modernize-concat-nested-namespaces,
modernize-loop-convert,
modernize-use-equals-default, modernize-use-equals-default,
modernize-use-equals-delete, modernize-use-equals-delete,
modernize-use-nullptr, modernize-use-nullptr,

50
src/SFML/Window/DRM/InputImplUDev.cpp
View File

@ -87,8 +87,8 @@ bool systemDown()
void uninitFileDescriptors() void uninitFileDescriptors()
{ {
for (std::vector<int>::iterator itr = fileDescriptors.begin(); itr != fileDescriptors.end(); ++itr) for (const auto& fileDescriptor : fileDescriptors)
close(*itr); close(fileDescriptor);
} }
#define BITS_PER_LONG (sizeof(unsigned long) * 8) #define BITS_PER_LONG (sizeof(unsigned long) * 8)
@ -317,35 +317,35 @@ TouchSlot& atSlot(int idx)
void processSlots() void processSlots()
{ {
for (std::vector<TouchSlot>::iterator slot = touchSlots.begin(); slot != touchSlots.end(); ++slot) for (auto& slot : touchSlots)
{ {
sf::Event event; sf::Event event;
event.touch.x = slot->pos.x; event.touch.x = slot.pos.x;
event.touch.y = slot->pos.y; event.touch.y = slot.pos.y;
if (slot->oldId == slot->id) if (slot.oldId == slot.id)
{ {
event.type = sf::Event::TouchMoved; event.type = sf::Event::TouchMoved;
event.touch.finger = static_cast<unsigned int>(slot->id); event.touch.finger = static_cast<unsigned int>(slot.id);
pushEvent(event); pushEvent(event);
} }
else else
{ {
if (slot->oldId != -1) if (slot.oldId != -1)
{ {
event.type = sf::Event::TouchEnded; event.type = sf::Event::TouchEnded;
event.touch.finger = static_cast<unsigned int>(slot->oldId); event.touch.finger = static_cast<unsigned int>(slot.oldId);
pushEvent(event); pushEvent(event);
} }
if (slot->id != -1) if (slot.id != -1)
{ {
event.type = sf::Event::TouchBegan; event.type = sf::Event::TouchBegan;
event.touch.finger = static_cast<unsigned int>(slot->id); event.touch.finger = static_cast<unsigned int>(slot.id);
pushEvent(event); pushEvent(event);
} }
slot->oldId = slot->id; slot.oldId = slot.id;
} }
} }
} }
@ -371,10 +371,10 @@ bool eventProcess(sf::Event& event)
ssize_t bytesRead; ssize_t bytesRead;
// Check all the open file descriptors for the next event // Check all the open file descriptors for the next event
for (std::vector<int>::iterator itr = fileDescriptors.begin(); itr != fileDescriptors.end(); ++itr) for (auto& fileDescriptor : fileDescriptors)
{ {
input_event inputEvent; input_event inputEvent;
bytesRead = read(*itr, &inputEvent, sizeof(inputEvent)); bytesRead = read(fileDescriptor, &inputEvent, sizeof(inputEvent));
while (bytesRead > 0) while (bytesRead > 0)
{ {
@ -467,30 +467,30 @@ bool eventProcess(sf::Event& event)
{ {
case ABS_MT_SLOT: case ABS_MT_SLOT:
currentSlot = inputEvent.value; currentSlot = inputEvent.value;
touchFd = *itr; touchFd = fileDescriptor;
break; break;
case ABS_MT_TRACKING_ID: case ABS_MT_TRACKING_ID:
atSlot(currentSlot).id = inputEvent.value; atSlot(currentSlot).id = inputEvent.value;
touchFd = *itr; touchFd = fileDescriptor;
break; break;
case ABS_MT_POSITION_X: case ABS_MT_POSITION_X:
atSlot(currentSlot).pos.x = inputEvent.value; atSlot(currentSlot).pos.x = inputEvent.value;
touchFd = *itr; touchFd = fileDescriptor;
break; break;
case ABS_MT_POSITION_Y: case ABS_MT_POSITION_Y:
atSlot(currentSlot).pos.y = inputEvent.value; atSlot(currentSlot).pos.y = inputEvent.value;
touchFd = *itr; touchFd = fileDescriptor;
break; break;
} }
} }
else if (inputEvent.type == EV_SYN && inputEvent.code == SYN_REPORT && *itr == touchFd) else if (inputEvent.type == EV_SYN && inputEvent.code == SYN_REPORT && fileDescriptor == touchFd)
{ {
// This pushes events directly to the queue, because it // This pushes events directly to the queue, because it
// can generate more than one event. // can generate more than one event.
processSlots(); processSlots();
} }
bytesRead = read(*itr, &inputEvent, sizeof(inputEvent)); bytesRead = read(fileDescriptor, &inputEvent, sizeof(inputEvent));
} }
if ((bytesRead < 0) && (errno != EAGAIN)) if ((bytesRead < 0) && (errno != EAGAIN))
@ -628,9 +628,9 @@ void InputImpl::setMousePosition(const Vector2i& position, const WindowBase& /*r
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool InputImpl::isTouchDown(unsigned int finger) bool InputImpl::isTouchDown(unsigned int finger)
{ {
for (std::vector<TouchSlot>::iterator slot = touchSlots.begin(); slot != touchSlots.end(); ++slot) for (const auto& slot : touchSlots)
{ {
if (slot->id == static_cast<int>(finger)) if (slot.id == static_cast<int>(finger))
return true; return true;
} }
@ -641,10 +641,10 @@ bool InputImpl::isTouchDown(unsigned int finger)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Vector2i InputImpl::getTouchPosition(unsigned int finger) Vector2i InputImpl::getTouchPosition(unsigned int finger)
{ {
for (std::vector<TouchSlot>::iterator slot = touchSlots.begin(); slot != touchSlots.end(); ++slot) for (const auto& slot : touchSlots)
{ {
if (slot->id == static_cast<int>(finger)) if (slot.id == static_cast<int>(finger))
return slot->pos; return slot.pos;
} }
return Vector2i(); return Vector2i();

6
src/SFML/Window/OSX/HIDInputManager.mm
View File

@ -314,12 +314,12 @@ void HIDInputManager::freeUp()
m_manager = nil; m_manager = nil;
for (unsigned int i = 0; i < Keyboard::KeyCount; ++i) for (auto& key : m_keys)
{ {
for (IOHIDElementRef iohidElementRef : m_keys[i]) for (IOHIDElementRef iohidElementRef : key)
CFRelease(iohidElementRef); CFRelease(iohidElementRef);
m_keys[i].clear(); key.clear();
} }
} }

4
src/SFML/Window/OSX/JoystickImpl.cpp
View File

@ -126,9 +126,9 @@ bool JoystickImpl::isConnected(unsigned int index)
// opened joystick devices then we find the new one. // opened joystick devices then we find the new one.
unsigned int openedCount = 0; unsigned int openedCount = 0;
for (unsigned int i(0); i < sf::Joystick::Count; ++i) for (const auto& locationID : m_locationIDs)
{ {
if (m_locationIDs[i] != 0) if (locationID != 0)
++openedCount; ++openedCount;
} }