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

[inkscape.git] / src / sp-line.h

diff --git a/src/sp-line.h b/src/sp-line.h
index 114b0ea7c32dc9d82ee874824cd595fc385752c2..8bcb8164552fbf8f4673a4016989923cc4daf14d 100644 (file)
--- a/src/sp-line.h
+++ b/src/sp-line.h
@@ -1,11 +1,13 @@
-#ifndef __SP_LINE_H__
-#define __SP_LINE_H__
+#ifndef SEEN_SP_LINE_H
+#define SEEN_SP_LINE_H
 
 /*
  * SVG <line> implementation
  *
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Abhishek Sharma
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 1999-2002 Lauris Kaplinski
  *
@@ -17,53 +19,60 @@
 
 
 
-#define SP_TYPE_LINE            (SPLine::sp_line_get_type ())
-#define SP_LINE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_LINE, SPLine))
-#define SP_LINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_LINE, SPLineClass))
-#define SP_IS_LINE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_LINE))
-#define SP_IS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_LINE))
+#define SP_TYPE_LINE            (SPLine::sp_line_get_type())
+#define SP_LINE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_LINE, SPLine))
+#define SP_LINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SP_TYPE_LINE, SPLineClass))
+#define SP_IS_LINE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_LINE))
+#define SP_IS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_LINE))
 
 class SPLine;
 class SPLineClass;
 
-//static void sp_line_class_init (SPLineClass *klass);
-
 class SPLine : public SPShape {
-       public:
-               SVGLength x1;
-               SVGLength y1;
-               SVGLength x2;
-               SVGLength y2;
-               static GType sp_line_get_type (void);
-       private:
-               static void sp_line_init (SPLine *line);
-
-               static void sp_line_build (SPObject * object, SPDocument * document, Inkscape::XML::Node * repr);
-               static void sp_line_set (SPObject *object, unsigned int key, const gchar *value);
-               static Inkscape::XML::Node *sp_line_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
-
-               static gchar *sp_line_description (SPItem * item);
-               static Geom::Matrix sp_line_set_transform(SPItem *item, Geom::Matrix const &xform);
-
-               static void sp_line_update (SPObject *object, SPCtx *ctx, guint flags);
-               static void sp_line_set_shape (SPShape *shape);
-               static void sp_line_convert_to_guides(SPItem *item);
-
-               friend class SPLineClass;
+public:
+    SVGLength x1;
+    SVGLength y1;
+    SVGLength x2;
+    SVGLength y2;
+    static GType sp_line_get_type(void);
+
+private:
+    static void init(SPLine *line);
+
+    static void build(SPObject * object, SPDocument * document, Inkscape::XML::Node * repr);
+    static void set(SPObject *object, unsigned int key, const gchar *value);
+    static Inkscape::XML::Node *write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
+
+    static gchar *getDescription(SPItem * item);
+    static Geom::Matrix setTransform(SPItem *item, Geom::Matrix const &xform);
+
+    static void update(SPObject *object, SPCtx *ctx, guint flags);
+    static void setShape(SPShape *shape);
+    static void convertToGuides(SPItem *item);
+
+    friend class SPLineClass;
 };
 
 class SPLineClass {
-       public:
-               SPShapeClass parent_class;
-       private:
-               static SPShapeClass *static_parent_class;
-               static void sp_line_class_init (SPLineClass *klass);
+public:
+    SPShapeClass parent_class;
+
+private:
+    static SPShapeClass *static_parent_class;
+    static void sp_line_class_init(SPLineClass *klass);
        
-       friend class SPLine;
+    friend class SPLine;
 };
 
-//GType sp_line_get_type (void);
-
 
-
-#endif
+#endif // SEEN_SP_LINE_H
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :