mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace NULL with nullptr on files that don't include base/base.h

Browse Source
This commit is contained in:
David Capello 2016-03-03 19:20:57 -03:00
parent 9a7ffab5a0
commit 8c9d9eb84c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/connection.h
View File

@ -1,5 +1,5 @@
// Aseprite Base Library
// Copyright (c) 2001-2015 David Capello
// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@ -15,7 +15,7 @@ class Slot;
class Connection {
public:
Connection() : m_signal(NULL), m_slot(NULL) {
Connection() : m_signal(nullptr), m_slot(nullptr) {
}
Connection(Signal* signal, Slot* slot) :
@ -25,7 +25,7 @@ public:
void disconnect();
operator bool() {
return (m_slot != NULL);
return (m_slot != nullptr);
}
private:

10
src/doc/site.h
View File

@ -1,5 +1,5 @@
// Aseprite Document Library
// Copyright (c) 2001-2015 David Capello
// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@ -26,9 +26,9 @@ namespace doc {
class Site {
public:
Site()
: m_document(NULL)
, m_sprite(NULL)
, m_layer(NULL)
: m_document(nullptr)
, m_sprite(nullptr)
, m_layer(nullptr)
, m_frame(0) { }
const Document* document() const { return m_document; }
@ -50,7 +50,7 @@ namespace doc {
LayerIndex layerIndex() const;
void layerIndex(LayerIndex layerIndex);
Palette* palette();
Image* image(int* x = NULL, int* y = NULL, int* opacity = NULL) const;
Image* image(int* x = nullptr, int* y = nullptr, int* opacity = nullptr) const;
Palette* palette() const;
private:

2
src/ui/cursor.cpp
View File

@ -19,7 +19,7 @@ Cursor::Cursor(she::Surface* surface, const gfx::Point& focus)
: m_surface(surface)
, m_focus(focus)
{
ASSERT(m_surface != NULL);
ASSERT(m_surface != nullptr);
}
Cursor::~Cursor()