Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2005-01-18 17:17:44 +0300
committerKent Mein <mein@cs.umn.edu>2005-01-18 17:17:44 +0300
commitf13bff1588fa63e464165ffab912d540c70128fd (patch)
tree4a2713e4214a28c63422f2a30e686e5409d03b43 /source/gameengine
parentb908cfcb07ca28b099953d5a1ddad9a5e1cc85c4 (diff)
The non scons specific stuff for bug tracker bug #2131
Basically removed #include <iostream.h> from some files that didn't need it (and I'm assuming it caused problems) I'll leave the scons stuff for someone else to look at since I don't really use it. Kent
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/GameLogic/SCA_IInputDevice.cpp5
-rw-r--r--source/gameengine/GameLogic/SCA_KeyboardManager.cpp5
-rw-r--r--source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp5
-rw-r--r--source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp5
4 files changed, 0 insertions, 20 deletions
diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.cpp b/source/gameengine/GameLogic/SCA_IInputDevice.cpp
index 9641ee601fe..c6858cdb75a 100644
--- a/source/gameengine/GameLogic/SCA_IInputDevice.cpp
+++ b/source/gameengine/GameLogic/SCA_IInputDevice.cpp
@@ -29,14 +29,9 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include <iostream.h>
#include <assert.h>
#include "SCA_IInputDevice.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
SCA_IInputDevice::SCA_IInputDevice()
:
m_currentTable(0)
diff --git a/source/gameengine/GameLogic/SCA_KeyboardManager.cpp b/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
index cd7e07a7e81..25a366352cc 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
@@ -32,17 +32,12 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include <iostream.h>
#include "BoolValue.h"
#include "SCA_KeyboardManager.h"
#include "SCA_KeyboardSensor.h"
#include "IntValue.h"
#include <vector>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
SCA_KeyboardManager::SCA_KeyboardManager(SCA_LogicManager* logicmgr,
SCA_IInputDevice* inputdev)
: SCA_EventManager(KEYBOARD_EVENTMGR),
diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
index 989317ebf61..dbe875957b0 100644
--- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
@@ -30,13 +30,8 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include <iostream.h>
#include "GPC_KeyboardDevice.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* NextFrame toggles currentTable with previousTable,
* and copies relevant event information from previous to current table
diff --git a/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
index bdd04fadb9b..b1b05d9a978 100644
--- a/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
+++ b/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
@@ -29,13 +29,8 @@
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#include <iostream.h>
#include "GPU_KeyboardDevice.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void GPU_KeyboardDevice::register_X_key_down_event(KeySym k)
{
ConvertEvent(k, 1);