Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Replace zeroes and nulls by nullptrs

Browse source
This commit is contained in:
Andrei Kortunov 2020-11-13 11:39:47 +04:00
parent 86fad60c7d
commit 8084a336b5
183 changed files with 483 additions and 483 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/sdlutil/sdlcursormanager.cpp
View file

@ -50,7 +50,7 @@ namespace CursorDecompression
traits->alpha = 8;
traits->windowDecoration = false;
traits->doubleBuffer = false;
traits->sharedContext = 0;
traits->sharedContext = nullptr;
traits->pbuffer = true;
osg::GraphicsContext::ScreenIdentifier si;
@ -267,7 +267,7 @@ namespace SDLUtil
if (mCursorMap.find(name) != mCursorMap.end())
return;
static bool forceSoftwareDecompression = (getenv("OPENMW_DECOMPRESS_TEXTURES") != 0);
static bool forceSoftwareDecompression = (getenv("OPENMW_DECOMPRESS_TEXTURES") != nullptr);
SurfaceUniquePtr (*decompressionFunction)(osg::ref_ptr<osg::Image>, float);
if (forceSoftwareDecompression || CursorDecompression::DXTCSupported) {

6
components/sdlutil/sdlgraphicswindow.cpp
View file

@ -11,8 +11,8 @@ GraphicsWindowSDL2::~GraphicsWindowSDL2()
}
GraphicsWindowSDL2::GraphicsWindowSDL2(osg::GraphicsContext::Traits *traits)
: mWindow(0)
, mContext(0)
: mWindow(nullptr)
, mContext(nullptr)
, mValid(false)
, mRealized(false)
, mOwnsWindow(false)
@ -79,7 +79,7 @@ void GraphicsWindowSDL2::init()
WindowData *inheritedWindowData = dynamic_cast<WindowData*>(_traits->inheritedWindowData.get());
mWindow = inheritedWindowData ? inheritedWindowData->mWindow : nullptr;
mOwnsWindow = (mWindow == 0);
mOwnsWindow = (mWindow == nullptr);
if(mOwnsWindow)
{
OSG_FATAL<<"Error: No SDL window provided."<<std::endl;

2
components/sdlutil/sdlgraphicswindow.hpp
View file

@ -24,7 +24,7 @@ class GraphicsWindowSDL2 : public osgViewer::GraphicsWindow
public:
GraphicsWindowSDL2(osg::GraphicsContext::Traits *traits);
bool isSameKindAs(const Object* object) const override { return dynamic_cast<const GraphicsWindowSDL2*>(object)!=0; }
bool isSameKindAs(const Object* object) const override { return dynamic_cast<const GraphicsWindowSDL2*>(object)!=nullptr; }
const char* libraryName() const override { return "osgViewer"; }
const char* className() const override { return "GraphicsWindowSDL2"; }