From 878117d8c70564983afddfb2bb26daa71f25b8c1 Mon Sep 17 00:00:00 2001
From: Tim Wiederhake <twied@gmx.net>
Date: Sat, 30 Dec 2023 20:49:48 +0100
Subject: Rename field 'delete' to 'remove' in TitlebarPixmaps

'delete' is a keyword in c++. Its usage confuses some tools that work
with c and c++ source code.

Signed-off-by: Tim Wiederhake <twied@gmx.net>
---
 src/screen.h | 2 +-
 src/twm.c    | 2 +-
 src/util.c   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/screen.h b/src/screen.h
index 3a1cb52..d8bf996 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -56,7 +56,7 @@ typedef struct _TitlebarPixmaps {
     Pixmap resize;
     Pixmap question;
     Pixmap menu;
-    Pixmap delete;
+    Pixmap remove;
 } TitlebarPixmaps;
 
 typedef struct ScreenInfo {
diff --git a/src/twm.c b/src/twm.c
index 564eeb0..57f50ad 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -522,7 +522,7 @@ main(int argc, char *argv[])
         Scr->tbpm.resize = None;
         Scr->tbpm.question = None;
         Scr->tbpm.menu = None;
-        Scr->tbpm.delete = None;
+        Scr->tbpm.remove = None;
 
         InitVariables();
         InitMenus();
diff --git a/src/util.c b/src/util.c
index f77b0b6..baff6c8 100644
--- a/src/util.c
+++ b/src/util.c
@@ -919,11 +919,11 @@ CreateDotPixmap(unsigned *widthp, unsigned *heightp)
     if (!(h & 1))
         h--;
     *widthp = *heightp = (unsigned int) h;
-    if (Scr->tbpm.delete == None) {
+    if (Scr->tbpm.remove == None) {
         GC gc;
         Pixmap pix;
 
-        pix = Scr->tbpm.delete =
+        pix = Scr->tbpm.remove =
             XCreatePixmap(dpy, Scr->Root, (unsigned) h, (unsigned) h, 1);
         gc = XCreateGC(dpy, pix, 0L, NULL);
         XSetLineAttributes(dpy, gc, (unsigned) h, LineSolid, CapRound,
@@ -934,7 +934,7 @@ CreateDotPixmap(unsigned *widthp, unsigned *heightp)
         XDrawLine(dpy, pix, gc, h / 2, h / 2, h / 2, h / 2);
         XFreeGC(dpy, gc);
     }
-    return Scr->tbpm.delete;
+    return Scr->tbpm.remove;
 }
 
 #define questionmark_width 8
-- 
cgit v1.2.3