mirror of https://github.com/stella-emu/stella.git
Fix minor warnings from clang-tidy.
This commit is contained in:
parent
69857756e3
commit
6a251308e8
|
@ -62,8 +62,8 @@ FBBackendSDL::~FBBackendSDL()
|
||||||
}
|
}
|
||||||
if(myWindow)
|
if(myWindow)
|
||||||
{
|
{
|
||||||
SDL_SetWindowFullscreen(myWindow, 0); // on some systems, a crash occurs
|
SDL_SetWindowFullscreen(myWindow, false); // on some systems, a crash occurs
|
||||||
// when destroying fullscreen window
|
// when destroying fullscreen window
|
||||||
SDL_DestroyWindow(myWindow);
|
SDL_DestroyWindow(myWindow);
|
||||||
myWindow = nullptr;
|
myWindow = nullptr;
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@ void FBBackendSDL::queryHardware(vector<Common::Size>& fullscreenRes,
|
||||||
if(SDL_GetDisplayUsableBounds(displays[i], &r))
|
if(SDL_GetDisplayUsableBounds(displays[i], &r))
|
||||||
windowedRes.emplace_back(r.w, r.h);
|
windowedRes.emplace_back(r.w, r.h);
|
||||||
|
|
||||||
int numModes;
|
int numModes = 0;
|
||||||
ostringstream s;
|
ostringstream s;
|
||||||
string lastRes;
|
string lastRes;
|
||||||
SDL_DisplayMode** modes = SDL_GetFullscreenDisplayModes(displays[i], &numModes);
|
SDL_DisplayMode** modes = SDL_GetFullscreenDisplayModes(displays[i], &numModes);
|
||||||
|
@ -380,7 +380,7 @@ bool FBBackendSDL::adaptRefreshRate(Int32 displayIndex,
|
||||||
for(int m = 1; m <= 2; ++m)
|
for(int m = 1; m <= 2; ++m)
|
||||||
{
|
{
|
||||||
SDL_DisplayMode closestSdlMode{};
|
SDL_DisplayMode closestSdlMode{};
|
||||||
float refresh_rate = wantedRefreshRate * m;
|
const float refresh_rate = wantedRefreshRate * m;
|
||||||
|
|
||||||
if(!SDL_GetClosestFullscreenDisplayMode(displayIndex, sdlMode->w, sdlMode->h, refresh_rate, true, &closestSdlMode))
|
if(!SDL_GetClosestFullscreenDisplayMode(displayIndex, sdlMode->w, sdlMode->h, refresh_rate, true, &closestSdlMode))
|
||||||
{
|
{
|
||||||
|
@ -428,7 +428,7 @@ bool FBBackendSDL::createRenderer()
|
||||||
{
|
{
|
||||||
recreate = recreate || video != SDL_GetRendererName(myRenderer);
|
recreate = recreate || video != SDL_GetRendererName(myRenderer);
|
||||||
|
|
||||||
SDL_PropertiesID props = SDL_GetRendererProperties(myRenderer);
|
const SDL_PropertiesID props = SDL_GetRendererProperties(myRenderer);
|
||||||
const bool currentVSync = SDL_GetNumberProperty(props,
|
const bool currentVSync = SDL_GetNumberProperty(props,
|
||||||
SDL_PROP_RENDERER_VSYNC_NUMBER, 0) != 0;
|
SDL_PROP_RENDERER_VSYNC_NUMBER, 0) != 0;
|
||||||
recreate = recreate || currentVSync != enableVSync;
|
recreate = recreate || currentVSync != enableVSync;
|
||||||
|
@ -440,7 +440,7 @@ bool FBBackendSDL::createRenderer()
|
||||||
SDL_DestroyRenderer(myRenderer);
|
SDL_DestroyRenderer(myRenderer);
|
||||||
|
|
||||||
// Re-create with new properties
|
// Re-create with new properties
|
||||||
SDL_PropertiesID props = SDL_CreateProperties();
|
const SDL_PropertiesID props = SDL_CreateProperties();
|
||||||
if(!video.empty())
|
if(!video.empty())
|
||||||
SDL_SetStringProperty(props, SDL_PROP_RENDERER_CREATE_NAME_STRING,
|
SDL_SetStringProperty(props, SDL_PROP_RENDERER_CREATE_NAME_STRING,
|
||||||
video.c_str());
|
video.c_str());
|
||||||
|
@ -490,7 +490,7 @@ string FBBackendSDL::about() const
|
||||||
ostringstream out;
|
ostringstream out;
|
||||||
out << "Video system: " << SDL_GetCurrentVideoDriver() << '\n';
|
out << "Video system: " << SDL_GetCurrentVideoDriver() << '\n';
|
||||||
|
|
||||||
SDL_PropertiesID props = SDL_GetRendererProperties(myRenderer);
|
const SDL_PropertiesID props = SDL_GetRendererProperties(myRenderer);
|
||||||
if(props != 0)
|
if(props != 0)
|
||||||
{
|
{
|
||||||
out << " Renderer: "
|
out << " Renderer: "
|
||||||
|
|
|
@ -356,7 +356,7 @@ void SoundSDL::audioCallback(void* object, SDL_AudioStream* stream,
|
||||||
std::vector<uInt8>& buf = self->myBuffer;
|
std::vector<uInt8>& buf = self->myBuffer;
|
||||||
|
|
||||||
// Make sure we always have enough room in the buffer
|
// Make sure we always have enough room in the buffer
|
||||||
if(additional_amt >= static_cast<int>(buf.capacity()))
|
if(std::cmp_greater_equal(additional_amt, buf.capacity()))
|
||||||
buf.resize(additional_amt);
|
buf.resize(additional_amt);
|
||||||
|
|
||||||
// The stream is 32-bit float (even though this callback is 8-bits), since
|
// The stream is 32-bit float (even though this callback is 8-bits), since
|
||||||
|
@ -465,8 +465,8 @@ void SoundSDL::WavHandler::wavCallback(void* object, SDL_AudioStream* stream,
|
||||||
int additional_amt, int)
|
int additional_amt, int)
|
||||||
{
|
{
|
||||||
auto* self = static_cast<WavHandler*>(object);
|
auto* self = static_cast<WavHandler*>(object);
|
||||||
uInt32 len = static_cast<uInt32>(additional_amt);
|
auto len = static_cast<uInt32>(additional_amt);
|
||||||
uInt32& remaining = self->myRemaining;
|
auto& remaining = self->myRemaining;
|
||||||
|
|
||||||
if(remaining)
|
if(remaining)
|
||||||
{
|
{
|
||||||
|
|
|
@ -109,13 +109,13 @@ VideoModeHandler::Mode::Mode(uInt32 iw, uInt32 ih, Stretch smode,
|
||||||
|
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
VideoModeHandler::Mode::Mode(uInt32 iw, uInt32 ih, uInt32 sw, uInt32 sh,
|
VideoModeHandler::Mode::Mode(uInt32 iw, uInt32 ih, uInt32 sw, uInt32 sh,
|
||||||
Stretch smode, bool fs, string_view desc,
|
Stretch smode, bool fullscreen, string_view desc,
|
||||||
double zoomLevel, double overscan, Bezel::Info bezelInfo)
|
double zoomLevel, double overscan, Bezel::Info bezelInfo)
|
||||||
: screenS{sw, sh},
|
: screenS{sw, sh},
|
||||||
stretch{smode},
|
stretch{smode},
|
||||||
description{desc},
|
description{desc},
|
||||||
zoom{zoomLevel}, //hZoom{zoomLevel}, vZoom{zoomLevel},
|
zoom{zoomLevel}, //hZoom{zoomLevel}, vZoom{zoomLevel},
|
||||||
fullscreen{fs}
|
fullscreen{fullscreen}
|
||||||
{
|
{
|
||||||
// Now resize based on windowed/fullscreen mode and stretch factor
|
// Now resize based on windowed/fullscreen mode and stretch factor
|
||||||
if(fullscreen)
|
if(fullscreen)
|
||||||
|
|
|
@ -634,7 +634,7 @@ string CartDebug::uniqueLabel(const string& label)
|
||||||
string uniqueLabel = label;
|
string uniqueLabel = label;
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
// TODO: does find return multiple items??
|
// FIXME: does find return multiple items??
|
||||||
while(myUserAddresses.find(uniqueLabel) != myUserAddresses.end())
|
while(myUserAddresses.find(uniqueLabel) != myUserAddresses.end())
|
||||||
uniqueLabel = label + "." + std::to_string(++count);
|
uniqueLabel = label + "." + std::to_string(++count);
|
||||||
|
|
||||||
|
|
|
@ -331,14 +331,13 @@ void EventHandler::handleMouseMotionEvent(int x, int y, int xrel, int yrel)
|
||||||
{
|
{
|
||||||
myEvent.set(Event::MouseAxisXValue, x); // required for Lightgun controller
|
myEvent.set(Event::MouseAxisXValue, x); // required for Lightgun controller
|
||||||
myEvent.set(Event::MouseAxisYValue, y); // required for Lightgun controller
|
myEvent.set(Event::MouseAxisYValue, y); // required for Lightgun controller
|
||||||
|
#if 0 // FIXME: remove debug code
|
||||||
cerr << "dx " << (x - lastX - xrel) << ": " << x << ", " << xrel <<
|
cerr << "dx " << (x - lastX - xrel) << ": " << x << ", " << xrel <<
|
||||||
" y:" << y << ", " << yrel << "\n";
|
" y:" << y << ", " << yrel << "\n";
|
||||||
if(x - lastX - xrel != 0)
|
if(x - lastX - xrel != 0)
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
lastX = x;
|
lastX = x;
|
||||||
|
#endif
|
||||||
myEvent.set(Event::MouseAxisXMove, xrel);
|
myEvent.set(Event::MouseAxisXMove, xrel);
|
||||||
myEvent.set(Event::MouseAxisYMove, yrel);
|
myEvent.set(Event::MouseAxisYMove, yrel);
|
||||||
}
|
}
|
||||||
|
|
|
@ -497,8 +497,6 @@ class EventHandler
|
||||||
// Global Event object
|
// Global Event object
|
||||||
Event myEvent;
|
Event myEvent;
|
||||||
|
|
||||||
int lastX;
|
|
||||||
|
|
||||||
// Indicates current overlay object
|
// Indicates current overlay object
|
||||||
DialogContainer* myOverlay{nullptr};
|
DialogContainer* myOverlay{nullptr};
|
||||||
|
|
||||||
|
|
|
@ -1505,7 +1505,7 @@ bool FrameBuffer::updateTheme()
|
||||||
{
|
{
|
||||||
if(myOSystem.settings().getBool("autouipalette"))
|
if(myOSystem.settings().getBool("autouipalette"))
|
||||||
{
|
{
|
||||||
bool darkTheme = myOSystem.settings().getBool("altuipalette");
|
const bool darkTheme = myOSystem.settings().getBool("altuipalette");
|
||||||
|
|
||||||
if((myBackend->isLightTheme() && darkTheme) ||
|
if((myBackend->isLightTheme() && darkTheme) ||
|
||||||
(myBackend->isDarkTheme() && !darkTheme))
|
(myBackend->isDarkTheme() && !darkTheme))
|
||||||
|
|
|
@ -112,7 +112,7 @@ class Thumbulator
|
||||||
double cycleFactor() const { return _armCyclesFactor; }
|
double cycleFactor() const { return _armCyclesFactor; }
|
||||||
#else
|
#else
|
||||||
void cycleFactor(double) { }
|
void cycleFactor(double) { }
|
||||||
double cycleFactor() const { return 1.0; }
|
double cycleFactor() const { return 1.0; } // NOLINT: we don't want static
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -330,9 +330,8 @@ void Dialog::render()
|
||||||
//cerr << " render " << typeid(*this).name() << '\n';
|
//cerr << " render " << typeid(*this).name() << '\n';
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(_surface == NULL) {
|
if(_surface == nullptr)
|
||||||
return; // fixes #1078
|
return; // fixes #1078
|
||||||
}
|
|
||||||
|
|
||||||
// Update dialog surface; also render any extra surfaces
|
// Update dialog surface; also render any extra surfaces
|
||||||
// Extra surfaces must be rendered afterwards, so they are drawn on top
|
// Extra surfaces must be rendered afterwards, so they are drawn on top
|
||||||
|
|
Loading…
Reference in New Issue