X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Fcommandline%2Fcmdlinemodulemanager.h;h=5271d242f76832b83d255eeedbb8f0097eea1056;hb=7a6907d2184cf7bf3ce09e83e9d902f9787a3eb0;hp=4214ab1f1b6ff592908c748c0955bfb303ff0289;hpb=9eb0581bed7c5147f8919ab19a7e2ed55e0e1514;p=alexxy%2Fgromacs.git

diff --git a/src/gromacs/commandline/cmdlinemodulemanager.h b/src/gromacs/commandline/cmdlinemodulemanager.h
index 4214ab1f1b..5271d242f7 100644
--- a/src/gromacs/commandline/cmdlinemodulemanager.h
+++ b/src/gromacs/commandline/cmdlinemodulemanager.h
@@ -43,7 +43,7 @@
 #ifndef GMX_COMMANDLINE_CMDLINEMODULEMANAGER_H
 #define GMX_COMMANDLINE_CMDLINEMODULEMANAGER_H
 
-#include "gromacs/onlinehelp/helptopicinterface.h"
+#include "gromacs/onlinehelp/ihelptopic.h"
 #include "gromacs/utility/classhelpers.h"
 #include "gromacs/utility/uniqueptr.h"
 
@@ -52,15 +52,15 @@ namespace gmx
 
 class CommandLineModuleGroup;
 class CommandLineModuleGroupData;
-class CommandLineModuleInterface;
 class CommandLineProgramContext;
-class FileOutputRedirectorInterface;
+class ICommandLineModule;
+class IFileOutputRedirector;
 
 //! \addtogroup module_commandline
 //! \{
 
-//! Smart pointer type for managing a CommandLineModuleInterface.
-typedef gmx_unique_ptr<CommandLineModuleInterface>::type
+//! Smart pointer type for managing a ICommandLineModule.
+typedef gmx_unique_ptr<ICommandLineModule>::type
     CommandLineModulePointer;
 
 /*! \libinternal \brief
@@ -127,7 +127,7 @@ class CommandLineModuleManager
          * Does not throw.  All exceptions are caught and handled internally.
          */
         static int runAsMainSingleModule(int argc, char *argv[],
-                                         CommandLineModuleInterface *module);
+                                         ICommandLineModule *module);
         /*! \brief
          * Implements a main() method that runs a given function.
          *
@@ -206,7 +206,7 @@ class CommandLineModuleManager
          * For tests, there should only be need to call this a single time,
          * right after creating the manager.
          */
-        void setOutputRedirector(FileOutputRedirectorInterface *output);
+        void setOutputRedirector(IFileOutputRedirector *output);
 
         /*! \brief
          * Makes the manager always run a single module.
@@ -217,7 +217,7 @@ class CommandLineModuleManager
          * directly passes all command-line arguments to \p module.
          * Help arguments are an exception: these are still recognized by the
          * manager and translated into a call to
-         * CommandLineModuleInterface::writeHelp().
+         * ICommandLineModule::writeHelp().
          *
          * This is public mainly for unit testing purposes; for other code,
          * runAsMainSingleModule() typically provides the desired
@@ -225,7 +225,7 @@ class CommandLineModuleManager
          *
          * Does not throw.
          */
-        void setSingleModule(CommandLineModuleInterface *module);
+        void setSingleModule(ICommandLineModule *module);
         /*! \brief
          * Adds a given module to this manager.
          *
@@ -266,7 +266,7 @@ class CommandLineModuleManager
          * \throws  std::bad_alloc if out of memory.
          *
          * \p Module must be default-constructible and implement
-         * CommandLineModuleInterface.
+         * ICommandLineModule.
          *
          * This method is provided as a convenient alternative to addModule()
          * for cases where each module is implemented by a different type