aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorTarnyko <tarnyko@tarnyko.net>2014-02-26 23:15:21 +0800
committerMilan Crha <mcrha@redhat.com>2014-02-26 23:15:21 +0800
commit5c60d57082ede522169b65efa67a1e268989b487 (patch)
treeb77a62c5fbee1719f7216f7135c068ca081c9c77 /calendar
parent5727d74fb54a1c76922099d023a182418c3bac70 (diff)
downloadgsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.gz
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.bz2
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.lz
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.xz
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.zst
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.zip
Replace 'interface' with 'iface' in the code
Win32 headers have a #define for 'interface', which breaks the build when this word is used in the code, thus replace it to 'iface', the same way as GLib or GTK+ code use to have it. (See bug #722068.)
Diffstat (limited to 'calendar')
-rw-r--r--calendar/alarm-notify/alarm-notify.c6
-rw-r--r--calendar/gui/e-cal-model-calendar.c26
-rw-r--r--calendar/gui/e-cal-model-memos.c24
-rw-r--r--calendar/gui/e-cal-model-tasks.c24
-rw-r--r--calendar/gui/e-cal-model.c26
-rw-r--r--calendar/gui/e-calendar-view.c14
-rw-r--r--calendar/gui/e-memo-table.c16
-rw-r--r--calendar/gui/e-task-table.c16
8 files changed, 76 insertions, 76 deletions
diff --git a/calendar/alarm-notify/alarm-notify.c b/calendar/alarm-notify/alarm-notify.c
index dced21f2da..fc71d6917b 100644
--- a/calendar/alarm-notify/alarm-notify.c
+++ b/calendar/alarm-notify/alarm-notify.c
@@ -46,7 +46,7 @@ struct _AlarmNotifyPrivate {
};
/* Forward Declarations */
-static void alarm_notify_initable_init (GInitableIface *interface);
+static void alarm_notify_initable_init (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
AlarmNotify, alarm_notify, GTK_TYPE_APPLICATION,
@@ -186,10 +186,10 @@ alarm_notify_class_init (AlarmNotifyClass *class)
}
static void
-alarm_notify_initable_init (GInitableIface *interface)
+alarm_notify_initable_init (GInitableIface *iface)
{
/* XXX Awkward name since we're missing an 'E' prefix. */
- interface->init = alarm_notify_initable;
+ iface->init = alarm_notify_initable;
}
static void
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index a163117a85..86bc470261 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -36,7 +36,7 @@
/* Forward Declarations */
static void e_cal_model_calendar_table_model_init
- (ETableModelInterface *interface);
+ (ETableModelInterface *iface);
static ETableModelInterface *table_model_parent_interface;
@@ -512,20 +512,20 @@ e_cal_model_calendar_class_init (ECalModelCalendarClass *class)
}
static void
-e_cal_model_calendar_table_model_init (ETableModelInterface *interface)
+e_cal_model_calendar_table_model_init (ETableModelInterface *iface)
{
table_model_parent_interface =
- g_type_interface_peek_parent (interface);
-
- interface->column_count = cal_model_calendar_column_count;
- interface->value_at = cal_model_calendar_value_at;
- interface->set_value_at = cal_model_calendar_set_value_at;
- interface->is_cell_editable = cal_model_calendar_is_cell_editable;
- interface->duplicate_value = cal_model_calendar_duplicate_value;
- interface->free_value = cal_model_calendar_free_value;
- interface->initialize_value = cal_model_calendar_initialize_value;
- interface->value_is_empty = cal_model_calendar_value_is_empty;
- interface->value_to_string = cal_model_calendar_value_to_string;
+ g_type_interface_peek_parent (iface);
+
+ iface->column_count = cal_model_calendar_column_count;
+ iface->value_at = cal_model_calendar_value_at;
+ iface->set_value_at = cal_model_calendar_set_value_at;
+ iface->is_cell_editable = cal_model_calendar_is_cell_editable;
+ iface->duplicate_value = cal_model_calendar_duplicate_value;
+ iface->free_value = cal_model_calendar_free_value;
+ iface->initialize_value = cal_model_calendar_initialize_value;
+ iface->value_is_empty = cal_model_calendar_value_is_empty;
+ iface->value_to_string = cal_model_calendar_value_to_string;
}
static void
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index aa4108ae82..22188da072 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -36,7 +36,7 @@
/* Forward Declarations */
static void e_cal_model_memos_table_model_init
- (ETableModelInterface *interface);
+ (ETableModelInterface *iface);
static ETableModelInterface *table_model_parent_interface;
@@ -230,22 +230,22 @@ e_cal_model_memos_class_init (ECalModelMemosClass *class)
}
static void
-e_cal_model_memos_table_model_init (ETableModelInterface *interface)
+e_cal_model_memos_table_model_init (ETableModelInterface *iface)
{
table_model_parent_interface =
- g_type_interface_peek_parent (interface);
+ g_type_interface_peek_parent (iface);
- interface->column_count = cal_model_memos_column_count;
+ iface->column_count = cal_model_memos_column_count;
- interface->value_at = cal_model_memos_value_at;
- interface->set_value_at = cal_model_memos_set_value_at;
- interface->is_cell_editable = cal_model_memos_is_cell_editable;
+ iface->value_at = cal_model_memos_value_at;
+ iface->set_value_at = cal_model_memos_set_value_at;
+ iface->is_cell_editable = cal_model_memos_is_cell_editable;
- interface->duplicate_value = cal_model_memos_duplicate_value;
- interface->free_value = cal_model_memos_free_value;
- interface->initialize_value = cal_model_memos_initialize_value;
- interface->value_is_empty = cal_model_memos_value_is_empty;
- interface->value_to_string = cal_model_memos_value_to_string;
+ iface->duplicate_value = cal_model_memos_duplicate_value;
+ iface->free_value = cal_model_memos_free_value;
+ iface->initialize_value = cal_model_memos_initialize_value;
+ iface->value_is_empty = cal_model_memos_value_is_empty;
+ iface->value_to_string = cal_model_memos_value_to_string;
}
static void
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 9f35a77079..e4737ad1a2 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -56,7 +56,7 @@ enum {
/* Forward Declarations */
static void e_cal_model_tasks_table_model_init
- (ETableModelInterface *interface);
+ (ETableModelInterface *iface);
static ETableModelInterface *table_model_parent_interface;
@@ -1232,22 +1232,22 @@ e_cal_model_tasks_class_init (ECalModelTasksClass *class)
}
static void
-e_cal_model_tasks_table_model_init (ETableModelInterface *interface)
+e_cal_model_tasks_table_model_init (ETableModelInterface *iface)
{
table_model_parent_interface =
- g_type_interface_peek_parent (interface);
+ g_type_interface_peek_parent (iface);
- interface->column_count = cal_model_tasks_column_count;
+ iface->column_count = cal_model_tasks_column_count;
- interface->value_at = cal_model_tasks_value_at;
- interface->set_value_at = cal_model_tasks_set_value_at;
- interface->is_cell_editable = cal_model_tasks_is_cell_editable;
+ iface->value_at = cal_model_tasks_value_at;
+ iface->set_value_at = cal_model_tasks_set_value_at;
+ iface->is_cell_editable = cal_model_tasks_is_cell_editable;
- interface->duplicate_value = cal_model_tasks_duplicate_value;
- interface->free_value = cal_model_tasks_free_value;
- interface->initialize_value = cal_model_tasks_initialize_value;
- interface->value_is_empty = cal_model_tasks_value_is_empty;
- interface->value_to_string = cal_model_tasks_value_to_string;
+ iface->duplicate_value = cal_model_tasks_duplicate_value;
+ iface->free_value = cal_model_tasks_free_value;
+ iface->initialize_value = cal_model_tasks_initialize_value;
+ iface->value_is_empty = cal_model_tasks_value_is_empty;
+ iface->value_to_string = cal_model_tasks_value_to_string;
}
static void
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index b37be73a69..aff77fa6e4 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -194,7 +194,7 @@ enum {
/* Forward Declarations */
static void e_cal_model_table_model_init
- (ETableModelInterface *interface);
+ (ETableModelInterface *iface);
static guint signals[LAST_SIGNAL];
@@ -2008,21 +2008,21 @@ e_cal_model_class_init (ECalModelClass *class)
}
static void
-e_cal_model_table_model_init (ETableModelInterface *interface)
+e_cal_model_table_model_init (ETableModelInterface *iface)
{
- interface->column_count = cal_model_column_count;
- interface->row_count = cal_model_row_count;
- interface->append_row = cal_model_append_row;
+ iface->column_count = cal_model_column_count;
+ iface->row_count = cal_model_row_count;
+ iface->append_row = cal_model_append_row;
- interface->value_at = cal_model_value_at;
- interface->set_value_at = cal_model_set_value_at;
- interface->is_cell_editable = cal_model_is_cell_editable;
+ iface->value_at = cal_model_value_at;
+ iface->set_value_at = cal_model_set_value_at;
+ iface->is_cell_editable = cal_model_is_cell_editable;
- interface->duplicate_value = cal_model_duplicate_value;
- interface->free_value = cal_model_free_value;
- interface->initialize_value = cal_model_initialize_value;
- interface->value_is_empty = cal_model_value_is_empty;
- interface->value_to_string = cal_model_value_to_string;
+ iface->duplicate_value = cal_model_duplicate_value;
+ iface->free_value = cal_model_free_value;
+ iface->initialize_value = cal_model_initialize_value;
+ iface->value_is_empty = cal_model_value_is_empty;
+ iface->value_to_string = cal_model_value_to_string;
}
static void
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 6983303db8..ce6cfaede4 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -98,7 +98,7 @@ enum {
static guint signals[LAST_SIGNAL];
-static void calendar_view_selectable_init (ESelectableInterface *interface);
+static void calendar_view_selectable_init (ESelectableInterface *iface);
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (
ECalendarView, e_calendar_view, GTK_TYPE_TABLE,
@@ -1035,13 +1035,13 @@ e_calendar_view_init (ECalendarView *calendar_view)
}
static void
-calendar_view_selectable_init (ESelectableInterface *interface)
+calendar_view_selectable_init (ESelectableInterface *iface)
{
- interface->update_actions = calendar_view_update_actions;
- interface->cut_clipboard = calendar_view_cut_clipboard;
- interface->copy_clipboard = calendar_view_copy_clipboard;
- interface->paste_clipboard = calendar_view_paste_clipboard;
- interface->delete_selection = calendar_view_delete_selection;
+ iface->update_actions = calendar_view_update_actions;
+ iface->cut_clipboard = calendar_view_cut_clipboard;
+ iface->copy_clipboard = calendar_view_copy_clipboard;
+ iface->paste_clipboard = calendar_view_paste_clipboard;
+ iface->delete_selection = calendar_view_delete_selection;
}
void
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index c7c6d5d091..ed39b43642 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -82,7 +82,7 @@ static const gchar *icon_names[] = {
/* Forward Declarations */
static void e_memo_table_selectable_init
- (ESelectableInterface *interface);
+ (ESelectableInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EMemoTable,
@@ -1182,14 +1182,14 @@ e_memo_table_init (EMemoTable *memo_table)
}
static void
-e_memo_table_selectable_init (ESelectableInterface *interface)
+e_memo_table_selectable_init (ESelectableInterface *iface)
{
- interface->update_actions = memo_table_update_actions;
- interface->cut_clipboard = memo_table_cut_clipboard;
- interface->copy_clipboard = memo_table_copy_clipboard;
- interface->paste_clipboard = memo_table_paste_clipboard;
- interface->delete_selection = memo_table_delete_selection;
- interface->select_all = memo_table_select_all;
+ iface->update_actions = memo_table_update_actions;
+ iface->cut_clipboard = memo_table_cut_clipboard;
+ iface->copy_clipboard = memo_table_copy_clipboard;
+ iface->paste_clipboard = memo_table_paste_clipboard;
+ iface->delete_selection = memo_table_delete_selection;
+ iface->select_all = memo_table_select_all;
}
/**
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 8f6181fee2..085b1b4c04 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -89,7 +89,7 @@ static const gchar *icon_names[] = {
/* Forward Declarations */
static void e_task_table_selectable_init
- (ESelectableInterface *interface);
+ (ESelectableInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ETaskTable,
@@ -1560,14 +1560,14 @@ e_task_table_init (ETaskTable *task_table)
}
static void
-e_task_table_selectable_init (ESelectableInterface *interface)
+e_task_table_selectable_init (ESelectableInterface *iface)
{
- interface->update_actions = task_table_update_actions;
- interface->cut_clipboard = task_table_cut_clipboard;
- interface->copy_clipboard = task_table_copy_clipboard;
- interface->paste_clipboard = task_table_paste_clipboard;
- interface->delete_selection = task_table_delete_selection;
- interface->select_all = task_table_select_all;
+ iface->update_actions = task_table_update_actions;
+ iface->cut_clipboard = task_table_cut_clipboard;
+ iface->copy_clipboard = task_table_copy_clipboard;
+ iface->paste_clipboard = task_table_paste_clipboard;
+ iface->delete_selection = task_table_delete_selection;
+ iface->select_all = task_table_select_all;
}
/**