Open BOOPSI/ReAction classes using the new-style methods.

Create some alternative NewObject macros and make some code use them.

1 files changed, 27 insertions, 27 deletions

diff --git a/amiga/gui.c b/amiga/gui.c
index ad70f2fbb..2fa1c5ef6 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3643,19 +3643,19 @@ gui_window_create(struct browser_window *bw,
 		ami_get_theme_filename(fave, "theme_fave", false);
 		ami_get_theme_filename(unfave, "theme_unfave", false);
 
-		g->shared->objects[GID_FAVE_ADD] = BitMapObject,
+		g->shared->objects[GID_FAVE_ADD] = BitMapObj,
 					BITMAP_SourceFile, fave,
 					BITMAP_Screen, scrn,
 					BITMAP_Masking, TRUE,
 					BitMapEnd;
 
-		g->shared->objects[GID_FAVE_RMV] = BitMapObject,
+		g->shared->objects[GID_FAVE_RMV] = BitMapObj,
 					BITMAP_SourceFile, unfave,
 					BITMAP_Screen, scrn,
 					BITMAP_Masking, TRUE,
 					BitMapEnd;
 
-		g->shared->objects[GID_ADDTAB_BM] = BitMapObject,
+		g->shared->objects[GID_ADDTAB_BM] = BitMapObj,
 					BITMAP_SourceFile, addtab,
 					BITMAP_SelectSourceFile, addtab_s,
 					BITMAP_DisabledSourceFile, addtab_g,
@@ -3663,7 +3663,7 @@ gui_window_create(struct browser_window *bw,
 					BITMAP_Masking, TRUE,
 					BitMapEnd;
 
-		g->shared->objects[GID_CLOSETAB_BM] = BitMapObject,
+		g->shared->objects[GID_CLOSETAB_BM] = BitMapObj,
 					BITMAP_SourceFile, closetab,
 					BITMAP_SelectSourceFile, closetab_s,
 					BITMAP_DisabledSourceFile, closetab_g,
@@ -3697,7 +3697,7 @@ gui_window_create(struct browser_window *bw,
 		}
 		else
 		{
-			g->shared->objects[GID_TABS_FLAG] = BitMapObject,
+			g->shared->objects[GID_TABS_FLAG] = BitMapObj,
 					BITMAP_SourceFile, tabthrobber,
 					BITMAP_Screen,scrn,
 					BITMAP_Masking,TRUE,
@@ -3706,7 +3706,7 @@ gui_window_create(struct browser_window *bw,
 
 		LOG(("Creating window object"));
 
-		g->shared->objects[OID_MAIN] = WindowObject,
+		g->shared->objects[OID_MAIN] = WindowObj,
 #ifndef __amigaos4__
 			WA_Width, 100,
 			WA_Height, 100,
@@ -3742,16 +3742,16 @@ gui_window_create(struct browser_window *bw,
 			WINDOW_BuiltInScroll, TRUE,
 			WINDOW_GadgetHelp, TRUE,
 			WINDOW_UserData, g->shared,
-  			WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = VGroupObject,
+  			WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = LayoutVObj,
 				LAYOUT_SpaceOuter, TRUE,
-				LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = HGroupObject,
+				LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = LayoutHObj,
 					LAYOUT_VertAlignment, LALIGN_CENTER,
 					LAYOUT_AddChild, g->shared->objects[GID_BACK] = ButtonObject,
 						GA_ID,GID_BACK,
 						GA_RelVerify,TRUE,
 						GA_Disabled,TRUE,
 						GA_HintInfo, g->shared->helphints[GID_BACK],
-						BUTTON_RenderImage,BitMapObject,
+						BUTTON_RenderImage,BitMapObj,
 							BITMAP_SourceFile,nav_west,
 							BITMAP_SelectSourceFile,nav_west_s,
 							BITMAP_DisabledSourceFile,nav_west_g,
@@ -3766,7 +3766,7 @@ gui_window_create(struct browser_window *bw,
 						GA_RelVerify,TRUE,
 						GA_Disabled,TRUE,
 						GA_HintInfo, g->shared->helphints[GID_FORWARD],
-						BUTTON_RenderImage,BitMapObject,
+						BUTTON_RenderImage,BitMapObj,
 							BITMAP_SourceFile,nav_east,
 							BITMAP_SelectSourceFile,nav_east_s,
 							BITMAP_DisabledSourceFile,nav_east_g,
@@ -3780,7 +3780,7 @@ gui_window_create(struct browser_window *bw,
 						GA_ID,GID_STOP,
 						GA_RelVerify,TRUE,
 						GA_HintInfo, g->shared->helphints[GID_STOP],
-						BUTTON_RenderImage,BitMapObject,
+						BUTTON_RenderImage,BitMapObj,
 							BITMAP_SourceFile,stop,
 							BITMAP_SelectSourceFile,stop_s,
 							BITMAP_DisabledSourceFile,stop_g,
@@ -3794,7 +3794,7 @@ gui_window_create(struct browser_window *bw,
 						GA_ID,GID_RELOAD,
 						GA_RelVerify,TRUE,
 						GA_HintInfo, g->shared->helphints[GID_RELOAD],
-						BUTTON_RenderImage,BitMapObject,
+						BUTTON_RenderImage,BitMapObj,
 							BITMAP_SourceFile,reload,
 							BITMAP_SelectSourceFile,reload_s,
 							BITMAP_DisabledSourceFile,reload_g,
@@ -3808,7 +3808,7 @@ gui_window_create(struct browser_window *bw,
 						GA_ID,GID_HOME,
 						GA_RelVerify,TRUE,
 						GA_HintInfo, g->shared->helphints[GID_HOME],
-						BUTTON_RenderImage,BitMapObject,
+						BUTTON_RenderImage,BitMapObj,
 							BITMAP_SourceFile,home,
 							BITMAP_SelectSourceFile,home_s,
 							BITMAP_DisabledSourceFile,home_g,
@@ -3818,7 +3818,7 @@ gui_window_create(struct browser_window *bw,
 					ButtonEnd,
 					CHILD_WeightedWidth,0,
 					CHILD_WeightedHeight,0,
-					LAYOUT_AddChild, HGroupObject, // FavIcon, URL bar and hotlist star
+					LAYOUT_AddChild, LayoutHObj, // FavIcon, URL bar and hotlist star
 						LAYOUT_VertAlignment, LALIGN_CENTER,
 						LAYOUT_AddChild, g->shared->objects[GID_ICON] = SpaceObject,
 							GA_ID, GID_ICON,
@@ -3853,7 +3853,7 @@ gui_window_create(struct browser_window *bw,
 				//	GA_RelVerify, TRUE,
 				//	LAYOUT_RelVerify, TRUE,
 					LAYOUT_WeightBar, TRUE,
-					LAYOUT_AddChild, HGroupObject,
+					LAYOUT_AddChild, LayoutHObj,
 						LAYOUT_VertAlignment, LALIGN_CENTER,
 						LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObject,
 							GA_ID, GID_SEARCH_ICON,
@@ -3887,11 +3887,11 @@ gui_window_create(struct browser_window *bw,
 					BEVEL_Style, BVS_SBAR_VERT,
 				BevelEnd,
 				CHILD_WeightedHeight, 0,
-				LAYOUT_AddChild, g->shared->objects[GID_HOTLISTLAYOUT] = VGroupObject,
+				LAYOUT_AddChild, g->shared->objects[GID_HOTLISTLAYOUT] = LayoutVObj,
 					LAYOUT_SpaceInner, FALSE,
 				LayoutEnd,
 				CHILD_WeightedHeight,0,
-				LAYOUT_AddChild, g->shared->objects[GID_TABLAYOUT] = HGroupObject,
+				LAYOUT_AddChild, g->shared->objects[GID_TABLAYOUT] = LayoutHObj,
 					LAYOUT_SpaceInner,FALSE,
 					addtabclosegadget, g->shared->objects[GID_CLOSETAB],
 					CHILD_WeightedWidth,0,
@@ -3905,8 +3905,8 @@ gui_window_create(struct browser_window *bw,
 					CHILD_WeightedHeight,0,
 				LayoutEnd,
 				CHILD_WeightedHeight,0,
-				LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = HGroupObject,
-					LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = VGroupObject,
+				LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj,
+					LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj,
 						LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObject,
 							GA_ID,GID_BROWSER,
 							SPACE_Transparent,TRUE,
@@ -3923,7 +3923,7 @@ gui_window_create(struct browser_window *bw,
 		g->shared->tabs = 0;
 		g->tab_node = NULL;
 
-		g->shared->objects[OID_MAIN] = WindowObject,
+		g->shared->objects[OID_MAIN] = WindowObj,
        	    WA_ScreenTitle, ami_gui_get_screen_title(),
            	WA_Activate, TRUE,
            	WA_DepthGadget, FALSE,
@@ -3950,10 +3950,10 @@ gui_window_create(struct browser_window *bw,
 			WINDOW_SharedPort,sport,
 			WINDOW_UserData,g->shared,
 			WINDOW_BuiltInScroll,TRUE,
-			WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = HGroupObject,
+			WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = LayoutHObj,
 			LAYOUT_SpaceOuter, TRUE,
-				LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = HGroupObject,
-					LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = VGroupObject,
+				LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj,
+					LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj,
 						LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObject,
 							GA_ID,GID_BROWSER,
 							SPACE_Transparent,TRUE,
@@ -4907,7 +4907,7 @@ static nserror gui_search_web_provider_update(const char *provider_name,
 			if(gwin->search_bm != NULL)
 				DisposeObject(gwin->search_bm);
 
-			gwin->search_bm = BitMapObject,
+			gwin->search_bm = BitMapObj,
 						BITMAP_Screen, scrn,
 						BITMAP_Width, 16,
 						BITMAP_Height, 16,
@@ -5161,7 +5161,7 @@ Object *ami_gui_splash_open(void)
 	struct TextAttr tattr;
 	struct TextFont *tfont;
 
-	win_obj = WindowObject,
+	win_obj = WindowObj,
 #ifdef __amigaos4__
 				WA_ToolBox, TRUE,
 #else
@@ -5173,8 +5173,8 @@ Object *ami_gui_splash_open(void)
 				WINDOW_Position, WPOS_CENTERSCREEN,
 				WINDOW_LockWidth, TRUE,
 				WINDOW_LockHeight, TRUE,
-				WINDOW_ParentGroup, VGroupObject,
-					LAYOUT_AddImage, bm_obj = BitMapObject,
+				WINDOW_ParentGroup, LayoutVObj,
+					LAYOUT_AddImage, bm_obj = BitMapObj,
 						BITMAP_SourceFile, "PROGDIR:Resources/splash.png",
 						BITMAP_Screen, wbscreen,
 						BITMAP_Precision, PRECISION_IMAGE,