asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused iostream includes

Browse source
This commit is contained in:
Rémi Verschelde 2019-01-28 12:16:12 +01:00
parent 7fe66bc70f
commit 70689ebffd
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/import/editor_import_collada.cpp
View file

@ -44,8 +44,6 @@
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#include <iostream>
struct ColladaImport { struct ColladaImport {
Collada collada; Collada collada;

7
platform/windows/joypad.cpp
View file

@ -29,9 +29,9 @@
/*************************************************************************/ /*************************************************************************/
#include "joypad.h" #include "joypad.h"
#include <oleauto.h> #include <oleauto.h>
#include <wbemidl.h> #include <wbemidl.h>
#include <iostream>
#ifndef __GNUC__ #ifndef __GNUC__
#define __builtin_bswap32 _byteswap_ulong #define __builtin_bswap32 _byteswap_ulong
@ -149,15 +149,12 @@ bool JoypadWindows::setup_dinput_joypad(const DIDEVICEINSTANCE *instance) {
const DWORD devtype = (instance->dwDevType & 0xFF); const DWORD devtype = (instance->dwDevType & 0xFF);
if ((devtype != DI8DEVTYPE_JOYSTICK) && (devtype != DI8DEVTYPE_GAMEPAD) && (devtype != DI8DEVTYPE_1STPERSON)) { if ((devtype != DI8DEVTYPE_JOYSTICK) && (devtype != DI8DEVTYPE_GAMEPAD) && (devtype != DI8DEVTYPE_1STPERSON)) {
//printf("ignore device %s, type %x\n", instance->tszProductName, devtype);
return false; return false;
} }
hr = dinput->CreateDevice(instance->guidInstance, &joy->di_joy, NULL); hr = dinput->CreateDevice(instance->guidInstance, &joy->di_joy, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
//std::wcout << "failed to create device: " << instance->tszProductName << std::endl;
return false; return false;
} }
@ -383,8 +380,6 @@ void JoypadWindows::process_joypads() {
hr = joy->di_joy->GetDeviceState(sizeof(DIJOYSTATE2), &js); hr = joy->di_joy->GetDeviceState(sizeof(DIJOYSTATE2), &js);
if (FAILED(hr)) { if (FAILED(hr)) {
//printf("failed to read joy #%d\n", i);
continue; continue;
} }