From fe83be1872746617a64d572a46e360cb5e90405a Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Thu, 18 Feb 2021 22:26:08 -0800 Subject: xquartz: Apply spell check fixes from master for easier cherry-picking of changes in xquartz See also: 23e83724df4809fd7857cc609c33ce7e8d3021a4 Signed-off-by: Jeremy Huddleston Sequoia --- hw/xquartz/GL/capabilities.c | 6 +++--- hw/xquartz/GL/glcontextmodes.c | 8 ++++---- hw/xquartz/X11Controller.h | 4 ++-- hw/xquartz/darwin.c | 4 ++-- hw/xquartz/mach-startup/.gitignore | 2 +- hw/xquartz/pbproxy/x-selection.m | 10 +++++----- hw/xquartz/xpr/xprScreen.c | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c index 5573629fd..1744f1203 100644 --- a/hw/xquartz/GL/capabilities.c +++ b/hw/xquartz/GL/capabilities.c @@ -369,7 +369,7 @@ handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes) assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS); } -/* Return non-zero if an error occured. */ +/* Return non-zero if an error occurred. */ static CGLError handleRendererDescriptions(CGLRendererInfoObj info, GLint r, struct glCapabilitiesConfig *c) @@ -521,7 +521,7 @@ freeGlCapabilities(struct glCapabilities *cap) cap->configurations = NULL; } -/*Return true if an error occured. */ +/* Return true if an error occurred. */ bool getGlCapabilities(struct glCapabilities *cap) { @@ -566,6 +566,6 @@ getGlCapabilities(struct glCapabilities *cap) CGLDestroyRendererInfo(info); - /* No error occured. We are done. */ + /* No error occurred. We are done. */ return kCGLNoError; } diff --git a/hw/xquartz/GL/glcontextmodes.c b/hw/xquartz/GL/glcontextmodes.c index 17e7a5874..64a1ac7c4 100644 --- a/hw/xquartz/GL/glcontextmodes.c +++ b/hw/xquartz/GL/glcontextmodes.c @@ -114,7 +114,7 @@ _gl_convert_to_x_visual_type(int visualType) /** * Copy a GLX visual config structure to a GL context mode structure. All * of the fields in \c config are copied to \c mode. Additional fields in - * \c mode that can be derrived from the fields of \c config (i.e., + * \c mode that can be derived from the fields of \c config (i.e., * \c haveDepthBuffer) are also filled in. The remaining fields in \c mode * that cannot be derived are set to default values. * @@ -408,10 +408,10 @@ _gl_get_context_mode_data(const __GLcontextModes *mode, int attribute, * \param count Number of structures to allocate. * \param minimum_size Minimum size of a structure to allocate. This allows * for differences in the version of the - * \c __GLcontextModes stucture used in libGL and in a + * \c __GLcontextModes structure used in libGL and in a * DRI-based driver. * \returns A pointer to the first element in a linked list of \c count - * stuctures on success, or \c NULL on failure. + * structures on success, or \c NULL on failure. * * \warning Use of \c minimum_size does \b not guarantee binary compatibility. * The fundamental assumption is that if the \c minimum_size @@ -469,7 +469,7 @@ _gl_context_modes_create(unsigned count, size_t minimum_size) * Destroy a linked list of \c __GLcontextModes structures created by * \c _gl_context_modes_create. * - * \param modes Linked list of structures to be destroyed. All structres + * \param modes Linked list of structures to be destroyed. All structures * in the list will be freed. */ void diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h index a4cafcb9b..29008c593 100644 --- a/hw/xquartz/X11Controller.h +++ b/hw/xquartz/X11Controller.h @@ -75,7 +75,7 @@ IBOutlet NSMenuItem *window_separator; // window_separator is DEPRECATED due to this radar: // NSApplication releases the separator in the Windows menu even though it's an IBOutlet - // It is kept around for localization compatability and is subject to removal "eventually" + // It is kept around for localization compatibility and is subject to removal "eventually" // If it is !NULL (meaning it is in the nib), it is removed from the menu and released IBOutlet NSMenuItem *x11_about_item; @@ -83,7 +83,7 @@ IBOutlet NSMenuItem *apps_separator; IBOutlet NSMenuItem *toggle_fullscreen_item; #ifdef XQUARTZ_SPARKLE - NSMenuItem *check_for_updates_item; // Programatically enabled + NSMenuItem *check_for_updates_item; // Programmatically enabled #endif IBOutlet NSMenuItem *copy_menu_item; IBOutlet NSMenu *dock_apps_menu; diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 71a65f3ce..629ba4e6f 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -748,7 +748,7 @@ ddxProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-fakemouse2")) { if (i == argc - 1) { - FatalError("-fakemouse2 must be followed by a modifer list\n"); + FatalError("-fakemouse2 must be followed by a modifier list\n"); } if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], "")) darwinFakeMouse2Mask = 0; @@ -761,7 +761,7 @@ ddxProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-fakemouse3")) { if (i == argc - 1) { - FatalError("-fakemouse3 must be followed by a modifer list\n"); + FatalError("-fakemouse3 must be followed by a modifier list\n"); } if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], "")) darwinFakeMouse3Mask = 0; diff --git a/hw/xquartz/mach-startup/.gitignore b/hw/xquartz/mach-startup/.gitignore index 374abbfbe..f6a06c550 100644 --- a/hw/xquartz/mach-startup/.gitignore +++ b/hw/xquartz/mach-startup/.gitignore @@ -1,4 +1,4 @@ -# Add & Override for this directory and it's subdirectories +# Add & Override for this directory and its subdirectories mach_startup.h mach_startupServer.c mach_startupServer.h diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m index 7e386fc82..21b5b3172 100644 --- a/hw/xquartz/pbproxy/x-selection.m +++ b/hw/xquartz/pbproxy/x-selection.m @@ -778,7 +778,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, [self send_reply:&reply]; } -/* Return nil if an error occured. */ +/* Return nil if an error occurred. */ /* DO NOT retain the encdata for longer than the length of an event response. * The autorelease pool will reuse/free it. */ @@ -809,8 +809,8 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, return encdata; } -/* Return YES when an error has occured when trying to send the PICT. */ -/* The caller should send a default reponse with a property of None when an error occurs. */ +/* Return YES when an error has occurred when trying to send the PICT. */ +/* The caller should send a default response with a property of None when an error occurs. */ - (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb type:(NSBitmapImageFileType)imagetype @@ -857,7 +857,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, return NO; /*no error*/ } -/* Return YES if an error occured. */ +/* Return YES if an error occurred. */ /* The caller should send a reply with a property of None when an error occurs. */ - (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb @@ -1040,7 +1040,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True, &type)) { /* - * An error occured, so we should invoke the copy_completed:, but + * An error occurred, so we should invoke the copy_completed:, but * not handle_selection:type:propdata: */ [self copy_completed:e->selection]; diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 5e4fb721d..ec2cdaa0c 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -453,7 +453,7 @@ xprSetupScreen(int index, ScreenPtr pScreen) /* * xprUpdateScreen - * Update screen after configuation change. + * Update screen after configuration change. */ static void xprUpdateScreen(ScreenPtr pScreen) -- cgit v1.2.1