From 1fa9a257cc405ff4414625397217bf587ba40b7c Mon Sep 17 00:00:00 2001
From: neil <neil@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Mon, 13 Jan 2014 14:20:21 +0000
Subject: [PATCH] "Composit" -> "Compositing"

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@48719 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 compiler/include/intuition/screens.h                 | 4 ++--
 rom/intuition/openscreen.c                           | 6 +++---
 rom/intuition/screenclass.c                          | 6 +++---
 workbench/devs/monitors/Compositor/compositorclass.c | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/compiler/include/intuition/screens.h b/compiler/include/intuition/screens.h
index 91dcbce46f..df00672758 100644
--- a/compiler/include/intuition/screens.h
+++ b/compiler/include/intuition/screens.h
@@ -2,7 +2,7 @@
 #define INTUITION_SCREENS_H
 
 /*
-    Copyright © 1995-2013, The AROS Development Team. All rights reserved.
+    Copyright © 1995-2014, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Screen handling structures
@@ -214,7 +214,7 @@ struct ExtNewScreen
 #define SA_ExactMatchMonitorName (SA_Dummy + 138)/* [I..] BOOL            Strictly obey SA_MonitorName                        */
 #define SA_CompositingLayers    (SA_Dummy + 139) /* [I.G] BOOL            Reserved (MorphOS: use composition for layers)      */
 #define SA_CompositingFlags     (SA_Dummy + 140) /* [ISG] ULONG           AROS: Allow openers to request compositing modes    */
-#define SA_AlphaPreCompositHook (SA_Dummy + 141) /* [ISG] Hook *          AROS: Hook to Pre-Process Composited buffers        */
+#define SA_AlphaPreCompositingHook (SA_Dummy + 141) /* [ISG] Hook *       AROS: Hook to Pre-Process Composited buffers        */
 
 /* SA_Overscan */
 #define OSCAN_TEXT     1
diff --git a/rom/intuition/openscreen.c b/rom/intuition/openscreen.c
index 61540760b5..fbe743f5c4 100644
--- a/rom/intuition/openscreen.c
+++ b/rom/intuition/openscreen.c
@@ -1,5 +1,5 @@
 /*
-    Copyright © 1995-2013, The AROS Development Team. All rights reserved.
+    Copyright © 1995-2014, The AROS Development Team. All rights reserved.
     Copyright © 2001-2013, The MorphOS Development Team. All Rights Reserved.
     $Id$
 
@@ -485,9 +485,9 @@ static const char THIS_FILE[] = __FILE__;
                 compflags = tag->ti_Data;
                 DEBUG_OPENSCREEN(dprintf("OpenScreen: SA_CompositingFlags 0x%p\n", compflags));
                 break;
-            case SA_AlphaPreCompositHook:
+            case SA_AlphaPreCompositingHook:
                 compalphahook = (struct Hook *)tag->ti_Data;
-                DEBUG_OPENSCREEN(dprintf("OpenScreen: SA_AlphaPreCompositHook 0x%p\n", compalphahook));
+                DEBUG_OPENSCREEN(dprintf("OpenScreen: SA_AlphaPreCompositingHook 0x%p\n", compalphahook));
                 break;
             case SA_Left:
                 DEBUG_OPENSCREEN(dprintf("OpenScreen: SA_Left %ld\n",tag->ti_Data));
diff --git a/rom/intuition/screenclass.c b/rom/intuition/screenclass.c
index 38078521c5..3a58e72594 100644
--- a/rom/intuition/screenclass.c
+++ b/rom/intuition/screenclass.c
@@ -1,5 +1,5 @@
 /*
-    Copyright © 2013, The AROS Development Team. All rights reserved.
+    Copyright © 2013-2014, The AROS Development Team. All rights reserved.
     $Id$
 */
 
@@ -869,7 +869,7 @@ IPTR ScreenClass__OM_GET(Class *cl, Object *o, struct opGet *msg)
         *msg->opg_Storage = (IPTR)(screen->SpecialFlags >> 8);
         break;
 
-    case SA_AlphaPreCompositHook:
+    case SA_AlphaPreCompositingHook:
         *msg->opg_Storage = (IPTR)screen->preAlphaCompHook;
         break;
 
@@ -946,7 +946,7 @@ IPTR ScreenClass__OM_SET(Class *cl, Object *o, struct opSet *msg)
             }
             break;
 
-        case SA_AlphaPreCompositHook:
+        case SA_AlphaPreCompositingHook:
             {
                 screen->preAlphaCompHook = (struct Hook *)tag->ti_Data;
             }
diff --git a/workbench/devs/monitors/Compositor/compositorclass.c b/workbench/devs/monitors/Compositor/compositorclass.c
index 2b57236a3f..f7ca4bed0c 100644
--- a/workbench/devs/monitors/Compositor/compositorclass.c
+++ b/workbench/devs/monitors/Compositor/compositorclass.c
@@ -1,5 +1,5 @@
 /*
-    Copyright © 2010-2013, The AROS Development Team. All rights reserved.
+    Copyright © 2010-2014, The AROS Development Team. All rights reserved.
     $Id$
 */
 
@@ -1138,8 +1138,8 @@ OOP_Object *METHOD(Compositor, Hidd_Compositor, BitMapStackChanged)
             n->sbmflags |= STACKNODEF_DISPLAYABLE;
             if (n->sbmflags & COMPF_ALPHA)
             {
-                GetAttr(SA_AlphaPreCompositHook, (Object *)bmScreen, (IPTR *)&n->prealphacomphook);
-                DSTACK(bug("[Compositor] %s: Pre-AlphaComposit Hook @ 0x%p\n", __PRETTY_FUNCTION__, n->prealphacomphook));
+                GetAttr(SA_AlphaPreCompositingHook, (Object *)bmScreen, (IPTR *)&n->prealphacomphook);
+                DSTACK(bug("[Compositor] %s: Pre-AlphaCompositing Hook @ 0x%p\n", __PRETTY_FUNCTION__, n->prealphacomphook));
             }
         }
 
-- 
2.11.4.GIT