NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

cam: options: Create a template class for options

Browse source 
In preparation to adding more parsers create a template class to hold
the parsed information. The rational for making it a template are that
different parsers can index the options using different data types.

The OptionsParser index its options using an int while the upcoming
KeyValyeParser will index its options using strings for example.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2019-01-28 00:35:12 +01:00 • committed by Laurent Pinchart
parent 377516a084
commit c6468e45d1
2 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/cam/options.cpp
View file

@ -12,6 +12,32 @@
#include "options.h"
template <typename T>
bool OptionsBase<T>::valid() const
{
return !values_.empty();
}
template <typename T>
bool OptionsBase<T>::isSet(const T &opt) const
{
return values_.find(opt) != values_.end();
}
template <typename T>
const std::string &OptionsBase<T>::operator[](const T &opt) const
{
return values_.find(opt)->second;
}
template <typename T>
void OptionsBase<T>::clear()
{
values_.clear();
}
template class OptionsBase<int>;
void OptionsParser::addOption(int opt, const char *help, const char *name,
OptionArgument argument, const char *argumentName)
{
@ -166,27 +192,3 @@ void OptionsParser::usage()
}
}
}
OptionsParser::Options::Options()
{
}
bool OptionsParser::Options::valid() const
{
return !values_.empty();
}
bool OptionsParser::Options::isSet(int opt) const
{
return values_.find(opt) != values_.end();
}
const std::string &OptionsParser::Options::operator[](int opt) const
{
return values_.find(opt)->second;
}
void OptionsParser::Options::clear()
{
values_.clear();
}

28
src/cam/options.h
View file

@ -28,21 +28,25 @@ struct Option {
bool hasLongOption() const { return name != nullptr; }
};
template <typename T>
class OptionsBase
{
public:
bool valid() const;
bool isSet(const T &opt) const;
const std::string &operator[](const T &opt) const;
private:
friend class OptionsParser;
std::map<T, std::string> values_;
void clear();
};
class OptionsParser
{
public:
class Options {
public:
Options();
bool valid() const;
bool isSet(int opt) const;
const std::string &operator[](int opt) const;
private:
friend class OptionsParser;
std::map<int, std::string> values_;
void clear();
class Options : public OptionsBase<int>
{
};
void addOption(int opt, const char *help, const char *name = nullptr,