It works! Yay!

[scdataviz] / graph.h

diff --git a/graph.h b/graph.h
index e66e685..33112a5 100644 (file)
--- a/graph.h
+++ b/graph.h
@@ -5,41 +5,34 @@
 ** Login   <solarion@johnathan>
 ** 
 
-Copyright (C) 2008 Joseph Pingenot
+    Copyright (C) 2008 Joseph Pingenot
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ** Started on  Thu Jul 17 10:51:32 2008 Johnny Q. Hacker
 ** Last update Thu Jul 17 10:51:32 2008 Johnny Q. Hacker
 */
 
-#ifndef        GRAPH_H_
-# define       GRAPH_H_
+#ifndef        GRAPHCLASS_H_
+#define        GRAPHCLASS_H_
 
 #include <glib-2.0/glib-object.h>
 
-enum graph_symbol {
-     SQUARE,
-     CIRCLE,
-     STAR,
-     PLUS,
-     MINUX,
-     CROSS
-   };
+typedef enum {SQUARE, CIRCLE, STAR, PLUS, MINUS, CROSS} graph_symbol;
 
 typedef struct _Graph {
-  GObject parent;
+  GObject parent_instance;
   /*Array of n_points sets of x,y coords*/
   GPtrArray *points;
   double maxx;
@@ -50,7 +43,7 @@ typedef struct _Graph {
 } Graph;
 
 typedef struct _GraphClass {
-  GObject parent;
+  GObjectClass parent_class;
 } GraphClass;
 
 #define GRAPH_TYPE (graph_get_type())
@@ -63,4 +56,4 @@ typedef struct _GraphClass {
 Graph *graph_new(void);
 int graph_add_point(Graph* graph, double x, double y);
 
-#endif             /* !GRAPH_H_ */
+#endif             /* !GRAPHCLASS_H_ */