Make core/ includes absolute, remove subfolders from include path

This allows more consistency in the manner we include core headers,
where previously there would be a mix of absolute, relative and
include path-dependent includes.
This commit is contained in:
Rémi Verschelde
2018-09-11 18:13:45 +02:00
parent cc71012266
commit 277b24dfb7
873 changed files with 2119 additions and 2027 deletions

View File

@ -32,9 +32,9 @@
#include "dir_access_windows.h"
#include "os/memory.h"
#include "core/os/memory.h"
#include "core/print_string.h"
#include "print_string.h"
#include <stdio.h>
#include <wchar.h>
#include <windows.h>

View File

@ -33,7 +33,7 @@
#ifdef WINDOWS_ENABLED
#include "os/dir_access.h"
#include "core/os/dir_access.h"
/**
@author Juan Linietsky <reduz@gmail.com>

View File

@ -33,13 +33,15 @@
#ifdef WINDOWS_ENABLED
#include "os/file_access.h"
#include "os/memory.h"
#include "core/os/file_access.h"
#include "core/os/memory.h"
#include <stdio.h>
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
class FileAccessWindows : public FileAccess {
FILE *f;

View File

@ -29,7 +29,8 @@
/*************************************************************************/
#include "mutex_windows.h"
#include "os/memory.h"
#include "core/os/memory.h"
#ifdef WINDOWS_ENABLED

View File

@ -33,11 +33,14 @@
#ifdef WINDOWS_ENABLED
#include "os/mutex.h"
#include "core/os/mutex.h"
#include <windows.h>
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
class MutexWindows : public Mutex {
#ifdef WINDOWS_USE_MUTEX

View File

@ -35,6 +35,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
// Must be included after Windows headers or hell breaks loose
#include "drivers/unix/socket_helpers.h"
int PacketPeerUDPWinsock::get_available_packet_count() const {

View File

@ -33,8 +33,8 @@
#ifndef PACKET_PEER_UDP_WINSOCK_H
#define PACKET_PEER_UDP_WINSOCK_H
#include "io/packet_peer_udp.h"
#include "ring_buffer.h"
#include "core/io/packet_peer_udp.h"
#include "core/ring_buffer.h"
class PacketPeerUDPWinsock : public PacketPeerUDP {

View File

@ -32,8 +32,9 @@
#include "rw_lock_windows.h"
#include "error_macros.h"
#include "os/memory.h"
#include "core/error_macros.h"
#include "core/os/memory.h"
#include <stdio.h>
void RWLockWindows::read_lock() {

View File

@ -33,7 +33,8 @@
#if defined(WINDOWS_ENABLED)
#include "os/rw_lock.h"
#include "core/os/rw_lock.h"
#include <windows.h>
class RWLockWindows : public RWLock {

View File

@ -32,7 +32,7 @@
#if defined(WINDOWS_ENABLED)
#include "os/memory.h"
#include "core/os/memory.h"
Error SemaphoreWindows::wait() {

View File

@ -31,14 +31,16 @@
#ifndef SEMAPHORE_WINDOWS_H
#define SEMAPHORE_WINDOWS_H
#include "os/semaphore.h"
#include "core/os/semaphore.h"
#ifdef WINDOWS_ENABLED
#include <windows.h>
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
class SemaphoreWindows : public Semaphore {
mutable HANDLE semaphore;

View File

@ -31,12 +31,14 @@
#ifndef SHELL_WINDOWS_H
#define SHELL_WINDOWS_H
#include "os/shell.h"
#include "core/os/shell.h"
#ifdef WINDOWS_ENABLED
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
class ShellWindows : public Shell {
public:
virtual void execute(String p_path);

View File

@ -33,7 +33,7 @@
#ifndef STREAM_PEER_TCP_WINSOCK_H
#define STREAM_PEER_TCP_WINSOCK_H
#include "error_list.h"
#include "core/error_list.h"
#include "core/io/ip_address.h"
#include "core/io/stream_peer_tcp.h"

View File

@ -32,7 +32,7 @@
#if defined(WINDOWS_ENABLED) && !defined(UWP_ENABLED)
#include "os/memory.h"
#include "core/os/memory.h"
Thread::ID ThreadWindows::get_id() const {

View File

@ -31,16 +31,17 @@
#ifndef THREAD_WINDOWS_H
#define THREAD_WINDOWS_H
#ifdef WINDOWS_ENABLED
#include "core/os/thread.h"
#include "core/script_language.h"
#include <windows.h>
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
#ifdef WINDOWS_ENABLED
#include "os/thread.h"
#include "script_language.h"
#include <windows.h>
class ThreadWindows : public Thread {
ThreadCreateCallback callback;