Rename Atspi namespace to atspi to distinguish classes from namespaces

Change-Id: I871fbeffc4835e88a53166c7e3e41be179ba81b9

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c36fc3..fe1dd29 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,7 @@ SET(SRCS
        ActivityChangeRequest.cpp
        AutoScanOnActivity.cpp
        MenuBuilder.cpp
-       Atspi.cpp
+       atspi.cpp
        UniversalSwitch.cpp
        AcceptScanningActivity.cpp
 )

diff --git a/src/Atspi.cpp b/src/atspi.cpp
similarity index 89%
rename from src/Atspi.cpp
rename to src/atspi.cpp
index 8d4331f..7f3538e 100644 (file)
--- a/src/Atspi.cpp
+++ b/src/atspi.cpp
@@ -1,4 +1,4 @@
-#include "Atspi.hpp"
+#include "atspi.hpp"
 
 #include <Eldbus.h>
 #include <functional>
@@ -87,7 +87,7 @@ namespace
        }
 }
 
-bool Atspi::ConnectAtClient()
+bool atspi::ConnectAtClient()
 {
        auto error = atspi_init();
        if (error != 0 || error != 1) {
@@ -106,7 +106,7 @@ bool Atspi::ConnectAtClient()
        return true;
 }
 
-bool Atspi::DisconnectAtClient()
+bool atspi::DisconnectAtClient()
 {
        auto dbusStatus = _dbus_set_property_bool(ELDBUS_CONNECTION_TYPE_SESSION, "org.a11y.Bus", "/org/a11y/bus", "org.a11y.Status", "IsEnabled", false);
        if (!dbusStatus)
@@ -120,7 +120,7 @@ bool Atspi::DisconnectAtClient()
        return true;
 }
 
-Optional<std::shared_ptr<AtspiAction>> Atspi::getActionInterface(std::shared_ptr<AtspiAccessible> accessibleObj)
+Optional<std::shared_ptr<AtspiAction>> atspi::getActionInterface(std::shared_ptr<AtspiAccessible> accessibleObj)
 {
        auto action = atspi_accessible_get_action_iface(accessibleObj.get());
        if (action)
@@ -129,7 +129,7 @@ Optional<std::shared_ptr<AtspiAction>> Atspi::getActionInterface(std::shared_ptr
        return {};
 }
 
-bool Atspi::doAction(std::shared_ptr<AtspiAction> accessibleObj, int action)
+bool atspi::doAction(std::shared_ptr<AtspiAction> accessibleObj, int action)
 {
        GError *error = nullptr;
        auto status = atspi_action_do_action(accessibleObj.get(), action, &error);
@@ -141,7 +141,7 @@ bool Atspi::doAction(std::shared_ptr<AtspiAction> accessibleObj, int action)
        return false;
 }
 
-bool Atspi::doActionName(std::shared_ptr<AtspiAction> accessibleObj, const std::string &action)
+bool atspi::doActionName(std::shared_ptr<AtspiAction> accessibleObj, const std::string &action)
 {
        GError *error = nullptr;
        auto status = atspi_action_do_action_name(accessibleObj.get(), action.c_str(), &error);
@@ -153,7 +153,7 @@ bool Atspi::doActionName(std::shared_ptr<AtspiAction> accessibleObj, const std::
        return false;
 }
 
-Optional<std::shared_ptr<AtspiAccessible>> Atspi::getObjectInRelation(std::shared_ptr<AtspiAccessible> accessibleObj, AtspiRelationType searchType)
+Optional<std::shared_ptr<AtspiAccessible>> atspi::getObjectInRelation(std::shared_ptr<AtspiAccessible> accessibleObj, AtspiRelationType searchType)
 {
        if (!accessibleObj) {
                ERROR("accessibleObj is nullptr");
@@ -187,7 +187,7 @@ Optional<std::shared_ptr<AtspiAccessible>> Atspi::getObjectInRelation(std::share
        return {};
 }
 
-Optional<std::shared_ptr<AtspiValue>> Atspi::getValueInterface(std::shared_ptr<AtspiAccessible> accessibleObj)
+Optional<std::shared_ptr<AtspiValue>> atspi::getValueInterface(std::shared_ptr<AtspiAccessible> accessibleObj)
 {
        auto valueInterface = atspi_accessible_get_value_iface(accessibleObj.get());
        if (valueInterface)
@@ -198,12 +198,12 @@ Optional<std::shared_ptr<AtspiValue>> Atspi::getValueInterface(std::shared_ptr<A
        }
 }
 
-Optional<double> Atspi::getCurrentValue(std::shared_ptr<AtspiValue> valueInterface)
+Optional<double> atspi::getCurrentValue(std::shared_ptr<AtspiValue> valueInterface)
 {
        return getValueTemplateFunction<double>(atspi_value_get_current_value, valueInterface.get());
 }
 
-bool Atspi::setCurrentValue(std::shared_ptr<AtspiValue> valueInterface, double newValue)
+bool atspi::setCurrentValue(std::shared_ptr<AtspiValue> valueInterface, double newValue)
 {
        GError *error = nullptr;
        auto isSuccessful = atspi_value_set_current_value(valueInterface.get(), newValue, &error);
@@ -214,17 +214,17 @@ bool Atspi::setCurrentValue(std::shared_ptr<AtspiValue> valueInterface, double n
                return false;
 }
 
-Optional<double> Atspi::getMinimumIncrement(std::shared_ptr<AtspiValue> valueInterface)
+Optional<double> atspi::getMinimumIncrement(std::shared_ptr<AtspiValue> valueInterface)
 {
        return getValueTemplateFunction<double>(atspi_value_get_minimum_increment, valueInterface.get());
 }
 
-Optional<double> Atspi::getMaximumValue(std::shared_ptr<AtspiValue> valueInterface)
+Optional<double> atspi::getMaximumValue(std::shared_ptr<AtspiValue> valueInterface)
 {
        return getValueTemplateFunction<double>(atspi_value_get_maximum_value, valueInterface.get());
 }
 
-Optional<double> Atspi::getMinimumValue(std::shared_ptr<AtspiValue> valueInterface)
+Optional<double> atspi::getMinimumValue(std::shared_ptr<AtspiValue> valueInterface)
 {
        return getValueTemplateFunction<double>(atspi_value_get_minimum_value, valueInterface.get());
 }

diff --git a/src/Atspi.hpp b/src/atspi.hpp
similarity index 98%
rename from src/Atspi.hpp
rename to src/atspi.hpp
index 9843638..d72c9a8 100644 (file)
--- a/src/Atspi.hpp
+++ b/src/atspi.hpp
@@ -6,7 +6,7 @@
 #include <atspi/atspi.h>
 #include <memory>
 
-namespace Atspi
+namespace atspi
 {
        bool ConnectAtClient();
        bool DisconnectAtClient();

diff --git a/src/main.cpp b/src/main.cpp
index 12ea8a6..f249418 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 #include "UniversalSwitchLog.hpp"
 #include "Window.hpp"
 #include "ScreenScannerManager.hpp"
-#include "Atspi.hpp"
+#include "atspi.hpp"
 
 #include "UniversalSwitch.hpp"
 #include "CompositeSwitchProvider.hpp"
@@ -32,7 +32,7 @@ bool app_create(void *data)
 {
        DEBUG("App create");
        ecore_event_init();
-       Atspi::ConnectAtClient();
+       atspi::ConnectAtClient();
 
        auto activityFactory = ActivityFactory::getInstance();
 
@@ -67,7 +67,7 @@ void app_terminate(void *data)
 {
        DEBUG("app termination procedure");
        ecore_event_shutdown();
-       Atspi::DisconnectAtClient();
+       atspi::DisconnectAtClient();
        ScreenScannerManager::instance().stopAutoscanning();
 
        return;