From db6a4f8368974938cfb200061687fc569c207259 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Fri, 19 Jul 2019 13:59:07 +0200
Subject: [PATCH] (UI Companion) Get rid of unused iterate function callback

---
 gfx/drivers_context/cocoa_gl_ctx.m |  3 +--
 ui/drivers/cocoa/cocoatouch_menu.m |  3 +++
 ui/drivers/ui_cocoa.m              |  8 --------
 ui/drivers/ui_cocoatouch.m         | 13 -------------
 ui/drivers/ui_qt.cpp               |  8 --------
 ui/drivers/ui_win32.c              |  9 ---------
 ui/ui_companion_driver.h           |  1 -
 7 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index 2bdee23250..b12b55b367 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -687,9 +687,8 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data,
 #elif defined(HAVE_COCOA)
    CocoaView *g_view           = (CocoaView*)nsview_get_ptr();
 #endif
-   cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
-
 #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
+   cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
    cocoa_ctx->width            = width;
    cocoa_ctx->height           = height;
 #endif
diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m
index e6517baf45..7379860005 100644
--- a/ui/drivers/cocoa/cocoatouch_menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@@ -781,6 +781,9 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
       case MENU_ENTRY_ENUM:
          me = [RAMenuItemEnum new];
          break;
+       case MENU_ENTRY_SIZE:
+         /* TODO/FIXME - implement this */
+         break;
    };
 
    [me initialize:self idx:i];
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 25acb63a90..8036348653 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -710,13 +710,6 @@ static void ui_companion_cocoa_toggle(void *data, bool force)
    (void)force;
 }
 
-static int ui_companion_cocoa_iterate(void *data, unsigned action)
-{
-   (void)data;
-
-   return 0;
-}
-
 static void ui_companion_cocoa_deinit(void *data)
 {
    ui_companion_cocoa_t *handle = (ui_companion_cocoa_t*)data;
@@ -763,7 +756,6 @@ static void *ui_companion_cocoa_get_main_window(void *data)
 ui_companion_driver_t ui_companion_cocoa = {
    ui_companion_cocoa_init,
    ui_companion_cocoa_deinit,
-   ui_companion_cocoa_iterate,
    ui_companion_cocoa_toggle,
    ui_companion_cocoa_event_command,
    ui_companion_cocoa_notify_content_loaded,
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index c9eadf6afc..fd2d3a2409 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -580,18 +580,6 @@ static void ui_companion_cocoatouch_toggle(void *data, bool force)
       [ap toggleUI];
 }
 
-static int ui_companion_cocoatouch_iterate(void *data, unsigned action)
-{
-   RetroArch_iOS *ap  = (RetroArch_iOS*)apple_platform;
-
-   (void)data;
-
-   if (ap)
-      [ap showPauseMenu:ap];
-
-   return 0;
-}
-
 static void ui_companion_cocoatouch_deinit(void *data)
 {
    ui_companion_cocoatouch_t *handle = (ui_companion_cocoatouch_t*)data;
@@ -679,7 +667,6 @@ static void ui_companion_cocoatouch_msg_queue_push(void *data, const char *msg,
 ui_companion_driver_t ui_companion_cocoatouch = {
    ui_companion_cocoatouch_init,
    ui_companion_cocoatouch_deinit,
-   ui_companion_cocoatouch_iterate,
    ui_companion_cocoatouch_toggle,
    ui_companion_cocoatouch_event_command,
    ui_companion_cocoatouch_notify_content_loaded,
diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp
index 61f9f3c314..42eec02288 100644
--- a/ui/drivers/ui_qt.cpp
+++ b/ui/drivers/ui_qt.cpp
@@ -645,13 +645,6 @@ static void* ui_companion_qt_init(void)
    return handle;
 }
 
-static int ui_companion_qt_iterate(void *data, unsigned action)
-{
-   (void)data;
-   (void)action;
-   return 0;
-}
-
 static void ui_companion_qt_notify_content_loaded(void *data)
 {
    (void)data;
@@ -747,7 +740,6 @@ void ui_companion_qt_msg_queue_push(void *data, const char *msg, unsigned priori
 ui_companion_driver_t ui_companion_qt = {
    ui_companion_qt_init,
    ui_companion_qt_deinit,
-   ui_companion_qt_iterate,
    ui_companion_qt_toggle,
    ui_companion_qt_event_command,
    ui_companion_qt_notify_content_loaded,
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index 1d75ab029b..0de663603b 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -290,14 +290,6 @@ static void *ui_companion_win32_init(void)
    return handle;
 }
 
-static int ui_companion_win32_iterate(void *data, unsigned action)
-{
-   (void)data;
-   (void)action;
-
-   return 0;
-}
-
 static void ui_companion_win32_notify_content_loaded(void *data)
 {
    (void)data;
@@ -327,7 +319,6 @@ static void ui_companion_win32_notify_list_pushed(void *data,
 ui_companion_driver_t ui_companion_win32 = {
    ui_companion_win32_init,
    ui_companion_win32_deinit,
-   ui_companion_win32_iterate,
    ui_companion_win32_toggle,
    ui_companion_win32_event_command,
    ui_companion_win32_notify_content_loaded,
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index 3317a695fc..ae6e9de6e0 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -127,7 +127,6 @@ typedef struct ui_companion_driver
 {
    void *(*init)(void);
    void (*deinit)(void *data);
-   int  (*iterate)(void *data, unsigned action);
    void (*toggle)(void *data, bool force);
    void (*event_command)(void *data, enum event_command action);
    void (*notify_content_loaded)(void *data);