From c6a937629c0a580e92cbedb143406e8a2995a4f8 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Mon, 2 Feb 2015 18:40:35 +0000 Subject: [PATCH] Clean trailing spaces --- src/Configuration.cpp | 1 - src/Configuration.hpp | 2 +- src/Editor.cpp | 1 - src/EditorState.cpp | 1 - src/EditorState.hpp | 6 +++--- src/FileFormat/CPP.cpp | 5 ++--- src/FileFormat/Lua.cpp | 3 +-- src/FileFormat/NBE.hpp | 3 +-- src/GUIHelpers.cpp | 1 - src/Node.cpp | 2 -- src/NodeBox.cpp | 1 - src/Project.cpp | 3 +-- src/Project.hpp | 2 +- src/dialogs/TextureDialog.hpp | 1 - src/main.cpp | 7 +++---- src/modes/NBEditor.cpp | 2 -- src/modes/NBEditor.hpp | 1 - src/modes/NodeEditor.cpp | 1 - src/modes/TextureEditor.cpp | 1 - src/util/SimpleFileCombiner.cpp | 10 +++++----- src/util/SimpleFileCombiner.hpp | 1 - src/util/string.cpp | 1 - src/util/tinyfiledialogs.h | 2 +- 23 files changed, 19 insertions(+), 39 deletions(-) diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 4fd8bbb..86e3b6f 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -86,4 +86,3 @@ int Configuration::getInt(const std::string & key) const { return atoi(settings.find(key)->second.c_str()); } - diff --git a/src/Configuration.hpp b/src/Configuration.hpp index 575c2de..7473b99 100644 --- a/src/Configuration.hpp +++ b/src/Configuration.hpp @@ -8,7 +8,7 @@ class Configuration public: Configuration() {} bool load(const std::string & filename); - bool save(const std::string & filename); + bool save(const std::string & filename); // Getters const std::string & get(const std::string & key) const; diff --git a/src/Editor.cpp b/src/Editor.cpp index 662cba5..3a4d9e2 100644 --- a/src/Editor.cpp +++ b/src/Editor.cpp @@ -540,4 +540,3 @@ void Editor::viewportTick(Viewport viewport, rect rect, bool mousehit) } } } - diff --git a/src/EditorState.cpp b/src/EditorState.cpp index 9f6b2a6..600627a 100644 --- a/src/EditorState.cpp +++ b/src/EditorState.cpp @@ -83,4 +83,3 @@ ViewportType EditorState::getViewportType(Viewport id) return stringToType(settings->get("viewport_bottom_right"), VIEWT_PERS); } } - diff --git a/src/EditorState.hpp b/src/EditorState.hpp index 0b96055..4624d61 100644 --- a/src/EditorState.hpp +++ b/src/EditorState.hpp @@ -42,8 +42,8 @@ public: } void SelectMode(int id); - - void AddMode(EditorMode *value); + + void AddMode(EditorMode *value); void CloseEditor() { close_requested = true; } bool NeedsClose() const { return close_requested; } @@ -51,7 +51,7 @@ public: bool mousedown; vector2di mouse_position; KeyState keys[NUMBER_OF_KEYS]; - + Configuration *settings; MenuState *menu; diff --git a/src/FileFormat/CPP.cpp b/src/FileFormat/CPP.cpp index 4813a85..10ce545 100644 --- a/src/FileFormat/CPP.cpp +++ b/src/FileFormat/CPP.cpp @@ -10,7 +10,7 @@ bool CPPFileFormat::write(Project * project, const std::string & filename){ std::ofstream file(filename.c_str()); - if (!file) { + if (!file) { error_code = EFFE_IO_ERROR; return false; } @@ -39,7 +39,7 @@ bool CPPFileFormat::write(Project * project, const std::string & filename){ for (std::vector::const_iterator it = boxes.begin(); it != boxes.end(); ++it) { - + file << "\t// " << (*it)->name << "\n"; if (is_first) { file << "\tf->setNodeBox(core::aabbox3d(\n"; @@ -65,4 +65,3 @@ Project * CPPFileFormat::read(const std::string & file, Project *project) throw std::runtime_error("CPPFileFormat::read() is not implemented!"); return NULL; } - diff --git a/src/FileFormat/Lua.cpp b/src/FileFormat/Lua.cpp index 834fa28..81eebb0 100644 --- a/src/FileFormat/Lua.cpp +++ b/src/FileFormat/Lua.cpp @@ -43,7 +43,7 @@ std::string doTileImage(Node *node, CubeSide face) Media::Image *image = node->getTexture(face); if (!image) return "default_wood.png"; - + return image->name; } @@ -105,4 +105,3 @@ Project * LuaFileFormat::read(const std::string & file, Project *project) throw std::runtime_error("LuaFileFormat::read() is not implemented!"); return NULL; } - diff --git a/src/FileFormat/NBE.hpp b/src/FileFormat/NBE.hpp index ccb2e9b..5b8eeb5 100644 --- a/src/FileFormat/NBE.hpp +++ b/src/FileFormat/NBE.hpp @@ -21,7 +21,7 @@ public: { READ_STAGE_ROOT, READ_STAGE_NODE - }; + }; private: readstage stage; Node *node; @@ -33,4 +33,3 @@ private: }; #endif - diff --git a/src/GUIHelpers.cpp b/src/GUIHelpers.cpp index f42e19f..3ee256d 100644 --- a/src/GUIHelpers.cpp +++ b/src/GUIHelpers.cpp @@ -44,4 +44,3 @@ void addXYZ(IGUIElement* parent,IGUIEnvironment* guienv, vector2di pos, int star addBox(parent, guienv, vector2di(pos.X, pos.Y + 30), startIndex + 1, L"Y"); // 80, 0 addBox(parent, guienv, vector2di(pos.X, pos.Y + 60), startIndex + 2, L"Z"); // 160, 0 } - diff --git a/src/Node.cpp b/src/Node.cpp index b074b78..cfa6dd2 100644 --- a/src/Node.cpp +++ b/src/Node.cpp @@ -134,5 +134,3 @@ void Node::rotate(EAxis axis) { } remesh(); } - - diff --git a/src/NodeBox.cpp b/src/NodeBox.cpp index 5a76861..d069079 100644 --- a/src/NodeBox.cpp +++ b/src/NodeBox.cpp @@ -431,4 +431,3 @@ void NodeBox::rotate(EAxis axis) two.Z = tmp; } } - diff --git a/src/Project.cpp b/src/Project.cpp index a049963..7533f09 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -41,7 +41,7 @@ void Project::hideAllButCurrentNode() it != nodes.end(); ++it, ++curid) { if (snode == curid) { - (*it)->remesh(); + (*it)->remesh(); } else { (*it)->hide(); } @@ -120,4 +120,3 @@ Node* Project::GetCurrentNode() const return NULL; } } - diff --git a/src/Project.hpp b/src/Project.hpp index d11e0ed..cc372cf 100644 --- a/src/Project.hpp +++ b/src/Project.hpp @@ -32,7 +32,7 @@ public: void hideAllButCurrentNode(); void remesh(); Node* GetNode(int id) const; - Node* GetNode(vector3di pos) const; + Node* GetNode(vector3di pos) const; Node* GetCurrentNode() const; int GetSelectedNodeId() const { return snode; } unsigned int GetNodeCount() const { return _node_count; } diff --git a/src/dialogs/TextureDialog.hpp b/src/dialogs/TextureDialog.hpp index 231d96e..b324879 100644 --- a/src/dialogs/TextureDialog.hpp +++ b/src/dialogs/TextureDialog.hpp @@ -21,4 +21,3 @@ private: }; #endif - diff --git a/src/main.cpp b/src/main.cpp index c99c6e9..0c43464 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) { if (!editor_is_installed) conf->load("editor.conf"); else - if (!conf->load(std::string(getSaveLoadDirectory("", true)) + ".config/nodeboxeditor.conf")) + if (!conf->load(std::string(getSaveLoadDirectory("", true)) + ".config/nodeboxeditor.conf")) conf->load("editor.conf"); conf->set("installed", editor_is_installed?"true":"false"); @@ -118,7 +118,7 @@ int main(int argc, char *argv[]) { if (device == NULL) { return EXIT_FAILURE; // could not create selected driver. } - + #if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8 std::cerr << "Warning! Your irrlicht version is outdated, so some NBE features will not be available." << std::endl; #endif @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) { if (!editor_is_installed) conf->save("editor.conf"); else - if (!conf->save(std::string(getSaveLoadDirectory("", true)) + ".config/nodeboxeditor.conf")) + if (!conf->save(std::string(getSaveLoadDirectory("", true)) + ".config/nodeboxeditor.conf")) conf->save("editor.conf"); return 1; @@ -144,4 +144,3 @@ void junk() { i = pthread_getconcurrency(); }; #endif - diff --git a/src/modes/NBEditor.cpp b/src/modes/NBEditor.cpp index 7d2ea10..1c96239 100644 --- a/src/modes/NBEditor.cpp +++ b/src/modes/NBEditor.cpp @@ -546,5 +546,3 @@ irr::video::ITexture* NBEditor::icon() ->getTexture("media/icon_mode_nodebox.png"); return icon; } - - diff --git a/src/modes/NBEditor.hpp b/src/modes/NBEditor.hpp index c1d3c07..72d9cfa 100644 --- a/src/modes/NBEditor.hpp +++ b/src/modes/NBEditor.hpp @@ -48,4 +48,3 @@ private: }; #endif - diff --git a/src/modes/NodeEditor.cpp b/src/modes/NodeEditor.cpp index e12683e..e68a957 100644 --- a/src/modes/NodeEditor.cpp +++ b/src/modes/NodeEditor.cpp @@ -241,4 +241,3 @@ irr::video::ITexture* NodeEditor::icon() getVideoDriver()->getTexture("media/icon_mode_node.png"); return icon; } - diff --git a/src/modes/TextureEditor.cpp b/src/modes/TextureEditor.cpp index d070f82..50499ec 100644 --- a/src/modes/TextureEditor.cpp +++ b/src/modes/TextureEditor.cpp @@ -115,4 +115,3 @@ irr::video::ITexture* TextureEditor::icon() getVideoDriver()->getTexture("media/icon_mode_texture.png"); return icon; } - diff --git a/src/util/SimpleFileCombiner.cpp b/src/util/SimpleFileCombiner.cpp index ebf005a..7dee19a 100644 --- a/src/util/SimpleFileCombiner.cpp +++ b/src/util/SimpleFileCombiner.cpp @@ -26,7 +26,7 @@ bool SimpleFileCombiner::write(std::string filename) { std::ofstream output(filename.c_str(), std::ios::binary|std::ios::out); if (!output) { errcode = EERR_IO; - return false; + return false; } output.write("NBEFP", 5); output << (char)files.size(); @@ -42,17 +42,17 @@ bool SimpleFileCombiner::write(std::string filename) { name += " "; } output << name.c_str(); - output.write(static_cast(static_cast(&start)), sizeof(unsigned int)); + output.write(static_cast(static_cast(&start)), sizeof(unsigned int)); output.write(static_cast(static_cast(&size)), sizeof(unsigned int)); start += size; - - } + + } for (std::list::const_iterator it = files.begin(); it != files.end(); ++it) { SimpleFileCombiner::File file = *it; output.write(&file.bytes[0], file.bytes.size()); - } + } output.close(); return true; } diff --git a/src/util/SimpleFileCombiner.hpp b/src/util/SimpleFileCombiner.hpp index 0d56e8c..9194014 100644 --- a/src/util/SimpleFileCombiner.hpp +++ b/src/util/SimpleFileCombiner.hpp @@ -39,4 +39,3 @@ public: }; #endif - diff --git a/src/util/string.cpp b/src/util/string.cpp index 2871ca3..49b5d59 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -33,4 +33,3 @@ std::string str_replace(const std::string & str, char f, char r) std::replace(s.begin(), s.end(), f, r); return s; } - diff --git a/src/util/tinyfiledialogs.h b/src/util/tinyfiledialogs.h index fc31bef..fdb0922 100644 --- a/src/util/tinyfiledialogs.h +++ b/src/util/tinyfiledialogs.h @@ -30,7 +30,7 @@ On UNIX it tries successive command line calls: - python 2 / tkinter - dialog. The same executable can run across desktops and distributions. - + - License - This software is provided 'as-is', without any express or implied