Use G_DECLARE_*_TYPE to simplify code and fix docs

[sojka/lightdm.git] / liblightdm-gobject / lightdm / layout.h

diff --git a/liblightdm-gobject/lightdm/layout.h b/liblightdm-gobject/lightdm/layout.h
index 0bc57578a480bbe3ae160452e6fa3155e87a67c5..f4369504fa87d221104c55965348771e522222d3 100644 (file)
--- a/liblightdm-gobject/lightdm/layout.h
+++ b/liblightdm-gobject/lightdm/layout.h
@@ -1,41 +1,35 @@
 /*
  * Copyright (C) 2010 Robert Ancell.
  * Author: Robert Ancell <robert.ancell@canonical.com>
- * 
+ *
  * This library 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. See http://www.gnu.org/copyleft/lgpl.html the full text of the
- * license.
+ * Software Foundation; either version 2 or version 3 of the License.
+ * See http://www.gnu.org/copyleft/lgpl.html the full text of the license.
  */
 
-#ifndef _LIGHTDM_LAYOUT_H_
-#define _LIGHTDM_LAYOUT_H_
+#ifndef LIGHTDM_LAYOUT_H_
+#define LIGHTDM_LAYOUT_H_
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define LIGHTDM_TYPE_LAYOUT            (lightdm_layout_get_type())
-#define LIGHTDM_LAYOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayout));
-#define LIGHTDM_LAYOUT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_LAYOUT, LightDMLayoutClass))
-#define LIGHTDM_IS_LAYOUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_LAYOUT))
-#define LIGHTDM_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LAYOUT))
-#define LIGHTDM_LAYOUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayoutClass))
+#define LIGHTDM_TYPE_LAYOUT (lightdm_layout_get_type())
 
-typedef struct
-{
-    GObject parent_instance;
-} LightDMLayout;
+G_DECLARE_FINAL_TYPE (LightDMLayout, lightdm_layout, LIGHTDM, LAYOUT, GObject)
 
-typedef struct
+struct _LightDMLayoutClass
 {
+    /*< private >*/
     GObjectClass parent_class;
-} LightDMLayoutClass;
+};
+
+GList *lightdm_get_layouts (void);
 
-GType lightdm_layout_get_type (void);
+void lightdm_set_layout (LightDMLayout *layout);
 
-LightDMLayout *lightdm_layout_new (const gchar *name, const gchar *short_description, const gchar *description);
+LightDMLayout *lightdm_get_layout (void);
 
 const gchar *lightdm_layout_get_name (LightDMLayout *layout);
 
@@ -45,4 +39,4 @@ const gchar *lightdm_layout_get_description (LightDMLayout *layout);
 
 G_END_DECLS
 
-#endif /* _LIGHTDM_LAYOUT_H_ */
+#endif /* LIGHTDM_LAYOUT_H_ */