Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / filters / mergenode.cpp

diff --git a/src/filters/mergenode.cpp b/src/filters/mergenode.cpp
index c135c06fb5e06c3fa5c021c2ac30bc62181789eb..b7b06a94a4dd2bb82b68a575b950e1667945ff40 100644 (file)
--- a/src/filters/mergenode.cpp
+++ b/src/filters/mergenode.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEMERGENODE_CPP__
-
 /** \file
  * feMergeNode implementation. A feMergeNode contains the name of one
  * input image for feMerge.
@@ -8,6 +6,7 @@
  * Authors:
  *   Kees Cook <kees@outflux.net>
  *   Niko Kiirala <niko@kiirala.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2004,2007 authors
  *
@@ -84,7 +83,7 @@ sp_feMergeNode_init(SPFeMergeNode *feMergeNode)
 static void
 sp_feMergeNode_build(SPObject *object, SPDocument */*document*/, Inkscape::XML::Node */*repr*/)
 {
-    object->readAttr( "in");
+    object->readAttr( "in" );
 }
 
 /**
@@ -174,4 +173,4 @@ sp_feMergeNode_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::X
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :