libaurum: Re-arrange headers

Divide interface, Combine Accessble, Move header to proper location etc...

Change-Id: I6c27896543ceca46cf61c57a746f2060e16ac4b5

diff --git a/libaurum/inc/Accessibility/Accessible.h b/libaurum/inc/Accessibility/Accessible.h
new file mode 100644 (file)
index 0000000..3292ad8
--- /dev/null
+++ b/libaurum/inc/Accessibility/Accessible.h
@@ -0,0 +1,12 @@
+#ifndef _ACCESSIBLE_H_
+#define _ACCESSIBLE_H_
+
+#include "AccessibleNode.h"
+#include "AccessibleUtils.h"
+#include "AccessibleWatcher.h"
+#include "AccessibleApplication.h"
+#include "AccessibleWindow.h"
+#include "IEventConsumer.h"
+#include "IEventSource.h"
+
+#endif /* _ACCESSIBLE_H_ */

diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h
index e695057..d9869cd 100644 (file)
--- a/libaurum/inc/Accessibility/AccessibleWatcher.h
+++ b/libaurum/inc/Accessibility/AccessibleWatcher.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include "AccessibleApplication.h"
 #include "AccessibleWindow.h"
 #include "AccessibleNode.h"

diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h
index 2f46351..76e7405 100644 (file)
--- a/libaurum/inc/Aurum.h
+++ b/libaurum/inc/Aurum.h
@@ -16,13 +16,7 @@
 #include "Waiter.h"
 #include "ISearchable.h"
 #include "IDevice.h"
-#include "AccessibleNode.h"
-#include "AccessibleUtils.h"
-#include "AccessibleWatcher.h"
-#include "AccessibleApplication.h"
-#include "AccessibleWindow.h"
-#include "IEventConsumer.h"
-#include "IEventSource.h"
+#include "Accessible.h"
 #include "Point2D.h"
 #include "Rect.h"
 #include "PartialMatch.h"

diff --git a/libaurum/inc/IDevice.h b/libaurum/inc/Interface/IDevice.h
similarity index 100%
rename from libaurum/inc/IDevice.h
rename to libaurum/inc/Interface/IDevice.h

diff --git a/libaurum/inc/ISearchable.h b/libaurum/inc/Interface/ISearchable.h
similarity index 100%
rename from libaurum/inc/ISearchable.h
rename to libaurum/inc/Interface/ISearchable.h

diff --git a/libaurum/inc/bitmask.h b/libaurum/inc/Misc/bitmask.h
similarity index 100%
rename from libaurum/inc/bitmask.h
rename to libaurum/inc/Misc/bitmask.h

diff --git a/libaurum/meson.build b/libaurum/meson.build
index 257e6f4..24d3c3b 100644 (file)
--- a/libaurum/meson.build
+++ b/libaurum/meson.build
@@ -7,18 +7,12 @@ libaurum_install_inc = [
   './inc/Sel.h',
   './inc/Until.h',
   './inc/Waiter.h',
-  './inc/ISearchable.h',
-  './inc/IDevice.h',
+  './inc/Interface/ISearchable.h',
+  './inc/Interface/IDevice.h',
   './inc/A11yEvent.h',
-  './inc/bitmask.h',
-  './inc/Accessibility/AccessibleNode.h',
-  './inc/Accessibility/AccessibleUtils.h',
-  './inc/Accessibility/AccessibleWatcher.h',
-  './inc/Accessibility/AccessibleApplication.h',
-  './inc/Accessibility/AccessibleWindow.h',
-  './inc/Accessibility/IEventConsumer.h',
-  './inc/Accessibility/IEventSource.h',
+  './inc/Accessibility/Accessible.h',
   './inc/Runnable/Runnable.h',
+  './inc/Misc/bitmask.h',
   './inc/Misc/Point2D.h',
   './inc/Misc/Rect.h',
   './inc/Aurum.h',
@@ -30,7 +24,8 @@ libaurum_inc = [
   include_directories('./inc/Impl'),
   include_directories('./inc/Impl/Accessibility'),
   include_directories('./inc/Misc'),
-  include_directories('./inc/Runnable/'),
+  include_directories('./inc/Runnable'),
+  include_directories('./inc/Interface'),
   root_inc,
   loguru_inc,
 ]
@@ -77,4 +72,3 @@ libaurum =  declare_dependency(link_with: libaurum_lib,
 
 install_headers(libaurum_install_inc,
 )
-

diff --git a/libaurum/src/A11yEvent.cc b/libaurum/src/A11yEvent.cc
index 996fb33..d4d0bed 100644 (file)
--- a/libaurum/src/A11yEvent.cc
+++ b/libaurum/src/A11yEvent.cc
@@ -1,6 +1,5 @@
-#include "A11yEvent.h"
-
 #include "Aurum.h"
+
 #include <unordered_map>
 
 A11yEventInfo::A11yEventInfo() : A11yEventInfo(A11yEvent::EVENT_NONE, nullptr, nullptr) {}