diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-03-03 21:21:55 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-03-03 21:21:55 +0000 |
| commit | 7c4b51c7574844efd991df787e9be4c96fb031b3 (patch) | |
| tree | 812bb7bf2313247b69ce49d6e701385f22e779f2 /src | |
| parent | - fix memleak (diff) | |
| download | inkscape-7c4b51c7574844efd991df787e9be4c96fb031b3.tar.gz inkscape-7c4b51c7574844efd991df787e9be4c96fb031b3.zip | |
change 0 to NULL for pointers
(bzr r13102)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-object.h | 8 | ||||
| -rw-r--r-- | src/uri-references.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/font-selector.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/sp-object.h b/src/sp-object.h index 3faadb404..cf18d4523 100644 --- a/src/sp-object.h +++ b/src/sp-object.h @@ -685,18 +685,18 @@ public: unsigned getPosition(); - gchar const * getAttribute(gchar const *name,SPException *ex=0) const; + gchar const * getAttribute(gchar const *name,SPException *ex=NULL) const; void appendChild(Inkscape::XML::Node *child); - void addChild(Inkscape::XML::Node *child,Inkscape::XML::Node *prev=0); + void addChild(Inkscape::XML::Node *child,Inkscape::XML::Node *prev=NULL); /** * Call virtual set() function of object. */ void setKeyValue(unsigned int key, gchar const *value); - void setAttribute(gchar const *key, gchar const *value, SPException *ex=0); + void setAttribute(gchar const *key, gchar const *value, SPException *ex=NULL); /** * Read value of key attribute from XML node into object. @@ -705,7 +705,7 @@ public: gchar const *getTagName(SPException *ex) const; - void removeAttribute(gchar const *key, SPException *ex=0); + void removeAttribute(gchar const *key, SPException *ex=NULL); /** * Returns an object style property. diff --git a/src/uri-references.cpp b/src/uri-references.cpp index 8edafb0b0..1da890c56 100644 --- a/src/uri-references.cpp +++ b/src/uri-references.cpp @@ -172,7 +172,7 @@ void URIReference::_release(SPObject *obj) SPObject* sp_css_uri_reference_resolve( SPDocument *document, const gchar *uri ) { - SPObject* ref = 0; + SPObject* ref = NULL; if ( document && uri && ( strncmp(uri, "url(", 4) == 0 ) ) { gchar *trimmed = extract_uri( uri ); @@ -188,7 +188,7 @@ SPObject* sp_css_uri_reference_resolve( SPDocument *document, const gchar *uri ) SPObject * sp_uri_reference_resolve (SPDocument *document, const gchar *uri) { - SPObject* ref = 0; + SPObject* ref = NULL; if ( uri && (*uri == '#') ) { ref = document->getObjectById( uri + 1 ); diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp index 5f9098d44..0e862638c 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -295,7 +295,7 @@ static void sp_font_selector_family_select_row(GtkTreeSelection *selection, // Next get family name with its style list gchar *family; - GList *list=0; + GList *list=NULL; gtk_tree_model_get (model, &iter, 0, &family, 1, &list, -1); // Find best style match for selected family with current style (e.g. of selected text). @@ -418,7 +418,7 @@ static void sp_font_selector_emit_set (SPFontSelector *fsel) GtkTreeModel *model_style; GtkTreeIter iter_family; GtkTreeIter iter_style; - char *family=0, *style=0; + char *family=NULL, *style=NULL; //We need to check this here since most GtkTreeModel operations are not atomic //See GtkListStore documenation, Chapter "Atomic Operations" --mderezynski |