From 687b62dfd3e6a20b6fc111f08478898dc7cfda20 Mon Sep 17 00:00:00 2001 From: cc9cii Date: Tue, 30 Sep 2014 18:46:26 +1000 Subject: [PATCH] Revert some changes (mostly iostream adds) --- apps/opencs/model/doc/document.cpp | 1 - apps/opencs/view/render/pagedworldspacewidget.cpp | 4 ++-- apps/opencs/view/render/pagedworldspacewidget.hpp | 1 - apps/openmw/mwmechanics/levelledlist.hpp | 2 -- apps/openmw/mwrender/animation.cpp | 2 -- apps/openmw/mwrender/occlusionquery.cpp | 2 -- apps/openmw/mwrender/renderingmanager.cpp | 1 - apps/openmw/mwstate/statemanagerimp.cpp | 2 -- apps/openmw/mwworld/containerstore.cpp | 1 - components/nif/niffile.hpp | 13 ------------- components/terrain/terraingrid.cpp | 1 - extern/sdl4ogre/sdlinputwrapper.cpp | 1 - extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp | 2 -- 13 files changed, 2 insertions(+), 31 deletions(-) diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp index 040a4462d..9a174d9d5 100644 --- a/apps/opencs/model/doc/document.cpp +++ b/apps/opencs/model/doc/document.cpp @@ -2,7 +2,6 @@ #include #include -#include #include diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp index 22af7cd86..b201f2110 100644 --- a/apps/opencs/view/render/pagedworldspacewidget.cpp +++ b/apps/opencs/view/render/pagedworldspacewidget.cpp @@ -107,7 +107,7 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells() Ogre::TexturePtr texture = Ogre::TextureManager::getSingleton().getByName("CellBillboardTexture" + iter->getId(mWorldspace)); if (texture.isNull()) { - texture = Ogre::TextureManager::getSingleton().createManual("CellBillboardTexture" + iter->getId(mWorldspace), + texture = Ogre::TextureManager::getSingleton().createManual("CellBillboardTexture" + iter->getId(mWorldspace), Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D, 1024, 1024, 5, Ogre::PF_X8R8G8B8, Ogre::TU_DEFAULT); @@ -396,4 +396,4 @@ void CSVRender::PagedWorldspaceWidget::cellAdded (const QModelIndex& index, int /// \todo check if no selected cell is affected and do not update, if that is the case if (adjustCells()) flagAsModified(); -} \ No newline at end of file +} diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp index 1b43510ff..304424453 100644 --- a/apps/opencs/view/render/pagedworldspacewidget.hpp +++ b/apps/opencs/view/render/pagedworldspacewidget.hpp @@ -60,7 +60,6 @@ namespace CSVRender void displayCellCoord(bool display); - /// \return Drop handled? virtual bool handleDrop (const std::vector& data, DropType type); diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp index ad0677067..5d9e29118 100644 --- a/apps/openmw/mwmechanics/levelledlist.hpp +++ b/apps/openmw/mwmechanics/levelledlist.hpp @@ -8,8 +8,6 @@ #include "../mwbase/environment.hpp" #include "../mwmechanics/creaturestats.hpp" -#include - namespace MWMechanics { diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index bdc74f5e3..12ba3c2da 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -1,7 +1,5 @@ #include "animation.hpp" -#include - #include #include #include diff --git a/apps/openmw/mwrender/occlusionquery.cpp b/apps/openmw/mwrender/occlusionquery.cpp index c228a0160..92a49acc0 100644 --- a/apps/openmw/mwrender/occlusionquery.cpp +++ b/apps/openmw/mwrender/occlusionquery.cpp @@ -1,7 +1,5 @@ #include "occlusionquery.hpp" -#include - #include #include #include diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 7b597f0c8..4512bbbeb 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -1,7 +1,6 @@ #include "renderingmanager.hpp" #include -#include #include #include diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp index 2ec061fe7..18ebe11ce 100644 --- a/apps/openmw/mwstate/statemanagerimp.cpp +++ b/apps/openmw/mwstate/statemanagerimp.cpp @@ -1,8 +1,6 @@ #include "statemanagerimp.hpp" -#include - #include #include #include diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp index 8382311aa..085b079d9 100644 --- a/apps/openmw/mwworld/containerstore.cpp +++ b/apps/openmw/mwworld/containerstore.cpp @@ -1,7 +1,6 @@ #include "containerstore.hpp" -#include #include #include #include diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp index f7cee6c40..108e455d7 100644 --- a/components/nif/niffile.hpp +++ b/components/nif/niffile.hpp @@ -5,21 +5,8 @@ #include #include -<<<<<<< HEAD -#include -#include #include -#include -#include -#include -#include - -#include -======= -#include ->>>>>>> master - #include "record.hpp" namespace Nif diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp index 106f00e76..fe322a6bf 100644 --- a/components/terrain/terraingrid.cpp +++ b/components/terrain/terraingrid.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "chunk.hpp" diff --git a/extern/sdl4ogre/sdlinputwrapper.cpp b/extern/sdl4ogre/sdlinputwrapper.cpp index d0be46966..db46a4af9 100644 --- a/extern/sdl4ogre/sdlinputwrapper.cpp +++ b/extern/sdl4ogre/sdlinputwrapper.cpp @@ -4,7 +4,6 @@ #include #include -#include namespace SFO { diff --git a/extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp b/extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp index 8b819f6ef..e71854019 100644 --- a/extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp +++ b/extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp @@ -8,8 +8,6 @@ #include #include -#include - namespace sh { OgreGpuProgram::OgreGpuProgram(