neocturne/neofx-zoomedit
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zoomedit:

Browse source 
* Use 0 instead of NULL consistantly
This commit is contained in:
neoraider 2008-04-14 09:19:00 +00:00
parent 55af49b483
commit 9c24bd0bb2
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Data/Level.cpp
View file

@ -69,7 +69,7 @@ Room* Level::getRoom(const Glib::ustring &id) const {
return *room; return *room;
} }
return NULL; return 0;
} }
Room* Level::addRoom(const Glib::ustring &id) { Room* Level::addRoom(const Glib::ustring &id) {
@ -95,7 +95,7 @@ Gate* Level::getGate(const Glib::ustring &id) const {
return *gate; return *gate;
} }
return NULL; return 0;
} }
Gate* Level::addGate(const Glib::ustring &id) { Gate* Level::addGate(const Glib::ustring &id) {
@ -123,7 +123,7 @@ Texture* Level::getTexture(const Glib::ustring &id) const {
return *tex; return *tex;
} }
return NULL; return 0;
} }
Texture* Level::addTexture(const Glib::ustring &id) { Texture* Level::addTexture(const Glib::ustring &id) {

4
src/Data/Triangle.cpp
View file

@ -101,8 +101,8 @@ Triangle::Triangle(xmlpp::Element *node) : triangleNode(node) {
vertexNodes[++i] = e; vertexNodes[++i] = e;
vertices[i] = loadVertex(e); vertices[i] = loadVertex(e);
normalNodes[i] = NULL; normalNodes[i] = 0;
texCoordsNodes[i] = NULL; texCoordsNodes[i] = 0;
} }
} }

4
src/Gui/RenderArea.cpp
View file

@ -28,7 +28,7 @@
namespace ZoomEdit { namespace ZoomEdit {
namespace Gui { namespace Gui {
GdkGLConfig *RenderArea::glconfig = NULL; GdkGLConfig *RenderArea::glconfig = 0;
RenderArea::RenderArea(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade::Xml> &xml) RenderArea::RenderArea(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade::Xml> &xml)
: Gtk::DrawingArea(cobject), xCenter(0), yCenter(0), zoomLevel(0), scale(100) { : Gtk::DrawingArea(cobject), xCenter(0), yCenter(0), zoomLevel(0), scale(100) {
@ -63,7 +63,7 @@ RenderArea::RenderArea(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade:
if(vScrollbar) if(vScrollbar)
vScrollbar->signal_value_changed().connect(sigc::mem_fun(this, &RenderArea::updateScrolling)); vScrollbar->signal_value_changed().connect(sigc::mem_fun(this, &RenderArea::updateScrolling));
gtk_widget_set_gl_capability(GTK_WIDGET(cobject), glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE); gtk_widget_set_gl_capability(GTK_WIDGET(cobject), glconfig, 0, TRUE, GDK_GL_RGBA_TYPE);
} }
void RenderArea::onRealize() { void RenderArea::onRealize() {

6
src/Instance.cpp
View file

@ -28,7 +28,7 @@ namespace ZoomEdit {
guint Instance::instances = 0; guint Instance::instances = 0;
Instance::Instance(const Glib::ustring &file) : window(NULL), levelXml(NULL), level(NULL) { Instance::Instance(const Glib::ustring &file) : window(0), levelXml(0), level(0) {
instances++; instances++;
#ifdef GLIBMM_EXCEPTIONS_ENABLED #ifdef GLIBMM_EXCEPTIONS_ENABLED
@ -114,7 +114,7 @@ void Instance::createLevel() {
bool Instance::loadLevel(const Glib::ustring &file) { bool Instance::loadLevel(const Glib::ustring &file) {
if(level) { if(level) {
delete level; delete level;
level = NULL; level = 0;
} }
if(levelXml) if(levelXml)
@ -131,7 +131,7 @@ bool Instance::loadLevel(const Glib::ustring &file) {
level = new Data::Level(doc->get_root_node()); level = new Data::Level(doc->get_root_node());
return (level != NULL); return (level != 0);
} }
bool Instance::saveLevel(const Glib::ustring &file) { bool Instance::saveLevel(const Glib::ustring &file) {

8
src/Util/Xml.cpp
View file

@ -25,15 +25,15 @@ namespace Util {
xmlpp::Element* Xml::addSibling(xmlpp::Node *previous, const Glib::ustring &name) { xmlpp::Element* Xml::addSibling(xmlpp::Node *previous, const Glib::ustring &name) {
if(!previous) if(!previous)
return NULL; return 0;
xmlNodePtr child = xmlNewNode(NULL, (const xmlChar*)name.c_str()); xmlNodePtr child = xmlNewNode(0, (const xmlChar*)name.c_str());
if(!child) if(!child)
return NULL; return 0;
xmlNodePtr node = xmlAddNextSibling(previous->cobj(), child); xmlNodePtr node = xmlAddNextSibling(previous->cobj(), child);
if(!node) if(!node)
return NULL; return 0;
return static_cast<xmlpp::Element*>(node->_private); return static_cast<xmlpp::Element*>(node->_private);
} }