From 467611a21ab3293a161e686626ec956167609de1 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Mon, 18 Oct 2021 16:28:04 +0900 Subject: [PATCH] aurum: Use Aurum namespace This is for prepare Aurum 1.0 version release. namespaces - Aurum for public classes AurumInternal for internal headers such as atspi, impl classes AurumInternal::Mock for Mock wrapper. We will add more namespace if we added other back-end instead of ATSPI, or other Node type needed. Change-Id: Ia47ff40387d322e3e0932b3b0cda45b0d4a5f19a --- libaurum/inc/A11yEvent.h | 4 ++++ libaurum/inc/Accessibility/AccessibleApplication.h | 4 ++++ libaurum/inc/Accessibility/AccessibleNode.h | 4 ++++ libaurum/inc/Accessibility/AccessibleWatcher.h | 4 ++++ libaurum/inc/Accessibility/AccessibleWindow.h | 4 ++++ libaurum/inc/Accessibility/IEventConsumer.h | 4 ++++ libaurum/inc/Accessibility/IEventSource.h | 4 ++++ libaurum/inc/Comparer.h | 4 ++++ .../Impl/Accessibility/AtspiAccessibleApplication.h | 6 ++++++ libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h | 6 ++++++ .../inc/Impl/Accessibility/AtspiAccessibleWatcher.h | 6 ++++++ .../inc/Impl/Accessibility/AtspiAccessibleWindow.h | 6 ++++++ libaurum/inc/Impl/Accessibility/AtspiWrapper.h | 4 ++++ .../inc/Impl/Accessibility/MockAccessibleApplication.h | 10 ++++++++++ libaurum/inc/Impl/Accessibility/MockAccessibleNode.h | 10 ++++++++++ .../inc/Impl/Accessibility/MockAccessibleWatcher.h | 10 ++++++++++ libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h | 10 ++++++++++ libaurum/inc/Impl/MockDeviceImpl.h | 10 ++++++++++ libaurum/inc/Impl/TizenDeviceImpl.h | 6 ++++++ libaurum/inc/Interface/IDevice.h | 5 ++++- libaurum/inc/Interface/ISearchable.h | 4 ++++ libaurum/inc/Misc/Point2D.h | 4 ++++ libaurum/inc/Misc/Rect.h | 4 ++++ libaurum/inc/Misc/Size2D.h | 4 ++++ libaurum/inc/Misc/bitmask.h | 4 ++++ libaurum/inc/PartialMatch.h | 4 ++++ libaurum/inc/Runnable/Runnable.h | 4 ++++ libaurum/inc/Runnable/SendKeyRunnable.h | 4 ++++ libaurum/inc/Sel.h | 4 ++++ libaurum/inc/UiDevice.h | 4 ++++ libaurum/inc/UiObject.h | 4 ++++ libaurum/inc/UiScrollable.h | 5 +++++ libaurum/inc/UiSelector.h | 4 ++++ libaurum/inc/Until.h | 4 ++++ libaurum/inc/Waiter.h | 4 ++++ libaurum/src/A11yEvent.cc | 2 ++ libaurum/src/Accessibility/AccessibleApplication.cc | 2 ++ libaurum/src/Accessibility/AccessibleNode.cc | 2 ++ libaurum/src/Accessibility/AccessibleWatcher.cc | 3 +++ libaurum/src/Accessibility/AccessibleWindow.cc | 2 ++ libaurum/src/Comparer.cc | 2 ++ .../Impl/Accessibility/AtspiAccessibleApplication.cc | 3 +++ libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc | 3 +++ .../src/Impl/Accessibility/AtspiAccessibleWatcher.cc | 3 +++ .../src/Impl/Accessibility/AtspiAccessibleWindow.cc | 3 +++ libaurum/src/Impl/Accessibility/AtspiWrapper.cc | 2 ++ .../Impl/Accessibility/MockAccessibleApplication.cc | 3 +++ libaurum/src/Impl/Accessibility/MockAccessibleNode.cc | 3 +++ .../src/Impl/Accessibility/MockAccessibleWatcher.cc | 3 +++ .../src/Impl/Accessibility/MockAccessibleWindow.cc | 3 +++ libaurum/src/Impl/MockDeviceImpl.cc | 3 +++ libaurum/src/Impl/TizenDeviceImpl.cc | 3 +++ libaurum/src/PartialMatch.cc | 2 ++ libaurum/src/Runnable/SendKeyRunnable.cc | 2 ++ libaurum/src/Sel.cc | 2 ++ libaurum/src/UiDevice.cc | 3 +++ libaurum/src/UiObject.cc | 2 ++ libaurum/src/UiScrollable.cc | 3 ++- libaurum/src/UiSelector.cc | 2 ++ libaurum/src/Until.cc | 2 ++ libaurum/src/Waiter.cc | 2 ++ org.tizen.aurum-bootstrap/inc/ObjectMapper.h | 2 ++ tests/Test_Misc.cc | 1 - tests/Test_Sel.cc | 2 ++ tests/Test_UiDevice.cc | 2 ++ tests/Test_UiObject.cc | 2 ++ tests/Test_UiSelector.cc | 4 ++-- 67 files changed, 255 insertions(+), 5 deletions(-) diff --git a/libaurum/inc/A11yEvent.h b/libaurum/inc/A11yEvent.h index f7b23bd..c557979 100644 --- a/libaurum/inc/A11yEvent.h +++ b/libaurum/inc/A11yEvent.h @@ -21,6 +21,8 @@ #include "bitmask.h" #include +namespace Aurum { + /** * @class A11yEvent * @@ -144,4 +146,6 @@ protected: const std::string mPkg; }; +} + #endif diff --git a/libaurum/inc/Accessibility/AccessibleApplication.h b/libaurum/inc/Accessibility/AccessibleApplication.h index 097d141..3a6daa0 100644 --- a/libaurum/inc/Accessibility/AccessibleApplication.h +++ b/libaurum/inc/Accessibility/AccessibleApplication.h @@ -23,6 +23,8 @@ #include +namespace Aurum { + /** * @class AccessibleApplication * @@ -98,4 +100,6 @@ private: std::shared_ptr mNode; }; +} + #endif diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index a6956a4..b8b8d12 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -28,6 +28,8 @@ #include "Rect.h" #include "config.h" +namespace Aurum { + /** * @brief AccessibleNodeInterface enum class * @@ -424,4 +426,6 @@ private: mutable std::mutex mLock; }; +} + #endif diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index d2977f2..cfaf72b 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -33,6 +33,8 @@ #include "config.h" +namespace Aurum { + /** * @class AccessibleWatcher * @@ -146,4 +148,6 @@ private: std::mutex mLock; }; +} + #endif diff --git a/libaurum/inc/Accessibility/AccessibleWindow.h b/libaurum/inc/Accessibility/AccessibleWindow.h index f422d68..3d2c258 100644 --- a/libaurum/inc/Accessibility/AccessibleWindow.h +++ b/libaurum/inc/Accessibility/AccessibleWindow.h @@ -23,6 +23,8 @@ #include #include +namespace Aurum { + class AccessibleApplication; /** @@ -103,4 +105,6 @@ private: std::shared_ptr mNode; }; +} + #endif diff --git a/libaurum/inc/Accessibility/IEventConsumer.h b/libaurum/inc/Accessibility/IEventConsumer.h index d8cd29a..b7c0557 100644 --- a/libaurum/inc/Accessibility/IEventConsumer.h +++ b/libaurum/inc/Accessibility/IEventConsumer.h @@ -18,6 +18,8 @@ #ifndef _IEVENT_CONSUMER_H_ #define _IEVENT_CONSUMER_H_ +namespace Aurum { + /** * @class EventType * @@ -71,4 +73,6 @@ public: virtual void notify(int type1, int type2, void *src) = 0; }; +} + #endif diff --git a/libaurum/inc/Accessibility/IEventSource.h b/libaurum/inc/Accessibility/IEventSource.h index d1f6ce4..73f5c34 100644 --- a/libaurum/inc/Accessibility/IEventSource.h +++ b/libaurum/inc/Accessibility/IEventSource.h @@ -21,6 +21,8 @@ #include "IEventConsumer.h" #include +namespace Aurum { + /** * @class IEventSource * @@ -68,4 +70,6 @@ public: virtual void notifyAll(int type1, int type2, void *src) = 0; }; +} + #endif diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h index ae1ccab..c64afeb 100644 --- a/libaurum/inc/Comparer.h +++ b/libaurum/inc/Comparer.h @@ -30,6 +30,8 @@ #include #include +namespace Aurum { + /** * @class Comparer * @@ -127,4 +129,6 @@ private: bool mEarlyReturn; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h index a6cdb80..2bdcbac 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h @@ -23,6 +23,10 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + /** * @internal * @@ -63,4 +67,6 @@ public: std::string getPackageName(void) override; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h index b916c1b..2935faa 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h @@ -21,6 +21,10 @@ #include "AccessibleNode.h" #include +using namespace Aurum; + +namespace AurumInternal { + /** * @brief AtspiAccessibleNode is inherited from AccessibleNode class. * It manages object informations which from atspi server. @@ -144,4 +148,6 @@ private: AtspiAccessible *mNode; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index f4ed61f..8ce234b 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -32,6 +32,10 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + /** * @internal * @@ -157,4 +161,6 @@ private: static std::mutex mMutex; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h index e9d6f71..1e71af3 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h @@ -20,6 +20,10 @@ #include "AccessibleWindow.h" +using namespace Aurum; + +namespace AurumInternal { + /** * @internal * @@ -50,4 +54,6 @@ public: }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h index ee603d6..b3928fb 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h +++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h @@ -21,6 +21,8 @@ #include #include +namespace AurumInternal { + /** * @internal * @@ -61,4 +63,6 @@ private: static std::recursive_mutex mMutex; }; +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h index c2e03e8..942e779 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h @@ -24,6 +24,12 @@ #include +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + class MockAccessibleApplication : public AccessibleApplication, public std::enable_shared_from_this { public: /** @@ -83,4 +89,8 @@ private: std::vector> mWindowList; }; +} + +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h index 67cde40..110b6e1 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h @@ -23,6 +23,12 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + class MockAccessibleNode : public AccessibleNode { public: /** @@ -202,4 +208,8 @@ private: std::mutex mLock; }; +} + +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h index 18dd60d..b36381a 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h @@ -28,6 +28,12 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + class MockAccessibleWatcher : public AccessibleWatcher { public: /** @@ -91,4 +97,8 @@ private: std::map> mActiveAppMap; }; +} + +} + #endif diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h index a978089..df214ef 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h @@ -21,6 +21,12 @@ #include "AccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + class MockAccessibleApplication; class MockAccessibleWindow : public AccessibleWindow { @@ -51,4 +57,8 @@ private: std::shared_ptr mMockNode; }; +} + +} + #endif \ No newline at end of file diff --git a/libaurum/inc/Impl/MockDeviceImpl.h b/libaurum/inc/Impl/MockDeviceImpl.h index 93705c1..7517471 100644 --- a/libaurum/inc/Impl/MockDeviceImpl.h +++ b/libaurum/inc/Impl/MockDeviceImpl.h @@ -27,6 +27,12 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + +namespace Mock { + enum class MockKeyType { BACK, HOME, @@ -294,4 +300,8 @@ public: Size2D mScreenSize; }; +} + +} + #endif diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index 0bcbff9..4e16377 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -24,6 +24,10 @@ #include #include +using namespace Aurum; + +namespace AurumInternal { + class TizenDeviceImpl : public IDevice { public: TizenDeviceImpl(); @@ -198,4 +202,6 @@ private: Size2D mScreenSize; }; +} + #endif \ No newline at end of file diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index 85b213e..5d979d6 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -19,10 +19,11 @@ #define _IDEVICE_H_ #include "config.h" -#include "Rect.h" #include "Size2D.h" #include +namespace Aurum { + /** * @brief TimeRequestType enum class. * @@ -277,4 +278,6 @@ public: virtual const Size2D getScreenSize() = 0; }; +} + #endif diff --git a/libaurum/inc/Interface/ISearchable.h b/libaurum/inc/Interface/ISearchable.h index fe25b09..e02bbcf 100644 --- a/libaurum/inc/Interface/ISearchable.h +++ b/libaurum/inc/Interface/ISearchable.h @@ -25,6 +25,8 @@ #include #include +namespace Aurum { + class UiObject; /** @@ -79,4 +81,6 @@ public: const std::shared_ptr selector) const = 0; }; +} + #endif diff --git a/libaurum/inc/Misc/Point2D.h b/libaurum/inc/Misc/Point2D.h index 1baddb9..634d779 100644 --- a/libaurum/inc/Misc/Point2D.h +++ b/libaurum/inc/Misc/Point2D.h @@ -18,6 +18,8 @@ #ifndef _POINT2D_H_ #define _POINT2D_H_ +namespace Aurum { + /** * @class Point2D * @@ -94,4 +96,6 @@ public: T y; }; +} + #endif diff --git a/libaurum/inc/Misc/Rect.h b/libaurum/inc/Misc/Rect.h index 5984670..9d935ed 100644 --- a/libaurum/inc/Misc/Rect.h +++ b/libaurum/inc/Misc/Rect.h @@ -20,6 +20,8 @@ #include "Point2D.h" +namespace Aurum { + /** * @class Rect * @@ -141,4 +143,6 @@ public: Point2D mBottomRight; }; +} + #endif diff --git a/libaurum/inc/Misc/Size2D.h b/libaurum/inc/Misc/Size2D.h index c8e1459..e44ef04 100644 --- a/libaurum/inc/Misc/Size2D.h +++ b/libaurum/inc/Misc/Size2D.h @@ -18,6 +18,8 @@ #ifndef _SIZE2D_H_ #define _SIZE2D_H_ +namespace Aurum { + /** * @brief Size2D Class. * This class for represent specific obejct's size as width and height. @@ -80,4 +82,6 @@ public: T height; }; +} + #endif diff --git a/libaurum/inc/Misc/bitmask.h b/libaurum/inc/Misc/bitmask.h index bcbca84..cbfef0b 100644 --- a/libaurum/inc/Misc/bitmask.h +++ b/libaurum/inc/Misc/bitmask.h @@ -20,6 +20,8 @@ #include +namespace Aurum { + template struct enable_bitmask_operators{ static const bool enable=false; @@ -89,4 +91,6 @@ operator^=(E& lhs,E rhs){ return lhs; } +} + #endif diff --git a/libaurum/inc/PartialMatch.h b/libaurum/inc/PartialMatch.h index bb8fb44..10fb59f 100644 --- a/libaurum/inc/PartialMatch.h +++ b/libaurum/inc/PartialMatch.h @@ -25,6 +25,8 @@ #include "AccessibleNode.h" #include "UiSelector.h" +namespace Aurum { + /** * @class PartialMatch * @@ -165,4 +167,6 @@ private: std::list> mPartialMatches; }; +} + #endif diff --git a/libaurum/inc/Runnable/Runnable.h b/libaurum/inc/Runnable/Runnable.h index 22b7723..b6b14f2 100644 --- a/libaurum/inc/Runnable/Runnable.h +++ b/libaurum/inc/Runnable/Runnable.h @@ -18,6 +18,8 @@ #ifndef _RUNNABLE_H_ #define _RUNNABLE_H_ +namespace Aurum { + /** * @class Runnable * @@ -43,4 +45,6 @@ public: virtual void run() const = 0; }; +} + #endif diff --git a/libaurum/inc/Runnable/SendKeyRunnable.h b/libaurum/inc/Runnable/SendKeyRunnable.h index 91f80dc..115166f 100644 --- a/libaurum/inc/Runnable/SendKeyRunnable.h +++ b/libaurum/inc/Runnable/SendKeyRunnable.h @@ -22,6 +22,8 @@ #include "Runnable.h" +namespace Aurum { + /** * @class SendKeyRunnable * @@ -49,4 +51,6 @@ public: void run() const override; }; +} + #endif diff --git a/libaurum/inc/Sel.h b/libaurum/inc/Sel.h index 9d75ab0..ae052d7 100644 --- a/libaurum/inc/Sel.h +++ b/libaurum/inc/Sel.h @@ -25,6 +25,8 @@ #include "UiSelector.h" +namespace Aurum { + /** * @class Sel * @@ -80,4 +82,6 @@ public: static std::shared_ptr depth(int depth); }; +} + #endif diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index f3ddcbb..2e5a3ff 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -35,6 +35,8 @@ #include #include +namespace Aurum { + /** * @class UiDevice * @@ -403,4 +405,6 @@ private: const Waiter *mWaiter; }; +} + #endif diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index b725b7d..08b3a3d 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -28,6 +28,8 @@ #include #include +namespace Aurum { + class UiDevice; /** @@ -511,4 +513,6 @@ private: static const unsigned int LOGNCLICK_INTERVAL = 500; }; +} + #endif diff --git a/libaurum/inc/UiScrollable.h b/libaurum/inc/UiScrollable.h index 090e746..0e27e81 100644 --- a/libaurum/inc/UiScrollable.h +++ b/libaurum/inc/UiScrollable.h @@ -20,6 +20,9 @@ #include "UiObject.h" #include + +namespace Aurum { + /** * @brief UiScrollable class * @since_tizen 5.5 @@ -96,4 +99,6 @@ private: int mScrollStep; }; +} + #endif diff --git a/libaurum/inc/UiSelector.h b/libaurum/inc/UiSelector.h index 37ade0c..25ef153 100644 --- a/libaurum/inc/UiSelector.h +++ b/libaurum/inc/UiSelector.h @@ -24,6 +24,8 @@ #include #include +namespace Aurum { + /** * @class UiSelector * @@ -383,4 +385,6 @@ public: std::shared_ptr mParent; }; +} + #endif diff --git a/libaurum/inc/Until.h b/libaurum/inc/Until.h index a67e45f..167ff48 100644 --- a/libaurum/inc/Until.h +++ b/libaurum/inc/Until.h @@ -22,6 +22,8 @@ #include "ISearchable.h" #include "UiSelector.h" +namespace Aurum { + /** * @class Until * @@ -115,4 +117,6 @@ public: const bool isCheckable); }; +} + #endif diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index 5c0c935..6f5a647 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -22,6 +22,8 @@ #include +namespace Aurum { + /** * @class Waiter * @@ -90,4 +92,6 @@ private: const int WAIT_TIMEOUT_MS; }; +} + #endif diff --git a/libaurum/src/A11yEvent.cc b/libaurum/src/A11yEvent.cc index b9f205b..86f5d6c 100644 --- a/libaurum/src/A11yEvent.cc +++ b/libaurum/src/A11yEvent.cc @@ -19,6 +19,8 @@ #include +using namespace Aurum; + A11yEventInfo::A11yEventInfo() : A11yEventInfo(A11yEvent::EVENT_NONE, nullptr, nullptr) {} A11yEventInfo::~A11yEventInfo() {} diff --git a/libaurum/src/Accessibility/AccessibleApplication.cc b/libaurum/src/Accessibility/AccessibleApplication.cc index 127e995..bbccc78 100644 --- a/libaurum/src/Accessibility/AccessibleApplication.cc +++ b/libaurum/src/Accessibility/AccessibleApplication.cc @@ -19,6 +19,8 @@ #include +using namespace Aurum; + AccessibleApplication::AccessibleApplication(std::shared_ptr node) : mNode{node} { diff --git a/libaurum/src/Accessibility/AccessibleNode.cc b/libaurum/src/Accessibility/AccessibleNode.cc index 45c3993..d4bfb68 100644 --- a/libaurum/src/Accessibility/AccessibleNode.cc +++ b/libaurum/src/Accessibility/AccessibleNode.cc @@ -24,6 +24,8 @@ #include "config.h" #include +using namespace Aurum; + AccessibleNode::~AccessibleNode() { } diff --git a/libaurum/src/Accessibility/AccessibleWatcher.cc b/libaurum/src/Accessibility/AccessibleWatcher.cc index 5b6bc3a..d26461d 100644 --- a/libaurum/src/Accessibility/AccessibleWatcher.cc +++ b/libaurum/src/Accessibility/AccessibleWatcher.cc @@ -27,6 +27,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + AccessibleWatcher::AccessibleWatcher() :mSources{}, mLock{} { diff --git a/libaurum/src/Accessibility/AccessibleWindow.cc b/libaurum/src/Accessibility/AccessibleWindow.cc index ea2315c..c2bc794 100644 --- a/libaurum/src/Accessibility/AccessibleWindow.cc +++ b/libaurum/src/Accessibility/AccessibleWindow.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + AccessibleWindow::AccessibleWindow(std::shared_ptr app, std::shared_ptr node) : mApp{app}, mNode{node} { diff --git a/libaurum/src/Comparer.cc b/libaurum/src/Comparer.cc index f5ebdf2..634d2e2 100644 --- a/libaurum/src/Comparer.cc +++ b/libaurum/src/Comparer.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + Comparer::Comparer(const std::shared_ptr device, const std::shared_ptr selector, const bool &earlyReturn) : mDevice(device), mSelector(selector), mEarlyReturn(earlyReturn) diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc index 4cd1327..6850096 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleApplication.cc @@ -22,6 +22,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + AtspiAccessibleApplication::AtspiAccessibleApplication(std::shared_ptr node) : AccessibleApplication(node) { diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc index 6a0575d..13d9373 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc @@ -22,6 +22,9 @@ #include +using namespace Aurum; +using namespace AurumInternal; + AtspiAccessibleNode::AtspiAccessibleNode(AtspiAccessible *node) : mNode{node} { diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index a167104..2c14713 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -28,6 +28,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + #define COMPARE(A, B) \ (B != A11yEvent::EVENT_NONE) && ((A & B) == B) diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc index 6968cae..053fcef 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWindow.cc @@ -18,6 +18,9 @@ #include "AtspiAccessibleWindow.h" #include "AtspiWrapper.h" +using namespace Aurum; +using namespace AurumInternal; + AtspiAccessibleWindow::AtspiAccessibleWindow(std::shared_ptr app, std::shared_ptr node) : AccessibleWindow(app, node) { diff --git a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc index fdf6e26..f41b7f0 100644 --- a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc +++ b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc @@ -17,6 +17,8 @@ #include "AtspiWrapper.h" +using namespace AurumInternal; + std::recursive_mutex AtspiWrapper::mMutex = std::recursive_mutex{}; GArray *AtspiWrapper::Atspi_state_set_get_states(AtspiStateSet *set) diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc b/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc index e01ee5c..efe80fa 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleApplication.cc @@ -21,6 +21,9 @@ #include +using namespace Aurum; +using namespace AurumInternal::Mock; + MockAccessibleApplication::MockAccessibleApplication(std::shared_ptr node) : AccessibleApplication(node), mWindowList{} { diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc index 795c8e7..5497dc2 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc @@ -21,6 +21,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal::Mock; + MockAccessibleNode::MockAccessibleNode(std::shared_ptr parent, std::string text, std::string pkg, std::string role, std::string res, std::string type, std::string style,std::string automationId, Rect screenBoundingBox, int supportingIfaces,int featureProperty) : mParentNode(parent), mChildrenList{}, mActionSet{} { diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc index 05fec2f..52f5373 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleWatcher.cc @@ -20,6 +20,9 @@ #include "MockAccessibleApplication.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; + MockAccessibleWatcher::MockAccessibleWatcher() { } diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc b/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc index 9941ac4..f20b351 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleWindow.cc @@ -19,6 +19,9 @@ #include "MockAccessibleApplication.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; + MockAccessibleWindow::MockAccessibleWindow(std::shared_ptr app, std::shared_ptr node) : AccessibleWindow(app, node), mMockNode{node} { diff --git a/libaurum/src/Impl/MockDeviceImpl.cc b/libaurum/src/Impl/MockDeviceImpl.cc index e05ceee..629329c 100644 --- a/libaurum/src/Impl/MockDeviceImpl.cc +++ b/libaurum/src/Impl/MockDeviceImpl.cc @@ -34,6 +34,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal::Mock; + #define NANO_SEC 1000000000.0 #define MICRO_SEC 1000000 diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc index a5ffd01..1040f5c 100644 --- a/libaurum/src/Impl/TizenDeviceImpl.cc +++ b/libaurum/src/Impl/TizenDeviceImpl.cc @@ -32,6 +32,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + #define NANO_SEC 1000000000.0 #define MICRO_SEC 1000000 diff --git a/libaurum/src/PartialMatch.cc b/libaurum/src/PartialMatch.cc index 3b3e4eb..796c869 100644 --- a/libaurum/src/PartialMatch.cc +++ b/libaurum/src/PartialMatch.cc @@ -22,6 +22,8 @@ #include #include +using namespace Aurum; + bool PartialMatch::checkCriteria(const std::string textA, const std::string textB) { std::regex re(textA); diff --git a/libaurum/src/Runnable/SendKeyRunnable.cc b/libaurum/src/Runnable/SendKeyRunnable.cc index 3044426..a7e6ca5 100644 --- a/libaurum/src/Runnable/SendKeyRunnable.cc +++ b/libaurum/src/Runnable/SendKeyRunnable.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + SendKeyRunnable::SendKeyRunnable(std::string keycode) : mKeycode{keycode} { diff --git a/libaurum/src/Sel.cc b/libaurum/src/Sel.cc index 484ffca..282f28d 100644 --- a/libaurum/src/Sel.cc +++ b/libaurum/src/Sel.cc @@ -18,6 +18,8 @@ #include "Aurum.h" #include +using namespace Aurum; + std::shared_ptr Sel::text(std::string text) { std::shared_ptr sel = std::make_shared(); diff --git a/libaurum/src/UiDevice.cc b/libaurum/src/UiDevice.cc index 5643f3a..bafa6d7 100644 --- a/libaurum/src/UiDevice.cc +++ b/libaurum/src/UiDevice.cc @@ -30,6 +30,9 @@ #include #include +using namespace Aurum; +using namespace AurumInternal; + UiDevice::UiDevice() : UiDevice(nullptr) {} UiDevice::UiDevice(IDevice *impl) diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc index 101f90f..7d4ebcc 100644 --- a/libaurum/src/UiObject.cc +++ b/libaurum/src/UiObject.cc @@ -23,6 +23,8 @@ #include #include +using namespace Aurum; + UiObject::UiObject() : UiObject(nullptr, nullptr, nullptr) {} UiObject::~UiObject() diff --git a/libaurum/src/UiScrollable.cc b/libaurum/src/UiScrollable.cc index 9a2eb57..c2c7aa3 100644 --- a/libaurum/src/UiScrollable.cc +++ b/libaurum/src/UiScrollable.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + UiScrollable::UiScrollable(std::shared_ptr selector) : mSelector{selector}, mMaxSearchSwipe{100}, mScrollStep{50} { @@ -54,7 +56,6 @@ bool UiScrollable::scrollForward() bool UiScrollable::scrollForward(int steps) { - //TODO Check Scree Size here return true; diff --git a/libaurum/src/UiSelector.cc b/libaurum/src/UiSelector.cc index 9f7b9bd..25af9e8 100644 --- a/libaurum/src/UiSelector.cc +++ b/libaurum/src/UiSelector.cc @@ -19,6 +19,8 @@ #include #include +using namespace Aurum; + UiSelector::UiSelector() : mId{}, mAutomationId{}, mRole{}, mText{}, mPkg{}, mType{}, mStyle{}, mMatchId{}, mMatchAutomationId{}, mMatchRole{}, mMatchText{}, mMatchPkg{}, mMatchType{}, mMatchStyle{}, diff --git a/libaurum/src/Until.cc b/libaurum/src/Until.cc index c6951c5..3a30831 100644 --- a/libaurum/src/Until.cc +++ b/libaurum/src/Until.cc @@ -17,6 +17,8 @@ #include "Aurum.h" +using namespace Aurum; + std::function Until::hasObject( const std::shared_ptr selector) { diff --git a/libaurum/src/Waiter.cc b/libaurum/src/Waiter.cc index 6b852d0..43c8194 100644 --- a/libaurum/src/Waiter.cc +++ b/libaurum/src/Waiter.cc @@ -20,6 +20,8 @@ #include #include +using namespace Aurum; + Waiter::Waiter() : Waiter(nullptr) {} Waiter::~Waiter() {} diff --git a/org.tizen.aurum-bootstrap/inc/ObjectMapper.h b/org.tizen.aurum-bootstrap/inc/ObjectMapper.h index 8326266..6bf7af7 100644 --- a/org.tizen.aurum-bootstrap/inc/ObjectMapper.h +++ b/org.tizen.aurum-bootstrap/inc/ObjectMapper.h @@ -23,6 +23,8 @@ #include "UiObject.h" +using namespace Aurum; + class ObjectMapper { private: std::map> mObjectMap; diff --git a/tests/Test_Misc.cc b/tests/Test_Misc.cc index d6793f7..99e6a63 100644 --- a/tests/Test_Misc.cc +++ b/tests/Test_Misc.cc @@ -15,7 +15,6 @@ #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" - class AurumTestMisc : public ::testing::Test { public: AurumTestMisc(){ diff --git a/tests/Test_Sel.cc b/tests/Test_Sel.cc index cef1c7f..b9ff53b 100644 --- a/tests/Test_Sel.cc +++ b/tests/Test_Sel.cc @@ -15,6 +15,8 @@ #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; class AurumTestSel : public ::testing::Test { public: diff --git a/tests/Test_UiDevice.cc b/tests/Test_UiDevice.cc index b46b312..4e09236 100644 --- a/tests/Test_UiDevice.cc +++ b/tests/Test_UiDevice.cc @@ -18,6 +18,8 @@ #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; class AurumTestUiDevice : public ::testing::Test { public: diff --git a/tests/Test_UiObject.cc b/tests/Test_UiObject.cc index 6820f93..9f20ca8 100644 --- a/tests/Test_UiObject.cc +++ b/tests/Test_UiObject.cc @@ -19,6 +19,8 @@ #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; class AurumTestUiObject : public ::testing::Test { public: diff --git a/tests/Test_UiSelector.cc b/tests/Test_UiSelector.cc index 3e2c79c..bdf6861 100644 --- a/tests/Test_UiSelector.cc +++ b/tests/Test_UiSelector.cc @@ -10,13 +10,13 @@ #include #include - - #include "MockAccessibleWatcher.h" #include "MockAccessibleApplication.h" #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" +using namespace Aurum; +using namespace AurumInternal::Mock; class AurumTestUiSelector : public ::testing::Test { public: -- 2.34.1