schroot-common: Rename options_base to options

12 files changed, 23 insertions, 22 deletions

diff --git a/bin/dchroot-dsa/main.cc b/bin/dchroot-dsa/main.cc
index a06a5f6e..f54312c5 100644
--- a/bin/dchroot-dsa/main.cc
+++ b/bin/dchroot-dsa/main.cc
@@ -37,7 +37,7 @@ using sbuild::_;
 using boost::format;
 using namespace dchroot_dsa;
 
-main::main (schroot_common::options_base::ptr& options):
+main::main (schroot_common::options::ptr& options):
   dchroot_common::main_base("dchroot-dsa",
             // TRANSLATORS: '...' is an ellipsis e.g. U+2026, and '-'
             // is an em-dash.
diff --git a/bin/dchroot-dsa/main.h b/bin/dchroot-dsa/main.h
index 55557d48..458a4350 100644
--- a/bin/dchroot-dsa/main.h
+++ b/bin/dchroot-dsa/main.h
@@ -20,6 +20,7 @@
 #define DCHROOT_DSA_MAIN_H
 
 #include <dchroot-common/main-base.h>
+#include <schroot-common/options.h>
 
 /**
  * dchroot-dsa program components.
@@ -38,7 +39,7 @@ namespace dchroot_dsa
      *
      * @param options the command-line options to use.
      */
-    main (schroot_common::options_base::ptr& options);
+    main (schroot_common::options::ptr& options);
 
     /// The destructor.
     virtual ~main ();
diff --git a/bin/dchroot-dsa/options.cc b/bin/dchroot-dsa/options.cc
index 0530ff43..4db1bf19 100644
--- a/bin/dchroot-dsa/options.cc
+++ b/bin/dchroot-dsa/options.cc
@@ -35,7 +35,7 @@ namespace opt = boost::program_options;
 using namespace dchroot_dsa;
 
 options::options ():
-  schroot_common::options_base()
+  schroot_common::options()
 {
 }
 
@@ -47,7 +47,7 @@ void
 options::add_options ()
 {
   // Chain up to add general schroot options.
-  schroot_common::options_base::add_options();
+  schroot_common::options::add_options();
 
   actions.add_options()
     ("listpaths,p",
@@ -66,7 +66,7 @@ void
 options::check_options ()
 {
   // Chain up to check general schroot options.
-  schroot_common::options_base::check_options();
+  schroot_common::options::check_options();
 
   if (vm.count("listpaths"))
     this->action = ACTION_LOCATION;
diff --git a/bin/dchroot-dsa/options.h b/bin/dchroot-dsa/options.h
index 1d8140b3..e119b482 100644
--- a/bin/dchroot-dsa/options.h
+++ b/bin/dchroot-dsa/options.h
@@ -19,7 +19,7 @@
 #ifndef DCHROOT_DSA_OPTIONS_H
 #define DCHROOT_DSA_OPTIONS_H
 
-#include <schroot-common/options-base.h>
+#include <schroot-common/options.h>
 
 namespace dchroot_dsa
 {
@@ -27,7 +27,7 @@ namespace dchroot_dsa
   /**
    * dchroot-dsa command-line options.
    */
-  class options : public schroot_common::options_base
+  class options : public schroot_common::options
   {
   public:
     /// The constructor.
diff --git a/bin/dchroot/main.cc b/bin/dchroot/main.cc
index c77092da..258a5dcb 100644
--- a/bin/dchroot/main.cc
+++ b/bin/dchroot/main.cc
@@ -37,7 +37,7 @@ using sbuild::_;
 using boost::format;
 using namespace dchroot;
 
-main::main (schroot_common::options_base::ptr& options):
+main::main (schroot_common::options::ptr& options):
   dchroot_common::main_base("dchroot",
             // TRANSLATORS: '...' is an ellipsis e.g. U+2026, and '-'
             // is an em-dash.
diff --git a/bin/dchroot/main.h b/bin/dchroot/main.h
index 6c90cace..7b4cd772 100644
--- a/bin/dchroot/main.h
+++ b/bin/dchroot/main.h
@@ -38,7 +38,7 @@ namespace dchroot
      *
      * @param options the command-line options to use.
      */
-    main (schroot_common::options_base::ptr& options);
+    main (schroot_common::options::ptr& options);
 
     /// The destructor.
     virtual ~main ();
diff --git a/bin/dchroot/options.cc b/bin/dchroot/options.cc
index aeba3ffa..7c7bb471 100644
--- a/bin/dchroot/options.cc
+++ b/bin/dchroot/options.cc
@@ -33,7 +33,7 @@ namespace opt = boost::program_options;
 using namespace dchroot;
 
 options::options ():
-  schroot_common::options_base()
+  schroot_common::options()
 {
 }
 
@@ -45,7 +45,7 @@ void
 options::add_options ()
 {
   // Chain up to add general schroot options.
-  schroot_common::options_base::add_options();
+  schroot_common::options::add_options();
 
   actions.add_options()
     ("path,p", opt::value<std::string>(&this->chroot_path),
@@ -66,7 +66,7 @@ void
 options::check_options ()
 {
   // Chain up to check general schroot options.
-  schroot_common::options_base::check_options();
+  schroot_common::options::check_options();
 
   if (vm.count("path"))
     {
diff --git a/bin/dchroot/options.h b/bin/dchroot/options.h
index 8de1f44d..a603a1b5 100644
--- a/bin/dchroot/options.h
+++ b/bin/dchroot/options.h
@@ -19,7 +19,7 @@
 #ifndef DCHROOT_OPTIONS_H
 #define DCHROOT_OPTIONS_H
 
-#include <schroot-common/options-base.h>
+#include <schroot-common/options.h>
 
 namespace dchroot
 {
@@ -27,7 +27,7 @@ namespace dchroot
   /**
    * dchroot command-line options.
    */
-  class options : public schroot_common::options_base
+  class options : public schroot_common::options
   {
   public:
     /// The constructor.
diff --git a/bin/schroot/main.cc b/bin/schroot/main.cc
index d039380d..4950b3a3 100644
--- a/bin/schroot/main.cc
+++ b/bin/schroot/main.cc
@@ -37,7 +37,7 @@ using boost::format;
 using sbuild::_;
 using namespace schroot;
 
-main::main (schroot_common::options_base::ptr& options):
+main::main (schroot_common::options::ptr& options):
   schroot_common::main("schroot",
             _("[OPTION…] [COMMAND] — run command or shell in a chroot"),
             options,
diff --git a/bin/schroot/main.h b/bin/schroot/main.h
index d6ec179e..04997ebf 100644
--- a/bin/schroot/main.h
+++ b/bin/schroot/main.h
@@ -20,7 +20,7 @@
 #define SCHROOT_MAIN_H
 
 #include <schroot-common/main.h>
-#include <schroot-common/options-base.h>
+#include <schroot-common/options.h>
 
 /**
  * schroot program components.
@@ -39,7 +39,7 @@ namespace schroot
      *
      * @param options the command-line options to use.
      */
-    main (schroot_common::options_base::ptr& options);
+    main (schroot_common::options::ptr& options);
 
     /// The destructor.
     virtual ~main ();
diff --git a/bin/schroot/options.cc b/bin/schroot/options.cc
index 1c21e849..f46704d5 100644
--- a/bin/schroot/options.cc
+++ b/bin/schroot/options.cc
@@ -33,7 +33,7 @@ namespace opt = boost::program_options;
 using namespace schroot;
 
 options::options ():
-  options_base()
+  schroot_common::options()
 {
 }
 
@@ -45,7 +45,7 @@ void
 options::add_options ()
 {
   // Chain up to add general schroot options.
-  options_base::add_options();
+  schroot_common::options::add_options();
 
   actions.add_options()
     ("location",
@@ -99,7 +99,7 @@ void
 options::check_options ()
 {
   // Chain up to check general schroot options.
-  options_base::check_options();
+  schroot_common::options::check_options();
 
   if (vm.count("location"))
     this->action = ACTION_LOCATION;
diff --git a/bin/schroot/options.h b/bin/schroot/options.h
index d6a4efe5..0f172c97 100644
--- a/bin/schroot/options.h
+++ b/bin/schroot/options.h
@@ -19,7 +19,7 @@
 #ifndef SCHROOT_OPTIONS_H
 #define SCHROOT_OPTIONS_H
 
-#include <schroot-common/options-base.h>
+#include <schroot-common/options.h>
 
 namespace schroot
 {
@@ -27,7 +27,7 @@ namespace schroot
   /**
    * schroot command-line options.
    */
-  class options : public schroot_common::options_base
+  class options : public schroot_common::options
   {
   public:
     /// The constructor.