From b16093a5336ba79dd93efdae1a458525e73662d4 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 19 Mar 2020 11:04:02 +0900 Subject: [PATCH] [qwaq] Split out Array(Group) interface --- ruamoko/qwaq/qwaq-garray.h | 29 +++++++++++++++++++++++++++++ ruamoko/qwaq/qwaq-garray.r | 2 +- ruamoko/qwaq/qwaq-group.h | 24 ------------------------ ruamoko/qwaq/qwaq-group.r | 1 + 4 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 ruamoko/qwaq/qwaq-garray.h diff --git a/ruamoko/qwaq/qwaq-garray.h b/ruamoko/qwaq/qwaq-garray.h new file mode 100644 index 000000000..1a2e53576 --- /dev/null +++ b/ruamoko/qwaq/qwaq-garray.h @@ -0,0 +1,29 @@ +#ifndef __qwaq_garray_h +#define __qwaq_garray_h + +#include + +typedef BOOL condition_func (id object, void *data); +typedef BOOL condition_func2 (id object, void *anObject, void *data); + +@interface Array (Group) +- (void) makeObjectsPerformSelector: (SEL)selector + if: (condition_func)condition + with: (void *)data; +- (void) makeObjectsPerformSelector: (SEL)selector + withObject: (void *)anObject + if: (condition_func2)condition + with: (void *)data; +- (void) makeReversedObjectsPerformSelector: (SEL)selector; +- (void) makeReversedObjectsPerformSelector: (SEL)selector + withObject: (void *)anObject; +- (void) makeReversedObjectsPerformSelector: (SEL)selector + if: (condition_func)condition + with: (void *)data; +- (void) makeReversedObjectsPerformSelector: (SEL)selector + withObject: (void *)anObject + if: (condition_func2)condition + with: (void *)data; +@end + +#endif//__qwaq_garray_h diff --git a/ruamoko/qwaq/qwaq-garray.r b/ruamoko/qwaq/qwaq-garray.r index 1b7fc46d3..b3298ffa4 100644 --- a/ruamoko/qwaq/qwaq-garray.r +++ b/ruamoko/qwaq/qwaq-garray.r @@ -1,6 +1,6 @@ #include #include "event.h" -#include "qwaq-group.h" +#include "qwaq-garray.h" @implementation Array (Group) - (void) makeObjectsPerformSelector: (SEL)selector diff --git a/ruamoko/qwaq/qwaq-group.h b/ruamoko/qwaq/qwaq-group.h index c534979ab..483a07c05 100644 --- a/ruamoko/qwaq/qwaq-group.h +++ b/ruamoko/qwaq/qwaq-group.h @@ -1,32 +1,8 @@ #ifndef __qwaq_group_h #define __qwaq_group_h -#include #include "qwaq-view.h" -typedef BOOL condition_func (id object, void *data); -typedef BOOL condition_func2 (id object, void *anObject, void *data); - -@interface Array (Group) -- (void) makeObjectsPerformSelector: (SEL)selector - if: (condition_func)condition - with: (void *)data; -- (void) makeObjectsPerformSelector: (SEL)selector - withObject: (void *)anObject - if: (condition_func2)condition - with: (void *)data; -- (void) makeReversedObjectsPerformSelector: (SEL)selector; -- (void) makeReversedObjectsPerformSelector: (SEL)selector - withObject: (void *)anObject; -- (void) makeReversedObjectsPerformSelector: (SEL)selector - if: (condition_func)condition - with: (void *)data; -- (void) makeReversedObjectsPerformSelector: (SEL)selector - withObject: (void *)anObject - if: (condition_func2)condition - with: (void *)data; -@end - @interface Group : View { Array *views; diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r index 770834c71..e9982fd1c 100644 --- a/ruamoko/qwaq/qwaq-group.r +++ b/ruamoko/qwaq/qwaq-group.r @@ -1,5 +1,6 @@ #include #include "event.h" +#include "qwaq-garray.h" #include "qwaq-group.h" @implementation Group