X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Ftestutils%2Fcmdlinetest.h;h=5c1feec7ea4477258598af5ac6c764790158b9a3;hb=7a6907d2184cf7bf3ce09e83e9d902f9787a3eb0;hp=519911f16e75b342f3a0444a0bf1335c3c8777ec;hpb=9eb0581bed7c5147f8919ab19a7e2ed55e0e1514;p=alexxy%2Fgromacs.git

diff --git a/src/testutils/cmdlinetest.h b/src/testutils/cmdlinetest.h
index 519911f16e..5c1feec7ea 100644
--- a/src/testutils/cmdlinetest.h
+++ b/src/testutils/cmdlinetest.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,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.
@@ -55,8 +55,8 @@
 namespace gmx
 {
 
-class CommandLineModuleInterface;
-class CommandLineOptionsModuleInterface;
+class ICommandLineModule;
+class ICommandLineOptionsModule;
 
 namespace test
 {
@@ -206,7 +206,7 @@ class CommandLineTestHelper
 {
     public:
         /*! \brief
-         * Runs a command-line program that implements CommandLineModuleInterface.
+         * Runs a command-line program that implements ICommandLineModule.
          *
          * \param[in,out] module       Module to run.
          *     The function does not take ownership.
@@ -216,10 +216,10 @@ class CommandLineTestHelper
          * \throws  unspecified  Any exception thrown by the module.
          */
         static int
-        runModule(CommandLineModuleInterface *module, CommandLine *commandLine);
+        runModule(ICommandLineModule *module, CommandLine *commandLine);
         /*! \brief
          * Runs a command-line program that implements
-         * CommandLineOptionsModuleInterface.
+         * ICommandLineOptionsModule.
          *
          * \param[in] factory          Factory method for the module to run.
          * \param[in,out] commandLine  Command line parameters to pass.
@@ -229,7 +229,7 @@ class CommandLineTestHelper
          *     module.
          */
         static int
-        runModule(CommandLineOptionsModuleInterface *(*factory)(),
+        runModule(ICommandLineOptionsModule         *(*factory)(),
                   CommandLine                      *commandLine);
 
         /*! \brief