Commit f4420f2e authored by Jiří Techet's avatar Jiří Techet

Rename tidy to champlain and move to the champlain directory

Now as we have only three classes from tidy, it reduces quite some makefile
and boilerplate code when we move them directly to the champlain directory.
parent 8b948baf
SUBDIRS = build tidy champlain
SUBDIRS = build champlain
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
......
......@@ -42,6 +42,9 @@ libchamplain_headers_public = \
$(srcdir)/champlain-file-tile-source.h \
$(srcdir)/champlain-null-tile-source.h \
$(srcdir)/champlain-network-bbox-tile-source.h \
$(srcdir)/champlain-adjustment.h \
$(srcdir)/champlain-finger-scroll.h \
$(srcdir)/champlain-viewport.h \
$(srcdir)/champlain-bounding-box.h
libchamplain_headers_private = \
......@@ -87,6 +90,9 @@ libchamplain_sources = \
$(srcdir)/champlain-null-tile-source.c \
$(srcdir)/champlain-network-bbox-tile-source.c \
$(srcdir)/champlain-group.c \
$(srcdir)/champlain-adjustment.c \
$(srcdir)/champlain-finger-scroll.c \
$(srcdir)/champlain-viewport.c \
$(srcdir)/champlain-bounding-box.c
champlain-features.h: $(top_builddir)/config.status
......@@ -125,7 +131,7 @@ nodist_libchamplain_@CHAMPLAIN_API_VERSION@_la_SOURCES = \
$(libchamplain_headers_built) \
$(libchamplain_sources_built)
libchamplain_@CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) $(MEMPHIS_LIBS) $(top_builddir)/tidy/libtidy-1.0.la
libchamplain_@CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) $(MEMPHIS_LIBS)
libchamplain_@CHAMPLAIN_API_VERSION@_la_LDFLAGS = \
-version-info $(LIBRARY_VERSION)\
......@@ -137,7 +143,6 @@ AM_CPPFLAGS = \
$(SOUP_CFLAGS) \
$(MEMPHIS_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-I$(top_srcdir)/tidy \
-I$(top_srcdir) \
-DCHAMPLAIN_COMPILATION \
$(WARN_CFLAGS)
......@@ -174,7 +179,7 @@ Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources)
Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0 $(memphis_gir_include)
Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(MEMPHIS_CFLAGS) \
-I$(top_srcdir)/tidy -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir) -I$(top_builddir) \
-DCHAMPLAIN_COMPILATION
INTROSPECTION_GIRS += Champlain-@CHAMPLAIN_API_VERSION@.gir
......
/* tidy-adjustment.h: Adjustment object
/* champlain-adjustment.h: Adjustment object
*
* Copyright (C) 2008 OpenedHand
*
......@@ -20,74 +20,74 @@
* Written by: Chris Lord <chris@openedhand.com>, inspired by GtkAdjustment
*/
#ifndef __TIDY_ADJUSTMENT_H__
#define __TIDY_ADJUSTMENT_H__
#ifndef __CHAMPLAIN_ADJUSTMENT_H__
#define __CHAMPLAIN_ADJUSTMENT_H__
#include <glib-object.h>
#include <clutter/clutter.h>
G_BEGIN_DECLS
#define TIDY_TYPE_ADJUSTMENT (tidy_adjustment_get_type())
#define TIDY_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TIDY_TYPE_ADJUSTMENT, TidyAdjustment))
#define TIDY_IS_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TIDY_TYPE_ADJUSTMENT))
#define TIDY_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TIDY_TYPE_ADJUSTMENT, TidyAdjustmentClass))
#define TIDY_IS_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TIDY_TYPE_ADJUSTMENT))
#define TIDY_ADJUSTMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TIDY_TYPE_ADJUSTMENT, TidyAdjustmentClass))
#define CHAMPLAIN_TYPE_ADJUSTMENT (champlain_adjustment_get_type())
#define CHAMPLAIN_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_ADJUSTMENT, ChamplainAdjustment))
#define CHAMPLAIN_IS_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_ADJUSTMENT))
#define CHAMPLAIN_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_ADJUSTMENT, ChamplainAdjustmentClass))
#define CHAMPLAIN_IS_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_ADJUSTMENT))
#define CHAMPLAIN_ADJUSTMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_ADJUSTMENT, ChamplainAdjustmentClass))
typedef struct _TidyAdjustment TidyAdjustment;
typedef struct _TidyAdjustmentPrivate TidyAdjustmentPrivate;
typedef struct _TidyAdjustmentClass TidyAdjustmentClass;
typedef struct _ChamplainAdjustment ChamplainAdjustment;
typedef struct _ChamplainAdjustmentPrivate ChamplainAdjustmentPrivate;
typedef struct _ChamplainAdjustmentClass ChamplainAdjustmentClass;
/**
* TidyAdjustment:
* ChamplainAdjustment:
*
* Class for handling an interval between to values. The contents of
* the #TidyAdjustment are private and should be accessed using the
* the #ChamplainAdjustment are private and should be accessed using the
* public API.
*/
struct _TidyAdjustment
struct _ChamplainAdjustment
{
/*< private >*/
GObject parent_instance;
TidyAdjustmentPrivate *priv;
ChamplainAdjustmentPrivate *priv;
};
/**
* TidyAdjustmentClass
* ChamplainAdjustmentClass
* @changed: Class handler for the ::changed signal.
*
* Base class for #TidyAdjustment.
* Base class for #ChamplainAdjustment.
*/
struct _TidyAdjustmentClass
struct _ChamplainAdjustmentClass
{
/*< private >*/
GObjectClass parent_class;
/*< public >*/
void (* changed) (TidyAdjustment *adjustment);
void (* changed) (ChamplainAdjustment *adjustment);
};
GType tidy_adjustment_get_type (void) G_GNUC_CONST;
GType champlain_adjustment_get_type (void) G_GNUC_CONST;
TidyAdjustment *tidy_adjustment_new (gdouble value,
ChamplainAdjustment *champlain_adjustment_new (gdouble value,
gdouble lower,
gdouble upper,
gdouble step_increment,
gdouble page_increment,
gdouble page_size);
gdouble tidy_adjustment_get_value (TidyAdjustment *adjustment);
void tidy_adjustment_set_value (TidyAdjustment *adjustment,
gdouble champlain_adjustment_get_value (ChamplainAdjustment *adjustment);
void champlain_adjustment_set_value (ChamplainAdjustment *adjustment,
gdouble value);
void tidy_adjustment_set_values (TidyAdjustment *adjustment,
void champlain_adjustment_set_values (ChamplainAdjustment *adjustment,
gdouble value,
gdouble lower,
gdouble upper,
gdouble step_increment,
gdouble page_increment,
gdouble page_size);
void tidy_adjustment_get_values (TidyAdjustment *adjustment,
void champlain_adjustment_get_values (ChamplainAdjustment *adjustment,
gdouble *value,
gdouble *lower,
gdouble *upper,
......@@ -95,22 +95,22 @@ void tidy_adjustment_get_values (TidyAdjustment *adjustment,
gdouble *page_increment,
gdouble *page_size);
void tidy_adjustment_interpolate (TidyAdjustment *adjustment,
void champlain_adjustment_interpolate (ChamplainAdjustment *adjustment,
gdouble value,
guint n_frames,
guint fps);
gboolean tidy_adjustment_get_elastic (TidyAdjustment *adjustment);
void tidy_adjustment_set_elastic (TidyAdjustment *adjustment,
gboolean champlain_adjustment_get_elastic (ChamplainAdjustment *adjustment);
void champlain_adjustment_set_elastic (ChamplainAdjustment *adjustment,
gboolean elastic);
gboolean tidy_adjustment_clamp (TidyAdjustment *adjustment,
gboolean champlain_adjustment_clamp (ChamplainAdjustment *adjustment,
gboolean interpolate,
guint n_frames,
guint fps);
void tidy_adjustment_interpolate_stop (TidyAdjustment *adjustment);
void champlain_adjustment_interpolate_stop (ChamplainAdjustment *adjustment);
G_END_DECLS
#endif /* __TIDY_ADJUSTMENT_H__ */
#endif /* __CHAMPLAIN_ADJUSTMENT_H__ */
/* tidy-finger-scroll.h: Finger scrolling container actor
/* champlain-finger-scroll.h: Finger scrolling container actor
*
* Copyright (C) 2008 OpenedHand
*
......@@ -20,45 +20,45 @@
* Written by: Chris Lord <chris@openedhand.com>
*/
#ifndef __TIDY_FINGER_SCROLL_H__
#define __TIDY_FINGER_SCROLL_H__
#ifndef __CHAMPLAIN_FINGER_SCROLL_H__
#define __CHAMPLAIN_FINGER_SCROLL_H__
#include <glib-object.h>
#include <clutter/clutter.h>
G_BEGIN_DECLS
#define TIDY_TYPE_FINGER_SCROLL (tidy_finger_scroll_get_type())
#define TIDY_FINGER_SCROLL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TIDY_TYPE_FINGER_SCROLL, TidyFingerScroll))
#define TIDY_IS_FINGER_SCROLL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TIDY_TYPE_FINGER_SCROLL))
#define TIDY_FINGER_SCROLL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TIDY_TYPE_FINGER_SCROLL, TidyFingerScrollClass))
#define TIDY_IS_FINGER_SCROLL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TIDY_TYPE_FINGER_SCROLL))
#define TIDY_FINGER_SCROLL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TIDY_TYPE_FINGER_SCROLL, TidyFingerScrollClass))
#define CHAMPLAIN_TYPE_FINGER_SCROLL (champlain_finger_scroll_get_type())
#define CHAMPLAIN_FINGER_SCROLL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_FINGER_SCROLL, ChamplainFingerScroll))
#define CHAMPLAIN_IS_FINGER_SCROLL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_FINGER_SCROLL))
#define CHAMPLAIN_FINGER_SCROLL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_FINGER_SCROLL, ChamplainFingerScrollClass))
#define CHAMPLAIN_IS_FINGER_SCROLL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_FINGER_SCROLL))
#define CHAMPLAIN_FINGER_SCROLL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_FINGER_SCROLL, ChamplainFingerScrollClass))
typedef struct _TidyFingerScroll TidyFingerScroll;
typedef struct _TidyFingerScrollPrivate TidyFingerScrollPrivate;
typedef struct _TidyFingerScrollClass TidyFingerScrollClass;
typedef struct _ChamplainFingerScroll ChamplainFingerScroll;
typedef struct _ChamplainFingerScrollPrivate ChamplainFingerScrollPrivate;
typedef struct _ChamplainFingerScrollClass ChamplainFingerScrollClass;
struct _TidyFingerScroll
struct _ChamplainFingerScroll
{
/*< private >*/
ClutterActor parent_instance;
TidyFingerScrollPrivate *priv;
ChamplainFingerScrollPrivate *priv;
};
struct _TidyFingerScrollClass
struct _ChamplainFingerScrollClass
{
ClutterActorClass parent_class;
};
GType tidy_finger_scroll_get_type (void) G_GNUC_CONST;
GType champlain_finger_scroll_get_type (void) G_GNUC_CONST;
ClutterActor *tidy_finger_scroll_new (gboolean kinetic);
ClutterActor *champlain_finger_scroll_new (gboolean kinetic);
void tidy_finger_scroll_stop (TidyFingerScroll *scroll);
void champlain_finger_scroll_stop (ChamplainFingerScroll *scroll);
G_END_DECLS
#endif /* __TIDY_FINGER_SCROLL_H__ */
#endif /* __CHAMPLAIN_FINGER_SCROLL_H__ */
VOID:DOUBLE,DOUBLE,BOXED
VOID:POINTER,UINT,BOOLEAN
VOID:UINT,UINT
VOID:OBJECT,OBJECT
......@@ -67,9 +67,9 @@
#include <glib.h>
#include <glib-object.h>
#include <math.h>
#include <tidy-finger-scroll.h>
#include <tidy-viewport.h>
#include <tidy-adjustment.h>
#include <champlain-finger-scroll.h>
#include <champlain-viewport.h>
#include <champlain-adjustment.h>
//#define VIEW_LOG
#ifdef VIEW_LOG
......@@ -264,7 +264,7 @@ update_viewport (ChamplainView *view,
if (relocate || force_relocate)
{
g_signal_handlers_block_by_func (priv->viewport, G_CALLBACK (viewport_pos_changed_cb), view);
tidy_viewport_set_origin (TIDY_VIEWPORT (priv->viewport),
champlain_viewport_set_origin (CHAMPLAIN_VIEWPORT (priv->viewport),
priv->viewport_x,
priv->viewport_y);
g_signal_handlers_unblock_by_func (priv->viewport, G_CALLBACK (viewport_pos_changed_cb), view);
......@@ -283,7 +283,7 @@ update_viewport (ChamplainView *view,
static void
panning_completed (G_GNUC_UNUSED TidyFingerScroll *scroll,
panning_completed (G_GNUC_UNUSED ChamplainFingerScroll *scroll,
ChamplainView *view)
{
DEBUG_LOG ()
......@@ -292,7 +292,7 @@ panning_completed (G_GNUC_UNUSED TidyFingerScroll *scroll,
gfloat absolute_x, absolute_y;
gfloat x, y;
tidy_viewport_get_origin (TIDY_VIEWPORT (priv->viewport), &x, &y);
champlain_viewport_get_origin (CHAMPLAIN_VIEWPORT (priv->viewport), &x, &y);
absolute_x = x + priv->anchor_x + priv->viewport_width / 2.0;
absolute_y = y + priv->anchor_y + priv->viewport_height / 2.0;
......@@ -330,11 +330,11 @@ resize_viewport (ChamplainView *view)
gdouble lower_y = 0;
gdouble upper_x = G_MAXINT16;
gdouble upper_y = G_MAXINT16;
TidyAdjustment *hadjust, *vadjust;
ChamplainAdjustment *hadjust, *vadjust;
ChamplainViewPrivate *priv = view->priv;
tidy_viewport_get_adjustments (TIDY_VIEWPORT (priv->viewport), &hadjust,
champlain_viewport_get_adjustments (CHAMPLAIN_VIEWPORT (priv->viewport), &hadjust,
&vadjust);
if (priv->zoom_level < 8)
......@@ -351,7 +351,7 @@ resize_viewport (ChamplainView *view)
/*
* block emmision of signal by priv->viewport with viewport_pos_changed_cb()
* callback - the signal can be emitted by updating TidyAdjustment, but
* callback - the signal can be emitted by updating ChamplainAdjustment, but
* calling the callback now would be a disaster since we don't have updated
* anchor yet
*/
......@@ -525,14 +525,14 @@ champlain_view_dispose (GObject *object)
if (priv->kinetic_scroll != NULL)
{
tidy_finger_scroll_stop (TIDY_FINGER_SCROLL (priv->kinetic_scroll));
champlain_finger_scroll_stop (CHAMPLAIN_FINGER_SCROLL (priv->kinetic_scroll));
g_object_unref (priv->kinetic_scroll);
priv->kinetic_scroll = NULL;
}
if (priv->viewport != NULL)
{
tidy_viewport_stop (TIDY_VIEWPORT (priv->viewport));
champlain_viewport_stop (CHAMPLAIN_VIEWPORT (priv->viewport));
g_object_unref (priv->viewport);
priv->viewport = NULL;
}
......@@ -1018,7 +1018,7 @@ champlain_view_init (ChamplainView *view)
clutter_actor_show (priv->viewport_container);
/* Setup viewport */
priv->viewport = g_object_ref (tidy_viewport_new ());
priv->viewport = g_object_ref (champlain_viewport_new ());
clutter_container_add_actor (CLUTTER_CONTAINER (priv->viewport), priv->viewport_container);
g_object_set (G_OBJECT (priv->viewport), "sync-adjustments", FALSE, NULL);
......@@ -1031,7 +1031,7 @@ champlain_view_init (ChamplainView *view)
clutter_actor_raise (priv->user_layers, priv->map_layer);
/* Setup kinetic scroll */
priv->kinetic_scroll = g_object_ref (tidy_finger_scroll_new (FALSE));
priv->kinetic_scroll = g_object_ref (champlain_finger_scroll_new (FALSE));
g_signal_connect (priv->kinetic_scroll, "scroll-event",
G_CALLBACK (scroll_event), view);
......@@ -1084,7 +1084,7 @@ viewport_pos_changed_cb (G_GNUC_UNUSED GObject *gobject,
ChamplainViewPrivate *priv = view->priv;
gfloat x, y;
tidy_viewport_get_origin (TIDY_VIEWPORT (priv->viewport), &x, &y);
champlain_viewport_get_origin (CHAMPLAIN_VIEWPORT (priv->viewport), &x, &y);
if (fabs (x - priv->viewport_x) > 100 ||
fabs (y - priv->viewport_y) > 100 ||
......
/* tidy-viewport.h: Viewport actor
/* champlain-viewport.h: Viewport actor
*
* Copyright (C) 2008 OpenedHand
*
......@@ -20,60 +20,60 @@
* Written by: Chris Lord <chris@openedhand.com>
*/
#ifndef __TIDY_VIEWPORT_H__
#define __TIDY_VIEWPORT_H__
#ifndef __CHAMPLAIN_VIEWPORT_H__
#define __CHAMPLAIN_VIEWPORT_H__
#include <glib-object.h>
#include <clutter/clutter.h>
#include "tidy-adjustment.h"
#include "champlain-adjustment.h"
G_BEGIN_DECLS
#define TIDY_TYPE_VIEWPORT (tidy_viewport_get_type())
#define TIDY_VIEWPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TIDY_TYPE_VIEWPORT, TidyViewport))
#define TIDY_IS_VIEWPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TIDY_TYPE_VIEWPORT))
#define TIDY_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TIDY_TYPE_VIEWPORT, TidyViewportClass))
#define TIDY_IS_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TIDY_TYPE_VIEWPORT))
#define TIDY_VIEWPORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TIDY_TYPE_VIEWPORT, TidyViewportClass))
#define CHAMPLAIN_TYPE_VIEWPORT (champlain_viewport_get_type())
#define CHAMPLAIN_VIEWPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_VIEWPORT, ChamplainViewport))
#define CHAMPLAIN_IS_VIEWPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_VIEWPORT))
#define CHAMPLAIN_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_VIEWPORT, ChamplainViewportClass))
#define CHAMPLAIN_IS_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_VIEWPORT))
#define CHAMPLAIN_VIEWPORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_VIEWPORT, ChamplainViewportClass))
typedef struct _TidyViewport TidyViewport;
typedef struct _TidyViewportPrivate TidyViewportPrivate;
typedef struct _TidyViewportClass TidyViewportClass;
typedef struct _ChamplainViewport ChamplainViewport;
typedef struct _ChamplainViewportPrivate ChamplainViewportPrivate;
typedef struct _ChamplainViewportClass ChamplainViewportClass;
struct _TidyViewport
struct _ChamplainViewport
{
ClutterGroup parent;
TidyViewportPrivate *priv;
ChamplainViewportPrivate *priv;
};
struct _TidyViewportClass
struct _ChamplainViewportClass
{
ClutterGroupClass parent_class;
};
GType tidy_viewport_get_type (void) G_GNUC_CONST;
GType champlain_viewport_get_type (void) G_GNUC_CONST;
ClutterActor * tidy_viewport_new (void);
ClutterActor * champlain_viewport_new (void);
void tidy_viewport_set_origin (TidyViewport *viewport,
void champlain_viewport_set_origin (ChamplainViewport *viewport,
float x,
float y);
void tidy_viewport_get_origin (TidyViewport *viewport,
void champlain_viewport_get_origin (ChamplainViewport *viewport,
gfloat *x,
gfloat *y);
void tidy_viewport_stop (TidyViewport *viewport);
void champlain_viewport_stop (ChamplainViewport *viewport);
void tidy_viewport_get_adjustments (TidyViewport *viewport,
TidyAdjustment **hadjustment,
TidyAdjustment **vadjustment);
void champlain_viewport_get_adjustments (ChamplainViewport *viewport,
ChamplainAdjustment **hadjustment,
ChamplainAdjustment **vadjustment);
void tidy_viewport_set_adjustments (TidyViewport *viewport,
TidyAdjustment *hadjustment,
TidyAdjustment *vadjustment);
void champlain_viewport_set_adjustments (ChamplainViewport *viewport,
ChamplainAdjustment *hadjustment,
ChamplainAdjustment *vadjustment);
G_END_DECLS
#endif /* __TIDY_VIEWPORT_H__ */
#endif /* __CHAMPLAIN_VIEWPORT_H__ */
......@@ -214,7 +214,6 @@ AC_CONFIG_FILES([build/Makefile
champlain/Makefile
champlain/champlain-version.h
demos/Makefile
tidy/Makefile
docs/Makefile
docs/reference/Makefile
docs/reference/version.xml
......
BUILT_SOURCES =
CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST =
tidy_headers_public = \
$(srcdir)/tidy-adjustment.h \
$(srcdir)/tidy-finger-scroll.h \
$(srcdir)/tidy-viewport.h \
$(srcdir)/tidy-private.h
tidy_sources = \
$(srcdir)/tidy-adjustment.c \
$(srcdir)/tidy-finger-scroll.c \
$(srcdir)/tidy-viewport.c
# glib-genmarshal rules
glib_marshal_list = tidy-marshal.list
glib_marshal_prefix = _tidy_marshal
include $(top_srcdir)/build/Makefile.am.marshal
# glib-mkenums rules
glib_enum_h = tidy-enum-types.h
glib_enum_c = tidy-enum-types.c
glib_enum_headers = $(tidy_headers_public)
include $(top_srcdir)/build/Makefile.am.enums
tidy_headers_built = \
tidy-enum-types.h \
tidy-marshal.h
tidy_sources_built = \
tidy-enum-types.c \
tidy-marshal.c
libtidy_1_0_la_SOURCES = \
$(tidy_headers_public) \
$(tidy_sources)
nodist_libtidy_1_0_la_SOURCES = \
$(tidy_headers_built) \
$(tidy_sources_built)
libtidy_1_0_la_LIBADD = $(DEPS_LIBS)
AM_CPPFLAGS = \
-I$(top_srcdir) \
-DPREFIX=\""$(prefix)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DG_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"Tidy\" \
$(DEPS_CFLAGS) \
$(TIDY_DEBUG_CFLAGS)
noinst_LTLIBRARIES = libtidy-1.0.la
/*** BEGIN file-header ***/
#include "tidy-enum-types.h"
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@filename@" */
#include "@filename@"
/*** END file-production ***/
/*** BEGIN value-header ***/
GType
@enum_name@_get_type(void) {
static GType enum_type_id = 0;
if (G_UNLIKELY (!enum_type_id))
{
static const G@Type@Value values[] = {
/*** END value-header ***/
/*** BEGIN value-production ***/
{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },
/*** END value-production ***/
/*** BEGIN value-tail ***/
{ 0, NULL, NULL }
};
enum_type_id = g_@type@_register_static("@EnumName@", values);
}
return enum_type_id;
}
/*** END value-tail ***/
/*** BEGIN file-header ***/
#ifndef __TIDY_ENUM_TYPES_H__
#define __TIDY_ENUM_TYPES_H__
#include <glib-object.h>
G_BEGIN_DECLS
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@filename@" */
/*** END file-production ***/
/*** BEGIN file-tail ***/
G_END_DECLS
#endif /* !__TIDY_ENUM_TYPES_H__ */
/*** END file-tail ***/
/*** BEGIN value-header ***/
GType @enum_name@_get_type (void) G_GNUC_CONST;
#define TIDY_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
/*** END value-header ***/
VOID:OBJECT
VOID:VOID
VOID:PARAM
VOID:UINT
VOID:UINT,UINT
VOID:OBJECT,OBJECT
/* tidy-private.h: Private declarations
*
* Copyright (C) 2007 OpenedHand
*
* 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 2 of the License, or (at your option) any later version.
*
* This library 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.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __TIDY_PRIVATE_H__
#define __TIDY_PRIVATE_H__
#include <glib.h>
G_BEGIN_DECLS
#define I_(str) (g_intern_static_string ((str)))
#define TIDY_PARAM_READABLE \
(G_PARAM_READABLE | \
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
#define TIDY_PARAM_READWRITE \
(G_PARAM_READABLE | G_PARAM_WRITABLE | \
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
G_END_DECLS
#endif /* __TIDY_PRIVATE_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment