From b07830f947516b06c7a9c7419a660b86ffb4ae3f Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 5 Apr 2013 18:41:07 +0100 Subject: dchroot-common: Rename main_base to main --- bin/dchroot-dsa/main.cc | 2 +- bin/dchroot-dsa/main.h | 4 ++-- bin/dchroot/main.cc | 2 +- bin/dchroot/main.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/dchroot-dsa/main.cc b/bin/dchroot-dsa/main.cc index f54312c5..40cf1a19 100644 --- a/bin/dchroot-dsa/main.cc +++ b/bin/dchroot-dsa/main.cc @@ -38,7 +38,7 @@ using boost::format; using namespace dchroot_dsa; main::main (schroot_common::options::ptr& options): - dchroot_common::main_base("dchroot-dsa", + dchroot_common::main("dchroot-dsa", // TRANSLATORS: '...' is an ellipsis e.g. U+2026, and '-' // is an em-dash. _("[OPTION…] chroot [COMMAND] — run command or shell in a chroot"), diff --git a/bin/dchroot-dsa/main.h b/bin/dchroot-dsa/main.h index 458a4350..a63ff6ae 100644 --- a/bin/dchroot-dsa/main.h +++ b/bin/dchroot-dsa/main.h @@ -19,7 +19,7 @@ #ifndef DCHROOT_DSA_MAIN_H #define DCHROOT_DSA_MAIN_H -#include +#include #include /** @@ -31,7 +31,7 @@ namespace dchroot_dsa /** * Frontend for dchroot-dsa. This class is used to "run" dchroot-dsa. */ - class main : public dchroot_common::main_base + class main : public dchroot_common::main { public: /** diff --git a/bin/dchroot/main.cc b/bin/dchroot/main.cc index 258a5dcb..61547b9d 100644 --- a/bin/dchroot/main.cc +++ b/bin/dchroot/main.cc @@ -38,7 +38,7 @@ using boost::format; using namespace dchroot; main::main (schroot_common::options::ptr& options): - dchroot_common::main_base("dchroot", + dchroot_common::main("dchroot", // TRANSLATORS: '...' is an ellipsis e.g. U+2026, and '-' // is an em-dash. _("[OPTION…] [COMMAND] — run command or shell in a chroot"), diff --git a/bin/dchroot/main.h b/bin/dchroot/main.h index 7b4cd772..0011d665 100644 --- a/bin/dchroot/main.h +++ b/bin/dchroot/main.h @@ -19,7 +19,7 @@ #ifndef DCHROOT_MAIN_H #define DCHROOT_MAIN_H -#include +#include /** * dchroot program components. @@ -30,7 +30,7 @@ namespace dchroot /** * Frontend for dchroot. This class is used to "run" dchroot. */ - class main : public dchroot_common::main_base + class main : public dchroot_common::main { public: /** -- cgit v1.2.3