ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 299 insertions, 299 deletions

diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index dc51d501b99..26b97a1cdd9 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -21,7 +21,6 @@
  * \ingroup spoutliner
  */
 
-
 #include <string.h>
 #include <stdio.h>
 
@@ -52,380 +51,381 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-
 #include "outliner_intern.h"
 #include "GPU_framebuffer.h"
 
 static void outliner_main_region_init(wmWindowManager *wm, ARegion *ar)
 {
-	ListBase *lb;
-	wmKeyMap *keymap;
-
-	/* make sure we keep the hide flags */
-	ar->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
-	ar->v2d.scroll &= ~(V2D_SCROLL_LEFT | V2D_SCROLL_TOP);	/* prevent any noise of past */
-	ar->v2d.scroll |= V2D_SCROLL_HORIZONTAL_HIDE;
-	ar->v2d.scroll |= V2D_SCROLL_VERTICAL_HIDE;
-
-	ar->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y);
-	ar->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT);
-	ar->v2d.keeptot = V2D_KEEPTOT_STRICT;
-	ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f;
-
-	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy);
-
-	/* own keymap */
-	keymap = WM_keymap_ensure(wm->defaultconf, "Outliner", SPACE_OUTLINER, 0);
-	/* don't pass on view2d mask, it's always set with scrollbar space, hide fails */
-	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, NULL, &ar->winrct);
-
-	/* Add dropboxes */
-	lb = WM_dropboxmap_find("Outliner", SPACE_OUTLINER, RGN_TYPE_WINDOW);
-	WM_event_add_dropbox_handler(&ar->handlers, lb);
+  ListBase *lb;
+  wmKeyMap *keymap;
+
+  /* make sure we keep the hide flags */
+  ar->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM);
+  ar->v2d.scroll &= ~(V2D_SCROLL_LEFT | V2D_SCROLL_TOP); /* prevent any noise of past */
+  ar->v2d.scroll |= V2D_SCROLL_HORIZONTAL_HIDE;
+  ar->v2d.scroll |= V2D_SCROLL_VERTICAL_HIDE;
+
+  ar->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y);
+  ar->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT);
+  ar->v2d.keeptot = V2D_KEEPTOT_STRICT;
+  ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f;
+
+  UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy);
+
+  /* own keymap */
+  keymap = WM_keymap_ensure(wm->defaultconf, "Outliner", SPACE_OUTLINER, 0);
+  /* don't pass on view2d mask, it's always set with scrollbar space, hide fails */
+  WM_event_add_keymap_handler_bb(&ar->handlers, keymap, NULL, &ar->winrct);
+
+  /* Add dropboxes */
+  lb = WM_dropboxmap_find("Outliner", SPACE_OUTLINER, RGN_TYPE_WINDOW);
+  WM_event_add_dropbox_handler(&ar->handlers, lb);
 }
 
 static void outliner_main_region_draw(const bContext *C, ARegion *ar)
 {
-	View2D *v2d = &ar->v2d;
-	View2DScrollers *scrollers;
+  View2D *v2d = &ar->v2d;
+  View2DScrollers *scrollers;
 
-	/* clear */
-	UI_ThemeClearColor(TH_BACK);
-	GPU_clear(GPU_COLOR_BIT);
+  /* clear */
+  UI_ThemeClearColor(TH_BACK);
+  GPU_clear(GPU_COLOR_BIT);
 
-	draw_outliner(C);
+  draw_outliner(C);
 
-	/* reset view matrix */
-	UI_view2d_view_restore(C);
+  /* reset view matrix */
+  UI_view2d_view_restore(C);
 
-	/* scrollers */
-	scrollers = UI_view2d_scrollers_calc(C, v2d, NULL, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
-	UI_view2d_scrollers_draw(C, v2d, scrollers);
-	UI_view2d_scrollers_free(scrollers);
+  /* scrollers */
+  scrollers = UI_view2d_scrollers_calc(
+      C, v2d, NULL, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
+  UI_view2d_scrollers_draw(C, v2d, scrollers);
+  UI_view2d_scrollers_free(scrollers);
 }
 
-
 static void outliner_main_region_free(ARegion *UNUSED(ar))
 {
-
 }
 
-static void outliner_main_region_listener(
-        wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
-        wmNotifier *wmn, const Scene *UNUSED(scene))
+static void outliner_main_region_listener(wmWindow *UNUSED(win),
+                                          ScrArea *UNUSED(sa),
+                                          ARegion *ar,
+                                          wmNotifier *wmn,
+                                          const Scene *UNUSED(scene))
 {
-	/* context changes */
-	switch (wmn->category) {
-		case NC_SCENE:
-			switch (wmn->data) {
-				case ND_OB_ACTIVE:
-				case ND_OB_SELECT:
-				case ND_OB_VISIBLE:
-				case ND_OB_RENDER:
-				case ND_MODE:
-				case ND_KEYINGSET:
-				case ND_FRAME:
-				case ND_RENDER_OPTIONS:
-				case ND_SEQUENCER:
-				case ND_LAYER:
-				case ND_LAYER_CONTENT:
-				case ND_WORLD:
-				case ND_SCENEBROWSE:
-					ED_region_tag_redraw(ar);
-					break;
-			}
-			break;
-		case NC_OBJECT:
-			switch (wmn->data) {
-				case ND_TRANSFORM:
-					/* transform doesn't change outliner data */
-					break;
-				case ND_BONE_ACTIVE:
-				case ND_BONE_SELECT:
-				case ND_DRAW:
-				case ND_PARENT:
-				case ND_OB_SHADING:
-					ED_region_tag_redraw(ar);
-					break;
-				case ND_CONSTRAINT:
-					switch (wmn->action) {
-						case NA_ADDED:
-						case NA_REMOVED:
-						case NA_RENAME:
-							ED_region_tag_redraw(ar);
-							break;
-					}
-					break;
-				case ND_MODIFIER:
-					/* all modifier actions now */
-					ED_region_tag_redraw(ar);
-					break;
-				default:
-					/* Trigger update for NC_OBJECT itself */
-					ED_region_tag_redraw(ar);
-					break;
-			}
-			break;
-		case NC_GROUP:
-			/* all actions now, todo: check outliner view mode? */
-			ED_region_tag_redraw(ar);
-			break;
-		case NC_LAMP:
-			/* For updating light icons, when changing light type */
-			if (wmn->data == ND_LIGHTING_DRAW) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-		case NC_SPACE:
-			if (wmn->data == ND_SPACE_OUTLINER) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-		case NC_ID:
-			if (wmn->action == NA_RENAME) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-		case NC_MATERIAL:
-			switch (wmn->data) {
-				case ND_SHADING_LINKS:
-					ED_region_tag_redraw(ar);
-					break;
-			}
-			break;
-		case NC_GEOM:
-			switch (wmn->data) {
-				case ND_VERTEX_GROUP:
-				case ND_DATA:
-					ED_region_tag_redraw(ar);
-					break;
-			}
-			break;
-		case NC_ANIMATION:
-			switch (wmn->data) {
-				case ND_NLA_ACTCHANGE:
-				case ND_KEYFRAME:
-					ED_region_tag_redraw(ar);
-					break;
-				case ND_ANIMCHAN:
-					if (wmn->action == NA_SELECTED) {
-						ED_region_tag_redraw(ar);
-					}
-					break;
-			}
-			break;
-		case NC_GPENCIL:
-			if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-		case NC_SCREEN:
-			if (ELEM(wmn->data, ND_LAYER)) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-		case NC_MASK:
-			if (ELEM(wmn->action, NA_ADDED)) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-		case NC_PAINTCURVE:
-			if (ELEM(wmn->action, NA_ADDED)) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-	}
-
+  /* context changes */
+  switch (wmn->category) {
+    case NC_SCENE:
+      switch (wmn->data) {
+        case ND_OB_ACTIVE:
+        case ND_OB_SELECT:
+        case ND_OB_VISIBLE:
+        case ND_OB_RENDER:
+        case ND_MODE:
+        case ND_KEYINGSET:
+        case ND_FRAME:
+        case ND_RENDER_OPTIONS:
+        case ND_SEQUENCER:
+        case ND_LAYER:
+        case ND_LAYER_CONTENT:
+        case ND_WORLD:
+        case ND_SCENEBROWSE:
+          ED_region_tag_redraw(ar);
+          break;
+      }
+      break;
+    case NC_OBJECT:
+      switch (wmn->data) {
+        case ND_TRANSFORM:
+          /* transform doesn't change outliner data */
+          break;
+        case ND_BONE_ACTIVE:
+        case ND_BONE_SELECT:
+        case ND_DRAW:
+        case ND_PARENT:
+        case ND_OB_SHADING:
+          ED_region_tag_redraw(ar);
+          break;
+        case ND_CONSTRAINT:
+          switch (wmn->action) {
+            case NA_ADDED:
+            case NA_REMOVED:
+            case NA_RENAME:
+              ED_region_tag_redraw(ar);
+              break;
+          }
+          break;
+        case ND_MODIFIER:
+          /* all modifier actions now */
+          ED_region_tag_redraw(ar);
+          break;
+        default:
+          /* Trigger update for NC_OBJECT itself */
+          ED_region_tag_redraw(ar);
+          break;
+      }
+      break;
+    case NC_GROUP:
+      /* all actions now, todo: check outliner view mode? */
+      ED_region_tag_redraw(ar);
+      break;
+    case NC_LAMP:
+      /* For updating light icons, when changing light type */
+      if (wmn->data == ND_LIGHTING_DRAW) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+    case NC_SPACE:
+      if (wmn->data == ND_SPACE_OUTLINER) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+    case NC_ID:
+      if (wmn->action == NA_RENAME) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+    case NC_MATERIAL:
+      switch (wmn->data) {
+        case ND_SHADING_LINKS:
+          ED_region_tag_redraw(ar);
+          break;
+      }
+      break;
+    case NC_GEOM:
+      switch (wmn->data) {
+        case ND_VERTEX_GROUP:
+        case ND_DATA:
+          ED_region_tag_redraw(ar);
+          break;
+      }
+      break;
+    case NC_ANIMATION:
+      switch (wmn->data) {
+        case ND_NLA_ACTCHANGE:
+        case ND_KEYFRAME:
+          ED_region_tag_redraw(ar);
+          break;
+        case ND_ANIMCHAN:
+          if (wmn->action == NA_SELECTED) {
+            ED_region_tag_redraw(ar);
+          }
+          break;
+      }
+      break;
+    case NC_GPENCIL:
+      if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+    case NC_SCREEN:
+      if (ELEM(wmn->data, ND_LAYER)) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+    case NC_MASK:
+      if (ELEM(wmn->action, NA_ADDED)) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+    case NC_PAINTCURVE:
+      if (ELEM(wmn->action, NA_ADDED)) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+  }
 }
 
-static void outliner_main_region_message_subscribe(
-        const struct bContext *UNUSED(C),
-        struct WorkSpace *UNUSED(workspace), struct Scene *UNUSED(scene),
-        struct bScreen *UNUSED(screen), struct ScrArea *sa, struct ARegion *ar,
-        struct wmMsgBus *mbus)
+static void outliner_main_region_message_subscribe(const struct bContext *UNUSED(C),
+                                                   struct WorkSpace *UNUSED(workspace),
+                                                   struct Scene *UNUSED(scene),
+                                                   struct bScreen *UNUSED(screen),
+                                                   struct ScrArea *sa,
+                                                   struct ARegion *ar,
+                                                   struct wmMsgBus *mbus)
 {
-	SpaceOutliner *soops = sa->spacedata.first;
-	wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
-		.owner = ar,
-		.user_data = ar,
-		.notify = ED_region_do_msg_notify_tag_redraw,
-	};
-
-	if (ELEM(soops->outlinevis, SO_VIEW_LAYER, SO_SCENES)) {
-		WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw);
-	}
+  SpaceOutliner *soops = sa->spacedata.first;
+  wmMsgSubscribeValue msg_sub_value_region_tag_redraw = {
+      .owner = ar,
+      .user_data = ar,
+      .notify = ED_region_do_msg_notify_tag_redraw,
+  };
+
+  if (ELEM(soops->outlinevis, SO_VIEW_LAYER, SO_SCENES)) {
+    WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw);
+  }
 }
 
-
 /* ************************ header outliner area region *********************** */
 
 /* add handlers, stuff you only do once or on area/region changes */
 static void outliner_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
 {
-	ED_region_header_init(ar);
+  ED_region_header_init(ar);
 }
 
 static void outliner_header_region_draw(const bContext *C, ARegion *ar)
 {
-	ED_region_header(C, ar);
+  ED_region_header(C, ar);
 }
 
 static void outliner_header_region_free(ARegion *UNUSED(ar))
 {
 }
 
-static void outliner_header_region_listener(
-        wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
-        wmNotifier *wmn, const Scene *UNUSED(scene))
+static void outliner_header_region_listener(wmWindow *UNUSED(win),
+                                            ScrArea *UNUSED(sa),
+                                            ARegion *ar,
+                                            wmNotifier *wmn,
+                                            const Scene *UNUSED(scene))
 {
-	/* context changes */
-	switch (wmn->category) {
-		case NC_SCENE:
-			if (wmn->data == ND_KEYINGSET) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-		case NC_SPACE:
-			if (wmn->data == ND_SPACE_OUTLINER) {
-				ED_region_tag_redraw(ar);
-			}
-			break;
-	}
+  /* context changes */
+  switch (wmn->category) {
+    case NC_SCENE:
+      if (wmn->data == ND_KEYINGSET) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+    case NC_SPACE:
+      if (wmn->data == ND_SPACE_OUTLINER) {
+        ED_region_tag_redraw(ar);
+      }
+      break;
+  }
 }
 
 /* ******************** default callbacks for outliner space ***************** */
 
 static SpaceLink *outliner_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
-	ARegion *ar;
-	SpaceOutliner *soutliner;
+  ARegion *ar;
+  SpaceOutliner *soutliner;
 
-	soutliner = MEM_callocN(sizeof(SpaceOutliner), "initoutliner");
-	soutliner->spacetype = SPACE_OUTLINER;
-	soutliner->filter_id_type = ID_GR;
+  soutliner = MEM_callocN(sizeof(SpaceOutliner), "initoutliner");
+  soutliner->spacetype = SPACE_OUTLINER;
+  soutliner->filter_id_type = ID_GR;
 
-	/* header */
-	ar = MEM_callocN(sizeof(ARegion), "header for outliner");
+  /* header */
+  ar = MEM_callocN(sizeof(ARegion), "header for outliner");
 
-	BLI_addtail(&soutliner->regionbase, ar);
-	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
+  BLI_addtail(&soutliner->regionbase, ar);
+  ar->regiontype = RGN_TYPE_HEADER;
+  ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
 
-	/* main region */
-	ar = MEM_callocN(sizeof(ARegion), "main region for outliner");
+  /* main region */
+  ar = MEM_callocN(sizeof(ARegion), "main region for outliner");
 
-	BLI_addtail(&soutliner->regionbase, ar);
-	ar->regiontype = RGN_TYPE_WINDOW;
+  BLI_addtail(&soutliner->regionbase, ar);
+  ar->regiontype = RGN_TYPE_WINDOW;
 
-	return (SpaceLink *)soutliner;
+  return (SpaceLink *)soutliner;
 }
 
 /* not spacelink itself */
 static void outliner_free(SpaceLink *sl)
 {
-	SpaceOutliner *soutliner = (SpaceOutliner *)sl;
-
-	outliner_free_tree(&soutliner->tree);
-	if (soutliner->treestore) {
-		BLI_mempool_destroy(soutliner->treestore);
-	}
-	if (soutliner->treehash) {
-		BKE_outliner_treehash_free(soutliner->treehash);
-	}
+  SpaceOutliner *soutliner = (SpaceOutliner *)sl;
+
+  outliner_free_tree(&soutliner->tree);
+  if (soutliner->treestore) {
+    BLI_mempool_destroy(soutliner->treestore);
+  }
+  if (soutliner->treehash) {
+    BKE_outliner_treehash_free(soutliner->treehash);
+  }
 }
 
 /* spacetype; init callback */
 static void outliner_init(wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
 {
-
 }
 
 static SpaceLink *outliner_duplicate(SpaceLink *sl)
 {
-	SpaceOutliner *soutliner = (SpaceOutliner *)sl;
-	SpaceOutliner *soutlinern = MEM_dupallocN(soutliner);
+  SpaceOutliner *soutliner = (SpaceOutliner *)sl;
+  SpaceOutliner *soutlinern = MEM_dupallocN(soutliner);
 
-	BLI_listbase_clear(&soutlinern->tree);
-	soutlinern->treestore = NULL;
-	soutlinern->treehash = NULL;
+  BLI_listbase_clear(&soutlinern->tree);
+  soutlinern->treestore = NULL;
+  soutlinern->treehash = NULL;
 
-	return (SpaceLink *)soutlinern;
+  return (SpaceLink *)soutlinern;
 }
 
 static void outliner_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id)
 {
-	SpaceOutliner *so = (SpaceOutliner *)slink;
-
-	/* Some early out checks. */
-	if (!TREESTORE_ID_TYPE(old_id)) {
-		return;  /* ID type is not used by outilner... */
-	}
-
-	if (so->search_tse.id == old_id) {
-		so->search_tse.id = new_id;
-	}
-
-	if (so->treestore) {
-		TreeStoreElem *tselem;
-		BLI_mempool_iter iter;
-		bool changed = false;
-
-		BLI_mempool_iternew(so->treestore, &iter);
-		while ((tselem = BLI_mempool_iterstep(&iter))) {
-			if (tselem->id == old_id) {
-				tselem->id = new_id;
-				changed = true;
-			}
-		}
-		if (so->treehash && changed) {
-			/* rebuild hash table, because it depends on ids too */
-			/* postpone a full rebuild because this can be called many times on-free */
-			so->storeflag |= SO_TREESTORE_REBUILD;
-		}
-	}
+  SpaceOutliner *so = (SpaceOutliner *)slink;
+
+  /* Some early out checks. */
+  if (!TREESTORE_ID_TYPE(old_id)) {
+    return; /* ID type is not used by outilner... */
+  }
+
+  if (so->search_tse.id == old_id) {
+    so->search_tse.id = new_id;
+  }
+
+  if (so->treestore) {
+    TreeStoreElem *tselem;
+    BLI_mempool_iter iter;
+    bool changed = false;
+
+    BLI_mempool_iternew(so->treestore, &iter);
+    while ((tselem = BLI_mempool_iterstep(&iter))) {
+      if (tselem->id == old_id) {
+        tselem->id = new_id;
+        changed = true;
+      }
+    }
+    if (so->treehash && changed) {
+      /* rebuild hash table, because it depends on ids too */
+      /* postpone a full rebuild because this can be called many times on-free */
+      so->storeflag |= SO_TREESTORE_REBUILD;
+    }
+  }
 }
 
 /* only called once, from space_api/spacetypes.c */
 void ED_spacetype_outliner(void)
 {
-	SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype time");
-	ARegionType *art;
-
-	st->spaceid = SPACE_OUTLINER;
-	strncpy(st->name, "Outliner", BKE_ST_MAXNAME);
-
-	st->new = outliner_new;
-	st->free = outliner_free;
-	st->init = outliner_init;
-	st->duplicate = outliner_duplicate;
-	st->operatortypes = outliner_operatortypes;
-	st->keymap = outliner_keymap;
-	st->dropboxes = outliner_dropboxes;
-	st->id_remap = outliner_id_remap;
-
-	/* regions: main window */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype outliner region");
-	art->regionid = RGN_TYPE_WINDOW;
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES;
-
-	art->init = outliner_main_region_init;
-	art->draw = outliner_main_region_draw;
-	art->free = outliner_main_region_free;
-	art->listener = outliner_main_region_listener;
-	art->message_subscribe = outliner_main_region_message_subscribe;
-	BLI_addhead(&st->regiontypes, art);
-
-	/* regions: header */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype outliner header region");
-	art->regionid = RGN_TYPE_HEADER;
-	art->prefsizey = HEADERY;
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
-
-	art->init = outliner_header_region_init;
-	art->draw = outliner_header_region_draw;
-	art->free = outliner_header_region_free;
-	art->listener = outliner_header_region_listener;
-	BLI_addhead(&st->regiontypes, art);
-
-	BKE_spacetype_register(st);
+  SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype time");
+  ARegionType *art;
+
+  st->spaceid = SPACE_OUTLINER;
+  strncpy(st->name, "Outliner", BKE_ST_MAXNAME);
+
+  st->new = outliner_new;
+  st->free = outliner_free;
+  st->init = outliner_init;
+  st->duplicate = outliner_duplicate;
+  st->operatortypes = outliner_operatortypes;
+  st->keymap = outliner_keymap;
+  st->dropboxes = outliner_dropboxes;
+  st->id_remap = outliner_id_remap;
+
+  /* regions: main window */
+  art = MEM_callocN(sizeof(ARegionType), "spacetype outliner region");
+  art->regionid = RGN_TYPE_WINDOW;
+  art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES;
+
+  art->init = outliner_main_region_init;
+  art->draw = outliner_main_region_draw;
+  art->free = outliner_main_region_free;
+  art->listener = outliner_main_region_listener;
+  art->message_subscribe = outliner_main_region_message_subscribe;
+  BLI_addhead(&st->regiontypes, art);
+
+  /* regions: header */
+  art = MEM_callocN(sizeof(ARegionType), "spacetype outliner header region");
+  art->regionid = RGN_TYPE_HEADER;
+  art->prefsizey = HEADERY;
+  art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
+
+  art->init = outliner_header_region_init;
+  art->draw = outliner_header_region_draw;
+  art->free = outliner_header_region_free;
+  art->listener = outliner_header_region_listener;
+  BLI_addhead(&st->regiontypes, art);
+
+  BKE_spacetype_register(st);
 }