From dd0923960040a0a8832b581c7a7e8d3a14b5061f Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Thu, 2 Jan 2020 15:45:17 +0100
Subject: libcamera: controls: Reorder ControlValue methods
Reorder functions in ControlValue class to group const methods together.
Cosmetic change only.
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
src/libcamera/controls.cpp | 94 +++++++++++++++++++++++-----------------------
1 file changed, 47 insertions(+), 47 deletions(-)
(limited to 'src')
diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp
index 0031cd06..613e6d76 100644
--- a/src/libcamera/controls.cpp
+++ b/src/libcamera/controls.cpp
@@ -112,6 +112,53 @@ ControlValue::ControlValue(int64_t value)
* \return True if the value type is ControlTypeNone, false otherwise
*/
+/**
+ * \brief Assemble and return a string describing the value
+ * \return A string describing the ControlValue
+ */
+std::string ControlValue::toString() const
+{
+ switch (type_) {
+ case ControlTypeNone:
+ return "<None>";
+ case ControlTypeBool:
+ return bool_ ? "True" : "False";
+ case ControlTypeInteger32:
+ return std::to_string(integer32_);
+ case ControlTypeInteger64:
+ return std::to_string(integer64_);
+ }
+
+ return "<ValueType Error>";
+}
+
+/**
+ * \brief Compare ControlValue instances for equality
+ * \return True if the values have identical types and values, false otherwise
+ */
+bool ControlValue::operator==(const ControlValue &other) const
+{
+ if (type_ != other.type_)
+ return false;
+
+ switch (type_) {
+ case ControlTypeBool:
+ return bool_ == other.bool_;
+ case ControlTypeInteger32:
+ return integer32_ == other.integer32_;
+ case ControlTypeInteger64:
+ return integer64_ == other.integer64_;
+ default:
+ return false;
+ }
+}
+
+/**
+ * \fn bool ControlValue::operator!=()
+ * \brief Compare ControlValue instances for non equality
+ * \return False if the values have identical types and values, true otherwise
+ */
+
/**
* \fn template<typename T> const T &ControlValue::get() const
* \brief Get the control value
@@ -175,53 +222,6 @@ void ControlValue::set<int64_t>(const int64_t &value)
}
#endif /* __DOXYGEN__ */
-/**
- * \brief Assemble and return a string describing the value
- * \return A string describing the ControlValue
- */
-std::string ControlValue::toString() const
-{
- switch (type_) {
- case ControlTypeNone:
- return "<None>";
- case ControlTypeBool:
- return bool_ ? "True" : "False";
- case ControlTypeInteger32:
- return std::to_string(integer32_);
- case ControlTypeInteger64:
- return std::to_string(integer64_);
- }
-
- return "<ValueType Error>";
-}
-
-/**
- * \brief Compare ControlValue instances for equality
- * \return True if the values have identical types and values, false otherwise
- */
-bool ControlValue::operator==(const ControlValue &other) const
-{
- if (type_ != other.type_)
- return false;
-
- switch (type_) {
- case ControlTypeBool:
- return bool_ == other.bool_;
- case ControlTypeInteger32:
- return integer32_ == other.integer32_;
- case ControlTypeInteger64:
- return integer64_ == other.integer64_;
- default:
- return false;
- }
-}
-
-/**
- * \fn bool ControlValue::operator!=()
- * \brief Compare ControlValue instances for non equality
- * \return False if the values have identical types and values, true otherwise
- */
-
/**
* \class ControlId
* \brief Control static metadata
--
cgit v1.2.1