projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure BaseHandle class move noexcept (core public-api)
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
animation
/
path.cpp
diff --git
a/dali/public-api/animation/path.cpp
b/dali/public-api/animation/path.cpp
index
3dda29c
..
133ae94
100644
(file)
--- a/
dali/public-api/animation/path.cpp
+++ b/
dali/public-api/animation/path.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
18
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,78
+16,69
@@
*/
// CLASS HEADER
*/
// CLASS HEADER
-#include <dali/public-api/animation/path.h>
#include <dali/internal/event/animation/path-impl.h>
#include <dali/internal/event/animation/path-impl.h>
+#include <dali/public-api/animation/path.h>
// INTERNAL INCLUDES
namespace Dali
{
// INTERNAL INCLUDES
namespace Dali
{
-
Path Path::New()
{
Internal::Path* internal = Internal::Path::New();
return Path(internal);
}
Path Path::New()
{
Internal::Path* internal = Internal::Path::New();
return Path(internal);
}
-Path Path::DownCast(
BaseHandle handle
)
+Path Path::DownCast(
BaseHandle handle
)
{
{
- return Path(
dynamic_cast<Dali::Internal::Path*>(handle.GetObjectPtr())
);
+ return Path(
dynamic_cast<Dali::Internal::Path*>(handle.GetObjectPtr())
);
}
}
-Path::Path()
-{
-}
+Path::Path() = default;
-Path::~Path()
-{
-}
+Path::~Path() = default;
-Path::Path(const Path& handle)
-:Handle(handle)
-{
-}
+Path::Path(const Path& handle) = default;
Path::Path(Internal::Path* internal)
: Handle(internal)
{
}
Path::Path(Internal::Path* internal)
: Handle(internal)
{
}
-Path& Path::operator=(const Path& rhs)
-{
- BaseHandle::operator=(rhs);
- return *this;
-}
+Path& Path::operator=(const Path& rhs) = default;
-void Path::AddPoint(const Vector3& point )
+Path::Path(Path&& rhs) noexcept = default;
+
+Path& Path::operator=(Path&& rhs) noexcept = default;
+
+void Path::AddPoint(const Vector3& point)
{
{
- GetImplementation(*this).AddPoint(
point
);
+ GetImplementation(*this).AddPoint(
point
);
}
}
-void Path::AddControlPoint(const Vector3& point
)
+void Path::AddControlPoint(const Vector3& point)
{
{
- GetImplementation(*this).AddControlPoint(
point
);
+ GetImplementation(*this).AddControlPoint(
point
);
}
}
-void Path::GenerateControlPoints(
float curvature
)
+void Path::GenerateControlPoints(
float curvature
)
{
{
- GetImplementation(*this).GenerateControlPoints(
curvature
);
+ GetImplementation(*this).GenerateControlPoints(
curvature
);
}
}
-
-void Path::Sample( float progress, Vector3& position, Vector3& tangent ) const
+void Path::Sample(float progress, Vector3& position, Vector3& tangent) const
{
{
- GetImplementation(*this).Sample(
progress, position, tangent
);
+ GetImplementation(*this).Sample(
progress, position, tangent
);
}
}
-Vector3& Path::GetPoint(
size_t index
)
+Vector3& Path::GetPoint(
size_t index
)
{
{
- return GetImplementation(*this).GetPoint(
static_cast<uint32_t>( index )
);
+ return GetImplementation(*this).GetPoint(
static_cast<uint32_t>(index)
);
}
}
-Vector3& Path::GetControlPoint(
size_t index
)
+Vector3& Path::GetControlPoint(
size_t index
)
{
{
- return GetImplementation(*this).GetControlPoint(
static_cast<uint32_t>( index )
);
+ return GetImplementation(*this).GetControlPoint(
static_cast<uint32_t>(index)
);
}
size_t Path::GetPointCount() const
}
size_t Path::GetPointCount() const
@@
-95,4
+86,4
@@
size_t Path::GetPointCount() const
return GetImplementation(*this).GetPointCount();
}
return GetImplementation(*this).GetPointCount();
}
-} // Dali
+} //
namespace
Dali