Fix includes to use local project includes.

Worked on my machine™
canonical · Nov 11, 2024 · 38b971a · 38b971a
1 parent d96e5f9
commit 38b971a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/examples/miral-custom-decorations/input.h b/examples/miral-custom-decorations/input.h
@@ -18,21 +18,22 @@
 #define MIRAL_CUSTOM_DECORATIONS_INPUT_H
 
 #include "mir/shell/input_resolver.h"
-#include "mircore/mir/geometry/rectangle.h"
-#include "mircore/mir_toolkit/common.h"
 #include "threadsafe_access.h"
-#include "window.h"
 
 #include <memory>
 #include <vector>
 #include <mutex>
-#include <map>
 #include <optional>
 
 namespace msd = mir::shell::decoration;
 
 struct MirEvent;
 class UserDecorationExample;
+struct StaticGeometry;
+class WindowState;
+
+template<typename T>
+class ThreadsafeAccess;
 
 namespace mir
 {

diff --git a/examples/miral-custom-decorations/theme.h b/examples/miral-custom-decorations/theme.h
@@ -17,8 +17,6 @@
 #ifndef MIRAL_CUSTOM_DECORATIONS_THEME_H
 #define MIRAL_CUSTOM_DECORATIONS_THEME_H
 
-#include "mircore/mir/geometry/forward.h"
-
 #include "input.h"
 
 #include <cstdint>

diff --git a/src/include/server/mir/shell/decoration_notifier.h b/src/include/server/mir/shell/decoration_notifier.h
@@ -21,7 +21,6 @@
 
 #include <mir/geometry/size.h>
 #include <mir/geometry/forward.h>
-#include <mircommon/mir_toolkit/event.h>
 
 #include <memory>
 

diff --git a/src/miral/symbols.map b/src/miral/symbols.map
@@ -509,6 +509,14 @@ global:
     miral::decoration::DecorationManagerAdapter::undecorate_all*;
     miral::decoration::DecorationManagerBuilder::build*;
     miral::decoration::DecorationManagerBuilder::done*;
+    miral::decoration::InputResolverAdapter::process_down*;
+    miral::decoration::InputResolverAdapter::process_drag*;
+    miral::decoration::InputResolverAdapter::process_enter*;
+    miral::decoration::InputResolverAdapter::process_leave*;
+    miral::decoration::InputResolverAdapter::process_move*;
+    miral::decoration::InputResolverAdapter::process_up*;
+    miral::decoration::InputResolverBuilder::build*;
+    miral::decoration::InputResolverBuilder::done*;
     non-virtual?thunk?to?miral::decoration::DecorationAdapter::attrib_changed*;
     non-virtual?thunk?to?miral::decoration::DecorationAdapter::handle_input_event*;
     non-virtual?thunk?to?miral::decoration::DecorationAdapter::set_scale*;
@@ -518,6 +526,12 @@ global:
     non-virtual?thunk?to?miral::decoration::DecorationManagerAdapter::init*;
     non-virtual?thunk?to?miral::decoration::DecorationManagerAdapter::undecorate*;
     non-virtual?thunk?to?miral::decoration::DecorationManagerAdapter::undecorate_all*;
+    non-virtual?thunk?to?miral::decoration::InputResolverAdapter::process_down*;
+    non-virtual?thunk?to?miral::decoration::InputResolverAdapter::process_drag*;
+    non-virtual?thunk?to?miral::decoration::InputResolverAdapter::process_enter*;
+    non-virtual?thunk?to?miral::decoration::InputResolverAdapter::process_leave*;
+    non-virtual?thunk?to?miral::decoration::InputResolverAdapter::process_move*;
+    non-virtual?thunk?to?miral::decoration::InputResolverAdapter::process_up*;
     typeinfo?for?miral::ConfigFile;
     typeinfo?for?miral::Decorations;
     typeinfo?for?miral::IdleListener;
@@ -529,8 +543,11 @@ global:
     typeinfo?for?miral::decoration::DecorationBuilder;
     typeinfo?for?miral::decoration::DecorationManagerAdapter;
     typeinfo?for?miral::decoration::DecorationManagerBuilder;
+    typeinfo?for?miral::decoration::InputResolverAdapter;
+    typeinfo?for?miral::decoration::InputResolverBuilder;
     vtable?for?miral::decoration::DecorationAdapter;
     vtable?for?miral::decoration::DecorationManagerAdapter;
+    vtable?for?miral::decoration::InputResolverAdapter;
   };
 } MIRAL_5.0;
 
diff --git a/src/server/shell/decoration/input.cpp b/src/server/shell/decoration/input.cpp
@@ -18,6 +18,7 @@
 #include "mir/shell/input_resolver.h"
 
 #include "basic_decoration.h"
+#include "mir_toolkit/events/event.h"
 #include "window.h"
 #include "threadsafe_access.h"
 

diff --git a/src/server/shell/decoration/theme.h b/src/server/shell/decoration/theme.h
@@ -19,8 +19,6 @@
 
 #include "input.h"
 
-#include "mir/geometry/forward.h"
-
 #include <cstdint>
 #include <functional>
 #include <map>