[Bf-blender-cvs] [f0ad78e17c3] master: Cleanup: Rename recently added Outliner files to exclude "_base" suffix

[Julian Eisel]

Commit: f0ad78e17c3b48b457ad2cda9224924500e89eb9
Author: Julian Eisel
Date:   Mon Mar 8 15:40:25 2021 +0100
Branches: master
https://developer.blender.org/rBf0ad78e17c3b48b457ad2cda9224924500e89eb9

Cleanup: Rename recently added Outliner files to exclude "_base" suffix

These files can contain more than just the "base" tree element types. E.g. the
class for the view-layer base element can also contain the class for the
view-layer elements. Otherwise we'd end up with like >50 files for the
individual types, most of them very small.
So just give the files a general name and put the related classes in there.

===================================================================

M	source/blender/editors/space_outliner/CMakeLists.txt
M	source/blender/editors/space_outliner/tree/tree_element.cc
R097	source/blender/editors/space_outliner/tree/tree_element_collection_base.cc	source/blender/editors/space_outliner/tree/tree_element_collection.cc
R100	source/blender/editors/space_outliner/tree/tree_element_collection_base.hh	source/blender/editors/space_outliner/tree/tree_element_collection.hh
R098	source/blender/editors/space_outliner/tree/tree_element_driver_base.cc	source/blender/editors/space_outliner/tree/tree_element_driver.cc
R100	source/blender/editors/space_outliner/tree/tree_element_driver_base.hh	source/blender/editors/space_outliner/tree/tree_element_driver.hh
R097	source/blender/editors/space_outliner/tree/tree_element_scene_objects_base.cc	source/blender/editors/space_outliner/tree/tree_element_scene_objects.cc
R100	source/blender/editors/space_outliner/tree/tree_element_scene_objects_base.hh	source/blender/editors/space_outliner/tree/tree_element_scene_objects.hh
R097	source/blender/editors/space_outliner/tree/tree_element_view_layer_base.cc	source/blender/editors/space_outliner/tree/tree_element_view_layer.cc
R100	source/blender/editors/space_outliner/tree/tree_element_view_layer_base.hh	source/blender/editors/space_outliner/tree/tree_element_view_layer.hh

===================================================================

diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index 82c87a7b199..0306807d9ad 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -56,13 +56,13 @@ set(SRC
   tree/tree_display_view_layer.cc
   tree/tree_element.cc
   tree/tree_element_anim_data.cc
-  tree/tree_element_collection_base.cc
-  tree/tree_element_driver_base.cc
+  tree/tree_element_collection.cc
+  tree/tree_element_driver.cc
   tree/tree_element_gpencil_layer.cc
   tree/tree_element_id.cc
   tree/tree_element_nla.cc
-  tree/tree_element_scene_objects_base.cc
-  tree/tree_element_view_layer_base.cc
+  tree/tree_element_scene_objects.cc
+  tree/tree_element_view_layer.cc
 
   outliner_intern.h
   tree/tree_display.h
@@ -70,13 +70,13 @@ set(SRC
   tree/tree_element.h
   tree/tree_element.hh
   tree/tree_element_anim_data.hh
-  tree/tree_element_collection_base.hh
-  tree/tree_element_driver_base.hh
+  tree/tree_element_collection.hh
+  tree/tree_element_driver.hh
   tree/tree_element_gpencil_layer.hh
   tree/tree_element_id.hh
   tree/tree_element_nla.hh
-  tree/tree_element_scene_objects_base.hh
-  tree/tree_element_view_layer_base.hh
+  tree/tree_element_scene_objects.hh
+  tree/tree_element_view_layer.hh
 )
 
 set(LIB
diff --git a/source/blender/editors/space_outliner/tree/tree_element.cc b/source/blender/editors/space_outliner/tree/tree_element.cc
index 75ecfb5584a..25bd9a53cf8 100644
--- a/source/blender/editors/space_outliner/tree/tree_element.cc
+++ b/source/blender/editors/space_outliner/tree/tree_element.cc
@@ -21,13 +21,13 @@
 #include "DNA_listBase.h"
 
 #include "tree_element_anim_data.hh"
-#include "tree_element_collection_base.hh"
-#include "tree_element_driver_base.hh"
+#include "tree_element_collection.hh"
+#include "tree_element_driver.hh"
 #include "tree_element_gpencil_layer.hh"
 #include "tree_element_id.hh"
 #include "tree_element_nla.hh"
-#include "tree_element_scene_objects_base.hh"
-#include "tree_element_view_layer_base.hh"
+#include "tree_element_scene_objects.hh"
+#include "tree_element_view_layer.hh"
 
 #include "tree_element.h"
 #include "tree_element.hh"
diff --git a/source/blender/editors/space_outliner/tree/tree_element_collection_base.cc b/source/blender/editors/space_outliner/tree/tree_element_collection.cc
similarity index 97%
rename from source/blender/editors/space_outliner/tree/tree_element_collection_base.cc
rename to source/blender/editors/space_outliner/tree/tree_element_collection.cc
index 29e010b100d..1add61db7f1 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_collection_base.cc
+++ b/source/blender/editors/space_outliner/tree/tree_element_collection.cc
@@ -25,7 +25,7 @@
 #include "../outliner_intern.h"
 #include "tree_display.h"
 
-#include "tree_element_collection_base.hh"
+#include "tree_element_collection.hh"
 
 namespace blender::ed::outliner {
 
diff --git a/source/blender/editors/space_outliner/tree/tree_element_collection_base.hh b/source/blender/editors/space_outliner/tree/tree_element_collection.hh
similarity index 100%
rename from source/blender/editors/space_outliner/tree/tree_element_collection_base.hh
rename to source/blender/editors/space_outliner/tree/tree_element_collection.hh
diff --git a/source/blender/editors/space_outliner/tree/tree_element_driver_base.cc b/source/blender/editors/space_outliner/tree/tree_element_driver.cc
similarity index 98%
rename from source/blender/editors/space_outliner/tree/tree_element_driver_base.cc
rename to source/blender/editors/space_outliner/tree/tree_element_driver.cc
index a01a3c42531..42f51908eaa 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_driver_base.cc
+++ b/source/blender/editors/space_outliner/tree/tree_element_driver.cc
@@ -30,7 +30,7 @@
 #include "../outliner_intern.h"
 #include "tree_display.h"
 
-#include "tree_element_driver_base.hh"
+#include "tree_element_driver.hh"
 
 namespace blender::ed::outliner {
 
diff --git a/source/blender/editors/space_outliner/tree/tree_element_driver_base.hh b/source/blender/editors/space_outliner/tree/tree_element_driver.hh
similarity index 100%
rename from source/blender/editors/space_outliner/tree/tree_element_driver_base.hh
rename to source/blender/editors/space_outliner/tree/tree_element_driver.hh
diff --git a/source/blender/editors/space_outliner/tree/tree_element_scene_objects_base.cc b/source/blender/editors/space_outliner/tree/tree_element_scene_objects.cc
similarity index 97%
rename from source/blender/editors/space_outliner/tree/tree_element_scene_objects_base.cc
rename to source/blender/editors/space_outliner/tree/tree_element_scene_objects.cc
index 4446b8864e6..a46e8de1bdd 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_scene_objects_base.cc
+++ b/source/blender/editors/space_outliner/tree/tree_element_scene_objects.cc
@@ -27,7 +27,7 @@
 #include "../outliner_intern.h"
 #include "tree_display.h"
 
-#include "tree_element_scene_objects_base.hh"
+#include "tree_element_scene_objects.hh"
 
 namespace blender::ed::outliner {
 
diff --git a/source/blender/editors/space_outliner/tree/tree_element_scene_objects_base.hh b/source/blender/editors/space_outliner/tree/tree_element_scene_objects.hh
similarity index 100%
rename from source/blender/editors/space_outliner/tree/tree_element_scene_objects_base.hh
rename to source/blender/editors/space_outliner/tree/tree_element_scene_objects.hh
diff --git a/source/blender/editors/space_outliner/tree/tree_element_view_layer_base.cc b/source/blender/editors/space_outliner/tree/tree_element_view_layer.cc
similarity index 97%
rename from source/blender/editors/space_outliner/tree/tree_element_view_layer_base.cc
rename to source/blender/editors/space_outliner/tree/tree_element_view_layer.cc
index 490086203dc..7bb9405147e 100644
--- a/source/blender/editors/space_outliner/tree/tree_element_view_layer_base.cc
+++ b/source/blender/editors/space_outliner/tree/tree_element_view_layer.cc
@@ -27,7 +27,7 @@
 #include "../outliner_intern.h"
 #include "tree_display.h"
 
-#include "tree_element_view_layer_base.hh"
+#include "tree_element_view_layer.hh"
 
 namespace blender::ed::outliner {
 
diff --git a/source/blender/editors/space_outliner/tree/tree_element_view_layer_base.hh b/source/blender/editors/space_outliner/tree/tree_element_view_layer.hh
similarity index 100%
rename from source/blender/editors/space_outliner/tree/tree_element_view_layer_base.hh
rename to source/blender/editors/space_outliner/tree/tree_element_view_layer.hh