Split CalendarViewFactory into separate classes by view type.

I suspect this will enable us to ditch GalViewFactory entirely once I
rework a few more things.  We'll see though; one step at a time here.

1 files changed, 30 insertions, 34 deletions

diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h
index 833c4bd281..ff4f8ee1c4 100644
--- a/calendar/gui/calendar-view-factory.h
+++ b/calendar/gui/calendar-view-factory.h
@@ -1,6 +1,5 @@
 /*
- *
- * Evolution calendar - Generic view factory for calendar views
+ * calendar-view-factory.h
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,50 +14,47 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
- *
- * Authors:
- *		Federico Mena-Quintero <federico@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
  */
 
 #ifndef CALENDAR_VIEW_FACTORY_H
 #define CALENDAR_VIEW_FACTORY_H
 
-#include "gnome-cal.h"
+#include <e-util/e-util.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define GAL_TYPE_VIEW_FACTORY_CALENDAR_DAY \
+	(gal_view_factory_calendar_day_get_type ())
+#define GAL_TYPE_VIEW_FACTORY_CALENDAR_WORK_WEEK \
+	(gal_view_factory_calendar_work_week_get_type ())
+#define GAL_TYPE_VIEW_FACTORY_CALENDAR_WEEK \
+	(gal_view_factory_calendar_week_get_type ())
+#define GAL_TYPE_VIEW_FACTORY_CALENDAR_MONTH \
+	(gal_view_factory_calendar_month_get_type ())
 
-#define TYPE_CALENDAR_VIEW_FACTORY            (calendar_view_factory_get_type ())
-#define CALENDAR_VIEW_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW_FACTORY,  \
-					       CalendarViewFactory))
-#define CALENDAR_VIEW_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),			   \
-					       TYPE_CALENDAR_VIEW_FACTORY, CalendarViewClass))
-#define IS_CALENDAR_VIEW_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CALENDAR_VIEW_FACTORY))
-#define IS_CALENDAR_VIEW_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),			   \
-					       TYPE_CALENDAR_VIEW_FACTORY))
-
-typedef struct _CalendarViewFactoryPrivate CalendarViewFactoryPrivate;
-
-typedef struct {
-	GalViewFactory factory;
+G_BEGIN_DECLS
 
-	/* Private data */
-	CalendarViewFactoryPrivate *priv;
-} CalendarViewFactory;
+typedef struct _GalViewFactory GalViewFactoryCalendarDay;
+typedef struct _GalViewFactoryClass GalViewFactoryCalendarDayClass;
 
-typedef struct {
-	GalViewFactoryClass parent_class;
-} CalendarViewFactoryClass;
+typedef struct _GalViewFactory GalViewFactoryCalendarWorkWeek;
+typedef struct _GalViewFactoryClass GalViewFactoryCalendarWorkWeekClass;
 
-GType calendar_view_factory_get_type (void);
+typedef struct _GalViewFactory GalViewFactoryCalendarWeek;
+typedef struct _GalViewFactoryClass GalViewFactoryCalendarWeekClass;
 
-GalViewFactory *calendar_view_factory_construct (CalendarViewFactory *cal_view_factory,
-						      GnomeCalendarViewType view_type);
+typedef struct _GalViewFactory GalViewFactoryCalendarMonth;
+typedef struct _GalViewFactoryClass GalViewFactoryCalendarMonthClass;
 
-GalViewFactory *calendar_view_factory_new (GnomeCalendarViewType view_type);
+GType		gal_view_factory_calendar_day_get_type
+						(void) G_GNUC_CONST;
+GType		gal_view_factory_calendar_work_week_get_type
+						(void) G_GNUC_CONST;
+GType		gal_view_factory_calendar_week_get_type
+						(void) G_GNUC_CONST;
+GType		gal_view_factory_calendar_month_get_type
+						(void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif
+#endif /* CALENDAR_VIEW_FACTORY_H */
+