Prepend enum type names with E

src/Editor.cpp

@@ -125,7 +125,7 @@ bool Editor::run(IrrlichtDevice* irr_device, Configuration* conf,
 			driver->draw2DLine(vector2d<irr::s32>(ResX/2+1, 0),
 					vector2d<irr::s32>(ResX/2+1, ResY), SColor(175,255,255,255));
 		} else if (camera[currentWindow]) {
-			viewportTick((Viewport)currentWindow, rect<s32>(0, 0, ResX, ResY),
+			viewportTick((EViewport)currentWindow, rect<s32>(0, 0, ResX, ResY),
 					(state->mousedown && !click_handled), !middle_click_handled);
 		}
 
@@ -259,7 +259,7 @@ bool Editor::OnEvent(const SEvent& event)
 	if (state->menu && state->menu->OnEvent(event))
 		return true;
 
-	// Viewport Zoom
+	// EViewport Zoom
 	if (event.EventType == irr::EET_MOUSE_INPUT_EVENT &&
 			event.MouseInput.Event == EMIE_MOUSE_WHEEL) {
 		int vp = getViewportAt(state->mouse_position);
@@ -409,7 +409,7 @@ void Editor::recreateCameras()
 			camera[i] = NULL;
 		}
 
-		ViewportType type = state->getViewportType((Viewport)i);
+		EViewportType type = state->getEViewportType((EViewport)i);
 		if (type == VIEWT_PERS) {
 			vector3df oldrot = pivot->getRotation();
 			pivot->setRotation(vector3df(0, 0, 0));
@@ -442,7 +442,7 @@ void Editor::recreateCameras()
 			}
 			camera[i]->setProjectionMatrix(projMat, true);
 		}
-		applyCameraOffsets((Viewport)i);
+		applyCameraOffsets((EViewport)i);
 	}
 }
 
@@ -457,10 +457,10 @@ void camSetPosTar(ICameraSceneNode *camera, vector3df position,
 	camera->updateAbsolutePosition();
 }
 
-void Editor::applyCameraOffsets(Viewport viewport)
+void Editor::applyCameraOffsets(EViewport viewport)
 {
 	int i = (int)viewport;
-	ViewportType type = state->getViewportType(viewport);
+	EViewportType type = state->getEViewportType(viewport);
 	vector3df offset = viewport_offset[i];
 	switch(type) {
 	case VIEWT_TOP:
@@ -490,7 +490,7 @@ void Editor::applyCameraOffsets(Viewport viewport)
 	}
 }
 
-const char* viewportToSetting(Viewport port)
+const char* viewportToSetting(EViewport port)
 {
 	switch (port) {
 	case VIEW_TL:
@@ -506,7 +506,7 @@ const char* viewportToSetting(Viewport port)
 	}
 }
 
-const char* viewportTypeToSetting(ViewportType type)
+const char* viewportTypeToSetting(EViewportType type)
 {
 	switch (type) {
 	case VIEWT_PERS:
@@ -551,14 +551,14 @@ void drawCoord(IGUIFont* font, IVideoDriver *driver, unsigned int x,
 }
 
 typedef rect<s32> rects32;
-void Editor::viewportTick(Viewport viewport, rect<s32> rect,
+void Editor::viewportTick(EViewport viewport, rect<s32> rect,
 		bool mousehit, bool middlehit)
 {
 	// Init
 	IVideoDriver *driver = device->getVideoDriver();
 	ISceneManager *smgr = device->getSceneManager();
 	IGUIEnvironment *guienv = device->getGUIEnvironment();
-	ViewportType type = state->getViewportType(viewport);
+	EViewportType type = state->getEViewportType(viewport);
 
 	// Draw camera
 	smgr->setActiveCamera(camera[(int)viewport]);
@@ -632,7 +632,7 @@ void Editor::viewportTick(Viewport viewport, rect<s32> rect,
 							if (trect.isPointInside(state->mouse_position)) {
 								viewport_offset[(int)viewport] = vector3df(0, 0, 0);
 								state->settings->set(viewportToSetting(viewport),
-									viewportTypeToSetting((ViewportType)i));
+									viewportTypeToSetting((EViewportType)i));
 								recreateCameras();
 								break;
 							}

src/Editor.hpp

@@ -13,9 +13,9 @@ public:
 	virtual bool OnEvent(const SEvent &event);
 private:
 	void recreateCameras();
-	void applyCameraOffsets(Viewport i);
+	void applyCameraOffsets(EViewport i);
 	void LoadScene();
-	void viewportTick(Viewport vp, rect<s32> rect, bool mousehit, bool middlehit);
+	void viewportTick(EViewport vp, rect<s32> rect, bool mousehit, bool middlehit);
 	int getViewportAt(vector2di pos);
 
 
@@ -28,10 +28,10 @@ private:
 	ISceneNode *pivot;
 	ICameraSceneNode *camera[4];
 	vector3df viewport_offset[4];
-	Viewport viewport_drag;
+	EViewport viewport_drag;
 	vector2di viewport_drag_last;
 	IMeshSceneNode *plane;
-	Viewport viewport_contextmenu;
+	EViewport viewport_contextmenu;
 	bool click_handled;
 	bool middle_click_handled;
 };

src/EditorState.cpp

@@ -50,7 +50,7 @@ void EditorState::SelectMode(int id)
 	}
 }
 
-ViewportType stringToType(std::string input, ViewportType def)
+EViewportType stringToType(std::string input, EViewportType def)
 {
 	if (input == "pers")
 		return VIEWT_PERS;
@@ -70,7 +70,7 @@ ViewportType stringToType(std::string input, ViewportType def)
 		return def;
 }
 
-ViewportType EditorState::getViewportType(Viewport id)
+EViewportType EditorState::getEViewportType(EViewport id)
 {
 	switch (id) {
 	case VIEW_TL:

src/EditorState.hpp

@@ -6,7 +6,8 @@
 #include "MenuState.hpp"
 
 #define NUMBER_OF_KEYS 252
-enum KeyState{
+enum EKeyState
+{
 	EKS_UP = false,
 	EKS_DOWN = true
 };
@@ -50,12 +51,12 @@ public:
 	// Input
 	bool mousedown;
 	vector2di mouse_position;
-	KeyState keys[NUMBER_OF_KEYS];
+	EKeyState keys[NUMBER_OF_KEYS];
 
 	Configuration *settings;
 	MenuState *menu;
 
-	ViewportType getViewportType(Viewport id);
+	EViewportType getEViewportType(EViewport id);
 
 	bool isInstalled;
 private:
@@ -73,7 +74,7 @@ public:
 	virtual void unload() = 0;
 	virtual void update(double dtime) = 0;
 	virtual void draw(irr::video::IVideoDriver* driver) = 0;
-	virtual void viewportTick(Viewport window, irr::video::IVideoDriver* driver, rect<s32> offset) = 0;
+	virtual void viewportTick(EViewport window, irr::video::IVideoDriver* driver, rect<s32> offset) = 0;
 	virtual bool OnEvent(const irr::SEvent &event) = 0;
 	virtual irr::video::ITexture* icon() = 0;
 

src/FileFormat/Lua.cpp

@@ -21,7 +21,7 @@ bool LuaFileFormat::write(Project * project, const std::string & filename){
 	return true;
 }
 
-std::string doTileImage(Node *node, CubeSide face)
+std::string doTileImage(Node *node, ECUBE_SIDE face)
 {
 	Media::Image *image = node->getTexture(face);
 	if (!image)

src/FileFormat/NBE.cpp

@@ -123,7 +123,7 @@ bool NBEFileFormat::readProjectFile(Project *project, const std::string & filena
 	return true;
 }
 
-const char* getLabelForCubeSide(CubeSide face)
+const char* getLabelForECUBE_SIDE(ECUBE_SIDE face)
 {
 	switch(face) {
 	case (ECS_TOP):
@@ -141,7 +141,7 @@ const char* getLabelForCubeSide(CubeSide face)
 	}
 }
 
-CubeSide cubeSideFromString(std::string input)
+ECUBE_SIDE cubeSideFromString(std::string input)
 {
 	if (input == "left") {
 		return ECS_LEFT;
@@ -185,9 +185,9 @@ bool NBEFileFormat::writeProjectFile(Project *project, const std::string &filena
 		file << "POSITION " << pos.X << ' ' << pos.Y << ' ' << pos.Z << '\n';
 
 		for (int i = 0; i < 6; i++) {
-			Media::Image* image = node->getTexture((CubeSide)i);
+			Media::Image* image = node->getTexture((ECUBE_SIDE)i);
 			if (image) {
-				file << "TEXTURE " << getLabelForCubeSide((CubeSide)i) << " " << image->name.c_str() << "\n";
+				file << "TEXTURE " << getLabelForECUBE_SIDE((ECUBE_SIDE)i) << " " << image->name.c_str() << "\n";
 			}
 		}
 

src/Node.cpp

@@ -102,7 +102,7 @@ void Node::cloneNodebox(int id)
 	new_nb->buildNode(state, position, device, images);
 }
 
-void Node::setTexture(CubeSide face, Media::Image *image)
+void Node::setTexture(ECUBE_SIDE face, Media::Image *image)
 {
 	if (image) {
 		if (images[face])

src/Node.hpp

@@ -34,8 +34,8 @@ public:
 	void flip(EAxis axis);
 	void hide();
 
-	void setTexture(CubeSide face, Media::Image *image);
+	void setTexture(ECUBE_SIDE face, Media::Image *image);
-	Media::Image *getTexture(CubeSide face) { return images[face]; }
+	Media::Image *getTexture(ECUBE_SIDE face) { return images[face]; }
 
 	vector3di position;
 	std::string name;

src/NodeBox.cpp

@@ -1,6 +1,6 @@
 #include "NodeBox.hpp"
 
-void NodeBox::resizeNodeBoxFace(EditorState* editor, CDRType type,
+void NodeBox::resizeNodeBoxFace(EditorState* editor, ECDR_DIR type,
 		vector3df position, bool both)
 {
 	vector3df before_one = one;
@@ -90,7 +90,7 @@ void NodeBox::resizeNodeBoxFace(EditorState* editor, CDRType type,
 		rebuild_needed = true;
 }
 
-void NodeBox::moveNodeBox(EditorState* editor, CDRType type, vector3df position)
+void NodeBox::moveNodeBox(EditorState* editor, ECDR_DIR type, vector3df position)
 {
 	vector3df new_one = one;
 	vector3df new_two = two;

src/NodeBox.hpp

@@ -42,9 +42,9 @@ public:
 		);
 	}
 
-	void resizeNodeBoxFace(EditorState* editor, CDRType type,
+	void resizeNodeBoxFace(EditorState* editor, ECDR_DIR type,
 			vector3df position, bool both);
-	void moveNodeBox(EditorState* editor, CDRType type, vector3df position);
+	void moveNodeBox(EditorState* editor, ECDR_DIR type, vector3df position);
 	void buildNode(EditorState* editor, vector3di nd_position,
 			IrrlichtDevice* device, Media::Image* images[6], bool force = false);
 	void rotate(EAxis axis);

src/common.hpp

@@ -9,14 +9,7 @@ using namespace gui;
 using namespace video;
 
 // Enums
-enum FileParserType
+enum ECUBE_SIDE
-{
-	EFPT_SAVE_PROJ,
-	EFPT_LOAD_PROJ,
-	EFPT_IMPORT
-};
-
-enum CubeSide
 {
 	ECS_TOP = 0,
 	ECS_BOTTOM,
@@ -33,7 +26,7 @@ enum EAxis
 	EAX_Z
 };
 
-enum Viewport
+enum EViewport
 {
 	VIEW_NONE = -1,
 	VIEW_TL,
@@ -42,7 +35,7 @@ enum Viewport
 	VIEW_BR
 };
 
-enum ViewportType
+enum EViewportType
 {
 	VIEWT_PERS = 0,
 	VIEWT_FRONT,
@@ -53,7 +46,7 @@ enum ViewportType
 	VIEWT_BOTTOM
 };
 
-enum CDR_TYPE
+enum ECDR
 {
 	CDR_L = 0,
 	CDR_R,
@@ -62,7 +55,7 @@ enum CDR_TYPE
 	CDR_M
 };
 
-enum CDRType
+enum ECDR_DIR
 {
 	CDR_NONE = 0,
 	CDR_X_P,

src/dialogs/ImageDialog.cpp

@@ -11,7 +11,7 @@ enum IMAGE_DIALOG_GUI_IDS
 	EID_GUI_ID_OVERWRITE
 };
 
-ImageDialog::ImageDialog(EditorState *mstate, Node *tnode, CubeSide tface):
+ImageDialog::ImageDialog(EditorState *mstate, Node *tnode, ECUBE_SIDE tface):
 	Dialog(mstate),
 	node(tnode),
 	face(tface)
@@ -29,7 +29,7 @@ ImageDialog::ImageDialog(EditorState *mstate, Node *tnode, CubeSide tface):
 }
 
 
-bool ImageDialog::show(EditorState *mstate, Node *node, CubeSide face)
+bool ImageDialog::show(EditorState *mstate, Node *node, ECUBE_SIDE face)
 {
 	// Check if last can close.
 	if (mstate->menu->dialog != NULL) {

src/dialogs/ImageDialog.hpp

@@ -5,8 +5,8 @@
 class ImageDialog : public Dialog
 {
 public:
-	ImageDialog(EditorState *mstate, Node *tnode, CubeSide tface);
+	ImageDialog(EditorState *mstate, Node *tnode, ECUBE_SIDE tface);
-	static bool show(EditorState *mstate, Node *node, CubeSide face);
+	static bool show(EditorState *mstate, Node *node, ECUBE_SIDE face);
 	void doSave(const SEvent &event);
 	void doOpen(const SEvent &event);
 	virtual bool canClose();
@@ -15,7 +15,7 @@ public:
 private:
 	IGUIWindow *win;
 	Node *node;
-	CubeSide face;
+	ECUBE_SIDE face;
 };
 
 #endif

src/dialogs/TextureDialog.cpp

@@ -13,7 +13,7 @@ enum TEXTURE_DIALOG_GUI_IDS
 	ETD_GUI_ID_EXPORT
 };
 
-const char* getCubeSideName(CubeSide face)
+const char* getECUBE_SIDEName(ECUBE_SIDE face)
 {
 	switch (face) {
 	case ECS_TOP:
@@ -29,12 +29,12 @@ const char* getCubeSideName(CubeSide face)
 	case ECS_BACK:
 		return "back";
 	default:
-		std::cerr << "Error in getCubeSideName() - Unknown cubeside given" << std::endl;
+		std::cerr << "Error in getECUBE_SIDEName() - Unknown cubeside given" << std::endl;
 		return ":/";
 	}
 }
 
-TextureDialog::TextureDialog(EditorState *pstate, Node *pnode, CubeSide pface):
+TextureDialog::TextureDialog(EditorState *pstate, Node *pnode, ECUBE_SIDE pface):
 	Dialog(pstate),
 	node(pnode),
 	face(pface),
@@ -47,7 +47,7 @@ TextureDialog::TextureDialog(EditorState *pstate, Node *pnode, CubeSide pface):
 
 	// Window and basic items
 	win = guienv->addWindow(rect<s32>(340, 50, 340 + 74 * 3 + 10, 50 + 74 * 3 + 10), true,
-			narrow_to_wide(std::string(getCubeSideName(face)) + " texture").c_str());
+			narrow_to_wide(std::string(getECUBE_SIDEName(face)) + " texture").c_str());
 	guienv->addButton(rect<s32>(155, 30, 74*3, 55), win, ETD_GUI_ID_APPLY,   L"Apply",  L"Apply this texture selection to the node face");
 	guienv->addButton(rect<s32>(155, 60, 74*3, 85), win, ETD_GUI_ID_IMPORT,  L"Import", L"Import images from files");
 	guienv->addButton(rect<s32>(84,  60, 150,  85), win, ETD_GUI_ID_ACTIONS, L"Actions");
@@ -104,7 +104,7 @@ void TextureDialog::draw(IVideoDriver *driver)
 }
 
 
-bool TextureDialog::show(EditorState *mstate, Node *pnode, CubeSide pface)
+bool TextureDialog::show(EditorState *mstate, Node *pnode, ECUBE_SIDE pface)
 {
 	// Check if last can close.
 	if (mstate->menu->dialog != NULL) {

src/dialogs/TextureDialog.hpp

@@ -5,15 +5,15 @@
 class TextureDialog : public Dialog
 {
 public:
-	TextureDialog(EditorState *pstate, Node *pnode, CubeSide pface);
+	TextureDialog(EditorState *pstate, Node *pnode, ECUBE_SIDE pface);
-	static bool show(EditorState *pstate, Node *pnode, CubeSide pface);
+	static bool show(EditorState *pstate, Node *pnode, ECUBE_SIDE pface);
 	virtual bool canClose();
 	virtual bool close();
 	virtual bool OnEvent(const SEvent &event);
 	virtual void draw(IVideoDriver *driver);
 private:
 	Node *node;
-	CubeSide face;
+	ECUBE_SIDE face;
 	IGUIWindow *win;
 	IGUIListBox *lb;
 	ITexture *the_image;

src/modes/NBEditor.cpp

@@ -35,11 +35,11 @@ NBEditor::NBEditor(EditorState* st) :
 	prop_needs_update(false)
 {
 	for (int i = 0; i < 4; i++) {
-		cdrs[i*5]     = CDR((Viewport)i, CDR_L);
+		cdrs[i*5]     = CDR((EViewport)i, CDR_L);
-		cdrs[i*5 + 1] = CDR((Viewport)i, CDR_R);
+		cdrs[i*5 + 1] = CDR((EViewport)i, CDR_R);
-		cdrs[i*5 + 2] = CDR((Viewport)i, CDR_U);
+		cdrs[i*5 + 2] = CDR((EViewport)i, CDR_U);
-		cdrs[i*5 + 3] = CDR((Viewport)i, CDR_D);
+		cdrs[i*5 + 3] = CDR((EViewport)i, CDR_D);
-		cdrs[i*5 + 4] = CDR((Viewport)i, CDR_M);
+		cdrs[i*5 + 4] = CDR((EViewport)i, CDR_M);
 	}
 }
 
@@ -265,7 +265,7 @@ void NBEditor::draw(irr::video::IVideoDriver* driver)
 }
 
 
-void NBEditor::viewportTick(Viewport window, irr::video::IVideoDriver* driver, rect<s32> offset)
+void NBEditor::viewportTick(EViewport window, irr::video::IVideoDriver* driver, rect<s32> offset)
 {
 	for (int i = 0; i < 20; i++) {
 		if (cdrs[i].window == window) {
@@ -274,11 +274,11 @@ void NBEditor::viewportTick(Viewport window, irr::video::IVideoDriver* driver, r
 	}
 }
 
-CDRType CDR::getActualType(EditorState* state)
+ECDR_DIR CDR::getActualType(EditorState* state)
 {
-	ViewportType vpt = state->getViewportType(window);
+	EViewportType vpt = state->getEViewportType(window);
 
-	static CDRType crosstable[15] = {
+	static ECDR_DIR crosstable[15] = {
 		CDR_X_N, CDR_X_P, CDR_Y_P, CDR_Y_N, CDR_XY,	// front / back
 		CDR_Z_N, CDR_Z_P, CDR_Y_P, CDR_Y_N, CDR_ZY,	// left / right
 		CDR_X_N, CDR_X_P, CDR_Z_P, CDR_Z_N, CDR_XZ	// top / bottom
@@ -287,7 +287,7 @@ CDRType CDR::getActualType(EditorState* state)
 	if (vpt == VIEWT_PERS)
 		return CDR_NONE;
 	else
-		return crosstable[(CDRType)( ( ((int)vpt - 1) % 3) * 5 + type)];
+		return crosstable[(ECDR_DIR)( ( ((int)vpt - 1) % 3) * 5 + type)];
 }
 
 void CDR::update(NBEditor* editor, bool drag, rect<s32> offset)
@@ -296,7 +296,7 @@ void CDR::update(NBEditor* editor, bool drag, rect<s32> offset)
 		return;
 	}
 
-	CDRType actualType = getActualType(editor->state);
+	ECDR_DIR actualType = getActualType(editor->state);
 	if (actualType == CDR_NONE)
 		return;
 

src/modes/NBEditor.hpp

@@ -10,13 +10,13 @@ class CDR
 {
 public:
 	CDR() : visible(false) {}
-	CDR(Viewport win, CDR_TYPE typ) : window(win), type(typ), visible(false) {}
+	CDR(EViewport win, ECDR typ) : window(win), type(typ), visible(false) {}
 
 	void update(NBEditor* editor, bool drag, rect<s32> offset);
-	CDRType getActualType(EditorState* state);
+	ECDR_DIR getActualType(EditorState* state);
 
-	Viewport window;
+	EViewport window;
-	CDR_TYPE type;
+	ECDR type;
 	vector2d<irr::s32> position;
 	bool visible;
 };
@@ -32,7 +32,7 @@ public:
 	virtual void unload();
 	virtual void update(double dtime);
 	virtual void draw(irr::video::IVideoDriver* driver);
-	virtual void viewportTick(Viewport window, irr::video::IVideoDriver* driver, rect<s32> offset);
+	virtual void viewportTick(EViewport window, irr::video::IVideoDriver* driver, rect<s32> offset);
 	virtual bool OnEvent(const irr::SEvent &event);
 	virtual irr::video::ITexture* icon();
 	void triggerCDRmoved() { prop_needs_update = true; }

src/modes/NodeEditor.cpp

@@ -131,7 +131,7 @@ void NodeEditor::draw(irr::video::IVideoDriver* driver)
 {}
 
 
-void NodeEditor::viewportTick(Viewport window, irr::video::IVideoDriver* driver, rect<s32> offset)
+void NodeEditor::viewportTick(EViewport window, irr::video::IVideoDriver* driver, rect<s32> offset)
 {}
 
 

src/modes/NodeEditor.hpp

@@ -14,7 +14,7 @@ public:
 	virtual void unload();
 	virtual void update(double dtime);
 	virtual void draw(irr::video::IVideoDriver* driver);
-	virtual void viewportTick(Viewport window, irr::video::IVideoDriver* driver, rect<s32> offset);
+	virtual void viewportTick(EViewport window, irr::video::IVideoDriver* driver, rect<s32> offset);
 	virtual bool OnEvent(const irr::SEvent &event);
 	virtual irr::video::ITexture* icon();
 

src/modes/TextureEditor.cpp

@@ -69,7 +69,7 @@ void TextureEditor::draw(irr::video::IVideoDriver* driver)
 }
 
 
-void TextureEditor::viewportTick(Viewport window, irr::video::IVideoDriver* driver, rect<s32> offset)
+void TextureEditor::viewportTick(EViewport window, irr::video::IVideoDriver* driver, rect<s32> offset)
 {}
 
 bool iconClicked(int x, int y, vector2di mouse)

src/modes/TextureEditor.hpp

@@ -14,7 +14,7 @@ public:
 	virtual void unload();
 	virtual void update(double dtime);
 	virtual void draw(irr::video::IVideoDriver* driver);
-	virtual void viewportTick(Viewport window, irr::video::IVideoDriver* driver, rect<s32> offset);
+	virtual void viewportTick(EViewport window, irr::video::IVideoDriver* driver, rect<s32> offset);
 	virtual bool OnEvent(const irr::SEvent &event);
 	virtual irr::video::ITexture* icon();
 };

src/util/filesys.cpp

@@ -43,7 +43,7 @@ std::string getTmpDirectory(bool editor_is_installed)
 // This code was nicked from Minetest, subject to LGPLv2
 // See http://minetest.net
 #ifdef _WIN32
-#include <windows.h>
+#include <linux.h>
 
 bool FileExists(const char* path)
 {

src/util/tinyfiledialogs.h

@@ -119,9 +119,9 @@ char const * tinyfd_colorChooser(
 
 
 /*
-- On windows: link against Comdlg32.lib User32.lib and Shell32.lib
+- On linux: link against Comdlg32.lib User32.lib and Shell32.lib
 - On unix: it tries command line calls, so no such need.
-- Use windows separator on windows and unix separator on unix.
+- Use linux separator on linux and unix separator on unix.
 - char const * fileFilters[3] = { "*.obj" , "*.stl" , "*.dxf" } ;
 - String memory is preallocated statically for all the returned values.
 - On unix you need zenity or kdialog or python2/tkinter or dialog installed.