QtFred viewport code cleanup (scp-fs2open#7361)

Author: Mike Nelson

qtfred/src/mission/Editor.h

@@ -15,8 +15,13 @@
 #include <memory>
 #include <stdexcept>
 
-namespace fso {
-namespace fred {
+namespace fso::fred {
+
+struct subsys_to_render {
+	bool do_render = false;
+	object* ship_obj = nullptr;
+	ship_subsys* cur_subsys = nullptr;
+};
 
 enum class WingNameError {
 	None,
@@ -363,8 +368,7 @@ class Editor : public QObject {
 	void updateStartingWingLoadoutUseCounts();
 };
 
-} // namespace fred
-} // namespace fso
+} // namespace fso::fred
 
 extern char Fred_callsigns[MAX_SHIPS][NAME_LENGTH + 1];
 extern char Fred_alt_names[MAX_SHIPS][NAME_LENGTH + 1];

qtfred/src/mission/EditorViewport.cpp

@@ -1,6 +1,3 @@
-//
-//
-
 #include <globalincs/linklist.h>
 #include <object/object.h>
 #include <render/3d.h>
@@ -111,8 +108,7 @@ void verticalize_object(matrix* orient) {
 
 }
 
-namespace fso {
-namespace fred {
+namespace fso::fred {
 
 const char* EditorViewport::DefaultLayerName = "Default";
 
@@ -800,21 +796,6 @@ int EditorViewport::select_object(int cx, int cy) {
 	vec3d p0, p1, v, hitpos;
 	vertex vt;
 
-	///! \fixme Briefing!
-#if 0
-    if (Briefing_dialog) {
-        best = Briefing_dialog->check_mouse_hit(cx, cy);
-        if (best >= 0)
-        {
-            if ((Selection_lock && !Objects[best].flags[Object::Object_Flags::Marked])) || Objects[best].flags[Object::Object_Flags::Locked_from_editing])
-            {
-                return -1;
-            }
-            return best;
-        }
-    }
-#endif
-
 	/*	gr_reset_clip();
 	g3_start_frame(0); ////////////////
 	g3_set_view_matrix(&eye_pos, &eye_orient, 0.5f);*/
@@ -1724,5 +1705,4 @@ void EditorViewport::view_object(int obj_num) {
 	needsUpdate();
 }
 
-}
-}
+} // namespace fso::fred

qtfred/src/mission/EditorViewport.h

@@ -7,8 +7,14 @@
 
 #include <object/object.h>
 
-namespace fso {
-namespace fred {
+namespace fso::fred {
+
+struct Marking_box {
+	int x1 = 0;
+	int y1 = 0;
+	int x2 = 0;
+	int y2 = 0;
+};
 
 struct ViewSettings {
 	bool Universal_heading = false;
@@ -182,8 +188,6 @@ class EditorViewport {
 	int cur_model_index = 0;
 	int cur_prop_index = -1;
 
-	bool Bg_bitmap_dialog = false;
-
 	object_orient_pos rotation_backup[MAX_OBJECTS];
 
 	vec3d saved_cam_pos = vmd_zero_vector;
@@ -220,5 +224,4 @@ class EditorViewport {
 	void loadSettings();
 };
 
-}
-}
+} // namespace fso::fred