From c21739d52b7df06d564c437b6b07fc733d5535c6 Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Tue, 18 Aug 2015 15:20:05 +0000
Subject: [PATCH] use consistent hidd naming

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@51014 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 arch/all-hosted/hidd/x11/bitmap_class.h  | 7 ++++---
 arch/all-hosted/hidd/x11/x11gfx.c        | 2 +-
 arch/all-hosted/hidd/x11/x11gfx.conf     | 6 ++++--
 arch/all-hosted/hidd/x11/x11gfx_intern.h | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/arch/all-hosted/hidd/x11/bitmap_class.h b/arch/all-hosted/hidd/x11/bitmap_class.h
index dc767e89d4..4e1e7ada03 100644
--- a/arch/all-hosted/hidd/x11/bitmap_class.h
+++ b/arch/all-hosted/hidd/x11/bitmap_class.h
@@ -1,5 +1,5 @@
 /*
-    Copyright © 1995-2011, The AROS Development Team. All rights reserved.
+    Copyright © 1995-2015, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: X11 bitmap class, external definitions
@@ -14,12 +14,13 @@
  * classes, although they don't have a common superclass
  */
 
-#define IID_Hidd_X11BitMap "hidd.bitmap.x11bitmap"
-
 extern OOP_AttrBase HiddX11BitMapAB;
 
 /* extern OOP_AttrBase HiddX11BitMapAB; */
 
+#define CLID_Hidd_BitMap_X11    "hidd.bitmap.x11"
+#define IID_Hidd_BitMap_X11     "hidd.bitmap.x11"
+
 enum
 {
     aoHidd_X11BitMap_Drawable,
diff --git a/arch/all-hosted/hidd/x11/x11gfx.c b/arch/all-hosted/hidd/x11/x11gfx.c
index 614edd8121..81a216bb74 100644
--- a/arch/all-hosted/hidd/x11/x11gfx.c
+++ b/arch/all-hosted/hidd/x11/x11gfx.c
@@ -65,7 +65,7 @@ OOP_AttrBase HiddAttrBase;
 static const struct OOP_ABDescr attrbases[] =
 {
     { IID_Hidd_BitMap       , &HiddBitMapAttrBase   },
-    { IID_Hidd_X11BitMap    , &HiddX11BitMapAB      },
+    { IID_Hidd_BitMap_X11    , &HiddX11BitMapAB      },
     { IID_Hidd_Sync         , &HiddSyncAttrBase     },
     { IID_Hidd_PixFmt       , &HiddPixFmtAttrBase   },
     { IID_Hidd_Gfx          , &HiddGfxAttrBase      },
diff --git a/arch/all-hosted/hidd/x11/x11gfx.conf b/arch/all-hosted/hidd/x11/x11gfx.conf
index c7280ad3fa..ccdeff8c5b 100644
--- a/arch/all-hosted/hidd/x11/x11gfx.conf
+++ b/arch/all-hosted/hidd/x11/x11gfx.conf
@@ -4,7 +4,7 @@ libbase 	X11ClBase
 libbasetype 	struct x11clbase
 version 	42.0
 residentpri     9
-classid         CLID_Hidd_X11Gfx
+classid         CLID_Hidd_Gfx_X11
 superclass      CLID_Hidd_Gfx
 classptr_field  xsd.gfxclass
 classdatatype   struct gfx_data
@@ -14,6 +14,7 @@ classdatatype   struct gfx_data
 #include <hidd/graphics.h>
 #include "x11.h"
 #include "x11gfx_intern.h"
+#include "bitmap_class.h"
 #include "bitmap.h"
 
 /* Avoid conflict with intuition and X11 definition of CurrentTime in the generated code */
@@ -38,9 +39,10 @@ SetCursorVisible
 ##begin config
 basename X11BM
 type hidd
-superclass CLID_Hidd_BitMap
 classptr_field xsd.bmclass
 classdatatype struct bitmap_data
+classid         CLID_Hidd_BitMap_X11
+superclass CLID_Hidd_BitMap
 ##end config
 
 ##begin methodlist
diff --git a/arch/all-hosted/hidd/x11/x11gfx_intern.h b/arch/all-hosted/hidd/x11/x11gfx_intern.h
index 305028072b..0b542cecf0 100644
--- a/arch/all-hosted/hidd/x11/x11gfx_intern.h
+++ b/arch/all-hosted/hidd/x11/x11gfx_intern.h
@@ -42,7 +42,8 @@ VOID free_ximage(XImage *image);
 
 /* Private Attrs and methods for the X11Gfx Hidd */
 
-#define IID_Hidd_X11Gfx     	"hidd.gfx.x11gfx"
+#define CLID_Hidd_Gfx_X11	"hidd.gfx.x11"
+#define IID_Hidd_Gfx_X11     	"hidd.gfx.x11"
 
 #define PEN_BITS    4
 #define NUM_COLORS  (1L << PEN_BITS)
-- 
2.11.4.GIT