summaryrefslogtreecommitdiff
path: root/src/cam
diff options
context:
space:
mode:
Diffstat (limited to 'src/cam')
-rw-r--r--src/cam/main.cpp2
-rw-r--r--src/cam/options.cpp13
-rw-r--r--src/cam/options.h2
3 files changed, 2 insertions, 15 deletions
diff --git a/src/cam/main.cpp b/src/cam/main.cpp
index 22211670..0d37039f 100644
--- a/src/cam/main.cpp
+++ b/src/cam/main.cpp
@@ -33,7 +33,7 @@ static int parseOptions(int argc, char *argv[])
parser.addOption(OptHelp, "Display this help message", "help");
parser.addOption(OptList, "List all cameras", "list");
- options = std::move(parser.parse(argc, argv));
+ options = parser.parse(argc, argv);
if (!options.valid())
return -EINVAL;
diff --git a/src/cam/options.cpp b/src/cam/options.cpp
index d391a0e5..82acff9b 100644
--- a/src/cam/options.cpp
+++ b/src/cam/options.cpp
@@ -102,7 +102,7 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv)
options.values_[c] = optarg ? optarg : "";
}
- return std::move(options);
+ return options;
}
void OptionsParser::usage()
@@ -160,17 +160,6 @@ OptionsParser::Options::Options()
{
}
-OptionsParser::Options::Options(Options &&other)
- : values_(std::move(other.values_))
-{
-}
-
-OptionsParser::Options &OptionsParser::Options::operator=(Options &&other)
-{
- values_ = other.values_;
- return *this;
-}
-
bool OptionsParser::Options::valid() const
{
return !values_.empty();
diff --git a/src/cam/options.h b/src/cam/options.h
index 88336dfe..f99ea730 100644
--- a/src/cam/options.h
+++ b/src/cam/options.h
@@ -23,8 +23,6 @@ public:
class Options {
public:
Options();
- Options(Options &&other);
- Options &operator=(Options &&other);
bool valid() const;
bool isSet(int opt) const;