From c82ecd1529ab7348048ea6f50715553c7bc5ad93 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 22 Sep 2014 21:05:52 +0000 Subject: switch to C99 (Designated Initializers) --- BarDisplay.c | 82 +++++++++++++++++++++++------------------------- BarDisplayP.h | 20 ++++++------ Graph.c | 96 +++++++++++++++++++++++++++------------------------------ GraphDisplay.c | 77 ++++++++++++++++++++++----------------------- GraphDisplayP.h | 20 ++++++------ GraphP.h | 24 +++++++-------- 6 files changed, 154 insertions(+), 165 deletions(-) diff --git a/BarDisplay.c b/BarDisplay.c index f94a4c4..e079f8f 100644 --- a/BarDisplay.c +++ b/BarDisplay.c @@ -24,52 +24,48 @@ static void Redisplay(); static void ComputeSize(); static Boolean SetValues(); -#define Superclass (&graphDisplayClassRec) BarDisplayClassRec barDisplayClassRec = { - /* object */ - { - /* superclass */ (WidgetClass) Superclass, - /* class_name */ "BarDisplay", - /* widget_size */ sizeof(BarDisplayRec), - /* class_initialize */ NULL, - /* class_part_initialize */ NULL, - /* class_inited */ False, - /* initialize */ Initialize, - /* initialize_hook */ NULL, - /* obj1 */ NULL, - /* obj2 */ NULL, - /* obj3 */ 0, - /* resources */ resources, - /* num_resources */ XtNumber(resources), - /* xrm_class */ NULLQUARK, - /* obj4 */ 0, - /* obj5 */ 0, - /* obj6 */ 0, - /* obj7 */ 0, - /* destroy */ NULL, - /* obj8 */ NULL, - /* obj9 */ NULL, - /* set_values */ SetValues, - /* set_values_hook */ NULL, - /* obj10 */ NULL, - /* get_values_hook */ NULL, - /* accept_focus */ NULL, - /* version */ XtVersion, - /* callback offsets */ NULL, - /* obj12 */ NULL, - /* obj13 */ NULL, - /* obj14 */ NULL, - /* extension */ NULL, + .object_class = { + .superclass = (WidgetClass)&graphDisplayClassRec, + .class_name = "BarDisplay", + .widget_size = sizeof(BarDisplayRec), + .class_initialize = NULL, + .class_part_initialize = NULL, + .class_inited = False, + .initialize = Initialize, + .initialize_hook = NULL, + .obj1 = NULL, + .obj2 = NULL, + .obj3 = 0, + .resources = resources, + .num_resources = XtNumber(resources), + .xrm_class = NULLQUARK, + .obj4 = 0, + .obj5 = 0, + .obj6 = 0, + .obj7 = 0, + .destroy = NULL, + .obj8 = NULL, + .obj9 = NULL, + .set_values = SetValues, + .set_values_hook = NULL, + .obj10 = NULL, + .get_values_hook = NULL, + .obj11 = NULL, + .version = XtVersion, + .callback_private = NULL, + .obj12 = NULL, + .obj13 = NULL, + .obj14 = NULL, + .extension = NULL, }, - /* graphDisplay */ - { - /* compute_size */ ComputeSize, - /* expose */ Redisplay, - /* extension */ NULL, + .graphDisplay_class = { + .compute_size = ComputeSize, + .expose = Redisplay, + .extension = NULL, }, - /* barDisplay */ - { - /* extension */ NULL, + .barDisplay_class = { + .extension = NULL, }, }; diff --git a/BarDisplayP.h b/BarDisplayP.h index 328e691..43e98f8 100644 --- a/BarDisplayP.h +++ b/BarDisplayP.h @@ -7,25 +7,25 @@ #include "GraphDisplayP.h" typedef struct { - Dimension space; - Dimension default_graph_width; - String format; + Dimension space; + Dimension default_graph_width; + String format; } BarDisplayPart; typedef struct _BarDisplayRec { - ObjectPart object; - GraphDisplayPart graphDisplay; - BarDisplayPart barDisplay; + ObjectPart object; + GraphDisplayPart graphDisplay; + BarDisplayPart barDisplay; } BarDisplayRec; typedef struct { - XtPointer extension; + XtPointer extension; } BarDisplayClassPart; typedef struct _BarDisplayClassRec { - ObjectClassPart object_class; - GraphDisplayClassPart graphDisplay_class; - BarDisplayClassPart barDisplay_class; + ObjectClassPart object_class; + GraphDisplayClassPart graphDisplay_class; + BarDisplayClassPart barDisplay_class; } BarDisplayClassRec, *BarDisplayObjectClass; extern BarDisplayClassRec barDisplayClassRec; diff --git a/Graph.c b/Graph.c index 75beb74..7a4a15f 100644 --- a/Graph.c +++ b/Graph.c @@ -30,61 +30,57 @@ static void InsertChild(); static Boolean SetValues(); static CompositeClassExtensionRec compositeExtension = { - /* next_extension */ NULL, - /* recort_type */ NULLQUARK, - /* version */ XtCompositeExtensionVersion, - /* record_size */ sizeof(CompositeClassExtensionRec), - /* accepts_objects */ True, + .next_extension = NULL, + .record_type = NULLQUARK, + .version = XtCompositeExtensionVersion, + .record_size = sizeof(CompositeClassExtensionRec), + .accepts_objects = True, }; -#define Superclass (&compositeClassRec) GraphClassRec graphClassRec = { - /* core */ - { - /* superclass */ (WidgetClass) Superclass, - /* class_name */ "Graph", - /* widget_size */ sizeof(GraphRec), - /* class_initialize */ ClassInitialize, - /* class_part_initialize */ NULL, - /* class_inited */ False, - /* initialize */ Initialize, - /* initialize_hook */ NULL, - /* realize */ Realize, - /* actions */ NULL, - /* num_actions */ 0, - /* resources */ resources, - /* num_resources */ XtNumber(resources), - /* xrm_class */ NULLQUARK, - /* compress_motion */ True, - /* compress_exposure */ XtExposeCompressMultiple, - /* compress_enterleave */ True, - /* visible_interest */ False, - /* destroy */ Destroy, - /* resize */ Resize, - /* expose */ Redisplay, - /* set_values */ SetValues, - /* set_values_hook */ NULL, - /* set_values_almost */ XtInheritSetValuesAlmost, - /* get_values_hook */ NULL, - /* accept_focus */ NULL, - /* version */ XtVersion, - /* callback_private */ NULL, - /* tm_table */ NULL, - /* query_geometry */ NULL, - /* display_accelerator */ NULL, - /* extension */ NULL, + .core_class = { + .superclass = (WidgetClass)&compositeClassRec, + .class_name = "Graph", + .widget_size = sizeof(GraphRec), + .class_initialize = ClassInitialize, + .class_part_initialize = NULL, + .class_inited = False, + .initialize = Initialize, + .initialize_hook = NULL, + .realize = Realize, + .actions = NULL, + .num_actions = 0, + .resources = resources, + .num_resources = XtNumber(resources), + .xrm_class = NULLQUARK, + .compress_motion = True, + .compress_exposure = XtExposeCompressMultiple, + .compress_enterleave = True, + .visible_interest = False, + .destroy = Destroy, + .resize = Resize, + .expose = Redisplay, + .set_values = SetValues, + .set_values_hook = NULL, + .set_values_almost = XtInheritSetValuesAlmost, + .get_values_hook = NULL, + .accept_focus = NULL, + .version = XtVersion, + .callback_private = NULL, + .tm_table = NULL, + .query_geometry = NULL, + .display_accelerator = NULL, + .extension = NULL, }, - /* composite */ - { - /* geometry_manager */ NULL, - /* change_managed */ NULL, - /* insert_child */ InsertChild, - /* delete_child */ XtInheritDeleteChild, - /* extension */ &compositeExtension, + .composite_class = { + .geometry_manager = NULL, + .change_managed = NULL, + .insert_child = InsertChild, + .delete_child = XtInheritDeleteChild, + .extension = &compositeExtension, }, - /* graph */ - { - /* extension */ NULL, + .graph_class = { + .extension = NULL, }, }; diff --git a/GraphDisplay.c b/GraphDisplay.c index c91b45e..3b0d582 100644 --- a/GraphDisplay.c +++ b/GraphDisplay.c @@ -18,48 +18,45 @@ static void Initialize(); static void Destroy(); static Boolean SetValues(); -#define Superclass (&objectClassRec) GraphDisplayClassRec graphDisplayClassRec = { - /* object */ - { - /* superclass */ (WidgetClass) Superclass, - /* class_name */ "GraphDisplay", - /* widget_size */ sizeof(GraphDisplayRec), - /* class_initialize */ NULL, - /* class_part_initialize */ ClassPartInitialize, - /* class_inited */ False, - /* initialize */ Initialize, - /* initialize_hook */ NULL, - /* obj1 */ NULL, - /* obj2 */ NULL, - /* obj3 */ 0, - /* resources */ resources, - /* num_resources */ XtNumber(resources), - /* xrm_class */ NULLQUARK, - /* obj4 */ 0, - /* obj5 */ 0, - /* obj6 */ 0, - /* obj7 */ 0, - /* destroy */ Destroy, - /* obj8 */ 0, - /* obj9 */ 0, - /* set_values */ SetValues, - /* set_values_hook */ NULL, - /* obj10 */ NULL, - /* get_values_hook */ NULL, - /* accept_focus */ NULL, - /* version */ XtVersion, - /* callback offsets */ NULL, - /* obj12 */ NULL, - /* obj13 */ NULL, - /* obj14 */ NULL, - /* extension */ NULL, + .object_class = { + .superclass = (WidgetClass)&objectClassRec, + .class_name = "GraphDisplay", + .widget_size = sizeof(GraphDisplayRec), + .class_initialize = NULL, + .class_part_initialize = ClassPartInitialize, + .class_inited = False, + .initialize = Initialize, + .initialize_hook = NULL, + .obj1 = NULL, + .obj2 = NULL, + .obj3 = 0, + .resources = resources, + .num_resources = XtNumber(resources), + .xrm_class = NULLQUARK, + .obj4 = 0, + .obj5 = 0, + .obj6 = 0, + .obj7 = 0, + .destroy = Destroy, + .obj8 = 0, + .obj9 = 0, + .set_values = SetValues, + .set_values_hook = NULL, + .obj10 = NULL, + .get_values_hook = NULL, + .obj11 = NULL, + .version = XtVersion, + .callback_private = NULL, + .obj12 = NULL, + .obj13 = NULL, + .obj14 = NULL, + .extension = NULL, }, - /* graphDisplay */ - { - /* compute_size */ NULL, - /* expose */ NULL, - /* extension */ NULL, + .graphDisplay_class = { + .compute_size = NULL, + .expose = NULL, + .extension = NULL, }, }; diff --git a/GraphDisplayP.h b/GraphDisplayP.h index 7f3adc0..4b43b75 100644 --- a/GraphDisplayP.h +++ b/GraphDisplayP.h @@ -6,27 +6,27 @@ #include "GraphDisplay.h" typedef struct { - Pixel foreground; - XFontStruct *font; - GC gc; + Pixel foreground; + XFontStruct *font; + GC gc; } GraphDisplayPart; typedef struct _GraphDisplayRec { - ObjectPart object; - GraphDisplayPart graphDisplay; + ObjectPart object; + GraphDisplayPart graphDisplay; } GraphDisplayRec; typedef void (*ComputeSizeProc)(); typedef struct { - ComputeSizeProc compute_size; - XtExposeProc expose; - XtPointer extension; + ComputeSizeProc compute_size; + XtExposeProc expose; + XtPointer extension; } GraphDisplayClassPart; typedef struct _GraphDisplayClassRec { - ObjectClassPart object_class; - GraphDisplayClassPart graphDisplay_class; + ObjectClassPart object_class; + GraphDisplayClassPart graphDisplay_class; } GraphDisplayClassRec, *GraphDisplayObjectClass; extern GraphDisplayClassRec graphDisplayClassRec; diff --git a/GraphP.h b/GraphP.h index b4f5be6..e09356f 100644 --- a/GraphP.h +++ b/GraphP.h @@ -6,27 +6,27 @@ #include "Graph.h" typedef struct { - int num_entries; - String *labels; - int *values; - int max_value; - int scale; + int num_entries; + String *labels; + int *values; + int max_value; + int scale; } GraphPart; typedef struct _GraphRec { - CorePart core; - CompositePart composite; - GraphPart graph; + CorePart core; + CompositePart composite; + GraphPart graph; } GraphRec; typedef struct { - XtPointer extension; + XtPointer extension; } GraphClassPart; typedef struct _GraphClassRec { - CoreClassPart core_class; - CompositeClassPart composite_class; - GraphClassPart graph_class; + CoreClassPart core_class; + CompositeClassPart composite_class; + GraphClassPart graph_class; } GraphClassRec; extern GraphClassRec graphClassRec; -- cgit v1.2.3