krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Revert some changes (mostly iostream adds)

Browse source
This commit is contained in:
cc9cii 2014-09-30 18:46:26 +10:00
parent 312b7cd571
commit 687b62dfd3
13 changed files with 2 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/model/doc/document.cpp
View file

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

1
apps/opencs/view/render/pagedworldspacewidget.hpp
View file

@ -60,7 +60,6 @@ namespace CSVRender
void displayCellCoord(bool display); void displayCellCoord(bool display);
/// \return Drop handled? /// \return Drop handled?
virtual bool handleDrop (const std::vector<CSMWorld::UniversalId>& data, virtual bool handleDrop (const std::vector<CSMWorld::UniversalId>& data,
DropType type); DropType type);

2
apps/openmw/mwmechanics/levelledlist.hpp
View file

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

2
apps/openmw/mwrender/animation.cpp
View file

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

2
apps/openmw/mwrender/occlusionquery.cpp
View file

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

1
apps/openmw/mwrender/renderingmanager.cpp
View file

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

2
apps/openmw/mwstate/statemanagerimp.cpp
View file

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

1
apps/openmw/mwworld/containerstore.cpp
View file

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

13
components/nif/niffile.hpp
View file

@ -5,21 +5,8 @@
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
<<<<<<< HEAD
#include <cassert>
#include <typeinfo>
#include <iostream> #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" #include "record.hpp"
namespace Nif namespace Nif

1
components/terrain/terraingrid.cpp
View file

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

1
extern/sdl4ogre/sdlinputwrapper.cpp vendored
View file

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

2
extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp vendored
View file

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