From f53a739e0e9ef3de824c549fa14e758e194e2dde Mon Sep 17 00:00:00 2001 From: Jean Guyomarc'h Date: Tue, 7 Jun 2016 21:42:46 +0200 Subject: ecore_cocoa: simplify clipboard functions naming ecore_cocoa_selection_clipboard_xxxx() have been renamed into ecore_cocoa_clipboard_xxxx() and they have nothing to do with selection, only with clipboard. Since the API is not stable yet, I can change it. --- src/lib/ecore_cocoa/Ecore_Cocoa.h | 10 +++++----- src/lib/ecore_cocoa/ecore_cocoa_cnp.m | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/lib/ecore_cocoa') diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h index a94785cee7..7f7ca6d9d8 100644 --- a/src/lib/ecore_cocoa/Ecore_Cocoa.h +++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h @@ -472,7 +472,7 @@ EAPI Ecore_Cocoa_Object *ecore_cocoa_window_get(const Ecore_Cocoa_Window *window * @param type * @return EINA_TRUE on success, EINA_FALSE on failure */ -EAPI Eina_Bool ecore_cocoa_selection_clipboard_set(const void *data, +EAPI Eina_Bool ecore_cocoa_clipboard_set(const void *data, int size, Ecore_Cocoa_Cnp_Type type); @@ -487,15 +487,15 @@ EAPI Eina_Bool ecore_cocoa_selection_clipboard_set(const void *data, * @c retrieved_types will contain ECORE_COCOA_CNP_TYPE_STRING and the data * will be a C string (char*) that must be freed after use. */ -EAPI void *ecore_cocoa_selection_clipboard_get(int *size, - Ecore_Cocoa_Cnp_Type type, - Ecore_Cocoa_Cnp_Type *retrieved_types) +EAPI void *ecore_cocoa_clipboard_get(int *size, + Ecore_Cocoa_Cnp_Type type, + Ecore_Cocoa_Cnp_Type *retrieved_types) EINA_WARN_UNUSED_RESULT; /** * Deletes the contents of the Cocoa clipboard */ -EAPI void ecore_cocoa_selection_clipboard_clear(void); +EAPI void ecore_cocoa_clipboard_clear(void); /** * Set the Cocoa cursor for a given Cocoa window diff --git a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m index efe3cbdbef..da2db90aa0 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m @@ -10,9 +10,9 @@ #import "ecore_cocoa_app.h" EAPI Eina_Bool -ecore_cocoa_selection_clipboard_set(const void *data, - int size, - Ecore_Cocoa_Cnp_Type type) +ecore_cocoa_clipboard_set(const void *data, + int size, + Ecore_Cocoa_Cnp_Type type) { NSMutableArray *objects; NSString *str = nil; @@ -62,9 +62,9 @@ ecore_cocoa_selection_clipboard_set(const void *data, EAPI void * -ecore_cocoa_selection_clipboard_get(int *size, - Ecore_Cocoa_Cnp_Type type, - Ecore_Cocoa_Cnp_Type *retrieved_types) +ecore_cocoa_clipboard_get(int *size, + Ecore_Cocoa_Cnp_Type type, + Ecore_Cocoa_Cnp_Type *retrieved_types) { NSMutableArray *classes; void *data; @@ -167,7 +167,7 @@ fail: } EAPI void -ecore_cocoa_selection_clipboard_clear(void) +ecore_cocoa_clipboard_clear(void) { [[NSPasteboard generalPasteboard] clearContents]; } -- cgit v1.2.1