Change naming convention for C++ interfaces

[alexxy/gromacs.git] / src / gromacs / options / options.cpp

diff --git a/src/gromacs/options/options.cpp b/src/gromacs/options/options.cpp
index b208ecb7442211ed124b5873a378f0027935ef7c..4048addbf346a6b25c10758454135916c2e3a5a6 100644 (file)
--- a/src/gromacs/options/options.cpp
+++ b/src/gromacs/options/options.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2014, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,2014,2015, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -39,14 +39,15 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_options
  */
-#include "gromacs/options/options.h"
+#include "gmxpre.h"
+
+#include "options.h"
 
 #include "gromacs/options/abstractoption.h"
 #include "gromacs/options/abstractoptionstorage.h"
 #include "gromacs/utility/arrayref.h"
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/gmxassert.h"
-#include "gromacs/utility/messagestringcollector.h"
 #include "gromacs/utility/stringutil.h"
 
 #include "options-impl.h"
@@ -55,10 +56,10 @@ namespace gmx
 {
 
 /********************************************************************
- * OptionManagerInterface
+ * IOptionManager
  */
 
-OptionManagerInterface::~OptionManagerInterface()
+IOptionManager::~IOptionManager()
 {
 }
 
@@ -153,10 +154,10 @@ void Options::setDescription(const std::string &desc)
 
 void Options::setDescription(const ConstArrayRef<const char *> &descArray)
 {
-    impl_->description_ = concatenateStrings(descArray.data(), descArray.size());
+    impl_->description_ = joinStrings(descArray, "\n");
 }
 
-void Options::addManager(OptionManagerInterface *manager)
+void Options::addManager(IOptionManager *manager)
 {
     GMX_RELEASE_ASSERT(impl_->parent_ == NULL,
                        "Can only add a manager in a top-level Options object");