diff options
author | Juan Linietsky <juan@godotengine.org> | 2020-03-01 19:14:37 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 15:49:32 +0100 |
commit | 4396e98834f159da59ec790f2ff64fb65dacd9ce (patch) | |
tree | d618e96d7a7b856260fd96e5e727f38a26de0724 /scene/gui | |
parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) |
Refactored Input, create DisplayServer and DisplayServerX11
Diffstat (limited to 'scene/gui')
-rw-r--r-- | scene/gui/color_picker.cpp | 2 | ||||
-rw-r--r-- | scene/gui/graph_edit.cpp | 2 | ||||
-rw-r--r-- | scene/gui/popup_menu.cpp | 2 | ||||
-rw-r--r-- | scene/gui/shortcut.h | 2 | ||||
-rw-r--r-- | scene/gui/spin_box.cpp | 2 | ||||
-rw-r--r-- | scene/gui/text_edit.cpp | 2 | ||||
-rw-r--r-- | scene/gui/tree.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index a8b5ac6909..29900def80 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -30,7 +30,7 @@ #include "color_picker.h" -#include "core/os/input.h" +#include "core/input/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 4bc33b220e..bae82923b2 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -30,7 +30,7 @@ #include "graph_edit.h" -#include "core/os/input.h" +#include "core/input/input.h" #include "core/os/keyboard.h" #include "scene/gui/box_container.h" diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index e75dadd5e0..9b24498740 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -30,7 +30,7 @@ #include "popup_menu.h" -#include "core/os/input.h" +#include "core/input/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/print_string.h" diff --git a/scene/gui/shortcut.h b/scene/gui/shortcut.h index 59d3245db5..b22c3441c5 100644 --- a/scene/gui/shortcut.h +++ b/scene/gui/shortcut.h @@ -31,7 +31,7 @@ #ifndef SHORTCUT_H #define SHORTCUT_H -#include "core/os/input_event.h" +#include "core/input/input_event.h" #include "core/resource.h" class ShortCut : public Resource { diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index 576de98a4f..c5e8da9978 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "spin_box.h" +#include "core/input/input.h" #include "core/math/expression.h" -#include "core/os/input.h" Size2 SpinBox::get_minimum_size() const { diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index cdc2430eb5..46f6d002cd 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -30,8 +30,8 @@ #include "text_edit.h" +#include "core/input/input.h" #include "core/message_queue.h" -#include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/project_settings.h" diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 12b3d56938..d9bfffffe9 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -30,8 +30,8 @@ #include "tree.h" +#include "core/input/input.h" #include "core/math/math_funcs.h" -#include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/print_string.h" |