summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libcamera/controls.h6
-rw-r--r--src/libcamera/controls.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
index 12a13aac..999fcf7a 100644
--- a/include/libcamera/controls.h
+++ b/include/libcamera/controls.h
@@ -60,11 +60,11 @@ class ControlId
{
public:
unsigned int id() const { return id_; }
- const char *name() const { return name_; }
+ const std::string &name() const { return name_; }
ControlType type() const { return type_; }
protected:
- ControlId(unsigned int id, const char *name, ControlType type)
+ ControlId(unsigned int id, const std::string &name, ControlType type)
: id_(id), name_(name), type_(type)
{
}
@@ -74,7 +74,7 @@ private:
ControlId &operator=(const ControlId &) = delete;
unsigned int id_;
- const char *name_;
+ std::string name_;
ControlType type_;
};
diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp
index bfab177f..292e48cd 100644
--- a/src/libcamera/controls.cpp
+++ b/src/libcamera/controls.cpp
@@ -232,7 +232,7 @@ bool ControlValue::operator==(const ControlValue &other) const
*/
/**
- * \fn ControlId::ControlId(unsigned int id, const char *name, ControlType type)
+ * \fn ControlId::ControlId(unsigned int id, const std::string &name, ControlType type)
* \brief Construct a ControlId instance
* \param[in] id The control numerical ID
* \param[in] name The control name