Changes in src/UIElements/CommandLineUI/CommandLineDialog.hpp [163110:37a67f]

File:

• src/UIElements/CommandLineUI/CommandLineDialog.hpp (modified) (1 diff)

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -34 +34 @@
 
   virtual void queryEmpty(const std::string ="", const std::string = "");
-  virtual void queryInt(Parameter<int> &, const std::string ="", const std::string = "");
-  virtual void queryInts(Parameter<std::vector<int> > &, const std::string ="", const std::string = "");
-  virtual void queryUnsignedInt(Parameter<unsigned int> &, const std::string ="", const std::string = "");
-  virtual void queryUnsignedInts(Parameter<std::vector<unsigned int> > &, const std::string ="", const std::string = "");
-  virtual void queryBoolean(Parameter<bool> &, const std::string ="", const std::string = "");
-  virtual void queryString(Parameter<std::string> &, const std::string ="", const std::string = "");
-  virtual void queryStrings(Parameter<std::vector<std::string> > &, const std::string ="", const std::string = "");
-  virtual void queryDouble(Parameter<double> &, const std::string ="", const std::string = "");
-  virtual void queryDoubles(Parameter<std::vector<double> > &, const std::string ="", const std::string = "");
-  virtual void queryAtom(Parameter<const atom *> &, const std::string ="", const std::string = "");
-  virtual void queryAtoms(Parameter<std::vector<const atom *> > &, const std::string ="", const std::string = "");
-  virtual void queryMolecule(Parameter<const molecule *> &, const std::string ="", const std::string = "");
-  virtual void queryMolecules(Parameter<std::vector<const molecule *> > &, const std::string ="", const std::string = "");
-  virtual void queryVector(Parameter<Vector> &, const std::string ="", const std::string = "");
-  virtual void queryVectors(Parameter<std::vector<Vector> > &, const std::string ="", const std::string = "");
-  virtual void queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &, const std::string ="", const std::string = "");
-  virtual void queryElement(Parameter<const element *> &, const std::string ="", const std::string = "");
-  virtual void queryElements(Parameter<std::vector<const element *> > &, const std::string ="", const std::string = "");
-  virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string ="", const std::string = "");
-  virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const std::string ="", const std::string = "");
-  virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const std::string ="", const std::string = "");
-  // specialized stuff for command line queries
-  // all placed into Query/CommandLineQuery.hpp
-  // !please adhere to alphabetical ordering!
-  class AtomCommandLineQuery;
-  class AtomsCommandLineQuery;
-  class BooleanCommandLineQuery;
-  class DoubleCommandLineQuery;
-  class DoublesCommandLineQuery;
-  class ElementCommandLineQuery;
-  class ElementsCommandLineQuery;
+
+protected:
+
   class EmptyCommandLineQuery;
-  class FileCommandLineQuery;
-  class FilesCommandLineQuery;
-  class IntCommandLineQuery;
-  class IntsCommandLineQuery;
-  class MoleculeCommandLineQuery;
-  class MoleculesCommandLineQuery;
-  class RealSpaceMatrixCommandLineQuery;
-  class StringCommandLineQuery;
-  class StringsCommandLineQuery;
-  class UnsignedIntCommandLineQuery;
-  class UnsignedIntsCommandLineQuery;
-  class VectorCommandLineQuery;
-  class VectorsCommandLineQuery;
-  class RandomNumberDistribution_ParametersCommandLineQuery;
+
+  /** With the following boost::preprocessor code we generate virtual function
+   * definitions and forward declarations for all desired query types in the
+   * CommandLineUI specialization of class Dialog.
+   */
+#include "UIElements/GlobalListOfParameterQueries.hpp"
+#include "UIElements/Dialog_impl_pre.hpp"
+
+  #include <boost/preprocessor/facilities/empty.hpp>
+
+  // iterate over all parameter query types for query declarations
+  #if defined GLOBALLISTOFPARAMETERQUERIES_Token && defined GLOBALLISTOFPARAMETERQUERIES_Type
+  #define SUFFIX BOOST_PP_EMPTY()
+  #define BOOST_PP_LOCAL_MACRO(n) dialog_declaration(~, n, GLOBALLISTOFPARAMETERQUERIES_Token, GLOBALLISTOFPARAMETERQUERIES_Type)
+  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMETERTOKENS-1)
+  #include BOOST_PP_LOCAL_ITERATE()
+  #undef dialog_declaration
+  #undef SUFFIX
+  #endif
+
+  // iterate over all parameter query types for forward declarations
+  #if defined GLOBALLISTOFPARAMETERQUERIES_Token && defined GLOBALLISTOFPARAMETERQUERIES_Type
+  #define BOOST_PP_LOCAL_MACRO(n) forward_declaration(~, n, GLOBALLISTOFPARAMETERQUERIES_Token, CommandLineQuery)
+  #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMETERTOKENS-1)
+  #include BOOST_PP_LOCAL_ITERATE()
+  #undef forward_declaration
+  #endif
+
+#include "Dialog_impl_undef.hpp"
+  /* End of preprocessor code piece */
+
 };