Skip to content

Commit

Permalink
Upgrade clang-tidy for Linux jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChrisThrasher
ChrisThrasher committed May 21, 2024
1 parent 7234fc1 commit 8046e32
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 57 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,12 @@ jobs:
matrix:
platform:
- { name: Windows, os: windows-2022, flags: -GNinja }
- { name: Linux, os: ubuntu-22.04 }
- { name: Linux DRM, os: ubuntu-22.04, flags: -DSFML_USE_DRM=TRUE }
- { name: Linux OpenGL ES, os: ubuntu-22.04, flags: -DSFML_OPENGL_ES=ON }
- { name: Linux, os: ubuntu-24.04 }
- { name: Linux DRM, os: ubuntu-24.04, flags: -DSFML_USE_DRM=TRUE }
- { name: Linux OpenGL ES, os: ubuntu-24.04, flags: -DSFML_OPENGL_ES=ON }
- { name: macOS, os: macos-12 }
- { name: iOS, os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 }
- { name: Android, os: ubuntu-22.04, flags: -DCMAKE_ANDROID_ARCH_ABI=x86_64 -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=21 -DCMAKE_ANDROID_NDK=$ANDROID_NDK -DCMAKE_ANDROID_STL_TYPE=c++_shared }
- { name: Android, os: ubuntu-24.04, flags: -DCMAKE_ANDROID_ARCH_ABI=x86_64 -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=21 -DCMAKE_ANDROID_NDK=$ANDROID_NDK -DCMAKE_ANDROID_STL_TYPE=c++_shared }

steps:
- name: Checkout Code
Expand All @@ -367,7 +367,7 @@ jobs:
- name: Install Linux Dependencies
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install libxrandr-dev libxcursor-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev
run: sudo apt-get update && sudo apt-get install libfreetype-dev libxrandr-dev libxcursor-dev libudev-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev

- name: Install macOS Dependencies
if: runner.os == 'macOS'
Expand Down
14 changes: 7 additions & 7 deletions src/SFML/Main/MainAndroid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void* main(ActivityStates* states)
void goToFullscreenMode(ANativeActivity* activity)
{
// Get the current Android API level.
int apiLevel = sf::priv::getAndroidApiLevel(activity);
const int apiLevel = sf::priv::getAndroidApiLevel(activity);

// Hide the status bar
ANativeActivity_setWindowFlags(activity, AWINDOW_FLAG_FULLSCREEN, AWINDOW_FLAG_FULLSCREEN);
Expand All @@ -179,28 +179,28 @@ void goToFullscreenMode(ANativeActivity* activity)
// API Level 14
if (apiLevel >= 14)
{
jfieldID fieldSystemUiFlagLowProfile = lJNIEnv->GetStaticFieldID(classView,
jfieldID fieldSystemUiFlagLowProfile = lJNIEnv->GetStaticFieldID(classView,
"SYSTEM_UI_FLAG_HIDE_NAVIGATION",
"I");
jint systemUiFlagLowProfile = lJNIEnv->GetStaticIntField(classView, fieldSystemUiFlagLowProfile);
const jint systemUiFlagLowProfile = lJNIEnv->GetStaticIntField(classView, fieldSystemUiFlagLowProfile);
flags |= systemUiFlagLowProfile;
}

// API Level 16
if (apiLevel >= 16)
{
jfieldID fieldSystemUiFlagFullscreen = lJNIEnv->GetStaticFieldID(classView, "SYSTEM_UI_FLAG_FULLSCREEN", "I");
jint systemUiFlagFullscreen = lJNIEnv->GetStaticIntField(classView, fieldSystemUiFlagFullscreen);
jfieldID fieldSystemUiFlagFullscreen = lJNIEnv->GetStaticFieldID(classView, "SYSTEM_UI_FLAG_FULLSCREEN", "I");
const jint systemUiFlagFullscreen = lJNIEnv->GetStaticIntField(classView, fieldSystemUiFlagFullscreen);
flags |= systemUiFlagFullscreen;
}

// API Level 19
if (apiLevel >= 19)
{
jfieldID fieldSystemUiFlagImmersiveSticky = lJNIEnv->GetStaticFieldID(classView,
jfieldID fieldSystemUiFlagImmersiveSticky = lJNIEnv->GetStaticFieldID(classView,
"SYSTEM_UI_FLAG_IMMERSIVE_STICKY",
"I");
jint systemUiFlagImmersiveSticky = lJNIEnv->GetStaticIntField(classView, fieldSystemUiFlagImmersiveSticky);
const jint systemUiFlagImmersiveSticky = lJNIEnv->GetStaticIntField(classView, fieldSystemUiFlagImmersiveSticky);
flags |= systemUiFlagImmersiveSticky;
}

Expand Down
4 changes: 2 additions & 2 deletions src/SFML/Window/Android/InputImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void setVirtualKeyboardVisible(bool visible)
const std::lock_guard lock(states.mutex);

// Initializes JNI
jint lFlags = 0;
const jint lFlags = 0;

JavaVM* lJavaVM = states.activity->vm;
JNIEnv* lJNIEnv = states.activity->env;
Expand All @@ -97,7 +97,7 @@ void setVirtualKeyboardVisible(bool visible)
lJavaVMAttachArgs.name = "NativeThread";
lJavaVMAttachArgs.group = nullptr;

jint lResult = lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs);
const jint lResult = lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs);

if (lResult == JNI_ERR)
err() << "Failed to initialize JNI, couldn't switch the keyboard visibility" << std::endl;
Expand Down
4 changes: 2 additions & 2 deletions src/SFML/Window/Android/SensorImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ bool SensorImpl::open(Sensor::Type sensor)
return false;

// Get the minimum delay allowed between events
Time minimumDelay = microseconds(ASensor_getMinDelay(m_sensor));
const Time minimumDelay = microseconds(ASensor_getMinDelay(m_sensor));

// Set the event rate (not to consume too much battery)
ASensorEventQueue_setEventRate(sensorEventQueue, m_sensor, static_cast<std::int32_t>(minimumDelay.asMicroseconds()));
Expand Down Expand Up @@ -151,7 +151,7 @@ const ASensor* SensorImpl::getDefaultSensor(Sensor::Type sensor)
ASENSOR_TYPE_LINEAR_ACCELERATION,
ASENSOR_TYPE_ORIENTATION};

int type = types[sensor];
const int type = types[sensor];

// Retrieve the default sensor matching this type
return ASensorManager_getDefaultSensor(sensorManager, type);
Expand Down
82 changes: 41 additions & 41 deletions src/SFML/Window/Android/WindowImplAndroid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ void WindowImplAndroid::forwardEvent(const Event& event)
{
if (WindowImplAndroid::singleInstance != nullptr)
{
ActivityStates& states = getActivity();
const ActivityStates& states = getActivity();

if (event.is<Event::FocusGained>())
{
Expand Down Expand Up @@ -267,12 +267,12 @@ int WindowImplAndroid::processEvent(int /* fd */, int /* events */, void* /* dat

int handled = 0;

std::int32_t type = AInputEvent_getType(inputEvent);
const std::int32_t type = AInputEvent_getType(inputEvent);

if (type == AINPUT_EVENT_TYPE_KEY)
{
std::int32_t action = AKeyEvent_getAction(inputEvent);
std::int32_t key = AKeyEvent_getKeyCode(inputEvent);
const std::int32_t action = AKeyEvent_getAction(inputEvent);
const std::int32_t key = AKeyEvent_getKeyCode(inputEvent);

if ((action == AKEY_EVENT_ACTION_DOWN || action == AKEY_EVENT_ACTION_UP || action == AKEY_EVENT_ACTION_MULTIPLE) &&
key != AKEYCODE_VOLUME_UP && key != AKEYCODE_VOLUME_DOWN)
Expand All @@ -282,7 +282,7 @@ int WindowImplAndroid::processEvent(int /* fd */, int /* events */, void* /* dat
}
else if (type == AINPUT_EVENT_TYPE_MOTION)
{
std::int32_t action = AMotionEvent_getAction(inputEvent);
const std::int32_t action = AMotionEvent_getAction(inputEvent);

switch (action & AMOTION_EVENT_ACTION_MASK)
{
Expand Down Expand Up @@ -348,18 +348,18 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* inputEvent, ActivityState
}

// Retrieve everything we need to create this MotionEvent in Java
std::int64_t downTime = AMotionEvent_getDownTime(inputEvent);
std::int64_t eventTime = AMotionEvent_getEventTime(inputEvent);
std::int32_t action = AMotionEvent_getAction(inputEvent);
float x = AMotionEvent_getX(inputEvent, 0);
float y = AMotionEvent_getY(inputEvent, 0);
float pressure = AMotionEvent_getPressure(inputEvent, 0);
float size = AMotionEvent_getSize(inputEvent, 0);
std::int32_t metaState = AMotionEvent_getMetaState(inputEvent);
float xPrecision = AMotionEvent_getXPrecision(inputEvent);
float yPrecision = AMotionEvent_getYPrecision(inputEvent);
std::int32_t deviceId = AInputEvent_getDeviceId(inputEvent);
std::int32_t edgeFlags = AMotionEvent_getEdgeFlags(inputEvent);
const std::int64_t downTime = AMotionEvent_getDownTime(inputEvent);
const std::int64_t eventTime = AMotionEvent_getEventTime(inputEvent);
const std::int32_t action = AMotionEvent_getAction(inputEvent);
const float x = AMotionEvent_getX(inputEvent, 0);
const float y = AMotionEvent_getY(inputEvent, 0);
const float pressure = AMotionEvent_getPressure(inputEvent, 0);
const float size = AMotionEvent_getSize(inputEvent, 0);
const std::int32_t metaState = AMotionEvent_getMetaState(inputEvent);
const float xPrecision = AMotionEvent_getXPrecision(inputEvent);
const float yPrecision = AMotionEvent_getYPrecision(inputEvent);
const std::int32_t deviceId = AInputEvent_getDeviceId(inputEvent);
const std::int32_t edgeFlags = AMotionEvent_getEdgeFlags(inputEvent);

// Create the MotionEvent object in Java through its static constructor obtain()
jclass classMotionEvent = lJNIEnv->FindClass("android/view/MotionEvent");
Expand All @@ -385,8 +385,8 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* inputEvent, ActivityState
edgeFlags);

// Call its getAxisValue() method to get the delta value of our wheel move event
jmethodID methodGetAxisValue = lJNIEnv->GetMethodID(classMotionEvent, "getAxisValue", "(I)F");
jfloat delta = lJNIEnv->CallFloatMethod(objectMotionEvent, methodGetAxisValue, 0x00000001);
jmethodID methodGetAxisValue = lJNIEnv->GetMethodID(classMotionEvent, "getAxisValue", "(I)F");
const jfloat delta = lJNIEnv->CallFloatMethod(objectMotionEvent, methodGetAxisValue, 0x00000001);

lJNIEnv->DeleteLocalRef(classMotionEvent);
lJNIEnv->DeleteLocalRef(objectMotionEvent);
Expand All @@ -408,10 +408,10 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* inputEvent, ActivityState
////////////////////////////////////////////////////////////
int WindowImplAndroid::processKeyEvent(AInputEvent* inputEvent, ActivityStates& /* states */)
{
std::int32_t action = AKeyEvent_getAction(inputEvent);
const std::int32_t action = AKeyEvent_getAction(inputEvent);

std::int32_t key = AKeyEvent_getKeyCode(inputEvent);
std::int32_t metakey = AKeyEvent_getMetaState(inputEvent);
const std::int32_t key = AKeyEvent_getKeyCode(inputEvent);
const std::int32_t metakey = AKeyEvent_getMetaState(inputEvent);

Event::KeyChanged keyChanged;
keyChanged.code = androidKeyToSF(key);
Expand Down Expand Up @@ -462,7 +462,7 @@ int WindowImplAndroid::processKeyEvent(AInputEvent* inputEvent, ActivityStates&
////////////////////////////////////////////////////////////
int WindowImplAndroid::processMotionEvent(AInputEvent* inputEvent, ActivityStates& states)
{
std::int32_t device = AInputEvent_getSource(inputEvent);
const std::int32_t device = AInputEvent_getSource(inputEvent);

Event event;

Expand All @@ -471,11 +471,11 @@ int WindowImplAndroid::processMotionEvent(AInputEvent* inputEvent, ActivityState
else if (static_cast<std::uint32_t>(device) & AINPUT_SOURCE_TOUCHSCREEN)
event = Event::TouchMoved{};

std::size_t pointerCount = AMotionEvent_getPointerCount(inputEvent);
const std::size_t pointerCount = AMotionEvent_getPointerCount(inputEvent);

for (std::size_t p = 0; p < pointerCount; ++p)
{
std::int32_t id = AMotionEvent_getPointerId(inputEvent, p);
const std::int32_t id = AMotionEvent_getPointerId(inputEvent, p);

int x = static_cast<int>(AMotionEvent_getX(inputEvent, p));
int y = static_cast<int>(AMotionEvent_getY(inputEvent, p));
Expand Down Expand Up @@ -507,12 +507,12 @@ int WindowImplAndroid::processMotionEvent(AInputEvent* inputEvent, ActivityState
////////////////////////////////////////////////////////////
int WindowImplAndroid::processPointerEvent(bool isDown, AInputEvent* inputEvent, ActivityStates& states)
{
std::int32_t device = AInputEvent_getSource(inputEvent);
std::int32_t action = AMotionEvent_getAction(inputEvent);
const std::int32_t device = AInputEvent_getSource(inputEvent);
const std::int32_t action = AMotionEvent_getAction(inputEvent);

std::size_t index = (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
std::int32_t id = AMotionEvent_getPointerId(inputEvent, index);
const auto button = static_cast<Mouse::Button>(id);
const std::size_t index = (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
const std::int32_t id = AMotionEvent_getPointerId(inputEvent, index);
const auto button = static_cast<Mouse::Button>(id);

int x = static_cast<int>(AMotionEvent_getX(inputEvent, index));
int y = static_cast<int>(AMotionEvent_getY(inputEvent, index));
Expand Down Expand Up @@ -708,16 +708,16 @@ int WindowImplAndroid::getUnicode(AInputEvent* event)
err() << "Failed to initialize JNI, couldn't get the Unicode value" << std::endl;

// Retrieve key data from the input event
jlong downTime = AKeyEvent_getDownTime(event);
jlong eventTime = AKeyEvent_getEventTime(event);
jint action = AKeyEvent_getAction(event);
jint code = AKeyEvent_getKeyCode(event);
jint repeat = AKeyEvent_getRepeatCount(event); // not sure!
jint metaState = AKeyEvent_getMetaState(event);
jint deviceId = AInputEvent_getDeviceId(event);
jint scancode = AKeyEvent_getScanCode(event);
jint flags = AKeyEvent_getFlags(event);
jint source = AInputEvent_getSource(event);
const jlong downTime = AKeyEvent_getDownTime(event);
const jlong eventTime = AKeyEvent_getEventTime(event);
const jint action = AKeyEvent_getAction(event);
const jint code = AKeyEvent_getKeyCode(event);
const jint repeat = AKeyEvent_getRepeatCount(event); // not sure!
const jint metaState = AKeyEvent_getMetaState(event);
const jint deviceId = AInputEvent_getDeviceId(event);
const jint scancode = AKeyEvent_getScanCode(event);
const jint flags = AKeyEvent_getFlags(event);
const jint source = AInputEvent_getSource(event);

// Construct a KeyEvent object from the event data
jclass classKeyEvent = lJNIEnv->FindClass("android/view/KeyEvent");
Expand All @@ -737,7 +737,7 @@ int WindowImplAndroid::getUnicode(AInputEvent* event)

// Call its getUnicodeChar() method to get the Unicode value
jmethodID methodGetUnicode = lJNIEnv->GetMethodID(classKeyEvent, "getUnicodeChar", "(I)I");
int unicode = lJNIEnv->CallIntMethod(objectKeyEvent, methodGetUnicode, metaState);
const int unicode = lJNIEnv->CallIntMethod(objectKeyEvent, methodGetUnicode, metaState);

lJNIEnv->DeleteLocalRef(classKeyEvent);
lJNIEnv->DeleteLocalRef(objectKeyEvent);
Expand Down

0 comments on commit 8046e32

Please sign in to comment.