[gtk/wip/chergert/macos-iosurface] rename superview to view

[Christian Hergert <chergert src gnome org>]

commit 52b17f521be9ec5ea2b3af9ab0a621d5b64fb40e
Author: Christian Hergert <christian hergert me>
Date:   Wed Feb 9 14:38:10 2022 -0800

    rename superview to view

 gdk/macos/{GdkMacosSuperView.c => GdkMacosView.c} | 6 +++---
 gdk/macos/{GdkMacosSuperView.h => GdkMacosView.h} | 8 ++++----
 gdk/macos/GdkMacosWindow.c                        | 8 ++++----
 gdk/macos/gdkmacoscairocontext.c                  | 2 --
 gdk/macos/gdkmacossurface.c                       | 7 +++----
 gdk/macos/meson.build                             | 3 +--
 6 files changed, 15 insertions(+), 19 deletions(-)
---
diff --git a/gdk/macos/GdkMacosSuperView.c b/gdk/macos/GdkMacosView.c
similarity index 95%
rename from gdk/macos/GdkMacosSuperView.c
rename to gdk/macos/GdkMacosView.c
index 04a0420477..66cac30be4 100644
--- a/gdk/macos/GdkMacosSuperView.c
+++ b/gdk/macos/GdkMacosView.c
@@ -1,4 +1,4 @@
-/* GdkMacosSuperView.c
+/* GdkMacosView.c
  *
  * Copyright 2022 Christian Hergert <chergert redhat com>
  *
@@ -23,9 +23,9 @@
 #include <CoreGraphics/CoreGraphics.h>
 
 #import "GdkMacosLayer.h"
-#import "GdkMacosSuperView.h"
+#import "GdkMacosView.h"
 
-@implementation GdkMacosSuperView
+@implementation GdkMacosView
 
 -(id)initWithFrame:(NSRect)frame
 {
diff --git a/gdk/macos/GdkMacosSuperView.h b/gdk/macos/GdkMacosView.h
similarity index 84%
rename from gdk/macos/GdkMacosSuperView.h
rename to gdk/macos/GdkMacosView.h
index a0a2a198f5..db3b05efa0 100644
--- a/gdk/macos/GdkMacosSuperView.h
+++ b/gdk/macos/GdkMacosView.h
@@ -1,4 +1,4 @@
-/* GdkMacosSuperView.h
+/* GdkMacosView.h
  *
  * Copyright 2022 Christian Hergert <chergert redhat com>
  *
@@ -24,12 +24,12 @@
 
 #include "gdkmacosbuffer-private.h"
 
-#define GDK_IS_MACOS_SUPER_VIEW(obj) ((obj) && [obj isKindOfClass:[GdkMacosSuperView class]])
+#define GDK_IS_MACOS_VIEW(obj) ((obj) && [obj isKindOfClass:[GdkMacosView class]])
 
-@interface GdkMacosSuperView : GdkMacosBaseView
+@interface GdkMacosView : GdkMacosBaseView
 {
   NSRect _nextFrame;
-  guint _nextFrameDirty : 1;
+  guint  _nextFrameDirty : 1;
 }
 
 -(void)setOpaqueRegion:(const cairo_region_t *)opaqueRegion;
diff --git a/gdk/macos/GdkMacosWindow.c b/gdk/macos/GdkMacosWindow.c
index 4cd7883d20..9ed2147ed8 100644
--- a/gdk/macos/GdkMacosWindow.c
+++ b/gdk/macos/GdkMacosWindow.c
@@ -25,7 +25,7 @@
 
 #import "GdkMacosBaseView.h"
 #import "GdkMacosGLView.h"
-#import "GdkMacosSuperView.h"
+#import "GdkMacosView.h"
 #import "GdkMacosWindow.h"
 
 #include "gdkmacosclipboard-private.h"
@@ -281,7 +281,7 @@ typedef NSString *CALayerContentsGravity;
                    defer:(BOOL)flag
                   screen:(NSScreen *)screen
 {
-  GdkMacosSuperView *view;
+  GdkMacosView *view;
 
   self = [super initWithContentRect:contentRect
                                styleMask:styleMask
@@ -294,7 +294,7 @@ typedef NSString *CALayerContentsGravity;
   [self setReleasedWhenClosed:YES];
   [self setPreservesContentDuringLiveResize:NO];
 
-  view = [[GdkMacosSuperView alloc] initWithFrame:contentRect];
+  view = [[GdkMacosView alloc] initWithFrame:contentRect];
   [self setContentView:view];
   [view release];
 
@@ -853,7 +853,7 @@ typedef NSString *CALayerContentsGravity;
 
 -(void)swapBuffer:(GdkMacosBuffer *)buffer withDamage:(const cairo_region_t *)damage
 {
-  [(GdkMacosSuperView *)[self contentView] swapBuffer:buffer withDamage:damage];
+  [(GdkMacosView *)[self contentView] swapBuffer:buffer withDamage:damage];
 }
 
 @end
diff --git a/gdk/macos/gdkmacoscairocontext.c b/gdk/macos/gdkmacoscairocontext.c
index abee8f3c5f..aed6614155 100644
--- a/gdk/macos/gdkmacoscairocontext.c
+++ b/gdk/macos/gdkmacoscairocontext.c
@@ -26,8 +26,6 @@
 #include <QuartzCore/QuartzCore.h>
 #include <CoreGraphics/CoreGraphics.h>
 
-#import "GdkMacosSuperView.h"
-
 #include "gdkmacosbuffer-private.h"
 #include "gdkmacoscairocontext-private.h"
 #include "gdkmacossurface-private.h"
diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index 5cc9c3c47a..80e3a19425 100644
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -23,7 +23,7 @@
 #include <float.h>
 #include <gdk/gdk.h>
 
-#import "GdkMacosSuperView.h"
+#import "GdkMacosView.h"
 
 #include "gdkmacossurface-private.h"
 
@@ -111,9 +111,8 @@ gdk_macos_surface_set_opaque_region (GdkSurface     *surface,
       self->opaque_region = cairo_region_copy (region);
     }
 
-  if ((nsview = _gdk_macos_surface_get_view (GDK_MACOS_SURFACE (surface))) &&
-      GDK_IS_MACOS_SUPER_VIEW (nsview))
-    [(GdkMacosSuperView *)nsview setOpaqueRegion:region];
+  if ((nsview = _gdk_macos_surface_get_view (GDK_MACOS_SURFACE (surface))))
+    [(GdkMacosView *)nsview setOpaqueRegion:region];
 }
 
 static void
diff --git a/gdk/macos/meson.build b/gdk/macos/meson.build
index cc89252812..f42914a9d0 100644
--- a/gdk/macos/meson.build
+++ b/gdk/macos/meson.build
@@ -21,11 +21,10 @@ gdk_macos_sources = files([
   'gdkmacosseat.c',
   'gdkmacossurface.c',
   'gdkmacostoplevelsurface.c',
-
   'GdkMacosBaseView.c',
   'GdkMacosLayer.c',
   'GdkMacosTile.c',
-  'GdkMacosSuperView.c',
+  'GdkMacosView.c',
   'GdkMacosWindow.c',
 
   'GdkMacosGLView.c',