Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure classes match their header filename #25821

Merged
merged 5 commits into from
Feb 13, 2019
Merged

Ensure classes match their header filename #25821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7cc2bb
Core: Ensure classes match their header filename
akien-mga Feb 12, 2019
75dae1b
Drivers, main, servers: Ensure classes match their header filename
akien-mga Feb 12, 2019
bc26d0d
Platform: Ensure classes match their header filename
akien-mga Feb 12, 2019
c5dcbeb
Scene: Ensure classes match their header filename
akien-mga Feb 12, 2019
fe7e11e
Modules: Ensure classes match their header filename
akien-mga Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
195 changes: 0 additions & 195 deletions core/allocators.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/core_string_names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef CORE_STRING_NAMES_H
#define CORE_STRING_NAMES_H

#include "core/string_db.h"
#include "core/string_name.h"

class CoreStringNames {

Expand Down
2 changes: 1 addition & 1 deletion core/global_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef GLOBAL_CONSTANTS_H
#define GLOBAL_CONSTANTS_H

#include "core/string_db.h"
#include "core/string_name.h"

class GlobalConstants {
public:
Expand Down
2 changes: 1 addition & 1 deletion core/hashfuncs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "core/math/math_defs.h"
#include "core/math/math_funcs.h"
#include "core/node_path.h"
#include "core/string_db.h"
#include "core/string_name.h"
#include "core/typedefs.h"
#include "core/ustring.h"

Expand Down
2 changes: 1 addition & 1 deletion core/image.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#define IMAGE_H

#include "core/color.h"
#include "core/dvector.h"
#include "core/math/rect2.h"
#include "core/pool_vector.h"
#include "core/resource.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion core/io/file_access_buffered.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#ifndef FILE_ACCESS_BUFFERED_H
#define FILE_ACCESS_BUFFERED_H

#include "core/dvector.h"
#include "core/os/file_access.h"
#include "core/pool_vector.h"
#include "core/ustring.h"

class FileAccessBuffered : public FileAccess {
Expand Down
2 changes: 1 addition & 1 deletion core/io/file_access_buffered_fa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class FileAccessBufferedFA : public FileAccessBuffered {
cache.offset = p_offset;
cache.buffer.resize(p_size);

// on dvector
// on PoolVector
//PoolVector<uint8_t>::Write write = cache.buffer.write();
//f.get_buffer(write.ptrw(), p_size);

Expand Down
4 changes: 2 additions & 2 deletions core/io/resource_import.cpp → core/io/resource_importer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*************************************************************************/
/* resource_import.cpp */
/* resource_importer.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Expand Down Expand Up @@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/

#include "resource_import.h"
#include "resource_importer.h"

#include "core/os/os.h"
#include "core/variant_parser.h"
Expand Down
8 changes: 4 additions & 4 deletions core/io/resource_import.h → core/io/resource_importer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*************************************************************************/
/* resource_import.h */
/* resource_importer.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Expand Down Expand Up @@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/

#ifndef RESOURCE_IMPORT_H
#define RESOURCE_IMPORT_H
#ifndef RESOURCE_IMPORTER_H
#define RESOURCE_IMPORTER_H

#include "core/io/resource_loader.h"

Expand Down Expand Up @@ -110,4 +110,4 @@ class ResourceImporter : public Reference {
virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = NULL) = 0;
};

#endif // RESOURCE_IMPORT_H
#endif // RESOURCE_IMPORTER_H
2 changes: 1 addition & 1 deletion core/io/resource_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "resource_loader.h"

#include "core/io/resource_import.h"
#include "core/io/resource_importer.h"
#include "core/os/file_access.h"
#include "core/os/os.h"
#include "core/path_remap.h"
Expand Down
2 changes: 1 addition & 1 deletion core/list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#define GLOBALS_LIST_H

#include "core/os/memory.h"
#include "core/sort.h"
#include "core/sort_array.h"

/**
* Generic Templatized Linked List Implementation.
Expand Down
2 changes: 1 addition & 1 deletion core/math/bsp_tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
#ifndef BSP_TREE_H
#define BSP_TREE_H

#include "core/dvector.h"
#include "core/math/aabb.h"
#include "core/math/face3.h"
#include "core/math/plane.h"
#include "core/method_ptrcall.h"
#include "core/pool_vector.h"
#include "core/variant.h"
#include "core/vector.h"
/**
Expand Down
2 changes: 1 addition & 1 deletion core/math/geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
#ifndef GEOMETRY_H
#define GEOMETRY_H

#include "core/dvector.h"
#include "core/math/face3.h"
#include "core/math/rect2.h"
#include "core/math/triangulate.h"
#include "core/math/vector3.h"
#include "core/object.h"
#include "core/pool_vector.h"
#include "core/print_string.h"
#include "core/vector.h"

Expand Down
2 changes: 1 addition & 1 deletion core/math/triangle_mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "triangle_mesh.h"

#include "core/sort.h"
#include "core/sort_array.h"

int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &max_depth, int &max_alloc) {

Expand Down
2 changes: 1 addition & 1 deletion core/node_path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef NODE_PATH_H
#define NODE_PATH_H

#include "core/string_db.h"
#include "core/string_name.h"
#include "core/ustring.h"

/**
Expand Down
Loading