Collect project related code into project/

CMakeLists.txt

@@ -33,23 +33,28 @@ set(NBE_SRC
 	src/EditorState.cpp
 	src/MenuState.cpp
 	src/Editor.cpp
+	src/minetest.cpp
+
+	src/project/project.cpp
+	src/project/media.cpp
+	src/project/node.cpp
+	src/project/nodebox.cpp
+
 	src/modes/NBEditor.cpp
 	src/modes/NodeEditor.cpp
 	src/modes/TextureEditor.cpp
+
 	src/dialogs/FileDialog.cpp
 	src/dialogs/TextureDialog.cpp
 	src/dialogs/ImageDialog.cpp
-	src/Project.cpp
-	src/MediaManager.cpp
-	src/Node.cpp
-	src/NodeBox.cpp
-	src/minetest.cpp
+
 	src/FileFormat/FileFormat.cpp
 	src/FileFormat/helpers.cpp
 	src/FileFormat/NBE.cpp
 	src/FileFormat/Lua.cpp
 	src/FileFormat/CPP.cpp
 	src/FileFormat/obj.cpp
+
 	src/util/string.cpp
 	src/util/filesys.cpp
 	src/util/SimpleFileCombiner.cpp

src/Editor.cpp

@@ -1,5 +1,5 @@
 #include "Editor.hpp"
-#include "Node.hpp"
+#include "project/node.hpp"
 #include "modes/NBEditor.hpp"
 #include "modes/TextureEditor.hpp"
 #include "modes/NodeEditor.hpp"

src/Editor.hpp

@@ -3,7 +3,7 @@
 
 #include "common.hpp"
 #include "EditorState.hpp"
-#include "Project.hpp"
+#include "project/project.hpp"
 
 class Editor : public IEventReceiver
 {

src/EditorState.hpp

@@ -2,7 +2,7 @@
 #define EDITORSTATE_HPP_INCLUDED
 #include "common.hpp"
 #include "Configuration.hpp"
-#include "Project.hpp"
+#include "project/project.hpp"
 #include "MenuState.hpp"
 
 #define NUMBER_OF_KEYS 252

src/FileFormat/CPP.cpp

@@ -4,8 +4,8 @@
 #include <list>
 #include <stdexcept>
 #include "../common.hpp"
-#include "../Project.hpp"
-#include "../Node.hpp"
+#include "../project/project.hpp"
+#include "../project/node.hpp"
 #include "CPP.hpp"
 
 bool CPPFileFormat::write(Project * project, const std::string & filename){

src/FileFormat/FileFormat.hpp

@@ -1,7 +1,7 @@
 #ifndef FILEFORMAT_HPP_INCLUDED
 #define FILEFORMAT_HPP_INCLUDED
 #include <string>
-#include "../Project.hpp"
+#include "../project/project.hpp"
 #include "../EditorState.hpp"
 
 enum FileFormatError

src/FileFormat/Lua.cpp

@@ -4,8 +4,8 @@
 #include <list>
 #include <stdexcept>
 #include "../common.hpp"
-#include "../Project.hpp"
-#include "../Node.hpp"
+#include "../project/project.hpp"
+#include "../project/node.hpp"
 #include "Lua.hpp"
 #include <sstream>
 #include "../util/filesys.hpp"

src/FileFormat/NBE.hpp

@@ -2,7 +2,7 @@
 #define NBEFILEFORMAT_HPP_INCLUDED
 
 #include "FileFormat.hpp"
-#include "../Node.hpp"
+#include "../project/node.hpp"
 
 class NBEFileFormat : public FileFormat
 {

src/FileFormat/obj.hpp

@@ -1,7 +1,7 @@
 #ifndef OBJ_HPP_INCLUDED
 #define OBJ_HPP_INCLUDED
 
-#include "../Node.hpp"
+#include "../project/node.hpp"
 
 std::string nodeToObj(Node *node, std::string filenameNoExt = "out");
 

src/modes/NBEditor.cpp

@@ -2,8 +2,8 @@
 #include <vector>
 #include "../GUIHelpers.hpp"
 #include "../util/string.hpp"
-#include "../Node.hpp"
-#include "../NodeBox.hpp"
+#include "../project/node.hpp"
+#include "../project/nodebox.hpp"
 
 // The gui id numbers for this mode
 // NOTE: the maximum that can be here is 20

src/modes/NodeEditor.cpp

@@ -1,6 +1,6 @@
 #include "NodeEditor.hpp"
 #include <list>
-#include "../Node.hpp"
+#include "../project/node.hpp"
 #include "../GUIHelpers.hpp"
 #include "../util/string.hpp"
 

src/project/media.cpp

@@ -1,5 +1,5 @@
-#include "MediaManager.hpp"
-#include "util/filesys.hpp"
+#include "media.hpp"
+#include "../util/filesys.hpp"
 
 Media::~Media()
 {

src/project/media.hpp

@@ -1,6 +1,6 @@
 #ifndef MEDIAMANAGER_HPP_INCLUDED
 #define MEDIAMANAGER_HPP_INCLUDED
-#include "common.hpp"
+#include "../common.hpp"
 #include <assert.h>
 #include <map>
 

src/project/node.cpp

@@ -1,5 +1,5 @@
-#include "util/string.hpp"
-#include "Node.hpp"
+#include "../util/string.hpp"
+#include "node.hpp"
 
 Node::Node(IrrlichtDevice* device, EditorState* state, unsigned int id) :
 	device(device),

src/project/node.hpp

@@ -2,10 +2,10 @@
 #define NODE_HPP_INCLUDED
 
 #include <vector>
-#include "common.hpp"
-#include "EditorState.hpp"
-#include "NodeBox.hpp"
-#include "MediaManager.hpp"
+#include "../common.hpp"
+#include "../EditorState.hpp"
+#include "nodebox.hpp"
+#include "media.hpp"
 
 class EditorState;
 class NodeBox;

src/project/nodebox.cpp

@@ -1,4 +1,4 @@
-#include "NodeBox.hpp"
+#include "nodebox.hpp"
 
 void NodeBox::resizeNodeBoxFace(EditorState* editor, ECDR_DIR type,
 		vector3df position, bool both)

src/project/nodebox.hpp

@@ -2,9 +2,9 @@
 #define NODEBOX_HPP_INCLUDED
 
 #include <string>
-#include "common.hpp"
-#include "EditorState.hpp"
-#include "MediaManager.hpp"
+#include "../common.hpp"
+#include "../EditorState.hpp"
+#include "media.hpp"
 
 class EditorState;
 class NodeBox

src/project/project.cpp

@@ -1,6 +1,6 @@
-#include "Project.hpp"
-#include "Node.hpp"
-#include "util/string.hpp"
+#include "project.hpp"
+#include "node.hpp"
+#include "../util/string.hpp"
 
 Project::Project() :
 	name("test"),

src/project/project.hpp

@@ -3,10 +3,10 @@
 
 #include <string>
 #include <list>
-#include "common.hpp"
-#include "EditorState.hpp"
-#include "MediaManager.hpp"
-#include "Node.hpp"
+#include "../common.hpp"
+#include "../EditorState.hpp"
+#include "media.hpp"
+#include "node.hpp"
 
 class Node;
 class EditorState;