Remove namespaces from source files

source/ls_math/vector/Vector2.cpp

@@ -11,119 +11,124 @@
 #include <limits>
 #include <ls_math/vector/Vector2.hpp>
 
-ls::math::vector::Vector2::Vector2(const ls::math::core::type::vector2_component &_x, const ls::math::core::type::vector2_component &_y)
+using ls::math::core::type::vector2_component;
+using ls::math::core::type::vector2_components;
+using ls::math::core::type::vector_scalar;
+using ls::math::vector::Vector2;
+
+Vector2::Vector2(const vector2_component &_x, const vector2_component &_y)
 {
   this->components[0] = _x;
   this->components[1] = _y;
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::operator+(const ls::math::vector::Vector2 &_vector) const
+Vector2 Vector2::operator+(const Vector2 &_vector) const
 {
-  return ls::math::vector::Vector2::_add(*this, _vector);
+  return Vector2::_add(*this, _vector);
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::operator-(const ls::math::vector::Vector2 &_vector) const
+Vector2 Vector2::operator-(const Vector2 &_vector) const
 {
-  return ls::math::vector::Vector2::_subtract(*this, _vector);
+  return Vector2::_subtract(*this, _vector);
 }
 
-ls::math::core::type::vector_scalar ls::math::vector::Vector2::operator*(const ls::math::vector::Vector2 &_vector) const
+vector_scalar Vector2::operator*(const Vector2 &_vector) const
 {
-  return ls::math::vector::Vector2::_dot(*this, _vector);
+  return Vector2::_dot(*this, _vector);
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::operator*(double _value)
+Vector2 Vector2::operator*(double _value)
 {
-  return ls::math::vector::Vector2{components[0] * _value, components[1] * _value};
+  return Vector2{components[0] * _value, components[1] * _value};
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::operator/(double _divisor)
+Vector2 Vector2::operator/(double _divisor)
 {
-  return ls::math::vector::Vector2::_operatorDivision(this->components[0], this->components[1], _divisor);
+  return Vector2::_operatorDivision(this->components[0], this->components[1], _divisor);
 }
 
-bool ls::math::vector::Vector2::operator==(const ls::math::vector::Vector2 &_vector)
+bool Vector2::operator==(const Vector2 &_vector)
 {
   return this->components[0] == _vector.components[0] && this->components[1] == _vector.components[1];
 }
 
-bool ls::math::vector::Vector2::operator!=(const ls::math::vector::Vector2 &_vector)
+bool Vector2::operator!=(const Vector2 &_vector)
 {
   return this->components[0] != _vector.components[0] || this->components[1] != _vector.components[1];
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::add(const ls::math::vector::Vector2 &_leftAddend, const ls::math::vector::Vector2 &_rightAddend)
+Vector2 Vector2::add(const Vector2 &_leftAddend, const Vector2 &_rightAddend)
 {
-  return ls::math::vector::Vector2::_add(_leftAddend, _rightAddend);
+  return Vector2::_add(_leftAddend, _rightAddend);
 }
 
-ls::math::core::type::vector_scalar ls::math::vector::Vector2::dot(const ls::math::vector::Vector2 &_leftAddend, const ls::math::vector::Vector2 &_rightAddend)
+vector_scalar Vector2::dot(const Vector2 &_leftAddend, const Vector2 &_rightAddend)
 {
-  return ls::math::vector::Vector2::_dot(_leftAddend, _rightAddend);
+  return Vector2::_dot(_leftAddend, _rightAddend);
 }
 
-ls::math::core::type::vector2_components ls::math::vector::Vector2::getComponents()
+vector2_components Vector2::getComponents()
 {
   return this->components;
 }
 
-double ls::math::vector::Vector2::getLength()
+double Vector2::getLength()
 {
-  return ls::math::vector::Vector2::_getLength(this->components[0], this->components[1]);
+  return Vector2::_getLength(this->components[0], this->components[1]);
 }
 
-ls::math::core::type::vector2_component ls::math::vector::Vector2::getX()
+vector2_component Vector2::getX()
 {
   return this->components[0];
 }
 
-ls::math::core::type::vector2_component ls::math::vector::Vector2::getY()
+vector2_component Vector2::getY()
 {
   return this->components[1];
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::normalize()
+Vector2 Vector2::normalize()
 {
-  double length = ls::math::vector::Vector2::_getLength(this->components[0], this->components[1]) + std::numeric_limits<double>::min();
-  return ls::math::vector::Vector2::_operatorDivision(this->components[0], this->components[1], length);
+  double length = Vector2::_getLength(this->components[0], this->components[1]) + std::numeric_limits<double>::min();
+  return Vector2::_operatorDivision(this->components[0], this->components[1], length);
 }
 
-void ls::math::vector::Vector2::setX(const ls::math::core::type::vector2_component &_value)
+void Vector2::setX(const vector2_component &_value)
 {
   this->components[0] = _value;
 }
 
-void ls::math::vector::Vector2::setY(const ls::math::core::type::vector2_component &_value)
+void Vector2::setY(const vector2_component &_value)
 {
   this->components[1] = _value;
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::subtract(const ls::math::vector::Vector2 &_leftAddend, const ls::math::vector::Vector2 &_rightAddend)
+Vector2 Vector2::subtract(const Vector2 &_leftAddend, const Vector2 &_rightAddend)
 {
-  return ls::math::vector::Vector2::_subtract(_leftAddend, _rightAddend);
+  return Vector2::_subtract(_leftAddend, _rightAddend);
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::_add(const ls::math::vector::Vector2 &_leftAddend, const ls::math::vector::Vector2 &_rightAddend)
+Vector2 Vector2::_add(const Vector2 &_leftAddend, const Vector2 &_rightAddend)
 {
-  return ls::math::vector::Vector2{_leftAddend.components[0] + _rightAddend.components[0], _leftAddend.components[1] + _rightAddend.components[1]};
+  return Vector2{_leftAddend.components[0] + _rightAddend.components[0], _leftAddend.components[1] + _rightAddend.components[1]};
 }
 
-ls::math::core::type::vector_scalar ls::math::vector::Vector2::_dot(const ls::math::vector::Vector2 &_leftAddend, const ls::math::vector::Vector2 &_rightAddend)
+vector_scalar Vector2::_dot(const Vector2 &_leftAddend, const Vector2 &_rightAddend)
 {
   return _leftAddend.components[0] * _rightAddend.components[0] + _leftAddend.components[1] * _rightAddend.components[1];
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::_subtract(const ls::math::vector::Vector2 &_leftAddend, const ls::math::vector::Vector2 &_rightAddend)
+Vector2 Vector2::_subtract(const Vector2 &_leftAddend, const Vector2 &_rightAddend)
 {
-  return ls::math::vector::Vector2{_leftAddend.components[0] - _rightAddend.components[0], _leftAddend.components[1] - _rightAddend.components[1]};
+  return Vector2{_leftAddend.components[0] - _rightAddend.components[0], _leftAddend.components[1] - _rightAddend.components[1]};
 }
 
-double ls::math::vector::Vector2::_getLength(const ls::math::core::type::vector2_component &_x, const ls::math::core::type::vector2_component &_y)
+double Vector2::_getLength(const vector2_component &_x, const vector2_component &_y)
 {
   return sqrt(_x * _x + _y * _y);
 }
 
-ls::math::vector::Vector2 ls::math::vector::Vector2::_operatorDivision(const ls::math::core::type::vector2_component &_x, const ls::math::core::type::vector2_component &_y, double _divisor)
+Vector2 Vector2::_operatorDivision(const vector2_component &_x, const vector2_component &_y, double _divisor)
 {
-  return ls::math::vector::Vector2{_x / _divisor, _y / _divisor};
+  return Vector2{_x / _divisor, _y / _divisor};
 }

test/cases/vector/Vector2Test.cpp

@@ -11,12 +11,14 @@
 #include <gtest/gtest.h>
 #include <ls_math/ls_math_vector.hpp>
 
-using namespace ls::math::vector;
-using namespace ls::math::core::type;
+using ls::math::core::type::vector2_components;
+using ls::math::core::type::vector_scalar;
+using ls::math::vector::Vector2;
+using testing::Test;
 
 namespace
 {
-  class Vector2Test : public ::testing::Test
+  class Vector2Test : public Test
   {
     protected:
 
@@ -107,7 +109,7 @@ namespace
 
   TEST_F(Vector2Test, dot)
   {
-    vector_scalar scalar = ls::math::vector::Vector2::dot(Vector2(3.0f, 4.0f), Vector2(5.0f, 3.0f));
+    vector_scalar scalar = Vector2::dot(Vector2(3.0f, 4.0f), Vector2(5.0f, 3.0f));
     ASSERT_FLOAT_EQ(27.0f, scalar);
   }
 
@@ -173,7 +175,7 @@ namespace
 
   TEST_F(Vector2Test, subtract)
   {
-    Vector2 c = ls::math::vector::Vector2::subtract(Vector2(3.0f, 4.0f), Vector2(5.0f, 3.0f));
+    Vector2 c = Vector2::subtract(Vector2(3.0f, 4.0f), Vector2(5.0f, 3.0f));
 
     ASSERT_FLOAT_EQ(-2.0f, c.getX());
     ASSERT_FLOAT_EQ(1.0f, c.getY());