Revert some changes (mostly iostream adds)

apps/opencs/model/doc/document.cpp

@@ -2,7 +2,6 @@
 
 #include <cassert>
 #include <fstream>
-#include <iostream>
 
 #include <boost/filesystem.hpp>
 

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();
-}
+}

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<CSMWorld::UniversalId>& data,
                 DropType type);

apps/openmw/mwmechanics/levelledlist.hpp

@@ -8,8 +8,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
-#include <iostream>
-
 namespace MWMechanics
 {
 

apps/openmw/mwrender/animation.cpp

@@ -1,7 +1,5 @@
 #include "animation.hpp"
 
-#include <iostream>
-
 #include <OgreSkeletonManager.h>
 #include <OgreSkeletonInstance.h>
 #include <OgreEntity.h>

apps/openmw/mwrender/occlusionquery.cpp

@@ -1,7 +1,5 @@
 #include "occlusionquery.hpp"
 
-#include <iostream>
-
 #include <OgreRenderSystem.h>
 #include <OgreRoot.h>
 #include <OgreBillboardSet.h>

apps/openmw/mwrender/renderingmanager.cpp

@@ -1,7 +1,6 @@
 #include "renderingmanager.hpp"
 
 #include <cassert>
-#include <iostream>
 
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>

apps/openmw/mwstate/statemanagerimp.cpp

@@ -1,8 +1,6 @@
 
 #include "statemanagerimp.hpp"
 
-#include <iostream>
-
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/esmreader.hpp>
 #include <components/esm/cellid.hpp>

apps/openmw/mwworld/containerstore.cpp

@@ -1,7 +1,6 @@
 
 #include "containerstore.hpp"
 
-#include <iostream>
 #include <cassert>
 #include <typeinfo>
 #include <stdexcept>

components/nif/niffile.hpp

@@ -5,21 +5,8 @@
 
 #include <stdexcept>
 #include <vector>
-<<<<<<< HEAD
-#include <cassert>
-#include <typeinfo>
 #include <iostream>
 
-#include <boost/weak_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/detail/endian.hpp>
-
-#include <stdint.h>
-=======
-#include <iostream>
->>>>>>> master
-
 #include "record.hpp"
 
 namespace Nif

components/terrain/terraingrid.cpp

@@ -3,7 +3,6 @@
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
 #include <OgreAxisAlignedBox.h>
-#include <OgreTextureManager.h>
 
 #include "chunk.hpp"
 

extern/sdl4ogre/sdlinputwrapper.cpp

@@ -4,7 +4,6 @@
 #include <OgrePlatform.h>
 #include <OgreRoot.h>
 
-#include <iostream>
 
 namespace SFO
 {

extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp

@@ -8,8 +8,6 @@
 #include <OgreGpuProgramManager.h>
 #include <OgreVector4.h>
 
-#include <iostream>
-
 namespace sh
 {
 	OgreGpuProgram::OgreGpuProgram(