(AT-SPI) Created sub-folders for some of the Bridge code (for SAM score)

Change-Id: Ib492379432f068a41825d4dbd8a717385fee9198

diff --git a/dali/internal/accessibility/bridge/accessibility-common.h b/dali/internal/accessibility/bridge/accessibility-common.h
index 4f61522..e77281d 100644 (file)
--- a/dali/internal/accessibility/bridge/accessibility-common.h
+++ b/dali/internal/accessibility/bridge/accessibility-common.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_ATSPI_ACCESSIBILITY_COMMON_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
-#include <dali/internal/accessibility/bridge/dbus-locators.h>
-#include <dali/internal/accessibility/bridge/dbus.h>
+#include <dali/internal/accessibility/bridge/dbus/dbus-locators.h>
+#include <dali/internal/accessibility/bridge/dbus/dbus.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 // DBus names

diff --git a/dali/internal/accessibility/bridge/bridge-impl.cpp b/dali/internal/accessibility/bridge/bridge-impl.cpp
index 083d382..afd3a96 100644 (file)
--- a/dali/internal/accessibility/bridge/bridge-impl.cpp
+++ b/dali/internal/accessibility/bridge/bridge-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
 #include <dali/internal/accessibility/bridge/bridge-text.h>
 #include <dali/internal/accessibility/bridge/bridge-value.h>
 #include <dali/internal/accessibility/bridge/bridge-application.h>
-#include <dali/internal/accessibility/bridge/dummy-atspi.h>
+#include <dali/internal/accessibility/bridge/dummy/dummy-atspi.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/system/common/environment-variables.h>
 

diff --git a/dali/internal/accessibility/bridge/dbus-locators.h b/dali/internal/accessibility/bridge/dbus/dbus-locators.h
similarity index 100%
rename from dali/internal/accessibility/bridge/dbus-locators.h
rename to dali/internal/accessibility/bridge/dbus/dbus-locators.h

diff --git a/dali/internal/accessibility/bridge/dbus-tizen.cpp b/dali/internal/accessibility/bridge/dbus/dbus-tizen.cpp
similarity index 99%
rename from dali/internal/accessibility/bridge/dbus-tizen.cpp
rename to dali/internal/accessibility/bridge/dbus/dbus-tizen.cpp
index 5aaba13..52014da 100644 (file)
--- a/dali/internal/accessibility/bridge/dbus-tizen.cpp
+++ b/dali/internal/accessibility/bridge/dbus/dbus-tizen.cpp
@@ -16,7 +16,7 @@
 
 // CLASS HEADER
 #include <dali/internal/accessibility/bridge/accessibility-common.h>
-#include <dali/internal/accessibility/bridge/dbus.h>
+#include <dali/internal/accessibility/bridge/dbus/dbus.h>
 
 // EXTERNAL INCLUDES
 #include <iostream>

diff --git a/dali/internal/accessibility/bridge/dbus.h b/dali/internal/accessibility/bridge/dbus/dbus.h
similarity index 100%
rename from dali/internal/accessibility/bridge/dbus.h
rename to dali/internal/accessibility/bridge/dbus/dbus.h

diff --git a/dali/internal/accessibility/bridge/dummy-atspi.cpp b/dali/internal/accessibility/bridge/dummy/dummy-atspi.cpp
similarity index 96%
rename from dali/internal/accessibility/bridge/dummy-atspi.cpp
rename to dali/internal/accessibility/bridge/dummy/dummy-atspi.cpp
index 21876c2..5e8e49e 100644 (file)
--- a/dali/internal/accessibility/bridge/dummy-atspi.cpp
+++ b/dali/internal/accessibility/bridge/dummy/dummy-atspi.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
 #include <dali/devel-api/atspi-interfaces/accessible.h>
 #include <dali/devel-api/atspi-interfaces/component.h>
-#include <dali/internal/accessibility/bridge/dummy-atspi.h>
+#include <dali/internal/accessibility/bridge/dummy/dummy-atspi.h>
 
 namespace Dali
 {

diff --git a/dali/internal/accessibility/bridge/dummy-atspi.h b/dali/internal/accessibility/bridge/dummy/dummy-atspi.h
similarity index 98%
rename from dali/internal/accessibility/bridge/dummy-atspi.h
rename to dali/internal/accessibility/bridge/dummy/dummy-atspi.h
index 81caf8e..4032d11 100644 (file)
--- a/dali/internal/accessibility/bridge/dummy-atspi.h
+++ b/dali/internal/accessibility/bridge/dummy/dummy-atspi.h
@@ -2,7 +2,7 @@
 #define DALI_ADAPTOR_DUMMY_ATSPI_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/dali/internal/accessibility/file.list b/dali/internal/accessibility/file.list
old mode 100755 (executable)
new mode 100644 (file)
index 14a6ba8..c7fbade
--- a/dali/internal/accessibility/file.list
+++ b/dali/internal/accessibility/file.list
@@ -65,11 +65,11 @@ SET( adaptor_accessibility_atspi_bridge_src_files
     ${adaptor_accessibility_dir}/bridge/bridge-text.cpp
     ${adaptor_accessibility_dir}/bridge/bridge-value.cpp
     ${adaptor_accessibility_dir}/bridge/component.cpp
-    ${adaptor_accessibility_dir}/bridge/dbus-tizen.cpp
+    ${adaptor_accessibility_dir}/bridge/dbus/dbus-tizen.cpp
 )
 
 SET( adaptor_accessibility_atspi_dummy_src_files
-    ${adaptor_accessibility_dir}/bridge/dummy-atspi.cpp
+    ${adaptor_accessibility_dir}/bridge/dummy/dummy-atspi.cpp
 )
 
 # module: accessibility, backend: macos