[osmium-tool] 38/44: Refactor: reordering.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Jul 21 20:15:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to tag v1.1.0
in repository osmium-tool.
commit 78224c8a2a8a8cf749d0743b1a73db307f53b0d0
Author: Jochen Topf <jochen at topf.org>
Date: Fri Jul 3 14:38:41 2015 +0200
Refactor: reordering.
---
src/command_apply_changes.cpp | 3 +--
src/command_cat.cpp | 3 +--
src/command_check_refs.cpp | 3 +--
src/command_fileinfo.cpp | 3 +--
src/command_getid.cpp | 3 +--
src/command_merge_changes.cpp | 3 +--
src/command_renumber.cpp | 3 +--
src/command_time_filter.cpp | 3 +--
8 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/command_apply_changes.cpp b/src/command_apply_changes.cpp
index e3b4483..5a1b3f1 100644
--- a/src/command_apply_changes.cpp
+++ b/src/command_apply_changes.cpp
@@ -32,8 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command_apply_changes.hpp"
bool CommandApplyChanges::setup(const std::vector<std::string>& arguments) {
- po::variables_map vm;
-
po::options_description cmdline("Allowed options");
cmdline.add_options()
("input-format,F", po::value<std::string>(), "Format of input file")
@@ -57,6 +55,7 @@ bool CommandApplyChanges::setup(const std::vector<std::string>& arguments) {
positional.add("input-filename", 1);
positional.add("change-filenames", -1);
+ po::variables_map vm;
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
po::notify(vm);
diff --git a/src/command_cat.cpp b/src/command_cat.cpp
index ca02b17..72e3c14 100644
--- a/src/command_cat.cpp
+++ b/src/command_cat.cpp
@@ -31,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command_cat.hpp"
bool CommandCat::setup(const std::vector<std::string>& arguments) {
- po::variables_map vm;
-
po::options_description cmdline("Allowed options");
cmdline.add_options()
("input-format,F", po::value<std::string>(), "Format of input files")
@@ -53,6 +51,7 @@ bool CommandCat::setup(const std::vector<std::string>& arguments) {
po::positional_options_description positional;
positional.add("input-filenames", -1);
+ po::variables_map vm;
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
po::notify(vm);
diff --git a/src/command_check_refs.cpp b/src/command_check_refs.cpp
index 42a7e02..c17adce 100644
--- a/src/command_check_refs.cpp
+++ b/src/command_check_refs.cpp
@@ -35,8 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command_check_refs.hpp"
bool CommandCheckRefs::setup(const std::vector<std::string>& arguments) {
- po::variables_map vm;
-
po::options_description cmdline("Allowed options");
cmdline.add_options()
("show-ids,i", "Show IDs of missing objects")
@@ -57,6 +55,7 @@ bool CommandCheckRefs::setup(const std::vector<std::string>& arguments) {
po::positional_options_description positional;
positional.add("input-filename", 1);
+ po::variables_map vm;
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
po::notify(vm);
diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
index 5f63d06..8897791 100644
--- a/src/command_fileinfo.cpp
+++ b/src/command_fileinfo.cpp
@@ -481,8 +481,6 @@ public:
/*************************************************************************/
bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
- po::variables_map vm;
-
po::options_description cmdline("Allowed options");
cmdline.add_options()
("extended,e", "Extended output")
@@ -503,6 +501,7 @@ bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
po::positional_options_description positional;
positional.add("input-filename", 1);
+ po::variables_map vm;
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
po::notify(vm);
diff --git a/src/command_getid.cpp b/src/command_getid.cpp
index f39c3a1..5dbd4fc 100644
--- a/src/command_getid.cpp
+++ b/src/command_getid.cpp
@@ -45,8 +45,6 @@ void CommandGetId::sort_unique(osmium::item_type type) {
}
bool CommandGetId::setup(const std::vector<std::string>& arguments) {
- po::variables_map vm;
-
po::options_description cmdline("Allowed options");
cmdline.add_options()
("input-format,F", po::value<std::string>(), "Format of input file")
@@ -68,6 +66,7 @@ bool CommandGetId::setup(const std::vector<std::string>& arguments) {
positional.add("input-filename", 1);
positional.add("ids", -1);
+ po::variables_map vm;
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
po::notify(vm);
diff --git a/src/command_merge_changes.cpp b/src/command_merge_changes.cpp
index 588100c..15de8ae 100644
--- a/src/command_merge_changes.cpp
+++ b/src/command_merge_changes.cpp
@@ -33,8 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command_merge_changes.hpp"
bool CommandMergeChanges::setup(const std::vector<std::string>& arguments) {
- po::variables_map vm;
-
po::options_description cmdline("Allowed options");
cmdline.add_options()
("input-format,F", po::value<std::string>(), "Format of input files")
@@ -55,6 +53,7 @@ bool CommandMergeChanges::setup(const std::vector<std::string>& arguments) {
po::positional_options_description positional;
positional.add("input-filenames", -1);
+ po::variables_map vm;
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
po::notify(vm);
diff --git a/src/command_renumber.cpp b/src/command_renumber.cpp
index bbd8e8e..d36ed37 100644
--- a/src/command_renumber.cpp
+++ b/src/command_renumber.cpp
@@ -41,8 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command_renumber.hpp"
bool CommandRenumber::setup(const std::vector<std::string>& arguments) {
- po::variables_map vm;
-
po::options_description cmdline("Allowed options");
cmdline.add_options()
("input-format,F", po::value<std::string>(), "Format of input files")
@@ -63,6 +61,7 @@ bool CommandRenumber::setup(const std::vector<std::string>& arguments) {
po::positional_options_description positional;
positional.add("input-filename", 1);
+ po::variables_map vm;
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
po::notify(vm);
diff --git a/src/command_time_filter.cpp b/src/command_time_filter.cpp
index fd18b28..2cf53ba 100644
--- a/src/command_time_filter.cpp
+++ b/src/command_time_filter.cpp
@@ -31,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command_time_filter.hpp"
bool CommandTimeFilter::setup(const std::vector<std::string>& arguments) {
- po::variables_map vm;
-
po::options_description cmdline("Allowed options");
cmdline.add_options()
("input-format,F", po::value<std::string>(), "Format of input file")
@@ -56,6 +54,7 @@ bool CommandTimeFilter::setup(const std::vector<std::string>& arguments) {
positional.add("time-from", 1);
positional.add("time-to", 1);
+ po::variables_map vm;
po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
po::notify(vm);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git
More information about the Pkg-grass-devel
mailing list